[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - solenv/gbuild swext/Extension_wiki-publisher.mk

2012-01-04 Thread Andras Timar 
 solenv/gbuild/Extension.mk|1 -
 swext/Extension_wiki-publisher.mk |6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 2cd98654de1975a64661efb1efb99eb8f081bd68
Author: Andras Timar ati...@suse.com
Date:   Wed Jan 4 11:23:04 2012 +0100

pack UI localizations with MediaWiki extension

diff --git a/swext/Extension_wiki-publisher.mk 
b/swext/Extension_wiki-publisher.mk
index 61b39cd..4db566d 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -37,14 +37,14 @@ $(eval $(call 
gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar))
 
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar))
 
 endif
-$(eval $(call 
gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Addons.xcu))
 
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
-$(eval $(call 
gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,Paths.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Paths.xcu))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,ProtocolHandler.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,Types.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
-$(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,components.rdb,$(WIKISRC)/src/components.rdb))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl))
commit 58d915f63011e4aef0e372cbc78a2e0c1095b079
Author: Andras Timar ati...@suse.com
Date:   Wed Jan 4 11:22:46 2012 +0100

remove leftover comment

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 94fdd2f..ec357c6 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -134,6 +134,5 @@ $(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
$(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2)
 
 endef
-#  $(call gb_Output_announce,$@,$(true),PRP,3)
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: avmedia/Library_avmediawin.mk sfx2/Library_sfx.mk solenv/gbuild sot/Library_sot.mk svtools/Library_svt.mk tools/Library_tl.mk vcl/Library_vcl.mk

2012-01-04 Thread Michael Stahl 
 avmedia/Library_avmediawin.mk   |4 
 sfx2/Library_sfx.mk |2 +-
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |6 --
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 --
 solenv/gbuild/platform/windows.mk   |8 
 sot/Library_sot.mk  |2 +-
 svtools/Library_svt.mk  |2 +-
 tools/Library_tl.mk |2 +-
 vcl/Library_vcl.mk  |2 +-
 9 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit 473a1a4a48003e926ebed16f3535f57bfcf371d9
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 4 12:39:53 2012 +0100

gbuild: define NOMINMAX in windows.mk

diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index df0e5d8..bf09a03 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_Library_set_include,avmediawin,\
-I$(realpath $(SRCDIR)/avmedia/source/inc) \
 ))
 
-$(eval $(call gb_Library_add_defs,avmediawin,\
-   -DNOMINMAX \
-))
-
 $(eval $(call gb_Library_add_api,avmediawin,\
udkapi \
offapi \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 893aa3f..b8f5d37 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,sfx,\
 ))
 
 $(eval $(call gb_Library_add_defs,sfx,\
--DSFX2_DLLIMPLEMENTATION -DNOMINMAX \
+-DSFX2_DLLIMPLEMENTATION \
 ))
 
 ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 1a6b095..9e0109b 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -36,12 +36,6 @@ include $(GBUILDDIR)/platform/windows.mk
 
 gb_RC := $(WINDRES)
 
-gb_OSDEFS := \
-   -DWINVER=0x0500 \
-   -D_WIN32_IE=0x0500 \
-   -DWIN32 \
-   -DWNT \
-
 ifeq ($(GXX_INCLUDE_PATH),)
 GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
 endif
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 36c95f6..ab8446d 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -49,12 +49,6 @@ ifneq ($(origin CXX),default)
 gb_CXX := $(CXX)
 endif
 
-gb_OSDEFS := \
-   -DWINVER=0x0500 \
-   -D_WIN32_IE=0x0500 \
-   -DWIN32 \
-   -DWNT \
-
 gb_COMPILERDEFS := \
-DMSC \
-D_CRT_NON_CONFORMING_SWPRINTFS \
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 35658b2..5207cb5 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -31,4 +31,12 @@ gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
 
 gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XX
 
+gb_OSDEFS := \
+   -DWINVER=0x0500 \
+   -D_WIN32_IE=0x0500 \
+   -DWIN32 \
+   -DWNT \
+   -DNOMINMAX \
+
+
 # vim:set noexpandtab:
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 1c008a1..cc5271d 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_api,sot,\
 ))
 
 $(eval $(call gb_Library_add_defs,sot,\
--DSOT_DLLIMPLEMENTATION -DNOMINMAX\
+-DSOT_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,sot,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 0cba018..d987e59 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_set_include,svt,\
 ))
 
 $(eval $(call gb_Library_add_defs,svt,\
--DSVT_DLLIMPLEMENTATION -DNOMINMAX\
+-DSVT_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,svt,\
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 30bf9fd..0a3ee93 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,tl,\
 ))
 
 $(eval $(call gb_Library_add_defs,tl,\
--DTOOLS_DLLIMPLEMENTATION -DNOMINMAX\
+-DTOOLS_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_api,tl,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 95a307f..f18c18f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,vcl,\
 ))
 
 $(eval $(call gb_Library_add_defs,vcl,\
--DVCL_DLLIMPLEMENTATION -DNOMINMAX \
+-DVCL_DLLIMPLEMENTATION \
 -DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,cui)\ \
 -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - basctl/source cui/source sc/source sfx2/inc sfx2/source svl/inc svl/source svx/inc svx/source sw/source unusedcode.easy

2012-01-04 Thread Lubos Lunak 
 basctl/source/basicide/basides1.cxx |2 
 cui/source/inc/numfmt.hxx   |5 -
 cui/source/tabpages/numfmt.cxx  |   74 --
 sc/source/ui/inc/formula.hxx|6 -
 sc/source/ui/inc/funcpage.hxx   |6 -
 sc/source/ui/inc/parawin.hxx|8 -
 sc/source/ui/inc/undotab.hxx|7 -
 sc/source/ui/inc/viewfunc.hxx   |6 -
 sc/source/ui/view/viewfun2.cxx  |1 
 sfx2/inc/sfx2/frmdescr.hxx  |3 
 sfx2/source/appl/appcfg.cxx |4 
 sfx2/source/appl/appdata.cxx|4 
 sfx2/source/inc/appdata.hxx |2 
 svl/inc/svl/svarray.hxx |2 
 svl/inc/svl/svstdarr.hxx|8 -
 svl/source/items/style.cxx  |1 
 svl/source/memtools/svarray.cxx |2 
 svx/inc/svx/numfmtsh.hxx|   85 
 svx/source/items/numfmtsh.cxx   |  146 
 sw/source/core/doc/docdde.cxx   |2 
 sw/source/core/unocore/unotbl.cxx   |   19 +---
 sw/source/filter/basflt/fltini.cxx  |2 
 sw/source/filter/html/swhtml.cxx|2 
 sw/source/ui/uno/unoatxt.cxx|2 
 unusedcode.easy |1 
 25 files changed, 149 insertions(+), 251 deletions(-)

New commits:
commit 2004a9920e1cef4ac208f14453c1bc8ad80b7c77
Author: Brad Sowden c...@sowden.org
Date:   Thu Dec 29 22:31:12 2011 +1300

Easyhack fdo#38831 remove SvStrings

Remove SvStrings definition and obsolete #defines.

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 5de3788..bcf4006 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -27,8 +27,6 @@
  /
 
 
-#define _SVSTDARR_STRINGS
-
 #include ide_pch.hxx
 
 #define _SOLAR__PRIVATE 1
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 306aaa5..e9e0b34 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -37,12 +37,6 @@
 #include svtools/svmedit.hxx
 #include vcl/tabpage.hxx
 
-#ifndef _SVSTDARR_STRINGS
-
-#define _SVSTDARR_STRINGS
-#include svl/svstdarr.hxx
-
-#endif
 #include compiler.hxx
 #include cell.hxx
 
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index ca24748..79f8185 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -37,12 +37,6 @@
 #include svtools/svmedit.hxx
 #include vcl/tabpage.hxx
 
-#ifndef _SVSTDARR_STRINGS
-
-#define _SVSTDARR_STRINGS
-#include svl/svstdarr.hxx
-
-#endif
 #include vcl/tabctrl.hxx
 #include parawin.hxx
 #include svtools/svtreebx.hxx
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index c6b7409..d2dfedf 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -34,13 +34,6 @@
 #include tools/color.hxx
 #include tabbgcolor.hxx
 
-#ifndef _SVSTDARR_STRINGS
-
-#define _SVSTDARR_STRINGS
-#include svl/svstdarr.hxx
-
-#endif
-
 #include com/sun/star/uno/Sequence.hxx
 
 #include boost/shared_ptr.hpp
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 29e10f3..f1273cf 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -32,12 +32,6 @@
 
 #include tabbgcolor.hxx
 
-#ifndef _SVSTDARR_STRINGS
-
-#define _SVSTDARR_STRINGS
-#include svl/svstdarr.hxx
-
-#endif
 #include com/sun/star/embed/XEmbeddedObject.hpp
 #include com/sun/star/embed/Aspects.hpp
 #include vector
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index e2c950c..400d1cb 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -33,7 +33,6 @@
 #include editeng/eeitem.hxx
 
 #include sfx2/app.hxx
-#define _SVSTDARR_STRINGS
 #include editeng/boxitem.hxx
 #include editeng/fontitem.hxx
 #include editeng/scripttypeitem.hxx
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 85e5374..868a07c 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -47,8 +47,6 @@
 #include svl/szitem.hxx
 #include svl/undo.hxx
 
-#define _SVSTDARR_STRINGS
-#include svl/svstdarr.hxx
 #include sfx2/sfxsids.hrc
 #include sot/exchange.hxx
 
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 4c8d077..47b8063 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -81,7 +81,7 @@
 *   Sortierung mit Hilfe der Object-operatoren  und ==
 *
 * JP 09.10.96:  vordefinierte Arrays:
-*   PtrArr: SvStrings, SvStringsDtor
+*   PtrArr: SvStringsDtor
 *   SortArr:SvStringsSort, SvStringsSortDtor,
 *   SvStringsISort, SvStringsISortDtor
 ***/
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 54f6d2a..1d1b6e8 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -32,7 +32,7 @@
 *   (die defines setzen sich aus

[Libreoffice-commits] .: sw/source

2012-01-04 Thread Cédric Bosdonnat 
 sw/source/ui/docvw/PageBreakWin.cxx |   96 +---
 sw/source/ui/inc/PageBreakWin.hxx   |4 +
 2 files changed, 38 insertions(+), 62 deletions(-)

New commits:
commit 965e72d64c3e38780a69cace3f1bcc5fb35d6c1e
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Wed Jan 4 09:33:44 2012 +0100

Page Break: show the page break right under the mouse

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index 538f6d7..300aa4d 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -68,59 +68,22 @@ using namespace drawinglayer::primitive2d;
 
 namespace
 {
-static B2DPolygon lcl_CreatePolygon( B2DRectangle aBounds, bool bMirror )
+static B2DPolygon lcl_CreatePolygon( B2DRectangle aBounds )
 {
 B2DPolygon aRetval;
 const double nRadius = 1;
 const double nKappa((M_SQRT2 - 1.0) * 4.0 / 3.0);
 
-// Create the top left corner
-{
-B2DPoint aTLCorner = aBounds.getMinimum();
-B2DPoint aStart( 0.0, nRadius );
-B2DPoint aEnd( nRadius, 0.0 );
-aRetval.append( aStart );
-aRetval.appendBezierSegment(
-interpolate( aStart, aTLCorner, nKappa ),
-interpolate( aEnd, aTLCorner, nKappa ),
-aEnd );
-}
-
-// Create the top right angle
-{
-B2DPoint aTMCorner( aBounds.getWidth() - ARROW_WIDTH, 0.0 );
-B2DPoint aStart = aTMCorner + B2DVector( - nRadius, 0.0 );
-B2DVector aEndVect( double( ARROW_WIDTH ), aBounds.getHeight() / 
2.0 );
-aEndVect.setLength( nRadius );
-B2DPoint aEnd = aTMCorner + aEndVect;
-aRetval.append( aStart );
-aRetval.appendBezierSegment(
-interpolate( aStart, aTMCorner, nKappa ),
-interpolate( aEnd, aTMCorner, nKappa ),
-aEnd );
-}
-
-// Create the right corner
+// Create the top right corner
 {
-B2DPoint aMRCorner( aBounds.getWidth(), aBounds.getHeight() / 2.0 
);
-B2DVector aStartVect( double( - ARROW_WIDTH ), - 
aBounds.getHeight() / 2.0 );
-aStartVect.setLength( nRadius );
-B2DPoint aStart = aMRCorner + aStartVect;
-B2DVector aEndVect( double( - ARROW_WIDTH ), aBounds.getHeight() / 
2.0 );
-aEndVect.setLength( nRadius );
-B2DPoint aEnd = aMRCorner + aEndVect;
-aRetval.append( aStart );
-aRetval.appendBezierSegment(
-interpolate( aStart, aMRCorner, nKappa ),
-interpolate( aEnd, aMRCorner, nKappa ),
-aEnd );
+B2DPoint aTMCorner( aBounds.getWidth(), 0.0 );
+aRetval.append( aTMCorner );
 }
 
-// Create the bottom right angle
+// Create the bottom right corner
 {
-B2DPoint aBMCorner( aBounds.getWidth() - ARROW_WIDTH, 
aBounds.getHeight() );
-B2DVector aStartVect( double( ARROW_WIDTH ), - aBounds.getHeight() 
/ 2.0 );
-aStartVect.setLength( nRadius );
+B2DPoint aBMCorner( aBounds.getWidth(), aBounds.getHeight() );
+B2DVector aStartVect( 0.0, - nRadius );
 B2DPoint aStart = aBMCorner + aStartVect;
 B2DPoint aEnd = aBMCorner + B2DVector( - nRadius, 0.0 );
 aRetval.append( aStart );
@@ -142,13 +105,10 @@ namespace
 aEnd );
 }
 
-aRetval.setClosed( true );
-
-if ( bMirror )
+// Create the top left corner
 {
-B2DHomMatrix bRotMatrix = createRotateAroundPoint(
-aBounds.getCenterX(), aBounds.getCenterY(), M_PI );
-aRetval.transform( bRotMatrix );
+B2DPoint aTLCorner = aBounds.getMinimum();
+aRetval.append( aTLCorner );
 }
 
 return aRetval;
@@ -178,7 +138,12 @@ namespace
 m_pWin-Fade( false );
 }
 else if ( !m_pWin-IsVisible() )
+{
 m_pWin-Fade( true );
+}
+
+Point* pPtr = new Point( rMEvt.GetPosPixel() );
+m_pWin-UpdatePosition( pPtr );
 }
 
 void SwBreakDashedLine::MouseButtonDown( const MouseEvent rMEvt )
@@ -199,7 +164,8 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const 
SwPageFrm* pPageFrm )
 m_pLine( NULL ),
 m_bIsAppearing( false ),
 m_nFadeRate( 100 ),
