CWS-TOOLING: integrate CWS svxsplit

24 files changed, 115 insertions, 113 deletions

diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index f275cc084877..dcef5e9fa9e7 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -35,14 +35,14 @@
 
 #include "align.hxx"
 
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <svx/dialogs.hrc>
 #include <cuires.hrc>
 #include "align.hrc"
 #include <svx/rotmodit.hxx>
 
 #include <svx/algitem.hxx>
-#include <svx/frmdiritem.hxx>
+#include <editeng/frmdiritem.hxx>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <tools/shl.hxx>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 764a5e0b163e..fcf05709b7cd 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -61,10 +61,10 @@
 #include "autocdlg.hxx"
 #include "autocdlg.hrc"
 #include "helpid.hrc"
-#include <svx/acorrcfg.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/acorrcfg.hxx>
+#include <editeng/svxacorr.hxx>
 #include "cuicharmap.hxx"
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <dialmgr.hxx>
 #include <svx/svxids.hrc> // SID_OPEN_SMARTTAGSOPTIONS
 
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 004b79817b32..3add36afda6a 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -47,20 +47,21 @@
 
 #include <cuires.hrc>
 #include "backgrnd.hrc"
-#include <svx/svxitems.hrc> // RID_SVXITEM_COL_WHITE
 #include <svx/dialmgr.hxx>
+#include <editeng/memberids.hrc>
+#include <editeng/editrids.hrc>
+#include <editeng/eerdll.hxx>
 
 // Tabellenhintergrund
 #define TBL_DEST_CELL   0
 #define TBL_DEST_ROW    1
 #define TBL_DEST_TBL    2
 
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include "backgrnd.hxx"
 
 #include <svx/xtable.hxx>
-#include <svx/opengrf.hxx>
-#include <svx/impgrf.hxx>
+#include <sfx2/opengrf.hxx>
 #include <svx/svxerr.hxx>
 #include <svx/drawitem.hxx>
 #include <dialmgr.hxx>
@@ -1171,7 +1172,7 @@ BOOL SvxBackgroundTabPage::LoadLinkedGraphic_Impl()
 
 {
     BOOL bResult = ( aBgdGraphicPath.Len() > 0 ) &&
-                   ( GRFILTER_OK == LoadGraphic( aBgdGraphicPath,
+                   ( GRFILTER_OK == GraphicFilter::LoadGraphic( aBgdGraphicPath,
                                                  aBgdGraphicFilter,
                                                  aBgdGraphic ) );
     return bResult;
@@ -1209,7 +1210,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
         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 ) );
         WinBits nBits = ( aBackgroundColorSet.GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD );
         aBackgroundColorSet.SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
         aBackgroundColorSet.SetStyle( nBits );
@@ -1883,7 +1884,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
 
         if(bGraphTransparency)
         {
-            const GraphicObject* pObject = rBgdAttr.GetGraphicObject(SfxObjectShell::Current());
+            const GraphicObject* pObject = rBgdAttr.GetGraphicObject();
             if(pObject)
                 aGraphTransMF.SetValue(lcl_TransparencyToPercent(pObject->GetAttr().GetTransparency()));
             else
@@ -1903,8 +1904,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
             // Grafik ist im Item vorhanden und muss nicht
             // geladen werden:
 
-            const Graphic* pGraphic =
-                rBgdAttr.GetGraphic( SfxObjectShell::Current() );
+            const Graphic* pGraphic = rBgdAttr.GetGraphic();
 
             if ( !pGraphic && aBtnPreview.IsChecked() )
                 bIsGraphicValid = LoadLinkedGraphic_Impl();
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 31191b4dffe1..f25ebf1e2f70 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -47,8 +47,8 @@
 
 #include <svx/xtable.hxx>               // XColorTable
 #include <svx/drawitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/shaditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/shaditem.hxx>
 #include "border.hxx"
 #include <svx/dlgutil.hxx>
 #include <dialmgr.hxx>
@@ -239,7 +239,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
     mbUseMarginItem = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN),TRUE) != SFX_ITEM_UNKNOWN;
 
     // Metrik einstellen
