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 /svx | |
parent | 0c6ebe5d225d6a655f078977455cec6d0a3afa6e (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/dialog/rubydialog.cxx | 14 | ||||
-rw-r--r-- | svx/source/dialog/svxbmpnumvalueset.cxx | 12 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmdmod.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/tabledesign.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 14 | ||||
-rw-r--r-- | svx/source/unodraw/UnoNameItemTable.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unomod.cxx | 6 | ||||
-rw-r--r-- | svx/source/unodraw/unomtabl.cxx | 2 | ||||
-rw-r--r-- | svx/workben/msview/xmlconfig.cxx | 10 |
10 files changed, 33 insertions, 33 deletions
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index abdce55c131e..75e9138f6867 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -399,9 +399,9 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight) const PropertyValue* pProps = aProps.getConstArray(); for(sal_Int32 nProp = 0; nProp < aProps.getLength(); nProp++) { - if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyBaseText))) + if ( pProps[nProp].Name == cRubyBaseText ) pProps[nProp].Value >>= sLeft; - else if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyText))) + else if ( pProps[nProp].Name == cRubyText ) pProps[nProp].Value >>= sRight; } } @@ -431,9 +431,9 @@ void SvxRubyDialog::GetText() PropertyValue* pProps = rProps.getArray(); for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++) { - if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyBaseText))) + if ( pProps[nProp].Name == cRubyBaseText ) pProps[nProp].Value <<= OUString(aEditArr[i]->GetText()); - else if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyText))) + else if ( pProps[nProp].Name == cRubyText ) pProps[nProp].Value <<= OUString(aEditArr[i + 1]->GetText()); } } @@ -610,7 +610,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox) PropertyValue* pProps = rProps.getArray(); for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++) { - if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyAdjust))) + if ( pProps[nProp].Name == cRubyAdjust ) pProps[nProp].Value <<= nAdjust; } SetModified(sal_True); @@ -631,7 +631,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox) PropertyValue* pProps = rProps.getArray(); for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++) { - if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyIsAbove))) + if ( pProps[nProp].Name == cRubyIsAbove ) pProps[nProp].Value.setValue(&bAbove, rType); } SetModified(sal_True); @@ -653,7 +653,7 @@ IMPL_LINK_NOARG(SvxRubyDialog, CharStyleHdl_Impl) PropertyValue* pProps = rProps.getArray(); for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++) { - if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyCharStyleName))) + if ( pProps[nProp].Name == cRubyCharStyleName ) { pProps[nProp].Value <<= sStyleName; } diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index f1b810c69692..e885e17f758e 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -310,17 +310,17 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) aNumberingTypes[i] = 0; for(sal_Int32 nProperty = 0; nProperty < aLevel.getLength() - 1; nProperty++) { - if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cNumberingType))) + if ( pValues[nProperty].Name == cNumberingType ) pValues[nProperty].Value >>= aNumberingTypes[i]; - else if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cBulletFontName))) + else if ( pValues[nProperty].Name == cBulletFontName ) pValues[nProperty].Value >>= sFontNames[i]; - else if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cBulletChar))) + else if ( pValues[nProperty].Name == cBulletChar ) pValues[nProperty].Value >>= sBulletChars[i]; - else if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cPrefix))) + else if ( pValues[nProperty].Name == cPrefix ) pValues[nProperty].Value >>= sPrefixes[i]; - else if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cSuffix))) + else if ( pValues[nProperty].Name == cSuffix ) pValues[nProperty].Value >>= sSuffixes[i]; - else if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cParentNumbering))) + else if ( pValues[nProperty].Name == cParentNumbering ) pValues[nProperty].Value >>= aParentNumberings[i]; } Sequence< PropertyValue > aProperties(2); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index df609e587c9a..d1c6efcc8d1c 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -2460,7 +2460,7 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException m_aMode = Mode; FmGridControl* pGrid = (FmGridControl*) GetWindow(); - if ( Mode.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterMode")) ) + if ( Mode == "FilterMode" ) pGrid->SetFilterMode(sal_True); else { diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index 86ee670152e1..13882b6268bb 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -44,7 +44,7 @@ using namespace ::svxform; { xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceSpecifier); } - else if ( ServiceSpecifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ControlShape")) ) + else if ( ServiceSpecifier == "com.sun.star.drawing.ControlShape" ) { SdrObject* pObj = new FmFormObj(); xRet = static_cast<cppu::OWeakObject*>(static_cast<SvxShape_UnoImplHelper*>(new SvxShapeControl(pObj))); diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 273286c18972..47cf331a294a 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -755,7 +755,7 @@ void TableDesignFamily::setPropertyValue( const OUString& , const Any& ) throw Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") )) + if ( PropertyName == "DisplayName" ) { OUString sDisplayName( SVX_RESSTR( RID_SVXSTR_STYLEFAMILY_TABLEDESIGN ) ); return Any( sDisplayName ); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index d96fa497e240..184c6db400f0 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -383,9 +383,9 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< : for ( sal_uInt16 i=0; i<nItemCount; ++i ) { ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); - if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_DOWNSEARCH))) + if ( sItemCommand == COMMAND_DOWNSEARCH ) m_nDownSearchId = i; - else if (sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_UPSEARCH))) + else if ( sItemCommand == COMMAND_UPSEARCH ) m_nUpSearchId = i; } } @@ -426,7 +426,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur return; ::rtl::OUString aFeatureURL = rEvent.FeatureURL.Complete; - if (aFeatureURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AppendSearchHistory"))) + if ( aFeatureURL == "AppendSearchHistory" ) { m_pFindTextFieldControl->Remember_Impl(m_pFindTextFieldControl->GetText()); } @@ -554,7 +554,7 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) for ( sal_uInt16 i=0; i<nItemCount; ++i ) { ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); - if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_FINDTEXT)) ) + if ( sItemCommand == COMMAND_FINDTEXT ) { Window* pItemWin = pToolBox->GetItemWindow(i); if (pItemWin) @@ -798,7 +798,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDi { css::uno::Reference< css::frame::XDispatch > xDispatch; - if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.findbar:")) ) + if ( aURL.Protocol == "vnd.sun.star.findbar:" ) xDispatch = this; return xDispatch; @@ -819,7 +819,7 @@ css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fin void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ ) throw( css::uno::RuntimeException ) { //vnd.sun.star.findbar:FocusToFindbar - set cursor to the FindTextFieldControl of the findbar - if ( aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FocusToFindbar")) ) + if ( aURL.Path == "FocusToFindbar" ) { css::uno::Reference< css::beans::XPropertySet > xPropSet(m_xFrame, css::uno::UNO_QUERY); if(!xPropSet.is()) @@ -852,7 +852,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css for ( sal_uInt16 i=0; i<nItemCount; ++i ) { ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); - if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FindText")) ) + if ( sItemCommand == ".uno:FindText" ) { Window* pItemWin = pToolBox->GetItemWindow( i ); if ( pItemWin ) diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index d23c1ca6da04..9707d5117481 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -134,7 +134,7 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName ) // a little quickfix for 2.0 to let applications clear api // created items that are not used - if( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("~clear~") ) ) + if ( aApiName == "~clear~" ) { dispose(); return; diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 517c7fb32a67..df4ec36a50c4 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -394,17 +394,17 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c return uno::Reference< uno::XInterface >( SvxCreateNumRule( mpDoc ), uno::UNO_QUERY ); } - if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.image.ImageMapRectangleObject") ) ) + if ( aServiceSpecifier == "com.sun.star.image.ImageMapRectangleObject" ) { return SvUnoImageMapRectangleObject_createInstance( ImplGetSupportedMacroItems() ); } - if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.image.ImageMapCircleObject") ) ) + if ( aServiceSpecifier == "com.sun.star.image.ImageMapCircleObject" ) { return SvUnoImageMapCircleObject_createInstance( ImplGetSupportedMacroItems() ); } - if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.image.ImageMapPolygonObject") ) ) + if ( aServiceSpecifier == "com.sun.star.image.ImageMapPolygonObject" ) { return SvUnoImageMapPolygonObject_createInstance( ImplGetSupportedMacroItems() ); } diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index bcbca448e56e..e90f635a1df8 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -203,7 +203,7 @@ void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName ) // a little quickfix for 2.0 to let applications clear api // created items that are not used - if( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("~clear~") ) ) + if ( aApiName == "~clear~" ) { dispose(); return; diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 12e64160fad5..703345582d4b 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -98,23 +98,23 @@ void ConfigHandler::errorThrow( const OUString& rErrorMessage ) throw (SAXExcept ElementConfigType ConfigHandler::parseType( const OUString& sType ) throw (SAXException ) { - if( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("uint") ) ) + if ( sType == "uint" ) { return ECT_UINT; } - else if( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("byte") ) ) + else if ( sType == "byte" ) { return ECT_BYTE; } - else if( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("unistring") ) ) + else if ( sType == "unistring" ) { return ECT_UNISTRING; } - else if( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("float") ) ) + else if ( sType == "float" ) { return ETC_FLOAT; } - else if( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hexdump") ) ) + else if ( sType == "hexdump" ) { } else |