diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-02-18 16:02:34 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-19 15:33:12 +0100 |
| commit | 3537afd0e8abc6dcdb1d856aa11883319005a474 (patch) | |
| tree | fac7fbb27827710b6e1bb530988aedd7efcf469f | |
| parent | adb69169481dee3146b28ee87a388a3bae0b939d (diff) | |
ODT import filter fixed for the new borders
| -rw-r--r-- | sw/source/filter/xml/xmlithlp.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index a6e2d9ba5c90..b00a09535f8a 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -51,7 +51,7 @@ using namespace ::xmloff::token; using namespace ::com::sun::star; -#define API_LINE_NONE USHRT_MAX +#define API_LINE_NONE -1 #define API_LINE_SOLID 0 #define API_LINE_DOTTED 1 #define API_LINE_DASHED 2 @@ -166,7 +166,7 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, sal_Bool bHasColor, const Color& rColor ) { // 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) ) { sal_Bool bRet = 0 != rpLine; @@ -191,10 +191,10 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, if( ( bHasWidth && (USHRT_MAX != nNamedWidth || (nWidth != rpLine->GetWidth() ) ) ) || ( bHasStyle && - ((SVX_XML_BORDER_STYLE_SOLID == nStyle && rpLine->GetDistance()) || - (SVX_XML_BORDER_STYLE_DOUBLE == nStyle && !rpLine->GetDistance())) ) ) + ((API_LINE_SOLID == nStyle && rpLine->GetDistance()) || + (API_LINE_DOUBLE == nStyle && !rpLine->GetDistance())) ) ) { - sal_Bool bDouble = (bHasWidth && SVX_XML_BORDER_STYLE_DOUBLE == nStyle ) || + sal_Bool bDouble = (bHasWidth && API_LINE_DOUBLE == nStyle ) || rpLine->GetDistance(); // The width has to be changed |