diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-06-01 17:19:58 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-06-01 17:40:03 +0100 |
| commit | ff43ad1a77a89d1d1ebc0c20807bb9ec508fc9fd (patch) | |
| tree | daca69d3fceb0a7ec682360418033cf0126a6e95 /oox/source/vml | |
| parent | fcc31f1749e01e4184c4347929a9e1d7e782dee1 (diff) | |
targetted string cleanup
Change-Id: Iaf77bb427d62d7f3be00a96cba4dfb25a01934ac
Diffstat (limited to 'oox/source/vml')
| -rw-r--r-- | oox/source/vml/vmlshapecontext.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index e6485f3c7927..3134282c06d4 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -349,18 +349,18 @@ void ShapeTypeContext::setStyle( const OUString& rStyle ) OUString aName, aValue; if( ConversionHelper::separatePair( aName, aValue, rStyle.getToken( 0, ';', nIndex ), ':' ) ) { - if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "position" ) ) ) mrTypeModel.maPosition = aValue; - else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "left" ) ) ) mrTypeModel.maLeft = aValue; - else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "top" ) ) ) mrTypeModel.maTop = aValue; - else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "width" ) ) ) mrTypeModel.maWidth = aValue; - else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "height" ) ) ) mrTypeModel.maHeight = aValue; - else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "margin-left" ) ) ) mrTypeModel.maMarginLeft = aValue; - else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "margin-top" ) ) ) mrTypeModel.maMarginTop = aValue; - else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "mso-position-vertical-relative" ) ) ) mrTypeModel.maPositionVerticalRelative = aValue; + if( aName == "position" ) mrTypeModel.maPosition = aValue; + else if( aName == "left" ) mrTypeModel.maLeft = aValue; + else if( aName == "top" ) mrTypeModel.maTop = aValue; + else if( aName == "width" ) mrTypeModel.maWidth = aValue; + else if( aName == "height" ) mrTypeModel.maHeight = aValue; + else if( aName == "margin-left" ) mrTypeModel.maMarginLeft = aValue; + else if( aName == "margin-top" ) mrTypeModel.maMarginTop = aValue; + else if( aName == "mso-position-vertical-relative" ) mrTypeModel.maPositionVerticalRelative = aValue; else if( aName == "mso-position-horizontal" ) mrTypeModel.maPositionHorizontal = aValue; - else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "mso-fit-shape-to-text" ) ) ) mrTypeModel.mbAutoHeight = sal_True; - else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "rotation" ) ) ) mrTypeModel.maRotation = aValue; - else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "flip" ) ) ) mrTypeModel.maFlip = aValue; + else if( aName == "mso-fit-shape-to-text" ) mrTypeModel.mbAutoHeight = sal_True; + else if( aName == "rotation" ) mrTypeModel.maRotation = aValue; + else if( aName == "flip" ) mrTypeModel.maFlip = aValue; } } } @@ -389,7 +389,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 nElement, const Attri case VML_TOKEN( textbox ): // Custom shape in Writer with a textbox are transformed into a frame dynamic_cast<SimpleShape&>( mrShape ).setService( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame"))); + "com.sun.star.text.TextFrame"); return new TextBoxContext( *this, mrShapeModel.createTextBox(), rAttribs ); case VMLX_TOKEN( ClientData ): return new ClientDataContext( *this, mrShapeModel.createClientData(), rAttribs ); @@ -397,7 +397,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 nElement, const Attri // Force RectangleShape, this is ugly :( // and is there because of the lines above which change it to TextFrame dynamic_cast< SimpleShape& >( mrShape ).setService( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.RectangleShape"))); + "com.sun.star.drawing.RectangleShape"); mrShapeModel.maLegacyDiagramPath = getFragmentPathFromRelId(rAttribs.getString(XML_id, OUString())); break; } |