[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Miklos Vajna (via logerrit)]

 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx     |    6 +++---
 writerfilter/source/dmapper/GraphicImport.cxx |    5 -----
 writerfilter/source/dmapper/PropertyIds.cxx   |    1 -
 writerfilter/source/dmapper/PropertyIds.hxx   |    1 -
 4 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 7972ce0d6bc22a36d7fbaaa19bed11ec4cfe52d7
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Oct 16 23:38:11 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Oct 17 08:39:02 2019 +0200

    writerfilter: clean up now redundant PROP_LAYOUT_IN_CELL
    
    Which is now exactly the same as PROP_FOLLOW_TEXT_FLOW, so no need to
    set it separately.
    
    Change-Id: I32e1e2bdfb8ac46eb6a07f5187f780275d334b2f
    Reviewed-on: https://gerrit.libreoffice.org/80926
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 04e583a435f0..e76ba3385a76 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -401,10 +401,10 @@ DECLARE_OOXMLIMPORT_TEST(testTdf115094, "tdf115094.docx")
 
 DECLARE_OOXMLIMPORT_TEST(testTdf115094v2, "tdf115094v2.docx")
 {
-    // Introduce new attribute "layoutInCell"
+    // layoutInCell="1" combined with <wp:wrapNone/>
 
-    CPPUNIT_ASSERT(getProperty<bool>(getShapeByName("Grafik 18"), "IsLayoutInCell"));
-    CPPUNIT_ASSERT(getProperty<bool>(getShapeByName("Grafik 19"), "IsLayoutInCell"));
+    CPPUNIT_ASSERT(getProperty<bool>(getShapeByName("Grafik 18"), "IsFollowingTextFlow"));
+    CPPUNIT_ASSERT(getProperty<bool>(getShapeByName("Grafik 19"), "IsFollowingTextFlow"));
 }
 
 DECLARE_OOXMLIMPORT_TEST(testTdf122224, "tdf122224.docx")
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 2e2ff9e4eec1..d207f609a4f0 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1326,11 +1326,6 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer
                 if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell )
                     xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_FOLLOW_TEXT_FLOW ),
                         uno::makeAny(true));
-                if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell )
-                {
-                    xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_LAYOUT_IN_CELL ),
-                        uno::makeAny(true));
-                }
 
                 xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_SURROUND_CONTOUR ),
                     uno::makeAny(m_pImpl->bContour));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index cf683112f30f..8667929183e2 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -349,7 +349,6 @@ OUString getPropertyName( PropertyIds eId )
         case PROP_RUBY_TEXT: sName = "RubyText"; break;
         case PROP_RUBY_ADJUST: sName = "RubyAdjust"; break;
         case PROP_RUBY_POSITION: sName = "RubyPosition"; break;
-        case PROP_LAYOUT_IN_CELL: sName = "IsLayoutInCell"; break;
         case PROP_DATABASE_NAME: sName = "DataBaseName"; break;
         case PROP_COMMAND_TYPE: sName = "DataCommandType"; break;
         case PROP_DATATABLE_NAME: sName = "DataTableName"; break;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index 8c8e9ca1a09c..ce44a1520e6d 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -349,7 +349,6 @@ enum PropertyIds
         ,PROP_RUBY_TEXT
         ,PROP_RUBY_ADJUST
         ,PROP_RUBY_POSITION
-        ,PROP_LAYOUT_IN_CELL
         ,PROP_DATABASE_NAME
         ,PROP_COMMAND_TYPE
         ,PROP_DATATABLE_NAME