diff options
Diffstat (limited to 'oox/source/export/shapes.cxx')
-rw-r--r-- | oox/source/export/shapes.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 87b8e5521899..862f839c120e 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -106,10 +106,6 @@ using ::com::sun::star::frame::XModel; using ::com::sun::star::sheet::XSpreadsheetDocument; using ::comphelper::MediaDescriptor; using ::oox::core::XmlFilterBase; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::sax_fastparser::FSHelperPtr; #define IDS(x) OString(OStringLiteral(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr() @@ -557,10 +553,10 @@ static const char* lcl_GetPresetGeometry( const char* sShapeType ) namespace oox { namespace drawingml { #define GETA(propName) \ - GetProperty( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( #propName ) ) ) + GetProperty( rXPropSet, OUString(#propName)) #define GETAD(propName) \ - ( GetPropertyAndState( rXPropSet, rXPropState, String( RTL_CONSTASCII_USTRINGPARAM( #propName ) ), eState ) && eState == beans::PropertyState_DIRECT_VALUE ) + ( GetPropertyAndState( rXPropSet, rXPropState, OUString(#propName), eState ) && eState == beans::PropertyState_DIRECT_VALUE ) #define GET(variable, propName) \ if ( GETA(propName) ) \ |