LibreOffice Math new features

[unfetteredsoftwareforever]

I have a few feature requests for the next version of Math:
handwriting recognition
TeX support
Raster export
Computation Support



--
View this message in context: 
http://nabble.documentfoundation.org/LibreOffice-Math-new-features-tp3997291.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument

[Kohei Yoshida]

On 07/23/2012 11:51 AM, Petr Mladek wrote:

Eike Rathke píše v Po 23. 07. 2012 v 17:36 +0200:

Hi Kohei,

On Friday, 2012-07-20 10:10:48 -0400, Kohei Yoshida wrote:


I'll add this configuration option during 3.7 cycle if this can wait
until 3.7.  If you guys need it earlier than that I could work on it
and push it as a late feature if it's desperately needed for 3.6.


I'd appreciate if you could do it for 3.6 as well, but it would need
also translation, do we add that in stable branches?


If the bug was already in LO-3.3, I would not break the UI/string freeze
because of it. I think that such an old bug could wait few more months
for LO-3.7.


I tend to agree with this.

Anyway, in case we change our mind and backport this to 3.6, commits 
4e8552993aed7caaa247bb1baf6168ddcfba159a through 
01ee7955fe6d0e25c325717fe7d5dbd56e28983c add an extra configuration 
option to toggle this behavior.


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 8 commits - officecfg/registry sc/inc sc/source

[Kohei Yoshida]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 
 sc/inc/calcconfig.hxx|1 
 sc/inc/formulaopt.hxx|8 
 sc/source/core/tool/calcconfig.cxx   |6 
 sc/source/core/tool/formulaopt.cxx   |   47 ++--
 sc/source/core/tool/interpr4.cxx |   29 +-
 sc/source/ui/docshell/docsh6.cxx |4 
 sc/source/ui/optdlg/calcoptionsdlg.cxx   |  169 +++
 sc/source/ui/optdlg/calcoptionsdlg.hrc   |9 
 sc/source/ui/optdlg/calcoptionsdlg.hxx   |   11 
 sc/source/ui/optdlg/calcoptionsdlg.src   |   34 +++
 sc/source/ui/optdlg/tpformula.cxx|6 
 12 files changed, 261 insertions(+), 71 deletions(-)

New commits:
commit 01ee7955fe6d0e25c325717fe7d5dbd56e28983c
Author: Kohei Yoshida 
Date:   Mon Jul 23 21:32:47 2012 -0400

More helpful description for this option.

Change-Id: Ib9399719d3d055c98108811cfb29dfd6f6dd9095

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.src 
b/sc/source/ui/optdlg/calcoptionsdlg.src
index 235ec0e..4c53229 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.src
+++ b/sc/source/ui/optdlg/calcoptionsdlg.src
@@ -125,7 +125,7 @@ ModalDialog RID_SCDLG_FORMULA_CALCOPTIONS
 
 String STR_EMPTY_STRING_AS_ZERO_DESC
 {
-Text [ en-US ] = "Blah.";
+Text [ en-US ] = "This option determines whether or not an empty 
string is to be treated as having a value of zero when used in arithmetic.";
 };
 
 String STR_TRUE
commit 9b2d4348e1659cebdf560626a3b6c00263c6b1f2
Author: Kohei Yoshida 
Date:   Mon Jul 23 21:17:53 2012 -0400

Unused parameter.

Change-Id: Ie76561a2c8e5d6a8613e948620503f42ad73a207

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 3b1f8da..69bd2a8 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -312,7 +312,7 @@ IMPL_LINK(ScCalcOptionsDialog, SettingsSelHdl, Control*, 
pCtrl)
 return 0;
 }
 
-IMPL_LINK(ScCalcOptionsDialog, BtnToggleHdl, RadioButton*, pBtn)
+IMPL_LINK_NOARG(ScCalcOptionsDialog, BtnToggleHdl)
 {
 RadioValueChanged();
 return 0;
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx 
b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 85a62db..a1a7222 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -43,7 +43,7 @@ public:
 virtual ~ScCalcOptionsDialog();
 
 DECL_LINK( SettingsSelHdl, Control* );
-DECL_LINK( BtnToggleHdl, RadioButton* );
+DECL_LINK( BtnToggleHdl, void* );
 
 const ScCalcConfig& GetConfig() const;
 
commit 3a8f10ddb4bfbbf76590102bbcaa10c9aa2c0af3
Author: Kohei Yoshida 
Date:   Mon Jul 23 21:10:50 2012 -0400

Honor the configuration option in the interpreter.

Change-Id: I686d1f3703cbb122e1b3ed010a727163be2e942a

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 566d0b3..c35cdfd 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -243,21 +243,26 @@ double ScInterpreter::ConvertStringToValue( const String& 
rStr )
 SetError( mnStringNoValueError);
 return fValue;
 }
-// The number scanner does not accept empty strings or strings containing
-// only spaces, be on par in these cases with what was accepted in OOo and
-// is in AOO (see also the #else branch below) and convert to 0 to prevent
-// interoperability nightmares.
-if (!rStr.Len())
-return fValue;
-else if (rStr.GetChar(0) == ' ')
+
+if (GetGlobalConfig().mbEmptyStringAsZero)
 {
-const sal_Unicode* p = rStr.GetBuffer() + 1;
-const sal_Unicode* const pStop = p - 1 + rStr.Len();
-while (p < pStop && *p == ' ')
-++p;
-if (p == pStop)
+// The number scanner does not accept empty strings or strings
+// containing only spaces, be on par in these cases with what was
+// accepted in OOo and is in AOO (see also the else branch below) and
+// convert to 0 to prevent interoperability nightmares.
+if (!rStr.Len())
 return fValue;
+else if (rStr.GetChar(0) == ' ')
+{
+const sal_Unicode* p = rStr.GetBuffer() + 1;
+const sal_Unicode* const pStop = p - 1 + rStr.Len();
+while (p < pStop && *p == ' ')
+++p;
+if (p == pStop)
+return fValue;
+}
 }
+
 sal_uInt32 nFIndex = 0;
 if (!pFormatter->IsNumberFormat(rStr, nFIndex, fValue))
 {
commit 22cf0759547aa1803f77dbd3ee91774600dadc6f
Author: Kohei Yoshida 
Date:   Mon Jul 23 21:05:00 2012 -0400

Let's not forget to set the description for this option.

Change-Id: I9441ef145b62b84c1b4b8dd6ce85d6c0744f3103

diff --git a/sc/sourc

[Libreoffice-commits] .: Branch 'feature/calc-empty-string-config' - sc/source

[Kohei Yoshida]

 sc/source/ui/optdlg/calcoptionsdlg.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3dd8abf895611d00220da40ed6fa1dbabe8f3a31
Author: Kohei Yoshida 
Date:   Mon Jul 23 21:32:47 2012 -0400

More helpful description for this option.

Change-Id: Ib9399719d3d055c98108811cfb29dfd6f6dd9095

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.src 
b/sc/source/ui/optdlg/calcoptionsdlg.src
index 235ec0e..4c53229 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.src
+++ b/sc/source/ui/optdlg/calcoptionsdlg.src
@@ -125,7 +125,7 @@ ModalDialog RID_SCDLG_FORMULA_CALCOPTIONS
 
 String STR_EMPTY_STRING_AS_ZERO_DESC
 {
-Text [ en-US ] = "Blah.";
+Text [ en-US ] = "This option determines whether or not an empty 
string is to be treated as having a value of zero when used in arithmetic.";
 };
 
 String STR_TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/calc-empty-string-config' - 5 commits - officecfg/registry sc/source

[Kohei Yoshida]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 +++
 sc/source/core/tool/formulaopt.cxx   |   33 +++
 sc/source/core/tool/interpr4.cxx |   29 +++--
 sc/source/ui/optdlg/calcoptionsdlg.cxx   |3 -
 sc/source/ui/optdlg/calcoptionsdlg.hxx   |2 
 5 files changed, 54 insertions(+), 21 deletions(-)

New commits:
commit 1a37fe6ac99b8520ee2f47dfcb0d8eadcfbe6802
Author: Kohei Yoshida 
Date:   Mon Jul 23 21:17:53 2012 -0400

Unused parameter.

Change-Id: Ie76561a2c8e5d6a8613e948620503f42ad73a207

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 3b1f8da..69bd2a8 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -312,7 +312,7 @@ IMPL_LINK(ScCalcOptionsDialog, SettingsSelHdl, Control*, 
pCtrl)
 return 0;
 }
 
-IMPL_LINK(ScCalcOptionsDialog, BtnToggleHdl, RadioButton*, pBtn)
+IMPL_LINK_NOARG(ScCalcOptionsDialog, BtnToggleHdl)
 {
 RadioValueChanged();
 return 0;
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx 
b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 85a62db..a1a7222 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -43,7 +43,7 @@ public:
 virtual ~ScCalcOptionsDialog();
 
 DECL_LINK( SettingsSelHdl, Control* );
-DECL_LINK( BtnToggleHdl, RadioButton* );
+DECL_LINK( BtnToggleHdl, void* );
 
 const ScCalcConfig& GetConfig() const;
 
commit e439191345627ff2178387e0ebf5938484714192
Author: Kohei Yoshida 
Date:   Mon Jul 23 21:10:50 2012 -0400

Honor the configuration option in the interpreter.

Change-Id: I686d1f3703cbb122e1b3ed010a727163be2e942a

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 566d0b3..c35cdfd 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -243,21 +243,26 @@ double ScInterpreter::ConvertStringToValue( const String& 
rStr )
 SetError( mnStringNoValueError);
 return fValue;
 }
-// The number scanner does not accept empty strings or strings containing
-// only spaces, be on par in these cases with what was accepted in OOo and
-// is in AOO (see also the #else branch below) and convert to 0 to prevent
-// interoperability nightmares.
-if (!rStr.Len())
-return fValue;
-else if (rStr.GetChar(0) == ' ')
+
+if (GetGlobalConfig().mbEmptyStringAsZero)
 {
-const sal_Unicode* p = rStr.GetBuffer() + 1;
-const sal_Unicode* const pStop = p - 1 + rStr.Len();
-while (p < pStop && *p == ' ')
-++p;
-if (p == pStop)
+// The number scanner does not accept empty strings or strings
+// containing only spaces, be on par in these cases with what was
+// accepted in OOo and is in AOO (see also the else branch below) and
+// convert to 0 to prevent interoperability nightmares.
+if (!rStr.Len())
 return fValue;
+else if (rStr.GetChar(0) == ' ')
+{
+const sal_Unicode* p = rStr.GetBuffer() + 1;
+const sal_Unicode* const pStop = p - 1 + rStr.Len();
+while (p < pStop && *p == ' ')
+++p;
+if (p == pStop)
+return fValue;
+}
 }
+
 sal_uInt32 nFIndex = 0;
 if (!pFormatter->IsNumberFormat(rStr, nFIndex, fValue))
 {
commit 06fdef1658f35bf1ef331c592fd58bf59d378e84
Author: Kohei Yoshida 
Date:   Mon Jul 23 21:05:00 2012 -0400

Let's not forget to set the description for this option.

Change-Id: I9441ef145b62b84c1b4b8dd6ce85d6c0744f3103

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 4fdffb8..3b1f8da 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -214,6 +214,7 @@ void ScCalcOptionsDialog::SelectionChanged()
 maBtnTrue.Check(false);
 maBtnFalse.Check(true);
 }
+maFtAnnotation.SetText(maDescEmptyStringAsZero);
 }
 break;
 default:
commit 3bc73056876b0554f83a08353817f4f1a484f81f
Author: Kohei Yoshida 
Date:   Mon Jul 23 21:02:46 2012 -0400

Handle saving to and loading from user configuration.

Change-Id: I81730077322b8890726da4d033f034c1266afa76

diff --git a/sc/source/core/tool/formulaopt.cxx 
b/sc/source/core/tool/formulaopt.cxx
index d3d4e89..b5989ad 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -207,13 +207,14 @@ SfxPoolItem* ScTpFormulaItem::Clone( SfxItemPool * ) const
 
 #define CFGPATH_FORMULA   "Office.Calc/Formula"
 
-#define SCFORMULAOPT_GRAMMAR   0
-#define SCFORMULAOPT_ENGLISH_FUNCNAME  1
-#define SCFORMULAOPT_SEP_ARG   2
-#define SCFORMULAOPT_SEP_ARRAY_ROW 3
-#define SCFORMULAO

[Libreoffice-commits] .: basctl/source

[Takeshi Abe]

 basctl/source/basicide/baside2.cxx  |4 ++--
 basctl/source/basicide/baside2.hxx  |2 +-
 basctl/source/basicide/baside2b.cxx |4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 7727f93d7dca7ebffc7bcf3ef82cbefca8599eee
Author: Takeshi Abe 
Date:   Mon Jul 23 19:00:41 2012 +0900

Remove unused argument

Change-Id: Ida75dce28b876abf4aec8dcae8ad60ba89063b59

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 696d603..dc0f182 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -268,7 +268,7 @@ void ModulWindow::CheckCompileBasic()
 if( bModified )
 {
 AssertValidEditEngine();
-GetEditorWindow().SetSourceInBasic( false );
+GetEditorWindow().SetSourceInBasic();
 }
 
 sal_Bool bWasModified = GetBasic()->IsModified();
@@ -836,7 +836,7 @@ void ModulWindow::StoreData()
 // StoreData is called when the BasicManager is destroyed or
 // this window is closed.
 // => interrupts undesired!
-GetEditorWindow().SetSourceInBasic( true );
+GetEditorWindow().SetSourceInBasic();
 }
 
 bool ModulWindow::CanClose()
diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 7a15c45..5e3a06c 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -161,7 +161,7 @@ public:
 { pModulWindow = pWin; }
 
 voidForceSyntaxTimeout();
-boolSetSourceInBasic( bool bQuiet = true );
+boolSetSourceInBasic();
 
 boolCanModify() { return ImpCanModify(); }
 };
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 4fbd360..c5b09d7 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -500,10 +500,8 @@ void EditorWindow::LoseFocus()
 Window::LoseFocus();
 }
 
-bool EditorWindow::SetSourceInBasic( bool bQuiet )
+bool EditorWindow::SetSourceInBasic()
 {
-(void)bQuiet;
-
 bool bChanged = false;
 if ( pEditEngine && pEditEngine->IsModified()
 && !GetEditView()->IsReadOnly() )   // Added for #i60626, otherwise
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: License statement

[Jean-Tiare LE BIGOT]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

"All my contributions, past and future, to LibreOffice are licensed
under the terms of the MPL1.1+ / GPLv3+ / LGPLv3+"


- -- 
Jean-Tiare
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJQDeKIAAoJENsOhxLjiWV2y3MH/jLkv9CGggy0vQ1kjlDzsc2k
HgveLr4YqCAgxADgCTV0NCThMrauGb7VsBnRJYOdxapkaGRUbPQU403+AZbf19Y2
zFb3dfWcowv/nCmeXBEJ/RkIl2IglMc2mmGCId1rkBnMCP9gU8+fMdTY1E4u/LTG
ZK/Ds1VJreDowFuQ1M1vklJcVD+yriu07V7/65bAScl5dwUUl9TYyIaBiZFmR4gG
D3XjatgKTRB09H4j4He+wmiu+entKa9TkBvQknC+2Jjrnyd5Sd6tvT8B4qgoFFpL
aCgGSbfzU5rCQban6aAqQhr/+Q5+Qt3jxXd5tO6dDxgsSHg3k2bE27o5Gc9RxbM=
=QoIv
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Changing sort order of language list box

[Arno Teigseth]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Figured out how to break my LO's language list box, so that it would
only show languages with installed checkers:

http://imgbin.org/index.php?page=image&id=8868

But, what I'm after is sorting the listbox by
1) Languages with Installed checkers then
2) Languages without

Now, I can't find where in the listbox control source the actual
sorting takes place? Any hints?

best
Arno
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlAN21wACgkQEMIGVCc8BjCIygCdFbzBKClAe+GUvCtrGObLNhHv
YxwAnjAIJJwny55t32IBPakcaQrAzVaM
=mHpi
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[GSoC] testing - Weekly Report no. 9

[Artur Dorda]

Hello,

This week I have started extending tests for Word format import in
sw/qa/extras/{rtf,ooxml,ww8}tok.
The reconnaissance in the new part of code have taken a while, but
fortunately I have managed to make one test working.

Now work is in progress to make it working for all three of them (rtf,
ooxm and ww8).

Best regards,
Artur
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] StarMath: fixing context menu entry for arccot function

[jumbo444]

Hello,

There is a 'c' missing in the context menu for arccot function. Here's a
small patch to fix it.

Laurent BP

http://nabble.documentfoundation.org/file/n3997268/0001-Correction-of-context-menu-entry-for-Math-arccot-fun.patch
0001-Correction-of-context-menu-entry-for-Math-arccot-fun.patch 



-
LibreOffice 3.5.5
--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-StarMath-fixing-context-menu-entry-for-arccot-function-tp3997268.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

libreoffice@lists.freedesktop.org

[Caolán McNamara]

On Tue, 2012-07-17 at 14:22 +0200, David Tardon wrote:
> Hi all,
> 
> commit b480f91968a3df16a655585fba494425aea725dc fixes a bug in Draw
> where a connector cannot be selected again after drag&drop (well, it can
> be, if you only try to click on the part of the line that is inside the
> original bound rectangle). The problem is (as the previous sentence
> suggests) the bound rectangle is not changed after drop.

Seems reasonable, and apparently safe. I wonder if this has always been
broken (?) or if something else trigger it, anyway... pushed to 3-5 and
3-6. Two more acks required for 3-6-0 I believe.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svx/source

[Caolán McNamara]

 svx/source/svdraw/svdoedge.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 85938bedc9aaee91e20794c94aa8d7665273b21f
Author: David Tardon 
Date:   Tue Jul 17 13:53:49 2012 +0200

fdo#44534 invalidate bound rect after drag&drop

Change-Id: Ie3319870ae26e9e2cac32641a33be62e4e020c02
(cherry picked from commit b480f91968a3df16a655585fba494425aea725dc)

Signed-off-by: Caolán McNamara 

diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 1e47375..6ed81c1 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1921,6 +1921,8 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
 ImpSetEdgeInfoToAttr();
 bEdgeTrackUserDefined = false;
 
