date:20130401

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3152

to look at the new patch set (#5).

Change subject: use filelist install method for udkapi and offapi
..

use filelist install method for udkapi and offapi

... so we can drop ZipUnoApi again.

Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
---
M instsetoo_native/util/openoffice.lst.in
M offapi/UnoApi_offapi.mk
M scp2/inc/macros.inc
M scp2/source/sdkoo/sdkoo.scp
M solenv/gbuild/Package.mk
M solenv/gbuild/UnoApi.mk
D solenv/gbuild/ZipUnoApi.mk
M solenv/gbuild/gbuild.mk
M solenv/gbuild/platform/IOS_ARM_GCC.mk
M solenv/gbuild/platform/WNT_INTEL_GCC.mk
M solenv/gbuild/platform/com_MSC_class.mk
M solenv/gbuild/platform/macosx.mk
M solenv/gbuild/platform/solaris.mk
M solenv/gbuild/platform/unxgcc.mk
M udkapi/UnoApi_udkapi.mk
15 files changed, 321 insertions(+), 326 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3152/5
-- 
To view, visit https://gerrit.libreoffice.org/3152
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: LibreOffice gerrit bot 

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

[PUSHED] Fix typo: addtional => additional in the comment.

2013-04-01 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3165

Approvals:
  Andras Timar: Verified; Looks good to me, approved
  Thomas Arnhold: Looks good to me, but someone else must approve


-- 
To view, visit https://gerrit.libreoffice.org/3165
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e9e71c721266a0cbc4412024ec49cb689672876
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Golnaz Irannejad 
Gerrit-Reviewer: Andras Timar 
Gerrit-Reviewer: Thomas Arnhold 

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

[Libreoffice-commits] core.git: sc/source

2013-04-01 Thread Thomas Arnhold

 sc/source/ui/drawfunc/chartsh.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 83810a61bab4fe079de3539dc3489b008e776eaf
Author: Thomas Arnhold 
Date:   Tue Apr 2 08:48:28 2013 +0200

fix build

css is ::com::sun::star already

Change-Id: Ib3fba33c5612fcfe6c792f2026fba478d21fd46c

diff --git a/sc/source/ui/drawfunc/chartsh.cxx 
b/sc/source/ui/drawfunc/chartsh.cxx
index 170ede8..c20f0ad 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -40,7 +40,9 @@
 #define ScChartShell
 #include "scslots.hxx"
 
-using namespace ::css::uno;
+using namespace css::uno;
+
+namespace drawing = com::sun::star::drawing;
 
 SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell, ScResId(SCSTR_CHARTSHELL) )
 {
@@ -90,7 +92,7 @@ void ScChartShell::ExecuteExportAsGraphic( SfxRequest& )
 
 if( pObject && pObject->ISA( SdrOle2Obj ) )
 {
-Reference< XShape > xSourceDoc = Reference< XShape >( 
pObject->getUnoShape(), UNO_QUERY_THROW );
+Reference< drawing::XShape > xSourceDoc = Reference< 
drawing::XShape >( pObject->getUnoShape(), UNO_QUERY_THROW );
 GraphicHelper::SaveShapeAsGraphic( xSourceDoc );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

2013-04-01 Thread Stephan Bergmann

 l10ntools/source/xmlparse.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a47e50e3386a13a1601b3aa1355de70aa9e056ff
Author: Stephan Bergmann 
Date:   Tue Apr 2 08:47:27 2013 +0200

Prevent asserts from firing

...whether or not this is already the correct fix.  The twisted
nEndPos/nStartPos arguments in the calls to lcl_QuotRange look somewhat odd.

Change-Id: If22afb058012c830b5aa6d059c7df0b4e9c53696

diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index c76d5a6..651a27a 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -1180,8 +1180,8 @@ static icu::UnicodeString lcl_QuotRange(
 const sal_Int32 nEnd, bool bInsideTag = false )
 {
 icu::UnicodeString sReturn;
-assert( nStart > 0 && nStart < rString.length() );
-assert( nEnd > 0 && nEnd < rString.length() );
+assert( nStart >= 0 );
+assert( nEnd < rString.length() );
 for (sal_Int32 i = nStart; i <= nEnd; ++i)
 {
 switch (rString[i])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source sw/source vcl/source

2013-04-01 Thread Golnaz Irannejad

 filter/source/xslt/import/wordml/wordml2ooo_draw.xsl |2 +-
 sw/source/ui/vba/vbadocumentproperties.cxx   |2 +-
 vcl/source/control/lstbox.cxx|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4d858fff6b0980e82b36a7fe70a9e750ee9d53a2
Author: Golnaz Irannejad 
Date:   Mon Apr 1 21:06:21 2013 -0400

Fix typo: addtional => additional in the comment.

Change-Id: I7e9e71c721266a0cbc4412024ec49cb689672876
Reviewed-on: https://gerrit.libreoffice.org/3165
Reviewed-by: Thomas Arnhold 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl 
b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
index f5d7249..b92a129 100644
--- a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
+++ b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
@@ -1684,7 +1684,7 @@
 
 
 
-
+
 
 
 
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx 
b/sw/source/ui/vba/vbadocumentproperties.cxx
index 7640bd1..db8f408 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -296,7 +296,7 @@ public:
 try
 {
 // Characters, ParagraphCount & WordCount are available from
-// the model ( and addtionally these also update the statics 
object )
+// the model ( and additionally these also update the statics 
object )
 return mxModelProps->getPropertyValue( rPropName );
 }
 catch (const uno::Exception&)
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 9b15759..89de20b 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -1197,7 +1197,7 @@ void ListBox::EnableMultiSelection( sal_Bool bMulti, 
sal_Bool bStackSelection )
 
 // WB_SIMPLEMODE:
 // The MultiListBox behaves just like a normal ListBox
-// MultiSelection is possible via corresponding addtional keys
+// MultiSelection is possible via corresponding additional keys
 sal_Bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? sal_True : 
sal_False;
 mpImplLB->SetMultiSelectionSimpleMode( bSimpleMode );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] Turn on Neon debug output (if enabled in Neon) when building...

2013-04-01 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3166

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3166
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6757954ea3ad53df855935930de176c222bff0ed
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Tor Lillqvist 
Gerrit-Reviewer: Fridrich Strba 

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - ucb/source

 ucb/source/ucp/webdav-neon/NeonSession.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit fb0cdcb8e3084ac969a8d744e0e55041431b862e
Author: Tor Lillqvist 
Date:   Thu Mar 14 20:47:12 2013 +0200

Turn on Neon debug output (if enabled in Neon) when building for debugging

Also add NE_DBG_LOCKS and NE_DBG_SSL to the debugging mask.

(cherry picked from commit be2ce85e9539debc7c40680a6616c7dbe461d74c)

Change-Id: I6757954ea3ad53df855935930de176c222bff0ed
Reviewed-on: https://gerrit.libreoffice.org/3166
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 3ac4700..f1f3b9f 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -695,7 +695,7 @@ void NeonSession::Init()
 // #122205# - libxml2 needs to be initialized once if used by
 // multithreaded programs like OOo.
 xmlInitParser();
-#if 0
+#if OSL_DEBUG_LEVEL > 0
 // for more debug flags see ne_utils.h; NE_DEBUGGING must be 
defined
 // while compiling neon in order to actually activate neon debug
 // output.
@@ -705,7 +705,8 @@ void NeonSession::Init()
// | NE_DBG_HTTPAUTH
// | NE_DBG_XML
// | NE_DBG_XMLPARSE
-   // | NE_DBG_LOCKS
+   | NE_DBG_LOCKS
+   | NE_DBG_SSL
  );
 #endif
 m_bGlobalsInited = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] Turn on Neon debug output (if enabled in Neon) when building...

2013-04-01 Thread Tor Lillqvist (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3166

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/3166/1

Turn on Neon debug output (if enabled in Neon) when building for debugging

Also add NE_DBG_LOCKS and NE_DBG_SSL to the debugging mask.

(cherry picked from commit be2ce85e9539debc7c40680a6616c7dbe461d74c)

Change-Id: I6757954ea3ad53df855935930de176c222bff0ed
---
M ucb/source/ucp/webdav-neon/NeonSession.cxx
1 file changed, 3 insertions(+), 2 deletions(-)



diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 3ac4700..f1f3b9f 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -695,7 +695,7 @@
 // #122205# - libxml2 needs to be initialized once if used by
 // multithreaded programs like OOo.
 xmlInitParser();
-#if 0
+#if OSL_DEBUG_LEVEL > 0
 // for more debug flags see ne_utils.h; NE_DEBUGGING must be 
defined
 // while compiling neon in order to actually activate neon debug
 // output.
@@ -705,7 +705,8 @@
// | NE_DBG_HTTPAUTH
// | NE_DBG_XML
// | NE_DBG_XMLPARSE
-   // | NE_DBG_LOCKS
+   | NE_DBG_LOCKS
+   | NE_DBG_SSL
  );
 #endif
 m_bGlobalsInited = true;

-- 
To view, visit https://gerrit.libreoffice.org/3166
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6757954ea3ad53df855935930de176c222bff0ed
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Tor Lillqvist 

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

[PATCH] use filelist install method for udkapi and offapi

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3152

to look at the new patch set (#4).

Change subject: use filelist install method for udkapi and offapi
..

use filelist install method for udkapi and offapi

... so we can drop ZipUnoApi again.

Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
---
M instsetoo_native/util/openoffice.lst.in
M offapi/UnoApi_offapi.mk
M scp2/inc/macros.inc
M scp2/source/sdkoo/sdkoo.scp
M solenv/gbuild/Package.mk
M solenv/gbuild/UnoApi.mk
D solenv/gbuild/ZipUnoApi.mk
M solenv/gbuild/gbuild.mk
M solenv/gbuild/platform/IOS_ARM_GCC.mk
M solenv/gbuild/platform/WNT_INTEL_GCC.mk
M solenv/gbuild/platform/com_MSC_class.mk
M solenv/gbuild/platform/macosx.mk
M solenv/gbuild/platform/solaris.mk
M solenv/gbuild/platform/unxgcc.mk
M udkapi/UnoApi_udkapi.mk
15 files changed, 321 insertions(+), 326 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3152/4
-- 
To view, visit https://gerrit.libreoffice.org/3152
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: LibreOffice gerrit bot 

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

[Libreoffice-commits] core.git: svx/inc svx/source

2013-04-01 Thread David Tardon

 svx/inc/svx/graphichelper.hxx |5 +
 svx/source/core/graphichelper.cxx |4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit f38c4f138c6ec810b26fcf2064f64e64eb14129b
Author: David Tardon 
Date:   Tue Apr 2 07:34:56 2013 +0200

try to fix windows tb with pch

C:/lo/gerrit_core/solver/wntmsci13.pro/inc\vcl/lineinfo.hxx(39) : error 
C2872: 'LineStyle' : ambiguous symbol
could be 
'C:/lo/gerrit_core/solver/wntmsci13.pro/inc\vcl/vclenum.hxx(80) : LineStyle'
or 'C:/lo/gerrit_core/solver/wntmsci13.pro/inc/offapi 
om/sun/star/drawing/LineStyle.hdl(13) : com::sun::star::drawing::LineStyle'
...
make[1]: *** 
[C:/lo/gerrit_core/workdir/wntmsci13.pro/PrecompiledHeader/nodebug/precompiled_sd.hxx.gch]
 Error 2

WTH do we have 'using namespace' in _new_ code, anyway?

Change-Id: If149653f0a7a4a0061f48e866b30ced120f8bc5e

diff --git a/svx/inc/svx/graphichelper.hxx b/svx/inc/svx/graphichelper.hxx
index 1d9e9e3..650a300 100644
--- a/svx/inc/svx/graphichelper.hxx
+++ b/svx/inc/svx/graphichelper.hxx
@@ -25,16 +25,13 @@
 
 #include 
 
-using namespace css::uno;
-using namespace css::drawing;
-
 class SVX_DLLPUBLIC GraphicHelper
 {
 
 public:
 static void GetPreferedExtension( OUString& rExtension, const Graphic& 
rGraphic );
 static OUString ExportGraphic( const Graphic& rGraphic, const OUString& 
rGraphicName );
-static void SaveShapeAsGraphic( const Reference< XShape >& xShape );
+static void SaveShapeAsGraphic( const com::sun::star::uno::Reference< 
com::sun::star::drawing::XShape >& xShape );
 };
 
 
diff --git a/svx/source/core/graphichelper.cxx 
b/svx/source/core/graphichelper.cxx
index 4671c91..deb3397 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -56,6 +56,8 @@ using namespace css::ui::dialogs;
 
 using namespace sfx2;
 
+namespace drawing = com::sun::star::drawing;
+
 void GraphicHelper::GetPreferedExtension( OUString& rExtension, const Graphic& 
rGraphic )
 {
 OUString aExtension = "png";
@@ -196,7 +198,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& 
rGraphic, const OUString&
 return OUString();
 }
 
-void GraphicHelper::SaveShapeAsGraphic( const Reference< XShape >& xShape )
+void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& 
xShape )
 {
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - ucb/source

 ucb/source/ucp/webdav-neon/NeonSession.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit be2ce85e9539debc7c40680a6616c7dbe461d74c
Author: Tor Lillqvist 
Date:   Thu Mar 14 20:47:12 2013 +0200

Turn on Neon debug output (if enabled in Neon) when building for debugging

Also add NE_DBG_LOCKS and NE_DBG_SSL to the debugging mask.

Change-Id: I6757954ea3ad53df855935930de176c222bff0ed

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 3ac4700..f1f3b9f 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -695,7 +695,7 @@ void NeonSession::Init()
 // #122205# - libxml2 needs to be initialized once if used by
 // multithreaded programs like OOo.
 xmlInitParser();
-#if 0
+#if OSL_DEBUG_LEVEL > 0
 // for more debug flags see ne_utils.h; NE_DEBUGGING must be 
defined
 // while compiling neon in order to actually activate neon debug
 // output.
@@ -705,7 +705,8 @@ void NeonSession::Init()
// | NE_DBG_HTTPAUTH
// | NE_DBG_XML
// | NE_DBG_XMLPARSE
-   // | NE_DBG_LOCKS
+   | NE_DBG_LOCKS
+   | NE_DBG_SSL
  );
 #endif
 m_bGlobalsInited = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7d/5520c591922f58a1bef59e39ad9f52d0c99165

 7d/5520c591922f58a1bef59e39ad9f52d0c99165 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 31e457f255b1649401a91b5ab25b406a71dcaa4d
Author: Xisco Fauli 
Date:   Tue Apr 2 07:29:00 2013 +0200

Notes added by 'git notes add'

diff --git a/7d/5520c591922f58a1bef59e39ad9f52d0c99165 
b/7d/5520c591922f58a1bef59e39ad9f52d0c99165
new file mode 100644
index 000..0fb99de
--- /dev/null
+++ b/7d/5520c591922f58a1bef59e39ad9f52d0c99165
@@ -0,0 +1 @@
+merged as: 80e187b58a2def63f8e779214adff3cf64294c8d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c6/302d8cf8522034ab795e13fa6bece88ab9057c

 c6/302d8cf8522034ab795e13fa6bece88ab9057c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d2f59702fa19203c3af44881f888a9ce12da78ef
Author: Xisco Fauli 
Date:   Tue Apr 2 07:26:56 2013 +0200

Notes added by 'git notes add'

diff --git a/c6/302d8cf8522034ab795e13fa6bece88ab9057c 
b/c6/302d8cf8522034ab795e13fa6bece88ab9057c
new file mode 100644
index 000..df10347
--- /dev/null
+++ b/c6/302d8cf8522034ab795e13fa6bece88ab9057c
@@ -0,0 +1 @@
+merged as: 95136e701c5f631307d1b72ad8adf6b3df9090fe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 51/4843f9d4fbd4db287300faa52ca6bda618aea1

 51/4843f9d4fbd4db287300faa52ca6bda618aea1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bb41bb3098bab2fa6ff830143dfd913ef7ab67eb
Author: Xisco Fauli 
Date:   Tue Apr 2 07:24:50 2013 +0200

Notes added by 'git notes add'

diff --git a/51/4843f9d4fbd4db287300faa52ca6bda618aea1 
b/51/4843f9d4fbd4db287300faa52ca6bda618aea1
new file mode 100644
index 000..514bdd1
--- /dev/null
+++ b/51/4843f9d4fbd4db287300faa52ca6bda618aea1
@@ -0,0 +1 @@
+merged as: 74700570730f7259a78c031973cbecd98ef777ff
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - dictionaries filter/source helpcontent2 svx/source

2013-04-01 Thread Armin Le Grand

 dictionaries|2 +-
 filter/source/msfilter/escherex.cxx |   13 -
 helpcontent2|2 +-
 svx/source/svdraw/svddrgmt.cxx  |   13 +
 4 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 80e187b58a2def63f8e779214adff3cf64294c8d
Author: Armin Le Grand 
Date:   Wed Sep 19 00:55:57 2012 +

#120999# Added support code in SdrDragObjOwn::MoveSdrDrag to rescue the 
changed AutoGrowWidth setting to allow instantaneous resizing of AutoGrowWidth 
objects even when using a cloned SdrObject for the UI interaction

diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 3dad382..2b2e061 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1233,6 +1233,19 @@ void SdrDragObjOwn::MoveSdrDrag(const Point& rNoSnapPnt)
 {
 mpClone = pObj->getFullDragClone();
 mpClone->applySpecialDrag(DragStat());
+
+// #120999# AutoGrowWidth may change for SdrTextObj 
due to the automatism used
+// with bDisableAutoWidthOnDragging, so not only 
geometry changes but
+// also this (pretty indirect) property change is 
possible. If it gets
+// changed, it needs to be copied to the original 
since nothing will
+// happen when it only changes in the drag clone
+const bool 
bOldAutoGrowWidth(((SdrTextAutoGrowWidthItem&)pObj->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
+const bool 
bNewAutoGrowWidth(((SdrTextAutoGrowWidthItem&)mpClone->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
+
+if(bOldAutoGrowWidth != bNewAutoGrowWidth)
+{
+
GetDragObj()->SetMergedItem(SdrTextAutoGrowWidthItem(bNewAutoGrowWidth));
+}
 }
 
 Show();
commit 95136e701c5f631307d1b72ad8adf6b3df9090fe
Author: Herbert DÃ¼rr 
Date:   Wed Jun 13 08:20:49 2012 +

#i119559# fix vertical text in *pptÂ export

Patch by: Lei Debin, Wang Zhe
Found by: Li Feng Wang
Review by: Herbert Duerr

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 89727c3..412fb59 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3093,6 +3094,12 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 AddOpt(DFF_Prop_gtextAlign,gTextAlign);
 }
 }
+if((nTextPathFlags & 0x4000) != 0)  //Is Font work
+{
+OutlinerParaObject* pOutlinerParaObject = 
pCustoShape->GetOutlinerParaObject();
+if ( pOutlinerParaObject && 
pOutlinerParaObject->IsVertical() )
+nTextPathFlags |= 0x2000;
+}
 if ( nTextPathFlags != nTextPathFlagsOrg )
 AddOpt( DFF_Prop_gtextFStrikethrough, 
nTextPathFlags );
 }
commit 74700570730f7259a78c031973cbecd98ef777ff
Author: Andre Fischer 
Date:   Fri Jul 13 08:27:09 2012 +

Fix #i119495# Fixed export of arrow styles to PPT.

Reported by: Du Jing
Patch by: Jianyuan Li
Review by: Andre Fischer

Conflicts:
filter/source/msfilter/escherex.cxx

Change-Id: Ic45b36a3193b3771d16fa36b9baa8f0661656e1b

diff --git a/dictionaries b/dictionaries
index 66a5a2e..36776c3 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 66a5a2e03573ab1862db1965f7b9c5419db3decd
+Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 6449ba8..89727c3 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -731,6 +731,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const 
sal_Bool bLineStart,
 sal_Int16   nWhich = bLineStart ? XATTR_LINESTART : 
XATTR_LINEEND;
 
 OUString aApiName = SvxUnogetApiNameForItem(nWhich, 
aArrowStartName);
+sal_Bool bIsMapped = sal_True;
 if ( !aApiName.isEmpty() )
 {
 
@@ -765,8 +766,11 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const 
sal_Bool bLineStart,
 reLineEnd = ESCHER_LineArrowDiamondEnd;
 else if ( aApiName == "Arrow" )
 reLineEnd = ESCHER_LineArrowEnd;
+else
+bIsMapped = sal_False;
+
 }

[PATCH] Fix typo: addtional => additional in the comment.

2013-04-01 Thread Golnaz Irannejad (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3165

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/3165/1

Fix typo: addtional => additional in the comment.

Change-Id: I7e9e71c721266a0cbc4412024ec49cb689672876
---
M filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
M sw/source/ui/vba/vbadocumentproperties.cxx
M vcl/source/control/lstbox.cxx
3 files changed, 3 insertions(+), 3 deletions(-)



diff --git a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl 
b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
index f5d7249..b92a129 100644
--- a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
+++ b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
@@ -1684,7 +1684,7 @@
 
 
 
-
+
 
 
 
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx 
b/sw/source/ui/vba/vbadocumentproperties.cxx
index 7640bd1..db8f408 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -296,7 +296,7 @@
 try
 {
 // Characters, ParagraphCount & WordCount are available from
-// the model ( and addtionally these also update the statics 
object )
+// the model ( and additionally these also update the statics 
object )
 return mxModelProps->getPropertyValue( rPropName );
 }
 catch (const uno::Exception&)
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 9b15759..89de20b 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -1197,7 +1197,7 @@
 
 // WB_SIMPLEMODE:
 // The MultiListBox behaves just like a normal ListBox
-// MultiSelection is possible via corresponding addtional keys
+// MultiSelection is possible via corresponding additional keys
 sal_Bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? sal_True : 
sal_False;
 mpImplLB->SetMultiSelectionSimpleMode( bSimpleMode );
 

-- 
To view, visit https://gerrit.libreoffice.org/3165
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e9e71c721266a0cbc4412024ec49cb689672876
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Golnaz Irannejad 

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

[PATCH] Fixed 3 spelling errors in the comments.

