[Libreoffice-commits] core.git: 2 commits - oox/source sd/qa svl/qa

Szymon Kłos szymon.klos at collabora.com
Mon Oct 23 14:27:17 UTC 2017


 oox/source/export/drawingml.cxx    |    9 ------
 sd/qa/unit/export-tests-ooxml2.cxx |    4 --
 svl/qa/unit/svl.cxx                |   50 +++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 13 deletions(-)

New commits:
commit f68c1a0f03b974839b02cbff400f1a2785489c87
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Mon Oct 23 11:20:34 2017 +0200

    tdf#113263 Revert "PPTX export: correct position for shape in group"
    
    This reverts commit fd3383556881d6a9d73e1a3027c079cf9bfddecb.
    
    Change-Id: Ia9befead3b45975d91215cea584b32afadb5bd52
    Reviewed-on: https://gerrit.libreoffice.org/43711
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 953c16467596..e17553e1e18f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1300,15 +1300,6 @@ void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape, sa
         aPos.X -= aParentPos.X;
         aPos.Y -= aParentPos.Y;
     }
-    else if (m_xParent.is())
-    {
-        SdrObject* pShape = GetSdrObjectFromXShape(rXShape);
-        if (pShape)
-        {
-            aPos.X = pShape->GetRelativePos().getX();
-            aPos.Y = pShape->GetRelativePos().getY();
-        }
-    }
 
     if ( aSize.Width < 0 )
         aSize.Width = 1000;
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index e430e37b4c4a..89e3c5c2c8fd 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1251,10 +1251,6 @@ void SdOOXMLExportTest2::testSmartartRotation2()
 
     xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
     assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:txBody/a:bodyPr", "rot", "10800000");
-    assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:spPr/a:xfrm/a:off", "x", "2276280");
-    assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:spPr/a:xfrm/a:off", "y", "3158280");
-    assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[1]/p:spPr/a:xfrm/a:off", "x", "2031840");
-    assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[1]/p:spPr/a:xfrm/a:off", "y", "719640");
 }
 
 void SdOOXMLExportTest2::testAccentColor()
commit 9794d194eddf004cc6c27eb25bd889193ada79ad
Author: Laurent BP <laurent.balland-poirier at laposte.net>
Date:   Fri Oct 20 21:01:33 2017 +0200

    tdf#33689 Add QA unit test
    
    Test of English NfKeywords with non-English languages
    
    These tests need https://gerrit.libreoffice.org/43633/
    to pass for Finnish
    
    Change-Id: I5e6c3250e6136eeb2e8e25e1f411390e109d5b7e
    Reviewed-on: https://gerrit.libreoffice.org/43634
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 2ee7f82c943a..db3c1c35d699 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1333,6 +1333,56 @@ void Test::testUserDefinedNumberFormats()
         sExpected = "1900-01-02 23:53.605";
         checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
     }
+    {   // tdf#33689 use English NfKeywords in non-English language
+        eLang = LANGUAGE_DUTCH;
+        sExpected = "Dutch: 1900/01/02 03:23:54";
+        sCode =     "\"Dutch:\" JJJJ/MM/DD UU:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        sCode =     "\"Dutch: \"YYYY/MM/DD HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        eLang = LANGUAGE_GERMAN;
+        sExpected = "German: 1900/01/02 03:23:54";
+        sCode =     "\"German: \"JJJJ/MM/TT HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        sCode =     "\"German: \"YYYY/MM/DD HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        eLang = LANGUAGE_FRENCH;
+        sExpected = "French: 1900/01/02 03:23:54";
+        sCode =     "\"French: \"AAAA/MM/JJ HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        sCode =     "\"French: \"YYYY/MM/DD HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        eLang = LANGUAGE_ITALIAN;
+        sExpected = "Italian: 1900/01/02 03:23:54";
+        sCode =     "\"Italian: \"AAAA/MM/GG HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        sCode =     "\"Italian: \"YYYY/MM/DD HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        eLang = LANGUAGE_PORTUGUESE;
+        sExpected = "Portuguese: 1900/01/02 03:23:54";
+        sCode =     "\"Portuguese: \"AAAA/MM/DD HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        sCode =     "\"Portuguese: \"YYYY/MM/DD HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        eLang = LANGUAGE_SPANISH_MODERN;
+        sExpected = "Spanish: 1900/01/02 03:23:54";
+        sCode =     "\"Spanish: \"AAAA/MM/DD HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        sCode =     "\"Spanish: \"YYYY/MM/DD HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        eLang = LANGUAGE_DANISH;
+        sExpected = "Danish: 1900/01/02 03:23:54";
+        sCode =     "\"Danish: \"YYYY/MM/DD TT:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        sCode =     "\"Danish: \"YYYY/MM/DD HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        eLang = LANGUAGE_FINNISH;
+        sExpected = "Finnish: 1900/01/02 03:23:54";
+        sCode =     "\"Finnish: \"VVVV/KK/PP TT:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+        sCode =     "\"Finnish: \"YYYY/MM/DD HH:MM:SS";
+        checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+    }
 }
 
 void Test::testNfEnglishKeywordsIntegrity()


More information about the Libreoffice-commits mailing list