+SetRectsDirty();
+
 if(bOriginalEdgeModified && rDragStat.GetView())
 {
 // hide connect marker helper again when original gets changed.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/source

[Caolán McNamara]

 svx/source/svdraw/svdoedge.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c5eb88ff59e1e8c54814c276c8dccf74bf892cd9
Author: David Tardon 
Date:   Tue Jul 17 13:53:49 2012 +0200

fdo#44534 invalidate bound rect after drag&drop

Change-Id: Ie3319870ae26e9e2cac32641a33be62e4e020c02
(cherry picked from commit b480f91968a3df16a655585fba494425aea725dc)

Signed-off-by: Caolán McNamara 

diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 4312ae4..ddfd82d 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1919,6 +1919,8 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
 ImpSetEdgeInfoToAttr();
 bEdgeTrackUserDefined = false;
 
+SetRectsDirty();
+
 if(bOriginalEdgeModified && rDragStat.GetView())
 {
 // hide connect marker helper again when original gets changed.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/calc-empty-string-config' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/formulaopt.hxx  |8 +---
 sc/source/core/tool/formulaopt.cxx |   14 +++---
 sc/source/ui/docshell/docsh6.cxx   |4 +---
 sc/source/ui/optdlg/tpformula.cxx  |6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit a4c0a7c0abe44e782e7ec6459bab3f1e524c6d05
Author: Kohei Yoshida 
Date:   Mon Jul 23 18:10:08 2012 -0400

Using ScCalcConfig throughout saves quite a bit of code.

Change-Id: I697b03d603a99cdb58c31d78447bbed10230311e

diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index 5ca55a3..7cc2dd8 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -35,13 +35,14 @@
 #include "formula/grammar.hxx"
 #include "scdllapi.h"
 #include "global.hxx"
+#include "calcconfig.hxx"
 
 class SC_DLLPUBLIC ScFormulaOptions
 {
 private:
 bool bUseEnglishFuncName; // use English function name even if the 
locale is not English.
 formula::FormulaGrammar::Grammar eFormulaGrammar;  // formula grammar used 
to switch different formula syntax
-formula::FormulaGrammar::AddressConvention eStringRefSyntax;
+ScCalcConfig aCalcConfig;
 
 ::rtl::OUString aFormulaSepArg;
 ::rtl::OUString aFormulaSepArrayRow;
@@ -57,8 +58,9 @@ public:
 void SetFormulaSyntax( ::formula::FormulaGrammar::Grammar eGram ) { 
eFormulaGrammar = eGram; }
 ::formula::FormulaGrammar::Grammar GetFormulaSyntax() const { return 
eFormulaGrammar; }
 
-void SetStringRefAddressSyntax(formula::FormulaGrammar::AddressConvention 
eConv) { eStringRefSyntax = eConv; }
-formula::FormulaGrammar::AddressConvention GetStringRefAddressSyntax() 
const { return eStringRefSyntax; }
+ScCalcConfig& GetCalcConfig() { return aCalcConfig; }
+const ScCalcConfig& GetCalcConfig() const { return aCalcConfig; }
+void SetCalcConfig(const ScCalcConfig& rConfig) { aCalcConfig = rConfig; }
 
 void SetUseEnglishFuncName( bool bVal ) { bUseEnglishFuncName = bVal; }
 bool GetUseEnglishFuncName() const { return bUseEnglishFuncName; }
diff --git a/sc/source/core/tool/formulaopt.cxx 
b/sc/source/core/tool/formulaopt.cxx
index 7cb1687..d3d4e89 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -55,7 +55,7 @@ ScFormulaOptions::ScFormulaOptions()
 ScFormulaOptions::ScFormulaOptions( const ScFormulaOptions& rCpy ) :
 bUseEnglishFuncName ( rCpy.bUseEnglishFuncName ),
 eFormulaGrammar ( rCpy.eFormulaGrammar ),
-eStringRefSyntax(rCpy.eStringRefSyntax),
+aCalcConfig(rCpy.aCalcConfig),
 aFormulaSepArg  ( rCpy.aFormulaSepArg ),
 aFormulaSepArrayRow ( rCpy.aFormulaSepArrayRow ),
 aFormulaSepArrayCol ( rCpy.aFormulaSepArrayCol )
@@ -72,7 +72,7 @@ void ScFormulaOptions::SetDefaults()
 eFormulaGrammar = ::formula::FormulaGrammar::GRAM_NATIVE;
 
 // unspecified means use the current formula syntax.
-eStringRefSyntax = formula::FormulaGrammar::CONV_UNSPECIFIED;
+aCalcConfig.reset();
 
 ResetFormulaSeparators();
 }
@@ -144,7 +144,7 @@ ScFormulaOptions& ScFormulaOptions::operator=( const 
ScFormulaOptions& rCpy )
 {
 bUseEnglishFuncName = rCpy.bUseEnglishFuncName;
 eFormulaGrammar = rCpy.eFormulaGrammar;
-eStringRefSyntax = rCpy.eStringRefSyntax;
+aCalcConfig = rCpy.aCalcConfig;
 aFormulaSepArg  = rCpy.aFormulaSepArg;
 aFormulaSepArrayRow = rCpy.aFormulaSepArrayRow;
 aFormulaSepArrayCol = rCpy.aFormulaSepArrayCol;
@@ -155,7 +155,7 @@ bool ScFormulaOptions::operator==( const ScFormulaOptions& 
rOpt ) const
 {
 return bUseEnglishFuncName == rOpt.bUseEnglishFuncName
 && eFormulaGrammar == rOpt.eFormulaGrammar
-&& eStringRefSyntax == rOpt.eStringRefSyntax
+&& aCalcConfig == rOpt.aCalcConfig
 && aFormulaSepArg  == rOpt.aFormulaSepArg
 && aFormulaSepArrayRow == rOpt.aFormulaSepArrayRow
 && aFormulaSepArrayCol == rOpt.aFormulaSepArrayCol;
@@ -311,7 +311,7 @@ ScFormulaCfg::ScFormulaCfg() :
 case SCFORMULAOPT_STRING_REF_SYNTAX:
 {
 // Get default value in case this option is not set.
-::formula::FormulaGrammar::AddressConvention eConv = 
GetStringRefAddressSyntax();
+::formula::FormulaGrammar::AddressConvention eConv = 
GetCalcConfig().meStringRefAddressSyntax;
 
 do
 {
@@ -338,7 +338,7 @@ ScFormulaCfg::ScFormulaCfg() :
 }
 }
 while (false);
-SetStringRefAddressSyntax(eConv);
+GetCalcConfig().meStringRefAddressSyntax = eConv;
 }
 break;
 }
@@ -387,7 +387,7 @@ void ScFormulaCfg::Commit()
 case SCFORMULAOPT_STRING_REF_SYNTAX:
 {
 sal_Int32 nVal = -1;
-switch (GetStringRefAddressSyntax())
+switch (GetCalcConfig().meStringRefAd

[Libreoffice-commits] Changes to 'feature/calc-empty-string-config'

[Kohei Yoshida]

New branch 'feature/calc-empty-string-config' available with the following 
commits:
commit 972064f5d10ba1decaed5dfb1b115b846b5a89f6
Author: Kohei Yoshida 
Date:   Mon Jul 23 17:49:03 2012 -0400

Add new formula config option in the UI for "treat empty string as zero."

Change-Id: I116857ee8b377c80707efbc76fcfa06c3e46201d

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/calc-empty-string-config' - 0 commits -

[Kohei Yoshida]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: libo_git_from_tar.sh: use curl if wget is not found

[Riccardo Magliocchetti]

Il 23/07/2012 20:33, Norbert Thiebaud ha scritto:

On Mon, Jul 23, 2012 at 1:20 PM, Riccardo Magliocchetti
  wrote:

Hello,

tried libo_git_from_tar.sh on mac os x and failed because of missing wget,
since we have curl which should do it let's try tp use it.

This has been lightly tested, read: i've verified that the both on linux and
on mac os x it starts downloading. It is still running on mac os x and
tomorrow will know if it worked fine. Anyway the patch looks simple enough
to be correct.

Please review.


@@ -77,6 +77,22 @@ shift
  }

  ###
+# Wrapper for curl / wget
+#
+download()
+{
+if command -v wget; then
+wget -c $1 -P $2
+else
+if command -v curl; then
+curl -C --create-dirs $1 -o $2/$(basename $1)
+exit 1<--- that looks wrong !!


indeed, proper patch attached.

thanks,
riccardo
>From ed7323c335d2ee7380edb02db37610cf74a869c7 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti 
Date: Mon, 23 Jul 2012 20:14:27 +0200
Subject: [PATCH] Use curl if available in libo_git_from_tar

This helps on MacOS X

Signed-off-by: Riccardo Magliocchetti 
---
 libo_git_from_tar.sh |   21 ++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/libo_git_from_tar.sh b/libo_git_from_tar.sh
index bc086ad..81f03f8 100755
--- a/libo_git_from_tar.sh
+++ b/libo_git_from_tar.sh
@@ -55,7 +55,7 @@ usage()
 #
 sanity_check()
 {
-which wget > /dev/null 2>&1 || die "This script need wget in the PATH to function"
+which wget > /dev/null 2>&1 || which curl > /dev/null 2>&1 || die "This script need wget or curl in the PATH to function"
 which tar > /dev/null 2>&1 || die "This script need tar in the PATH to function"
 which bzip2 > /dev/null 2>&1 || die "This script need bzips in the PATH to function"
 }
@@ -77,6 +77,21 @@ shift
 }
 
 ###
+# Wrapper for curl / wget
+#
+download()
+{
+if command -v wget; then
+wget -c $1 -P $2
+else
+if command -v curl; then
+curl -C --create-dirs $1 -o $2/$(basename $1)
+fi
+fi
+}
+
+
+###
 # Create the links, if needed, in the core repo for a given child repos
 #
 relink()
@@ -109,7 +124,7 @@ process_child_repo()
 local repo="$1"
 
 if ! $resume ; then do_action "Remove old copy of $repo tar.bz2 file, if any" "removing ${temp_dir}/libreoffice-$repo.tar.bz2"  rm -f ${temp_dir}/libreoffice-$repo.tar.bz2 ; fi
-do_action "Download the $repo repo tar.bz2 file" "downloading package for the $repo repo" wget -c http://dev-www.libreoffice.org/bundles/libreoffice-$repo.tar.bz2 -P ${temp_dir}
+do_action "Download the $repo repo tar.bz2 file" "downloading package for the $repo repo" download http://dev-www.libreoffice.org/bundles/libreoffice-$repo.tar.bz2 ${temp_dir}
 
 if [ -e ./clone/$repo ] ; then
 do_action "Remove the current $repo repo" "removing ./clone/$repo" rm -fr ./clone/$repo
@@ -176,7 +191,7 @@ fi
 
 if $do_core ; then
 if ! $resume ; then do_action "Remove any old copy of core tar.bz2 file, if any" "removing ${temp_dir}/libreoffice-core.tar.bz2"  rm -f ${temp_dir}/libreoffice-core.tar.bz2 ; fi
-do_action "Download the core repo tar.bz2 file" "downloading package for the core repo" wget -c http://dev-www.libreoffice.org/bundles/libreoffice-core.tar.bz2 -P ${temp_dir}
+do_action "Download the core repo tar.bz2 file" "downloading package for the core repo" download http://dev-www.libreoffice.org/bundles/libreoffice-core.tar.bz2 ${temp_dir}
 do_action "" "cannot create the directory ${core_path}" mkdir ${core_path?}
 do_action "" "cannot cd to ${core_path?}" pushd ${core_path?} > /dev/null
 do_action "Unpack the core repo tar.bz2 file to ${core_path}" "unpacking the core tar.bz2 file" tar --strip-components=1 -xf ${temp_dir}/libreoffice-core.tar.bz2
-- 
1.7.10.4

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License statement

[Arno Teigseth]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

"All my contributions, past and future, to LibreOffice are licensed
under the terms of the MPL1.1+ / GPLv3+ / LGPLv3+"

best
Arno Teigseth (arnotixe)

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlANuPoACgkQEMIGVCc8BjClIACg2J57PyNO7OMiqecZstXx/WTd
mOIAn1pTEL12YZ3qyV1h3IF8pSX3L8mF
=rK8e
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH][PUSHED] Fixing multiple email attachments with thunderbird on linux

[Caolán McNamara]

On Sat, 2012-07-21 at 22:08 -0500, Arno Teigseth wrote:
> This fixes an issue with thunderbird on linux:
> 
> When using XSimpleMailMessage and attaching more than one attachment,
> thunderbird picked up just one of the attached files.
> 
> Reason was that the file:// part should be enclosed in 's. 

Pushed now, thanks for this.

I don't see you listed at
http://wiki.documentfoundation.org/Development/Developers yet (?). Could
we get a statement that this patch (and/or all potential patches) are
under our preferred LGPLv3+/MPL license combo ?, i.e. send a mail (or
follow up to this one) with the statement and add yourself to the wiki
with a link to the mailing list archive.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: shell/source

[Caolán McNamara]

 shell/source/unix/misc/senddoc.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8cdd150a0aae3ec3b2829ad6c45da5cb58f1bcc3
Author: Arno Teigseth 
Date:   Sat Jul 21 21:58:41 2012 -0500

Fixed multiple attachment passing to thunderbird: file:// part needs 's

Change-Id: I365e559610e06c6ffe964121b3c45077bf6ca264

diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index f75e51d..2a4c414 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -112,7 +112,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 COMMAND=${COMMAND:-}${COMMAND:+,}body=${BODY}
 fi
 if [ "$ATTACH" != "" ]; then
-COMMAND=${COMMAND:-}${COMMAND:+,}attachment=${ATTACH}
+COMMAND=${COMMAND:-}${COMMAND:+,}attachment=\'${ATTACH}\'
 fi
 
 run_mozilla "$MAILER" "$COMMAND"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - sc/source tubes/inc tubes/prj tubes/source

[Matus Kukan]

 sc/source/ui/collab/contacts.cxx |2 
 tubes/inc/tubes/conference.hxx   |   53 +--
 tubes/inc/tubes/contact-list.hxx |6 +
 tubes/inc/tubes/manager.hxx  |   18 +
 tubes/prj/build.lst  |2 
 tubes/source/conference.cxx  |  131 ++-
 tubes/source/manager.cxx |   16 ++--
 7 files changed, 116 insertions(+), 112 deletions(-)

New commits:
commit db9630667061789106a5864300ca73d83d04aa73
Author: Matúš Kukan 
Date:   Mon Jul 23 20:48:47 2012 +0200

tubes: do not include telepathy-glib.h in public headers

Change-Id: Ib2c88f2f1fc1c9ebffbbdc9896045c3d1e5b719c

diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index 02240d9..84f73e1 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -39,6 +39,8 @@
 #include 
 #include 
 
+#include 
+
 #define CONTACTS_DLG
 
 #ifdef CONTACTS_DLG
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index a66d65b..fc495e5 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -32,11 +32,14 @@
 #include 
 #include "tubes/tubesdllapi.h"
 #include 
-#include 
 #include 
 
 class TeleManager;
 class TeleConferenceImpl;
+typedef struct _TpAccount TpAccount;
+typedef struct _TpContact TpContact;
+typedef struct _TpDBusTubeChannel TpDBusTubeChannel;
+typedef struct _GDBusConnection GDBusConnection;
 
 /** Conference setup by TeleManager */
 class TeleConference
diff --git a/tubes/inc/tubes/contact-list.hxx b/tubes/inc/tubes/contact-list.hxx
index a17b110..9c48ab7 100644
--- a/tubes/inc/tubes/contact-list.hxx
+++ b/tubes/inc/tubes/contact-list.hxx
@@ -32,10 +32,12 @@
 #include 
 #include 
 
-#include 
-
 #include "tubes/tubesdllapi.h"
 
+typedef struct _TpAccount TpAccount;
+typedef struct _TpContact TpContact;
+typedef struct _TpAccountManager TpAccountManager;
+
 typedef ::std::pair< TpAccount *, TpContact * > AccountContactPair;
 typedef ::std::vector< AccountContactPair > AccountContactPairV;
 
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 8e39e65..a112b61 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 
 // For testing purposes, we might need more in future.
 #define LIBO_TUBES_DBUS_INTERFACE "org.libreoffice.calc"
@@ -46,6 +45,10 @@
 
 namespace osl { class Mutex; }
 class TeleManagerImpl;
+typedef struct _TpAccount TpAccount;
+typedef struct _TpContact TpContact;
+typedef struct _GMainLoop GMainLoop;
+typedef struct _GMainContext GMainContext;
 
 /** Interface to Telepathy DBus Tubes.
 
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
index a2fafd2..d28ffc3 100644
--- a/tubes/source/conference.cxx
+++ b/tubes/source/conference.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 #if defined SAL_LOG_INFO
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 4abed6b..d16422d 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -39,6 +39,8 @@
 #include 
 #include 
 #include 
+
+#include 
 #include 
 
 namespace css = ::com::sun::star;
commit abeb02c02d6d2cf5ac48d75b04563d3376d71677
Author: Matúš Kukan 
Date:   Mon Jul 23 19:50:19 2012 +0200

tubes: create TeleConferenceImpl to hide more details from public

Change-Id: If1be001e336991218893e3bc455a16e73ecaab0f

diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index 8954457..a66d65b 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -33,10 +33,10 @@
 #include "tubes/tubesdllapi.h"
 #include 
 #include 
-#include 
 #include 
 
 class TeleManager;
+class TeleConferenceImpl;
 
 /** Conference setup by TeleManager */
 class TeleConference
@@ -52,17 +52,11 @@ public:
 /// Unrefs, unregisters from manager and calls dtor if last reference!
 voidfinalize();
 
-TeleManager*getManager() const  { return mpManager; }
-
 TUBES_DLLPUBLIC boolsendPacket( const OString& rPacket );
 
 /** Pop a received packet. */
 boolpopPacket( OString& rPacket );
 
-/** Queue incoming data as OString */
-voidqueue( const char* pPacket, int nSize );
-voidqueue( const OString& rPacket );
-
 TUBES_DLLPUBLIC voidinvite( TpContact *pContact );
 
 /** Emitted when a packet is received. */
@@ -71,37 +65,36 @@ public:
 typedef void  (*FileSentCallback)( bool aSuccess, void* pUserData);
 TUBES_DLLPUBLIC voidsendFile( rtl::OUString &localUri, 
FileSentCallback pCallback, void* pUserData);
 TUBES_DLLPUBLIC const OString& getUuid() const { return msUuid; }
-voidsetUuid( const OString& rUuid ) { msUuid = rUuid; }
 
 // --- following only to be called only by manager's callbacks ---
 // TODO: make frien

Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #9

[Marco Cecchetti]

On Mon, 23 Jul 2012 16:53:51 +0200, Thorsten Behrens  
 wrote:



Marco Cecchetti wrote:

A survey on the state of svg text support
link:
https://docs.google.com/document/d/1hc-0Jh78PiVgn7vT9VRlhv9wlwkBCBqE2bN7v4Ogmhk/edit?pli=1#


Hi Marco,

nice research & writeup - I wonder if some distilled version of that
would be possible as a README in filter/source/svg - always good to
preserve rationale for later hackers looking at the code. ;)


No problem, what about filing a bug ?


Given the contraints, I agree with your conclusion, but would like
to ask you to make the choice between absolute glyph positions (and
native font runs) configurable (can be a hidden config item or
somesuch). Since it's a rather nasty tradeoff, for high-fidelity
presentations, given my past experience, people would probably
prefer exactly-rendered text ...


Yep, I agree.


Cheers,
-- Marco




--
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: cui/source

[Michael Meeks]

 cui/source/options/optcolor.cxx |   26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

New commits:
commit 7ba03350e8392f1b7de7cf0258ab5b45c63483e4
Author: Michael Meeks 
Date:   Mon Jul 23 19:48:37 2012 +0100

attempt to fix compile by avoiding make_shared.

Change-Id: Id34b1cca10108334533eb900f5a1cf03c93fb0f4

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 5c90b65..ece061a 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -36,7 +36,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -464,15 +463,15 @@ ColorConfigWindow_Impl::Entry::Entry (
 // has checkbox?
 if (vEntryInfo[iEntry].bCheckBox)
 {
-pText = boost::make_shared(
+pText = boost::shared_ptr( new CheckBox (
 &rParent, ResId(vEntryInfo[iEntry].nTextResId, rResMgr)
-);
+) );
 }
 else
 {
-pText = boost::make_shared(
+pText = boost::shared_ptr( new FixedText (
 &rParent, ResId(vEntryInfo[iEntry].nTextResId, rResMgr)
-);
+) );
 }
 }
 
@@ -481,7 +480,7 @@ ColorConfigWindow_Impl::Entry::Entry (
 Window& rParent, ResMgr& rResMgr,
 unsigned nYPos, ExtendedColorConfigValue const& aColorEntry
 ) :
-pText(boost::make_shared(&rParent, ResId(FT_BASICERROR, 
rResMgr))),
+pText(boost::shared_ptr(new FixedText (&rParent, 
ResId(FT_BASICERROR, rResMgr,
 aColorList(&rParent, ResId(LB_BASICERROR, rResMgr)),
 aPreview(&rParent, ResId(WN_BASICERROR, rResMgr)),
 aDefaultColor(aColorEntry.getDefaultColor())
@@ -692,15 +691,14 @@ void ColorConfigWindow_Impl::CreateEntries (ResMgr& 
rResMgr)
 vChapters.reserve(nGroupCount);
 for (unsigned i = 0; i != nGroupCount; ++i)
 {
-vChapters.push_back(boost::make_shared(
-*this, static_cast(i), rResMgr
-));
+vChapters.push_back(boost::shared_ptr (
+new Chapter( *this, static_cast(i), rResMgr ) ) );
 }
 
 // creating entries
 vEntries.reserve(ColorConfigEntryCount);
 for (unsigned i = 0; i != ColorConfigEntryCount; ++i)
-vEntries.push_back(boost::make_shared(*this, i, rResMgr));
+vEntries.push_back( boost::shared_ptr(new Entry (*this, i, 
rResMgr) ) );
 
 // calculate heights of groups which can be hidden
 {
@@ -722,19 +720,19 @@ void ColorConfigWindow_Impl::CreateEntries (ResMgr& 
rResMgr)
 for (unsigned j = 0; j != nExtGroupCount; ++j)
 {
 rtl::OUString const sComponentName = 
aExtConfig.GetComponentName(j);
-vChapters.push_back(boost::make_shared(
+vChapters.push_back(boost::shared_ptr(new Chapter (
 *this, rResMgr, nLineNum * LINE_HEIGHT,
 aExtConfig.GetComponentDisplayName(sComponentName)
-));
+)));
 ++nLineNum;
 unsigned nColorCount = 
aExtConfig.GetComponentColorCount(sComponentName);
 for (unsigned i = 0; i != nColorCount; ++i)
 {
 ExtendedColorConfigValue const aColorEntry =
 aExtConfig.GetComponentColorConfigValue(sComponentName, i);
-vEntries.push_back(boost::make_shared(
+vEntries.push_back(boost::shared_ptr( new Entry (
 *this, rResMgr, nLineNum * LINE_HEIGHT, aColorEntry
-));
+)));
 ++nLineNum;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Need help to locate HSQLDB in Base

[Muhammad Waqas Iftikhar]

Me and my friends are trying to work on to embedd SQLite under base instead
of hsqldb. For that we are trying to understand how BASE works with HSQLDB
for now. We've been debugging Libreoffice for a while now. In our search
for code relating to HSQLDB, we've gone through the code in the "load"
function of "dbloader2.cxx" found in the "source/filter/xml" directory
under the "dbaccess" module as well as the code in "connection.cxx" file
found in the "source/code/dataaccess" folder, also under the "dbaccess"
module. We've seen how the wizards and the windows for Base are initialized
and then displayed and how the connection is established when the tables
are to be accessed. However, we haven't been able to locate the portion of
code that actually initializes HSQLDB. Please give us an idea of how to
proceed further.

-- 
Regards Waqas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: libo_git_from_tar.sh: use curl if wget is not found

[Norbert Thiebaud]

On Mon, Jul 23, 2012 at 1:20 PM, Riccardo Magliocchetti
 wrote:
> Hello,
>
> tried libo_git_from_tar.sh on mac os x and failed because of missing wget,
> since we have curl which should do it let's try tp use it.
>
> This has been lightly tested, read: i've verified that the both on linux and
> on mac os x it starts downloading. It is still running on mac os x and
> tomorrow will know if it worked fine. Anyway the patch looks simple enough
> to be correct.
>
> Please review.

@@ -77,6 +77,22 @@ shift
 }

 ###
+# Wrapper for curl / wget
+#
+download()
+{
+if command -v wget; then
+wget -c $1 -P $2
+else
+if command -v curl; then
+curl -C --create-dirs $1 -o $2/$(basename $1)
+exit 1  <--- that looks wrong !!
+fi
+fi
+}
+
+

>
> thanks,
> riccardo
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED]] fdo#48549 System::Beep() removal

[Stephan Bergmann]

On 07/23/2012 04:24 PM, Michael Meeks wrote:

I did a little cleanup and it works nicely; in addition - people get
upset about warnings breaking their build - so a warning-free
compilation is rather a bonus.


But please see 
 
(fourth item) for how to fix such warnings.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - basctl/source sc/source

[Stephan Bergmann]

 basctl/source/basicide/baside2b.cxx |   26 +++---
 sc/source/ui/docshell/olinefun.cxx  |3 +--
 sc/source/ui/inc/olinefun.hxx   |2 +-
 sc/source/ui/unoobj/cellsuno.cxx|2 +-
 sc/source/ui/view/dbfunc3.cxx   |2 +-
 5 files changed, 7 insertions(+), 28 deletions(-)

New commits:
commit f9d86d0bc2dd1c2b93f1de47379e65be0a1eaf42
Author: Stephan Bergmann 
Date:   Mon Jul 23 20:23:05 2012 +0200

Some clean-up

Change-Id: Ib515db3b5e3bc77a397d24ed7ec1ed446f2998a2

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 3682d72..4fbd360 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1967,46 +1967,26 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* 
pEntry, const rtl::OUString
 
 sal_Bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const 
String& rResult )
 {
-WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
-String aVName( pItem->maName );
-
-sal_Bool bError = sal_False;
-String aResult( rResult );
-String aIndex;
 bool bArrayElement;
 SbxBase* pSBX = ImplGetSBXForEntry( pEntry, bArrayElement );
 
-SbxBase* pToBeChanged = NULL;
 if ( pSBX && pSBX->ISA( SbxVariable ) && !pSBX->ISA( SbxMethod ) )
 {
 SbxVariable* pVar = (SbxVariable*)pSBX;
 SbxDataType eType = pVar->GetType();
-if ( (sal_uInt8)eType == (sal_uInt8)SbxOBJECT )
-bError = sal_True;
-else if ( eType & SbxARRAY )
-bError = sal_True;
-else
-pToBeChanged = pSBX;
-}
-
-if ( pToBeChanged )
-{
-if ( pToBeChanged->ISA( SbxVariable ) )
+if ( (sal_uInt8)eType != (sal_uInt8)SbxOBJECT
+ && ( eType & SbxARRAY ) == 0 )
 {
 // If the type is variable, the conversion of the SBX does not 
matter,
 // else the string is converted.
-((SbxVariable*)pToBeChanged)->PutStringExt( aResult );
+pVar->PutStringExt( rResult );
 }
-else
-bError = sal_True;
 }
 
 if ( SbxBase::IsError() )
 {
-bError = sal_True;
 SbxBase::ResetError();
 }
-(void)bError; // used to Beep.
 
 UpdateWatches();
 
commit 55c390d526a1877bc5370d94338b9ebd75a9f3da
Author: Stephan Bergmann 
Date:   Mon Jul 23 20:22:43 2012 +0200

Properly fix -Werror=unused-parameter

Change-Id: Ia526b347e977836226bdac2b9741fa95e38e9788

diff --git a/sc/source/ui/docshell/olinefun.cxx 
b/sc/source/ui/docshell/olinefun.cxx
index 223eb2d..54f1d7c 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -442,9 +442,8 @@ sal_Bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, 
sal_Bool bColumns, sal_uInt1
 
 //
 
-sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool 
bRecord, sal_Bool bApi )
+sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool 
bRecord )
 {
-(void)bApi;
 sal_Bool bDone = false;
 
 SCCOL nStartCol = rRange.aStart.Col();
diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx
index 2dee30c..c32ecab 100644
--- a/sc/source/ui/inc/olinefun.hxx
+++ b/sc/source/ui/inc/olinefun.hxx
@@ -45,7 +45,7 @@ public:
 sal_BoolSelectLevel( SCTAB nTab, sal_Bool bColumns, sal_uInt16 
nLevel,
 sal_Bool bRecord, sal_Bool bPaint, 
sal_Bool bApi );
 
-sal_BoolShowMarkedOutlines( const ScRange& rRange, sal_Bool 
bRecord, sal_Bool bApi );
+sal_BoolShowMarkedOutlines( const ScRange& rRange, sal_Bool 
bRecord );
 sal_BoolHideMarkedOutlines( const ScRange& rRange, sal_Bool 
bRecord, sal_Bool bApi );
 
 sal_BoolShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt16 
nLevel, sal_uInt16 nEntry,
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index b880f23..d98d0a3 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7961,7 +7961,7 @@ void SAL_CALL ScTableSheetObj::showDetail( const 
table::CellRangeAddress& rCellR
 ScRange aMarkRange;
 ScUnoConversion::FillScRange( aMarkRange, rCellRange );
 ScOutlineDocFunc aFunc(*pDocSh);
-aFunc.ShowMarkedOutlines( aMarkRange, sal_True, sal_True );
+aFunc.ShowMarkedOutlines( aMarkRange, sal_True );
 }
 }
 
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index cf7d96a..9882a40 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -351,7 +351,7 @@ void ScDBFunc::ShowMarkedOutlines( sal_Bool bRecord )
 {
 ScDocShell* pDocSh = GetViewData()->GetDocShell();
 ScOutlineDocFunc aFunc(*pDocSh);
-sal_Bool bDone = aFunc.ShowMarkedOutlines( aRange, bRecord, false );
+sal_Bool bDone = aFunc

libo_git_from_tar.sh: use curl if wget is not found

[Riccardo Magliocchetti]

Hello,

tried libo_git_from_tar.sh on mac os x and failed because of missing 
wget, since we have curl which should do it let's try tp use it.


This has been lightly tested, read: i've verified that the both on linux 
and on mac os x it starts downloading. It is still running on mac os x 
and tomorrow will know if it worked fine. Anyway the patch looks simple 
enough to be correct.


Please review.

thanks,
riccardo
>From ccbe3e4e0a28e2b8587daa1c4ad6732e9c608286 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti 
Date: Mon, 23 Jul 2012 20:14:27 +0200
Subject: [PATCH] Use curl if available in libo_git_from_tar


Signed-off-by: Riccardo Magliocchetti 
---
 libo_git_from_tar.sh |   22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/libo_git_from_tar.sh b/libo_git_from_tar.sh
index bc086ad..2850c68 100755
--- a/libo_git_from_tar.sh
+++ b/libo_git_from_tar.sh
@@ -55,7 +55,7 @@ usage()
 #
 sanity_check()
 {
-which wget > /dev/null 2>&1 || die "This script need wget in the PATH to function"
+which wget > /dev/null 2>&1 || which curl > /dev/null 2>&1 || die "This script need wget or curl in the PATH to function"
 which tar > /dev/null 2>&1 || die "This script need tar in the PATH to function"
 which bzip2 > /dev/null 2>&1 || die "This script need bzips in the PATH to function"
 }
@@ -77,6 +77,22 @@ shift
 }
 
 ###
+# Wrapper for curl / wget
+#
+download()
+{
+if command -v wget; then
+wget -c $1 -P $2
+else
+if command -v curl; then
+curl -C --create-dirs $1 -o $2/$(basename $1)
+exit 1
+fi
+fi
+}
+
+
+###
 # Create the links, if needed, in the core repo for a given child repos
 #
 relink()
@@ -109,7 +125,7 @@ process_child_repo()
 local repo="$1"
 
 if ! $resume ; then do_action "Remove old copy of $repo tar.bz2 file, if any" "removing ${temp_dir}/libreoffice-$repo.tar.bz2"  rm -f ${temp_dir}/libreoffice-$repo.tar.bz2 ; fi
-do_action "Download the $repo repo tar.bz2 file" "downloading package for the $repo repo" wget -c http://dev-www.libreoffice.org/bundles/libreoffice-$repo.tar.bz2 -P ${temp_dir}
+do_action "Download the $repo repo tar.bz2 file" "downloading package for the $repo repo" download http://dev-www.libreoffice.org/bundles/libreoffice-$repo.tar.bz2 ${temp_dir}
 
 if [ -e ./clone/$repo ] ; then
 do_action "Remove the current $repo repo" "removing ./clone/$repo" rm -fr ./clone/$repo
@@ -176,7 +192,7 @@ fi
 
 if $do_core ; then
 if ! $resume ; then do_action "Remove any old copy of core tar.bz2 file, if any" "removing ${temp_dir}/libreoffice-core.tar.bz2"  rm -f ${temp_dir}/libreoffice-core.tar.bz2 ; fi
-do_action "Download the core repo tar.bz2 file" "downloading package for the core repo" wget -c http://dev-www.libreoffice.org/bundles/libreoffice-core.tar.bz2 -P ${temp_dir}
+do_action "Download the core repo tar.bz2 file" "downloading package for the core repo" download http://dev-www.libreoffice.org/bundles/libreoffice-core.tar.bz2 ${temp_dir}
 do_action "" "cannot create the directory ${core_path}" mkdir ${core_path?}
 do_action "" "cannot cd to ${core_path?}" pushd ${core_path?} > /dev/null
 do_action "Unpack the core repo tar.bz2 file to ${core_path}" "unpacking the core tar.bz2 file" tar --strip-components=1 -xf ${temp_dir}/libreoffice-core.tar.bz2
-- 
1.7.10.4

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/source

[Stephan Bergmann]

 sc/source/ui/docshell/docfunc.cxx |   12 ++--
 sc/source/ui/inc/docfunc.hxx  |4 ++--
 sc/source/ui/undo/undoblk.cxx |2 +-
 sc/source/ui/unoobj/cellsuno.cxx  |2 +-
 sc/source/ui/view/viewfun2.cxx|2 +-
 sc/source/ui/view/viewfun3.cxx|4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 5a639557ae6e0e752e68de8e831fef3166c80a3b
Author: Stephan Bergmann 
Date:   Mon Jul 23 19:34:52 2012 +0200

-Werror=unused-parameter

...and no need for ScDocFunc::UnmergeCells to be virtual---there are no
overrides.

Change-Id: Ifc8083926d7b5cb22bb3a28e6b2cc29658d07ebf

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index f6941a1..16aaed8 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1608,7 +1608,7 @@ sal_Bool ScDocFunc::InsertCells( const ScRange& rRange, 
const ScMarkData* pTabMa
 ScRange aRange( *iIter );
 if( pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED | 
HASATTR_MERGED ) )
 {
-UnmergeCells( aRange, sal_True, sal_True );
+UnmergeCells( aRange, sal_True );
 }
 }
 }
@@ -2016,7 +2016,7 @@ sal_Bool ScDocFunc::DeleteCells( const ScRange& rRange, 
const ScMarkData* pTabMa
 ScRange aRange( *iIter );
 if( pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED | 
HASATTR_MERGED ) )
 {
-UnmergeCells( aRange, sal_True, sal_True );
+UnmergeCells( aRange, sal_True );
 }
 }
 }
