#i107450#: make svx buildable with new editeng lib

5 files changed, 16 insertions, 16 deletions

diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 12978b5a6b44..4da2317dd7ba 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -44,7 +44,7 @@
 
 #include <svx/svdview.hxx>
 #include "drawitem.hxx"
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include "xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 3b484d770397..0db6803b4cc4 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -44,7 +44,7 @@
 #include <svl/eitem.hxx>
 #include <vcl/settings.hxx>
 #include <svl/intitem.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include "chrtitem.hxx"
 #include <tools/urlobj.hxx>
 
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 13a01b6dc31b..0386bd99e50b 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -45,8 +45,8 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/frmdiritem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/frmdiritem.hxx>
 #include "toolbarmenu.hxx"
 
 #include "fontworkgallery.hxx"
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 50da14402fae..0b7a0938e979 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -56,8 +56,8 @@
 #include <svx/svxids.hrc>
 #include "grafctrl.hrc"
 #include <svx/dialogs.hrc>
-#include <svx/brshitem.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <svx/sdgcpitm.hxx>
 //CHINA001 #include "../dialog/grfpage.hxx"
 #include <svx/itemwin.hxx>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5c283b3aae24..c3750210eecb 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -59,9 +59,7 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <unotools/fontoptions.hxx>
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 
 #include <vcl/svapp.hxx>
 #include <svl/smplhint.hxx>
@@ -79,13 +77,13 @@
 #include "helpid.hrc"
 #include "htmlmode.hxx"
 #include <svx/xtable.hxx>
-#include "fontitem.hxx"
-#include <svx/fhgtitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/colritem.hxx>
-#include "flstitem.hxx"
-#include "bolnitem.hxx"
+#include "editeng/fontitem.hxx"
+#include <editeng/fhgtitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/colritem.hxx>
+#include "editeng/flstitem.hxx"
+#include "editeng/bolnitem.hxx"
 #include "drawitem.hxx"
 #include <svx/tbcontrl.hxx>
 #include "dlgutil.hxx"
@@ -94,6 +92,8 @@
 #include <memory>
 
 #include <svx/tbxcolorupdate.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc>
 
 // ------------------------------------------------------------------------
 
@@ -882,7 +882,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
         long nCount = pColorTable->Count();
         XColorEntry* pEntry = NULL;
         ::Color aColWhite( COL_WHITE );
-        String aStrWhite( SVX_RES(RID_SVXITEMS_COLOR_WHITE) );
+        String aStrWhite( EditResId(RID_SVXITEMS_COLOR_WHITE) );
 
         if ( nCount > PALETTE_SIZE )
             // Show scrollbar if more than PALLETTE_SIZE colors are available