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

[Libreoffice Gerrit user]

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

New commits:
commit 2c9e1123658c1448b8fe0b0e4295578ad1b183b0
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Mon Dec 10 12:51:01 2012 +0100

    oox: v:textbox's inset attribute should be imported in Hmm, not in Emu
    
    Trivial reproducer: http://people.freedesktop.org/~vmiklos/2012/simple-textbox.docx
    
    Change-Id: I030f7153326affc5a01e7ede1ddf1164fa500071
    (cherry picked from commit 5bc835d48f1e5373b3a31bd166fadfdf19b3588f)

diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index 841c150..3f188e3 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -137,16 +137,16 @@ TextBoxContext::TextBoxContext( ContextHandler2Helper& rParent, TextBox& rTextBo
         OUString inset = rAttribs.getString( XML_inset ).get();
         OUString value;
         ConversionHelper::separatePair( value, inset, inset, ',' );
-        rTextBox.borderDistanceLeft = ConversionHelper::decodeMeasureToEmu( graphicHelper,
+        rTextBox.borderDistanceLeft = ConversionHelper::decodeMeasureToHmm( graphicHelper,
             value.isEmpty() ? "0.1in" : value, 0, false, false );
         ConversionHelper::separatePair( value, inset, inset, ',' );
-        rTextBox.borderDistanceTop = ConversionHelper::decodeMeasureToEmu( graphicHelper,
+        rTextBox.borderDistanceTop = ConversionHelper::decodeMeasureToHmm( graphicHelper,
             value.isEmpty() ? "0.05in" : value, 0, false, false );
         ConversionHelper::separatePair( value, inset, inset, ',' );
-        rTextBox.borderDistanceRight = ConversionHelper::decodeMeasureToEmu( graphicHelper,
+        rTextBox.borderDistanceRight = ConversionHelper::decodeMeasureToHmm( graphicHelper,
             value.isEmpty() ? "0.1in" : value, 0, false, false );
         ConversionHelper::separatePair( value, inset, inset, ',' );
-        rTextBox.borderDistanceBottom = ConversionHelper::decodeMeasureToEmu( graphicHelper,
+        rTextBox.borderDistanceBottom = ConversionHelper::decodeMeasureToHmm( graphicHelper,
             value.isEmpty() ? "0.05in" : value, 0, false, false );
         rTextBox.borderDistanceSet = true;
     }