2013-04-01 Thread Golnaz Irannejad (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3164

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/3164/1

Fixed 3 spelling errors in the comments.

Change-Id: Ic48f52d7ea4f6a4964f627e3051c96c46ffc2f76
---
M cli_ure/source/uno_bridge/cli_proxy.h
M sw/inc/comcore.hrc
M unodevtools/source/skeletonmaker/skeletoncommon.hxx
3 files changed, 3 insertions(+), 3 deletions(-)



diff --git a/cli_ure/source/uno_bridge/cli_proxy.h 
b/cli_ure/source/uno_bridge/cli_proxy.h
index 657cc69..f519ab1 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.h
+++ b/cli_ure/source/uno_bridge/cli_proxy.h
@@ -199,7 +199,7 @@
 method within the UNO interface one can use the position to obtain the
 MethodInfo of the corresponding cli method. To obtain the index for the
 m_arMethodInfos array the function position has to be decreased by 3.
-This is becaus, the cli interface does not contain the XInterface
+This is because, the cli interface does not contain the XInterface
 methods.
 */
 gcroot^> m_arMethodInfos;
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 2a96f9d..ace1c6e 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -99,7 +99,7 @@
 #define STR_AUTOFMTREDL_SET_NUMBULET19
 #define STR_AUTOFMTREDL_DEL_MORELINES   20
 #define STR_AUTOFMTREDL_NON_BREAK_SPACE 21
-// !!  alwats set the correct end 
+// !!  always set the correct end 
 #define STR_AUTOFMTREDL_END 22
 
 
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.hxx 
b/unodevtools/source/skeletonmaker/skeletoncommon.hxx
index 8fc3951..8bc8918 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.hxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.hxx
@@ -136,7 +136,7 @@
 
 /**
checks if XComponent have to be supported, if yes it removes it from the
-   supported interfaces list becuase it becmoes implmented by the appropriate
+   supported interfaces list because it becomes implmented by the appropriate
helper
 
@param manager a type manager

-- 
To view, visit https://gerrit.libreoffice.org/3164
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic48f52d7ea4f6a4964f627e3051c96c46ffc2f76
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Golnaz Irannejad 

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

[PATCH] fdo#39468 Translate German in DBG_ASSERT and OSL_ENSURE in t...

2013-04-01 Thread Christian M. Heller (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3163

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/3163/1

fdo#39468 Translate German in DBG_ASSERT and OSL_ENSURE in texteng.cxx

Change-Id: I9aac6a1f6e4a36fb95a518b752aef2066b45094c
---
M vcl/source/edit/texteng.cxx
1 file changed, 58 insertions(+), 58 deletions(-)



diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 2372768..cf0f080 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -477,7 +477,7 @@
 FormatAndUpdate();
 
 EnableUndo( bUndoCurrentlyEnabled );
-DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(), 
"Undo nach SetText?" );
+DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(), 
"SetText: Undo!" );
 }
 
 
@@ -491,7 +491,7 @@
 
 void TextEngine::ImpRemoveChars( const TextPaM& rPaM, sal_uInt16 nChars, 
SfxUndoAction* )
 {
-DBG_ASSERT( nChars, "ImpRemoveChars - 0 Chars?!" );
+DBG_ASSERT( nChars, "ImpRemoveChars: 0 Chars?!" );
 if ( IsUndoEnabled() && !IsInUndo() )
 {
 // Attribute muessen hier vorm RemoveChars fuer UNDO gesichert werden!
@@ -518,7 +518,7 @@
 
 TextPaM TextEngine::ImpConnectParagraphs( sal_uLong nLeft, sal_uLong nRight )
 {
-DBG_ASSERT( nLeft != nRight, "Den gleichen Absatz zusammenfuegen ?" );
+DBG_ASSERT( nLeft != nRight, "ImpConnectParagraphs: connect the very same 
paragraph ?" );
 
 TextNode* pLeft = mpDoc->GetNodes().GetObject( nLeft );
 TextNode* pRight = mpDoc->GetNodes().GetObject( nRight );
@@ -529,8 +529,8 @@
 // Erstmal Portions suchen, da pRight nach ConnectParagraphs weg.
 TEParaPortion* pLeftPortion = mpTEParaPortions->GetObject( nLeft );
 TEParaPortion* pRightPortion = mpTEParaPortions->GetObject( nRight );
-DBG_ASSERT( pLeft && pLeftPortion, "Blinde Portion in 
ImpConnectParagraphs(1)" );
-DBG_ASSERT( pRight && pRightPortion, "Blinde Portion in 
ImpConnectParagraphs(2)" );
+DBG_ASSERT( pLeft && pLeftPortion, "ImpConnectParagraphs(1): Hidden 
Portion" );
+DBG_ASSERT( pRight && pRightPortion, "ImpConnectParagraphs(2): Hidden 
Portion" );
 
 TextPaM aPaM = mpDoc->ConnectParagraphs( pLeft, pRight );
 ImpParagraphRemoved( nRight );
@@ -557,8 +557,8 @@
 CursorMoved( aStartPaM.GetPara() ); // nur damit neu eingestellte 
Attribute verschwinden...
 CursorMoved( aEndPaM.GetPara() );   // nur damit neu eingestellte 
Attribute verschwinden...
 
-DBG_ASSERT( mpDoc->IsValidPaM( aStartPaM ), "Index im Wald in 
ImpDeleteText" );
-DBG_ASSERT( mpDoc->IsValidPaM( aEndPaM ), "Index im Wald in ImpDeleteText" 
);
+DBG_ASSERT( mpDoc->IsValidPaM( aStartPaM ), "ImpDeleteText(1): bad Index" 
);
+DBG_ASSERT( mpDoc->IsValidPaM( aEndPaM ), "ImpDeleteText(2): bad Index" );
 
 sal_uLong nStartNode = aStartPaM.GetPara();
 sal_uLong nEndNode = aEndPaM.GetPara();
@@ -579,7 +579,7 @@
 {
 ImpRemoveChars( aStartPaM, nChars );
 TEParaPortion* pPortion = mpTEParaPortions->GetObject( nStartNode 
);
-DBG_ASSERT( pPortion, "Blinde Portion in ImpDeleteText(3)" );
+DBG_ASSERT( pPortion, "ImpDeleteText(3): bad Index" );
 pPortion->MarkSelectionInvalid( aStartPaM.GetIndex(), 
pLeft->GetText().Len() );
 }
 
@@ -592,7 +592,7 @@
 aEndPaM.GetIndex() = 0;
 ImpRemoveChars( aEndPaM, nChars );
 TEParaPortion* pPortion = mpTEParaPortions->GetObject( nEndNode );
-DBG_ASSERT( pPortion, "Blinde Portion in ImpDeleteText(4)" );
+DBG_ASSERT( pPortion, "ImpDeleteText(4): bad Index" );
 pPortion->MarkSelectionInvalid( 0, 
pPortion->GetNode()->GetText().Len() );
 }
 
@@ -605,7 +605,7 @@
 nChars = aEndPaM.GetIndex() - aStartPaM.GetIndex();
 ImpRemoveChars( aStartPaM, nChars );
 TEParaPortion* pPortion = mpTEParaPortions->GetObject( nStartNode );
-DBG_ASSERT( pPortion, "Blinde Portion in ImpDeleteText(5)" );
+DBG_ASSERT( pPortion, "ImpDeleteText(5): bad Index" );
 pPortion->MarkInvalid( aEndPaM.GetIndex(), aStartPaM.GetIndex() - 
aEndPaM.GetIndex() );
 }
 
@@ -670,8 +670,8 @@
 
 TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& 
rCurSel, sal_Bool bOverwrite, sal_Bool bIsUserInput )
 {
-DBG_ASSERT( c != '\n', "Zeilenumbruch bei InsertText ?" );
-DBG_ASSERT( c != '\r', "Zeilenumbruch bei InsertText ?" );
+DBG_ASSERT( c != '\n', "InsertText: NewLine!" );
+DBG_ASSERT( c != '\r', "InsertText: NewLine!" );
 
 TextPaM aPaM( rCurSel.GetStart() );
 TextNode* pNode = mpDoc->GetNodes().GetObject( aPaM.GetPara() );
@@ -855,7 +855,7 @@
 TextPaM aPaM( mpDoc->InsertParaBreak( rPaM, bKeepEndingAttribs ) );
 
 TEParaPortion* pPortion = mpTEParaPortions->GetObject( rPaM.GetPara() );
-DBG_ASSERT( pPortion, "Blinde Portion in ImpInsertParaBreak" );

LibreOffice-SDK for MinGW

2013-04-01 Thread Helmar Spangenberg

Hi,

is it possible to create the sdk package on the nightly builds for MinGW?

On my system (SuSE 12.3 / x86-64) with the actual mingw packages I run into 
big problems.
To get LO compiled I had to do some code adjustments (in case you are 
interested, I will send them later); I managed to get the compiled LO run 
under wine and windows. However, the sdk worked only as long as I did not 
contact LO, it seems that there are some problems transfering the control 
structures to the environment.
I suspect, the MinGW threads in my environment do something horrible to the 
data;in a debug session I can see, something probably reasonable is 
transferred, but later, trying to use the data, ends aup with a crash.
I mean "reasonable" since it was once possible to control LO remotely - I must 
have had a constellation of the memory which kept the structures untouched. 
But as soon I changed the code adding functions or other stuff, everything 
crashed.

Thanks in advance,

Helmar Spangenberg

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

[Libreoffice-commits] libvisio.git: 2 commits - build/win32 src/lib

2013-04-01 Thread Fridrich Štrba

 build/win32/libvisio.vcproj   |4 ++--
 build/win32/libvisio.vcxproj  |4 ++--
 build/win32/vsd2raw.vcproj|4 ++--
 build/win32/vsd2raw.vcxproj   |4 ++--
 build/win32/vsd2xhtml.vcproj  |4 ++--
 build/win32/vsd2xhtml.vcxproj |4 ++--
 src/lib/VSDParser.cpp |   15 +++
 7 files changed, 27 insertions(+), 12 deletions(-)

New commits:
commit a7190200d4b0022b07d1487950fe42ec8b756c45
Author: Fridrich Å trba 
Date:   Tue Apr 2 00:36:44 2013 +0200

Add ICU stuff to the MSVC build files

diff --git a/build/win32/libvisio.vcproj b/build/win32/libvisio.vcproj
index 952544a..4401712 100644
--- a/build/win32/libvisio.vcproj
+++ b/build/win32/libvisio.vcproj
@@ -41,7 +41,7 @@

 
   Disabled
-  
$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)
+  
$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)
   
_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
   EnableFastChecks
   MultiThreadedDebugDLL
@@ -74,7 +74,7 @@
 
   MaxSpeed
   OnlyExplicitInline
-  
$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)
+  
$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)
   
NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
   true
   MultiThreadedDLL
diff --git a/build/win32/vsd2raw.vcproj b/build/win32/vsd2raw.vcproj
index 5db58a2..d6b9058 100644
--- a/build/win32/vsd2raw.vcproj
+++ b/build/win32/vsd2raw.vcproj
@@ -75,7 +75,7 @@
OutputFile="Debug\bin\vsd2raw.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
-   
AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR)"
+   
AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/vsd2raw.pdb"
SubSystem="1"
@@ -164,7 +164,7 @@
OutputFile="Release\bin\vsd2raw.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
-   
AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR)"
+   
AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
ProgramDatabaseFile=".\Release/vsd2raw.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
diff --git a/build/win32/vsd2raw.vcxproj b/build/win32/vsd2raw.vcxproj
index 53b6b6d..c774295 100644
--- a/build/win32/vsd2raw.vcxproj
+++ b/build/win32/vsd2raw.vcxproj
@@ -73,7 +73,7 @@
   
libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)
   Debug\bin\vsd2raw.exe
   true
-  
Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)
+  
Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)
   true
   .\Debug/vsd2raw.pdb
   Console
@@ -96,7 +96,7 @@
 
 
   Disabled
-  
..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)
+  
..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)
   
NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)
   MultiThreadedDLL
   false
diff --git a/build/win32/vsd2xhtml.vcproj b/build/win32/vsd2xhtml.vcproj
index a540c22..37934c6 100644
--- a/build/win32/vsd2xhtml.vcproj
+++ b/build/win32/vsd2xhtml.vcproj
@@ -73,7 +73,7 @@
OutputFile="Release\bin\vsd2xhtml.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
-   
AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR)"
+   
AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
ProgramDatabaseFile=".\Release/vsd2xhtml.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
@@ -163,

Broken localized build

2013-04-01 Thread Olivier Hallot

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

After a  git pull and make clean, I can't pass through this step:

- --with-help
- --lang=en-US pt-BR

- -%<---

[build HPX] hu/helpcontent2/source/text/sbasic/guide
[build HPX] hu/helpcontent2/source/text/sbasic/shared
[build HPX] hu/helpcontent2/source/text/sbasic/shared/01
helpex: /home/tdf/git/core/l10ntools/source/xmlparse.cxx:1183:
icu_51::UnicodeString {anonymous}::lcl_QuotRange(const
icu_51::UnicodeString&, sal_Int32, sal_Int32, bool): Assertion `nStart >
0 && nStart < rString.length()' failed.
helpex: /home/tdf/git/core/l10ntools/source/xmlparse.cxx:1183:
icu_51::UnicodeString {anonymous}::lcl_QuotRange(const
icu_51::UnicodeString&, sal_Int32, sal_Int32, bool): Assertion `nStart >
0 && nStart < rString.length()' failed.
Aborted (core dumped)
make[1]: **
[/home/tdf/git/core/workdir/unxlngx6/HelpTranslatePartTarget/hu/helpcontent2/source/text/sbasic/shared/done]
Erro 134
make[1]: *** Esperando que os outros processos terminem
Aborted (core dumped)
make[1]: **
[/home/tdf/git/core/workdir/unxlngx6/HelpTranslatePartTarget/hu/helpcontent2/source/text/sbasic/guide/done]
Erro 134
make: ** [build] Erro 2

- -%<---

Any clues?
- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Fundação responsável civilmente, de acordo com o direito civil
Detalhes Legais: http://www.documentfoundation.org/imprint
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQEcBAEBAgAGBQJRWgkOAAoJEJp3R7nH3vLx6KAIAIhbp9iPPes5yk1iruPaOg23
0P6PvxivXe41CHaYJ2aEkY9IXE9OqNyMWuqZ2ixistyHiFkv0XMMCBkqXpz2RCD6
uiZ52hlZDlDJMTZ2Ryr64atu5ZRZtoWp4gyNslQIvIxoQkKOqnYUvCUWjNNTcDxT
X33FOCb0kfUyEVwRqe0xioqcbXF0aW1Z4G9k9Ty2JQ9VwbY3RfXEEzgQiFK6yDr2
p6z+VXJHfDQR8GHAnymOr3Jb+n8guV/MP8zSWfePOrzBCpSzXVRjduMj0PfU5m/X
62oYwGT2KdzbnQ1aOJ+2Gpo44mplvV9m1Rb5782HWBvtq5tv8KAtEh0kG2Gjz9E=
=06Ra
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#39468 Translate German comments - vcl/source/edit/{textd...

2013-04-01 Thread Christian M. Heller (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3162

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/3162/1

fdo#39468 Translate German comments - vcl/source/edit/{textdata, textdoc}

Change-Id: I0f9e8dcda27a714628edaa5e1e8fd875c8f67593
---
M vcl/source/edit/textdata.cxx
M vcl/source/edit/textdoc.cxx
2 files changed, 48 insertions(+), 81 deletions(-)



diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index f713947..0025ca8 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -24,10 +24,6 @@
 #include 
 
 
-// -
-// (+) class TextSelection
-// -
-
 TextSelection::TextSelection()
 {
 }
@@ -53,9 +49,6 @@
 }
 
 
-// -
-// (+) class TETextPortionList
-// -
 TETextPortionList::TETextPortionList()
 {
 }
@@ -82,7 +75,7 @@
 
 sal_uInt16 TETextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16& 
nPortionStart, sal_Bool bPreferStartingPortion )
 {
-// Bei nCharPos an Portion-Grenze wird die linke Portion gefunden
+// find left portion at nCharPos at portion boarder
 sal_uInt16 nTmpPos = 0;
 for ( sal_uInt16 nPortion = 0; nPortion < size(); nPortion++ )
 {
@@ -103,9 +96,6 @@
 }
 
 
-// -
-// (+) class TEParaPortion
-// -
 TEParaPortion::TEParaPortion( TextNode* pN )
 {
 mpNode = pN;
@@ -127,13 +117,13 @@
 }
 else
 {
-// Einfaches hintereinander tippen
+// simple consecutive typing
 if ( ( nDiff > 0 ) && ( mnInvalidDiff > 0 ) &&
  ( ( mnInvalidPosStart+mnInvalidDiff ) == nStart ) )
 {
 mnInvalidDiff = mnInvalidDiff + nDiff;
 }
-// Einfaches hintereinander loeschen
+// simple consecutive deleting
 else if ( ( nDiff < 0 ) && ( mnInvalidDiff < 0 ) && ( 
mnInvalidPosStart == nStart ) )
 {
 mnInvalidPosStart = mnInvalidPosStart + nDiff;
@@ -202,12 +192,11 @@
 const TextLine* pUnformatted = maLines[ nLastFormattedLine+1 ];
 short nPortionDiff = pUnformatted->GetStartPortion() - 
pLastFormatted->GetEndPortion();
 short nTextDiff = pUnformatted->GetStart() - pLastFormatted->GetEnd();
-nTextDiff++;// LastFormatted->GetEnd() war incl. => 1 zuviel 
abgezogen!
+nTextDiff++;// LastFormatted->GetEnd() was inclusive => 1 
subtracted too much!
 
-// Die erste unformatierte muss genau eine Portion hinter der letzten 
der
-// formatierten beginnen:
-// Wenn in der geaenderten Zeile eine Portion gesplittet wurde,
-// kann nLastEnd > nNextStart sein!
+// The first unformated one has to start exactly one portion past the 
last
+// formated one.
+// If a portion got split in the changed row, nLastEnd could be > 
nNextStart!
 short nPDiff = sal::static_int_cast< short >(-( nPortionDiff-1 ));
 short nTDiff = sal::static_int_cast< short >(-( nTextDiff-1 ));
 if ( nPDiff || nTDiff )
@@ -228,9 +217,6 @@
 }
 }
 
-// -
-// (+) class TEParaPortions
-// -
 TEParaPortions::TEParaPortions()
 {
 }
@@ -248,9 +234,6 @@
 clear();
 }
 
-// -
-// (+) class IdleFormatter
-// -
 IdleFormatter::IdleFormatter()
 {
 mpView = 0;
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 5dc0394..aa772bc 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -22,17 +22,12 @@
 #include 
 
 
-
-// Vergleichmethode wird von QuickSort gerufen...
-
+// compare function called by QuickSort
 static bool CompareStart( const TextCharAttrib* pFirst, const TextCharAttrib* 
pSecond )
 {
 return pFirst->GetStart() < pSecond->GetStart();
 }
 
-// -
-// (+) class TextCharAttrib
-// -
 TextCharAttrib::TextCharAttrib( const TextAttrib& rAttr, sal_uInt16 nStart, 
sal_uInt16 nEnd )
 {
 mpAttr = rAttr.Clone();
@@ -51,10 +46,6 @@
 {
 delete mpAttr;
 }
-
-// -
-// (+) class TextCharAttribList
-// -
 
 TextCharAttribList::TextCharAttr

[Libreoffice-commits] core.git: 2 commits - sfx2/source

 sfx2/source/appl/workwin.cxx |   18 +++---
 sfx2/source/view/viewfrm.cxx |3 ++-
 2 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit e72558346dda04be6a0878d90e3155616c0a1e7d
Author: Tor Lillqvist 
Date:   Tue Apr 2 00:51:15 2013 +0300

Don't call SFX_OBJECTBAR_REGISTRATION in non-DESKTOP environments

Gets rid of the SFX_OBJECTBAR_FULLSCREEN, i.e. the thingie with just
the button to exit full screen mode. We don't want to exit full screen
mode on non-DESKTOP.

I also bypass the SFX_OBJECTBAR_REGISTRATION call that registers
SFX_OBJECTBAR_APPLICATION, whatever that is, but presumably something
we don't want either.

Change-Id: I8ef958976fcde3321a5651cf4372a313ceff2c60

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index c4cfce5..526c45a 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -155,9 +155,10 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0))
 {
 SFX_CHILDWINDOW_REGISTRATION( SID_BROWSER );
 SFX_CHILDWINDOW_REGISTRATION( SID_RECORDING_FLOATWINDOW );
-
+#if HAVE_FEATURE_DESKTOP
 SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_FULLSCREEN | 
SFX_VISIBILITY_FULLSCREEN, SfxResId(RID_FULLSCREENTOOLBOX) );
 SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | 
SFX_VISIBILITY_STANDARD, SfxResId(RID_ENVTOOLBOX) );
+#endif
 }
 
 TYPEINIT2(SfxViewFrame,SfxShell,SfxListener);
commit 532dee5f3d0e9836559d296c93182343dbaf3ab8
Author: Tor Lillqvist 
Date:   Tue Apr 2 00:45:34 2013 +0300

Add comment about the ugly hardcoded resource ids

Change-Id: I54d04f97fe720d6a262a86b63126f328a7812018

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 99da99d..cce1d39 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -65,9 +65,21 @@ struct ResIdToResName
 
 static const ResIdToResName pToolBarResToName[] =
 {
-{ 558,  "fullscreenbar"},
-{ 560,  "standardbar", },
-{ 18001,"formsnavigationbar"   },
+// OMG! hardcoded numbers that have nice (?) symbolic names
+// elsewhere.
+{ 558,  "fullscreenbar"}, // This 558 for instance equals 
RID_FULLSCREENTOOLBOX (in
+  // value, and presumably also in 
semantics) from app.hrc in
+  // this very same directory, so why 
RID_FULLSCREENTOOLBOX
+  // can't be used I have no idea.
+
+{ 560,  "standardbar", }, // 560 is called RID_ENVTOOLBOX in 
app.hrc, still the same?
+
+{ 18001,"formsnavigationbar"   }, // Probably the rest are defined in 
.hrc files that are higher
+  // up in the dependency chain and/or 
later in the build order,
+  // and that is the (bad) reason why 
their symbolic names are
+  // not available? Would it really be 
so owful to move the .hrc
+  // files in question out from the 
modules where they now are?
+
 { 18002,"formsfilterbar"   },
 { 18003,"formtextobjectbar"},
 { 18004,"formcontrols" },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Really use 'nCategoriesLength'

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3161

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3161/1

Really use 'nCategoriesLength'

Git history shows it's been there since a bugfix for #i110617#
See e9ec6f67bf4aa0d7474e54b5f55ca71671356a48

Change-Id: I455661ccd97be6ea54d00201fda2906cfbd6f819
---
M xmloff/source/chart/SchXMLExport.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index 11cac87..516738d 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -832,7 +832,7 @@
 if( nCategoriesLength > nMaxSequenceLength )
 {
 aSimpleCategories.realloc(nMaxSequenceLength);//#i110617#
-nCategoriesLength = nMaxSequenceLength;
+nMaxSequenceLength = nCategoriesLength;
 }
 size_t nNumColumns( bSeriesFromColumns ? nNumSequences : 
nMaxSequenceLength );
 size_t nNumRows( bSeriesFromColumns ? nMaxSequenceLength : 
nNumSequences );

-- 
To view, visit https://gerrit.libreoffice.org/3161
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I455661ccd97be6ea54d00201fda2906cfbd6f819
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fa/6c5d91da2ef372004b5ed563b9c5e3626a7a41

 fa/6c5d91da2ef372004b5ed563b9c5e3626a7a41 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8bce560dab7536efcb1e1d11adb616714d138366
Author: Xisco Fauli 
Date:   Mon Apr 1 23:25:13 2013 +0200

Notes added by 'git notes add'

diff --git a/fa/6c5d91da2ef372004b5ed563b9c5e3626a7a41 
b/fa/6c5d91da2ef372004b5ed563b9c5e3626a7a41
new file mode 100644
index 000..281c559
--- /dev/null
+++ b/fa/6c5d91da2ef372004b5ed563b9c5e3626a7a41
@@ -0,0 +1 @@
+merged as: 638678893657aaf90a3b6e1a6c4d3fb3fc28e954
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - eb/35d2fe464df76f105f9a1514081495cc5ee3a7

 eb/35d2fe464df76f105f9a1514081495cc5ee3a7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4158a969bac2c78284a5970a7fc325fa85b722fe
Author: Xisco Fauli 
Date:   Mon Apr 1 23:22:52 2013 +0200

Notes added by 'git notes add'

diff --git a/eb/35d2fe464df76f105f9a1514081495cc5ee3a7 
b/eb/35d2fe464df76f105f9a1514081495cc5ee3a7
new file mode 100644
index 000..ea58867
--- /dev/null
+++ b/eb/35d2fe464df76f105f9a1514081495cc5ee3a7
@@ -0,0 +1 @@
+merged as: 460e17a1c7dae290ae9375e78820ec1257fe3942
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - filter/source

 filter/source/msfilter/svdfppt.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a9f03c1ad14890f2cd02ebfc1c2adfe9c2b55259
Author: Xisco Fauli 
Date:   Mon Apr 1 23:18:03 2013 +0200

Related to 119875: Remove RTL_CONSTASCII_USTRINGPARAM

Change-Id: I86461c14b5b73c3c7473b48bff70fd27f640ba59

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index d65254ba..6071eb6 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7275,8 +7275,8 @@ void ApplyCellAttributes( const SdrObject* pObj, 
Reference< XCell >& xCell )
 //set textHorizontalAdjust and TextWritingMode attr
 const sal_Int32 eHA(((const 
SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
 const SvxFrameDirection eDirection = (const SvxFrameDirection)((( 
const 
SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
-static const rtl::OUString  sHorizontalAdjust( 
RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) );
-static const rtl::OUString  sWritingMode( 
RTL_CONSTASCII_USTRINGPARAM("TextWritingMode") );
+static const rtl::OUString  sHorizontalAdjust( "TextHorizontalAdjust" 
);
+static const rtl::OUString  sWritingMode( "TextWritingMode" );
 xPropSet->setPropertyValue(  sHorizontalAdjust , Any( eHA ) );
 if ( eDirection == FRMDIR_VERT_TOP_RIGHT )
 {//vertical writing
commit 460e17a1c7dae290ae9375e78820ec1257fe3942
Author: Sun Ying 
Date:   Thu Aug 16 02:13:43 2012 +

#119875# fix vertical text direction in table cell change when save .ppt 
file

Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 200e7b4..d65254ba 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7272,6 +7272,16 @@ void ApplyCellAttributes( const SdrObject* pObj, 
Reference< XCell >& xCell )
 eVA = drawing::TextVerticalAdjust_BOTTOM;
 xPropSet->setPropertyValue( sTextVerticalAdjust, Any( eVA ) );
 
+//set textHorizontalAdjust and TextWritingMode attr
+const sal_Int32 eHA(((const 
SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
+const SvxFrameDirection eDirection = (const SvxFrameDirection)((( 
const 
SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
+static const rtl::OUString  sHorizontalAdjust( 
RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) );
+static const rtl::OUString  sWritingMode( 
RTL_CONSTASCII_USTRINGPARAM("TextWritingMode") );
+xPropSet->setPropertyValue(  sHorizontalAdjust , Any( eHA ) );
+if ( eDirection == FRMDIR_VERT_TOP_RIGHT )
+{//vertical writing
+xPropSet->setPropertyValue(  sWritingMode , Any( 
::com::sun::star::text::WritingMode_TB_RL ) );
+}
 SfxItemSet aSet( pObj->GetMergedItemSet() );
 XFillStyle eFillStyle(((XFillStyleItem&)pObj->GetMergedItem( 
XATTR_FILLSTYLE )).GetValue());
 ::com::sun::star::drawing::FillStyle eFS( 
com::sun::star::drawing::FillStyle_NONE );
commit a9d8b4dfc103b991de6c4d99914a39acef93ad23
Author: Xisco Fauli 
Date:   Mon Apr 1 23:14:21 2013 +0200

Revert "Reported by: Li Feng Wang"

This reverts commit e518ef52bbda3449130f51dbbf6f0a60bb76298f.

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index d65254ba..200e7b4 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7272,16 +7272,6 @@ void ApplyCellAttributes( const SdrObject* pObj, 
Reference< XCell >& xCell )
 eVA = drawing::TextVerticalAdjust_BOTTOM;
 xPropSet->setPropertyValue( sTextVerticalAdjust, Any( eVA ) );
 
-//set textHorizontalAdjust and TextWritingMode attr
-const sal_Int32 eHA(((const 
SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
-const SvxFrameDirection eDirection = (const SvxFrameDirection)((( 
const 
SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
-static const rtl::OUString  sHorizontalAdjust( 
RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) );
-static const rtl::OUString  sWritingMode( 
RTL_CONSTASCII_USTRINGPARAM("TextWritingMode") );
-xPropSet->setPropertyValue(  sHorizontalAdjust , Any( eHA ) );
-if ( eDirection == FRMDIR_VERT_TOP_RIGHT )
-{//vertical writing
-xPropSet->setPropertyValue(  sWritingMode , Any( 
::com::sun::star::text::WritingMode_TB_RL ) );
-}
 SfxItemSet aSet( pObj->GetMergedItemSet() );
 XFillStyle eFillStyle(((XFillStyleItem&)pObj->GetMergedItem( 
XATTR_FILLSTYLE )).GetValue());
 ::com::sun::star::drawing::FillStyle eFS( 
com::sun::star::drawing::

[Libreoffice-commits] core.git: 3 commits - filter/source sw/source

 filter/source/msfilter/escherex.cxx |   18 ++
 filter/source/msfilter/svdfppt.cxx  |   10 ++
 sw/source/filter/ww8/ww8par.cxx |   13 +++--
 3 files changed, 27 insertions(+), 14 deletions(-)

New commits:
commit c6ba5edabc427bfddd850b1e8e586d5e440246c2
Author: Xisco Fauli 
Date:   Mon Apr 1 23:01:59 2013 +0200

Related to #120039: Remove RTL_CONSTASCII_USTRINGPARAM

Change-Id: Idc6bae019e972ad512158c71376f7995ab8cf2db

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 880cc51..6449ba8 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1455,33 +1455,27 @@ sal_Bool 
EscherPropertyContainer::CreateGraphicProperties(
 if ( eBitmapMode == ::com::sun::star::drawing::BitmapMode_REPEAT )
 {
 sal_Int32 nSizeX = 0,nSizeY = 0,nOffsetX = 0,nOffsetY = 
0,nPosOffsetX = 0,nPosOffsetY = 0;
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapSizeX" 
) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet, "FillBitmapSizeX", sal_True ) )
 {
 aAny >>= nSizeX;
 }
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapSizeY" 
) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet, "FillBitmapSizeY", sal_True ) )
 {
 aAny >>= nSizeY;
 }
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM( 
"FillBitmapOffsetX" ) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet, "FillBitmapOffsetX", sal_True ) )
 {
 aAny >>= nOffsetX;
 }
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM( 
"FillBitmapOffsetY" ) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet, "FillBitmapOffsetY", sal_True ) )
 {
 aAny >>= nOffsetY;
 }
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM( 
"FillBitmapPositionOffsetX" ) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet, "FillBitmapPositionOffsetX", sal_True ) )
 {
 aAny >>= nPosOffsetX;
 }
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM( 
"FillBitmapPositionOffsetY" ) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, 
rXPropSet, "FillBitmapPositionOffsetY", sal_True ) )
 {
 aAny >>= nPosOffsetY;
 }
commit 638678893657aaf90a3b6e1a6c4d3fb3fc28e954
Author: Lei De Bin 
Date:   Wed Jul 4 05:46:06 2012 +

Fix #119510# - fix some invalid FLY_AT_PARA case:

The width should be automatically re-sized, then for the horizontal 
alignment left is
better than right.

Found by: yan ji
Patch by: Lei De Bin
Review by: Chen Zuo Jun
Conflicts:
sw/source/filter/ww8/ww8par.cxx

Change-Id: I584b81bf2f32e8ae41bd761f760672a33d1bfd73

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 621bdbb..f78da7b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -57,6 +57,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1892,9 +1893,17 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(long 
nStart, long nLen,
 
 SwFlyFrmFmt *pFrame = rDoc.MakeFlySection(FLY_AT_PARA, pPaM->GetPoint());
 
-pFrame->SetFmtAttr(SwFmtFrmSize(ATT_MIN_SIZE, nPageWidth, MINLAY));
+SwFmtAnchor aAnch( pFrame->GetAnchor() );
+aAnch.SetType( FLY_AT_PARA );
+pFrame->SetFmtAttr( aAnch );
+SwFmtFrmSize aSz(ATT_MIN_SIZE, nPageWidth, MINLAY);
+SwFrmSize eFrmSize = ATT_MIN_SIZE;
+if( eFrmSize != aSz.GetWidthSizeType() )
+aSz.SetWidthSizeType( eFrmSize );
+pFrame->SetFmtAttr(aSz);
 pFrame->SetFmtAttr(SwFmtSurround(SURROUND_THROUGHT));
-pFrame->SetFmtAttr(SwFmtHoriOrient(0, text::HoriOrientation::RIGHT)); 
//iFOO
+pFrame->SetFmtAttr(SwFmtHoriOrient(0, text::HoriOrientation::LEFT)); //iFOO
+
 // #i43427# - send frame for header/footer into background.
 pFrame->SetFmtAttr( SvxOpaqueItem( RES_OPAQUE, false ) );
 SdrObject* pF

[Libreoffice-commits] libvisio.git: configure.ac src/lib

2013-04-01 Thread Fridrich Štrba

 configure.ac|   25 +
 src/lib/VSDContentCollector.cpp |  504 +++-
 src/lib/VSDContentCollector.h   |1 
 src/lib/VSDTypes.h  |5 
 4 files changed, 168 insertions(+), 367 deletions(-)

New commits:
commit a655e5fcca4835a55992b3c9db792ed98bcb265a
Author: Fridrich Å trba 
Date:   Mon Apr 1 22:57:46 2013 +0200

Use ICU for charset conversions

diff --git a/configure.ac b/configure.ac
index 508e034..151f581 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,27 @@ PKG_CHECK_MODULES([LIBXML],[
libxml-2.0
 ])
 
+# 
+# Find icu
+# 
+AS_IF([test "${ICU_CFLAGS+set}" = set],[
+   ICU_CFLAGS_overriden=yes],[
+   ICU_CFLAGS_overriden=no])
+PKG_CHECK_MODULES([ICU],[icu-i18n],[
+   AS_IF([test "${ICU_CFLAGS_overriden}" = no], [
+   ICU_CFLAGS="${ICU_CFLAGS} `${PKG_CONFIG} icu-i18n 
--variable=CXXFLAGS`"])
+   ], [
+   AC_PATH_PROG([ICU_CONFIG],[icu-config])
+   AC_MSG_CHECKING([ICU installation])
+   AS_IF([${ICU_CONFIG} --cflags >/dev/null 2>&1],[
+   ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags`
+   ICU_LIBS=`${ICU_CONFIG} --ldflags`
+   AC_MSG_RESULT([found])],[
+   AC_MSG_ERROR([libicu config program icu-config not found])])]
+)
+AC_SUBST(ICU_CFLAGS)
+AC_SUBST(ICU_LIBS)
+
 # =
 # Find zlib
 # =
@@ -222,8 +243,8 @@ AS_IF([test "x$native_win32" = "xyes"], [
CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow -pedantic"
])
 ])
-LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS} ${ZLIB_CFLAGS}"
-LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS}"
+LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS} ${ZLIB_CFLAGS} 
${ICU_CFLAGS}"
+LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS} ${ICU_LIBS}"
 AC_SUBST(LIBVISIO_CXXFLAGS)
 AC_SUBST(LIBVISIO_LIBS)
 
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 82ca61f..f90ce7b 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -31,6 +31,9 @@
 #include  // for memcpy
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include "VSDContentCollector.h"
 #include "VSDParser.h"
@@ -54,52 +57,19 @@ static unsigned bitmapId = 0;
 namespace
 {
 
-static void _appendUCS4(WPXString &text, unsigned ucs4Character)
+static void _appendUCS4(WPXString &text, UChar32 ucs4Character)
 {
-  unsigned char first;
-  int len;
-  if (ucs4Character < 0x80)
-  {
-first = 0;
-len = 1;
-  }
-  else if (ucs4Character < 0x800)
-  {
-first = 0xc0;
-len = 2;
-  }
-  else if (ucs4Character < 0x1)
-  {
-first = 0xe0;
-len = 3;
-  }
-  else if (ucs4Character < 0x20)
-  {
-first = 0xf0;
-len = 4;
-  }
-  else if (ucs4Character < 0x400)
-  {
-first = 0xf8;
-len = 5;
-  }
-  else
-  {
-first = 0xfc;
-len = 6;
-  }
+  // Convert carriage returns to new line characters
+  // Writerperfect/LibreOffice will replace them by 
+  if (ucs4Character == (UChar32) 0x0d || ucs4Character == (UChar32) 0x0e)
+ucs4Character = (UChar32) '\n';
 
-  unsigned char outbuf[6] = { 0, 0, 0, 0, 0, 0 };
-  int i;
-  for (i = len - 1; i > 0; --i)
-  {
-outbuf[i] = (ucs4Character & 0x3f) | 0x80;
-ucs4Character >>= 6;
-  }
-  outbuf[0] = (ucs4Character & 0xff) | first;
+  unsigned char outbuf[U8_MAX_LENGTH+1];
+  int i = 0;
+  U8_APPEND_UNSAFE(&outbuf[0], i, ucs4Character);
+  outbuf[i] = 0;
 
-  for (i = 0; i < len; i++)
-text.append(outbuf[i]);
+  text.append((char *)outbuf);
 }
 
 } // anonymous namespace
@@ -2636,353 +2606,157 @@ void 
libvisio::VSDContentCollector::appendCharacters(WPXString &text, const std:
 return;
   }
 
-  static const unsigned short cp874map[] =
-  {
-0x20AC, 0x0020, 0x0020, 0x0020, 0x0020, 0x2026, 0x0020, 0x0020,
-0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020,
-0x0020, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020,
-0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07,
-0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
-0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17,
-0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F,
-0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
-0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
-0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
-0x0E38, 0x0E39, 0x0E3A, 0x0020, 0x0020, 0x0020, 0x0020, 0x0E3F,
-0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
-0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
-0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
-0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0020, 0x0020, 0x0020, 0x0020
-  };
-
-  static const unsigned short cp12

[Libreoffice-commits] core.git: 2 commits - sfx2/source sw/source

 sfx2/source/appl/workwin.cxx |6 ++
 sw/source/ui/uiview/view.cxx |4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit cfeed2303f114afdf45b59c5a4994966e23fa76a
Author: Tor Lillqvist 
Date:   Mon Apr 1 23:34:48 2013 +0300

Avoid rulers in non-DESKTOP environment

Another simple first step.

Change-Id: If683004cbb1ffac01e90b9b27e81c033d5b0e529

diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 84c2699..e4858ab 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
 #include 
 #include 
@@ -960,11 +961,12 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* 
pOldSh )
 m_bVScrollbarEnabled = aUsrPref.IsViewVScrollBar();
 m_bHScrollbarEnabled = aUsrPref.IsViewHScrollBar();
 m_pHScrollbar->SetAuto(bBrowse);
+#if HAVE_FEATURE_DESKTOP
 if( aUsrPref.IsViewHRuler() )
 CreateTab();
 if( aUsrPref.IsViewVRuler() )
 CreateVRuler();
-
+#endif
 m_pWrtShell->SetUIOptions( aUsrPref );
 m_pWrtShell->SetReadOnlyAvailable( aUsrPref.IsCursorInProtectedArea() );
 m_pWrtShell->ApplyAccessiblityOptions(SW_MOD()->GetAccessibilityOptions());
commit 2a5073d91702061177b279e7a8555a1f30266015
Author: Tor Lillqvist 
Date:   Mon Apr 1 23:31:18 2013 +0300

Avoid desktop GUI elements in non-DESKTOP environment

One simple early step: Start a SfxWorkWindow (what a meaningless
name...) in "full-screen" mode, and without a status bar. Still lots
of ifdefs etc to add if we want to avoid compiling in all the tons of
related code.

Change-Id: Id8b37bd215423a839643c5c1f426f6455956a886

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 0a379df..99da99d 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
 #include 
 #include 
@@ -582,8 +583,13 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& 
rB, SfxWorkWindow* pPar
 bDockingAllowed(sal_True),
 bInternalDockingAllowed(sal_True),
 bAllChildrenVisible(sal_True),
+#if HAVE_FEATURE_DESKTOP
 bIsFullScreen( sal_False ),
 bShowStatusBar( sal_True ),
+#else
+bIsFullScreen( sal_True ),
+bShowStatusBar( sal_False ),
+#endif
 m_nLock( 0 ),
 m_aStatusBarResName( RTL_CONSTASCII_USTRINGPARAM( 
"private:resource/statusbar/statusbar" )),
 m_aLayoutManagerPropName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: forms/source

2013-04-01 Thread Thomas Arnhold

 forms/source/inc/frm_strings.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c893d404c6bb90990ea18db70f27647269a6369f
Author: Thomas Arnhold 
Date:   Mon Apr 1 22:48:35 2013 +0200

Revert "Remove RTL_CONSTASCII_(U)STRINGPARAM in forms(frm_strings.hxx)"

This reverts commit 6591068f2a73252f4e3c9abf9b153a5b4f59410b.

The second parameter of ConstAsciiString is length.

diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index 18ed90c..3e10031 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -34,7 +34,7 @@ namespace frm
 extern const ConstAsciiString ident
 #else
 #define FORMS_CONSTASCII_STRING( ident, string )\
-extern const ConstAsciiString ident = {OString(string)}
+extern const ConstAsciiString ident = 
{RTL_CONSTASCII_STRINGPARAM(string)}
 #endif
 
 
//..
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig

 cui/source/inc/helpid.hrc  |1 
 cui/uiconfig/ui/optfltrpage.ui |7 
 cui/uiconfig/ui/optsavepage.ui |  794 +++--
 3 files changed, 377 insertions(+), 425 deletions(-)

New commits:
commit 0c3ee477085b9ed1750fed540fd628a4a64a3497
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 21:25:09 2013 +0100

remove unused help ids

Change-Id: I2a5e7099fd9900864c70c4e2be687e69d67509f9

diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 7ae83f1..a6a8b8b 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -24,7 +24,6 @@
 
 // Help-Ids --
 
-#define HID_OPTIONS_SAVE "CUI_HID_OPTIONS_SAVE"
 #define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU"
 #define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW"
 #define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT"
commit 2ba5a31ceb1ef488e8c1a9576819a6c17ed668bf
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 21:03:44 2013 +0100

put save options into columns

risk putting the save options into columns, and put the load
options into their traditional position, rather than side
by side with the save options

Change-Id: I298ca87b11afcc0dcd4ddc148b37f50e0c89baea

diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index 3828833..54320f8 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -15,274 +15,262 @@
 vertical
 12
 
-  
+  
 True
 False
+True
+0
+none
 
-  
+  
 True
 False
-0
-none
+6
+12
 
-  
+  
 True
 False
-6
-12
+6
 
-  
+  
+Load printer 
settings with the document
 True
-False
-True
-6
-
-  
-True
-False
-6
-
-  
-Save 
_AutoRecovery information every
-True
-True
-False
-True
-0
-True
-  
-  
-0
-0
-1
-1
-  
-
-
-  
-True
-True
-â
-True
-adjustment1
-  
-  
-1
-0
-1
-1
-  
-
-
-  
-True
-False
-Minutes
-  
-  
-2
-0
-1
-1
-  
-
-  
-  
-0
-2
-1
-1
-  
-
-
-  
-_Edit 
document properties before saving
-True
-True
-False
-True
-0
-True
-  
-  
-0
-0
-1
-1
-  
-
-
-  
-Al_ways 
create backup copy
-True
-True
-False
-True
-0
-True
-  
-  
-0
-1
-1
-1
-  
-
-
-  
-Automatically save the document too
-True
-True
-

[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst source/text

 helpers/help_hid.lst |   23 -
 source/text/shared/optionen/01010200.xhp |   54 +++
 source/text/shared/optionen/01130100.xhp |   25 +++---
 3 files changed, 40 insertions(+), 62 deletions(-)

New commits:
commit 037b55c72ae7831f19ffb8429fba81038314c163
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 21:24:38 2013 +0100

update helpids for ms vba load/save options page .ui conversion

Change-Id: I4f46a1b9d4749cdd752cf2cd8337a6f4ca99be99

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 9c5af7c..f6baeaa 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -7435,13 +7435,6 @@ 
svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_PRINT_EXTENSION,808846374,
 svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_STARBASIC,808846367,
 svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_STARBASIC_WARNING,808846368,
 svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_UNKNOWN_TAGS,808846357,
-svx_CheckBox_RID_OFAPAGE_MSFILTEROPT_CB_EBAS_CODE,809174019,
-svx_CheckBox_RID_OFAPAGE_MSFILTEROPT_CB_EBAS_EXECTBL,809174020,
-svx_CheckBox_RID_OFAPAGE_MSFILTEROPT_CB_EBAS_STG,809174021,
-svx_CheckBox_RID_OFAPAGE_MSFILTEROPT_CB_PBAS_CODE,809174022,
-svx_CheckBox_RID_OFAPAGE_MSFILTEROPT_CB_PBAS_STG,809174023,
-svx_CheckBox_RID_OFAPAGE_MSFILTEROPT_CB_WBAS_CODE,809174017,
-svx_CheckBox_RID_OFAPAGE_MSFILTEROPT_CB_WBAS_STG,809174018,
 svx_CheckBox_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS,809256156,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709,
@@ -8310,8 +8303,6 @@ 
svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BRACKETED,1237598722,
 svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_SIMPLE_CONVERSION,1237598721,
 svx_TabPage_RID_OFAPAGE_CONNPOOLOPTIONS,809205760,
 svx_TabPage_RID_OFAPAGE_HTMLOPT,808845312,
-svx_TabPage_RID_OFAPAGE_MSFILTEROPT,809172992,
-svx_TabPage_RID_OFAPAGE_MSFILTEROPT2,809189376,
 svx_TabPage_RID_OFA_TP_INTERNATIONAL,811335680,
 svx_TabPage_RID_SFXPAGE_DBREGISTER,809222144,
 svx_TabPage_RID_SVXPAGE_EVENTASSIGN,705675264,
diff --git a/source/text/shared/optionen/01130100.xhp 
b/source/text/shared/optionen/01130100.xhp
index 8e614bb..a406832 100644
--- a/source/text/shared/optionen/01130100.xhp
+++ b/source/text/shared/optionen/01130100.xhp
@@ -18,8 +18,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-   
+
 
   
  VBA Properties
@@ -36,6 +35,7 @@
  VBA code; loading/saving documents with VBA 
code
  Visual Basic for Applications; loading/saving 
documents with VBA code
 
+
 VBA Properties
  Specifies the general properties for loading 
and saving Microsoft Office documents with VBA (Visual Basic for Applications) 
code.
@@ -45,18 +45,18 @@
   
   Microsoft Word 97/2000/XP
   Select the settings for Microsoft Word documents.
-
-
-
+
+
+
 Load Basic code
-  Loads and saves the 
Basic code from a Microsoft document as a special $[officename] Basic module 
with the document. The disabled Microsoft Basic code is visible in the 
$[officename] Basic IDE between Sub and End 
Sub. You can edit the code. When saving the document in 
$[officename] format, the Basic code is saved as well. When saving in another 
format, the Basic code from the $[officename] Basic IDE is not saved. 
+  Loads and saves the Basic code from a 
Microsoft document as a special $[officename] Basic module with the document. 
The disabled Microsoft Basic code is visible in the $[officename] Basic IDE 
between Sub and End Sub. You can edit the 
code. When saving the document in $[officename] format, the Basic code is saved 
as well. When saving in another format, the Basic code from the $[officename] 
Basic IDE is not saved.
 
-
-
-
+
+
+
 Save original Basic code
   
- Specifies that the 
original Microsoft Basic code contained in the document is held in a special 
internal memory for as long as the document remains loaded in $[officename]. 
When saving the document in Microsoft format the Microsoft Basic is saved again 
with the code in an unchanged form.
+ Specifies 
that the original Microsoft Basic code contained in the document is held in a 
special internal memory for as long as the document remains loaded in 
$[officename]. When saving the document in Microsoft format the Microsoft Basic 
is saved again with the code in an unchanged form.
  When saving in another format than Microsoft Format, the 
Microsoft Basic Code is not saved. For example, if the document contains 
Microsoft Basic Code and you save it in $[officename] format, you will be 
warned that the Microsoft Basic Code will not be saved.
  The Save original Basic code checkbox takes 
precedence over the Load Basic code check box. If both boxes are 
marked and you edit the disabled Basic Code in the $[officename] Basic IDE, the 
original Microsoft Bas

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7963b57c85068a33da4d3043c4bfe0d2df84c7ec
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 21:24:38 2013 +0100

Updated core
Project: help  037b55c72ae7831f19ffb8429fba81038314c163

diff --git a/helpcontent2 b/helpcontent2
index d67b1b1..037b55c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d67b1b116fd3c4d9e08c45135949e55e7170a6ae
+Subproject commit 037b55c72ae7831f19ffb8429fba81038314c163
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basegfx/source

 basegfx/source/raster/rasterconvert3d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b847e3c809bd662ccedf4f9a74cb19cc7c2de7dd
Author: Julien Nabet 
Date:   Mon Apr 1 22:27:04 2013 +0200

Prefer prefix ++/-- operators for non-primitive types

Change-Id: Iaf45e2b7f48ae4c5675d0b59df851dbde42ba934

diff --git a/basegfx/source/raster/rasterconvert3d.cxx 
b/basegfx/source/raster/rasterconvert3d.cxx
index c2c9236..501bdf9 100644
--- a/basegfx/source/raster/rasterconvert3d.cxx
+++ b/basegfx/source/raster/rasterconvert3d.cxx
@@ -106,7 +106,7 @@ namespace basegfx
 }
 }
 
-aCurrentEntry++;
+++aCurrentEntry;
 }
 
 // sort current scanline using comparator. Only X is used there
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] Try to optimize a bit

Julien Nabet has abandoned this change.

Change subject: Try to optimize a bit
..


Patch Set 3: Abandoned

Sorry, didn't see you had already pushed the fix.
Thank you anyway for your review and explanations! :-)

-- 
To view, visit https://gerrit.libreoffice.org/3153
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I36a529ef29b93ee46e4a3ff6823fbce15d176c27
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Julien Nabet 
Gerrit-Reviewer: Markus Mohrhard 
Gerrit-Reviewer: Noel Grandin 

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

[PATCH] Use OUString and sal_Int32 in GetNonMnemonicString() and Get...

2013-04-01 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3160

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/3160/1

Use OUString and sal_Int32 in GetNonMnemonicString() and GetCtrlTextWidth()

Change-Id: I599d03686a020841dc3c18ca75ffcc96889a95a6
---
M vcl/inc/vcl/outdev.hxx
M vcl/source/gdi/outdev3.cxx
M vcl/source/gdi/pdfwriter_impl.cxx
M vcl/source/window/menu.cxx
4 files changed, 30 insertions(+), 32 deletions(-)



diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index df433ff..f63c7ec 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -622,12 +622,12 @@
 voidDrawCtrlText( const Point& rPos, const XubString& rStr,
   xub_StrLen nIndex = 0, xub_StrLen nLen = 
STRING_LEN,
   sal_uInt16 nStyle = TEXT_DRAW_MNEMONIC, 
MetricVector* pVector = NULL, OUString* pDisplayText = NULL );
-longGetCtrlTextWidth( const XubString& rStr, xub_StrLen 
nIndex = 0,
-  xub_StrLen nLen = STRING_LEN,
+longGetCtrlTextWidth( const OUString& rStr, sal_Int32 
nIndex = 0,
+  sal_Int32 nLen = -1,
   sal_uInt16 nStyle = 
TEXT_DRAW_MNEMONIC ) const;
-static XubStringGetNonMnemonicString( const XubString& rStr, 
xub_StrLen& rMnemonicPos );
-static XubStringGetNonMnemonicString( const XubString& rStr )
-{ xub_StrLen nDummy; return GetNonMnemonicString( 
rStr, nDummy ); }
+static OUStringGetNonMnemonicString( const OUString& rStr, sal_Int32& 
rMnemonicPos );
+static OUStringGetNonMnemonicString( const OUString& rStr )
+{ sal_Int32 nDummy; return GetNonMnemonicString( 
rStr, nDummy ); }
 
 sal_BoolGetTextBoundRect( Rectangle& rRect,
 const String& rStr, xub_StrLen nBase = 0, 
xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN,
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index ec06af0..f966cc0 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6228,7 +6228,7 @@
 
 longnTextHeight = rTargetDevice.GetTextHeight();
 TextAlign   eAlign  = rTargetDevice.GetTextAlign();
-xub_StrLen  nMnemonicPos= STRING_NOTFOUND;
+sal_Int32   nMnemonicPos= -1;
 
 String aStr = rOrigStr;
 if ( nStyle & TEXT_DRAW_MNEMONIC )
@@ -6239,7 +6239,6 @@
 // Mehrzeiligen Text behandeln wir anders
 if ( nStyle & TEXT_DRAW_MULTILINE )
 {
-
 XubString   aLastLine;
 ImplMultiTextLineInfo   aMultiLineInfo;
 ImplTextLineInfo*   pLineInfo;
@@ -6392,7 +6391,7 @@
 longnMnemonicX = 0;
 longnMnemonicY = 0;
 longnMnemonicWidth = 0;
-if ( nMnemonicPos != STRING_NOTFOUND )
+if ( nMnemonicPos != -1 )
 {
 sal_Int32* pCaretXArray = (sal_Int32*) alloca( 2 * 
sizeof(sal_Int32) * aStr.Len() );
 /*sal_Bool bRet =*/ _rLayout.GetCaretPositions( aStr, 
pCaretXArray, 0, aStr.Len() );
@@ -6412,7 +6411,7 @@
 _rLayout.DrawText( aPos, aStr, 0, STRING_LEN, pVector, 
pDisplayText );
 if ( bDrawMnemonics )
 {
-if ( nMnemonicPos != STRING_NOTFOUND )
+if ( nMnemonicPos != -1 )
 rTargetDevice.ImplDrawMnemonicLine( nMnemonicX, 
nMnemonicY, nMnemonicWidth );
 }
 rTargetDevice.Pop();
@@ -6422,7 +6421,7 @@
 _rLayout.DrawText( aPos, aStr, 0, STRING_LEN, pVector, 
pDisplayText );
 if ( bDrawMnemonics )
 {
-if ( nMnemonicPos != STRING_NOTFOUND )
+if ( nMnemonicPos != -1 )
 rTargetDevice.ImplDrawMnemonicLine( nMnemonicX, 
nMnemonicY, nMnemonicWidth );
 }
 }
