tdf#165083 Remove of wrong page margin export code

With 8ef9573 import and export
of page margins has been changed. The export part was wrong so
it is removed here.

Change-Id: I00ab7854cb7ee0baa81bfffcd7f07dea3b84f2f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183146
Reviewed-by: Thorsten Behrens <[email protected]>
Tested-by: Jenkins
Tested-by: Gabor Kelemen <[email protected]>
(cherry picked from commit 1a87821e7947da8aaa9e67eddcd8602c4f9ae637)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184481

Author: os-cib

sw/qa/extras/ooxmlexport/ooxmlexport19.cxx

@@ -1280,23 +1280,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf148952_2010)
     CPPUNIT_ASSERT_EQUAL(u"Black"_ustr, title);
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf153196, "A019_min.docx")
-{
-    uno::Reference<beans::XPropertySet> xPageStyle;
-    getStyles("PageStyles")->getByName("Converted1") >>= xPageStyle;
-    sal_Int32 nLeftMargin{};
-    xPageStyle->getPropertyValue("LeftMargin") >>= nLeftMargin;
-    // Without the accompanying fix in place, this test would have failed with:
-    // - Expected: 4265
-    // - Actual  : 0
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4265), nLeftMargin);
-    sal_Int32 nRightMargin{};
-    xPageStyle->getPropertyValue("RightMargin") >>= nRightMargin;
-    // - Expected: 0
-    // - Actual  : 4265
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), nRightMargin);
-}
-
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/qa/extras/ooxmlexport/data/A019_min.docx renamed to sw/qa/extras/ooxmlimport/data/A019_min.docx

@@ -1333,6 +1333,26 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf154370)
         CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DIRECT_VALUE, ePropertyState);
     }
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testTdf153196)
+{
+    createSwDoc("A019_min.docx");
+
+    uno::Reference<beans::XPropertySet> xPageStyle;
+    getStyles("PageStyles")->getByName("Converted1") >>= xPageStyle;
+    sal_Int32 nLeftMargin{};
+    xPageStyle->getPropertyValue("LeftMargin") >>= nLeftMargin;
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 4265
+    // - Actual  : 0
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4265), nLeftMargin);
+    sal_Int32 nRightMargin{};
+    xPageStyle->getPropertyValue("RightMargin") >>= nRightMargin;
+    // - Expected: 0
+    // - Actual  : 4265
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), nRightMargin);
+}
+
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT
 
 } // end of anonymous namespace

sw/qa/extras/ooxmlimport/ooxmlimport2.cxx

@@ -9468,17 +9468,6 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
 
         m_pageMargins.nLeft += sal::static_int_cast<sal_uInt16>(rLRSpace.ResolveLeft({}));
         m_pageMargins.nRight += sal::static_int_cast<sal_uInt16>(rLRSpace.ResolveRight({}));
-        // if page layout is 'left' then left/right margin need to be exchanged
-        // as it is exported as mirrored layout starting with even page
-        const WW8_SepInfo *pSectionInfo = m_rExport.Sections().CurrentSectionInfo();
-        if (pSectionInfo->pPageDesc &&
-            m_rExport.isMirroredMargin() &&
-            ((pSectionInfo->pPageDesc->ReadUseOn() & UseOnPage::All) == UseOnPage::Left))
-        {
-            sal_uInt16 nLeft = m_pageMargins.nLeft;
-            m_pageMargins.nLeft = m_pageMargins.nRight;
-            m_pageMargins.nRight = nLeft;
-        }
         sal_uInt16 nGutter = rLRSpace.GetGutterMargin();
 
         AddToAttrList( m_pSectionSpacingAttrList,