[Libreoffice-commits] .: writerfilter/source

[Lubos Lunak]

 writerfilter/source/dmapper/GraphicImport.cxx |   34 ++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)

New commits:
commit c0f09b7cff0686aa0643c6469084de9c5b8bc1aa
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Feb 10 17:27:31 2011 +0100

    handle wp:simplePos properly

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 8f7fdce..537901f 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -903,14 +903,14 @@ void GraphicImport::attribute(Id nName, Value & val)
             //enable overlapping - ignored
         break;
         case NS_ooxml::LN_CT_Point2D_x: // 90405;
+            m_pImpl->nLeftPosition = ConversionHelper::convertTwipToMM100(nIntValue);
+            m_pImpl->nHoriRelation = text::RelOrientation::PAGE_FRAME;
+            m_pImpl->nHoriOrient = text::HoriOrientation::NONE;
+        break;
         case NS_ooxml::LN_CT_Point2D_y: // 90406;
-            if( m_pImpl->bUseSimplePos )
-            {
-                //todo: absolute positioning
-                NS_ooxml::LN_CT_Point2D_x == nName ? m_pImpl->nLeftPosition = ConversionHelper::convertTwipToMM100(nIntValue) : 
-                                                        m_pImpl->nTopPosition = ConversionHelper::convertTwipToMM100(nIntValue);
-                
-            }    
+            m_pImpl->nTopPosition = ConversionHelper::convertTwipToMM100(nIntValue);
+            m_pImpl->nVertRelation = text::RelOrientation::PAGE_FRAME;
+            m_pImpl->nVertOrient = text::VertOrientation::NONE;
         break;
         case NS_ooxml::LN_CT_WrapTight_wrapText: // 90934;            
             m_pImpl->bContour = true;
@@ -1271,10 +1271,12 @@ void GraphicImport::sprm(Sprm & rSprm)
             if( pProperties.get( ) )
             {
                 pProperties->resolve( *pHandler );
-
-                m_pImpl->nHoriRelation = pHandler->m_nRelation;
-                m_pImpl->nHoriOrient = pHandler->m_nOrient;
-                m_pImpl->nLeftPosition = pHandler->m_nPosition;
+                if( !m_pImpl->bUseSimplePos )
+                {
+                    m_pImpl->nHoriRelation = pHandler->m_nRelation;
+                    m_pImpl->nHoriOrient = pHandler->m_nOrient;
+                    m_pImpl->nLeftPosition = pHandler->m_nPosition;
+                }
             }
         }
         break;
@@ -1286,10 +1288,12 @@ void GraphicImport::sprm(Sprm & rSprm)
             if( pProperties.get( ) )
             {
                 pProperties->resolve( *pHandler );
-
-                m_pImpl->nVertRelation = pHandler->m_nRelation;
-                m_pImpl->nVertOrient = pHandler->m_nOrient;
-                m_pImpl->nTopPosition = pHandler->m_nPosition;
+                if( !m_pImpl->bUseSimplePos )
+                {
+                    m_pImpl->nVertRelation = pHandler->m_nRelation;
+                    m_pImpl->nVertOrient = pHandler->m_nOrient;
+                    m_pImpl->nTopPosition = pHandler->m_nPosition;
+                }
             }
         }
         break;