diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-22 20:43:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-22 21:06:02 +0100 |
| commit | 92da12ad15a9c11c5f117f1c490d5113bdead045 (patch) | |
| tree | 387c3f8eb02be86e85c3e592f801138f80d84cc1 | |
| parent | c95c96d62d4c7811afe0bace7c23154837a716a8 (diff) | |
Pick a single place to declare SfxObjectShellRef typedef
Change-Id: Ie949f4d9002beefb810c87cdd44bf59f575da101
| -rw-r--r-- | include/sfx2/app.hxx | 6 | ||||
| -rw-r--r-- | include/sfx2/doctempl.hxx | 5 | ||||
| -rw-r--r-- | include/sfx2/objsh.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/viewfrm.hxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/inc/linkarea.hxx | 1 |
5 files changed, 2 insertions, 20 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 58738f6e7b07..33180caa92f3 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 f84848bbfdc0..d07d2fe9a89d 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 90c536e2d757..7cfd3584fbf5 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 9094293fb446..23a461053b45 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 7e68b47f4cf5..a9a8b575d6e7 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> |