sw/qa/extras/rtfimport/rtfimport.cxx | 7 +------
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2 --
2 files changed, 1 insertion(+), 8 deletions(-)
New commits:
commit f2ba6ef61c8d7f36e8e64344839f2b2e42e86445
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Fri Mar 29 22:01:08 2024 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri Mar 29 22:20:18 2024 +0100
RTF import result for header now like in master
Same code as in https://gerrit.libreoffice.org/c/core/+/162932 works
now also for libreoffice-7-6.
Change-Id: I10f360d006f4ae4b9b26dabdc2e49ca929d9e3e3
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8d47cb388cfc..a14f3366d520 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1572,12 +1572,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf108947)
uno::Reference<text::XText> xHeaderTextLeft =
getProperty<uno::Reference<text::XText>>(
getStyles("PageStyles")->getByName("Default Page Style"),
"HeaderTextLeft");
aActual = xHeaderTextLeft->getString();
- CPPUNIT_ASSERT_EQUAL(
- OUString(
- SAL_NEWLINE_STRING
- // note: there should be *one* break here - as it is in the
24.2 branch - but somehow in the 7.6 branch there are 2; most likely it was
fixed by commit 4b0fa253a4540f5461397815d290586f9ddabe61 which is a bit large
to backport
- SAL_NEWLINE_STRING "Header Page 2 ?"),
- aActual);
+ CPPUNIT_ASSERT_EQUAL(OUString(SAL_NEWLINE_STRING "Header Page 2 ?"),
aActual);
#endif
}
commit d429fe3be052563df4b2070e862ff01e5fa53ba0
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Fri Mar 29 15:48:23 2024 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri Mar 29 22:20:18 2024 +0100
Fixup: Merge tag 'libreoffice-7.6.6.3' into feature/cib_contract49
Change-Id: Id985c571840f596bb84eb1cbe7108a9585e36265
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 848f7506ad8e..5bf0015c29f8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -911,8 +911,6 @@ public:
css::uno::Reference<css::drawing::XShape> PopPendingShape();
void PopPageHeaderFooter(PagePartType ePagePartType, PageType eType);
- void PushPageHeader(SectionPropertyMap::PageType eType);
- void PushPageFooter(SectionPropertyMap::PageType eType);
bool IsInHeaderFooter() const { auto const
type(m_StreamStateStack.top().eSubstreamType); return type ==
SubstreamType::Header || type == SubstreamType::Footer; }
void ConvertHeaderFooterToTextFrame(bool, bool);
