From 0b20f01a8817867d7657ed2ee29321de9af15843 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 30 Jan 2014 10:25:16 +0100
Subject: [PATCH] swpagerelsize: implement ODF import/export

Export rel-height-rel / rel-width-rel only in case rel-height /
rel-width is non-zero, though.

Change-Id: I36120cbd8679ac4fc072d1e7cf4dfc024836b5ac
---
 include/xmloff/txtprmap.hxx               |   2 ++
 include/xmloff/xmltoken.hxx               |   2 ++
 sw/qa/extras/odfexport/data/relh-page.odt | Bin 0 -> 10183 bytes
 sw/qa/extras/odfexport/data/relw-page.odt | Bin 0 -> 10221 bytes
 sw/qa/extras/odfexport/odfexport.cxx      |  19 +++++++++++++++++++
 xmloff/source/core/xmltoken.cxx           |   2 ++
 xmloff/source/text/txtexppr.cxx           |  18 ++++++++++++++++++
 xmloff/source/text/txtprmap.cxx           |   2 ++
 8 files changed, 45 insertions(+)
 create mode 100644 sw/qa/extras/odfexport/data/relh-page.odt
 create mode 100644 sw/qa/extras/odfexport/data/relw-page.odt

diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx
index 0eebd9bca1df..dc8de7026395 100644
--- a/include/xmloff/txtprmap.hxx
+++ b/include/xmloff/txtprmap.hxx
@@ -194,6 +194,8 @@
 #define CTF_CHARRIGHTBORDER                 (XML_TEXT_CTF_START + 165)
 #define CTF_CHARTOPBORDER                   (XML_TEXT_CTF_START + 166)
 #define CTF_CHARBOTTOMBORDER                (XML_TEXT_CTF_START + 167)