-    FieldUnit eFUnit = GetModuleFieldUnit( &rCoreAttrs );
+    FieldUnit eFUnit = GetModuleFieldUnit( rCoreAttrs );
 
     if( mbUseMarginItem )
     {
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index c117e631abbd..35d3c9a69985 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -33,10 +33,10 @@
 
 #include "borderconn.hxx"
 #include <svx/frmsel.hxx>
-#include "svx/bolnitem.hxx"
-#include <svx/boxitem.hxx>
+#include "editeng/bolnitem.hxx"
+#include <editeng/boxitem.hxx>
 #include <svx/algitem.hxx>
-#include <svx/shaditem.hxx>
+#include <editeng/shaditem.hxx>
 
 namespace svx {
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 6028fdf97ab9..ba4efe732afe 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_cui.hxx"
 
 // include ---------------------------------------------------------------
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
@@ -45,6 +45,7 @@
 #include <vcl/msgbox.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svtools/unitconv.hxx>
 
 #define _SVX_CHARDLG_CXX
 #include <svl/languageoptions.hxx>
@@ -54,38 +55,38 @@
 
 #include <svx/xtable.hxx>       // XColorTable
 #include "chardlg.hxx"
-#include "svx/fontitem.hxx"
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/prszitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/cmapitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/blnkitem.hxx>
-#include "svx/flstitem.hxx"
-#include <svx/akrnitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/colritem.hxx>
+#include "editeng/fontitem.hxx"
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/prszitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/cmapitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/blnkitem.hxx>
+#include "editeng/flstitem.hxx"
+#include <editeng/akrnitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/colritem.hxx>
 #include "svx/drawitem.hxx"
 #include "svx/dlgutil.hxx"
 #include <dialmgr.hxx>
 #include "svx/htmlmode.hxx"
 #include "cuicharmap.hxx"
 #include "chardlg.h"
-#include <svx/emphitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/twolinesitem.hxx>
-#include <svx/charhiddenitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/twolinesitem.hxx>
+#include <editeng/charhiddenitem.hxx>
 #include <svl/stritem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charrotateitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charrotateitem.hxx>
 #include <svx/svxdlg.hxx> //CHINA001
 #include <cuires.hrc> //CHINA001
 #include <svl/intitem.hxx> //CHINA001
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index cd62234aeb2d..9d354ce71da5 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -133,7 +133,7 @@ SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttr
 
     FillTypeLB();
 
-    const FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs );
+    const FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
     SetFieldUnit( aMtrFldHorz1, eFUnit );
     SetFieldUnit( aMtrFldHorz2, eFUnit );
     SetFieldUnit( aMtrFldVert1, eFUnit );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 5afb0e817aa3..13f98fa0e9a9 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -38,8 +38,8 @@
 #include <sfx2/sfxsids.hrc>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <grfpage.hxx>
 #include <svx/grfcrop.hxx>
 #include <grfpage.hrc>
@@ -93,7 +93,7 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
     SetExchangeSupport();
 
     // set the correct metric
-    const FieldUnit eMetric = GetModuleFieldUnit( &rSet );
+    const FieldUnit eMetric = GetModuleFieldUnit( rSet );
 
     SetFieldUnit( aWidthMF, eMetric );
     SetFieldUnit( aHeightMF, eMetric );
@@ -698,7 +698,7 @@ void SvxGrfCropPage::GraphicHasChanged( BOOL bFound )
         aBottomMF.SetSpinSize(nSpin);
 
         //Originalgroesse anzeigen
-        const FieldUnit eMetric = GetModuleFieldUnit( &GetItemSet() );
+        const FieldUnit eMetric = GetModuleFieldUnit( GetItemSet() );
 
         MetricField aFld(this, WB_HIDE);
         SetFieldUnit( aFld, eMetric );
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index a311fadca64b..23e947d79222 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -252,7 +252,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet&  )
 
     //------------Metrik einstellen-----------------------------
 
-    FieldUnit eFUnit = GetModuleFieldUnit( &rOutAttrs );
+    FieldUnit eFUnit = GetModuleFieldUnit( rOutAttrs );
 
     switch ( eFUnit )
     {
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 4b00f3289338..fbe40bebdad0 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -137,7 +137,7 @@ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) :
 
     FreeResource();
 
-    const FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs );
+    const FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
     SetFieldUnit( aMtrFldLineDist, eFUnit );
     SetFieldUnit( aMtrFldHelplineOverhang, eFUnit );
     SetFieldUnit( aMtrFldHelplineDist, eFUnit );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 22c13efa37ab..a051189fcffe 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -43,18 +43,18 @@
 #include <i18npool/mslangid.hxx>
 #include <svtools/valueset.hxx>
 #include <helpid.hrc>
-#include <svx/numitem.hxx>
+#include <editeng/numitem.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/gallery.hxx>
 #include <svl/urihelper.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/msgbox.hxx>
 #include "cuicharmap.hxx"
-#include <svx/flstitem.hxx>
+#include <editeng/flstitem.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
@@ -62,7 +62,7 @@
 #include <svx/htmlmode.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -76,7 +76,7 @@
 
 #include <algorithm>
 #include <vector>
-#include "svx/opengrf.hxx"
+#include "sfx2/opengrf.hxx"
 
 #include <cuires.hrc> //CHINA001
 #include <sfx2/request.hxx> //CHINA001
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 27db31f684fa..94b72612666a 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -50,22 +50,24 @@
 #include "helpid.hrc"
 #include "page.hxx"
 #include <svx/pageitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/shaditem.hxx>
-#include <svx/pbinitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/frmdiritem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/pbinitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/frmdiritem.hxx>
 #include "svx/dlgutil.hxx"
 #include <dialmgr.hxx>
-#include <svx/paperinf.hxx>
+#include <editeng/paperinf.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/module.hxx>
 #include <svl/stritem.hxx>
-#include <svx/dialmgr.hxx>  // for RID_SVXSTR_PAPERBIN...
-#include <svx/dialogs.hrc>  // for RID_SVXSTR_PAPERBIN..., RID_SVXPAGE_PAGE
+#include <svx/dialogs.hrc>  // for RID_SVXPAGE_PAGE
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc> // for RID_SVXSTR_PAPERBIN...,
+#include <svx/svxids.hrc>
 
 // #i4219#
 #include <svtools/optionsdrawinglayer.hxx>
@@ -347,7 +349,7 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
     }
     Init_Impl();
 
-    FieldUnit eFUnit = GetModuleFieldUnit( &rAttr );
+    FieldUnit eFUnit = GetModuleFieldUnit( rAttr );
     SetFieldUnit( aLeftMarginEdit, eFUnit );
     SetFieldUnit( aRightMarginEdit, eFUnit );
     SetFieldUnit( aTopMarginEdit, eFUnit );
@@ -547,7 +549,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
     String aBinName;
 
     if ( PAPERBIN_PRINTER_SETTINGS  == nPaperBin )
-        aBinName = SVX_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS );
+        aBinName = EE_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS );
     else
         aBinName = pImpl->mpDefPrinter->GetPaperBinName( (USHORT)nPaperBin );
 
@@ -1000,10 +1002,10 @@ IMPL_LINK( SvxPageDescPage, PaperBinHdl_Impl, ListBox *, EMPTYARG )
     aPaperTrayBox.SetUpdateMode( FALSE );
     aPaperTrayBox.Clear();
     USHORT nEntryPos = aPaperTrayBox.InsertEntry(
-        SVX_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS ) );
+        EE_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS ) );
     aPaperTrayBox.SetEntryData( nEntryPos,
         (void*)(ULONG)PAPERBIN_PRINTER_SETTINGS );
-    String aPaperBin( SVX_RES( RID_SVXSTR_PAPERBIN ) );
+    String aPaperBin( EditResId( RID_SVXSTR_PAPERBIN ) );
     USHORT nBinCount = pImpl->mpDefPrinter->GetPaperBinCount();
 
     for ( USHORT i = 0; i < nBinCount; ++i )
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 4c2a1446755c..d82af221450f 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -41,27 +41,27 @@
 #define _SVX_PARAGRPH_CXX   0
 
 #include <svl/languageoptions.hxx>
-#include <svx/pgrditem.hxx>
+#include <editeng/pgrditem.hxx>
 #include <cuires.hrc>
 #include "paragrph.hrc"
 #include "paragrph.hxx"
-#include <svx/frmdiritem.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/orphitem.hxx>
-#include <svx/widwitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/pmdlitem.hxx>
-#include <svx/spltitem.hxx>
-#include <svx/hyznitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/brkitem.hxx>
-#include <svx/keepitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/orphitem.hxx>
+#include <editeng/widwitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/pmdlitem.hxx>
+#include <editeng/spltitem.hxx>
+#include <editeng/hyznitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/brkitem.hxx>
+#include <editeng/keepitem.hxx>
 #include "svx/dlgutil.hxx"
 #include <dialmgr.hxx>
 #include "svx/htmlmode.hxx"
