diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-01-21 14:29:12 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-19 17:57:18 +0100 |
| commit | 32f4b0aad616dac395023badfcf6e297714d230e (patch) | |
| tree | a311b43fe5229ab9e2ec8b8b2a51d48925ff460e /xmloff | |
| parent | 52b908ce3db5f9b1556cdb4cbdc3b92ef2f89583 (diff) | |
ODF borders import: constants cleanup
Diffstat (limited to 'xmloff')
| -rwxr-xr-x | xmloff/source/style/bordrhdl.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index f8e14ca88b..9f9f640c0c 100755 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -67,12 +67,6 @@ const sal_uInt16 API_LINE_NONE = USHRT_MAX; #define DEF_LINE_WIDTH_1 35 #define DEF_LINE_WIDTH_2 88 -#define SVX_XML_BORDER_STYLE_NONE 0 -#define SVX_XML_BORDER_STYLE_SOLID 1 -#define SVX_XML_BORDER_STYLE_DOUBLE 2 -#define SVX_XML_BORDER_STYLE_DASHED 3 -#define SVX_XML_BORDER_STYLE_DOTTED 4 - #define SVX_XML_BORDER_WIDTH_THIN 0 #define SVX_XML_BORDER_WIDTH_MIDDLE 1 #define SVX_XML_BORDER_WIDTH_THICK 2 @@ -262,7 +256,7 @@ sal_Bool XMLBorderHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue // if there is no style or a different style than none but no width, // then the declaration is not valid. - if( !bHasStyle || (SVX_XML_BORDER_STYLE_NONE != nStyle && !bHasWidth) ) + if( !bHasStyle || (API_LINE_NONE != nStyle && !bHasWidth) ) return sal_False; table::BorderLine2 aBorderLine; @@ -276,7 +270,7 @@ sal_Bool XMLBorderHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue } // first of all, delete an empty line - if( (bHasStyle && SVX_XML_BORDER_STYLE_NONE == nStyle) || + if( (bHasStyle && API_LINE_NONE == nStyle) || (bHasWidth && USHRT_MAX == nNamedWidth && 0 == nWidth) ) { aBorderLine.InnerLineWidth = 0; |