-m_bDestroyed( false )
+m_bDestroyed( false ),
+m_pMousePt( NULL )
 {
 // Use pixels for the rest of the drawing
 SetMapMode( MapMode ( MAP_PIXEL ) );
@@ -224,6 +190,7 @@ SwPageBreakWin::~SwPageBreakWin( )
 
 delete m_pPopupMenu;
 delete m_pLine;
+delete m_pMousePt;
 }
 
 void SwPageBreakWin::Paint( const Rectangle )
@@ -255,7 +222,7 @@ void SwPageBreakWin::Paint( const Rectangle )

[Libreoffice-commits] .: 4 commits - sal/android sal/osl

2012-01-04 Thread Tor Lillqvist 
 sal/android/lo-bootstrap.c |7 +--
 sal/osl/unx/uunxapi.cxx|   38 +++-
 sal/osl/unx/uunxapi.hxx|  104 ++---
 3 files changed, 80 insertions(+), 69 deletions(-)

New commits:
commit 0a5821652fdc57bde39d6b0b6472fc0b4b42cb1a
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Jan 4 14:19:14 2012 +0200

Remove bogus one column indentation

diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx
index 44ad6a0..8e47cfc 100644
--- a/sal/osl/unx/uunxapi.hxx
+++ b/sal/osl/unx/uunxapi.hxx
@@ -26,76 +26,74 @@
  *
  /
 
- #ifndef _OSL_UUNXAPI_HXX_
- #define _OSL_UUNXAPI_HXX_
+#ifndef _OSL_UUNXAPI_HXX_
+#define _OSL_UUNXAPI_HXX_
 
- #ifndef _OSL_UUNXAPI_H_
- #include uunxapi.h
- #endif
+#ifndef _OSL_UUNXAPI_H_
+#include uunxapi.h
+#endif
 
- #ifndef _RTL_USTRING_HXX_
- #include rtl/ustring.hxx
- #endif
+#ifndef _RTL_USTRING_HXX_
+#include rtl/ustring.hxx
+#endif
 
- namespace osl
- {
+namespace osl
+{
 
- /***
-  osl::access
-
-  @see access
-  **/
-
- inline int access(const rtl::OUString ustrPath, int mode)
-  {
- return access_u(ustrPath.pData, mode);
-   }
-
- /***
-  osl::realpath
-
-  @descr
-  The return value differs from the
-  realpath function
-
-  @returns sal_True on success else
-  sal_False
+/***
+ osl::access
 
-  @see realpath
-  **/
+ @see access
+ **/
 
- inline sal_Bool realpath(
- const rtl::OUString ustrFileName,
-rtl::OUString ustrResolvedName)
+inline int access(const rtl::OUString ustrPath, int mode)
  {
- return realpath_u(ustrFileName.pData, ustrResolvedName.pData);
+return access_u(ustrPath.pData, mode);
   }
 
+/***
+ osl::realpath
+
+ @descr
+ The return value differs from the
+ realpath function
 
- /***
-  osl::lstat
+ @returns sal_True on success else
+ sal_False
 
-  @see lstat
-  **/
+ @see realpath
+ **/
+
+inline sal_Bool realpath(
+const rtl::OUString ustrFileName,
+   rtl::OUString ustrResolvedName)
+{
+return realpath_u(ustrFileName.pData, ustrResolvedName.pData);
+ }
 
-  inline int lstat(const rtl::OUString ustrPath, struct stat buf)
-  {
-   return lstat_u(ustrPath.pData, buf);
-  }
 
 /***
-  osl::mkdir
-  @see mkdir
-  **/
-inline int mkdir(const rtl::OUString aPath, mode_t aMode)
-{
-return mkdir_u(aPath.pData, aMode);
-}
+ osl::lstat
+
+ @see lstat
+ **/
 
- } // end namespace osl
+ inline int lstat(const rtl::OUString ustrPath, struct stat buf)
+ {
+  return lstat_u(ustrPath.pData, buf);
+ }
 
+   /***
+ osl::mkdir
+ @see mkdir
+ **/
+   inline int mkdir(const rtl::OUString aPath, mode_t aMode)
+   {
+   return mkdir_u(aPath.pData, aMode);
+   }
 
- #endif /* _OSL_UUNXAPI_HXX_ */
+} // end namespace osl
 
+#endif /* _OSL_UUNXAPI_HXX_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d37157372db95ee64afdc6e74c536e28fc5bbd6e
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Jan 4 14:18:02 2012 +0200

Handle /assets paths also in realpath_u()

diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 61fac80..86e86e2 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -113,6 +113,20 @@
  {
 #ifndef MACOSX // not MACOSX
 rtl::OString fn = OUStringToOString(pustrFileName);
+#ifdef ANDROID
+if (strncmp(fn.getStr(), /assets, sizeof(/assets)-1) == 0 
+(fn.getStr()[sizeof(/assets)-1] == '\0' ||
+ fn.getStr()[sizeof(/assets)-1] == '/'))
+{
+if (access_u(pustrFileName, F_OK) == -1)
+return sal_False;
+
+rtl_uString silly(*pustrFileName);
+rtl_uString_assign(ppustrResolvedName, silly);
+
+return sal_True;
+}
+#endif
 #else
 rtl::OString fn = macxp_resolveAliasAndConvert(pustrFileName);
 #endif
commit 36ce37def3c7dde751098649763479ca21321a9a
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Jan 4 14:15:43 2012 +0200

Fix the monkey patching to work for an arbitrary offset

We used to patch in a simple b instruction with a relative offset
that has to fit in 24(+2) bits. Which was not enough in practice.

Now patch in a ldr pc, [pc, #-4] instead which loads PC from the

[Libreoffice-commits] .: 2 commits - i18npool/inc i18npool/source scp2/source setup_native/source solenv/bin solenv/inc svtools/source

2012-01-04 Thread Eike Rathke 
 i18npool/inc/i18npool/lang.h   |1 +
 i18npool/source/isolang/isolang.cxx|1 +
 i18npool/source/isolang/langid.pl  |4 ++--
 i18npool/source/isolang/mslangid.cxx   |2 ++
 scp2/source/ooo/file_ooo.scp   |1 +
 setup_native/source/win32/msi-encodinglist.txt |3 ++-
 solenv/bin/modules/installer/globals.pm|5 +++--
 solenv/inc/langlist.mk |2 ++
 svtools/source/misc/langtab.src|1 +
 9 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit d0bb67f5df45ed9ee1f152677d7104b7129052e8
Author: Eike Rathke er...@redhat.com
Date:   Wed Jan 4 14:40:39 2012 +0100

added Kyrgyz (China) [ky-CN] to language list

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index c2b733a..177d2a7 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -537,6 +537,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ARAGONESE 0x0665
 #define LANGUAGE_USER_KEYID 0x0666  /* key id pseudolanguage */
 #define LANGUAGE_USER_PALI_LATIN0x0667
+#define LANGUAGE_USER_KYRGYZ_CHINA  0x0668  /* not derived from 
LANGUAGE_KIRGHIZ as these may be different scripts, see 
http://www.omniglot.com/writing/kirghiz.htm */
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
 
diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index f9f7b49..610ea7f 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -482,6 +482,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ARAGONESE,  an, ES },
 { LANGUAGE_USER_KEYID, qtz,},   // key id 
pseudolanguage used for UI testing
 { LANGUAGE_USER_PALI_LATIN,pli,},   // Pali with Latin 
script
+{ LANGUAGE_USER_KYRGYZ_CHINA,   ky, CN },
 { LANGUAGE_NONE,   zxx,},   // added to ISO 
639-2 on 2006-01-11: Used to declare the absence of linguistic information
 { LANGUAGE_DONTKNOW,,  }// marks end of 
table
 };
diff --git a/i18npool/source/isolang/mslangid.cxx 
b/i18npool/source/isolang/mslangid.cxx
index 59a37ed..3cd877e 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -240,6 +240,7 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
 case LANGUAGE_KASHMIRI LANGUAGE_MASK_PRIMARY :
 case LANGUAGE_SINDHI   LANGUAGE_MASK_PRIMARY :
 case LANGUAGE_UIGHUR_CHINA LANGUAGE_MASK_PRIMARY :
+case LANGUAGE_USER_KYRGYZ_CHINALANGUAGE_MASK_PRIMARY :
 return true;
 
 default:
@@ -344,6 +345,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 case LANGUAGE_USER_MAITHILI_INDIA:
 case LANGUAGE_UIGHUR_CHINA:
 case LANGUAGE_USER_LIMBU:
+case LANGUAGE_USER_KYRGYZ_CHINA:
 nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
 break;
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a3dd222..4876614 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -683,6 +683,7 @@ File gid_File_Share_Registry_Ctl_Xcd
 Name (he) = ctl.xcd;
 Name (hi) = ctl.xcd;
 Name (km) = ctl.xcd;
+Name (ky-CN) = ctl.xcd;
 Name (lo) = ctl.xcd;
 Name (my) = ctl.xcd;
 Name (ne) = ctl.xcd;
diff --git a/setup_native/source/win32/msi-encodinglist.txt 
b/setup_native/source/win32/msi-encodinglist.txt
index ed21cac..936adb4 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -64,7 +64,8 @@ ko 949  1042
 kok  0     # Konkani
 ks   0  1120   # Kashmiri
 ku   0  1574
-ky   0  2100
+ky   0  1088   # Kyrgyz
+ky-CN0  1640   # Kyrgyz (China)
 lb1252  1134
 lo   0  1108   # Lao
 lt1257  1063   # Lithuanian
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index 8c08f43..ea352ba 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -95,10 +95,11 @@ BEGIN
 ny,
 so,
 kab,
-tk
+tk,
+ky-CN
 );
 @items_at_modules = (Files, Dirs, Unixlinks);
-@rtllanguages = (ar, fa, he, ug);
+@rtllanguages = (ar, fa, he, ug, ky-CN);
 
 $ziplistname = ;
 $pathfilename = ;
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index f044711..aa4e9ed 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -76,6 +76,8 @@ ko \
 kok \
 ks \
 ku \
+ky \
+ky-CN \
 lb \
 lo \
 lt \
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index b82e0f4..01b2846 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@

[Libreoffice-commits] .: svx/source

2012-01-04 Thread Radek Doulík 
 svx/source/customshapes/EnhancedCustomShape2d.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 250f84daf8f443bf436e0a86c9a718c37749971a
Author: Radek Doulik r...@novell.com
Date:   Wed Jan 4 15:05:32 2012 +0100

implemented QUADRATICCURVETO case of custom shape paths

 - convert them to cubic beziers, which we have in basegfx

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 2b2078a..0d9f9a3 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1637,10 +1637,20 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16 
rSrcPt, sal_uInt16 rSegm
 }
 break;
 
-case QUADRATICCURVETO :  // TODO
+case QUADRATICCURVETO :
 for ( sal_Int32 i(0L); ( i  nPntCount )  ( rSrcPt + 1  
nCoordSize ); i++ )
 {
-rSrcPt += 2;
+const Point aControl(GetPoint( seqCoordinates[ 
rSrcPt++ ], sal_True, sal_True ));
+const Point aEnd(GetPoint( seqCoordinates[ rSrcPt++ ], 
sal_True, sal_True ));
+
+basegfx::B2DPoint aStartPointB2D( 
aNewB2DPolygon.getB2DPoint(aNewB2DPolygon.count() - 1 ) );
+Point aStartPoint( aStartPointB2D.getX(), 
aStartPointB2D.getY() );
+
+DBG_ASSERT(aNewB2DPolygon.count(), 
EnhancedCustomShape2d::CreateSubPath: Error in adding control point (!));
+aNewB2DPolygon.appendBezierSegment(
+basegfx::B2DPoint(aStartPoint.X() + 
2.0*(aControl.X() - aStartPoint.X())/3.0, aStartPoint.Y() + 2.0*(aControl.Y() - 
aStartPoint.Y())/3.0),
+basegfx::B2DPoint(aEnd.X() + 2.0*(aControl.X() - 
aEnd.X())/3.0, aEnd.Y() + 2.0*(aControl.Y() - aEnd.Y())/3.0),
+basegfx::B2DPoint(aEnd.X(), aEnd.Y()));
 }
 break;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-04 Thread Markus Mohrhard 
 sc/source/ui/docshell/docsh8.cxx |2 +-
 sc/source/ui/docshell/externalrefmgr.cxx |5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 63ade823e2d854b60df76790e3628a5ab78f653a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Jan 4 15:18:09 2012 +0100

