summaryrefslogtreecommitdiff
path: root/svx/source/unodraw
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-04-06 14:28:18 +0200
committerJan Holesovsky <kendy@suse.cz>2012-04-06 14:30:05 +0200
commit8a01ee624318ac08800af89d988971114637a04e (patch)
treee4acf35e42ab0c1d0b593bd8970fa2c435f90c95 /svx/source/unodraw
parent6cf547f02c79278430ee75483a3128076cfc609e (diff)
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 'svx/source/unodraw')
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx40
-rw-r--r--svx/source/unodraw/unopage.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx18
3 files changed, 30 insertions, 30 deletions
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 68d1f556c4b5..6ee3ed08d1f0 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -443,34 +443,34 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
const PropertyValue* pValues = aDescriptor.getConstArray();
while( nArgs-- )
{
- if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
+ if ( pValues->Name == "FilterName" )
{
pValues->Value >>= rSettings.maFilterName;
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
+ else if ( pValues->Name == "MediaType" )
{
pValues->Value >>= rSettings.maMediaType;
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ else if ( pValues->Name == "URL" )
{
if( !( pValues->Value >>= rSettings.maURL ) )
{
pValues->Value >>= rSettings.maURL.Complete;
}
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) )
+ else if ( pValues->Name == "OutputStream" )
{
pValues->Value >>= rSettings.mxOutputStream;
}
- else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GraphicRenderer" ) ) )
+ else if ( pValues->Name == "GraphicRenderer" )
{
pValues->Value >>= rSettings.mxGraphicRenderer;
}
- else if ( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) )
+ else if ( pValues->Name == "StatusIndicator" )
{
pValues->Value >>= rSettings.mxStatusIndicator;
}
- else if ( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ) ) )
+ else if ( pValues->Name == "InteractionHandler" )
{
pValues->Value >>= rSettings.mxInteractionHandler;
}
@@ -486,7 +486,7 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
{
pValues->Value >>= rSettings.mbExportOnlyBackground;
}
- else if ( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) )
+ else if ( pValues->Name == "FilterData" )
{
pValues->Value >>= rSettings.maFilterData;
@@ -494,7 +494,7 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
PropertyValue* pDataValues = rSettings.maFilterData.getArray();
while( nFilterArgs-- )
{
- if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Translucent" ) ) )
+ if ( pDataValues->Name == "Translucent" )
{
if ( !( pDataValues->Value >>= rSettings.mbTranslucent ) ) // SJ: TODO: The GIF Transparency is stored as int32 in
{ // configuration files, this has to be changed to boolean
@@ -503,11 +503,11 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
rSettings.mbTranslucent = nTranslucent != 0;
}
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PixelWidth" ) ) )
+ else if ( pDataValues->Name == "PixelWidth" )
{
pDataValues->Value >>= rSettings.mnWidth;
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PixelHeight" ) ) )
+ else if ( pDataValues->Name == "PixelHeight" )
{
pDataValues->Value >>= rSettings.mnHeight;
}
@@ -521,24 +521,24 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
pDataValues->Value >>= rSettings.mnHeight;
pDataValues->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PixelHeight" ) );
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportOnlyBackground" ) ) )
+ else if ( pDataValues->Name == "ExportOnlyBackground" )
{
pDataValues->Value >>= rSettings.mbExportOnlyBackground;
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HighContrast" ) ) )
+ else if ( pDataValues->Name == "HighContrast" )
{
pDataValues->Value >>= rSettings.mbUseHighContrast;
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageNumber" ) ) )
+ else if ( pDataValues->Name == "PageNumber" )
{
pDataValues->Value >>= mnPageNumber;
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScrollText" ) ) )
+ else if ( pDataValues->Name == "ScrollText" )
{
// #110496# Read flag solitary scroll text metafile
pDataValues->Value >>= rSettings.mbScrollText;
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CurrentPage" ) ) )
+ else if ( pDataValues->Name == "CurrentPage" )
{
Reference< XDrawPage > xPage;
pDataValues->Value >>= xPage;
@@ -549,25 +549,25 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
mpCurrentPage = pUnoPage->GetSdrPage();
}
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleXNumerator" ) ) )
+ else if ( pDataValues->Name == "ScaleXNumerator" )
{
sal_Int32 nVal = 1;
if( pDataValues->Value >>= nVal )
rSettings.maScaleX = Fraction( nVal, rSettings.maScaleX.GetDenominator() );
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleXDenominator" ) ) )
+ else if ( pDataValues->Name == "ScaleXDenominator" )
{
sal_Int32 nVal = 1;
if( pDataValues->Value >>= nVal )
rSettings.maScaleX = Fraction( rSettings.maScaleX.GetNumerator(), nVal );
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleYNumerator" ) ) )
+ else if ( pDataValues->Name == "ScaleYNumerator" )
{
sal_Int32 nVal = 1;
if( pDataValues->Value >>= nVal )
rSettings.maScaleY = Fraction( nVal, rSettings.maScaleY.GetDenominator() );
}
- else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleYDenominator" ) ) )
+ else if ( pDataValues->Name == "ScaleYDenominator" )
{
sal_Int32 nVal = 1;
if( pDataValues->Value >>= nVal )
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 229dd64bf004..eaafdff4e0cb 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -582,7 +582,7 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor,
rInventor = SdrInventor;
rType = OBJ_TABLE;
}
- else if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.MediaShape" )) )
+ else if ( aName == "com.sun.star.presentation.MediaShape" )
{
rInventor = SdrInventor;
rType = OBJ_MEDIA;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 53341d9ae6e4..f3c5548fce23 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -835,18 +835,18 @@ void SAL_CALL SvxShapeControl::setPropertyValue( const OUString& aPropertyName,
if( xInfo.is() && xInfo->hasPropertyByName( aFormsName ) )
{
uno::Any aConvertedValue( aValue );
- if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FontSlant" ) ) )
+ if ( aFormsName == "FontSlant" )
{
awt::FontSlant nSlant;
if( !(aValue >>= nSlant ) )
throw lang::IllegalArgumentException();
aConvertedValue <<= (sal_Int16)nSlant;
}
- else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Align" ) ) )
+ else if ( aFormsName == "Align" )
{
lcl_convertParaAdjustmentToTextAlignment( aConvertedValue );
}
- else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VerticalAlign" ) ) )
+ else if ( aFormsName == "VerticalAlign" )
{
convertVerticalAdjustToVerticalAlign( aConvertedValue );
}
@@ -876,7 +876,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyNa
if( xInfo.is() && xInfo->hasPropertyByName( aFormsName ) )
{
aValue = xControl->getPropertyValue( aFormsName );
- if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FontSlant" ) ) )
+ if ( aFormsName == "FontSlant" )
{
awt::FontSlant eSlant = awt::FontSlant_NONE;
sal_Int16 nSlant = sal_Int16();
@@ -890,11 +890,11 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyNa
}
aValue <<= eSlant;
}
- else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Align" ) ) )
+ else if ( aFormsName == "Align" )
{
lcl_convertTextAlignmentToParaAdjustment( aValue );
}
- else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VerticalAlign" ) ) )
+ else if ( aFormsName == "VerticalAlign" )
{
convertVerticalAlignToVerticalAdjust( aValue );
}
@@ -970,17 +970,17 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const ::rtl::OUString& aP
if( xControl.is() )
{
Any aDefault( xControl->getPropertyDefault( aFormsName ) );
- if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FontSlant" ) ) )
+ if ( aFormsName == "FontSlant" )
{
sal_Int16 nSlant( 0 );
aDefault >>= nSlant;
aDefault <<= (awt::FontSlant)nSlant;
}
- else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Align" ) ) )
+ else if ( aFormsName == "Align" )
{
lcl_convertTextAlignmentToParaAdjustment( aDefault );
}
- else if ( aFormsName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VerticalAlign" ) ) )
+ else if ( aFormsName == "VerticalAlign" )
{
convertVerticalAlignToVerticalAdjust( aDefault );
}