From 554a45f266791c32543fcf96a979036becf41f8a Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Tue, 2 Oct 2012 11:31:09 -0300 Subject: ::rtl::OUString to OUString in basctl Change-Id: I34228049e15ee8a899a4c5e1484d7ed3bc541dd4 Reviewed-on: https://gerrit.libreoffice.org/748 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot --- basctl/source/basicide/baside3.cxx | 90 +++++++++++++++++----------------- basctl/source/basicide/basidectrlr.cxx | 2 +- basctl/source/basicide/basides1.cxx | 74 ++++++++++++++-------------- basctl/source/basicide/bastype2.hxx | 62 +++++++++++------------ 4 files changed, 114 insertions(+), 114 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index e5fc1ce20e04..27bdba100164 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -77,7 +77,7 @@ TYPEINIT1( DialogWindow, BaseWindow ); DialogWindow::DialogWindow ( DialogWindowLayout* pParent, ScriptDocument const& rDocument, - rtl::OUString aLibName, rtl::OUString aName, + OUString aLibName, OUString aName, com::sun::star::uno::Reference const& xDialogModel ) : BaseWindow(pParent, rDocument, aLibName, aName), @@ -256,7 +256,7 @@ void DialogWindow::GetState( SfxItemSet& rSet ) if ( xModel.is() ) { Reference< lang::XServiceInfo > xServiceInfo ( xModel, UNO_QUERY ); - if ( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ) ) ) + if ( xServiceInfo.is() && xServiceInfo->supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) ) bIsCalc = true; } } @@ -662,7 +662,7 @@ Reference< container::XNameContainer > DialogWindow::GetDialog() const return pEditor->GetDialog(); } -bool DialogWindow::RenameDialog( const ::rtl::OUString& rNewName ) +bool DialogWindow::RenameDialog( const OUString& rNewName ) { if ( !basctl::RenameDialog( this, GetDocument(), GetLibName(), GetName(), rNewName ) ) return false; @@ -683,7 +683,7 @@ void DialogWindow::UpdateBrowser() rLayout.UpdatePropertyBrowser(); } -static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" )); +static OUString aResourceResolverPropName( "ResourceResolver" ); bool DialogWindow::SaveDialog() { @@ -697,7 +697,7 @@ bool DialogWindow::SaveDialog() Sequence aServiceType(1); aServiceType[0] <<= TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD; xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); + "com.sun.star.ui.dialogs.FilePicker", aServiceType ), UNO_QUERY ); } Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY); @@ -709,17 +709,17 @@ bool DialogWindow::SaveDialog() if ( !aCurPath.isEmpty() ) xFP->setDisplayDirectory ( aCurPath ); - xFP->setDefaultName( ::rtl::OUString( GetName() ) ); + xFP->setDefaultName( OUString( GetName() ) ); - ::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); + OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); - xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) ); - xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( RTL_CONSTASCII_USTRINGPARAM( FilterMask_All ) ) ); + xFltMgr->appendFilter( aDialogStr, String( "*.xdl" ) ); + xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( FilterMask_All ) ); xFltMgr->setCurrentFilter( aDialogStr ); if( xFP->execute() == RET_OK ) { - Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); + Sequence< OUString > aPaths = xFP->getFiles(); aCurPath = aPaths[0]; // export dialog model to xml @@ -782,29 +782,29 @@ bool DialogWindow::SaveDialog() { INetURLObject aURLObj( aCurPath ); aURLObj.removeExtension(); - ::rtl::OUString aDialogName( aURLObj.getName() ); + OUString aDialogName( aURLObj.getName() ); aURLObj.removeSegment(); - ::rtl::OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); bool bReadOnly = false; - ::rtl::OUString aComment( RTL_CONSTASCII_USTRINGPARAM( "# " )); + OUString aComment( "# " ); aComment += aDialogName; - aComment += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " strings" )); + aComment += " strings" ; Reference< task::XInteractionHandler > xDummyHandler; // Remove old properties files in case of overwriting Dialog files if( xSFI->isFolder( aURL ) ) { - Sequence< ::rtl::OUString > aContentSeq = xSFI->getFolderContents( aURL, false ); + Sequence< OUString > aContentSeq = xSFI->getFolderContents( aURL, false ); - ::rtl::OUString aDialogName_( aDialogName ); - aDialogName_ += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_" )); + OUString aDialogName_( aDialogName ); + aDialogName_ += "_" ; sal_Int32 nCount = aContentSeq.getLength(); - const ::rtl::OUString* pFiles = aContentSeq.getConstArray(); + const OUString* pFiles = aContentSeq.getConstArray(); for( int i = 0 ; i < nCount ; i++ ) { - ::rtl::OUString aCompleteName = pFiles[i]; - rtl::OUString aPureName; - rtl::OUString aExtension; + OUString aCompleteName = pFiles[i]; + OUString aPureName; + OUString aExtension; sal_Int32 iDot = aCompleteName.lastIndexOf( '.' ); sal_Int32 iSlash = aCompleteName.lastIndexOf( '/' ); if( iDot != -1 ) @@ -946,7 +946,7 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent, } -bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName ) +bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ) { bool bDone = false; @@ -957,7 +957,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri Sequence aServiceType(1); aServiceType[0] <<= TemplateDescription::FILEOPEN_SIMPLE; xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); + "com.sun.star.ui.dialogs.FilePicker", aServiceType ), UNO_QUERY ); } Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY); @@ -966,23 +966,23 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri aValue <<= sal_True; xFPControl->setValue(ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue); - ::rtl::OUString aCurPath( rCurPath ); + OUString aCurPath( rCurPath ); if ( !aCurPath.isEmpty() ) xFP->setDisplayDirectory ( aCurPath ); - ::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); + OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); - xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) ); - xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( RTL_CONSTASCII_USTRINGPARAM( FilterMask_All ) ) ); + xFltMgr->appendFilter( aDialogStr, String( "*.xdl" ) ); + xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( FilterMask_All ) ); xFltMgr->setCurrentFilter( aDialogStr ); if( xFP->execute() == RET_OK ) { - Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); + Sequence< OUString > aPaths = xFP->getFiles(); aCurPath = aPaths[0]; - ::rtl::OUString aBasePath; - ::rtl::OUString aOUCurPath( aCurPath ); + OUString aBasePath; + OUString aOUCurPath( aCurPath ); sal_Int32 iSlash = aOUCurPath.lastIndexOf( '/' ); if( iSlash != -1 ) aBasePath = aOUCurPath.copy( 0, iSlash + 1 ); @@ -991,7 +991,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri { // create dialog model Reference< container::XNameContainer > xDialogModel( xMSF->createInstance - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY_THROW ); + ( "com.sun.star.awt.UnoControlDialogModel" ), UNO_QUERY_THROW ); Reference< XSimpleFileAccess2 > xSFI( SimpleFileAccess::create(comphelper::getProcessComponentContext()) ); @@ -1003,14 +1003,14 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri comphelper::getComponentContext( xMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() ); - ::rtl::OUString aXmlDlgName; + OUString aXmlDlgName; Reference< beans::XPropertySet > xDialogModelPropSet( xDialogModel, UNO_QUERY ); if( xDialogModelPropSet.is() ) { try { Any aXmlDialogNameAny = xDialogModelPropSet->getPropertyValue( DLGED_PROP_NAME ); - ::rtl::OUString aOUXmlDialogName; + OUString aOUXmlDialogName; aXmlDialogNameAny >>= aOUXmlDialogName; aXmlDlgName = aOUXmlDialogName; } @@ -1024,7 +1024,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri bool bDialogAlreadyExists = rDocument.hasDialog( aLibName, aXmlDlgName ); - ::rtl::OUString aNewDlgName = aXmlDlgName; + OUString aNewDlgName = aXmlDlgName; enum NameClashMode { NO_CLASH, @@ -1034,8 +1034,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri NameClashMode eNameClashMode = NO_CLASH; if( bDialogAlreadyExists ) { - ::rtl::OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TITLE)); - ::rtl::OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TEXT)); + OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TITLE)); + OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TEXT)); aQueryBoxText = aQueryBoxText.replaceAll("$(ARG1)", aXmlDlgName); NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); @@ -1071,7 +1071,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri bool bReadOnly = true; Reference< XStringResourceWithLocation > xImportStringResource = StringResourceWithLocation::create( xContext, aBasePath, bReadOnly, - aLocale, aXmlDlgName, ::rtl::OUString(), xDummyHandler ); + aLocale, aXmlDlgName, OUString(), xDummyHandler ); Sequence< lang::Locale > aImportLocaleSeq = xImportStringResource->getLocales(); sal_Int32 nImportLocaleCount = aImportLocaleSeq.getLength(); @@ -1098,8 +1098,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri bool bAddDialogLanguagesToLib = false; if( nOnlyInImportLanguageCount > 0 ) { - ::rtl::OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TITLE)); - ::rtl::OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TEXT)); + OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TITLE)); + OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TEXT)); LanguageMismatchQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); sal_uInt16 nRet = aQueryBox.Execute(); if( RET_YES == nRet ) @@ -1207,7 +1207,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri try { Any aXmlDialogNameAny; - aXmlDialogNameAny <<= ::rtl::OUString( aNewDlgName ); + aXmlDialogNameAny <<= OUString( aNewDlgName ); xDialogModelPropSet->setPropertyValue( DLGED_PROP_NAME, aXmlDialogNameAny ); bRenamed = true; } @@ -1250,7 +1250,7 @@ bool DialogWindow::ImportDialog() DBG_CHKTHIS( DialogWindow, 0 ); const ScriptDocument& rDocument = GetDocument(); - ::rtl::OUString aLibName = GetLibName(); + OUString aLibName = GetLibName(); return implImportDialog( this, aCurPath, rDocument, aLibName ); } @@ -1279,7 +1279,7 @@ bool DialogWindow::IsModified() return pUndoMgr.get(); } -::rtl::OUString DialogWindow::GetTitle() +OUString DialogWindow::GetTitle() { return GetName(); } @@ -1287,8 +1287,8 @@ bool DialogWindow::IsModified() EntryDescriptor DialogWindow::CreateEntryDescriptor() { ScriptDocument aDocument( GetDocument() ); - ::rtl::OUString aLibName( GetLibName() ); - ::rtl::OUString aLibSubName; + OUString aLibName( GetLibName() ); + OUString aLibSubName; LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName ); return EntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, GetName(), OBJ_TYPE_DIALOG ); } @@ -1325,7 +1325,7 @@ void DialogWindow::StoreData() Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() ); - xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) ); + xLib->replaceByName( OUString( GetName() ), makeAny( xISP ) ); } } } diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx index 6af458723822..855ad1ee3f6f 100644 --- a/basctl/source/basicide/basidectrlr.cxx +++ b/basctl/source/basicide/basidectrlr.cxx @@ -38,7 +38,7 @@ namespace { int const nPropertyIconId = 1; -rtl::OUString const sPropertyIconId("IconId"); +OUString const sPropertyIconId("IconId"); } diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 7244f092098d..42644e5762a0 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -114,8 +114,8 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) else nFound = pCurWin->StartSearchAndReplace(rSearchItem); - rtl::OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES)); - aReplStr = aReplStr.replaceAll("XX", rtl::OUString::valueOf(nFound)); + OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES)); + aReplStr = aReplStr.replaceAll("XX", OUString::valueOf(nFound)); InfoBox( pCurWin, aReplStr ).Execute(); } else @@ -272,7 +272,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) break; case SID_BASICIDE_CHOOSEMACRO: { - ChooseMacro( NULL, false, ::rtl::OUString() ); + ChooseMacro( NULL, false, OUString() ); } break; case SID_BASICIDE_CREATEMACRO: @@ -286,9 +286,9 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) ); StartListening( *pBasMgr, true /* log on only once */ ); - ::rtl::OUString aLibName( rInfo.GetLib() ); + OUString aLibName( rInfo.GetLib() ); if ( aLibName.isEmpty() ) - aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")); + aLibName = "Standard" ; StarBASIC* pBasic = pBasMgr->GetLib( aLibName ); if ( !pBasic ) { @@ -310,9 +310,9 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) { if ( rInfo.GetModule().Len() || !pBasic->GetModules()->Count() ) { - ::rtl::OUString aModName = rInfo.GetModule(); + OUString aModName = rInfo.GetModule(); - ::rtl::OUString sModuleCode; + OUString sModuleCode; if ( aDocument.createModule( aLibName, aModName, false, sModuleCode ) ) pModule = pBasic->FindModule( aModName ); } @@ -351,14 +351,14 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) if ( aWindowTable.find( rTabId.GetValue() ) != aWindowTable.end() ) { BaseWindow* pWin = aWindowTable[ rTabId.GetValue() ]; - ::rtl::OUString aNewName( rModName.GetValue() ); - ::rtl::OUString aOldName( pWin->GetName() ); + OUString aNewName( rModName.GetValue() ); + OUString aOldName( pWin->GetName() ); if ( aNewName != aOldName ) { bool bRenameOk = false; if (ModulWindow* pModWin = dynamic_cast(pWin)) { - rtl::OUString aLibName = pModWin->GetLibName(); + OUString aLibName = pModWin->GetLibName(); ScriptDocument aDocument( pWin->GetDocument() ); if (RenameModule(pModWin, aDocument, aLibName, aOldName, aNewName)) @@ -437,7 +437,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) uno::Reference< frame::XModel > xModel( rShellItem.GetValue(), UNO_QUERY ); ScriptDocument aDocument( xModel.is() ? ScriptDocument( xModel ) : ScriptDocument::getApplicationScriptDocument() ); const SfxStringItem& rLibNameItem = (const SfxStringItem&)rReq.GetArgs()->Get( SID_BASICIDE_ARG_LIBNAME ); - ::rtl::OUString aLibName( rLibNameItem.GetValue() ); + OUString aLibName( rLibNameItem.GetValue() ); if ( nSlot == SID_BASICIDE_LIBSELECTED ) { @@ -453,7 +453,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY ); if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aLibName ) && !xPasswd->isLibraryPasswordVerified( aLibName ) ) { - ::rtl::OUString aPassword; + OUString aPassword; bOK = QueryPassword( xModLibContainer, aLibName, aPassword ); } } @@ -512,8 +512,8 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) DBG_ASSERT( rReq.GetArgs(), "arguments expected" ); const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX ); ScriptDocument aDocument( rSbxItem.GetDocument() ); - ::rtl::OUString aLibName( rSbxItem.GetLibName() ); - ::rtl::OUString aName( rSbxItem.GetName() ); + OUString aLibName( rSbxItem.GetLibName() ); + OUString aName( rSbxItem.GetName() ); if ( m_aCurLibName.isEmpty() || ( aDocument == m_aCurDocument && aLibName == m_aCurLibName ) ) { if ( rSbxItem.GetType() == TYPE_MODULE ) @@ -538,8 +538,8 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) DBG_ASSERT( rReq.GetArgs(), "arguments expected" ); const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX ); ScriptDocument aDocument( rSbxItem.GetDocument() ); - ::rtl::OUString aLibName( rSbxItem.GetLibName() ); - ::rtl::OUString aName( rSbxItem.GetName() ); + OUString aLibName( rSbxItem.GetLibName() ); + OUString aName( rSbxItem.GetName() ); SetCurLib( aDocument, aLibName ); BaseWindow* pWin = 0; if ( rSbxItem.GetType() == TYPE_DIALOG ) @@ -567,7 +567,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) SFX_REQUEST_ARG( rReq, pDocumentItem, SfxStringItem, SID_BASICIDE_ARG_DOCUMENT, false ); if ( pDocumentItem ) { - ::rtl::OUString sDocumentCaption = pDocumentItem->GetValue(); + OUString sDocumentCaption = pDocumentItem->GetValue(); if ( !sDocumentCaption.isEmpty() ) pDocument.reset( new ScriptDocument( ScriptDocument::getDocumentWithURLOrCaption( sDocumentCaption ) ) ); } @@ -587,16 +587,16 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) if ( !pLibNameItem ) break; - ::rtl::OUString aLibName( pLibNameItem->GetValue() ); + OUString aLibName( pLibNameItem->GetValue() ); pDocument->loadLibraryIfExists( E_SCRIPTS, aLibName ); SetCurLib( *pDocument, aLibName ); SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, SID_BASICIDE_ARG_NAME, false ); if ( pNameItem ) { - ::rtl::OUString aName( pNameItem->GetValue() ); - ::rtl::OUString aModType(RTL_CONSTASCII_USTRINGPARAM("Module")); - ::rtl::OUString aDlgType(RTL_CONSTASCII_USTRINGPARAM("Dialog")); - ::rtl::OUString aType( aModType ); + OUString aName( pNameItem->GetValue() ); + OUString aModType( "Module" ); + OUString aDlgType( "Dialog" ); + OUString aType( aModType ); SFX_REQUEST_ARG( rReq, pTypeItem, SfxStringItem, SID_BASICIDE_ARG_TYPE, false ); if ( pTypeItem ) aType = pTypeItem->GetValue(); @@ -839,7 +839,7 @@ void Shell::GetState(SfxItemSet &rSet) break; case SID_BASICIDE_LIBSELECTOR: { - ::rtl::OUString aName; + OUString aName; if ( !m_aCurLibName.isEmpty() ) { LibraryLocation eLocation = m_aCurDocument.getLibraryLocation( m_aCurLibName ); @@ -851,7 +851,7 @@ void Shell::GetState(SfxItemSet &rSet) break; case SID_SEARCH_ITEM: { - ::rtl::OUString aSelected = GetSelectionText(true); + OUString aSelected = GetSelectionText(true); SvxSearchItem& rItem = GetExtraData()->GetSearchItem(); rItem.SetSearchString( aSelected ); rSet.Put( rItem ); @@ -859,7 +859,7 @@ void Shell::GetState(SfxItemSet &rSet) break; case SID_BASICIDE_STAT_DATE: { - ::rtl::OUString aDate(RTL_CONSTASCII_USTRINGPARAM("Datum?!")); + OUString aDate( "Datum?!" ); SfxStringItem aItem( SID_BASICIDE_STAT_DATE, aDate ); rSet.Put( aItem ); } @@ -887,7 +887,7 @@ void Shell::GetState(SfxItemSet &rSet) { if ( pCurWin ) { - ::rtl::OUString aTitle = pCurWin->CreateQualifiedName(); + OUString aTitle = pCurWin->CreateQualifiedName(); SfxStringItem aItem( SID_BASICIDE_STAT_TITLE, aTitle ); rSet.Put( aItem ); } @@ -910,7 +910,7 @@ void Shell::GetState(SfxItemSet &rSet) rSet.DisableItem( nWh ); else { - ::rtl::OUString aItemStr; + OUString aItemStr; boost::shared_ptr pCurMgr(GetCurLocalizationMgr()); if ( pCurMgr->isLibraryLocalized() ) { @@ -919,7 +919,7 @@ void Shell::GetState(SfxItemSet &rSet) sal_Int32 i, nCount = aLocaleSeq.getLength(); // Force different results for any combination of locales and default locale - ::rtl::OUString aLangStr; + OUString aLangStr; for ( i = 0; i <= nCount; ++i ) { lang::Locale aLocale; @@ -1051,11 +1051,11 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe void Shell::ManageToolbars() { - static ::rtl::OUString aLayoutManagerName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )); - static ::rtl::OUString aMacroBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/macrobar" )); - static ::rtl::OUString aDialogBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/dialogbar" )); - static ::rtl::OUString aInsertControlsBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcontrolsbar" )); - static ::rtl::OUString aFormControlsBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/formcontrolsbar" )); + static OUString aLayoutManagerName( "LayoutManager" ); + static OUString aMacroBarResName( "private:resource/toolbar/macrobar" ); + static OUString aDialogBarResName( "private:resource/toolbar/dialogbar" ); + static OUString aInsertControlsBarResName( "private:resource/toolbar/insertcontrolsbar" ); + static OUString aFormControlsBarResName( "private:resource/toolbar/formcontrolsbar" ); (void)aInsertControlsBarResName; if( !pCurWin ) @@ -1099,7 +1099,7 @@ BaseWindow* Shell::FindApplicationWindow() BaseWindow* Shell::FindWindow( ScriptDocument const& rDocument, - rtl::OUString const& rLibName, rtl::OUString const& rName, + OUString const& rLibName, OUString const& rName, ItemType eType, bool bFindSuspended ) { @@ -1153,7 +1153,7 @@ long Shell::CallBasicBreakHdl( StarBASIC* pBasic ) ModulWindow* Shell::ShowActiveModuleWindow( StarBASIC* pBasic ) { - SetCurLib( ScriptDocument::getApplicationScriptDocument(), ::rtl::OUString(), false ); + SetCurLib( ScriptDocument::getApplicationScriptDocument(), OUString(), false ); SbModule* pActiveModule = StarBASIC::GetActiveModule(); if (SbClassModuleObject* pCMO = dynamic_cast(pActiveModule)) @@ -1169,7 +1169,7 @@ ModulWindow* Shell::ShowActiveModuleWindow( StarBASIC* pBasic ) if (BasicManager* pBasMgr = FindBasicManager(pLib)) { ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) ); - ::rtl::OUString aLibName = pLib->GetName(); + OUString aLibName = pLib->GetName(); pWin = FindBasWin( aDocument, aLibName, pActiveModule->GetName(), true ); DBG_ASSERT( pWin, "Error/Step-Hdl: Fenster wurde nicht erzeugt/gefunden!" ); SetCurLib( aDocument, aLibName ); @@ -1260,7 +1260,7 @@ void Shell::Deactivate( sal_Bool bMDI ) if ( /* !pWin->IsSuspended() && */ !pWin->CanClose() ) { if ( !m_aCurLibName.isEmpty() && ( pWin->IsDocument( m_aCurDocument ) || pWin->GetLibName() != m_aCurLibName ) ) - SetCurLib( ScriptDocument::getApplicationScriptDocument(), ::rtl::OUString(), false ); + SetCurLib( ScriptDocument::getApplicationScriptDocument(), OUString(), false ); SetCurWindow( pWin, true ); break; } diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx index acd531f60f4a..b718ce2df6de 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/basicide/bastype2.hxx @@ -91,28 +91,28 @@ public: class LibEntry : public DocumentEntry { private: - rtl::OUString m_aLibName; + OUString m_aLibName; public: LibEntry ( ScriptDocument const& rDocument, LibraryLocation eLocation, - rtl::OUString const& rLibName, + OUString const& rLibName, EntryType eType = OBJ_TYPE_LIBRARY ); virtual ~LibEntry (); - rtl::OUString const& GetLibName () const { return m_aLibName; } + OUString const& GetLibName () const { return m_aLibName; } }; class EntryDescriptor { ScriptDocument m_aDocument; LibraryLocation m_eLocation; - rtl::OUString m_aLibName; - rtl::OUString m_aLibSubName; // for vba entry: Document Objects, Class Modules, Forms and Normal Modules - rtl::OUString m_aName; - rtl::OUString m_aMethodName; + OUString m_aLibName; + OUString m_aLibSubName; // for vba entry: Document Objects, Class Modules, Forms and Normal Modules + OUString m_aName; + OUString m_aMethodName; EntryType m_eType; public: @@ -120,41 +120,41 @@ public: EntryDescriptor ( ScriptDocument const& rDocument, LibraryLocation eLocation, - rtl::OUString const& rLibName, - rtl::OUString const& rLibSubName, - rtl::OUString const& rName, + OUString const& rLibName, + OUString const& rLibSubName, + OUString const& rName, EntryType eType ); EntryDescriptor ( ScriptDocument const& rDocument, LibraryLocation eLocation, - rtl::OUString const& rLibName, - rtl::OUString const& rLibSubName, - rtl::OUString const& rName, - rtl::OUString const& rMethodName, + OUString const& rLibName, + OUString const& rLibSubName, + OUString const& rName, + OUString const& rMethodName, EntryType eType ); virtual ~EntryDescriptor (); bool operator == (EntryDescriptor const& rDesc) const; - ScriptDocument const& GetDocument() const { return m_aDocument; } - void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } + ScriptDocument const& GetDocument() const { return m_aDocument; } + void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } LibraryLocation GetLocation() const { return m_eLocation; } void SetLocation( LibraryLocation eLocation ) { m_eLocation = eLocation; } - const ::rtl::OUString& GetLibName() const { return m_aLibName; } - void SetLibName( const ::rtl::OUString& aLibName ) { m_aLibName = aLibName; } + const OUString& GetLibName() const { return m_aLibName; } + void SetLibName( const OUString& aLibName ) { m_aLibName = aLibName; } - const ::rtl::OUString& GetLibSubName() const { return m_aLibSubName; } - void SetLibSubName( const ::rtl::OUString& aLibSubName ) { m_aLibSubName = aLibSubName; } + const OUString& GetLibSubName() const { return m_aLibSubName; } + void SetLibSubName( const OUString& aLibSubName ) { m_aLibSubName = aLibSubName; } - const ::rtl::OUString& GetName() const { return m_aName; } - void SetName( const ::rtl::OUString& aName ) { m_aName = aName; } + const OUString& GetName() const { return m_aName; } + void SetName( const OUString& aName ) { m_aName = aName; } - const ::rtl::OUString& GetMethodName() const { return m_aMethodName; } - void SetMethodName( const ::rtl::OUString& aMethodName ) { m_aMethodName = aMethodName; } + const OUString& GetMethodName() const { return m_aMethodName; } + void SetMethodName( const OUString& aMethodName ) { m_aMethodName = aMethodName; } EntryType GetType() const { return m_eType; } void SetType( EntryType eType ) { m_eType = eType; } @@ -188,10 +188,10 @@ protected: virtual long ExpandingHdl(); void ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation ); - void ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ); - void ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ); - void ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ); - SvLBoxEntry* ImpFindEntry( SvLBoxEntry* pParent, const ::rtl::OUString& rText ); + void ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); + void ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); + void ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); + SvLBoxEntry* ImpFindEntry( SvLBoxEntry* pParent, const OUString& rText ); // DocumentEventListener virtual void onDocumentCreated( const ScriptDocument& _rDocument ); @@ -220,7 +220,7 @@ public: SbModule* FindModule( SvLBoxEntry* pEntry ); SbxVariable* FindVariable( SvLBoxEntry* pEntry ); SvLBoxEntry* FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); - SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const ::rtl::OUString& rText, EntryType eType ); + SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const OUString& rText, EntryType eType ); EntryDescriptor GetEntryDescriptor( SvLBoxEntry* pEntry ); @@ -228,14 +228,14 @@ public: bool IsValidEntry( SvLBoxEntry* pEntry ); SvLBoxEntry* AddEntry( - const ::rtl::OUString& rText, const Image& rImage, + const OUString& rText, const Image& rImage, SvLBoxEntry* pParent, bool bChildrenOnDemand, std::auto_ptr aUserData ); void RemoveEntry (SvLBoxEntry*); void RemoveEntry (ScriptDocument const&); - ::rtl::OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const; + OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const; void GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage ); void SetCurrentEntry (EntryDescriptor&); -- cgit