summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-15 11:05:19 +0200
committerNoel Grandin <noel@peralex.com>2013-11-19 10:29:31 +0200
commit610b2b94b33b0fc2d79cd515f9e293ca1c2610e8 (patch)
tree6eab2639cb8104ca54daa3f7a2ebd83ef1566cf0 /oox
parent2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (diff)
remove unnecessary use of OUString constructor when assigning
change code like aStr = OUString("xxxx"); to aStr = "xxxx"; Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/hyperlinkcontext.cxx4
-rw-r--r--oox/source/drawingml/shape.cxx22
2 files changed, 13 insertions, 13 deletions
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx
index 036849b4878d..9f7f0630ecfe 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -126,9 +126,9 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper& rParent,
const OUString sNotesSlide( "notesSlide" );
const OUString aSlideType( sHref.copy( 0, nIndex2 ) );
if ( aSlideType.match( sSlide ) )
- sURL = OUString( "#Slide " ).concat( OUString::number( nPageNumber ) );
+ sURL = "#Slide " + OUString::number( nPageNumber );
else if ( aSlideType.match( sNotesSlide ) )
- sURL = OUString( "#Notes " ).concat( OUString::number( nPageNumber ) );
+ sURL = "#Notes " + OUString::number( nPageNumber );
// else: todo for other types such as notesMaster or slideMaster as they can't be referenced easily
}
}
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 0638cac4fe3c..54db7bb73fb8 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -665,7 +665,7 @@ void Shape::keepDiagramCompatibilityInfo( XmlFilterBase& rFilterBase )
if ( !xSetInfo.is() )
return;
- const OUString& aGrabBagPropName = OUString( UNO_NAME_MISC_OBJ_INTEROPGRABBAG );
+ const OUString aGrabBagPropName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
if( !xSetInfo->hasPropertyByName( aGrabBagPropName ) )
return;
@@ -727,27 +727,27 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase )
static_cast < sal_Int32 > ( ( fPixelsPer100thmm * aActualSize.Height ) + 0.5 ) );
Sequence< PropertyValue > aFilterData( 7 );
- aFilterData[ 0 ].Name = OUString( "Compression" );
+ aFilterData[ 0 ].Name = "Compression";
aFilterData[ 0 ].Value <<= static_cast < sal_Int32 > ( 9 );
- aFilterData[ 1 ].Name = OUString( "Interlaced" );
+ aFilterData[ 1 ].Name = "Interlaced";
aFilterData[ 1 ].Value <<= static_cast < sal_Int32 > ( 1 );
- aFilterData[ 2 ].Name = OUString( "Translucent" );
+ aFilterData[ 2 ].Name = "Translucent";
aFilterData[ 2 ].Value <<= static_cast < sal_Int32 > ( 1 );
- aFilterData[ 3 ].Name = OUString( "PixelWidth" );
+ aFilterData[ 3 ].Name = "PixelWidth";
aFilterData[ 3 ].Value <<= aSize.Width;
- aFilterData[ 4 ].Name = OUString( "PixelHeight" );
+ aFilterData[ 4 ].Name = "PixelHeight";
aFilterData[ 4 ].Value <<= aSize.Height;
- aFilterData[ 5 ].Name = OUString( "LogicalWidth" );
+ aFilterData[ 5 ].Name = "LogicalWidth";
aFilterData[ 5 ].Value <<= aActualSize.Width;
- aFilterData[ 6 ].Name = OUString( "LogicalHeight" );
+ aFilterData[ 6 ].Name = "LogicalHeight";
aFilterData[ 6 ].Value <<= aActualSize.Height;
Sequence < PropertyValue > aDescriptor( 3 );
- aDescriptor[ 0 ].Name = OUString( "OutputStream" );
+ aDescriptor[ 0 ].Name = "OutputStream";
aDescriptor[ 0 ].Value <<= xOutputStream;
- aDescriptor[ 1 ].Name = OUString( "FilterName" );
+ aDescriptor[ 1 ].Name = "FilterName";
aDescriptor[ 1 ].Value <<= sFormat;
- aDescriptor[ 2 ].Name = OUString( "FilterData" );
+ aDescriptor[ 2 ].Name = "FilterData";
aDescriptor[ 2 ].Value <<= aFilterData;
Reference < lang::XComponent > xSourceDoc( mxShape, UNO_QUERY_THROW );