diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-10 23:41:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-13 11:42:40 +0100 |
| commit | 068501f46fcc0029355fb854eb9416731df30bf8 (patch) | |
| tree | 43aaef08670d60c906c670e8e70b9df120efe9ea /oox/source | |
| parent | 655d930476045a2de7f3ead4768bb75df8cf7c82 (diff) | |
createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/core/fragmenthandler2.cxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx index a04d990d6ec9..bc8974b73f1d 100644 --- a/oox/source/core/fragmenthandler2.cxx +++ b/oox/source/core/fragmenthandler2.cxx @@ -76,7 +76,7 @@ bool FragmentHandler2::prepareMceContext( sal_Int32 nElement, const AttributeLis case MCE_TOKEN( Choice ): { - OUString aRequires = rAttribs.getString( ( XML_Requires ), OUString::createFromAscii("none") ); + OUString aRequires = rAttribs.getString( ( XML_Requires ), OUString(RTL_CONSTASCII_USTRINGPARAM("none")) ); aRequires = getFilter().getNamespaceURL( aRequires ); if( getFilter().getNamespaceId( aRequires ) > 0 && !aMceState.empty() && aMceState.back() == MCE_STARTED ) aMceState.back() = MCE_FOUND_CHOICE; diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 63c34fcd6ba2..2524e190a793 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -448,9 +448,9 @@ Reference< XShape > Shape::createAndInsert( // applying properties aShapeProps.assignUsed( getShapeProperties() ); aShapeProps.assignUsed( maDefaultShapeProperties ); - if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) ) + if ( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GraphicObjectShape")) ) mpGraphicPropertiesPtr->pushToPropMap( aShapeProps, rGraphicHelper ); - if ( mpTablePropertiesPtr.get() && ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.TableShape" ) ) ) + if ( mpTablePropertiesPtr.get() && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TableShape")) ) mpTablePropertiesPtr->pushToPropSet( rFilterBase, xSet, mpMasterTextListStyle ); aFillProperties.pushToPropMap( aShapeProps, rGraphicHelper, mnRotation, nFillPhClr ); aLineProperties.pushToPropMap( aShapeProps, rGraphicHelper, nLinePhClr ); |