remove entry from unsaved ref container if doc is saved

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index 536dea7..4ad9a91 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2683,8 +2683,8 @@ sal_uInt32 
ScExternalRefManager::getMappedNumberFormat(sal_uInt16 nFileId, sal_u
 
 void ScExternalRefManager::transformUnsavedRefToSavedRef( SfxObjectShell* 
pShell )
 {
-for(DocShellMap::iterator itr = maUnsavedDocShells.begin();
-itr != maUnsavedDocShells.end(); ++itr)
+DocShellMap::iterator itr = maUnsavedDocShells.begin();
+while( itr != maUnsavedDocShells.end() )
 {
 if ((itr-second.maShell) == pShell)
 {
@@ -2692,6 +2692,7 @@ void ScExternalRefManager::transformUnsavedRefToSavedRef( 
SfxObjectShell* pShell
 rtl::OUString aFileURL = 
pShell-GetMedium()-GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
 switchSrcFile(itr-first, aFileURL, rtl::OUString());
 EndListening(*pShell);
+maUnsavedDocShells.erase(itr++);
 }
 }
 }
commit 51caf9b45403b92deadf934347f2d6f9ffecdf08
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Dec 29 13:05:33 2011 +0100

don't show generic error message if a better one is available, fdo#43911

diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 207f0f0..6de8364 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -364,7 +364,7 @@ sal_uLong ScDocShell::DBaseImport( const String 
rFullFileName, CharSet eCharSet
 if ( nColCount  MAXCOL+1 )
 {
 nColCount = MAXCOL+1;
-nErr = SCWARN_IMPORT_RANGE_OVERFLOW;// warning
+nErr = SCWARN_IMPORT_COLUMN_OVERFLOW;// warning
 }
 
 uno::Referencesdbc::XRow xRow( xRowSet, uno::UNO_QUERY );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-04 Thread Cédric Bosdonnat 
 sw/source/ui/docvw/DashedLine.cxx  |8 
 sw/source/ui/docvw/HeaderFooterWin.cxx |3 +--
 sw/source/ui/docvw/PageBreakWin.cxx|7 +++
 sw/source/ui/inc/DashedLine.hxx|4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 3b5a556fe6b1de0e71af2fae554e48b0553e750c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Wed Jan 4 15:20:22 2012 +0100

Page Break, Header/Footer: fixed the line color change if config changes

diff --git a/sw/source/ui/docvw/DashedLine.cxx 
b/sw/source/ui/docvw/DashedLine.cxx
index 0470733..3cb66b1 100644
--- a/sw/source/ui/docvw/DashedLine.cxx
+++ b/sw/source/ui/docvw/DashedLine.cxx
@@ -36,9 +36,9 @@
 #include svx/sdr/contact/objectcontacttools.hxx
 #include vcl/svapp.hxx
 
-SwDashedLine::SwDashedLine( Window* pParent, const basegfx::BColor rColor ) :
+SwDashedLine::SwDashedLine( Window* pParent, Color ( *pColorFn )() ) :
 FixedLine( pParent, WB_DIALOGCONTROL | WB_HORZ ),
-m_aColor( rColor )
+m_pColorFn( pColorFn )
 {
 }
 
@@ -69,7 +69,7 @@ void SwDashedLine::Paint( const Rectangle )
 const StyleSettings rSettings = 
Application::GetSettings().GetStyleSettings();
 
 std::vector double  aStrokePattern;
-basegfx::BColor aColor = m_aColor;
+basegfx::BColor aColor = m_pColorFn().getBColor();
 if ( rSettings.GetHighContrastMode( ) )
 {
 // Only a solid line in high contrast mode
@@ -103,7 +103,7 @@ void SwDashedLine::Paint( const Rectangle )
 drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D * pLine =
 new drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D (
 basegfx::B2DPolyPolygon( aPolygon ),
-drawinglayer::attribute::LineAttribute( m_aColor ),
+drawinglayer::attribute::LineAttribute( 
m_pColorFn().getBColor() ),
 drawinglayer::attribute::StrokeAttribute( aStrokePattern ) );
 
 aSeq[ aSeq.getLength() - 1 ] = 
drawinglayer::primitive2d::Primitive2DReference( pLine );
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx 
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index df39978..180b975 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -163,8 +163,7 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, 
const SwPageFrm* pPag
 SetMapMode( MapMode ( MAP_PIXEL ) );
 
 // Create the line control
-basegfx::BColor aColor = 
SwViewOption::GetHeaderFooterMarkColor().getBColor();
-m_pLine = new SwDashedLine( GetEditWin(), aColor );
+m_pLine = new SwDashedLine( GetEditWin(), 
SwViewOption::GetHeaderFooterMarkColor );
 m_pLine-SetZOrder( this, WINDOW_ZORDER_BEFOR );
 
 // Create and set the PopupMenu
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index 7c1f00e..4799320 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -160,8 +160,8 @@ namespace
 SwPageBreakWin* m_pWin;
 
 public:
-SwBreakDashedLine( Window* pParent, const BColor rColor, 
SwPageBreakWin* pWin ) :
-SwDashedLine( pParent, rColor ),
+SwBreakDashedLine( Window* pParent, Color ( *pColorFn )(), 
SwPageBreakWin* pWin ) :
+SwDashedLine( pParent, pColorFn ),
 m_pWin( pWin ) {};
 
 virtual void MouseMove( const MouseEvent rMEvt );
@@ -206,8 +206,7 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const 
SwPageFrm* pPageFrm )
 SetMapMode( MapMode ( MAP_PIXEL ) );
 
 // Create the line control
-BColor aColor = SwViewOption::GetPageBreakColor().getBColor();
-m_pLine = new SwBreakDashedLine( GetEditWin(), aColor, this );
+m_pLine = new SwBreakDashedLine( GetEditWin(), 
SwViewOption::GetPageBreakColor, this );
 
 // Create the popup menu
 m_pPopupMenu = new PopupMenu( SW_RES( MN_PAGEBREAK_BUTTON ) );
diff --git a/sw/source/ui/inc/DashedLine.hxx b/sw/source/ui/inc/DashedLine.hxx
index 671024a..21719ea 100644
--- a/sw/source/ui/inc/DashedLine.hxx
+++ b/sw/source/ui/inc/DashedLine.hxx
@@ -35,10 +35,10 @@
   */
 class SwDashedLine : public FixedLine
 {
-basegfx::BColor m_aColor;
+Color (*m_pColorFn)();
 
 public:
-SwDashedLine( Window* pParent, const basegfx::BColor rColor );
+SwDashedLine( Window* pParent, Color ( *pColorFn )() );
 ~SwDashedLine( );
 
 virtual void Paint( const Rectangle rRect );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/source

2012-01-04 Thread Radek Doulík 
 svx/source/customshapes/EnhancedCustomShape2d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8edd479f579afe9b26790c99a9a6648261aec4e3
Author: Radek Doulik r...@novell.com
Date:   Wed Jan 4 15:27:27 2012 +0100

move the assert checking the polygon count higher

 - so that it is called before accessing polygon points

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 0d9f9a3..f1fbf44 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1643,10 +1643,10 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16 
rSrcPt, sal_uInt16 rSegm
 const Point aControl(GetPoint( seqCoordinates[ 
rSrcPt++ ], sal_True, sal_True ));
 const Point aEnd(GetPoint( seqCoordinates[ rSrcPt++ ], 
sal_True, sal_True ));
 
+DBG_ASSERT(aNewB2DPolygon.count(), 
EnhancedCustomShape2d::CreateSubPath: Error in adding control point (!));
 basegfx::B2DPoint aStartPointB2D( 
aNewB2DPolygon.getB2DPoint(aNewB2DPolygon.count() - 1 ) );
 Point aStartPoint( aStartPointB2D.getX(), 
aStartPointB2D.getY() );
 
-DBG_ASSERT(aNewB2DPolygon.count(), 
EnhancedCustomShape2d::CreateSubPath: Error in adding control point (!));
 aNewB2DPolygon.appendBezierSegment(
 basegfx::B2DPoint(aStartPoint.X() + 
2.0*(aControl.X() - aStartPoint.X())/3.0, aStartPoint.Y() + 2.0*(aControl.Y() - 
aStartPoint.Y())/3.0),
 basegfx::B2DPoint(aEnd.X() + 2.0*(aControl.X() - 
aEnd.X())/3.0, aEnd.Y() + 2.0*(aControl.Y() - aEnd.Y())/3.0),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - solenv/gbuild

2012-01-04 Thread Michael Stahl 
 solenv/gbuild/platform/macosx.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81151f6861eeb24c356f6fb544a78e4459070bf3
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 4 16:02:54 2012 +0100

gbuild: macosx.mk: enable -fobjc-exceptions

Add it to gb_OBJCFLAGS, just like in old solenv/inc/unxmacx.mk.

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index bd92908..114dd16 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -84,7 +84,7 @@ endif
 # (see toolkit module for a case where it is necessary to do it this way)
 gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
 
-gb_OBJCFLAGS := -x objective-c
+gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
 
 gb_LinkTarget_LDFLAGS := \
-Wl,-syslibroot,$(gb_SDKDIR) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-04 Thread Radek Doulík 
 oox/source/drawingml/customshapegeometry.cxx |2 +-
 oox/source/drawingml/customshapepresets1.cxx |2 +-
 oox/source/drawingml/customshapepresets2.cxx |4 ++--
 oox/source/drawingml/customshapepresets4.cxx |2 +-
 oox/source/drawingml/customshapepresets6.cxx |6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ec2d500c094c1c64c9b0dc4e90d0943d06349e77
Author: Radek Doulik r...@novell.com
Date:   Wed Jan 4 16:08:25 2012 +0100

regenerated custom shape presets with fixed ssd* constants

diff --git a/oox/source/drawingml/customshapepresets1.cxx 
b/oox/source/drawingml/customshapepresets1.cxx
index faf8841..beebc82 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -16003,7 +16003,7 @@ void CustomShapeProperties::initializePresetsMap1()
 aStringSequence[79] = CREATE_OUSTRING (?15 +?75 -0);
 aStringSequence[80] = CREATE_OUSTRING (?26 +?76 -0);
 aStringSequence[81] = CREATE_OUSTRING (?26 +0-?38 );
-aStringSequence[82] = CREATE_OUSTRING (min(logwidth,logheight)/50);
+aStringSequence[82] = CREATE_OUSTRING (min(logwidth,logheight)/2);
 aStringSequence[83] = CREATE_OUSTRING (logheight);
 aStringSequence[84] = CREATE_OUSTRING (logwidth);
 aPropertyMap [PROP_Equations] = aStringSequence;
diff --git a/oox/source/drawingml/customshapepresets2.cxx 
b/oox/source/drawingml/customshapepresets2.cxx
index 2dda792..36d79b5 100644
--- a/oox/source/drawingml/customshapepresets2.cxx
+++ b/oox/source/drawingml/customshapepresets2.cxx
@@ -3433,7 +3433,7 @@ void CustomShapeProperties::initializePresetsMap2()
 aStringSequence[101] = CREATE_OUSTRING (?17 +?97 -0);
 aStringSequence[102] = CREATE_OUSTRING (?32 +?98 -0);
 aStringSequence[103] = CREATE_OUSTRING (?32 +0-?48 );
-aStringSequence[104] = CREATE_OUSTRING (min(logwidth,logheight)/50);
+aStringSequence[104] = CREATE_OUSTRING (min(logwidth,logheight)/2);
 aStringSequence[105] = CREATE_OUSTRING (logheight);
 aStringSequence[106] = CREATE_OUSTRING (logwidth);
 aPropertyMap [PROP_Equations] = aStringSequence;
@@ -17494,7 +17494,7 @@ void CustomShapeProperties::initializePresetsMap2()
 }
 {
 Sequence OUString  aStringSequence (18);
-aStringSequence[0] = CREATE_OUSTRING (min(logwidth,logheight)/54);
+aStringSequence[0] = CREATE_OUSTRING (min(logwidth,logheight)/6);
 aStringSequence[1] = CREATE_OUSTRING (logwidth+0-?0 );
 aStringSequence[2] = CREATE_OUSTRING (logheight+0-?0 );
 aStringSequence[3] = CREATE_OUSTRING (?0 *29289/10);
diff --git a/oox/source/drawingml/customshapepresets4.cxx 
b/oox/source/drawingml/customshapepresets4.cxx
index 185cec2..f99ad2c 100644
--- a/oox/source/drawingml/customshapepresets4.cxx
+++ b/oox/source/drawingml/customshapepresets4.cxx
@@ -7628,7 +7628,7 @@ void CustomShapeProperties::initializePresetsMap4()
 aStringSequence[4] = CREATE_OUSTRING (logheight*?0 /10);
 aStringSequence[5] = CREATE_OUSTRING (?1 *?3 /10);
 aStringSequence[6] = CREATE_OUSTRING (logwidth+0-?5 );
-aStringSequence[7] = CREATE_OUSTRING (min(logwidth,logheight)/56);
+aStringSequence[7] = CREATE_OUSTRING (min(logwidth,logheight)/8);
 aStringSequence[8] = CREATE_OUSTRING (0+?7 -0);
 aStringSequence[9] = CREATE_OUSTRING (540*1/14);
 aStringSequence[10] = CREATE_OUSTRING (?7 *tan(pi*(?9 )/1080));
diff --git a/oox/source/drawingml/customshapepresets6.cxx 
b/oox/source/drawingml/customshapepresets6.cxx
index b100a29..77d7145 100644
--- a/oox/source/drawingml/customshapepresets6.cxx
+++ b/oox/source/drawingml/customshapepresets6.cxx
@@ -693,9 +693,9 @@ void CustomShapeProperties::initializePresetsMap6()
 aStringSequence[13] = CREATE_OUSTRING (logwidth+0-?12 );
 aStringSequence[14] = CREATE_OUSTRING (logheight);
 aStringSequence[15] = CREATE_OUSTRING (logwidth);
-aStringSequence[16] = CREATE_OUSTRING (min(logwidth,logheight)/80);
-aStringSequence[17] = CREATE_OUSTRING (min(logwidth,logheight)/64);
-aStringSequence[18] = CREATE_OUSTRING (min(logwidth,logheight)/56);
+aStringSequence[16] = CREATE_OUSTRING (min(logwidth,logheight)/32);
+aStringSequence[17] = CREATE_OUSTRING (min(logwidth,logheight)/16);
+aStringSequence[18] = CREATE_OUSTRING (min(logwidth,logheight)/8);
 aPropertyMap [PROP_Equations] = aStringSequence;
 }
 {
commit 7f1fbec21e94b4074fb53d8614c1392863e510a3
Author: Radek Doulik r...@novell.com
Date:   Wed Jan 4 16:07:59 2012 +0100

PPTX: fix ssd* constants import for drawingml formulas

diff --git a/oox/source/drawingml/customshapegeometry.cxx 
b/oox/source/drawingml/customshapegeometry.cxx
index cd75285..6e93cdd 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cui/source sw/source

2012-01-04 Thread Cédric Bosdonnat 
 cui/source/dialogs/SpellDialog.cxx  |2 +-
 sw/source/core/layout/paintfrm.cxx  |   15 ---
 sw/source/ui/docvw/FrameControlsManager.cxx |8 
 sw/source/ui/inc/FrameControlsManager.hxx   |1 +
 4 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit fd399133ded7f5ec1eb8768eb7fd1d7b269b6e73
Author: László Németh nem...@numbertext.org
Date:   Tue Dec 13 10:18:52 2011 +0100

Fix always-false condition of FullCommentURL

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index fee3bdd..cb68f6b 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1233,7 +1233,7 @@ bool SpellDialog::GetNextSentence_Impl(bool 
bUseSavedSentence, bool bRecheck)
 beans::PropertyValues  aProperties = 
aStart-aGrammarError.aProperties;
 rtl::OUString sFullCommentURL;
 sal_Int32 i = 0;
-while ( !sFullCommentURL.isEmpty()  i  
aProperties.getLength() )
+while ( sFullCommentURL.isEmpty()  i  
aProperties.getLength() )
 {
 if ( aProperties[i].Name.equalsAscii( FullCommentURL 
) )
 {
commit 8005d9db022c83fdfd64f6bb203e489dad13a664
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Wed Jan 4 17:31:52 2012 +0100

Page Break: fix remaining indicator in some cases

When creating a new page without using a page break, before a page
break, there was a remaining indicator. These are now checked and
removed to avoid such cases.

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 387d8a3..55a2b71 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3341,15 +3341,16 @@ void SwPageFrm::PaintBreak( ) const
 if ( pFirstFrm  pFirstFrm-IsTabFrm() )
 pFlowFrm = static_cast const SwTabFrm* ( pFirstFrm );
 
-if ( pFlowFrm  pFlowFrm-IsPageBreak( sal_True ) )
+SwWrtShell* pWrtSh = dynamic_cast SwWrtShell* ( pGlobalShell );
+if ( pWrtSh )
 {
-SwWrtShell* pWrtSh = dynamic_cast SwWrtShell* ( pGlobalShell 
);
-if ( pWrtSh )
-{
-SwEditWin rEditWin = pWrtSh-GetView().GetEditWin();
-SwFrameControlsManager rMngr = 
rEditWin.GetFrameControlsManager();
+SwEditWin rEditWin = pWrtSh-GetView().GetEditWin();
+SwFrameControlsManager rMngr = 
rEditWin.GetFrameControlsManager();
+
+if ( pFlowFrm  pFlowFrm-IsPageBreak( sal_True ) )
 rMngr.SetPageBreakControl( this );
-}
+else
+rMngr.RemoveControlsByType( PageBreak, this );
 }
 }
 SwLayoutFrm::PaintBreak( );
diff --git a/sw/source/ui/docvw/FrameControlsManager.cxx 
b/sw/source/ui/docvw/FrameControlsManager.cxx
index 6b00d56..40e461d 100644
--- a/sw/source/ui/docvw/FrameControlsManager.cxx
+++ b/sw/source/ui/docvw/FrameControlsManager.cxx
@@ -122,6 +122,14 @@ void SwFrameControlsManager::RemoveControls( const SwFrm* 
pFrm )
 }
 }
 
+void SwFrameControlsManager::RemoveControlsByType( FrameControlType eType, 
const SwFrm* pFrm )
+{
+vector SwFrameControlPtr  aVect = m_aControls[eType];
+aVect.erase( remove_if( aVect.begin(),
+aVect.end(),
+FramePredicate( pFrm ) ), aVect.end() );
+}
+
 
 void SwFrameControlsManager::HideControls( FrameControlType eType )
 {
diff --git a/sw/source/ui/inc/FrameControlsManager.hxx 
b/sw/source/ui/inc/FrameControlsManager.hxx
index 453466e..c9e0aed 100644
--- a/sw/source/ui/inc/FrameControlsManager.hxx
+++ b/sw/source/ui/inc/FrameControlsManager.hxx
@@ -64,6 +64,7 @@ class SwFrameControlsManager
 std::vector SwFrameControlPtr  GetControls( FrameControlType eType 
);
 void AddControl( FrameControlType eType, SwFrameControlPtr pControl );
 void RemoveControls( const SwFrm* pFrm );
+void RemoveControlsByType( FrameControlType eType, const SwFrm* pFrm );
 void HideControls( FrameControlType eType );
 void SetReadonlyControls( bool bReadonly );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source

2012-01-04 Thread Andras Timar 
 l10ntools/source/help/HelpIndexerTool.java |   23 ---
 l10ntools/source/help/HelpLinker.cxx   |   17 -
 l10ntools/source/xmlparse.cxx  |2 --
 3 files changed, 42 deletions(-)

New commits:
commit 8f21e3b66c2a7b0e60aa3a610509a2170e21
Author: Andras Timar ati...@suse.com
Date:   Wed Jan 4 17:39:45 2012 +0100

help compiler: less verbose output to console

diff --git a/l10ntools/source/help/HelpIndexerTool.java 
b/l10ntools/source/help/HelpIndexerTool.java
index c20d9f1..d1d0873 100644
--- a/l10ntools/source/help/HelpIndexerTool.java
+++ b/l10ntools/source/help/HelpIndexerTool.java
@@ -185,21 +185,11 @@ public class HelpIndexerTool
 
 try
 {
-Date start = new Date();
 Analyzer analyzer = aLanguageStr.equals(ja) ? (Analyzer)new 
CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
 IndexWriter writer = new IndexWriter( aIndexDir, analyzer, true );
-if( !bExtensionMode )
-System.out.println( Lucene: Indexing to directory ' + 
aIndexDir + '... );
 int nRet = indexDocs( writer, aModule, bExtensionMode, 
aCaptionFilesDir, aContentFilesDir );
 if( nRet != -1 )
-{
-if( !bExtensionMode )
-{
-System.out.println();
-System.out.println( Optimizing ... );
-}
 writer.optimize();
-}
 writer.close();
 
 boolean bCfsFileOk = true;
@@ -229,8 +219,6 @@ public class HelpIndexerTool
 if( nRet == -1 )
 deleteRecursively( aIndexDir );
 
-if( bCfsFileOk  bSegmentFileOk )
-System.out.println( Zipping ... );
 File aDirToZipFile = new File( aDirToZipStr );
 createZipFile( aDirToZipFile, aTargetZipFileStr );
 deleteRecursively( aDirToZipFile );
@@ -247,10 +235,6 @@ public class HelpIndexerTool
 System.out.println( segment file check failed, 
terminating... );
 System.exit( -1 );
 }
-
-Date end = new Date();
-if( !bExtensionMode )
-System.out.println(end.getTime() - start.getTime() +  total 
milliseconds);
 }
 catch (IOException e)
 {
@@ -288,8 +272,6 @@ public class HelpIndexerTool
 HashSet aContentFilesHashSet = new HashSet( aContentFilesList );
 
 // Loop over caption files and find corresponding content file
-if( !bExtensionMode )
-System.out.println( Indexing, adding files );
 int nCaptionFilesLen = aCaptionFiles.length;
 for( int i = 0 ; i  nCaptionFilesLen ; i++ )
 {
@@ -298,9 +280,6 @@ public class HelpIndexerTool
 File aContentFile = null;
 if( aContentFilesHashSet.contains( aCaptionFileStr ) )
 aContentFile = new File( aContentFilesDir, aCaptionFileStr );
-
-if( !bExtensionMode )
-System.out.print( . );
 writer.addDocument( HelpFileDocument.Document( aModule, 
aCaptionFile, aContentFile ) );
 }
 
@@ -314,8 +293,6 @@ public class HelpIndexerTool
 // Not already handled in caption files loop
 File aCaptionFile = null;
 File aContentFile = new File( aContentFilesDir, 
aContentFileStr );
-if( !bExtensionMode )
-System.out.print( . );
 writer.addDocument( HelpFileDocument.Document( aModule, 
aCaptionFile, aContentFile ) );
 }
 }
diff --git a/l10ntools/source/help/HelpLinker.cxx 
b/l10ntools/source/help/HelpLinker.cxx
index b754991..bf237c0 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -483,22 +483,10 @@ void HelpLinker::link() throw( HelpProcessingException )
 if ( (!bExtensionMode || bIndexForExtension)  !helpFiles.empty())
 initIndexerPreProcessor();
 
-if( !bExtensionMode )
-{
-std::cout  Making   outputFile.native_file_string() 
- from   helpFiles.size()   input files  std::endl;
-}
-
 // here we start our loop over the hzip files.
 HashSet::iterator end = helpFiles.end();
 for (HashSet::iterator iter = helpFiles.begin(); iter != end; ++iter)
 {
-if( !bExtensionMode )
-{
-std::cout  .;
-std::cout.flush();
-}
-
 // process one file
 // streamTable contains the streams in the hzip file
 StreamTable streamTable;
@@ -671,8 +659,6 @@ void HelpLinker::link() throw( HelpProcessingException )
 }
 
 } // while loop over hzip files ending
-if( !bExtensionMode )
-std::cout  std::endl;
 
 } // try
 catch( const HelpProcessingException )
@@ -1040,7 +1026,6 @@ void HelpLinker::main( std::vectorstd::string args,
 
 int main(int argc,

[Libreoffice-commits] .: 3 commits - extensions/source slideshow/source solenv/gbuild

2012-01-04 Thread Michael Stahl 
 extensions/source/macosx/spotlight/GetMetadataForFile.m   |2 
 extensions/source/macosx/spotlight/OOoContentDataParser.m |   11 ++
 extensions/source/macosx/spotlight/OOoMetaDataParser.m|9 ++
 extensions/source/macosx/spotlight/ioapi.m|   56 +++---
 extensions/source/macosx/spotlight/main.m |3 
 slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m |1 
 solenv/gbuild/platform/macosx.mk  |2 
 7 files changed, 53 insertions(+), 31 deletions(-)

New commits:
commit 49697f6d54cef37bff44898c9fbf46b5688073c8
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 4 17:59:05 2012 +0100

gbuild: macosx.mk: enable -Werror for ObjC files

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index ef82a82..2c61e8f 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -158,7 +158,7 @@ endef
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
 gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) 
$(gb_OBJCXXFLAGS)
-gb_LinkTarget_OBJCFLAGS := $(gb_CFLAGS) $(gb_OBJCFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_OBJCFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_OBJCFLAGS) 
$(gb_COMPILEROPTFLAGS)
 
 ifeq ($(gb_SYMBOL),$(true))
 gb_LinkTarget_CFLAGS += -g
commit 2f2c747ffcabd906c3451b0ee20758b07c0f1cce
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 4 17:57:53 2012 +0100

extensions: fix unused param warnings in ObjC files

The namespace handling in the spotlight plugin XML parser looks broken,
added some FIXMEs for that.

diff --git a/extensions/source/macosx/spotlight/GetMetadataForFile.m 
b/extensions/source/macosx/spotlight/GetMetadataForFile.m
index e47603d..f93449a 100644
--- a/extensions/source/macosx/spotlight/GetMetadataForFile.m
+++ b/extensions/source/macosx/spotlight/GetMetadataForFile.m
@@ -48,7 +48,7 @@ typedef int NSColorRenderingIntent;
and return it as a dictionary

- */
 
-Boolean GetMetadataForFile(void* thisInterface, 
+Boolean GetMetadataForFile(void* /*thisInterface*/,
   CFMutableDictionaryRef attributes, 
   CFStringRef contentTypeUTI,
   CFStringRef pathToFile)
diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m 
b/extensions/source/macosx/spotlight/OOoContentDataParser.m
index a35b219..d5abd1d 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m
@@ -78,6 +78,11 @@ typedef int NSColorRenderingIntent;
 
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName 
namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName 
attributes:(NSDictionary *)attributeDict
 {
+(void) parser; // unused
+(void) namespaceURI; // FIXME this should not be ignored but should be used
+ // instead of text: prefix in the comparison below!
+(void) qualifiedName; // unused
+(void) attributeDict; // unused
 // all text content is stored inside text:p elements
 if ([elementName isEqualToString:@text:p] == YES) {
 runningTextContent = [NSMutableString new];
@@ -92,6 +97,10 @@ typedef int NSColorRenderingIntent;
 
 - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName 
namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName 
 {
+(void) parser; // unused
+(void) elementName; // unused
+(void) namespaceURI; // unused
+(void) qName; // unused
 if (shouldReadCharacters == TRUE) {
 if (textContent == nil) {
 textContent = [NSMutableString new];
@@ -109,6 +118,7 @@ typedef int NSColorRenderingIntent;
 
 - (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string
 {
+(void) parser; // unused
 if (shouldReadCharacters == NO) {
 return;
 }
@@ -138,6 +148,7 @@ typedef int NSColorRenderingIntent;
 
 - (void)parserDidEndDocument:(NSXMLParser *)parser
 {
+(void) parser; // unused
 if (textContent != nil  [textContent length]  0) {
 [mdiValues setObject:[NSString stringWithString:textContent] 
forKey:(NSString*)kMDItemTextContent];
 [textContent release];
diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m 
b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
index cb26f91..cd69772 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
@@ -48,6 +48,7 @@ static NSDictionary *metaXML2MDIKeys;
 if (isInitialized == NO) {
 //set up the meta elements with only one value
 NSMutableSet *temp = [NSMutableSet new];
+//FIXME these should use namespace URIs and not prefixes
 [temp

[Libreoffice-commits] .: nss/makefile.mk

2012-01-04 Thread Christian Lohmaier 
 nss/makefile.mk |   62 
 1 file changed, 31 insertions(+), 31 deletions(-)

New commits:
commit 7cfb7a449765e774d24dd242629d5742dc87d675
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jan 4 18:09:44 2012 +0100

get rid of obsolete pathdelimiter escape

diff --git a/nss/makefile.mk b/nss/makefile.mk
index bc7b827..dbb5f07 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -38,7 +38,7 @@ TARGET=nss
 
 .IF $(SYSTEM_NSS)==YES
 all:
-@echo NSS will not be built. Using system one instead.
+   @echo NSS will not be built. Using system one instead.
 .ENDIF 
 
 VER_MAJOR=3
@@ -91,11 +91,11 @@ MACOS_SDK_DIR*=$(MACDEVSDK)
 .ENDIF # $(EXTRA_CFLAGS)!=
 .ENDIF # $(OS)==MACOSX
 
-OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) mozilla$/dist$/out$/lib$/libcrmf.a
+OUT2LIB=mozilla/dist/out/lib/*$(DLLPOST) mozilla/dist/out/lib/libcrmf.a
 
-OUT2BIN=config$/nspr-config mozilla$/security$/nss$/nss-config
+OUT2BIN=config/nspr-config mozilla/security/nss/nss-config
 
-BUILD_DIR=mozilla$/security$/nss
+BUILD_DIR=mozilla/security/nss
 BUILD_ACTION= $(GNUMAKE) nss_build_all
 #See #i105566#  moz#513024#
 .IF $(OS)==LINUX
@@ -126,20 +126,20 @@ nss_LIBS=
 nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 
-BUILD_DIR=mozilla$/security$/nss
+BUILD_DIR=mozilla/security/nss
 BUILD_ACTION=NS_USE_GCC=1 CC=$(nss_CC) CXX=$(nss_CXX) 
OS_LIBS=$(nss_LIBS) OS_TARGET=WIN95 _WIN32_IE=0x500 PATH=$(PATH) 
DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all
 
 OUT2LIB= \
-mozilla$/dist$/out$/lib$/libnspr4.a \
-mozilla$/dist$/out$/lib$/libnss3.a \
-mozilla$/dist$/out$/lib$/libnssdbm3.a \
-mozilla$/dist$/out$/lib$/libnssutil3.a \
-mozilla$/dist$/out$/lib$/libplc4.a \
-mozilla$/dist$/out$/lib$/libplds4.a \
-mozilla$/dist$/out$/lib$/libsmime3.a \
-mozilla$/dist$/out$/lib$/libsoftokn3.a \
-mozilla$/dist$/out$/lib$/libsqlite3.a \
-mozilla$/dist$/out$/lib$/libssl3.a
+mozilla/dist/out/lib/libnspr4.a \
+mozilla/dist/out/lib/libnss3.a \
+mozilla/dist/out/lib/libnssdbm3.a \
+mozilla/dist/out/lib/libnssutil3.a \
+mozilla/dist/out/lib/libplc4.a \
+mozilla/dist/out/lib/libplds4.a \
+mozilla/dist/out/lib/libsmime3.a \
+mozilla/dist/out/lib/libsoftokn3.a \
+mozilla/dist/out/lib/libsqlite3.a \
+mozilla/dist/out/lib/libssl3.a
 
 .ELSE  # $(COM)==GCC
 MOZ_MSVCVERSION= 9
@@ -155,32 +155,32 @@ OS_TARGET=WIN95
 
 #To build nss one has to call make nss_build_all in 
 #mozilla/security/nss
-NSS_BUILD_DIR= $(subst,\,/ 
$(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss)
-BUILD_ACTION= PATH=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH) 
 $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
+NSS_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss
+BUILD_ACTION= PATH=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH) 
 $(MOZILLABUILD)/msys/bin/bash -i \
 -c cd $(NSS_BUILD_DIR)  make nss_build_all
 
 OUT2LIB= \
- mozilla$/dist$/out$/lib$/nspr4.lib \
- mozilla$/dist$/out$/lib$/nss3.lib \
- mozilla$/dist$/out$/lib$/nssdbm3.lib \
- mozilla$/dist$/out$/lib$/nssutil3.lib \
- mozilla$/dist$/out$/lib$/plc4.lib \
- mozilla$/dist$/out$/lib$/plds4.lib \
- mozilla$/dist$/out$/lib$/smime3.lib \
- mozilla$/dist$/out$/lib$/softokn3.lib \
- mozilla$/dist$/out$/lib$/sqlite3.lib \
- mozilla$/dist$/out$/lib$/ssl3.lib
+ mozilla/dist/out/lib/nspr4.lib \
+ mozilla/dist/out/lib/nss3.lib \
+ mozilla/dist/out/lib/nssdbm3.lib \
+ mozilla/dist/out/lib/nssutil3.lib \
+ mozilla/dist/out/lib/plc4.lib \
+ mozilla/dist/out/lib/plds4.lib \
+ mozilla/dist/out/lib/smime3.lib \
+ mozilla/dist/out/lib/softokn3.lib \
+ mozilla/dist/out/lib/sqlite3.lib \
+ mozilla/dist/out/lib/ssl3.lib
 
 .ENDIF # $(COM)==GCC
 
-OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST) \
- config$/nspr-config \
- mozilla$/security$/nss$/nss-config
+OUT2BIN=mozilla/dist/out/lib/*$(DLLPOST) \
+ config/nspr-config \
+ mozilla/security/nss/nss-config
 
 .ENDIF # $(GUI)==WNT
 
 
-OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include
+OUTDIR2INC=mozilla/dist/public/nss mozilla/dist/out/include
 
 # --- Targets --
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: canvas/Library_directx5canvas.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk

2012-01-04 Thread Michael Stahl 
 canvas/Library_directx5canvas.mk |3 +++
 canvas/Library_directx9canvas.mk |2 ++
 canvas/Library_gdipluscanvas.mk  |2 ++
 3 files changed, 7 insertions(+)

New commits:
commit 52394ea0f992755fc289b3385ed90e5a43360e57
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 4 18:38:59 2012 +0100

canvas: work around NOMINMAX windows breakage

diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk
index b531a84..13e2467 100644
--- a/canvas/Library_directx5canvas.mk
+++ b/canvas/Library_directx5canvas.mk
@@ -40,8 +40,11 @@ $(eval $(call gb_Library_add_api,directx5canvas,\
 offapi \
 udkapi \
 ))
+
+# clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_Library_add_defs,directx5canvas,\
-DDIRECTX_VERSION=0x0500 \
+   -UNOMINMAX \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,directx5canvas,\
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 081c107..070df09 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -40,8 +40,10 @@ $(eval $(call gb_Library_add_api,directx9canvas,\
 udkapi \
 ))
 
+# clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_Library_add_defs,directx9canvas,\
-DDIRECTX_VERSION=0x0900 \
+   -UNOMINMAX \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,directx9canvas,\
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 93b08c8..7531d75 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -40,8 +40,10 @@ $(eval $(call gb_Library_add_api,gdipluscanvas,\
 udkapi \
 ))
 
+# clear NOMINMAX because GdiplusTypes.h uses those macros :(
 $(eval $(call gb_Library_add_defs,gdipluscanvas,\
-DDIRECTX_VERSION=0x0900 \
+   -UNOMINMAX \
 ))
 
 ifneq ($(strip $(VERBOSE)$(verbose)),)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: fpicker/Library_fps.mk

2012-01-04 Thread Michael Stahl 
 fpicker/Library_fps.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ca03c035e544c460d9278ea6bae414569118099e
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 4 18:46:03 2012 +0100

fpicker: fix makefile typo

diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 85245e3..a7e8b7e 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -63,7 +63,7 @@ $(eval $(call gb_Library_add_linked_libs,fps,\
 
 ifeq ($(COM),MSC)
 $(eval $(call gb_Library_add_libs,fps,\
-   Delayimp.lib /DELAYLOAD:shell32.dll
+   Delayimp.lib /DELAYLOAD:shell32.dll \
 ))
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/qa

2012-01-04 Thread Kohei Yoshida 
 sc/qa/unit/ucalc.cxx |   92 +++
 1 file changed, 92 insertions(+)

New commits:
commit 27bcd172ca47874ff530eef12149e872f9e1448a
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 4 12:59:32 2012 -0500

New unit test to test jumping to precedent / dependent cells.

The test doesn't do the actual jumping, but it only tests the validity
of the destination range(s).

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index a4158c3..724dced 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -47,6 +47,7 @@
 #include postit.hxx
 #include attrib.hxx
 #include dbdata.hxx
+#include reftokenhelper.hxx
 
 #include docsh.hxx
 #include docfunc.hxx
@@ -160,6 +161,12 @@ public:
  */
 void testToggleRefFlag();
 
+/**
+ * Test to make sure correct precedent / dependent cells are obtained when
+ * preparing to jump to them.
+ */
+void testJumpToPrecedentsDependents();
+
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testCollator);
 CPPUNIT_TEST(testInput);
@@ -187,6 +194,7 @@ public:
 CPPUNIT_TEST(testCopyPaste);
 CPPUNIT_TEST(testMergedCells);
 CPPUNIT_TEST(testUpdateReference);
+CPPUNIT_TEST(testJumpToPrecedentsDependents);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2875,6 +2883,90 @@ void Test::testUpdateReference()
 m_pDoc-DeleteTab(0);
 }
 
+namespace {
+
+bool hasRange(const std::vectorScTokenRef rRefTokens, const ScRange rRange)
+{
+std::vectorScTokenRef::const_iterator it = rRefTokens.begin(), itEnd = 
rRefTokens.end();
+for (; it != itEnd; ++it)
+{
+const ScTokenRef p = *it;
+if (!ScRefTokenHelper::isRef(p) || ScRefTokenHelper::isExternalRef(p))
+continue;
+
+switch (p-GetType())
+{
+case formula::svSingleRef:
+{
+ScSingleRefData aData = p-GetSingleRef();
+if (rRange.aStart != rRange.aEnd)
+break;
+
+ScAddress aThis(aData.nCol, aData.nRow, aData.nTab);
+if (aThis == rRange.aStart)
+return true;
+}
+break;
+case formula::svDoubleRef:
+{
+ScComplexRefData aData = p-GetDoubleRef();
+ScRange aThis(aData.Ref1.nCol, aData.Ref1.nRow, 
aData.Ref1.nTab, aData.Ref2.nCol, aData.Ref2.nRow, aData.Ref2.nTab);
+if (aThis == rRange)
+return true;
+}
+break;
+default:
+;
+}
+}
+return false;
+}
+
+}
+
+void Test::testJumpToPrecedentsDependents()
+{
+// Precedent is another cell that the cell references, while dependent is
+// another cell that references it.
+m_pDoc-InsertTab(0, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Test)));
+
+m_pDoc-SetString(2, 0, 0, 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(=A1+A2+B3))); // C1
+m_pDoc-SetString(2, 1, 0, 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(=A1)));   // C2
+m_pDoc-CalcAll();
+
+std::vectorScTokenRef aRefTokens;
+ScDocFunc rDocFunc = m_xDocShRef-GetDocFunc();
+
+{
+// C1's precedent should be A1:A2,B3.
+ScRangeList aRange(ScRange(2, 0, 0));
+rDocFunc.DetectiveCollectAllPreds(aRange, aRefTokens);
+CPPUNIT_ASSERT_MESSAGE(A1:A2 should be a precedent of C1.,
+   hasRange(aRefTokens, ScRange(0, 0, 0, 0, 1, 
0)));
+CPPUNIT_ASSERT_MESSAGE(B3 should be a precedent of C1.,
+   hasRange(aRefTokens, ScRange(1, 2, 0)));
+}
+
+{
+// C2's precedent should be A1 only.
+ScRangeList aRange(ScRange(2, 1, 0));
+rDocFunc.DetectiveCollectAllPreds(aRange, aRefTokens);
+CPPUNIT_ASSERT_MESSAGE(there should only be one reference token.,
+   aRefTokens.size() == 1);
+CPPUNIT_ASSERT_MESSAGE(A1 should be a precedent of C1.,
+   hasRange(aRefTokens, ScRange(0, 0, 0)));
+}
+
+{
+// A1's dependent should be C1:C2.
+ScRangeList aRange(ScRange(0, 0, 0));
+rDocFunc.DetectiveCollectAllSuccs(aRange, aRefTokens);
+CPPUNIT_ASSERT_MESSAGE(C1:C2 should be the only dependent of A1.,
+   aRefTokens.size() == 1  hasRange(aRefTokens, 
ScRange(2, 0, 0, 2, 1, 0)));
+}
+
+m_pDoc-DeleteTab(0);
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

2012-01-04 Thread Kohei Yoshida 
 sc/qa/unit/ucalc.cxx |   92 +++
 1 file changed, 92 insertions(+)

New commits:
commit bc4699ba6e05af115ffed17e2938e3176f3f930a
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 4 12:59:32 2012 -0500

New unit test to test jumping to precedent / dependent cells.

The test doesn't do the actual jumping, but it only tests the validity
of the destination range(s).

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index f98195d..5471c47 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -47,6 +47,7 @@
 #include postit.hxx
 #include attrib.hxx
 #include dbdata.hxx
+#include reftokenhelper.hxx
 
 #include docsh.hxx
 #include docfunc.hxx
@@ -160,6 +161,12 @@ public:
  */
 void testToggleRefFlag();
 
+/**
+ * Test to make sure correct precedent / dependent cells are obtained when
+ * preparing to jump to them.
+ */
+void testJumpToPrecedentsDependents();
+
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testCollator);
 CPPUNIT_TEST(testInput);
@@ -187,6 +194,7 @@ public:
 CPPUNIT_TEST(testCopyPaste);
 CPPUNIT_TEST(testMergedCells);
 CPPUNIT_TEST(testUpdateReference);
+CPPUNIT_TEST(testJumpToPrecedentsDependents);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2875,6 +2883,90 @@ void Test::testUpdateReference()
 m_pDoc-DeleteTab(0);
 }
 
+namespace {
+
+bool hasRange(const std::vectorScTokenRef rRefTokens, const ScRange rRange)
+{
+std::vectorScTokenRef::const_iterator it = rRefTokens.begin(), itEnd = 
rRefTokens.end();
+for (; it != itEnd; ++it)
+{
+const ScTokenRef p = *it;
+if (!ScRefTokenHelper::isRef(p) || ScRefTokenHelper::isExternalRef(p))
+continue;
+
+switch (p-GetType())
+{
+case formula::svSingleRef:
+{
+ScSingleRefData aData = p-GetSingleRef();
+if (rRange.aStart != rRange.aEnd)
+break;
+
+ScAddress aThis(aData.nCol, aData.nRow, aData.nTab);
+if (aThis == rRange.aStart)
+return true;
+}
+break;
+case formula::svDoubleRef:
+{
+ScComplexRefData aData = p-GetDoubleRef();
+ScRange aThis(aData.Ref1.nCol, aData.Ref1.nRow, 
aData.Ref1.nTab, aData.Ref2.nCol, aData.Ref2.nRow, aData.Ref2.nTab);
+if (aThis == rRange)
+return true;
+}
+break;
+default:
+;
+}
+}
+return false;
+}
+
+}
+
+void Test::testJumpToPrecedentsDependents()
+{
+// Precedent is another cell that the cell references, while dependent is
+// another cell that references it.
+m_pDoc-InsertTab(0, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Test)));
+
+m_pDoc-SetString(2, 0, 0, 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(=A1+A2+B3))); // C1
+m_pDoc-SetString(2, 1, 0, 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(=A1)));   // C2
+m_pDoc-CalcAll();
+
+std::vectorScTokenRef aRefTokens;
+ScDocFunc rDocFunc = m_xDocShRef-GetDocFunc();
+
+{
+// C1's precedent should be A1:A2,B3.
+ScRangeList aRange(ScRange(2, 0, 0));
+rDocFunc.DetectiveCollectAllPreds(aRange, aRefTokens);
+CPPUNIT_ASSERT_MESSAGE(A1:A2 should be a precedent of C1.,
+   hasRange(aRefTokens, ScRange(0, 0, 0, 0, 1, 
0)));
+CPPUNIT_ASSERT_MESSAGE(B3 should be a precedent of C1.,
+   hasRange(aRefTokens, ScRange(1, 2, 0)));
+}
+
+{
+// C2's precedent should be A1 only.
+ScRangeList aRange(ScRange(2, 1, 0));
+rDocFunc.DetectiveCollectAllPreds(aRange, aRefTokens);
+CPPUNIT_ASSERT_MESSAGE(there should only be one reference token.,
+   aRefTokens.size() == 1);
+CPPUNIT_ASSERT_MESSAGE(A1 should be a precedent of C1.,
+   hasRange(aRefTokens, ScRange(0, 0, 0)));
+}
+
+{
+// A1's dependent should be C1:C2.
+ScRangeList aRange(ScRange(0, 0, 0));
+rDocFunc.DetectiveCollectAllSuccs(aRange, aRefTokens);
+CPPUNIT_ASSERT_MESSAGE(C1:C2 should be the only dependent of A1.,
+   aRefTokens.size() == 1  hasRange(aRefTokens, 
ScRange(2, 0, 0, 2, 1, 0)));
+}
+
+m_pDoc-DeleteTab(0);
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-04 Thread Jan Holesovsky 
 extensions/qa/update/simple.xml   |6 ++--
 extensions/qa/update/test_update.cxx  |   27 +++---
 extensions/source/update/check/updateprotocol.cxx |   14 +--
 extensions/source/update/check/updateprotocol.hxx |1 
 4 files changed, 40 insertions(+), 8 deletions(-)

New commits:
commit 953b7f9e1ba665b4763fac8f83113f43b6d49b39
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Jan 4 19:25:57 2012 +0100

Online update: Introduce inst:gitid to check exactly if we are the same.

This allows to feed updates via a static .xml in a controlled environment.

diff --git a/extensions/qa/update/simple.xml b/extensions/qa/update/simple.xml
index 6a6af12..7900397 100644
--- a/extensions/qa/update/simple.xml
+++ b/extensions/qa/update/simple.xml
@@ -1,8 +1,8 @@
 ?xml version=1.0 encoding=utf-8?
 inst:description xmlns:inst=http://update.libreoffice.org/description;
-  inst:idLibreOffice_3.4/inst:id
-  inst:version3.4.2/inst:version
-  inst:buildid102/inst:buildid
+  inst:idLibreOffice 3.5.0 Beta2/inst:id
+  inst:version3.5.0 Beta2/inst:version
+  inst:gitid123456-abcdef-1a2b3c-4d5e6f/inst:gitid
   inst:osLinux/inst:os
   inst:archx86/inst:arch
 
diff --git a/extensions/qa/update/test_update.cxx 
b/extensions/qa/update/test_update.cxx
index bed67d3..af93e66 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -121,8 +121,8 @@ protected:
 CPPUNIT_FAIL( Wrong type of the entry. );
 }
 
-// test the checkForUpdates() method
-void testCheckForUpdates()
+// test the checkForUpdates() method - update is available
+void testCheckUpdateAvailable()
 {
 UpdateInfo aInfo;
 rtl::Reference UpdateCheck  aController( UpdateCheck::get() );
@@ -131,6 +131,7 @@ protected:
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Linux ) ),
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x86 ) ),
 m_aRepositoryList,
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
11-22-33-44 ) ),
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( InstallSetID 
) ) ) )
 {
 CPPUNIT_ASSERT( aInfo.Sources.size() == 1 );
@@ -140,9 +141,29 @@ protected:
 CPPUNIT_FAIL( Calling checkForUpdates() failed. );
 }
 
