diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-25 15:51:46 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-28 11:19:00 +0200 |
| commit | 7d34d4b5d23d7c29a22c9e79322dea0dad36096a (patch) | |
| tree | 8a00958458b29a11aedb73b144dec26de2486697 /sc/source/filter/html | |
| parent | 4618dd39832253ae27d1f94534a9ae7928870129 (diff) | |
Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows
Diffstat (limited to 'sc/source/filter/html')
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 29 | ||||
| -rw-r--r-- | sc/source/filter/html/htmlpars.cxx | 6 |
2 files changed, 18 insertions, 17 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 7573b9427243..1c97b00152e6 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -102,6 +102,7 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +using ::editeng::SvxBorderLine; //======================================================================== @@ -511,22 +512,22 @@ void ScHTMLExport::BorderToStyle( ByteString& rOut, const char* pBorderName, (rOut += ByteString::CreateFromInt32( nPxWidth )) += "px "; switch ( pLine->GetStyle() ) { - case SOLID: rOut += "solid"; break; - case DOTTED: rOut += "dotted"; break; - case DASHED: rOut += "dashed"; break; - case DOUBLE: - case THINTHICK_SMALLGAP: - case THINTHICK_MEDIUMGAP: - case THINTHICK_LARGEGAP: - case THICKTHIN_SMALLGAP: - case THICKTHIN_MEDIUMGAP: - case THICKTHIN_LARGEGAP: + case ::editeng::SOLID: rOut += "solid"; break; + case ::editeng::DOTTED: rOut += "dotted"; break; + case ::editeng::DASHED: rOut += "dashed"; break; + case ::editeng::DOUBLE: + case ::editeng::THINTHICK_SMALLGAP: + case ::editeng::THINTHICK_MEDIUMGAP: + case ::editeng::THINTHICK_LARGEGAP: + case ::editeng::THICKTHIN_SMALLGAP: + case ::editeng::THICKTHIN_MEDIUMGAP: + case ::editeng::THICKTHIN_LARGEGAP: rOut += "double"; break; - case EMBOSSED: rOut += "ridge"; break; - case ENGRAVED: rOut += "groove"; break; - case OUTSET: rOut += "outset"; break; - case INSET: rOut += "inset"; break; + case ::editeng::EMBOSSED: rOut += "ridge"; break; + case ::editeng::ENGRAVED: rOut += "groove"; break; + case ::editeng::OUTSET: rOut += "outset"; break; + case ::editeng::INSET: rOut += "inset"; break; default: rOut += "hidden"; } rOut += " #"; diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 05d71399c4c4..7af88be0b100 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -67,7 +67,7 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> - +using ::editeng::SvxBorderLine; using namespace ::com::sun::star; @@ -2192,8 +2192,8 @@ void ScHTMLTable::ApplyCellBorders( ScDocument* pDoc, const ScAddress& rFirstPos const SCROW nLastRow = maSize.mnRows - 1; const long nOuterLine = DEF_LINE_WIDTH_2; const long nInnerLine = DEF_LINE_WIDTH_0; - SvxBorderLine aOuterLine( NULL, nOuterLine, SOLID ); - SvxBorderLine aInnerLine( NULL, nInnerLine, SOLID ); + SvxBorderLine aOuterLine( NULL, nOuterLine, ::editeng::SOLID ); + SvxBorderLine aInnerLine( NULL, nInnerLine, ::editeng::SOLID ); SvxBoxItem aBorderItem( ATTR_BORDER ); for( SCCOL nCol = 0; nCol <= nLastCol; ++nCol ) |