diff options
| author | Adam Co <rattles2013@gmail.com> | 2013-07-15 18:40:08 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-07-16 09:46:48 +0200 |
| commit | 1a37ca65b896a5ba100d46c7cde0793f62bc546b (patch) | |
| tree | 555972e7a4d59217516dc1a2c52d1cf9e78cab6b /oox | |
| parent | 56ee768bfd912c3c4278056a4712c1108ec38af4 (diff) | |
fdo#66929: fix for default textbox inset values
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I0e9fa5e73e802f85f02c3fcc5c276ed0c1cb2a58
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/vml/vmltextboxcontext.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx index d91c66ade821..fbb701f67ca5 100644 --- a/oox/source/vml/vmltextboxcontext.cxx +++ b/oox/source/vml/vmltextboxcontext.cxx @@ -171,18 +171,27 @@ TextBoxContext::TextBoxContext( ContextHandler2Helper& rParent, TextBox& rTextBo { OUString inset = rAttribs.getString( XML_inset ).get(); OUString value; - ConversionHelper::separatePair( value, inset, inset, ',' ); + OUString remainingStr; + + ConversionHelper::separatePair( value, remainingStr, inset, ',' ); rTextBox.borderDistanceLeft = ConversionHelper::decodeMeasureToHmm( graphicHelper, value.isEmpty() ? "0.1in" : value, 0, false, false ); - ConversionHelper::separatePair( value, inset, inset, ',' ); + + inset = remainingStr; + ConversionHelper::separatePair( value, remainingStr, inset, ',' ); rTextBox.borderDistanceTop = ConversionHelper::decodeMeasureToHmm( graphicHelper, value.isEmpty() ? "0.05in" : value, 0, false, false ); - ConversionHelper::separatePair( value, inset, inset, ',' ); + + inset = remainingStr; + ConversionHelper::separatePair( value, remainingStr, inset, ',' ); rTextBox.borderDistanceRight = ConversionHelper::decodeMeasureToHmm( graphicHelper, value.isEmpty() ? "0.1in" : value, 0, false, false ); - ConversionHelper::separatePair( value, inset, inset, ',' ); + + inset = remainingStr; + ConversionHelper::separatePair( value, remainingStr, inset, ',' ); rTextBox.borderDistanceBottom = ConversionHelper::decodeMeasureToHmm( graphicHelper, value.isEmpty() ? "0.05in" : value, 0, false, false ); + rTextBox.borderDistanceSet = true; } |