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 | bb3a9e8b7feec274782e5f10ae2ebd0da23d24e5 (patch) | |
| tree | 43fd6485e0e8c1816844a1d23d2bab2b57c2efd5 /xmloff | |
| parent | d13469c38ba3e88219c918425b106e2ef83608c5 (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 299d56ec421a..230f1082fe2e 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; |