+// test the checkForUpdates() method - we are up-to-date
+void testCheckUpToDate()
+{
+UpdateInfo aInfo;
+rtl::Reference UpdateCheck  aController( UpdateCheck::get() );
+
+if ( checkForUpdates( aInfo, m_xContext, 
aController-getInteractionHandler(), m_xProvider,
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Linux ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x86 ) ),
+m_aRepositoryList,
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
123456-abcdef-1a2b3c-4d5e6f ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( InstallSetID 
) ) ) )
+{
+CPPUNIT_ASSERT( aInfo.Sources.size() == 0 );
+}
+else
+CPPUNIT_FAIL( Calling checkForUpdates() failed. );
+}
+
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testGetUpdateInformationEnumeration);
-CPPUNIT_TEST(testCheckForUpdates);
+CPPUNIT_TEST(testCheckUpdateAvailable);
+CPPUNIT_TEST(testCheckUpToDate);
 CPPUNIT_TEST_SUITE_END();
 
 private:
diff --git a/extensions/source/update/check/updateprotocol.cxx 
b/extensions/source/update/check/updateprotocol.cxx
index b0a20ab..2e9ec20 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -59,8 +59,14 @@ namespace xml = css::xml ;
 static bool
 getBootstrapData(
 uno::Sequence ::rtl::OUString   rRepositoryList,
+::rtl::OUString  rGitID,
 ::rtl::OUString  rInstallSetID)
 {
+rGitID = UNISTRING( ${$BRAND_BASE_DIR/program/ SAL_CONFIGFILE(version) 
:buildid} );
+rtl::Bootstrap::expandMacros( rGitID );
+if ( rGitID.isEmpty() )
+return false;
+
 rInstallSetID = UNISTRING( ${$BRAND_BASE_DIR/program/ 
SAL_CONFIGFILE(version) :UpdateID} );
 rtl::Bootstrap::expandMacros( rInstallSetID );
 if ( ! rInstallSetID.getLength() )
@@ -97,14 +103,15 @@ checkForUpdates(
 rtl::Bootstrap::get(UNISTRING(_ARCH), myArch);
 
 uno::Sequence ::rtl::OUString  aRepositoryList;
+::rtl::OUString aGitID;
 ::rtl::OUString aInstallSetID;
 
-if( ! ( getBootstrapData(aRepositoryList, aInstallSetID)  
(aRepositoryList.getLength()  0) ) )
+if( ! ( getBootstrapData(aRepositoryList, aGitID, aInstallSetID)  
(aRepositoryList.getLength()  0) ) )
 return false;
 
 return checkForUpdates( o_rUpdateInfo, rxContext, rxInteractionHandler, 
rUpdateInfoProvider,
 myOS, myArch,
-aRepositoryList, aInstallSetID );
+aRepositoryList, aGitID, aInstallSetID );
 }

[Libreoffice-commits] .: sw/source

2012-01-04 Thread Cédric Bosdonnat 
 sw/source/core/crsr/crsrsh.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit fef489ad0f1f14bd9f018552c47a93a80e8b353d
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Wed Jan 4 20:42:17 2012 +0100

Header/Footer: switch cursor between header and footer using the cursor

This fixes commit cce76e658af88813e17dea4f04388a29d7e582df.

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 0d1efa3..049a867 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1317,6 +1317,21 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, 
sal_Bool bIdleEnd )
 
 if ( IsInHeaderFooter() != IsHeaderFooterEdit() )
 ToggleHeaderFooterEdit();
+sal_Bool bInHeader= sal_True;
+if ( IsInHeaderFooter( bInHeader ) )
+{
+if ( IsShowHeaderFooterSeparator( Header )  !bInHeader )
+{
+SetShowHeaderFooterSeparator( Footer, true );
+SetShowHeaderFooterSeparator( Header, false );
+}
+else if ( IsShowHeaderFooterSeparator( Footer )  bInHeader )
+{
+SetShowHeaderFooterSeparator( Header, true );
+SetShowHeaderFooterSeparator( Footer, false );
+}
+}
+
 
 // #i27301#
 SwNotifyAccAboutInvalidTextSelections aInvalidateTextSelections( *this );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - extensions/Library_OOoSpotlightImporter.mk solenv/gbuild