@@ -2484,7 +2484,7 @@ sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource, 
const ScAddress& rDestPos
 
 // skipped rows and merged cells don't mix
 if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
-UnmergeCells( aPasteDest, false, sal_True );
+UnmergeCells( aPasteDest, false );
 
 VirtualDevice aVirtDev;
 sal_Bool bDestHeight = AdjustRowHeight(
@@ -4495,17 +4495,17 @@ sal_Bool ScDocFunc::MergeCells( const 
ScCellMergeOption& rOption, sal_Bool bCont
 return sal_True;
 }
 
-sal_Bool ScDocFunc::UnmergeCells( const ScRange& rRange, sal_Bool bRecord, 
sal_Bool bApi )
+sal_Bool ScDocFunc::UnmergeCells( const ScRange& rRange, sal_Bool bRecord )
 {
 ScCellMergeOption aOption(rRange.aStart.Col(), rRange.aStart.Row(), 
rRange.aEnd.Col(), rRange.aEnd.Row());
 SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
 for (SCTAB i = nTab1; i <= nTab2; ++i)
 aOption.maTabs.insert(i);
 
-return UnmergeCells(aOption, bRecord, bApi);
+return UnmergeCells(aOption, bRecord);
 }
 
-bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, sal_Bool 
bRecord, sal_Bool bApi )
+bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, sal_Bool 
bRecord )
 {
 using ::std::set;
 
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index fcf851c..8d87bd9 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -186,8 +186,8 @@ public:
 
 virtual sal_BoolMergeCells( const ScCellMergeOption& rOption, 
sal_Bool bContents,
 sal_Bool bRecord, sal_Bool bApi );
-virtual sal_BoolUnmergeCells( const ScRange& rRange, sal_Bool 
bRecord, sal_Bool bApi );
-virtual boolUnmergeCells( const ScCellMergeOption& rOption, 
sal_Bool bRecord, sal_Bool bApi );
+sal_BoolUnmergeCells( const ScRange& rRange, sal_Bool bRecord );
+boolUnmergeCells( const ScCellMergeOption& rOption, sal_Bool 
bRecord );
 
 virtual boolSetNewRangeNames( ScRangeName* pNewRanges, bool 
bModifyDoc = true, SCTAB nTab = -1 ); // takes ownership of pNewRanges 
//nTab = -1 for local range names
 virtual boolModifyRangeNames( const ScRangeName& rNewRanges, 
SCTAB nTab = -1 );
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index b978a5c..cbab521 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -1346,7 +1346,7 @@ void ScUndoDragDrop::Redo()
 
 // skipped rows and merged cells don't mix
 if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
-pDocShell->GetDocFunc().UnmergeCells( aDestRange, false, sal_True );
+pDocShell->GetDocFunc().UnmergeCells( aDestRange, false );
 
 for (nTab=aDestRange.aStart.Tab(); nTab<=aDestRange.aEnd.Tab(); nTab++)
 {
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 4781941..b880f23 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -5424,7 +5424,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) 
throw(uno::RuntimeExcepti

[GSOC-UPDATE](23.7)

[Andrzej J. R. Hunt]

Hi everyone,

The latest from today:

- Styled the Thumbnail Activity.
- Fixed a bug in the Service, meaning that the thumbnail activity can 
now control the slideshow.
- Refactored the Thumbnail Activity into a Fragment, and created a 
Presentation Activity to hold it and further fragments.
- Started working on the main slideshow view (also a fragment, used in 
the presentation activity):
   -- Implemented the resizing handle/slider to allow resizing of the 
respective portions of the main view.


I've also discovered that someone has already implemented a 3d 
"cover-flow" widget for android, which can probably be used for the main 
view (apache licenced), which will save me having to implement one myself.


(I've also switched to using a 32 bit system on an SSD, which makes 
things noticeably faster, especially when using git.)


Cheers,

Andrzej
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: mdds/makefile.mk mdds/mdds_0.6.0-unreachable-code.patch

[Stephan Bergmann]

 mdds/makefile.mk   |3 ++-
 mdds/mdds_0.6.0-unreachable-code.patch |   10 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 593580f2e5ce4f3c2d234b5ccb5a9371f5424e63
Author: Stephan Bergmann 
Date:   Mon Jul 23 18:58:47 2012 +0200

warning C4702: unreachable code

Change-Id: I37863a76a051566ca97d8de5a5cfe35cf4dc5be0

diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index 5adc83d..e922b92 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -32,7 +32,8 @@ TARFILE_MD5=3e89a35f253a4f1c7de68c57d851ef38
 PATCH_FILES=\
mdds_0.6.0.patch \
0001-help-compiler-select-the-right-overload-of-vector-in.patch \
-mdds_0.6.0-unused-parameter.patch
+mdds_0.6.0-unused-parameter.patch \
+mdds_0.6.0-unreachable-code.patch
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
diff --git a/mdds/mdds_0.6.0-unreachable-code.patch 
b/mdds/mdds_0.6.0-unreachable-code.patch
new file mode 100644
index 000..8bacd2e
--- /dev/null
+++ b/mdds/mdds_0.6.0-unreachable-code.patch
@@ -0,0 +1,10 @@
+--- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl 2012-07-23 
16:20:34.101608964 +0200
 misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl   
2012-07-23 16:19:13.022858991 +0200
+@@ -44,7 +44,6 @@
+ default:
+ throw matrix_error("unknown density type");
+ }
+-return NULL;
+ }
+ 
+ template
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#52223: fix Object Catalog in Basic IDE when resizing

[János Uray]

This patch fixes this bug:
https://bugs.freedesktop.org/show_bug.cgi?id=52223
From ef69583b67ff9f34e615b3595984090515dec501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Uray=20M.=20J=C3=A1nos"?= 
Date: Mon, 23 Jul 2012 18:48:47 +0200
Subject: [PATCH] fdo#52223 fix Object Catalog in Basic IDE when resizing

Change-Id: I96861bfcf7c0da6dd94c50acd673dedb14d15204
---
 basctl/source/basicide/baside2.cxx  |   28 +---
 basctl/source/basicide/baside2.hxx  |2 ++
 basctl/source/basicide/basides1.cxx |   23 ---
 basctl/source/basicide/basidesh.cxx |2 --
 basctl/source/inc/basidesh.hxx  |2 --
 5 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index e419c42..0ece951 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1508,14 +1508,14 @@ void ModulWindowLayout::ArrangeWindows()
 if ( ( nVSplitPos < nMinPos ) || ( nVSplitPos > nMaxPos ) )
 nVSplitPos = ( nVSplitPos < nMinPos ) ? 0 : ( aSz.Height() - SPLIT_HEIGHT );
 
-Size aXEWSz;
-aXEWSz.Width() = aSz.Width() - OBJCAT_PANE_WIDTH;
-
-aXEWSz.Height() = nVSplitPos + 1;
 if ( m_pModulWindow )
 {
 DBG_CHKOBJ( m_pModulWindow, ModulWindow, 0 );
-m_pModulWindow->SetPosSizePixel( Point( OBJCAT_PANE_WIDTH, 0 ), aXEWSz );
+bool const bObjCat = aObjectCatalog.IsVisible();
+m_pModulWindow->SetPosSizePixel(
+Point(bObjCat ? OBJCAT_PANE_WIDTH : 0, 0),
+Size(bObjCat ? aSz.Width() - OBJCAT_PANE_WIDTH : aSz.Width(), nVSplitPos + 1)
+);
 }
 
 aVSplitter.SetDragRectPixel( Rectangle( Point( 0, 0 ), Size( aSz.Width(), aSz.Height() ) ) );
@@ -1540,10 +1540,12 @@ void ModulWindowLayout::ArrangeWindows()
 if ( !aStackWindow.IsFloatingMode() )
 aStackWindow.SetPosSizePixel( aSWPos, aSWSz );
 
-Size aOCSz( OBJCAT_PANE_WIDTH, aSz.Height() - aSWSz.Height() - 3 );
-Point aOCPos( 0, 0 );
 if ( !aObjectCatalog.IsFloatingMode() )
+{
+Size aOCSz( OBJCAT_PANE_WIDTH, aSz.Height() - aSWSz.Height() - 3 );
+Point aOCPos( 0, 0 );
 aObjectCatalog.SetPosSizePixel( aOCPos, aOCSz );
+}
 
 if ( aStackWindow.IsFloatingMode() && aWatchWindow.IsFloatingMode() )
 aHSplitter.Hide();
@@ -1733,4 +1735,16 @@ Image ModulWindowLayout::getImage(sal_uInt16 nId) const
 return m_aImagesNormal.GetImage(nId);
 }
 
+// shows or hides the Object Catalog window (depending on its state)
+void ModulWindowLayout::ToggleObjectCatalog ()
+{
+// show or hide?
+bool const bShow = !aObjectCatalog.IsVisible();
+bShow ? aObjectCatalog.Show() : aObjectCatalog.Hide();
+if (m_pModulWindow)
+m_pModulWindow->SetObjectCatalogDisplay(bShow);
+// refreshing
+ArrangeWindows();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 9e90a75..e13ce31 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -477,6 +477,8 @@ public:
 
 inline Color const & getSyntaxColor(TokenTypes eType) const
 { return m_aSyntaxColors[eType]; }
+
+void ToggleObjectCatalog ();
 };
 
 #endif  // _BASIDE2_HXX
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index d11ece3..ae9443f 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -439,26 +439,11 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
 pWin->EditMacro( rInfo.GetMethod() );
 }
 break;
+
 case SID_BASICIDE_OBJCAT:
-{
-if ( bObjectCatalogDisplay )
-{
-pModulLayout->GetObjectCatalog().Hide();
-dynamic_cast(pCurWin)->SetPosPixel( Point( 0, 0 ) );
-dynamic_cast(pCurWin)->SetSizePixel( Size( pCurWin->GetSizePixel().Width() + OBJCAT_PANE_WIDTH, pCurWin->GetSizePixel().Height() ) );
-dynamic_cast(pCurWin)->SetObjectCatalogDisplay( false );
-bObjectCatalogDisplay = sal_False;
-}
-else
-{
-pModulLayout->GetObjectCatalog().Show();
-dynamic_cast(pCurWin)->SetPosPixel( Point( OBJCAT_PANE_WIDTH, 0 ) );
-dynamic_cast(pCurWin)->SetSizePixel( Size( pCurWin->GetSizePixel().Width() - OBJCAT_PANE_WIDTH, pCurWin->GetSizePixel().Height() ) );
-dynamic_cast(pCurWin)->SetObjectCatalogDisplay( true );
-bObjectCatalogDisplay = sal_True;
-}
-}
-break;
+pModulLayout->ToggleObjectCatalog();
+break;
+
 case SID_BASICIDE_NAMECHANGEDONTAB:
 {
 DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 8144b17..885f7

Re: [PUSHED][3-5][3-6] Re: [REVIEW 3-6] fdo#50975 crash in about dialog on RHEL-5

[Miklos Vajna]

On Mon, Jul 23, 2012 at 05:59:29PM +0200, Michael Stahl  
wrote:
> i was wondering why you'd removed the content of the then branch until i
> realized that that is actually error handling code for a failed close
> call... it's really painful to read code with 2 side effects in the if
> clause

+1 from me, one more needed.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument

[khagaroth]

>From a translators point of view, it would be no problem. The
translations are continually updated anyway. I guess it could be a
little bit annoying for people that do not use pootle, but who cares
about one untranslated string if it fixes a problem that breaks
compatibility, not to mention there are still not that many languages
that are fully translated.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Inquiry

[William Larry]

Hello am Larry William.
Am actually interested in Big Satellite Dish and i will be very happy to
hear a fast reply from you if u have it in stock. Reply me with pictures of
samples,sizes as well as prices of those u do have in stock and hope to
hear from you soon.Also what type of credit card do you accept.

Best Regards
Larry William
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH-3-6-0 2/3] fdo#47368 - many crashes with a11y on OS/X ...

[Stephan Bergmann]

On 07/23/2012 05:12 PM, Michael Meeks wrote:

Norbert's trace with bugs suggested a great site for the source of
this; an unfortunately outdated copy of listeners that can be emitted
after they are removed. This simple patch uses the list copy for safe
iteration, while checking the parent listener is still registered. At
least, I hope it does ;-)

