Bin pointless _SOLAR__PRIVATE which was always 1 anyway

Change-Id: I98f35920f02d4ee71787a9968158b220af69bde6

basctl/source/basicide/basides1.cxx

@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define _SOLAR__PRIVATE 1
-
 #include "basidesh.hrc"
 #include "helpid.hrc"
 

basctl/source/basicide/basides3.cxx

@@ -19,8 +19,6 @@
 
 #include <basidesh.hrc>
 
-#define _SOLAR__PRIVATE 1
-
 #include <basidesh.hxx>
 #include <baside2.hxx>
 #include <baside3.hxx>

basctl/source/basicide/basidesh.cxx

@@ -22,7 +22,6 @@
 
 #include "basidesh.hxx"
 
-#define _SOLAR__PRIVATE 1
 #include <tools/diagnose_ex.h>
 #include <basic/basmgr.hxx>
 #include <basidesh.hrc>

basctl/source/inc/basidesh.hxx

@@ -95,7 +95,6 @@ private:
     friend class ContainerListenerImpl;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xLibListener;
 
-#if _SOLAR__PRIVATE
     void                Init();
     void                InitTabBar();
     void                InitScrollBars();
@@ -113,7 +112,6 @@ private:
 
     DECL_LINK( TabBarHdl, TabBar* );
     DECL_LINK( TabBarSplitHdl, TabBar * );
-#endif
 
     static unsigned nShellCount;
 

cui/source/inc/dlgname.hxx

@@ -39,9 +39,8 @@ private:
     HelpButton      aBtnHelp;
 
     Link            aCheckNameHdl;
-#if _SOLAR__PRIVATE
+
     DECL_LINK(ModifyHdl, void *);
-#endif
 
 public:
     SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc );
@@ -93,9 +92,8 @@ private:
 
     // callback link for name uniqueness
     Link            aCheckNameHdl;
-#if _SOLAR__PRIVATE
+
     DECL_LINK(ModifyHdl, void *);
-#endif
 
 public:
     // constructor
@@ -156,10 +154,10 @@ private:
     CancelButton    aBtnCancel;
     FixedImage      aFtImage;
     Image*          pImage;
-#if _SOLAR__PRIVATE
+
     DECL_LINK(Button1Hdl, void *);
     DECL_LINK(Button2Hdl, void *);
-#endif
+
 public:
     SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg = NULL );
     ~SvxMessDialog();

cui/source/inc/linkdlg.hxx

@@ -73,7 +73,6 @@ class SvBaseLinksDlg : public ModalDialog
     sal_Bool            bHtmlMode;
     Timer aUpdateTimer;
 
-#if _SOLAR__PRIVATE
     DECL_LINK( LinksSelectHdl, SvTabListBox * );
     DECL_LINK( LinksDoubleClickHdl, SvTabListBox * );
     DECL_LINK( AutomaticClickHdl, RadioButton * );
@@ -88,7 +87,6 @@ class SvBaseLinksDlg : public ModalDialog
     String ImplGetStateStr( const sfx2::SvBaseLink& );
     void SetType( sfx2::SvBaseLink& rLink, sal_uInt16 nPos, sal_uInt16 nType );
     void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uInt16 nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False);
-#endif
 
     void StartUpdateTimer()         { aUpdateTimer.Start(); }
 

cui/source/inc/macropg.hxx

@@ -56,14 +56,12 @@ class _SvxMacroTabPage_Impl;
 
 class _SvxMacroTabPage : public SfxTabPage
 {
-#if _SOLAR__PRIVATE
     DECL_STATIC_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox * );
     DECL_STATIC_LINK( _SvxMacroTabPage, AssignDeleteHdl_Impl, PushButton * );
     DECL_STATIC_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox * );
 
     static long GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* pBtn );
 
-#endif
 protected:
     _SvxMacroTabPage_Impl*      mpImpl;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xAppEvents;
@@ -133,9 +131,7 @@ private:
     const SfxItemSet*   pOptions;
     SfxItemSet*         pOutSet;
 
-#if _SOLAR__PRIVATE
     DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * );
-#endif
 };
 
 

cui/source/inc/transfrm.hxx

@@ -134,22 +134,18 @@ private:
     RECT_POINT          meRP;
 
     //------------------------------------
-#if _SOLAR__PRIVATE
     DECL_LINK( ChangePosProtectHdl, void * );
     DECL_LINK( ChangeSizeProtectHdl, void * );
 
     void SetMinMaxPosition();
     void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange);
-#endif
 
-#if _SOLAR__PRIVATE
     DECL_LINK( ChangeWidthHdl, void * );
     DECL_LINK( ChangeHeightHdl, void * );
     DECL_LINK( ClickSizeProtectHdl, void * );
     DECL_LINK( ClickAutoHdl, void * );
 
     void        SetMaxSize( Rectangle aRect );
