diff options
28 files changed, 143 insertions, 147 deletions
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 1b2499386911..c257a3925775 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -135,7 +135,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( bool bIncludeAllTypes = false; for ( sal_Int32 i=0; i<typeFilterCount; ++i, ++typeFilter ) { - if ( typeFilter->equalsAsciiL( "%", 1 ) ) + if ( typeFilter->startsWith( "%" ) ) { bIncludeAllTypes = true; break; @@ -163,7 +163,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( aCatalogFilter = m_pConnection->getCatalogRestriction(); // similar for schema Any aSchemaFilter; - if ( schemaPattern.equalsAsciiL( "%", 1 ) ) + if ( schemaPattern.startsWith( "%" ) ) aSchemaFilter = m_pConnection->getSchemaRestriction(); else aSchemaFilter <<= schemaPattern; diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 58d102dbe54e..dfa656c47ea1 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -168,7 +168,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto // first, filter for the table names sal_Int32 nTableFilterCount = _tableFilter.getLength(); - sal_Bool dontFilterTableNames = ( ( nTableFilterCount == 1 ) && _tableFilter[0].equalsAsciiL( "%", 1 ) ); + sal_Bool dontFilterTableNames = ( ( nTableFilterCount == 1 ) && _tableFilter[0].startsWith( "%" ) ); if( dontFilterTableNames ) { aFilteredTables = _unfilteredTables; @@ -198,7 +198,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto // second, filter for the table types sal_Int32 nTableTypeFilterCount = _tableTypeFilter.getLength(); - sal_Bool dontFilterTableTypes = ( ( nTableTypeFilterCount == 1 ) && _tableTypeFilter[0].equalsAsciiL( "%", 1 ) ); + sal_Bool dontFilterTableTypes = ( ( nTableTypeFilterCount == 1 ) && _tableTypeFilter[0].startsWith( "%" ) ); dontFilterTableTypes = dontFilterTableTypes || ( nTableTypeFilterCount == 0 ); // (for TableTypeFilter, unlike TableFilter, "empty" means "do not filter at all") if ( !dontFilterTableTypes ) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index d04681367ffb..36f8615ea003 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -217,7 +217,7 @@ DBG_NAME(OTableSubscriptionPage) } else { - if ((1 == _rTableFilter.getLength()) && _rTableFilter[0].equalsAsciiL("%", 1)) + if ((1 == _rTableFilter.getLength()) && _rTableFilter[0].startsWith("%")) { // all tables visible CheckAll(sal_True); } diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 3b3c6a5c08b9..64cf32e23441 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -1054,7 +1054,7 @@ void MigrationImpl::runServices() { OUString sExtension(sToolbarName.copy(nIndex)); OUString sToolbarResourceName(sToolbarName.copy(0, nIndex)); - if (!sToolbarResourceName.isEmpty() && sExtension.equalsAsciiL(".xml", 4)) + if (!sToolbarResourceName.isEmpty() && sExtension.startsWith(".xml")) aModuleInfo.m_vToolbars.push_back(sToolbarResourceName); } } diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 223decab3997..b6b1374def56 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -566,7 +566,7 @@ UpdateInformationProvider::getUpdateInformationEnumeration( if( xElement.is() ) { - if( xElement->getNodeName().equalsAsciiL("feed", 4) ) + if( xElement->getNodeName().startsWith("feed") ) { OUString aXPathExpression; diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 54bc4c2b088d..9e2003ffb09c 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -263,11 +263,11 @@ long ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { - if ( rControlCommand.Command.equalsAsciiL( "SetText", 7 )) + if ( rControlCommand.Command.startsWith( "SetText" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Text")) { OUString aText; rControlCommand.Arguments[i].Value >>= aText; @@ -279,11 +279,11 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "SetList", 7 )) + else if ( rControlCommand.Command.startsWith( "SetList" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "List", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "List" )) { Sequence< OUString > aList; m_pComboBox->Clear(); @@ -304,13 +304,13 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "AddEntry", 8 )) + else if ( rControlCommand.Command.startsWith( "AddEntry" )) { sal_uInt16 nPos( COMBOBOX_APPEND ); OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) { if ( rControlCommand.Arguments[i].Value >>= aText ) m_pComboBox->InsertEntry( aText, nPos ); @@ -318,13 +318,13 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "InsertEntry", 11 )) + else if ( rControlCommand.Command.startsWith( "InsertEntry" )) { sal_uInt16 nPos( COMBOBOX_APPEND ); OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Pos" )) { sal_Int32 nTmpPos = 0; if ( rControlCommand.Arguments[i].Value >>= nTmpPos ) @@ -334,17 +334,17 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f nPos = sal_uInt16( nTmpPos ); } } - else if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + else if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) rControlCommand.Arguments[i].Value >>= aText; } m_pComboBox->InsertEntry( aText, nPos ); } - else if ( rControlCommand.Command.equalsAsciiL( "RemoveEntryPos", 14 )) + else if ( rControlCommand.Command.startsWith( "RemoveEntryPos" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Pos" )) { sal_Int32 nPos( -1 ); if ( rControlCommand.Arguments[i].Value >>= nPos ) @@ -356,11 +356,11 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "RemoveEntryText", 15 )) + else if ( rControlCommand.Command.startsWith( "RemoveEntryText" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Text")) { OUString aText; if ( rControlCommand.Arguments[i].Value >>= aText ) @@ -369,11 +369,11 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "SetDropDownLines", 16 )) + else if ( rControlCommand.Command.startsWith( "SetDropDownLines" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Lines", 5 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Lines" )) { sal_Int32 nValue( 5 ); rControlCommand.Arguments[i].Value >>= nValue; @@ -382,11 +382,11 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "SetBackgroundColor", 18 )) + else if ( rControlCommand.Command.startsWith( "SetBackgroundColor" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Color", 5 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Color" )) { com::sun::star::util::Color aColor(0); if ( rControlCommand.Arguments[i].Value >>= aColor ) @@ -398,11 +398,11 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "SetTextColor", 12 )) + else if ( rControlCommand.Command.startsWith( "SetTextColor" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Color", 5 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Color" )) { com::sun::star::util::Color aColor(0); if ( rControlCommand.Arguments[i].Value >>= aColor ) diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index b87987b8d1eb..9a5e6e7bb249 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -214,11 +214,11 @@ long DropdownToolbarController::PreNotify( NotifyEvent& /*rNEvt*/ ) void DropdownToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { - if ( rControlCommand.Command.equalsAsciiL( "SetList", 7 )) + if ( rControlCommand.Command.startsWith( "SetList" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "List", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "List" )) { Sequence< OUString > aList; m_pListBoxControl->Clear(); @@ -241,13 +241,13 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "AddEntry", 8 )) + else if ( rControlCommand.Command.startsWith( "AddEntry" )) { sal_uInt16 nPos( LISTBOX_APPEND ); OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) { if ( rControlCommand.Arguments[i].Value >>= aText ) m_pListBoxControl->InsertEntry( aText, nPos ); @@ -255,13 +255,13 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "InsertEntry", 11 )) + else if ( rControlCommand.Command.startsWith( "InsertEntry" )) { sal_uInt16 nPos( LISTBOX_APPEND ); OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Pos" )) { sal_Int32 nTmpPos = 0; if ( rControlCommand.Arguments[i].Value >>= nTmpPos ) @@ -271,17 +271,17 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f nPos = sal_uInt16( nTmpPos ); } } - else if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + else if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) rControlCommand.Arguments[i].Value >>= aText; } m_pListBoxControl->InsertEntry( aText, nPos ); } - else if ( rControlCommand.Command.equalsAsciiL( "RemoveEntryPos", 14 )) + else if ( rControlCommand.Command.startsWith( "RemoveEntryPos" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Pos" )) { sal_Int32 nPos( -1 ); if ( rControlCommand.Arguments[i].Value >>= nPos ) @@ -293,11 +293,11 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "RemoveEntryText", 15 )) + else if ( rControlCommand.Command.startsWith( "RemoveEntryText" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) { OUString aText; if ( rControlCommand.Arguments[i].Value >>= aText ) @@ -306,11 +306,11 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f } } } - else if ( rControlCommand.Command.equalsAsciiL( "SetDropDownLines", 16 )) + else if ( rControlCommand.Command.startsWith( "SetDropDownLines" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Lines", 5 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Lines" )) { sal_Int32 nValue( 5 ); rControlCommand.Arguments[i].Value >>= nValue; diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index d4bb63311f63..251f5b508fe0 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -218,11 +218,11 @@ long EditToolbarController::PreNotify( NotifyEvent& rNEvt ) void EditToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { - if ( rControlCommand.Command.equalsAsciiL( "SetText", 7 )) + if ( rControlCommand.Command.startsWith( "SetText" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) { OUString aText; rControlCommand.Arguments[i].Value >>= aText; diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 0abd71760c19..26a39196ee2d 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -135,12 +135,12 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star { SolarMutexGuard aSolarMutexGuard; // i73486 to be downward compatible use old and "wrong" also! - if (( rControlCommand.Command.equalsAsciiL( "SetImag", 7 )) || - ( rControlCommand.Command.equalsAsciiL( "SetImage", 8 )) ) + if (( rControlCommand.Command.startsWith( "SetImag" )) || + ( rControlCommand.Command.startsWith( "SetImage" )) ) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "URL", 3 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "URL" )) { OUString aURL; rControlCommand.Arguments[i].Value >>= aURL; diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 26480d1d7768..687e2658616f 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -346,11 +346,11 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: OUString aStep; bool bFloatValue( false ); - if ( rControlCommand.Command.equalsAsciiL( "SetStep", 7 )) + if ( rControlCommand.Command.startsWith( "SetStep" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Step", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Step" )) { sal_Int32 nValue; double fValue; @@ -362,11 +362,11 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: } } } - else if ( rControlCommand.Command.equalsAsciiL( "SetValue", 8 )) + else if ( rControlCommand.Command.startsWith( "SetValue" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Value", 5 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Value" )) { sal_Int32 nValue; double fValue; @@ -381,7 +381,7 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: } } } - else if ( rControlCommand.Command.equalsAsciiL( "SetValues", 9 )) + else if ( rControlCommand.Command.startsWith( "SetValues" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { @@ -392,30 +392,30 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: OUString aName = rControlCommand.Arguments[i].Name; if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat )) { - if ( aName.equalsAsciiL( "Value", 5 )) + if ( aName.startsWith( "Value" )) { aValue = bFloat ? OUString::number( fValue ) : OUString::number( nValue ); bFloatValue = bFloat; } - else if ( aName.equalsAsciiL( "Step", 4 )) + else if ( aName.startsWith( "Step" )) aStep = bFloat ? OUString::number( fValue ) : OUString::number( nValue ); - else if ( aName.equalsAsciiL( "LowerLimit", 10 )) + else if ( aName.startsWith( "LowerLimit" )) aMin = bFloat ? OUString::number( fValue ) : OUString::number( nValue ); - else if ( aName.equalsAsciiL( "UpperLimit", 10 )) + else if ( aName.startsWith( "UpperLimit" )) aMax = bFloat ? OUString::number( fValue ) : OUString::number( nValue ); } - else if ( aName.equalsAsciiL( "OutputFormat", 12 )) + else if ( aName.startsWith( "OutputFormat" )) rControlCommand.Arguments[i].Value >>= m_aOutFormat; } } - else if ( rControlCommand.Command.equalsAsciiL( "SetLowerLimit", 13 )) + else if ( rControlCommand.Command.startsWith( "SetLowerLimit" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "LowerLimit", 10 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "LowerLimit" )) { sal_Int32 nValue; double fValue; @@ -427,11 +427,11 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: } } } - else if ( rControlCommand.Command.equalsAsciiL( "SetUpperLimit", 13 )) + else if ( rControlCommand.Command.startsWith( "SetUpperLimit" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "UpperLimit", 10 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "UpperLimit" )) { sal_Int32 nValue; double fValue; @@ -443,11 +443,11 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: } } } - else if ( rControlCommand.Command.equalsAsciiL( "SetOutputFormat", 15 )) + else if ( rControlCommand.Command.startsWith( "SetOutputFormat" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "OutputFormat", 10 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "OutputFormat" )) { rControlCommand.Arguments[i].Value >>= m_aOutFormat; break; diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index b015338148d2..27ec3940199d 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -142,11 +142,11 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta if (( m_eStyle == STYLE_DROPDOWNBUTTON ) || ( m_eStyle == STYLE_TOGGLE_DROPDOWNBUTTON )) { - if ( rControlCommand.Command.equalsAsciiL( "SetList", 7 )) + if ( rControlCommand.Command.startsWith( "SetList" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "List", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "List" )) { Sequence< OUString > aList; m_aDropdownMenuList.clear(); @@ -167,11 +167,11 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta } } } - else if ( rControlCommand.Command.equalsAsciiL( "CheckItemPos", 12 )) + else if ( rControlCommand.Command.startsWith( "CheckItemPos" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Pos" )) { sal_Int32 nPos( -1 ); @@ -194,12 +194,12 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta } } } - else if ( rControlCommand.Command.equalsAsciiL( "AddEntry", 8 )) + else if ( rControlCommand.Command.startsWith( "AddEntry" )) { OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) { if ( rControlCommand.Arguments[i].Value >>= aText ) m_aDropdownMenuList.push_back( aText ); @@ -207,14 +207,14 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta } } } - else if ( rControlCommand.Command.equalsAsciiL( "InsertEntry", 11 )) + else if ( rControlCommand.Command.startsWith( "InsertEntry")) { sal_Int32 nPos( COMBOBOX_APPEND ); sal_Int32 nSize = sal_Int32( m_aDropdownMenuList.size() ); OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Pos" )) { sal_Int32 nTmpPos = 0; if ( rControlCommand.Arguments[i].Value >>= nTmpPos ) @@ -223,7 +223,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta nPos = nTmpPos; } } - else if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + else if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) rControlCommand.Arguments[i].Value >>= aText; } @@ -231,11 +231,11 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta aIter += nPos; m_aDropdownMenuList.insert( aIter, aText ); } - else if ( rControlCommand.Command.equalsAsciiL( "RemoveEntryPos", 14 )) + else if ( rControlCommand.Command.startsWith( "RemoveEntryPos" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Pos" )) { sal_Int32 nPos( -1 ); if ( rControlCommand.Arguments[i].Value >>= nPos ) @@ -249,11 +249,11 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta } } } - else if ( rControlCommand.Command.equalsAsciiL( "RemoveEntryText", 15 )) + else if ( rControlCommand.Command.startsWith( "RemoveEntryText" )) { for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { - if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) + if ( rControlCommand.Arguments[i].Name.startsWith( "Text" )) { OUString aText; if ( rControlCommand.Arguments[i].Value >>= aText ) diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 29263c7f17a4..dc659100c6cc 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -130,7 +130,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th PropertyValue aPropValue; if ( aArguments[i] >>= aPropValue ) { - if ( aPropValue.Name.equalsAsciiL( "PopupMode", 9 )) + if ( aPropValue.Name.startsWith( "PopupMode" )) { aPropValue.Value >>= bPopupMode; break; diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index 1a7822b58364..7c7261ed1743 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -113,18 +113,18 @@ sal_Bool AddonsToolBoxFactory::hasButtonsInContext( const Sequence< PropertyValue >& rPropSeq = rPropSeqSeq[i]; for ( sal_uInt32 j = 0; j < (sal_uInt32)rPropSeq.getLength(); j++ ) { - if ( rPropSeq[j].Name.equalsAsciiL( "Context", 7 )) + if ( rPropSeq[j].Name.startsWith( "Context" )) { OUString aContextList; if ( rPropSeq[j].Value >>= aContextList ) bIsCorrectContext = IsCorrectContext( aModuleIdentifier, aContextList ); nPropChecked++; } - else if ( rPropSeq[j].Name.equalsAsciiL( "URL", 3 )) + else if ( rPropSeq[j].Name.startsWith( "URL" )) { OUString aURL; rPropSeq[j].Value >>= aURL; - bIsButton = !aURL.equalsAsciiL( "private:separator", 17 ); + bIsButton = !aURL.startsWith( "private:separator" ); nPropChecked++; } diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 475c4897187c..954bce419b28 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1020,7 +1020,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) OUString ORptExport::convertFormula(const OUString& _sFormula) { OUString sFormula = _sFormula; - if ( _sFormula.equalsAsciiL("rpt:",4) ) + if ( _sFormula.startsWith("rpt:") ) sFormula = ""; return sFormula; } diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index e6cc71fc26b5..21a453f50c59 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -73,7 +73,7 @@ void ScFormulaOptions::GetDefaultFormulaSeparators( const Locale& rLocale = *ScGlobal::GetLocale(); const OUString& rLang = rLocale.Language; - if (rLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ru"))) + if (rLang.startsWith("ru")) // Don't do automatic guess for these languages, and fall back to // the old separator set. return; @@ -97,7 +97,7 @@ void ScFormulaOptions::GetDefaultFormulaSeparators( cListSep = ','; // Special case for de_CH locale. - if (rLocale.Language.equalsAsciiL("de", 2) && rLocale.Country.equalsAsciiL("CH", 2)) + if (rLocale.Language.startsWith("de") && rLocale.Country.startsWith("CH")) cListSep = ';'; // by default, the parameter separator equals the locale-specific diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index fd189ffd46bd..db4b1ee3292f 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -1816,7 +1816,7 @@ SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix pContext = new ScXMLDependingsContext(GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper); else if (IsXMLToken(rLocalName, XML_DELETIONS)) pContext = new ScXMLDeletionsContext(GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper); - else if (IsXMLToken(rLocalName, XML_CUT_OFFS) || rLocalName.equalsAsciiL("cut_offs", 8)) + else if (IsXMLToken(rLocalName, XML_CUT_OFFS) || rLocalName.startsWith("cut_offs")) pContext = new ScXMLCutOffsContext(GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper); else { diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index bc55a0b508a0..fc127f883242 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -427,8 +427,8 @@ void ScXMLContentValidationContext::EndElement() for( sal_Int32 i = 0; i < nLength; i++ ) { // #i47525# must allow "MacroName" or "Script" - if ( aValues[i].Name.equalsAsciiL( "MacroName", sizeof("MacroName")-1 ) || - aValues[i].Name.equalsAsciiL( "Script", sizeof("Script")-1 ) ) + if ( aValues[i].Name.startsWith( "MacroName" ) || + aValues[i].Name.startsWith( "Script" ) ) { aValues[i].Value >>= sErrorTitle; break; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index aa134fda54e0..5ed08dfa70f6 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2148,7 +2148,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x if (bGetMerge) bGetMerge = GetMerged(pAddresses, xTable); pCellStyles->AddRangeStyleName(*pAddresses, nIndex, false, nValidationIndex, nNumberFormat); - if (!sStyleName.equalsAsciiL("Default", 7) || nValidationIndex != -1) + if (!sStyleName.startsWith("Default") || nValidationIndex != -1) { pSharedData->SetLastColumn(nTable, pAddresses->EndColumn); pSharedData->SetLastRow(nTable, pAddresses->EndRow); diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index d34e64b01dd3..6f901ced2534 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2761,7 +2761,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) OUString aReplace(pAuto->GetStartDoubleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getDoubleQuotationMarkStart(); - if (!aReplace.equalsAsciiL("\"", 1)) + if (!aReplace.startsWith("\"")) aString = aString.replaceAll( aReplace, OUString("\"")); @@ -2769,7 +2769,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) aReplace = OUString(pAuto->GetEndDoubleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getDoubleQuotationMarkEnd(); - if (!aReplace.equalsAsciiL("\"", 1)) + if (!aReplace.startsWith("\"")) aString = aString.replaceAll( aReplace, OUString("\"")); @@ -2777,7 +2777,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) aReplace = OUString(pAuto->GetStartSingleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getQuotationMarkStart(); - if (!aReplace.equalsAsciiL("'", 1)) + if (!aReplace.startsWith("'")) aString = aString.replaceAll( aReplace, OUString("'")); @@ -2785,7 +2785,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) aReplace = OUString(pAuto->GetEndSingleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getQuotationMarkEnd(); - if (!aReplace.equalsAsciiL("'", 1)) + if (!aReplace.startsWith("'")) aString = aString.replaceAll( aReplace, OUString("'")); diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 66d54208fd86..7fdde8e0a71c 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -602,8 +602,8 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util if ( pDispatch && ( - (aURL.Protocol.equalsAsciiL( ".uno:", 5 ) && aURL.Path == aDispatchURL.Path) || - (aURL.Protocol.equalsAsciiL( "slot:", 5 ) && aURL.Path.toInt32() == GetId()) + (aURL.Protocol.startsWith( ".uno:" ) && aURL.Path == aDispatchURL.Path) || + (aURL.Protocol.startsWith( "slot:" ) && aURL.Path.toInt32() == GetId()) ) ) { @@ -629,17 +629,17 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util for( sal_Int32 n=0; n<nCount; n++ ) { const ::com::sun::star::beans::PropertyValue& rProp = aArgs[n]; - if( rProp.Name.equalsAsciiL("SynchronMode",12)) + if( rProp.Name.startsWith("SynchronMode")) { if( rProp.Value >>=bTemp ) nCall = bTemp ? SFX_CALLMODE_SYNCHRON : SFX_CALLMODE_ASYNCHRON; } - else if( rProp.Name.equalsAsciiL("Bookmark",8)) + else if( rProp.Name.startsWith("Bookmark")) { nMarkArg = n; aAddArgs.push_back( aArgs[n] ); } - else if( rProp.Name.equalsAsciiL("KeyModifier",11)) + else if( rProp.Name.startsWith("KeyModifier")) rProp.Value >>= nModifier; else aAddArgs.push_back( aArgs[n] ); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 23fd6de0beb0..10e950fa0430 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -889,9 +889,9 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 { for ( sal_Int32 n = 0; n < aPropSeq.getLength(); n++ ) { - if ( aPropSeq[n].Name.equalsAsciiL( "Name", 4 )) + if ( aPropSeq[n].Name.startsWith( "Name" )) aPropSeq[n].Value >>= aName; - else if ( aPropSeq[n].Name.equalsAsciiL( "LineDash", 8 )) + else if ( aPropSeq[n].Name.startsWith( "LineDash" )) { if ( aPropSeq[n].Value >>= aLineDash ) bLineDash = true; diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 712f2d296c92..5e0bdb201a6c 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -599,7 +599,7 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang const PropertyChangeEvent& rEvt = rEvents.getConstArray()[i]; Reference< XControlModel > xModel( rEvt.Source, UNO_QUERY ); sal_Bool bOwnModel = (XControlModel*)xModel.get() == (XControlModel*)getModel().get(); - if ( bOwnModel && rEvt.PropertyName.equalsAsciiL( "ImageURL", 8 )) + if ( bOwnModel && rEvt.PropertyName.startsWith( "ImageURL" )) { OUString aImageURL; Reference< graphic::XGraphic > xGraphic; diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index f597c6457dfb..bf34bec5d964 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -269,12 +269,12 @@ void UnoControl::ImplSetPeerProperty( const OUString& rPropName, const Any& rVal { // We now support a mapping for language dependent properties. This is the // central method to implement it. - if (( rPropName.equalsAsciiL( "Text", 4 )) || - ( rPropName.equalsAsciiL( "Label", 5 )) || - ( rPropName.equalsAsciiL( "Title", 5 )) || - ( rPropName.equalsAsciiL( "HelpText", 8 )) || - ( rPropName.equalsAsciiL( "CurrencySymbol", 14 )) || - ( rPropName.equalsAsciiL( "StringItemList", 14 )) ) + if (( rPropName.startsWith( "Text" )) || + ( rPropName.startsWith( "Label" )) || + ( rPropName.startsWith( "Title" )) || + ( rPropName.startsWith( "HelpText" )) || + ( rPropName.startsWith( "CurrencySymbol" )) || + ( rPropName.startsWith( "StringItemList" )) ) { OUString aValue; uno::Sequence< OUString > aSeqValue; @@ -505,7 +505,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent // Detect changes on our resource resolver which invalidates // automatically some language dependent properties. - if ( pEvents->PropertyName.equalsAsciiL( "ResourceResolver", 16 )) + if ( pEvents->PropertyName.startsWith( "ResourceResolver" )) { Reference< resource::XStringResourceResolver > xStrResolver; if ( pEvents->NewValue >>= xStrResolver ) diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index bd88a6fbf4b6..fcd5e25e5985 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -167,7 +167,7 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType ) rtl_TextEncoding aEncoding = RTL_TEXTENCODING_DONTKNOW; OUString aMimeType( rMimeType.toAsciiLowerCase() ); sal_Int32 nIndex = 0; - if( aMimeType.getToken( 0, ';', nIndex ).equalsAsciiL( "text/plain" , 10 ) ) + if( aMimeType.getToken( 0, ';', nIndex ).startsWith( "text/plain" ) ) { if( aMimeType.getLength() == 10 ) // only "text/plain" aEncoding = RTL_TEXTENCODING_ISO_8859_1; @@ -177,7 +177,7 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType ) { OUString aToken = aMimeType.getToken( 0, ';', nIndex ); sal_Int32 nPos = 0; - if( aToken.getToken( 0, '=', nPos ).equalsAsciiL( "charset", 7 ) ) + if( aToken.getToken( 0, '=', nPos ).startsWith( "charset" ) ) { OString aEncToken = OUStringToOString( aToken.getToken( 0, '=', nPos ), RTL_TEXTENCODING_ISO_8859_1 ); aEncoding = rtl_getTextEncodingFromUnixCharset( aEncToken.getStr() ); @@ -1051,7 +1051,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ OUStringToOString( rType, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif - if( rType.equalsAsciiL( "text/plain;charset=utf-16", 25 ) ) + if( rType.startsWith( "text/plain;charset=utf-16" ) ) { // lets see if we have UTF16 else try to find something convertible if( it->second->m_aTypes.getLength() && ! it->second->m_bHaveUTF16 ) @@ -1105,7 +1105,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ } } } - else if( rType.equalsAsciiL( "image/bmp", 9 ) ) + else if( rType.startsWith( "image/bmp" ) ) { // #i83376# try if someone has the data in image/bmp already before // doing the PIXMAP stuff (e.g. the gimp has this) @@ -1350,7 +1350,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > pFlavors->MimeType = convertTypeFromNative( *pAtoms, selection, nFormat ); pFlavors->DataType = getCppuType( (Sequence< sal_Int8 >*)0 ); sal_Int32 nIndex = 0; - if( pFlavors->MimeType.getToken( 0, ';', nIndex ).equalsAsciiL( "text/plain", 10 ) ) + if( pFlavors->MimeType.getToken( 0, ';', nIndex ).startsWith( "text/plain" ) ) { OUString aToken(pFlavors->MimeType.getToken( 0, ';', nIndex )); // omit text/plain;charset=unicode since it is not well defined diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 5722e77c6895..02bc33a7e843 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -193,8 +193,7 @@ void XMLImageMapExport::ExportMapEntry( mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, - sTargt.equalsAsciiL( "_blank", sizeof("_blank")-1 ) - ? XML_NEW : XML_REPLACE ); + sTargt.startsWith( "_blank" ) ? XML_NEW : XML_REPLACE ); } // name diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index 868162444ccc..4d496a7b5940 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -242,7 +242,7 @@ void XMLEventExport::ExportEvent( } else { - if (! sType.equalsAsciiL("None", sizeof("None")-1)) + if (! sType.startsWith("None")) { OSL_FAIL("unknown event type returned by API"); // unknown type -> error (ignore) diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 927f4cc03d47..47b5a6783c3b 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -2716,8 +2716,7 @@ void XMLTextFieldExport::ProcessBibliographyData( sal_Int32 nLength = aValues.getLength(); for (sal_Int32 i = 0; i < nLength; i++) { - if (aValues[i].Name.equalsAsciiL("BibiliographicType", - sizeof("BibiliographicType")-1)) + if (aValues[i].Name.startsWith("BibiliographicType")) { sal_Int16 nTypeId = 0; aValues[i].Value >>= nTypeId; @@ -3328,128 +3327,127 @@ enum XMLTokenEnum XMLTextFieldExport::MapBibliographyFieldName(OUString sName) { enum XMLTokenEnum eName = XML_TOKEN_INVALID; - if (sName.equalsAsciiL("Identifier", sizeof("Identifier")-1)) + if (sName.startsWith("Identifier")) { eName = XML_IDENTIFIER; } - else if (sName.equalsAsciiL("BibiliographicType", - sizeof("BibiliographicType")-1)) + else if (sName.startsWith("BibiliographicType")) { eName = XML_BIBLIOGRAPHY_TYPE; } - else if (sName.equalsAsciiL("Address", sizeof("Address")-1)) + else if (sName.startsWith("Address")) { eName = XML_ADDRESS; } - else if (sName.equalsAsciiL("Annote", sizeof("Annote")-1)) + else if (sName.startsWith("Annote")) { eName = XML_ANNOTE; } - else if (sName.equalsAsciiL("Author", sizeof("Author")-1)) + else if (sName.startsWith("Author")) { eName = XML_AUTHOR; } - else if (sName.equalsAsciiL("Booktitle", sizeof("Booktitle")-1)) + else if (sName.startsWith("Booktitle")) { eName = XML_BOOKTITLE; } - else if (sName.equalsAsciiL("Chapter", sizeof("Chapter")-1)) + else if (sName.startsWith("Chapter")) { eName = XML_CHAPTER; } - else if (sName.equalsAsciiL("Edition", sizeof("Edition")-1)) + else if (sName.startsWith("Edition")) { eName = XML_EDITION; } - else if (sName.equalsAsciiL("Editor", sizeof("Editor")-1)) + else if (sName.startsWith("Editor")) { eName = XML_EDITOR; } - else if (sName.equalsAsciiL("Howpublished", sizeof("Howpublished")-1)) + else if (sName.startsWith("Howpublished")) { eName = XML_HOWPUBLISHED; } - else if (sName.equalsAsciiL("Institution", sizeof("Institution")-1)) + else if (sName.startsWith("Institution")) { eName = XML_INSTITUTION; } - else if (sName.equalsAsciiL("Journal", sizeof("Journal")-1)) + else if (sName.startsWith("Journal")) { eName = XML_JOURNAL; } - else if (sName.equalsAsciiL("Month", sizeof("Month")-1)) + else if (sName.startsWith("Month")) { eName = XML_MONTH; } - else if (sName.equalsAsciiL("Note", sizeof("Note")-1)) + else if (sName.startsWith("Note")) { eName = XML_NOTE; } - else if (sName.equalsAsciiL("Number", sizeof("Number")-1)) + else if (sName.startsWith("Number")) { eName = XML_NUMBER; } - else if (sName.equalsAsciiL("Organizations", sizeof("Organizations")-1)) + else if (sName.startsWith("Organizations")) { eName = XML_ORGANIZATIONS; } - else if (sName.equalsAsciiL("Pages", sizeof("Pages")-1)) + else if (sName.startsWith("Pages")) { eName = XML_PAGES; } - else if (sName.equalsAsciiL("Publisher", sizeof("Publisher")-1)) + else if (sName.startsWith("Publisher")) { eName = XML_PUBLISHER; } - else if (sName.equalsAsciiL("School", sizeof("School")-1)) + else if (sName.startsWith("School")) { eName = XML_SCHOOL; } - else if (sName.equalsAsciiL("Series", sizeof("Series")-1)) + else if (sName.startsWith("Series")) { eName = XML_SERIES; } - else if (sName.equalsAsciiL("Title", sizeof("Title")-1)) + else if (sName.startsWith("Title")) { eName = XML_TITLE; } - else if (sName.equalsAsciiL("Report_Type", sizeof("Report_Type")-1)) + else if (sName.startsWith("Report_Type")) { eName = XML_REPORT_TYPE; } - else if (sName.equalsAsciiL("Volume", sizeof("Volume")-1)) + else if (sName.startsWith("Volume")) { eName = XML_VOLUME; } - else if (sName.equalsAsciiL("Year", sizeof("Year")-1)) + else if (sName.startsWith("Year")) { eName = XML_YEAR; } - else if (sName.equalsAsciiL("URL", sizeof("URL")-1)) + else if (sName.startsWith("URL")) { eName = XML_URL; } - else if (sName.equalsAsciiL("Custom1", sizeof("Custom1")-1)) + else if (sName.startsWith("Custom1")) { eName = XML_CUSTOM1; } - else if (sName.equalsAsciiL("Custom2", sizeof("Custom2")-1)) + else if (sName.startsWith("Custom2")) { eName = XML_CUSTOM2; } - else if (sName.equalsAsciiL("Custom3", sizeof("Custom3")-1)) + else if (sName.startsWith("Custom3")) { eName = XML_CUSTOM3; } - else if (sName.equalsAsciiL("Custom4", sizeof("Custom4")-1)) + else if (sName.startsWith("Custom4")) { eName = XML_CUSTOM4; } - else if (sName.equalsAsciiL("Custom5", sizeof("Custom5")-1)) + else if (sName.startsWith("Custom5")) { eName = XML_CUSTOM5; } - else if (sName.equalsAsciiL("ISBN", sizeof("ISBN")-1)) + else if (sName.startsWith("ISBN")) { eName = XML_ISBN; } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index f389b4d5c5f7..32ff3ad1fd6f 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -3305,8 +3305,7 @@ sal_Bool XMLTextParagraphExport::addHyperlinkAttributes( GetExport().AddAttribute( XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME, sTargetFrame ); enum XMLTokenEnum eTok = - sTargetFrame.equalsAsciiL( "_blank", sizeof("_blank")-1 ) - ? XML_NEW : XML_REPLACE; + sTargetFrame.startsWith( "_blank" ) ? XML_NEW : XML_REPLACE; GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, eTok ); } |