kudos to Norbert for managing to reproduce it on a build with symbols.
2x extra reviews much appreciated to take it to -3-6-0:

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6&id=222b7032153cfd3a6f5e12e2fc855ccabc2ea769

Of course, it is -possible- that continuing to emit listener that have
been already removed is required by some dark corner of the code (if so
it is prolly best to find it sooner rather than later).


+1 from me

Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH (partial)] fdo#48549 System::Beep() removal

[Stephan Bergmann]

On 07/23/2012 05:42 PM, Eike Rathke wrote:

On Monday, 2012-07-23 16:01:56 +0200, Philipp Riemer wrote:

But I do not know what the general opinion of the LO developers for
that cases is... Maybe they are happy without any logging in there...
Whould love to hear from the others what they think.


In general such cases deserve a SAL_WARN,


...or, depending on the nature of the event that caused the beep, merely 
a SAL_LOG.  See 
 
for a (potentially unhelpful) differentiation of the two's intended uses.


The general idea is that SAL_WARN is for events that "do not normally 
happen."  And something like "in the Basic IDE, user attempts to set a 
breakpoint on a line that contains no code" (whether or not that is 
something that used to trigger a beep; I did not check) in my 
interpretation does not fall into that category and thus should be 
logged with SAL_LOG.  But a somewhat gray area indeed...


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   52 +++--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |8 +++
 2 files changed, 55 insertions(+), 5 deletions(-)

New commits:
commit c7d590293eae63bcd86bf48f58b3d563b8883511
Author: Miklos Vajna 
Date:   Mon Jul 23 18:09:32 2012 +0200

implement import of RTF_{MD,MDPR,MBEGCHR,MENDCHR}

Change-Id: Ie671977d523e1fb7142f62ca2d8d47e65082d3fd

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8088406..36b3fa6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -952,6 +952,8 @@ void RTFDocumentImpl::text(OUString& rString)
 case DESTINATION_ATNID:
 case DESTINATION_MR:
 case DESTINATION_MCHR:
+case DESTINATION_MBEGCHR:
+case DESTINATION_MENDCHR:
 m_aStates.top().aDestinationText.append(rString);
 break;
 case DESTINATION_EQINSTRUCTION:
@@ -1449,10 +1451,24 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 case RTF_MCHR:
 m_aStates.top().nDestinationState = DESTINATION_MCHR;
 break;
+case RTF_MBEGCHR:
+m_aStates.top().nDestinationState = DESTINATION_MBEGCHR;
+break;
+case RTF_MENDCHR:
+m_aStates.top().nDestinationState = DESTINATION_MENDCHR;
+break;
 case RTF_ME:
 m_aMathBuffer.appendOpeningTag(M_TOKEN(e));
 m_aStates.top().nDestinationState = DESTINATION_ME;
 break;
+case RTF_MD:
+m_aMathBuffer.appendOpeningTag(M_TOKEN(d));
+m_aStates.top().nDestinationState = DESTINATION_MD;
+break;
+case RTF_MDPR:
+m_aMathBuffer.appendOpeningTag(M_TOKEN(dPr));
+m_aStates.top().nDestinationState = DESTINATION_MDPR;
+break;
 default:
 SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle 
destination '" << lcl_RtfToString(nKeyword) << "'");
 // Make sure we skip destinations (even without \*) till we don't 
handle them
@@ -3550,12 +3566,22 @@ int RTFDocumentImpl::popState()
 m_aMathBuffer.appendClosingTag(M_TOKEN(acc));
 else if (m_aStates.top().nDestinationState == DESTINATION_MACCPR)
 m_aMathBuffer.appendClosingTag(M_TOKEN(accPr));
-else if (m_aStates.top().nDestinationState == DESTINATION_MCHR)
+else if (m_aStates.top().nDestinationState == DESTINATION_MCHR ||
+m_aStates.top().nDestinationState == DESTINATION_MBEGCHR ||
+m_aStates.top().nDestinationState == DESTINATION_MENDCHR)
 {
 oox::formulaimport::XmlStream::AttributeList aAttribs;
 aAttribs[M_TOKEN(val)] = 
m_aStates.top().aDestinationText.makeStringAndClear();
-m_aMathBuffer.appendOpeningTag(M_TOKEN(chr), aAttribs);
-m_aMathBuffer.appendClosingTag(M_TOKEN(chr));
+sal_Int32 nToken = 0;
+switch (m_aStates.top().nDestinationState)
+{
+case DESTINATION_MCHR: nToken = M_TOKEN(chr); break;
+case DESTINATION_MBEGCHR: nToken = M_TOKEN(begChr); break;
+case DESTINATION_MENDCHR: nToken = M_TOKEN(endChr); break;
+default: break;
+}
+m_aMathBuffer.appendOpeningTag(nToken, aAttribs);
+m_aMathBuffer.appendClosingTag(nToken);
 }
 else if (m_aStates.top().nDestinationState == DESTINATION_ME)
 m_aMathBuffer.appendClosingTag(M_TOKEN(e));
@@ -3563,6 +3589,10 @@ int RTFDocumentImpl::popState()
 m_aMathBuffer.appendClosingTag(M_TOKEN(bar));
 else if (m_aStates.top().nDestinationState == DESTINATION_MBARPR)
 m_aMathBuffer.appendClosingTag(M_TOKEN(barPr));
+else if (m_aStates.top().nDestinationState == DESTINATION_MD)
+m_aMathBuffer.appendClosingTag(M_TOKEN(d));
+else if (m_aStates.top().nDestinationState == DESTINATION_MDPR)
+m_aMathBuffer.appendClosingTag(M_TOKEN(dPr));
 
 // See if we need to end a track change
 RTFValue::Pointer_t pTrackchange = 
m_aStates.top().aCharacterSprms.find(NS_ooxml::LN_trackchange);
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 6b700c9..9a7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -132,7 +132,11 @@ namespace writerfilter {
 DESTINATION_MCHR,
 DESTINATION_ME,
 DESTINATION_MBAR,
-DESTINATION_MBARPR
+DESTINATION_MBARPR,
+DESTINATION_MD,
+DESTINATION_MDPR,
+DESTINATION_MBEGCHR,
+DESTINATION_MENDCHR
 };
 
 enum RTFBorderState
commit 43e4ae79f2c09e0fe596a7dc96eb9f2498439490
Author: Miklos Vajna 
Date:   Mon Jul 23 17:40:56 2012 +0200

implement RTF_MBAR{,PR}

Change-Id: Id5acca5c

Re: [PUSHED 3-6-0] Fix vertical rulers on MacOS

[Petr Mladek]

Norbert Thiebaud píše v Po 23. 07. 2012 v 10:11 -0500:
> On Mon, Jul 23, 2012 at 10:06 AM, Norbert Thiebaud  
> wrote:
> > On Mon, Jul 23, 2012 at 9:48 AM, Thorsten Behrens
> >  wrote:
> >> Jan Holesovsky wrote:
> >>> Thanks so much for that! - looks great to me; we should probably remove
> >>> the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse
> >>> others too, right? :-)
> >>>
> >> No idea - Norbert, you were refactoring that recently, any opinion?
> >
> > no I (should) not have touched that...
> > I will run a test after the next builbot iteration to verify the
> > fix... but reading I would concur to +1
> 
> ok so vertical rulers looks fine on master... so +1

This was 3rd approval => pushed into 3-6-0 branch.


Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - vcl/aqua

[Petr Mladek]

 vcl/aqua/source/gdi/salatslayout.cxx |   29 -
 1 file changed, 28 insertions(+), 1 deletion(-)

New commits:
commit f9e000361a29c4894d64c0b0a03622323a19b6a0
Author: Thorsten Behrens 
Date:   Sun Jul 22 16:34:10 2012 +0200

Fix fdo#50631 - have GetTextBoundRect() properly rotate bounds

Earlier fixes to AquaSalGraphics::GetGlyphBoundRect() are
ineffective, since this method is not even called from ATSLayout.

Change-Id: Iaeda228afed4799e6d54c5a7b1764b39f7b77c81
Signed-off-by: Jan Holesovsky 
Signed-off-by: Michael Meeks 
Signed-off-by: Norbert Thiebaud 

diff --git a/vcl/aqua/source/gdi/salatslayout.cxx 
b/vcl/aqua/source/gdi/salatslayout.cxx
index a8fc7c5..8dcd70f 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -852,12 +852,39 @@ void ATSLayout::GetCaretPositions( int nMaxIndex, long* 
pCaretXArray ) const
  *
  * @return : measurement valid
 **/
