From feae30c4ce1a1aa303500371b858f871d4ef88fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= <tamas.zolnai@collabora.com>
Date: Sat, 8 Feb 2014 01:50:55 +0100
Subject: [PATCH] ODF export/import: text vertical adjustment attribute of text
 frames

ODF standard handle 'textarea-vertical-align' as a
'graphic-property' which "specifies formatting
properties for chart, draw, graphic, and frame elements".
So this change fit to the standard.

Change-Id: I956f512953380983c2c882e943178335fd4dbfeb
---
 include/xmloff/xmltypes.hxx                    |   1 +
 .../odfexport/data/textframe-vertadjust.odt    | Bin 0 -> 12850 bytes
 sw/qa/extras/odfexport/odfexport.cxx           |  15 +++++++++++++++
 xmloff/source/text/txtprhdl.cxx                |  17 +++++++++++++++--
 xmloff/source/text/txtprmap.cxx                |   1 +
 5 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 sw/qa/extras/odfexport/data/textframe-vertadjust.odt

diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx
index 55cac8348135..3c8d7376db92 100644
--- a/include/xmloff/xmltypes.hxx
+++ b/include/xmloff/xmltypes.hxx
@@ -276,6 +276,7 @@
 
 #define XML_TYPE_CHAR_SCRIPT            (XML_TEXT_TYPES_START + 116)
 #define XML_TYPE_CHAR_RFC_LANGUAGE_TAG  (XML_TEXT_TYPES_START + 117)
+#define XML_TYPE_VERTICAL_ALIGN         (XML_TEXT_TYPES_START + 118)
 
 #define XML_SCH_TYPES_START (0x4 << XML_TYPE_APP_SHIFT)
 #define XML_PM_TYPES_START  (0x5 << XML_TYPE_APP_SHIFT) // page master
diff --git a/sw/qa/extras/odfexport/data/textframe-vertadjust.odt b/sw/qa/extras/odfexport/data/textframe-vertadjust.odt
new file mode 100644
index 0000000000000000000000000000000000000000..bbf3416c09e119b8c82c771bbd5643fbb5aa63ac
GIT binary patch
literal 12850
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
MPEY*vnd!OoUo5MHasU7T

literal 0
HcmV?d00001

diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index c2e5c0cbbdf3..db752040e4a9 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -14,6 +14,7 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/table/ShadowFormat.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
+#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 
 class Test : public SwModelTestBase
 {
@@ -335,6 +336,20 @@ DECLARE_ODFEXPORT_TEST(testRelwPage, "relw-page.odt")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(4896), parseDump("/root/page/body/txt/anchored/fly/infos/bounds", "width").toInt32());
 }
 
+DECLARE_ODFEXPORT_TEST(testTextFrameVertAdjust, "textframe-vertadjust.odt")
+{
+    // Test import/export of new frame attribute called TextVerticalAdjust
+
+    // 1st frame's context is adjusted to the top
+    uno::Reference<beans::XPropertySet> xFrame(getTextFrameByName("Rectangle 1"), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_TOP, getProperty<drawing::TextVerticalAdjust>(xFrame, "TextVerticalAdjust"));
+    // 2nd frame's context is adjusted to the center
+    xFrame.set(getTextFrameByName("Rectangle 2"), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_CENTER, getProperty<drawing::TextVerticalAdjust>(xFrame, "TextVerticalAdjust"));
+    // 3rd frame's context is adjusted to the bottom
+    xFrame.set(getTextFrameByName("Rectangle 3"), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM, getProperty<drawing::TextVerticalAdjust>(xFrame, "TextVerticalAdjust"));
+}
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 951fa1f6fd01..032a055dac84 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -45,6 +45,7 @@
 #include "txtprhdl.hxx"
 // OD 2004-05-05 #i28701#
 #include <com/sun/star/text/WrapInfluenceOnPosition.hpp>
+#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -211,7 +212,7 @@ static SvXMLEnumMapEntry const pXML_FontRelief_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-static SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] =
+static SvXMLEnumMapEntry const pXML_ParaVerticalAlign_Enum[] =
 {
     { XML_TOP,          ParagraphVertAlign::TOP     },
     { XML_MIDDLE,       ParagraphVertAlign::CENTER  },
@@ -231,6 +232,15 @@ static SvXMLEnumMapEntry const pXML_WrapInfluenceOnPosition_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
+static SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] =
+{
+    { XML_TOP,          drawing::TextVerticalAdjust_TOP },
+    { XML_MIDDLE,       drawing::TextVerticalAdjust_CENTER },
+    { XML_BOTTOM,       drawing::TextVerticalAdjust_BOTTOM },
+    { XML_JUSTIFY,      drawing::TextVerticalAdjust_BLOCK },
+    { XML_TOKEN_INVALID, 0 }
+};
+
 static SvXMLEnumMapEntry const pXML_FillStyle_Enum[] =
 {
     { XML_NONE,     drawing::FillStyle_NONE },
@@ -1347,7 +1357,7 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
                                             GetXMLToken( XML_LINE_HEIGHT ) );
         break;
     case XML_TYPE_TEXT_VERTICAL_ALIGN:
-        pHdl = new XMLConstantsPropertyHandler( pXML_VerticalAlign_Enum, XML_TOKEN_INVALID );
+        pHdl = new XMLConstantsPropertyHandler( pXML_ParaVerticalAlign_Enum, XML_TOKEN_INVALID );
         break;
     case XML_TYPE_TEXT_RUBY_POSITION:
         pHdl = new XMLNamedBoolPropertyHdl( ::xmloff::token::XML_ABOVE,
@@ -1383,6 +1393,9 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
     case XML_TYPE_FILLSTYLE:
         pHdl = new XMLConstantsPropertyHandler( pXML_FillStyle_Enum, XML_TOKEN_INVALID );
         break;
+    case XML_TYPE_VERTICAL_ALIGN:
+        pHdl = new XMLConstantsPropertyHandler( pXML_VerticalAlign_Enum, XML_TOKEN_INVALID );
+        break;
     }
 
     return pHdl;
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index a1f9898f2f91..90cb26e56869 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -786,6 +786,7 @@ XMLPropertyMapEntry aXMLFramePropMap[] =
     MG_E( "UserDefinedAttributes", TEXT, XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
     MAP_EXT("RelativeWidthRelation", XML_NAMESPACE_LO_EXT, XML_REL_WIDTH_REL, XML_TYPE_TEXT_HORIZONTAL_REL|XML_TYPE_PROP_GRAPHIC, CTF_RELWIDTHREL),
     MAP_EXT("RelativeHeightRelation", XML_NAMESPACE_LO_EXT, XML_REL_HEIGHT_REL, XML_TYPE_TEXT_VERTICAL_REL|XML_TYPE_PROP_GRAPHIC, CTF_RELHEIGHTREL),
+    MG_E("TextVerticalAdjust", DRAW, TEXTAREA_VERTICAL_ALIGN, XML_TYPE_VERTICAL_ALIGN, 0),
 
     M_END()
 };