-#endif
 
 public:
     SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs  );

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: */

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 );

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;
 

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
 };
 
 //========================================================================

svx/inc/svdibrow.hxx

@@ -56,14 +56,14 @@ friend class ImpItemEdit;
     bool bDontSortItems;
     bool bShowWhichIds;
     bool bShowRealValues;
+
 private:
-#if _SOLAR__PRIVATE
     void ImpCtor();
     void ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum);
     ImpItemListRow* ImpGetEntry(sal_uIntPtr nPos) const { return aList[nPos]; }
     void ImpSaveWhich();
     void ImpRestoreWhich();
-#endif // __PRIVATE
+
 protected:
     virtual long GetRowCount() const;
     virtual sal_Bool SeekRow(long nRow);

svx/source/tbxctrls/colorwindow.hxx

@@ -25,9 +25,7 @@ private:
     rtl::OUString  maCommand;
     const Color    mLastColor;
 
-#if _SOLAR__PRIVATE
     DECL_LINK( SelectHdl, void * );
-#endif
 
 protected:
     virtual void    Resize();

svx/source/tbxctrls/tbcontrl.cxx

@@ -247,9 +247,7 @@ private:
     ImageList       aImgList;
     sal_Bool        bParagraphMode;
 
-#if _SOLAR__PRIVATE
     DECL_LINK( SelectHdl, void * );
-#endif
 
 protected:
     virtual void    Resize();
@@ -277,9 +275,7 @@ private:
     LineListBox         m_aLineStyleLb;
     bool                m_bIsWriter;
 
-#if _SOLAR__PRIVATE
     DECL_LINK( SelectHdl, void * );
-#endif
 
 protected:
     virtual void    Resize();

sw/source/ui/inc/docfnote.hxx

@@ -30,9 +30,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog
 
     virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
-#ifdef _SOLAR__PRIVATE
     DECL_LINK( OkHdl, Button * );
-#endif
 
 public:
     SwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh );

tools/inc/tools/solar.h

@@ -24,11 +24,6 @@
 #include <osl/endian.h>
 #include <comphelper/fileformat.h>
 
-#ifdef _SOLAR__PRIVATE
-#undef _SOLAR__PRIVATE
-#endif
-#define _SOLAR__PRIVATE 1
-
 /** Intermediate type to solve type clash with Windows headers.
  Should be removed as soon as all code parts have been reviewed
  and the correct type is known. Most of the times ULONG is meant

unotools/inc/unotools/ucblockbytes.hxx

@@ -151,7 +151,6 @@ public:
     // calling this method delegates the responsibility to call closeinput to the caller!
     ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > getInputStream();
 
-#if _SOLAR__PRIVATE
     sal_Bool                setInputStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > &rxInputStream,
                                                  sal_Bool bSetXSeekable = sal_True );
     sal_Bool                setStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > &rxStream );
@@ -188,7 +187,6 @@ public:
     void                    SetRealURL_Impl( const String& rURL )  { m_aRealURL = rURL; }
     void                    SetExpireDate_Impl( const DateTime& rDateTime )  { m_aExpireDate = rDateTime; }
     void                    SetStreamValid_Impl();
-#endif
 };
 
 SV_IMPL_REF( UcbLockBytes );

vcl/inc/impbmp.hxx

@@ -50,8 +50,6 @@ public:
                         ImpBitmap();
                         ~ImpBitmap();
 
-#if _SOLAR__PRIVATE
-
 public:
 
     void                ImplSetSalBitmap( SalBitmap* pSalBitmap );
@@ -80,8 +78,6 @@ public:
 
     inline void         ImplSetChecksum( sal_uLong nChecksum ) { mnChecksum = nChecksum; }
     inline sal_uLong        ImplGetChecksum() const { return mnChecksum; }
-
-#endif // PRIVATE
 };
 
 inline Size ImpBitmap::ImplGetSourceSize() const

vcl/inc/vcl/syswin.hxx

@@ -152,11 +152,9 @@ private:
     sal_uInt16          mnIcon;
     ImplData*       mpImplData;
 
-#if _SOLAR__PRIVATE
 public:
     using Window::ImplIsInTaskPaneList;
     SAL_DLLPRIVATE sal_Bool ImplIsInTaskPaneList( Window* pWin );
-#endif
 
 private:
     // Default construction is forbidden and not implemented.

vcl/inc/vcl/timer.hxx

@@ -59,10 +59,8 @@ public:
 
     Timer&          operator=( const Timer& rTimer );
 
-//    #ifdef _SOLAR__PRIVATE
     static void ImplDeInitTimer();
     static void ImplTimerCallbackProc();
-//    #endif
 };
 
 // -------------