2012-01-04 Thread Michael Stahl 
 extensions/Library_OOoSpotlightImporter.mk |4 +---
 solenv/gbuild/platform/macosx.mk   |   13 +++--
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 0dd3e081fbea5b917d4635de9b5cf15db217063c
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 4 21:29:11 2012 +0100

gbuild: macosx.mk: add gb_Library_Bundle

...and use it to build OOoSpotlightImporter.

This isn't particularly elegant, but then again, why the heck does dyld
have different dynamic library types in the first place?

diff --git a/extensions/Library_OOoSpotlightImporter.mk 
b/extensions/Library_OOoSpotlightImporter.mk
index f8a4c3c..336cf4d 100644
--- a/extensions/Library_OOoSpotlightImporter.mk
+++ b/extensions/Library_OOoSpotlightImporter.mk
@@ -28,7 +28,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Library_Library,OOoSpotlightImporter))
+$(eval $(call gb_Library_Bundle,OOoSpotlightImporter))
 
 $(eval $(call gb_Library_add_objcobjects,OOoSpotlightImporter,\
extensions/source/macosx/spotlight/GetMetadataForFile \
@@ -45,8 +45,6 @@ $(eval $(call gb_Library_add_ldflags,OOoSpotlightImporter,\
-framework Foundation \
-framework CoreServices \
 ))
-#  -bundle \
-
 
 $(eval $(call gb_Library_use_external,OOoSpotlightImporter,zlib))
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 114dd16..7b2517b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -187,6 +187,7 @@ $(call gb_Helper_abbreviate_dirs,\
DYLIB_FILE=`$(gb_MKTEMP)`  \
$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+   $(if $(filter 
Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(subst \d,$$,$(RPATH)) \
@@ -194,6 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call 
gb_Library_get_filename,$(lib  $${DYLIB_FILE}  \
$(gb_CXX) \
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+   $(if $(filter 
Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(subst \d,$$,$(RPATH)) \
@@ -214,7 +216,7 @@ $(call gb_Helper_abbreviate_dirs,\
 $(if $(filter Executable,$(TARGETTYPE)), \
 $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \
 $(LAYER) $(1) ) \
-   $(if $(filter Library CppunitTest,$(TARGETTYPE)),\
+   $(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library 
$(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1))  \
ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) ) \
rm -f $${DYLIB_FILE})
@@ -237,7 +239,7 @@ endef
 
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call 
gb_LinkTarget__command_dynamiclink,$(1),$(2)))
+$(if $(filter Library Bundle CppunitTest Executable,$(TARGETTYPE)),$(call 
gb_LinkTarget__command_dynamiclink,$(1),$(2)))
 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call 
gb_LinkTarget__command_staticlink,$(1)))
 endef
 
@@ -246,6 +248,7 @@ endef
 
 gb_Library_DEFS :=
 gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
+gb_Bundle_TARGETTYPEFLAGS := -bundle
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .dylib
@@ -305,6 +308,12 @@ endef
 
 gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
 
+# bundle is a special kind of library that exists only on Darwin/OSX
+# set the TARGETTYPE to Bundle
+define gb_Library_Bundle
+$(call gb_Library_Library,$(1))
+$(call gb_LinkTarget_set_targettype,$(call 
gb_Library_get_linktargetname,$(1)),Bundle)
+endef
 
 # StaticLibrary class
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-01-04 Thread Cédric Bosdonnat 
 sw/source/ui/docvw/PageBreakWin.cxx |   16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit a0fa723ed5761609d2c31061fdd0282a2f1df6e7
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jan 4 21:54:05 2012 +0100

Page Break: fixed position of tab in RTL and added dirty hack for freezes

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index aa1085c..b16e51f 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -142,8 +142,11 @@ namespace
 m_pWin-Fade( true );
 }
 
-Point* pPtr = new Point( rMEvt.GetPosPixel() );
-m_pWin-UpdatePosition( pPtr );
+if ( !rMEvt.IsSynthetic() )
+{
+Point* pPtr = new Point( rMEvt.GetPosPixel() );
+m_pWin-UpdatePosition( pPtr );
+}
 }
 
 void SwBreakDashedLine::MouseButtonDown( const MouseEvent rMEvt )
@@ -450,7 +453,14 @@ void SwPageBreakWin::UpdatePosition( const Point* pEvtPt )
 if ( m_pMousePt )
 {
 nBtnLeft = nLineLeft + m_pMousePt-X();
-if ( ( nBtnLeft + aBtnSize.getWidth() )  nLineRight )
+
+if ( Application::GetSettings().GetLayoutRTL() )
+{
+nBtnLeft -= aBtnSize.getWidth();
+if ( nBtnLeft  nLineLeft )
+nBtnLeft = nLineLeft;
+}
+else if ( ( nBtnLeft + aBtnSize.getWidth() )  nLineRight )
 nBtnLeft = nLineRight - aBtnSize.getWidth();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/source svx/source

2012-01-04 Thread Matus Kukan 
 framework/source/uielement/controlmenucontroller.cxx |4 ++--
 svx/source/form/fmshimp.cxx  |   12 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 5f2355014375adb66dd8e986068abc8429e0ad0d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Jan 4 21:58:46 2012 +0100

make these variables static

diff --git a/framework/source/uielement/controlmenucontroller.cxx 
b/framework/source/uielement/controlmenucontroller.cxx
index a946858..1f5e64e 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -115,7 +115,7 @@
 #define SID_FM_IMAGEBUTTON  (SID_FMSLOTS_START + 12)
 #define SID_FM_FILECONTROL  (SID_FMSLOTS_START + 13)
 
-sal_Int16 nConvertSlots[] =
+static sal_Int16 nConvertSlots[] =
 {
 SID_FM_CONVERTTO_EDIT,
 SID_FM_CONVERTTO_BUTTON,
@@ -139,7 +139,7 @@ sal_Int16 nConvertSlots[] =
 SID_FM_CONVERTTO_SPINBUTTON
 };
 
-sal_Int16 nCreateSlots[] =
+static sal_Int16 nCreateSlots[] =
 {
 SID_FM_EDIT,
 SID_FM_PUSHBUTTON,
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e261c21..04751bb 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -117,7 +117,7 @@
 #include vector
 
 // wird fuer Invalidate verwendet - mitpflegen
-sal_uInt16 DatabaseSlotMap[] =
+static sal_uInt16 DatabaseSlotMap[] =
 {
 SID_FM_RECORD_FIRST,
 SID_FM_RECORD_NEXT,
@@ -145,7 +145,7 @@ sal_uInt16 DatabaseSlotMap[] =
 
 // wird fuer Invalidate verwendet - mitpflegen
 // aufsteigend sortieren !!
-sal_Int16 DlgSlotMap[] =// slots des Controllers
+static sal_Int16 DlgSlotMap[] =// slots des Controllers
 {
 SID_FM_CTL_PROPERTIES,
 SID_FM_PROPERTIES,
@@ -161,7 +161,7 @@ sal_Int16 DlgSlotMap[] =// slots des Controllers
 0
 };
 
-sal_Int16 SelObjectSlotMap[] =  // vom SelObject abhaengige Slots
+static sal_Int16 SelObjectSlotMap[] =  // vom SelObject abhaengige Slots
 {
 SID_FM_CONVERTTO_EDIT,
 SID_FM_CONVERTTO_BUTTON,
@@ -192,7 +192,7 @@ sal_Int16 SelObjectSlotMap[] =  // vom SelObject abhaengige 
Slots
 
 // die folgenden Arrays muessen kosistent sein, also einander entsprechende 
Eintraege an der selben relativen Position
 // innerhalb ihres jeweiligen Arrays stehen
-sal_Int16 nConvertSlots[] =
+static sal_Int16 nConvertSlots[] =
 {
 SID_FM_CONVERTTO_EDIT,
 SID_FM_CONVERTTO_BUTTON,
@@ -216,7 +216,7 @@ sal_Int16 nConvertSlots[] =
 SID_FM_CONVERTTO_NAVIGATIONBAR
 };
 
-sal_Int16 nCreateSlots[] =
+static sal_Int16 nCreateSlots[] =
 {
 SID_FM_EDIT,
 SID_FM_PUSHBUTTON,
@@ -240,7 +240,7 @@ sal_Int16 nCreateSlots[] =
 SID_FM_NAVIGATIONBAR
 };
 
-sal_Int16 nObjectTypes[] =
+static sal_Int16 nObjectTypes[] =
 {
 OBJ_FM_EDIT,
 OBJ_FM_BUTTON,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sax/prj

2012-01-04 Thread Matus Kukan 
 sax/prj/build.lst |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 4572e00ec358f507e64cbab9d9f3430ea6f97d51
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Jan 4 23:06:57 2012 +0100

sax: this had to be accidentally added when merging

diff --git a/sax/prj/build.lst b/sax/prj/build.lst
index 940ef70..34e520f 100644
--- a/sax/prj/build.lst
+++ b/sax/prj/build.lst
@@ -1,4 +1,2 @@
 ax sax :   offapi cppuhelper EXPAT:expat comphelper 
LIBXSLT:libxslt NULL
 ax sax\prj 
nmake   -   all ax_prj NULL
-
-ax  sax\test   nmake   -   
all ax_test NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: nss/makefile.mk

2012-01-04 Thread Christian Lohmaier 
 nss/makefile.mk |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 39042cce6685fc9db5ee20957bcc7ac584c28554
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Jan 4 23:36:45 2012 +0100

compile nss against the Mac OSX SDK

nss-3.12.8/mozilla/security/coreconf/Darwin.mk claims gcc would pass
syslibroot according to passed -isysroot parameter, hence let's try it
for now, although I'm not 100% confident in this statement.
libs that get linked without syslibroot include libsqlite3.dylib - and
that is a known troublemaker…

diff --git a/nss/makefile.mk b/nss/makefile.mk
index dbb5f07..93cd3d7 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -82,13 +82,8 @@ USE_64:=1
 .ENDIF  # $(OS)$(COM)==LINUXGCC
 
 .IF $(OS)==MACOSX
-.IF $(EXTRA_CFLAGS)!=
-CPP:=gcc -E $(EXTRA_CFLAGS)
-CXX:=g++ $(EXTRA_CFLAGS)
-CC:=gcc $(EXTRA_CFLAGS)
-MACOS_SDK_DIR*=$(MACDEVSDK)
-.EXPORT : CPP MACOS_SDK_DIR
-.ENDIF # $(EXTRA_CFLAGS)!=
+MACOS_SDK_DIR:=$(MACOSX_SDK_PATH)
+.EXPORT : MACOS_SDK_DIR
 .ENDIF # $(OS)==MACOSX
 
 OUT2LIB=mozilla/dist/out/lib/*$(DLLPOST) mozilla/dist/out/lib/libcrmf.a
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - offapi/com offapi/UnoApi_offapi.mk oox/source sc/inc sc/source

2012-01-04 Thread Kohei Yoshida 
 offapi/UnoApi_offapi.mk|1 
 offapi/com/sun/star/chart2/data/XSheetDataProvider.idl |   52 ++
 oox/source/xls/excelchartconverter.cxx |   67 +---
 sc/inc/chart2uno.hxx   |   18 +-
 sc/source/ui/unoobj/chart2uno.cxx  |  131 +
 5 files changed, 239 insertions(+), 30 deletions(-)

New commits:
commit a2fa83d1844fde5e1a14ba813ca1087577a1434f
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 4 15:45:09 2012 -0500

Register chart data ranges via tokens rather than string.

Doing it this way avoids having to re-generate the data ranges in
Calc A1 before passing it to the chart backend in Calc.  We need this
in order to remove the silly restriction that forces us to always pass
data range strings in Calc A1 format, which is error-prone.

This is also necessary in order to fix the bug that prevents editing
data ranges of an existing chart when the formula syntax is something
other than Calc A1.

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 0391056..e44bf23 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1985,6 +1985,7 @@ $(eval $(call 
gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2/dat
XNumericalDataSequence \
XRangeHighlighter \
XRangeXMLConversion \
+   XSheetDataProvider \
XTextualDataSequence \
 ))
 $(eval $(call 
gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configuration,\
diff --git a/offapi/com/sun/star/chart2/data/XSheetDataProvider.idl 
b/offapi/com/sun/star/chart2/data/XSheetDataProvider.idl
new file mode 100644
index 000..db443c9
--- /dev/null
+++ b/offapi/com/sun/star/chart2/data/XSheetDataProvider.idl
@@ -0,0 +1,52 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ *   Copyright (C) 2012 Kohei Yoshida kohei.yosh...@suse.com
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef com_sun_star_chart2_data_XSheetDataProvider_idl
+#define com_sun_star_chart2_data_XSheetDataProvider_idl
+
+#include com/sun/star/uno/XInterface.idl
+#include com/sun/star/chart2/data/XDataSequence.idl
+#include com/sun/star/sheet/FormulaToken.idl
+
+module com { module sun { module star { module chart2 { module data {
+
+/**
+ * Interface specific to spreadsheet data provider backend.
+ */
+interface XSheetDataProvider : com::sun::star::uno::XInterface
+{
+boolean createDataSequenceByFormulaTokensPossible(
+[in] sequence com::sun::star::sheet::FormulaToken  aTokens );
+
+XDataSequence createDataSequenceByFormulaTokens(
+[in] sequence com::sun::star::sheet::FormulaToken  aTokens )
+raises( com::sun::star::lang::IllegalArgumentException );
+};
+
+};};};};};
+
+#endif
diff --git a/oox/source/xls/excelchartconverter.cxx 
b/oox/source/xls/excelchartconverter.cxx
index 5c63ee5..2fb699d 100644
--- a/oox/source/xls/excelchartconverter.cxx
+++ b/oox/source/xls/excelchartconverter.cxx
@@ -31,6 +31,8 @@
 #include com/sun/star/lang/XMultiServiceFactory.hpp
 #include com/sun/star/chart2/data/XDataProvider.hpp
 #include com/sun/star/chart2/data/XDataReceiver.hpp
+#include com/sun/star/chart2/data/XSheetDataProvider.hpp
+
 #include oox/core/filterbase.hxx
 #include oox/drawingml/chart/datasourcemodel.hxx
 #include oox/helper/containerhelper.hxx
@@ -79,42 +81,53 @@ Reference XDataSequence  
ExcelChartConverter::createDataSequence(
 const Reference XDataProvider  rxDataProvider, const 
DataSequenceModel rDataSeq )
 {
 Reference XDataSequence  xDataSeq;
-if( rxDataProvider.is() )
+if (!rxDataProvider.is())
+return xDataSeq;
+
+ReferenceXSheetDataProvider xSheetProvider(rxDataProvider, UNO_QUERY);
+if (!xSheetProvider.is())
+return xDataSeq;
+
+if (!rDataSeq.maFormula.isEmpty())
 {
-OUString aRangeRep;
-if( rDataSeq.maFormula.getLength()  0 )
-{
-// parse the formula string, create a token sequence
-

[Libreoffice-commits] .: offapi/com offapi/UnoApi_offapi.mk oox/source sc/inc sc/source

2012-01-04 Thread Kohei Yoshida 
 offapi/UnoApi_offapi.mk|1 
 offapi/com/sun/star/chart2/data/XSheetDataProvider.idl |   52 ++
 oox/source/xls/excelchartconverter.cxx |   67 +---
 sc/inc/chart2uno.hxx   |   18 +-
 sc/source/ui/unoobj/chart2uno.cxx  |  131 +
 5 files changed, 239 insertions(+), 30 deletions(-)

New commits:
commit 578292d707077c18079de050c928afaae268a25d
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Jan 4 15:45:09 2012 -0500

Register chart data ranges via tokens rather than string.

Doing it this way avoids having to re-generate the data ranges in
Calc A1 before passing it to the chart backend in Calc.  We need this
in order to remove the silly restriction that forces us to always pass
data range strings in Calc A1 format, which is error-prone.

This is also necessary in order to fix the bug that prevents editing
data ranges of an existing chart when the formula syntax is something
other than Calc A1.

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index e83b667..b6c4bd4 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1983,6 +1983,7 @@ $(eval $(call 
gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2/dat
XNumericalDataSequence \
XRangeHighlighter \
XRangeXMLConversion \
+   XSheetDataProvider \
XTextualDataSequence \
 ))
 $(eval $(call 
gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configuration,\
diff --git a/offapi/com/sun/star/chart2/data/XSheetDataProvider.idl 
b/offapi/com/sun/star/chart2/data/XSheetDataProvider.idl
new file mode 100644
index 000..db443c9
--- /dev/null
+++ b/offapi/com/sun/star/chart2/data/XSheetDataProvider.idl
@@ -0,0 +1,52 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ *   Copyright (C) 2012 Kohei Yoshida kohei.yosh...@suse.com
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef com_sun_star_chart2_data_XSheetDataProvider_idl
+#define com_sun_star_chart2_data_XSheetDataProvider_idl
+
+#include com/sun/star/uno/XInterface.idl
+#include com/sun/star/chart2/data/XDataSequence.idl
+#include com/sun/star/sheet/FormulaToken.idl
+
+module com { module sun { module star { module chart2 { module data {
+
+/**
+ * Interface specific to spreadsheet data provider backend.
+ */
+interface XSheetDataProvider : com::sun::star::uno::XInterface
+{
+boolean createDataSequenceByFormulaTokensPossible(
+[in] sequence com::sun::star::sheet::FormulaToken  aTokens );
+
+XDataSequence createDataSequenceByFormulaTokens(
+[in] sequence com::sun::star::sheet::FormulaToken  aTokens )
+raises( com::sun::star::lang::IllegalArgumentException );
+};
+
+};};};};};
+
+#endif
diff --git a/oox/source/xls/excelchartconverter.cxx 
b/oox/source/xls/excelchartconverter.cxx
index da938ea..2fb699d 100644
--- a/oox/source/xls/excelchartconverter.cxx
+++ b/oox/source/xls/excelchartconverter.cxx
@@ -31,6 +31,8 @@
 #include com/sun/star/lang/XMultiServiceFactory.hpp
 #include com/sun/star/chart2/data/XDataProvider.hpp
 #include com/sun/star/chart2/data/XDataReceiver.hpp
+#include com/sun/star/chart2/data/XSheetDataProvider.hpp
+
 #include oox/core/filterbase.hxx
 #include oox/drawingml/chart/datasourcemodel.hxx
 #include oox/helper/containerhelper.hxx
@@ -79,42 +81,53 @@ Reference XDataSequence  
ExcelChartConverter::createDataSequence(
 const Reference XDataProvider  rxDataProvider, const 
DataSequenceModel rDataSeq )
 {
 Reference XDataSequence  xDataSeq;
-if( rxDataProvider.is() )
+if (!rxDataProvider.is())
+return xDataSeq;
+
+ReferenceXSheetDataProvider xSheetProvider(rxDataProvider, UNO_QUERY);
+if (!xSheetProvider.is())
+return xDataSeq;
+
+if (!rDataSeq.maFormula.isEmpty())
 {
-OUString aRangeRep;
-if( !rDataSeq.maFormula.isEmpty() )
-{
-// parse the formula string, create a token sequence
-

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

2012-01-04 Thread Kohei Yoshida 
 sc/source/core/data/documen5.cxx  |4 ++--
 sc/source/core/tool/charthelper.cxx   |2 --
 sc/source/core/tool/rangeutl.cxx  |   13 +++--
 sc/source/filter/excel/xichart.cxx|2 +-
 sc/source/filter/xml/XMLTableShapeResizer.cxx |4 ++--
 sc/source/ui/unoobj/chart2uno.cxx |   10 ++
 6 files changed, 14 insertions(+), 21 deletions(-)

New commits:
commit 0c47ce165d56c13abea1e78f4feeed6c3dd3f59b
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Thu Jan 5 00:25:40 2012 -0500

Removed the restriction to always pass Calc A1 formatted data ranges.

This change also fixes the bug where changing data series ranges was
impossible to do when the formula syntax was not Calc A1.

diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 4a1c2b4..f19a067 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -297,8 +297,8 @@ void ScDocument::SetChartRanges( const rtl::OUString 
rChartName, const ::std::v
 for( sal_Int32 nN=0; nNnCount; nN++ )
 {
 ScRangeList aScRangeList( rRangesVector[nN] );
-rtl::OUString sRangeStr; // This range must be in Calc A1 format.
-aScRangeList.Format( sRangeStr, SCR_ABS_3D, this );
+rtl::OUString sRangeStr;
+aScRangeList.Format( sRangeStr, SCR_ABS_3D, this, 
GetAddressConvention() );
 aRangeStrings[nN]=sRangeStr;
 }
 ScChartHelper::SetChartRanges( xChartDoc, aRangeStrings );
diff --git a/sc/source/core/tool/charthelper.cxx 
b/sc/source/core/tool/charthelper.cxx
index e1f0500..6cd84f1 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -248,7 +248,6 @@ void ScChartHelper::SetChartRanges( const uno::Reference 
chart2::XChartDocument
 
 if( xLabel.is())
 {
-// the range string must be in Calc A1 format.
 uno::Reference chart2::data::XDataSequence  xNewSeq(
 xDataProvider-createDataSequenceByRangeRepresentation( 
rRanges[nRange++] ));
 
@@ -264,7 +263,6 @@ void ScChartHelper::SetChartRanges( const uno::Reference 
chart2::XChartDocument
 
 if( xValues.is())
 {
-// the range string must be in Calc A1 format.
 uno::Reference chart2::data::XDataSequence  xNewSeq(
 xDataProvider-createDataSequenceByRangeRepresentation( 
rRanges[nRange++] ));
 
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 5e1db5d..572ff17 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -834,13 +834,13 @@ static void lcl_appendCellAddress(
 rBuf.append(sal_Unicode('.'));
 
 String aAddr;
-rCell.Format(aAddr, SCA_ABS, NULL, 
::formula::FormulaGrammar::CONV_OOO);
+rCell.Format(aAddr, SCA_ABS, NULL, pDoc-GetAddressConvention());
 rBuf.append(aAddr);
 }
 else
 {
 String aAddr;
-rCell.Format(aAddr, SCA_ABS_3D, pDoc, 
::formula::FormulaGrammar::CONV_OOO);
+rCell.Format(aAddr, SCA_ABS_3D, pDoc, pDoc-GetAddressConvention());
 rBuf.append(aAddr);
 }
 }
@@ -869,7 +869,7 @@ static void lcl_appendCellRangeAddress(
 rBuf.append(sal_Unicode('.'));
 
 String aAddr;
-rCell1.Format(aAddr, SCA_ABS, NULL, 
::formula::FormulaGrammar::CONV_OOO);
+rCell1.Format(aAddr, SCA_ABS, NULL, pDoc-GetAddressConvention());
 rBuf.append(aAddr);
 
 rBuf.appendAscii(:);
@@ -881,7 +881,7 @@ static void lcl_appendCellRangeAddress(
 rBuf.append(sal_Unicode('.'));
 }
 
-rCell2.Format(aAddr, SCA_ABS, NULL, 
::formula::FormulaGrammar::CONV_OOO);
+rCell2.Format(aAddr, SCA_ABS, NULL, pDoc-GetAddressConvention());
 rBuf.append(aAddr);
 }
 else
@@ -890,7 +890,7 @@ static void lcl_appendCellRangeAddress(
 aRange.aStart = rCell1;
 aRange.aEnd   = rCell2;
 String aAddr;
-aRange.Format(aAddr, SCR_ABS_3D, pDoc, 
::formula::FormulaGrammar::CONV_OOO);
+aRange.Format(aAddr, SCR_ABS_3D, pDoc, pDoc-GetAddressConvention());
 rBuf.append(aAddr);
 }
 }
@@ -898,7 +898,8 @@ static void lcl_appendCellRangeAddress(
 void ScRangeStringConverter::GetStringFromXMLRangeString( OUString rString, 
const OUString rXMLRange, ScDocument* pDoc )
 {
 FormulaGrammar::AddressConvention eConv = pDoc-GetAddressConvention();
-const sal_Unicode cSep = ' ', cSepNew = ';';
+const sal_Unicode cSep = ' ';
+const sal_Unicode cSepNew = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
 const sal_Unicode cQuote = '\'';
 
 OUStringBuffer aRetStr;
diff --git a/sc/source/filter/excel/xichart.cxx 
b/sc/source/filter/excel/xichart.cxx
index 5ae9215..8cf884d 100644
--- a/sc/source/filter/excel/xichart.cxx
+++

[Libreoffice-commits] .: sc/source

2012-01-04 Thread Kohei Yoshida 
 sc/source/core/data/documen5.cxx  |4 ++--
 sc/source/core/tool/charthelper.cxx   |2 --
 sc/source/core/tool/rangeutl.cxx  |   13 +++--
 sc/source/filter/excel/xichart.cxx|2 +-
 sc/source/filter/xml/XMLTableShapeResizer.cxx |4 ++--
 sc/source/ui/unoobj/chart2uno.cxx |   10 ++
 6 files changed, 14 insertions(+), 21 deletions(-)

New commits:
commit a1d605a6b8772426229941449c23d68ea91aa81a
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Thu Jan 5 00:25:40 2012 -0500

Removed the restriction to always pass Calc A1 formatted data ranges.

This change also fixes the bug where changing data series ranges was
impossible to do when the formula syntax was not Calc A1.

diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 4a1c2b4..f19a067 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -297,8 +297,8 @@ void ScDocument::SetChartRanges( const rtl::OUString 
rChartName, const ::std::v
 for( sal_Int32 nN=0; nNnCount; nN++ )
 {
 ScRangeList aScRangeList( rRangesVector[nN] );
-rtl::OUString sRangeStr; // This range must be in Calc A1 format.
-aScRangeList.Format( sRangeStr, SCR_ABS_3D, this );
+rtl::OUString sRangeStr;
+aScRangeList.Format( sRangeStr, SCR_ABS_3D, this, 
GetAddressConvention() );
 aRangeStrings[nN]=sRangeStr;
 }
 ScChartHelper::SetChartRanges( xChartDoc, aRangeStrings );
diff --git a/sc/source/core/tool/charthelper.cxx 
b/sc/source/core/tool/charthelper.cxx
index e1f0500..6cd84f1 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -248,7 +248,6 @@ void ScChartHelper::SetChartRanges( const uno::Reference 
chart2::XChartDocument
 
 if( xLabel.is())
 {
-// the range string must be in Calc A1 format.
 uno::Reference chart2::data::XDataSequence  xNewSeq(
 xDataProvider-createDataSequenceByRangeRepresentation( 
rRanges[nRange++] ));
 
@@ -264,7 +263,6 @@ void ScChartHelper::SetChartRanges( const uno::Reference 
chart2::XChartDocument
 
 if( xValues.is())
 {
-// the range string must be in Calc A1 format.
 uno::Reference chart2::data::XDataSequence  xNewSeq(
 xDataProvider-createDataSequenceByRangeRepresentation( 
rRanges[nRange++] ));
 
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 5e1db5d..572ff17 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -834,13 +834,13 @@ static void lcl_appendCellAddress(
 rBuf.append(sal_Unicode('.'));
 
 String aAddr;
-rCell.Format(aAddr, SCA_ABS, NULL, 
::formula::FormulaGrammar::CONV_OOO);
+rCell.Format(aAddr, SCA_ABS, NULL, pDoc-GetAddressConvention());
 rBuf.append(aAddr);
 }
 else
 {
 String aAddr;
-rCell.Format(aAddr, SCA_ABS_3D, pDoc, 
::formula::FormulaGrammar::CONV_OOO);
+rCell.Format(aAddr, SCA_ABS_3D, pDoc, pDoc-GetAddressConvention());
 rBuf.append(aAddr);
 }
 }
@@ -869,7 +869,7 @@ static void lcl_appendCellRangeAddress(
 rBuf.append(sal_Unicode('.'));
 
 String aAddr;
-rCell1.Format(aAddr, SCA_ABS, NULL, 
::formula::FormulaGrammar::CONV_OOO);
+rCell1.Format(aAddr, SCA_ABS, NULL, pDoc-GetAddressConvention());
 rBuf.append(aAddr);
 
 rBuf.appendAscii(:);
@@ -881,7 +881,7 @@ static void lcl_appendCellRangeAddress(
 rBuf.append(sal_Unicode('.'));
 }
 
-rCell2.Format(aAddr, SCA_ABS, NULL, 
::formula::FormulaGrammar::CONV_OOO);
+rCell2.Format(aAddr, SCA_ABS, NULL, pDoc-GetAddressConvention());
 rBuf.append(aAddr);
 }
 else
@@ -890,7 +890,7 @@ static void lcl_appendCellRangeAddress(
 aRange.aStart = rCell1;
 aRange.aEnd   = rCell2;
 String aAddr;
-aRange.Format(aAddr, SCR_ABS_3D, pDoc, 
::formula::FormulaGrammar::CONV_OOO);
+aRange.Format(aAddr, SCR_ABS_3D, pDoc, pDoc-GetAddressConvention());
 rBuf.append(aAddr);
 }
 }
@@ -898,7 +898,8 @@ static void lcl_appendCellRangeAddress(
 void ScRangeStringConverter::GetStringFromXMLRangeString( OUString rString, 
const OUString rXMLRange, ScDocument* pDoc )
 {
 FormulaGrammar::AddressConvention eConv = pDoc-GetAddressConvention();
-const sal_Unicode cSep = ' ', cSepNew = ';';
+const sal_Unicode cSep = ' ';
+const sal_Unicode cSepNew = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
 const sal_Unicode cQuote = '\'';
 
 OUStringBuffer aRetStr;
diff --git a/sc/source/filter/excel/xichart.cxx 
b/sc/source/filter/excel/xichart.cxx
index 5ae9215..8cf884d 100644
--- a/sc/source/filter/excel/xichart.cxx
+++