Kaydet (Commit) c97b226b authored tarafından Alexandre Vicenzi's avatar Alexandre Vicenzi Kaydeden (comit) Caolán McNamara

fdo#63154 Removed unused solar.h ref. in sfx2

Change-Id: I7fd8815482c3491d28e0d353e725e7c37aa52fc3
Reviewed-on: https://gerrit.libreoffice.org/7736Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 53ba2eef
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <sal/config.h> #include <sal/config.h>
#include <sfx2/dllapi.h> #include <sfx2/dllapi.h>
#include <sal/types.h> #include <sal/types.h>
#include <tools/solar.h>
#include <tools/errcode.hxx> #include <tools/errcode.hxx>
#include <svl/smplhint.hxx> #include <svl/smplhint.hxx>
#include <svl/poolitem.hxx> #include <svl/poolitem.hxx>
...@@ -98,8 +97,6 @@ namespace sfx2 ...@@ -98,8 +97,6 @@ namespace sfx2
} }
} }
//====================================================================
class SfxLinkItem : public SfxPoolItem class SfxLinkItem : public SfxPoolItem
{ {
Link aLink; Link aLink;
...@@ -266,8 +263,6 @@ public: ...@@ -266,8 +263,6 @@ public:
#define SFX_APP() SfxGetpApp() #define SFX_APP() SfxGetpApp()
//--------------------------------------------------------------------
inline SfxApplication* SfxGetpApp() inline SfxApplication* SfxGetpApp()
{ {
return SfxApplication::GetOrCreate(); return SfxApplication::GetOrCreate();
......
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
#ifndef INCLUDED_SFX2_CHALIGN_HXX #ifndef INCLUDED_SFX2_CHALIGN_HXX
#define INCLUDED_SFX2_CHALIGN_HXX #define INCLUDED_SFX2_CHALIGN_HXX
#include <tools/solar.h>
// New order: first, navigation bar, then vertically docked child windows // New order: first, navigation bar, then vertically docked child windows
// (Explorer!), then horizontally docked child windows (Browser!), // (Explorer!), then horizontally docked child windows (Browser!),
// then the format bar, status bar, and at the end of the toolbar. // then the format bar, status bar, and at the end of the toolbar.
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <sal/config.h> #include <sal/config.h>
#include <sfx2/dllapi.h> #include <sfx2/dllapi.h>
#include <sal/types.h> #include <sal/types.h>
#include <tools/solar.h>
#include <tools/rtti.hxx> #include <tools/rtti.hxx>
// SFX_IMPL_MODULE_LIB // SFX_IMPL_MODULE_LIB
...@@ -39,8 +38,6 @@ struct SfxObjectFactory_Impl; ...@@ -39,8 +38,6 @@ struct SfxObjectFactory_Impl;
class SfxFilterContainer; class SfxFilterContainer;
class SfxBindings; class SfxBindings;
//====================================================================
typedef void (*SfxVoidFunc)(); typedef void (*SfxVoidFunc)();
#define SDT_SDT_DOCFACTPRIO 10 // Explorer #define SDT_SDT_DOCFACTPRIO 10 // Explorer
...@@ -56,8 +53,6 @@ typedef void (*SfxVoidFunc)(); ...@@ -56,8 +53,6 @@ typedef void (*SfxVoidFunc)();
#define SDT_MSG_DOCFACTPRIO 110 // Message Document #define SDT_MSG_DOCFACTPRIO 110 // Message Document
#define SDT_SDB_DOCFACTPRIO 200 // Database Document #define SDT_SDB_DOCFACTPRIO 200 // Database Document
//====================================================================
class SFX2_DLLPUBLIC SfxObjectFactory class SFX2_DLLPUBLIC SfxObjectFactory
{ {
private: private:
...@@ -107,8 +102,6 @@ private: ...@@ -107,8 +102,6 @@ private:
SAL_DLLPRIVATE const SfxObjectFactory& operator=(const SfxObjectFactory &); SAL_DLLPRIVATE const SfxObjectFactory& operator=(const SfxObjectFactory &);
}; };
//=========================================================================
#define SFX_DECL_OBJECTFACTORY() \ #define SFX_DECL_OBJECTFACTORY() \
public: \ public: \
static SfxObjectFactory& Factory(); \ static SfxObjectFactory& Factory(); \
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <sal/types.h> #include <sal/types.h>
#include <sfx2/dllapi.h> #include <sfx2/dllapi.h>
#include <sfx2/sfxdefs.hxx> #include <sfx2/sfxdefs.hxx>
#include <tools/solar.h>
#include <tools/wldcrd.hxx> #include <tools/wldcrd.hxx>
#define SFX_FILTER_STARTPRESENTATION 0x20000000L #define SFX_FILTER_STARTPRESENTATION 0x20000000L
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/solar.h>
#include <tools/errcode.hxx> #include <tools/errcode.hxx>
#include <vcl/dialog.hxx> #include <vcl/dialog.hxx>
#include <vcl/edit.hxx> #include <vcl/edit.hxx>
...@@ -35,8 +34,6 @@ ...@@ -35,8 +34,6 @@
#include <sfx2/sfxuno.hxx> #include <sfx2/sfxuno.hxx>
#include <sfx2/docfilt.hxx> #include <sfx2/docfilt.hxx>
//-----------------------------------------------------------------------------
namespace com namespace com
{ {
namespace sun namespace sun
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <sal/config.h> #include <sal/config.h>
#include <sal/types.h> #include <sal/types.h>
#include <sfx2/dllapi.h> #include <sfx2/dllapi.h>
#include <tools/solar.h>
class SvStream; class SvStream;
class SotDataObject; class SotDataObject;
......
...@@ -20,10 +20,7 @@ ...@@ -20,10 +20,7 @@
#define INCLUDED_SFX2_OBJSH_HXX #define INCLUDED_SFX2_OBJSH_HXX
#include <config_features.h> #include <config_features.h>
#include <sal/config.h> #include <sal/config.h>
#include <tools/solar.h>
#include <sfx2/dllapi.h> #include <sfx2/dllapi.h>
#include <sal/types.h> #include <sal/types.h>
#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrame.hpp>
...@@ -40,10 +37,6 @@ ...@@ -40,10 +37,6 @@
#include <com/sun/star/document/CmisVersion.hpp> #include <com/sun/star/document/CmisVersion.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
//________________________________________________________________________________________________________________
// include something else
//________________________________________________________________________________________________________________
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
#include <svl/poolitem.hxx> #include <svl/poolitem.hxx>
#include <vcl/bitmap.hxx> #include <vcl/bitmap.hxx>
...@@ -132,8 +125,6 @@ typedef sal_uInt32 SfxObjectShellFlags; ...@@ -132,8 +125,6 @@ typedef sal_uInt32 SfxObjectShellFlags;
#define SFXOBJECTSHELL_STD_SPECIAL ( SFXOBJECTSHELL_DONTLOADFILTERS ) #define SFXOBJECTSHELL_STD_SPECIAL ( SFXOBJECTSHELL_DONTLOADFILTERS )
#define SFXOBJECTSHELL_UNDEFINED 0xf000000 #define SFXOBJECTSHELL_UNDEFINED 0xf000000
//--------------------------------------------------------------------
#define SFX_TITLE_TITLE 0 #define SFX_TITLE_TITLE 0
#define SFX_TITLE_FILENAME 1 #define SFX_TITLE_FILENAME 1
#define SFX_TITLE_FULLNAME 2 #define SFX_TITLE_FULLNAME 2
...@@ -148,8 +139,6 @@ typedef sal_uInt32 SfxObjectShellFlags; ...@@ -148,8 +139,6 @@ typedef sal_uInt32 SfxObjectShellFlags;
#define SFX_LOADED_IMAGES 2 #define SFX_LOADED_IMAGES 2
#define SFX_LOADED_ALL 3 #define SFX_LOADED_ALL 3
//--------------------------------------------------------------------
#define HIDDENINFORMATION_RECORDEDCHANGES 0x0001 #define HIDDENINFORMATION_RECORDEDCHANGES 0x0001
#define HIDDENINFORMATION_NOTES 0x0002 #define HIDDENINFORMATION_NOTES 0x0002
#define HIDDENINFORMATION_DOCUMENTVERSIONS 0x0004 #define HIDDENINFORMATION_DOCUMENTVERSIONS 0x0004
...@@ -162,8 +151,6 @@ enum HiddenWarningFact ...@@ -162,8 +151,6 @@ enum HiddenWarningFact
WhenCreatingPDF WhenCreatingPDF
}; };
//--------------------------------------------------------------------
enum SfxObjectCreateMode enum SfxObjectCreateMode
{ {
SFX_CREATE_MODE_EMBEDDED, SFX_CREATE_MODE_EMBEDDED,
...@@ -174,13 +161,11 @@ enum SfxObjectCreateMode ...@@ -174,13 +161,11 @@ enum SfxObjectCreateMode
SFX_CREATE_MODE_INTERNAL SFX_CREATE_MODE_INTERNAL
}; };
/*==================================================================== /*
The class SfxObjectShell is the base class for SFx-objects, ie documents
The class SfxObjectShell is the base class for SFx-objects, ie documents and parts of documents that can be integrated as separate objects
and parts of documents that can be integrated as separate objects into foreign objects.
into foreign objects. */
----------------------------------------------------------------------*/
class SfxToolBoxConfig; class SfxToolBoxConfig;
struct TransferableObjectDescriptor; struct TransferableObjectDescriptor;
...@@ -550,7 +535,7 @@ public: ...@@ -550,7 +535,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTarget ); const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTarget );
// ==== The functions from SvPersist // The functions from SvPersist
void EnableSetModified( sal_Bool bEnable = sal_True ); void EnableSetModified( sal_Bool bEnable = sal_True );
sal_Bool IsEnableSetModified() const; sal_Bool IsEnableSetModified() const;
virtual void SetModified( sal_Bool bModified = sal_True ); virtual void SetModified( sal_Bool bModified = sal_True );
...@@ -584,7 +569,7 @@ public: ...@@ -584,7 +569,7 @@ public:
comphelper::EmbeddedObjectContainer& GetEmbeddedObjectContainer() const; comphelper::EmbeddedObjectContainer& GetEmbeddedObjectContainer() const;
void ClearEmbeddedObjects(); void ClearEmbeddedObjects();
// ==== The functions from SvEmbeddedObject // The functions from SvEmbeddedObject
virtual Printer * GetDocumentPrinter(); virtual Printer * GetDocumentPrinter();
virtual OutputDevice* GetDocumentRefDev(); virtual OutputDevice* GetDocumentRefDev();
virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ); virtual void OnDocumentPrinterChanged( Printer * pNewPrinter );
...@@ -623,8 +608,6 @@ public: ...@@ -623,8 +608,6 @@ public:
virtual bool SetProtectionPassword( const OUString &rPassword ); virtual bool SetProtectionPassword( const OUString &rPassword );
virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ); virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash );
// =================================
SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const; SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const;
SAL_DLLPRIVATE sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const; SAL_DLLPRIVATE sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
...@@ -746,16 +729,15 @@ public: ...@@ -746,16 +729,15 @@ public:
}; };
//--------------------------------------------------------------------
#ifndef SFX_DECL_OBJECTSHELL_DEFINED #ifndef SFX_DECL_OBJECTSHELL_DEFINED
#define SFX_DECL_OBJECTSHELL_DEFINED #define SFX_DECL_OBJECTSHELL_DEFINED
SV_DECL_REF(SfxObjectShell) SV_DECL_REF(SfxObjectShell)
#endif #endif
SV_DECL_LOCK(SfxObjectShell) SV_DECL_LOCK(SfxObjectShell)
SV_IMPL_LOCK(SfxObjectShell) SV_IMPL_LOCK(SfxObjectShell)
SV_IMPL_REF(SfxObjectShell) SV_IMPL_REF(SfxObjectShell)
//--------------------------------------------------------------------
class AutoReloadTimer_Impl : public Timer class AutoReloadTimer_Impl : public Timer
{ {
OUString aUrl; OUString aUrl;
...@@ -767,8 +749,6 @@ public: ...@@ -767,8 +749,6 @@ public:
virtual void Timeout(); virtual void Timeout();
}; };
//-------------------------------------------------------------------------
class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem
{ {
SfxObjectShell* pObjSh; SfxObjectShell* pObjSh;
......
...@@ -19,12 +19,11 @@ ...@@ -19,12 +19,11 @@
#ifndef INCLUDED_SFX2_PROGRESS_HXX #ifndef INCLUDED_SFX2_PROGRESS_HXX
#define INCLUDED_SFX2_PROGRESS_HXX #define INCLUDED_SFX2_PROGRESS_HXX
#include <rtl/ustring.hxx>
#include <sal/config.h> #include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h> #include <sal/types.h>
#include <tools/solar.h> #include <sfx2/dllapi.h>
#include <tools/link.hxx> #include <tools/link.hxx>
#include <rtl/ustring.hxx>
namespace rtl { namespace rtl {
class OUString; class OUString;
...@@ -34,8 +33,6 @@ struct SfxProgress_Impl; ...@@ -34,8 +33,6 @@ struct SfxProgress_Impl;
struct PlugInLoadStatus; struct PlugInLoadStatus;
struct SvProgressArg; struct SvProgressArg;
//=======================================================================
class SFX2_DLLPUBLIC SfxProgress class SFX2_DLLPUBLIC SfxProgress
{ {
SfxProgress_Impl* pImp; SfxProgress_Impl* pImp;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment