diff options
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/dbgui/foptmgr.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/namedlg/namemgrtable.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/undo/undoutil.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 26 | ||||
-rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/nameuno.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/scdetect.cxx | 20 | ||||
-rw-r--r-- | sc/source/ui/unoobj/styleuno.cxx | 6 |
9 files changed, 33 insertions, 33 deletions
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 61bd2ce2c567..f82b2a06f5bf 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -189,7 +189,7 @@ void ScFilterOptionsMgr::Init() rBtnHeader.Check( pDBData->HasHeader() ); theDbName = pDBData->GetName(); - if ( theDbName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)) ) + if ( theDbName == STR_DB_LOCAL_NONAME ) rBtnHeader.Enable(); else rBtnHeader.Disable(); diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index c315147419da..f935ef977246 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -92,7 +92,7 @@ bool ScDBDocFunc::AddDBRange( const ::rtl::OUString& rName, const ScRange& rRang bool bOk; if ( bCompile ) pDoc->CompileDBFormula( sal_True ); // CreateFormulaString - if (rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME))) + if ( rName == STR_DB_LOCAL_NONAME ) { pDoc->SetAnonymousDBData(rRange.aStart.Tab() , pNew); bOk = true; diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 6b52369b748e..941002c42250 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -134,7 +134,7 @@ void ScRangeManagerTable::Init() { const ScRangeName* pLocalRangeName = itr->second; ScRangeNameLine aLine; - if (itr->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_GLOBAL_RANGE_NAME))) + if ( itr->first == STR_GLOBAL_RANGE_NAME ) aLine.aScope = maGlobalString; else aLine.aScope = itr->first; diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index 913333fc3a00..56b42b05ea80 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -97,7 +97,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB if ( pUndoData ) { const ::rtl::OUString& aName = pUndoData->GetName(); - if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME))) + if ( aName == STR_DB_LOCAL_NONAME ) bWasTemp = true; } OSL_ENSURE(bWasTemp, "Undo: didn't find database range"); diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 5ff808bff4f9..bbfdce78d04a 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1051,7 +1051,7 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint for(sal_Int32 i = 0; i < aArguments.getLength(); ++i) { rtl::OUString sName(aArguments[i].Name); - if (aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation"))) + if ( aArguments[i].Name == "CellRangeRepresentation" ) { aArguments[i].Value >>= aRangeRepresentation; } @@ -1460,7 +1460,7 @@ ScChart2DataProvider::createDataSource( for(sal_Int32 i = 0; i < aArguments.getLength(); ++i) { rtl::OUString sName(aArguments[i].Name); - if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource"))) + if ( aArguments[i].Name == "DataRowSource" ) { chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS; if( ! (aArguments[i].Value >>= eSource)) @@ -1471,19 +1471,19 @@ ScChart2DataProvider::createDataSource( } bOrientCol = (eSource == chart::ChartDataRowSource_COLUMNS); } - else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel"))) + else if ( aArguments[i].Name == "FirstCellAsLabel" ) { bLabel = ::cppu::any2bool(aArguments[i].Value); } - else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories"))) + else if ( aArguments[i].Name == "HasCategories" ) { bCategories = ::cppu::any2bool(aArguments[i].Value); } - else if (aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation"))) + else if ( aArguments[i].Name == "CellRangeRepresentation" ) { aArguments[i].Value >>= aRangeRepresentation; } - else if (aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SequenceMapping"))) + else if ( aArguments[i].Name == "SequenceMapping" ) { aArguments[i].Value >>= aSequenceMapping; } @@ -2319,7 +2319,7 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS))) + if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS ) { if ( !(rValue >>= m_bIncludeHiddenCells)) throw lang::IllegalArgumentException(); @@ -2335,7 +2335,7 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; - if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS))) + if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS ) aRet <<= m_bIncludeHiddenCells; else throw beans::UnknownPropertyException(); @@ -3497,12 +3497,12 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ROLE))) + if ( rPropertyName == SC_UNONAME_ROLE ) { if ( !(rValue >>= m_aRole)) throw lang::IllegalArgumentException(); } - else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS))) + else if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS ) { sal_Bool bOldValue = m_bIncludeHiddenCells; if ( !(rValue >>= m_bIncludeHiddenCells)) @@ -3522,11 +3522,11 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue( lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; - if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ROLE))) + if ( rPropertyName == SC_UNONAME_ROLE ) aRet <<= m_aRole; - else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS))) + else if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS ) aRet <<= m_bIncludeHiddenCells; - else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SC_UNONAME_HIDDENVALUES))) + else if ( rPropertyName == SC_UNONAME_HIDDENVALUES ) { // This property is read-only thus cannot be set externally via // setPropertyValue(...). diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 030395c587e4..0d03f9927ee7 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -377,7 +377,7 @@ void ScPrintUIOptions::SetDefaults() aPropertyValue.Value <<= nContent; aUIProp[nPropPos].Value <<= aPropertyValue; } - else if ( aPropertyValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsIncludeEmptyPages") ) ) + else if ( aPropertyValue.Name == "IsIncludeEmptyPages" ) { ScUnoHelpFunctions::SetBoolInAny( aPropertyValue.Value, ! bSuppress ); aUIProp[nPropPos].Value <<= aPropertyValue; diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 9119c1ee1af0..66aa69473cb7 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -693,7 +693,7 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNO_MODIFY_BROADCAST))) + if ( rPropertyName == SC_UNO_MODIFY_BROADCAST ) { aValue >>= mbModifyAndBroadcast; } @@ -704,7 +704,7 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyN uno::RuntimeException) { Any aRet; - if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNO_MODIFY_BROADCAST))) + if ( rPropertyName == SC_UNO_MODIFY_BROADCAST ) { aRet <<= mbModifyAndBroadcast; } diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index fdab3736a9ee..6ef14291107c 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -269,7 +269,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty ) { // extract properties - if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) ) + if ( lDescriptor[nProperty].Name == "URL" ) { lDescriptor[nProperty].Value >>= sTemp; aURL = sTemp; @@ -279,12 +279,12 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) lDescriptor[nProperty].Value >>= sTemp; aURL = sTemp; } - else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName")) ) + else if ( lDescriptor[nProperty].Name == "TypeName" ) { lDescriptor[nProperty].Value >>= sTemp; aTypeName = sTemp; } - else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterName")) ) + else if ( lDescriptor[nProperty].Name == "FilterName" ) { lDescriptor[nProperty].Value >>= sTemp; aPreselectedFilterName = sTemp; @@ -293,22 +293,22 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // remember index of property to get access to it later nIndexOfFilterName = nProperty; } - else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")) ) + else if ( lDescriptor[nProperty].Name == "InputStream" ) nIndexOfInputStream = nProperty; - else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ReadOnly")) ) + else if ( lDescriptor[nProperty].Name == "ReadOnly" ) nIndexOfReadOnlyFlag = nProperty; - else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UCBContent")) ) + else if ( lDescriptor[nProperty].Name == "UCBContent" ) nIndexOfContent = nProperty; - else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AsTemplate")) ) + else if ( lDescriptor[nProperty].Name == "AsTemplate" ) { lDescriptor[nProperty].Value >>= bOpenAsTemplate; nIndexOfTemplateFlag = nProperty; } - else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) ) + else if ( lDescriptor[nProperty].Name == "InteractionHandler" ) lDescriptor[nProperty].Value >>= xInteraction; - else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RepairPackage")) ) + else if ( lDescriptor[nProperty].Name == "RepairPackage" ) lDescriptor[nProperty].Value >>= bRepairPackage; - else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentTitle")) ) + else if ( lDescriptor[nProperty].Name == "DocumentTitle" ) nIndexOfDocumentTitle = nProperty; } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 63d8a140fbaa..aa173a701aca 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -1040,7 +1040,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr { uno::Any aRet; - if ( sPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ) ) + if ( sPropertyName == "DisplayName" ) { SolarMutexGuard aGuard; sal_uInt32 nResId = 0; @@ -1873,7 +1873,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons if (*pValue >>= nPages) { ScPageScaleToItem aItem = ((const ScPageScaleToItem&)rSet.Get(ATTR_PAGE_SCALETO)); - if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SC_UNO_PAGE_SCALETOX))) + if ( rPropertyName == SC_UNO_PAGE_SCALETOX ) aItem.SetWidth(static_cast<sal_uInt16>(nPages)); else aItem.SetHeight(static_cast<sal_uInt16>(nPages)); @@ -2061,7 +2061,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa case ATTR_PAGE_SCALETO: { ScPageScaleToItem aItem((const ScPageScaleToItem&)pItemSet->Get(ATTR_PAGE_SCALETO)); - if (aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SC_UNO_PAGE_SCALETOX))) + if ( aPropertyName == SC_UNO_PAGE_SCALETOX ) aAny = uno::makeAny(static_cast<sal_Int16>(aItem.GetWidth())); else aAny = uno::makeAny(static_cast<sal_Int16>(aItem.GetHeight())); |