summaryrefslogtreecommitdiff
path: root/svx
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
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')
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx4
-rw-r--r--svx/source/form/fmcontrollayout.cxx4
-rw-r--r--svx/source/form/formcontrolfactory.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx4
-rw-r--r--svx/source/gengal/gengal.cxx8
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx6
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx4
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx40
-rw-r--r--svx/source/unodraw/unopage.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx18
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx2
-rw-r--r--svx/source/xml/xmlxtimp.cxx12
-rw-r--r--svx/source/xoutdev/xattr.cxx8
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx6
-rw-r--r--svx/workben/msview/xmlconfig.cxx16
16 files changed, 69 insertions, 69 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 32f323b91d59..3be2cd4a87f7 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -112,9 +112,9 @@ void SAL_CALL EnhancedCustomShapeEngine::initialize( const SEQ( NMSP_UNO::Any )&
for ( i = 0; i < aParameter.getLength(); i++ )
{
const NMSP_BEANS::PropertyValue& rProp = aParameter[ i ];
- if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CustomShape" ) ) )
+ if ( rProp.Name == "CustomShape" )
rProp.Value >>= mxShape;
- else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ForceGroupWithText" ) ) )
+ else if ( rProp.Name == "ForceGroupWithText" )
rProp.Value >>= mbForceGroupWithText;
}
}
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 1a94658027b3..f8792313be04 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -249,9 +249,9 @@ namespace svxform
OSL_VERIFY( aVisualEffect >>= sVisualEffect );
sal_Int16 nVisualEffect = VisualEffect::NONE;
- if ( sVisualEffect.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "flat" ) ) )
+ if ( sVisualEffect == "flat" )
nVisualEffect = VisualEffect::FLAT;
- else if ( sVisualEffect.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "3D" ) ) )
+ else if ( sVisualEffect == "3D" )
nVisualEffect = VisualEffect::LOOK3D;
if ( xPSI->hasPropertyByName( FM_PROP_BORDER ) )
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 62d09e7777b9..ec74af27c7a2 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -544,7 +544,7 @@ namespace svxform
const PropertyValue* pInfoEnd = pInfo + aInfo.getLength();
for ( ; pInfo != pInfoEnd; ++pInfo )
{
- if ( pInfo->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreferDosLikeLineEnds" ) ) )
+ if ( pInfo->Name == "PreferDosLikeLineEnds" )
{
pInfo->Value >>= bDosLineEnds;
break;
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 956663c906fc..5c1522eadba4 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3524,7 +3524,7 @@ void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExcept
m_aMode = Mode;
- if ( Mode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterMode" ) ) )
+ if ( Mode == "FilterMode" )
startFiltering();
else
stopFiltering();
@@ -4184,7 +4184,7 @@ void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< Proper
return;
}
- if ( _rURL.Complete.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:/InteractionHandler" ) ) )
+ if ( _rURL.Complete == "private:/InteractionHandler" )
{
Reference< XInteractionRequest > xRequest;
OSL_VERIFY( _rArgs[0].Value >>= xRequest );
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index bad7a7aca44e..0104b70d753d 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -286,16 +286,16 @@ int GalApp::Main()
aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) )
bHelp = true;
- else if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--name" ) ) )
+ else if ( aParam == "--name" )
aName = GetCommandLineParam( ++i );
- else if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--path" ) ) )
+ else if ( aParam == "--path" )
aPath = Smartify( GetCommandLineParam( ++i ) );
- else if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--destdir" ) ) )
+ else if ( aParam == "--destdir" )
aDestDir = GetCommandLineParam( ++i );
- else if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--number-from" ) ) )
+ else if ( aParam == "--number-from" )
nNumFrom = GetCommandLineParam( ++i ).ToInt32();
else
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 9dd53da31af4..1bfd3d577c91 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -146,7 +146,7 @@ ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString&
aSize.Width() += 20, aSize.Height() += 6;
SetSizePixel( aSize );
- if ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafGamma" ) ))
+ if ( maCommand == ".uno:GrafGamma" )
{
SetDecimalDigits( 2 );
@@ -230,9 +230,9 @@ void ImplGrafMetricField::Update( const SfxPoolItem* pItem )
{
long nValue;
- if ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafTransparence" ) ))
+ if ( maCommand == ".uno:GrafTransparence" )
nValue = ( (SfxUInt16Item*) pItem )->GetValue();
- else if ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafGamma" ) ))
+ else if ( maCommand == ".uno:GrafGamma" )
nValue = ( (SfxUInt32Item*) pItem )->GetValue();
else
nValue = ( (SfxInt16Item*) pItem )->GetValue();
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index b1d3b07ea216..0a3706dc85fc 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -302,7 +302,7 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow()
{
DBG_ASSERT(( SID_UNDO == GetSlotId() || SID_REDO == GetSlotId() ), "mismatching ids" );
- if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:Undo" ) ))
+ if ( m_aCommandURL == ".uno:Undo" )
updateStatus( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GetUndoStrings" )));
else
updateStatus( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GetRedoStrings" )));
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 2546935a6303..ce259c38ca86 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -335,7 +335,7 @@ throw ( uno::RuntimeException )
if ( m_pBox )
{
SolarMutexGuard aSolarMutexGuard;
- if ( rEvent.FeatureURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FontHeight" ) ))
+ if ( rEvent.FeatureURL.Path == "FontHeight" )
{
if ( rEvent.IsEnabled )
{
@@ -349,7 +349,7 @@ throw ( uno::RuntimeException )
else
m_pBox->Disable();
}
- else if ( rEvent.FeatureURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharFontName" ) ))
+ else if ( rEvent.FeatureURL.Path == "CharFontName" )
{
if ( rEvent.State >>= m_aCurrentFont )
m_pBox->UpdateFont( m_aCurrentFont );
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 );
}
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index ee30a32e23d6..67e6399264cd 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -182,7 +182,7 @@ void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >&
{
const beans::PropertyValue& rProp = aParams[ i ];
- if( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ProvideHiddenThemes" ) ) )
+ if ( rProp.Name == "ProvideHiddenThemes" )
rProp.Value >>= mbHiddenThemes;
}
}
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 98b5d6002215..8efc492a8b38 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -484,32 +484,32 @@ SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix, const
sal_Bool bOOoFormat = (XML_NAMESPACE_OFFICE == nPrefix);
Type aType = mrTable->getElementType();
- if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "color-table" ) ) )
+ if ( rLocalName == "color-table" )
{
if( aType == ::getCppuType((const sal_Int32*)0) )
return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_color, mrTable, bOOoFormat );
}
- else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "marker-table" ) ) )
+ else if ( rLocalName == "marker-table" )
{
if( aType == ::getCppuType((const drawing::PolyPolygonBezierCoords*)0) )
return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_marker, mrTable, bOOoFormat );
}
- else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "dash-table" ) ) )
+ else if ( rLocalName == "dash-table" )
{
if( aType == ::getCppuType((const drawing::LineDash*)0) )
return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_dash, mrTable, bOOoFormat );
}
- else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "hatch-table" ) ) )
+ else if ( rLocalName == "hatch-table" )
{
if( aType == ::getCppuType((const drawing::Hatch*)0) )
return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_hatch, mrTable, bOOoFormat );
}
- else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "gradient-table" ) ) )
+ else if ( rLocalName == "gradient-table" )
{
if( aType == ::getCppuType((const awt::Gradient*)0))
return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_gradient, mrTable, bOOoFormat );
}
- else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bitmap-table" ) ) )
+ else if ( rLocalName == "bitmap-table" )
{
if( aType == ::getCppuType((const OUString*)0))
return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_bitmap, mrTable, bOOoFormat );
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index cf8070e09fc0..18745ef829f3 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -3461,9 +3461,9 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
{
for ( sal_Int32 n = 0; n < aPropSeq.getLength(); n++ )
{
- if ( aPropSeq[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" )))
+ if ( aPropSeq[n].Name == "Name" )
aPropSeq[n].Value >>= aName;
- else if ( aPropSeq[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FillGradient" )))
+ else if ( aPropSeq[n].Name == "FillGradient" )
{
if ( aPropSeq[n].Value >>= aGradient2 )
bGradient = true;
@@ -4057,9 +4057,9 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
{
for ( sal_Int32 n = 0; n < aPropSeq.getLength(); n++ )
{
- if ( aPropSeq[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" )))
+ if ( aPropSeq[n].Name == "Name" )
aPropSeq[n].Value >>= aName;
- else if ( aPropSeq[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FillHatch" )))
+ else if ( aPropSeq[n].Name == "FillHatch" )
{
if ( aPropSeq[n].Value >>= aUnoHatch )
bHatch = true;
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 85187e8a0fbe..388d4a25c5df 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -712,11 +712,11 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt
{
for ( sal_Int32 n = 0; n < aPropSeq.getLength(); n++ )
{
- if( aPropSeq[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" )))
+ if ( aPropSeq[n].Name == "Name" )
bSetName = (aPropSeq[n].Value >>= aName);
- else if( aPropSeq[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FillBitmapURL" )))
+ else if ( aPropSeq[n].Name == "FillBitmapURL" )
bSetURL = (aPropSeq[n].Value >>= aURL);
- else if( aPropSeq[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Bitmap" )))
+ else if ( aPropSeq[n].Name == "Bitmap" )
bSetBitmap = (aPropSeq[n].Value >>= xBmp);
}
}
diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx
index b7611d11eefb..12e64160fad5 100644
--- a/svx/workben/msview/xmlconfig.cxx
+++ b/svx/workben/msview/xmlconfig.cxx
@@ -169,32 +169,32 @@ void SAL_CALL ConfigHandler::startElement(const OUString& aName, const Reference
{
ElementConfigPtr pElement;
- if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config" ) ) )
+ if ( aName == "config" )
{
return;
}
- if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "container" ) ) )
+ if ( aName == "container" )
{
pElement = importAtomConfig( xAttribs, true );
}
- else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "atom" ) ) )
+ else if ( aName == "atom" )
{
pElement = importAtomConfig( xAttribs, false );
}
- else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "element" ) ) )
+ else if ( aName == "element" )
{
pElement = importElementConfig( xAttribs );
}
- else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "value" ) ) )
+ else if ( aName == "value" )
{
pElement = importValueElementConfig( xAttribs );
}
- else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "switch" ) ) )
+ else if ( aName == "switch" )
{
pElement = importSwitchConfig( xAttribs );
}
- else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "case" ) ) )
+ else if ( aName == "case" )
{
pElement = importCaseConfig( xAttribs );
}
@@ -285,7 +285,7 @@ ElementConfigPtr ConfigHandler::importCaseConfig( const Reference< XAttributeLis
void SAL_CALL ConfigHandler::endElement(const OUString& aName) throw( SAXException, RuntimeException )
{
- if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config" ) ) )
+ if ( aName == "config" )
{
return;
}