[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 2 commits - sd/qa vcl/source

[Gülşah Köse (via logerrit)]

 sd/qa/unit/data/pptx/tdf128213-shaperot.pptx |binary
 sd/qa/unit/export-tests-ooxml2.cxx           |   17 +++++++++++++++++
 vcl/source/window/seleng.cxx                 |    2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 96399f08cbc82cae4449d6b3a0616d9262159656
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Wed Feb 17 09:54:18 2021 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Apr 7 23:36:38 2021 +0200

    tdf#128213 Add unit test for text camera z rotation.
    
    Change-Id: I50dab62ba1013d4ae17684edde620f9c94c5ec47
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111028
    Tested-by: Jenkins
    Reviewed-by: Gülşah Köse <gulsah.kose at collabora.com>

diff --git a/sd/qa/unit/data/pptx/tdf128213-shaperot.pptx b/sd/qa/unit/data/pptx/tdf128213-shaperot.pptx
new file mode 100644
index 000000000000..4e834bb7c563
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf128213-shaperot.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 4c7dc3d0eb42..10a2b5371e26 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -205,6 +205,7 @@ public:
     void testShapeSoftEdgeEffect();
     void testShapeShadowBlurEffect();
     void testTdf119223();
+    void testTdf128213ShapeRot();
 
     CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -325,6 +326,7 @@ public:
     CPPUNIT_TEST(testShapeSoftEdgeEffect);
     CPPUNIT_TEST(testShapeShadowBlurEffect);
     CPPUNIT_TEST(testTdf119223);
+    CPPUNIT_TEST(testTdf128213ShapeRot);
 
     CPPUNIT_TEST_SUITE_END();
 
@@ -3043,6 +3045,21 @@ void SdOOXMLExportTest2::testTdf119223()
                 "//p:cNvPr[@name='SomeGroup']");
 }
 
+void SdOOXMLExportTest2::testTdf128213ShapeRot()
+{
+    auto xDocShRef
+            = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf128213-shaperot.pptx"), PPTX);
+    utl::TempFile tempFile;
+    xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+    xDocShRef->DoClose();
+
+    xmlDocUniquePtr pXmlDocRels = parseExport(tempFile, "ppt/slides/slide1.xml");
+
+    assertXPath(pXmlDocRels, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr/a:scene3d");
+    assertXPath(pXmlDocRels, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr/a:scene3d/a:camera/a:rot", "rev", "5400000");
+}
+
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit f5536c0671e96983976569d3d3109c9c05b080b9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 9 16:50:22 2021 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Apr 7 23:35:23 2021 +0200

    Revert "on SelMouseButtonDown check if window pointer is not null"
    
    because there is no pWin for the cases where an EditEngine is
    hosted in a native widget, e.g. comment in a sidebar in writer
    or format header/footer in calc's format page, header/footer, edit...
    and with change applied clicking doesn't move the cursor
    
    This reverts commit 0a2fa32f8756b3c99975df6d98736a8e9abb625a.
    
    Change-Id: Ie1da24d22b6d298f0c074f7bf187c5d891b78368
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110648
    Reviewed-by: Pranam Lashkari <lpranam at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 2d154d55db925dfa20358faa0302d4d942496aee)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110677
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 4e311785090c..390c6d00c57d 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -115,7 +115,7 @@ void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 )
 bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
 {
     nFlags &= ~SelectionEngineFlags::CMDEVT;
-    if ( !pFunctionSet || rMEvt.GetClicks() > 1 || !pWin )
+    if ( !pFunctionSet || rMEvt.GetClicks() > 1 )
         return false;
 
     sal_uInt16 nModifier = rMEvt.GetModifier() | nLockedMods;