include/xmloff/shapeexport.hxx | 4 +---
sc/source/filter/xml/xmlexprt.cxx | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit f3e258e343dd6e3ca39fc8cb710ed6c4cbb530ba
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Dec 6 09:05:23 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Dec 7 07:42:35 2018 +0100
remove unused XMLShapeExportFlags::NO_CHART_DATA
dead since
commit ec712408961a4a2efc667a7af83a21209907f9eb
Date: Fri Nov 20 11:58:22 2009 +0100
chartpositioning: #i100778# chart positioning excluding labels
Change-Id: Ibc7f23d51a0ba4ac1e63cd89a28298d95a405110
Reviewed-on: https://gerrit.libreoffice.org/64718
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index d9cb574deadc..6dbbde2b8b82 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -53,8 +53,6 @@ enum class XMLShapeExportFlags {
WIDTH = 0x0004,
HEIGHT = 0x0008,
SIZE = WIDTH | HEIGHT,
-// when you set this flag a chart does NOT export its own data as table element
- NO_CHART_DATA = 0x0010,
// When setting the flag below no ignorableWhiteSpace will be called around
// the drawing object elements
NO_WS = 0x0020,
@@ -63,7 +61,7 @@ enum class XMLShapeExportFlags {
};
namespace o3tl
{
- template<> struct typed_flags<XMLShapeExportFlags> :
is_typed_flags<XMLShapeExportFlags, 0x7f> {};
+ template<> struct typed_flags<XMLShapeExportFlags> :
is_typed_flags<XMLShapeExportFlags, 0x6f> {};
}
#define SEF_DEFAULT
XMLShapeExportFlags::POSITION|XMLShapeExportFlags::SIZE
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 6f4109e4f5f7..a71d2ffc325f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3433,7 +3433,7 @@ void ScXMLExport::ExportShape(const uno::Reference <
drawing::XShape >& xShape,
SvXMLAttributeList* pAttrList = new
SvXMLAttributeList();
pAttrList->AddAttribute(
GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_DRAW, GetXMLToken( XML_NOTIFY_ON_UPDATE_OF_RANGES ) ), sRanges );
- GetShapeExport()->exportShape( xShape,
XMLShapeExportFlags::NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList );
+ GetShapeExport()->exportShape( xShape,
SEF_DEFAULT, pPoint, pAttrList );
}
}
}
@@ -3467,7 +3467,7 @@ void ScXMLExport::ExportShape(const uno::Reference <
drawing::XShape >& xShape,
pAttrList->AddAttribute(
GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_DRAW, GetXMLToken(XML_NOTIFY_ON_UPDATE_OF_RANGES) ), sRanges );
}
- GetShapeExport()->exportShape(xShape,
XMLShapeExportFlags::NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList);
+ GetShapeExport()->exportShape(xShape,
SEF_DEFAULT, pPoint, pAttrList);
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
