diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-12-10 12:51:01 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-01-13 21:59:37 +0100 |
| commit | c46c8164c5ad8c8c2aee72f5ee3bd73eeef59e06 (patch) | |
| tree | 812c463be54d44027aad07b02e6a0354a30be661 | |
| parent | 46bee74bf9ae9173ab903969edc02920cf15a9b3 (diff) | |
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)
| -rw-r--r-- | oox/source/vml/vmltextboxcontext.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx index 841c1508e2ec..3f188e35aece 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; } |