diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-13 17:13:35 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-17 11:33:11 -0500 |
| commit | 5cdb7a5934877f9820429f9b8ff4c7814f0fa65e (patch) | |
| tree | 23dc6b524a741a7221783cf012fdeec22ade282a /include | |
| parent | 1051a7bedca4a5207e08152f0498df589cfa2257 (diff) | |
Remove STYLE_* and use css::table::BorderLineStyle instead.
Change-Id: I187511dbf85ecdfe0c5d05c6f77cf4ac93363051
Diffstat (limited to 'include')
| -rw-r--r-- | include/drawinglayer/primitive2d/borderlineprimitive2d.hxx | 5 | ||||
| -rw-r--r-- | include/svtools/ctrlbox.hxx | 17 |
2 files changed, 8 insertions, 14 deletions
diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index c0f225e36ca3..3e85b3a5e845 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -26,7 +26,8 @@ #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <svtools/ctrlbox.hxx> + +#include <com/sun/star/table/BorderLineStyle.hpp> ////////////////////////////////////////////////////////////////////////////// @@ -74,7 +75,7 @@ namespace drawinglayer bool isSolidLine() const { - return (mnStyle==STYLE_SOLID); + return mnStyle == com::sun::star::table::BorderLineStyle::SOLID; } bool isInsideUsed() const diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 19eea12b24b1..29fee682a516 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -29,6 +29,8 @@ #include <vcl/metric.hxx> #include <vcl/field.hxx> +#include <com/sun/star/table/BorderLineStyle.hpp> + class FontList; class ImplColorListData; class ImpLineListData; @@ -37,15 +39,6 @@ typedef ::std::vector< ImplColorListData* > ImpColorList; typedef ::std::vector< ImpLineListData* > ImpLineList; typedef ::std::vector< FontInfo > ImplFontList; -// FIXME: STYLE_* duplicate values from editeng::SvxBorderStyle, -// which in turn duplicates values from com::sun::star::table::BorderLineStyle: -// this needs cleaning up on master -#define STYLE_SOLID ( ( sal_uInt16 ) 0 ) -#define STYLE_DOTTED ( ( sal_uInt16 ) 1 ) -#define STYLE_DASHED ( ( sal_uInt16 ) 2 ) -#define STYLE_FINE_DASHED ( ( sal_uInt16 ) 14 ) -#define STYLE_NONE ( ( sal_uInt16 ) -1) - #define CHANGE_LINE1 ( ( sal_uInt16 ) 1 ) #define CHANGE_LINE2 ( ( sal_uInt16 ) 2 ) #define CHANGE_DIST ( ( sal_uInt16 ) 4 ) @@ -339,17 +332,17 @@ public: virtual void Clear(); using ListBox::GetEntryPos; - virtual sal_uInt16 GetEntryPos( sal_uInt16 nStyle = STYLE_SOLID ) const; + virtual sal_uInt16 GetEntryPos( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const; sal_uInt16 GetEntryStyle( sal_uInt16 nPos ) const; void SelectEntry( const OUString& rStr, sal_Bool bSelect = sal_True ) { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( sal_uInt16 nStyle = STYLE_SOLID, sal_Bool bSelect = sal_True ); + void SelectEntry( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID, sal_Bool bSelect = sal_True ); sal_uInt16 GetSelectEntryStyle( sal_uInt16 nSelIndex = 0 ) const; bool IsEntrySelected(const OUString& rStr) const { return ListBox::IsEntrySelected(rStr); } - bool IsEntrySelected(sal_uInt16 nStyle = STYLE_SOLID) const + bool IsEntrySelected( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const { sal_uInt16 nPos = GetEntryPos( nStyle ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) |