[Libreoffice-commits] core.git: 2 commits - include/sfx2 sc/source sfx2/source

[Stephan Bergmann]

 include/sfx2/app.hxx          |    6 ------
 include/sfx2/doctempl.hxx     |   12 +-----------
 include/sfx2/objsh.hxx        |    3 ---
 include/sfx2/viewfrm.hxx      |    7 +------
 sc/source/ui/inc/linkarea.hxx |    1 +
 sfx2/source/doc/doctempl.cxx  |    6 ------
 6 files changed, 3 insertions(+), 32 deletions(-)

New commits:
commit f4c40c4ae8ad1c1b3565f94eecc52296125570a7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 22 20:48:42 2016 +0100

    Resolve SfxDocTemplate_ImplRef typedef
    
    Change-Id: I9dfe4557a471f1b33cc4cad879bec1797e03f8d1

diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index d07d2fe..82fdc11 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -31,17 +31,12 @@ class SfxObjectShell;
 
 class SfxDocTemplate_Impl;
 
-#ifndef SFX_DECL_DOCTEMPLATES_DEFINED
-#define SFX_DECL_DOCTEMPLATES_DEFINED
-typedef tools::SvRef<SfxDocTemplate_Impl> SfxDocTemplate_ImplRef;
-#endif
-
 // class SfxDocumentTemplates --------------------------------------------
 
 class SFX2_DLLPUBLIC SfxDocumentTemplates
 {
 private:
-    SfxDocTemplate_ImplRef  pImp;
+    tools::SvRef<SfxDocTemplate_Impl> pImp;
 
     SAL_DLLPRIVATE bool CopyOrMove( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx,
                                     sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx, bool bMove );
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 23672ca..69a99d0 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -253,12 +253,6 @@ public:
     }
 };
 
-
-#ifndef SFX_DECL_DOCTEMPLATES_DEFINED
-#define SFX_DECL_DOCTEMPLATES_DEFINED
-typedef tools::SvRef<SfxDocTemplate_Impl> SfxDocTemplate_ImplRef;
-#endif
-
 SfxDocTemplate_Impl *gpTemplateData = nullptr;
 
 
commit 92da12ad15a9c11c5f117f1c490d5113bdead045
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 22 20:43:56 2016 +0100

    Pick a single place to declare SfxObjectShellRef typedef
    
    Change-Id: Ie949f4d9002beefb810c87cdd44bf59f575da101

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 58738f6..33180ca 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -26,7 +26,6 @@
 #include <svl/smplhint.hxx>
 #include <svl/poolitem.hxx>
 #include <vcl/image.hxx>
-#include <tools/ref.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
@@ -106,11 +105,6 @@ public:
                              GetValue() const { return aLink; }
 };
 
-#ifndef SFX_DECL_OBJECTSHELL_DEFINED
-#define SFX_DECL_OBJECTSHELL_DEFINED
-typedef tools::SvRef<SfxObjectShell> SfxObjectShellRef;
-#endif
-
 class SfxObjectShellLock;
 
 class SFX2_DLLPUBLIC SfxApplication: public SfxShell
diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index f84848b..d07d2fe 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -29,11 +29,6 @@
 
 class SfxObjectShell;
 
-#ifndef SFX_DECL_OBJECTSHELL_DEFINED
-#define SFX_DECL_OBJECTSHELL_DEFINED
-typedef tools::SvRef<SfxObjectShell> SfxObjectShellRef;
-#endif
-
 class SfxDocTemplate_Impl;
 
 #ifndef SFX_DECL_DOCTEMPLATES_DEFINED
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 90c536e..7cfd358 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -754,10 +754,7 @@ public:
     };
 
 
-#ifndef SFX_DECL_OBJECTSHELL_DEFINED
-#define SFX_DECL_OBJECTSHELL_DEFINED
 typedef tools::SvRef<SfxObjectShell> SfxObjectShellRef;
-#endif
 
 class SfxObjectShellLock
 {
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 9094293..23a4610 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -25,6 +25,7 @@
 #include <svl/lstner.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/frame.hxx>
+#include <sfx2/objsh.hxx>
 #include <sfx2/shell.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svl/poolitem.hxx>
@@ -37,7 +38,6 @@
 
 class SvBorder;
 class SfxDispatcher;
-class SfxObjectShell;
 class SfxBindings;
 class SfxProgress;
 class SvData;
@@ -62,11 +62,6 @@ namespace basegfx
     class BColor;
 }
 
-#ifndef SFX_DECL_OBJECTSHELL_DEFINED
-#define SFX_DECL_OBJECTSHELL_DEFINED
-typedef tools::SvRef<SfxObjectShell> SfxObjectShellRef;
-#endif
-
 class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener
 {
     struct SfxViewFrame_Impl*   pImp;
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index 7e68b47f..a9a8b57 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -26,6 +26,7 @@
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
+#include <sfx2/objsh.hxx>
 #include <svtools/stdctrl.hxx>
 #include <svtools/inettbc.hxx>