[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - oox/source

[Miklos Vajna]

 oox/source/vml/vmltextboxcontext.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 87ebf8183142cd136046f7c923ac5477d6c05ee3
Author: Miklos Vajna <vmik...@suse.cz>
Date:   Fri Jun 7 11:49:10 2013 +0200

    bnc#820788 VML import of v:textbox's mso-fit-shape-to-text style property
    
    (cherry picked from commit a22ef599bd3fdcf0bd5c3616aa566a5922624ff3)
    
    Conflicts:
        sw/qa/extras/ooxmlimport/ooxmlimport.cxx
    
    Change-Id: I74a0ecd50ca61a4f5bf7ebdbf12743dc1fd9368a

diff --git a/oox/source/vml/vmltextboxcontext.cxx 
b/oox/source/vml/vmltextboxcontext.cxx
index 108b9f9..d83dcc9 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -197,6 +197,10 @@ TextBoxContext::TextBoxContext( ContextHandler2Helper& 
rParent, TextBox& rTextBo
         if( ConversionHelper::separatePair( aName, aValue, sStyle.getToken( 0, 
';', nIndex ), ':' ) )
         {
             if( aName == "layout-flow" )      rTextBox.maLayoutFlow = aValue;
+            else if (aName == "mso-fit-shape-to-text")
+                rTextBox.mrTypeModel.mbAutoHeight = true;
+            else
+                SAL_WARN("oox", "unhandled style property: " << aName);
         }
     }
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits