diff options
author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-04-06 15:05:52 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 15:07:41 +0200 |
commit | 743f22045c4ec08c46c259fc0ba240194a391457 (patch) | |
tree | faed42bb31c4ee767619eb5c3ebd4dec0a41fa03 /oox | |
parent | Merge remote-tracking branch 'origin/master' (diff) | |
download | core-743f22045c4ec08c46c259fc0ba240194a391457.tar.gz core-743f22045c4ec08c46c259fc0ba240194a391457.zip |
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used:
find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\)) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/shape.cxx | 4 | ||||
-rw-r--r-- | oox/source/export/chartexport.cxx | 12 | ||||
-rw-r--r-- | oox/source/ole/axfontdata.cxx | 2 | ||||
-rw-r--r-- | oox/source/ole/olehelper.cxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/timenodelistcontext.cxx | 6 | ||||
-rw-r--r-- | oox/source/vml/vmlshape.cxx | 4 |
6 files changed, 16 insertions, 16 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 01ee8191ac41..967f57c661cb 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -394,7 +394,7 @@ Reference< XShape > Shape::createAndInsert( aTransformation.scale(1/360.0, 1/360.0); // special for lineshape - if ( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.LineShape")) ) + if ( aServiceName == "com.sun.star.drawing.LineShape" ) { ::basegfx::B2DPolygon aPoly; aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) ); @@ -415,7 +415,7 @@ Reference< XShape > Shape::createAndInsert( maShapeProperties[ PROP_PolyPolygon ] <<= aPolyPolySequence; } - else if ( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ConnectorShape")) ) + else if ( aServiceName == "com.sun.star.drawing.ConnectorShape" ) { ::basegfx::B2DPolygon aPoly; aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) ); diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index e8c56b3d30f0..4283a48986a8 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -662,24 +662,24 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha bool bBrokenRangeAvailable = false; for( sal_Int32 i=0; i<aArgs.getLength(); ++i ) { - if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation"))) + if ( aArgs[i].Name == "CellRangeRepresentation" ) aArgs[i].Value >>= sCellRange; - else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("BrokenCellRangeForExport"))) + else if ( aArgs[i].Name == "BrokenCellRangeForExport" ) { if( aArgs[i].Value >>= sBrokenRange ) bBrokenRangeAvailable = true; } - else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DataRowSource"))) + else if ( aArgs[i].Name == "DataRowSource" ) { ::com::sun::star::chart::ChartDataRowSource eRowSource; aArgs[i].Value >>= eRowSource; mbRowSourceColumns = ( eRowSource == ::com::sun::star::chart::ChartDataRowSource_COLUMNS ); } - else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel"))) + else if ( aArgs[i].Name == "FirstCellAsLabel" ) aArgs[i].Value >>= mbHasSeriesLabels; - else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SequenceMapping"))) + else if ( aArgs[i].Name == "SequenceMapping" ) aArgs[i].Value >>= maSequenceMapping; - else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("TableNumberList"))) + else if ( aArgs[i].Name == "TableNumberList" ) aArgs[i].Value >>= msTableNumberList; } diff --git a/oox/source/ole/axfontdata.cxx b/oox/source/ole/axfontdata.cxx index b4846ca00373..dc6a070e4be2 100644 --- a/oox/source/ole/axfontdata.cxx +++ b/oox/source/ole/axfontdata.cxx @@ -117,7 +117,7 @@ bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm ) OUString aGuid = OleHelper::importGuid( rInStrm ); if( aGuid.equalsAscii( AX_GUID_CFONT ) ) return importBinaryModel( rInStrm ); - if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDFONT) ) ) + if ( aGuid == OLE_GUID_STDFONT ) return importStdFont( rInStrm ); return false; } diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 91953f35aa4b..191c74b024aa 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -404,7 +404,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight, else // hyperlink moniker { OUString aGuid = importGuid( rInStrm ); - if( aGuid.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_FILEMONIKER)) ) + if ( aGuid == OLE_GUID_FILEMONIKER ) { // file name, maybe relative and with directory up-count sal_Int16 nUpLevels; @@ -425,7 +425,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight, for( sal_Int16 nLevel = 0; nLevel < nUpLevels; ++nLevel ) orHlinkInfo.maTarget = CREATE_OUSTRING( "../" ) + orHlinkInfo.maTarget; } - else if( aGuid.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_URLMONIKER)) ) + else if ( aGuid == OLE_GUID_URLMONIKER ) { // URL, maybe relative and with leading '../' sal_Int32 nBytes = rInStrm.readInt32(); diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 1112e68d28d8..486cfef0af8f 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -277,7 +277,7 @@ namespace oox { namespace ppt { { nCommand = EffectCommands::STOPAUDIO; } - else if( msCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("play") ) ) + else if ( msCommand == "play" ) { nCommand = EffectCommands::PLAY; } @@ -293,11 +293,11 @@ namespace oox { namespace ppt { } nCommand = EffectCommands::PLAY; } - else if( msCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("togglePause") ) ) + else if ( msCommand == "togglePause" ) { nCommand = EffectCommands::TOGGLEPAUSE; } - else if( msCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("stop") ) ) + else if ( msCommand == "stop" ) { nCommand = EffectCommands::STOP; } diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 9258c5a3a7a7..2b61e91aa783 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -585,12 +585,12 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes aPropSet.setProperty( PROP_GraphicURL, aGraphicUrl ); } // If the shape has an absolute position, set the properties accordingly. - if (maTypeModel.maPosition.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("absolute"))) + if ( maTypeModel.maPosition == "absolute" ) { aPropSet.setProperty(PROP_HoriOrientPosition, rShapeRect.X); aPropSet.setProperty(PROP_VertOrientPosition, rShapeRect.Y); } - if (maTypeModel.maPositionVerticalRelative.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("page"))) + if ( maTypeModel.maPositionVerticalRelative == "page" ) { aPropSet.setProperty(PROP_VertOrientRelation, text::RelOrientation::PAGE_FRAME); } |