summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng8
-rw-r--r--sw/qa/extras/globalfilter/globalfilter.cxx7
-rw-r--r--sw/source/core/unocore/unomap1.cxx1
-rw-r--r--sw/uiconfig/swriter/ui/frmaddpage.ui228
-rw-r--r--xmloff/inc/xmlprop.hxx1
-rw-r--r--xmloff/source/text/txtparae.cxx1
-rw-r--r--xmloff/source/text/txtprmap.cxx1
7 files changed, 149 insertions, 98 deletions
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index f0e242081ae0..6266dbded22f 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -3492,4 +3492,12 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:optional>
</rng:define>
+ <rng:define name="style-graphic-properties-attlist" combine="interleave">
+ <rng:optional>
+ <rng:attribute name="loext:decorative">
+ <rng:ref name="boolean"/>
+ </rng:attribute>
+ </rng:optional>
+ </rng:define>
+
</rng:grammar>
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 2b8c37114ce1..77a0b8aa2011 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -1237,9 +1237,16 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf143311)
// check DOCX filters
saveAndReload("Office Open XML Text");
CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1), "Decorative"));
+ {
+ // tdf#153925 not imported - check default and set it to test ODF filters
+ uno::Reference<beans::XPropertySet> const xStyle(getStyles("FrameStyles")->getByName("Formula"), uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xStyle, "Decorative"));
+ xStyle->setPropertyValue("Decorative", uno::Any(true));
+ }
// check ODF filters
saveAndReload("writer8");
CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1), "Decorative"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getStyles("FrameStyles")->getByName("Formula"), "Decorative"));
// check PDF export
utl::MediaDescriptor aMediaDescriptor;
diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx
index 4496a65bae07..5b70b52948ae 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -413,6 +413,7 @@ o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetFrameStyl
{ UNO_NAME_ALLOW_OVERLAP, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_ALLOW_OVERLAP},
{ UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
{ UNO_NAME_HIDDEN, FN_UNO_HIDDEN, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+ { u"Decorative", RES_DECORATIVE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
{ UNO_NAME_TEXT_VERT_ADJUST, RES_TEXT_VERT_ADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE ,0},
// added FillProperties for SW, same as FILL_PROPERTIES in svx
diff --git a/sw/uiconfig/swriter/ui/frmaddpage.ui b/sw/uiconfig/swriter/ui/frmaddpage.ui
index 51431a1ff493..f73f404a9b7b 100644
--- a/sw/uiconfig/swriter/ui/frmaddpage.ui
+++ b/sw/uiconfig/swriter/ui/frmaddpage.ui
@@ -18,7 +18,7 @@
<property name="row-spacing">12</property>
<property name="column-spacing">24</property>
<child>
- <object class="GtkFrame" id="nameframe">
+ <object class="GtkFrame" id="a11yframe">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
@@ -26,8 +26,8 @@
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <!-- n-columns=2 n-rows=3 -->
- <object class="GtkGrid" id="grid1">
+ <!-- n-columns=1 n-rows=2 -->
+ <object class="GtkGrid" id="grid0">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">12</property>
@@ -37,113 +37,146 @@
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<child>
- <object class="GtkEntry" id="name">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates-default">True</property>
- <property name="width-chars">50</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="name-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|name">Enter a name for the selected item.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="altname">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates-default">True</property>
- <property name="width-chars">50</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="altname-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|altname">Enter a short description of the essential details of the selected object for a person who cannot see the object. This text is available for use by assistive technologies. For images, this text is exported with an appropriate tag to HTML and PDF format.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="name_label">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes" context="frmaddpage|name_label">_Name:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">name</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="altname_label">
+ <object class="GtkFrame" id="nameframe">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes" context="frmaddpage|altname_label">Text _Alternative:</property>
- <property name="tooltip_text" translatable="yes" context="frmaddpage|altname_label|tooltip_text">Give a short description for users who do not see this object.</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">altname</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="description_label">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes" context="frmaddpage|description_label">_Description:</property>
- <property name="tooltip_text" translatable="yes" context="frmaddpage|description_label">Give a longer explanation of the content if it is too complex to be described briefly in “Text Alternative.”</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">description</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow-type">in</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkTextView" id="description">
+ <!-- n-columns=2 n-rows=3 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can-focus">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">0</property>
+ <property name="margin-top">0</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="wrap-mode">word</property>
- <property name="buffer">textbuffer1</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="description-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|description">Enter a longer description of the object, especially if the object is too complex or contains too much detail to be described adequately with the short “Text Alternative.” This text is available for use by assistive technologies. For images, this text is exported with an appropriate tag to HTML and PDF format.</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="name">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates-default">True</property>
+ <property name="width-chars">50</property>
+ <property name="truncate-multiline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="name-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|name">Enter a name for the selected item.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="altname">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates-default">True</property>
+ <property name="width-chars">50</property>
+ <property name="truncate-multiline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="altname-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|altname">Enter a short description of the essential details of the selected object for a person who cannot see the object. This text is available for use by assistive technologies. For images, this text is exported with an appropriate tag to HTML and PDF format.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="name_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes" context="frmaddpage|name_label">_Name:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">name</property>
+ <property name="xalign">0</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
</child>
+ <child>
+ <object class="GtkLabel" id="altname_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes" context="frmaddpage|altname_label">Text _Alternative:</property>
+ <property name="tooltip_text" translatable="yes" context="frmaddpage|altname_label|tooltip_text">Give a short description for users who do not see this object.</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">altname</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="description_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes" context="frmaddpage|description_label">_Description:</property>
+ <property name="tooltip_text" translatable="yes" context="frmaddpage|description_label">Give a longer explanation of the content if it is too complex to be described briefly in “Text Alternative.”</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">description</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow-type">in</property>
+ <child>
+ <object class="GtkTextView" id="description">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="wrap-mode">word</property>
+ <property name="buffer">textbuffer1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="description-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="frmaddpage|extended_tip|description">Enter a longer description of the object, especially if the object is too complex or contains too much detail to be described adequately with the short “Text Alternative.” This text is available for use by assistive technologies. For images, this text is exported with an appropriate tag to HTML and PDF format.</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="dummylabelforVCL">
+ <property name="visible">False</property>
+ <property name="can-focus">False</property>
</object>
</child>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
@@ -162,8 +195,7 @@
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">3</property>
- <property name="width">2</property>
+ <property name="top-attach">2</property>
</packing>
</child>
</object>
diff --git a/xmloff/inc/xmlprop.hxx b/xmloff/inc/xmlprop.hxx
index 27adbde570d7..ab7c53de01cf 100644
--- a/xmloff/inc/xmlprop.hxx
+++ b/xmloff/inc/xmlprop.hxx
@@ -165,6 +165,7 @@ inline constexpr OUStringLiteral PROP_DataRowSource = u"DataRowSource";
inline constexpr OUStringLiteral PROP_DataTableHBorder = u"DataTableHBorder";
inline constexpr OUStringLiteral PROP_DataTableOutline = u"DataTableOutline";
inline constexpr OUStringLiteral PROP_DataTableVBorder = u"DataTableVBorder";
+inline constexpr OUStringLiteral PROP_Decorative = u"Decorative";
inline constexpr OUStringLiteral PROP_Deep = u"Deep";
inline constexpr OUStringLiteral PROP_DefaultOutlineLevel = u"DefaultOutlineLevel";
inline constexpr OUStringLiteral PROP_Dim3D = u"Dim3D";
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4b930e73a0b6..f9928e402295 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3009,6 +3009,7 @@ XMLShapeExportFlags XMLTextParagraphExport::addTextFrameAttributes(
}
}
+ // TODO remove
if (xPropSetInfo->hasPropertyByName("Decorative")
&& rPropSet->getPropertyValue("Decorative").get<bool>())
{
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 6b8ab2960ca7..c57c8c243540 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -887,6 +887,7 @@ XMLPropertyMapEntry const aXMLFramePropMap[] =
MAP_EXT( PROP_RelativeWidthRelation, XML_NAMESPACE_LO_EXT, XML_REL_WIDTH_REL, XML_TYPE_TEXT_HORIZONTAL_REL|XML_TYPE_PROP_GRAPHIC, CTF_RELWIDTHREL),
MAP_EXT( PROP_RelativeHeightRelation, XML_NAMESPACE_LO_EXT, XML_REL_HEIGHT_REL, XML_TYPE_TEXT_VERTICAL_REL|XML_TYPE_PROP_GRAPHIC, CTF_RELHEIGHTREL),
MG_E(PROP_TextVerticalAdjust, DRAW, TEXTAREA_VERTICAL_ALIGN, XML_TYPE_VERTICAL_ALIGN, 0),
+ MAP_EXT(PROP_Decorative, XML_NAMESPACE_LO_EXT, XML_DECORATIVE, XML_TYPE_BOOL|XML_TYPE_PROP_GRAPHIC, 0),
M_END()
};
generated by cgit (git 2.34.1) at 2024-07-19 09:36:02 +0000