-bool ATSLayout::GetBoundRect( SalGraphics&, Rectangle& rVCLRect ) const
+bool ATSLayout::GetBoundRect( SalGraphics& rGraphics, Rectangle& rVCLRect ) 
const
 {
+AquaSalGraphics& rAquaGraphics = static_cast(rGraphics);
+
 const Point aPos = GetDrawPosition( Point(mnBaseAdv, 0) );
 const Fixed nFixedX = Vcl2Fixed( +aPos.X() );
 const Fixed nFixedY = Vcl2Fixed( +aPos.Y() );
 
+// prepare ATSUI drawing attributes
+static const ItemCount nMaxControls = 8;
+ATSUAttributeTag theTags[ nMaxControls ];
+ByteCount theSizes[ nMaxControls];
+ATSUAttributeValuePtr theValues[ nMaxControls ];
+ItemCount numcontrols = 0;
+
+// Tell ATSUI to use CoreGraphics
+theTags[numcontrols] = kATSUCGContextTag;
+theSizes[numcontrols] = sizeof( CGContextRef );
+theValues[numcontrols++] = &rAquaGraphics.mrContext;
+
+// Rotate if necessary
+if( rAquaGraphics.mnATSUIRotation != 0 )
+{
+Fixed theAngle = rAquaGraphics.mnATSUIRotation;
+theTags[numcontrols] = kATSULineRotationTag;
+theSizes[numcontrols] = sizeof( Fixed );
+theValues[numcontrols++] = &theAngle;
+}
+
+DBG_ASSERT( (numcontrols <= nMaxControls), "ATSLayout::GetBoundRect() 
numcontrols overflow" );
+OSStatus theErr = ATSUSetLayoutControls (maATSULayout, numcontrols, 
theTags, theSizes, theValues);
+DBG_ASSERT( (theErr==noErr), "ATSLayout::GetBoundRect 
ATSUSetLayoutControls failed!\n" );
+
 Rect aMacRect;
 OSStatus eStatus = ATSUMeasureTextImage( maATSULayout,
 mnMinCharPos, mnCharCount, nFixedX, nFixedY, &aMacRect );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/calc-empty-string-config'

[Kohei Yoshida]

New branch 'feature/calc-empty-string-config' available with the following 
commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED][3-5][3-6] Re: [REVIEW 3-6] fdo#50975 crash in about dialog on RHEL-5

[Michael Stahl]

On 23/07/12 17:41, Caolán McNamara wrote:
> So rsvg_handle_new_from_data calls rsvg_handle_close already it turns
> out. In new versions of librsvg you can call rsvg_handle_close on a
> handle safely as many times as you want, but in older versions like that
> of RHEL-5 you can only call it once.
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=682cb83ed59233decbeeaff68c4d871442b58bb1
> 
> i.e. just drop rsvg_handle_close because rsvg_handle_new_from_data
> already did it

i was wondering why you'd removed the content of the then branch until i
realized that that is actually error handling code for a failed close
call... it's really painful to read code with 2 side effects in the if
clause

pushed to libreoffice-3-5. libreoffice-3-6

2 more necessary for -3-6-0


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 52340, which changed state.

Bug 52340 Summary: EDITING: CRASH when Copy+Paste row with conditional 
formatting to other sheet and back to inserted row
https://bugs.freedesktop.org/show_bug.cgi?id=52340

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Tinderbox nightlies broken (was Re: No Win builds?)

[Stephan Bergmann]

On 07/23/2012 12:38 PM, Michael Stahl wrote:

On 22/07/12 16:36, Lubos Lunak wrote:

  There was one more thing broken. The recent changes to get dev-install
working changed the package format built in the 'build' target to .zip, so
there was no .msi package to upload. I've reverted that change and moved the
FORCE2ARCHIVE part to dev-install,


oh i didn't notice that FORCE2ARCHIVE would prevent MSI from being
built, but looking at the actual instsetoo_native/util/makefile.mk it
overrides PKGFORMAT, so it's not a surprise :)

if we want to build a MSI anyway, then building the archive in
dev-install makes a lot of sense.


See 
 
"sb118: independent of PKGFORMAT, always build a default-language 
openoffice product also in archive format, so that tests that require an 
OOo installation (like smoketestoo_native) have one available" and 
 
"sb118: always set PKGFORMAT (so that always building 
openoffice_en-US.archive in instsetoo_native/util also works on 
Windows)" for how this was achieved in OOo times.  On all platforms, it 
always built an additional archive installation set in module 
insetsetoo_native, so that during the later build of module 
smoketestoo_native that archive installation set could be unpacked and 
used for the smoke test (as well as any subsequenttests; only on Windows 
the installation set was not unpacked once to solver/*/installation, but 
for each test anew to a temp folder, to work around problems with long 
file paths).


No idea how much of that got broken in the meantime though.  (As for 
non-Windows, the solver/*/installation set used by the various tests is 
now produced by another means via "make dev-install".)


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/matrix-new-backend' - 0 commits -

[Kohei Yoshida]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source

[Michael Stahl]

 vcl/source/components/rasterizer_rsvg.cxx |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 765c20bbbc76bf85d0582b2a2cdb040f78faed1d
Author: Caolán McNamara 
Date:   Mon Jul 23 13:59:12 2012 +0100

Resolves: fdo#50975 rsvg_handle_new_from_data calls rsvg_handle_close

rsvg_handle_new_from_data calls rsvg_handle_fill_with_data which itself 
calls
rsvg_handle_close on success, so we don't have to.

And older versions of librsvg (e.g. 2.16.1) don't protect against
rsvg_handle_close getting called twice, although new versions do,
so we crash on e.g. RHEL-5

Change-Id: I451075e50c9c2c7b07289356d7a92eb55db82f9f
(cherry picked from commit 682cb83ed59233decbeeaff68c4d871442b58bb1)

Signed-off-by: Michael Stahl 

diff --git a/vcl/source/components/rasterizer_rsvg.cxx 
b/vcl/source/components/rasterizer_rsvg.cxx
index 20d4598..592ebb3 100644
--- a/vcl/source/components/rasterizer_rsvg.cxx
+++ b/vcl/source/components/rasterizer_rsvg.cxx
@@ -119,7 +119,6 @@ public:
 // LibRSVG
 void rsvg_init() { (*mp_rsvg_init)(); }
 RsvgHandle* rsvg_handle_new_from_data( const guint8* data, gsize size, 
GError** error) { return( (*mp_rsvg_handle_new_from_data)( data, size, error ) 
); }
-gboolean rsvg_handle_close( RsvgHandle* handle, GError** error ) { return( 
(*mp_rsvg_handle_close)( handle, error ) ); }
 void rsvg_handle_set_dpi_x_y( RsvgHandle* handle, double dpix, double dpiy 
) { (*mp_rsvg_handle_set_dpi_x_y)( handle, dpix, dpiy ); }
 void rsvg_handle_get_dimensions( RsvgHandle* handle, RsvgDimensionData* 
dimensions ) { (*mp_rsvg_handle_get_dimensions)( handle, dimensions ); }
 gboolean rsvg_handle_render_cairo( RsvgHandle* handle, cairo_t* cairo ) { 
return( (*mp_rsvg_handle_render_cairo)( handle, cairo ) ); }
@@ -139,7 +138,6 @@ private:
 // LibRSVG
 void (*mp_rsvg_init)( void );
 RsvgHandle* (*mp_rsvg_handle_new_from_data)( const guint8*, gsize, 
GError** );
-gboolean (*mp_rsvg_handle_close)( RsvgHandle*, GError** );
 void (*mp_rsvg_handle_set_dpi_x_y)( RsvgHandle*, double, double );
 void (*mp_rsvg_handle_get_dimensions)( RsvgHandle*, RsvgDimensionData* );
 gboolean (*mp_rsvg_handle_render_cairo)( RsvgHandle*, cairo_t* );
@@ -191,14 +189,12 @@ LibraryWrapper::LibraryWrapper() :
 {
 mp_rsvg_init = ( void (*)( void ) ) osl_getAsciiFunctionSymbol( 
mpRSVGLib, "rsvg_init" );
 mp_rsvg_handle_new_from_data = ( RsvgHandle* (*)( const guint8*, 
gsize, GError** ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, 
"rsvg_handle_new_from_data" );
-mp_rsvg_handle_close = ( gboolean (*)( RsvgHandle*, GError** ) ) 
osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_close" );
 mp_rsvg_handle_set_dpi_x_y = ( void (*)( RsvgHandle*, double, double ) 
) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_set_dpi_x_y" );
 mp_rsvg_handle_get_dimensions = ( void (*)( RsvgHandle*, 
RsvgDimensionData* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, 
"rsvg_handle_get_dimensions" );
 mp_rsvg_handle_render_cairo = ( gboolean (*)( RsvgHandle*, cairo_t* ) 
) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_render_cairo" );
 
 if( !( mp_rsvg_init &&
mp_rsvg_handle_new_from_data &&
-   mp_rsvg_handle_close &&
mp_rsvg_handle_set_dpi_x_y &&
mp_rsvg_handle_get_dimensions &&
mp_rsvg_handle_render_cairo ) )
@@ -417,12 +413,15 @@ uno::Reference< graphic::XGraphic > 
Rasterizer::implGetXGraphicFromSurface( cair
 }
 while( nReadSize == nBlockSize );
 
-if( aDataBuffer.size() &&
-( NULL != ( mpRsvgHandle = rLib.rsvg_handle_new_from_data( 
reinterpret_cast< sal_uInt8* >( &aDataBuffer[ 0 ] ),
-   
aDataBuffer.size(), NULL ) ) ) &&
-!rLib.rsvg_handle_close( mpRsvgHandle, NULL ) )
+if (aDataBuffer.size())
 {
-implFreeRsvgHandle();
+//See: fdo#50975 rsvg_handle_new_from_data calls
+//rsvg_handle_fill_with_data which itself calls rsvg_handle_close
+//on success.  Older versions of librsvg (e.g. 2.16.1) don't
+//protect against rsvg_handle_close getting called twice, so we
+//shouldn't additionally call svg_handle_close here.
+mpRsvgHandle = rLib.rsvg_handle_new_from_data( reinterpret_cast< 
sal_uInt8* >( &aDataBuffer[ 0 ] ),
+   
aDataBuffer.size(), NULL );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6-0] [PUSHED 3-6-0] fix for fdo#52340, use correct table for conditional format paste

[Kohei Yoshida]

On 07/23/2012 07:05 AM, Michael Meeks wrote:


On Mon, 2012-07-23 at 12:17 +0200, Eike Rathke wrote:

[1] fixes several problems around conditional format paste.


Perfect ;-)
Pushed to 3-6 with
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6&id=8ac1d7cc1d825e53d42aac699b077ffddb9c8769


You have a +1 from me also; only one more required.


I'll give my sign-off too.  With this, this one goes to 3-6-0.

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - sc/source

[Kohei Yoshida]

 sc/source/core/data/table2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aeebb0d20c6163ecbea47bb84fc83dd34b1438fa
Author: Markus Mohrhard 
Date:   Sun Jul 22 21:15:37 2012 +0200

use correct source table for cond format paste, fdo#52340

(cherry picked from commit 669784c6653732fd2ad43024332957d5df5652bb)

Change-Id: I7c4cb1a5f31ba9e37a280af2243a13c57914cb2f
Signed-off-by: Eike Rathke 
Signed-off-by: Michael Meeks 
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 18dfda4..9dd2afb 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -658,7 +658,7 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW 
nRow1, SCCOL nCol2, SCRO
 ScConditionalFormatList* pOldCondFormatList = 
pTable->mpCondFormatList.get();
 for(SCCOL i = nCol1; i <= nCol2; ++i)
 {
-ScAttrIterator* pIter = aCol[i-nDx].CreateAttrIterator( nRow1-nDy, 
nRow2-nDy );
+ScAttrIterator* pIter = pTable->aCol[i-nDx].CreateAttrIterator( 
nRow1-nDy, nRow2-nDy );
 SCROW nStartRow = 0, nEndRow = 0;
 const ScPatternAttr* pPattern = pIter->Next( nStartRow, nEndRow );
 sal_uInt32 nId = 
((SfxUInt32Item&)pPattern->GetItem(ATTR_CONDITIONAL)).GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source

[Michael Stahl]

 vcl/source/components/rasterizer_rsvg.cxx |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit cd878743c11d977ec1c336918d795180983972e5
Author: Caolán McNamara 
Date:   Mon Jul 23 13:59:12 2012 +0100

Resolves: fdo#50975 rsvg_handle_new_from_data calls rsvg_handle_close

rsvg_handle_new_from_data calls rsvg_handle_fill_with_data which itself 
calls
rsvg_handle_close on success, so we don't have to.

And older versions of librsvg (e.g. 2.16.1) don't protect against
rsvg_handle_close getting called twice, although new versions do,
so we crash on e.g. RHEL-5

Change-Id: I451075e50c9c2c7b07289356d7a92eb55db82f9f
(cherry picked from commit 682cb83ed59233decbeeaff68c4d871442b58bb1)

Signed-off-by: Michael Stahl 

diff --git a/vcl/source/components/rasterizer_rsvg.cxx 
b/vcl/source/components/rasterizer_rsvg.cxx
index 00940c2..f5a7f57 100644
--- a/vcl/source/components/rasterizer_rsvg.cxx
+++ b/vcl/source/components/rasterizer_rsvg.cxx
@@ -117,7 +117,6 @@ public:
 // LibRSVG
 void rsvg_init() { (*mp_rsvg_init)(); }
 RsvgHandle* rsvg_handle_new_from_data( const guint8* data, gsize size, 
GError** error) { return( (*mp_rsvg_handle_new_from_data)( data, size, error ) 
); }
-gboolean rsvg_handle_close( RsvgHandle* handle, GError** error ) { return( 
(*mp_rsvg_handle_close)( handle, error ) ); }
 void rsvg_handle_set_dpi_x_y( RsvgHandle* handle, double dpix, double dpiy 
) { (*mp_rsvg_handle_set_dpi_x_y)( handle, dpix, dpiy ); }
 void rsvg_handle_get_dimensions( RsvgHandle* handle, RsvgDimensionData* 
dimensions ) { (*mp_rsvg_handle_get_dimensions)( handle, dimensions ); }
 gboolean rsvg_handle_render_cairo( RsvgHandle* handle, cairo_t* cairo ) { 
return( (*mp_rsvg_handle_render_cairo)( handle, cairo ) ); }
@@ -137,7 +136,6 @@ private:
 // LibRSVG
 void (*mp_rsvg_init)( void );
 RsvgHandle* (*mp_rsvg_handle_new_from_data)( const guint8*, gsize, 
GError** );
-gboolean (*mp_rsvg_handle_close)( RsvgHandle*, GError** );
 void (*mp_rsvg_handle_set_dpi_x_y)( RsvgHandle*, double, double );
 void (*mp_rsvg_handle_get_dimensions)( RsvgHandle*, RsvgDimensionData* );
 gboolean (*mp_rsvg_handle_render_cairo)( RsvgHandle*, cairo_t* );
@@ -189,14 +187,12 @@ LibraryWrapper::LibraryWrapper() :
 {
 mp_rsvg_init = ( void (*)( void ) ) osl_getAsciiFunctionSymbol( 
mpRSVGLib, "rsvg_init" );
 mp_rsvg_handle_new_from_data = ( RsvgHandle* (*)( const guint8*, 
gsize, GError** ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, 
"rsvg_handle_new_from_data" );
-mp_rsvg_handle_close = ( gboolean (*)( RsvgHandle*, GError** ) ) 
osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_close" );
 mp_rsvg_handle_set_dpi_x_y = ( void (*)( RsvgHandle*, double, double ) 
) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_set_dpi_x_y" );
 mp_rsvg_handle_get_dimensions = ( void (*)( RsvgHandle*, 
RsvgDimensionData* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, 
"rsvg_handle_get_dimensions" );
 mp_rsvg_handle_render_cairo = ( gboolean (*)( RsvgHandle*, cairo_t* ) 
) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_render_cairo" );
 
 if( !( mp_rsvg_init &&
mp_rsvg_handle_new_from_data &&
-   mp_rsvg_handle_close &&
mp_rsvg_handle_set_dpi_x_y &&
mp_rsvg_handle_get_dimensions &&
mp_rsvg_handle_render_cairo ) )
@@ -415,12 +411,15 @@ uno::Reference< graphic::XGraphic > 
Rasterizer::implGetXGraphicFromSurface( cair
 }
 while( nReadSize == nBlockSize );
 
-if( aDataBuffer.size() &&
-( NULL != ( mpRsvgHandle = rLib.rsvg_handle_new_from_data( 
reinterpret_cast< sal_uInt8* >( &aDataBuffer[ 0 ] ),
-   
aDataBuffer.size(), NULL ) ) ) &&
-!rLib.rsvg_handle_close( mpRsvgHandle, NULL ) )
+if (aDataBuffer.size())
 {
-implFreeRsvgHandle();
+//See: fdo#50975 rsvg_handle_new_from_data calls
+//rsvg_handle_fill_with_data which itself calls rsvg_handle_close
+//on success.  Older versions of librsvg (e.g. 2.16.1) don't
+//protect against rsvg_handle_close getting called twice, so we
+//shouldn't additionally call svg_handle_close here.
+mpRsvgHandle = rLib.rsvg_handle_new_from_data( reinterpret_cast< 
sal_uInt8* >( &aDataBuffer[ 0 ] ),
+   
aDataBuffer.size(), NULL );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument

[Petr Mladek]

Eike Rathke píše v Po 23. 07. 2012 v 17:36 +0200:
> Hi Kohei,
> 
> On Friday, 2012-07-20 10:10:48 -0400, Kohei Yoshida wrote:
> 
> > I'll add this configuration option during 3.7 cycle if this can wait
> > until 3.7.  If you guys need it earlier than that I could work on it
> > and push it as a late feature if it's desperately needed for 3.6.
> 
> I'd appreciate if you could do it for 3.6 as well, but it would need
> also translation, do we add that in stable branches?

If the bug was already in LO-3.3, I would not break the UI/string freeze
because of it. I think that such an old bug could wait few more months
for LO-3.7.


Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: boost/boost.4127.warnings.patch

[Caolán McNamara]

 boost/boost.4127.warnings.patch |   42 
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 31c4ac62dba8f8312ae094def9dfae4cd3fdc05a
Author: Caolán McNamara 
Date:   Mon Jul 23 16:46:34 2012 +0100

ah, dos format breaks some patches

Change-Id: Id99429366485924ff35da63ebde1b5df11419d58

diff --git a/boost/boost.4127.warnings.patch b/boost/boost.4127.warnings.patch
index b3e355d..fe3c2bf 100644
--- a/boost/boost.4127.warnings.patch
+++ b/boost/boost.4127.warnings.patch
@@ -1,21 +1,21 @@
 misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp  (revision 69250)
-+++ misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp(revision 69251)
-@@ -49,7 +49,18 @@
- {
- if( initialized_ )
- {
-+#if defined( __GNUC__ )
-+
-+// fixes incorrect aliasing warning
-+T * p = reinterpret_cast< T* >( storage_.data_ );
-+p->~T();
-+
-+#else
-+
- reinterpret_cast< T* >( storage_.data_ )->~T();
-+
-+#endif
-+
- initialized_ = false;
- }
- }
+--- misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp
 misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp
+@@ -49,7 +49,18 @@
+ {
+ if( initialized_ )
+ {
++#if defined( __GNUC__ )
++
++// fixes incorrect aliasing warning
++T * p = reinterpret_cast< T* >( storage_.data_ );
++p->~T();
++
++#else
++
+ reinterpret_cast< T* >( storage_.data_ )->~T();
++
++#endif
++
+ initialized_ = false;
+ }
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument

[Kohei Yoshida]

On 07/23/2012 11:36 AM, Eike Rathke wrote:

Hi Kohei,

On Friday, 2012-07-20 10:10:48 -0400, Kohei Yoshida wrote:


I'll add this configuration option during 3.7 cycle if this can wait
until 3.7.  If you guys need it earlier than that I could work on it
and push it as a late feature if it's desperately needed for 3.6.


I'd appreciate if you could do it for 3.6 as well, but it would need
also translation, do we add that in stable branches?


Normally we don't, but we *may* have to somehow make an exception for 
this.  Let me CC Andras and Petr on this.


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH (partial)] fdo#48549 System::Beep() removal

[Eike Rathke]

Hi Philipp,

On Monday, 2012-07-23 16:01:56 +0200, Philipp Riemer wrote:

> But I do not know what the general opinion of the LO developers for
> that cases is... Maybe they are happy without any logging in there...
> Whould love to hear from the others what they think.

In general such cases deserve a SAL_WARN, so that at least in a debug
build some output is logged to the console.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpyPcVfJc0oL.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW 3-6] fdo#50975 crash in about dialog on RHEL-5

[Caolán McNamara]

So rsvg_handle_new_from_data calls rsvg_handle_close already it turns
out. In new versions of librsvg you can call rsvg_handle_close on a
handle safely as many times as you want, but in older versions like that
of RHEL-5 you can only call it once.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=682cb83ed59233decbeeaff68c4d871442b58bb1

i.e. just drop rsvg_handle_close because rsvg_handle_new_from_data
already did it

C.



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] [PUSHED:3-6] [URGENT] horrible performance regression

[Petr Mladek]

Stephan Bergmann píše v Út 17. 07. 2012 v 13:48 +0200:
> On 07/17/2012 12:10 AM, Lionel Elie Mamane wrote:
> > Please cherry-pick 0cda6605844ef68e45db7a7c05cc4d09ef2bc49a
> > (http://cgit.freedesktop.org/libreoffice/core/commit/?id=0cda6605844ef68e45db7a7c05cc4d09ef2bc49a
> >   and patch also attached)
> > to libreoffice-3-6 in time for rc2. This would allow me to get some
> > Base testers in 3.6 before release (as it is, embedded HSQLDB is so
> > slow as to be unusable).
> 
> Just for the record:  My understanding is that cherry picking shall 
> generally happen from master to branches like libreoffice-3-6.  The 
> above link unfortunately does not make it clear that 
> 0cda6605844ef68e45db7a7c05cc4d09ef2bc49a is not on master, but rather on 
> features/base-preview.  (It meanwhile got cherry-picked to master too as 
> .)

It is in both 3-6 and 3-6-0 branches.


Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument

[Eike Rathke]

Hi Kohei,

On Friday, 2012-07-20 10:10:48 -0400, Kohei Yoshida wrote:

> I'll add this configuration option during 3.7 cycle if this can wait
> until 3.7.  If you guys need it earlier than that I could work on it
> and push it as a late feature if it's desperately needed for 3.6.

I'd appreciate if you could do it for 3.6 as well, but it would need
also translation, do we add that in stable branches?

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpCMSzHOMTtQ.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: boost/boost.4127.warnings.patch

[Caolán McNamara]

 boost/boost.4127.warnings.patch |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e7ffa3e2d36a800bf2f2d91ca6d08887a21caa31
Author: Caolán McNamara 
Date:   Mon Jul 23 16:25:19 2012 +0100

my patch applied it, other's don't, so regenerating

Change-Id: I7ffd382b6aa3954bc346d1ecc45607a417ad2509

diff --git a/boost/boost.4127.warnings.patch b/boost/boost.4127.warnings.patch
index 11a955f..b3e355d 100644
--- a/boost/boost.4127.warnings.patch
+++ b/boost/boost.4127.warnings.patch
@@ -1,6 +1,7 @@
 --- misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp  (revision 69250)
 +++ misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp(revision 69251)
-@@ -50,5 +50,16 @@
+@@ -49,7 +49,18 @@
+ {
  if( initialized_ )
  {
 +#if defined( __GNUC__ )
@@ -17,3 +18,4 @@
 +
  initialized_ = false;
  }
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - cui/source

[Michael Stahl]

 cui/source/inc/treeopt.hxx |9 -
 cui/source/options/treeopt.cxx |  318 +
 2 files changed, 175 insertions(+), 152 deletions(-)

New commits:
commit 734b653a95a88478ca53d7010aefc82ad78f6740
Author: Stephan Bergmann 
Date:   Wed Jul 18 14:00:57 2012 +0200

fdo#52232 ConfigurationSet wrapper unusable for localized properties

The comphelper::ConfigurationSet wrapper, used by the automatically 
generated
headers to access the configuration data from C++, is based on
com.sun.star.configuration.ReadOnlyAccess/ReadWriteAcess that provide an 
all-
locales view of the configuration data, i.e., a localized property is 
represented as a UNO object implementing various container interfaces (to 
access the per-locale values) instead of a plain value.

Hence,

  xLeaveAccess->getByName(C2U("Label")) >>= sLeafLabel;

silently changed its meaning, now silently failing to extract a string and
leaving sLeafLabel empty, which in turn causes the labels of extension 
option
pages to disappear from the "Tools - Options..." dialog.

This partially reverts commit 161c3f179f71eda2a32dabaf68ff6fb3ba487062 "Some
more comphelper/configurationhelper clean up."

Change-Id: I584c682ea6a7c8b9444b34f1867cc553ad160802
(cherry picked from commit aebf5bf22304c73e121b16dc0b51f909c5f34c28)

Signed-off-by: Caolán McNamara 
(cherry picked from commit 10ae81acb68ba6e03cfe8907d8a0a1ea33067376)

Signed-off-by: Michael Meeks 
Signed-off-by: Michael Stahl 

diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 38700e6..64d2b9b 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -138,6 +138,7 @@ struct LastPageSaver
 // class OfaTreeOptionsDialog 
 
 namespace com { namespace sun { namespace star { namespace frame { class 
XFrame; } } } }
+namespace com { namespace sun { namespace star { namespace container { class 
XNameAccess; } } } }
 namespace com { namespace sun { namespace star { namespace lang { class 
XMultiServiceFactory; } } } }
 namespace com { namespace sun { namespace star { namespace awt { class 
XContainerWindowProvider; } } } }
 
@@ -191,8 +192,12 @@ private:
 
com::sun::star::lang::XMultiServiceFactory >& xMFac,
  const com::sun::star::uno::Reference<
 com::sun::star::frame::XFrame >& 
xFrame );
-Module* LoadModule( const rtl::OUString& rModuleIdentifier );
-voidLoadNodes( Module* pModule,
+Module* LoadModule( const rtl::OUString& rModuleIdentifier,
+const com::sun::star::uno::Reference<
+com::sun::star::container::XNameAccess >& 
xRoot );
+voidLoadNodes( const com::sun::star::uno::Reference<
+com::sun::star::container::XNameAccess >& 
xRoot,
+   Module* pModule,
const rtl::OUString& rExtensionId,
VectorOfNodes& rOutNodeList );
 voidInsertNodes( const VectorOfNodes& rNodeList );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 95a52c6..66c7b47 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -67,11 +67,11 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1995,12 +1995,18 @@ void OfaTreeOptionsDialog::LoadExtensionOptions( const 
rtl::OUString& rExtension
 {
 Module* pModule = NULL;
 Reference< XMultiServiceFactory > xMSFac = 
comphelper::getProcessServiceFactory();
+// open optionsdialog.xcu
+Reference< XNameAccess > xRoot(
+::comphelper::ConfigurationHelper::openConfig(
+xMSFac, C2U("org.openoffice.Office.OptionsDialog"),
+::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
+DBG_ASSERT( xRoot.is(), "OfaTreeOptionsDialog::LoadExtensionOptions(): no 
config" );
 // when called by Tools - Options then load nodes of active module
 if ( rExtensionId.isEmpty() )
-pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference< XFrame 
>() ) );
+pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference< XFrame 
>() ), xRoot );
 
 VectorOfNodes aNodeList;
-LoadNodes( pModule, rExtensionId, aNodeList );
+LoadNodes( xRoot, pModule, rExtensionId, aNodeList );
 InsertNodes( aNodeList );
 }
 
@@ -2039,58 +2045,64 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier(
 }
 
 Module* OfaTreeOptionsDialog::LoadModule(
-const rtl::OUString& rModuleIdentifier )
+const rtl::OUString& rModuleIdentifier, const Reference< XNameAccess >& 
xRoot )
 {
 Module* 

Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS

[Norbert Thiebaud]

On Mon, Jul 23, 2012 at 9:48 AM, Thorsten Behrens
 wrote:
> Jan Holesovsky wrote:
>> Thanks so much for that! - looks great to me; we should probably remove
>> the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse
>> others too, right? :-)
>>
> No idea - Norbert, you were refactoring that recently, any opinion?

no I (should) not have touched that...
I will run a test after the next builbot iteration to verify the
fix... but reading I would concur to +1

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Re: [REVIEW 3-6-0] fdo#52232 Hidden MediaWiki options page

[Michael Stahl]

On 23/07/12 14:02, Michael Meeks wrote:
> 
> On Mon, 2012-07-23 at 12:42 +0100, Caolán McNamara wrote:
 
 "fdo#52232 ConfigurationSet wrapper unusable for localized properties."
   It bluntly reverts the adaption of the affected code to the simplified
 C++ configuration access.
>>
>> Pushed to 3-6. Need +2 for 3-6-0 IIRC
> 
>   And now I read it properly - it's affects just the cui code, not
> configmgr itself ;-) so - it seems reasonable for 3.6.0, you have my +1
> - one more needed.

pushed to libreoffice-3-6-0

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 3 commits - oox/inc oox/source writerfilter/source

[Miklos Vajna]

 oox/inc/oox/mathml/importutils.hxx |7 +
 oox/source/mathml/importutils.cxx  |   16 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   99 ++---
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |6 +
 4 files changed, 83 insertions(+), 45 deletions(-)

New commits:
commit fd11c723d0bbaa50421baf9806295ec079ab
Author: Miklos Vajna 
Date:   Mon Jul 23 17:15:21 2012 +0200

rtftok: cleanup - use M_TOKEN() macro

Change-Id: If51def3c7c798104fd6dec9cf38473e5d70420fc

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1338542..3581f30 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -68,6 +68,7 @@
 #include 
 
 #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : 
(((TWIP)*127L-36L)/72L))
+#define M_TOKEN(token) OOX_TOKEN(officeMath, token)
 
 using std::make_pair;
 using rtl::OString;
@@ -1402,73 +1403,46 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 // Nothing to do here (just enter the destination) till 
RTF_MMATHPR is implemented.
 break;
 case RTF_MOMATH:
-{
-uno::Reference aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_oMath, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MOMATH;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(oMath));
+m_aStates.top().nDestinationState = DESTINATION_MOMATH;
 break;
 case RTF_MR:
 m_aStates.top().nDestinationState = DESTINATION_MR;
 break;
 case RTF_MF:
-{
-uno::Reference aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_f, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MF;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(f));
+m_aStates.top().nDestinationState = DESTINATION_MF;
 break;
 case RTF_MFPR:
-{
-uno::Reference aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_fPr, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MFPR;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(fPr));
+m_aStates.top().nDestinationState = DESTINATION_MFPR;
 break;
 case RTF_MCTRLPR:
-{
-uno::Reference aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_ctrlPr, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MCTRLPR;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(ctrlPr));
+m_aStates.top().nDestinationState = DESTINATION_MCTRLPR;
 break;
 case RTF_MNUM:
-{
-uno::Reference aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_num, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MNUM;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(num));
+m_aStates.top().nDestinationState = DESTINATION_MNUM;
 break;
 case RTF_MDEN:
-{
-uno::Reference aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_den, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MDEN;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(den));
+m_aStates.top().nDestinationState = DESTINATION_MDEN;
 break;
 case RTF_MACC:
-{
-uno::Reference aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_acc, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MACC;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(acc));
+m_aStates.top().nDestinationState = DESTINATION_MACC;
 break;
 case RTF_MACCPR:
-{
-uno::Reference aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_accPr, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MACCPR;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(accPr));
+m_aStates.top().nDestinationState = DESTINATION_MACCPR;
 break;
 case RTF_MCHR:
 m_aStates.top().nDestinationState = DESTINATION_MCHR;
 break;
 case RTF_ME:
-{
-uno::Reference aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_e, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_ME;
-}
+

[PATCH-3-6-0] fdo#47368 - many crashes with a11y on OS/X ...

[Michael Meeks]

Hi guys,

Norbert's trace with bugs suggested a great site for the source of
this; an unfortunately outdated copy of listeners that can be emitted
after they are removed. This simple patch uses the list copy for safe
iteration, while checking the parent listener is still registered. At
least, I hope it does ;-)

kudos to Norbert for managing to reproduce it on a build with symbols.
2x extra reviews much appreciated to take it to -3-6-0:

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6&id=222b7032153cfd3a6f5e12e2fc855ccabc2ea769

Of course, it is -possible- that continuing to emit listener that have
been already removed is required by some dark corner of the code (if so
it is prolly best to find it sooner rather than later).

Thanks ! :-)

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - boost/boost.4127.warnings.patch boost/makefile.mk i18npool/qa i18npool/source

[Caolán McNamara]

 boost/boost.4127.warnings.patch|   19 
 boost/makefile.mk  |2 
 i18npool/qa/cppunit/test_breakiterator.cxx |   80 +++
 i18npool/source/breakiterator/data/README  |  722 +
 4 files changed, 823 insertions(+)

New commits:
commit b8b792babfa63ce2f59104117c961e96d8e265a7
Author: Caolán McNamara 
Date:   Mon Jul 23 16:07:11 2012 +0100

Related: boost#4127 strict-aliasing rules warning

Change-Id: I9b4f9009c29276054ff94a427adf51c2094377b5

diff --git a/boost/boost.4127.warnings.patch b/boost/boost.4127.warnings.patch
new file mode 100644
index 000..11a955f
--- /dev/null
+++ b/boost/boost.4127.warnings.patch
@@ -0,0 +1,19 @@
+--- misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp  (revision 69250)
 misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp(revision 69251)
+@@ -50,5 +50,16 @@
+ if( initialized_ )
+ {
++#if defined( __GNUC__ )
++
++// fixes incorrect aliasing warning
++T * p = reinterpret_cast< T* >( storage_.data_ );
++p->~T();
++
++#else
++
+ reinterpret_cast< T* >( storage_.data_ )->~T();
++
++#endif
++
+ initialized_ = false;
+ }
diff --git a/boost/makefile.mk b/boost/makefile.mk
index e223ddf..5ce795f 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -53,6 +53,8 @@ TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a
 PATCH_FILES=$(TARFILE_NAME).patch
 #https://svn.boost.org/trac/boost/ticket/3780
 PATCH_FILES+=boost.3780.aliasing.patch
+#https://svn.boost.org/trac/boost/ticket/4127
+PATCH_FILES+=boost.4127.warnings.patch
 #https://svn.boost.org/trac/boost/ticket/4713
 PATCH_FILES+=boost.4713.warnings.patch
 #https://svn.boost.org/trac/boost/ticket/5119
commit a1cb33edbbb03bbb5f856d8c180b8ad97bd708b0
Author: Caolán McNamara 
Date:   Mon Jul 23 15:20:04 2012 +0100

Related: #i13494# regression tests for word iterator

Change-Id: Ifad0a8ae01386db80a5eca9dfba8ee6841980139

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index b72deda..f983686 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -281,6 +281,86 @@ void TestBreakIterator::testWordBoundaries()
 CPPUNIT_ASSERT(m_xBreak->isEndWord(aTest, aBounds.endPos, aLocale, 
mode));
 }
 }
+
+//See https://issues.apache.org/ooo/show_bug.cgi?id=13494
+{
+const rtl::OUString aBase("xxAAxxBBxxCCxx");
+const sal_Unicode aTests[] =
+{
+'\'', ';', ',', '.', '!', '@', '#', '%', '&', '*',
+'(', ')', '_', '-', '{', '}', '[', ']', '\"', '/',
+'\\', '?', '~', '$', '+', '^', '=', '<', '>', '|'
+};
+
+const sal_Int32 aDoublePositions[] = {0, 2, 4, 6, 8, 10, 12, 14};
+for (size_t j = 0; j < SAL_N_ELEMENTS(aTests); ++j)
+{
+rtl::OUString aTest = aBase.replace('x', aTests[j]);
+sal_Int32 nPos = -1;
+size_t i = 0;
+do
+{
+CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aDoublePositions));
+nPos = m_xBreak->nextWord(aTest, nPos, aLocale, 
i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
+CPPUNIT_ASSERT(nPos == aDoublePositions[i++]);
+}
+while (nPos < aTest.getLength());
+nPos = aTest.getLength();
+i = SAL_N_ELEMENTS(aDoublePositions)-1;
+do
+{
+nPos = m_xBreak->previousWord(aTest, nPos, aLocale, 
i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
+CPPUNIT_ASSERT(nPos == aDoublePositions[--i]);
+}
+while (nPos > 0);
+}
+
+const sal_Int32 aSinglePositions[] = {0, 1, 3, 4, 6, 7, 9, 10};
+for (size_t j = 1; j < SAL_N_ELEMENTS(aTests); ++j)
+{
+rtl::OUString aTest = aBase.replaceAll(rtl::OUString("xx"), 
rtl::OUString(aTests[j]));
+sal_Int32 nPos = -1;
+size_t i = 0;
+do
+{
+CPPUNIT_ASSERT(i < SAL_N_ELEMENTS(aSinglePositions));
+nPos = m_xBreak->nextWord(aTest, nPos, aLocale, 
i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
+CPPUNIT_ASSERT(nPos == aSinglePositions[i++]);
+}
+while (nPos < aTest.getLength());
+nPos = aTest.getLength();
+i = SAL_N_ELEMENTS(aSinglePositions)-1;
+do
+{
+nPos = m_xBreak->previousWord(aTest, nPos, aLocale, 
i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
+CPPUNIT_ASSERT(nPos == aSinglePositions[--i]);
+}
+while (nPos > 0);
+}
+
+const sal_Int32 aSingleQuotePositions[] = {0, 1, 9, 10};
+CPPUNIT_ASSERT(aTests[0] == '\'');
+{
+rtl::OUString aTest = aBase.replaceAll(rtl::OUString("xx"), 
rtl::O

Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS

[Norbert Thiebaud]

On Mon, Jul 23, 2012 at 10:06 AM, Norbert Thiebaud  wrote:
> On Mon, Jul 23, 2012 at 9:48 AM, Thorsten Behrens
>  wrote:
>> Jan Holesovsky wrote:
>>> Thanks so much for that! - looks great to me; we should probably remove
>>> the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse
>>> others too, right? :-)
>>>
>> No idea - Norbert, you were refactoring that recently, any opinion?
>
> no I (should) not have touched that...
> I will run a test after the next builbot iteration to verify the
> fix... but reading I would concur to +1

ok so vertical rulers looks fine on master... so +1

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source

[Michael Meeks]

 vcl/source/app/vclevent.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 222b7032153cfd3a6f5e12e2fc855ccabc2ea769
Author: Michael Meeks 
Date:   Mon Jul 23 14:53:27 2012 +0100

fdo#47368 - fix one potential re-enterancy hazard around even emission

Change-Id: I8be50fb82d1333731dae825b1785e981fe69adbd
Signed-off-by: Norbert Thiebaud 

diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index 613a659..2656c15 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -69,7 +69,10 @@ void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
 ImplDelData aDel( pWinEvent->GetWindow() );
 while ( aIter != aCopy.end() && ! aDel.IsDead() )
 {
-(*aIter).Call( pEvent );
+Link &rLink = *aIter;
+// check this hasn't been removed in some re-enterancy scenario 
fdo#47368
+if( std::find(m_aListeners.begin(), m_aListeners.end(), rLink) != 
m_aListeners.end() )
+rLink.Call( pEvent );
 aIter++;
 }
 }
@@ -77,7 +80,9 @@ void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
 {
 while ( aIter != aCopy.end() )
 {
-(*aIter).Call( pEvent );
+Link &rLink = *aIter;
+if( std::find(m_aListeners.begin(), m_aListeners.end(), rLink) != 
m_aListeners.end() )
+rLink.Call( pEvent );
 aIter++;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC 2012][Collaboration] status, ideas

[Eike Rathke]

Hi Matúš,

On Friday, 2012-07-20 22:35:53 +0200, Matúš Kukan wrote:

> https://gerrit.libreoffice.org/#/c/336/

See my nitpicking there..

> > Right; there is a need to associated XFrames - or SfxSomething's 
> > with
> > collaboration sessions I suppose that bit needs doing;
> 
> It's associated to ScDocFuncSend.
> But It does not work if we -
> open another document | receive another channel -
> between receiving channel and setting session for document belonging
> to that channel.

Is that '|' as in one or the other? Or the sequence of opening another
document and receiving another channel? Anyhow, I think that could be
solved by queuing the requested channels while an association of channel
with document is in progress.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpwg1hHFx2d3.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #9

[Thorsten Behrens]

Marco Cecchetti wrote:
> A survey on the state of svg text support
> link:
> https://docs.google.com/document/d/1hc-0Jh78PiVgn7vT9VRlhv9wlwkBCBqE2bN7v4Ogmhk/edit?pli=1#
> 
Hi Marco,

nice research & writeup - I wonder if some distilled version of that
would be possible as a README in filter/source/svg - always good to
preserve rationale for later hackers looking at the code. ;)

Given the contraints, I agree with your conclusion, but would like
to ask you to make the choice between absolute glyph positions (and
native font runs) configurable (can be a hidden config item or
somesuch). Since it's a rather nasty tradeoff, for high-fidelity
presentations, given my past experience, people would probably
prefer exactly-rendered text ...

Cheers,

-- Thorsten


pgpjfzwCHB460.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

mdds::multi_type_vector (was: Re: C++11 in LibreOffice)

[Kohei Yoshida]

On 07/23/2012 05:04 AM, Lubos Lunak wrote:


  Where's the benchmark for that? I'd like to see what difference it makes, but
I cannot find anything in the blog post.


Good question.  I didn't put benchmark data in because I wanted to first 
get the background story out first, which I knew was going to be 
somewhat long.  I'll do another blog post just for benchmarks, and for 
other performance considerations.


Having said that, I have _some_ numbers to share.  While I can't really 
test the real spreadsheet storage benchmark since doing that would 
require we actually put this structure into ScColumn for real), we can 
simulate it by using the former matrix backend container 
mixed_type_matrix, and compare it to multi_type_matrix which uses 
multi_type_vector as its backend storage.  mixed_type_matrix also had 
its elements allocated on the heap and their memory locations stored in 
its primary array, so it had the same weakness as the current cell 
storage model in ScColumn.


Here are the numbers.  The test scenario is to 1) create a 100,000 by 
1,000 matrix instance and fill it with numeric values, and 2) iterate 
through all its elements and calculate their total.  The results are:


mixed_type_matrix:
1) 0.887776 sec
2) 1.96097 sec

multi_type_matrix:
1) 0.819243 sec
2) 0.364899 sec

The instantiation and insertion performance is only slightly faster, but 
element iteration performance is noticeably faster with multi_type_matrix.


The test code was compiled with g++ with only -Os flag.  I haven't 
tested it with any other optimization flags that gcc provides.


Best,

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS

[Thorsten Behrens]

Michael Meeks wrote:
>   +1 from me - it simply duplicates the equivalent code [cough] from
> DrawText - right ? ;-)
> 
Yes. ;)

-- Thorsten


pgpglEapxrvtB.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS

[Thorsten Behrens]

Jan Holesovsky wrote:
> Thanks so much for that! - looks great to me; we should probably remove
> the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse
> others too, right? :-)
> 
No idea - Norbert, you were refactoring that recently, any opinion?

-- Thorsten


pgpZi7zv0NYgd.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] Fix for sw_filter_test crash due to ambiguous FieldEntry destructor

[Michael Stahl]

On 22/07/12 11:25, Kristian Rietveld wrote:
> (Please keep me on CC as I am not subscribed to the list)

> During the build, however, the "sw_filters_test" unit test crashes. The 
> crash happens in rtl_string_release from the FieldEntry (the one in 
> sw/source/file/ww8/ww8par.hxx) destructor. The FieldEntry destructor is 
> called through a dyld stub.
> 
> After reading assembly code I figured that the FieldEntry destructor 
> being executed does not match the FieldEntry's fields. What was already 
> suspicious above is that rtl_string_release is being called even though 
> this FieldEntry uses OUStrings.
> 
>  From the assembly code I guess the FieldEntry destructor being executed 
> is actually the one in registry/source/reflwrit.cxx.  So my impression 
> is that the dynamic linker on OS X is simply calling the wrong 
> destructor (the symbols have the same name).

that is really not supposed to happen, we really should build everything
with -fvisibility=hidden on all platforms where unnecessarily exported
symbols cause such problems (guess that means everything but Windows).

on master and libreoffice-3-6, in solenv/gbuild/platform/macosx.mk the
-fvisibility=hidden is inside:

> ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)

can you check that that is actually detected properly for your compiler?
and if so, that it's actually on the command line in a "make registry
VERBOSE=t"?
perhaps the check for it is broken somehow.

ah, there is another one, i wonder what that does:

> ifneq ($(HAVE_GCC_VISIBILITY_BROKEN),TRUE)

possibly in this day and age we should strongly consider hard-requiring
visibility support in configure, i.e. reject compilers that can't do it.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] Tinderbox nightlies broken (was Re: No Win builds?)

[Rainer Bielefeld]

Jan Holesovsky schrieb:


Adding the QA guys - from my point of view, the nightly should be as
close to our 'normal' installation as possible (ie. .msi), so that the
QA guys can see installation problems early too.  But up to them do
decide, I guess.


Hi,

that all is a little true for particular tester's preferences. I usually 
do server installations (msiexec /a) and modify bootstrap.ini to an 
existing LibOdev profile, what has been copied from my normal 
installation profile. So I have a realistic test environment. I think 
that would also be possible with  zip, and I already did so with MinGW 
builds sometimes. I saw few installer problems, so I believe .ZIPs as 
daily builds would not have bigger disadvantages.


For occasional testers the simple "installation" of zips (using their 
individual own profile) even might be favorable, so someone has the 
possibility to test a fix for a particular problem with a master build 
without need to learn anything about parallel installation or similar. 
Most times that worked well for me with MinGW builds, what came very 
reliable every day, but currently source has run dry? We will discuss 
those needs additionally during German QA-Weekend.


An Additional advantage of master.zip builds might be that we could 
invite interested WIN users to see and test new features very early.


For me that "quick and easy" is less important because I have to do some 
"administration overhead" to keep overview for the lots of versions.


Very interesting for me (and may be 5 ... 10 other "power testers" would 
be some kind of feed / newsletter or whatever with "New build from 
Tinderbx @xx available"


Best regards


Rainer


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sal/osl

[Michael Meeks]

 sal/osl/unx/system.c |   25 -
 1 file changed, 20 insertions(+), 5 deletions(-)

New commits:
commit ba47dd6f03cfea17ae1117598bed8fe4e7d18a51
Author: Arnaud Versini 
Date:   Sun Jul 22 16:04:06 2012 +0200

Don't use a mutex for gethostbyname_r on Mac OS X

Change-Id: I5b8c7901266ae73d95626e98116b9a3b43710642

diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 720d1cd..1eaeb18 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -30,11 +30,26 @@
 
 #ifdef NO_PTHREAD_RTL
 
-static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
-
 /* struct passwd differs on some platforms */
+
 #if defined(MACOSX) || defined(IOS) || defined(OPENBSD) || defined(NETBSD)
 
+//No mutex needed on Mac OS X, gethostbyname is thread safe
+
+#if defined(MACOSX)
+
+#define RTL_MUTEX_LOCK
+#define RTL_MUTEX_UNLOCK
+
+#else //defined(MACOSX)
+
+static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+#define RTL_MUTEX_LOCK pthread_mutex_lock(&getrtl_mutex);
+#define RTL_MUTEX_UNLOCK pthread_mutex_unlock(&getrtl_mutex);
+
+#endif //defined(MACOSX)
+
 extern int h_errno;
 
 struct hostent *gethostbyname_r(const char *name, struct hostent *result,
@@ -50,7 +65,7 @@ struct hostent *gethostbyname_r(const char *name, struct 
hostent *result,
  */
   struct hostent* res;
 
-  pthread_mutex_lock(&getrtl_mutex);
+  RTL_MUTEX_LOCK
 
   if ( (res = gethostbyname(name)) )
   {
@@ -120,9 +135,9 @@ struct hostent *gethostbyname_r(const char *name, struct 
hostent *result,
 *h_errnop = h_errno;
 }
 
-pthread_mutex_unlock(&getrtl_mutex);
+RTL_MUTEX_UNLOCK
 
-  return res;
+return res;
 }
 #endif // OSX || IOS || OPENBSD || NETBSD
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: config_host.mk.source configure.in

[Jan Holesovsky]

 config_host.mk.source |3 ++-
 configure.in  |4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 17ddd27bf543eadebe3d950b5184ffce48bd5014
Author: Jan Holesovsky 
Date:   Mon Jul 23 16:35:01 2012 +0200

Use config_host.mk.source when configuring 'build' for cross-compilation.

Change-Id: I2e6e2a98bbaf515ececa75948d6b20bf9a093fe5

diff --git a/config_host.mk.source b/config_host.mk.source
index 10dd617..89f5f4b 100644
--- a/config_host.mk.source
+++ b/config_host.mk.source
@@ -5,6 +5,7 @@
 #   source ./config_host.mk.source
 
 temp_conf=`mktemp config_host.mk.XX`
-sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/' config_host.mk >$temp_conf
+sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/' \
+-e 's/^\s*export\s\+\([A-Z0-9_]*\)?=\(.*\)$/export \1="${\1:-\2}"/' 
config_host.mk >$temp_conf
 source ./$temp_conf
 rm $temp_conf
diff --git a/configure.in b/configure.in
index 1006d37..264c6c6 100644
--- a/configure.in
+++ b/configure.in
@@ -3527,6 +3527,7 @@ if test "$cross_compiling" = "yes"; then
 bin/repo-list.in \
 config.guess \
 config_host.mk.in \
+config_host.mk.source \
 configure \
 ooo.lst.in \
 oowintool \
@@ -3571,8 +3572,7 @@ if test "$cross_compiling" = "yes"; then
 test -f ./config_host.mk 2>/dev/null || exit
 cp config_host.mk ../config_build.mk
 cp config.log ../config.Build.log
-sed -e 's,=\(.*\),="\1",' < config_host.mk > config_host.sh
-. ./config_host.sh
+. ./config_host.mk.source
 for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON 
GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
  PYTHON SYSTEM_LIBXSLT; do
 VV='$'$V
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS

[Michael Meeks]

On Mon, 2012-07-23 at 15:53 +0200, Jan Holesovsky wrote:
> > would some two people please review & then cherry-pick
> >  
> > http://cgit.freedesktop.org/libreoffice/core/commit/?id=5bfba6ee21b5576c9da475b13d7db0f735f078d2
>
> Thanks so much for that! - looks great to me; we should probably remove
> the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse
> others too, right? :-)
> 1 more review + cherry-pick still needed.

+1 from me - it simply duplicates the equivalent code [cough] from
DrawText - right ? ;-)

Regards,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: cui/source

[Stephan Bergmann]

 cui/source/options/optcolor.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6a90d4ec8afd1e58c9b69f4de1364d5b5624300b
Author: Stephan Bergmann 
Date:   Mon Jul 23 16:28:22 2012 +0200

-Werror=sign-compare

Change-Id: I6be5df685575c6909d4adfcee0ccc4fb0bd4b600

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 7bbc437..5c90b65 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1033,7 +1033,7 @@ unsigned ColorConfigWindow_Impl::GetPosBehindLastChapter 
() const
 long ColorConfigWindow_Impl::GetDeltaAbove (Group eGroup) const
 {
 long nDelta = 0;
-for (unsigned i = 0; i != eGroup; ++i)
+for (int i = 0; i != eGroup; ++i)
 if (!IsGroupVisible(static_cast(i)))
 nDelta += vChapters[i]->GetHeight();
 return nDelta;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED]] fdo#48549 System::Beep() removal

[Michael Meeks]

On Mon, 2012-07-23 at 03:10 -0700, Mathieu Vonlanthen wrote:
> I send a new version of the patch taking into account the last commits.
> I didn't add error reporting because I don't know the official way to do
> this.

Thanks :-) One thing that is worth doing is compiling your code before
submitting it, anyhow - I did a little cleanup and it works nicely; in
addition - people get upset about warnings breaking their build - so a
warning-free compilation is rather a bonus.

Nevertheless - nice work :-) can you close the bug ? What else would
you like to work on ? there is certainly a lot that needs cleaning up &
improving :-)

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - basctl/source basic/source cui/source formula/source sc/source svtools/source svx/source svx/workben sw/source vcl/source

[Michael Meeks]

 basctl/source/basicide/baside2.cxx  |   18 -
 basctl/source/basicide/baside2b.cxx |   23 +
 basctl/source/basicide/brkdlg.cxx   |1 
 basic/source/runtime/methods.cxx|1 
 cui/source/options/optcolor.cxx |2 -
 formula/source/ui/dlg/funcutl.cxx   |4 ---
 sc/source/core/data/documen4.cxx|2 -
 sc/source/ui/app/inputhdl.cxx   |6 
 sc/source/ui/docshell/docfunc.cxx   |6 
 sc/source/ui/docshell/olinefun.cxx  |9 --
 sc/source/ui/navipi/content.cxx |2 -
 sc/source/ui/navipi/navipi.cxx  |2 -
 sc/source/ui/view/editsh.cxx|   12 -
 sc/source/ui/view/gridwin.cxx   |   10 ---
 sc/source/ui/view/gridwin2.cxx  |2 -
 sc/source/ui/view/select.cxx|1 
 sc/source/ui/view/tabcont.cxx   |3 --
 sc/source/ui/view/tabvwshe.cxx  |1 
 sc/source/ui/view/viewfun2.cxx  |4 ---
 sc/source/ui/view/viewfun6.cxx  |   47 ++--
 sc/source/ui/view/viewfunc.cxx  |2 -
 svtools/source/contnr/fileview.cxx  |3 --
 svtools/source/contnr/svlbitm.cxx   |2 -
 svtools/source/contnr/svtreebx.cxx  |1 
 svtools/source/edit/textview.cxx|5 ---
 svx/source/fmcomp/gridctrl.cxx  |1 
 svx/source/form/tbxform.cxx |1 
 svx/workben/edittest.cxx|2 -
 sw/source/ui/utlui/content.cxx  |6 
 vcl/source/control/field2.cxx   |7 -
 vcl/source/window/menu.cxx  |   13 -
 31 files changed, 15 insertions(+), 184 deletions(-)

New commits:
commit 20ac67f06bc1a21a52e0843de3139d3d6133e4de
Author: Michael Meeks 
Date:   Mon Jul 23 15:12:15 2012 +0100

WaE: misc. fixes.

Change-Id: I6cab01b0b82f7b82fff617715c5af45d23c536fe

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 0c91e85..696d603 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -772,7 +772,6 @@ void ModulWindow::BasicAddWatch()
 aWatchStr = GetEditView()->GetSelected();
 pLayout->GetWatchWindow().AddWatch( aWatchStr );
 pLayout->GetWatchWindow().UpdateWatches();
-bInserted = sal_True;
 }
 }
 }
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index d10859c..3682d72 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2006,6 +2006,7 @@ sal_Bool WatchTreeListBox::ImplBasicEntryEdited( 
SvLBoxEntry* pEntry, const Stri
 bError = sal_True;
 SbxBase::ResetError();
 }
+(void)bError; // used to Beep.
 
 UpdateWatches();
 
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index ee68e3b..7bbc437 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -779,7 +779,7 @@ void ColorConfigWindow_Impl::SetAppearance ()
 ColorListBox aSampleColorList(this);
 {
 XColorListRef const xColorTable = XColorList::CreateStdColorList();
-for (unsigned i = 0; i != xColorTable->Count(); ++i)
+for (sal_Int32 i = 0; i != xColorTable->Count(); ++i)
 {
 XColorEntry& rEntry = *xColorTable->GetColor(i);
 aSampleColorList.InsertEntry(rEntry.GetColor(), rEntry.GetName());
diff --git a/sc/source/ui/docshell/olinefun.cxx 
b/sc/source/ui/docshell/olinefun.cxx
index 3c177eb..223eb2d 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -444,6 +444,7 @@ sal_Bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, 
sal_Bool bColumns, sal_uInt1
 
 sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool 
bRecord, sal_Bool bApi )
 {
+(void)bApi;
 sal_Bool bDone = false;
 
 SCCOL nStartCol = rRange.aStart.Col();
commit 0f6101cfef4c2e45d9f1f1b3a61ef94799e4526b
Author: Mathieu Vonlanthen 
Date:   Thu Jul 19 11:02:45 2012 +0200

fdo#48549 System::Beep() removal

Change-Id: I8fe133dd8d1f759fbe21d47ae358c0b5451812b5

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index d427a30..0c91e85 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -546,7 +546,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
 CheckCompileBasic();
 if ( aStatus.bError )
 {
-Sound::Beep();
 return sal_False;
 }
 
@@ -572,9 +571,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
 }
 }
 }
-
-if ( !bNewBreakPoint )
-Sound::Beep();
 }
 }
 
