[Libreoffice-commits] core.git: include/sfx2
Alexandre Vicenzi
vicenzi.alexandre at gmail.com
Thu Jan 30 03:32:20 PST 2014
include/sfx2/app.hxx | 5 -----
include/sfx2/chalign.hxx | 2 --
include/sfx2/docfac.hxx | 7 -------
include/sfx2/docfilt.hxx | 1 -
include/sfx2/filedlghelper.hxx | 3 ---
include/sfx2/mieclip.hxx | 1 -
include/sfx2/objsh.hxx | 36 ++++++++----------------------------
include/sfx2/progress.hxx | 7 ++-----
8 files changed, 10 insertions(+), 52 deletions(-)
New commits:
commit c97b226b5a5480caf00d1c859fc7bcbfddde3a6a
Author: Alexandre Vicenzi <vicenzi.alexandre at gmail.com>
Date: Wed Jan 29 21:58:11 2014 -0200
fdo#63154 Removed unused solar.h ref. in sfx2
Change-Id: I7fd8815482c3491d28e0d353e725e7c37aa52fc3
Reviewed-on: https://gerrit.libreoffice.org/7736
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index d811b27..95e987b 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
-#include <tools/solar.h>
#include <tools/errcode.hxx>
#include <svl/smplhint.hxx>
#include <svl/poolitem.hxx>
@@ -98,8 +97,6 @@ namespace sfx2
}
}
-//====================================================================
-
class SfxLinkItem : public SfxPoolItem
{
Link aLink;
@@ -266,8 +263,6 @@ public:
#define SFX_APP() SfxGetpApp()
-//--------------------------------------------------------------------
-
inline SfxApplication* SfxGetpApp()
{
return SfxApplication::GetOrCreate();
diff --git a/include/sfx2/chalign.hxx b/include/sfx2/chalign.hxx
index c964299..bea8eca 100644
--- a/include/sfx2/chalign.hxx
+++ b/include/sfx2/chalign.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SFX2_CHALIGN_HXX
#define INCLUDED_SFX2_CHALIGN_HXX
-#include <tools/solar.h>
-
// New order: first, navigation bar, then vertically docked child windows
// (Explorer!), then horizontally docked child windows (Browser!),
// then the format bar, status bar, and at the end of the toolbar.
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index 512a82c..af0b7f9 100644
--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
-#include <tools/solar.h>
#include <tools/rtti.hxx>
// SFX_IMPL_MODULE_LIB
@@ -39,8 +38,6 @@ struct SfxObjectFactory_Impl;
class SfxFilterContainer;
class SfxBindings;
-//====================================================================
-
typedef void (*SfxVoidFunc)();
#define SDT_SDT_DOCFACTPRIO 10 // Explorer
@@ -56,8 +53,6 @@ typedef void (*SfxVoidFunc)();
#define SDT_MSG_DOCFACTPRIO 110 // Message Document
#define SDT_SDB_DOCFACTPRIO 200 // Database Document
-//====================================================================
-
class SFX2_DLLPUBLIC SfxObjectFactory
{
private:
@@ -107,8 +102,6 @@ private:
SAL_DLLPRIVATE const SfxObjectFactory& operator=(const SfxObjectFactory &);
};
-//=========================================================================
-
#define SFX_DECL_OBJECTFACTORY() \
public: \
static SfxObjectFactory& Factory(); \
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 85f93da..e746946 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -30,7 +30,6 @@
#include <sal/types.h>
#include <sfx2/dllapi.h>
#include <sfx2/sfxdefs.hxx>
-#include <tools/solar.h>
#include <tools/wldcrd.hxx>
#define SFX_FILTER_STARTPRESENTATION 0x20000000L
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 37e48b1..a68a791 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
-#include <tools/solar.h>
#include <tools/errcode.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
@@ -35,8 +34,6 @@
#include <sfx2/sfxuno.hxx>
#include <sfx2/docfilt.hxx>
-//-----------------------------------------------------------------------------
-
namespace com
{
namespace sun
diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx
index bbd8f5b..0fad211 100644
--- a/include/sfx2/mieclip.hxx
+++ b/include/sfx2/mieclip.hxx
@@ -24,7 +24,6 @@
#include <sal/config.h>
#include <sal/types.h>
#include <sfx2/dllapi.h>
-#include <tools/solar.h>
class SvStream;
class SotDataObject;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 69b49a6..8cf31db 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -20,10 +20,7 @@
#define INCLUDED_SFX2_OBJSH_HXX
#include <config_features.h>
-
#include <sal/config.h>
-
-#include <tools/solar.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
#include <com/sun/star/frame/XFrame.hpp>
@@ -40,10 +37,6 @@
#include <com/sun/star/document/CmisVersion.hpp>
#include <boost/shared_ptr.hpp>
-//________________________________________________________________________________________________________________
-// include something else
-//________________________________________________________________________________________________________________
-
#include <vcl/timer.hxx>
#include <svl/poolitem.hxx>
#include <vcl/bitmap.hxx>
@@ -132,8 +125,6 @@ typedef sal_uInt32 SfxObjectShellFlags;
#define SFXOBJECTSHELL_STD_SPECIAL ( SFXOBJECTSHELL_DONTLOADFILTERS )
#define SFXOBJECTSHELL_UNDEFINED 0xf000000
-//--------------------------------------------------------------------
-
#define SFX_TITLE_TITLE 0
#define SFX_TITLE_FILENAME 1
#define SFX_TITLE_FULLNAME 2
@@ -148,8 +139,6 @@ typedef sal_uInt32 SfxObjectShellFlags;
#define SFX_LOADED_IMAGES 2
#define SFX_LOADED_ALL 3
-//--------------------------------------------------------------------
-
#define HIDDENINFORMATION_RECORDEDCHANGES 0x0001
#define HIDDENINFORMATION_NOTES 0x0002
#define HIDDENINFORMATION_DOCUMENTVERSIONS 0x0004
@@ -162,8 +151,6 @@ enum HiddenWarningFact
WhenCreatingPDF
};
-//--------------------------------------------------------------------
-
enum SfxObjectCreateMode
{
SFX_CREATE_MODE_EMBEDDED,
@@ -174,13 +161,11 @@ enum SfxObjectCreateMode
SFX_CREATE_MODE_INTERNAL
};
-/*====================================================================
-
-The class SfxObjectShell is the base class for SFx-objects, ie documents
-and parts of documents that can be integrated as separate objects
-into foreign objects.
-
-----------------------------------------------------------------------*/
+/*
+ The class SfxObjectShell is the base class for SFx-objects, ie documents
+ and parts of documents that can be integrated as separate objects
+ into foreign objects.
+*/
class SfxToolBoxConfig;
struct TransferableObjectDescriptor;
@@ -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 >& xTarget );
- // ==== The functions from SvPersist
+ // The functions from SvPersist
void EnableSetModified( sal_Bool bEnable = sal_True );
sal_Bool IsEnableSetModified() const;
virtual void SetModified( sal_Bool bModified = sal_True );
@@ -584,7 +569,7 @@ public:
comphelper::EmbeddedObjectContainer& GetEmbeddedObjectContainer() const;
void ClearEmbeddedObjects();
- // ==== The functions from SvEmbeddedObject
+ // The functions from SvEmbeddedObject
virtual Printer * GetDocumentPrinter();
virtual OutputDevice* GetDocumentRefDev();
virtual void OnDocumentPrinterChanged( Printer * pNewPrinter );
@@ -623,8 +608,6 @@ public:
virtual bool SetProtectionPassword( const OUString &rPassword );
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 sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
@@ -746,16 +729,15 @@ public:
};
-//--------------------------------------------------------------------
#ifndef SFX_DECL_OBJECTSHELL_DEFINED
#define SFX_DECL_OBJECTSHELL_DEFINED
SV_DECL_REF(SfxObjectShell)
#endif
+
SV_DECL_LOCK(SfxObjectShell)
SV_IMPL_LOCK(SfxObjectShell)
SV_IMPL_REF(SfxObjectShell)
-//--------------------------------------------------------------------
class AutoReloadTimer_Impl : public Timer
{
OUString aUrl;
@@ -767,8 +749,6 @@ public:
virtual void Timeout();
};
-//-------------------------------------------------------------------------
-
class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem
{
SfxObjectShell* pObjSh;
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index af24b58..0e21a43 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -19,12 +19,11 @@
#ifndef INCLUDED_SFX2_PROGRESS_HXX
#define INCLUDED_SFX2_PROGRESS_HXX
+#include <rtl/ustring.hxx>
#include <sal/config.h>
-#include <sfx2/dllapi.h>
#include <sal/types.h>
-#include <tools/solar.h>
+#include <sfx2/dllapi.h>
#include <tools/link.hxx>
-#include <rtl/ustring.hxx>
namespace rtl {
class OUString;
@@ -34,8 +33,6 @@ struct SfxProgress_Impl;
struct PlugInLoadStatus;
struct SvProgressArg;
-//=======================================================================
-
class SFX2_DLLPUBLIC SfxProgress
{
SfxProgress_Impl* pImp;
More information about the Libreoffice-commits
mailing list