summaryrefslogtreecommitdiffstats
path: root/include/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'include/svtools')
-rw-r--r--include/svtools/calendar.hxx4
-rw-r--r--include/svtools/ctrlbox.hxx7
-rw-r--r--include/svtools/ctrltool.hxx3
-rw-r--r--include/svtools/headbar.hxx2
-rw-r--r--include/svtools/ruler.hxx2
-rw-r--r--include/svtools/scrwin.hxx2
-rw-r--r--include/svtools/valueset.hxx4
-rw-r--r--include/svtools/wizdlg.hxx2
8 files changed, 2 insertions, 24 deletions
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 2c41ae7ed929..0fa8a949455b 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -224,7 +224,6 @@ private:
Timer maDragScrollTimer;
sal_uInt16 mnDragScrollHitTest;
-#ifdef _SV_CALENDAR_CXX
using Control::ImplInitSettings;
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle );
@@ -252,7 +251,6 @@ private:
SVT_DLLPRIVATE void ImplTracking( const Point& rPos, sal_Bool bRepeat );
SVT_DLLPRIVATE void ImplEndTracking( sal_Bool bCancel );
SVT_DLLPRIVATE DayOfWeek ImplGetWeekStart() const;
-#endif
protected:
@@ -412,11 +410,9 @@ private:
sal_Bool mbNone;
Link maSelectHdl;
-#ifdef _SV_CALENDAR_CXX
DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* );
DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* );
DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* );
-#endif
public:
CalendarField( Window* pParent, WinBits nWinStyle );
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 39e5bb02bcc0..d2c933b8c0a1 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -164,11 +164,10 @@ class SVT_DLLPUBLIC ColorListBox : public ListBox
ImpColorList* pColorList; // separate liste, in case of user data are required from outside
Size aImageSize;
-#ifdef _CTRLBOX_CXX
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit();
SVT_DLLPRIVATE void ImplDestroyColorEntries();
-#endif
+
public:
ColorListBox( Window* pParent,
WinBits nWinStyle = WB_BORDER );
@@ -424,10 +423,8 @@ private:
sal_Bool mbWYSIWYG;
String maFontMRUEntriesFile;
-#ifdef _CTRLBOX_CXX
SVT_DLLPRIVATE void ImplCalcUserItemSize();
SVT_DLLPRIVATE void ImplDestroyFontList();
-#endif
protected:
void LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep = ';' );
@@ -506,10 +503,8 @@ class SVT_DLLPUBLIC FontSizeBox : public MetricBox
bPtRelative:1,
bStdSize:1;
-#ifdef _CTRLBOX_CXX
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit();
-#endif
protected:
virtual OUString CreateFieldText( sal_Int64 nValue ) const;
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index b90f1b67a532..efe7b53b7cb3 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -162,12 +162,11 @@ private:
OutputDevice* mpDev;
OutputDevice* mpDev2;
boost::ptr_vector<ImplFontListNameInfo> maEntries;
-#ifdef CTRLTOOL_CXX
+
SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const OUString& rSearchName, sal_uLong* pIndex ) const;
SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const OUString& rStr ) const;
SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, sal_Bool bAll,
sal_Bool bInsertData );
-#endif
public:
FontList( OutputDevice* pDevice,
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index 9be63ce3229d..29bd35fe2804 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -263,7 +263,6 @@ private:
::com::sun::star::accessibility::XAccessible >
mxAccessible;
-#ifdef _SV_HEADBAR_CXX
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle );
SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
@@ -285,7 +284,6 @@ private:
SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, sal_Bool bCommand );
SVT_DLLPRIVATE void ImplDrag( const Point& rPos );
SVT_DLLPRIVATE void ImplEndDrag( sal_Bool bCancel );
-#endif
public:
HeaderBar( Window* pParent, WinBits nWinBits = WB_STDHEADERBAR );
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index a06109bca6a0..5a457103cea0 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -644,7 +644,6 @@ private:
Link maDoubleClickHdl;
Link maExtraDownHdl;
-#ifdef _SV_RULER_CXX
SVT_DLLPRIVATE void ImplVDrawLine( long nX1, long nY1, long nX2, long nY2 );
SVT_DLLPRIVATE void ImplVDrawRect( long nX1, long nY1, long nX2, long nY2 );
SVT_DLLPRIVATE void ImplVDrawText( long nX, long nY, const String& rText, long nMin = LONG_MIN, long nMax = LONG_MAX );
@@ -675,7 +674,6 @@ private:
SVT_DLLPRIVATE void ImplDrag( const Point& rPos );
SVT_DLLPRIVATE void ImplEndDrag();
DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* );
-#endif
// Forbidden and not implemented.
Ruler (const Ruler &);
diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx
index f9af5b9aa620..3980954e5dab 100644
--- a/include/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
@@ -57,11 +57,9 @@ private:
bHCenter:1,
bVCenter:1;
-#ifdef _SVT_SCRWIN_CXX
SVT_DLLPRIVATE void ImpInitialize( ScrollableWindowFlags nFlags );
DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );
DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * );
-#endif
public:
ScrollableWindow( Window* pParent, WinBits nBits = 0,
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index ff032fd3baa4..70fcd008c363 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -37,10 +37,8 @@ class ScrollBar;
struct ValueSetItem;
typedef ::std::vector< ValueSetItem* > ValueItemList;
-#ifdef _SV_VALUESET_CXX
class ValueSetAcc;
class ValueItemAcc;
-#endif
/*************************************************************************
@@ -241,7 +239,6 @@ private:
Link maSelectHdl;
Link maHighlightHdl;
-#ifdef _SV_VALUESET_CXX
friend class ValueSetAcc;
friend class ValueItemAcc;
using Control::ImplInitSettings;
@@ -272,7 +269,6 @@ private:
SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, bool bCancel );
DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* );
-#endif
// Forbidden and not implemented.
ValueSet (const ValueSet &);
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index f161b7339ff7..765d2fac6dd7 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -239,7 +239,6 @@ protected:
*/
void SetEmptyViewMargin();
-#ifdef _SVT_WIZDLG_CXX
private:
SVT_DLLPRIVATE void ImplInitData();
SVT_DLLPRIVATE void ImplCalcSize( Size& rSize );
@@ -247,7 +246,6 @@ private:
SVT_DLLPRIVATE void ImplPosTabPage();
SVT_DLLPRIVATE void ImplShowTabPage( TabPage* pPage );
SVT_DLLPRIVATE TabPage* ImplGetPage( sal_uInt16 nLevel ) const;
-#endif
public:
WizardDialog( Window* pParent, WinBits nStyle = WB_STDTABDIALOG );
generated by cgit (git 2.34.1) at 2024-08-02 02:15:39 +0000