You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2026/10/23 14:26:55 UTC
(openoffice) branch odf-devel updated (99fa0a57e1 -> c5e6b715d6)
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a change to branch odf-devel
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 99fa0a57e1 test/odf-validate: add fixtures for the ODF 1.2 mode gating, alien-attribute and connector viewBox fixes
new 6d59ad5f92 xmloff: don't write text in draw:object in ODF 1.0 and 1.1 modes
new ecd4ad9ffe xmloff: don't write form:xforms-list-source on comboboxes in ODF 1.0 and 1.1 modes
new 28cd21254a xmloff: don't write additional chart shapes in ODF 1.0 and 1.1 modes
new c5e6b715d6 xmloff: don't write svg:viewBox on connectors in ODF 1.0 and 1.1 modes
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/xmloff/source/chart/SchXMLExport.cxx | 2 +-
main/xmloff/source/draw/shapeexport2.cxx | 4 ++--
main/xmloff/source/forms/elementexport.cxx | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
(openoffice) 03/04: xmloff: don't write additional chart shapes in ODF 1.0 and 1.1 modes
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch odf-devel
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 28cd21254a3e699672022f64b2e35f859d93b21c
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Fri Oct 23 10:26:48 2026 -0400
xmloff: don't write additional chart shapes in ODF 1.0 and 1.1 modes
---
main/xmloff/source/chart/SchXMLExport.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/xmloff/source/chart/SchXMLExport.cxx b/main/xmloff/source/chart/SchXMLExport.cxx
index 10ecc04342..330a93d45a 100644
--- a/main/xmloff/source/chart/SchXMLExport.cxx
+++ b/main/xmloff/source/chart/SchXMLExport.cxx
@@ -1594,7 +1594,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
{
Any aShapesAny = xDocPropSet->getPropertyValue( OUString::createFromAscii( "AdditionalShapes" ));
aShapesAny >>= mxAdditionalShapes;
- if( mrExport.getDefaultVersion() == SvtSaveOptions::ODFVER_012 )
+ if( mrExport.getDefaultVersion() >= SvtSaveOptions::ODFVER_010 && mrExport.getDefaultVersion() <= SvtSaveOptions::ODFVER_012 )
mxAdditionalShapes.clear();
}
catch( uno::Exception & rEx )
(openoffice) 02/04: xmloff: don't write form:xforms-list-source on comboboxes in ODF 1.0 and 1.1 modes
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch odf-devel
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ecd4ad9ffe653398391c655948169f269bc8201b
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Fri Oct 23 10:26:48 2026 -0400
xmloff: don't write form:xforms-list-source on comboboxes in ODF 1.0 and 1.1 modes
---
main/xmloff/source/forms/elementexport.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/main/xmloff/source/forms/elementexport.cxx b/main/xmloff/source/forms/elementexport.cxx
index e86b2c106d..f213b0db04 100644
--- a/main/xmloff/source/forms/elementexport.cxx
+++ b/main/xmloff/source/forms/elementexport.cxx
@@ -1767,7 +1767,8 @@ namespace xmloff
// is (list-)control bound to XForms list?
if( getXFormsListBindName( m_xProps ).getLength() > 0 &&
- ( m_eType != COMBOBOX || m_rContext.getGlobalContext().getDefaultVersion() != SvtSaveOptions::ODFVER_012 ) )
+ ( m_eType != COMBOBOX || m_rContext.getGlobalContext().getDefaultVersion() < SvtSaveOptions::ODFVER_010 ||
+ m_rContext.getGlobalContext().getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) )
{
m_nIncludeBindings |= BA_XFORMS_LISTBIND;
}
(openoffice) 01/04: xmloff: don't write text in draw:object in ODF 1.0 and 1.1 modes
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch odf-devel
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6d59ad5f92a046dd58b863a87a788b01daf6aa90
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Fri Oct 23 10:26:48 2026 -0400
xmloff: don't write text in draw:object in ODF 1.0 and 1.1 modes
---
main/xmloff/source/draw/shapeexport2.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/xmloff/source/draw/shapeexport2.cxx b/main/xmloff/source/draw/shapeexport2.cxx
index 918c062f3d..18b99a8abd 100644
--- a/main/xmloff/source/draw/shapeexport2.cxx
+++ b/main/xmloff/source/draw/shapeexport2.cxx
@@ -1668,7 +1668,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, eElem, sal_True, sal_True );
// #i118485# Add text export, the draw OLE shape allows text now
- if( mrExport.getDefaultVersion() != SvtSaveOptions::ODFVER_012 ) ImpExportText( xShape );
+ if( mrExport.getDefaultVersion() < SvtSaveOptions::ODFVER_010 || mrExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) ImpExportText( xShape );
if(bExportEmbedded && !bIsEmptyPresObj)
{
(openoffice) 04/04: xmloff: don't write svg:viewBox on connectors in ODF 1.0 and 1.1 modes
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch odf-devel
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit c5e6b715d6aea4f94b9622b974c237cbadf81d8e
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Fri Oct 23 10:26:49 2026 -0400
xmloff: don't write svg:viewBox on connectors in ODF 1.0 and 1.1 modes
---
main/xmloff/source/draw/shapeexport2.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/xmloff/source/draw/shapeexport2.cxx b/main/xmloff/source/draw/shapeexport2.cxx
index 18b99a8abd..c215a536c5 100644
--- a/main/xmloff/source/draw/shapeexport2.cxx
+++ b/main/xmloff/source/draw/shapeexport2.cxx
@@ -1454,7 +1454,7 @@ void XMLShapeExport::ImpExportConnectorShape(
const basegfx::B2DRange aPathRange(basegfx::tools::getRange(aPolyPolygon));
SdXMLImExViewBox aViewBox(0, 0, FRound(aPathRange.getWidth()) + 1, FRound(aPathRange.getHeight()) + 1);
- mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString());
+ if( mrExport.getDefaultVersion() < SvtSaveOptions::ODFVER_010 || mrExport.getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString());
}
}