summaryrefslogtreecommitdiff
path: root/include/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'include/svtools')
-rw-r--r--include/svtools/brwbox.hxx30
-rw-r--r--include/svtools/calendar.hxx17
-rw-r--r--include/svtools/colrdlg.hxx4
-rw-r--r--include/svtools/headbar.hxx18
-rw-r--r--include/svtools/printoptions.hxx12
-rw-r--r--include/svtools/prnsetup.hxx6
-rw-r--r--include/svtools/ruler.hxx13
-rw-r--r--include/svtools/scrwin.hxx12
-rw-r--r--include/svtools/tabbar.hxx16
-rw-r--r--include/svtools/valueset.hxx3
-rw-r--r--include/svtools/wizdlg.hxx7
11 files changed, 17 insertions, 121 deletions
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index cad8aaaf1d3e..f81fb46fe4eb 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -46,14 +46,11 @@ namespace svt {
class BrowseBoxImpl;
class IAccessibleFactory;
}
+
namespace utl {
class AccessibleStateSetHelper;
}
-
-// - BrowseBox-Types -
-
-
#define BROWSER_INVALIDID SAL_MAX_UINT16
#define BROWSER_ENDOFSELECTION (static_cast<long>(SFX_ENDOFSELECTION))
@@ -125,9 +122,6 @@ namespace o3tl
#define BROWSER_MOVECOLUMNRIGHT 757
-// - BrowseEvent -
-
-
class BrowseEvent
{
VclPtr<vcl::Window> pWin;
@@ -151,9 +145,6 @@ public:
};
-// - BrowserMouseEvent -
-
-
class BrowserMouseEvent: public MouseEvent, public BrowseEvent
{
public:
@@ -165,9 +156,6 @@ public:
};
-// - BrowserAcceptDropEvent -
-
-
class BrowserAcceptDropEvent : public AcceptDropEvent, public BrowseEvent
{
public:
@@ -176,9 +164,6 @@ public:
};
-// - BrowserExecuteDropEvent -
-
-
class BrowserExecuteDropEvent : public ExecuteDropEvent, public BrowseEvent
{
public:
@@ -187,9 +172,6 @@ public:
};
-// - BrowseBox -
-
-
// TODO
// The whole selection thingie in this class is somewhat .... suspicious to me.
// some oddities:
@@ -271,8 +253,7 @@ private:
} uRow;
MultiSelection* pColSel; // selected column-ids
- //fdo#83943, detect if making the cursor position
- //visible is impossible to achieve
+ // fdo#83943, detect if making the cursor position visible is impossible to achieve
struct CursorMoveAttempt
{
long m_nCol;
@@ -670,7 +651,6 @@ public:
/// return <TRUE/> if and only if the accessible object for this instance has been created and is alive
bool isAccessibleAlive( ) const;
- // ACCESSIBILITY ==========================================================
public:
/** Creates and returns the accessible object of the whole BrowseBox. */
virtual css::uno::Reference<
@@ -710,8 +690,6 @@ public:
css::accessibility::XAccessible >
CreateAccessibleControl( sal_Int32 nIndex ) override;
- // Conversions ------------------------------------------------------------
-
/** Converts a point relative to the data window origin to a cell address.
@param rnRow Out-parameter that takes the row index.
@param rnColumnId Out-parameter that takes the column ID.
@@ -741,8 +719,6 @@ public:
@return <TRUE/>, if the point could be converted to a valid index. */
virtual bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ) override;
- // Object data and state --------------------------------------------------
-
/** return the name of the specified object.
@param eObjType
The type to ask for
@@ -825,6 +801,6 @@ inline const DataFlavorExVector& BrowseBox::GetDataFlavors() const
return *static_cast<DataFlavorExVector*>(implGetDataFlavors());
}
-#endif
+#endif // INCLUDED_SVTOOLS_BRWBOX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index da98035a8dac..265a5983ea80 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -131,15 +131,11 @@ calls or by ending a selection.
*************************************************************************/
-
-// - Calendar types -
-
-
#define WB_QUICKHELPSHOWSDATEINFO ((WinBits)0x00004000)
#define WB_BOLDTEXT ((WinBits)0x00008000)
#define WB_FRAMEINFO ((WinBits)0x00010000)
#define WB_WEEKNUMBER ((WinBits)0x00020000)
-// Needs to in agreement with the WinBits in the TabBar or
+// Needs to be in agreement with the WinBits in the TabBar or
// we move it to \vcl\inc\wintypes.hxx
#ifndef WB_RANGESELECT
#define WB_RANGESELECT ((WinBits)0x00200000)
@@ -150,10 +146,6 @@ calls or by ending a selection.
#define DIB_BOLD ((sal_uInt16)0x0001)
-
-// - Calendar -
-
-
typedef std::set<sal_uInt32> IntDateSet;
@@ -231,7 +223,7 @@ private:
SVT_DLLPRIVATE void ImplGetWeekFont( vcl::Font& rFont ) const;
SVT_DLLPRIVATE void ImplFormat();
using Window::ImplHitTest;
- SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const;
+ SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const;
SVT_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bDrawPrev = true, bool bDrawNext = true);
SVT_DLLPRIVATE void ImplDrawDate(vcl::RenderContext& rRenderContext, long nX, long nY,
sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear,
@@ -241,7 +233,7 @@ private:
SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate );
SVT_DLLPRIVATE void ImplUpdateSelection( IntDateSet* pOld );
SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest,
- bool bMove, bool bExpand, bool bExtended );
+ bool bMove, bool bExpand, bool bExtended );
SVT_DLLPRIVATE void ImplUpdate( bool bCalcNew = false );
using Window::ImplScroll;
SVT_DLLPRIVATE void ImplScroll( bool bPrev );
@@ -343,9 +335,6 @@ method in CalendarField and create an own calendar there ourselves.
*************************************************************************/
-// - CalendarField -
-
-
class SVT_DLLPUBLIC CalendarField : public DateField
{
private:
diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx
index 4fe31bfa1d8a..f24e79898eab 100644
--- a/include/svtools/colrdlg.hxx
+++ b/include/svtools/colrdlg.hxx
@@ -26,10 +26,6 @@
namespace vcl { class Window; }
-
-// - ColorDialog -
-
-
namespace svtools
{
// SELECT is the default
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index 0d5dc458a9d8..b2ccc9594659 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -175,18 +175,10 @@ class ImplHeadItem;
typedef ::std::vector< ImplHeadItem* > ImplHeadItemList;
-
-// - WinBits -
-
-
#define WB_BOTTOMBORDER ((WinBits)0x0400)
#define WB_BUTTONSTYLE ((WinBits)0x0800)
#define WB_STDHEADERBAR (WB_BUTTONSTYLE | WB_BOTTOMBORDER)
-
-// - HeaderBarItemBits -
-
-
enum class HeaderBarItemBits
{
NONE = 0x0000,
@@ -207,27 +199,21 @@ enum class HeaderBarItemBits
USERDRAW = 0x4000,
STDSTYLE = LEFT | LEFTIMAGE | VCENTER | CLICKABLE,
};
+
namespace o3tl
{
template<> struct typed_flags<HeaderBarItemBits> : is_typed_flags<HeaderBarItemBits, 0x7fff> {};
}
-
-// - HeaderBar-Types -
-
-
#define HEADERBAR_APPEND ((sal_uInt16)0xFFFF)
#define HEADERBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF)
#define HEADERBAR_FULLSIZE ((long)1000000000)
#define HEADERBAR_TEXTOFF 2
-
-// - HeaderBar -
-
-
class VCLXHeaderBar;
+
class SVT_DLLPUBLIC HeaderBar : public vcl::Window
{
private:
diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx
index bf281aa68a86..8025a01228fe 100644
--- a/include/svtools/printoptions.hxx
+++ b/include/svtools/printoptions.hxx
@@ -27,13 +27,9 @@
#include <unotools/options.hxx>
class SvtPrintOptions_Impl;
-
-
-// - SvtBasePrintOptions -
-
-
class PrinterOptions;
+
class SVT_DLLPUBLIC SvtBasePrintOptions: public utl::detail::Options
{
protected:
@@ -82,9 +78,6 @@ public:
};
-// - SvtPrinterOptions -
-
-
class SVT_DLLPUBLIC SvtPrinterOptions : public SvtBasePrintOptions
{
private:
@@ -99,9 +92,6 @@ public:
};
-// - SvtPrintFileOptions -
-
-
class SVT_DLLPUBLIC SvtPrintFileOptions : public SvtBasePrintOptions
{
private:
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 384bc86b7a9b..007294e52656 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -34,9 +34,6 @@ class Printer;
class QueueInfo;
-// - PrinterSetupDialog -
-
-
class SVT_DLLPUBLIC PrinterSetupDialog : public ModalDialog
{
private:
@@ -74,9 +71,6 @@ public:
};
-// - Helper functions for print dialog -
-
-
#define IMPL_PRINTDLG_STATUS_UPDATE 15000
void ImplFillPrnDlgListBox( const Printer* pPrinter,
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 33106c0b7a47..740e4427ff2f 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -456,13 +456,11 @@ Tips for the use of the ruler:
*************************************************************************/
-// - WinBits -
#define WB_EXTRAFIELD ((WinBits)0x00004000)
#define WB_RIGHT_ALIGNED ((WinBits)0x00008000)
#define WB_STDRULER WB_HORZ
-// - Ruler-Type -
enum RulerType { RULER_TYPE_DONTKNOW, RULER_TYPE_OUTSIDE,
RULER_TYPE_MARGIN1, RULER_TYPE_MARGIN2,
@@ -483,11 +481,9 @@ enum RulerExtra { RULER_EXTRA_DONTKNOW,
#define RULER_MOUSE_BORDERWIDTH 5
#define RULER_MOUSE_MARGINWIDTH 3
-// - RulerMargin -
#define RULER_MARGIN_SIZEABLE ((sal_uInt16)0x0001)
-// - RulerBorder -
#define RULER_BORDER_SIZEABLE ((sal_uInt16)0x0001)
#define RULER_BORDER_MOVEABLE ((sal_uInt16)0x0002)
@@ -505,7 +501,6 @@ struct RulerBorder
long nMaxPos;
};
-// - RulerIndent -
#define RULER_INDENT_TOP ((sal_uInt16)0x0000)
#define RULER_INDENT_BOTTOM ((sal_uInt16)0x0001)
@@ -518,7 +513,6 @@ struct RulerIndent
sal_uInt16 nStyle;
};
-// - RulerTab -
#define RULER_TAB_LEFT ((sal_uInt16)0x0000)
#define RULER_TAB_RIGHT ((sal_uInt16)0x0001)
@@ -535,15 +529,13 @@ struct RulerTab
};
-
-// - RulerLine -
-
struct RulerLine
{
long nPos;
sal_uInt16 nStyle;
};
+
struct RulerSelection
{
long nPos;
@@ -565,6 +557,7 @@ struct RulerSelection
{}
};
+
struct RulerUnitData
{
MapUnit eMapUnit; // MAP_UNIT for calculation
@@ -576,6 +569,7 @@ struct RulerUnitData
sal_Char aUnitStr[8]; // Unit string
};
+
// Data for drawing ruler tabstops
struct RulerTabData
{
@@ -597,7 +591,6 @@ struct RulerTabData
sal_uInt16 textoff;
};
-// - Ruler -
class ImplRulerData;
diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx
index b0832842756e..05ba486195a9 100644
--- a/include/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
@@ -27,10 +27,6 @@
class DataChangedEvent;
-
-// - ScrollableWindow-Type -
-
-
enum class ScrollableWindowFlags
{
THUMBDRAGGING = 1,
@@ -38,15 +34,13 @@ enum class ScrollableWindowFlags
HCENTER = 4,
DEFAULT = THUMBDRAGGING | VCENTER | HCENTER,
};
+
namespace o3tl
{
template<> struct typed_flags<ScrollableWindowFlags> : is_typed_flags<ScrollableWindowFlags, 0x07> {};
}
-// - ScrollableWindow -
-
-
class SVT_DLLPUBLIC ScrollableWindow: public vcl::Window
{
private:
@@ -55,9 +49,9 @@ private:
long nLinePixH; // size of a line/column (pixel)
long nColumnPixW;
- VclPtr<ScrollBar> aVScroll; // the scrollbars
+ VclPtr<ScrollBar> aVScroll; // the scrollbars
VclPtr<ScrollBar> aHScroll;
- VclPtr<ScrollBarBox> aCornerWin; // window in the bottom right corner
+ VclPtr<ScrollBarBox> aCornerWin; // window in the bottom right corner
bool bScrolling:1, // user controlled scrolling
bHandleDragging:1, // scroll window while dragging
bHCenter:1,
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 678981feeb5c..aa2aef2cee27 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -262,9 +262,6 @@ been carried out.
class Button;
-// - WinBits -
-
-
#define WB_RANGESELECT ((WinBits)0x00200000)
#define WB_MULTISELECT ((WinBits)0x00400000)
#define WB_TOPBORDER ((WinBits)0x04000000)
@@ -273,19 +270,10 @@ class Button;
#define WB_INSERTTAB ((WinBits)0x40000000)
#define WB_STDTABBAR WB_BORDER
-
-// - TabBarPageBits -
-
-
typedef sal_uInt16 TabBarPageBits;
-
-// - Bits for TabBarPages -
-
-
#define TPB_SPECIAL ((TabBarPageBits)0x0001)
-
// - TabBar-Types - used in TabBar::AllowRenaming
enum TabBarAllowRenamingReturnCode {
@@ -294,9 +282,6 @@ enum TabBarAllowRenamingReturnCode {
TABBAR_RENAMING_CANCEL
};
-
-// - TabBar -
-
class MouseEvent;
class TrackingEvent;
class DataChangedEvent;
@@ -308,6 +293,7 @@ struct ImplTabBarItem;
struct TabBar_Impl;
typedef std::vector<ImplTabBarItem*> ImplTabBarList;
+
class SVT_DLLPUBLIC TabBar : public vcl::Window
{
friend class ImplTabButton;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 88da972ee0e8..93ab5891955f 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -179,7 +179,6 @@ to be set (before Show) with SetStyle().
typedef std::vector<ValueSetItem*> ValueItemList;
-// - ValueSet types -
#define WB_RADIOSEL ((WinBits)0x00008000)
#define WB_ITEMBORDER ((WinBits)0x00010000)
#define WB_DOUBLEBORDER ((WinBits)0x00020000)
@@ -189,10 +188,10 @@ typedef std::vector<ValueSetItem*> ValueItemList;
#define WB_NO_DIRECTSELECT ((WinBits)0x04000000)
#define WB_MENUSTYLEVALUESET ((WinBits)0x08000000)
-
#define VALUESET_APPEND ((size_t)-1)
#define VALUESET_ITEM_NOTFOUND ((size_t)-1)
+
class SVT_DLLPUBLIC ValueSet : public Control
{
private:
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index be3de098c17d..9ed4e2bbf949 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -182,17 +182,10 @@ IMPL_LINK_TYPED( MyWizardDlg, ImplNextHdl, PushButton*, pBtn, void )
*************************************************************************/
-
-// - WizardDialog-Types -
-
-
#define WIZARDDIALOG_BUTTON_STDOFFSET_X 6
#define WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X 3
-// - WizardDialog -
-
-
class SVT_DLLPUBLIC WizardDialog : public ModalDialog
{
private:
generated by cgit (git 2.34.1) at 2025-04-29 04:57:49 +0000