diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-01-07 18:52:36 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-01-07 18:52:36 +0100 |
| commit | 67791d91c26061b34a0084ca4011d58a0f8ff3c5 (patch) | |
| tree | a39ec564a1d90f573a96d3cbd539fc95c8ac6cda /svx/source | |
| parent | aed3f1817f4de6314285efed1e48dc7c305e4f67 (diff) | |
#i107450#: make svx buildable with new editeng lib
Diffstat (limited to 'svx/source')
141 files changed, 529 insertions, 1501 deletions
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 8bfc618dfbd9..2ed0c19a0191 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -37,8 +37,8 @@ // //------------------------------------------------------------------------ #include <svl/itemset.hxx> -#include <svx/editdata.hxx> -#include <svx/outliner.hxx> +#include <editeng/editdata.hxx> +#include <editeng/outliner.hxx> #include <svx/svdmodel.hxx> #include <svx/svdobj.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx index d2b775321dfe..0b4e8b7fad34 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx @@ -35,7 +35,7 @@ #include <svl/lstner.hxx> #include <memory> -#include <svx/unoedsrc.hxx> +#include <editeng/unoedsrc.hxx> class SdrObject; class SdrView; diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 1eae76689e76..7385075bd34b 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -51,7 +51,7 @@ #include <vcl/svapp.hxx> #include <svx/frmsel.hxx> #include <svx/dialmgr.hxx> -#include "unolingu.hxx" +#include "editeng/unolingu.hxx" #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index eec143cb4f64..5df41fb36ced 100755 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -48,9 +48,9 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/text/XText.hpp> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <rtl/ref.hxx> -#include <svx/unoedsrc.hxx> +#include <editeng/unoedsrc.hxx> #include <svx/unoshtxt.hxx> #include <svx/svdobj.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx index 37ed65cd40a1..5d0813f232f0 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.cxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx @@ -32,16 +32,16 @@ #include "precompiled_svx.hxx" #include "AccessibleTextEventQueue.hxx" #include <svx/unoshape.hxx> -#include "unolingu.hxx" -#include <svx/unotext.hxx> +#include "editeng/unolingu.hxx" +#include <editeng/unotext.hxx> -#include "unoedhlp.hxx" -#include "unopracc.hxx" +#include "editeng/unoedhlp.hxx" +#include "editeng/unopracc.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpntv.hxx> -#include <svx/editdata.hxx> -#include <svx/editeng.hxx> -#include <svx/editview.hxx> +#include <editeng/editdata.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> namespace accessibility { diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 5b632115c93c..5944cbe0614a 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -70,18 +70,18 @@ #include "AccessibleTextEventQueue.hxx" #include <svx/AccessibleTextHelper.hxx> #include <svx/unoshape.hxx> -#include "unolingu.hxx" -#include <svx/unotext.hxx> +#include "editeng/unolingu.hxx" +#include <editeng/unotext.hxx> -#include "unoedhlp.hxx" -#include "unopracc.hxx" -#include "AccessibleParaManager.hxx" -#include "AccessibleEditableTextPara.hxx" +#include "editeng/unoedhlp.hxx" +#include "editeng/unopracc.hxx" +#include "editeng/AccessibleParaManager.hxx" +#include "editeng/AccessibleEditableTextPara.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpntv.hxx> -#include <svx/editdata.hxx> -#include <svx/editeng.hxx> -#include <svx/editview.hxx> +#include <editeng/editdata.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 77dd60808dc2..09d9bdef96b9 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -33,21 +33,16 @@ #include <svx/IAccessibleViewForwarderListener.hxx> #include <svx/IAccessibleParent.hxx> #include <svx/AccessibleShapeTreeInfo.hxx> -#include <svx/AccessibleContextBase.hxx> +#include <editeng/AccessibleContextBase.hxx> #include <cppuhelper/compbase2.hxx> #include <vos/mutex.hxx> #include <vector> +#include <memory> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/document/XEventListener.hpp> -#ifndef _COM_SUN_STAR_DOCUMENT_XSELECTIONCHANGELISTENER_HPP_ #include <com/sun/star/view/XSelectionChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBLE_XACCESSIBLE_HPP_ #include <com/sun/star/accessibility/XAccessible.hpp> -#endif -#include <vector> - using namespace ::com::sun::star; diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk index 8b1802bf1a25..053cb6c10728 100755 --- a/svx/source/accessibility/makefile.mk +++ b/svx/source/accessibility/makefile.mk @@ -33,7 +33,6 @@ PRJ=..$/.. PRJNAME=svx TARGET=accessibility -LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- @@ -43,21 +42,13 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/AccessibleStringWrap.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ +SLOFILES= \ $(SLO)$/charmapacc.obj \ $(SLO)$/svxrectctaccessiblecontext.obj \ $(SLO)$/GraphCtlAccessibleContext.obj \ $(SLO)$/ChildrenManager.obj \ $(SLO)$/ChildrenManagerImpl.obj \ $(SLO)$/DescriptionGenerator.obj \ - $(SLO)$/AccessibleContextBase.obj \ - $(SLO)$/AccessibleComponentBase.obj \ - $(SLO)$/AccessibleSelectionBase.obj \ $(SLO)$/AccessibleShape.obj \ $(SLO)$/AccessibleGraphicShape.obj \ $(SLO)$/AccessibleOLEShape.obj \ @@ -66,18 +57,12 @@ LIB2OBJFILES= \ $(SLO)$/AccessibleTextHelper.obj \ $(SLO)$/AccessibleEmptyEditSource.obj \ $(SLO)$/AccessibleTextEventQueue.obj \ - $(SLO)$/AccessibleStaticTextBase.obj \ - $(SLO)$/AccessibleParaManager.obj \ - $(SLO)$/AccessibleEditableTextPara.obj \ - $(SLO)$/AccessibleImageBullet.obj \ $(SLO)$/ShapeTypeHandler.obj \ $(SLO)$/SvxShapeTypes.obj \ $(SLO)$/AccessibleControlShape.obj \ $(SLO)$/DGColorNameLookUp.obj \ $(SLO)$/AccessibleFrameSelector.obj -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - SRS2NAME = accessibility SRC2FILES = accessibility.src diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 673e95877fcb..5e71eeff9840 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -45,8 +45,8 @@ #include <svx/svdoashp.hxx> #include <svx/svdogrp.hxx> #include <svx/svdorect.hxx> -#include <svx/outlobj.hxx> -#include <svx/outliner.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/outliner.hxx> #include <svx/svdoutl.hxx> #include <svl/itemset.hxx> #include <svx/svdopath.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index abe6178cc800..848cd8b0a3bb 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -43,19 +43,19 @@ #include <vcl/virdev.hxx> #include <svditer.hxx> #include <vcl/metric.hxx> -#include <svx/eeitem.hxx> -#include <svx/frmdiritem.hxx> -#include <fontitem.hxx> -#include <svx/postitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/charscaleitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/charscaleitem.hxx> #include "EnhancedCustomShapeTypeNames.hxx" #include <svx/svdorect.hxx> #include <svx/svdoashp.hxx> -#include <svx/outliner.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> -#include <svx/editeng.hxx> +#include <editeng/outliner.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editeng.hxx> #include <svx/svdmodel.hxx> #include <vector> #include <numeric> diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 490adac522fc..d80be975180f 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -39,7 +39,7 @@ #include <svtools/txtcmp.hxx> #include <unotools/charclass.hxx> // INCLUDE ------------------------------------------------------------------- -#include <unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/dialmgr.hxx> #include "ctredlin.hrc" #include <svx/ctredlin.hxx> diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index fb3205f4766c..75e96845e549 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -36,6 +36,7 @@ #include "dlgutil.hxx" #include <svl/itemset.hxx> #include <sfx2/sfxsids.hrc> +#include <svl/intitem.hxx> // ----------------------------------------------------------------------- diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index b5f2066ee890..49d28989529e 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -49,7 +49,7 @@ #include <svx/dialogs.hrc> #include "fontwork.hrc" #include <svx/fontwork.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index a47f0a44c6e2..6292aea4198e 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -34,7 +34,7 @@ #include <math.h> #include <vcl/outdev.hxx> -#include <svx/borderline.hxx> +#include <editeng/borderline.hxx> // ---------------------------------------------------------------------------- diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index df30e2be0213..eb4d6bb05bf7 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -42,17 +42,7 @@ #include <svx/dialogs.hrc> #include "hdft.hrc" - - - - - - - - - - - +#include <svl/intitem.hxx> #define _SVX_HDFT_CXX @@ -63,12 +53,12 @@ #include <svx/dialmgr.hxx> #include "htmlmode.hxx" -#include <svx/brshitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/shaditem.hxx> -#include <svx/sizeitem.hxx> -#include <svx/boxitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/boxitem.hxx> #include <svx/svxdlg.hxx> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 1663f5316d2f..bd68ea6d6fb0 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -44,8 +44,8 @@ #include <tools/shl.hxx> #include <i18npool/mslangid.hxx> #include <i18npool/lang.h> -#include <svx/scripttypeitem.hxx> -#include <unolingu.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/unolingu.hxx> #include <svx/langbox.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk index 0cd91e7b1f9a..d80c1cb1d040 100644 --- a/svx/source/dialog/makefile.mk +++ b/svx/source/dialog/makefile.mk @@ -60,7 +60,6 @@ SRC1FILES = \ imapdlg.src \ langbox.src \ language.src \ - lingu.src \ passwd.src \ prtqry.src \ rubydialog.src\ @@ -81,11 +80,9 @@ LIB1OBJFILES= \ $(SLO)$/dialmgr.obj\ $(SLO)$/dlgutil.obj \ $(SLO)$/framelink.obj\ - $(SLO)$/hangulhanja.obj \ $(SLO)$/langbox.obj \ $(SLO)$/opengrf.obj \ $(SLO)$/simptabl.obj \ - $(SLO)$/splwrap.obj \ $(SLO)$/svxdlg.obj \ $(SLO)$/stddlg.obj \ @@ -131,7 +128,6 @@ LIB2OBJFILES= \ $(SLO)$/srchdlg.obj \ $(SLO)$/strarray.obj \ $(SLO)$/svxbmpnumvalueset.obj\ - $(SLO)$/svxbox.obj \ $(SLO)$/svxgrahicitem.obj \ $(SLO)$/svxruler.obj \ $(SLO)$/swframeexample.obj \ diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx index c778f9ec8681..432ca7cb46ea 100644 --- a/svx/source/dialog/opengrf.cxx +++ b/svx/source/dialog/opengrf.cxx @@ -126,8 +126,6 @@ SvxOpenGraphicDialog::~SvxOpenGraphicDialog() } -GraphicFilter* GetGrfFilter(); - short SvxOpenGraphicDialog::Execute() { USHORT nImpRet; @@ -138,7 +136,7 @@ short SvxOpenGraphicDialog::Execute() { if( GetPath().Len() ) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); INetURLObject aObj( GetPath() ); // check whether we can load the graphic diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 4acb07fb27e6..4aa3c4c52237 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -35,10 +35,10 @@ #include <vcl/bitmap.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/pageitem.hxx> #include <svx/pagectrl.hxx> -#include <svx/boxitem.hxx> +#include <editeng/boxitem.hxx> #include <algorithm> diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 53e1e8bea1e9..245c61ba720e 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -42,10 +42,10 @@ #include <svx/dialogs.hrc> #include <svx/ruler.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/tstpitem.hxx> -#include "protitem.hxx" +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/tstpitem.hxx> +#include "editeng/protitem.hxx" #include "rlrcitem.hxx" #include "rulritem.hxx" #include <svl/eitem.hxx> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 9d114d74844b..109f7f5e8bce 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -53,6 +53,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> #include <comphelper/processfactory.hxx> #include <svl/itempool.hxx> +#include <svl/intitem.hxx> #include <sfx2/app.hxx> #include <toolkit/unohlp.hxx> @@ -72,7 +73,7 @@ #include "srchctrl.hxx" #include <svx/dialmgr.hxx> #include "dlgutil.hxx" -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <svx/svxdlg.hxx> //CHINA001 diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index dcfaabf0f415..81a6db032c85 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -41,17 +41,17 @@ #ifndef _SVX_HELPID_HRC #include <helpid.hrc> #endif -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> #include <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 <flstitem.hxx> +#include <editeng/flstitem.hxx> #include <dlgutil.hxx> #ifndef _XTABLE_HXX //autogen @@ -62,7 +62,7 @@ #include <htmlmode.hxx> #include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> -#include <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/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index a07cf1f254d2..36faeb3b1a86 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -52,9 +52,9 @@ #include <svx/ruler.hxx> #include "rlrcitem.hxx" #include "rulritem.hxx" -#include <svx/tstpitem.hxx> -#include <svx/lrspitem.hxx> -#include "protitem.hxx" +#include <editeng/tstpitem.hxx> +#include <editeng/lrspitem.hxx> +#include "editeng/protitem.hxx" #ifndef _APP_HXX #include <vcl/svapp.hxx> #endif diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx index c47c516b05f2..807a89f5c792 100644 --- a/svx/source/engine3d/deflt3d.cxx +++ b/svx/source/engine3d/deflt3d.cxx @@ -34,7 +34,7 @@ #include <svx/deflt3d.hxx> #include <svx/cube3d.hxx> #include <svx/svxids.hrc> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> /************************************************************************* diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx index 825ee89926ba..0c902ff9b0a0 100644 --- a/svx/source/engine3d/e3dundo.cxx +++ b/svx/source/engine3d/e3dundo.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <svx/e3dundo.hxx> #include <svx/svdmodel.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/view3d.hxx> #include <svx/scene3d.hxx> #include <svx/e3dsceneupdater.hxx> diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index b57285709f75..a70302c4ad71 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -49,9 +49,9 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/polysc3d.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/style.hxx> - +#include <dlgutil.hxx> #include <dlgutil.hxx> #include <svx/dialmgr.hxx> @@ -60,7 +60,7 @@ #include <svx/svxids.hrc> #include <svx/dialogs.hrc> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> #include <gallery.hxx> diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 25c2d1af6748..4eb517e763ff 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -60,7 +60,7 @@ #include <tools/poly.hxx> #include <tools/b3dtrans.hxx> #include <svx/svxids.hrc> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> @@ -70,7 +70,7 @@ #include <svx/svx3ditems.hxx> #include <svl/whiter.hxx> #include <svtools/colorcfg.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/xgrscit.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/e3dproperties.hxx> diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 0e2b87be4ca7..d696379ad9bd 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -45,7 +45,7 @@ #include <svx/e3dundo.hxx> #include <svx/svdtrans.hxx> #include <svx/svxids.hrc> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 06d4cf5bbe95..922ceda87a6e 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -41,7 +41,7 @@ #include <svx/svdmodel.hxx> #include <svx/svdpagv.hxx> #include <svx/svxids.hrc> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/xtable.hxx> #include <svx/svdview.hxx> #include <svx/dialogs.hrc> @@ -697,7 +697,7 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D, |* 3D-Konvertierung zu Extrude ausfuehren |* \************************************************************************/ -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj) { diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 5c4bb1c38be1..ec01f2707e07 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -44,7 +44,7 @@ #include <svx/obj3d.hxx> #include <svx/polysc3d.hxx> #include <svx/e3ditem.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/lathe3d.hxx> #include <svx/sphere3d.hxx> #include <svx/extrud3d.hxx> diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 691acb8a33e4..542154e3ca68 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -35,7 +35,7 @@ #include "fmobj.hxx" #include "fmprop.hrc" #include "fmvwimp.hxx" -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <svx/svdovirt.hxx> /** === begin UNO includes === **/ diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index b332e4a7ab40..6b4fc2badf0a 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -42,7 +42,7 @@ #ifndef _SVX_PARAGRPH_HXX //#include "paragrph.hxx" #endif -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #ifndef _SVX_TABSTPGE_HXX //#include "tabstpge.hxx" #endif diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index b5f583102981..f0bc81865401 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -36,14 +36,14 @@ #include "fmtextcontroldialogs.hxx" #include "fmtextcontrolfeature.hxx" #include "fmtextcontrolshell.hxx" -#include "svx/crsditem.hxx" +#include "editeng/crsditem.hxx" #include "svx/dialmgr.hxx" -#include "svx/editeng.hxx" -#include "svx/eeitem.hxx" +#include "editeng/editeng.hxx" +#include "editeng/eeitem.hxx" #include "svx/fmglob.hxx" -#include "svx/scriptspaceitem.hxx" +#include "editeng/scriptspaceitem.hxx" #include "svx/svxids.hrc" -#include "svx/udlnitem.hxx" +#include "editeng/udlnitem.hxx" /** === begin UNO includes === **/ #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index 4a94b165b1b6..5df0cff268c2 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -34,34 +34,35 @@ #include <sfx2/msg.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/cntritem.hxx> -#include <svx/shdditem.hxx> -#include <svx/postitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/postitem.hxx> #ifndef _SVX_CLIPBOARDCTL_HXX_ #include "clipfmtitem.hxx" #endif -#include <svx/fhgtitem.hxx> -#include "fontitem.hxx" -#include <svx/charreliefitem.hxx> -#include <svx/escpitem.hxx> -#include <svx/colritem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/charscaleitem.hxx> -#include <svx/akrnitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/langitem.hxx> -#include <svx/kernitem.hxx> -#include <svx/tstpitem.hxx> -#include <svx/adjitem.hxx> +#include <editeng/fhgtitem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/charreliefitem.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/charscaleitem.hxx> +#include <editeng/akrnitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/tstpitem.hxx> +#include <editeng/adjitem.hxx> #ifndef _SVX_EMPHITEM_HXX -#include <svx/emphitem.hxx> +#include <editeng/emphitem.hxx> #endif +#include <editeng/memberids.hrc> #define SFX_TYPEMAP #include "svxslots.hxx" diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 6e212a0ff58b..5c75ea3fc891 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -44,8 +44,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/sfxsids.hrc> -#include "svx/impgrf.hxx" -#include <svx/brshitem.hxx> +#include "svtools/filter.hxx" +#include <editeng/brshitem.hxx> #include "helpid.hrc" #include "gallery.hxx" #include "galobj.hxx" @@ -1154,7 +1154,7 @@ String GalleryBrowser2::GetFilterName() const if( ( SGA_OBJ_BMP == eObjKind ) || ( SGA_OBJ_ANIM == eObjKind ) ) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); INetURLObject aURL; mpCurTheme->GetURL( mnCurActionPos, aURL ); sal_uInt16 nFilter = pFilter->GetImportFormatNumberForShortName( aURL.GetExtension() ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 09a95bec67a2..d058d595a488 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -40,12 +40,12 @@ #include "galtheme.hxx" #include "svx/galmisc.hxx" #include "galctrl.hxx" -#include "AccessibleStringWrap.hxx" -#include <svx/svxfont.hxx> +#include "editeng/AccessibleStringWrap.hxx" +#include <editeng/svxfont.hxx> #include "galobj.hxx" #include <avmedia/mediawindow.hxx> #include "gallery.hrc" -#include <svx/impgrf.hxx> +#include <svtools/filter.hxx> // ----------- // - Defines - @@ -97,7 +97,7 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL ) } else { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); GalleryProgress aProgress( pFilter ); if( pFilter->ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) ) bRet = false; diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index bbf0771c65de..f56a556641c5 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -45,7 +45,7 @@ #include <avmedia/mediawindow.hxx> #include <vcl/svapp.hxx> -#include "svx/impgrf.hxx" +#include "svtools/filter.hxx" #include <svx/svdpage.hxx> #include <svx/svdograf.hxx> #include <svx/fmmodel.hxx> @@ -129,7 +129,7 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, if( pIStm ) { - GraphicFilter* pGraphicFilter = GetGrfFilter(); + GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); GalleryProgress* pProgress = bShowProgress ? new GalleryProgress( pGraphicFilter ) : NULL; USHORT nFormat; diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index 1158baa78f69..a3dcce3726ba 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -33,7 +33,7 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/tabdlg.hxx> -#include <flstitem.hxx> +#include <editeng/flstitem.hxx> //........................................................................ namespace svx diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index c7aeb0bc358b..c98358091954 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -35,7 +35,7 @@ #include <vcl/image.hxx> #include <svx/frmsel.hxx> #include <svx/framelinkarray.hxx> -#include <svx/borderline.hxx> +#include <editeng/borderline.hxx> namespace svx { diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 447d11f6d6ea..184932507d91 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -53,7 +53,7 @@ #include <svx/algitem.hxx> #include <svx/dialmgr.hxx> -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> #include <svx/unomid.hxx> using namespace ::rtl; diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index e16a4883693d..27a1451fac52 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -34,7 +34,7 @@ #include <tools/stream.hxx> #include <svx/grfcrop.hxx> -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> #include <com/sun/star/text/GraphicCrop.hpp> using namespace ::com::sun::star; diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk index 0c2e4b7ff5ec..8b6b023d403b 100644 --- a/svx/source/items/makefile.mk +++ b/svx/source/items/makefile.mk @@ -50,7 +50,6 @@ LIBTARGET=NO SRS1NAME=svxitems SRC1FILES = \ svxerr.src \ - page.src \ svxitems.src LIB1TARGET= $(SLB)$/$(TARGET)-core.lib diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 54eaf9b5898e..a12a4c614c00 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -36,11 +36,13 @@ #include <svx/pageitem.hxx> -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> #include <svx/unomid.hxx> #include <com/sun/star/style/PageStyleLayout.hpp> #include <com/sun/star/style/BreakType.hpp> #include <svl/itemset.hxx> +#include <svx/svxitems.hrc> +#include <svx/dialmgr.hxx> using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 658e915e4320..99af76ed8f8d 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -35,7 +35,9 @@ #define _SVX_POSTATTR_CXX #include "postattr.hxx" -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> +#include <svx/svxitems.hrc> +#include <svx/dialmgr.hxx> // ----------------------------------------------------------------------- diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src index 82ccac920e60..289fc6b6d295 100644 --- a/svx/source/items/svxerr.src +++ b/svx/source/items/svxerr.src @@ -31,6 +31,8 @@ #define __RSC #include "svxerr.hxx" #include <svx/dialogs.hrc> +#include <editeng/editerr.hxx> + // pragma ---------------------------------------------------------------- // Error-Context --------------------------------------------------------- diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src index d5188bdde22f..1f11f25da217 100644 --- a/svx/source/items/svxitems.src +++ b/svx/source/items/svxitems.src @@ -31,15 +31,6 @@ #include <svx/svxitems.hrc> // pragma ------------------------------------------------------------------- - // Value-Strings ------------------------------------------------------------ -String RID_SVXITEMS_TRUE -{ - Text [ en-US ] = "True" ; -}; -String RID_SVXITEMS_FALSE -{ - Text [ en-US ] = "False" ; -}; // Extras ------------------------------------------------------------------- String RID_SVXITEMS_EXTRAS_CHARCOLOR { @@ -110,56 +101,6 @@ String RID_SVXITEMS_SEARCHAPP_BASE { Text = "StarBase" ; }; - // enum SvxBreak ------------------------------------------------------------ -String RID_SVXITEMS_BREAK_NONE -{ - Text [ en-US ] = "No break" ; -}; -String RID_SVXITEMS_BREAK_COLUMN_BEFORE -{ - Text [ en-US ] = "Break before new column" ; -}; -String RID_SVXITEMS_BREAK_COLUMN_AFTER -{ - Text [ en-US ] = "Break after new column" ; -}; -String RID_SVXITEMS_BREAK_COLUMN_BOTH -{ - Text [ en-US ] = "Break before and after new column" ; -}; -String RID_SVXITEMS_BREAK_PAGE_BEFORE -{ - Text [ en-US ] = "Break before new page" ; -}; -String RID_SVXITEMS_BREAK_PAGE_AFTER -{ - Text [ en-US ] = "Break after new page" ; -}; -String RID_SVXITEMS_BREAK_PAGE_BOTH -{ - Text [ en-US ] = "Break before and after new page" ; -}; - // enum SvxShadowLocation --------------------------------------------------- -String RID_SVXITEMS_SHADOW_NONE -{ - Text [ en-US ] = "No Shadow" ; -}; -String RID_SVXITEMS_SHADOW_TOPLEFT -{ - Text [ en-US ] = "Shadow top left" ; -}; -String RID_SVXITEMS_SHADOW_TOPRIGHT -{ - Text [ en-US ] = "Shadow top right" ; -}; -String RID_SVXITEMS_SHADOW_BOTTOMLEFT -{ - Text [ en-US ] = "Shadow bottom left" ; -}; -String RID_SVXITEMS_SHADOW_BOTTOMRIGHT -{ - Text [ en-US ] = "Shadow bottom right" ; -}; // enum BrushStyle ---------------------------------------------------------- String RID_SVXITEMS_BRUSHSTYLE_NULL { @@ -209,460 +150,6 @@ String RID_SVXITEMS_BRUSHSTYLE_BITMAP { Text [ en-US ] = "Image" ; }; - // enum ColorName ----------------------------------------------------------- -String RID_SVXITEMS_COLOR -{ - Text [ en-US ] = "Color " ; -}; -String RID_SVXITEMS_COLOR_BLACK -{ - Text [ en-US ] = "Black" ; -}; -String RID_SVXITEMS_COLOR_BLUE -{ - Text [ en-US ] = "Blue" ; -}; -String RID_SVXITEMS_COLOR_GREEN -{ - Text [ en-US ] = "Green" ; -}; -String RID_SVXITEMS_COLOR_CYAN -{ - Text [ en-US ] = "Cyan" ; -}; -String RID_SVXITEMS_COLOR_RED -{ - Text [ en-US ] = "Red" ; -}; -String RID_SVXITEMS_COLOR_MAGENTA -{ - Text [ en-US ] = "Magenta" ; -}; -String RID_SVXITEMS_COLOR_BROWN -{ - Text [ en-US ] = "Brown" ; -}; -String RID_SVXITEMS_COLOR_GRAY -{ - Text [ en-US ] = "Gray" ; -}; -String RID_SVXITEMS_COLOR_LIGHTGRAY -{ - Text [ en-US ] = "Light Gray" ; -}; -String RID_SVXITEMS_COLOR_LIGHTBLUE -{ - Text [ en-US ] = "Light Blue" ; -}; -String RID_SVXITEMS_COLOR_LIGHTGREEN -{ - Text [ en-US ] = "Light Green" ; -}; -String RID_SVXITEMS_COLOR_LIGHTCYAN -{ - Text [ en-US ] = "Light Cyan" ; -}; -String RID_SVXITEMS_COLOR_LIGHTRED -{ - Text [ en-US ] = "Light Red" ; -}; -String RID_SVXITEMS_COLOR_LIGHTMAGENTA -{ - Text [ en-US ] = "Light Magenta" ; -}; -String RID_SVXITEMS_COLOR_YELLOW -{ - Text [ en-US ] = "Yellow" ; -}; -String RID_SVXITEMS_COLOR_WHITE -{ - Text [ en-US ] = "White" ; -}; -String RID_SVXITEMS_COLOR_MENUBAR -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_MENUBARTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_POPUPMENU -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_POPUPMENUTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_WINDOWTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_WINDOWWORKSPACE -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_HIGHLIGHT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_HIGHLIGHTTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DFACE -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DLIGHT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DSHADOW -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_SCROLLBAR -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_FIELD -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_FIELDTEXT -{ - Text = "?" ; -}; - // enum FontItalic ------------------------------------------------------- -String RID_SVXITEMS_ITALIC_NONE -{ - Text [ en-US ] = "Not Italic" ; -}; -String RID_SVXITEMS_ITALIC_OBLIQUE -{ - Text [ en-US ] = "Oblique italic" ; -}; -String RID_SVXITEMS_ITALIC_NORMAL -{ - Text [ en-US ] = "Italic" ; -}; - // enum FontWeight ------------------------------------------------------- -String RID_SVXITEMS_WEIGHT_DONTKNOW -{ - Text = "?" ; -}; -String RID_SVXITEMS_WEIGHT_THIN -{ - Text [ en-US ] = "thin" ; -}; -String RID_SVXITEMS_WEIGHT_ULTRALIGHT -{ - Text [ en-US ] = "ultra thin" ; -}; -String RID_SVXITEMS_WEIGHT_LIGHT -{ - Text [ en-US ] = "light" ; -}; -String RID_SVXITEMS_WEIGHT_SEMILIGHT -{ - Text [ en-US ] = "semi light" ; -}; -String RID_SVXITEMS_WEIGHT_NORMAL -{ - Text [ en-US ] = "normal" ; -}; -String RID_SVXITEMS_WEIGHT_MEDIUM -{ - Text [ en-US ] = "medium" ; -}; -String RID_SVXITEMS_WEIGHT_SEMIBOLD -{ - Text [ en-US ] = "semi bold" ; -}; -String RID_SVXITEMS_WEIGHT_BOLD -{ - Text [ en-US ] = "bold" ; -}; -String RID_SVXITEMS_WEIGHT_ULTRABOLD -{ - Text [ en-US ] = "ultra bold" ; -}; -String RID_SVXITEMS_WEIGHT_BLACK -{ - Text [ en-US ] = "black" ; -}; - // enum FontUnderline - used for underline ------------------------------ -String RID_SVXITEMS_UL_NONE -{ - Text [ en-US ] = "No underline" ; -}; -String RID_SVXITEMS_UL_SINGLE -{ - Text [ en-US ] = "Single underline" ; -}; -String RID_SVXITEMS_UL_DOUBLE -{ - Text [ en-US ] = "Double underline" ; -}; -String RID_SVXITEMS_UL_DOTTED -{ - Text [ en-US ] = "Dotted underline" ; -}; -String RID_SVXITEMS_UL_DONTKNOW -{ - Text [ en-US ] = "Underline"; -}; -String RID_SVXITEMS_UL_DASH -{ - Text [ en-US ] = "Underline (dashes)"; -}; -String RID_SVXITEMS_UL_LONGDASH -{ - Text [ en-US ] = "Underline (long dashes)"; -}; -String RID_SVXITEMS_UL_DASHDOT -{ - Text [ en-US ] = "Underline (dot dash)"; -}; -String RID_SVXITEMS_UL_DASHDOTDOT -{ - Text [ en-US ] = "Underline (dot dot dash)"; -}; -String RID_SVXITEMS_UL_SMALLWAVE -{ - Text [ en-US ] = "Underline (small wave)"; -}; -String RID_SVXITEMS_UL_WAVE -{ - Text [ en-US ] = "Underline (Wave)"; -}; -String RID_SVXITEMS_UL_DOUBLEWAVE -{ - Text [ en-US ] = "Underline (Double wave)"; -}; -String RID_SVXITEMS_UL_BOLD -{ - Text [ en-US ] = "Underlined (Bold)"; -}; -String RID_SVXITEMS_UL_BOLDDOTTED -{ - Text [ en-US ] = "Dotted underline (Bold)"; -}; -String RID_SVXITEMS_UL_BOLDDASH -{ - Text [ en-US ] = "Underline (Dash bold)"; -}; -String RID_SVXITEMS_UL_BOLDLONGDASH -{ - Text [ en-US ] = "Underline (long dash, bold)"; -}; -String RID_SVXITEMS_UL_BOLDDASHDOT -{ - Text [ en-US ] = "Underline (dot dash, bold)"; -}; -String RID_SVXITEMS_UL_BOLDDASHDOTDOT -{ - Text [ en-US ] = "Underline (dot dot dash, bold)"; -}; -String RID_SVXITEMS_UL_BOLDWAVE -{ - Text [ en-US ] = "Underline (wave, bold)"; -}; - // enum FontUnderline - used for overline ------------------------------- -String RID_SVXITEMS_OL_NONE -{ - Text [ en-US ] = "No overline" ; -}; -String RID_SVXITEMS_OL_SINGLE -{ - Text [ en-US ] = "Single overline" ; -}; -String RID_SVXITEMS_OL_DOUBLE -{ - Text [ en-US ] = "Double overline" ; -}; -String RID_SVXITEMS_OL_DOTTED -{ - Text [ en-US ] = "Dotted overline" ; -}; -String RID_SVXITEMS_OL_DONTKNOW -{ - Text [ en-US ] = "Overline"; -}; -String RID_SVXITEMS_OL_DASH -{ - Text [ en-US ] = "Overline (dashes)"; -}; -String RID_SVXITEMS_OL_LONGDASH -{ - Text [ en-US ] = "Overline (long dashes)"; -}; -String RID_SVXITEMS_OL_DASHDOT -{ - Text [ en-US ] = "Overline (dot dash)"; -}; -String RID_SVXITEMS_OL_DASHDOTDOT -{ - Text [ en-US ] = "Overline (dot dot dash)"; -}; -String RID_SVXITEMS_OL_SMALLWAVE -{ - Text [ en-US ] = "Overline (small wave)"; -}; -String RID_SVXITEMS_OL_WAVE -{ - Text [ en-US ] = "Overline (Wave)"; -}; -String RID_SVXITEMS_OL_DOUBLEWAVE -{ - Text [ en-US ] = "Overline (Double wave)"; -}; -String RID_SVXITEMS_OL_BOLD -{ - Text [ en-US ] = "Overlined (Bold)"; -}; -String RID_SVXITEMS_OL_BOLDDOTTED -{ - Text [ en-US ] = "Dotted overline (Bold)"; -}; -String RID_SVXITEMS_OL_BOLDDASH -{ - Text [ en-US ] = "Overline (Dash bold)"; -}; -String RID_SVXITEMS_OL_BOLDLONGDASH -{ - Text [ en-US ] = "Overline (long dash, bold)"; -}; -String RID_SVXITEMS_OL_BOLDDASHDOT -{ - Text [ en-US ] = "Overline (dot dash, bold)"; -}; -String RID_SVXITEMS_OL_BOLDDASHDOTDOT -{ - Text [ en-US ] = "Overline (dot dot dash, bold)"; -}; -String RID_SVXITEMS_OL_BOLDWAVE -{ - Text [ en-US ] = "Overline (wave, bold)"; -}; - // enum FontStrikeout ---------------------------------------------------- -String RID_SVXITEMS_STRIKEOUT_NONE -{ - Text [ en-US ] = "No strikethrough" ; -}; -String RID_SVXITEMS_STRIKEOUT_SINGLE -{ - Text [ en-US ] = "Single strikethrough" ; -}; -String RID_SVXITEMS_STRIKEOUT_DOUBLE -{ - Text [ en-US ] = "Double strikethrough" ; -}; -String RID_SVXITEMS_STRIKEOUT_BOLD -{ - Text [ en-US ] = "Bold strikethrough"; -}; -String RID_SVXITEMS_STRIKEOUT_SLASH -{ - Text [ en-US ] = "Strike through with slash"; -}; -String RID_SVXITEMS_STRIKEOUT_X -{ - Text [ en-US ] = "Strike through with Xes"; -}; - // enum CASEMAP ---------------------------------------------------------- -String RID_SVXITEMS_CASEMAP_NONE -{ - Text [ en-US ] = "None" ; -}; -String RID_SVXITEMS_CASEMAP_VERSALIEN -{ - Text [ en-US ] = "Caps" ; -}; -String RID_SVXITEMS_CASEMAP_GEMEINE -{ - Text [ en-US ] = "Lowercase" ; -}; -String RID_SVXITEMS_CASEMAP_TITEL -{ - Text [ en-US ] = "Title" ; -}; -String RID_SVXITEMS_CASEMAP_KAPITAELCHEN -{ - Text [ en-US ] = "Small caps" ; -}; - // enum ESCAPEMENT ------------------------------------------------------- -String RID_SVXITEMS_ESCAPEMENT_OFF -{ - Text [ en-US ] = "Normal position" ; -}; -String RID_SVXITEMS_ESCAPEMENT_SUPER -{ - Text [ en-US ] = "Superscript " ; -}; -String RID_SVXITEMS_ESCAPEMENT_SUB -{ - Text [ en-US ] = "Subscript " ; -}; -String RID_SVXITEMS_ESCAPEMENT_AUTO -{ - Text [ en-US ] = "automatic" ; -}; - // enum SvxAdjust ----------------------------------------------------------- -String RID_SVXITEMS_ADJUST_LEFT -{ - Text [ en-US ] = "Align left" ; -}; -String RID_SVXITEMS_ADJUST_RIGHT -{ - Text [ en-US ] = "Align right" ; -}; -String RID_SVXITEMS_ADJUST_BLOCK -{ - Text [ en-US ] = "Justify" ; -}; -String RID_SVXITEMS_ADJUST_CENTER -{ - Text [ en-US ] = "Centered" ; -}; -String RID_SVXITEMS_ADJUST_BLOCKLINE -{ - Text [ en-US ] = "Justify" ; -}; - // enum SvxTabAdjust -------------------------------------------------------- -String RID_SVXITEMS_TAB_DECIMAL_CHAR -{ - Text [ en-US ] = "Decimal Symbol:" ; -}; -String RID_SVXITEMS_TAB_FILL_CHAR -{ - Text [ en-US ] = "Fill character:" ; -}; -String RID_SVXITEMS_TAB_ADJUST_LEFT -{ - Text [ en-US ] = "Left" ; -}; -String RID_SVXITEMS_TAB_ADJUST_RIGHT -{ - Text [ en-US ] = "Right" ; -}; -String RID_SVXITEMS_TAB_ADJUST_DECIMAL -{ - Text [ en-US ] = "Decimal" ; -}; -String RID_SVXITEMS_TAB_ADJUST_CENTER -{ - Text [ en-US ] = "Centered" ; -}; -String RID_SVXITEMS_TAB_ADJUST_DEFAULT -{ - Text [ en-US ] = "Default" ; -}; // Typ-Namen der SlotIds ---------------------------------------------------- String RID_ATTR_ZOOM { @@ -1032,94 +519,6 @@ String RID_PARA_VERTALIGN { Text [ en-US ] = "Vertical text alignment"; }; -String RID_SINGLE_LINE0 -{ - Text [ en-US ] = "Single, fine lines" ; -}; -String RID_SINGLE_LINE1 -{ - Text [ en-US ] = "Single, thin" ; -}; -String RID_SINGLE_LINE2 -{ - Text [ en-US ] = "Single, thick" ; -}; -String RID_SINGLE_LINE3 -{ - Text [ en-US ] = "Single, very thick" ; -}; -String RID_SINGLE_LINE4 -{ - Text [ en-US ] = "Single, bold" ; -}; -String RID_DOUBLE_LINE0 -{ - Text [ en-US ] = "Double, fine lines, spacing: small" ; -}; -String RID_DOUBLE_LINE1 -{ - Text [ en-US ] = "Double, fine line, spacing: large" ; -}; -String RID_DOUBLE_LINE2 -{ - Text [ en-US ] = "Double, thin, spacing: small" ; -}; -String RID_DOUBLE_LINE3 -{ - Text [ en-US ] = "Double, thick, spacing: large" ; -}; -String RID_DOUBLE_LINE4 -{ - Text [ en-US ] = "Double, inside: fine lines, outside: thin, spacing: large" ; -}; -String RID_DOUBLE_LINE5 -{ - Text [ en-US ] = "Double, inside: fine lines, outside: thick, spacing: large" ; -}; -String RID_DOUBLE_LINE6 -{ - Text [ en-US ] = "Double, inside: fine lines, outside: very thick, spacing: large" ; -}; -String RID_DOUBLE_LINE7 -{ - Text [ en-US ] = "Double, inside: thin, outside: thick, spacing: large" ; -}; -String RID_DOUBLE_LINE8 -{ - Text [ en-US ] = "Double, inside: thick, outside: thin, spacing: small" ; -}; -String RID_DOUBLE_LINE9 -{ - Text [ en-US ] = "Double, inside: thick, outside: very thick, spacing: large" ; -}; -String RID_DOUBLE_LINE10 -{ - Text [ en-US ] = "Double, inside: very thick, outside: thick, Spacing: large" ; -}; -String RID_SVXITEMS_METRIC_MM -{ - Text = "mm" ; -}; -String RID_SVXITEMS_METRIC_CM -{ - Text = "cm" ; -}; -String RID_SVXITEMS_METRIC_INCH -{ - Text = "inch" ; -}; -String RID_SVXITEMS_METRIC_POINT -{ - Text = "pt" ; -}; -String RID_SVXITEMS_METRIC_TWIP -{ - Text = "twip" ; -}; -String RID_SVXITEMS_METRIC_PIXEL -{ - Text = "pixel" ; -}; String RID_SVXITEMS_HORJUST_STANDARD { Text [ en-US ] = "Horizontal alignment default" ; @@ -1177,126 +576,6 @@ String RID_SVXITEMS_ORI_STACKED Text [ en-US ] = "Stacked" ; }; // GetValueText von BoolItems -String RID_SVXITEMS_SHADOWED_TRUE -{ - Text [ en-US ] = "Shadowed" ; -}; -String RID_SVXITEMS_SHADOWED_FALSE -{ - Text [ en-US ] = "Not Shadowed" ; -}; -String RID_SVXITEMS_BLINK_TRUE -{ - Text [ en-US ] = "Blinking" ; -}; -String RID_SVXITEMS_BLINK_FALSE -{ - Text [ en-US ] = "Not Blinking" ; -}; -String RID_SVXITEMS_AUTOKERN_TRUE -{ - Text [ en-US ] = "Pair Kerning" ; -}; -String RID_SVXITEMS_AUTOKERN_FALSE -{ - Text [ en-US ] = "No pair kerning" ; -}; -String RID_SVXITEMS_WORDLINE_TRUE -{ - Text [ en-US ] = "Individual words" ; -}; -String RID_SVXITEMS_WORDLINE_FALSE -{ - Text [ en-US ] = "Not Words Only" ; -}; -String RID_SVXITEMS_CONTOUR_TRUE -{ - Text [ en-US ] = "Outline" ; -}; -String RID_SVXITEMS_CONTOUR_FALSE -{ - Text [ en-US ] = "No Outline" ; -}; -String RID_SVXITEMS_NOLINEBREAK_TRUE -{ - Text = "?" ; -}; -String RID_SVXITEMS_NOLINEBREAK_FALSE -{ - Text = "?" ; -}; -String RID_SVXITEMS_NOHYPHEN_TRUE -{ - Text = "?" ; -}; -String RID_SVXITEMS_NOHYPHEN_FALSE -{ - Text = "?" ; -}; -String RID_SVXITEMS_PRINT_TRUE -{ - Text [ en-US ] = "Print" ; -}; -String RID_SVXITEMS_PRINT_FALSE -{ - Text [ en-US ] = "Don't print" ; -}; -String RID_SVXITEMS_OPAQUE_TRUE -{ - Text [ en-US ] = "Opaque" ; -}; -String RID_SVXITEMS_OPAQUE_FALSE -{ - Text [ en-US ] = "Not Opaque" ; -}; -String RID_SVXITEMS_FMTKEEP_TRUE -{ - Text [ en-US ] = "Keep with next paragraph" ; -}; -String RID_SVXITEMS_FMTKEEP_FALSE -{ - Text [ en-US ] = "Don't Keep Paragraphs Together" ; -}; -String RID_SVXITEMS_FMTSPLIT_TRUE -{ - Text [ en-US ] = "Split paragraph" ; -}; -String RID_SVXITEMS_FMTSPLIT_FALSE -{ - Text [ en-US ] = "Don't split paragraph" ; -}; -String RID_SVXITEMS_PROT_CONTENT_TRUE -{ - Text [ en-US ] = "Contents protected" ; -}; -String RID_SVXITEMS_PROT_CONTENT_FALSE -{ - Text [ en-US ] = "Contents not protected" ; -}; -String RID_SVXITEMS_PROT_SIZE_TRUE -{ - Text [ en-US ] = "Size protected" ; -}; -String RID_SVXITEMS_PROT_SIZE_FALSE -{ - Text [ en-US ] = "Size not protected" ; -}; -String RID_SVXITEMS_PROT_POS_TRUE -{ - Text [ en-US ] = "Position protected" ; -}; -String RID_SVXITEMS_PROT_POS_FALSE -{ - Text [ en-US ] = "Position not protected" ; -}; -String RID_SVXITEMS_TRANSPARENT_TRUE -{ - Text [ en-US ] = "Transparent" ; -}; -String RID_SVXITEMS_TRANSPARENT_FALSE -{ - Text [ en-US ] = "Not Transparent" ; -}; String RID_SVXITEMS_BOXINF_TABLE_TRUE { Text [ en-US ] = "Table" ; @@ -1321,22 +600,6 @@ String RID_SVXITEMS_BOXINF_MDIST_FALSE { Text [ en-US ] = "Allowed to fall short of spacing interval" ; }; -String RID_SVXITEMS_HYPHEN_TRUE -{ - Text [ en-US ] = "Hyphenation" ; -}; -String RID_SVXITEMS_HYPHEN_FALSE -{ - Text [ en-US ] = "No hyphenation" ; -}; -String RID_SVXITEMS_PAGE_END_TRUE -{ - Text [ en-US ] = "Page End" ; -}; -String RID_SVXITEMS_PAGE_END_FALSE -{ - Text [ en-US ] = "No Page End" ; -}; String RID_SVXITEMS_MARGIN_LEFT { Text [ en-US ] = "Left margin: " ; @@ -1353,66 +616,6 @@ String RID_SVXITEMS_MARGIN_BOTTOM { Text [ en-US ] = "Bottom margin: " ; }; -String RID_SVXITEMS_SIZE_WIDTH -{ - Text [ en-US ] = "Width: " ; -}; -String RID_SVXITEMS_SIZE_HEIGHT -{ - Text [ en-US ] = "Height: " ; -}; -String RID_SVXITEMS_LRSPACE_LEFT -{ - Text [ en-US ] = "Indent left " ; -}; -String RID_SVXITEMS_LRSPACE_FLINE -{ - Text [ en-US ] = "First Line " ; -}; -String RID_SVXITEMS_LRSPACE_RIGHT -{ - Text [ en-US ] = "Indent right " ; -}; -String RID_SVXITEMS_SHADOW_COMPLETE -{ - Text [ en-US ] = "Shadow: " ; -}; -String RID_SVXITEMS_BORDER_COMPLETE -{ - Text [ en-US ] = "Borders " ; -}; -String RID_SVXITEMS_BORDER_NONE -{ - Text [ en-US ] = "No border"; -}; -String RID_SVXITEMS_BORDER_TOP -{ - Text [ en-US ] = "top " ; -}; -String RID_SVXITEMS_BORDER_BOTTOM -{ - Text [ en-US ] = "bottom " ; -}; -String RID_SVXITEMS_BORDER_LEFT -{ - Text [ en-US ] = "left " ; -}; -String RID_SVXITEMS_BORDER_RIGHT -{ - Text [ en-US ] = "right " ; -}; -String RID_SVXITEMS_BORDER_DISTANCE -{ - Text [ en-US ] = "Spacing " ; -}; -String RID_SVXITEMS_ULSPACE_UPPER -{ - Text [ en-US ] = "From top " ; -}; -String RID_SVXITEMS_ULSPACE_LOWER -{ - Text [ en-US ] = "From bottom " ; -}; String RID_SVXITEMS_PAGE_COMPLETE { Text [ en-US ] = "Page Description: " ; @@ -1465,47 +668,6 @@ String RID_SVXITEMS_PAGE_USAGE_MIRROR { Text [ en-US ] = "Mirrored" ; }; -String RID_SVXITEMS_LINES -{ - Text [ en-US ] = "%1 Lines" ; - Text [ x-comment ] = "pb: %1 == will be replaced by the number of lines"; -}; -String RID_SVXITEMS_WIDOWS_COMPLETE -{ - Text [ en-US ] = "Widow control" ; -}; -String RID_SVXITEMS_ORPHANS_COMPLETE -{ - Text [ en-US ] = "Orphan control" ; -}; -String RID_SVXITEMS_HYPHEN_MINLEAD -{ - Text [ en-US ] = "Characters at end of line" ; -}; -String RID_SVXITEMS_HYPHEN_MINTRAIL -{ - Text [ en-US ] = "Characters at beginning of line" ; -}; -String RID_SVXITEMS_HYPHEN_MAX -{ - Text [ en-US ] = "Hyphens" ; -}; -String RID_SVXITEMS_PAGEMODEL_COMPLETE -{ - Text [ en-US ] = "Page Style: " ; -}; -String RID_SVXITEMS_KERNING_COMPLETE -{ - Text [ en-US ] = "Kerning " ; -}; -String RID_SVXITEMS_KERNING_EXPANDED -{ - Text [ en-US ] = "locked " ; -}; -String RID_SVXITEMS_KERNING_CONDENSED -{ - Text [ en-US ] = "Condensed " ; -}; String RID_SVXITEMS_AUTHOR_COMPLETE { Text [ en-US ] = "Author: " ; @@ -1526,176 +688,9 @@ String RID_SVXITEMS_PATTERN_COLOR { Text [ en-US ] = "Pattern color: " ; }; -String RID_SVXITEMS_GRAPHIC -{ - Text [ en-US ] = "Graphic" ; -}; - String RID_SVXITEMS_BRUSH_CHAR { Text [ en-US ] = "Character background"; }; - - -String RID_SVXITEMS_EMPHASIS_NONE_STYLE -{ - Text [ en-US ] = "none"; -}; -String RID_SVXITEMS_EMPHASIS_DOT_STYLE -{ - Text [ en-US ] = "Dots "; -}; -String RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE -{ - Text [ en-US ] = "Circle "; -}; -String RID_SVXITEMS_EMPHASIS_DISC_STYLE -{ -// ??? disc == filled ring - Text [ en-US ] = "Filled circle "; -}; -String RID_SVXITEMS_EMPHASIS_ACCENT_STYLE -{ - Text [ en-US ] = "Accent "; -}; - -String RID_SVXITEMS_EMPHASIS_ABOVE_POS -{ - Text [ en-US ] = "Above"; -}; -String RID_SVXITEMS_EMPHASIS_BELOW_POS -{ - Text [ en-US ] = "Below"; -}; - -String RID_SVXITEMS_TWOLINES_OFF -{ - Text [ en-US ] = "Double-lined off"; -}; -String RID_SVXITEMS_TWOLINES -{ - Text [ en-US ] = "Double-lined"; -}; - -String RID_SVXITEMS_SCRPTSPC_OFF -{ - Text [ en-US ] = "No automatic character spacing"; -}; -String RID_SVXITEMS_SCRPTSPC_ON -{ - Text [ en-US ] = "No automatic character spacing"; -}; - -String RID_SVXITEMS_HNGPNCT_OFF -{ - Text [ en-US ] = "No hanging punctuation at line end"; -}; -String RID_SVXITEMS_HNGPNCT_ON -{ - Text [ en-US ] = "Hanging punctuation at line end"; -}; -String RID_SVXITEMS_FORBIDDEN_RULE_OFF -{ - Text [ en-US ] = "Apply list of forbidden characters to beginning and end of lines"; -}; - -String RID_SVXITEMS_FORBIDDEN_RULE_ON -{ - Text [ en-US ] = "Don't apply list of forbidden characters to beginning and end of lines"; -}; - - -String RID_SVXITEMS_CHARROTATE_OFF -{ - Text [ en-US ] = "No rotated characters"; -}; -String RID_SVXITEMS_CHARROTATE -{ - Text [ en-US ] = "Character rotated by $(ARG1)°"; -}; -String RID_SVXITEMS_CHARROTATE_FITLINE -{ - Text [ en-US ] = "Fit to line"; -}; -String RID_SVXITEMS_CHARSCALE -{ - Text [ en-US ] = "Characters scaled $(ARG1)%"; -}; -String RID_SVXITEMS_CHARSCALE_OFF -{ - Text [ en-US ] = "No scaled characters"; -}; - -String RID_SVXITEMS_RELIEF_NONE -{ - Text [ en-US ] = "No relief"; -}; -String RID_SVXITEMS_RELIEF_EMBOSSED -{ - Text [ en-US ] = "Relief"; -}; -String RID_SVXITEMS_RELIEF_ENGRAVED -{ - Text [ en-US ] = "Engraved"; -}; -String RID_SVXITEMS_PARAVERTALIGN_AUTO -{ - Text [ en-US ] = "Automatic text alignment"; -}; -String RID_SVXITEMS_PARAVERTALIGN_BASELINE -{ - Text [ en-US ] = "Text aligned to base line"; -}; -String RID_SVXITEMS_PARAVERTALIGN_TOP -{ - Text [ en-US ] = "Text aligned top"; -}; -String RID_SVXITEMS_PARAVERTALIGN_CENTER -{ - Text [ en-US ] = "Text aligned middle"; -}; -String RID_SVXITEMS_PARAVERTALIGN_BOTTOM -{ - Text [ en-US ] = "Text aligned bottom"; -}; - -String RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP -{ - Text [ en-US ] = "Text direction left-to-right (horizontal)"; -}; -String RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP -{ - Text [ en-US ] = "Text direction right-to-left (horizontal)"; -}; -String RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT -{ - Text [ en-US ] = "Text direction right-to-left (vertical)"; -}; -String RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT -{ - Text [ en-US ] = "Text direction left-to-right (vertical)"; -}; -String RID_SVXITEMS_FRMDIR_ENVIRONMENT -{ - Text [ en-US ] = "Use superordinate object text direction setting"; -}; - -String RID_SVXITEMS_PARASNAPTOGRID_ON -{ - Text[ en-US ] = "Paragraph snaps to text grid (if active)"; -}; - -String RID_SVXITEMS_PARASNAPTOGRID_OFF -{ - Text[ en-US ] = "Paragraph does not snap to text grid"; -}; -String RID_SVXITEMS_CHARHIDDEN_FALSE -{ - Text [ en-US ] = "Not hidden"; -}; -String RID_SVXITEMS_CHARHIDDEN_TRUE -{ - Text [ en-US ] = "Hidden"; -}; // ********************************************************************** EOF diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 1b00c199da48..85245f607230 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -39,8 +39,8 @@ #include <svx/fntctl.hxx> // #include <svx/svxids.hrc> -#include "flstitem.hxx" -#include "fontitem.hxx" +#include "editeng/flstitem.hxx" +#include "editeng/fontitem.hxx" // STATIC DATA ----------------------------------------------------------- diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 4a4f2a54a1f0..374d29d570d6 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -42,9 +42,9 @@ #include <svx/fntszctl.hxx> // #include <svx/dialogs.hrc> -#include <svx/fhgtitem.hxx> -#include "fontitem.hxx" -#include "flstitem.hxx" +#include <editeng/fhgtitem.hxx> +#include "editeng/fontitem.hxx" +#include "editeng/flstitem.hxx" #include "dlgutil.hxx" #include <svx/dialmgr.hxx> diff --git a/svx/source/options/optgrid.cxx b/svx/source/options/optgrid.cxx index a100a1e3741d..d202d226fd9a 100644 --- a/svx/source/options/optgrid.cxx +++ b/svx/source/options/optgrid.cxx @@ -35,6 +35,7 @@ #include <tools/shl.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> +#include <svl/intitem.hxx> #define _SVX_OPTGRID_CXX diff --git a/svx/source/options/optitems.cxx b/svx/source/options/optitems.cxx index f3fbffb82c9a..2075e5823310 100644 --- a/svx/source/options/optitems.cxx +++ b/svx/source/options/optitems.cxx @@ -38,6 +38,8 @@ #include "optitems.hxx" #include <svx/dialmgr.hxx> #include <svx/svxitems.hrc> +#include <editeng/eerdll.hxx> +#include <editeng/editrids.hrc> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; @@ -169,10 +171,10 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: { rText += String::CreateFromInt32( nMinLead ); - rText += String( ResId( RID_SVXITEMS_HYPHEN_MINLEAD, DIALOG_MGR() ) ); + rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINLEAD ) ); rText += ','; rText += String::CreateFromInt32( nMinTrail ); - rText += String( ResId( RID_SVXITEMS_HYPHEN_MINTRAIL, DIALOG_MGR() ) ); + rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINTRAIL ) ); return ePres; } default: diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx index ae6204d15bef..f2a3a30fd8c1 100644 --- a/svx/source/sdr/attribute/sdrtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrtextattribute.cxx @@ -34,9 +34,9 @@ #include <svx/sdr/attribute/sdrtextattribute.hxx> #include <svx/sdr/attribute/sdrformtextattribute.hxx> #include <svx/svdotext.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> -#include <svx/flditem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> +#include <editeng/flditem.hxx> #include <svx/sdr/properties/properties.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 6c9d9a4c4c24..86bbdf78c47c 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -61,8 +61,8 @@ #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> -#include <svx/eeitem.hxx> -#include <svx/colritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/colritem.hxx> //#include <svx/xtable.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 47e85894f37e..2702d2c13b4c 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -35,9 +35,9 @@ #include <basegfx/color/bcolor.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> -#include <svx/flditem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> +#include <editeng/flditem.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <unoapi.hxx> #include <svx/svdpage.hxx> diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index 7f33ee39854e..3d7dbcc0c6e9 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdocapt.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index 1043aaf2b9d0..391791c36206 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdocirc.hxx> #include <svx/sxcikitm.hxx> #include <svx/sxciaitm.hxx> diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index cc144525e264..007d6bd1b496 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdoedge.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 88dd25fab96b..39bebb47612f 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svdoashp.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdtagitm.hxx> #include <svl/whiter.hxx> #include <svl/itemset.hxx> diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 1f4d1bd65c88..3de80d8e020e 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -39,7 +39,7 @@ #include <svx/svdobj.hxx> #include <svx/svddef.hxx> #include <svx/svdpool.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index c7eaf8a91afd..d9e77d5aa13b 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdograf.hxx> #include <svx/sdgcpitm.hxx> diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index 6370978c4527..b842dd091efb 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/whiter.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdogrp.hxx> #include <svx/svdpool.hxx> #include <svx/svdpage.hxx> diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index e5d02ff97459..34c2486844c8 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdomeas.hxx> #include <svx/sxmsuitm.hxx> #include <svx/xlnstit.hxx> diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 8f9626b37a02..927c0a8295d0 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -38,14 +38,14 @@ #include <svx/svddef.hxx> #include <svx/svdotext.hxx> #include <svx/svdoutl.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <svx/svdmodel.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/xflclit.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/svdetc.hxx> -#include <svx/editeng.hxx> -#include <svx/flditem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/flditem.hxx> #include <svx/xlnwtit.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 559e905b45be..5fbd087b4835 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -35,12 +35,8 @@ #include <limits.h> #include <tools/shl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <vcl/image.hxx> #include <svl/stritem.hxx> #include <svl/ptitem.hxx> @@ -49,14 +45,14 @@ #include <sfx2/module.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> - +#include <svl/intitem.hxx> #define _SVX_PSZCTRL_CXX #include "pszctrl.hxx" #define PAINT_OFFSET 5 -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> #include <svx/dialmgr.hxx> #include "dlgutil.hxx" #include "stbctrls.h" diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index a73aeaa3ab8c..ba905ba58721 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -61,7 +61,7 @@ #define PAINT_OFFSET 5 -//#include <svx/sizeitem.hxx> +//#include <editeng/sizeitem.hxx> //#include <svx/dialmgr.hxx> //#include "dlgutil.hxx" //#include "stbctrls.h" diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk index 0f8fcb06a7af..6e158341ae92 100644 --- a/svx/source/svdraw/makefile.mk +++ b/svx/source/svdraw/makefile.mk @@ -77,7 +77,6 @@ LIB1OBJFILES= \ $(SLO)$/svdorect.obj \ $(SLO)$/svdoedge.obj \ $(SLO)$/svdomeas.obj \ - $(SLO)$/svdfield.obj \ $(SLO)$/svdopath.obj \ $(SLO)$/svdocapt.obj \ $(SLO)$/svdocirc.obj \ diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 356546e409a0..fa610cd362c3 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -53,7 +53,7 @@ #include <svx/svdpool.hxx> #include <svl/solar.hrc> -#include "xmlcnitm.hxx" +#include "editeng/xmlcnitm.hxx" #include <svx/svxids.hrc> #include <svx/xtable.hxx> // fuer RGB_Color() @@ -63,9 +63,9 @@ #include "svdglob.hxx" // Stringcache #include "svdstr.hrc" #include <svx/sdgcpitm.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/sdtfchim.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <tools/bigint.hxx> #include <tools/stream.hxx> @@ -76,13 +76,13 @@ #define ITEMID_BOX SDRATTR_TABLE_BORDER #define ITEMID_BOXINFO SDRATTR_TABLE_BORDER_INNER -#include "svx/boxitem.hxx" +#include "editeng/boxitem.hxx" #define ITEMID_SHADOW SDRATTR_TABLE_BORDER_SHADOW -#include "svx/shaditem.hxx" +#include "editeng/shaditem.hxx" #define ITEMID_LINE 0 -#include "bolnitem.hxx" +#include "editeng/bolnitem.hxx" using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 48f6df15c5fd..8654072fd55d 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -55,7 +55,7 @@ #include <svx/svdopath.hxx> // fuer Crook #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/aeitem.hxx> #include <svl/whiter.hxx> #include <svx/sdr/contact/objectcontact.hxx> diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index f8394525dfcf..daf1c12ab6e0 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <svx/svdedtv.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/svdundo.hxx> #include <svx/svdogrp.hxx> // fuer's Gruppieren #include <svx/svdovirt.hxx> // fuer VirtualObject-Bundling (Writer) @@ -48,8 +48,8 @@ #include <svx/svdetc.hxx> #include <sfx2/basedlgs.hxx> #include <vcl/msgbox.hxx> -#include <svx/outlobj.hxx> -#include <svx/eeitem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/eeitem.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index e3d2f3390201..02acf4c36dc2 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -44,15 +44,15 @@ #include <vcl/hatch.hxx> #include <svl/whiter.hxx> #include <svl/style.hxx> -#include <editstat.hxx> +#include <editeng/editstat.hxx> #include <tools/config.hxx> #include <vcl/cursor.hxx> -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> -#include <svx/editeng.hxx> -#include <svx/editobj.hxx> -#include <svx/outlobj.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editobj.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/scripttypeitem.hxx> #include "svditext.hxx" #include <svx/svdoutl.hxx> #include <svx/sdtfchim.hxx> @@ -73,8 +73,8 @@ #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache #include "globl3d.hxx" -#include <svx/outliner.hxx> -#include <svx/adjitem.hxx> +#include <editeng/outliner.hxx> +#include <editeng/adjitem.hxx> // #98988# #include <svtools/colorcfg.hxx> diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 980cb30563c1..8762feddc928 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "forbiddencharacterstable.hxx" +#include "editeng/forbiddencharacterstable.hxx" #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <svx/svdetc.hxx> @@ -43,15 +43,15 @@ #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> #include <vcl/bmpacc.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include <tools/config.hxx> #include <unotools/cacheoptions.hxx> #include <svl/whiter.hxx> #include <tools/bigint.hxx> -#include "fontitem.hxx" -#include <svx/colritem.hxx> -#include <svx/fhgtitem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/colritem.hxx> +#include <editeng/fhgtitem.hxx> #include <svx/xgrad.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 6682e421c180..6d28c4837421 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -32,31 +32,31 @@ #include "precompiled_svx.hxx" #include "svdfmtf.hxx" -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <math.h> #include <svx/xpoly.hxx> #include <vcl/svapp.hxx> -#include <svx/eeitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/shdditem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/shdditem.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xflclit.hxx> #include <svx/xgrad.hxx> #include <svx/xflgrit.hxx> -#include <fontitem.hxx> -#include <svx/akrnitem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/colritem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/akrnitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/colritem.hxx> #include <vcl/metric.hxx> -#include <svx/charscaleitem.hxx> +#include <editeng/charscaleitem.hxx> #include <svx/xflhtit.hxx> #include <svx/svdattr.hxx> diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 3c0cd7a19be5..a31c891a1944 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "svdibrow.hxx" @@ -40,8 +40,8 @@ #endif #include "svditext.hxx" -#include <svx/flditem.hxx> -#include <svx/editdata.hxx> +#include <editeng/flditem.hxx> +#include <editeng/editdata.hxx> #include <svx/svdpool.hxx> #include <svx/svdattr.hxx> #include <svx/svdattrx.hxx> @@ -56,13 +56,13 @@ #include <svx/xflbstit.hxx> #include <svx/xflbtoxy.hxx> #include <svx/xftshit.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> -#include "fontitem.hxx" -#include <svx/fhgtitem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/fhgtitem.hxx> -#include <svx/charscaleitem.hxx> +#include <editeng/charscaleitem.hxx> #include <svl/whiter.hxx> #include <svl/flagitem.hxx> #include <svl/ptitem.hxx> diff --git a/svx/source/svdraw/svditext.hxx b/svx/source/svdraw/svditext.hxx index 2e3a28f39a29..8f01cc146961 100644 --- a/svx/source/svdraw/svditext.hxx +++ b/svx/source/svdraw/svditext.hxx @@ -33,7 +33,7 @@ // SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #endif // _SVDITEXT_HXX diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index be84f0688580..016ac49d5632 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -53,7 +53,7 @@ #include <svx/xlnstit.hxx> #include "svditext.hxx" -#include <svx/editeng.hxx> // Fuer EditEngine::CreatePool() +#include <editeng/editeng.hxx> // Fuer EditEngine::CreatePool() #include <svx/xtable.hxx> @@ -74,15 +74,15 @@ #include "asiancfg.hxx" -#include "fontitem.hxx" -#include <svx/colritem.hxx> -#include <svx/fhgtitem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/colritem.hxx> +#include <editeng/fhgtitem.hxx> #include <svl/style.hxx> #include <tools/bigint.hxx> -#include <svx/numitem.hxx> -#include <bulitem.hxx> -#include <svx/outlobj.hxx> -#include "forbiddencharacterstable.hxx" +#include <editeng/numitem.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/outlobj.hxx> +#include "editeng/forbiddencharacterstable.hxx" #include <svl/zforlist.hxx> #include <comphelper/processfactory.hxx> @@ -93,7 +93,7 @@ // #95114# #include <vcl/svapp.hxx> #include <svx/sdr/properties/properties.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 4c4c39f7225b..392a9993a80b 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -63,10 +63,10 @@ #include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten #include "svdglob.hxx" // StringCache #include "svdstr.hrc" // Objektname -#include <svx/eeitem.hxx> -#include "editstat.hxx" +#include <editeng/eeitem.hxx> +#include "editeng/editstat.hxx" #include <svx/svdoutl.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/sdtfchim.hxx> #include "../customshapes/EnhancedCustomShapeGeometry.hxx" #include "../customshapes/EnhancedCustomShapeTypeNames.hxx" @@ -77,7 +77,7 @@ #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <svx/xlnclit.hxx> #include <svx/svxids.hrc> #include <svl/whiter.hxx> diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index a44d72c47123..94bed2a60080 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -60,11 +60,11 @@ #include <svx/xftshit.hxx> -#include <svx/colritem.hxx> -#include "fontitem.hxx" -#include <svx/fhgtitem.hxx> +#include <editeng/colritem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/fhgtitem.hxx> -//#include <svx/charscaleitem.hxx> +//#include <editeng/charscaleitem.hxx> #include <svx/xlnstcit.hxx> #include <svx/xlnwtit.hxx> #include <svl/style.hxx> @@ -75,7 +75,7 @@ #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> #include <svx/xlnedcit.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/xflbckit.hxx> #include <svx/xtable.hxx> #include <svx/xbtmpit.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 013eaed311c6..d5f92a1d18f1 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -88,14 +88,14 @@ #include <svx/xflftrit.hxx> #include "svx/xlinjoit.hxx" #include <svx/unopage.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/xenum.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> #include <svx/xflhtit.hxx> #include <svx/xbtmpit.hxx> #include <svx/svdpool.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <vcl/salbtype.hxx> // FRound #include <svl/whiter.hxx> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index be3529ea4818..af834c2f31d4 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -51,7 +51,7 @@ #include <svx/xflhtit.hxx> #include <svx/xflclit.hxx> #include <svx/xfltrit.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdr/properties/captionproperties.hxx> #include <vcl/salbtype.hxx> // FRound #include <svx/sdr/contact/viewcontactofsdrcaptionobj.hxx> diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 0be63fefa61f..33b3710979ba 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -52,7 +52,7 @@ #include <svx/svdview.hxx> // Zum Draggen (Ortho) #include "svdglob.hxx" // StringCache #include "svdstr.hrc" // Objektname -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/circleproperties.hxx> #include <svx/sdr/contact/viewcontactofsdrcircobj.hxx> diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 7e608887c6fc..c45f9509b024 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -50,7 +50,7 @@ #include "svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/connectorproperties.hxx> #include <svx/sdr/contact/viewcontactofsdredgeobj.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 8e17e8ab9bc4..2a4103791363 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -58,7 +58,7 @@ #include <svx/svdpagv.hxx> #include "svdviter.hxx" #include <svx/svdview.hxx> -#include "svx/impgrf.hxx" +#include "svtools/filter.hxx" #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> #include <svx/xbitmap.hxx> @@ -67,7 +67,7 @@ #include <svx/svdundo.hxx> #include "svdfmtf.hxx" #include <svx/sdgcpitm.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdr/properties/graphicproperties.hxx> #include <svx/sdr/contact/viewcontactofgraphic.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -1158,7 +1158,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) mbIsPreview = sal_True; } - if( !GetGrfFilter()->ImportGraphic( aGraphic, String(), *pStream, + if( !GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW, NULL, 0, pFilterData ) ) { const String aUserData( pGraphic->GetUserData() ); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index d72e2cedab6a..6b91bbb26a34 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -47,7 +47,7 @@ #include "svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnedit.hxx> @@ -55,11 +55,11 @@ #include <svx/xlnedwit.hxx> #include <svx/xlnstcit.hxx> #include <svx/xlnedcit.hxx> -#include <svx/outlobj.hxx> -#include <svx/outliner.hxx> -#include <svx/editobj.hxx> -#include <svx/svdfield.hxx> -#include <svx/flditem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/outliner.hxx> +#include <editeng/editobj.hxx> +#include <editeng/svdfield.hxx> +#include <editeng/flditem.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 67505e12ba73..843a6fee9ab5 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -85,7 +85,6 @@ #include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include "unomlstr.hxx" -#include "svx/impgrf.hxx" #include <svtools/chartprettypainter.hxx> #include <svx/sdr/contact/viewcontactofsdrole2obj.hxx> #include <svx/svdograf.hxx> diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 7ae49a7a795a..6382ceebceac 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -42,25 +42,25 @@ #include <svx/svdmodel.hxx> // OutlinerDefaults #include "svdglob.hxx" // Stringcache #include "svdstr.hrc" // Objektname -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <svx/sdtfchim.hxx> #include <svtools/colorcfg.hxx> -#include <svx/eeitem.hxx> -#include <editstat.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> -#include <svx/outliner.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editstat.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> +#include <editeng/outliner.hxx> +#include <editeng/fhgtitem.hxx> #include <svl/itempool.hxx> -#include <svx/adjitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/flditem.hxx> #include <svx/xftouit.hxx> #include <vcl/salbtype.hxx> // FRound #include <svx/xflgrit.hxx> #include <svx/svdpool.hxx> #include <svx/xflclit.hxx> #include <svl/style.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <svl/itemiter.hxx> #include <svx/sdr/properties/textproperties.hxx> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 072c40c8a1f3..62182d8e66db 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -39,7 +39,7 @@ #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> #include <basegfx/range/b2drange.hxx> -#include <editstat.hxx> +#include <editeng/editstat.hxx> #include <vcl/salbtype.hxx> #include <svx/sdtfchim.hxx> #include <svl/itemset.hxx> @@ -48,10 +48,10 @@ #include <drawinglayer/animation/animationtiming.hxx> #include <basegfx/color/bcolor.hxx> #include <vcl/svapp.hxx> -#include <svx/eeitemid.hxx> -#include <svx/escpitem.hxx> -#include <svx/svxenum.hxx> -#include <svx/flditem.hxx> +#include <editeng/eeitemid.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/svxenum.hxx> +#include <editeng/flditem.hxx> #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> #include <vcl/metaact.hxx> #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx> @@ -59,7 +59,7 @@ #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> ////////////////////////////////////////////////////////////////////////////// // helpers diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 058d0c1a4513..82ee5caa4de8 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/i18n/XBreakIterator.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/i18n/CharacterIteratorMode.hdl> -#include <unolingu.hxx> +#include <editeng/unolingu.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> @@ -67,7 +67,7 @@ #include <svx/xlndsit.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx> -#include <editstat.hxx> +#include <editeng/editstat.hxx> #include <unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx> diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 99d5b051a362..e6ff4776d6e5 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -39,30 +39,30 @@ #include <svx/svdorect.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight #include <svx/svdocapt.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight #include <svx/svdetc.hxx> -#include <svx/writingmodeitem.hxx> -#include <svx/editeng.hxx> -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/writingmodeitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <svx/sdtfchim.hxx> -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include <svl/smplhint.hxx> #include <svl/whiter.hxx> -#include <svx/outlobj.hxx> -#include <svx/outliner.hxx> -#include <svx/eeitem.hxx> -#include <svx/editobj.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/outliner.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editobj.hxx> +#include <editeng/fhgtitem.hxx> -#include <svx/charscaleitem.hxx> +#include <editeng/charscaleitem.hxx> #include <svl/style.hxx> #include <svl/itemiter.hxx> -#include <svx/lrspitem.hxx> +#include <editeng/lrspitem.hxx> #include <svl/itempool.hxx> -#include <svx/numitem.hxx> -#include <svx/editeng.hxx> -#include <svx/postitem.hxx> +#include <editeng/numitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/postitem.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// // diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index 945bc2e48f91..d71cfd429777 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -35,10 +35,10 @@ #include "svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize #include <svx/svdoutl.hxx> -#include <svx/outliner.hxx> -#include <editstat.hxx> +#include <editeng/outliner.hxx> +#include <editeng/editstat.hxx> #include <svl/itemset.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdtfchim.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx index 4c19bed3e6a2..577c60e0ee18 100644 --- a/svx/source/svdraw/svdotxfl.cxx +++ b/svx/source/svdraw/svdotxfl.cxx @@ -30,9 +30,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/svdfield.hxx> +#include <editeng/svdfield.hxx> #include <svx/svdotext.hxx> static BOOL bInit = FALSE; diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index d61655beb306..9d28a0fdfa09 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -41,7 +41,7 @@ #include <svx/svdotext.hxx> #include "svditext.hxx" #include <svx/svdmodel.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #ifndef SVX_LIGHT #ifndef _LNKBASE_HXX //autogen diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index beb39b6285c3..1ba2a06bee27 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -39,7 +39,7 @@ #include <svx/svdoutl.hxx> #include <svx/svdpage.hxx> // fuer Convert #include <svx/svdmodel.hxx> // fuer Convert -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/sdr/properties/itemsettools.hxx> #include <svx/sdr/properties/properties.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index 6f76cf4cde7a..c529ce76cbcc 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -31,11 +31,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/svdoutl.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/svdotext.hxx> -#include <editstat.hxx> +#include <editeng/editstat.hxx> #include <svx/svdmodel.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/itempool.hxx> DBG_NAME(SdrOutliner) diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index eb41ebab2d2b..c7b459334490 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -44,7 +44,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdoutl.hxx> #include <svx/svdpagv.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> #include <svx/svdouno.hxx> diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index b2bd8b33778b..bfdc2911de7a 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -45,7 +45,7 @@ #include <svl/smplhint.hxx> #include <svx/svdpntv.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> @@ -67,7 +67,7 @@ #include <svx/svdview.hxx> #include <svx/sxlayitm.hxx> #include <svl/itemiter.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/whiter.hxx> #include <svl/style.hxx> #include <svx/sdrpagewindow.hxx> diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index 3bd09667a067..8deb36b20b4f 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -35,11 +35,11 @@ #include "svx/svdotext.hxx" #include "svx/svdetc.hxx" -#include "svx/outlobj.hxx" +#include "editeng/outlobj.hxx" #include "svx/svdoutl.hxx" #include "svx/svdmodel.hxx" -#include "svx/fhgtitem.hxx" -#include <svx/eeitem.hxx> +#include "editeng/fhgtitem.hxx" +#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> SdrText::SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject /* = 0 */ ) diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index ed76f2884c9e..1c9268a36d86 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -42,7 +42,7 @@ #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache #include <svx/scene3d.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdogrp.hxx> #include <svx/sdr/properties/itemsettools.hxx> #include <svx/sdr/properties/properties.hxx> diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index edda4b700e29..8d5736ebd039 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache @@ -49,8 +49,8 @@ #include "svx/svdoutl.hxx" #include "svx/svdview.hxx" -#include "svx/editview.hxx" // fuer GetField -#include "svx/flditem.hxx" // fuer URLField +#include "editeng/editview.hxx" // fuer GetField +#include "editeng/flditem.hxx" // fuer URLField #include "svx/obj3d.hxx" #include "svx/svddrgmt.hxx" #include "svx/svdoutl.hxx" @@ -977,7 +977,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } return bRet; } -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier, BOOL bLeftDown) const { diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 22de2cfe3888..252521fa976a 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <vector> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include "xexch.hxx" #include <svx/xflclit.hxx> #include <svx/svdxcgv.hxx> diff --git a/svx/source/svxlink/fileobj.cxx b/svx/source/svxlink/fileobj.cxx index 6e0925da2bb2..a1b24e5440e5 100644 --- a/svx/source/svxlink/fileobj.cxx +++ b/svx/source/svxlink/fileobj.cxx @@ -58,7 +58,6 @@ #include <svx/dialogs.hrc> #include "xoutbmp.hxx" #include "opengrf.hxx" -#include "svx/impgrf.hxx" namespace css = ::com::sun::star; @@ -337,7 +336,7 @@ BOOL SvFileObject::LoadFile_Impl() BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) { - GraphicFilter* pGF = GetGrfFilter(); + GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); const USHORT nFilter = sFilter.Len() && pGF->GetImportFormatCount() ? pGF->GetImportFormatNumber( sFilter ) diff --git a/svx/source/svxlink/linkmgr.cxx b/svx/source/svxlink/linkmgr.cxx index 26cc0bace065..7b1d7dca42d8 100644 --- a/svx/source/svxlink/linkmgr.cxx +++ b/svx/source/svxlink/linkmgr.cxx @@ -58,7 +58,7 @@ #include "fileobj.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "unolingu.hxx" +#include "editeng/unolingu.hxx" class SvxInternalLink : public sfx2::SvLinkSource { diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index d76d5e1b3079..bb872245ed83 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -42,7 +42,7 @@ #include <unotools/accessiblestatesethelper.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/unoshtxt.hxx> #include <svx/svdotext.hxx> diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 95c8d684fe3b..6fb0475d8b92 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -38,10 +38,11 @@ #include <rtl/ref.hxx> -#include <svx/AccessibleContextBase.hxx> -#include <svx/AccessibleComponentBase.hxx> +#include <editeng/AccessibleContextBase.hxx> +#include <editeng/AccessibleComponentBase.hxx> #include <svx/IAccessibleViewForwarderListener.hxx> #include <svx/AccessibleTextHelper.hxx> +#include <svx/AccessibleShapeTreeInfo.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index a565ae06da29..28e748a8d292 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -44,8 +44,8 @@ #include <vcl/svapp.hxx> #include "svx/sdr/properties/textproperties.hxx" -#include "svx/outlobj.hxx" -#include "svx/writingmodeitem.hxx" +#include "editeng/outlobj.hxx" +#include "editeng/writingmodeitem.hxx" #include "svx/svdotable.hxx" #include "svx/svdoutl.hxx" #include "svx/unoshtxt.hxx" @@ -58,8 +58,8 @@ #include "svx/unoshtxt.hxx" #include "svx/unoshprp.hxx" #include "svx/unoshape.hxx" -#include "svx/editobj.hxx" -#include "svx/boxitem.hxx" +#include "editeng/editobj.hxx" +#include "editeng/boxitem.hxx" #include "svx/xflbstit.hxx" #include "svx/xflbmtit.hxx" #include <svx/svdpool.hxx> @@ -77,9 +77,6 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::style; using namespace ::com::sun::star::container; -extern sal_Bool lcl_LineToSvxLine(const BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert); -extern BorderLine lcl_SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConvert); - // ----------------------------------------------------------------------------- static const SvxItemPropertySet* ImplGetSvxCellPropertySet() @@ -969,7 +966,7 @@ sal_Int32 SAL_CALL Cell::getError( ) throw (RuntimeException) Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) { - Any aAny( mpPropSet->getPropertyValue( pMap, aSet ) ); + Any aAny( SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ) ); if( *pMap->pType != aAny.getValueType() ) { @@ -1034,27 +1031,27 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& SvxBoxInfoItem aBoxInfo( SDRATTR_TABLE_BORDER_INNER ); SvxBorderLine aLine; - sal_Bool bSet = lcl_LineToSvxLine(pBorder->TopLine, aLine, false); + sal_Bool bSet = SvxBoxItem::LineToSvxLine(pBorder->TopLine, aLine, false); aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_TOP); aBoxInfo.SetValid(VALID_TOP, pBorder->IsTopLineValid); - bSet = lcl_LineToSvxLine(pBorder->BottomLine, aLine, false); + bSet = SvxBoxItem::LineToSvxLine(pBorder->BottomLine, aLine, false); aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_BOTTOM); aBoxInfo.SetValid(VALID_BOTTOM, pBorder->IsBottomLineValid); - bSet = lcl_LineToSvxLine(pBorder->LeftLine, aLine, false); + bSet = SvxBoxItem::LineToSvxLine(pBorder->LeftLine, aLine, false); aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_LEFT); aBoxInfo.SetValid(VALID_LEFT, pBorder->IsLeftLineValid); - bSet = lcl_LineToSvxLine(pBorder->RightLine, aLine, false); + bSet = SvxBoxItem::LineToSvxLine(pBorder->RightLine, aLine, false); aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_RIGHT); aBoxInfo.SetValid(VALID_RIGHT, pBorder->IsRightLineValid); - bSet = lcl_LineToSvxLine(pBorder->HorizontalLine, aLine, false); + bSet = SvxBoxItem::LineToSvxLine(pBorder->HorizontalLine, aLine, false); aBoxInfo.SetLine(bSet ? &aLine : 0, BOXINFO_LINE_HORI); aBoxInfo.SetValid(VALID_HORI, pBorder->IsHorizontalLineValid); - bSet = lcl_LineToSvxLine(pBorder->VerticalLine, aLine, false); + bSet = SvxBoxItem::LineToSvxLine(pBorder->VerticalLine, aLine, false); aBoxInfo.SetLine(bSet ? &aLine : 0, BOXINFO_LINE_VERT); aBoxInfo.SetValid(VALID_VERT, pBorder->IsVerticalLineValid); @@ -1169,17 +1166,17 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(mpProperties->GetItem(SDRATTR_TABLE_BORDER)); TableBorder aTableBorder; - aTableBorder.TopLine = lcl_SvxLineToLine(rBox.GetTop(), false); + aTableBorder.TopLine = SvxBoxItem::SvxLineToLine(rBox.GetTop(), false); aTableBorder.IsTopLineValid = rBoxInfoItem.IsValid(VALID_TOP); - aTableBorder.BottomLine = lcl_SvxLineToLine(rBox.GetBottom(), false); + aTableBorder.BottomLine = SvxBoxItem::SvxLineToLine(rBox.GetBottom(), false); aTableBorder.IsBottomLineValid = rBoxInfoItem.IsValid(VALID_BOTTOM); - aTableBorder.LeftLine = lcl_SvxLineToLine(rBox.GetLeft(), false); + aTableBorder.LeftLine = SvxBoxItem::SvxLineToLine(rBox.GetLeft(), false); aTableBorder.IsLeftLineValid = rBoxInfoItem.IsValid(VALID_LEFT); - aTableBorder.RightLine = lcl_SvxLineToLine(rBox.GetRight(), false); + aTableBorder.RightLine = SvxBoxItem::SvxLineToLine(rBox.GetRight(), false); aTableBorder.IsRightLineValid = rBoxInfoItem.IsValid(VALID_RIGHT ); - aTableBorder.HorizontalLine = lcl_SvxLineToLine(rBoxInfoItem.GetHori(), false); + aTableBorder.HorizontalLine = SvxBoxItem::SvxLineToLine(rBoxInfoItem.GetHori(), false); aTableBorder.IsHorizontalLineValid = rBoxInfoItem.IsValid(VALID_HORI); - aTableBorder.VerticalLine = lcl_SvxLineToLine(rBoxInfoItem.GetVert(), false); + aTableBorder.VerticalLine = SvxBoxItem::SvxLineToLine(rBoxInfoItem.GetVert(), false); aTableBorder.IsVerticalLineValid = rBoxInfoItem.IsValid(VALID_VERT); aTableBorder.Distance = rBox.GetDistance(); aTableBorder.IsDistanceValid = rBoxInfoItem.IsValid(VALID_DISTANCE); diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 39cb21f1d2af..7270f2c2829f 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -40,7 +40,7 @@ #include <svl/style.hxx> #include "svx/sdtaitm.hxx" #include "tablemodel.hxx" -#include "svx/unotext.hxx" +#include "editeng/unotext.hxx" #include "svx/svdtext.hxx" // ----------------------------------------------------------------------------- diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx index 5a518e34502f..4a1ecfeae770 100644 --- a/svx/source/table/celleditsource.cxx +++ b/svx/source/table/celleditsource.cxx @@ -47,17 +47,17 @@ #include "svx/svdmodel.hxx" #include "svx/svdoutl.hxx" #include "svx/svdobj.hxx" -#include "unoedhlp.hxx" +#include "editeng/unoedhlp.hxx" #include "svx/svdview.hxx" #include "svx/svdetc.hxx" -#include "svx/outliner.hxx" -#include "svx/unoforou.hxx" -#include "svx/unoviwou.hxx" -#include "svx/outlobj.hxx" +#include "editeng/outliner.hxx" +#include "editeng/unoforou.hxx" +#include "editeng/unoviwou.hxx" +#include "editeng/outlobj.hxx" #include "svx/svdotext.hxx" #include "svx/svdpage.hxx" -#include "svx/editeng.hxx" -#include "svx/unotext.hxx" +#include "editeng/editeng.hxx" +#include "editeng/unotext.hxx" #include "sdrpaintwindow.hxx" //------------------------------------------------------------------------ diff --git a/svx/source/table/celleditsource.hxx b/svx/source/table/celleditsource.hxx index 1d097dc6ede5..da029b334fd7 100644 --- a/svx/source/table/celleditsource.hxx +++ b/svx/source/table/celleditsource.hxx @@ -33,7 +33,7 @@ #include "cell.hxx" #include "celltypes.hxx" -#include "svx/unoedsrc.hxx" +#include "editeng/unoedsrc.hxx" class SvxTextForwarder; class SdrObject; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 97e06fd4bb61..e6d7da88d0d6 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -46,8 +46,8 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <svl/style.hxx> -#include "editstat.hxx" -#include "svx/outlobj.hxx" +#include "editeng/editstat.hxx" +#include "editeng/outlobj.hxx" #include "svx/svdview.hxx" #include "svx/sdr/properties/textproperties.hxx" #include "svx/svdotable.hxx" @@ -62,14 +62,14 @@ #include "tablelayouter.hxx" #include "svx/svdetc.hxx" #include "tablehandles.hxx" -#include "svx/boxitem.hxx" +#include "editeng/boxitem.hxx" #include "svx/framelink.hxx" #include "svx/sdr/table/tabledesign.hxx" #include "svx/svdundo.hxx" #include "svdstr.hrc" #include "svdglob.hxx" -#include "svx/writingmodeitem.hxx" -#include "svx/frmdiritem.hxx" +#include "editeng/writingmodeitem.hxx" +#include "editeng/frmdiritem.hxx" #include "svx/xflhtit.hxx" #include "svx/xflftrit.hxx" #include "svx/xfltrit.hxx" diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 345ce9315156..27e0b0004697 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -47,28 +47,28 @@ #include <sfx2/request.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/scripttypeitem.hxx> #include <svx/svdotable.hxx> #include <svx/sdr/overlay/overlayobjectcell.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/svxids.hrc> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdoutl.hxx> #include <svx/svdpagv.hxx> #include <svx/svdetc.hxx> -#include <svx/editobj.hxx> -#include "editstat.hxx" -#include "unolingu.hxx" +#include <editeng/editobj.hxx> +#include "editeng/editstat.hxx" +#include "editeng/unolingu.hxx" #include "svx/sdrpagewindow.hxx" #include <svx/selectioncontroller.hxx> #include <svx/svdmodel.hxx> #include "sdrpaintwindow.hxx" #include <svx/svxdlg.hxx> -#include <svx/boxitem.hxx> +#include <editeng/boxitem.hxx> #include "cell.hxx" -#include <svx/borderline.hxx> -#include <svx/colritem.hxx> -#include "bolnitem.hxx" +#include <editeng/borderline.hxx> +#include <editeng/colritem.hxx> +#include "editeng/bolnitem.hxx" #include "svdstr.hrc" #include "svdglob.hxx" #include "svx/svdpage.hxx" diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index c44ac040df74..bfc2bc4b4b6f 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> +#include <comphelper/serviceinfohelper.hxx> #include <osl/mutex.hxx> #include <vos/mutex.hxx> @@ -237,7 +238,7 @@ OUString SAL_CALL TableDesignStyle::getImplementationName() throw(RuntimeExcepti sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } // ---------------------------------------------------------- @@ -515,7 +516,7 @@ OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeExcept sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } // ---------------------------------------------------------- diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 2d19a9994c41..1d97fc8fb318 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -44,8 +44,8 @@ #include "tablecolumns.hxx" #include "tablelayouter.hxx" #include "svx/svdotable.hxx" -#include "svx/borderline.hxx" -#include "svx/boxitem.hxx" +#include "editeng/borderline.hxx" +#include "editeng/boxitem.hxx" #include "svx/svdmodel.hxx" #include "svdstr.hrc" #include "svdglob.hxx" diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 4192f60899ef..a94c5fe82621 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -40,18 +40,18 @@ #include <svtools/rtfkeywd.hxx> #include <svtools/rtfout.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdtaitm.hxx> -#include <svx/wghtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/udlnitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/udlnitem.hxx> #include "cell.hxx" #include "celltypes.hxx" #include "svx/svdotable.hxx" #include "svx/svdoutl.hxx" -#include "svx/editeng.hxx" -#include "svx/outlobj.hxx" +#include "editeng/editeng.hxx" +#include "editeng/outlobj.hxx" //#include <tablertfexporter.hxx> diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 73e2c7739d71..adaab8c36ec7 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -39,19 +39,19 @@ #include <tools/stream.hxx> #include <svtools/rtftoken.h> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdetc.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/outlobj.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/outlobj.hxx> #include "cell.hxx" #include "celltypes.hxx" #include "svx/svdotable.hxx" #include "svx/svdoutl.hxx" -#include "svx/editeng.hxx" -#include "svx/editdata.hxx" +#include "editeng/editeng.hxx" +#include "editeng/editdata.hxx" #include "svx/svdmodel.hxx" -#include "svxrtf.hxx" +#include "editeng/svxrtf.hxx" using ::rtl::OUString; using namespace ::com::sun::star::uno; diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index f72ca2fd8927..87003705d82f 100644 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include "svx/sdr/properties/textproperties.hxx" -#include "svx/outlobj.hxx" +#include "editeng/outlobj.hxx" #include "cell.hxx" #include "tableundo.hxx" diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index e53f41251ff2..01ee9ae919db 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -48,7 +48,7 @@ #include <svx/sdr/attribute/sdrtextattribute.hxx> #include <svx/sdr/attribute/sdrallattribute.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> -#include <svx/borderline.hxx> +#include <editeng/borderline.hxx> #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> #include "cell.hxx" diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 12978b5a6b44..4da2317dd7ba 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -44,7 +44,7 @@ #include <svx/svdview.hxx> #include "drawitem.hxx" -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include "xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 3b484d770397..0db6803b4cc4 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -44,7 +44,7 @@ #include <svl/eitem.hxx> #include <vcl/settings.hxx> #include <svl/intitem.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include "chrtitem.hxx" #include <tools/urlobj.hxx> diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 13a01b6dc31b..0386bd99e50b 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -45,8 +45,8 @@ #include <svx/svdobj.hxx> #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> -#include <svx/eeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/frmdiritem.hxx> #include "toolbarmenu.hxx" #include "fontworkgallery.hxx" diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 50da14402fae..0b7a0938e979 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -56,8 +56,8 @@ #include <svx/svxids.hrc> #include "grafctrl.hrc" #include <svx/dialogs.hrc> -#include <svx/brshitem.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/sizeitem.hxx> #include <svx/sdgcpitm.hxx> //CHINA001 #include "../dialog/grfpage.hxx" #include <svx/itemwin.hxx> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 5c283b3aae24..c3750210eecb 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -59,9 +59,7 @@ #include <sfx2/childwin.hxx> #include <sfx2/viewfrm.hxx> #include <unotools/fontoptions.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <vcl/svapp.hxx> #include <svl/smplhint.hxx> @@ -79,13 +77,13 @@ #include "helpid.hrc" #include "htmlmode.hxx" #include <svx/xtable.hxx> -#include "fontitem.hxx" -#include <svx/fhgtitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/colritem.hxx> -#include "flstitem.hxx" -#include "bolnitem.hxx" +#include "editeng/fontitem.hxx" +#include <editeng/fhgtitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/colritem.hxx> +#include "editeng/flstitem.hxx" +#include "editeng/bolnitem.hxx" #include "drawitem.hxx" #include <svx/tbcontrl.hxx> #include "dlgutil.hxx" @@ -94,6 +92,8 @@ #include <memory> #include <svx/tbxcolorupdate.hxx> +#include <editeng/eerdll.hxx> +#include <editeng/editrids.hrc> // ------------------------------------------------------------------------ @@ -882,7 +882,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, long nCount = pColorTable->Count(); XColorEntry* pEntry = NULL; ::Color aColWhite( COL_WHITE ); - String aStrWhite( SVX_RES(RID_SVXITEMS_COLOR_WHITE) ); + String aStrWhite( EditResId(RID_SVXITEMS_COLOR_WHITE) ); if ( nCount > PALETTE_SIZE ) // Show scrollbar if more than PALLETTE_SIZE colors are available diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 734c43a15098..9614d91bc521 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -52,7 +52,7 @@ #include <svx/dialogs.hrc> #endif #include <svx/svdview.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include "chrtitem.hxx" #include <svx/extrusionbar.hxx> diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index c40c5c5df8d5..a1c9df91f73e 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -48,9 +48,9 @@ #include <svx/svdoashp.hxx> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <sfx2/bindings.hxx> -#include <svx/eeitem.hxx> -#include <svx/charscaleitem.hxx> -#include <svx/kernitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/charscaleitem.hxx> +#include <editeng/kernitem.hxx> #include <sdrpaintwindow.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index ebd8f83e00f0..6d8c2277f93b 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -65,11 +65,11 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <svx/svdpagv.hxx> #include <svx/svdograf.hxx> #include "xoutbmp.hxx" -#include "svx/impgrf.hxx" +#include "svtools/filter.hxx" #include "unoapi.hxx" #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> @@ -77,9 +77,9 @@ #include <svx/fmmodel.hxx> #include <svx/unopage.hxx> #include <svx/pageitem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdoutl.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include "boost/scoped_ptr.hpp" @@ -105,7 +105,7 @@ using namespace ::com::sun::star::task; #include <svx/sdr/contact/viewcontact.hxx> // #i102251# -#include <editstat.hxx> +#include <editeng/editstat.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -1013,7 +1013,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes if( NULL == mpUnoPage ) return sal_False; - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); if( NULL == pFilter || NULL == mpUnoPage->GetSdrPage() || NULL == mpDoc ) return sal_False; @@ -1233,7 +1233,7 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& MimeTypeNam { const String aMimeTypeName( MimeTypeName ); - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nCount = pFilter->GetExportFormatCount(); sal_uInt16 nFilter; for( nFilter = 0; nFilter < nCount; nFilter++ ) @@ -1249,7 +1249,7 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& MimeTypeNam Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) throw (RuntimeException) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nCount = pFilter->GetExportFormatCount(); sal_uInt16 nFilter; sal_uInt16 nFound = 0; diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 12d35898439e..a17eaba418e0 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -45,7 +45,7 @@ #include <comphelper/stl_types.hxx> #include <svl/itempool.hxx> #include "unoapi.hxx" -#include "xmlcnitm.hxx" +#include "editeng/xmlcnitm.hxx" using namespace ::comphelper; diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index fee6a7295656..cb596e6a5611 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -46,7 +46,7 @@ #include <svx/xdef.hxx> #include "unoapi.hxx" -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <basegfx/polygon/b2dpolygon.hxx> using namespace com::sun::star; diff --git a/svx/source/unodraw/makefile.mk b/svx/source/unodraw/makefile.mk index 4b8ecb093df4..6f13f892de97 100644 --- a/svx/source/unodraw/makefile.mk +++ b/svx/source/unodraw/makefile.mk @@ -49,7 +49,6 @@ LIB1OBJFILES= \ $(SLO)$/XPropertyTable.obj \ $(SLO)$/UnoNameItemTable.obj \ $(SLO)$/unoshape.obj \ - $(SLO)$/unoipset.obj \ $(SLO)$/unoshap2.obj \ $(SLO)$/unoshap3.obj \ $(SLO)$/unoshap4.obj \ @@ -57,8 +56,6 @@ LIB1OBJFILES= \ $(SLO)$/unoshtxt.obj \ $(SLO)$/unoprov.obj \ $(SLO)$/unomod.obj \ - $(SLO)$/unonrule.obj \ - $(SLO)$/unofdesc.obj \ $(SLO)$/unomlstr.obj \ $(SLO)$/unogtabl.obj \ $(SLO)$/unohtabl.obj \ diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 7aa359ad6e19..7b10a224284e 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -40,10 +40,10 @@ #include <svx/svdmodel.hxx> #include <svx/xflhtit.hxx> #include "unoapi.hxx" -#include "svx/impgrf.hxx" #include <svx/unomid.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include "unofill.hxx" +#include <editeng/memberids.hrc> using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index aa03f4286949..d788bb7f0b99 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -41,10 +41,11 @@ #include <svl/itemprop.hxx> #include <svtools/unoevent.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/serviceinfohelper.hxx> #include <cppuhelper/implbase2.hxx> #include <unofill.hxx> -#include <unonrule.hxx> +#include <editeng/unonrule.hxx> #include <svtools/unoimap.hxx> #include <svx/fmdpage.hxx> #include <svx/fmmodel.hxx> @@ -57,7 +58,7 @@ #include <svx/svdtypes.hxx> #include <svx/unoprov.hxx> #include <svx/unopage.hxx> -#include <svx/unofield.hxx> +#include <editeng/unofield.hxx> #include <svx/unomod.hxx> #include <svx/unomodel.hxx> #include <svx/svdobj.hxx> @@ -591,7 +592,7 @@ OUString SAL_CALL SvxUnoDrawingModel::getImplementationName() sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames() throw(uno::RuntimeException) @@ -751,7 +752,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNam uno::Sequence< OUString > aSeq( &aService, 1 ); return aSeq; } -#include <unonrule.hxx> +#include <editeng/unonrule.hxx> com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw() { SvxNumRule* pDefaultRule = NULL; diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index ec6920b15aa1..12533f3fd00d 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -38,6 +38,7 @@ #include <osl/mutex.hxx> #include <sfx2/dispatch.hxx> #include <sot/clsids.hxx> +#include <comphelper/serviceinfohelper.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> @@ -935,7 +936,7 @@ OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeExcept sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException ) diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 1abf930eb3ed..2fda613577f9 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -49,7 +49,7 @@ #include <svx/xflbmtit.hxx> #include <svx/unopage.hxx> #include <svx/svdetc.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include "unoapi.hxx" #include <memory> diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index b5204f5d876a..7baae35c9579 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -49,9 +49,9 @@ #include <comphelper/propertysetinfo.hxx> #include <svx/dialmgr.hxx> #include "unoapi.hxx" -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> #include <svx/unoshprp.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include "globl3d.hxx" #include <svx/dialogs.hrc> #include <svx/svdpool.hxx> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 7f39a35b5dfa..d5257e82a35f 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -47,7 +47,7 @@ #include <vcl/svapp.hxx> #include <vos/mutex.hxx> #include <svtools/fltcall.hxx> -#include "svx/impgrf.hxx" +#include <svtools/filter.hxx> #include <boost/scoped_ptr.hpp> #include <svx/svdpool.hxx> @@ -55,7 +55,7 @@ #include <rtl/memory.h> #include <tools/urlobj.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <svx/unoshape.hxx> #include <svx/unopage.hxx> #include <svx/svdobj.hxx> @@ -1738,7 +1738,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const if( aURLObj.GetProtocol() != INET_PROT_NOT_VALID ) { - GraphicFilter* pGrfFilter = GetGrfFilter(); + GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter(); aFilterName = pGrfFilter->GetImportFormatName( pGrfFilter->GetImportFormatNumberForShortName( aURLObj.getExtension() ) ); } } diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index c28839c533db..b72eb7863bad 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -39,13 +39,14 @@ #include <com/sun/star/drawing/CameraGeometry.hpp> #include <vcl/svapp.hxx> #include <vos/mutex.hxx> +#include <comphelper/serviceinfohelper.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> #include <svx/svdpool.hxx> #include <svx/unoshape.hxx> #include <svx/unopage.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <svx/polysc3d.hxx> #include "globl3d.hxx" #include <svx/cube3d.hxx> @@ -494,7 +495,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.Shape3DScene" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.Shape3DScene" ); return aSeq; } @@ -624,7 +625,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", "com.sun.star.drawing.Shape3DCube"); return aSeq; } @@ -740,7 +741,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", "com.sun.star.drawing.Shape3DSphere"); return aSeq; } @@ -948,7 +949,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", "com.sun.star.drawing.Shape3DLathe"); return aSeq; } @@ -1059,7 +1060,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames( throw(uno::RuntimeException) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", "com.sun.star.drawing.Shape3DExtrude"); return aSeq; } @@ -1204,7 +1205,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames( throw(uno::RuntimeException) { Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", "com.sun.star.drawing.Shape3DPolygon"); return aSeq; } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 9349f01d5d91..296018d80ed9 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -41,15 +41,15 @@ #include <svl/itemprop.hxx> #include <svtools/fltcall.hxx> #include <vos/mutex.hxx> -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> #include <osl/mutex.hxx> #include <comphelper/extract.hxx> #include "svx/shapepropertynotifier.hxx" - +#include <comphelper/serviceinfohelper.hxx> #include <toolkit/unohlp.hxx> - +#include <comphelper/serviceinfohelper.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> #include <vcl/gfxlink.hxx> @@ -96,7 +96,7 @@ #include "svdglob.hxx" #include "svdstr.hrc" #include "unomaster.hxx" -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vector> @@ -608,7 +608,7 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw() //---------------------------------------------------------------------- //---------------------------------------------------------------------- void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet, - SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet, const SfxItemPropertyMap* pMap ) const + SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet, const SfxItemPropertyMap* pMap ) { if(rPropSet.AreThereOwnUsrAnys()) { @@ -639,7 +639,7 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID)); // setzen - setPropertyValue(pEntry, *pUsrAny, rSet); + SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet); } } } @@ -660,7 +660,7 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet) { SfxItemSet aSet( mpModel->GetItemPool(), SDRATTR_START, SDRATTR_END, 0); Reference< beans::XPropertySet > xShape( (OWeakObject*)this, UNO_QUERY ); - ObtainSettingsFromPropertySet(rPropSet, aSet, xShape, mpPropSet->getPropertyMap() ); + SvxItemPropertySet_ObtainSettingsFromPropertySet(rPropSet, aSet, xShape, mpPropSet->getPropertyMap() ); mpObj->SetMergedItemSetAndBroadcast(aSet); @@ -2250,7 +2250,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE default: { // Hole Wert aus ItemSet - aAny = mpPropSet->getPropertyValue( pMap, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ); if( *pMap->pType != aAny.getValueType() ) { @@ -3459,7 +3459,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_GroupServices; - SvxServiceInfoHelper::addToSequence( SvxShape_GroupServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_GroupServices, 2, sUNO_service_drawing_GroupShape, sUNO_service_drawing_Shape ); @@ -3479,7 +3479,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_CustomShapeServices; - SvxServiceInfoHelper::addToSequence( SvxShape_CustomShapeServices, 13, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_CustomShapeServices, 13, sUNO_service_drawing_CustomShape, sUNO_service_drawing_Shape, sUNO_service_drawing_CustomShapeProperties, @@ -3510,7 +3510,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_LineServices; - SvxServiceInfoHelper::addToSequence( SvxShape_LineServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_LineServices,14, sUNO_service_drawing_LineShape, sUNO_service_drawing_Shape, @@ -3545,7 +3545,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_RectServices; - SvxServiceInfoHelper::addToSequence( SvxShape_RectServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_RectServices,14, sUNO_service_drawing_RectangleShape, sUNO_service_drawing_Shape, @@ -3582,7 +3582,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_CircServices; - SvxServiceInfoHelper::addToSequence( SvxShape_CircServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_CircServices,14, sUNO_service_drawing_EllipseShape, sUNO_service_drawing_Shape, @@ -3618,7 +3618,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_PathServices; - SvxServiceInfoHelper::addToSequence( SvxShape_PathServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_PathServices,14, sUNO_service_drawing_PolyLineShape, sUNO_service_drawing_Shape, @@ -3653,7 +3653,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_PolyServices; - SvxServiceInfoHelper::addToSequence( SvxShape_PolyServices,15, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_PolyServices,15, sUNO_service_drawing_PolyPolygonShape, sUNO_service_drawing_Shape, @@ -3691,7 +3691,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_FreeLineServices; - SvxServiceInfoHelper::addToSequence( SvxShape_FreeLineServices,15, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_FreeLineServices,15, sUNO_service_drawing_OpenBezierShape, sUNO_service_drawing_Shape, @@ -3729,7 +3729,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_FreeFillServices; - SvxServiceInfoHelper::addToSequence( SvxShape_FreeFillServices,15, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_FreeFillServices,15, sUNO_service_drawing_ClosedBezierShape, sUNO_service_drawing_Shape, @@ -3767,7 +3767,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_TextServices; - SvxServiceInfoHelper::addToSequence( SvxShape_TextServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_TextServices,14, sUNO_service_drawing_TextShape, sUNO_service_drawing_Shape, @@ -3801,7 +3801,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_GrafServices; - SvxServiceInfoHelper::addToSequence( SvxShape_GrafServices, 12, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_GrafServices, 12, sUNO_service_drawing_GraphicObjectShape, sUNO_service_drawing_Shape, @@ -3834,7 +3834,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_Ole2Services; - SvxServiceInfoHelper::addToSequence( SvxShape_Ole2Services, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_Ole2Services, 2, sUNO_service_drawing_OLE2Shape, sUNO_service_drawing_Shape); @@ -3854,7 +3854,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_CaptionServices; - SvxServiceInfoHelper::addToSequence( SvxShape_CaptionServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_CaptionServices,14, sUNO_service_drawing_CaptionShape, sUNO_service_drawing_Shape, @@ -3890,7 +3890,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_PageServices; - SvxServiceInfoHelper::addToSequence( SvxShape_PageServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_PageServices, 2, sUNO_service_drawing_PageShape, sUNO_service_drawing_Shape ); @@ -3910,7 +3910,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_MeasureServices; - SvxServiceInfoHelper::addToSequence( SvxShape_MeasureServices,15, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_MeasureServices,15, sUNO_service_drawing_MeasureShape, sUNO_service_drawing_MeasureProperties, @@ -3948,7 +3948,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_FrameServices; - SvxServiceInfoHelper::addToSequence( SvxShape_FrameServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_FrameServices, 2, sUNO_service_drawing_FrameShape, sUNO_service_drawing_Shape ); @@ -3968,7 +3968,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_UnoServices; - SvxServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, sUNO_service_drawing_ControlShape, sUNO_service_drawing_Shape ); @@ -3988,7 +3988,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_EdgeServices; - SvxServiceInfoHelper::addToSequence( SvxShape_EdgeServices,15, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_EdgeServices,15, sUNO_service_drawing_ConnectorShape, sUNO_service_drawing_ConnectorProperties, @@ -4023,7 +4023,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_MediaServices; - SvxServiceInfoHelper::addToSequence( SvxShape_MediaServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_MediaServices, 2, sUNO_service_drawing_MediaShape, sUNO_service_drawing_Shape); @@ -4047,7 +4047,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_UnoServices; - SvxServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, sUNO_service_drawing_ControlShape, sUNO_service_drawing_Shape ); @@ -4551,3 +4551,69 @@ SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Refer SvxShape* pSvxShape = SvxShape::getImplementation( xInt ); return pSvxShape ? pSvxShape->GetSdrObject() : 0; } + +/** this function checks if a SFX_METRIC_ITEM realy needs to be converted. + This check is for items that store either metric values if theire positiv + or percentage if theire negativ. +*/ +sal_Bool SvxUnoCheckForConversion( const SfxItemSet&, sal_Int32 nWID, const uno::Any& rVal ) +{ + sal_Bool bConvert = sal_True; // the default is that all metric items must be converted + + switch( nWID ) + { + case XATTR_FILLBMP_SIZEX: + case XATTR_FILLBMP_SIZEY: + { + sal_Int32 nValue = 0; + if( rVal >>= nValue ) + bConvert = nValue > 0; + break; + } + } + + // the default is to always + return bConvert; +} + +uno::Any SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) +{ + if(!pMap || !pMap->nWID) + return uno::Any(); + + uno::Any aVal = rPropSet.getPropertyValue( pMap, rSet, (pMap->nWID != SDRATTR_XMLATTRIBUTES) ); + if( pMap->nMemberId & SFX_METRIC_ITEM ) + { + // check for needed metric translation + SfxItemPool* pPool = rSet.GetPool(); + const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM; + if( (pMap->nMemberId & SFX_METRIC_ITEM) && (eMapUnit != SFX_MAPUNIT_100TH_MM) ) + { + if( SvxUnoCheckForConversion( rSet, pMap->nWID, aVal ) ) + SvxUnoConvertToMM( eMapUnit, aVal ); + } + } + + return aVal; +} + +void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) +{ + if(!pMap || !pMap->nWID) + return; + + uno::Any aValue( rVal ); + if( pMap->nMemberId & SFX_METRIC_ITEM ) + { + // check for needed metric translation + SfxItemPool* pPool = rSet.GetPool(); + const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM; + if( (pMap->nMemberId & SFX_METRIC_ITEM) && eMapUnit != SFX_MAPUNIT_100TH_MM ) + { + if( SvxUnoCheckForConversion( rSet, pMap->nWID, aValue ) ) + SvxUnoConvertFromMM( eMapUnit, aValue ); + } + } + + rPropSet.setPropertyValue( pMap, aValue, rSet ); +} diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 0cc232efdce5..f2a813e06192 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -34,6 +34,7 @@ #include "unoshcol.hxx" #include <svx/unoprov.hxx> +#include <comphelper/serviceinfohelper.hxx> using namespace ::cppu; using namespace ::com::sun::star; @@ -238,7 +239,7 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException sal_Bool SAL_CALL SvxShapeCollection::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< ::rtl::OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException ) diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index f355de08e843..f8eb9c80787c 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -34,7 +34,7 @@ #include <vcl/svapp.hxx> #include <svx/unoshtxt.hxx> -#include <unoedhlp.hxx> +#include <editeng/unoedhlp.hxx> #include <svl/lstner.hxx> #include <rtl/ref.hxx> #include <osl/mutex.hxx> @@ -45,16 +45,16 @@ #include <svx/svdobj.hxx> #include <svx/svdview.hxx> #include <svx/svdetc.hxx> -#include <svx/outliner.hxx> -#include <svx/unoforou.hxx> -#include <svx/unoviwou.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outliner.hxx> +#include <editeng/unoforou.hxx> +#include <editeng/unoviwou.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdotext.hxx> #include <svx/svdpage.hxx> -#include <svx/editeng.hxx> -#include <svx/editobj.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editobj.hxx> -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> #include <com/sun/star/linguistic2/XLinguServiceManager.hpp> #include <comphelper/processfactory.hxx> #include <vos/mutex.hxx> diff --git a/svx/source/xml/makefile.mk b/svx/source/xml/makefile.mk index f8d77f9fea62..84495a26b4fe 100644 --- a/svx/source/xml/makefile.mk +++ b/svx/source/xml/makefile.mk @@ -43,8 +43,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES = \ $(SLO)$/xmlexport.obj \ - $(SLO)$/xmltxtimp.obj \ - $(SLO)$/xmltxtexp.obj \ $(SLO)$/xmlxtimp.obj \ $(SLO)$/xmlxtexp.obj \ $(SLO)$/xmlgrhlp.obj \ diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 7f43bc2df269..1e2dc464e13d 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -49,7 +49,7 @@ #include <vcl/metaact.hxx> #include <tools/zcodec.hxx> -#include "svx/impgrf.hxx" +#include "svtools/filter.hxx" #include "xmlgrhlp.hxx" #include <algorithm> @@ -142,7 +142,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphi { if( aGraphic.GetType() == GRAPHIC_BITMAP ) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); String aFormat; if( aGraphic.IsAnimated() ) @@ -334,7 +334,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() mpOStm->Seek( 0 ); USHORT nFormat = GRFILTER_FORMAT_DONTKNOW; USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW; - GetGrfFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW) { @@ -377,7 +377,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() if (nStreamLen_) { pDest->Seek(0L); - GetGrfFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); } } delete pDest; @@ -573,7 +573,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor if( aStream.xStream.is() ) { SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream ); - GetGrfFilter()->ImportGraphic( aGraphic, String(), *pStream ); + GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream ); delete pStream; } @@ -619,7 +619,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt { if( aGraphic.GetType() == GRAPHIC_BITMAP ) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); String aFormat; if( aGraphic.IsAnimated() ) diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 0eda2eeb375f..d54916b2d816 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -41,9 +41,9 @@ #include <svl/solar.hrc> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> -#include "svx/impgrf.hxx" #include "xoutbmp.hxx" #include <svtools/FilterConfigItem.hxx> +#include <svtools/filter.hxx> // ----------- // - Defines - @@ -330,7 +330,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, INetURLObject aURL( rFileName ); Graphic aGraphic; String aExt; - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); USHORT nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND; BOOL bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated(); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 6b05262d2321..a1734d42baac 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <svl/itempool.hxx> - +#include <editeng/memberids.hrc> #include <tools/stream.hxx> #include "unoapi.hxx" @@ -58,7 +58,7 @@ #include "xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> #include <svx/xdef.hxx> #include <svx/unomid.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index aefcb6dd586f..d00c06e2f921 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -41,7 +41,7 @@ #include "xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> #include <svx/xdef.hxx> #define GLOBALOVERFLOW diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 8f78f6c43e95..0dac4b39d886 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -38,13 +38,14 @@ #include <vcl/bitmapex.hxx> #include <toolkit/unohlp.hxx> #include <svl/style.hxx> +#include <editeng/memberids.hrc> #include <svx/dialogs.hrc> #include "xattr.hxx" #include <svx/xtable.hxx> #include <svx/xdef.hxx> #include <svx/unomid.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include "unoapi.hxx" #include <svx/svdmodel.hxx> |