sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 5 +++++
writerfilter/source/dmapper/StyleSheetTable.cxx | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit b47a8f091ad8f9048a6b7962e9cde5d04ea0d665
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Thu Aug 1 15:50:00 2019 +0300
Commit: Justin Luth <justin_l...@sil.org>
CommitDate: Thu Aug 1 19:28:54 2019 +0200
tdf#126544 writerfilter: check parent style exists before assigning
If you set the parent style to a style that is not yet created,
then it silently fails, and thus inherits from nothing!
Change-Id: Ibb85235643dd5b1eb9b0bd43f701580f24b2b7fa
Reviewed-on: https://gerrit.libreoffice.org/76805
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_l...@sil.org>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 6b3a70dccfba..fb6836c64f88 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -947,6 +947,11 @@ DECLARE_OOXMLEXPORT_TEST(testExtraSectionBreak,
"1_page.docx")
uno::Reference<text::XPageCursor>
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
xCursor->jumpToLastPage();
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage());
+
+ // tdf126544 Styles were being added before their
base/parent/inherited-from style existed, and so were using default settings.
+ uno::Reference<container::XNameAccess>
xParaStyles(getStyles("ParagraphStyles"));
+ uno::Reference<style::XStyle> xStyle(xParaStyles->getByName("Heading 1"),
uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL( OUString("Heading Base"), xStyle->getParentStyle() );
}
DECLARE_OOXMLEXPORT_TEST(testcolumnbreak, "columnbreak.docx")
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 54b072768558..12b525f79e6d 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -982,7 +982,13 @@ void StyleSheetTable::ApplyStyleSheets( const
FontTablePtr& rFontTable )
StyleSheetEntryPtr pParent = FindStyleSheetByISTD(
pEntry->sBaseStyleIdentifier );
// Writer core doesn't support numbering styles
having a parent style, it seems
if (pParent.get() != nullptr && !bListStyle)
- xStyle->setParentStyle(ConvertStyleName(
pParent->sStyleName ));
+ {
+ const OUString sParentStyleName =
ConvertStyleName( pParent->sStyleName );
+ if ( !sParentStyleName.isEmpty() &&
!xStyles->hasByName( sParentStyleName ) )
+ aMissingParent.emplace_back(
sParentStyleName, xStyle );
+ else
+ xStyle->setParentStyle( sParentStyleName );
+ }
}
catch( const uno::RuntimeException& )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
