[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/unocore/unotext.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 3b1d844d8d567b3e593cd6ab524581bb9bfc400d
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Apr 12 10:55:23 2023 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Apr 20 08:26:11 2023 +0200

    sw floattable: don't try to set left margin as cell property
    
    Cell UNO objects don't have such a property, and this generates a
    warning on importing sw/qa/core/layout/data/floattable.docx, silence it.
    
    (cherry picked from commit 8f9523b3ef464731afed61a253c958644fca6335)
    
    Change-Id: I573c6f95edb8577e70518a9c21119a0e32b6a411
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150383
    Tested-by: Miklos Vajna <vmik...@collabora.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 2f16de793d35..124325789afd 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2199,7 +2199,13 @@ lcl_ApplyCellProperties(
         {
             try
             {
-                xCellPS->setPropertyValue(rName, rValue);
+                static const std::initializer_list<std::u16string_view> 
vDenylist = {
+                    u"LeftMargin",
+                };
+                if (std::find(vDenylist.begin(), vDenylist.end(), rName) == 
vDenylist.end())
+                {
+                    xCellPS->setPropertyValue(rName, rValue);
+                }
             }
             catch (const uno::Exception&)
             {