diff options
60 files changed, 213 insertions, 213 deletions
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index 48413feb9a4c..9b2bccd1e9f5 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -93,7 +93,7 @@ OUString SIDEModel::getImplementationName_Static() sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { - return rServiceName == OUString( "com.sun.star.script.BasicIDE" ); + return rServiceName == "com.sun.star.script.BasicIDE"; } uno::Sequence< OUString > SIDEModel::getSupportedServiceNames(void) throw( uno::RuntimeException ) { diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 2ccda76c5c26..d9d19cf2f5af 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -95,7 +95,7 @@ Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeExce ::com::sun::star::uno::RuntimeException) { // Tries to get the PerformanceTestObject - if( sObjectName == OUString( "TestRemoteObject" ) ) + if( sObjectName == "TestRemoteObject" ) { return m_rSMgr->createInstance( OUString("com.sun.star.test.performance.PerformanceTestObject") ); diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index 0b5d97928660..1d75b8667e6a 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.cxx @@ -132,7 +132,7 @@ void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName) Reference<XPropertySet> xProp(xObject,UNO_QUERY); sal_Bool bIsView; - if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == OUString("VIEW")))) // here we have a view + if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == "VIEW"))) // here we have a view aSql += "VIEW "; else aSql += "TABLE "; diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index c11ff08080e1..1a70ed251048 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -104,7 +104,7 @@ sal_Bool MorkDriver::acceptsURL(OUString const & url) { aAddrbookScheme= aAddrbookURI; } - else if(url == OUString("sdbc:address:") ) + else if( url == "sdbc:address:" ) { return false; } diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index d292687b767d..766d251468c9 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -220,7 +220,7 @@ EDriverType MozabDriver::impl_classifyURL( const OUString& url ) // There isn't any subschema: - but could be just subschema if ( !aAddrbookURI.isEmpty() ) aAddrbookScheme= aAddrbookURI; - else if(url == OUString("sdbc:address:") ) + else if(url == "sdbc:address:" ) return Unknown; // TODO check else return Unknown; diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index 25fbf73ff712..08957989a178 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.cxx @@ -136,7 +136,7 @@ void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName) OUString aSql( "DROP " ); Reference<XPropertySet> xProp(xObject,UNO_QUERY); - sal_Bool bIsView = xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == OUString("VIEW"); + sal_Bool bIsView = xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == "VIEW"; if(bIsView) // here we have a view aSql += "VIEW "; else diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx index cae97e22a356..2e09b8287714 100644 --- a/connectivity/source/drivers/odbcbase/OConnection.cxx +++ b/connectivity/source/drivers/odbcbase/OConnection.cxx @@ -161,7 +161,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr,sal_Int32 nTim { OUString sVersion; OTools::GetInfo(this,m_aConnectionHandle,SQL_DRIVER_ODBC_VER,sVersion,*this,getTextEncoding()); - m_bUseOldDateFormat = sVersion == OUString("02.50") || sVersion == OUString("02.00"); + m_bUseOldDateFormat = sVersion == "02.50" || sVersion == "02.00"; } catch(Exception&) { diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx index b7a30a8288dd..7783e801a3bf 100644 --- a/cppuhelper/test/testpropshlp.cxx +++ b/cppuhelper/test/testpropshlp.cxx @@ -468,13 +468,13 @@ public: case PROPERTY_BOOL: { OSL_FAIL( "PropertySetHelper: BOOL cannot change" ); - OSL_ENSURE( evt.PropertyName == OUString("BOOL"), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == "BOOL", "PropertySetHelper: wrong name" ); } break; case PROPERTY_INT16: { - OSL_ENSURE( evt.PropertyName == OUString("INT16"), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == "INT16", "PropertySetHelper: wrong name" ); OSL_ENSURE( pExceptedListenerValues[nCurrent].getValueType().getTypeClass() == TypeClass_SHORT , "PropertySetHelper: wrong data type" ); @@ -493,7 +493,7 @@ public: case PROPERTY_INT32: { - OSL_ENSURE( evt.PropertyName == OUString("INT32"), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == "INT32", "PropertySetHelper: wrong name" ); sal_Int32 nInt32(0),nOldInt32(0); @@ -526,13 +526,13 @@ public: case PROPERTY_BOOL: { OSL_FAIL( "PropertySetHelper: BOOL cannot change" ); - OSL_ENSURE( evt.PropertyName == OUString("BOOL"), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == "BOOL", "PropertySetHelper: wrong name" ); } break; case PROPERTY_INT16: { - OSL_ENSURE( evt.PropertyName == OUString("INT16"), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == "INT16", "PropertySetHelper: wrong name" ); sal_Int16 nInt16(0), nOldInt16(0); pExceptedListenerValues[nCurrent] >>= nInt16; @@ -554,7 +554,7 @@ public: case PROPERTY_INT32: { - OSL_ENSURE( evt.PropertyName == OUString("INT32"), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == "INT32", "PropertySetHelper: wrong name" ); sal_Int32 nInt32(0),nOldInt32(0); pExceptedListenerValues[nCurrent] >>= nInt32; @@ -589,13 +589,13 @@ public: case PROPERTY_BOOL: { OSL_FAIL( "PropertySetHelper: BOOL cannot change" ); - OSL_ENSURE( evt.PropertyName == OUString("BOOL"), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == "BOOL", "PropertySetHelper: wrong name" ); } break; case PROPERTY_INT16: { - OSL_ENSURE( evt.PropertyName == OUString("INT16"), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == "INT16", "PropertySetHelper: wrong name" ); sal_Int16 nInt16(0), nOldInt16(0); pExceptedListenerValues[nCurrent] >>= nInt16; @@ -611,7 +611,7 @@ public: case PROPERTY_INT32: { - OSL_ENSURE( evt.PropertyName == OUString("INT32"), "PropertySetHelper: wrong name" ); + OSL_ENSURE( evt.PropertyName == "INT32", "PropertySetHelper: wrong name" ); sal_Int32 nInt32(0),nOldInt32(0); diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 12f65f4cca71..9be127b90134 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -355,8 +355,8 @@ Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( OUString sNodeP uno::Reference< lang::XMultiServiceFactory > xConfigProvider( com::sun::star::configuration::theDefaultProvider::get( xContext ) ); - if( sNodePath == OUString("") ) - sNodePath = OUString("/"); + if( sNodePath == "" ) + sNodePath = "/"; beans::NamedValue aProperty; aProperty.Name = "nodepath"; aProperty.Value = uno::makeAny( sNodePath ); @@ -472,24 +472,24 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) OUString sDialogValue; OUString sNewValue; - if( sPropertyType == OUString( "boolean" ) ) + if( sPropertyType == "boolean" ) { bool bValue; - if( sPropertyValue == OUString("true") ) + if( sPropertyValue == "true" ) { - sDialogValue = OUString("false"); + sDialogValue = "false"; bValue = false; } else { - sDialogValue = OUString("true"); + sDialogValue = "true"; bValue = true; } pProperty->Value = uno::makeAny( bValue ); bOpenDialog = false; } - else if ( sPropertyType == OUString( "void" ) ) + else if ( sPropertyType == "void" ) { bOpenDialog = false; } @@ -505,11 +505,11 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) { //Cosmetic length limit for integer values. int limit=0; - if( sPropertyType == OUString("short") ) + if( sPropertyType == "short" ) limit = SHORT_LEN_LIMIT; - else if( sPropertyType == OUString("long") ) + else if( sPropertyType == "long" ) limit = LONG_LEN_LIMIT; - else if( sPropertyType == OUString("hyper") ) + else if( sPropertyType == "hyper" ) limit = HYPER_LEN_LIMIT; CuiAboutConfigValueDialog* pValueDialog = new CuiAboutConfigValueDialog(0, sDialogValue, limit); @@ -518,7 +518,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) if( ret == RET_OK ) { sNewValue = pValueDialog->getValue(); - if ( sPropertyType == OUString("short")) + if ( sPropertyType == "short") { sal_Int16 nShort; sal_Int32 nNumb = sNewValue.toInt32(); @@ -531,7 +531,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) pProperty->Value = uno::makeAny( nShort ); } else - if( sPropertyType == OUString("long")) + if( sPropertyType == "long" ) { sal_Int32 nLong = sNewValue.toInt32(); if( !( nLong==0 && sNewValue.getLength()!=1 ) && nLong < SAL_MAX_INT32 && nLong > SAL_MIN_INT32) @@ -539,7 +539,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) else throw uno::Exception(); } - else if( sPropertyType == OUString("hyper")) + else if( sPropertyType == "hyper") { sal_Int64 nHyper = sNewValue.toInt64(); if( !( nHyper==0 && sNewValue.getLength()!=1 ) && nHyper < SAL_MAX_INT32 && nHyper > SAL_MIN_INT32) @@ -547,7 +547,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) else throw uno::Exception(); } - else if( sPropertyType == OUString("double")) + else if( sPropertyType == "double") { double nDoub = sNewValue.toDouble(); if( !( nDoub ==0 && sNewValue.getLength()!=1 ) && nDoub < SAL_MAX_INT32 && nDoub > SAL_MIN_INT32) @@ -555,7 +555,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) else throw uno::Exception(); } - else if( sPropertyType == OUString("float")) + else if( sPropertyType == "float") { float nFloat = sNewValue.toFloat(); if( !( nFloat ==0 && sNewValue.getLength()!=1 ) && nFloat < SAL_MAX_INT32 && nFloat > SAL_MIN_INT32) @@ -567,7 +567,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) { pProperty->Value = uno::makeAny( sNewValue ); } - else if( sPropertyType == OUString("[]short") ) + else if( sPropertyType == "[]short" ) { //create string sequence from comma seperated string //uno::Sequence< OUString > seqStr; @@ -583,7 +583,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) } pProperty->Value = uno::makeAny( seqShort ); } - else if( sPropertyType == OUString("[]long") ) + else if( sPropertyType == "[]long" ) { std::vector< OUString > seqStrLong; seqStrLong = commaStringToSequence( sNewValue ); @@ -595,7 +595,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) } pProperty->Value = uno::makeAny( seqLong ); } - else if( sPropertyType == OUString("[]hyper") ) + else if( sPropertyType == "[]hyper" ) { std::vector< OUString > seqStrHyper; seqStrHyper = commaStringToSequence( sNewValue ); @@ -606,7 +606,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) } pProperty->Value = uno::makeAny( seqHyper ); } - else if( sPropertyType == OUString("[]double") ) + else if( sPropertyType == "[]double" ) { std::vector< OUString > seqStrDoub; seqStrDoub = commaStringToSequence( sNewValue ); @@ -617,7 +617,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) } pProperty->Value = uno::makeAny( seqDoub ); } - else if( sPropertyType == OUString("[]float") ) + else if( sPropertyType == "[]float" ) { std::vector< OUString > seqStrFloat; seqStrFloat = commaStringToSequence( sNewValue ); @@ -628,7 +628,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) } pProperty->Value = uno::makeAny( seqFloat ); } - else if( sPropertyType == OUString("[]string")) + else if( sPropertyType == "[]string" ) { pProperty->Value = uno::makeAny( comphelper::containerToSequence( commaStringToSequence( sNewValue ))); } diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 9e66780750cc..23af3b0b31e9 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -217,7 +217,7 @@ void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) thr Reference<XPropertySet> xProp(Event.Element,UNO_QUERY); OUString sType; xProp->getPropertyValue(PROPERTY_TYPE) >>= sType; - if ( sType == OUString("VIEW") ) + if ( sType == "VIEW" ) insertElement(sName,createObject(sName)); } } diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 8543942cfed9..31d990b6425c 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -446,17 +446,17 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa const PropertyValue* pArgs = aArgs.getConstArray(); for (sal_uInt16 i=0; i<aArgs.getLength(); ++i, ++pArgs) { - if (pArgs->Name == OUString("ColumnViewPos")) + if (pArgs->Name == "ColumnViewPos") { nColId = pGrid->GetColumnIdFromViewPos(::comphelper::getINT16(pArgs->Value)); break; } - if (pArgs->Name == OUString("ColumnModelPos")) + if (pArgs->Name == "ColumnModelPos") { nColId = pGrid->GetColumnIdFromModelPos(::comphelper::getINT16(pArgs->Value)); break; } - if (pArgs->Name == OUString("ColumnId")) + if (pArgs->Name == "ColumnId") { nColId = ::comphelper::getINT16(pArgs->Value); break; diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 709500697923..fce8d4afe2db 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -341,7 +341,7 @@ xKey.clear(); xKey->getPropertyValue(PROPERTY_TYPE) >>= nType; OUString sReferencedTable; xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable; - if ( sReferencedTable == OUString(getReferencedTable()->GetTableName()) ) + if ( sReferencedTable == getReferencedTable()->GetTableName() ) { xColSup.set(xKey,UNO_QUERY_THROW); try diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 218692c963d2..0e6822da4d25 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -348,7 +348,7 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) Reference<XPropertySet> xTable = GetView()->getController().getTable(); if (IsReadOnly() || ( xTable.is() && xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && - ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == OUString("VIEW"))) + ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == "VIEW")) return NULL; // If the row is ReadOnly, editing is forbidden diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index e7aa7aa67957..86726ba3867c 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -58,7 +58,7 @@ sal_Bool OTableFieldControl::IsReadOnly() { // The columns of a ::com::sun::star::sdbcx::View could not be locked Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable(); - if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == OUString("VIEW")) + if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == "VIEW") bRead = sal_True; else { diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx index 129370196fd3..89eea11beda4 100644 --- a/dtrans/source/cnttype/mcnttype.cxx +++ b/dtrans/source/cnttype/mcnttype.cxx @@ -246,13 +246,13 @@ void SAL_CALL CMimeContentType::trailer( void ) OUString sToken(TOKEN); while( !m_nxtSym.isEmpty( ) ) { - if ( m_nxtSym == OUString("(") ) + if ( m_nxtSym == "(" ) { getSym( ); comment( ); acceptSym( OUString(")") ); } - else if ( m_nxtSym == OUString(";") ) + else if ( m_nxtSym == ";" ) { // get the parameter name getSym( ); @@ -315,7 +315,7 @@ OUString SAL_CALL CMimeContentType::pValue( ) OUString sToken(TOKEN); // quoted pvalue - if ( m_nxtSym == OUString( "\"" ) ) + if ( m_nxtSym == "\"" ) { getSym( ); pvalue = quotedPValue( ); @@ -362,7 +362,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( ) else if ( isInRange( m_nxtSym, OUString(TOKEN) + OUString(TSPECIALS) + OUString(SPACE) ) ) { pvalue += m_nxtSym; - if ( m_nxtSym == OUString( "\"" ) ) + if ( m_nxtSym == "\"" ) bAfterQuoteSign = sal_True; else bAfterQuoteSign = sal_False; @@ -408,7 +408,7 @@ void SAL_CALL CMimeContentType::comment( void ) { if ( isInRange( m_nxtSym, OUString(TOKEN) + OUString(SPACE) ) ) getSym( ); - else if ( m_nxtSym == OUString(")") ) + else if ( m_nxtSym == ")" ) break; else throw IllegalArgumentException( ); diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx index b0226c83f1a4..e0bdf950c23b 100644 --- a/dtrans/source/test/test_dtrans.cxx +++ b/dtrans/source/test/test_dtrans.cxx @@ -434,7 +434,7 @@ int SAL_CALL main( int argc, const char* argv[] ) TEST( "initial number of clipboards (0): ", xClipboardManager->listClipboardNames().getLength() == 0 ); PERFORM( "insertion of generic clipboard: ", xClipboardManager->addClipboard( xClipboard ) ); TEST( "number of inserted clipboards (1): ", xClipboardManager->listClipboardNames().getLength() == 1 ); - TEST( "name of inserted clipboard (generic): ", xClipboardManager->listClipboardNames()[0] == OUString("generic") ); + TEST( "name of inserted clipboard (generic): ", xClipboardManager->listClipboardNames()[0] == "generic" ); TEST( "inserted clipboard instance: ", xClipboardManager->getClipboard( OUString("generic") ) == xClipboard ); PERFORM( "removal of generic clipboard: ", xClipboardManager->removeClipboard( OUString("generic") ) ); TEST( "number of inserted clipboards (0): ", xClipboardManager->listClipboardNames().getLength() == 0 ); diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx index 4e6577660c58..2fbbfef6beea 100644 --- a/extensions/qa/update/test_update.cxx +++ b/extensions/qa/update/test_update.cxx @@ -65,7 +65,7 @@ protected: deployment::UpdateInformationEntry aEntry; if ( aUpdateInfoEnumeration->nextElement() >>= aEntry ) { - CPPUNIT_ASSERT( aEntry.UpdateDocument->getNodeName() == OUString( "description" ) ); + CPPUNIT_ASSERT( aEntry.UpdateDocument->getNodeName() == "description" ); uno::Reference< dom::XNodeList> xChildNodes = aEntry.UpdateDocument->getChildNodes(); CPPUNIT_ASSERT( xChildNodes.is() ); @@ -85,7 +85,7 @@ protected: //uno::Reference< dom::XElement > xChildId( xChildNodes->item( 0 ), uno::UNO_QUERY ); //CPPUNIT_ASSERT( xChildId.is() ); - //CPPUNIT_ASSERT( xChildId->getNodeValue() == OUString( "LibreOffice_3.4" ) ); + //CPPUNIT_ASSERT( xChildId->getNodeValue() == "LibreOffice_3.4" ); //fprintf( stderr, "Attribute == %s\n", OUStringToOString( aEntry.UpdateDocument->getAttribute( OUString( "test" ) ), RTL_TEXTENCODING_UTF8 ).getStr() ); //fprintf( stderr, "Value == %s\n", OUStringToOString( xChildId->getNodeValue(), RTL_TEXTENCODING_UTF8 ).getStr() ); // TODO check more deeply @@ -108,7 +108,7 @@ protected: OUString( "InstallSetID" ) ) ) { CPPUNIT_ASSERT( aInfo.Sources.size() == 1 ); - CPPUNIT_ASSERT( aInfo.Sources[0].URL == OUString( "http://www.libreoffice.org/download/" ) ); + CPPUNIT_ASSERT( aInfo.Sources[0].URL == "http://www.libreoffice.org/download/" ); } else CPPUNIT_FAIL( "Calling checkForUpdates() failed." ); diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index ab8e4001377b..3fb7b8a90914 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -298,7 +298,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent if ( !IsCorrectContext( rModel, aContext ) || ( aTitle.isEmpty() && aURL.isEmpty() )) continue; - if ( aURL == OUString( "private:separator" )) + if ( aURL == "private:separator" ) bInsertSeparator = sal_True; else { diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index b15c9f4f9908..78b02981db65 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -134,7 +134,7 @@ void BmkMenu::Initialize() if ( aTitle.isEmpty() && aURL.isEmpty() ) continue; - if ( aURL == OUString( "private:separator" )) + if ( aURL == "private:separator" ) InsertSeparator(); else { diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 74170745d1d3..b814e770ff50 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -149,7 +149,7 @@ sal_uInt16 MenuBarMerger::FindMenuItem( const OUString& rCmd, Menu* pCurrMenu ) const sal_uInt16 nItemId = pCurrMenu->GetItemId( i ); if ( nItemId > 0 ) { - if ( rCmd == OUString( pCurrMenu->GetItemCommand( nItemId ))) + if ( rCmd == pCurrMenu->GetItemCommand( nItemId ) ) return i; } } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 87413661ce6c..db552106ef36 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1037,10 +1037,10 @@ void ToolBarManager::CreateControllers() if (pController) { - if(aCommandURL == OUString( ".uno:SwitchXFormsDesignMode" ) || - aCommandURL == OUString( ".uno:ViewDataSourceBrowser" ) || - aCommandURL == OUString( ".uno:ParaLeftToRight" ) || - aCommandURL == OUString( ".uno:ParaRightToLeft" ) + if(aCommandURL == ".uno:SwitchXFormsDesignMode" || + aCommandURL == ".uno:ViewDataSourceBrowser" || + aCommandURL == ".uno:ParaLeftToRight" || + aCommandURL == ".uno:ParaRightToLeft" ) pController->setFastPropertyValue_NoBroadcast(1,makeAny(sal_True)); } diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index d7063dec0f4f..3e80f09e382e 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -276,7 +276,7 @@ void ODataStreamTest::testSimple( const Reference < XDataInputStream > &rInput ERROR_ASSERT( rInput->readHyper() == 0x123456789abcdefLL , "int64 read/write mismatch" ); rOutput->writeUTF( OUString("Live long and prosper !") ); - ERROR_ASSERT( rInput->readUTF() == OUString("Live long and prosper !") , + ERROR_ASSERT( rInput->readUTF() == "Live long and prosper !", "UTF read/write mismatch" ); Sequence<sal_Unicode> wc(0x10001); diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 6fc2f92018e0..602caf9e181d 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -125,7 +125,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport const OUString sFormula = sCompleteFormula.getToken(0,'(',nIndex); ::sal_Int16 nGroupOn = report::GroupOn::DEFAULT; - if ( sFormula ==OUString("rpt:LEFT")) + if ( sFormula == "rpt:LEFT") { nGroupOn = report::GroupOn::PREFIX_CHARACTERS; OUString sInterval = sCompleteFormula.getToken(1,';',nIndex); @@ -133,26 +133,26 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport sInterval = sInterval.getToken(0,')',nIndex); m_xGroup->setGroupInterval(sInterval.toInt32()); } - else if ( sFormula == OUString("rpt:YEAR")) + else if ( sFormula == "rpt:YEAR") nGroupOn = report::GroupOn::YEAR; - else if ( sFormula == OUString("rpt:MONTH")) + else if ( sFormula == "rpt:MONTH") { nGroupOn = report::GroupOn::MONTH; } - else if ( sCompleteFormula.matchIgnoreAsciiCase(OUString("rpt:INT((MONTH"),0) + else if ( sCompleteFormula.matchIgnoreAsciiCase("rpt:INT((MONTH",0) && sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",8) ) { nGroupOn = report::GroupOn::QUARTAL; } - else if ( sFormula ==OUString("rpt:WEEK")) + else if ( sFormula == "rpt:WEEK") nGroupOn = report::GroupOn::WEEK; - else if ( sFormula ==OUString("rpt:DAY")) + else if ( sFormula == "rpt:DAY") nGroupOn = report::GroupOn::DAY; - else if ( sFormula ==OUString("rpt:HOUR")) + else if ( sFormula == "rpt:HOUR") nGroupOn = report::GroupOn::HOUR; - else if ( sFormula ==OUString("rpt:MINUTE")) + else if ( sFormula == "rpt:MINUTE") nGroupOn = report::GroupOn::MINUTE; - else if ( sFormula ==OUString("rpt:INT")) + else if ( sFormula == "rpt:INT") { nGroupOn = report::GroupOn::INTERVAL; _rImport.removeFunction(sExpression); diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 45cd1b2a4fd1..ce5f4b462e07 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -250,9 +250,9 @@ void testContentImpl(ScDocument* pDoc, sal_Int32 nFormat ) //same code for ods, OUString aString = pDoc->GetString(1, 0, 0); //check string import - CPPUNIT_ASSERT_MESSAGE("string imported not correctly", aString == OUString("String1")); + CPPUNIT_ASSERT_MESSAGE("string imported not correctly", aString == "String1"); aString = pDoc->GetString(1, 1, 0); - CPPUNIT_ASSERT_MESSAGE("string not imported correctly", aString == OUString("String2")); + CPPUNIT_ASSERT_MESSAGE("string not imported correctly", aString == "String2"); //check basic formula import // in case of DIF it just contains values diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 7dccf6f629ad..b645d5851722 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -492,7 +492,7 @@ sal_uInt16 XclExpNameManagerImpl::FindBuiltInNameIdx( { /* Get built-in index from the name. Special case: the database range 'unnamed' will be mapped to Excel's built-in '_FilterDatabase' name. */ - sal_Unicode cBuiltIn = (bDBRange && (rName == OUString(STR_DB_LOCAL_NONAME))) ? + sal_Unicode cBuiltIn = (bDBRange && (rName == STR_DB_LOCAL_NONAME)) ? EXC_BUILTIN_FILTERDATABASE : XclTools::GetBuiltInDefNameIndex( rName ); if( cBuiltIn < EXC_BUILTIN_UNKNOWN ) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 66e7ba518d9f..676352af77c0 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2373,7 +2373,7 @@ void ScExternalRefManager::convertToAbsName(OUString& rFile) const ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(&aType, false)); while (pShell) { - if (rFile == OUString(pShell->GetName())) + if (rFile == pShell->GetName()) return; pShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pShell, &aType, false)); diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 3c7dc4328cde..7c169ba531fb 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -301,7 +301,7 @@ IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl) ScDocument* pDoc = GetSelectedDoc(); if (pDoc) pDoc->CreateValidTabName(aCopyName); - if (aCopyName == OUString(pEdTabName->GetText())) + if (aCopyName == pEdTabName->GetText()) pEdTabName->SetText( OUString() ); } else diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index c3df2e12b478..e8f831e98d21 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -215,8 +215,8 @@ void ScRangeManagerTable::SetEntry(const ScRangeNameLine& rLine) { for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry)) { - if (rLine.aName == OUString(GetEntryText(pEntry, 0)) - && rLine.aScope == OUString(GetEntryText(pEntry, 2))) + if (rLine.aName == GetEntryText(pEntry, 0) + && rLine.aScope == GetEntryText(pEntry, 2)) { SetCurEntry(pEntry); } diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 4bb09ab5a01e..f4fce0f7e0c6 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -1052,7 +1052,7 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const OUString& rDoc ) : { sal_uInt8 nMode = pDoc->GetLinkMode(i); if (nMode) - if (pDoc->GetLinkDoc(i) == OUString(aDocName)) + if (pDoc->GetLinkDoc(i) == aDocName) { if (!nCount) { diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 98ce4589fff4..2d19a4631db0 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -295,7 +295,7 @@ void ScSheetLinkObj::setFileName(const OUString& rNewName) ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; nTab++) - if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == OUString(aFileName) ) // alte Datei + if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == aFileName ) // alte Datei pDoc->SetLink( nTab, pDoc->GetLinkMode(nTab), aNewStr, pDoc->GetLinkFlt(nTab), pDoc->GetLinkOpt(nTab), pDoc->GetLinkTab(nTab), diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 1878f5ddb344..106a0ef591d7 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -208,7 +208,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) pCustomShow != NULL && bDifferent; pCustomShow = (SdCustomShow*) pCustomShowList->Next() ) { - if( aStr == OUString( pCustomShow->GetName() ) ) + if( aStr == pCustomShow->GetName() ) bDifferent = sal_False; } if( !bDifferent ) diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 23f016a282f9..3cdc5b065f36 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -361,7 +361,7 @@ void SvBaseLink::_GetRealObject( sal_Bool bConnect) { OUString sServer; if( pImpl->m_pLinkMgr->GetDisplayNames( this, &sServer ) && - sServer == OUString(GetpApp()->GetAppName()) ) // internal Link !!! + sServer == GetpApp()->GetAppName() ) // internal Link !!! { // so that the Internal link can be created! nObjType = OBJECT_INTERN; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index b97062248f74..ad869f5083c7 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1411,7 +1411,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) size_t nCount = aStrings.size(); size_t nPos = 0; while(nPos < nCount && pEntry && - aStrings[nPos] == OUString(aFmtLb.GetEntryText(pEntry))) + aStrings[nPos] == aFmtLb.GetEntryText(pEntry)) { ++nPos; pEntry = aFmtLb.Next( pEntry ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 1ed9433f8a72..11a81a049d62 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3063,7 +3063,7 @@ sal_Bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium ) const SfxFilter* pFilter = rMedium.GetFilter(); bool bChart = false; - if(pFilter->GetName() == OUString("chart8")) + if(pFilter->GetName() == "chart8") bChart = true; SetupStorage( xStorage, nVersion, bTemplate, bChart ); diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 9765eb38c107..32a9f6fc9224 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -252,7 +252,7 @@ sal_uLong SotExchange::RegisterFormatName( const OUString& rName ) for( i = 0, nMax = rL.size(); i < nMax; i++ ) { DataFlavor* pFlavor = rL[ i ]; - if( pFlavor && rName == OUString( pFlavor->HumanPresentableName ) ) + if( pFlavor && rName == pFlavor->HumanPresentableName ) return i + SOT_FORMATSTR_ID_USER_END + 1; } @@ -287,7 +287,7 @@ sal_uLong SotExchange::RegisterFormatMimeType( const OUString& rMimeType ) for( i = 0, nMax = rL.size(); i < nMax; i++ ) { DataFlavor* pFlavor = rL[ i ]; - if( pFlavor && rMimeType == OUString( pFlavor->MimeType ) ) + if( pFlavor && rMimeType == pFlavor->MimeType ) return i + SOT_FORMATSTR_ID_USER_END + 1; } diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index d8c93ef88404..b1158c9ff345 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -1991,7 +1991,7 @@ sal_uInt8 MathType::HandleNodes(SmNode *pNode,int nLevel) SmTextNode *pText=(SmTextNode *)pNode; //if the token str and the result text are the same then this //is to be seen as text, else assume it's a mathchar - if (pText->GetText() == OUString(pText->GetToken().aText)) + if (pText->GetText() == pText->GetToken().aText) HandleText(pText,nLevel); else HandleMath(pText,nLevel); diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx index 828c18b378ad..060612474866 100644 --- a/starmath/source/wordexportbase.cxx +++ b/starmath/source/wordexportbase.cxx @@ -58,7 +58,7 @@ void SmWordExportBase::HandleNode( const SmNode* pNode, int nLevel ) const SmTextNode* pText= static_cast< const SmTextNode* >( pNode ); //if the token str and the result text are the same then this //is to be seen as text, else assume it's a mathchar - if (pText->GetText() == OUString(pText->GetToken().aText)) + if (pText->GetText() == pText->GetToken().aText) HandleText(pText,nLevel); else HandleMath(pText,nLevel); diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index e0e04358b821..bfe792d1e280 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -86,7 +86,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Reference< XHierarchicalNameAccess > xHNameAccess( xRefl, UNO_QUERY ); OSL_ENSURE(xHNameAccess.is(), "### cannot get XHierarchicalNameAccess!" ); - OSL_ENSURE(xRefl->forName("ModuleA.StructA")->getName() == OUString("ModuleA.StructA"), "test_RegCoreReflection(): error 2b"); + OSL_ENSURE(xRefl->forName("ModuleA.StructA")->getName() == "ModuleA.StructA", "test_RegCoreReflection(): error 2b"); OSL_ENSURE(xRefl->forName("ModuleA.ExceptionB")->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 2c"); OSL_ENSURE(xRefl->forName("ModuleA.ModuleB.EnumA").is(), "test_RegCoreReflection(): error 2e"); @@ -108,11 +108,11 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) OSL_ENSURE( (fields.getLength() == 3) && - (fields.getArray()[0]->getName() == OUString( "VAL_1" )) && + (fields.getArray()[0]->getName() == "VAL_1" ) && (*(EnumA*)fields.getArray()[0]->get(Any()).getValue() == EnumA_VAL_1) && - (fields.getArray()[1]->getName() == OUString( "VAL_2" )) && + (fields.getArray()[1]->getName() == "VAL_2" ) && (*(EnumA*)fields.getArray()[1]->get(Any()).getValue() == EnumA_VAL_2) && - (fields.getArray()[2]->getName() == OUString( "VAL_3" )) && + (fields.getArray()[2]->getName() == "VAL_3" ) && (*(EnumA*)fields.getArray()[2]->get(Any()).getValue() == EnumA_VAL_3), "test_RegCoreReflection(): error 6"); @@ -137,59 +137,59 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) typelib_typedescription_release( pTD ); OSL_ENSURE(xClass->getSuperclasses().getLength() == 1, "test_RegCoreReflection(): error 9"); - OSL_ENSURE(xClass->getSuperclasses().getArray()[0]->getName() == OUString("ModuleC.XInterfaceA"), "test_RegCoreReflection(): error 10"); + OSL_ENSURE(xClass->getSuperclasses().getArray()[0]->getName() == "ModuleC.XInterfaceA"), "test_RegCoreReflection(): error 10"; OSL_ENSURE(xClass->getMethods().getLength() == 7, "test_RegCoreReflection(): error 11"); OSL_ENSURE(xA->getMethods().getLength() == 7, "test_RegCoreReflection(): error 11a"); - OSL_ENSURE(xClass->getMethods().getArray()[3]->getName() == OUString("methodA"), "test_RegCoreReflection(): 12"); + OSL_ENSURE(xClass->getMethods().getArray()[3]->getName() == "methodA"), "test_RegCoreReflection(): 12"; OSL_ENSURE(xClass->getMethods().getArray()[3]->getReturnType()->getTypeClass() == TypeClass_VOID, "test_RegCoreReflection(): error 13"); OSL_ENSURE(xClass->getMethods().getArray()[3]->getParameterTypes().getLength() == 0, "test_RegCoreReflection(): error 14"); OSL_ENSURE(xClass->getMethods().getArray()[3]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 15"); - OSL_ENSURE(xClass->getMethods().getArray()[4]->getName() == OUString( "methodB" ), "test_RegCoreReflection(): error 16"); + OSL_ENSURE(xClass->getMethods().getArray()[4]->getName() == "methodB", "test_RegCoreReflection(): error 16"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getMode() == MethodMode_ONEWAY, "test_RegCoreReflection(): error 16a"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getReturnType()->getTypeClass() == TypeClass_VOID, "test_RegCoreReflection(): error 16"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterTypes().getLength() == 1, "test_RegCoreReflection(): error 17"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterTypes().getArray()[0]->getTypeClass() == TypeClass_SHORT, "test_RegCoreReflection(): error 18"); - OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aName == OUString( "aShort" ), "test_RegCoreReflection(): error 18a"); + OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aName == "aShort", "test_RegCoreReflection(): error 18a"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aType == xRefl->forName("short"), "test_RegCoreReflection(): error 18b"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aMode == ParamMode_IN, "test_RegCoreReflection(): error 18c"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 19"); - OSL_ENSURE(xClass->getMethods().getArray()[5]->getName() == OUString("methodC"), "test_RegCoreReflection(): error 20"); + OSL_ENSURE(xClass->getMethods().getArray()[5]->getName() == "methodC", "test_RegCoreReflection(): error 20"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getMode() == MethodMode_TWOWAY, "test_RegCoreReflection(): error 20a"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 21"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 22"); - OSL_ENSURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getName() == OUString("ModuleA.StructB"), "test_RegCoreReflection(): error 23"); + OSL_ENSURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getName() == "ModuleA.StructB", "test_RegCoreReflection(): error 23"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getLength() == 2, "test_RegCoreReflection(): error 24"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 25"); - OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getName() == OUString("ModuleA.StructC"), "test_RegCoreReflection(): error 26"); + OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getName() == "ModuleA.StructC", "test_RegCoreReflection(): error 26"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 27"); - OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getName() == OUString("ModuleA.StructA"), "test_RegCoreReflection(): error 28"); + OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getName() == "ModuleA.StructA", "test_RegCoreReflection(): error 28"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 29"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getName() == OUString("methodD"), "test_RegCoreReflection(): error 30"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getName() == "methodD", "test_RegCoreReflection(): error 30"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getReturnType()->getTypeClass() == TypeClass_INTERFACE, "test_RegCoreReflection(): error 31"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getReturnType()->getName() == OUString("ModuleC.XInterfaceA"), "test_RegCoreReflection(): error 32"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getReturnType()->getName() == "ModuleC.XInterfaceA", "test_RegCoreReflection(): error 32"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getParameterTypes().getLength() == 1, "test_RegCoreReflection(): error 33"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getTypeClass() == TypeClass_ENUM, "test_RegCoreReflection(): error 34"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getName() == OUString("ModuleA.ModuleB.EnumA"), "test_RegCoreReflection(): error 35"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getName() == "ModuleA.ModuleB.EnumA", "test_RegCoreReflection(): error 35"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getLength() == 3, "test_RegCoreReflection(): error 36"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 37"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getName() == OUString("ModuleA.ExceptionA"), "test_RegCoreReflection(): error 38"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getName() == "ModuleA.ExceptionA", "test_RegCoreReflection(): error 38"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 38"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getName() == OUString("ModuleA.ExceptionB"), "test_RegCoreReflection(): error 39"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getName() == "ModuleA.ExceptionB", "test_RegCoreReflection(): error 39"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 40"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getName() == OUString("ModuleA.ExceptionC"), "test_RegCoreReflection(): error 41"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getName() == "ModuleA.ExceptionC", "test_RegCoreReflection(): error 41"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getLength() == 3, "test_RegCoreReflection(): error 42"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getTypeClass() == TypeClass_BOOLEAN, "test_RegCoreReflection(): error 43"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getName() == OUString("boolean"), "test_RegCoreReflection(): error 43a"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getName() == "boolean", "test_RegCoreReflection(): error 43a"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 44"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getName() == OUString("ModuleA.StructC"), "test_RegCoreReflection(): error 45"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getName() == "ModuleA.StructC", "test_RegCoreReflection(): error 45"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getTypeClass() == TypeClass_INTERFACE, "test_RegCoreReflection(): error 46"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getName() == OUString("ModuleA.XInterface1"), "test_RegCoreReflection(): error 47"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getName() == "ModuleA.XInterface1", "test_RegCoreReflection(): error 47"); // SequenceReflections OSL_ENSURE(xRefl->forName("[]ModuleA.StructA")->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 48"); OSL_ENSURE(xRefl->forName("[]ModuleA.StructA")->getComponentType().is(), "test_RegCoreReflection(): error 49"); - OSL_ENSURE(xRefl->forName("[][]ModuleA.StructA")->getComponentType()->getComponentType()->getName() == OUString("ModuleA.StructA"), "test_RegCoreReflection(): error 50"); + OSL_ENSURE(xRefl->forName("[][]ModuleA.StructA")->getComponentType()->getComponentType()->getName() == "ModuleA.StructA", "test_RegCoreReflection(): error 50"); OSL_ENSURE(xRefl->forName("[]com.sun.star.uno.XInterface") == xRefl->forName("ModuleA.StructC")->getField(OUString("aInterfaceSeq"))->getType(), "test_RegCoreReflection(): error 51"); StructC aStructC; diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index 9f2da08d27ad..06c3167c2c56 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -575,7 +575,7 @@ sal_Bool ImplIntroTest::hasElements( ) sal_Int32 getIndexForName( const OUString& ItemName ) { OUString aLeftStr = ItemName.copy( 0, 4 ); - if( aLeftStr == OUString("Item") ) + if( aLeftStr == "Item" ) { // TODO OUString aNumStr = ItemName.copy( 4 ); diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx index 014ae2fcdb55..a9a680b1531d 100644 --- a/stoc/test/testregistry.cxx +++ b/stoc/test/testregistry.cxx @@ -232,22 +232,22 @@ void test_SimpleRegistry( name = seqNames.getArray()[i]; xSubKey = seqKeys.getArray()[i]; - if (name == OUString( "/FirstKey/FirstSubKey" )) + if (name == "/FirstKey/FirstSubKey" ) { OSL_ENSURE( xSubKey->getLongValue() == 123456789, "test_SimpleRegistry error 10" ); } else - if (name == OUString( "/FirstKey/SecondSubKey" )) + if (name == "/FirstKey/SecondSubKey" ) { - OSL_ENSURE( xSubKey->getAsciiValue() == OUString( "ich bin ein acsii value" ), + OSL_ENSURE( xSubKey->getAsciiValue() == "ich bin ein acsii value", "test_SimpleRegistry error 11" ); } else - if (name == OUString( "/FirstKey/ThirdSubKey" )) + if (name == "/FirstKey/ThirdSubKey" ) { - OSL_ENSURE( xSubKey->getStringValue() == OUString( "ich bin ein unicode value" ), + OSL_ENSURE( xSubKey->getStringValue() == "ich bin ein unicode value", "test_SimpleRegistry error 12" ); } else - if (name == OUString( "/FirstKey/FourthSubKey" )) + if (name == "/FirstKey/FourthSubKey" ) { Sequence<sal_Int8> seqByte = xSubKey->getBinaryValue(); OSL_ENSURE(!strcmp(((const char*)seqByte.getArray()), "ich bin ein binary value"), @@ -287,9 +287,9 @@ void test_SimpleRegistry( Sequence<OUString> seqAscii2; seqAscii2 = xKey->getAsciiListValue(); OSL_ENSURE( seqAscii2.getLength() == 3, "test_SimpleRegistry error 18" ); - OSL_ENSURE( seqAscii2.getArray()[0] == OUString( "Hallo" ), "test_SimpleRegistry error 19"); - OSL_ENSURE( seqAscii2.getArray()[1] == OUString( "jetzt komm" ), "test_SimpleRegistry error 20"); - OSL_ENSURE( seqAscii2.getArray()[2] == OUString( "ich" ), "test_SimpleRegistry error 21"); + OSL_ENSURE( seqAscii2.getArray()[0] == "Hallo", "test_SimpleRegistry error 19"); + OSL_ENSURE( seqAscii2.getArray()[1] == "jetzt komm", "test_SimpleRegistry error 20"); + OSL_ENSURE( seqAscii2.getArray()[2] == "ich", "test_SimpleRegistry error 21"); xKey = xRootKey->createKey(OUString( "FourthKey" )); OUString pUnicode[3]; @@ -303,9 +303,9 @@ void test_SimpleRegistry( Sequence<OUString> seqUnicode2; seqUnicode2 = xKey->getStringListValue(); OSL_ENSURE( seqUnicode2.getLength() == 3, "test_SimpleRegistry error 22" ); - OSL_ENSURE( seqUnicode2.getArray()[0] == OUString( "Hallo" ), "test_SimpleRegistry error 23"); - OSL_ENSURE( seqUnicode2.getArray()[1] == OUString( "jetzt komm" ), "test_SimpleRegistry error 24"); - OSL_ENSURE( seqUnicode2.getArray()[2] == OUString( "ich als unicode" ), "test_SimpleRegistry error 25"); + OSL_ENSURE( seqUnicode2.getArray()[0] == "Hallo", "test_SimpleRegistry error 23"); + OSL_ENSURE( seqUnicode2.getArray()[1] == "jetzt komm", "test_SimpleRegistry error 24"); + OSL_ENSURE( seqUnicode2.getArray()[2] == "ich als unicode", "test_SimpleRegistry error 25"); xReg->open(testreg2, sal_False, sal_True); @@ -354,18 +354,18 @@ void test_SimpleRegistry( xKey = xRootKey->openKey("/FifthKey/MyFirstLink"); OSL_ENSURE( xKey->isValid(), "test_SimpleRegistry error 27" ); - OSL_ENSURE( xKey->getKeyName() == OUString( "/ThirdKey/FirstSubKey" ), "test_SimpleRegistry error 28" ); + OSL_ENSURE( xKey->getKeyName() == "/ThirdKey/FirstSubKey", "test_SimpleRegistry error 28" ); xKey->createLink(OUString( "/WithSubSubKey/MyFourthLink" ), OUString( "/FourthKey/MySecondLink" )); OSL_ENSURE( xKey->getLinkTarget(OUString( "/WithSubSubKey/MyFourthLink" )) - == OUString( "/FourthKey/MySecondLink" ), "test_SimpleRegistry error 29" ); + == "/FourthKey/MySecondLink", "test_SimpleRegistry error 29" ); try { OSL_ENSURE( xKey->getResolvedName(OUString( "/WithSubSubKey/MyFourthLink/BlaBlaBla" )) - == OUString( "/FourthKey/MySecondLink/BlaBlaBla" ), "test_SimpleRegistry error 30" ); + == "/FourthKey/MySecondLink/BlaBlaBla", "test_SimpleRegistry error 30" ); } catch(InvalidRegistryException&) { @@ -388,7 +388,7 @@ void test_SimpleRegistry( } OSL_ENSURE( xRootKey->getLinkTarget(OUString( "/FifthKey/MyFirstLink/WithSubSubKey/MyFourthLink" )) - == OUString( "/FourthKey/MySecondLink" ), "test_SimpleRegistry error 31" ); + == "/FourthKey/MySecondLink", "test_SimpleRegistry error 31" ); xRootKey->deleteLink(OUString( "/FifthKey/MyFirstLink/WithSubSubKey/MyFourthLink" )); @@ -399,14 +399,14 @@ void test_SimpleRegistry( seqNames = xKey->getKeyNames(); seqKeys = xKey->openKeys(); - OSL_ENSURE( seqNames.getArray()[0] == OUString( "/SixthKey/SixthSubKey" ), + OSL_ENSURE( seqNames.getArray()[0] == "/SixthKey/SixthSubKey", "test_SimpleRegistry error 32" ); - OSL_ENSURE( seqNames.getArray()[1] == OUString( "/SixthKey/MyThirdLink" ), + OSL_ENSURE( seqNames.getArray()[1] == "/SixthKey/MyThirdLink", "test_SimpleRegistry error 33" ); - OSL_ENSURE( seqKeys.getArray()[0]->getKeyName() == OUString( "/SixthKey/SixthSubKey" ), + OSL_ENSURE( seqKeys.getArray()[0]->getKeyName() == "/SixthKey/SixthSubKey", "test_SimpleRegistry error 34" ); - OSL_ENSURE( seqKeys.getArray()[1]->getKeyName() == OUString( "/ThirdKey/FirstSubKey/WithSubSubKey" ), + OSL_ENSURE( seqKeys.getArray()[1]->getKeyName() == "/ThirdKey/FirstSubKey/WithSubSubKey", "test_SimpleRegistry error 35" ); xRootKey->deleteLink(OUString( "/FourthKey/MySecondLink" )); @@ -457,7 +457,7 @@ void test_DefaultRegistry( OSL_ENSURE( xServInfo.is(), "test_DefaultRegistry error2"); - OSL_ENSURE( xServInfo->getImplementationName() == OUString( "com.sun.star.comp.stoc.NestedRegistry" ), "test_DefualtRegistry error3"); + OSL_ENSURE( xServInfo->getImplementationName() == "com.sun.star.comp.stoc.NestedRegistry", "test_DefualtRegistry error3"); OSL_ENSURE( xServInfo->supportsService("com.sun.star.registry.NestedRegistry"), "test_DefaultRegistry error4"); OSL_ENSURE( xServInfo->getSupportedServiceNames().getLength() == 1, "test_DefaultRegistry error5"); xServInfo.clear(); @@ -470,7 +470,7 @@ void test_DefaultRegistry( Reference<XRegistryKey> xKey = xRootKey->openKey("/UCR/com/sun/star/registry/XSimpleRegistry"); - OSL_ENSURE( xKey->getKeyName() == OUString( "/UCR/com/sun/star/registry/XSimpleRegistry" ), + OSL_ENSURE( xKey->getKeyName() == "/UCR/com/sun/star/registry/XSimpleRegistry", "test_DefaultRegistry error 7" ); if (bMergeDifferently) @@ -508,11 +508,11 @@ void test_DefaultRegistry( Sequence<OUString> seqValue = xKey->getAsciiListValue(); OSL_ENSURE( seqValue.getLength() == 3, "test_DefaultRegistry error 10" ); - OSL_ENSURE( seqValue.getArray()[0] == OUString( "Hallo" ), + OSL_ENSURE( seqValue.getArray()[0] == "Hallo", "test_DefaultRegistry error 11" ); - OSL_ENSURE( seqValue.getArray()[1] == OUString( "jetzt komm" ), + OSL_ENSURE( seqValue.getArray()[1] == "jetzt komm", "test_DefaultRegistry error 12" ); - OSL_ENSURE( seqValue.getArray()[2] == OUString( "ich" ), + OSL_ENSURE( seqValue.getArray()[2] == "ich", "test_DefaultRegistry error 13" ); Sequence<sal_Int32> seqLong(3); @@ -537,20 +537,20 @@ void test_DefaultRegistry( xKey = xRootKey->openKey("/Test/FifthKey/MyFirstLink"); OSL_ENSURE( xKey->isValid(), "test_DefaultRegistry error 18" ); - OSL_ENSURE( xKey->getKeyName() == OUString( "/Test/ThirdKey/FirstSubKey" ), + OSL_ENSURE( xKey->getKeyName() == "/Test/ThirdKey/FirstSubKey", "test_DefaultRegistry error 19" ); xKey->createLink(OUString( "/WithSubSubKey/MyFourthLink" ), OUString( "/Test/FourthKey/MySecondLink" )); OSL_ENSURE( xKey->getLinkTarget(OUString( "/WithSubSubKey/MyFourthLink" )) - == OUString( "/Test/FourthKey/MySecondLink" ), + == "/Test/FourthKey/MySecondLink", "test_DefaultRegistry error 20" ); try { OSL_ENSURE( xKey->getResolvedName(OUString( "/WithSubSubKey/MyFourthLink/BlaBlaBla" )) - == OUString( "/Test/FourthKey/MySecondLink/BlaBlaBla" ), + == "/Test/FourthKey/MySecondLink/BlaBlaBla", "test_DefaultRegistry error 21" ); } catch(InvalidRegistryException&) @@ -573,7 +573,7 @@ void test_DefaultRegistry( } OSL_ENSURE( xRootKey->getLinkTarget(OUString( "/Test/FifthKey/MyFirstLink/WithSubSubKey/MyFourthLink" )) - == OUString( "/Test/FourthKey/MySecondLink" ), + == "/Test/FourthKey/MySecondLink", "test_DefaultRegistry error 22" ); xRootKey->deleteLink(OUString( "/Test/FifthKey/MyFirstLink/WithSubSubKey/MyFourthLink" )); @@ -581,12 +581,12 @@ void test_DefaultRegistry( xKey = xRootKey->openKey("/Test/DefaultLink/SecondSubSubKey"); if (xKey.is()) { - OSL_ENSURE( xKey->getKeyName() == OUString( "/Test/ThirdKey/FirstSubKey/SecondSubSubKey" ), "test_DefaultRegistry error 23" ); + OSL_ENSURE( xKey->getKeyName() == "/Test/ThirdKey/FirstSubKey/SecondSubSubKey", "test_DefaultRegistry error 23" ); } xKey = xRootKey->createKey(OUString( "/Test/DefaultLink/ThirdSubSubKey" )); if (xKey.is()) { - OSL_ENSURE( xKey->getKeyName() == OUString( "/Test/ThirdKey/FirstSubKey/ThirdSubSubKey" ), + OSL_ENSURE( xKey->getKeyName() == "/Test/ThirdKey/FirstSubKey/ThirdSubSubKey", "test_DefaultRegistry error 24" ); } diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx index 6e65b0c0b51e..d077821c3f5a 100644 --- a/stoc/test/testsmgr_cpnt.cxx +++ b/stoc/test/testsmgr_cpnt.cxx @@ -237,7 +237,7 @@ extern "C" void SAL_CALL test_ServiceManager() // getImplementations() check Sequence<OUString> seqImpl = xInst->getImplementations(OUString("com.sun.star.loader.SharedLibrary"), atUModule2); OSL_ENSURE( seqImpl.getLength() == 1, "count of implementantions is wrong" ); - OSL_ENSURE( seqImpl.getConstArray()[0] == OUString("com.sun.star.DummyService.V10"), "implementation name is not equal" ); + OSL_ENSURE( seqImpl.getConstArray()[0] == "com.sun.star.DummyService.V10", "implementation name is not equal" ); // tests, if a service provider can be instantiated. diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index c672b5ec2cb9..211704158043 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3727,7 +3727,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() } rCurrencyTable.insert( rCurrencyTable.begin() + nCurrencyPos++, pEntry ); if ( !nSystemCurrencyPosition && (!aConfiguredCurrencyAbbrev.isEmpty() ? - pEntry->GetBankSymbol() == OUString(aConfiguredCurrencyAbbrev) && + pEntry->GetBankSymbol() == aConfiguredCurrencyAbbrev && pEntry->GetLanguage() == eConfiguredCurrencyLanguage : false) ) { nSystemCurrencyPosition = nCurrencyPos-1; @@ -3772,7 +3772,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() rCurrencyTable.insert( rCurrencyTable.begin() + nCurrencyPos++, pEntry ); if ( !nSecondarySystemCurrencyPosition && (!aConfiguredCurrencyAbbrev.isEmpty() ? - pEntry->GetBankSymbol() == OUString(aConfiguredCurrencyAbbrev) : + pEntry->GetBankSymbol() == aConfiguredCurrencyAbbrev : pEntry->GetLanguage() == eConfiguredCurrencyLanguage) ) { nSecondarySystemCurrencyPosition = nCurrencyPos-1; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index d07b77373ced..42a1b1c6547f 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1210,7 +1210,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) { - bool bInclusive = ( m_pLayoutBtn->GetText() == OUString(aLayoutStr) ); + bool bInclusive = ( m_pLayoutBtn->GetText() == aLayoutStr ); if ( ( pBtn == m_pSearchBtn ) || ( pBtn == m_pSearchAllBtn )|| diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 86e50ad4f308..b4ecd7d7b18e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1348,7 +1348,7 @@ DECLARE_OOXML_TEST(testSmartart, "smartart.docx") sal_Bool bTheme = sal_False; for(int i = 0; i < aGrabBag.getLength(); ++i) { - if (aGrabBag[i].Name == OUString("OOXTheme")) + if (aGrabBag[i].Name == "OOXTheme") { bTheme = sal_True; uno::Reference<xml::dom::XDocument> aThemeDom; @@ -1372,35 +1372,35 @@ DECLARE_OOXML_TEST(testSmartart, "smartart.docx") sal_Bool bData = sal_False, bLayout = sal_False, bQStyle = sal_False, bColor = sal_False, bDrawing = sal_False; for(int i = 0; i < aGrabBag.getLength(); ++i) { - if (aGrabBag[i].Name == OUString("OOXData")) + if (aGrabBag[i].Name == "OOXData") { bData = sal_True; uno::Reference<xml::dom::XDocument> aDataDom; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aDataDom); // PropertyValue of proper type CPPUNIT_ASSERT(aDataDom.get()); // Reference not empty } - else if (aGrabBag[i].Name == OUString("OOXLayout")) + else if (aGrabBag[i].Name == "OOXLayout") { bLayout = sal_True; uno::Reference<xml::dom::XDocument> aLayoutDom; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aLayoutDom); // PropertyValue of proper type CPPUNIT_ASSERT(aLayoutDom.get()); // Reference not empty } - else if (aGrabBag[i].Name == OUString("OOXStyle")) + else if (aGrabBag[i].Name == "OOXStyle") { bQStyle = sal_True; uno::Reference<xml::dom::XDocument> aStyleDom; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aStyleDom); // PropertyValue of proper type CPPUNIT_ASSERT(aStyleDom.get()); // Reference not empty } - else if (aGrabBag[i].Name == OUString("OOXColor")) + else if (aGrabBag[i].Name == "OOXColor") { bColor = sal_True; uno::Reference<xml::dom::XDocument> aColorDom; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aColorDom); // PropertyValue of proper type CPPUNIT_ASSERT(aColorDom.get()); // Reference not empty } - else if (aGrabBag[i].Name == OUString("OOXDrawing")) + else if (aGrabBag[i].Name == "OOXDrawing") { bDrawing = sal_True; uno::Reference<xml::dom::XDocument> aDrawingDom; diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 8e5724619568..3972d451642c 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -666,7 +666,7 @@ SwXFieldmark::CreateXFieldmark(SwDoc & rDoc, ::sw::mark::IMark & rMark) SwXFieldmark::getCheckboxFieldmark() { ::sw::mark::ICheckboxFieldmark* pCheckboxFm = NULL; - if ( getFieldType() == OUString( ODF_FORMCHECKBOX ) ) + if ( getFieldType() == ODF_FORMCHECKBOX ) { // evil #TODO #FIXME casting away the const-ness pCheckboxFm = const_cast<sw::mark::ICheckboxFieldmark*>(dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( GetBookmark())); diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 334387e6ac53..5227be19f271 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1691,7 +1691,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, { for (sal_uInt16 i=0, nEnd = pPrinter->GetPaperBinCount(); i < nEnd; i++ ) { - if (sTmp == OUString ( pPrinter->GetPaperBinName ( i ) ) ) + if (sTmp == pPrinter->GetPaperBinName ( i ) ) { nBin = i; break; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index c87713804cd3..afcddfd3aecd 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2834,7 +2834,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, IDocumentMarkAccess::BOOKMARK ); // jump to bookmark - if( JUMPTO_MARK == eJumpTo && pNewMark->GetName() == OUString(sJmpMark) ) + if( JUMPTO_MARK == eJumpTo && pNewMark->GetName() == sJmpMark ) { bChkJumpMark = sal_True; eJumpTo = JUMPTO_NONE; diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index d876c965e298..fb7646c68774 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -753,7 +753,7 @@ sal_Bool SwMailTransferable::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) throw (uno::RuntimeException) { - return (aFlavor.MimeType == OUString(m_aMimeType)); + return (aFlavor.MimeType == m_aMimeType); } uno::Reference< beans::XPropertySetInfo > SwMailTransferable::getPropertySetInfo( ) throw(uno::RuntimeException) diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index a736545fd232..3a64309f1e0a 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -383,7 +383,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl) if(bInsert) { GetParentSwLabDlg()->TypeIds().push_back(i); - if ( !nLstType && aType == OUString(aItem.aLstType) ) + if ( !nLstType && aType == aItem.aLstType ) nLstType = GetParentSwLabDlg()->TypeIds().size(); } } diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx index 8d73f13fe4f8..2ac92626de3f 100644 --- a/sw/source/ui/uno/SwXFilterOptions.cxx +++ b/sw/source/ui/uno/SwXFilterOptions.cxx @@ -85,7 +85,7 @@ void SwXFilterOptions::setPropertyValues( const uno::Sequence<beans::PropertyV if ( aPropName.equalsAscii( SW_PROP_NAME_STR(UNO_NAME_FILTER_NAME) ) ) rProp.Value >>= sFilterName; - else if ( aPropName == OUString(FILTER_OPTIONS_NAME) ) + else if ( aPropName == FILTER_OPTIONS_NAME ) rProp.Value >>= sFilterOptions; else if ( aPropName == "InputStream" ) rProp.Value >>= xInputStream; @@ -159,7 +159,7 @@ OUString SwXFilterOptions::getImplementationName() throw(uno::RuntimeException) sal_Bool SwXFilterOptions::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { - return rServiceName == OUString(SWFILTEROPTIONSOBJ_SERVICE); + return rServiceName == SWFILTEROPTIONSOBJ_SERVICE; } uno::Sequence< OUString > SwXFilterOptions::getSupportedServiceNames() diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx index d12d44b3bb83..8b7f1190f13c 100644 --- a/test/source/sheet/xdatabaserange.cxx +++ b/test/source/sheet/xdatabaserange.cxx @@ -71,53 +71,53 @@ void XDatabaseRange::testGetSortDescriptor() beans::PropertyValue xProp = xSortDescr[i]; //std::cout << "Prop " << i << " Name: " << OUString(xProp.Name) << std::endl; - if (xProp.Name == OUString("IsSortColumns")) + if (xProp.Name == "IsSortColumns") { sal_Bool bIsSortColumns = sal_True; xProp.Value >>= bIsSortColumns; CPPUNIT_ASSERT(bIsSortColumns == sal_True); } - else if (xProp.Name == OUString("ContainsHeader")) + else if (xProp.Name == "ContainsHeader") { sal_Bool bContainsHeader = sal_True; xProp.Value >>= bContainsHeader; CPPUNIT_ASSERT(bContainsHeader == sal_True); } - else if (xProp.Name == OUString("MaxFieldCount")) + else if (xProp.Name == "MaxFieldCount") { sal_Int32 nMaxFieldCount = 0; xProp.Value >>= nMaxFieldCount; std::cout << "Value: " << nMaxFieldCount << std::endl; } - else if (xProp.Name == OUString("SortFields")) + else if (xProp.Name == "SortFields") { } - else if (xProp.Name == OUString("BindFormatsToContent")) + else if (xProp.Name == "BindFormatsToContent") { sal_Bool bBindFormatsToContent = sal_False; xProp.Value >>= bBindFormatsToContent; CPPUNIT_ASSERT(bBindFormatsToContent == sal_True); } - else if (xProp.Name == OUString("CopyOutputData")) + else if (xProp.Name == "CopyOutputData") { sal_Bool bCopyOutputData = sal_True; xProp.Value >>= bCopyOutputData; CPPUNIT_ASSERT(bCopyOutputData == sal_False); } - else if (xProp.Name == OUString("OutputPosition")) + else if (xProp.Name == "OutputPosition") { } - else if (xProp.Name == OUString("IsUserListEnabled")) + else if (xProp.Name == "IsUserListEnabled") { sal_Bool bIsUserListEnabled = sal_True; xProp.Value >>= bIsUserListEnabled; CPPUNIT_ASSERT(bIsUserListEnabled == sal_False); } - else if (xProp.Name == OUString("UserListIndex")) + else if (xProp.Name == "UserListIndex") { sal_Int32 nUserListIndex = 1; xProp.Value >>= nUserListIndex; diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 315fe9c3e4ea..457f4ca77b11 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -813,8 +813,8 @@ void SAL_CALL XResultSet_impl::setPropertyValue( lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == OUString("IsRowCountFinal") || - aPropertyName == OUString("RowCount") ) + if( aPropertyName == "IsRowCountFinal" || + aPropertyName == "RowCount" ) return; throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } @@ -826,13 +826,13 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue( lang::WrappedTargetException, uno::RuntimeException) { - if( PropertyName == OUString("IsRowCountFinal") ) + if( PropertyName == "IsRowCountFinal" ) { uno::Any aAny; aAny <<= m_bRowCountFinal; return aAny; } - else if ( PropertyName == OUString("RowCount") ) + else if ( PropertyName == "RowCount" ) { uno::Any aAny; sal_Int32 count = sal::static_int_cast<sal_Int32>(m_aItems.size()); @@ -851,7 +851,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == OUString("IsRowCountFinal") ) + if( aPropertyName == "IsRowCountFinal" ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) @@ -860,7 +860,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( m_pIsFinalListeners->addInterface( xListener ); } - else if ( aPropertyName == OUString("RowCount") ) + else if ( aPropertyName == "RowCount" ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) @@ -880,13 +880,13 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener( lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == OUString("IsRowCountFinal") && + if( aPropertyName == "IsRowCountFinal" && m_pIsFinalListeners ) { osl::MutexGuard aGuard( m_aMutex ); m_pIsFinalListeners->removeInterface( aListener ); } - else if ( aPropertyName == OUString("RowCount") && + else if ( aPropertyName == "RowCount" && m_pRowCountListeners ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index ee414b9bb960..ee8a19fca8fc 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -192,7 +192,7 @@ FileProvider::supportsService( const OUString& ServiceName ) throw( RuntimeException ) { - return ServiceName == OUString("com.sun.star.ucb.FileContentProvider"); + return ServiceName == "com.sun.star.ucb.FileContentProvider"; } diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 589f7aabe285..f220f09f44da 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -527,8 +527,8 @@ void SAL_CALL ResultSetBase::setPropertyValue( lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == OUString("IsRowCountFinal") || - aPropertyName == OUString("RowCount") ) + if( aPropertyName == "IsRowCountFinal" || + aPropertyName == "RowCount" ) return; throw beans::UnknownPropertyException(); @@ -541,13 +541,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue( lang::WrappedTargetException, uno::RuntimeException) { - if( PropertyName == OUString("IsRowCountFinal") ) + if( PropertyName == "IsRowCountFinal" ) { uno::Any aAny; aAny <<= m_bRowCountFinal; return aAny; } - else if ( PropertyName == OUString("RowCount") ) + else if ( PropertyName == "RowCount" ) { uno::Any aAny; sal_Int32 count = m_aItems.size(); @@ -566,7 +566,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == OUString("IsRowCountFinal") ) + if( aPropertyName == "IsRowCountFinal" ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) @@ -575,7 +575,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( m_pIsFinalListeners->addInterface( xListener ); } - else if ( aPropertyName == OUString("RowCount") ) + else if ( aPropertyName == "RowCount" ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) @@ -595,13 +595,13 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener( lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == OUString("IsRowCountFinal") && + if( aPropertyName == "IsRowCountFinal" && m_pIsFinalListeners ) { osl::MutexGuard aGuard( m_aMutex ); m_pIsFinalListeners->removeInterface( aListener ); } - else if ( aPropertyName == OUString("RowCount") && + else if ( aPropertyName == "RowCount" && m_pRowCountListeners ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index ca4e57839389..5c7f78f35f87 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -186,7 +186,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc for (i = 0; i < n; i++) { PropertyChangeEvent evt (rEvent[i]); - if (evt.PropertyName == OUString("DocumentHeader")) + if (evt.PropertyName == "DocumentHeader") { Sequence<DocumentHeaderField> aHead; if (evt.NewValue >>= aHead) @@ -211,7 +211,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc m_xLockBytes->SetStreamValid_Impl(); } - else if (evt.PropertyName == OUString("PresentationURL")) + else if (evt.PropertyName == "PresentationURL") { OUString aUrl; if (evt.NewValue >>= aUrl) @@ -224,7 +224,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc } } } - else if (evt.PropertyName == OUString("MediaType")) + else if (evt.PropertyName == "MediaType") { OUString aContentType; if (evt.NewValue >>= aContentType) diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 92d28162e354..a5dfdce11d69 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -562,25 +562,25 @@ OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const sal_uLong StyleSettings::ImplNameToSymbolsStyle( const OUString &rName ) const { - if ( rName == OUString("default") ) + if ( rName == "default" ) return STYLE_SYMBOLS_DEFAULT; - else if ( rName == OUString("hicontrast") ) + else if ( rName == "hicontrast" ) return STYLE_SYMBOLS_HICONTRAST; - else if ( rName == OUString("industrial") ) + else if ( rName == "industrial" ) return STYLE_SYMBOLS_TANGO; // industrial is dead - else if ( rName == OUString("crystal") ) + else if ( rName == "crystal" ) return STYLE_SYMBOLS_CRYSTAL; - else if ( rName == OUString("tango") ) + else if ( rName == "tango" ) return STYLE_SYMBOLS_TANGO; - else if ( rName == OUString("oxygen") ) + else if ( rName == "oxygen" ) return STYLE_SYMBOLS_OXYGEN; - else if ( rName == OUString("classic") ) + else if ( rName == "classic" ) return STYLE_SYMBOLS_CLASSIC; - else if ( rName == OUString("human") ) + else if ( rName == "human" ) return STYLE_SYMBOLS_HUMAN; - else if ( rName == OUString("sifr") ) + else if ( rName == "sifr" ) return STYLE_SYMBOLS_SIFR; - else if ( rName == OUString("tango_testing") ) + else if ( rName == "tango_testing" ) return STYLE_SYMBOLS_TANGO_TESTING; return STYLE_SYMBOLS_AUTO; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 27df84f358c3..91d790650c55 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -7909,7 +7909,7 @@ void Window::SetCursor( Cursor* pCursor ) void Window::SetText( const OUString& rStr ) { - if (rStr == OUString(mpWindowImpl->maText)) + if (rStr == mpWindowImpl->maText) return; DBG_CHKTHIS( Window, ImplDbgCheckWindow ); diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index 75ae7b4a8370..a257d1e8da68 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -521,8 +521,8 @@ void SAL_CALL ResultSetBase::setPropertyValue( { (void)aValue; - if( aPropertyName == OUString( "IsRowCountFinal" ) || - aPropertyName == OUString( "RowCount" ) ) + if( aPropertyName == "IsRowCountFinal" || + aPropertyName == "RowCount" ) return; throw beans::UnknownPropertyException(); @@ -535,13 +535,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue( lang::WrappedTargetException, uno::RuntimeException) { - if( PropertyName == OUString( "IsRowCountFinal" ) ) + if( PropertyName == "IsRowCountFinal" ) { uno::Any aAny; aAny <<= m_bRowCountFinal; return aAny; } - else if ( PropertyName == OUString( "RowCount" ) ) + else if ( PropertyName == "RowCount" ) { uno::Any aAny; sal_Int32 count = m_aItems.size(); @@ -560,7 +560,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == OUString( "IsRowCountFinal" ) ) + if( aPropertyName == "IsRowCountFinal" ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) @@ -569,7 +569,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( m_pIsFinalListeners->addInterface( xListener ); } - else if ( aPropertyName == OUString( "RowCount" ) ) + else if ( aPropertyName == "RowCount" ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) @@ -589,13 +589,13 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener( lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == OUString( "IsRowCountFinal" ) && + if( aPropertyName == "IsRowCountFinal" && m_pIsFinalListeners ) { osl::MutexGuard aGuard( m_aMutex ); m_pIsFinalListeners->removeInterface( aListener ); } - else if ( aPropertyName == OUString( "RowCount" ) && + else if ( aPropertyName == "RowCount" && m_pRowCountListeners ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index dc303f8abe7c..9d73fc358431 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -460,17 +460,17 @@ void XMLChartExportPropertyMapper::handleSpecialItem( { OUString aServiceName; rProperty.maValue >>= aServiceName; - if (aServiceName == OUString("com.sun.star.chart2.LinearRegressionCurve")) + if (aServiceName == "com.sun.star.chart2.LinearRegressionCurve") sValueBuffer.append( GetXMLToken( XML_LINEAR )); - else if (aServiceName == OUString("com.sun.star.chart2.LogarithmicRegressionCurve")) + else if (aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve") sValueBuffer.append( GetXMLToken( XML_LOGARITHMIC )); - else if (aServiceName == OUString("com.sun.star.chart2.ExponentialRegressionCurve")) + else if (aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve") sValueBuffer.append( GetXMLToken( XML_EXPONENTIAL )); - else if (aServiceName == OUString("com.sun.star.chart2.PotentialRegressionCurve")) + else if (aServiceName == "com.sun.star.chart2.PotentialRegressionCurve") sValueBuffer.append( GetXMLToken( XML_POWER )); - else if (aServiceName == OUString("com.sun.star.chart2.PolynomialRegressionCurve")) + else if (aServiceName == "com.sun.star.chart2.PolynomialRegressionCurve") sValueBuffer.append( GetXMLToken( XML_POLYNOMIAL )); - else if (aServiceName == OUString("com.sun.star.chart2.MovingAverageRegressionCurve")) + else if (aServiceName == "com.sun.star.chart2.MovingAverageRegressionCurve") sValueBuffer.append( GetXMLToken( XML_MOVING_AVERAGE )); } break; diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index 95ba032a9610..164acb28bc08 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -84,7 +84,7 @@ void SAL_CALL ImplXMLSignatureListener::endDocument( ) void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) { - if ( aName == OUString("Signature") ) + if ( aName == "Signature" ) { maStartVerifySignatureElementListener.Call( (void*)&xAttribs ); } |