summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-11-11 18:31:36 +0100
committerMathias Bauer <mba@openoffice.org>2009-11-11 18:31:36 +0100
commit50e3b9c8876c4b72d0d7f5a4fd35aa704abe1ca1 (patch)
tree7dba4b0958dc5b35b279a0d691506354c3e772b2
parent2aaf8a29f9f56434ee91614259059c0527db626d (diff)
some fixes for remaining resource problems
-rw-r--r--cui/source/customize/acccfg.cxx2
-rw-r--r--cui/source/customize/macropg.cxx2
-rw-r--r--cui/source/customize/selector.cxx5
-rw-r--r--cui/source/dialogs/charmap.src4
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx1
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx2
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx1
-rw-r--r--cui/source/dialogs/cuiimapwnd.cxx1
-rw-r--r--cui/source/dialogs/postdlg.cxx3
-rw-r--r--cui/source/dialogs/postdlg.src3
-rw-r--r--cui/source/dialogs/sdrcelldlg.cxx2
-rw-r--r--cui/source/dialogs/showcols.src1
-rw-r--r--cui/source/dialogs/srchxtra.cxx2
-rw-r--r--cui/source/dialogs/tbxform.src1
-rw-r--r--cui/source/dialogs/zoom.cxx2
-rw-r--r--cui/source/dialogs/zoom.src3
-rw-r--r--cui/source/inc/cuires.hrc1
-rw-r--r--cui/source/options/connpoolconfig.cxx2
-rw-r--r--cui/source/options/dbregister.cxx1
-rw-r--r--cui/source/options/dbregister.src1
-rw-r--r--cui/source/options/dbregisterednamesconfig.cxx1
-rw-r--r--cui/source/options/doclinkdialog.cxx8
-rw-r--r--cui/source/options/fontsubs.src1
-rw-r--r--cui/source/options/optchart.cxx1
-rw-r--r--cui/source/options/optcolor.cxx1
-rw-r--r--cui/source/options/optgdlg.cxx1
-rw-r--r--cui/source/options/optgenrl.cxx1
-rw-r--r--cui/source/options/optinet2.cxx1
-rw-r--r--cui/source/tabpages/align.cxx1
-rw-r--r--cui/source/tabpages/autocdlg.cxx1
-rw-r--r--cui/source/tabpages/autocdlg.src2
-rw-r--r--cui/source/tabpages/backgrnd.cxx1
-rw-r--r--cui/source/tabpages/border.cxx1
-rw-r--r--cui/source/tabpages/grfpage.cxx3
-rw-r--r--cui/source/tabpages/page.cxx5
-rw-r--r--cui/source/tabpages/tabstpge.cxx1
-rw-r--r--cui/source/tabpages/textattr.cxx1
-rw-r--r--cui/source/tabpages/transfrm.cxx1
38 files changed, 25 insertions, 47 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 8a1c38157b01..8ff50323cc76 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -48,6 +48,8 @@
#include "cuires.hrc"
#include "acccfg.hrc"
+#include <svx/svxids.hrc> // SID_CHARMAP, SID_ATTR_SPECIALCHAR
+
//-----------------------------------------------
// include interface declarations
#include <com/sun/star/frame/XFramesSupplier.hpp>
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 4b08a831868a..faeaa60e2027 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -53,7 +53,7 @@
#include <cuires.hrc>
#include "headertablistbox.hxx"
#include "macropg_impl.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc> // RID_SVXPAGE_MACROASSIGN
#include <comphelper/namedvaluecollection.hxx>
#include <algorithm>
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 865ff5625b53..4379c1287d70 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -36,7 +36,8 @@
#include "selector.hxx"
#include <dialmgr.hxx>
#include "selector.hrc"
-#include <svx/fmresids.hrc>
+#include <svx/fmresids.hrc> // for RID_SVXIMG_...
+#include <svx/dialmgr.hxx> // for RID_SVXIMG_...
#include <cuires.hrc>
#include <sfx2/app.hxx>
#include <sfx2/msg.hxx>
@@ -266,7 +267,7 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
- ImageList aNavigatorImages( CUI_RES( RID_SVXIMGLIST_FMEXPL ) );
+ ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
SetNodeBitmaps(
aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src
index cf39acab5025..c8b1030cb328 100644
--- a/cui/source/dialogs/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -29,11 +29,11 @@
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/svxids.hrc>
+
#include <cuires.hrc>
#include "charmap.hrc"
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc> // for RID_SVXDLG_CHARMAP
// RID_SVXDLG_CHARMAP ----------------------------------------------------
ModalDialog RID_SVXDLG_CHARMAP
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 47b6dba7dcf2..7411224a0f93 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -31,7 +31,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-#include <svx/fmresids.hrc>
#include <tools/debug.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 1106a9290aa7..be2b401320fd 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -41,7 +41,7 @@
#include "cuigrfflt.hxx"
#include "grfflt.hrc"
#include <cuires.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc> // RID_SVX_GRFFILTER_DLG_...
// --------------------
// - SvxGraphicFilter -
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index dcba27401184..a73cc0007a6f 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -40,6 +40,7 @@
#include "hldoctp.hxx"
#include "hldocntp.hxx"
#include "hyperdlg.hrc"
+#include <svx/svxids.hrc> // SID_READONLY_MODE
using ::com::sun::star::uno::Reference;
using ::com::sun::star::frame::XFrame;
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index d1c4ed2ccc95..841b9ca59b78 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -44,7 +44,6 @@
#include <svx/xoutbmp.hxx>
#include <dialmgr.hxx>
#include <cuires.hrc>
-#include <svx/svxids.hrc>
#include <cuiimapdlg.hrc>
#include <cuiimapwnd.hxx>
#include <svx/svdpage.hxx>
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 7d682cdf425f..e695aaafa420 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -42,7 +42,8 @@
#include <unotools/useroptions.hxx>
#include <unotools/localedatawrapper.hxx>
#include <comphelper/processfactory.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc> // SID_ATTR_...
+#include <svx/dialogs.hrc> // RID_SVXDLG_POSTIT
#define _SVX_POSTDLG_CXX
diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src
index 10fbbdc5d13a..02face52b1b5 100644
--- a/cui/source/dialogs/postdlg.src
+++ b/cui/source/dialogs/postdlg.src
@@ -28,10 +28,9 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/svxids.hrc>
#include <cuires.hrc>
#include "postdlg.hrc"
-#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc> // for RID_SVXDLG_POSTIT
// RID_SVXDLG_POSTIT -----------------------------------------------------
ModalDialog RID_SVXDLG_POSTIT
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index ddac02ae2c6b..a5f8e074758e 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -39,7 +39,7 @@
#include "cuitabarea.hxx"
#include "svx/svdmodel.hxx"
#include "border.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc> // RID_SVXPAGE_...
SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel )
: SfxTabDialog ( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src
index 2568ee25b96f..f22c0e0e3557 100644
--- a/cui/source/dialogs/showcols.src
+++ b/cui/source/dialogs/showcols.src
@@ -28,7 +28,6 @@
*
************************************************************************/
-#include <svx/svxids.hrc>
#include "fmsearch.hrc"
ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 23527407dc7d..a7f168c82777 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -47,7 +47,7 @@
#include "paragrph.hxx"
#include <dialmgr.hxx>
#include "backgrnd.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc> // RID_SVXPAGE_...
// class SvxSearchFormatDialog -------------------------------------------
diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src
index 4d66b4541704..e19818d51072 100644
--- a/cui/source/dialogs/tbxform.src
+++ b/cui/source/dialogs/tbxform.src
@@ -27,7 +27,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svx/svxids.hrc>
#include "fmsearch.hrc"
ModalDialog RID_SVX_DLG_INPUTRECORDNO
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 37029819f0b8..1330f48818f6 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -49,7 +49,7 @@
#include <svx/viewlayoutitem.hxx>
#include <dialmgr.hxx>
#include <svx/zoom_def.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc> // RID_SVXDLG_ZOOM
#include <layout/layout-pre.hxx>
#if ENABLE_LAYOUT
diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src
index 1bc0e85db56c..a27c41d7e1cc 100644
--- a/cui/source/dialogs/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -28,10 +28,9 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/svxids.hrc>
#include <cuires.hrc>
#include "zoom.hrc"
-#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc> // for RID_SVXDLG_ZOOM
// RID_SVXDLG_ZOOM -------------------------------------------------------
ModalDialog RID_SVXDLG_ZOOM
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index ffc098fd57cb..c054d66c4645 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -33,7 +33,6 @@
// include ------------------------------------------------------------------
#include <sfx2/sfx.hrc>
-#include <svx/svxids.hrc>
#include <sfx2/dialogs.hrc>
// Resource-Id's ------------------------------------------------------------
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index 79de982272f1..1a681beb263e 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -42,8 +42,6 @@
#include <comphelper/processfactory.hxx>
#include "sdbcdriverenum.hxx"
-#include <svx/svxids.hrc>
-
//........................................................................
namespace offapp
{
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index c9834ad0b71d..23e8bf865626 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -37,7 +37,6 @@
#include "connpooloptions.hxx"
#include <svl/filenotation.hxx>
#include <cuires.hrc>
-#include <svx/svxids.hrc>
#include "helpid.hrc"
#include <svtools/editbrowsebox.hxx>
#include <cuires.hrc>
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index 98d32f09013d..aaa8dc5302bc 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -30,7 +30,6 @@
#include "dbregister.hrc"
#include <cuires.hrc>
-#include <svx/svxids.hrc>
#include <cuires.hrc>
#include <svx/dialogs.hrc>
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index 535f90cda4e4..6fd7e34b2729 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -33,7 +33,6 @@
#include "dbregisterednamesconfig.hxx"
#include <svl/itemset.hxx>
#include <tools/diagnose_ex.h>
-#include <svx/svxids.hrc>
#include <unotools/confignode.hxx>
#include <comphelper/extract.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 81d92e1e184a..1af621348023 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -31,19 +31,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include "doclinkdialog.hxx"
-#ifndef _SVX_DOCLINKDIALOG_HRC_
#include "doclinkdialog.hrc"
-#endif
#include <cuires.hrc>
-#include <svx/svxids.hrc>
#include <tools/debug.hxx>
-#ifndef SVTOOLS_FILENOTATION_HXX_
#include <svl/filenotation.hxx>
-#endif
#include <vcl/msgbox.hxx>
#include <ucbhelper/content.hxx>
#include <dialmgr.hxx>
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index f3160d2f4808..3400162c6992 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -30,7 +30,6 @@
// include ------------------------------------------------------------------
-#include <svx/svxids.hrc>
#include "fontsubs.hrc"
#include "helpid.hrc"
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 306f30b5850e..c32bffe730c9 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -35,6 +35,7 @@
#include "optchart.hxx"
#include "optchart.hrc"
#include <dialmgr.hxx>
+#include <svx/svxids.hrc> // for SID_SCH_EDITOPTIONS
// ====================
// class ChartColorLB
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index f82a04d21d79..58eeb487879d 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -44,7 +44,6 @@
#include <boost/shared_ptr.hpp>
#include <svx/svxdlg.hxx>
#include <helpid.hrc>
-#include <svx/svxids.hrc>
#include <dialmgr.hxx>
#include "optcolor.hxx"
#include <cuires.hrc>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 2a8e8ed2c001..2c069130c40d 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -70,7 +70,6 @@
#include "cuitabarea.hxx"
#include <cuires.hrc>
#include <svx/unolingu.hxx>
-#include <svx/svxids.hrc>
#include <svx/langitem.hxx>
#include <comphelper/processfactory.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 71d30851f2bd..85c0d450cc47 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -46,6 +46,7 @@
#include <dialmgr.hxx>
#include <svx/dlgutil.hxx>
#include <svx/strarray.hxx>
+#include <svx/svxids.hrc> // SID_FIELD_GRABFOCUS
#define TRIM(s) s.EraseLeadingChars().EraseTrailingChars()
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 22d24391a953..b8d7fec16efc 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -70,6 +70,7 @@
#include "helpid.hrc"
#include <svx/ofaitem.hxx>
#include <svx/htmlmode.hxx>
+#include <svx/svxids.hrc> // slot ids, mostly for changetracking
// for security TP
#include <comphelper/processfactory.hxx>
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index c8b7bf6ea924..b85f84476e1b 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -52,7 +52,6 @@
#include <svl/cjkoptions.hxx>
#include <svl/languageoptions.hxx>
#include <svtools/localresaccess.hxx>
-#include <svx/svxids.hrc> //CHINA001
#include <svx/flagsdef.hxx> //CHINA001
#include <svl/intitem.hxx> //CHINA001
#include <sfx2/request.hxx> //CHINA001
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 315e2b9a6a58..764a5e0b163e 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -66,6 +66,7 @@
#include "cuicharmap.hxx"
#include <svx/unolingu.hxx>
#include <dialmgr.hxx>
+#include <svx/svxids.hrc> // SID_OPEN_SMARTTAGSOPTIONS
static LanguageType eLastDialogLanguage = LANGUAGE_SYSTEM;
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 8da8db3d39c3..030a47aae26b 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -28,10 +28,10 @@
*
************************************************************************/
// include ------------------------------------------------------------------
-#include <svx/svxids.hrc>
#include "autocdlg.hrc"
#include <cuires.hrc>
#include "helpid.hrc"
+#include <svx/svxids.hrc> // SID_AUTOFORMAT
// pragma -------------------------------------------------------------------
/**************************************************************************/
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 6e3b46a990bf..a242bda5c1ec 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -66,7 +66,6 @@
#include <dialmgr.hxx>
#include <svx/htmlmode.hxx>
#include <svtools/controldims.hrc>
-#include <svx/svxids.hrc> //CHINA001
#include <svx/flagsdef.hxx> //CHINA001
#include <svl/intitem.hxx> //CHINA001
#include <sfx2/request.hxx> //CHINA001
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index fdaccdb67ba8..56a99968f5ef 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -55,7 +55,6 @@
#include <dialmgr.hxx>
#include "svx/htmlmode.hxx"
#include <vcl/msgbox.hxx>
-#include <svx/svxids.hrc> //CHINA001
#include "svx/flagsdef.hxx" //CHINA001
#include <sfx2/request.hxx>
#include <svl/intitem.hxx> //CHINA001
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 6eb477c8e772..5afb0e817aa3 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -44,8 +44,7 @@
#include <svx/grfcrop.hxx>
#include <grfpage.hrc>
#include <cuires.hrc>
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc> // for RID_SVXPAGE_GRFCROP
#define CM_1_TO_TWIP 567
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 928f952d0287..27db31f684fa 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -64,9 +64,8 @@
#include <dialmgr.hxx>
#include <sfx2/module.hxx>
#include <svl/stritem.hxx>
-#include <svx/svxids.hrc> //CHINA001
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx> // for RID_SVXSTR_PAPERBIN...
+#include <svx/dialogs.hrc> // for RID_SVXSTR_PAPERBIN..., RID_SVXPAGE_PAGE
// #i4219#
#include <svtools/optionsdrawinglayer.hxx>
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 5674ca1dc2b3..12b6fd870419 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -52,7 +52,6 @@
#include <unotools/localedatawrapper.hxx>
#include <comphelper/processfactory.hxx>
#include <sfx2/request.hxx> //CHINA001
-#include <svx/svxids.hrc> //add CHINA001
#include <svl/intitem.hxx> //add CHINA001
// class TabWin_Impl -----------------------------------------------------
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index c25a06158e98..6c81356cb334 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -57,7 +57,6 @@
#include "svx/dlgutil.hxx"
#include <sfx2/request.hxx> //add CHINA001
#include <svx/ofaitem.hxx> //add CHINA001
-#include <svx/svxids.hrc> //add CHINA001
#include <svx/writingmodeitem.hxx>
static USHORT pRanges[] =
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 1144c8d74faa..57e82898a947 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -41,7 +41,6 @@
#include <svx/svdotext.hxx>
#include <svx/sderitm.hxx>
#include <svx/dialogs.hrc>
-#include <svx/svxids.hrc>
#include <cuires.hrc>
#include "transfrm.hrc"
#include <svx/sizeitem.hxx>