+#define CTF_RELWIDTHREL                     (XML_TEXT_CTF_START + 168)
+#define CTF_RELHEIGHTREL                    (XML_TEXT_CTF_START + 169)
 
 
 #define TEXT_PROP_MAP_TEXT 0
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index f804744e09ce..16ddf69ec475 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1495,7 +1495,9 @@ namespace xmloff { namespace token {
         XML_REJECTION,
         XML_REL_COLUMN_WIDTH,
         XML_REL_HEIGHT,
+        XML_REL_HEIGHT_REL,
         XML_REL_WIDTH,
+        XML_REL_WIDTH_REL,
         XML_RELATIVE,
         XML_RELATIVE_TAB_STOP_POSITION,
         XML_RELN,
diff --git a/sw/qa/extras/odfexport/data/relh-page.odt b/sw/qa/extras/odfexport/data/relh-page.odt
new file mode 100644
index 0000000000000000000000000000000000000000..2dcf6412431df583b81be8a55250410a36aeeb80
GIT binary patch
literal 10183
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

literal 0
HcmV?d00001

diff --git a/sw/qa/extras/odfexport/data/relw-page.odt b/sw/qa/extras/odfexport/data/relw-page.odt
new file mode 100644
index 0000000000000000000000000000000000000000..047d91e876d51b11486be7131608618cca0368b5
GIT binary patch
literal 10221
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
Ne-5|$V@`Wl`#;OU`6U1V

literal 0
HcmV?d00001

diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 5ef7ca408499..333f00d802de 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -13,6 +13,7 @@
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/table/ShadowFormat.hpp>
+#include <com/sun/star/text/RelOrientation.hpp>
 
 class Test : public SwModelTestBase
 {
@@ -310,6 +311,24 @@ DECLARE_ODFEXPORT_TEST(testTextframeTransparentShadow, "textframe-transparent-sh
     CPPUNIT_ASSERT_EQUAL(sal_Int32(25), getProperty<sal_Int32>(xPicture, "ShadowTransparence"));
 }
 
+DECLARE_ODFEXPORT_TEST(testRelhPage, "relh-page.odt")
+{
+    uno::Reference<drawing::XShape> xTextFrame = getShape(1);
+    // This was text::RelOrientation::FRAME (the default), RelativeHeightRelation was not handled in xmloff.
+    CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xTextFrame, "RelativeHeightRelation"));
+    // Make sure rel-height-rel doesn't affect width.
+    CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME, getProperty<sal_Int16>(xTextFrame, "RelativeWidthRelation"));
+}
+
+DECLARE_ODFEXPORT_TEST(testRelwPage, "relw-page.odt")
+{
+    uno::Reference<drawing::XShape> xTextFrame = getShape(1);
+    // This was text::RelOrientation::FRAME (the default), RelativeWidthRelation was not handled in xmloff.
+    CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xTextFrame, "RelativeWidthRelation"));
+    // Make sure rel-width-rel doesn't affect height.
+    CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME, getProperty<sal_Int16>(xTextFrame, "RelativeHeightRelation"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 27fb252fb860..8ff43ec827d4 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1500,7 +1500,9 @@ namespace xmloff { namespace token {
         TOKEN( "rejection",                       XML_REJECTION ),
         TOKEN( "rel-column-width",                XML_REL_COLUMN_WIDTH ),
         TOKEN( "rel-height",                      XML_REL_HEIGHT ),
+        TOKEN( "rel-height-rel",                  XML_REL_HEIGHT_REL ),
         TOKEN( "rel-width",                       XML_REL_WIDTH ),
+        TOKEN( "rel-width-rel",                   XML_REL_WIDTH_REL ),
         TOKEN( "relative",                        XML_RELATIVE ),
         TOKEN( "relative-tab-stop-position",      XML_RELATIVE_TAB_STOP_POSITION ),
         TOKEN( "reln",                            XML_RELN ),
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 6c560cc2ac7f..aa67367ba566 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -626,6 +626,8 @@ void XMLTextExportPropertySetMapper::ContextFilter(
     XMLPropertyState* pVertOrientRelPageState = NULL;
     XMLPropertyState* pVertOrientRelFrameState = NULL;
     XMLPropertyState* pVertOrientRelAsCharState = NULL;
+    XMLPropertyState* pRelWidthRel = NULL;
+    XMLPropertyState* pRelHeightRel = NULL;
 
     // Vertical position and relation for shapes (#i28749#)
     XMLPropertyState* pShapeVertOrientState = NULL;
@@ -738,12 +740,14 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         case CTF_HORIZONTALREL:             pHoriOrientRelState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_HORIZONTALREL_FRAME:       pHoriOrientRelFrameState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_HORIZONTALMIRROR:          pHoriOrientMirrorState = propertie; bNeedsAnchor = sal_True; break;
+        case CTF_RELWIDTHREL:               pRelWidthRel = propertie; break;
         case CTF_VERTICALPOS:           pVertOrientState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_VERTICALPOS_ATCHAR:    pVertOrientAtCharState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_VERTICALREL:           pVertOrientRelState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_VERTICALREL_PAGE:      pVertOrientRelPageState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_VERTICALREL_FRAME:     pVertOrientRelFrameState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_VERTICALREL_ASCHAR:    pVertOrientRelAsCharState = propertie; bNeedsAnchor = sal_True; break;
+        case CTF_RELHEIGHTREL:          pRelHeightRel = propertie; break;
 
         // Handle new CTFs for shape positioning properties (#i28749#)
         case CTF_SHAPE_HORIZONTALPOS:             pShapeHoriOrientState = propertie; bNeedsAnchor = sal_True; break;
@@ -975,6 +979,13 @@ void XMLTextExportPropertySetMapper::ContextFilter(
             pHoriOrientRelState->mnIndex = -1;
         if( pHoriOrientRelFrameState && TextContentAnchorType_AT_FRAME != eAnchor )
             pHoriOrientRelFrameState->mnIndex = -1;
+        if (pRelWidthRel)
+        {
+            sal_Int16 nRelWidth = 0;
+            rPropSet->getPropertyValue("RelativeWidth") >>= nRelWidth;
+            if (!nRelWidth)
+                pRelWidthRel->mnIndex = -1;
+        }
 
         if( pVertOrientState && TextContentAnchorType_AT_CHARACTER == eAnchor )
             pVertOrientState->mnIndex = -1;
@@ -989,6 +1000,13 @@ void XMLTextExportPropertySetMapper::ContextFilter(
             pVertOrientRelFrameState->mnIndex = -1;
         if( pVertOrientRelAsCharState && TextContentAnchorType_AS_CHARACTER != eAnchor )
             pVertOrientRelAsCharState->mnIndex = -1;
+        if (pRelHeightRel)
+        {
+            sal_Int16 nRelHeight = 0;
+            rPropSet->getPropertyValue("RelativeHeight") >>= nRelHeight;
+            if (!nRelHeight)
+                pRelHeightRel->mnIndex = -1;
+        }
     }
 
     // States for shape positioning properties (#i28749#)
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 2eacad24214d..a1f9898f2f91 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -784,6 +784,8 @@ XMLPropertyMapEntry aXMLFramePropMap[] =
     MG_E( "",           DRAW,   VISIBLE_AREA_HEIGHT,    XML_TYPE_MEASURE|MID_FLAG_NO_PROPERTY|MID_FLAG_MULTI_PROPERTY,  CTF_OLE_VIS_AREA_HEIGHT ),
     MG_E( "",           DRAW,   DRAW_ASPECT,            XML_TYPE_TEXT_DRAW_ASPECT|MID_FLAG_NO_PROPERTY|MID_FLAG_MULTI_PROPERTY, CTF_OLE_DRAW_ASPECT ),
     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),
 
     M_END()
 };