@@ -6817,7 +6816,7 @@
 nLen = rStr.Len() - nIndex;
 
 XubString   aStr = rStr;
-xub_StrLen  nMnemonicPos = STRING_NOTFOUND;
+sal_Int32   nMnemonicPos = -1;
 
 longnMnemonicX = 0;
 longnMnemonicY = 0;
@@ -6825,7 +6824,7 @@
 if ( (nStyle & TEXT_DRAW_MNEMONIC) && nLen > 1 )
 {
 aStr = GetNonMnemonicString( aStr, nMnemonicPos );
-if ( nMnemonicPos != STRING_NOTFOUND )
+if ( nMnemonicPos != -1 )
 {
 if( nMnemonicPos < nIndex )
 --nIndex;
@@ -6923,21 +6922,21 @@
 mpAlphaVDev->DrawCtrlText( rPos, rStr, nIndex, nLen, nStyle, pVector, 
pDisplayText );
 }
 
-long OutputDevice::GetCtrlTextWidth( const String& rStr,
- xub_StrLen nIndex, xub_StrLen nLen,
+long OutputDevice::GetCtrlTextWidth( const OUString& rStr,
+ sal_Int32 nIndex, sal_Int32 nLe

[PATCH] Use OUString in ImplGetEllipsisString()

2013-04-01 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3159

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/3159/1

Use OUString in ImplGetEllipsisString()

Change-Id: I02ae342857d2944c3d1a20b8d24bd6fcf3ac1f4a
---
M vcl/inc/vcl/outdev.hxx
M vcl/source/gdi/outdev3.cxx
2 files changed, 58 insertions(+), 46 deletions(-)



diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index a1424f6..df433ff 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -386,7 +386,7 @@
 SAL_DLLPRIVATE SalLayout*   ImplGlyphFallbackLayout( SalLayout*, 
ImplLayoutArgs& ) const;
 
 static
-SAL_DLLPRIVATE XubStringImplGetEllipsisString( const OutputDevice& 
rTargetDevice, const XubString& rStr,
+SAL_DLLPRIVATE OUStringImplGetEllipsisString( const OutputDevice& 
rTargetDevice, const OUString& rStr,
long nMaxWidth, 
sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout );
 static
 SAL_DLLPRIVATE void ImplDrawText( OutputDevice& rTargetDevice, 
const Rectangle& rRect,
@@ -617,7 +617,7 @@
  const XubString& rStr, sal_uInt16 nStyle 
= TEXT_DRAW_WORDBREAK,
  TextRectInfo* pInfo = NULL,
  const ::vcl::ITextLayout* _pTextLayout = 
NULL ) const;
-OUStringGetEllipsisString( const XubString& rStr, long 
nMaxWidth,
+OUStringGetEllipsisString( const OUString& rStr, long 
nMaxWidth,
sal_uInt16 nStyle = 
TEXT_DRAW_ENDELLIPSIS ) const;
 voidDrawCtrlText( const Point& rPos, const XubString& rStr,
   xub_StrLen nIndex = 0, xub_StrLen nLen = 
STRING_LEN,
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 9cc6369..ec06af0 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6645,7 +6645,7 @@
 return sal_False;
 }
 
-OUString OutputDevice::GetEllipsisString( const String& rOrigStr, long 
nMaxWidth,
+OUString OutputDevice::GetEllipsisString( const OUString& rOrigStr, long 
nMaxWidth,
 sal_uInt16 nStyle ) const
 {
 DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
@@ -6653,44 +6653,57 @@
 return ImplGetEllipsisString( *this, rOrigStr, nMaxWidth, nStyle, 
aTextLayout );
 }
 
-String OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, 
const XubString& rOrigStr, long nMaxWidth,
+OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& 
rTargetDevice, const OUString& rOrigStr, long nMaxWidth,
sal_uInt16 nStyle, const 
::vcl::ITextLayout& _rLayout )
 {
-String aStr = rOrigStr;
-xub_StrLen nIndex = _rLayout.GetTextBreak( aStr, nMaxWidth, 0, aStr.Len() 
);
-
+OUString aStr = rOrigStr;
+sal_Int32 nIndex = _rLayout.GetTextBreak( aStr, nMaxWidth, 0, 
aStr.getLength() );
 
 if ( nIndex != STRING_LEN )
 {
 if( (nStyle & TEXT_DRAW_CENTERELLIPSIS) == TEXT_DRAW_CENTERELLIPSIS )
 {
-String aTmpStr( aStr );
-xub_StrLen nEraseChars = 4;
-while( nEraseChars < aStr.Len() && _rLayout.GetTextWidth( aTmpStr, 
0, aTmpStr.Len() ) > nMaxWidth )
+sal_Int32 nEraseStart = aStr.getLength()/2;
+sal_Int32 nEraseEnd = nEraseStart;
+sal_Int32 nEraseChars = nEraseEnd - nEraseStart +1;
+sal_Int32 nEllipsisWidth = _rLayout.GetTextWidth( "...", 0, 3 );
+bool bRemoveForward = true;
+sal_Int32 nOrigLength = _rLayout.GetTextWidth( aStr, 0, 
aStr.getLength() );
+while( nEraseChars < aStr.getLength() &&
+   nOrigLength - _rLayout.GetTextWidth( aStr, nEraseStart, 
nEraseEnd ) > nMaxWidth - nEllipsisWidth)
 {
-aTmpStr = aStr;
-xub_StrLen i = (aTmpStr.Len() - nEraseChars)/2;
-aTmpStr.Erase( i, nEraseChars++ );
-aTmpStr.InsertAscii( "...", i );
+if (bRemoveForward)
+++nEraseEnd;
+else
+--nEraseStart;
+bRemoveForward = !bRemoveForward;
+nEraseChars = nEraseEnd - nEraseStart +1;
 }
-aStr = aTmpStr;
+OUStringBuffer aTmpStr(aStr);
+aTmpStr.remove(nEraseStart, nEraseChars);
+aTmpStr.insert(nEraseStart, "...");
+aStr = aTmpStr.makeStringAndClear();
 }
 else if ( nStyle & TEXT_DRAW_ENDELLIPSIS )
 {
-aStr.Erase( nIndex );
+OUString aTmpStr = aStr.replaceAt( nIndex, 
aTmpStr.getLength()-nIndex, "" );
+
 if ( nIndex > 1 )
 {
-aStr.AppendAscii( "..." );
-while ( aStr.Len() && (_rLayout.GetT

[PATCH] Use OUString and sal_Int32 in GetTextWidth() (2)

2013-04-01 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3158

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/3158/1

Use OUString and sal_Int32 in GetTextWidth() (2)

Change-Id: I85ea6cc60add141954c8b75f78a8024c872d7174
---
M vcl/inc/textlayout.hxx
M vcl/source/gdi/textlayout.cxx
2 files changed, 7 insertions(+), 7 deletions(-)



diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 28f21eb..0788a8a 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -40,7 +40,7 @@
 class SAL_NO_VTABLE ITextLayout
 {
 public:
-virtual longGetTextWidth( const XubString& _rText, xub_StrLen 
_nStartIndex, xub_StrLen _nLength ) const = 0;
+virtual longGetTextWidth( const OUString& _rText, sal_Int32 
_nStartIndex, sal_Int32 _nLength ) const = 0;
 virtual voidDrawText( const Point& _rStartPoint, const 
OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength,
 MetricVector* _pVector, OUString* 
_pDisplayText ) = 0;
 virtual boolGetCaretPositions( const OUString& _rText, 
sal_Int32* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 
0;
@@ -68,9 +68,9 @@
 
 // ITextLayout overridables
 virtual longGetTextWidth(
-const XubString& _rText,
-xub_StrLen _nStartIndex,
-xub_StrLen _nLength
+const OUString& _rText,
+sal_Int32 _nStartIndex,
+sal_Int32 _nLength
 ) const;
 virtual voidDrawText(
 const Point& _rStartPoint,
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 5e70329..1e79f32 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -50,7 +50,7 @@
 }
 
 //
-long DefaultTextLayout::GetTextWidth( const XubString& _rText, xub_StrLen 
_nStartIndex, xub_StrLen _nLength ) const
+long DefaultTextLayout::GetTextWidth( const OUString& _rText, sal_Int32 
_nStartIndex, sal_Int32 _nLength ) const
 {
 return m_rTargetDevice.GetTextWidth( _rText, _nStartIndex, _nLength );
 }
@@ -91,7 +91,7 @@
 virtual ~ReferenceDeviceTextLayout();
 
 // ITextLayout
-virtual longGetTextWidth( const XubString& rStr, xub_StrLen 
nIndex, xub_StrLen nLen ) const;
+virtual longGetTextWidth( const OUString& rStr, sal_Int32 
nIndex, sal_Int32 nLen ) const;
 virtual voidDrawText( const Point& _rStartPoint, const 
OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector* 
_pVector, OUString* _pDisplayText );
 virtual boolGetCaretPositions( const OUString& _rText, 
sal_Int32* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const;
 virtual xub_StrLen  GetTextBreak( const OUString& _rText, long 
_nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const;
@@ -223,7 +223,7 @@
 }
 
 //
-long ReferenceDeviceTextLayout::GetTextWidth( const XubString& _rText, 
xub_StrLen _nStartIndex, xub_StrLen _nLength ) const
+long ReferenceDeviceTextLayout::GetTextWidth( const OUString& _rText, 
sal_Int32 _nStartIndex, sal_Int32 _nLength ) const
 {
 return GetTextArray( _rText, NULL, _nStartIndex, _nLength );
 }

-- 
To view, visit https://gerrit.libreoffice.org/3158
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85ea6cc60add141954c8b75f78a8024c872d7174
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith 

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

[Libreoffice-commits] core.git: fpicker/Library_fps_aqua.mk

 fpicker/Library_fps_aqua.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7ffc3fd98f063d0bfa5862298cc58df0ed751de3
Author: Tor Lillqvist 
Date:   Mon Apr 1 23:16:54 2013 +0300

Library_fps_aqua needs i18nisolang1

Change-Id: I4f555c40e6b103e7dcc7486dc612f74a54c05954

diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index 4684b25..ada788d 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -45,6 +45,7 @@ $(eval $(call 
gb_Library_use_system_darwin_frameworks,fps_aqua,\
 $(eval $(call gb_Library_use_libraries,fps_aqua,\
cppu \
cppuhelper \
+   i18nisolang1 \
sal \
tl \
vcl \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[RESTORED] Try to optimize a bit

Julien Nabet has restored this change.

Change subject: Try to optimize a bit
..


Patch Set 2: Restored

I understand a little better Markus, so I'm gonna use your patch.

-- 
To view, visit https://gerrit.libreoffice.org/3153
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: restore
Gerrit-Change-Id: I36a529ef29b93ee46e4a3ff6823fbce15d176c27
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Julien Nabet 
Gerrit-Reviewer: Markus Mohrhard 
Gerrit-Reviewer: Noel Grandin 

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

[Libreoffice-commits] core.git: 4 commits - forms/source sax/source scaddins/source smoketest/smoketest.cxx sot/source svl/qa svl/source toolkit/source vbahelper/inc

2013-04-01 Thread Chr . Rossmanith

 forms/source/inc/FormComponent.hxx |2 +-
 forms/source/inc/forms_module.hxx  |2 +-
 forms/source/inc/frm_strings.hxx   |2 +-
 forms/source/misc/services.cxx |4 ++--
 forms/source/richtext/richtextengine.cxx   |2 +-
 forms/source/richtext/richtextimplcontrol.cxx  |2 +-
 sax/source/fastparser/fastparser.cxx   |8 
 sax/source/tools/converter.cxx |2 +-
 scaddins/source/datefunc/datefunc.cxx  |8 
 scaddins/source/pricing/pricing.cxx|8 
 smoketest/smoketest.cxx|3 +--
 sot/source/base/formats.cxx|2 +-
 sot/source/sdstor/ucbstorage.cxx   |2 +-
 svl/qa/unit/test_URIHelper.cxx |   24 
 svl/source/items/style.cxx |2 +-
 svl/source/misc/urihelper.cxx  |2 +-
 svl/source/numbers/zforlist.cxx|   24 
 toolkit/source/awt/vclxtoolkit.cxx |6 +++---
 toolkit/source/awt/vclxwindows.cxx |4 ++--
 vbahelper/inc/vbahelper/vbahelperinterface.hxx |2 +-
 20 files changed, 55 insertions(+), 56 deletions(-)

New commits:
commit f32677968ad4e79338608e6f93f601b1bdfcd868
Author: Chr. Rossmanith 
Date:   Mon Apr 1 22:08:13 2013 +0200

Remove RTL_CONSTASCII_(U)STRINGPARAM in scaddins/sax

Change-Id: Ic4f9bef02cc4bdc74b9a6d81e3317e10b9c79bd4

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 5cc207d..601905b 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -631,11 +631,11 @@ OUString lclGetErrorMessage( XML_Error xmlE, const 
OUString& sSystemId, sal_Int3
 
 OUStringBuffer aBuffer( sal_Unicode( '[' ) );
 aBuffer.append( sSystemId );
-aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " line " ) );
+aBuffer.append( " line " );
 aBuffer.append( nLine );
-aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "]: " ) );
-aBuffer.appendAscii( pMessage );
-aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " error" ) );
+aBuffer.append( "]: " );
+aBuffer.append( pMessage );
+aBuffer.append( " error" );
 return aBuffer.makeStringAndClear();
 }
 
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index fae1280..af36a02 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -650,7 +650,7 @@ void Converter::convertDuration(::rtl::OUStringBuffer& 
rBuffer,
 fValue = - fValue;
 }
 
-rBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM( "PT" ));
+rBuffer.append( "PT" );
 fValue *= 24;
 double fHoursValue = ::rtl::math::approxFloor (fValue);
 fValue -= fHoursValue;
diff --git a/scaddins/source/datefunc/datefunc.cxx 
b/scaddins/source/datefunc/datefunc.cxx
index 3794104..8f016d6 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -336,15 +336,15 @@ OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 
nResId, sal_uInt16 nStrIndex
 
 OUString ScaDateAddIn::getImplementationName_Static()
 {
-return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_IMPLNAME ));
+return OUString( MY_IMPLNAME );
 }
 
 uno::Sequence< OUString > ScaDateAddIn::getSupportedServiceNames_Static()
 {
 uno::Sequence< OUString > aRet( 2 );
 OUString* pArray = aRet.getArray();
-pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( ADDIN_SERVICE ));
-pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE ));
+pArray[0] = OUString( ADDIN_SERVICE );
+pArray[1] = OUString( MY_SERVICE );
 return aRet;
 }
 
@@ -353,7 +353,7 @@ uno::Sequence< OUString > 
ScaDateAddIn::getSupportedServiceNames_Static()
 OUString SAL_CALL ScaDateAddIn::getServiceName() throw( uno::RuntimeException )
 {
 // name of specific AddIn service
-return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE ));
+return OUString( MY_SERVICE );
 }
 
 // XServiceInfo
diff --git a/scaddins/source/pricing/pricing.cxx 
b/scaddins/source/pricing/pricing.cxx
index cc1a30c..48f37d7 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -340,15 +340,15 @@ OUString ScaPricingAddIn::GetFuncDescrStr( sal_uInt16 
nResId, sal_uInt16 nStrInd
 
 OUString ScaPricingAddIn::getImplementationName_Static()
 {
-return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_IMPLNAME ));
+return OUString( MY_IMPLNAME );
 }
 
 uno::Sequence< OUString > ScaPricingAddIn::getSupportedServiceNames_Static()
 {
 uno::Sequence< OUString > aRet( 2 );
 OUString* pArray = aRet.getArray();
-pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( ADDIN_SERVICE ));
-pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE ));
+pArray[0] = OUString( ADDIN_SERVICE );
+pArray[1] = OUString( MY_SERVICE );
 return aRet;
 }

[PATCH] Fix for the dialog PDF Options, register Digital Signatures

2013-04-01 Thread Andreas Mantke (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3157

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/3157/1

Fix for the dialog PDF Options, register Digital Signatures

This patch changes the length of the fixed text field "Use this certificate 
(...)"
because in some languages, e.g. German, the translation fits not into the 
available
space.
It also changes for the same reason the width of the Select- and the 
Clear-Button.

Change-Id: Ifbba3e40b27d96da4706c8dcdf4d9ab26069a83f
---
M filter/source/pdf/impdialog.src
1 file changed, 4 insertions(+), 4 deletions(-)



diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 0155b07..8d74616 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -820,7 +820,7 @@
 FixedText FT_SIGN_CERT_TEXT
 {
 Pos = MAP_APPFONT( 6, 3 );
-Size = MAP_APPFONT( 200, 10 );
+Size = MAP_APPFONT( 250, 10 );
 Text[ en-US ] = "Use this certificate to digitally sign PDF 
documents:";
 };
 
@@ -836,15 +836,15 @@
 {
 TabStop = TRUE ;
 Pos = MAP_APPFONT ( 130, 17 ) ;
-Size = MAP_APPFONT ( 30 , 13 ) ;
+Size = MAP_APPFONT ( 40 , 13 ) ;
 Text[ en-US ] = "~Select...";
 };
 
 PushButton BTN_SIGN_CERT_CLEAR
 {
 TabStop = TRUE ;
-Pos = MAP_APPFONT ( 165, 17 ) ;
-Size = MAP_APPFONT ( 30 , 13 ) ;
+Pos = MAP_APPFONT ( 175, 17 ) ;
+Size = MAP_APPFONT ( 40 , 13 ) ;
 Text[ en-US ] = "Clear";
 };
 

-- 
To view, visit https://gerrit.libreoffice.org/3157
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbba3e40b27d96da4706c8dcdf4d9ab26069a83f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andreas Mantke 

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

[PUSHED] fdo#51656 : Mean value line starts in wrong place in column ...

2013-04-01 Thread Markus Mohrhard (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3122


-- 
To view, visit https://gerrit.libreoffice.org/3122
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2389687e54cec4c0e873bcc120cc21b3c3d11d78
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Prashant Pandey 
Gerrit-Reviewer: Markus Mohrhard 

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

[Libreoffice-commits] core.git: 2 commits - chart2/source

2013-04-01 Thread elixir

 chart2/source/tools/InternalDataProvider.cxx |   23 ---
 chart2/source/view/charttypes/VSeriesPlotter.cxx |6 --
 2 files changed, 12 insertions(+), 17 deletions(-)

New commits:
commit 1ed73984639390759d26a2fc0209083d9f984d52
Author: elixir 
Date:   Mon Apr 1 20:14:07 2013 +0200

fdo#51656 : Mean value line starts in wrong place in column graph

Change-Id: I2389687e54cec4c0e873bcc120cc21b3c3d11d78

diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 6e114dd..884df9a 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1011,13 +1011,16 @@ void VSeriesPlotter::createRegressionCurvesShapes( 
VDataSeries& rVDataSeries
 xRegressionCurveCalculator->getCurveValues(
 fMinX, fMaxX, nRegressionPointCount, xScalingX, xScalingY, 
bMaySkipPointsInRegressionCalculation ));
 nRegressionPointCount = aCalculatedPoints.getLength();
+bool bAverageLine = RegressionCurveHelper::isMeanValueLine( 
aCurveList[nN] );
 for(sal_Int32 nP=0; nPdoLogicScaling( &fLogicX, &fLogicY, &fLogicZ );
+// fdo#51656: don't scale mean value lines
+if(!bAverageLine)
+m_pPosHelper->doLogicScaling( &fLogicX, &fLogicY, &fLogicZ );
 
 if(!::rtl::math::isNan(fLogicX) && !::rtl::math::isInf(fLogicX)
 && !::rtl::math::isNan(fLogicY) && 
!::rtl::math::isInf(fLogicY)
@@ -1045,7 +1048,6 @@ void VSeriesPlotter::createRegressionCurvesShapes( 
VDataSeries& rVDataSeries
 aVLineProperties.initFromPropertySet( xCurveModelProp );
 
 //create an extra group shape for each curve for selection handling
-bool bAverageLine = RegressionCurveHelper::isMeanValueLine( 
aCurveList[nN] );
 uno::Reference< drawing::XShapes > xRegressionGroupShapes =
 createGroupShape( xTarget, rVDataSeries.getDataCurveCID( nN, 
bAverageLine ) );
 uno::Reference< drawing::XShape > xShape = 
m_pShapeFactory->createLine2D(
commit afa1e9952eab0310ee3c194ebd03e0b0fe941168
Author: Markus Mohrhard 
Date:   Mon Apr 1 20:14:27 2013 +0200

some little code clean-up

 #

Change-Id: Ifbb754ce7ebe34b69a803f88b02a1e31bd21248f

diff --git a/chart2/source/tools/InternalDataProvider.cxx 
b/chart2/source/tools/InternalDataProvider.cxx
index 6479040..3a4303b 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -276,16 +276,14 @@ public:
 
 void operator() ( vector< uno::Any >& rVector )
 {
-if( m_nLevel > static_cast< sal_Int32 >(rVector.size()) )
-rVector.resize( m_nLevel );
-
-vector< uno::Any >::iterator aIt( rVector.begin() );
-for( sal_Int32 nN=0; aIt= static_cast< sal_Int32 >(rVector.size()) )
 {
-if( nN==m_nLevel )
-break;
+rVector.resize( m_nLevel + 1 );
+}
+else
+{
+rVector.insert( rVector.begin() + m_nLevel, uno::Any() );
 }
-rVector.insert( aIt, uno::Any() );
 }
 
 private:
@@ -301,14 +299,9 @@ public:
 
 void operator() ( vector< uno::Any >& rVector )
 {
-vector< uno::Any >::iterator aIt( rVector.begin() );
-for( sal_Int32 nN=0; aIt(rVector.size()) )
 {
-if( nN==m_nLevel )
-{
-rVector.erase( aIt );
-break;
-}
+rVector.erase(rVector.begin() + m_nLevel);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - configure.in

2013-04-01 Thread Benedikt Morbach

 configure.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9f47202a0e215ec4a4156f45199fea16b7239565
Author: Benedikt Morbach 
Date:   Sun Mar 10 15:19:09 2013 +0100

fdo#62110: GLU also needs -lGL to link

Change-Id: Ida9d03564cf003cae282792f0daf5945cff34108
(cherry picked from commit fac49ace812a15ba10d30a3735b61ae30ac287c5)

Signed-off-by: Michael Stahl 

Conflicts:
configure.ac
(cherry picked from commit 2c40a112923bf1c4441ea76bb8fe3a7a8aa10bef)

Signed-off-by: Michael Stahl 

diff --git a/configure.in b/configure.in
index 0bd6937..702a637 100644
--- a/configure.in
+++ b/configure.in
@@ -9013,6 +9013,7 @@ else
 AC_MSG_RESULT([yes])
 AC_CHECK_LIB([GL], [main], [:],
   [AC_MSG_ERROR(libGL not installed or functional)], [])
+LDFLAGS="$LDFLAGS -lGL"
 AC_CHECK_LIB([GLU], [main], [:],
   [AC_MSG_ERROR(libGLU not installed or functional)], [])
 ENABLE_OPENGL=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac

2013-04-01 Thread Benedikt Morbach

 configure.ac |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2c40a112923bf1c4441ea76bb8fe3a7a8aa10bef
Author: Benedikt Morbach 
Date:   Sun Mar 10 15:19:09 2013 +0100

fdo#62110: GLU also needs -lGL to link

Change-Id: Ida9d03564cf003cae282792f0daf5945cff34108
(cherry picked from commit fac49ace812a15ba10d30a3735b61ae30ac287c5)

Signed-off-by: Michael Stahl 

Conflicts:
configure.ac

diff --git a/configure.ac b/configure.ac
index c561981..390b3eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9548,6 +9548,7 @@ else
 AC_MSG_RESULT([yes])
 AC_CHECK_LIB([GL], [main], [:],
   [AC_MSG_ERROR(libGL not installed or functional)], [])
+LDFLAGS="$LDFLAGS -lGL"
 AC_CHECK_LIB([GLU], [main], [:],
   [AC_MSG_ERROR(libGLU not installed or functional)], [])
 ENABLE_OPENGL=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About b3dpolygon.cxx (basegfx)

On 01/04/2013 19:15, Markus Mohrhard wrote:

Hey julien,
There are a lot of iterators stuff in

core/basegfx/source/polygon/b3dpolygon.cxx, I tried to fix 'prefix
++/--
operators for non-primitive types' errors (provided by cppcheck)
but I saw
several iterator things I'm not sure, eg:
...
Isn't aEnd invalidated by push_back call?

No. Push_back only invalidates if it has to reallocate the memory for
the elements which does not happen if you make sure that enough space
is reserved. Additionally we have two different vectors here and
therefore we have no invalidation in any case.

Ok (I'll try to remember this)

Isn't aEnd += nCount dangerous? (if aEnd tries to go further than
rOriginal.maVector.end())

It very much depends on what nCount is. If nCount is always <=
rOriginal.maVector.size then this call is perfectly safe. I would add
an assert statement into this method to make sure that the assumption
is always true.
Done, see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9b40d14eb91573e62bdd8a6b9157f623a8c4cf7f

Isn't aEnd iterator invalidated by insert call?

No. Notice that there are two different vectors involved.
rSource.maVector which provides aStart and aEnd is not changed. This
is just the range version of the the insert method that insert all
elements between aStart and aEnd into maVector.

You're right (as always! :-)), I should have noticed this.

There are others in this file but again, I'm not sure, I'm just
wondering.

Except for the case with nCount which depends on the context these
cases are correct. The way forward is to add an assert statement to
make sure that this assumption is true and check all the callers.

Thank you Markus for your detailed answer and your patience.

Regards,

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

[Libreoffice-commits] core.git: basegfx/source

 basegfx/source/polygon/b3dpolygon.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9b40d14eb91573e62bdd8a6b9157f623a8c4cf7f
Author: Julien Nabet 
Date:   Mon Apr 1 21:29:34 2013 +0200

Add assert nCount <= vector.size() (Thank you Markus!)

Change-Id: I076e88e6fc845c2333bc3de98de023330e531272

diff --git a/basegfx/source/polygon/b3dpolygon.cxx 
b/basegfx/source/polygon/b3dpolygon.cxx
index 70a5aeb..5a07ab2 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -278,6 +278,7 @@ public:
 BColorDataVector::const_iterator aStart(rOriginal.maVector.begin());
 aStart += nIndex;
 BColorDataVector::const_iterator aEnd(aStart);
+assert(nCount <= rOriginal.maVector.size());
 aEnd += nCount;
 maVector.reserve(nCount);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - svx/source vcl/source writerfilter/source xmloff/source

 svx/source/table/tablerow.cxx |4 ++--
 vcl/source/gdi/pngwrite.cxx   |2 +-
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |7 +++
 xmloff/source/chart/SchXMLSeriesHelper.cxx|5 +++--
 xmloff/source/table/XMLTableExport.cxx|4 +++-
 5 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 25e5d697bca38e4ac8aa6a7a9030ffbf36682cac
Author: Julien Nabet 
Date:   Mon Apr 1 20:21:48 2013 +0200

Prefer prefix ++/-- operators for non-primitive types

Change-Id: If5950affaff1537362b1e5c2e3791d04c5371306

diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index 8d9a992..fcd4211 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -258,7 +258,7 @@ sal_Bool PNGWriterImpl::Write( SvStream& rOStm )
 if ( nDataSize )
 rOStm.Write( &aBeg->aData[ 0 ], nDataSize );
 rOStm << nCRC;
-aBeg++;
+++aBeg;
 }
 rOStm.SetNumberFormatInt( nOldMode );
 return mbStatus;
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 5865846..81ac271 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -2256,14 +2256,13 @@ 
OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
 debug_logger->startElement("Wrapper-createChildContext");
 debug_logger->attribute("token", fastTokenToId(Element));
 
-set::const_iterator aIt(mMyNamespaces.begin());
-while (aIt != mMyNamespaces.end())
+const set::const_iterator aEnd(mMyNamespaces.end());
+for (set::const_iterator aIt(mMyNamespaces.begin());
+ aIt != aEnd; ++aIt)
 {
 debug_logger->startElement("namespace");
 debug_logger->attribute("id", fastTokenToId(*aIt));
 debug_logger->endElement();
-
-aIt++;
 }
 
 debug_logger->endElement();
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx 
b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index c50ac86..b6b7a66 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -83,9 +83,10 @@ using ::com::sun::star::uno::Sequence;
 sal_Int32 nIndex=0;
 
 ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( 
SchXMLSeriesHelper::getDataSeriesFromDiagram( xDiagram ));
+const ::std::vector< Reference< chart2::XDataSeries > >::const_iterator 
aSeriesEnd( aSeriesVector.end() );
 for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator 
aSeriesIt( aSeriesVector.begin() )
-; aSeriesIt != aSeriesVector.end()
-; aSeriesIt++, nIndex++ )
+; aSeriesIt != aSeriesEnd
+; ++aSeriesIt, nIndex++ )
 {
 Reference< chart2::XDataSeries > xSeries( *aSeriesIt );
 if( xSeries.is() )
diff --git a/xmloff/source/table/XMLTableExport.cxx 
b/xmloff/source/table/XMLTableExport.cxx
index b06df84..5be12e5 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -120,7 +120,9 @@ void StringStatisticHelper::add( const OUString& rStyleName 
)
 sal_Int32 StringStatisticHelper::getModeString( OUString& rStyleName )
 {
 sal_Int32 nMax = 0;
-for( std::map< OUString, sal_Int32 >::iterator iter( begin() ); iter != 
end(); iter++ )
+const std::map< OUString, sal_Int32 >::const_iterator aEnd( end() );
+for( std::map< OUString, sal_Int32 >::iterator iter( begin() );
+iter != aEnd; ++iter)
 {
 if( (*iter).second > nMax )
 {
commit 85a499d50fe17ff19b43f5a69b9c809ace18401e
Author: Julien Nabet 
Date:   Mon Apr 1 19:10:51 2013 +0200

Prefer prefix ++/-- operators for non-primitive types

Change-Id: I9fc8adf31c269db33d0d9806e182748ec082c1e3

diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index 03208ab..ab164dd 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -141,13 +141,13 @@ void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 
nCount )
 {
 CellVector::iterator aBegin( maCells.begin() );
 while( nIndex-- && (aBegin != maCells.end()) )
-aBegin++;
+++aBegin;
 
 if( nCount > 1 )
 {
 CellVector::iterator aEnd( aBegin );
 while( nCount-- && (aEnd != maCells.end()) )
-aEnd++;
+++aEnd;
 maCells.erase( aBegin, aEnd );
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice prints on tuesdays

2013-04-01 Thread Dan Lewis


On 04/01/2013 09:47 AM, Anthonys Lists wrote:

On 01/04/2013 11:49, Luc Castermans wrote:

Op 01-04-13 12:43, Dan Lewis schreef:

On 04/01/2013 06:14 AM, Bjoern Michaelsen wrote:

Hi,

I am happy to be able to be able to provide a prototype of the 
"LibreOffice

prints on Tuesdays extension" here:

http://skyfromme.wordpress.com/2013/04/01/libreoffice-prints-on-tuesdays-only/ 



I consider this an important feature an would love to see see it 
bundled with
LibreOffice 4.0 and 4.1, and will propose so on the ESC call. Any 
feedback on

this is welcome.

Best,

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

 What is the purpose of this extension? Why print only on Tuesdays?



April 1st is not on Tuesday


It is - it'll take a year to get it debugged and then it'll work fine 
when required...


Cheers,
Wol



 Are you sure that it will only take a year??? I am thinking it 
might take 6 years :-D


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

[PATCH] use filelist install method for udkapi and offapi

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3152

to look at the new patch set (#3).

Change subject: use filelist install method for udkapi and offapi
..

use filelist install method for udkapi and offapi

... so we can drop ZipUnoApi again.

Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
---
M instsetoo_native/util/openoffice.lst.in
M offapi/UnoApi_offapi.mk
M scp2/inc/macros.inc
M scp2/source/sdkoo/sdkoo.scp
M solenv/gbuild/Package.mk
M solenv/gbuild/UnoApi.mk
D solenv/gbuild/ZipUnoApi.mk
M solenv/gbuild/gbuild.mk
M solenv/gbuild/platform/IOS_ARM_GCC.mk
M solenv/gbuild/platform/WNT_INTEL_GCC.mk
M solenv/gbuild/platform/com_MSC_class.mk
M solenv/gbuild/platform/macosx.mk
M solenv/gbuild/platform/solaris.mk
M solenv/gbuild/platform/unxgcc.mk
M udkapi/UnoApi_udkapi.mk
15 files changed, 321 insertions(+), 326 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3152/3
-- 
To view, visit https://gerrit.libreoffice.org/3152
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: LibreOffice gerrit bot 

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

[Libreoffice-commits] core.git: configure.ac

2013-04-01 Thread Benedikt Morbach

 configure.ac |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fac49ace812a15ba10d30a3735b61ae30ac287c5
Author: Benedikt Morbach 
Date:   Sun Mar 10 15:19:09 2013 +0100

fdo#62110: GLU also needs -lGL to link

Change-Id: Ida9d03564cf003cae282792f0daf5945cff34108

diff --git a/configure.ac b/configure.ac
index 3f06fbc..66a5966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9523,6 +9523,7 @@ else
 AC_MSG_RESULT([yes])
 AC_CHECK_LIB([GL], [main], [:],
   [AC_MSG_ERROR(libGL not installed or functional)], [])
+LDFLAGS="$LDFLAGS -lGL"
 AC_CHECK_LIB([GLU], [main], [:],
   [AC_MSG_ERROR(libGLU not installed or functional)], [])
 ENABLE_OPENGL=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/win

2013-04-01 Thread Miklos Vajna

 vcl/win/source/gdi/salgdi3.cxx |   20 
 1 file changed, 20 deletions(-)

New commits:
commit b5f296f818a3551f0ae024cf767a5aede7170cbc
Author: Miklos Vajna 
Date:   Mon Apr 1 19:34:55 2013 +0200

vcl: unused includes

Change-Id: I43d83b916bf1741cea7c94a77dcc57b69544801c

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index e80b8ab..afbe04e 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -23,52 +23,32 @@
 
 #include 
 #include "rtl/logfile.hxx"
-#include "rtl/tencinfo.h"
-#include "rtl/textcvt.h"
 #include "rtl/bootstrap.hxx"
 
 #include "i18npool/mslangid.hxx"
-#include "i18npool/languagetag.hxx"
 
-#include "osl/module.h"
 #include "osl/file.hxx"
-#include "osl/thread.hxx"
 #include "osl/process.h"
 
 #include "basegfx/polygon/b2dpolygon.hxx"
-#include "basegfx/polygon/b2dpolypolygon.hxx"
-#include "basegfx/matrix/b2dhommatrix.hxx"
 #include "basegfx/matrix/b2dhommatrixtools.hxx"
 
 #include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL
 
-#include "vcl/font.hxx"
-#include "vcl/svapp.hxx"
-
-#include "tools/poly.hxx"
-#include "tools/debug.hxx"
 #include "tools/stream.hxx"
 #include "tools/helpers.hxx"
 
 #include 
 
-#include "win/wincomp.hxx"
 #include "win/saldata.hxx"
 #include "win/salgdi.h"
 
-#include "outfont.hxx"
 #include "fontsubset.hxx"
-#include "sallayout.hxx"
 #include "outdev.h" // for ImplGlyphFallbackFontSubstitution
 #include "sft.hxx"
 
 #include 
 
-#include 
-#if ENABLE_GRAPHITE
-#include 
-#endif
-
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Easter Bunny brings new redland tarballs

2013-04-01 Thread Michael Stahl (via Code Review)

Michael Stahl has uploaded a new patch set (#2).

Change subject: Easter Bunny brings new redland tarballs
..

Easter Bunny brings new redland tarballs

upgrade raptor to 2.0.9, rasqal to 0.9.30, redland to 1.0.16:
- new raptor depends on libxml2 version 2.6.27 and thus will _not_
  build against system libxml2 on Mac OS X 10.4/10.5
- stop delivering raptor-config/rasqal-config, set env vars instead
  (which unfortunately requires patching configures, TODO: upstream that)
- remove redundant configure flags
- stop passing -Wl,no-inhibit-exec (causes HP-UX code to be built on Linux)
- disable new rasqal build deps:
--with-uuid-library=internal --with-digest-library=internal
- disable redland "libltdl" nonsense via --disable-modular
- fortunately openssl digest support has been removed too
- drop raptor-1.4.18.ooo_build.patch, set RAPTOR2_CFLAGS/LIBS instead
- drop raptor-1.4.18.autotools.patch:
  + FreeBSD parts moved to raptor-freebsd.patch.1
  + Android parts obsolete
  + don't know about the MinGW part (TODO)
- from drop raptor-1.4.18.mingw.patch dropped the part defining parsers
  to be built, done via --enable-parsers
- drop redland/raptor/raptor-1.4.18.cross.patch:
  the vsnprintf check is now done at runtime, and expat has been removed
- drop raptor-1.4.18.aix.patch,redland-1.0.8.aix.patch:
  presumably don't need special check for V7BETA since it's released now
- drop raptor-1.4.18.rindex.patch, index/rindex no longer used
- drop raptor-1.4.18.entities.patch, fixed upstream in 2.0.7
- drop raptor-1.4.18.fixes.patch, fixed upstream in 2.0.9
- drop raptor-1.4.18.{libxml,libxslt}.patch: TODO
- drop {raptor-1.4.18,rasqal-0.9.16,redland-1.0.8}.legal.patch:
  we don't care any more about Sun legal dept.
- drop rasqal-0.9.16.ooo_build.patch, set RASQAL_CFLAGS/LIBS instead
- drop rasqal-0.9.16.autotools.patch:
  + FreeBSD parts moved to rasqal-freebsd.patch.1
  + Android parts obsolete
  + MinGW part only for cygwin build
- drop redland-1.0.8.autotools.patch:
  + FreeBSD parts moved to redland-freebsd.patch.1
  + Android parts obsolete
  + don't know about the MinGW part (TODO)
- drop redland-1.0.8.ooo_build.patch,
  hopefully not necessary to disable utils build

Change-Id: I9cc44928ba87392d69e809abe2236cec0e4a508a
---
M Repository.mk
M RepositoryExternal.mk
M configure.ac
M download.lst
M redland/ExternalPackage_raptor.mk
M redland/ExternalPackage_rasqal.mk
M redland/ExternalPackage_redland.mk
M redland/ExternalProject_raptor.mk
M redland/ExternalProject_rasqal.mk
M redland/ExternalProject_redland.mk
D redland/LICENSE.txt
M redland/Library_raptor.mk
M redland/Library_rasqal.mk
M redland/Library_rdf.mk
M redland/README
M redland/UnpackedTarball_raptor.mk
M redland/UnpackedTarball_rasqal.mk
M redland/UnpackedTarball_redland.mk
D redland/raptor/raptor-1.4.18.aix.patch
D redland/raptor/raptor-1.4.18.autotools.patch
D redland/raptor/raptor-1.4.18.bundled-soname.patch
D redland/raptor/raptor-1.4.18.cross.patch
D redland/raptor/raptor-1.4.18.entities.patch
D redland/raptor/raptor-1.4.18.fixes.patch
D redland/raptor/raptor-1.4.18.legal.patch
D redland/raptor/raptor-1.4.18.libxml.patch
D redland/raptor/raptor-1.4.18.libxslt.patch
D redland/raptor/raptor-1.4.18.mingw.patch
D redland/raptor/raptor-1.4.18.no-soname.patch
D redland/raptor/raptor-1.4.18.ooo_build.patch
D redland/raptor/raptor-1.4.18.rindex.patch
D redland/raptor/raptor-1.4.18.win32.patch
A redland/raptor/raptor-android.patch.1
A redland/raptor/raptor-bundled-soname.patch.1
A redland/raptor/raptor-freebsd.patch.1
A redland/raptor/raptor-mingw.patch.1
A redland/raptor/raptor2.h
A redland/raptor/raptor_config.h
D redland/rasqal/rasqal-0.9.16.aix.patch
D redland/rasqal/rasqal-0.9.16.autotools.patch
D redland/rasqal/rasqal-0.9.16.bundled-soname.patch
D redland/rasqal/rasqal-0.9.16.legal.patch
D redland/rasqal/rasqal-0.9.16.mingw.patch
D redland/rasqal/rasqal-0.9.16.no-soname.patch
D redland/rasqal/rasqal-0.9.16.ooo_build.patch
D redland/rasqal/rasqal-0.9.16.win32.patch
A redland/rasqal/rasqal-aix.patch.1
A redland/rasqal/rasqal-android.patch.1
A redland/rasqal/rasqal-bundled-soname.patch.1
A redland/rasqal/rasqal-freebsd.patch.1
A redland/rasqal/rasqal-mingw.patch.1
A redland/rasqal/rasqal-msvc.patch.1
A redland/rasqal/rasqal-pkgconfig.patch.1
A redland/rasqal/rasqal.h
A redland/redland/librdf.h
D redland/redland/redland-1.0.8.aix.patch
D redland/redland/redland-1.0.8.autotools.patch
D redland/redland/redland-1.0.8.bundled-soname.patch
D redland/redland/redland-1.0.8.legal.patch
D redland/redland/redland-1.0.8.mingw.patch
D redland/redland/redland-1.0.8.no-soname.patch
D redland/redland/redland-1.0.8.ooo_build.patch
A redland/redland/redland-android.patch.1
A redland/redland/redland-bundled-soname.patch.1
A redland/redland/redland-freebsd.patch.1
A redland/redland/redland-mingw.patch.1
R redland/redland/redland-msvc.patch.1
A redland/redland/redland-pkgconfig.patch.1
M scp2/source/ooo/fi

[Libreoffice-commits] core.git: svtools/AllLangResTarget_svt.mk svtools/inc svtools/source

 svtools/AllLangResTarget_svt.mk |1 
 svtools/inc/svtools/filedlg2.hrc|   12 -
 svtools/source/dialogs/filedlg2.src |   48 
 3 files changed, 1 insertion(+), 60 deletions(-)

New commits:
commit 2a8e44eba3e540adb763c3a1e29aa4e2057d0301
Author: Michael Stahl 
Date:   Mon Apr 1 19:20:39 2013 +0200

svtools: re-add filedlg2 to ResTarget, and remove un-used resources

Change-Id: I4e06e2d021e61d9816cf785322c13b80844f7415

diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 2355f8d..aff7ec4 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
 svtools/source/control/ctrltool.src \
 svtools/source/control/filectrl.src \
 svtools/source/dialogs/addresstemplate.src \
+   svtools/source/dialogs/filedlg2.src \
 svtools/source/dialogs/formats.src \
 svtools/source/dialogs/so3res.src \
 svtools/source/dialogs/wizardmachine.src \
diff --git a/svtools/inc/svtools/filedlg2.hrc b/svtools/inc/svtools/filedlg2.hrc
index 14b3799..4da7f5e 100644
--- a/svtools/inc/svtools/filedlg2.hrc
+++ b/svtools/inc/svtools/filedlg2.hrc
@@ -16,20 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#define STR_FILEDLG_SELECT  1000
-#define STR_FILEDLG_CANTCHDIR   1001
 #define STR_FILEDLG_OPEN1002
-#define STR_FILEDLG_FILE1003
-#define STR_FILEDLG_DIR 1004
 #define STR_FILEDLG_TYPE1005
-#define STR_FILEDLG_CANTOPENFILE1006
-#define STR_FILEDLG_CANTOPENDIR 1007
-#define STR_FILEDLG_OVERWRITE   1008
-#define STR_FILEDLG_GOUP1009
 #define STR_FILEDLG_SAVE1010
-#define STR_FILEDLG_DRIVES  1011
-#define STR_FILEDLG_HOME1012
-#define STR_FILEDLG_NEWDIR  1013
-#define STR_FILEDLG_ASKNEWDIR   1014
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/filedlg2.src 
b/svtools/source/dialogs/filedlg2.src
index 6b67e48..6e68db0 100644
--- a/svtools/source/dialogs/filedlg2.src
+++ b/svtools/source/dialogs/filedlg2.src
@@ -19,65 +19,17 @@
 
 #include 
 
-String STR_FILEDLG_SELECT
-{
-Text [ en-US ] = "Select Directory" ;
-};
-String STR_FILEDLG_CANTCHDIR
-{
-Text [ en-US ] = "Cannot change to directory" ;
-};
 String STR_FILEDLG_OPEN
 {
 Text [ en-US ] = "Open" ;
 };
-String STR_FILEDLG_FILE
-{
-Text [ en-US ] = "~File" ;
-};
-String STR_FILEDLG_DIR
-{
-Text [ en-US ] = "~Directory" ;
-};
 String STR_FILEDLG_TYPE
 {
 Text [ en-US ] = "File ~type" ;
 };
-String STR_FILEDLG_CANTOPENFILE
-{
-Text [ en-US ] = "Can't open file" ;
-};
-String STR_FILEDLG_CANTOPENDIR
-{
-Text [ en-US ] = "Can't open directory" ;
-};
-String STR_FILEDLG_OVERWRITE
-{
-Text [ en-US ] = "This file already exists. \nOverwrite ?" ;
-};
-String STR_FILEDLG_GOUP
-{
-Text [ en-US ] = "Up One Level" ;
-};
 String STR_FILEDLG_SAVE
 {
 Text [ en-US ] = "Save" ;
 };
-String STR_FILEDLG_DRIVES
-{
-Text [ en-US ] = "D~rive" ;
-};
-String STR_FILEDLG_HOME
-{
-Text [ en-US ] = "User Directory" ;
-};
-String STR_FILEDLG_NEWDIR
-{
-Text [ en-US ] = "Create Directory" ;
-};
-String STR_FILEDLG_ASKNEWDIR
-{
-Text [ en-US ] = "Do you want the directory %s to be created ?" ;
-};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [ABANDONED] fdo#51656 Mean value line starts in wrong place

2013-04-01 Thread Ngo Cao Cuong


OK sure I didn't notice the 3122 ;)

On 04/01/2013 07:19 PM, Markus Mohrhard (via Code Review) wrote:
> Markus Mohrhard has abandoned this change.
>
> Change subject: fdo#51656 Mean value line starts in wrong place
> ..
>
>
> Patch Set 1: Abandoned
>
> See https://gerrit.libreoffice.org/#/c/3122/ for the original review request. 
> Please note also that in the bug report Prashant mentioned that he is working 
> on it and assigned the bug to him.
>
> I'm sorry but I'm sure you'll find another Easy Hack to work on.
>

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

[ABANDONED] fdo#51656 Mean value line starts in wrong place

2013-04-01 Thread Markus Mohrhard (via Code Review)

Markus Mohrhard has abandoned this change.

Change subject: fdo#51656 Mean value line starts in wrong place
..


Patch Set 1: Abandoned

See https://gerrit.libreoffice.org/#/c/3122/ for the original review request. 
Please note also that in the bug report Prashant mentioned that he is working 
on it and assigned the bug to him.

I'm sorry but I'm sure you'll find another Easy Hack to work on.

-- 
To view, visit https://gerrit.libreoffice.org/3156
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I056423b3214e8f904202e6e6a3aeaec12122e62d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Cao Cuong Ngo 

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

[Libreoffice-commits] core.git: svtools/Package_inc.mk svtools/source

 svtools/Package_inc.mk  |1 
 svtools/source/dialogs/filedlg2.src |   83 
 2 files changed, 84 insertions(+)

New commits:
commit 775884578bac822753b3f2a03c30ddf29f12527e
Author: Michael Stahl 
Date:   Mon Apr 1 19:13:29 2013 +0200

svtools: restore filedlg2.hrc/src

This was removed in f7f9b74163acd6811ccfaabb2a1d762225258e15
but is still used in Mac-only fps_aqua library.

Change-Id: I227c6962906b533754ec999f36a2f9224465ce22

diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 105ca38..85a163a 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -55,6 +55,7 @@ $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svto
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx))
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx))
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx))
+$(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc))
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx))
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx))
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/filechangedchecker.hxx,svtools/filechangedchecker.hxx))
diff --git a/svtools/source/dialogs/filedlg2.src 
b/svtools/source/dialogs/filedlg2.src
new file mode 100644
index 000..6b67e48
--- /dev/null
+++ b/svtools/source/dialogs/filedlg2.src
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include 
+
+String STR_FILEDLG_SELECT
+{
+Text [ en-US ] = "Select Directory" ;
+};
+String STR_FILEDLG_CANTCHDIR
+{
+Text [ en-US ] = "Cannot change to directory" ;
+};
+String STR_FILEDLG_OPEN
+{
+Text [ en-US ] = "Open" ;
+};
+String STR_FILEDLG_FILE
+{
+Text [ en-US ] = "~File" ;
+};
+String STR_FILEDLG_DIR
+{
+Text [ en-US ] = "~Directory" ;
+};
+String STR_FILEDLG_TYPE
+{
+Text [ en-US ] = "File ~type" ;
+};
+String STR_FILEDLG_CANTOPENFILE
+{
+Text [ en-US ] = "Can't open file" ;
+};
+String STR_FILEDLG_CANTOPENDIR
+{
+Text [ en-US ] = "Can't open directory" ;
+};
+String STR_FILEDLG_OVERWRITE
+{
+Text [ en-US ] = "This file already exists. \nOverwrite ?" ;
+};
+String STR_FILEDLG_GOUP
+{
+Text [ en-US ] = "Up One Level" ;
+};
+String STR_FILEDLG_SAVE
+{
+Text [ en-US ] = "Save" ;
+};
+String STR_FILEDLG_DRIVES
+{
+Text [ en-US ] = "D~rive" ;
+};
+String STR_FILEDLG_HOME
+{
+Text [ en-US ] = "User Directory" ;
+};
+String STR_FILEDLG_NEWDIR
+{
+Text [ en-US ] = "Create Directory" ;
+};
+String STR_FILEDLG_ASKNEWDIR
+{
+Text [ en-US ] = "Do you want the directory %s to be created ?" ;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About b3dpolygon.cxx (basegfx)

2013-04-01 Thread Markus Mohrhard

Hey julien,


2013/4/1 julien2412 

> Hello,
>
> There are a lot of iterators stuff in
> core/basegfx/source/polygon/b3dpolygon.cxx, I tried to fix 'prefix ++/--
> operators for non-primitive types' errors (provided by cppcheck) but I saw
> several iterator things I'm not sure, eg:
> 274 BColorArray(const BColorArray& rOriginal, sal_uInt32 nIndex,
> sal_uInt32 nCount)
> 275 :   maVector(),
> 276 mnUsedEntries(0L)
> 277 {
> 278 BColorDataVector::const_iterator
> aStart(rOriginal.maVector.begin());
> 279 aStart += nIndex;
> 280 BColorDataVector::const_iterator aEnd(aStart);
> 281 aEnd += nCount;
> 282 maVector.reserve(nCount);
> 283
> 284 for(; aStart != aEnd; ++aStart)
> 285 {
> 286 if(!aStart->equalZero())
> 287 mnUsedEntries++;
> 288
> 289 maVector.push_back(*aStart);
> 290 }
> 291 }
> Isn't aEnd invalidated by push_back call?
>

No. Push_back only invalidates if it has to reallocate the memory for the
elements which does not happen if you make sure that enough space is
reserved. Additionally we have two different vectors here and therefore we
have no invalidation in any case.


Isn't aEnd += nCount dangerous? (if aEnd tries to go further than
> rOriginal.maVector.end())
>

It very much depends on what nCount is. If nCount is always <=
rOriginal.maVector.size then this call is perfectly safe. I would add an
assert statement into this method to make sure that the assumption is
always true.


>
> 358 void insert(sal_uInt32 nIndex, const BColorArray& rSource)
> 359 {
> 360 const sal_uInt32 nCount(rSource.maVector.size());
> 361
> 362 if(nCount)
> 363 {
> 364 // insert data
> 365 BColorDataVector::iterator aIndex(maVector.begin());
> 366 aIndex += nIndex;
> 367 BColorDataVector::const_iterator
> aStart(rSource.maVector.begin());
> 368 BColorDataVector::const_iterator
> aEnd(rSource.maVector.end());
> 369 maVector.insert(aIndex, aStart, aEnd);
> 370
> 371 for(; aStart != aEnd; ++aStart)
> 372 {
> 373 if(!aStart->equalZero())
> 374 mnUsedEntries++;
> 375 }
> 376 }
> 377 }
>
> Isn't aEnd iterator invalidated by insert call?
>

No. Notice that there are two different vectors involved. rSource.maVector
which provides aStart and aEnd is not changed. This is just the range
version of the the insert method that insert all elements between aStart
and aEnd into maVector.


>
> There are others in this file but again, I'm not sure, I'm just wondering.
>

Except for the case with nCount which depends on the context these cases
are correct. The way forward is to add an assert statement to make sure
that this assumption is true and check all the callers.

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

[PATCH] fdo#51656 Mean value line starts in wrong place

2013-04-01 Thread Cao Cuong Ngo (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3156

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/3156/1

fdo#51656 Mean value line starts in wrong place

In case of a mean value line, don't shift position.

Change-Id: I056423b3214e8f904202e6e6a3aeaec12122e62d
---
M chart2/source/view/charttypes/VSeriesPlotter.cxx
1 file changed, 4 insertions(+), 2 deletions(-)



diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 6e114dd..b35739d 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1011,13 +1011,16 @@
 xRegressionCurveCalculator->getCurveValues(
 fMinX, fMaxX, nRegressionPointCount, xScalingX, xScalingY, 
bMaySkipPointsInRegressionCalculation ));
 nRegressionPointCount = aCalculatedPoints.getLength();
+bool bAverageLine = RegressionCurveHelper::isMeanValueLine( 
aCurveList[nN] );
 for(sal_Int32 nP=0; nPdoLogicScaling( &fLogicX, &fLogicY, &fLogicZ );
+// Don't do scaling if it's a mean value line ( fdo#51656 ).
+if ( !bAverageLine )
+m_pPosHelper->doLogicScaling( &fLogicX, &fLogicY, &fLogicZ );
 
 if(!::rtl::math::isNan(fLogicX) && !::rtl::math::isInf(fLogicX)
 && !::rtl::math::isNan(fLogicY) && 
!::rtl::math::isInf(fLogicY)
@@ -1045,7 +1048,6 @@
 aVLineProperties.initFromPropertySet( xCurveModelProp );
 
 //create an extra group shape for each curve for selection handling
-bool bAverageLine = RegressionCurveHelper::isMeanValueLine( 
aCurveList[nN] );
 uno::Reference< drawing::XShapes > xRegressionGroupShapes =
 createGroupShape( xTarget, rVDataSeries.getDataCurveCID( nN, 
bAverageLine ) );
 uno::Reference< drawing::XShape > xShape = 
m_pShapeFactory->createLine2D(

-- 
To view, visit https://gerrit.libreoffice.org/3156
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I056423b3214e8f904202e6e6a3aeaec12122e62d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Cao Cuong Ngo 

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

[Libreoffice-commits] core.git: 3 commits - sd/source svx/source

 sd/source/core/drawdoc.cxx |3 ++-
 sd/source/ui/annotations/annotationmanager.cxx |4 +++-
 sd/source/ui/dlg/RemoteDialog.cxx  |4 +++-
 svx/source/table/tabledesign.cxx   |   24 ++--
 4 files changed, 26 insertions(+), 9 deletions(-)

New commits:
commit 76d5a2847ac60c7f8c662d3780885609eaf503e5
Author: Julien Nabet 
Date:   Mon Apr 1 19:09:39 2013 +0200

Prefer prefix ++/-- operators for non-primitive types

Change-Id: Ib5e17d5bb94d9b19008ca15e042b443689aba9b1

diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 4702792..a84dc2e 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -536,7 +536,9 @@ Any SAL_CALL TableDesignFamily::getByName( const OUString& 
rName ) throw(NoSuchE
 {
 SolarMutexGuard aGuard;
 
-for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != 
maDesigns.end(); iter++ )
+const TableDesignStyleVector::const_iterator aEnd( maDesigns.end() );
+for( TableDesignStyleVector::const_iterator iter( maDesigns.begin() );
+iter != aEnd; ++iter)
 {
 if( (*iter)->getName() == rName )
 return Any( (*iter) );
@@ -554,7 +556,9 @@ Sequence< OUString > SAL_CALL 
TableDesignFamily::getElementNames() throw(Runtime
 Sequence< OUString > aRet( maDesigns.size() );
 OUString* pNames = aRet.getArray();
 
-for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != 
maDesigns.end(); iter++ )
+const TableDesignStyleVector::const_iterator aEnd( maDesigns.end() );
+for( TableDesignStyleVector::const_iterator iter( maDesigns.begin() );
+ iter != aEnd; ++iter)
 *pNames++ = (*iter)->getName();
 
 return aRet;
@@ -566,7 +570,9 @@ sal_Bool SAL_CALL TableDesignFamily::hasByName( const 
OUString& aName ) throw(Ru
 {
 SolarMutexGuard aGuard;
 
-for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != 
maDesigns.end(); iter++ )
+const TableDesignStyleVector::const_iterator aEnd( maDesigns.end() );
+for( TableDesignStyleVector::const_iterator iter( maDesigns.begin() );
+iter != aEnd; ++iter)
 if( (*iter)->getName() == aName )
 return sal_True;
 
@@ -627,7 +633,9 @@ void SAL_CALL TableDesignFamily::insertByName( const 
OUString& rName, const Any&
 throw IllegalArgumentException();
 
 xStyle->setName( rName );
-for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != 
maDesigns.end(); iter++ )
+const TableDesignStyleVector::const_iterator aEnd( maDesigns.end() );
+for( TableDesignStyleVector::const_iterator iter( maDesigns.begin() );
+iter != aEnd; ++iter)
 if( (*iter)->getName() == rName )
 throw ElementExistException();
 
@@ -640,7 +648,9 @@ void SAL_CALL TableDesignFamily::removeByName( const 
OUString& rName ) throw(NoS
 {
 SolarMutexGuard aGuard;
 
-for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != 
maDesigns.end(); iter++ )
+const TableDesignStyleVector::const_iterator aEnd( maDesigns.end() );
+for( TableDesignStyleVector::iterator iter( maDesigns.begin() );
+iter != aEnd; ++iter)
 {
 if( (*iter)->getName() == rName )
 {
@@ -665,7 +675,9 @@ void SAL_CALL TableDesignFamily::replaceByName( const 
OUString& rName, const Any
 if( !xStyle.is() )
 throw IllegalArgumentException();
 
-for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != 
maDesigns.end(); iter++ )
+const TableDesignStyleVector::const_iterator aEnd( maDesigns.end() );
+for( TableDesignStyleVector::iterator iter( maDesigns.begin() );
+iter != aEnd; ++iter)
 {
 if( (*iter)->getName() == rName )
 {
commit 79894c1de064a65b3a793e063c8f3aa96426c70a
Author: Julien Nabet 
Date:   Mon Apr 1 19:02:44 2013 +0200

Prefer prefix ++/-- operators for non-primitive types

Change-Id: I0471261e01ed5fb45cb470abd5bc1e809f2873be

diff --git a/sd/source/ui/annotations/annotationmanager.cxx 
b/sd/source/ui/annotations/annotationmanager.cxx
index c91d358..c4c6897 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -762,7 +762,9 @@ void AnnotationManagerImpl::SelectAnnotation( 
::com::sun::star::uno::Reference<
 {
 mxSelectedAnnotation = xAnnotation;
 
-for( AnnotationTagVector::iterator iter( maTagVector.begin() ); iter != 
maTagVector.end(); iter++ )
+const AnnotationTagVector::const_iterator aEnd( maTagVector.end() );
+for( AnnotationTagVector::const_iterator iter( maTagVector.begin() );
+iter != aEnd; ++iter)
 {
 if( (*iter)->GetAnnotation() == xAnnotation )
 {
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx 
b/sd/source/ui/dlg/RemoteDialog.cxx
index 60fd783..8aec838 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg

Re: About b3dpolygon.cxx (basegfx)

2013-04-01 Thread Rodolfo

You're right on both cases...
Em 01/04/2013 08:53, "julien2412"  escreveu:

> Hello,
>
> There are a lot of iterators stuff in
> core/basegfx/source/polygon/b3dpolygon.cxx, I tried to fix 'prefix ++/--
> operators for non-primitive types' errors (provided by cppcheck) but I saw
> several iterator things I'm not sure, eg:
> 274 BColorArray(const BColorArray& rOriginal, sal_uInt32 nIndex,
> sal_uInt32 nCount)
> 275 :   maVector(),
> 276 mnUsedEntries(0L)
> 277 {
> 278 BColorDataVector::const_iterator
> aStart(rOriginal.maVector.begin());
> 279 aStart += nIndex;
> 280 BColorDataVector::const_iterator aEnd(aStart);
> 281 aEnd += nCount;
> 282 maVector.reserve(nCount);
> 283
> 284 for(; aStart != aEnd; ++aStart)
> 285 {
> 286 if(!aStart->equalZero())
> 287 mnUsedEntries++;
> 288
> 289 maVector.push_back(*aStart);
> 290 }
> 291 }
> Isn't aEnd invalidated by push_back call?
> Isn't aEnd += nCount dangerous? (if aEnd tries to go further than
> rOriginal.maVector.end())
>
> 358 void insert(sal_uInt32 nIndex, const BColorArray& rSource)
> 359 {
> 360 const sal_uInt32 nCount(rSource.maVector.size());
> 361
> 362 if(nCount)
> 363 {
> 364 // insert data
> 365 BColorDataVector::iterator aIndex(maVector.begin());
> 366 aIndex += nIndex;
> 367 BColorDataVector::const_iterator
> aStart(rSource.maVector.begin());
> 368 BColorDataVector::const_iterator
> aEnd(rSource.maVector.end());
> 369 maVector.insert(aIndex, aStart, aEnd);
> 370
> 371 for(; aStart != aEnd; ++aStart)
> 372 {
> 373 if(!aStart->equalZero())
> 374 mnUsedEntries++;
> 375 }
> 376 }
> 377 }
>
> Isn't aEnd iterator invalidated by insert call?
>
> There are others in this file but again, I'm not sure, I'm just wondering.
>
> Julien
>
>
>
> --
> View this message in context:
> http://nabble.documentfoundation.org/About-b3dpolygon-cxx-basegfx-tp4047270.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 mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: oox/source

 oox/source/ppt/slidepersist.cxx |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit abcf4fec9be9490b7062e57dd56422baf4d640c5
Author: Julien Nabet 
Date:   Mon Apr 1 18:47:29 2013 +0200

Prefer prefix ++/-- operators for non-primitive types

Change-Id: I59a332c96793ced08bb509776dbcb8fd6c9d2ab9

diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 92be16e..ddba98e 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -124,12 +124,14 @@ void SlidePersist::createXShapes( XmlFilterBase& 
rFilterBase )
 Reference< XShapes > xShapes( getPage(), UNO_QUERY );
 
 std::vector< oox::drawingml::ShapePtr >& rShapes( 
maShapesPtr->getChildren() );
-std::vector< oox::drawingml::ShapePtr >::iterator aShapesIter( 
rShapes.begin() );
-while( aShapesIter != rShapes.end() )
+const std::vector< oox::drawingml::ShapePtr >::const_iterator aShapesEnd( 
rShapes.end() );
+for (std::vector< oox::drawingml::ShapePtr >::const_iterator aShapesIter( 
rShapes.begin() );
+ aShapesIter != aShapesEnd ; ++aShapesIter)
 {
-std::vector< oox::drawingml::ShapePtr >& rChildren( 
(*aShapesIter++)->getChildren() );
-std::vector< oox::drawingml::ShapePtr >::iterator aChildIter( 
rChildren.begin() );
-while( aChildIter != rChildren.end() )
+std::vector< oox::drawingml::ShapePtr >& rChildren( 
(*aShapesIter)->getChildren() );
+const std::vector< oox::drawingml::ShapePtr >::const_iterator 
aChildEnd( rChildren.end() );
+for (std::vector< oox::drawingml::ShapePtr >::const_iterator 
aChildIter( rChildren.begin() );
+ aChildIter != aChildEnd ; ++aChildIter)
 {
 PPTShape* pPPTShape = dynamic_cast< PPTShape* >( 
(*aChildIter).get() );
 basegfx::B2DHomMatrix aTransformation;
@@ -137,7 +139,6 @@ void SlidePersist::createXShapes( XmlFilterBase& 
rFilterBase )
 pPPTShape->addShape( rFilterBase, *this, getTheme().get(), 
xShapes, aTransformation, 0, &getShapeMap() );
 else
 (*aChildIter)->addShape( rFilterBase, getTheme().get(), 
xShapes, aTransformation, maShapesPtr->getFillProperties(), 0, &getShapeMap() );
-aChildIter++;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help on the bug#59071

2013-04-01 Thread Noel Grandin

There is already quite a bit of explanation in bugzilla.
What parts exactly do you require help with Janit?

On Mon, Apr 1, 2013 at 4:44 PM, Janit Anjaria  wrote:
> Hey!
> I have been working on quite a few features/bugs and now i have taken this
> up :
>
> https://bugs.freedesktop.org/show_bug.cgi?id=59071
>
> And hence i would like some help on the same from your side.I have had a
> look at the code pointers provided and hence figured a few things out,but
> inputs from your side would surely make my task on code much faster and more
> importantly, efficient.
>
>
> Regards,
> Janit
>
> ___
> 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

[Libreoffice-commits] core.git: drawinglayer/source oox/source

 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |2 +-
 oox/source/drawingml/table/tableproperties.cxx|   14 ++
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 182059964fb566c16348b6bec0869a19894bfdc7
Author: Julien Nabet 
Date:   Mon Apr 1 18:13:16 2013 +0200

Prefer prefix ++/-- operators for non-primitive types

Change-Id: Ie155215aea1d6f15e51bf5e64bab10eb2198d4de

diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx 
b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 0832e4d..f87afc62 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -89,7 +89,7 @@ namespace
 bool bOkay(false);
 aBuffers::iterator aFound(maFreeBuffers.end());
 
-for(aBuffers::iterator a(maFreeBuffers.begin()); a != 
maFreeBuffers.end(); a++)
+for(aBuffers::iterator a(maFreeBuffers.begin()); a != 
maFreeBuffers.end(); ++a)
 {
 OSL_ENSURE(*a, "Empty pointer in VDevBuffer (!)");
 
diff --git a/oox/source/drawingml/table/tableproperties.cxx 
b/oox/source/drawingml/table/tableproperties.cxx
index e9d7e5e..440a0a5 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -139,12 +139,14 @@ void TableProperties::pushToPropSet( const 
::oox::core::XmlFilterBase& rFilterBa
 
 const TableStyle& rTableStyle( getUsedTableStyle( rFilterBase ) );
 sal_Int32 nRow = 0;
-std::vector< TableRow >::iterator aTableRowIter( mvTableRows.begin() );
-while( aTableRowIter != mvTableRows.end() )
+const std::vector< TableRow >::const_iterator aTableRowEnd( 
mvTableRows.end() );
+for (std::vector< TableRow >::iterator aTableRowIter( mvTableRows.begin() 
);
+ aTableRowIter != aTableRowEnd ; ++aTableRowIter, ++nRow)
 {
 sal_Int32 nColumn = 0;
-std::vector< TableCell >::iterator aTableCellIter( 
aTableRowIter->getTableCells().begin() );
-while( aTableCellIter != aTableRowIter->getTableCells().end() )
+const std::vector< TableCell >::const_iterator aTableCellEnd( 
aTableRowIter->getTableCells().end() );
+for (std::vector< TableCell >::iterator aTableCellIter( 
aTableRowIter->getTableCells().begin() );
+aTableCellIter != aTableCellEnd ; ++aTableCellIter, ++nColumn)
 {
 TableCell& rTableCell( *aTableCellIter );
 if ( !rTableCell.getvMerge() && !rTableCell.gethMerge() )
@@ -157,11 +159,7 @@ void TableProperties::pushToPropSet( const 
::oox::core::XmlFilterBase& rFilterBa
 rTableCell.pushToXCell( rFilterBase, pMasterTextListStyle, 
xCellRange->getCellByPosition( nColumn, nRow ), *this, rTableStyle,
 nColumn, aTableRowIter->getTableCells().size(), nRow, 
mvTableRows.size() );
 }
-nColumn++;
-aTableCellIter++;
 }
-nRow++;
-aTableRowIter++;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] API CHANGE: drop rtl::O[U]StringBuffer::{charAt,setCharAt}

2013-04-01 Thread Thomas Arnhold (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3155

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/3155/1

API CHANGE: drop rtl::O[U]StringBuffer::{charAt,setCharAt}

As a follow up of fdo#41474. See:

https://wiki.documentfoundation.org/Development/LibreOffice4

Change-Id: Ief3a418e2ab0039bdf5100ec6e1505a4887487e7
---
M sal/inc/rtl/strbuf.hxx
M sal/inc/rtl/ustrbuf.hxx
2 files changed, 0 insertions(+), 76 deletions(-)



diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 4dabc76..be8b0b1 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -366,44 +366,6 @@
 }
 
 /**
-Returns the character at a specific index in this string buffer.
-
-The first character of a string buffer is at index
-0, the next at index 1, and so on, for
-array indexing.
-
-The index argument must be greater than or equal to
-0, and less than the length of this string buffer.
-
-@param  index   the index of the desired character.
-@return the character at the specified index of this string buffer.
-*/
-SAL_DEPRECATED("use rtl::OStringBuffer::operator [] instead")
-sal_Char charAt( sal_Int32 index )
-{
-assert(index >= 0 && index < pData->length);
-return pData->buffer[ index ];
-}
-
-/**
-The character at the specified index of this string buffer is set
-to ch.
-
-The index argument must be greater than or equal to
-0, and less than the length of this string buffer.
-
-@param  index   the index of the character to modify.
-@param  ch  the new character.
- */
-SAL_DEPRECATED("use rtl::OStringBuffer::operator [] instead")
-OStringBuffer & setCharAt(sal_Int32 index, sal_Char ch)
-{
-assert(index >= 0 && index < pData->length);
-pData->buffer[ index ] = ch;
-return *this;
-}
-
-/**
 Return a null terminated character array.
  */
 const sal_Char* getStr() const { return pData->buffer; }
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 95993fc..b5a1db5 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -358,44 +358,6 @@
 }
 
 /**
-Returns the character at a specific index in this string buffer.
-
-The first character of a string buffer is at index
-0, the next at index 1, and so on, for
-array indexing.
-
-The index argument must be greater than or equal to
-0, and less than the length of this string buffer.
-
-@param  index   the index of the desired character.
-@return the character at the specified index of this string buffer.
- */
-SAL_DEPRECATED("use rtl::OUStringBuffer::operator [] instead")
-sal_Unicode charAt( sal_Int32 index ) const
-{
-assert(index >= 0 && index < pData->length);
-return pData->buffer[ index ];
-}
-
-/**
-The character at the specified index of this string buffer is set
-to ch.
-
-The index argument must be greater than or equal to
-0, and less than the length of this string buffer.
-
-@param  index   the index of the character to modify.
-@param  ch  the new character.
- */
-SAL_DEPRECATED("use rtl::OUStringBuffer::operator [] instead")
-OUStringBuffer & setCharAt(sal_Int32 index, sal_Unicode ch)
-{
-assert(index >= 0 && index < pData->length);
-pData->buffer[ index ] = ch;
-return *this;
-}
-
-/**
 Return a null terminated unicode character array.
  */
 const sal_Unicode*  getStr() const { return pData->buffer; }

-- 
To view, visit https://gerrit.libreoffice.org/3155
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief3a418e2ab0039bdf5100ec6e1505a4887487e7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold 

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 20/9dc6b3675bff64ea54ec109f5398442a5d3f72

 20/9dc6b3675bff64ea54ec109f5398442a5d3f72 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3e84e71bd35d9607d2e01c956ffba40a57d89e4c
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 16:51:15 2013 +0100

Notes added by 'git notes add'

diff --git a/20/9dc6b3675bff64ea54ec109f5398442a5d3f72 
b/20/9dc6b3675bff64ea54ec109f5398442a5d3f72
new file mode 100644
index 000..8983b41
--- /dev/null
+++ b/20/9dc6b3675bff64ea54ec109f5398442a5d3f72
@@ -0,0 +1 @@
+prefer: 91e81cd4bd8917ee06cd4fc0f7a56979c72100d6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - dd/ff14ee8d033aebd56b948bfaa23704f791ba46

 dd/ff14ee8d033aebd56b948bfaa23704f791ba46 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f6998d808f626959c86270b1cb27cb64bb0c39d6
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 16:47:48 2013 +0100

Notes added by 'git notes add'

diff --git a/dd/ff14ee8d033aebd56b948bfaa23704f791ba46 
b/dd/ff14ee8d033aebd56b948bfaa23704f791ba46
new file mode 100644
index 000..bcffe5d
--- /dev/null
+++ b/dd/ff14ee8d033aebd56b948bfaa23704f791ba46
@@ -0,0 +1 @@
+prefer: ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 22/a01f66b7dea315583f5145df61e9462c34195d 7c/9964d111937a0af503633a8f16195183747d43

 22/a01f66b7dea315583f5145df61e9462c34195d |1 +
 7c/9964d111937a0af503633a8f16195183747d43 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit e715d6d2f37945814d451b7b9c7ab8dd21c147a1
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 16:47:40 2013 +0100

Notes added by 'git notes add'

diff --git a/22/a01f66b7dea315583f5145df61e9462c34195d 
b/22/a01f66b7dea315583f5145df61e9462c34195d
new file mode 100644
index 000..bcffe5d
--- /dev/null
+++ b/22/a01f66b7dea315583f5145df61e9462c34195d
@@ -0,0 +1 @@
+prefer: ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa
commit e1c073a03b04e3c968925767994666432b3f9371
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 16:47:28 2013 +0100

Notes added by 'git notes add'

diff --git a/7c/9964d111937a0af503633a8f16195183747d43 
b/7c/9964d111937a0af503633a8f16195183747d43
new file mode 100644
index 000..bcffe5d
--- /dev/null
+++ b/7c/9964d111937a0af503633a8f16195183747d43
@@ -0,0 +1 @@
+prefer: ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8b/dce6d900be92077b715ff1298b846ce32171b7

 8b/dce6d900be92077b715ff1298b846ce32171b7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e9d7f7037e680f48a8b29ae471023e3b5bb00d7c
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 16:46:53 2013 +0100

Notes added by 'git notes add'

diff --git a/8b/dce6d900be92077b715ff1298b846ce32171b7 
b/8b/dce6d900be92077b715ff1298b846ce32171b7
new file mode 100644
index 000..bcffe5d
--- /dev/null
+++ b/8b/dce6d900be92077b715ff1298b846ce32171b7
@@ -0,0 +1 @@
+prefer: ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] Try to optimize a bit

Julien Nabet has abandoned this change.

Change subject: Try to optimize a bit
..


Patch Set 2: Abandoned

I failed with gerrit things, I resubmitted the same thing :-(

Anyway, my second change was almost like yours Markus but I didn't understand 
your resize part.
I prefer to abandon this since I'm obviously missing the point here.

-- 
To view, visit https://gerrit.libreoffice.org/3153
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I36a529ef29b93ee46e4a3ff6823fbce15d176c27
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Julien Nabet 
Gerrit-Reviewer: Markus Mohrhard 
Gerrit-Reviewer: Noel Grandin 

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 00/56d3aaa86b3747c11cb8cf5260cc0dac298da3

 00/56d3aaa86b3747c11cb8cf5260cc0dac298da3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ac763e7b76228dcefc669dd874026e8947deee99
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 15:59:36 2013 +0100

Notes added by 'git notes add'

diff --git a/00/56d3aaa86b3747c11cb8cf5260cc0dac298da3 
b/00/56d3aaa86b3747c11cb8cf5260cc0dac298da3
new file mode 100644
index 000..6b5fee1
--- /dev/null
+++ b/00/56d3aaa86b3747c11cb8cf5260cc0dac298da3
@@ -0,0 +1 @@
+prefer: cb3f52275b51546b579d7856b75dca4ecf791c6a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ad/77bec91c2fbb3387155d4227b6c5ee3c35333e

 ad/77bec91c2fbb3387155d4227b6c5ee3c35333e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0d35fe4a32e358e9112d4bef585988cecfc776e4
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 15:57:08 2013 +0100

Notes added by 'git notes add'

diff --git a/ad/77bec91c2fbb3387155d4227b6c5ee3c35333e 
b/ad/77bec91c2fbb3387155d4227b6c5ee3c35333e
new file mode 100644
index 000..6b5fee1
--- /dev/null
+++ b/ad/77bec91c2fbb3387155d4227b6c5ee3c35333e
@@ -0,0 +1 @@
+prefer: cb3f52275b51546b579d7856b75dca4ecf791c6a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 69/415c1c8396db0c9ecbd5e5794485b16bcbad5b

 69/415c1c8396db0c9ecbd5e5794485b16bcbad5b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 66feede73ea0867138bebce88c6e6a6ca98bee6f
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 15:53:31 2013 +0100

Notes added by 'git notes add'

diff --git a/69/415c1c8396db0c9ecbd5e5794485b16bcbad5b 
b/69/415c1c8396db0c9ecbd5e5794485b16bcbad5b
new file mode 100644
index 000..df924c5
--- /dev/null
+++ b/69/415c1c8396db0c9ecbd5e5794485b16bcbad5b
@@ -0,0 +1 @@
+prefer: 8f29699cd1723bd8b8acc25033708f9777576d6d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 39/9f004135b506ac2c23307c46c7a0053d77fa17

 39/9f004135b506ac2c23307c46c7a0053d77fa17 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b99b072ec1e5b8bf2edbeee4ae4261d1d55b24d4
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 15:50:23 2013 +0100

Notes added by 'git notes add'

diff --git a/39/9f004135b506ac2c23307c46c7a0053d77fa17 
b/39/9f004135b506ac2c23307c46c7a0053d77fa17
new file mode 100644
index 000..b91fe46
--- /dev/null
+++ b/39/9f004135b506ac2c23307c46c7a0053d77fa17
@@ -0,0 +1 @@
+prefer: e0a2bb01d55f7fc9af210ab3df237cd41ad7a29b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Help on the bug#59071

2013-04-01 Thread Janit Anjaria

Hey!
I have been working on quite a few features/bugs and now i have taken this
up :

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

And hence i would like some help on the same from your side.I have had a
look at the code pointers provided and hence figured a few things out,but
inputs from your side would surely make my task on code much faster and
more importantly, efficient.


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a3/79ffae809a4b9f92fbde9b9699f5353f7b3472

 a3/79ffae809a4b9f92fbde9b9699f5353f7b3472 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0a3e52def1971f858051b9d8130b289512b0c434
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 15:41:19 2013 +0100

Notes added by 'git notes add'

diff --git a/a3/79ffae809a4b9f92fbde9b9699f5353f7b3472 
b/a3/79ffae809a4b9f92fbde9b9699f5353f7b3472
new file mode 100644
index 000..da21b06
--- /dev/null
+++ b/a3/79ffae809a4b9f92fbde9b9699f5353f7b3472
@@ -0,0 +1 @@
+merged as: 93ce5834a6651a2d3ccf6e56336b1ec48c7905f2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2013-04-01 Thread Armin Le Grand

 vcl/source/filter/wmf/winmtf.cxx |   40 ++-
 vcl/source/filter/wmf/winmtf.hxx |2 -
 vcl/source/filter/wmf/winwmf.cxx |6 +++--
 3 files changed, 27 insertions(+), 21 deletions(-)

New commits:
commit 93ce5834a6651a2d3ccf6e56336b1ec48c7905f2
Author: Armin Le Grand 
Date:   Tue Jun 12 10:30:36 2012 +

Resolves: #i117968# Made WMFReader thread safe

Used multithreaded when SdrGrafObj is on asynchronous loading. It was not 
safe
due to using VirtualDevices on occasions where needed (mostly Font stuff).

Extends fix of 6280a1e3104826ccdcd71c422b149e249783d5da for fdo#36991

(cherry picked from commit a379ffae809a4b9f92fbde9b9699f5353f7b3472)

Conflicts:
svtools/source/filter/wmf/winmtf.cxx
svtools/source/filter/wmf/winmtf.hxx
svtools/source/filter/wmf/winwmf.cxx

Change-Id: Ifd1d23217c0fbe22edbd1b1995286846e19030de

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 424004f..5e8f5f2 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -27,6 +27,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 // 
 
@@ -232,8 +234,11 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
 Size  aFontSize( Size( rFont.lfWidth, rFont.lfHeight ) );
 if ( rFont.lfHeight > 0 )
 {
-// converting the cell height into a font height
+// #i117968# VirtualDevice is not thread safe, but filter is used in 
multithreading
+SolarMutexGuard aGuard;
 VirtualDevice aVDev;
+
+// converting the cell height into a font height
 aFont.SetSize( aFontSize );
 aVDev.SetFont( aFont );
 FontMetric aMetric( aVDev.GetFontMetric() );
@@ -249,7 +254,10 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
 
 if ( !rFont.lfWidth )
 {
+// #i117968# VirtualDevice is not thread safe, but filter is used in 
multithreading
+SolarMutexGuard aGuard;
 VirtualDevice aVDev;
+
 aFont.SetSize( aFontSize );
 aVDev.SetFont( aFont );
 FontMetric aMetric( aVDev.GetFontMetric() );
@@ -1500,13 +1508,10 @@ void WinMtfOutput::DrawPolyBezier( Polygon& rPolygon, 
sal_Bool bTo, sal_Bool bRe
 void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* 
pDXArry, sal_Bool bRecordPath, sal_Int32 nGfxMode )
 {
 UpdateClipRegion();
-
-VirtualDevice* pVDev = NULL;
-
 rPosition = ImplMap( rPosition );
-
 sal_Int32 nOldGfxMode = GetGfxMode();
 SetGfxMode( GM_COMPATIBLE );
+
 if ( pDXArry )
 {
 sal_Int32 i, nSum, nLen = rText.Len();
@@ -1600,20 +1605,22 @@ void WinMtfOutput::DrawText( Point& rPosition, String& 
rText, sal_Int32* pDXArry
 
 if( mnTextAlign & ( TA_UPDATECP | TA_RIGHT_CENTER ) )
 {
-if ( !pVDev )
-pVDev = new VirtualDevice;
+// #i117968# VirtualDevice is not thread safe, but filter is used in 
multithreading
+SolarMutexGuard aGuard;
+VirtualDevice aVDev;
+
 sal_Int32 nTextWidth;
-pVDev->SetMapMode( MapMode( MAP_100TH_MM ) );
-pVDev->SetFont( maFont );
+aVDev.SetMapMode( MapMode( MAP_100TH_MM ) );
+aVDev.SetFont( maFont );
 if( pDXArry )
 {
 sal_uInt32 nLen = rText.Len();
-nTextWidth = pVDev->GetTextWidth( rtl::OUString(rText.GetChar( 
(sal_uInt16)( nLen - 1 ) )) );
+nTextWidth = aVDev.GetTextWidth( rtl::OUString(rText.GetChar( 
(sal_uInt16)( nLen - 1 ) )) );
 if( nLen > 1 )
 nTextWidth += pDXArry[ nLen - 2 ];
 }
 else
-nTextWidth = pVDev->GetTextWidth( rText );
+nTextWidth = aVDev.GetTextWidth( rText );
 
 if( mnTextAlign & TA_UPDATECP )
 rPosition = maActPos;
@@ -1647,21 +1654,20 @@ void WinMtfOutput::DrawText( Point& rPosition, String& 
rText, sal_Int32* pDXArry
 sal_Int32* pDX = pDXArry;
 if ( !pDXArry )
 {
+// #i117968# VirtualDevice is not thread safe, but filter is used 
in multithreading
 SolarMutexGuard aGuard;
+VirtualDevice aVDev;
 
 pDX = new sal_Int32[ rText.Len() ];
-if ( !pVDev )
-pVDev = new VirtualDevice;
-pVDev->SetMapMode( MAP_100TH_MM );
-pVDev->SetFont( maLatestFont );
-pVDev->GetTextArray( rText, pDX, 0, STRING_LEN );
+aVDev.SetMapMode( MAP_100TH_MM );
+aVDev.SetFont( maLatestFont );
+aVDev.GetTextArray( rText, pDX, 0, STRING_LEN );
 }
 mpGDIMetaFile->AddAction( new MetaTextArrayAction( rPosition, rText, 
pDX, 0, STRING_LEN ) );
 if ( !pDXArry ) // this means we have created our own array
 delete[] pDX;   // which must be deleted
 }
 SetGfxMode( nOldGfxMode );
-

[PATCH] Easter Bunny brings new redland tarballs

2013-04-01 Thread Michael Stahl (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3154

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/3154/1

Easter Bunny brings new redland tarballs

upgrade raptor to 2.0.9, rasqal to 0.9.30, redland to 1.0.16:
- stop delivering raptor-config/rasqal-config, set env vars instead
  (which unfortunately requires patching configures, TODO: upstream that)
- remove redundant configure flags
- stop passing -Wl,no-inhibit-exec (causes HP-UX code to be built on Linux)
- disable new rasqal build deps:
--with-uuid-library=internal --with-digest-library=internal
- disable redland "libltdl" nonsense via --disable-modular
- fortunately openssl digest support has been removed too
- drop raptor-1.4.18.ooo_build.patch, set RAPTOR2_CFLAGS/LIBS instead
- drop raptor-1.4.18.autotools.patch:
  + FreeBSD parts moved to raptor-freebsd.patch.1
  + Android parts obsolete
  + don't know about the MinGW part (TODO)
- from drop raptor-1.4.18.mingw.patch dropped the part defining parsers
  to be built, done via --enable-parsers
- drop redland/raptor/raptor-1.4.18.cross.patch:
  the vsnprintf check is now done at runtime, and expat has been removed
- drop raptor-1.4.18.aix.patch,redland-1.0.8.aix.patch:
  presumably don't need special check for V7BETA since it's released now
- drop raptor-1.4.18.rindex.patch, index/rindex no longer used
- drop raptor-1.4.18.entities.patch, fixed upstream in 2.0.7
- drop raptor-1.4.18.fixes.patch, fixed upstream in 2.0.9
- drop raptor-1.4.18.{libxml,libxslt}.patch: TODO
- drop {raptor-1.4.18,rasqal-0.9.16,redland-1.0.8}.legal.patch:
  we don't care any more about Sun legal dept.
- drop rasqal-0.9.16.ooo_build.patch, set RASQAL_CFLAGS/LIBS instead
- drop rasqal-0.9.16.autotools.patch:
  + FreeBSD parts moved to rasqal-freebsd.patch.1
  + Android parts obsolete
  + MinGW part only for cygwin build
- drop redland-1.0.8.autotools.patch:
  + FreeBSD parts moved to redland-freebsd.patch.1
  + Android parts obsolete
  + don't know about the MinGW part (TODO)
- drop redland-1.0.8.ooo_build.patch,
  hopefully not necessary to disable utils build

Change-Id: I9cc44928ba87392d69e809abe2236cec0e4a508a
---
M Repository.mk
M RepositoryExternal.mk
M configure.ac
M download.lst
M redland/ExternalPackage_raptor.mk
M redland/ExternalPackage_rasqal.mk
M redland/ExternalPackage_redland.mk
M redland/ExternalProject_raptor.mk
M redland/ExternalProject_rasqal.mk
M redland/ExternalProject_redland.mk
D redland/LICENSE.txt
M redland/Library_raptor.mk
M redland/Library_rasqal.mk
M redland/Library_rdf.mk
M redland/README
M redland/UnpackedTarball_raptor.mk
M redland/UnpackedTarball_rasqal.mk
M redland/UnpackedTarball_redland.mk
D redland/raptor/raptor-1.4.18.aix.patch
D redland/raptor/raptor-1.4.18.autotools.patch
D redland/raptor/raptor-1.4.18.bundled-soname.patch
D redland/raptor/raptor-1.4.18.cross.patch
D redland/raptor/raptor-1.4.18.entities.patch
D redland/raptor/raptor-1.4.18.fixes.patch
D redland/raptor/raptor-1.4.18.legal.patch
D redland/raptor/raptor-1.4.18.libxml.patch
D redland/raptor/raptor-1.4.18.libxslt.patch
D redland/raptor/raptor-1.4.18.mingw.patch
D redland/raptor/raptor-1.4.18.no-soname.patch
D redland/raptor/raptor-1.4.18.ooo_build.patch
D redland/raptor/raptor-1.4.18.rindex.patch
D redland/raptor/raptor-1.4.18.win32.patch
A redland/raptor/raptor-android.patch.1
A redland/raptor/raptor-bundled-soname.patch.1
A redland/raptor/raptor-freebsd.patch.1
A redland/raptor/raptor-mingw.patch.1
A redland/raptor/raptor2.h
A redland/raptor/raptor_config.h
D redland/rasqal/rasqal-0.9.16.aix.patch
D redland/rasqal/rasqal-0.9.16.autotools.patch
D redland/rasqal/rasqal-0.9.16.bundled-soname.patch
D redland/rasqal/rasqal-0.9.16.legal.patch
D redland/rasqal/rasqal-0.9.16.mingw.patch
D redland/rasqal/rasqal-0.9.16.no-soname.patch
D redland/rasqal/rasqal-0.9.16.ooo_build.patch
D redland/rasqal/rasqal-0.9.16.win32.patch
A redland/rasqal/rasqal-aix.patch.1
A redland/rasqal/rasqal-android.patch.1
A redland/rasqal/rasqal-bundled-soname.patch.1
A redland/rasqal/rasqal-freebsd.patch.1
A redland/rasqal/rasqal-mingw.patch.1
A redland/rasqal/rasqal-msvc.patch.1
A redland/rasqal/rasqal-pkgconfig.patch.1
A redland/rasqal/rasqal.h
A redland/redland/librdf.h
D redland/redland/redland-1.0.8.aix.patch
D redland/redland/redland-1.0.8.autotools.patch
D redland/redland/redland-1.0.8.bundled-soname.patch
D redland/redland/redland-1.0.8.legal.patch
D redland/redland/redland-1.0.8.mingw.patch
D redland/redland/redland-1.0.8.no-soname.patch
D redland/redland/redland-1.0.8.ooo_build.patch
A redland/redland/redland-android.patch.1
A redland/redland/redland-bundled-soname.patch.1
A redland/redland/redland-freebsd.patch.1
A redland/redland/redland-mingw.patch.1
R redland/redland/redland-msvc.patch.1
A redland/redland/redland-pkgconfig.patch.1
M scp2/source/ooo/file_library_ooo.scp
69 files changed, 6,850 insertions(+), 1,728 deletions(-)




-- 
To view, visit https://gerri

Re: unusedcode some step further

2013-04-01 Thread Noel Grandin

Another way is to use a clang plugin to generate a more accurate list of
definitions and call sites.
That's what I would do, because clang would handle all of the macro and
language parsing.

On Monday, 1 April 2013, Thomas Arnhold wrote:

> Hi,
>
> there are several unused methods in the source which callcatcher doesn't
> catch. Two examples: 08b91c63131b7e625d2a2c489bc537**dafe5c5963 and
> c12ab867f282e783507fcf74ab5c90**e784681f65 which had only (virtual)
> definitions, but no calls.
>
> The same applies to inlines like 646daee253b69404591c006ec6e717**b6660af30b.
> Defined, but no calls.
>
> So the idea is to get something like a list of all methods in the project.
> First counting (virtual) definitions and second counting all calls.
>
> Counting the calls is not as easy as it seems. So I had the idea to
> preprocess the source files with -fpreprocessed -dD -E to get source files
> without comments and much other cruft removed (which may lead to
> false-positives). Counting in those files seems easier. So it would be 1st
> count definitions, 2nd count all occurrences. If they are equal there are
> no calls.
>
> This would be a way to find possible candidates for removal (excluding
> DLLPUBLIC stuff). Pros: platform independent. Cons: No macro expansion, if
> there are several independent methods which have the same name, but one is
> unused it's not possible to identify the unused one. So it will only
> identify a fraction of all unused stuff. The question is how big is this
> fraction ;)
>
> So my question: Is it worth doing this (because it's not the cleanest
> way)? Or did I miss something, especially the point "no calls, no users"?
>
>
> Another possible way: gcc with -fdata-sections and -ffunction-sections
> [1]. Where both results could be compared and unused methods could be
> identified. But I didn't try that. Did anyone do such thing?
>
> Thomas
>
>
> [1] http://embeddedfreak.**wordpress.com/2009/02/10/**
> removing-unused-functionsdead-**codes-with-gccgnu-ld/
> __**_
> 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: Google Summer of Code

2013-04-01 Thread Pratyush Nalam

Hi

As described in that link, I ran sudo apt-get build-dep libreoffice. The
problem is it started installing openjdk and those set of packages.
However, I already have Oracle Java installed as per this link
http://www.wikihow.com/Install-Oracle-Java-on-Ubuntu-Linux . How to build
libreoffice without openjdk as I already have a working installation of
Java (both JDK and JRE 7u17)

Thanks,

Pratyush Nalam
Technology. Environment. Inclusive Society.
http://www.cse.iitb.ac.in/~pratnala

On Mon, Apr 1, 2013 at 1:40 AM, Markus Mohrhard <
markus.mohrh...@googlemail.com> wrote:

> Hey,
>
>
> 2013/3/31 Pratyush Nalam 
>
>> Hi
>>
>> ** **
>>
>> I am Pratyush Nalam, an undergraduate sophomore from IIT Bombay, India. I
>> want to participate in Google Summer of Code with LibreOffice and I was
>> going through the FAQs and the wiki. Stupid as this may sound, I didn’t
>> find anywhere how to get a copy of the code so that I can start on one of
>> the Easy Hacks tasks. I will be glad if someone can help me out in this
>> regard.
>>
>> ** **
>>
>>
> You should find all the important steps how to build at
> https://wiki.documentfoundation.org/Development/Native_Build
>
> If you still have problems building feel free to ask for more details
>
> Regards,
> Markus
>
>
> ___
> 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

[PATCH] use filelist install method for udkapi and offapi

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3152

to look at the new patch set (#2).

Change subject: use filelist install method for udkapi and offapi
..

use filelist install method for udkapi and offapi

... so we can drop ZipUnoApi again.

Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
---
M instsetoo_native/util/openoffice.lst.in
M offapi/UnoApi_offapi.mk
M scp2/inc/macros.inc
M scp2/source/sdkoo/sdkoo.scp
M solenv/gbuild/Package.mk
M solenv/gbuild/UnoApi.mk
D solenv/gbuild/ZipUnoApi.mk
M solenv/gbuild/gbuild.mk
M solenv/gbuild/platform/IOS_ARM_GCC.mk
M solenv/gbuild/platform/WNT_INTEL_GCC.mk
M solenv/gbuild/platform/com_MSC_class.mk
M solenv/gbuild/platform/macosx.mk
M solenv/gbuild/platform/solaris.mk
M solenv/gbuild/platform/unxgcc.mk
M udkapi/UnoApi_udkapi.mk
15 files changed, 321 insertions(+), 326 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3152/2
-- 
To view, visit https://gerrit.libreoffice.org/3152
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: LibreOffice gerrit bot 

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

Re: LibreOffice prints on tuesdays

2013-04-01 Thread Anthonys Lists


On 01/04/2013 11:49, Luc Castermans wrote:

Op 01-04-13 12:43, Dan Lewis schreef:

On 04/01/2013 06:14 AM, Bjoern Michaelsen wrote:

Hi,

I am happy to be able to be able to provide a prototype of the 
"LibreOffice

prints on Tuesdays extension" here:

http://skyfromme.wordpress.com/2013/04/01/libreoffice-prints-on-tuesdays-only/

I consider this an important feature an would love to see see it 
bundled with
LibreOffice 4.0 and 4.1, and will propose so on the ESC call. Any 
feedback on

this is welcome.

Best,

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

 What is the purpose of this extension? Why print only on Tuesdays?



April 1st is not on Tuesday


It is - it'll take a year to get it debugged and then it'll work fine 
when required...


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

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 4 commits - chart2/source oox/source sd/source

2013-04-01 Thread Muthu Subramanian

 chart2/source/view/charttypes/PieChart.cxx |2 +-
 chart2/source/view/main/ChartView.cxx  |5 +++--
 oox/source/drawingml/chart/seriesconverter.cxx |3 +++
 sd/source/ui/view/drtxtob.cxx  |   22 +-
 4 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit b4fafe903e42db1d63550b1d0ad859d786e3688b
Author: Muthu Subramanian 
Date:   Thu Mar 14 12:54:28 2013 +0530

n#734735: Decrease pie chart's thickness.

diff --git a/chart2/source/view/charttypes/PieChart.cxx 
b/chart2/source/view/charttypes/PieChart.cxx
index 916199e..8ce5462 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -156,7 +156,7 @@ void PieChart::setScales( const std::vector< 
ExplicitScaleData >& rScales, bool
 drawing::Direction3D PieChart::getPreferredDiagramAspectRatio() const
 {
 if( m_nDimension == 3 )
-return drawing::Direction3D(1,1,0.25);
+return drawing::Direction3D(1,1,0.10);
 return drawing::Direction3D(1,1,1);
 }
 
commit def57902b4913417d7c5fef3b00782de9eb7e9d1
Author: Muthu Subramanian 
Date:   Thu Mar 7 18:17:01 2013 +0530

n#657905: Display the scaled fontsize in the toolbar.

Initial set of changes to improve UX for autofit.

diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 7980f14..e659b10 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 #include 
@@ -170,6 +171,8 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
 case SID_ATTR_CHAR_WEIGHT:
 case SID_ATTR_CHAR_POSTURE:
 {
+sal_uInt16 stretchX = 100;
+sal_uInt16 stretchY = 100;
 SvxScriptSetItem aSetItem( nSlotId, GetPool() );
 aSetItem.GetItemSet().Put( aAttrSet, sal_False );
 
@@ -180,6 +183,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
 // input language should be preferred over
 // current cursor position to detect script type
 OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
+SdrOutliner *pOutliner = mpView->GetTextEditOutliner();
 
 if (mpView->ISA(OutlineView))
 {
@@ -187,6 +191,9 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
 mpViewShell->GetActiveWindow());
 }
 
+if( pOutliner )
+pOutliner->GetGlobalCharStretching( stretchX, stretchY 
);
+
 if(pOLV && !pOLV->GetSelection().HasRange())
 {
 if( mpViewShell && mpViewShell->GetViewShell() && 
mpViewShell->GetViewShell()->GetWindow() )
@@ -200,9 +207,22 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
 
 const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScriptType 
);
 if( pI )
-aAttrSet.Put( *pI, nWhich );
+{
+if( nSlotId == SID_ATTR_CHAR_FONTHEIGHT )
+{
+SvxFontHeightItem aFontItem = *(dynamic_cast(pI));
+aFontItem.SetHeight(aFontItem.GetHeight(), stretchX, 
aFontItem.GetPropUnit());
+aAttrSet.Put( aFontItem, nWhich );
+}
+else
+{
+aAttrSet.Put( *pI, nWhich );
+}
+}
 else
+{
 aAttrSet.InvalidateItem( nWhich );
+}
 }
 break;
 
commit a95145e52da0f887f3cf96b515681371e76fa4a6
Author: Muthu Subramanian 
Date:   Wed Mar 27 16:20:42 2013 +0530

n#734735: [PPTX] Use number format, if available, for charts.

diff --git a/oox/source/drawingml/chart/seriesconverter.cxx 
b/oox/source/drawingml/chart/seriesconverter.cxx
index 157f4cd..e2f9034 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -234,6 +234,9 @@ void DataLabelsConverter::convertFromModel( const 
Reference< XDataSeries >& rxDa
 for( DataLabelsModel::DataLabelVector::iterator aIt = 
mrModel.maPointLabels.begin(), aEnd = mrModel.maPointLabels.end(); aIt != aEnd; 
++aIt )
 {
 (*aIt)->maNumberFormat.maFormatCode = 
mrModel.maNumberFormat.maFormatCode;
+if( !mrModel.maNumberFormat.maFormatCode.isEmpty() )
+(*aIt)->maNumberFormat.mbSourceLinked = false;
+
 DataLabelConverter aLabelConv( *this, **aIt );
 aLabelConv.convertFromModel( rxDataSeries, rTypeGroup );
 }
commit 99be3e8dee832ac1a74d6b8a4c552e5296f4fb90
Author: Muthu Subramanian 
Date:   Wed Mar 20 17:39:30 2013 +0530

n#734735: Use full available size for pie charts.

diff --git a/chart2/source/view/main/C

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1e/25617c5fbee25d98ed22dc2c5c4a3f4ea37f8d

 1e/25617c5fbee25d98ed22dc2c5c4a3f4ea37f8d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit beb7d200a695674064e8be485622a177a7ddd156
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 14:37:16 2013 +0100

Notes added by 'git notes add'

diff --git a/1e/25617c5fbee25d98ed22dc2c5c4a3f4ea37f8d 
b/1e/25617c5fbee25d98ed22dc2c5c4a3f4ea37f8d
new file mode 100644
index 000..059aef0
--- /dev/null
+++ b/1e/25617c5fbee25d98ed22dc2c5c4a3f4ea37f8d
@@ -0,0 +1 @@
+prefer: 464f69b8bb5f64f9f4660ba2e2095cdc1c65952b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - svtools/source

 svtools/source/table/tablecontrol_impl.cxx |   11 +--
 svtools/source/table/tablecontrol_impl.hxx |2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 0a40cec9fb760d6d66480d2ba41151d65cf8675b
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 14:08:50 2013 +0100

Related: #i119403# take transparency into account in both Invalidates

which would seem to be a good idea

Change-Id: Id6981851f7ecacab60247af1ef38e06ebb9a7f82

diff --git a/svtools/source/table/tablecontrol_impl.cxx 
b/svtools/source/table/tablecontrol_impl.cxx
index d54cb3f..53258d2 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2127,7 +2127,14 @@ namespace svt { namespace table
 impl_getCellRect( m_nCurColumn, _nPrevRow, aCellRect );
 aInvalidateRect.Bottom() = aCellRect.Bottom();
 }
-m_pDataWindow->Invalidate( aInvalidateRect );
+
+invalidateRect(aInvalidateRect);
+}
+
+void TableControl_Impl::invalidateRect(const Rectangle &rInvalidateRect)
+{
+m_pDataWindow->Invalidate( rInvalidateRect,
+m_pDataWindow->GetControlBackground().GetTransparency() ? 
INVALIDATE_TRANSPARENT : 0 );
 }
 
 
//--
@@ -2162,8 +2169,7 @@ namespace svt { namespace table
 if ( i_lastRow == ROW_INVALID )
 aInvalidateRect.Bottom() = 
m_pDataWindow->GetOutputSizePixel().Height();
 
-m_pDataWindow->Invalidate( aInvalidateRect,
-m_pDataWindow->GetControlBackground().GetTransparency() ? 
INVALIDATE_TRANSPARENT : 0 );
+invalidateRect(aInvalidateRect);
 }
 
 
//--
diff --git a/svtools/source/table/tablecontrol_impl.hxx 
b/svtools/source/table/tablecontrol_impl.hxx
index 21b43ae..d8bf51f 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -215,6 +215,8 @@ namespace svt { namespace table
 /** returns the position of the current row in the selection vector */
 int getRowSelectedNumber(const ::std::vector& selectedRows, 
RowPos current);
 
+void invalidateRect(const Rectangle &rInvalidateRect);
+
 /** ??? */
 voidinvalidateSelectedRegion( RowPos _nPrevRow, RowPos _nCurRow );
 
commit 0f22f933b940431c1ce5e55485ad3e11bca8d5a9
Author: JÃ¼rgen Schmidt 
Date:   Mon Jun 11 07:45:42 2012 +

Resolves: #i119403# GridControl not refreshing after deleting rows

fix: take care of transparency attribute of the control

Patch By: Tsutomu Uchino
Found By: Wolfgang Becker
Review By: jsc

(cherry picked from commit 44f7914e0606caff822957b189a4459ccc5e2aad)

Change-Id: I77c5339747aa5ad223b8c220f934627d0202d4cb

diff --git a/svtools/source/table/tablecontrol_impl.cxx 
b/svtools/source/table/tablecontrol_impl.cxx
index 5904805..d54cb3f 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2162,7 +2162,8 @@ namespace svt { namespace table
 if ( i_lastRow == ROW_INVALID )
 aInvalidateRect.Bottom() = 
m_pDataWindow->GetOutputSizePixel().Height();
 
-m_pDataWindow->Invalidate( aInvalidateRect );
+m_pDataWindow->Invalidate( aInvalidateRect,
+m_pDataWindow->GetControlBackground().GetTransparency() ? 
INVALIDATE_TRANSPARENT : 0 );
 }
 
 
//--
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 44/f7914e0606caff822957b189a4459ccc5e2aad

 44/f7914e0606caff822957b189a4459ccc5e2aad |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9f6ab5a997c219700ff4602fa35a052cf532e12f
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 14:33:51 2013 +0100

Notes added by 'git notes add'

diff --git a/44/f7914e0606caff822957b189a4459ccc5e2aad 
b/44/f7914e0606caff822957b189a4459ccc5e2aad
new file mode 100644
index 000..0386bfa
--- /dev/null
+++ b/44/f7914e0606caff822957b189a4459ccc5e2aad
@@ -0,0 +1 @@
+merged as: 0f22f933b940431c1ce5e55485ad3e11bca8d5a9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

unusedcode some step further

2013-04-01 Thread Thomas Arnhold

Hi,

there are several unused methods in the source which callcatcher doesn't
catch. Two examples: 08b91c63131b7e625d2a2c489bc537dafe5c5963 and
c12ab867f282e783507fcf74ab5c90e784681f65 which had only (virtual)
definitions, but no calls.

The same applies to inlines like
646daee253b69404591c006ec6e717b6660af30b. Defined, but no calls.

So the idea is to get something like a list of all methods in the
project. First counting (virtual) definitions and second counting all calls.

Counting the calls is not as easy as it seems. So I had the idea to
preprocess the source files with -fpreprocessed -dD -E to get source
files without comments and much other cruft removed (which may lead to
false-positives). Counting in those files seems easier. So it would be
1st count definitions, 2nd count all occurrences. If they are equal
there are no calls.

This would be a way to find possible candidates for removal (excluding
DLLPUBLIC stuff). Pros: platform independent. Cons: No macro expansion,
if there are several independent methods which have the same name, but
one is unused it's not possible to identify the unused one. So it will
only identify a fraction of all unused stuff. The question is how big is
this fraction ;)

So my question: Is it worth doing this (because it's not the cleanest
way)? Or did I miss something, especially the point "no calls, no users"?

Another possible way: gcc with -fdata-sections and -ffunction-sections
[1]. Where both results could be compared and unused methods could be
identified. But I didn't try that. Did anyone do such thing?

Thomas

[1]
http://embeddedfreak.wordpress.com/2009/02/10/removing-unused-functionsdead-codes-with-gccgnu-ld/

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

[Libreoffice-commits] core.git: hunspell/hunspell-wundef.patch.1 hunspell/UnpackedTarball_hunspell.mk

 hunspell/UnpackedTarball_hunspell.mk |1 +
 hunspell/hunspell-wundef.patch.1 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit d060197a8dd0deb686fcb3941d37db9d71edc2df
Author: Michael Stahl 
Date:   Mon Apr 1 14:44:08 2013 +0200

hunspell: -Werror=undef

Change-Id: Ib6d015605005dd1fec4aa5351dbf6e72f06cd8ec

diff --git a/hunspell/UnpackedTarball_hunspell.mk 
b/hunspell/UnpackedTarball_hunspell.mk
index 1e0544a..2c532ea 100644
--- a/hunspell/UnpackedTarball_hunspell.mk
+++ b/hunspell/UnpackedTarball_hunspell.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\
hunspell/hunspell-1.3.2-literal.patch \
hunspell/hunspell-1.3.2-compound.patch \
hunspell/hunspell.rhbz918938.patch \
+   hunspell/hunspell-wundef.patch.1 \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/hunspell/hunspell-wundef.patch.1 b/hunspell/hunspell-wundef.patch.1
new file mode 100644
index 000..75131e0
--- /dev/null
+++ b/hunspell/hunspell-wundef.patch.1
@@ -0,0 +1,11 @@
+--- a/src/hunspell/hunvisapi.h.in  2013-04-01 14:41:16.507546705 +0200
 b/src/hunspell/hunvisapi.h.in  2013-04-01 14:41:24.537547190 +0200
+@@ -9,7 +9,7 @@
+ #  else
+ #define LIBHUNSPELL_DLL_EXPORTED __declspec(dllimport)
+ #  endif
+-#elif BUILDING_LIBHUNSPELL && @HAVE_VISIBILITY@
++#elif defined(BUILDING_LIBHUNSPELL) && @HAVE_VISIBILITY@
+ #  define LIBHUNSPELL_DLL_EXPORTED __attribute__((__visibility__("default")))
+ #else
+ #  define LIBHUNSPELL_DLL_EXPORTED
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source

2013-04-01 Thread Ariel Constenla-Haile

 svtools/source/table/tabledatawindow.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8ac3ad62af9066736797330b48e19202da3efb19
Author: Ariel Constenla-Haile 
Date:   Wed May 30 01:34:36 2012 +

Resolves: #i119149# - Fix triggering of selection changed event

Original author: Tsutomu Uchino 

(cherry picked from commit d81d9022c27648c993df820c01a6e1bf2bf1ad8a)

Change-Id: I6d485c2c6f9c81f67c07c313737db637991232fc

diff --git a/svtools/source/table/tabledatawindow.cxx 
b/svtools/source/table/tabledatawindow.cxx
index 5ed3161..c9089c5 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -185,6 +185,7 @@ namespace svt { namespace table
 Point const aPoint = rMEvt.GetPosPixel();
 RowPos const hitRow = m_rTableControl.getRowAtPoint( aPoint );
 bool const wasRowSelected = m_rTableControl.isRowSelected( hitRow );
+size_t const nPrevSelRowCount = m_rTableControl.getSelectedRowCount();
 
 if ( !m_rTableControl.getInputHandler()->MouseButtonDown( 
m_rTableControl, rMEvt ) )
 {
@@ -193,7 +194,8 @@ namespace svt { namespace table
 }
 
 bool const isRowSelected = m_rTableControl.isRowSelected( hitRow );
-if ( isRowSelected != wasRowSelected )
+size_t const nCurSelRowCount = m_rTableControl.getSelectedRowCount();
+if ( isRowSelected != wasRowSelected || nCurSelRowCount != 
nPrevSelRowCount )
 {
 m_aSelectHdl.Call( NULL );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d8/1d9022c27648c993df820c01a6e1bf2bf1ad8a

 d8/1d9022c27648c993df820c01a6e1bf2bf1ad8a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f10aa7dfa327bddefb89b172ebafc550a4a97fe9
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 13:42:59 2013 +0100

Notes added by 'git notes add'

diff --git a/d8/1d9022c27648c993df820c01a6e1bf2bf1ad8a 
b/d8/1d9022c27648c993df820c01a6e1bf2bf1ad8a
new file mode 100644
index 000..d95f02b
--- /dev/null
+++ b/d8/1d9022c27648c993df820c01a6e1bf2bf1ad8a
@@ -0,0 +1 @@
+merged as: 8ac3ad62af9066736797330b48e19202da3efb19
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 61/1ba1bad5c535c78a3d83a5f6be425c3f76a59e

 61/1ba1bad5c535c78a3d83a5f6be425c3f76a59e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 65c03f1aefbf391629be7c610d3b378bc1e3d7b5
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 1 13:40:19 2013 +0100

Notes added by 'git notes add'

diff --git a/61/1ba1bad5c535c78a3d83a5f6be425c3f76a59e 
b/61/1ba1bad5c535c78a3d83a5f6be425c3f76a59e
new file mode 100644
index 000..db67e92
--- /dev/null
+++ b/61/1ba1bad5c535c78a3d83a5f6be425c3f76a59e
@@ -0,0 +1 @@
+prefer: c76c986e17194b0f678ba81a9c49a31bcf206607
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Try to optimize a bit

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3153

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/3153/1

Try to optimize a bit

Change-Id: I36a529ef29b93ee46e4a3ff6823fbce15d176c27
---
M chart2/source/tools/InternalDataProvider.cxx
1 file changed, 1 insertion(+), 6 deletions(-)



diff --git a/chart2/source/tools/InternalDataProvider.cxx 
b/chart2/source/tools/InternalDataProvider.cxx
index 6479040..6150327 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -279,12 +279,7 @@
 if( m_nLevel > static_cast< sal_Int32 >(rVector.size()) )
 rVector.resize( m_nLevel );
 
-vector< uno::Any >::iterator aIt( rVector.begin() );
-for( sal_Int32 nN=0; aIt::iterator aIt = std::find(rVector.begin(), 
rVector.end(), m_nLevel);
 rVector.insert( aIt, uno::Any() );
 }
 

-- 
To view, visit https://gerrit.libreoffice.org/3153
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36a529ef29b93ee46e4a3ff6823fbce15d176c27
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

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

[PATCH] move palettes.zip to package

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3151

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/3151/1

move palettes.zip to package

Change-Id: Ide4e393ff2d735d9cdf01fcb489d65b7659acdbe
---
M extras/Module_extras.mk
R extras/Package_palettes.mk
M scp2/source/ooo/file_extra_ooo.scp
3 files changed, 6 insertions(+), 6 deletions(-)



diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index e9f9667..977c475 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -18,6 +18,7 @@
Package_glade \
Package_labels \
Package_newfiles \
+   Package_palettes \
Package_wordbook \
Zip_autotextuser \
Zip_cfgsrvbitmapunx \
@@ -33,7 +34,6 @@
Zip_gallsystem \
Zip_gallwwwback \
Zip_gallwwwgraf \
-   Zip_palettes \
Zip_tpllayoutimpr \
Zip_tplwizagenda \
Zip_tplwizbitmap \
diff --git a/extras/Zip_palettes.mk b/extras/Package_palettes.mk
similarity index 80%
rename from extras/Zip_palettes.mk
rename to extras/Package_palettes.mk
index e4cdaab..937c1e4 100644
--- a/extras/Zip_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,palettes,$(SRCDIR)/extras/source/palettes))
+$(eval $(call 
gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palettes))
 
-$(eval $(call gb_Zip_add_files,palettes,\
+$(eval $(call gb_Package_add_files,extras_palettes,files/presets/config,\
arrowhd.soe \
classic.sog \
cmyk.soc \
diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index fd08738..2eef8a5 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -297,10 +297,10 @@
 End
 
 File gid_File_Extra_Palettes
-Dir = gid_Dir_User_Config;
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Name = "palettes.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "extras_palettes.filelist";
 Patchfiles = ();
 End
 

-- 
To view, visit https://gerrit.libreoffice.org/3151
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide4e393ff2d735d9cdf01fcb489d65b7659acdbe
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 

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

[PATCH] move autocorr.zip to package

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3150

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/3150/1

move autocorr.zip to package

Change-Id: Ia032d3cb3c41a654ab42b9fe5b2d79bc7ca713f1
---
M extras/Module_extras.mk
R extras/Package_autocorr.mk
M scp2/source/ooo/file_extra_ooo.scp
3 files changed, 6 insertions(+), 6 deletions(-)



diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index c3cb14b..e9f9667 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -13,12 +13,12 @@
AllLangZip_autotextshare \
CustomTarget_autocorr \
CustomTarget_glade \
+   Package_autocorr \
Package_fonts \
Package_glade \
Package_labels \
Package_newfiles \
Package_wordbook \
-   Zip_autocorr \
Zip_autotextuser \
Zip_cfgsrvbitmapunx \
Zip_cfgsrvnolang \
diff --git a/extras/Zip_autocorr.mk b/extras/Package_autocorr.mk
similarity index 85%
rename from extras/Zip_autocorr.mk
rename to extras/Package_autocorr.mk
index adf5651..7711ffa 100644
--- a/extras/Zip_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,autocorr,$(call 
gb_CustomTarget_get_workdir,extras/source/autotext)))
+$(eval $(call gb_Package_Package,extras_autocorr,$(call 
gb_CustomTarget_get_workdir,extras/source/autotext)))
 
-$(eval $(call gb_Zip_add_files,autocorr,\
+$(eval $(call gb_Package_add_files,extras_autocorr,files/share/autocorr,\
acor_af-ZA.dat \
acor_bg-BG.dat \
acor_cs-CZ.dat \
diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index 260c835..fd08738 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -28,10 +28,10 @@
 #include "macros.inc"
 
 File gid_File_Extra_Autocorr
-Dir = gid_Dir_Share_Autocorr;
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE);
-Name = "autocorr.zip";
+Styles = (FILELIST);
+Name = "extras_autocorr.filelist";
 End
 
 File gid_File_Extra_Autotextshare_Lang

-- 
To view, visit https://gerrit.libreoffice.org/3150
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia032d3cb3c41a654ab42b9fe5b2d79bc7ca713f1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 

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

[PATCH] allow to put files listed in file into installation

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3149

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/3149/1

allow to put files listed in file into installation

With this in place, we can replace most of our Zips by Packages.
Extensions and Dictionaries are on the radar as well.

To move an installed file from zip to filelist, do:
1. Convert the Zip_foo.mk to Package_foo.mk . The files must be placed
   under $OUTDIR/files with the exact path they will have in the
   installation (you can find that in scp2).
2. Change the scp2 record:
   - change filename to .filelist
   - replace ARCHIVE by FILELIST in Styles
   - change Dir to FILELIST_DIR.

Change-Id: Ie17d0765406081b03dcd44a6a23cf517f2067dd3
---
M instsetoo_native/util/openoffice.lst.in
M scp2/inc/macros.inc
M solenv/bin/modules/installer.pm
A solenv/bin/modules/installer/filelists.pm
M solenv/bin/modules/installer/globals.pm
M solenv/gbuild/Package.mk
M solenv/gbuild/TargetLocations.mk
7 files changed, 125 insertions(+), 6 deletions(-)



diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index c6afdbd..994e640 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -83,7 +83,7 @@
 downloadnameLibreOffice_{productversion}_{os}_install_{languages}
 langpackdownloadname
LibreOffice_{productversion}_languagepack_{os}_install_{languages}
 helppackdownloadname
LibreOffice_{productversion}_helppack_{os}_install_{languages}
-include 
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+include 
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},,{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 }
 }
 
@@ -140,7 +140,7 @@
 downloadname
LibreOfficeDev_{productversion}_{os}_install_{languages}
 langpackdownloadname
LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
 helppackdownloadname
LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-include 
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+include 
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 }
 }
 
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 1b537aa..dd4432c 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -425,6 +425,12 @@
 #define SCP2_URE_JDL_NORMAL(n) SCP2_URE_DL_NORMAL(n)
 #endif
 
+#if defined MACOSX
+#define FILELIST_DIR gid_Dir_Bundle_Contents
+#else
+#define FILELIST_DIR gid_Dir_Brand_Root
+#endif
+
 #include 
 
 
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index c731d9e..4ec318f 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -41,6 +41,7 @@
 use installer::environment;
 use installer::epmfile;
 use installer::files;
+use installer::filelists;
 use installer::globals;
 use installer::helppack;
 use installer::languagepack;
@@ -617,6 +618,14 @@
 
installer::scriptitems::quoting_illegal_filenames($filesinproductlanguageresolvedarrayref);
 }
 
+
##
+# Processing files with flag FILELIST and putting listed files into 
the file list
+
##
+
+installer::logger::print_message( "... analyzing files with flag 
FILELIST ...\n" );
+
+$filesinproductlangua

[Libreoffice-commits] core.git: boost/boost.wundef.patch.1 boost/UnpackedTarball_boost.mk

 boost/UnpackedTarball_boost.mk |1 +
 boost/boost.wundef.patch.1 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit bf52bd94a9395b0a6e96a6648bcb3a2aa301f32d
Author: Michael Stahl 
Date:   Mon Apr 1 13:56:39 2013 +0200

boost: fix -Wundef in multi_array/base.hpp

Change-Id: Ice8a2863f7b8c80a1fa9875b099394a16590b97e

diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 2987682..482bbfa 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -34,6 +34,7 @@ boost_patches += boost.6940.glibc.patch
 boost_patches += boost.7774.warnings.patch.1
 #https://svn.boost.org/trac/boost/ticket/6142
 boost_patches += boost.6142.warnings.patch.1
+boost_patches += boost.wundef.patch.1
 
 boost_patches += boost.windows.patch
 boost_patches += boost.vc2012.patch
diff --git a/boost/boost.wundef.patch.1 b/boost/boost.wundef.patch.1
new file mode 100644
index 000..9814928
--- /dev/null
+++ b/boost/boost.wundef.patch.1
@@ -0,0 +1,11 @@
+--- a/boost/multi_array/base.hpp   2013-04-01 13:53:59.565375431 +0200
 b/boost/multi_array/base.hpp   2013-04-01 13:54:03.230375652 +0200
+@@ -65,7 +65,7 @@
+ // object creation in small-memory environments.  Thus, the objects
+ // can be left undefined by defining BOOST_MULTI_ARRAY_NO_GENERATORS 
+ // before loading multi_array.hpp.
+-#if !BOOST_MULTI_ARRAY_NO_GENERATORS
++#ifndef BOOST_MULTI_ARRAY_NO_GENERATORS
+ namespace {
+   multi_array_types::extent_gen extents;
+   multi_array_types::index_gen indices;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

About b3dpolygon.cxx (basegfx)

2013-04-01 Thread julien2412

Hello,

There are a lot of iterators stuff in
core/basegfx/source/polygon/b3dpolygon.cxx, I tried to fix 'prefix ++/--
operators for non-primitive types' errors (provided by cppcheck) but I saw
several iterator things I'm not sure, eg:
274 BColorArray(const BColorArray& rOriginal, sal_uInt32 nIndex,
sal_uInt32 nCount)
275 :   maVector(),
276 mnUsedEntries(0L)
277 {
278 BColorDataVector::const_iterator
aStart(rOriginal.maVector.begin());
279 aStart += nIndex;
280 BColorDataVector::const_iterator aEnd(aStart);
281 aEnd += nCount;
282 maVector.reserve(nCount);
283 
284 for(; aStart != aEnd; ++aStart)
285 {
286 if(!aStart->equalZero())
287 mnUsedEntries++;
288 
289 maVector.push_back(*aStart);
290 }
291 }
Isn't aEnd invalidated by push_back call?
Isn't aEnd += nCount dangerous? (if aEnd tries to go further than
rOriginal.maVector.end()) 

358 void insert(sal_uInt32 nIndex, const BColorArray& rSource)
359 {
360 const sal_uInt32 nCount(rSource.maVector.size());
361 
362 if(nCount)
363 {
364 // insert data
365 BColorDataVector::iterator aIndex(maVector.begin());
366 aIndex += nIndex;
367 BColorDataVector::const_iterator
aStart(rSource.maVector.begin());
368 BColorDataVector::const_iterator
aEnd(rSource.maVector.end());
369 maVector.insert(aIndex, aStart, aEnd);
370 
371 for(; aStart != aEnd; ++aStart)
372 {
373 if(!aStart->equalZero())
374 mnUsedEntries++;
375 }
376 }
377 }

Isn't aEnd iterator invalidated by insert call?

There are others in this file but again, I'm not sure, I'm just wondering.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-b3dpolygon-cxx-basegfx-tp4047270.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-commits] core.git: 2 commits - boost/boost.6142.warnings.patch.1 boost/UnpackedTarball_boost.mk np_sdk/inc