sc/source/filter/html/htmlexp.cxx | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit d4d34ae87c6135b075c59adeb09739d1647aa4bb
Author: Sean Stangl <sean.sta...@gmail.com>
Date: Sat Jul 8 22:33:48 2017 -0700
tdf#79304 - Handle CrossedOutItems in HTML export.
Change-Id: I766fedb34737a1a7815693bf496fa08c08f492b1
Reviewed-on: https://gerrit.libreoffice.org/39719
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
(cherry picked from commit 2f2eba56d1f8ec5cdcadb4852e8856858477c008)
Reviewed-on: https://gerrit.libreoffice.org/39721
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 6372fee39669..ab254556feef 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -28,6 +28,7 @@
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/colritem.hxx>
+#include <editeng/crossedoutitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/postitem.hxx>
@@ -975,6 +976,9 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB
nTab )
const SvxUnderlineItem& rUnderlineItem = static_cast<const
SvxUnderlineItem&>(
pAttr->GetItem( ATTR_FONT_UNDERLINE, pCondItemSet ) );
+ const SvxCrossedOutItem& rCrossedOutItem = static_cast<const
SvxCrossedOutItem&>(
+ pAttr->GetItem( ATTR_FONT_CROSSEDOUT, pCondItemSet ) );
+
const SvxColorItem& rColorItem = static_cast<const SvxColorItem&>(
pAttr->GetItem(
ATTR_FONT_COLOR, pCondItemSet ) );
@@ -993,10 +997,11 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow,
SCTAB nTab )
else
aBgColor = rBrushItem.GetColor();
- bool bBold = ( WEIGHT_BOLD <= rWeightItem.GetWeight() );
- bool bItalic = ( ITALIC_NONE != rPostureItem.GetPosture() );
- bool bUnderline = ( LINESTYLE_NONE != rUnderlineItem.GetLineStyle() );
- bool bSetFontColor = ( COL_AUTO !=
rColorItem.GetValue().GetColor() ); // default is AUTO now
+ bool bBold = ( WEIGHT_BOLD <= rWeightItem.GetWeight() );
+ bool bItalic = ( ITALIC_NONE != rPostureItem.GetPosture() );
+ bool bUnderline = ( LINESTYLE_NONE != rUnderlineItem.GetLineStyle()
);
+ bool bCrossedOut = ( STRIKEOUT_SINGLE <= rCrossedOutItem.GetStrikeout()
);
+ bool bSetFontColor = ( COL_AUTO !=
rColorItem.GetValue().GetColor() ); // default is AUTO now
bool bSetFontName = ( aHTMLStyle.aFontFamilyName !=
rFontItem.GetFamilyName() );
sal_uInt16 nSetFontSizeNumber = 0;
sal_uInt32 nFontHeight = rFontHeightItem.GetHeight();
@@ -1098,6 +1103,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow,
SCTAB nTab )
if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic );
if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline );
+ if ( bCrossedOut ) TAG_ON( OOO_STRING_SVTOOLS_HTML_strikethrough );
if ( bSetFont )
{
@@ -1195,6 +1201,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow,
SCTAB nTab )
WriteGraphEntry( pGraphEntry );
if ( bSetFont ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_font );
+ if ( bCrossedOut ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_strikethrough );
if ( bUnderline ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_underline );
if ( bItalic ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_italic );
if ( bBold ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
