codemaker/source/cppumaker/cpputype.cxx | 5 +++--
sc/source/filter/xml/XMLExportDataPilot.cxx | 5 ++---
sc/source/filter/xml/xmldpimp.cxx | 1 -
3 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 809ddff82dc9a28051d8f6b0d6513b1824ba0ab9
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 19 12:26:47 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue May 19 17:05:09 2020 +0200
Fix the Clang check for using <experimental/source_location>
(see the <https://gerrit.libreoffice.org/c/core/+/93868/19#
message-77dcd3b30c4ae3919354f84b46b27d934164a938> comment to "use
std::experimental::source_location in uno::Exception")
Change-Id: I5d682dcf97be59f1798c5c08ad13025dfee0dd4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94495
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index e2288c961133..75906b9c5f00 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2787,8 +2787,9 @@ void ExceptionType::dumpHdlFile(
{
// LIBO_INTERNAL_ONLY implies GCC >= 7, which we need for this
// Merely checking __has_include is not enough because some systems
have the header,
- // but do not have a new enough clang for it to work.
- includes.addCustom("#if defined LIBO_INTERNAL_ONLY && ((defined
__GNUC__ && !defined __clang__) || (defined __clang__ && __clang_major__ >= 8))
&& __has_include(<experimental/source_location>)");
+ // but do not have a new enough Clang 9 supporting
__builtin_FILE/LINE/FUNCTION as used by
+ // that libstdc++ header.
+ includes.addCustom("#if defined LIBO_INTERNAL_ONLY && ((defined
__GNUC__ && !defined __clang__) || (defined __clang__ && __clang_major__ >= 9))
&& __has_include(<experimental/source_location>)");
includes.addCustom("#define LIBO_USE_SOURCE_LOCATION");
includes.addCustom("#endif");
includes.addCustom("#if defined LIBO_USE_SOURCE_LOCATION");
commit c4df27dc893fc397725334f885cb6bdb2585924a
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue May 19 14:42:46 2020 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue May 19 17:04:50 2020 +0200
sc: ODF export: OFFICE-3665 table:name on source-cell-range
It turns out that commit d840c7e15402dc3a133b400b113e28c0c78702c5
is pointless because this attribute was actually added in ODF 1.3,
which i didn't notice before; this means there's no benefit to add
a loext:name at this point.
Change-Id: Ic4c7a00f62e399f232a6e515ab83cd9ad99c01e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94501
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx
b/sc/source/filter/xml/XMLExportDataPilot.cxx
index ab3f2f4fe665..185e43efdaca 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -835,12 +835,11 @@ void ScXMLExportDataPilot::WriteDataPilots()
if (rExport.getSaneDefaultVersion() &
SvtSaveOptions::ODFSVER_EXTENDED)
{
if (pSheetSource->HasRangeName())
- {
+ { // ODF 1.3 OFFICE-3665
// FIXME this was wrongly exported to TABLE namespace
since 2011
+ // so continue doing that in ODF 1.2 extended, for now
rExport.AddAttribute(
XML_NAMESPACE_TABLE, XML_NAME,
pSheetSource->GetRangeName());
- rExport.AddAttribute(
- XML_NAMESPACE_LO_EXT, XML_NAME,
pSheetSource->GetRangeName());
}
}
diff --git a/sc/source/filter/xml/xmldpimp.cxx
b/sc/source/filter/xml/xmldpimp.cxx
index 3d06e30c291f..8b9bcd98325e 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -749,7 +749,6 @@ ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext(
ScXMLImport& rImport,
pDataPilotTable->SetSourceCellRangeAddress(aSourceRangeAddress);
}
break;
- case XML_ELEMENT( LO_EXT, XML_NAME ):
case XML_ELEMENT( TABLE, XML_NAME ):
pDataPilotTable->SetSourceRangeName(aIter.toString());
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
