diff options
| -rw-r--r-- | sw/qa/extras/ww8import/data/floating-table-section-margins.doc | bin | 38400 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8import/ww8import.cxx | 23 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 3 |
3 files changed, 0 insertions, 26 deletions
diff --git a/sw/qa/extras/ww8import/data/floating-table-section-margins.doc b/sw/qa/extras/ww8import/data/floating-table-section-margins.doc Binary files differdeleted file mode 100644 index f414be7f1ec8..000000000000 --- a/sw/qa/extras/ww8import/data/floating-table-section-margins.doc +++ /dev/null diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx index 82b4c74253dd..47a9e41f5352 100644 --- a/sw/qa/extras/ww8import/ww8import.cxx +++ b/sw/qa/extras/ww8import/ww8import.cxx @@ -37,29 +37,6 @@ public: } }; -CPPUNIT_TEST_FIXTURE(Test, testFloatingTableSectionMargins) -{ - createSwDoc("floating-table-section-margins.doc"); - sal_Int32 pageLeft = parseDump("/root/page[2]/infos/bounds", "left").toInt32(); - sal_Int32 pageWidth = parseDump("/root/page[2]/infos/bounds", "width").toInt32(); - sal_Int32 tableLeft = parseDump("//tab/infos/bounds", "left").toInt32(); - sal_Int32 tableWidth = parseDump("//tab/infos/bounds", "width").toInt32(); - CPPUNIT_ASSERT( pageWidth > 0 ); - CPPUNIT_ASSERT( tableWidth > 0 ); - // The table's resulting position should be roughly centered. - CPPUNIT_ASSERT( abs(( pageLeft + pageWidth / 2 ) - ( tableLeft + tableWidth / 2 )) < 20 ); - - uno::Reference<beans::XPropertySet> xTextSection = getProperty< uno::Reference<beans::XPropertySet> >(getParagraph(2), "TextSection"); - CPPUNIT_ASSERT(xTextSection.is()); - uno::Reference<text::XTextColumns> xTextColumns = getProperty< uno::Reference<text::XTextColumns> >(xTextSection, "TextColumns"); - OUString pageStyleName = getProperty<OUString>(getParagraph(2), "PageStyleName"); - uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName(pageStyleName), uno::UNO_QUERY); - uno::Reference<text::XTextColumns> xPageColumns = getProperty< uno::Reference<text::XTextColumns> >(xPageStyle, "TextColumns"); - - //either one or the other should get the column's, not both. - CPPUNIT_ASSERT( xTextColumns->getColumnCount() != xPageColumns->getColumnCount()); -} - CPPUNIT_TEST_FIXTURE(Test, testN816593) { createSwDoc("n816593.doc"); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index abd7cf4c0345..04c00b90b78e 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4527,9 +4527,6 @@ void wwSectionManager::InsertSegments() bool bInsertSection = (aIter != aStart) && aIter->IsContinuous() && bThisAndPreviousAreCompatible; bool bInsertPageDesc = !bInsertSection; - // HACK Force new pagedesc if left/right margins change, otherwise e.g. floating tables may be anchored improperly. - if( aIter->maSep.dxaLeft != aPrev->maSep.dxaLeft || aIter->maSep.dxaRight != aPrev->maSep.dxaRight ) - bInsertPageDesc = true; bool bProtected = SectionIsProtected(*aIter); // do we really need this ?? I guess I have a different logic in editshell which disables this... if (bInsertPageDesc) |