summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-11-20 13:55:16 +0200
committerTor Lillqvist <tml@iki.fi>2012-11-20 15:01:31 +0200
commit56d3de7360434e4f15d7bd92d50888e8bc092ad6 (patch)
treedccdb678df5566cdcccf469121bcc1f90d3a2ca9 /svx
parenta0adefdc4991baa8a3c402f3b01270b73fd28362 (diff)
Bin pointless _SOLAR__PRIVATE which was always 1 anyway
Change-Id: I98f35920f02d4ee71787a9968158b220af69bde6
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svdibrow.hxx4
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx4
3 files changed, 2 insertions, 8 deletions
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 8a8e8686d671..cdb82b66e958 100644
--- a/svx/inc/svdibrow.hxx
+++ b/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);
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 1b033ab36d8c..5de812f2becd 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/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();
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 063cb02fe2fc..7639bfe82887 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/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();