some problems with svxitems.hrc

5 files changed, 7 insertions, 8 deletions

diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index a7f168c82777..5b28029920cc 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -41,7 +41,8 @@
 #include <sfx2/objsh.hxx>
 #include <cuires.hrc>
 #include "srchxtra.hrc"
-#include <svx/svxitems.hrc>
+#include <svx/svxitems.hrc> // RID_ATTR_BEGIN
+#include <svx/dialmgr.hxx>  // item resources
 #include <svx/flstitem.hxx>
 #include "chardlg.hxx"
 #include "paragrph.hxx"
@@ -181,11 +182,12 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
                 }
             }
 
+            // item resources are in svx
             USHORT nResId = nSlot - SID_SVX_START + RID_ATTR_BEGIN;
             SvLBoxEntry* pEntry = NULL;
-            ResId aId( nResId, CUI_MGR() );
+            ResId aId( nResId, DIALOG_MGR() );
             aId.SetRT( RSC_STRING );
-            if ( CUI_MGR().IsAvailable( aId ) )
+            if ( DIALOG_MGR().IsAvailable( aId ) )
                 pEntry = aAttrLB.SvTreeListBox::InsertEntry( CUI_RESSTR( nResId ) );
             else
             {
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 0bf652aa648a..c958204fe3c4 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -51,7 +51,6 @@
 #include "cuisrchdlg.hxx"
 
 #include <cuires.hrc>
-#include <svx/svxitems.hrc>
 
 #define ITEMID_SETITEM      0
 
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index a242bda5c1ec..004b79817b32 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -47,7 +47,7 @@
 
 #include <cuires.hrc>
 #include "backgrnd.hrc"
-#include <svx/svxitems.hrc>
+#include <svx/svxitems.hrc> // RID_SVXITEM_COL_WHITE
 #include <svx/dialmgr.hxx>
 
 // Tabellenhintergrund
@@ -1209,7 +1209,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
         long nCount = pColorTable->Count();
         XColorEntry* pEntry = NULL;
         Color aColWhite( COL_WHITE );
-        String aStrWhite( CUI_RES( RID_SVXITEMS_COLOR_WHITE ) );
+        String aStrWhite( SVX_RES( RID_SVXITEMS_COLOR_WHITE ) );
         WinBits nBits = ( aBackgroundColorSet.GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD );
         aBackgroundColorSet.SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
         aBackgroundColorSet.SetStyle( nBits );
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 56a99968f5ef..95fb4fbbe5d6 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -40,7 +40,6 @@
 #define _SVX_BORDER_CXX
 
 #include <cuires.hrc>
-#include <svx/svxitems.hrc>
 #include "border.hrc"
 #include "helpid.hrc"
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 1e5b0646d527..6028fdf97ab9 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -50,7 +50,6 @@
 #include <svl/languageoptions.hxx>
 
 #include <cuires.hrc>
-#include <svx/svxitems.hrc>
 #include "chardlg.hrc"
 
 #include <svx/xtable.hxx>       // XColorTable