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

Miklos Vajna vmiklos at suse.cz
Fri Feb 15 02:08:04 PST 2013


 cui/source/inc/backgrnd.hxx      |    3 +--
 cui/source/tabpages/backgrnd.cxx |    2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 7987d46c6bc9439e299514e6bb1644e7f2c5880a
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Feb 15 11:06:59 2013 +0100

    cui: get rid of _SVX_BACKGRND_CXX define
    
    Change-Id: Ib93806d697f10abeb1e97d0cb08954e15961ad87

diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 24a8ccc..a413b72 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -24,6 +24,7 @@
 #include <vcl/graph.hxx>
 #include <svtools/valueset.hxx>
 #include <svx/dlgctrl.hxx>
+#include <editeng/brushitem.hxx>
 
 //------------------------------------------------------------------------
 // forwards:
@@ -135,7 +136,6 @@ private:
     SvxBackgroundTable_Impl*    pTableBck_Impl;///< Items for Sw-Table must be corrected
     SvxBackgroundPara_Impl* pParaBck_Impl;///< also for the paragraph style
 
-#ifdef _SVX_BACKGRND_CXX
     void                FillColorValueSets_Impl();
     void                ShowColorUI_Impl();
     void                HideColorUI_Impl();
@@ -161,7 +161,6 @@ private:
     DECL_LINK( TblDestinationHdl_Impl, ListBox* );
     DECL_LINK( ParaDestinationHdl_Impl, ListBox* );
     DECL_LINK(ModifyGradientHdl_Impl, void *);
-#endif
 };
 
 #endif // #ifndef _SVX_BACKGRND_HXX
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 9c139e3..5631316 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -28,8 +28,6 @@
 #include <sfx2/cntids.hrc>
 #include <svx/dialogs.hrc>
 
-#define _SVX_BACKGRND_CXX
-
 #include <cuires.hrc>
 #include <svx/dialmgr.hxx>
 #include <editeng/memberids.hrc>


More information about the Libreoffice-commits mailing list