From eb3942a24918e9537c85cc79a405fff8c167d456 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 6 Nov 2013 15:11:05 +0100
Subject: DOCX export of para style's qFormat, rsid and friends

Change-Id: I4ed35f2b497fec96d012303001d4861768daef6a
---
 writerfilter/source/dmapper/StyleSheetTable.cxx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'writerfilter')

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index b60e667af21a..85626e1d4b25 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -41,6 +41,7 @@
 #include <map>
 #include <stdio.h>
 #include <rtl/ustrbuf.hxx>
+#include <comphelper/string.hxx>
 
 #include <dmapperLoggers.hxx>
 
@@ -621,8 +622,14 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
                 beans::PropertyValue aValue;
                 if (nSprmId == NS_ooxml::LN_CT_Style_rsid)
                 {
+                    // We want the rsid as a hex string, but always with the length of 8.
+                    OUStringBuffer aBuf = OUString::number(nIntValue, 16);
+                    OUStringBuffer aStr;
+                    comphelper::string::padToLength(aStr, 8 - aBuf.getLength(), '0');
+                    aStr.append(aBuf.getStr());
+
                     aValue.Name = "rsid";
-                    aValue.Value = uno::makeAny(nIntValue);
+                    aValue.Value = uno::makeAny(aStr.makeStringAndClear());
                 }
                 else if (nSprmId == NS_ooxml::LN_CT_Style_qFormat)
                     aValue.Name = "qFormat";
@@ -633,7 +640,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
                 else
                 {
                     aValue.Name = "uiPriority";
-                    aValue.Value = uno::makeAny(nIntValue);
+                    aValue.Value = uno::makeAny(OUString::number(nIntValue));
                 }
                 pEntry->AppendInteropGrabBag(aValue);
             }
-- 
cgit