@@ -753,7 +749,6 @@ void ModulWindow::BasicAddWatch()
 {
 DBG_CHKTHIS( ModulWindow, 0 );
 String aWatchStr;
-sal_Bool bInserted = sal_False;
 AssertValidEditEngine();
 sal_Bool bAdd = sal_True;
 if ( !GetEditView()->HasSelection() )
@@ -780,9 +77

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/db/SQLQueryComposer.java |   33 +-
 1 file changed, 24 insertions(+), 9 deletions(-)

New commits:
commit c5b6a945e898ded83613afefbedef71372665b13
Author: Lionel Elie Mamane 
Date:   Thu Jul 12 23:23:03 2012 +0200

fdo#50800 populate composedCommandNames ASAP, not at call of getFromClause

In particular com/sun/star/wizards/ui/FilterComponent calls getSelectClause 
before calling getFromClause, and then all hell breaks loose: 
composedCommandNames is empty, thus cannot find the proper Alias column name, 
thus the column names in the select list were not properly escaped, ...
We have just made getFromClause quadratic instead of linear, but:
1) I do not think this would be a problem (small datastructures)
2) If it is, rather use a hashmap or something like that, wich will also 
make getSelectClause faster

Also make the fallback case of "unknown table" more robust: escape the 
table name (if any) and column name!

Change-Id: I474adc51fc6378d836bd5865d9eb9505983dcbc5
Sgined-off-by: Miklos Vajna 

diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java 
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 8469a2b..3a2d0b6 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -68,7 +68,7 @@ public class SQLQueryComposer
 {
 try
 {
-this.CurDBMetaData = _CurDBMetaData;
+setDBMetaData(_CurDBMetaData);
 xMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, 
CurDBMetaData.DBConnection);
 final Object oQueryComposer = 
xMSF.createInstance("com.sun.star.sdb.SingleSelectQueryComposer");
 m_xQueryAnalyzer = 
UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class, oQueryComposer);
@@ -231,6 +231,7 @@ public class SQLQueryComposer
 public void setDBMetaData(QueryMetaData _oDBMetaData)
 {
 this.CurDBMetaData = _oDBMetaData;
+updateComposedCommandNames();
 }
 
 private PropertyValue[][] replaceConditionsByAlias(PropertyValue 
_filterconditions[][])
@@ -255,22 +256,30 @@ public class SQLQueryComposer
 return m_xQueryAnalyzer.getQuery();
 }
 
-public StringBuilder getFromClause()
+private void updateComposedCommandNames()
 {
-StringBuilder sFromClause = new StringBuilder("FROM");
 composedCommandNames.clear();
 String[] sCommandNames = CurDBMetaData.getIncludedCommandNames();
 for (int i = 0; i < sCommandNames.length; i++)
 {
-CommandName curCommandName = new CommandName(CurDBMetaData, 
sCommandNames[i]); //(setComposedCommandName)
+CommandName curCommandName = new CommandName(CurDBMetaData, 
sCommandNames[i]);
 
curCommandName.setAliasName(getuniqueAliasName(curCommandName.getTableName()));
+composedCommandNames.add(curCommandName);
+}
+}
+
+public StringBuilder getFromClause()
+{
+StringBuilder sFromClause = new StringBuilder("FROM");
+String[] sCommandNames = CurDBMetaData.getIncludedCommandNames();
+for (int i = 0; i < sCommandNames.length; i++)
+{
+CommandName curCommandName = 
getComposedCommandByDisplayName(sCommandNames[i]);
 sFromClause.append(" 
").append(curCommandName.getComposedName()).append(" 
").append(quoteName(curCommandName.getAliasName()));
 if (i < sCommandNames.length - 1)
 {
 sFromClause.append(", ");
 }
-// fill composedCommandNames
-composedCommandNames.add(curCommandName);
 }
 return sFromClause;
 }
@@ -320,13 +329,19 @@ public class SQLQueryComposer
 private String getComposedAliasFieldName(String _fieldname)
 {
 FieldColumn CurFieldColumn = 
CurDBMetaData.getFieldColumnByDisplayName(_fieldname);
-CommandName curComposedCommandName = 
getComposedCommandByDisplayName(CurFieldColumn.getCommandName());
+final String curCommandName = CurFieldColumn.getCommandName();
+final String curFieldName = CurFieldColumn.getFieldName();
+CommandName curComposedCommandName = 
getComposedCommandByDisplayName(curCommandName);
 if (curComposedCommandName == null)
 {
-return _fieldname;
+//return _fieldname;
+if ( curCommandName.length() > 0 )
+return quoteName(curCommandName) + "." + 
quoteName(curFieldName);
+else
+return quoteName(CurFieldColumn.getFieldName());
 }
 String curAliasName = curComposedCommandName.getAliasName();
-return quoteName(curAliasName) + "." + 
quoteName(CurFieldColumn.getFieldName());
+return quoteName(curAliasName) + "." + quoteName(curFieldName);
 }
 
 private CommandName getComposedCommandByAliasName(String _AliasName)
_

[Libreoffice-commits] .: Branch 'feature/chart_errorbars' - 0 commits -

[Rafael Dominguez]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/template-dialog' - 0 commits -

[Rafael Dominguez]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH (partial)] fdo#48549 System::Beep() removal

[Philipp Riemer]

Hey,

2012/7/23 Mathieu Vonlanthen :
> Hi,
> Here is my license statement:
> -
> All of my past & future contributions to LibreOffice may be licensed
> under the MPL/LGPLv3+ dual license.
> --
> I send a new version of the patch taking into account the last commits.
> I didn't add error reporting because I don't know the official way to do
> this.
>
> Best regards
>
> Mathieu Vonlanthen

Thank you very much for your work! Having reviewed your patch, I still
think that a warning/logging might be helpful for latter debugging in
the following files:

* basctl/source/basicide/baside2.cxx
  - @@ -572,9 +571,6 @@ sal_Bool ModulWindow::ToggleBreakPoint(
sal_uLong nLine )
  - @@ -790,10 +782,7 @@ void ModulWindow::BasicAddWatch()
  - @@ -1022,10 +1011,6 @@ void ModulWindow::ExecuteCommand( SfxRequest& rReq )
* basic/source/runtime/methods.cxx
* formula/source/ui/dlg/funcutl.cxx
* sc/source/ui/app/inputhdl.cxx
* sc/source/ui/docshell/olinefun.cxx
* sc/source/ui/navipi/content.cxx
* sc/source/ui/navipi/navipi.cxx
* sc/source/ui/view/viewfun2.cxx
* sc/source/ui/view/viewfun6.cxx
* svtools/source/edit/textview.cxx
* svx/source/form/tbxform.cxx
* svx/workben/edittest.cxx
* sw/source/ui/utlui/content.cxx

But I do not know what the general opinion of the LO developers for
that cases is... Maybe they are happy without any logging in there...
Whould love to hear from the others what they think.

Nevertheless, removing that annoying beeps is a good thing!

Cheers,
Philipp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: setup_native/prj setup_native/source

[Fridrich Strba]

 setup_native/prj/d.lst |6 ++
 setup_native/source/win32/wintools/makecab/makefile.mk |   10 +++---
 setup_native/source/win32/wintools/msidb/makefile.mk   |   10 +++---
 setup_native/source/win32/wintools/msiinfo/makefile.mk |   10 +++---
 setup_native/source/win32/wintools/msiinfo/msiinfo.c   |   14 +++---
 setup_native/source/win32/wintools/msimsp/makefile.mk  |   10 +++---
 setup_native/source/win32/wintools/msitran/makefile.mk |   10 +++---
 7 files changed, 48 insertions(+), 22 deletions(-)

New commits:
commit 65e2c77e762a667b965ab3dc2bcaf8b8d1a0bc91
Author: Fridrich Å trba 
Date:   Mon Jul 23 15:59:44 2012 +0200

Build the cross-msi-tools if winegcc is found

Change-Id: Idc58b314a0721507e80e7b0e6216f29090f1d347

diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 19669cd..581bd85 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -1,7 +1,13 @@
 mkdir: %_DEST%\bin\osl
 ..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
 ..\%__SRC%\bin\*.exe %_DEST%\bin\*.exe
+..\%__SRC%\bin\*.exe.so %_DEST%\bin\*.exe.so
 ..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
+symlink: %_DEST%\bin\makecab.exe %_DEST%\bin\makecab
+symlink: %_DEST%\bin\msidb.exe %_DEST%\bin\msidb
+symlink: %_DEST%\bin\msiinfo.exe %_DEST%\bin\msiinfo
+symlink: %_DEST%\bin\msimsp.exe %_DEST%\bin\msimsp
+symlink: %_DEST%\bin\msitran.exe %_DEST%\bin\msitran
 
 mkdir: %_DEST%\bin\userscripts
 ..\%__SRC%\bin\install %_DEST%\bin\userscripts\install
diff --git a/setup_native/source/win32/wintools/makecab/makefile.mk 
b/setup_native/source/win32/wintools/makecab/makefile.mk
index c8fee10..b30a520 100644
--- a/setup_native/source/win32/wintools/makecab/makefile.mk
+++ b/setup_native/source/win32/wintools/makecab/makefile.mk
@@ -20,11 +20,15 @@ TARGET=sn_makecab
 .IF "$(WINEGCC)"==""
 @all:
 @echo "No winegcc present, not building makecab..."
-.ELSE
-@all:
-@echo "Not building makecab yet, stay tuned..."
 .ENDIF
 
+@all: $(BIN)/makecab.exe $(BIN)/makecab.exe.so
+
+$(BIN)/makecab.exe.so: $(BIN)/makecab.exe
+
+$(BIN)/makecab.exe:
+   $(WINEGCC) -o $(BIN)/makecab.exe makecab.c parseddf.c -mconsole -lmsi 
+
 # --- Targets --
 
 .INCLUDE : target.mk
diff --git a/setup_native/source/win32/wintools/msidb/makefile.mk 
b/setup_native/source/win32/wintools/msidb/makefile.mk
index 2bb31bc..6c1f0f3 100644
--- a/setup_native/source/win32/wintools/msidb/makefile.mk
+++ b/setup_native/source/win32/wintools/msidb/makefile.mk
@@ -20,11 +20,15 @@ TARGET=sn_msidb
 .IF "$(WINEGCC)"==""
 @all:
 @echo "No winegcc present, not building msidb..."
-.ELSE
-@all:
-@echo "Not building msidb yet, stay tuned..."
 .ENDIF
 
+@all: $(BIN)/msidb.exe $(BIN)/msidb.exe.so
+
+$(BIN)/msidb.exe.so: $(BIN)/msidb.exe
+
+$(BIN)/msidb.exe:
+   $(WINEGCC) -o $(BIN)/msidb.exe msidb.c -municode -lmsi 
+
 # --- Targets --
 
 .INCLUDE : target.mk
diff --git a/setup_native/source/win32/wintools/msiinfo/makefile.mk 
b/setup_native/source/win32/wintools/msiinfo/makefile.mk
index 62e09b5..d7aab3b 100644
--- a/setup_native/source/win32/wintools/msiinfo/makefile.mk
+++ b/setup_native/source/win32/wintools/msiinfo/makefile.mk
@@ -20,11 +20,15 @@ TARGET=sn_msiinfo
 .IF "$(WINEGCC)"==""
 @all:
 @echo "No winegcc present, not building msiinfo..."
-.ELSE
-@all:
-@echo "Not building msiinfo yet, stay tuned..."
 .ENDIF
 
+@all: $(BIN)/msiinfo.exe $(BIN)/msiinfo.exe.so
+
+$(BIN)/msiinfo.exe.so: $(BIN)/msiinfo.exe
+
+$(BIN)/msiinfo.exe:
+   $(WINEGCC) -o $(BIN)/msiinfo.exe msiinfo.c -mconsole -municode -lmsi 
+
 # --- Targets --
 
 .INCLUDE : target.mk
diff --git a/setup_native/source/win32/wintools/msiinfo/msiinfo.c 
b/setup_native/source/win32/wintools/msiinfo/msiinfo.c
index 2a33684..37bbe09 100644
--- a/setup_native/source/win32/wintools/msiinfo/msiinfo.c
+++ b/setup_native/source/win32/wintools/msiinfo/msiinfo.c
@@ -33,7 +33,7 @@
 #define MAX_STORAGE_NAME 31
 #define COMMANDS 17
 
-static const uint commandMap[COMMANDS][4] =
+static const unsigned commandMap[COMMANDS][4] =
 {{'c', PID_CODEPAGE, VT_I2},
  {'t', PID_TITLE, VT_LPSTR},
  {'j', PID_SUBJECT, VT_LPSTR},
@@ -61,7 +61,7 @@ static const char * commandNames[COMMANDS] =
 static void parseDate(LPCWSTR value, SYSTEMTIME *time)
 {
 LPWSTR field;
-uint len = 4*sizeof(WCHAR);
+unsigned len = 4*sizeof(WCHAR);
 
 if (lstrlenW(value) != 19) return;
 field = malloc(len + sizeof(WCHAR));
@@ -93,7 +93,7 @@ static void parseDate(LPCWSTR value, SYSTEMTIME *time)
 static BOOL msiinfoDisplayProperties(LPWSTR dbfile)
 {
 MSIHANDLE dbhandle, infohandle;
-uint i, r, dataType;
+unsigned i, r, dataType;
 INT iVal;
 FILETIME ftVal;
 SYSTEMTIME sysTime;
@@ -137,9 +137,9 @@ static BOOL msiinfoDisplayProperties(LPWSTR dbfile)
 re

[PUSHED] fdo#47957: refactoring and simplifying the color config settings

[Michael Meeks]

On Mon, 2012-07-23 at 14:33 +0200, János Uray wrote:
> Instead of the data members and the 7 arrays, there are now two
> classes in ColorConfigWindow_Impl: Entry and Chapter, and they contain
> the widgets as private data members. They have several member
> functions to handle the widgets.

Lovely :-) I like this sort of numstat:

943 1209cui/source/options/optcolor.cxx

Always good to remove & cleanup more code than is added.

Nice work :-)

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 52205, which changed state.

Bug 52205 Summary: EDITING: Regression: reference to CSV becomes a string, not 
an integer
https://bugs.freedesktop.org/show_bug.cgi?id=52205

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS

[Jan Holesovsky]

Hi Thorsten,

On 2012-07-22 at 16:42 +0200, Thorsten Behrens wrote:

> would some two people please review & then cherry-pick
> 
>  
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=5bfba6ee21b5576c9da475b13d7db0f735f078d2
> 
> into libreoffice-3-6-0?

Thanks so much for that! - looks great to me; we should probably remove
the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse
others too, right? :-)

1 more review + cherry-pick still needed.

All the best,
Kendy

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - pango/pango-1.28.3.patch solenv/gbuild solenv/inc

[Tor Lillqvist]

 pango/pango-1.28.3.patch |   14 --
 solenv/gbuild/platform/macosx.mk |1 +
 solenv/inc/unxmacx.mk|2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit abf0ff683bc87fe6b2d88df0ae101d89740d6238
Author: Tor Lillqvist 
Date:   Mon Jul 23 16:27:57 2012 +0300

Avoid confusion in 10.7 SDK headers in at least Xcode45-DP3

When building with MAC_OS_X_VERSION_MAX_ALLOWED <
MAC_OS_X_VERSION_10_7,  does #define
NSPersistentStoreRequest NSObject (i.e. as a dummy) and does not
import .

But  doesn't do anything similar, it
imports  unconditionally. So if
 has already been included by then, it will
end up quite confusing.

Change-Id: I9de6885ea444a73bf5fd50aa6a3d132b9fcc2f31

diff --git a/pango/pango-1.28.3.patch b/pango/pango-1.28.3.patch
index 539bef7..ba6edcb 100644
--- a/pango/pango-1.28.3.patch
+++ b/pango/pango-1.28.3.patch
@@ -65,7 +65,7 @@
  # Checks for LibThai
 --- misc/pango-1.28.3/pango/pangoatsui-fontmap.c
 +++ misc/build/pango-1.28.3/pango/pangoatsui-fontmap.c
-@@ -27,6 +27,12 @@
+@@ -27,6 +27,17 @@
  #include "pango-impl-utils.h"
  #include "modules.h"
  
@@ -75,12 +75,17 @@
 +typedef int NSColorRenderingIntent;
 +#endif
 +
++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 && MACOSX_SDK_VERSION >= 1070
++// Avoid a problem in at least the XCode 4.5DP3 SDK 10.7 headers
++#import 
++#endif
++
  #import 
  
  typedef struct _FontHashKey  FontHashKey;
 --- misc/pango-1.28.3/pango/pangocairo-atsuifont.c
 +++ misc/build/pango-1.28.3/pango/pangocairo-atsuifont.c
-@@ -22,6 +22,12 @@
+@@ -22,6 +22,17 @@
  
  #include "config.h"
  
@@ -90,6 +95,11 @@
 +typedef int NSColorRenderingIntent;
 +#endif
 +
++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 && MACOSX_SDK_VERSION >= 1070
++// Avoid a problem in at least the XCode 4.5DP3 SDK 10.7 headers
++#import 
++#endif
++
  #import 
  
  #include "pango-impl-utils.h"
commit 59fa9d92972e60ef5d7278454d584dae582401c0
Author: Tor Lillqvist 
Date:   Mon Jul 23 16:26:38 2012 +0300

Define also MACOSX_SDK_VERSION in compilations

Change-Id: I1f9810b1230c4e3e5ca0571e5392297c1daf6a47

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 425c7d6..084c4c0 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -44,6 +44,7 @@ gb_OSDEFS := \
-DQUARTZ \
-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \
-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \
+   -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \
$(EXTRA_CDEFS) \
 
 
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 1a7c891..a5ea287 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -49,7 +49,7 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT 
-DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI
 #.EXPORT: MACOSX_DEPLOYMENT_TARGET
 CDEFS+:=-DQUARTZ
 
-EXTRA_CDEFS+:=-isysroot $(MACOSX_SDK_PATH)  
-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) 
-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED)
+EXTRA_CDEFS+:=-isysroot $(MACOSX_SDK_PATH)  
-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) 
-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) 
-DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION)
 
 # Name of library where static data members are initialized
 # STATICLIBNAME=static$(DLLPOSTFIX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tinderbox nightlies broken (was Re: No Win builds?)

[Norbert Thiebaud]

On Mon, Jul 23, 2012 at 4:30 AM, Lubos Lunak  wrote:
> On Sunday 22 of July 2012, Norbert Thiebaud wrote:
>> ... but I used a simple grep +
>> sed to extract INPATH=  simpler and most importantly avoid  using
>> 'make' on platform for which that may not resolve to a gnumake.
>
>  You forgot to tell grep what to grep for, so if anybody has updated after
> this, please pull again.
>
>> I added the push of LibO*.zip files in push_nightlies.sh.
>
>  Is there any point in uploading a .zip file with a Windows build?

I suspect that the 2 are exclusive right... so either there is a zip or a msi
so push_nightlies.sh should not care and do a best effort

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: writerfilter/source

[Stephan Bergmann]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6ffe20407f6dc599a309183dcb68b83616f1dcc6
Author: Stephan Bergmann 
Date:   Mon Jul 23 15:21:05 2012 +0200

warning C4101: unreferenced local variable

Change-Id: I8dcd71b73204d37d3125e38b6983af430fa4570c

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8156512..2d8c584 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -659,7 +659,7 @@ void 
lcl_MoveBorderPropertiesToFrame(uno::Sequence& rFrame
 }
 rFrameProperties.realloc(nStart);
 }