-#include <svx/paravertalignitem.hxx>
+#include <editeng/paravertalignitem.hxx>
 #include <svl/eitem.hxx> //add CHINA001
 #include <sfx2/request.hxx> //add CHINA001
 #include <svl/intitem.hxx> //add CHINA001
@@ -440,7 +440,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet )
     String aEmpty;
 
     // Metrik einstellen
-    FieldUnit eFUnit = GetModuleFieldUnit( &rSet );
+    FieldUnit eFUnit = GetModuleFieldUnit( rSet );
     SetFieldUnit( aLeftIndent, eFUnit );
     SetFieldUnit( aRightIndent, eFUnit );
     SetFieldUnit( aFLineIndent, eFUnit );
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 488eb057418f..0906a49d8937 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -589,7 +589,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rIn
     m_bIsInRightToLeft(false)
 {
     FreeResource();
-    FieldUnit eDlgUnit = GetModuleFieldUnit( &rInAttrs );
+    FieldUnit eDlgUnit = GetModuleFieldUnit( rInAttrs );
     SetFieldUnit( m_aHoriByMF, eDlgUnit, TRUE );
     SetFieldUnit( m_aVertByMF, eDlgUnit, TRUE );
     SetFieldUnit( m_aWidthMF , eDlgUnit, TRUE );
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 12b6fd870419..52e26830fc3b 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -43,7 +43,7 @@
 
 #include <cuires.hrc>
 #include "tabstpge.hrc"
-#include <svx/lrspitem.hxx>
+#include <editeng/lrspitem.hxx>
 #include "tabstpge.hxx"
 #include <dialmgr.hxx>
 #include "svx/dlgutil.hxx"
@@ -153,7 +153,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
 
 
     // Metrik einstellen
-    FieldUnit eFUnit = GetModuleFieldUnit( &rAttr );
+    FieldUnit eFUnit = GetModuleFieldUnit( rAttr );
     SetFieldUnit( aTabBox, eFUnit );
 
     // Buttons initialisieren
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 3c7bdbcd4653..07604a8a8bc0 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -140,7 +140,7 @@ SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& r
 {
     FreeResource();
 
-    eFUnit = GetModuleFieldUnit( &rInAttrs );
+    eFUnit = GetModuleFieldUnit( rInAttrs );
     SfxItemPool* pPool = rOutAttrs.GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool" );
     eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST );
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 6c81356cb334..2bf4b6a4f359 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -57,7 +57,7 @@
 #include "svx/dlgutil.hxx"
 #include <sfx2/request.hxx> //add CHINA001
 #include <svx/ofaitem.hxx> //add CHINA001
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 
 static USHORT pRanges[] =
 {
@@ -133,7 +133,7 @@ SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs )
 {
     FreeResource();
 
-    FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs );
+    FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
     SetFieldUnit( aMtrFldLeft, eFUnit );
     SetFieldUnit( aMtrFldRight, eFUnit );
     SetFieldUnit( aMtrFldTop, eFUnit );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index ddeb02a20c1d..ec156bb5e654 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -712,7 +712,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
     SetExchangeSupport();
 
     // set Metrics
-    eFUnit = GetModuleFieldUnit( &rInAttrs );
+    eFUnit = GetModuleFieldUnit( rInAttrs );
 
     switch ( eFUnit )
     {
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index f34afb49a823..3719f260a7fa 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -73,7 +73,7 @@
 //#include "dlgname.hrc"
 #include <svx/svxdlg.hxx> //CHINA001
 #include <dialmgr.hxx>
-#include "svx/opengrf.hxx"
+#include "sfx2/opengrf.hxx"
 
 #define DLGWIN this->GetParent()->GetParent()
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 006099f1fde6..f93056e10028 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -117,7 +117,7 @@ SvxHatchTabPage::SvxHatchTabPage
     SetExchangeSupport();
 
     // Metrik einstellen
-    FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs );
+    FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
 
     switch ( eFUnit )
     {
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 09a5daadfe1d..e63657ea6e35 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -35,7 +35,7 @@
 
 #ifndef _SVX_SIZEITEM_HXX //autogen
 
-#include <svx/sizeitem.hxx>
+#include <editeng/sizeitem.hxx>
 #endif
 #include <tools/shl.hxx>
 #include <tools/urlobj.hxx>
@@ -64,14 +64,14 @@
 #include <svx/svdmodel.hxx>
 #include <svx/numvset.hxx>
 #include <vcl/msgbox.hxx>
-#include <svx/numitem.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/svxenum.hxx>
 #include <sfx2/objsh.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <svx/gallery.hxx>
 #include <svx/xbitmap.hxx>
 #include <unotools/localfilehelper.hxx>
-#include "svx/opengrf.hxx"
+#include "sfx2/opengrf.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
@@ -174,7 +174,7 @@ SvxLineTabPage::SvxLineTabPage
     SetExchangeSupport();
 
     // Metrik einstellen
-    FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs );
+    FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
 
     switch ( eFUnit )
     {
@@ -1555,7 +1555,6 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
 
         PopupMenu* pPopup = new PopupMenu;
         String aEmptyStr;
-        SfxObjectShell *pDocSh = SfxObjectShell::Current();
 
         nNumMenuGalleryItems=aGrfNames.Count();
         for(long i = 0; i < nNumMenuGalleryItems; i++)
@@ -1575,7 +1574,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
             pInfo->pBrushItem = pBrushItem;
             pInfo->nItemId = (UINT16)(MN_GALLERY_ENTRY + i);
             aGrfBrushItems.Insert(pInfo, i);
-            const Graphic* pGraphic = pBrushItem->GetGraphic(pDocSh);
+            const Graphic* pGraphic = pBrushItem->GetGraphic();
 
             if(pGraphic)
             {
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index f3d92be73278..e39fe7652e9b 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -122,7 +122,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
     SetExchangeSupport();
 
     // Metrik einstellen
-    eFUnit = GetModuleFieldUnit( &rInAttrs );
+    eFUnit = GetModuleFieldUnit( rInAttrs );
 
     switch ( eFUnit )
     {
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 48d6d627230d..d5e30a087190 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -100,7 +100,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
     SetExchangeSupport();
 
     // Metrik einstellen
-    FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs );
+    FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
 
     switch ( eFUnit )
     {
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 57e82898a947..b71fe2b2af56 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -43,12 +43,12 @@
 #include <svx/dialogs.hrc>
 #include <cuires.hrc>
 #include "transfrm.hrc"
-#include <svx/sizeitem.hxx>
+#include <editeng/sizeitem.hxx>
 
 #include "transfrm.hxx"
 #include <dialmgr.hxx>
 #include "svx/dlgutil.hxx"
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include "svx/anchorid.hxx"
 #include <sfx2/module.hxx>
 #include <svl/rectitem.hxx>
@@ -259,7 +259,7 @@ SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs  )
 void SvxAngleTabPage::Construct()
 {
     DBG_ASSERT(pView, "No valid view (!)");
-    eDlgUnit = GetModuleFieldUnit(&GetItemSet());
+    eDlgUnit = GetModuleFieldUnit(GetItemSet());
     SetFieldUnit(aMtrPosX, eDlgUnit, TRUE);
     SetFieldUnit(aMtrPosY, eDlgUnit, TRUE);
 
@@ -545,7 +545,7 @@ void SvxSlantTabPage::Construct()
 {
     // get the range
     DBG_ASSERT(pView, "no valid view (!)");
-    eDlgUnit = GetModuleFieldUnit(&GetItemSet());
+    eDlgUnit = GetModuleFieldUnit(GetItemSet());
     SetFieldUnit(aMtrRadius, eDlgUnit, TRUE);
 
     { // #i75273#
@@ -776,7 +776,7 @@ void SvxPositionSizeTabPage::Construct()
 {
     // get range and work area
     DBG_ASSERT( mpView, "no valid view (!)" );
-    meDlgUnit = GetModuleFieldUnit( &GetItemSet() );
+    meDlgUnit = GetModuleFieldUnit( GetItemSet() );
     SetFieldUnit( maMtrPosX, meDlgUnit, TRUE );
     SetFieldUnit( maMtrPosY, meDlgUnit, TRUE );
     SetFieldUnit( maMtrWidth, meDlgUnit, TRUE );