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 /sw/source | |
| 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 'sw/source')
| -rw-r--r-- | sw/source/core/view/pagepreviewlayout.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/inc/pview.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/inc/view.hxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/shells/slotadd.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/uno/SwXDocumentSettings.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/utlui/zoomctrl.cxx | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index fff8fceb1d63..22f9fce0db4b 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -41,7 +41,7 @@ // OD 19.02.2003 #107369# - method <SwAlignRect(..)> #include <frmtool.hxx> // OD 24.09.2003 #i19975# -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <printdata.hxx> #include <IDocumentDeviceAccess.hxx> diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index 329ba5e567d9..0073a5e996bf 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -33,7 +33,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewfac.hxx> #include <sfx2/viewsh.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include "swdllapi.h" #include "shellid.hxx" diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 229e8f5d810c..2d8acf631b67 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -36,7 +36,8 @@ #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> #include <editeng/svxenum.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> +#include <svx/svxids.hrc> #include <editeng/editstat.hxx> #include "swdllapi.h" #include <swtypes.hxx> diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 28280a0abdbf..3c5f15fd43ac 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -39,7 +39,7 @@ #include <sfx2/objitem.hxx> #include <sfx2/objsh.hxx> #include <svx/rulritem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <svx/viewlayoutitem.hxx> #include <svx/zoomslideritem.hxx> #include <svx/hlnkitem.hxx> diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index fa8a704247f8..d988bf54f8bf 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -44,7 +44,7 @@ #include <svl/zforlist.hxx> #include <unotxdoc.hxx> #include <cmdid.h> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include <unomod.hxx> #include <vcl/svapp.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx index 922eae695c75..5fd5b6f2b08b 100644 --- a/sw/source/ui/utlui/zoomctrl.cxx +++ b/sw/source/ui/utlui/zoomctrl.cxx @@ -32,7 +32,7 @@ #include <vcl/status.hxx> #include <sfx2/app.hxx> #include <svl/stritem.hxx> -#include <svx/zoomitem.hxx> +#include <sfx2/zoomitem.hxx> #include "swtypes.hxx" #include "zoomctrl.hxx" |