From 56d3de7360434e4f15d7bd92d50888e8bc092ad6 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Tue, 20 Nov 2012 13:55:16 +0200
Subject: Bin pointless _SOLAR__PRIVATE which was always 1 anyway

Change-Id: I98f35920f02d4ee71787a9968158b220af69bde6
---
 cui/source/inc/dlgname.hxx  | 10 ++++------
 cui/source/inc/linkdlg.hxx  |  2 --
 cui/source/inc/macropg.hxx  |  4 ----
 cui/source/inc/transfrm.hxx |  4 ----
 4 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'cui')

diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 35c065d6120d..de6405278136 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/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();
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 1c75302dda52..e5d928d7c253 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/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(); }
 
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index b83d825fdf9d..561e500297ac 100644
--- a/cui/source/inc/macropg.hxx
+++ b/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
 };
 
 
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 072ecae12313..c1417d67325f 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/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  );
-- 
cgit