[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - filter/source sw/qa

[Szymon Kłos]

 filter/source/msfilter/msdffimp.cxx       |    2 +-
 sw/qa/extras/ww8export/data/tdf111480.doc |binary
 sw/qa/extras/ww8export/ww8export2.cxx     |    9 +++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit f289357c6bc5e145e05075de4749591a05c37844
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Wed Aug 9 12:15:53 2017 +0200

    tdf#111480 Circular text was imported horizontally
    
    Change-Id: I84a6c3a30fd1dddf104ad8bf037a5e0b2a90d376
    Reviewed-on: https://gerrit.libreoffice.org/40912
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/42350
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 8053abeb8d26..e6acd585ab5e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4421,7 +4421,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
                         aFont.SetFamilyName( aFontName );
                         auto nTextWidth = pOut->GetTextWidth( aObjectText );
 
-                        if ( nTextWidth )
+                        if ( nTextWidth && aObjData.eShapeType == mso_sptTextPlainText )
                         {
                             fRatio = aFont.GetFontSize().Height();
                             fRatio /= nTextWidth;
diff --git a/sw/qa/extras/ww8export/data/tdf111480.doc b/sw/qa/extras/ww8export/data/tdf111480.doc
new file mode 100755
index 000000000000..888126066624
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf111480.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx
index 681e3173b519..c7f124e85f15 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -115,6 +115,15 @@ DECLARE_WW8EXPORT_TEST(testTdf91687, "tdf91687.doc")
     CPPUNIT_ASSERT_EQUAL((sal_Int32)18105, xWatermark->getSize().Width);
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf111480, "tdf111480.doc")
+{
+    // Circular text was imported horizontally
+    uno::Reference<drawing::XShape> xText = getShape(1);
+
+    CPPUNIT_ASSERT(xText->getSize().Height > 11000);
+    CPPUNIT_ASSERT(xText->getSize().Width  > 11000);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */