diff options
| -rw-r--r-- | sfx2/Library_sfx.mk | 1 | ||||
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/itemdel.cxx (renamed from svtools/source/misc/itemdel.cxx) | 2 | ||||
| -rw-r--r-- | sfx2/source/control/querystatus.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/request.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/sfxstatuslistener.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/shell.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/inc/itemdel.hxx (renamed from include/svtools/itemdel.hxx) | 8 | ||||
| -rw-r--r-- | svtools/Library_svt.mk | 1 |
9 files changed, 10 insertions, 12 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 249cdd832596..8ce0196f782e 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -133,6 +133,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/config/evntconf \ sfx2/source/control/bindings \ sfx2/source/control/ctrlitem \ + sfx2/source/control/itemdel \ sfx2/source/control/minfitem \ sfx2/source/control/msg \ sfx2/source/control/msgpool \ diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index afa3d1cd7a84..ad43c5b924d8 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/frame/DispatchDescriptor.hpp> #include <com/sun/star/frame/XController.hpp> #include <comphelper/processfactory.hxx> -#include <svtools/itemdel.hxx> +#include "itemdel.hxx" //Includes below due to nInReschedule #include "appdata.hxx" diff --git a/svtools/source/misc/itemdel.cxx b/sfx2/source/control/itemdel.cxx index 7645089ed084..7ff4d38e237f 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/sfx2/source/control/itemdel.cxx @@ -20,7 +20,7 @@ #include <sal/config.h> #include <boost/noncopyable.hpp> -#include <svtools/itemdel.hxx> +#include "itemdel.hxx" #include <vcl/svapp.hxx> #include <tools/errcode.hxx> #include <limits.h> diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index 64c1c0e2cdd0..ba455387bac3 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -26,7 +26,7 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <svl/itemset.hxx> -#include <svtools/itemdel.hxx> +#include "itemdel.hxx" #include <svl/visitem.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 083d5ea2e055..a98302b79fcc 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -28,7 +28,7 @@ #include <svl/itemiter.hxx> #include <svl/itempool.hxx> -#include <svtools/itemdel.hxx> +#include "itemdel.hxx" #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index 703ad903d3e6..543bf3d35e7b 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -23,7 +23,7 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <svl/itemset.hxx> -#include <svtools/itemdel.hxx> +#include "itemdel.hxx" #include <svl/visitem.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 594363e9cf2a..fbe76d206a17 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -25,7 +25,7 @@ #include <sal/log.hxx> #include <svl/itempool.hxx> #include <svl/undo.hxx> -#include <svtools/itemdel.hxx> +#include "itemdel.hxx" #include <svtools/asynclink.hxx> #include <basic/sbx.hxx> diff --git a/include/svtools/itemdel.hxx b/sfx2/source/inc/itemdel.hxx index da68f2f893e3..cd5d14de170e 100644 --- a/include/svtools/itemdel.hxx +++ b/sfx2/source/inc/itemdel.hxx @@ -16,14 +16,12 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_ITEMDEL_HXX -#define INCLUDED_SVTOOLS_ITEMDEL_HXX - -#include <svtools/svtdllapi.h> +#ifndef INCLUDED_SFX2_ITEMDEL_HXX +#define INCLUDED_SFX2_ITEMDEL_HXX class SfxPoolItem; -SVT_DLLPUBLIC void DeleteItemOnIdle( SfxPoolItem* pItem ); +void DeleteItemOnIdle( SfxPoolItem* pItem ); #endif diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index ea5e95316f95..07dc321e6314 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -181,7 +181,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/misc/imap \ svtools/source/misc/imap2 \ svtools/source/misc/imap3 \ - svtools/source/misc/itemdel \ svtools/source/misc/langtab \ svtools/source/misc/langhelp \ svtools/source/misc/openfiledroptargetlistener \ |