diff options
68 files changed, 271 insertions, 335 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index b29702a42489..82999fa71e4b 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -164,46 +164,46 @@ #define ITEMID_BRUSH 0 #include "svl/srchitem.hxx" -#include "svx/flstitem.hxx" -#include "svx/fontitem.hxx" -#include "svx/postitem.hxx" -#include "svx/wghtitem.hxx" -#include "svx/fhgtitem.hxx" -#include "svx/fwdtitem.hxx" -#include "svx/udlnitem.hxx" -#include "svx/crsditem.hxx" -#include "svx/shdditem.hxx" -#include "svx/akrnitem.hxx" -#include "svx/wrlmitem.hxx" -#include "svx/cntritem.hxx" -#include "svx/prszitem.hxx" -#include "svx/colritem.hxx" -#include "svx/cscoitem.hxx" -#include "svx/kernitem.hxx" - -#include "svx/cmapitem.hxx" -#include "svx/escpitem.hxx" -#include "svx/langitem.hxx" -#include "svx/nlbkitem.hxx" -#include "svx/nhypitem.hxx" -#include "svx/lcolitem.hxx" -#include "svx/blnkitem.hxx" - -#include "svx/pbinitem.hxx" -#include "svx/sizeitem.hxx" -#include "svx/lrspitem.hxx" -#include "svx/ulspitem.hxx" -#include "svx/prntitem.hxx" -#include "svx/opaqitem.hxx" -#include "svx/protitem.hxx" -#include "svx/shaditem.hxx" -#include "svx/boxitem.hxx" -#include "svx/brkitem.hxx" -#include "svx/keepitem.hxx" -#include "svx/bolnitem.hxx" -#include "svx/brshitem.hxx" +#include "editeng/flstitem.hxx" +#include "editeng/fontitem.hxx" +#include "editeng/postitem.hxx" +#include "editeng/wghtitem.hxx" +#include "editeng/fhgtitem.hxx" +#include "editeng/fwdtitem.hxx" +#include "editeng/udlnitem.hxx" +#include "editeng/crsditem.hxx" +#include "editeng/shdditem.hxx" +#include "editeng/akrnitem.hxx" +#include "editeng/wrlmitem.hxx" +#include "editeng/cntritem.hxx" +#include "editeng/prszitem.hxx" +#include "editeng/colritem.hxx" +#include "editeng/cscoitem.hxx" +#include "editeng/kernitem.hxx" + +#include "editeng/cmapitem.hxx" +#include "editeng/escpitem.hxx" +#include "editeng/langitem.hxx" +#include "editeng/nlbkitem.hxx" +#include "editeng/nhypitem.hxx" +#include "editeng/lcolitem.hxx" +#include "editeng/blnkitem.hxx" + +#include "editeng/pbinitem.hxx" +#include "editeng/sizeitem.hxx" +#include "editeng/lrspitem.hxx" +#include "editeng/ulspitem.hxx" +#include "editeng/prntitem.hxx" +#include "editeng/opaqitem.hxx" +#include "editeng/protitem.hxx" +#include "editeng/shaditem.hxx" +#include "editeng/boxitem.hxx" +#include "editeng/brkitem.hxx" +#include "editeng/keepitem.hxx" +#include "editeng/bolnitem.hxx" +#include "editeng/brshitem.hxx" #include "svx/xmlsecctrl.hxx" -#include "svx/unolingu.hxx" +#include "editeng/unolingu.hxx" #include "xmlscript/xmldlg_imexp.hxx" diff --git a/basctl/sdi/basslots.hrc b/basctl/sdi/basslots.hrc index ca42723efeff..5fc716399614 100644 --- a/basctl/sdi/basslots.hrc +++ b/basctl/sdi/basslots.hrc @@ -29,4 +29,4 @@ ************************************************************************/ #include <svx/svxids.hrc> - +#include <editeng/memberids.hrc> diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 4dd0dbd2aeca..c2c89e12c048 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -33,7 +33,7 @@ #include <ide_pch.hxx> - +#include <svx/svxids.hrc> #define GLOBALOVERFLOW2 diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index fb73babe54a5..c2e954a26319 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -48,7 +48,7 @@ #include "localizationmgr.hxx" #include "managelang.hxx" #include "dlgresid.hrc" -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svtools/langtab.hxx> diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index d33310b6e339..92682768337e 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -64,7 +64,7 @@ #include <helpid.hrc> #include <bastype2.hxx> #include <svx/svdview.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx index 60432ef4745f..f1029890f550 100644 --- a/basctl/source/basicide/ide_pch.hxx +++ b/basctl/source/basicide/ide_pch.hxx @@ -29,6 +29,9 @@ ************************************************************************/ #include <svheader.hxx> +#define ITEMID_SEARCH 0 +#define ITEMID_SIZE 0 + #include <vcl/wrkwin.hxx> #include <vcl/msgbox.hxx> #include <vcl/menu.hxx> @@ -38,6 +41,8 @@ #include <svl/aeitem.hxx> #include <svl/stritem.hxx> #include <svl/whiter.hxx> +#include <svl/intitem.hxx> +#include <svl/srchitem.hxx> #define _BASIC_TEXTPORTIONS #include <basic/sbdef.hxx> @@ -63,86 +68,6 @@ #include <sfx2/dinfdlg.hxx> #include <sfx2/docfac.hxx> #include <sfx2/progress.hxx> +#include <editeng/sizeitem.hxx> -#define ITEMID_FONT 0 -#define ITEMID_POSTURE 0 -#define ITEMID_WEIGHT 0 -#define ITEMID_SHADOWED 0 -#define ITEMID_CONTOUR 0 -#define ITEMID_CROSSEDOUT 0 -#define ITEMID_UNDERLINE 0 -#define ITEMID_FONTHEIGHT 0 -#define ITEMID_COLOR 0 -#define ITEMID_ADJUST 0 -#define ITEMID_LINESPACING 0 -#define ITEMID_TABSTOP 0 -#define ITEMID_LRSPACE 0 -#define ITEMID_ULSPACE 0 -#define ITEMID_SEARCH 0 -#define ITEMID_SEARCH 0 -#define ITEMID_SIZE 0 -#define ITEMID_FONTLIST 0 -#define ITEMID_AUTOKERN 0 -#define ITEMID_WORDLINEMODE 0 -#define ITEMID_PROPSIZE 0 -#define ITEMID_CHARSETCOLOR 0 -#define ITEMID_KERNING 0 -#define ITEMID_CASEMAP 0 -#define ITEMID_ESCAPEMENT 0 -#define ITEMID_LANGUAGE 0 -#define ITEMID_NOLINEBREAK 0 -#define ITEMID_NOHYPHENHERE 0 -#define ITEMID_BLINK 0 -#define ITEMID_PAPERBIN 0 -#define ITEMID_PRINT 0 -#define ITEMID_OPAQUE 0 -#define ITEMID_PROTECT 0 -#define ITEMID_SHADOW 0 -#define ITEMID_BOX 0 -#define ITEMID_BOXINFO 0 -#define ITEMID_FMTBREAK 0 -#define ITEMID_FMTKEEP 0 -#define ITEMID_LINE 0 -#define ITEMID_BRUSH 0 - -#include <svl/srchitem.hxx> -#include <svx/flstitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/postitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/fwdtitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/shdditem.hxx> -#include <svx/akrnitem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/prszitem.hxx> -#include <svx/colritem.hxx> -#include <svx/cscoitem.hxx> -#include <svx/kernitem.hxx> - -#include <svx/cmapitem.hxx> -#include <svx/escpitem.hxx> -#include <svx/langitem.hxx> -#include <svx/nlbkitem.hxx> -#include <svx/nhypitem.hxx> -#include <svx/lcolitem.hxx> -#include <svx/blnkitem.hxx> - -#include <svx/pbinitem.hxx> -#include <svx/sizeitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/prntitem.hxx> -#include <svx/opaqitem.hxx> -#include <svx/protitem.hxx> -#include <svx/shaditem.hxx> -#include <svx/boxitem.hxx> -#include <svx/brkitem.hxx> -#include <svx/keepitem.hxx> -#include <svx/bolnitem.hxx> -#include <svx/brshitem.hxx> - diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index d1ba13209147..8f797c87bdeb 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -56,7 +56,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <unotools/localedatawrapper.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svtools/langtab.hxx> diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk index 0f2a919ff655..de2514e0ff78 100644 --- a/basctl/util/makefile.mk +++ b/basctl/util/makefile.mk @@ -54,6 +54,7 @@ SHL1TARGET= basctl$(DLLPOSTFIX) SHL1IMPLIB= basctl SHL1BASE = 0x1d800000 SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFX2LIB) \ diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index a583a708c8b0..ae82dde312ea 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -46,8 +46,8 @@ #include <unotools/lingucfg.hxx> #include <svtools/textdata.hxx> #include <svtools/filter.hxx> -#include <svx/unolingu.hxx> -#include <svx/splwrap.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/splwrap.hxx> #include <linguistic/lngprops.hxx> #include <linguistic/misc.hxx> #include <comphelper/processfactory.hxx> @@ -60,12 +60,11 @@ #include <vcl/help.hxx> #include <vcl/graph.hxx> #include <osl/file.hxx> -#include <svx/impgrf.hxx> #include <cuires.hrc> #include <helpid.hrc> #include "SpellDialog.hrc" #include <svx/optitems.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <svx/SpellDialogChildWindow.hxx> #include "SpellDialog.hxx" #include <svx/dlgutil.hxx> @@ -888,7 +887,7 @@ static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl ) osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); Graphic aGraphic; const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) ); - if( GRFILTER_OK == LoadGraphic( aTmp, aFilterName, aGraphic ) ) + if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic ) ) { aRes = Image( aGraphic.GetBitmapEx() ); } diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index d1781e83348f..a2fb122f8169 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -34,7 +34,7 @@ #include <vcl/ctrl.hxx> #include <svtools/stdctrl.hxx> #include <vcl/edit.hxx> -#include <svx/svxbox.hxx> +#include <svtools/svxbox.hxx> #ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> #endif diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 83dc06e606a3..ac312730a30d 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -53,7 +53,7 @@ #include <sfx2/request.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/app.hxx> -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #include "charmap.hrc" #include "macroass.hxx" diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 426d6fef86ea..5f6ced04de8e 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -39,7 +39,7 @@ #include <avmedia/mediawindow.hxx> #include <unotools/pathoptions.hxx> #include <svx/opengrf.hxx> -#include <svx/impgrf.hxx> +#include <svtools/filter.hxx> #include <svx/gallery1.hxx> #include <svx/galtheme.hxx> #include "cuigaldlg.hxx" @@ -856,7 +856,7 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& void TPGalleryThemeProperties::FillFilterList() { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); String aExt; String aName; FilterEntry* pFilterEntry; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index afef3c1edb5f..018184cc46f9 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -53,7 +53,7 @@ #include <comphelper/processfactory.hxx> -#define HHC HangulHanjaConversion +#define HHC editeng::HangulHanjaConversion #define LINE_CNT static_cast< USHORT >(2) //............................................................................. @@ -604,7 +604,7 @@ namespace svx m_pPlayground->GetButton( SvxCommonLinguisticControl::eOptions )->Show(); // m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true ); - if ( HangulHanjaConversion::eHangulToHanja == _ePrimaryDirection ) + if ( editeng::HangulHanjaConversion::eHangulToHanja == _ePrimaryDirection ) { // m_aHanjaOnly.Enable( sal_False ); m_pIgnoreNonPrimary = &m_aHangulOnly; diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index dca6c2ff6dcd..b3c3e85b6f10 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -38,12 +38,12 @@ #include <vcl/msgbox.hxx> #include "cuires.hrc" #include "hyphen.hrc" -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include "hyphen.hxx" -#include <svx/splwrap.hxx> +#include <editeng/splwrap.hxx> #include <svx/dlgutil.hxx> #include <svx/dialmgr.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svtools/langtab.hxx> #include "dialmgr.hxx" diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 5b28029920cc..6b9f01fb9976 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -43,7 +43,7 @@ #include "srchxtra.hrc" #include <svx/svxitems.hrc> // RID_ATTR_BEGIN #include <svx/dialmgr.hxx> // item resources -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include "chardlg.hxx" #include "paragrph.hxx" #include <dialmgr.hxx> diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 5cd53e5521c6..6ac180501947 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -44,11 +44,12 @@ #include <svx/svxerr.hxx> #include "cuires.hrc" #include "thesdlg.hrc" -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/langbox.hxx> #include <svtools/langtab.hxx> #include "dialmgr.hxx" #include <svx/dialogs.hrc> +#include <editeng/editerr.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index d781333f9d47..2be763439401 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -274,12 +274,12 @@ void AbstractHangulHanjaConversionDialog_Impl::SetByCharacter( sal_Bool _bByChar pDlg->SetByCharacter(_bByCharacter); } -void AbstractHangulHanjaConversionDialog_Impl::SetConversionDirectionState( sal_Bool _bTryBothDirections, HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) +void AbstractHangulHanjaConversionDialog_Impl::SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) { pDlg->SetConversionDirectionState(_bTryBothDirections, _ePrimaryConversionDirection); } -void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormat( HangulHanjaConversion::ConversionFormat _eType ) +void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) { pDlg->SetConversionFormat(_eType); } @@ -328,7 +328,7 @@ sal_Bool AbstractHangulHanjaConversionDialog_Impl::GetUseBothDirections( ) const return pDlg->GetUseBothDirections(); } -HangulHanjaConversion::ConversionDirection AbstractHangulHanjaConversionDialog_Impl::GetDirection( HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const +editeng::HangulHanjaConversion::ConversionDirection AbstractHangulHanjaConversionDialog_Impl::GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const { return pDlg->GetDirection( _eDefaultDirection ); } @@ -345,7 +345,7 @@ String AbstractHangulHanjaConversionDialog_Impl::GetCurrentString( ) const { return pDlg->GetCurrentString(); } -HangulHanjaConversion::ConversionFormat AbstractHangulHanjaConversionDialog_Impl::GetConversionFormat( ) const +editeng::HangulHanjaConversion::ConversionFormat AbstractHangulHanjaConversionDialog_Impl::GetConversionFormat( ) const { return pDlg->GetConversionFormat(); } @@ -1135,7 +1135,7 @@ AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeD } AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(Window* pParent, - HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) + editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) { HangulHanjaConversionDialog* pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection); return new AbstractHangulHanjaConversionDialog_Impl( pDlg ); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 5773cb8292dd..f6189c9b486f 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -163,8 +163,8 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver virtual void EndDialog(long nResult = 0); virtual void EnableRubySupport( sal_Bool _bVal ); virtual void SetByCharacter( sal_Bool _bByCharacter ) ; - virtual void SetConversionDirectionState( sal_Bool _bTryBothDirections, HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); - virtual void SetConversionFormat( HangulHanjaConversion::ConversionFormat _eType ); + virtual void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); + virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ); virtual void SetOptionsChangedHdl( const Link& _rHdl ); virtual void SetIgnoreHdl( const Link& _rHdl ); virtual void SetIgnoreAllHdl( const Link& _rHdl ) ; @@ -174,14 +174,14 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) ; virtual void SetFindHdl( const Link& _rHdl ); virtual sal_Bool GetUseBothDirections( ) const; - virtual HangulHanjaConversion::ConversionDirection GetDirection( HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const; + virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const; virtual void SetCurrentString( const String& _rNewString, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, bool _bOriginatesFromDocument = true ); virtual String GetCurrentString( ) const ; - virtual HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const ; + virtual editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const ; virtual void FocusSuggestion( ); virtual String GetCurrentSuggestion( ) const; }; @@ -649,7 +649,7 @@ public: virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::SvLinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 ); virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001 - HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); + editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, const String &rWord, sal_Int16 nLanguage ); diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 86c41d17452e..dd352fcab91e 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -45,13 +45,13 @@ #include <com/sun/star/uno/Reference.hxx> -#include <svx/svxbox.hxx> +#include <svtools/svxbox.hxx> #include <svx/langbox.hxx> #include <memory> #include <svtools/svmedit.hxx> #include <svl/lstner.hxx> #include <svtools/xtextedt.hxx> -#include <svx/SpellPortions.hxx> +#include <editeng/SpellPortions.hxx> class ScrollBar; class TextEngine; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 6c87b8003479..3d9875e43e47 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -37,9 +37,9 @@ #include <vcl/fixed.hxx> #include <vcl/scrbar.hxx> #include <svx/checklbx.hxx> -#include <svx/hangulhanja.hxx> +#include <editeng/hangulhanja.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <com/sun/star/linguistic2/XConversionDictionaryList.hpp> #include <svtools/valueset.hxx> @@ -146,7 +146,7 @@ namespace svx public: HangulHanjaConversionDialog( Window* _pParent, - HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); + editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); ~HangulHanjaConversionDialog( ); public: @@ -173,20 +173,20 @@ namespace svx // retrieves the current suggestion String GetCurrentSuggestion( ) const; - void SetConversionFormat( HangulHanjaConversion::ConversionFormat _eType ); - HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const; + void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ); + editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const; void SetByCharacter( sal_Bool _bByCharacter ); sal_Bool GetByCharacter( ) const; - void SetConversionDirectionState( sal_Bool _bTryBothDirections, HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); + void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); // should text which does not match the primary conversion direction be ignored? sal_Bool GetUseBothDirections( ) const; // get current conversion direction to use // (return argument if GetUseBothDirections is true) - HangulHanjaConversion::ConversionDirection GetDirection( HangulHanjaConversion::ConversionDirection eDefaultDirection ) const; + editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection eDefaultDirection ) const; // enables or disbales the checkboxes for ruby formatted replacements void EnableRubySupport( sal_Bool bVal ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index a5d8a212d48e..342a7ee6609a 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -40,7 +40,7 @@ #include <vcl/edit.hxx> #include <vcl/field.hxx> #ifndef _SVX_NUMDEF_HXX -#include <svx/numdef.hxx> +#include <editeng/numdef.hxx> #endif #include <svtools/ctrlbox.hxx> #include <svl/svarray.hxx> diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index c05b0b778c58..cc469c539416 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -91,7 +91,7 @@ private: DECL_LINK( PathHdl_Impl, PushButton * ); DECL_LINK( StandardHdl_Impl, PushButton * ); - DECL_LINK( PathSelect_Impl, OptHeaderTabListBox * ); + DECL_LINK( PathSelect_Impl, svx::OptHeaderTabListBox * ); DECL_LINK( HeaderSelect_Impl, HeaderBar * ); DECL_LINK( HeaderEndDrag_Impl, HeaderBar * ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 1b716aedfd46..c83f8e634f7e 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -39,7 +39,7 @@ #include <svtools/stdctrl.hxx> #include <svx/pagectrl.hxx> #include <svx/frmdirlbox.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <i18npool/paper.hxx> #include <svx/flagsdef.hxx> diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 66d432ea37b4..d22416ad915c 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -38,7 +38,7 @@ #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> -#include <svx/tstpitem.hxx> +#include <editeng/tstpitem.hxx> #include <svx/flagsdef.hxx> // forward --------------------------------------------------------------- diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index caddf1b729dc..b2da78b05199 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -59,7 +59,7 @@ #include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <optjsearch.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include "backgrnd.hxx" diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 0bbf0ac287bd..8a6057416773 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -32,8 +32,8 @@ #include "precompiled_cui.hxx" #include <optasian.hxx> -#include <svx/langitem.hxx> -#include <svx/unolingu.hxx> +#include <editeng/langitem.hxx> +#include <editeng/unolingu.hxx> #include <optasian.hrc> #include <dialmgr.hxx> #include <cuires.hrc> diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index e56089dd351e..edfbface5aba 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/dlgutil.hxx> #include <sfx2/sfxuno.hxx> #include <svl/eitem.hxx> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index cb9da902c050..0205539a86c6 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -69,12 +69,13 @@ #include <svx/dlgutil.hxx> #include "cuitabarea.hxx" #include <cuires.hrc> -#include <svx/unolingu.hxx> -#include <svx/langitem.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/langitem.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> - - +#include <editeng/editids.hrc> +#include <svx/svxids.hrc> +#include <svl/intitem.hxx> #include <dialmgr.hxx> #include <svtools/helpopt.hxx> #include <unotools/saveopt.hxx> diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 85c0d450cc47..6f62f0962db4 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -36,6 +36,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <unotools/saveopt.hxx> +#include <svl/intitem.hxx> #define _SVX_OPTGENRL_CXX diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 7ca67a553278..1dee201213ba 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -40,7 +40,7 @@ #include <tools/dynary.hxx> #include <i18npool/mslangid.hxx> #include <unotools/lingucfg.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/dlgutil.hxx> #include <linguistic/lngprops.hxx> #include <linguistic/misc.hxx> diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 3d0f4d82a68d..cd813216ab28 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -55,8 +55,8 @@ #include <unotools/configitem.hxx> #include <sfx2/objsh.hxx> #include <comphelper/types.hxx> -#include <svx/unolingu.hxx> -#include <svx/langitem.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/langitem.hxx> #include "cuioptgenrl.hxx" #include "optpath.hxx" #include "optsave.hxx" diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 8e004b54b018..b9bd1c52d549 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -256,7 +256,7 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : Size aHeadSize = pHeaderBar->GetSizePixel(); WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP; - pPathBox = new OptHeaderTabListBox( &aPathCtrl, nBits ); + pPathBox = new svx::OptHeaderTabListBox( &aPathCtrl, nBits ); aPathCtrl.SetFocusControl( pPathBox ); pPathBox->SetWindowBits( nBits ); pPathBox->SetDoubleClickHdl( aLink ); @@ -409,7 +409,7 @@ void SvxPathTabPage::FillUserData() // ----------------------------------------------------------------------- -IMPL_LINK( SvxPathTabPage, PathSelect_Impl, OptHeaderTabListBox *, EMPTYARG ) +IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG ) /* [Beschreibung] diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index b45a19af4a70..c35738807ee7 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -113,7 +113,7 @@ #include "treeopt.hxx" #include "treeopt.hrc" #include "fontsubs.hxx" -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/xtable.hxx> #include "connpoolconfig.hxx" #include "dbregister.hxx" @@ -123,7 +123,7 @@ #ifndef _SVX_LANGITEM_HXX #define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #endif 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 58393bfb674b..4cff912e5fd5 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 <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 ); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 955e297f6515..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> 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/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index d32b264c3715..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> diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 22c13efa37ab..01fae6d60adc 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> diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 2b9a508e060c..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> @@ -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 5722f2e9d279..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 diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index a00a697eaae3..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" diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index b008fbe5b625..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[] = { diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 84410641305f..75dcfe28dab1 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,10 +64,10 @@ #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> diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 298b12b207f1..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> diff --git a/cui/util/makefile.mk b/cui/util/makefile.mk index 120b74098cce..715a138e2012 100644 --- a/cui/util/makefile.mk +++ b/cui/util/makefile.mk @@ -60,6 +60,7 @@ SHL1LIBS= \ SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(AVMEDIALIB) \ diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index c5675c3daa40..22575f404247 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -54,24 +54,24 @@ #include <com/sun/star/awt/FontStrikeout.hpp> #include "formstrings.hxx" #include "fontitemids.hxx" -#include <svx/charreliefitem.hxx> +#include <editeng/charreliefitem.hxx> #ifndef _SVX_EMPHITEM_HXX -#include <svx/emphitem.hxx> +#include <editeng/emphitem.hxx> #endif -#include <svx/fontitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/colritem.hxx> -#include <svx/flstitem.hxx> -#include <svx/langitem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/cmapitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/shdditem.hxx> -#include <svx/flstitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/flstitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/cmapitem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/flstitem.hxx> #include <svtools/ctrltool.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk index 9b9ffe47aa15..c70db079ae8f 100644 --- a/extensions/source/propctrlr/makefile.mk +++ b/extensions/source/propctrlr/makefile.mk @@ -120,6 +120,7 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1VERSIONMAP= $(TARGET).map SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx index 402323630361..a04c6fea88da 100644 --- a/forms/inc/pch/precompiled_forms.hxx +++ b/forms/inc/pch/precompiled_forms.hxx @@ -346,18 +346,18 @@ #include "svl/solar.hrc" #include "svtools/transfer.hxx" -#include "svx/editdata.hxx" -#include "svx/editeng.hxx" -#include "svx/editobj.hxx" -#include "svx/editstat.hxx" -#include "svx/editview.hxx" -#include "svx/eeitem.hxx" -#include "svx/frmdir.hxx" -#include "svx/scripttypeitem.hxx" -#include "svx/svxenum.hxx" +#include "editeng/editdata.hxx" +#include "editeng/editeng.hxx" +#include "editeng/editobj.hxx" +#include "editeng/editstat.hxx" +#include "editeng/editview.hxx" +#include "editeng/eeitem.hxx" +#include "editeng/frmdir.hxx" +#include "editeng/scripttypeitem.hxx" +#include "editeng/svxenum.hxx" #include "svx/svxids.hrc" -#include "svx/unoedsrc.hxx" -#include "svx/unofored.hxx" +#include "editeng/unoedsrc.hxx" +#include "editeng/unofored.hxx" #include "toolkit/helper/emptyfontdescriptor.hxx" diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx index e7fd029a86bd..9610bf84b10c 100644 --- a/forms/source/richtext/attributedispatcher.cxx +++ b/forms/source/richtext/attributedispatcher.cxx @@ -34,7 +34,7 @@ /** === begin UNO includes === **/ /** === end UNO includes === **/ -#include <svx/editview.hxx> +#include <editeng/editview.hxx> //........................................................................ namespace frm diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index eca90f30ddc2..3a6199abf013 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "clipboarddispatcher.hxx" -#include <svx/editview.hxx> +#include <editeng/editview.hxx> /** === begin UNO includes === **/ #include <com/sun/star/lang/DisposedException.hpp> diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index 9f6c4c15ed68..10309a986fa5 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "parametrizedattributedispatcher.hxx" -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 9150eac63e17..8cb7fb7ba0bf 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -52,7 +52,7 @@ #include <vcl/svapp.hxx> #include <svx/svxids.hrc> -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> #include <sfx2/msgpool.hxx> diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index b87d6260b723..d40396c59356 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -32,14 +32,14 @@ #include "precompiled_forms.hxx" #include "richtextengine.hxx" #include <svl/itempool.hxx> -#include <svx/eeitem.hxx> -#include <svx/editobj.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editobj.hxx> #define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT -#include <svx/fhgtitem.hxx> +#include <editeng/fhgtitem.hxx> #define ITEMID_FONT EE_CHAR_FONTHEIGHT -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #define ITEMID_LANGUAGE EE_CHAR_LANGUAGE -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <vcl/svapp.hxx> #include <vcl/mapunit.hxx> #include <vcl/mapmod.hxx> diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx index 6e0052a26da7..f7231d663bc4 100644 --- a/forms/source/richtext/richtextengine.hxx +++ b/forms/source/richtext/richtextengine.hxx @@ -30,7 +30,7 @@ #ifndef FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX #define FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <tools/link.hxx> #include <vector> diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 259197ac71d1..f2c560e51d50 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -33,16 +33,16 @@ #include "richtextimplcontrol.hxx" #include "textattributelistener.hxx" #include "richtextengine.hxx" -#include <svx/editeng.hxx> -#include <svx/editview.hxx> -#include <svx/eeitem.hxx> -#include <svx/editstat.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editstat.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svx/scripttypeitem.hxx> +#include <editeng/scripttypeitem.hxx> -#include <svx/editobj.hxx> +#include <editeng/editobj.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <vcl/mapunit.hxx> diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index 65e138b4f093..c162c977c1b2 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -34,7 +34,7 @@ #include "richtextviewport.hxx" #include "richtextengine.hxx" #include <vcl/scrbar.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <map> diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index d38b350ada32..066f083c735d 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -45,7 +45,7 @@ #include <comphelper/guarding.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx index 527fc034903c..84eac6ce544c 100644 --- a/forms/source/richtext/richtextunowrapper.cxx +++ b/forms/source/richtext/richtextunowrapper.cxx @@ -35,12 +35,12 @@ /** === begin UNO includes === **/ #include <com/sun/star/container/XNameContainer.hpp> /** === end UNO includes === **/ -#include <svx/unofored.hxx> -#include <svx/editview.hxx> -#include <svx/unoipset.hxx> +#include <editeng/unofored.hxx> +#include <editeng/editview.hxx> +#include <editeng/unoipset.hxx> #include <svx/svdpool.hxx> #include <svx/svdobj.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> //........................................................................ namespace frm diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx index 3a0e1a4aec47..af8ccde76d87 100644 --- a/forms/source/richtext/richtextunowrapper.hxx +++ b/forms/source/richtext/richtextunowrapper.hxx @@ -31,8 +31,8 @@ #ifndef FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX #define FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX -#include <svx/unotext.hxx> -#include <svx/unoedsrc.hxx> +#include <editeng/unotext.hxx> +#include <editeng/unoedsrc.hxx> //........................................................................ namespace frm diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 495a85c02162..f1648f08e905 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -53,13 +53,14 @@ #endif #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #endif -#include <svx/scripttypeitem.hxx> -#include <svx/editeng.hxx> -#include <svx/editview.hxx> -#include <svx/eeitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/fhgtitem.hxx> - +#include <editeng/scripttypeitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/editids.hrc> +#include <svx/svxids.hrc> #include <memory> //........................................................................ diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx index e85a8cf26035..c5e23b2cc607 100644 --- a/forms/source/richtext/richtextviewport.cxx +++ b/forms/source/richtext/richtextviewport.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "richtextviewport.hxx" -#include <svx/editview.hxx> +#include <editeng/editview.hxx> //........................................................................ namespace frm diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index d1090b82d914..2ebbbbd6bb4a 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -35,7 +35,7 @@ #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> #include <vcl/mapunit.hxx> @@ -43,18 +43,18 @@ #include <vcl/outdev.hxx> #define ITEMID_ADJUST EE_PARA_JUST -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #define ITEMID_WEIGHT EE_CHAR_WEIGHT -#include <svx/wghtitem.hxx> +#include <editeng/wghtitem.hxx> #define ITEMID_ESCAPEMENT EE_CHAR_ESCAPEMENT -#include <svx/escpitem.hxx> +#include <editeng/escpitem.hxx> #define ITEMID_LINESPACING EE_PARA_SBL -#include <svx/lspcitem.hxx> +#include <editeng/lspcitem.hxx> #define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT -#include <svx/fhgtitem.hxx> +#include <editeng/fhgtitem.hxx> #define ITEMID_FRAMEDIR EE_PARA_WRITINGDIR -#include <svx/frmdiritem.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/scripttypeitem.hxx> //........................................................................ namespace frm diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx index cca6723d5f7a..41db86982e4c 100644 --- a/forms/source/richtext/rtattributehandler.hxx +++ b/forms/source/richtext/rtattributehandler.hxx @@ -33,8 +33,8 @@ #include "rtattributes.hxx" #include <rtl/ref.hxx> -#include <svx/svxenum.hxx> -#include <svx/frmdir.hxx> +#include <editeng/svxenum.hxx> +#include <editeng/frmdir.hxx> class SfxItemSet; class SfxPoolItem; diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index a9176b8d3350..c9e7be22aea3 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "specialdispatchers.hxx" -#include <svx/editeng.hxx> -#include <svx/editview.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif #define ITEMID_SCRIPTSPACE SID_ATTR_PARA_SCRIPTSPACE -#include <svx/scriptspaceitem.hxx> +#include <editeng/scriptspaceitem.hxx> //........................................................................ namespace frm diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk index 1c454b1383db..a7a649473aad 100644 --- a/forms/util/makefile.mk +++ b/forms/util/makefile.mk @@ -58,6 +58,7 @@ LIB1FILES=\ SHL1TARGET=$(TARGET)$(DLLPOSTFIX) SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ |