60c17f3e76
* bnc-939996.diff - Fix bnc#889755 - LO-L3: PPTX: chart axis number format incorrect * bnc-889755.diff - bnc#679938 - LO-L3: saving to doc file the chapter name in the header does not change with chapters * bnc-679938.diff OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=338
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 4215bca95511af8e4ee96e3c8f521b35f638aef3 Mon Sep 17 00:00:00 2001
|
|
From: Andras Timar <andras.timar@collabora.com>
|
|
Date: Fri, 21 Aug 2015 10:42:06 +0200
|
|
Subject: export 'Chapter' field type as 'StyleRef' into .doc
|
|
|
|
Change-Id: I7e635c76b08636a9915cee30aaebb08fc854633d
|
|
Reviewed-on: https://gerrit.libreoffice.org/17888
|
|
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
|
|
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
|
|
index d2472d2..3da8f9e 100644
|
|
--- a/sw/source/filter/ww8/ww8atr.cxx
|
|
+++ b/sw/source/filter/ww8/ww8atr.cxx
|
|
@@ -2879,7 +2879,11 @@ void AttributeOutputBase::TextField( const SwFormatField& rField )
|
|
{
|
|
SwChapterField aCopy(*static_cast<const SwChapterField*>(pField));
|
|
aCopy.ChangeExpansion(*pTextNd, false);
|
|
- WriteExpand( &aCopy );
|
|
+ const OUString sStr = FieldString(ww::eSTYLEREF)
|
|
+ + " "
|
|
+ + OUString::number(aCopy.GetLevel() + 1)
|
|
+ + " \\* MERGEFORMAT ";
|
|
+ GetExport().OutputField(pField, ww::eSTYLEREF, sStr);
|
|
bWriteExpand = false;
|
|
}
|
|
}
|
|
--
|
|
cgit v0.10.2
|
|
|