From 4cbc41bc4eaa822829e68c1ee11eafe834bb7da7 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 6 Sep 2013 15:57:03 +0200
Subject: [PATCH] bnc#779642 VML import: handle drawinglayer rectangle char
 spacing

Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a
---
 include/oox/vml/vmltextbox.hxx                  |   1 +
 oox/source/vml/vmltextbox.cxx                   |  10 ++++++++++
 oox/source/vml/vmltextboxcontext.cxx            |  10 ++++++++++
 .../extras/ooxmlimport/data/groupshape-sdt.docx | Bin 0 -> 10742 bytes
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx        |  16 ++++++++++++++++
 5 files changed, 37 insertions(+)
 create mode 100755 sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx

diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx
index fc97dc78413b..d31bb3b1f269 100644
--- a/include/oox/vml/vmltextbox.hxx
+++ b/include/oox/vml/vmltextbox.hxx
@@ -54,6 +54,7 @@ struct OOX_DLLPUBLIC TextFontModel
     OptValue< bool >    mobBold;
     OptValue< bool >    mobItalic;
     OptValue< bool >    mobStrikeout;
+    OptValue<sal_Int32> monSpacing;
 
     explicit            TextFontModel();
 };
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index 553b6f05a34c..fbd821727883 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -20,6 +20,7 @@
 #include "oox/vml/vmltextbox.hxx"
 
 #include <rtl/ustrbuf.hxx>
+#include <svx/unopage.hxx>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
@@ -92,6 +93,15 @@ void TextBox::convert(uno::Reference<drawing::XShape> xShape) const
             aPropertyValue.Value = uno::makeAny(double(rFont.monSize.get()) / 2.);
             aPropVec.push_back(aPropertyValue);
         }
+        if (rFont.monSpacing.has())
+        {
+            aPropertyValue.Name = "CharKerning";
+            // Value is not converted to mm100: SvxKerningItem::PutValue() gets
+            // called with nMemberId = 0, so no mm100 -> twips conversion will
+            // be done there.
+            aPropertyValue.Value = uno::makeAny(sal_Int16(rFont.monSpacing.get()));
+            aPropVec.push_back(aPropertyValue);
+        }
         if (rParagraph.moParaAdjust.has())
         {
             style::ParagraphAdjust eAdjust = style::ParagraphAdjust_LEFT;
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index 2720450698a2..5c7e2f751ffb 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -132,6 +132,16 @@ void TextPortionContext::onStartElement(const AttributeList& rAttribs)
         case OOX_TOKEN(doc, color):
             maFont.moColor = rAttribs.getString( OOX_TOKEN(doc, val) );
         break;
+        case OOX_TOKEN(doc, spacing):
+            maFont.monSpacing = rAttribs.getInteger(OOX_TOKEN(doc, val));
+        break;
+        case OOX_TOKEN(doc, r):
+        case OOX_TOKEN(doc, rPr):
+        case OOX_TOKEN(doc, t):
+        break;
+        default:
+            SAL_INFO("oox", "unhandled: 0x" << std::hex<< getCurrentElement());
+        break;
     }
 }
 
diff --git a/sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx b/sw/qa/extras/ooxmlimport/data/groupshape-sdt.docx
new file mode 100755
index 0000000000000000000000000000000000000000..072984779d72fc2372718cb87e7571c9459d3aba
GIT binary patch
literal 10742
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

literal 0
HcmV?d00001

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 08b2bfcba189..b933e856b58d 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -132,6 +132,7 @@ public:
     void testTablePagebreak();
     void testFdo68607();
     void testVmlTextVerticalAdjust();
+    void testGroupshapeSdt();
 
     CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -230,6 +231,7 @@ void Test::run()
         {"table-pagebreak.docx", &Test::testTablePagebreak},
         {"fdo68607.docx", &Test::testFdo68607},
         {"vml-text-vertical-adjust.docx", &Test::testVmlTextVerticalAdjust},
+        {"groupshape-sdt.docx", &Test::testGroupshapeSdt},
     };
     header();
     for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1551,6 +1553,20 @@ void Test::testVmlTextVerticalAdjust()
     CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_TOP, getProperty<drawing::TextVerticalAdjust>(xShape, "TextVerticalAdjust"));
 }
 
+void Test::testGroupshapeSdt()
+{
+    // All problems here are due to the groupshape: we have a drawinglayer rectangle, not a writer textframe.
+    uno::Reference<drawing::XShapes> xOuterGroupShape(getShape(1), uno::UNO_QUERY);
+    uno::Reference<drawing::XShapes> xInnerGroupShape(xOuterGroupShape->getByIndex(0), uno::UNO_QUERY);
+    uno::Reference<text::XTextRange> xShape(xInnerGroupShape->getByIndex(0), uno::UNO_QUERY);
+    // Border distances were not implemented, this was 0.
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(1905), getProperty<sal_Int32>(xShape, "TextUpperDistance"));
+    // Sdt field result wasn't imported, this was "".
+    CPPUNIT_ASSERT_EQUAL(OUString("placeholder text"), xShape->getString());
+    // w:spacing was ignored in oox, this was 0.
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(20), getProperty<sal_Int32>(getRun(getParagraphOfText(1, xShape->getText()), 1), "CharKerning"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();