-catch( const uno::Exception& rEx )
+catch( const uno::Exception& )
 {
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cppu/source stoc/source

[Stephan Bergmann]

 cppu/source/uno/lbenv.cxx   |   15 ++-
 stoc/source/invocation_adapterfactory/iafactory.cxx |9 -
 2 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit a4967e4a7563e1d1bd43d1560ed95b9f6bbf58cd
Author: Stephan Bergmann 
Date:   Mon Jul 23 15:18:02 2012 +0200

Assertion clean-up

Change-Id: I234c615d9d3386da2b244709add5c029b76d346c

diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index ef37aee..3358fe9 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -187,17 +187,14 @@ inline void ObjectEntry::append(
 typelib_typedescription_acquire( (typelib_TypeDescription *) pTypeDescr );
 aNewEntry.pTypeDescr = pTypeDescr;
 
-::std::pair< Ptr2ObjectMap::iterator, bool > insertion(
+::std::pair< Ptr2ObjectMap::iterator, bool > i(
 pEnv->aPtr2ObjectMap.insert( Ptr2ObjectMap::value_type(
  pInterface, this ) ) );
-// No idea if the code above has side-effects and can't be just
-// bypassed in the no-OSL_ASSERT case, so avoid "unused variable" like 
this instead.
-(void) insertion;
-
-OSL_ASSERT( insertion.second ||
-(find( pInterface, 0 ) >= 0 &&
- // points to the same object entry:
- insertion.first->second == this) );
+SAL_WARN_IF(
+!i.second && (find(pInterface, 0) == -1 || i.first->second != this),
+"cppu",
+"map already contains " << i.first->second << " != " << this << " for "
+<< pInterface);
 aInterfaces.push_back( aNewEntry );
 }
 
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx 
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 72a880a..1a1ab13 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -861,11 +861,10 @@ Reference< XInterface > FactoryImpl::createAdapter(
 &adapter_set, m_receiver2adapters, xKey.get(), rTypes );
 if (0 == that) // again no entry
 {
-pair< t_ptr_set::iterator, bool > insertion(
-adapter_set->insert( pNew ) );
-// Avoid unused variable warning
-(void) insertion;
-OSL_ASSERT( insertion.second );
+pair< t_ptr_set::iterator, bool > i(adapter_set->insert(pNew));
+SAL_WARN_IF(
+!i.second, "stoc",
+"set already contains " << *(i.first) << " != " << pNew);
 that = pNew;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

REMINDER: Release 3.6.0-rc3 from libreoffice-3-6-0 branch

[Petr Mladek]

Hi,

please note that the commit deadline for 3.6.0-rc3 is today, July 23,
2012. It will be used as LO-3.6.0 final if no blocker is reported.


See also
http://wiki.documentfoundation.org/ReleasePlan#3.6_release
http://wiki.documentfoundation.org/Release_Criteria
http://wiki.documentfoundation.org/Development/Branches


Best Regards,
Petr


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Tinderbox nightlies broken (was Re: No Win builds?)

[Jan Holesovsky]

Hi Michael,

On 2012-07-23 at 12:38 +0200, Michael Stahl wrote:

> >> I added the push of LibO*.zip files in push_nightlies.sh.
> >
> >  Is there any point in uploading a .zip file with a Windows build?
> 
> that's a good question, it depends on what you want to test;
> for testing office functionality it's probably easier to use zips
> because they're trivial to install (just unzip) and use a private
> profile directory automatically, but they don't have bundled MSVC
> runtimes or system integration so you can't test that

Adding the QA guys - from my point of view, the nightly should be as
close to our 'normal' installation as possible (ie. .msi), so that the
QA guys can see installation problems early too.  But up to them do
decide, I guess.

Rainer, all - what do you prefer?

Regards,
Kendy

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: git branch audit - results ...

[Jan Holesovsky]

Hi Bjoern,

On 2012-07-20 at 23:45 +0200, Bjoern Michaelsen wrote:

> >   origin/feature/gbuildfixes
> 
> mostly mine. Whatever is in there is either merged or obsolete -> can be 
> deleted.

I've done that; but please, everybody, is it as simple as:

git push origin :feature/gbuildfixes

If you own a feature branch that is merged (or obsolete), just go ahead
and delete it, don't send "can be deleted" messages to the list.

Thank you,
Kendy

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/gbuildfixes' - 0 commits -

[Jan Holesovsky]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

[Caolán McNamara]

 vcl/source/components/rasterizer_rsvg.cxx |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 682cb83ed59233decbeeaff68c4d871442b58bb1
Author: Caolán McNamara 
Date:   Mon Jul 23 13:59:12 2012 +0100

Resolves: fdo#50975 rsvg_handle_new_from_data calls rsvg_handle_close

rsvg_handle_new_from_data calls rsvg_handle_fill_with_data which itself 
calls
rsvg_handle_close on success, so we don't have to.

And older versions of librsvg (e.g. 2.16.1) don't protect against
rsvg_handle_close getting called twice, although new versions do,
so we crash on e.g. RHEL-5

Change-Id: I451075e50c9c2c7b07289356d7a92eb55db82f9f

diff --git a/vcl/source/components/rasterizer_rsvg.cxx 
b/vcl/source/components/rasterizer_rsvg.cxx
index 00940c2..f5a7f57 100644
--- a/vcl/source/components/rasterizer_rsvg.cxx
+++ b/vcl/source/components/rasterizer_rsvg.cxx
@@ -117,7 +117,6 @@ public:
 // LibRSVG
 void rsvg_init() { (*mp_rsvg_init)(); }
 RsvgHandle* rsvg_handle_new_from_data( const guint8* data, gsize size, 
GError** error) { return( (*mp_rsvg_handle_new_from_data)( data, size, error ) 
); }
-gboolean rsvg_handle_close( RsvgHandle* handle, GError** error ) { return( 
(*mp_rsvg_handle_close)( handle, error ) ); }
 void rsvg_handle_set_dpi_x_y( RsvgHandle* handle, double dpix, double dpiy 
) { (*mp_rsvg_handle_set_dpi_x_y)( handle, dpix, dpiy ); }
 void rsvg_handle_get_dimensions( RsvgHandle* handle, RsvgDimensionData* 
dimensions ) { (*mp_rsvg_handle_get_dimensions)( handle, dimensions ); }
 gboolean rsvg_handle_render_cairo( RsvgHandle* handle, cairo_t* cairo ) { 
return( (*mp_rsvg_handle_render_cairo)( handle, cairo ) ); }
@@ -137,7 +136,6 @@ private:
 // LibRSVG
 void (*mp_rsvg_init)( void );
 RsvgHandle* (*mp_rsvg_handle_new_from_data)( const guint8*, gsize, 
GError** );
-gboolean (*mp_rsvg_handle_close)( RsvgHandle*, GError** );
 void (*mp_rsvg_handle_set_dpi_x_y)( RsvgHandle*, double, double );
 void (*mp_rsvg_handle_get_dimensions)( RsvgHandle*, RsvgDimensionData* );
 gboolean (*mp_rsvg_handle_render_cairo)( RsvgHandle*, cairo_t* );
@@ -189,14 +187,12 @@ LibraryWrapper::LibraryWrapper() :
 {
 mp_rsvg_init = ( void (*)( void ) ) osl_getAsciiFunctionSymbol( 
mpRSVGLib, "rsvg_init" );
 mp_rsvg_handle_new_from_data = ( RsvgHandle* (*)( const guint8*, 
gsize, GError** ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, 
"rsvg_handle_new_from_data" );
-mp_rsvg_handle_close = ( gboolean (*)( RsvgHandle*, GError** ) ) 
osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_close" );
 mp_rsvg_handle_set_dpi_x_y = ( void (*)( RsvgHandle*, double, double ) 
) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_set_dpi_x_y" );
 mp_rsvg_handle_get_dimensions = ( void (*)( RsvgHandle*, 
RsvgDimensionData* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, 
"rsvg_handle_get_dimensions" );
 mp_rsvg_handle_render_cairo = ( gboolean (*)( RsvgHandle*, cairo_t* ) 
) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_render_cairo" );
 
 if( !( mp_rsvg_init &&
mp_rsvg_handle_new_from_data &&
-   mp_rsvg_handle_close &&
mp_rsvg_handle_set_dpi_x_y &&
mp_rsvg_handle_get_dimensions &&
mp_rsvg_handle_render_cairo ) )
@@ -415,12 +411,15 @@ uno::Reference< graphic::XGraphic > 
Rasterizer::implGetXGraphicFromSurface( cair
 }
 while( nReadSize == nBlockSize );
 
-if( aDataBuffer.size() &&
-( NULL != ( mpRsvgHandle = rLib.rsvg_handle_new_from_data( 
reinterpret_cast< sal_uInt8* >( &aDataBuffer[ 0 ] ),
-   
aDataBuffer.size(), NULL ) ) ) &&
-!rLib.rsvg_handle_close( mpRsvgHandle, NULL ) )
+if (aDataBuffer.size())
 {
-implFreeRsvgHandle();
+//See: fdo#50975 rsvg_handle_new_from_data calls
+//rsvg_handle_fill_with_data which itself calls rsvg_handle_close
+//on success.  Older versions of librsvg (e.g. 2.16.1) don't
+//protect against rsvg_handle_close getting called twice, so we
+//shouldn't additionally call svg_handle_close here.
+mpRsvgHandle = rLib.rsvg_handle_new_from_data( reinterpret_cast< 
sal_uInt8* >( &aDataBuffer[ 0 ] ),
+   
aDataBuffer.size(), NULL );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-3-5]: fdo#39812: Writer: fix collapsing merged table border painti...

[Gerrit]

>From Michael Stahl :

Michael Stahl has uploaded a new change for review.

Change subject: fdo#39812: Writer: fix collapsing merged table border painting:
..

fdo#39812: Writer: fix collapsing merged table border painting:

Create a table with a merged cell like in the screenshot in the
bug, with a SAL_DEBUG in SwTabFrmPainter::PaintLines the following
lines are painted:

debug: paint start
1 debug: start: 2749,1488 end: 12387,1488
2 debug: start: 2749,1945 end: 7567,1945
3 debug: start: 7567,1945 end: 12387,1945
4 debug: start: 2749,2015 end: 12387,2015
5 debug: start: 2749,2542 end: 7567,2542
6 debug: start: 7567,2542 end: 12387,2542
7 debug: start: 2749,1488 end: 2749,1945
8 debug: start: 2749,1945 end: 2749,2015
9 debug: start: 2749,2015 end: 2749,2542
A debug: start: 7567,1945 end: 7567,2542
B debug: start: 12387,1488 end: 12387,1945
C debug: start: 12387,1945 end: 12387,2015
D debug: start: 12387,2015 end: 12387,2542
debug: paint end

*1*1*
7   B
7   B
*2*3*
8 A C
*4*4*
9 A D
9 A D
*5*6*

The problem is obviously that the Y coordinates of the lines 2, 3
and 4 differ; they should be on the same Y position.
The problem here is that logically horizontal lines must be painted
not centered but "below" the line, and It turns out that
SwTabFrmPainter::Insert cannot correct the positions properly to
do that, because it only looks at borders in a single cell.

When using the UI to set the borders, we get (for innner table borders)
only a bottom border in the cells, but no top borders, so the
top position of the logically vertical borders needs to be corrected
with the width of the bottom border of the cell _above_; a symmetric
correction of the bottom position to the top border of the cell below
is also necessary.

Fortunately if we just leave the positons alone in Insert then
TabFrmPainter will eliminate duplicate lines with equal positions
and so it's only necessary to correct the positions when actually
painting the line in wTabFrmPainter::PaintLines,
where we have the neighboring lines available.

Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129
(cherry picked from commit 02e80d2e431a57ad775a674eb3cfcd6cec53e09f)
---
M sw/source/core/layout/paintfrm.cxx
1 file changed, 26 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/342/1
--
To view, visit https://gerrit.libreoffice.org/342
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Michael Stahl 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[libreoffice-3-6]: fdo#39812: Writer: fix collapsing merged table border painti...

[Gerrit]

>From Michael Stahl :

Michael Stahl has uploaded a new change for review.

Change subject: fdo#39812: Writer: fix collapsing merged table border painting:
..

fdo#39812: Writer: fix collapsing merged table border painting:

Create a table with a merged cell like in the screenshot in the
bug, with a SAL_DEBUG in SwTabFrmPainter::PaintLines the following
lines are painted:

debug: paint start
1 debug: start: 2749,1488 end: 12387,1488
2 debug: start: 2749,1945 end: 7567,1945
3 debug: start: 7567,1945 end: 12387,1945
4 debug: start: 2749,2015 end: 12387,2015
5 debug: start: 2749,2542 end: 7567,2542
6 debug: start: 7567,2542 end: 12387,2542
7 debug: start: 2749,1488 end: 2749,1945
8 debug: start: 2749,1945 end: 2749,2015
9 debug: start: 2749,2015 end: 2749,2542
A debug: start: 7567,1945 end: 7567,2542
B debug: start: 12387,1488 end: 12387,1945
C debug: start: 12387,1945 end: 12387,2015
D debug: start: 12387,2015 end: 12387,2542
debug: paint end

*1*1*
7   B
7   B
*2*3*
8 A C
*4*4*
9 A D
9 A D
*5*6*

The problem is obviously that the Y coordinates of the lines 2, 3
and 4 differ; they should be on the same Y position.
The problem here is that logically horizontal lines must be painted
not centered but "below" the line, and It turns out that
SwTabFrmPainter::Insert cannot correct the positions properly to
do that, because it only looks at borders in a single cell.

When using the UI to set the borders, we get (for innner table borders)
only a bottom border in the cells, but no top borders, so the
top position of the logically vertical borders needs to be corrected
with the width of the bottom border of the cell _above_; a symmetric
correction of the bottom position to the top border of the cell below
is also necessary.

Fortunately if we just leave the positons alone in Insert then
TabFrmPainter will eliminate duplicate lines with equal positions
and so it's only necessary to correct the positions when actually
painting the line in wTabFrmPainter::PaintLines,
where we have the neighboring lines available.

Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129
(cherry picked from commit 02e80d2e431a57ad775a674eb3cfcd6cec53e09f)
---
M sw/source/core/layout/paintfrm.cxx
1 file changed, 26 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/341/1
--
To view, visit https://gerrit.libreoffice.org/341
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   93 +
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |   12 ++-
 writerfilter/source/rtftok/rtfvalue.cxx|   25 ++
 writerfilter/source/rtftok/rtfvalue.hxx|5 +
 4 files changed, 131 insertions(+), 4 deletions(-)

New commits:
commit 4ad9e3f5be10bde030338f744d56ffa6c7736bd0
Author: Miklos Vajna 
Date:   Mon Jul 23 14:45:45 2012 +0200

implement import of RTF_{MOMATH,MR,MF,MFPR,MCTRLPR,MNUM,MDEN}

Change-Id: I4d0d9df26de1ef52a808c82d89a8404c98ef7bc4

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 37da9c0..187ae91 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -48,11 +48,17 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
+#include 
 #include  // NS_sprm namespace
 #include  // NS_rtf namespace
 #include  // NS_ooxml namespace
 #include  // ooxml namespace
+#include  // oox namespace
+#include 
 
 #include 
 #include 
@@ -943,6 +949,7 @@ void RTFDocumentImpl::text(OUString& rString)
 case DESTINATION_SUBJECT:
 case DESTINATION_DOCCOMM:
 case DESTINATION_ATNID:
+case DESTINATION_MR:
 m_aStates.top().aDestinationText.append(rString);
 break;
 case DESTINATION_EQINSTRUCTION:
@@ -1390,6 +1397,54 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 case RTF_ATNID:
 m_aStates.top().nDestinationState = DESTINATION_ATNID;
 break;
+case RTF_MMATH:
+// Nothing to do here (just enter the destination) till 
RTF_MMATHPR is implemented.
+break;
+case RTF_MOMATH:
+{
+uno::Reference aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_oMath, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MOMATH;
+}
+break;
+case RTF_MR:
+m_aStates.top().nDestinationState = DESTINATION_MR;
+break;
+case RTF_MF:
+{
+uno::Reference aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_f, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MF;
+}
+break;
+case RTF_MFPR:
+{
+uno::Reference aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_fPr, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MFPR;
+}
+break;
+case RTF_MCTRLPR:
+{
+uno::Reference aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_ctrlPr, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MCTRLPR;
+}
+break;
+case RTF_MNUM:
+{
+uno::Reference aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_num, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MNUM;
+}
+break;
+case RTF_MDEN:
+{
+uno::Reference aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath | 
oox::XML_den, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MDEN;
+}
+break;
 default:
 SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle 
destination '" << lcl_RtfToString(nKeyword) << "'");
 // Make sure we skip destinations (even without \*) till we don't 
handle them
@@ -3443,6 +3498,44 @@ int RTFDocumentImpl::popState()
 parBreak();
 m_bNeedPap = true;
 }
+else if (m_aStates.top().nDestinationState == DESTINATION_MOMATH)
+{
+uno::Reference aAttribs;
+m_aMathBuffer.appendClosingTag(oox::NMSP_officeMath | oox::XML_oMath);
+
+SvGlobalName aGlobalName(SO3_SM_CLASSID);
+comphelper::EmbeddedObjectContainer aContainer;
+OUString aName;
+uno::Reference xObject = 
aContainer.CreateEmbeddedObject(aGlobalName.GetByteSequence(), aName);
+uno::Reference xComponent(xObject->getComponent(), 
uno::UNO_QUERY);
+if( oox::FormulaImportBase* pImport = 
dynamic_cast(xComponent.get()))
+pImport->readFormulaOoxml(m_aMathBuffer);
+RTFValue::Pointer_t pValue(new RTFValue(xObject));
+RTFSprms aMathAttributes;
+aMathAttributes.set(NS_ooxml::LN_starmath, pValue);
+writerfilter::Reference::Pointer_t const pProperties(new 
RTFReferenceProperties(aMathAttributes));
+Mapper().props(pProperties);
+m_aMathBuffer = oox::formulaimport::XmlStreamBuilder();
+}
+else if (m_aStates.top().nDestinationState ==

Re: [PATCH][PUSHED] Fix for sw_filter_test crash due to ambiguous FieldEntry destructor

[Caolán McNamara]

On Sun, 2012-07-22 at 11:25 +0200, Kristian Rietveld wrote:
> (Please keep me on CC as I am not subscribed to the list)
> 
> Hi all,
> 
> I have been building LibreOffice using Clang on Mac OS X Lion again, now 
> that it is possible to get a working build using Clang on Linux.
> 
> During the build, however, the "sw_filters_test" unit test crashes. The 
> crash happens in rtl_string_release from the FieldEntry (the one in 
> sw/source/file/ww8/ww8par.hxx) destructor. The FieldEntry destructor is 
> called through a dyld stub.
> 
> After reading assembly code I figured that the FieldEntry destructor 
> being executed does not match the FieldEntry's fields. What was already 
> suspicious above is that rtl_string_release is being called even though 
> this FieldEntry uses OUStrings.
> 
>  From the assembly code I guess the FieldEntry destructor being executed 
> is actually the one in registry/source/reflwrit.cxx.  So my impression 
> is that the dynamic linker on OS X is simply calling the wrong 
> destructor (the symbols have the same name).
> 
> To fix this, I can think of either putting the WW8 FieldEntry in a 
> namespace, or renaming it to WW8FieldEntry. Since no namespaces were 
> used in the current code, I decided to rename the class.
> 
> A patch is attached and I verified that it fixes the crashing unit test 
> for me. If people have a better or preferred way to fix this, please let 
> me know and I will update the patch accordingly.

Sounds like a similar problem to fdo#37044, fixed by
http://cgit.freedesktop.org/libreoffice/core/commit/?id=7080d629c82422a419d38051536c7711f8abe53e
I thought that got tracked down to disabled visibility or something of
that nature. Anyway, doesn't hurt to disambiguate.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH (partial)] fdo#48549 System::Beep() removal

[Mathieu Vonlanthen]

Hi,
Here is my license statement:
-
All of my past & future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.
--
I send a new version of the patch taking into account the last commits.
I didn't add error reporting because I don't know the official way to do
this.

Best regards

Mathieu Vonlanthen

-- 
http://www.fastmail.fm - IMAP accessible web-mail

From 499921f466ae4db5aeb3ccdc9c8c59e98b290cfe Mon Sep 17 00:00:00 2001
From: Mathieu Vonlanthen 
Date: Thu, 19 Jul 2012 11:02:45 +0200
Subject: [PATCH] fdo#48549 System::Beep() removal

Change-Id: I8fe133dd8d1f759fbe21d47ae358c0b5451812b5
---
 basctl/source/basicide/baside2.cxx  |   17 +
 basctl/source/basicide/baside2b.cxx |   22 +---
 basctl/source/basicide/brkdlg.cxx   |1 -
 basic/source/runtime/methods.cxx|1 -
 formula/source/ui/dlg/funcutl.cxx   |4 ---
 sc/source/core/data/documen4.cxx|2 --
 sc/source/ui/app/inputhdl.cxx   |6 -
 sc/source/ui/docshell/docfunc.cxx   |6 -
 sc/source/ui/docshell/olinefun.cxx  |8 --
 sc/source/ui/navipi/content.cxx |2 --
 sc/source/ui/navipi/navipi.cxx  |2 --
 sc/source/ui/view/editsh.cxx|   12 -
 sc/source/ui/view/gridwin.cxx   |   10 
 sc/source/ui/view/gridwin2.cxx  |2 --
 sc/source/ui/view/select.cxx|1 -
 sc/source/ui/view/tabcont.cxx   |3 ---
 sc/source/ui/view/tabvwshe.cxx  |1 -
 sc/source/ui/view/viewfun2.cxx  |4 ---
 sc/source/ui/view/viewfun6.cxx  |   47 ++-
 sc/source/ui/view/viewfunc.cxx  |2 --
 svtools/source/contnr/fileview.cxx  |3 ---
 svtools/source/contnr/svlbitm.cxx   |2 --
 svtools/source/contnr/svtreebx.cxx  |1 -
 svtools/source/edit/textview.cxx|5 
 svx/source/fmcomp/gridctrl.cxx  |1 -
 svx/source/form/tbxform.cxx |1 -
 svx/workben/edittest.cxx|2 --
 sw/source/ui/utlui/content.cxx  |6 +
 vcl/source/control/field2.cxx   |7 +-
 vcl/source/window/menu.cxx  |   13 --
 30 files changed, 12 insertions(+), 182 deletions(-)

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index d427a30..0c91e85 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -546,7 +546,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
 CheckCompileBasic();
 if ( aStatus.bError )
 {
-Sound::Beep();
 return sal_False;
 }
 
@@ -572,9 +571,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
 }
 }
 }
-
-if ( !bNewBreakPoint )
-Sound::Beep();
 }
 }
 
@@ -753,7 +749,6 @@ void ModulWindow::BasicAddWatch()
 {
 DBG_CHKTHIS( ModulWindow, 0 );
 String aWatchStr;
-sal_Bool bInserted = sal_False;
 AssertValidEditEngine();
 sal_Bool bAdd = sal_True;
 if ( !GetEditView()->HasSelection() )
@@ -780,9 +775,6 @@ void ModulWindow::BasicAddWatch()
 bInserted = sal_True;
 }
 }
-
-if ( !bInserted )
-Sound::Beep();
 }
 
 
@@ -790,10 +782,7 @@ void ModulWindow::BasicAddWatch()
 void ModulWindow::BasicRemoveWatch()
 {
 DBG_CHKTHIS( ModulWindow, 0 );
-bool bRemoved = pLayout->GetWatchWindow().RemoveSelectedWatch();
-
-if ( !bRemoved )
-Sound::Beep();
+pLayout->GetWatchWindow().RemoveSelectedWatch();
 }
 
 
@@ -1022,10 +1011,6 @@ void ModulWindow::ExecuteCommand( SfxRequest& rReq )
 }
 break;
 case SID_BASICIDE_MATCHGROUP:
-{
-if ( !GetEditView()->MatchGroup() )
-Sound::Beep();
-}
 break;
 case SID_BASICIDE_TOGGLEBRKPNT:
 {
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 0e63635..d10859c 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1496,8 +1496,6 @@ IMPL_LINK( WatchWindow, EditAccHdl, Accelerator *, pAcc )
 aXEdit.SetSelection( Selection( 0, 0x ) );
 UpdateWatches();
 }
-else
-Sound::Beep();
 }
 break;
 case KEY_ESCAPE:
@@ -1942,9 +1940,6 @@ sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
 }
 }
 
-if ( !bEdit )
-Sound::Beep();
-
 return bEdit;
 }
 
@@ -1962,22 +1957,10 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString
 aResult = aResult.Copy( 1, nResultLen - 2 );
 
 sal_Bool bResModified = ( aResult != aEditingRes ) ? sal_True : sal_False;
-sal_Bool bError = sal_False;
-if ( !aVName.Len() )
-{
-bError = sal_True;
-}
-
 sal_Bool bRet = sal_False;
 
-if ( bError )
-{
-Sound::Beep();
-