[Libreoffice-commits] .: solenv/gbuild

2011-10-10 Thread Bjoern Michaelsen 
 solenv/gbuild/CustomTarget.mk |4 ++--
 solenv/gbuild/LinkTarget.mk   |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 04e1536d4e77242a47afa5c573add7ab619e6762
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Oct 10 11:13:07 2011 +0200

fixing error handling for generated files again

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 19279a4..20cd29a 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -59,8 +59,8 @@ $(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\
 gb_CustomTarget_REPO_$(1) := $(2)
 $(call gb_CustomTarget_get_target,$(1)) : \
   $(call gb_CustomTarget__get_makefile,$($(2)),$(1))
-$(call gb_CustomTarget_get_workdir,$(1))/% : \
-  $(call gb_CustomTarget_get_target,$(1))
+$(call gb_CustomTarget_get_workdir,$(1))/% : $(call 
gb_CustomTarget_get_target,$(1))
+   test -f $@ || (echo Missing file $@ which should have been generated 
from CustomTarget $(1), but was not.  false)
 endef
 
 
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index dea4aaa..49dd076 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -197,7 +197,7 @@ gb_GenCObject_get_source = $(WORKDIR)/$(1).c
 #  gb_CObject__command
 
 $(call gb_GenCObject_get_target,%) : $(call gb_GenCObject_get_source,%)
-   $(if $(wildcard $),,$(eval $(call gb_Output_error,No such source file 
$)))
+   test -f $ || (echo Missing generated source file $  false)
$(call gb_CObject__command,$@,$*,$,$(call 
gb_GenCObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -216,7 +216,7 @@ gb_GenCxxObject_get_source = $(WORKDIR)/$(1).cxx
 #  gb_CxxObject__command
 
 $(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%)
-   $(if $(wildcard $),,$(eval $(call gb_Output_error,No such source file 
$)))
+   test -f $ || (echo Missing generated source file $  false)
$(call gb_CxxObject__command,$@,$*,$,$(call 
gb_GenCxxObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 11 commits - extensions/source sc/source sd/source sw/source

2011-10-10 Thread Tor Lillqvist 
 extensions/source/bibliography/datman.cxx |2 +-
 extensions/source/nsplugin/source/so_main.cxx |2 ++
 extensions/source/ole/oleobjw.cxx |3 +--
 extensions/source/ole/oleobjw.hxx |   15 ---
 sc/source/filter/excel/xeescher.cxx   |2 --
 sc/source/ui/vba/vbaapplication.cxx   |2 --
 sd/source/core/drawdoc.cxx|2 +-
 sd/source/filter/eppt/epptbase.hxx|2 +-
 sd/source/filter/eppt/text.hxx|4 ++--
 sw/source/core/crsr/crsrsh.cxx|2 +-
 10 files changed, 13 insertions(+), 23 deletions(-)

New commits:
commit a62e3205030d17a402255c9a84d0f484c18d25a9
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Oct 10 12:47:30 2011 +0300

WaE: unsafe mix of type 'bool' and type 'sal_Bool' in operation

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 8a8cd4e..f402e02 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -679,7 +679,7 @@ int SwCrsrShell::SetCrsr( const Point rLPt, sal_Bool 
bOnlyText, bool bBlock )
 
 // Toggle the Header/Footer mode if needed
 bool bInHeaderFooter = pFrm  ( pFrm-IsHeaderFrm() || 
pFrm-IsFooterFrm() );
-if ( bInHeaderFooter ^ IsHeaderFooterEdit() )
+if ( bInHeaderFooter ^ (bool) IsHeaderFooterEdit() )
 ToggleHeaderFooterEdit();
 
 if( pBlockCrsr  bBlock )
commit 2a0a3a15b985258f678c97890527216fdda8eead
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Oct 10 12:46:39 2011 +0300

WaE: inconsistent dll linkage

diff --git a/sc/source/ui/vba/vbaapplication.cxx 
b/sc/source/ui/vba/vbaapplication.cxx
index 371c70b..d1102b7 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -137,8 +137,6 @@ using ::rtl::OUString;
 #define FILE_PATH_SEPERATOR \\
 #endif
 
-uno::Any sbxToUnoValue( SbxVariable* pVar );
-
 class ActiveWorkbook : public ScVbaWorkbook
 {
 protected:
commit 76fd28341d36b55af448be2703a405d5095bafbd
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Oct 10 12:45:10 2011 +0300

WaE: unreachable code

diff --git a/sc/source/filter/excel/xeescher.cxx 
b/sc/source/filter/excel/xeescher.cxx
index e466614..2a290c3 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -136,7 +136,6 @@ static const char *ToHorizAlign( SdrTextHorzAdjust eAdjust )
 default:
 return left;
 }
-return unknown;
 }
 
 static const char *ToVertAlign( SdrTextVertAdjust eAdjust )
@@ -153,7 +152,6 @@ static const char *ToVertAlign( SdrTextVertAdjust eAdjust )
 default:
 return top;
 }
-return unknown;
 }
 
 static void lcl_WriteAnchorVertex( sax_fastparser::FSHelperPtr rComments, 
Rectangle aRect )
commit b76d47d9ad25fd5c6bc1c4499d000a2ea85079a3
Author: Noel Power noel.po...@novell.com
Date:   Mon Oct 10 12:43:19 2011 +0300

So just drop the duplicate XInvocation base class then

diff --git a/extensions/source/ole/oleobjw.cxx 
b/extensions/source/ole/oleobjw.cxx
index 1820fdd..275c6a8 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -166,7 +166,7 @@ Any IUnknownWrapper_Impl::queryInterface(const Type t)
 // properties. Note: Currently the basic runtime doesn't call put 
properties directly, it should... after all the basic runtime should know 
whether it is calling a put or get property.
 // For the moment for ease of merging we will let the XDirectInvoke and 
XAuthomationInvocation interfaces stay side by side ( and for the momemnt at 
least I would prefer the basic
 // runtime to call XAutomationInvocation instead of XDirectInvoke
-return WeakImplHelper8XInvocation, XBridgeSupplier2,
+return WeakImplHelper7XBridgeSupplier2,
 XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, 
XDirectInvocation, XAutomationInvocation ::queryInterface(t);
 }
 
diff --git a/extensions/source/ole/oleobjw.hxx 
b/extensions/source/ole/oleobjw.hxx
index 5e7769a..bbbf08d 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -41,15 +41,9 @@
 #include boost/unordered_map.hpp
 #include tools/postsys.h
 
-#ifdef _MSC_VER
-#pragma warning (push,1)
-// warning C4584: 
'cppu::WeakImplHelper8Ifc1,Ifc2,Ifc3,Ifc4,Ifc5,Ifc6,Ifc7,Ifc8' : base-class 
'com::sun::star::script::XInvocation' is already a base-class of 
'com::sun::star::script::XAutomationInvocation'
-#pragma warning (disable:4584)
-#endif
-
 #include cppuhelper/implbase3.hxx
 #include cppuhelper/implbase4.hxx
-#include cppuhelper/implbase8.hxx
+#include cppuhelper/implbase7.hxx
 
 #include com/sun/star/lang/XInitialization.hpp
 #include com/sun/star/bridge/oleautomation/XAutomationObject.hpp
@@ -82,7 +76,7 @@ typedef boost::unordered_multimapOUString, unsigned int, 
hashOUString_Impl, equ
 // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls 
on the

[Libreoffice-commits] .: Branch 'feature/gtk3' - basebmp/source

2011-10-10 Thread Michael Meeks 
 basebmp/source/bitmapdevice.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 055db78e0a93cb36096002770dc4700daeef56b9
Author: Michael Meeks michael.me...@suse.com
Date:   Sat Oct 8 15:37:32 2011 +0100

basebmp: B2IRange::isEmpty is surprisingly, unhelpfully lame - workaround

diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index a483197..f7f139b 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1343,6 +1343,10 @@ namespace
 if( aLocalSourceArea.isEmpty() )
 return false;
 
+// isEmpty is not what we want I think ...
+if( aLocalSourceArea.getWidth() = 0 || aLocalSourceArea.getHeight() 
= 0 )
+return false;
+
 // calc relative new source area points (relative to orig
 // source area)
 const ::basegfx::B2IVector aUpperLeftOffset(
@@ -1359,6 +1363,10 @@ namespace
 if( aLocalDestArea.isEmpty() )
 return false;
 
+// isEmpty is not what we want I think ...
+if( aLocalDestArea.getWidth() = 0 || aLocalDestArea.getHeight() = 0 )
+return false;
+
 // calc relative new dest area points (relative to orig
 // source area)
 const ::basegfx::B2IVector aDestUpperLeftOffset(
@@ -1398,6 +1406,10 @@ namespace
 if( aLocalSourceArea.isEmpty() )
 return false;
 
+ // sadly isEmpty is not what we want I think ...
+if( aLocalSourceArea.getWidth() = 0 || aLocalSourceArea.getHeight() 
= 0 )
+return false;
+
 // calc relative new source area points (relative to orig
 // source area)
 const ::basegfx::B2IVector aUpperLeftOffset(
@@ -1416,6 +1428,10 @@ namespace
 if( aLocalDestArea.isEmpty() )
 return false;
 
+// isEmpty is not what we want I think ...
+if( aLocalDestArea.getWidth() = 0 || aLocalDestArea.getHeight() = 0 )
+return false;
+
 // calc relative new dest area points (relative to orig
 // source area)
 const ::basegfx::B2IVector aDestUpperLeftOffset(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild solenv/inc

2011-10-10 Thread Fridrich Strba 
 solenv/gbuild/platform/unxgcc.mk   |1 +
 solenv/gbuild/platform/winmingw.mk |1 +
 solenv/inc/unxgcc.mk   |3 ++-
 solenv/inc/wntgcci.mk  |1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit eb09adaa9a2accbdc3531bb96447c8e7fbb9f8a9
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Oct 10 12:52:10 2011 +0200

Warn if declaration follows statement in C-files

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 0379d7c..7ee4217 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -69,6 +69,7 @@ gb_COMPILERDEFS := \
 
 gb_CFLAGS := \
-Wall \
+   -Wdeclaration-after-statement \
-Wendif-labels \
-Wextra \
-Wshadow \
diff --git a/solenv/gbuild/platform/winmingw.mk 
b/solenv/gbuild/platform/winmingw.mk
index a1a8233..6d438ff 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -71,6 +71,7 @@ gb_RCFLAGS := \
 
 gb_CFLAGS := \
-Wall \
+   -Wdeclaration-after-statement \
-Wendif-labels \
-Wextra \
-fmessage-length=0 \
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 45f6901..2e6d66b 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -135,7 +135,8 @@ CFLAGSOUTOBJ=-o
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
 CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
--Wno-non-virtual-dtor -Woverloaded-virtual
+-Wno-non-virtual-dtor
+CFLAGSWARNCC+=-Wdeclaration-after-statement
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
 CFLAGSWERRCC=-Werror -DLIBO_WERROR
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index f62c96a..5fe8bbd 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -82,6 +82,7 @@ CDEFS+=-D_DLL
 CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
 -Wno-non-virtual-dtor
+CFLAGSWARNCC+=-Wdeclaration-after-statement
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
 CFLAGSWERRCC=-Werror -DLIBO_WERROR
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-10 Thread Cédric Bosdonnat 
 sw/source/ui/docvw/PageBreakWin.cxx |  121 
 sw/source/ui/inc/PageBreakWin.hxx   |3 
 2 files changed, 100 insertions(+), 24 deletions(-)

New commits:
commit 4c03a2497c97568c244cd14767e840d200fbc440
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Mon Oct 10 12:50:02 2011 +0200

Page Break: Fix page break deletion when changing page style

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index 8a185d6..31fe8a3 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -34,6 +34,7 @@
 #include DashedLine.hxx
 #include doc.hxx
 #include edtwin.hxx
+#include fmtpdsc.hxx
 #include IDocumentUndoRedo.hxx
 #include PageBreakWin.hxx
 #include pagefrm.hxx
@@ -308,13 +309,21 @@ void SwPageBreakWin::Select( )
 if ( pBodyFrm )
 {
 SwCntntFrm *pCnt = const_cast SwCntntFrm* ( 
pBodyFrm-ContainsCntnt() );
-sal_uInt16 nWhich = 
pCnt-GetAttrSet()-GetPool()-GetWhich( SID_ATTR_PARA_PAGEBREAK );
+//sal_uInt16 nWhich = 
pCnt-GetAttrSet()-GetPool()-GetWhich( SID_ATTR_PARA_PAGEBREAK );
 SwCntntNode* pNd = pCnt-GetNode();
 
 pNd-GetDoc()-GetIDocumentUndoRedo( ).StartUndo( 
UNDO_UI_DELETE_PAGE_BREAK, NULL );
-SvxFmtBreakItem aNoBreakItem( SVX_BREAK_NONE, nWhich );
+
+SfxItemSet aSet( 
GetEditWin()-GetView().GetWrtShell().GetAttrPool(),
+RES_PAGEDESC, RES_PAGEDESC,
+RES_BREAK, RES_BREAK,
+NULL );
+aSet.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
+aSet.Put( SwFmtPageDesc( NULL ) );
+
 SwPaM aPaM( *pNd );
-pNd-GetDoc()-InsertPoolItem( aPaM, aNoBreakItem, 
nsSetAttrMode::SETATTR_DEFAULT );
+pNd-GetDoc()-InsertItemSet( aPaM, aSet, 
nsSetAttrMode::SETATTR_DEFAULT );
+
 pNd-GetDoc()-GetIDocumentUndoRedo( ).EndUndo( 
UNDO_UI_DELETE_PAGE_BREAK, NULL );
 }
 }
commit 61ae8caa020c76f3095ec91801c460a018872fae
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Mon Oct 10 10:50:01 2011 +0200

Page Break: show the button on the right for book mode view

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index 2caa8cc..8a185d6 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -44,6 +44,7 @@
 #include wrtsh.hxx
 
 #include basegfx/color/bcolortools.hxx
+#include basegfx/matrix/b2dhommatrixtools.hxx
 #include basegfx/polygon/b2dpolygon.hxx
 #include basegfx/polygon/b2dpolygontools.hxx
 #include basegfx/range/b2drectangle.hxx
@@ -65,7 +66,7 @@ using namespace drawinglayer::primitive2d;
 
 namespace
 {
-B2DPolygon lcl_CreatePolygon( B2DRectangle aBounds )
+B2DPolygon lcl_CreatePolygon( B2DRectangle aBounds, bool bShowOnRight )
 {
 B2DPolygon aRetval;
 const double nRadius = 1;
@@ -140,6 +141,14 @@ namespace
 }
 
 aRetval.setClosed( true );
+
+if ( bShowOnRight )
+{
+B2DHomMatrix bRotMatrix = createRotateAroundPoint(
+aBounds.getCenterX(), aBounds.getCenterY(), M_PI );
+aRetval.transform( bRotMatrix );
+}
+
 return aRetval;
 }
 }
@@ -190,10 +199,12 @@ void SwPageBreakWin::Paint( const Rectangle )
 aOtherColor = rSettings.GetDialogColor( ).getBColor();
 }
 
+bool bShowOnRight = ShowOnRight( );
+
 Primitive2DSequence aSeq( 2 );
 B2DRectangle aBRect( double( aRect.Left() ), double( aRect.Top( ) ),
double( aRect.Right() ), double( aRect.Bottom( ) ) );
-B2DPolygon aPolygon = lcl_CreatePolygon( aBRect );
+B2DPolygon aPolygon = lcl_CreatePolygon( aBRect, bShowOnRight );
 
 // Create the polygon primitives
 aSeq[0] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
@@ -213,7 +224,9 @@ void SwPageBreakWin::Paint( const Rectangle )
 double nTop = double( aRect.getHeight() ) / 2.0;
 double nBottom = nTop + 4.0;
 double nLeft = aRect.getWidth( ) - ARROW_WIDTH - 6.0;
-double nRight = aRect.getWidth( ) - ARROW_WIDTH + 2.0;
+if ( bShowOnRight )
+nLeft = ARROW_WIDTH - 2.0;
+double nRight = nLeft + 8.0;
 
 B2DPolygon aTriangle;
 aTriangle.append( B2DPoint( nLeft, nTop ) );
@@ -234,7 +247,10 @@ void SwPageBreakWin::Paint( const Rectangle )
 
 // Paint the picture
 Image aImg( SW_RES( IMG_PAGE_BREAK ) );
-DrawImage( Point( 3, 1 ), aImg );
+long nImgOfstX = 3;
+if ( bShowOnRight )
+nImgOfstX = aRect.Right() - aImg.GetSizePixel().Width() - 3;
+DrawImage( Point( nImgOfstX, 1 ), aImg );
 }
 
 void SwPageBreakWin::Select( )
@@ -306,33 +322,81 @@ void

[Libreoffice-commits] .: Branch 'feature/gtk3' - 2 commits - vcl/generic vcl/headless vcl/inc

2011-10-10 Thread Michael Meeks 
 vcl/generic/print/genprnpsp.cxx |2 +-
 vcl/headless/svpgdi.cxx |8 
 vcl/inc/vcl/sysdata.hxx |1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 047e770ede15b26191533027082feedb33adfbda
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Oct 10 11:55:14 2011 +0100

generic: overcome Mac specific build errors

diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 9e5e2c6..cdae650 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -109,7 +109,7 @@ static String getPdfDir( const PrinterInfo rInfo )
 
 static void getPaLib()
 {
-#if defined( UNX )
+#if defined( UNX )  !( defined( QUARTZ ) || defined( IOS ) )
 if( ! driverLib )
 {
 OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ) );
diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index 2e00618..b97e854 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -147,6 +147,7 @@ struct SystemGraphicsData
 : nSize( sizeof( SystemGraphicsData ) )
 #if defined( WNT )
 , hDC( 0 )
+#elif defined( QUARTZ ) || defined( IOS )
 #elif defined( UNX )
 , pDisplay( NULL )
 , hDrawable( 0 )
commit 63649f11fa31fc5262a2abf0916b71cb50a200a8
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Oct 10 11:25:42 2011 +0100

headless: add required clip map reset for simpler clipping cases

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 3609bd9..e44240d 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -270,11 +270,10 @@ SvpSalGraphics::ClipUndoHandle 
SvpSalGraphics::ensureClipFor( const basegfx::B2I
 bool SvpSalGraphics::setClipRegion( const Region i_rClip )
 {
 m_aClipRegion = i_rClip;
+m_aClipMap.reset();
 if( i_rClip.IsEmpty() )
-{
-m_aClipMap.reset();
 m_bClipSetup = true;
-}
+
 else if( i_rClip.GetRectCount() == 1 )
 {
 m_aClipMap.reset();
@@ -285,6 +284,7 @@ bool SvpSalGraphics::setClipRegion( const Region i_rClip )
 }
 else
 m_bClipSetup = false;
+
 return true;
 }
 
@@ -555,7 +555,7 @@ void SvpSalGraphics::copyBits( const SalTwoRect* pPosAry,
 }
 
 void SvpSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
-const SalBitmap rSalBitmap )
+ const SalBitmap rSalBitmap )
 {
 const SvpSalBitmap rSrc = static_castconst SvpSalBitmap(rSalBitmap);
 B2IRange aSrcRect( pPosAry-mnSrcX, pPosAry-mnSrcY,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svx binfilter/inc

2011-10-10 Thread Joseph Powers 
 binfilter/bf_sd/source/ui/view/sd_frmview.cxx   |1 
 binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx  |   43 -
 binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx |4 
 binfilter/bf_svx/source/svdraw/svx_svdmark.cxx  |   19 --
 binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx  |2 
 binfilter/inc/bf_svx/svddrgv.hxx|  204 
 binfilter/inc/bf_svx/svdxcgv.hxx|5 
 7 files changed, 4 insertions(+), 274 deletions(-)

New commits:
commit 184b91bc311b5d518215c106b0590bcc84b71ccf
Author: Joseph Powers jpower...@cox.net
Date:   Mon Oct 10 08:05:11 2011 -0700

Cleanup class SdrDragView a little

diff --git a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx 
b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
index 1220694..516897e 100644
--- a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
+++ b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
@@ -296,7 +296,6 @@ void FrameView::Update(SdOptions* pOptions)
 
 SetGridCoarse( Size( pOptions-GetFldDrawX(), pOptions-GetFldDrawY() 
) );
 SetGridFine( Size( pOptions-GetFldDivisionX(), 
pOptions-GetFldDivisionY() ) );
-//  SetSnapGrid( Size( pOptions-GetFldSnapX(), pOptions-GetFldSnapY() ) 
);
 Fraction aFractX(pOptions-GetFldDrawX(), pOptions-GetFldDrawX() / ( 
pOptions-GetFldDivisionX() ? pOptions-GetFldDivisionX() : 1 ));
 Fraction aFractY(pOptions-GetFldDrawY(), pOptions-GetFldDrawY() / ( 
pOptions-GetFldDivisionY() ? pOptions-GetFldDivisionY() : 1 ));
 SetSnapGridWidth(aFractX, aFractY);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx 
b/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
index bba22a1..d774bb6 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx
@@ -32,69 +32,31 @@
 
 namespace binfilter {
 
-#define XOR_DRAG_PEN   PEN_DOT
-
 /*N*/ void SdrDragView::ImpClearVars()
 /*N*/ {
-/*N*/   bFramDrag=FALSE;
 /*N*/   eDragMode=SDRDRAG_MOVE;
-/*N*/   bDragLimit=FALSE;
 /*N*/   bMarkedHitMovesAlways=FALSE;
-/*N*/   eDragHdl=HDL_MOVE;
-/*N*/   pDragHdl=NULL;
-/*N*/   bDragHdl=FALSE;
-/*N*/   bDragSpecial=FALSE;
-/*N*/   pDragBla=NULL;
 /*N*/   bDragStripes=FALSE;
 /*N*/   bNoDragHdl=TRUE;
 /*N*/   bMirrRefDragObj=TRUE;
 /*N*/   bSolidDragging=FALSE;
-/*N*/   bSolidDrgNow=FALSE;
-/*N*/   bSolidDrgChk=FALSE;
 /*N*/   bDragWithCopy=FALSE;
-/*N*/   pInsPointUndo=NULL;
-/*N*/   bInsAfter=FALSE;
-/*N*/   bInsGluePoint=FALSE;
-/*N*/   bInsObjPointMode=FALSE;
-/*N*/   bInsGluePointMode=FALSE;
-/*N*/   nDragXorPolyLimit=100;
-/*N*/   nDragXorPointLimit=500;
 /*N*/   bNoDragXorPolys=FALSE;
-/*N*/   bAutoVertexCon=TRUE;
-/*N*/   bAutoCornerCon=FALSE;
-/*N*/   bRubberEdgeDragging=TRUE;
-/*N*/   nRubberEdgeDraggingLimit=100;
-/*N*/   bDetailedEdgeDragging=TRUE;
-/*N*/   nDetailedEdgeDraggingLimit=10;
-/*N*/   bResizeAtCenter=FALSE;
-/*N*/   bCrookAtCenter=FALSE;
-/*N*/   bMouseHideWhileDraggingPoints=FALSE;
-/*N*/ }
-
-/*N*/ void SdrDragView::ImpMakeDragAttr()
-/*N*/ {
-/*N*/   ImpDelDragAttr();
 /*N*/ }
 
 /*N*/ SdrDragView::SdrDragView(SdrModel* pModel1, OutputDevice* pOut):
 /*N*/   SdrExchangeView(pModel1,pOut)
 /*N*/ {
 /*N*/   ImpClearVars();
-/*N*/   ImpMakeDragAttr();
 /*N*/ }
 
 /*N*/ SdrDragView::~SdrDragView()
 /*N*/ {
-/*N*/   ImpDelDragAttr();
-/*N*/ }
-
-/*N*/ void SdrDragView::ImpDelDragAttr()
-/*N*/ {
 /*N*/ }
 
 /*N*/ BOOL SdrDragView::IsAction() const
 /*N*/ {
-/*N*/   return SdrExchangeView::IsAction() || pDragBla!=NULL;
+/*N*/   return SdrExchangeView::IsAction();
 /*N*/ }
 
 /*N*/ void SdrDragView::BrkAction()
@@ -118,8 +80,7 @@ namespace binfilter {
 
 /*N*/ void SdrDragView::SetDragStripes(BOOL bOn)
 /*N*/ {
-/*N*/   if ( !(pDragBla!=NULL  aDragStat.IsShown() ) )
-/*N*/   bDragStripes=bOn;
+/*N*/   bDragStripes=bOn;
 /*N*/ }
 
 

diff --git a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx 
b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
index c706ae6..a2952d0 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
@@ -146,10 +146,6 @@ namespace binfilter {
 /*N*/   {
 /*N*/   // Das Standardlayerflag kam direkt nach der Betalieferung dazu
 /*N*/   rIn  rLayer.nType;
-/*N*/
-/*N*/   if(rLayer.nType == 1)
-/*N*/   {DBG_BF_ASSERT(0, STRIP);
-/*N*/   }
 /*N*/   }
 /*N*/
 /*N*/   if(aHead.GetVersion() = 12)
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx 
b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
index 23e2deb..4aae881 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
@@ -33,29 +33,10 @@ namespace binfilter {
 
 

 
-
-
-
-
-
-
-

[Libreoffice-commits] .: 3 commits - binfilter/bf_svx binfilter/bf_xmloff binfilter/inc

2011-10-10 Thread Caolán McNamara 
 binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx   |   10 -
 binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx |   17 
 binfilter/bf_xmloff/source/forms/layerexport.hxx|1 
 binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx |4 +++
 binfilter/inc/bf_svx/svdhdl.hxx |2 -
 binfilter/inc/bf_svx/svdvmark.hxx   |7 --
 6 files changed, 5 insertions(+), 36 deletions(-)

New commits:
commit 2a11056a9a4e33d39c15184f54d47b0886d45308
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Oct 10 16:25:24 2011 +0100

callcatcher: freshly unused code

diff --git a/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx 
b/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx
index e37e6b7..ecd5f10 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx
@@ -87,15 +87,6 @@ namespace binfilter {
 /*N*/   if (pXPolyPoly!=NULL) { delete pXPolyPoly; pXPolyPoly=NULL; }
 /*N*/ }
 
-/*N*/ void SdrViewUserMarker::Show()
-/*N*/ {DBG_BF_ASSERT(0, STRIP);
-/*N*/ }
-
-/*N*/ void SdrViewUserMarker::Hide()
-/*N*/ {DBG_BF_ASSERT(0, STRIP);
-/*N*/ }
-
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svx/svdvmark.hxx 
b/binfilter/inc/bf_svx/svdvmark.hxx
index e211863..a535b2a 100644
--- a/binfilter/inc/bf_svx/svdvmark.hxx
+++ b/binfilter/inc/bf_svx/svdvmark.hxx
@@ -150,8 +150,6 @@ public:
 bool IsAnimateBackward() const { return bAnimateBwd; }
 bool IsAnimateToggle() const { return bAnimateToggle; }
 
-void Show();
-void Hide();
 bool IsVisible() const { return bVisible; }
 
 bool HasPointer() const { return bHasPointer; }
commit 6d2ec30dd9063e3876428444c27a9e683d7f8925
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Oct 10 14:41:14 2011 +0100

callcatcher: newly unused methods

diff --git a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx 
b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
index d12fc2f..30b1cf2 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
@@ -47,16 +47,6 @@ SdrHdl::~SdrHdl() {}
 /*N*/ };
 
 
-
-
-/*N*/ SdrHdl* SdrHdlList::GetFocusHdl() const
-/*N*/ {
-/*N*/   if (pImpl-mnFocusIndex != CONTAINER_ENTRY_NOTFOUND  
pImpl-mnFocusIndex  GetHdlCount())
-/*?*/   return GetHdl(pImpl-mnFocusIndex);
-/*N*/   else
-/*?*/   return 0L;
-/*N*/ }
-
 /*N*/ SdrHdlList::SdrHdlList(SdrMarkView* pV)
 /*N*/ : pImpl(new ImplHdlListData(pV))
 /*N*/ , aList(1024,32,32)
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx 
b/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx
index 5eec928..e37e6b7 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx
@@ -87,14 +87,6 @@ namespace binfilter {
 /*N*/   if (pXPolyPoly!=NULL) { delete pXPolyPoly; pXPolyPoly=NULL; }
 /*N*/ }
 
-/*N*/ void SdrViewUserMarker::SetLineWidth(USHORT nWdt)
-/*N*/ {
-/*N*/   bool bVis=bVisible;
-/*N*/   if (bVis) Hide();
-/*N*/   nLineWdt=nWdt;
-/*N*/   if (bVis) Show();
-/*N*/ }
-
 /*N*/ void SdrViewUserMarker::Show()
 /*N*/ {DBG_BF_ASSERT(0, STRIP);
 /*N*/ }
diff --git a/binfilter/inc/bf_svx/svdhdl.hxx b/binfilter/inc/bf_svx/svdhdl.hxx
index 48d9d5c..1121c0c 100644
--- a/binfilter/inc/bf_svx/svdhdl.hxx
+++ b/binfilter/inc/bf_svx/svdhdl.hxx
@@ -178,8 +178,6 @@ public:
 ~SdrHdlList();
 void Clear();
 
-SdrHdl* GetFocusHdl() const;
-
 // Access to View
 SdrMarkView* GetView() const;
 
diff --git a/binfilter/inc/bf_svx/svdvmark.hxx 
b/binfilter/inc/bf_svx/svdvmark.hxx
index 0accacb..e211863 100644
--- a/binfilter/inc/bf_svx/svdvmark.hxx
+++ b/binfilter/inc/bf_svx/svdvmark.hxx
@@ -115,11 +115,6 @@ public:
 void SetOutputDevice(OutputDevice* pOut) { pForcedOutDev=pOut; }
 OutputDevice* GetOutputDevice() const { return pForcedOutDev; }
 
-// Der Marker kann durchaus auch in einen andere View gesteckt werden.
-// (Beim Destruieren der View wird die View am Marker automatisch auf NULL 
gesetzt.)
-
-void SetLineWidth(USHORT nWdt);
-
 void SetAnimateDelay(USHORT nTime) { nAnimateDelay=(nTime+25)/50; }
 void SetAnimateSpeed(USHORT nTime) { nAnimateSpeed=(nTime+25)/50; if 
(nAnimateSpeed0) nAnimateSpeed--; }
 void SetAnimateCount(USHORT nAnz) { nAnimateAnz=nAnz; }
commit c4c8d1453c8a84a23ed6fd4540e3817b6d432ab4
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Oct 10 13:46:03 2011 +0100

WaE: mirror in fix here

diff --git a/binfilter/bf_xmloff/source/forms/layerexport.hxx 
b/binfilter/bf_xmloff/source/forms/layerexport.hxx
index b6547e6..9f33c37 100644
--- a/binfilter/bf_xmloff/source/forms/layerexport.hxx
+++ b/binfilter/bf_xmloff/source/forms/layerexport.hxx
@@ -118,6 +118,7 @@ namespace xmloff
 
 public:
 OFormLayerXMLExport_Impl(SvXMLExport

[Libreoffice-commits] .: 2 commits - vcl/unx

2011-10-10 Thread Caolán McNamara 
 vcl/unx/gtk/app/gtkdata.cxx |   25 -
 1 file changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 76a0e6ee30cb7610bc0eb1d536476fc801f3a3bf
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Oct 10 17:09:12 2011 +0100

grab monitors on start also

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 4e10809..904d22a 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -783,6 +783,9 @@ void GtkXLib::Init()
 GdkScreen *pScreen = gdk_display_get_screen( pGdkDisp, n );
 if( pScreen )
 {
+m_pGtkSalDisplay-screenSizeChanged(pScreen);
+m_pGtkSalDisplay-monitorsChanged(pScreen);
+
 g_signal_connect( G_OBJECT(pScreen), size-changed, 
G_CALLBACK(signalScreenSizeChanged), m_pGtkSalDisplay );
 if( ! gtk_check_version( 2, 14, 0 ) ) // monitors-changed came in 
with 2.14, avoid an assertion
 g_signal_connect( G_OBJECT(pScreen), monitors-changed, 
G_CALLBACK(signalMonitorsChanged), m_pGtkSalDisplay );
commit 1f88a2a00dfdcc29e805d23c1a88a82b69d59d24
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Oct 10 17:08:37 2011 +0100

fix the fallback logic

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 4cb161a..4e10809 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -259,20 +259,24 @@ int GtkSalDisplay::GetDefaultMonitorNumber() const
 (screen_get_primary_monitor)osl_getAsciiFunctionSymbol( 
GetSalData()-m_pPlugin, gdk_screen_get_primary_monitor );
 if (sym_gdk_screen_get_primary_monitor)
 n = sym_gdk_screen_get_primary_monitor( pScreen );
-#if GTK_CHECK_VERSION(2,14,0)
-//gdk_screen_get_primary_monitor unavailable, take the first laptop monitor
-//as the default
-gint nMonitors = gdk_screen_get_n_monitors(pScreen);
-for (gint i = 0; i  nMonitors; ++i)
+else
 {
-if (g_ascii_strncasecmp (gdk_screen_get_monitor_plug_name(pScreen, i), 
LVDS, 4) == 0) {
-OSL_ASSERT( size_t(i)  m_aXineramaScreenIndexMap.size() );
-return (size_t(i)  m_aXineramaScreenIndexMap.size()) ? 
m_aXineramaScreenIndexMap[i] : 0;
+#if GTK_CHECK_VERSION(2,14,0)
+//gdk_screen_get_primary_monitor unavailable, take the first laptop 
monitor
+//as the default
+gint nMonitors = gdk_screen_get_n_monitors(pScreen);
+for (gint i = 0; i  nMonitors; ++i)
+{
+if (g_ascii_strncasecmp (gdk_screen_get_monitor_plug_name(pScreen, 
i), LVDS, 4) == 0)
+{
+n = i;
+break;
+}
 }
 }
 #endif
-return 0;
 #endif
+
 if( n = 0  size_t(n)  m_aXineramaScreenIndexMap.size() )
 n = m_aXineramaScreenIndexMap[n];
 return n;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: autodoc/inc autodoc/source

2011-10-10 Thread Kevin Hunter 
 autodoc/inc/ary_i/ci_text2.hxx   |2 +-
 autodoc/source/ary_i/kernel/ci_text2.cxx |   12 
 2 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 60f108553552eba8441589c47294f252e4ace1e5
Author: Kevin Hunter hunt...@earlham.edu
Date:   Mon Oct 10 13:58:25 2011 -0400

Simplify logic to use std::vector's .empty()

No need to muck about with iterators, adding a loop, and 2 function
calls to test for empty: it's a std::vector under the hood, so use
.empty(), and inline it.

diff --git a/autodoc/inc/ary_i/ci_text2.hxx b/autodoc/inc/ary_i/ci_text2.hxx
index 8e1c202..eef1d63 100644
--- a/autodoc/inc/ary_i/ci_text2.hxx
+++ b/autodoc/inc/ary_i/ci_text2.hxx
@@ -72,7 +72,7 @@ class DocuTex2
 DYN DocuToken  let_drToken );
 
 const TokenListTokens() const  { return aTokens; }
-boolIsEmpty() const;
+boolIsEmpty() const { return aTokens.empty(); }
 const String   TextOfFirstToken() const;
 
 String Access_TextOfFirstToken();
diff --git a/autodoc/source/ary_i/kernel/ci_text2.cxx 
b/autodoc/source/ary_i/kernel/ci_text2.cxx
index 00a5a7e..dea062f 100644
--- a/autodoc/source/ary_i/kernel/ci_text2.cxx
+++ b/autodoc/source/ary_i/kernel/ci_text2.cxx
@@ -77,18 +77,6 @@ DocuTex2::AddToken( DYN DocuToken  let_drToken )
 aTokens.push_back(let_drToken);
 }
 
-bool
-DocuTex2::IsEmpty() const
-{
-for ( ary::inf::DocuTex2::TokenList::const_iterator
-iter = aTokens.begin();
-  iter != aTokens.end();
-)
-{
-return false;
-}
-return true;
-}
 
 using csi::dsapi::DT_TextToken;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2011-10-10 Thread Fridrich Strba 
 solenv/inc/wntgcci.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2e267c98bd001929fb922f565b65d92365a8d390
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Oct 10 22:27:40 2011 +0200

Clone Caolán's work for wntgcci.mk too

diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 5fe8bbd..3831c85 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -79,10 +79,10 @@ CDEFS+=-D_DLL
 .ENDIF
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
+CFLAGSWARNBOTH=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCC=$(CFLAGSWARNBOTH) -Wdeclaration-after-statement
+CFLAGSWARNCXX=$(CFLAGSWARNBOTH) -Wshadow -Wno-ctor-dtor-privacy \
 -Wno-non-virtual-dtor
-CFLAGSWARNCC+=-Wdeclaration-after-statement
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
 CFLAGSWERRCC=-Werror -DLIBO_WERROR
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: unusedcode.easy writerfilter/inc writerfilter/source

2011-10-10 Thread Caolán McNamara 
 unusedcode.easy   |4 
 writerfilter/inc/resourcemodel/XPathLogger.hxx|4 
 writerfilter/source/resourcemodel/XPathLogger.cxx |4 
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 0123fc6d03412704ac8512339d949773b22b9cce
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Oct 10 22:34:26 2011 +0100

these can go behind DEBUG_CONTEXT_HANDLER

diff --git a/unusedcode.easy b/unusedcode.easy
index 310d070..c025a98 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2858,7 +2858,3 @@ writerfilter::TagLogger::chars(rtl::OUString const)
 writerfilter::TagLogger::endElement()
 writerfilter::TagLogger::startElement(std::basic_stringchar, 
std::char_traitschar, std::allocatorchar  const)
 writerfilter::TagLogger::~TagLogger()
-writerfilter::XPathLogger::XPathLogger()
-writerfilter::XPathLogger::endElement()
-writerfilter::XPathLogger::getXPath() const
-writerfilter::XPathLogger::startElement(std::basic_stringchar, 
std::char_traitschar, std::allocatorchar )
diff --git a/writerfilter/inc/resourcemodel/XPathLogger.hxx 
b/writerfilter/inc/resourcemodel/XPathLogger.hxx
index d5e97a2..584ed35 100644
--- a/writerfilter/inc/resourcemodel/XPathLogger.hxx
+++ b/writerfilter/inc/resourcemodel/XPathLogger.hxx
@@ -28,6 +28,8 @@
 #ifndef INCLUDED_XPATH_LOGGER_HXX
 #define INCLUDED_XPATH_LOGGER_HXX
 
+#ifdef DEBUG_CONTEXT_HANDLER
+
 #include stack
 #include string
 #include vector
@@ -62,4 +64,6 @@ public:
 void endElement();
 };
 }
+
+#endif
 #endif // INCLUDED_XPATH_LOGGER_HXX
diff --git a/writerfilter/source/resourcemodel/XPathLogger.cxx 
b/writerfilter/source/resourcemodel/XPathLogger.cxx
index aad6847..b9381e3 100644
--- a/writerfilter/source/resourcemodel/XPathLogger.cxx
+++ b/writerfilter/source/resourcemodel/XPathLogger.cxx
@@ -29,6 +29,8 @@
 #include stdio.h
 #include resourcemodel/XPathLogger.hxx
 
+#ifdef DEBUG_CONTEXT_HANDLER
+
 namespace writerfilter
 {
 XPathLogger::XPathLogger()
@@ -89,4 +91,6 @@ void XPathLogger::endElement()
 
 } // namespace writerfilter
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits