summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2021-11-10 14:35:13 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2021-11-11 16:47:59 +0100
commit29f08453059c308e3ce076c8689e48b19f84c026 (patch)
tree29d821b6e8ada86d0a566d5866e036a909c2e3fc
parenttdf#145584: fix crash on exporting as PDF with Selection rRange (diff)
downloadcore-29f08453059c308e3ce076c8689e48b19f84c026.tar.gz
core-29f08453059c308e3ce076c8689e48b19f84c026.zip
sw: the RedlineComment property is settable on SwXRedline
... but not SwXRedlinePortion. Change-Id: Ic186e2af76942a796b440c6346dc9443e71438a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125035 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r--sw/source/core/unocore/unomap1.cxx4
-rw-r--r--sw/source/core/unocore/unomapproperties.hxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx
index 34824a7cff32..9a186b05d280 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -1011,7 +1011,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetRedlinePropertyMap(
{
static SfxItemPropertyMapEntry const aRedlineMap_Impl[] =
{
- REDLINE_PROPERTIES
+ REDLINE_PROPERTIES(PropertyAttribute::READONLY)
REDLINE_NODE_PROPERTIES
{u"" UNO_NAME_REDLINE_START, 0, cppu::UnoType<css::uno::XInterface>::get(), PropertyAttribute::READONLY, 0},
{u"" UNO_NAME_REDLINE_END, 0, cppu::UnoType<css::uno::XInterface>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
@@ -1051,7 +1051,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetRedlinePortionPrope
{u"" UNO_NAME_CONTROL_CHARACTER, FN_UNO_CONTROL_CHARACTER, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD },
{u"" UNO_NAME_IS_COLLAPSED, FN_UNO_IS_COLLAPSED, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
{u"" UNO_NAME_IS_START, FN_UNO_IS_START, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
- REDLINE_PROPERTIES
+ REDLINE_PROPERTIES(0)
{u"" UNO_NAME_TEXT_PORTION_TYPE, FN_UNO_TEXT_PORTION_TYPE, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
{ u"", 0, css::uno::Type(), 0, 0 }
};
diff --git a/sw/source/core/unocore/unomapproperties.hxx b/sw/source/core/unocore/unomapproperties.hxx
index 1deefac3f660..c30572f7a92b 100644
--- a/sw/source/core/unocore/unomapproperties.hxx
+++ b/sw/source/core/unocore/unomapproperties.hxx
@@ -64,10 +64,10 @@
{ u"" UNO_NAME_START_REDLINE, FN_UNO_REDLINE_NODE_START , cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0xbf }, \
{ u"" UNO_NAME_END_REDLINE, FN_UNO_REDLINE_NODE_END , cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0xbf },
-#define REDLINE_PROPERTIES \
+#define REDLINE_PROPERTIES(readonly) \
{u"" UNO_NAME_REDLINE_AUTHOR, 0, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
{u"" UNO_NAME_REDLINE_DATE_TIME, 0, cppu::UnoType<css::util::DateTime>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
- {u"" UNO_NAME_REDLINE_COMMENT, 0, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+ {u"" UNO_NAME_REDLINE_COMMENT, 0, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID|readonly, 0},\
{u"" UNO_NAME_REDLINE_DESCRIPTION, 0, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0}, \
{u"" UNO_NAME_REDLINE_TYPE, 0, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
{u"" UNO_NAME_REDLINE_SUCCESSOR_DATA, 0, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\