Bin pointless _SOLAR__PRIVATE which was always 1 anyway

Change-Id: I98f35920f02d4ee71787a9968158b220af69bde6

4 files changed, 3 insertions, 12 deletions

diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 56023e9024ba..883162223148 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -25,9 +25,8 @@
 #include <vcl/combobox.hxx>
 #include <svtools/acceleratorexecute.hxx>
 
-#if _SOLAR__PRIVATE
-
 #include <sfx2/tbxctrl.hxx>
+
 class SvtURLBox;
 
 class SfxURLToolBoxControl_Impl : public SfxToolBoxControl
@@ -63,6 +62,4 @@ public:
 
 #endif
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 5ba00f65e830..9b347e0475e6 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -69,7 +69,6 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
 {
     SfxMedium_Impl* pImp;
 
-#if _SOLAR__PRIVATE
     SAL_DLLPRIVATE void SetIsRemote_Impl();
     SAL_DLLPRIVATE void CloseInStream_Impl();
     SAL_DLLPRIVATE sal_Bool CloseOutStream_Impl();
@@ -77,7 +76,6 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
     DECL_DLLPRIVATE_STATIC_LINK( SfxMedium, UCBHdl_Impl, sal_uInt32 * );
 
     SAL_DLLPRIVATE void SetEncryptionDataToStorage_Impl();
-#endif
 
 public:
 
@@ -197,7 +195,6 @@ public:
     void                SetInCheckIn( bool bInCheckIn );
     bool                IsInCheckIn( );
 
-#if _SOLAR__PRIVATE
     SAL_DLLPRIVATE sal_Bool HasStorage_Impl() const;
 
     SAL_DLLPRIVATE void StorageBackup_Impl();
@@ -266,7 +263,6 @@ public:
     //             in this case the methods will be used generally, and might need to be renamed
     SAL_DLLPRIVATE sal_uInt16 GetCachedSignatureState_Impl();
     SAL_DLLPRIVATE void       SetCachedSignatureState_Impl( sal_uInt16 nState );
-#endif
 
     static com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag > GetVersionList(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
index 6bb9983b26a8..2b3bdbede9d0 100644
--- a/sfx2/inc/sfx2/macropg.hxx
+++ b/sfx2/inc/sfx2/macropg.hxx
@@ -43,7 +43,7 @@ class _SfxMacroTabPage_Impl;
 class SFX2_DLLPUBLIC _SfxMacroTabPage : public SfxTabPage
 {
     SvxMacroTableDtor           aTbl;
-//#if 0 // _SOLAR__PRIVATE
+
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * );
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * );
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * );
@@ -54,7 +54,7 @@ class SFX2_DLLPUBLIC _SfxMacroTabPage : public SfxTabPage
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * );
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* );
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
-//#endif
+
 protected:
     _SfxMacroTabPage_Impl*      mpImpl;
 
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 3c9387c4149d..da8bd20776df 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -262,7 +262,6 @@ public:
     void                        AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, sal_Bool );
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier();
 
-#if _SOLAR__PRIVATE
     SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
     SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );
     SAL_DLLPRIVATE void RemoveContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );
@@ -296,7 +295,6 @@ public:
     SAL_DLLPRIVATE void TakeOwnerShip_Impl();
     SAL_DLLPRIVATE void TakeFrameOwnerShip_Impl();
     SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey);
-#endif
 };
 
 //========================================================================