oox/source/token/tokens.txt | 1 +
sw/source/filter/ww8/docxattributeoutput.cxx | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a44dbc35292b70dbcb2bbf3e51b60e2fcdbfc1c9
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Dec 10 12:47:28 2013 +0100
DOCX export: number drawingml objects from one
For some reason for drawingml shapes Word doesn't like the "0"
identifier. Let's do the same trick that works for font identifiers
already.
Change-Id: I30ebc33ab927becc1bbf146577eb36b914bf7edb
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 53c574d..9e0c8a3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6367,7 +6367,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
&rExport, FSHelperPtr pSeri
m_postponedChart( NULL ),
pendingPlaceholder( NULL ),
m_postitFieldsMaxId( 0 ),
- m_anchorId( 0 ),
+ m_anchorId( 1 ),
m_nextFontId( 1 ),
m_bBtLr(false),
m_bFrameBtLr(false),
commit d4b2f0df41093dddb0354bc256afc755524ced88
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Dec 10 12:47:05 2013 +0100
oox: allow to declare the wps namespace on export
Change-Id: I278b568d512dfbc34d24c612c1a532315e35e808
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 51f797e..648162e 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -5663,6 +5663,7 @@ wrapTopAndBottom
wrapTrailSpaces
wrapcoords
writeProtection
+wps
wsp
wsDr
x
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
