summaryrefslogtreecommitdiff
path: root/sfx2/inc/sfx2/docfac.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/inc/sfx2/docfac.hxx')
-rw-r--r--sfx2/inc/sfx2/docfac.hxx46
1 files changed, 21 insertions, 25 deletions
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index bc2d9bfc7be2..b0a047c7180b 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
#include <tools/rtti.hxx>
// SFX_IMPL_MODULE_LIB
-#include <vos/module.hxx>
+#include <osl/module.hxx>
#include <rtl/ustring.hxx>
#include <sfx2/objsh.hxx>
@@ -53,25 +54,25 @@ class SfxBindings;
typedef void (*SfxVoidFunc)();
#define SDT_SDT_DOCFACTPRIO 10 // Explorer
-#define SDT_SW_DOCFACTPRIO 20 // Text-Dokument
-#define SDT_SWW_DOCFACTPRIO 21 // Web-Dokument
-#define SDT_SC_DOCFACTPRIO 30 // Tabellen-Dokument
-#define SDT_SI_DOCFACTPRIO 40 // Impress-Dokument
-#define SDT_SD_DOCFACTPRIO 41 // Draw-Dokument
-#define SDT_SCH_DOCFACTPRIO 50 // Chart-Dokument
-#define SDT_SMA_DOCFACTPRIO 60 // Math-Dokument
-#define SDT_SIM_DOCFACTPRIO 70 // Image-Dokument
-#define SDT_FRM_DOCFACTPRIO 100 // Rahmen-Dokument
-#define SDT_MSG_DOCFACTPRIO 110 // Nachrichten-Dokument
-#define SDT_SDB_DOCFACTPRIO 200 // Datenbank-Dokument
+#define SDT_SW_DOCFACTPRIO 20 // Text Document
+#define SDT_SWW_DOCFACTPRIO 21 // Web Document
+#define SDT_SC_DOCFACTPRIO 30 // Table Document
+#define SDT_SI_DOCFACTPRIO 40 // Impress Document
+#define SDT_SD_DOCFACTPRIO 41 // Draw Document
+#define SDT_SCH_DOCFACTPRIO 50 // Chart Document
+#define SDT_SMA_DOCFACTPRIO 60 // Math Document
+#define SDT_SIM_DOCFACTPRIO 70 // Image Document
+#define SDT_FRM_DOCFACTPRIO 100 // Frame Document
+#define SDT_MSG_DOCFACTPRIO 110 // Message Document
+#define SDT_SDB_DOCFACTPRIO 200 // Database Document
//====================================================================
class SFX2_DLLPUBLIC SfxObjectFactory
{
private:
- const char* pShortName; // Objekt-Kurzname
- SfxObjectFactory_Impl* pImpl; // Zusatzdaten
+ const char* pShortName;
+ SfxObjectFactory_Impl* pImpl; // Additional Data
SfxObjectShellFlags nFlags;
SAL_DLLPRIVATE void Construct();
@@ -108,11 +109,9 @@ public:
SfxModule* GetModule() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void SetModule_Impl( SfxModule* );
SAL_DLLPRIVATE static void UpdateFilterContainers_Impl();
SAL_DLLPRIVATE sal_uInt16 GetViewNo_Impl( const sal_uInt16 i_nViewId, const sal_uInt16 i_nFallback ) const;
-//#endif
private:
// Kopieren verboten
@@ -123,19 +122,16 @@ private:
//=========================================================================
#define SFX_DECL_OBJECTFACTORY() \
-private: \
- static SfxObjectFactory* pObjectFactory; \
public: \
static SfxObjectFactory& Factory(); \
virtual SfxObjectFactory& GetFactory() const { return Factory(); }
#define SFX_IMPL_OBJECTFACTORY(ClassName,GlobName,Flags,ShortName) \
- SfxObjectFactory* ClassName::pObjectFactory = 0; \
- SfxObjectFactory& ClassName::Factory() \
- { if (!pObjectFactory) \
- pObjectFactory = \
- new SfxObjectFactory( GlobName, Flags, ShortName ); \
- return *pObjectFactory; \
- }
+ SfxObjectFactory& ClassName::Factory() \
+ { \
+ static SfxObjectFactory aObjectFactory(GlobName, Flags, ShortName); \
+ return aObjectFactory; \
+ }
#endif // #ifndef _SFX_OBJFAC_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */