[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source

[Noel Power]

 writerfilter/source/rtftok/rtfsdrimport.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 78b0de49c342402648b71ba59e91b03a7e7cc38e
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Wed Aug 1 15:37:45 2012 +0200

    fdo#49892 implement RTF import of dhgt shape property
    
    Change-Id: I36d574c5f7915d732c6c158fadb91b6032370a01
    (cherry picked from commit ce701e94db740ea8c2bb9f6dcf55a2aeda4d71af)

diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index dba4545..f12e44c 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -37,6 +37,8 @@
 #include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
 
+#include <dmapper/DomainMapper.hxx>
+#include "../dmapper/GraphicHelpers.hxx"
 #include <rtfsdrimport.hxx>
 
 using rtl::OString;
@@ -258,6 +260,14 @@ void RTFSdrImport::resolve(RTFShape& rShape)
             aViewBox.Width = i->second.toInt32();
         else if ( i->first == "geoBottom" )
             aViewBox.Height = i->second.toInt32();
+        else if ( i->first == "dhgt" )
+        {
+            writerfilter::dmapper::DomainMapper& rMapper = (writerfilter::dmapper::DomainMapper&)m_rImport.Mapper();
+            writerfilter::dmapper::GraphicZOrderHelper* pHelper = rMapper.graphicZOrderHelper();
+            sal_Int32 nZOrder = i->second.toInt32();
+            xPropertySet->setPropertyValue("ZOrder", uno::makeAny(pHelper->findZOrder(nZOrder)));
+            pHelper->addItem(xPropertySet, nZOrder);
+        }
         else
             SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle shape property '" <<
                     OUStringToOString( i->first, RTL_TEXTENCODING_UTF8 ).getStr() << "':'" <<