diff options
Diffstat (limited to 'embeddedobj/source')
25 files changed, 10 insertions, 64 deletions
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 16762c9dce85..641253008580 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/embed/EmbedVerbs.hpp> #include <com/sun/star/embed/EmbedUpdateModes.hpp> #include <com/sun/star/embed/ObjectSaveVetoException.hpp> #include <com/sun/star/embed/StorageWrappedTargetException.hpp> @@ -31,7 +30,6 @@ #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/io/IOException.hpp> -#include <com/sun/star/util/XCloseBroadcaster.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/frame/ModuleManager.hpp> @@ -48,7 +46,6 @@ #include <targetstatecontrol.hxx> #include <commonembobj.hxx> -#include <intercept.hxx> #include "embedobj.hxx" #include <specialobject.hxx> diff --git a/embeddedobj/source/commonembedding/embedobj.hxx b/embeddedobj/source/commonembedding/embedobj.hxx index 1c0de3723c90..6778238d2f59 100644 --- a/embeddedobj/source/commonembedding/embedobj.hxx +++ b/embeddedobj/source/commonembedding/embedobj.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_COMMONEMBEDDING_EMBEDOBJ_HXX #define INCLUDED_EMBEDDEDOBJ_SOURCE_COMMONEMBEDDING_EMBEDOBJ_HXX +#include <com/sun/star/awt/Rectangle.hpp> + css::awt::Rectangle GetRectangleInterception( const css::awt::Rectangle& aRect1, const css::awt::Rectangle& aRect2 ); #endif // INCLUDED_EMBEDDEDOBJ_SOURCE_COMMONEMBEDDING_EMBEDOBJ_HXX diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 557e21e2646a..5947fef7aca0 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -27,15 +27,12 @@ #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/interfacecontainer.h> #include <comphelper/mimeconfighelper.hxx> #include <vcl/svapp.hxx> -#include <closepreventer.hxx> -#include <intercept.hxx> #include "persistence.hxx" using namespace ::com::sun::star; diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 25c619b5b157..f162dfef5f31 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/embed/EmbedVerbs.hpp> #include <com/sun/star/embed/EntryInitModes.hpp> #include <com/sun/star/embed/StorageWrappedTargetException.hpp> #include <com/sun/star/embed/WrongStateException.hpp> @@ -37,7 +36,6 @@ #include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/frame/XModule.hpp> #include <com/sun/star/lang/NoSupportException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/util/XModifiable.hpp> diff --git a/embeddedobj/source/commonembedding/persistence.hxx b/embeddedobj/source/commonembedding/persistence.hxx index 655748613eeb..a6ef252629fd 100644 --- a/embeddedobj/source/commonembedding/persistence.hxx +++ b/embeddedobj/source/commonembedding/persistence.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_COMMONEMBEDDING_PERSISTENCE_HXX #define INCLUDED_EMBEDDEDOBJ_SOURCE_COMMONEMBEDDING_PERSISTENCE_HXX +#include <com/sun/star/beans/PropertyValue.hpp> + css::uno::Sequence< css::beans::PropertyValue > GetValuableArgs_Impl( const css::uno::Sequence< css::beans::PropertyValue >& aMedDescr, bool bCanUseDocumentBaseURL ); diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index 0ca1676b2de1..adb377544625 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/registry/InvalidRegistryException.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/factory.hxx> diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index a1e55d87debe..683fe0aab3f2 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -19,27 +19,17 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/embed/EmbedVerbs.hpp> -#include <com/sun/star/embed/EmbedUpdateModes.hpp> #include <com/sun/star/embed/UnreachableStateException.hpp> #include <com/sun/star/embed/WrongStateException.hpp> -#include <com/sun/star/embed/XEmbeddedClient.hpp> -#include <com/sun/star/embed/XInplaceClient.hpp> -#include <com/sun/star/embed/XWindowSupplier.hpp> #include <com/sun/star/embed/Aspects.hpp> -#include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/util/XCloseBroadcaster.hpp> #include <com/sun/star/util/XCloseable.hpp> -#include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> #include <cppuhelper/queryinterface.hxx> -#include <cppuhelper/typeprovider.hxx> #include <osl/diagnose.h> #include <specialobject.hxx> -#include <intercept.hxx> using namespace ::com::sun::star; diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index e5b855fa80b9..47ea271c7ca9 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/EntryInitModes.hpp> -#include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/NamedValue.hpp> @@ -32,7 +31,6 @@ #include "xfactory.hxx" #include <commonembobj.hxx> #include <specialobject.hxx> -#include <oleembobj.hxx> using namespace ::com::sun::star; diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index b48ffdfe5c64..6b9bb85ea5e0 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -23,13 +23,11 @@ #include <com/sun/star/frame/TerminationVetoException.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XSynchronousFrameLoader.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/XCloseBroadcaster.hpp> #include <com/sun/star/util/XCloseable.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/NamedValue.hpp> @@ -42,14 +40,10 @@ #include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/XView.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/VclWindowPeerAttribute.hpp> -#include <com/sun/star/bridge/XBridgeSupplier2.hpp> -#include <com/sun/star/bridge/ModelDependent.hpp> #include <com/sun/star/embed/XHatchWindow.hpp> #include <com/sun/star/embed/HatchWindowFactory.hpp> -#include <com/sun/star/embed/XInplaceClient.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XMenuBarMergingAcceptor.hpp> #include <com/sun/star/frame/ModuleManager.hpp> @@ -63,11 +57,8 @@ #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <osl/diagnose.h> -#include <rtl/process.h> #include <vcl/svapp.hxx> -#include <svtools/embedhlp.hxx> #include <unotools/resmgr.hxx> -#include <vcl/settings.hxx> #include <sfx2/strings.hrc> #include <comphelper/processfactory.hxx> diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index 935ad015fb0b..b83b9ec29183 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -18,13 +18,9 @@ */ #include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/embed/EmbedVerbs.hpp> -#include <com/sun/star/embed/EmbedUpdateModes.hpp> #include <com/sun/star/embed/UnreachableStateException.hpp> +#include <com/sun/star/embed/WrongStateException.hpp> #include <com/sun/star/embed/XEmbeddedClient.hpp> -#include <com/sun/star/embed/XInplaceClient.hpp> -#include <com/sun/star/embed/XWindowSupplier.hpp> -#include <com/sun/star/embed/StateChangeInProgressException.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> #include <com/sun/star/embed/EntryInitModes.hpp> diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 59df88e7873f..238f39704a33 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/embed/EmbedStates.hpp> -#include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <intercept.hxx> diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index fe6c79d73da5..f3df8d50de9f 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -22,8 +22,6 @@ #include <com/sun/star/embed/XEmbedObjectFactory.hpp> #include <com/sun/star/embed/OOoEmbeddedObjectFactory.hpp> #include <com/sun/star/embed/OLEEmbeddedObjectFactory.hpp> -#include <com/sun/star/embed/XLinkFactory.hpp> -#include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index 9ea5c5629424..b2c9acd9ec1e 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -26,16 +26,11 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <com/sun/star/embed/XVisualObject.hpp> #include <com/sun/star/embed/XEmbedPersist2.hpp> #include <com/sun/star/embed/XLinkageSupport.hpp> -#include <com/sun/star/embed/XClassifiedObject.hpp> -#include <com/sun/star/embed/XComponentSupplier.hpp> #include <com/sun/star/embed/XInplaceObject.hpp> -#include <com/sun/star/embed/XStateChangeBroadcaster.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/chart2/XDefaultSizeTransmitter.hpp> #include <cppuhelper/weak.hxx> diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 25194c87d0f8..051d63294af4 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -26,13 +26,9 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XEmbeddedOleObject.hpp> #include <com/sun/star/embed/XInplaceObject.hpp> -#include <com/sun/star/embed/XVisualObject.hpp> #include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/XLinkageSupport.hpp> -#include <com/sun/star/embed/XClassifiedObject.hpp> -#include <com/sun/star/embed/XComponentSupplier.hpp> #include <com/sun/star/embed/VerbDescriptor.hpp> -#include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/XCloseListener.hpp> diff --git a/embeddedobj/source/msole/mtnotification.hxx b/embeddedobj/source/msole/mtnotification.hxx index 710481460485..ac2243210ab0 100644 --- a/embeddedobj/source/msole/mtnotification.hxx +++ b/embeddedobj/source/msole/mtnotification.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_MTNOTIFICATION_HXX #define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_MTNOTIFICATION_HXX -#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/awt/XCallback.hpp> #include <cppuhelper/implbase.hxx> diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 33b9586173d8..80180e8dfdc1 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/io/TempFile.hpp> #include <com/sun/star/io/XTruncate.hpp> +#include <com/sun/star/io/IOException.hpp> #include <com/sun/star/awt/XRequestCallback.hpp> #include "platform.h" diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx index f9d3c58cbf39..ffcf3e920162 100644 --- a/embeddedobj/source/msole/olecomponent.hxx +++ b/embeddedobj/source/msole/olecomponent.hxx @@ -26,9 +26,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/embed/XOptimizedStorage.hpp> #include <com/sun/star/embed/VerbDescriptor.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/awt/Size.hpp> @@ -37,8 +34,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include <vector> - namespace cppu { class OMultiTypeInterfaceContainerHelper; diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index 5cf159dfdf17..c84b0e72d073 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -20,12 +20,10 @@ #include <oleembobj.hxx> #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/EmbedVerbs.hpp> -#include <com/sun/star/embed/EntryInitModes.hpp> #include <com/sun/star/embed/UnreachableStateException.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/EmbedUpdateModes.hpp> -#include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/NeedsRunningStateException.hpp> #include <com/sun/star/embed/StateChangeInProgressException.hpp> #include <com/sun/star/embed/EmbedMisc.hpp> diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 9f7f41235f60..8dee4adc8704 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/packages/WrongPasswordException.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> +#include <com/sun/star/io/IOException.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> diff --git a/embeddedobj/source/msole/olepersist.hxx b/embeddedobj/source/msole/olepersist.hxx index d0edd1d8b23b..d9607a1c3836 100644 --- a/embeddedobj/source/msole/olepersist.hxx +++ b/embeddedobj/source/msole/olepersist.hxx @@ -22,9 +22,7 @@ #include <sal/config.h> -#include <com/sun/star/io/IOException.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> #include <rtl/ustring.hxx> namespace com { namespace sun { namespace star { diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index ca1e4437b309..7af86e8db9ae 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <com/sun/star/registry/InvalidRegistryException.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/factory.hxx> diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index e89ec59f60d8..306f51dfe973 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -40,7 +40,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/mimeconfighelper.hxx> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include "olepersist.hxx" diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx index 4b437fea8d51..4afcb9e80b17 100644 --- a/embeddedobj/source/msole/ownview.hxx +++ b/embeddedobj/source/msole/ownview.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/util/XCloseListener.hpp> #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <cppuhelper/implbase.hxx> diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx index b858930b3646..128c099d23aa 100644 --- a/embeddedobj/source/msole/xdialogcreator.hxx +++ b/embeddedobj/source/msole/xdialogcreator.hxx @@ -23,8 +23,10 @@ #include <com/sun/star/embed/XInsertObjectDialog.hpp> #include <com/sun/star/embed/XEmbedObjectClipboardCreator.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase.hxx> +#include <osl/diagnose.h> class MSOLEDialogObjectCreator : public ::cppu::WeakImplHelper< diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx index 553f5846807a..341afdd3e003 100644 --- a/embeddedobj/source/msole/xolefactory.cxx +++ b/embeddedobj/source/msole/xolefactory.cxx @@ -17,13 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/EntryInitModes.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/io/IOException.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> #include "xolefactory.hxx" #include <oleembobj.hxx> |