diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-01-08 18:32:51 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-01-08 18:32:51 +0100 |
commit | 55f1f483cfa4cde111593782f17c514a0056d7f0 (patch) | |
tree | b862f97846992ba1457664b6f1cd551ca7eee844 /starmath | |
parent | ebbf721d69d4040a392d493c8a89a4c0023476cf (diff) |
#i107450#: build all other modules with new editeng lib
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/inc/edit.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/starmath.hrc | 6 | ||||
-rw-r--r-- | starmath/sdi/smslots.sdi | 1 | ||||
-rw-r--r-- | starmath/source/accessibility.cxx | 12 | ||||
-rw-r--r-- | starmath/source/accessibility.hxx | 4 | ||||
-rw-r--r-- | starmath/source/document.cxx | 18 | ||||
-rw-r--r-- | starmath/source/edit.cxx | 16 | ||||
-rw-r--r-- | starmath/source/format.cxx | 2 | ||||
-rw-r--r-- | starmath/source/math_pch.cxx | 2 | ||||
-rw-r--r-- | starmath/source/parse.cxx | 2 | ||||
-rw-r--r-- | starmath/source/unomodel.cxx | 2 | ||||
-rw-r--r-- | starmath/source/view.cxx | 2 | ||||
-rw-r--r-- | starmath/util/makefile.mk | 1 |
13 files changed, 34 insertions, 36 deletions
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index d453fc6216e5..6532a0540f8b 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -33,7 +33,7 @@ #include <vcl/window.hxx> #include <vcl/timer.hxx> #include <svtools/transfer.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <svtools/colorcfg.hxx> //#ifndef _ACCESSIBILITY_HXX_ diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 0f93e6551cc9..bbcb27003c23 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -30,13 +30,9 @@ #ifndef _STARMATH_HRC #define _STARMATH_HRC -#ifndef _SVX_SVXIDS_HRC #include <svl/solar.hrc> -#endif -#ifndef _SFXSIDS_HRC //autogen #include <sfx2/sfxsids.hrc> -#endif - +#include <editeng/memberids.hrc> #define SID_NEXTERR (SID_SMA_START + 1) #define SID_PREVERR (SID_SMA_START + 2) diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi index 88bd108bddff..2a43b08f2e50 100644 --- a/starmath/sdi/smslots.sdi +++ b/starmath/sdi/smslots.sdi @@ -35,6 +35,7 @@ StarMath [ HelpText ( "StarMath Application" ) SlotIdFile ( "starmath.hrc" ) + SlotIdFile ( "editeng/editids.hrc" ) SlotIdFile ( "sfx2/sfxsids.hrc" ) SlotIdFile ( "svx/svxids.hrc" ) ] diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 823e5bbd926e..4d5a58c81027 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -53,12 +53,12 @@ #include <vos/mutex.hxx> #include <svl/itemset.hxx> -#include <svx/editobj.hxx> -#include <svx/editdata.hxx> -#include <svx/editview.hxx> -#include <svx/eeitem.hxx> -#include <svx/outliner.hxx> -#include <svx/unoedhlp.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editdata.hxx> +#include <editeng/editview.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/outliner.hxx> +#include <editeng/unoedhlp.hxx> #include "accessibility.hxx" diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 07217bee9f1a..8bc5ac7534b2 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -54,8 +54,8 @@ #include <cppuhelper/implbase6.hxx> #include <svl/brdcst.hxx> -#include <svx/editeng.hxx> -#include <svx/unoedsrc.hxx> // SvxEditSource, SvxTextForwarder, SvxViewForwarder, SvxEditViewForwarder +#include <editeng/editeng.hxx> +#include <editeng/unoedsrc.hxx> // SvxEditSource, SvxTextForwarder, SvxViewForwarder, SvxEditViewForwarder #include <svx/AccessibleTextHelper.hxx> #include <edit.hxx> diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index b9064a78a5f5..b4477b395e25 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -71,17 +71,17 @@ #include <svl/undo.hxx> #include <svl/urihelper.hxx> #include <svl/whiter.hxx> -#include <svx/editeng.hxx> -#include <svx/editstat.hxx> -#include <svx/eeitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/unolingu.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editstat.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/unolingu.hxx> #include <ucbhelper/content.hxx> #include <vcl/mapmod.hxx> #include <vcl/mapunit.hxx> #include <vcl/msgbox.hxx> - +#include <sfx2/sfx.hrc> #include <document.hxx> #include <action.hxx> #include <config.hxx> @@ -97,8 +97,8 @@ #include "mathtype.hxx" #include "mathmlimport.hxx" #include "mathmlexport.hxx" - - +#include <sfx2/sfxsids.hrc> +#include <svx/svxids.hrc> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 6f69f52539aa..06c7397694b9 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -47,19 +47,19 @@ #include <vcl/menu.hxx> -#include <svx/editview.hxx> -#include <svx/editeng.hxx> -#include <svx/editstat.hxx> -#include <svx/eeitem.hxx> +#include <editeng/editview.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editstat.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/dispatch.hxx> #include <svl/intitem.hxx> #include <svl/itempool.hxx> #include <svl/stritem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/lrspitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/lrspitem.hxx> #include <svl/itemset.hxx> -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #include <sfx2/viewfrm.hxx> #include "edit.hxx" diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index 9ecfd1720b1e..ae7184a96b08 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -34,7 +34,7 @@ #include <tools/stream.hxx> #include <vcl/svapp.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/scripttypeitem.hxx> #include "format.hxx" ///////////////////////////////////////////////////////////////// diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index 6dba5ec80379..0e4b8e2113d6 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -817,7 +817,7 @@ #include <sfx2/ctrlitem.hxx> #include <sfx2/viewfac.hxx> #include <edit.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <toolbox.hxx> #include <vcl/toolbox.hxx> #include <vcl/dockwin.hxx> diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 727d595b40ea..8849b513f04e 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/i18n/UnicodeType.hpp> #include <i18npool/lang.h> #include <unotools/charclass.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <unotools/syslocale.hxx> #include "parse.hxx" #ifndef _STARMATH_HRC diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 6a4a65b7e228..e48d9d3a443e 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -40,7 +40,7 @@ #include <svl/itemprop.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/processfactory.hxx> -#include <svx/paperinf.hxx> +#include <editeng/paperinf.hxx> #include <vcl/settings.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <com/sun/star/beans/PropertyState.hpp> diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 855831fc9e9f..e76c9c86870c 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -61,7 +61,7 @@ #include <svl/undo.hxx> #include <svl/whiter.hxx> #include <svx/dialogs.hrc> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <svx/svxdlg.hxx> #include <svx/zoomitem.hxx> #include <vcl/decoview.hxx> diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk index 978cb6cff40c..7a4e56f94ea6 100644 --- a/starmath/util/makefile.mk +++ b/starmath/util/makefile.mk @@ -57,6 +57,7 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFX2LIB) \ |