From 1a37ca65b896a5ba100d46c7cde0793f62bc546b Mon Sep 17 00:00:00 2001 From: Adam Co Date: Mon, 15 Jul 2013 18:40:08 +0300 Subject: fdo#66929: fix for default textbox inset values Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I0e9fa5e73e802f85f02c3fcc5c276ed0c1cb2a58 --- oox/source/vml/vmltextboxcontext.cxx | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'oox') 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; } -- cgit