diff options
| author | Tim Hardeck <thardeck@suse.de> | 2012-06-12 19:04:05 +0200 |
|---|---|---|
| committer | Tim Hardeck <thardeck@suse.de> | 2012-06-15 13:38:56 +0200 |
| commit | 6484ccb4edad34d03d1300929fe20788f41b255e (patch) | |
| tree | 81889977e5eebedc929206a82baaa00c30512090 /starmath | |
| parent | 4ad231a6abea556ce7815fc6dafc9aebb87a4e26 (diff) | |
move zoomitem from svx to sfx2
To allow using SvxZoomItem in sfx2 zoomitem is moved from svx to sfx2.
This patch does base on Caolán McNamara's patch he sent to the mailing list.
Change-Id: I4d245f938d92ad3a20b692f5f76d8e0d00b1a648
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/qa/cppunit/test_starmath.cxx | 2 | ||||
| -rw-r--r-- | starmath/sdi/smitems.sdi | 10 | ||||
| -rw-r--r-- | starmath/source/typemap.cxx | 3 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 2 |
4 files changed, 4 insertions, 13 deletions
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index e59687ff2b18..ba30ac62028b 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -55,7 +55,7 @@ #include <editeng/editeng.hxx> #include <editeng/editview.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> SO2_DECL_REF(SmDocShell) SO2_IMPL_REF(SmDocShell) diff --git a/starmath/sdi/smitems.sdi b/starmath/sdi/smitems.sdi index 019d2c5f5312..0cf73d036de4 100644 --- a/starmath/sdi/smitems.sdi +++ b/starmath/sdi/smitems.sdi @@ -580,16 +580,6 @@ item SvxLongULSpace SvxLongULSpaceItem; //------------------------------------------------------------------------- -struct SvxZoom -{ - INT32 Type MID_TYPE; - UINT16 ValueSet MID_VALUESET; - INT32 Percent MID_PERCENT; -}; -item SvxZoom SvxZoomItem; - -//------------------------------------------------------------------------- - item SbxObject SvxTabStopItem; diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx index 076758d1c0a5..b46ca83a8327 100644 --- a/starmath/source/typemap.cxx +++ b/starmath/source/typemap.cxx @@ -125,7 +125,8 @@ #include <sfx2/msg.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> +#include <svx/svxids.hrc> #include <svl/slstitm.hxx> #define SFX_TYPEMAP diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index c425b75d02a7..52a7a542b847 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -62,7 +62,7 @@ #include <svx/dialogs.hrc> #include <editeng/editeng.hxx> #include <svx/svxdlg.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <vcl/decoview.hxx> #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> |