diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-16 12:44:19 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-17 06:04:30 +0000 |
commit | f2a873cd13adf0b74d18af203676f2de86d1cb2e (patch) | |
tree | 8b0f044b217e86db3c7320855e4df133fbabf3ae /include/svtools/ctrlbox.hxx | |
parent | 1bffa5e110772a7d6183ac64e56c23f2c3019f93 (diff) |
convert SvxBorderStyle to scoped enum
and rename to SvxBorderLineStyle
Change-Id: I19e530f162e4ca6290a0ad076e7fe3d5775ae6bc
Reviewed-on: https://gerrit.libreoffice.org/35265
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svtools/ctrlbox.hxx')
-rw-r--r-- | include/svtools/ctrlbox.hxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index b226137f9da3..b2179d4c5b65 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -34,6 +34,7 @@ class FontList; class ImpLineListData; +enum class SvxBorderLineStyle : sal_Int16; typedef ::std::vector< ImpLineListData* > ImpLineList; typedef ::std::vector< FontMetric > ImplFontList; @@ -206,7 +207,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance, Color nColor1, Color nColor2, Color nColorDist, - sal_uInt16 nStyle, Bitmap& rBmp ); + SvxBorderLineStyle nStyle, Bitmap& rBmp ); using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); void UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed @@ -231,21 +232,21 @@ public: using ListBox::InsertEntry; /** Insert a listbox entry with all widths in Twips. */ void InsertEntry(const BorderWidthImpl& rWidthImpl, - sal_uInt16 nStyle, long nMinWidth = 0, + SvxBorderLineStyle nStyle, long nMinWidth = 0, ColorFunc pColor1Fn = &sameColor, ColorFunc pColor2Fn = &sameColor, ColorDistFunc pColorDistFn = &sameDistColor); using ListBox::GetEntryPos; - sal_Int32 GetEntryPos( sal_uInt16 nStyle ) const; - sal_uInt16 GetEntryStyle( sal_Int32 nPos ) const; + sal_Int32 GetEntryPos( SvxBorderLineStyle nStyle ) const; + SvxBorderLineStyle GetEntryStyle( sal_Int32 nPos ) const; - void SelectEntry( sal_uInt16 nStyle, bool bSelect = true ); - sal_uInt16 GetSelectEntryStyle() const; + void SelectEntry( SvxBorderLineStyle nStyle, bool bSelect = true ); + SvxBorderLineStyle GetSelectEntryStyle() const; - void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } + void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } - void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } + void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } void SetColor( const Color& rColor ); const Color& GetColor() const { return aColor; } |