diff options
Diffstat (limited to 'dbaccess/source/ui/dlg')
37 files changed, 309 insertions, 310 deletions
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 202c54f9c991..6937b06af57b 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -63,7 +63,7 @@ using namespace comphelper; DBG_NAME(OCollectionView) OCollectionView::OCollectionView( Window * pParent ,const Reference< XContent>& _xContent - ,const ::rtl::OUString& _sDefaultName + ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) : ModalDialog( pParent, ModuleRes(DLG_COLLECTION_VIEW)) , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) @@ -115,12 +115,12 @@ Reference< XContent> OCollectionView::getSelectedFolder() const // ----------------------------------------------------------------------------- IMPL_LINK_NOARG(OCollectionView, Save_Click) { - ::rtl::OUString sName = m_aName.GetText(); + OUString sName = m_aName.GetText(); if ( sName.isEmpty() ) return 0; try { - ::rtl::OUString sSubFolder = m_aView.GetCurrentURL(); + OUString sSubFolder = m_aView.GetCurrentURL(); sal_Int32 nIndex = sName.lastIndexOf('/') + 1; if ( nIndex ) { @@ -154,17 +154,17 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) { Sequence< Any > aValues(2); PropertyValue aValue; - aValue.Name = ::rtl::OUString("ResourceName"); + aValue.Name = OUString("ResourceName"); aValue.Value <<= sSubFolder; aValues[0] <<= aValue; - aValue.Name = ::rtl::OUString("ResourceType"); - aValue.Value <<= ::rtl::OUString("folder"); + aValue.Name = OUString("ResourceType"); + aValue.Value <<= OUString("folder"); aValues[1] <<= aValue; InteractionClassification eClass = InteractionClassification_ERROR; ::com::sun::star::ucb::IOErrorCode eError = IOErrorCode_NOT_EXISTING_PATH; - ::rtl::OUString sTemp; + OUString sTemp; InteractiveAugmentedIOException aException(sTemp,Reference<XInterface>(),eClass,eError,aValues); @@ -253,7 +253,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) Reference<XNameAccess> xNameAccess(m_xContent,UNO_QUERY); if ( xNameAccess.is() ) { - ::rtl::OUString sSubFolder = m_aView.GetCurrentURL(); + OUString sSubFolder = m_aView.GetCurrentURL(); sal_Int32 nIndex = sSubFolder.lastIndexOf('/') + 1; sSubFolder = sSubFolder.getToken(0,'/',nIndex); if ( !sSubFolder.isEmpty() ) @@ -284,11 +284,11 @@ void OCollectionView::initCurrentPath() { if ( m_xContent.is() ) { - const ::rtl::OUString sCID = m_xContent->getIdentifier()->getContentIdentifier(); - const static ::rtl::OUString s_sFormsCID("private:forms"); - const static ::rtl::OUString s_sReportsCID("private:reports"); + const OUString sCID = m_xContent->getIdentifier()->getContentIdentifier(); + const static OUString s_sFormsCID("private:forms"); + const static OUString s_sReportsCID("private:reports"); m_bCreateForm = s_sFormsCID == sCID ; - ::rtl::OUString sPath("/"); + OUString sPath("/"); if ( m_bCreateForm && sCID.getLength() != s_sFormsCID.getLength()) sPath = sCID.copy(s_sFormsCID.getLength()); else if ( !m_bCreateForm && sCID.getLength() != s_sReportsCID.getLength() ) @@ -306,7 +306,7 @@ void OCollectionView::initCurrentPath() m_aUp.Enable(bEnable); } // ----------------------------------------------------------------------------- -::rtl::OUString OCollectionView::getName() const +OUString OCollectionView::getName() const { return m_aName.GetText(); } diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 442eac5ee225..1423ee136f6c 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -227,7 +227,7 @@ DBG_NAME(OConnectionHelper) break; case ::dbaccess::DST_MSACCESS: { - const ::rtl::OUString sExt("*.mdb"); + const OUString sExt("*.mdb"); String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, @@ -239,7 +239,7 @@ DBG_NAME(OConnectionHelper) break; case ::dbaccess::DST_MSACCESS_2007: { - const ::rtl::OUString sAccdb("*.accdb"); + const OUString sAccdb("*.accdb"); String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, @@ -253,8 +253,8 @@ DBG_NAME(OConnectionHelper) case ::dbaccess::DST_ODBC: { // collect all ODBC data source names - ::rtl::OUString sCurrDatasource = getURLNoPrefix(); - ::rtl::OUString sDataSource; + OUString sCurrDatasource = getURLNoPrefix(); + OUString sDataSource; if ( getSelectedDataSource(sDataSource,sCurrDatasource) && !sDataSource.isEmpty() ) { setURLNoPrefix(sDataSource); @@ -268,8 +268,8 @@ DBG_NAME(OConnectionHelper) #ifdef _ADO_DATALINK_BROWSE_ case ::dbaccess::DST_ADO: { - ::rtl::OUString sOldDataSource=getURLNoPrefix(); - ::rtl::OUString sNewDataSource; + OUString sOldDataSource=getURLNoPrefix(); + OUString sNewDataSource; HWND hWnd = GetParent()->GetSystemData()->hWnd; sNewDataSource = getAdoDatalink((long)hWnd,sOldDataSource); if ( !sNewDataSource.isEmpty() ) @@ -294,10 +294,10 @@ DBG_NAME(OConnectionHelper) Reference<XMozillaBootstrap> xMozillaBootstrap = MozillaBootstrap::create(xContext); // collect all Mozilla Profiles - ::com::sun::star::uno::Sequence< ::rtl::OUString > list; + ::com::sun::star::uno::Sequence< OUString > list; xMozillaBootstrap->getProfileList( profileType, list ); - const ::rtl::OUString * pArray = list.getConstArray(); + const OUString * pArray = list.getConstArray(); sal_Int32 count = list.getLength(); @@ -308,7 +308,7 @@ DBG_NAME(OConnectionHelper) // execute the select dialog ODatasourceSelectDialog aSelector(GetParent(), aProfiles); - ::rtl::OUString sOldProfile=getURLNoPrefix(); + OUString sOldProfile=getURLNoPrefix(); if (!sOldProfile.isEmpty()) aSelector.Select(sOldProfile); @@ -504,7 +504,7 @@ DBG_NAME(OConnectionHelper) } // ----------------------------------------------------------------------------- - IS_PATH_EXIST OConnectionHelper::pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const + IS_PATH_EXIST OConnectionHelper::pathExists(const OUString& _rURL, sal_Bool bIsFile) const { ::ucbhelper::Content aCheckExistence; sal_Bool bExists = sal_False; @@ -564,7 +564,7 @@ DBG_NAME(OConnectionHelper) INetProtocol eProtocol = aParser.GetProtocol(); - ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels + ::std::vector< OUString > aToBeCreated; // the to-be-created levels // search a level which exists IS_PATH_EXIST eParentExists = PATH_NOT_EXIST; @@ -585,27 +585,27 @@ DBG_NAME(OConnectionHelper) Reference< XCommandEnvironment > xEmptyEnv; ::ucbhelper::Content aParent(aParser.GetMainURL(INetURLObject::NO_DECODE), xEmptyEnv, comphelper::getProcessComponentContext()); - ::rtl::OUString sContentType; + OUString sContentType; if ( INET_PROT_FILE == eProtocol ) { - sContentType = ::rtl::OUString("application/vnd.sun.staroffice.fsys-folder"); + sContentType = OUString("application/vnd.sun.staroffice.fsys-folder"); // the file UCP currently does not support the ContentType property } else { - Any aContentType = aParent.getPropertyValue( ::rtl::OUString("ContentType") ); + Any aContentType = aParent.getPropertyValue( OUString("ContentType") ); aContentType >>= sContentType; } // the properties which need to be set on the new content - Sequence< ::rtl::OUString > aNewDirectoryProperties(1); - aNewDirectoryProperties[0] = ::rtl::OUString("Title"); + Sequence< OUString > aNewDirectoryProperties(1); + aNewDirectoryProperties[0] = OUString("Title"); // the values to be set Sequence< Any > aNewDirectoryAttributes(1); // loop - for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); + for ( ::std::vector< OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); aLocalName != aToBeCreated.rend(); ++aLocalName ) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 1497db425d44..2b9e4980f1d5 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -47,7 +47,7 @@ namespace dbaui FixedText m_aFT_Connection; OConnectionURLEdit m_aConnectionURL; PushButton m_aPB_Connection; - ::rtl::OUString m_eType; // the type can't be changed in this class, so we hold it as member. + OUString m_eType; // the type can't be changed in this class, so we hold it as member. public: @@ -78,7 +78,7 @@ namespace dbaui sal_Int32 checkPathExistence(const String& _rURL); - IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const; + IS_PATH_EXIST pathExists(const OUString& _rURL, sal_Bool bIsFile) const; sal_Bool createDirectoryDeep(const String& _rPathNormalized); sal_Bool commitURL(); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index f1cfea4ef953..d46a3504bb8d 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -192,7 +192,7 @@ DBG_NAME(OTextConnectionPageSetup) pCollection = pCollectionItem->getCollection(); OSL_ENSURE(pCollection, "OLDAPConnectionPageSetup::FillItemSet : really need a DSN type collection !"); - OUString sUrl = pCollection->getPrefix( ::rtl::OUString("sdbc:address:ldap:")); + OUString sUrl = pCollection->getPrefix( OUString("sdbc:address:ldap:")); sUrl += m_aETHostServer.GetText(); _rSet.Put(SfxStringItem(DSID_CONNECTURL, sUrl)); bChangedSomething = sal_True; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 405ec96bee38..bcee91b604bc 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -117,9 +117,9 @@ namespace catch(Exception&) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage("ODbAdminDialog::implTranslateProperty: could not set the property "); - sMessage += ::rtl::OString(_rName.getStr(), _rName.getLength(), RTL_TEXTENCODING_ASCII_US); - sMessage += ::rtl::OString("!"); + OString sMessage("ODbAdminDialog::implTranslateProperty: could not set the property "); + sMessage += OString(_rName.getStr(), _rName.getLength(), RTL_TEXTENCODING_ASCII_US); + sMessage += OString("!"); OSL_FAIL(sMessage.getStr()); #endif } @@ -589,9 +589,9 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr catch(Exception&) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString aMessage("ODbDataSourceAdministrationHelper::translateProperties: could not extract the property "); - aMessage += ::rtl::OString(aDirect->second.getStr(), aDirect->second.getLength(), RTL_TEXTENCODING_ASCII_US); - aMessage += ::rtl::OString("!"); + OString aMessage("ODbDataSourceAdministrationHelper::translateProperties: could not extract the property "); + aMessage += OString(aDirect->second.getStr(), aDirect->second.getLength(), RTL_TEXTENCODING_ASCII_US); + aMessage += OString("!"); OSL_FAIL(aMessage.getStr()); #endif } @@ -902,7 +902,7 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty(const Reference< X #if OSL_DEBUG_LEVEL > 0 //------------------------------------------------------------------------- -::rtl::OString ODbDataSourceAdministrationHelper::translatePropertyId( sal_Int32 _nId ) +OString ODbDataSourceAdministrationHelper::translatePropertyId( sal_Int32 _nId ) { OUString aString; @@ -918,7 +918,7 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty(const Reference< X aString = indirectPos->second; } - ::rtl::OString aReturn( aString.getStr(), aString.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString aReturn( aString.getStr(), aString.getLength(), RTL_TEXTENCODING_ASCII_US ); return aReturn; } #endif @@ -937,9 +937,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no string)!" ) ).getStr() ); } @@ -967,9 +967,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no boolean)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no boolean)!" ) ).getStr() ); } @@ -984,9 +984,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no int)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no int)!" ) ).getStr() ); } @@ -1017,9 +1017,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string sequence)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no string sequence)!" ) ).getStr() ); } diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 983878c1c3ba..e72c40fe9828 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -168,7 +168,7 @@ namespace dbaui sal_Bool hasAuthentication(const SfxItemSet& _rSet) const; #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString translatePropertyId( sal_Int32 _nId ); + OString translatePropertyId( sal_Int32 _nId ); #endif }; diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index e60236d7608b..b613cd697590 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -30,7 +30,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::NamedValue; using namespace dbaui; -void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext, ::std::vector< sal_Int32>& _out_rDetailsIds ) +void ODriversSettings::getSupportedIndirectSettings( const OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext, ::std::vector< sal_Int32>& _out_rDetailsIds ) { // for a number of settings, we do not need to use hard-coded here, but can ask a // central DataSourceUI instance. @@ -67,30 +67,30 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR } } #endif - typedef ::std::pair<sal_uInt16, ::rtl::OUString> TProperties; - TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString("ShowDeleted")) - ,TProperties(DSID_CHARSET,::rtl::OUString("CharSet")) - ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString("FieldDelimiter")) - ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString("StringDelimiter")) - ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString("DecimalDelimiter")) - ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString("ThousandDelimiter")) - ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString("Extension")) - ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString("HeaderLine")) - ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString("SystemDriverSettings")) - ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString("ShutdownDatabase")) - ,TProperties(DSID_CONN_DATAINC,::rtl::OUString("DataCacheSizeIncrement")) - ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString("DataCacheSize")) - ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString("ControlUser")) - ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString("ControlPassword")) - ,TProperties(DSID_USECATALOG,::rtl::OUString("UseCatalog")) - ,TProperties(DSID_CONN_SOCKET,::rtl::OUString("LocalSocket")) - ,TProperties(DSID_NAMED_PIPE,::rtl::OUString("NamedPipe")) - ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString("JavaDriverClass")) - ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString("BaseDN")) - ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString("MaxRowCount")) - ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString("UseSSL")) - ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString("IgnoreCurrency")) - ,TProperties(0,::rtl::OUString()) + typedef ::std::pair<sal_uInt16, OUString> TProperties; + TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,OUString("ShowDeleted")) + ,TProperties(DSID_CHARSET,OUString("CharSet")) + ,TProperties(DSID_FIELDDELIMITER,OUString("FieldDelimiter")) + ,TProperties(DSID_TEXTDELIMITER,OUString("StringDelimiter")) + ,TProperties(DSID_DECIMALDELIMITER,OUString("DecimalDelimiter")) + ,TProperties(DSID_THOUSANDSDELIMITER,OUString("ThousandDelimiter")) + ,TProperties(DSID_TEXTFILEEXTENSION,OUString("Extension")) + ,TProperties(DSID_TEXTFILEHEADER,OUString("HeaderLine")) + ,TProperties(DSID_ADDITIONALOPTIONS,OUString("SystemDriverSettings")) + ,TProperties(DSID_CONN_SHUTSERVICE,OUString("ShutdownDatabase")) + ,TProperties(DSID_CONN_DATAINC,OUString("DataCacheSizeIncrement")) + ,TProperties(DSID_CONN_CACHESIZE,OUString("DataCacheSize")) + ,TProperties(DSID_CONN_CTRLUSER,OUString("ControlUser")) + ,TProperties(DSID_CONN_CTRLPWD,OUString("ControlPassword")) + ,TProperties(DSID_USECATALOG,OUString("UseCatalog")) + ,TProperties(DSID_CONN_SOCKET,OUString("LocalSocket")) + ,TProperties(DSID_NAMED_PIPE,OUString("NamedPipe")) + ,TProperties(DSID_JDBCDRIVERCLASS,OUString("JavaDriverClass")) + ,TProperties(DSID_CONN_LDAP_BASEDN,OUString("BaseDN")) + ,TProperties(DSID_CONN_LDAP_ROWCOUNT,OUString("MaxRowCount")) + ,TProperties(DSID_CONN_LDAP_USESSL,OUString("UseSSL")) + ,TProperties(DSID_IGNORECURRENCY,OUString("IgnoreCurrency")) + ,TProperties(0,OUString()) }; // TODO: This mapping between IDs and property names already exists - in ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper. // Another mapping (which is also duplicated in ODbDataSourceAdministrationHelper) exists in dsmeta.cxx. We should diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 219dfa106200..21854d52a8a8 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -40,7 +40,7 @@ namespace dbaui @param _out_rDetailsIds Will be filled. */ - static void getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); + static void getSupportedIndirectSettings( const OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); /** Creates the detail page for Dbase */ diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 0d1dad07d5d9..05b6bd961bce 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -437,9 +437,9 @@ DBG_NAME(OTextConnectionHelper) { String sExtension; if (m_aRBAccessTextFiles.IsChecked()) - sExtension = rtl::OUString("txt"); + sExtension = OUString("txt"); else if (m_aRBAccessCSVFiles.IsChecked()) - sExtension = rtl::OUString("csv"); + sExtension = OUString("csv"); else { sExtension = m_aETOwnExtension.GetText(); @@ -458,11 +458,11 @@ DBG_NAME(OTextConnectionHelper) return rBox.GetText().copy(0); if ( !( &m_aTextSeparator == &rBox && nPos == (rBox.GetEntryCount()-1) ) ) - return rtl::OUString( + return OUString( static_cast< sal_Unicode >( rList.GetToken(((nPos*2)+1), nTok ).ToInt32())); // somewhat strange ... translates for instance an "32" into " " - return rtl::OUString(); + return OUString(); } void OTextConnectionHelper::SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ) @@ -473,7 +473,7 @@ DBG_NAME(OTextConnectionHelper) for( i=0 ; i<nCnt ; i+=2 ) { - rtl::OUString sTVal( + OUString sTVal( static_cast< sal_Unicode >( rList.GetToken( (i+1), nTok ).ToInt32())); diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index a0d074e87aa9..ad921e5e97e5 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -175,8 +175,8 @@ void OUserAdmin::FillUserNames() m_LB_USER.Clear(); m_aUserNames = m_xUsers->getElementNames(); - const ::rtl::OUString* pBegin = m_aUserNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength(); + const OUString* pBegin = m_aUserNames.getConstArray(); + const OUString* pEnd = pBegin + m_aUserNames.getLength(); for(;pBegin != pEnd;++pBegin) m_LB_USER.InsertEntry(*pBegin); @@ -223,8 +223,8 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) Reference<XPropertySet> xNewUser = xUserFactory->createDataDescriptor(); if(xNewUser.is()) { - xNewUser->setPropertyValue(PROPERTY_NAME,makeAny(rtl::OUString(aPwdDlg.GetUser()))); - xNewUser->setPropertyValue(PROPERTY_PASSWORD,makeAny(rtl::OUString(aPwdDlg.GetPassword()))); + xNewUser->setPropertyValue(PROPERTY_NAME,makeAny(OUString(aPwdDlg.GetUser()))); + xNewUser->setPropertyValue(PROPERTY_PASSWORD,makeAny(OUString(aPwdDlg.GetPassword()))); Reference<XAppend> xAppend(m_xUsers,UNO_QUERY); if(xAppend.is()) xAppend->appendByDescriptor(xNewUser); @@ -241,7 +241,7 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) m_xUsers->getByName(sName) >>= xUser; if(xUser.is()) { - ::rtl::OUString sNewPassword,sOldPassword; + OUString sNewPassword,sOldPassword; OPasswordDialog aDlg(this,sName); if(aDlg.Execute() == RET_OK) { diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 6fa2288c6e8b..1764d77895b5 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -52,7 +52,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames; + ::com::sun::star::uno::Sequence< OUString> m_aUserNames; String m_UserName; diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 404cefcf5a9c..3da067f29509 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -110,7 +110,7 @@ DBG_NAME(OUserAdminDlg) if ( !aMetaData.supportsUserAdministration( getORB() ) ) { String sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); - throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any()); + throw SQLException(sError,NULL,OUString("S1000") ,0,Any()); } } catch(const SQLException&) @@ -172,7 +172,7 @@ DBG_NAME(OUserAdminDlg) return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- - ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const + OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -182,7 +182,7 @@ DBG_NAME(OUserAdminDlg) m_pImpl->clearPassword(); } // ----------------------------------------------------------------------------- - void OUserAdminDlg::setTitle(const ::rtl::OUString& _sTitle) + void OUserAdminDlg::setTitle(const OUString& _sTitle) { SetText(_sTitle); } diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 250a431d6f86..fd2c978b502c 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -168,7 +168,7 @@ namespace dbaui m_aControlDependencies.enableOnRadioCheck( m_aNamedPipeRadio, m_aNamedPipe ); m_aControlDependencies.addController( ::svt::PDialogController( - new TextResetOperatorController( m_aHostName, rtl::OUString("localhost") ) + new TextResetOperatorController( m_aHostName, OUString("localhost") ) ) ); // sockets are available on Unix systems only, named pipes only on Windows diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 558dd9919a9f..3fbebe0a9cd7 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -78,7 +78,7 @@ namespace dbaui } //------------------------------------------------------------------------- - OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const rtl::OString& _rId, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) + OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rUIXMLDescription, _rAttrSet) ,m_abEnableRoadmap(sal_False) ,m_pAdminDialog(NULL) @@ -147,7 +147,7 @@ namespace dbaui return 0L; } // ----------------------------------------------------------------------- - sal_Bool OGenericAdministrationPage::getSelectedDataSource(::rtl::OUString& _sReturn,::rtl::OUString& _sCurr) + sal_Bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn,OUString& _sCurr) { // collect all ODBC data source names StringBag aOdbcDatasources; diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index e9e11c8a853e..2a9d08c4e741 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -109,7 +109,7 @@ namespace dbaui m_xORB; public: OGenericAdministrationPage(Window* _pParent, const ResId& _rId, const SfxItemSet& _rAttrSet); - OGenericAdministrationPage(Window* _pParent, const rtl::OString& _rId, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); + OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); ~OGenericAdministrationPage(); /// set a handler which gets called every time something on the page has been modified @@ -146,7 +146,7 @@ namespace dbaui @return <FALSE/> if an error occurred, otherwise <TRUE/> */ - sal_Bool getSelectedDataSource(::rtl::OUString& _sReturn,::rtl::OUString& _sCurr); + sal_Bool getSelectedDataSource(OUString& _sReturn,OUString& _sCurr); // svt::IWizardPageController virtual void initializePage(); diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index dcbd89c38dc7..a6dcb45b0f97 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -48,9 +48,9 @@ const CLSID CLSID_DataLinks = { 0x2206CDB2, 0x19C1, 0x11D1, { 0x89, 0xE0, 0x00, BSTR PromptEdit(long hWnd,BSTR connstr); BSTR PromptNew(long hWnd); -::rtl::OUString getAdoDatalink(long hWnd,::rtl::OUString& oldLink) +OUString getAdoDatalink(long hWnd,OUString& oldLink) { - ::rtl::OUString dataLink; + OUString dataLink; if (!oldLink.isEmpty()) { dataLink=reinterpret_cast<sal_Unicode *>(PromptEdit(hWnd,(BSTR)oldLink.getStr())); diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx index 523e9a1df854..e5de6c289a28 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.hxx +++ b/dbaccess/source/ui/dlg/adodatalinks.hxx @@ -23,6 +23,6 @@ #include <osl/module.h> #include "commontypes.hxx" -::rtl::OUString getAdoDatalink(long hWnd,::rtl::OUString& oldLink); +OUString getAdoDatalink(long hWnd,OUString& oldLink); #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 216d8902aaf9..68c5c1a6969c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -100,7 +100,7 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const if ( !pEntry ) return String(); - ::rtl::OUString aCatalog, aSchema, aTableName; + OUString aCatalog, aSchema, aTableName; SvTreeListEntry* pSchema = m_rTableList.GetParent(pEntry); if(pSchema && pSchema != m_rTableList.getAllObjectsEntry()) { @@ -111,7 +111,7 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const } aTableName = m_rTableList.GetEntryText(pEntry); - ::rtl::OUString aComposedName; + OUString aComposedName; try { Reference< XDatabaseMetaData > xMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW ); @@ -121,7 +121,7 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const && !xMeta->supportsSchemasInDataManipulation() ) { aCatalog = aSchema; - aSchema = ::rtl::OUString(); + aSchema = OUString(); } aComposedName = ::dbtools::composeTableName( @@ -160,7 +160,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) Reference< XViewsSupplier > xViewSupp; Reference< XNameAccess > xTables, xViews; - Sequence< ::rtl::OUString > sTables, sViews; + Sequence< OUString > sTables, sViews; xTables = xTableSupp->getTables(); if ( xTables.is() ) @@ -185,18 +185,18 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) // if no views are allowed remove the views also out the table name filter if ( !_bAllowViews ) { - const ::rtl::OUString* pTableBegin = sTables.getConstArray(); - const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength(); - ::std::vector< ::rtl::OUString > aTables(pTableBegin,pTableEnd); + const OUString* pTableBegin = sTables.getConstArray(); + const OUString* pTableEnd = pTableBegin + sTables.getLength(); + ::std::vector< OUString > aTables(pTableBegin,pTableEnd); - const ::rtl::OUString* pViewBegin = sViews.getConstArray(); - const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength(); + const OUString* pViewBegin = sViews.getConstArray(); + const OUString* pViewEnd = pViewBegin + sViews.getLength(); ::comphelper::TStringMixEqualFunctor aEqualFunctor; for(;pViewBegin != pViewEnd;++pViewBegin) aTables.erase(::std::remove_if(aTables.begin(),aTables.end(),::std::bind2nd(aEqualFunctor,*pViewBegin)),aTables.end()); - ::rtl::OUString* pTables = aTables.empty() ? 0 : &aTables[0]; - sTables = Sequence< ::rtl::OUString>(pTables, aTables.size()); - sViews = Sequence< ::rtl::OUString>(); + OUString* pTables = aTables.empty() ? 0 : &aTables[0]; + sTables = Sequence< OUString>(pTables, aTables.size()); + sViews = Sequence< OUString>(); } m_rTableList.UpdateTableList( m_xConnection, sTables, sViews ); @@ -258,7 +258,7 @@ QueryListFacade::~QueryListFacade() void QueryListFacade::_elementInserted( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName; + OUString sName; if ( _rEvent.Accessor >>= sName ) m_rQueryList.InsertEntry( sName ); } @@ -290,10 +290,10 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ ) Reference< XContainer> xContainer(xQueries,UNO_QUERY_THROW); m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer); } - Sequence< ::rtl::OUString > aQueryNames = xQueries->getElementNames(); + Sequence< OUString > aQueryNames = xQueries->getElementNames(); - const ::rtl::OUString* pQuery = aQueryNames.getConstArray(); - const ::rtl::OUString* pQueryEnd = aQueryNames.getConstArray() + aQueryNames.getLength(); + const OUString* pQuery = aQueryNames.getConstArray(); + const OUString* pQueryEnd = aQueryNames.getConstArray() + aQueryNames.getLength(); while ( pQuery != pQueryEnd ) m_rQueryList.InsertEntry( *pQuery++ ); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 0230697af9d3..868d8a82119c 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -463,7 +463,7 @@ namespace dbaui delete pExampleSet; pExampleSet = new SfxItemSet(*GetInputSetImpl()); - const ::rtl::OUString eType = m_pImpl->getDatasourceType(*_pItems); + const OUString eType = m_pImpl->getDatasourceType(*_pItems); DataSourceMetaData aMeta( eType ); const FeatureSet& rFeatures( aMeta.getFeatureSet() ); @@ -489,7 +489,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - bool AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( const ::rtl::OUString& _sURL ) + bool AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( const OUString& _sURL ) { DataSourceMetaData aMeta( _sURL ); const FeatureSet& rFeatures( aMeta.getFeatureSet() ); @@ -556,7 +556,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const + OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -568,7 +568,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - void AdvancedSettingsDialog::setTitle(const ::rtl::OUString& _sTitle) + void AdvancedSettingsDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 759c45faacf8..865e2c80565f 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -240,7 +240,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou SetUpdateMode(sal_True); } // ----------------------------------------------------------------------------- -void ODbAdminDialog::setTitle(const ::rtl::OUString& _sTitle) +void ODbAdminDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } @@ -307,7 +307,7 @@ Reference< XDriver > ODbAdminDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const +OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -324,30 +324,30 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp _rpPool = NULL; _rppDefaults = NULL; - const ::rtl::OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); + const OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); // create and initialize the defaults _rppDefaults = new SfxPoolItem*[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1]; SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults - *pCounter++ = new SfxStringItem(DSID_NAME, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CONNECTURL, rtl::OUString()); - *pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< ::rtl::OUString >(&sFilterAll, 1)); + *pCounter++ = new SfxStringItem(DSID_NAME, OUString()); + *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, OUString()); + *pCounter++ = new SfxStringItem(DSID_CONNECTURL, OUString()); + *pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< OUString >(&sFilterAll, 1)); *pCounter++ = new DbuTypeCollectionItem(DSID_TYPECOLLECTION, _pTypeCollection); *pCounter++ = new SfxBoolItem(DSID_INVALID_SELECTION, sal_False); *pCounter++ = new SfxBoolItem(DSID_READONLY, sal_False); - *pCounter++ = new SfxStringItem(DSID_USER, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_PASSWORD, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CHARSET, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_USER, OUString()); + *pCounter++ = new SfxStringItem(DSID_PASSWORD, OUString()); + *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, OUString()); + *pCounter++ = new SfxStringItem(DSID_CHARSET, OUString()); *pCounter++ = new SfxBoolItem(DSID_PASSWORDREQUIRED, sal_False); *pCounter++ = new SfxBoolItem(DSID_SHOWDELETEDROWS, sal_False); *pCounter++ = new SfxBoolItem(DSID_ALLOWLONGTABLENAMES, sal_False); - *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, rtl::OUString(',')); - *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, rtl::OUString('"')); - *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, rtl::OUString('.')); - *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, rtl::OUString("txt")); + *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, OUString()); + *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, OUString(',')); + *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, OUString('"')); + *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, OUString('.')); + *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, OUString()); + *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, OUString("txt")); *pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, sal_True); *pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, sal_False); *pCounter++ = new SfxInt32Item(DSID_CONN_PORTNUMBER, 8100); @@ -356,16 +356,16 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxBoolItem(DSID_CONN_SHUTSERVICE, sal_False); *pCounter++ = new SfxInt32Item(DSID_CONN_DATAINC, 20); *pCounter++ = new SfxInt32Item(DSID_CONN_CACHESIZE, 20); - *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, OUString()); *pCounter++ = new SfxBoolItem(DSID_USECATALOG, sal_False); - *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, OUString()); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, 389); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, 100); *pCounter++ = new SfxBoolItem(DSID_SQL92CHECK, sal_False); - *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, OUString()); + *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, OUString()); *pCounter++ = new SfxBoolItem(DSID_AUTORETRIEVEENABLED, sal_False); *pCounter++ = new SfxBoolItem(DSID_APPEND_TABLE_ALIAS, sal_False); *pCounter++ = new SfxInt32Item(DSID_MYSQL_PORTNUMBER, 3306); @@ -377,15 +377,15 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxBoolItem(DSID_SCHEMA, sal_True); *pCounter++ = new SfxBoolItem(DSID_INDEXAPPENDIX, sal_True); *pCounter++ = new SfxBoolItem(DSID_CONN_LDAP_USESSL, sal_False); - *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, OUString()); *pCounter++ = new SfxBoolItem(DSID_DOSLINEENDS, sal_False); - *pCounter++ = new SfxStringItem(DSID_DATABASENAME, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_DATABASENAME, OUString()); *pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, sal_True); *pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, sal_True); *pCounter++ = new SfxBoolItem(DSID_IGNORECURRENCY, sal_False); - *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, OUString()); *pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, sal_True); - *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, OUString()); *pCounter++ = new OptionalBoolItem( DSID_PRIMARY_KEY_SUPPORT ); *pCounter++ = new SfxInt32Item(DSID_MAX_ROW_SCAN, 100); *pCounter++ = new SfxBoolItem( DSID_RESPECTRESULTSETTYPE,sal_False ); @@ -457,7 +457,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp }; OSL_ENSURE(sizeof(aItemInfos)/sizeof(aItemInfos[0]) == DSID_LAST_ITEM_ID,"Invalid Ids!"); - _rpPool = new SfxItemPool(rtl::OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, + _rpPool = new SfxItemPool(OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, aItemInfos, _rppDefaults); _rpPool->FreezeIdRanges(); diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index f600a38335b3..574d18063247 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::svt; -const rtl::OString aGroupIdent(RTL_CONSTASCII_STRINGPARAM("dBase III")); +const OString aGroupIdent(RTL_CONSTASCII_STRINGPARAM("dBase III")); // ODbaseIndexDialog ---------------------------------------------------------- DBG_NAME(ODbaseIndexDialog) @@ -309,22 +309,22 @@ void ODbaseIndexDialog::Init() // first assume for all indexes they're free - Sequence< ::rtl::OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder)); + Sequence< OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder)); - ::rtl::OUString aIndexExt("ndx"); - ::rtl::OUString aTableExt("dbf"); + OUString aIndexExt("ndx"); + OUString aTableExt("dbf"); ::std::vector< String > aUsedIndexes; - const ::rtl::OUString *pBegin = aFolderContent.getConstArray(); - const ::rtl::OUString *pEnd = pBegin + aFolderContent.getLength(); + const OUString *pBegin = aFolderContent.getConstArray(); + const OUString *pEnd = pBegin + aFolderContent.getLength(); aURL.SetSmartProtocol(INET_PROT_FILE); for(;pBegin != pEnd;++pBegin) { - rtl::OUString aName; + OUString aName; ::utl::LocalFileHelper::ConvertURLToPhysicalName(pBegin->getStr(),aName); aURL.SetSmartURL(aName); - rtl::OUString aExt = aURL.getExtension(); + OUString aExt = aURL.getExtension(); if (aExt == aIndexExt) { m_aFreeIndexList.push_back( OTableIndex(aURL.getName()) ); @@ -335,15 +335,15 @@ void ODbaseIndexDialog::Init() OTableInfo& rTabInfo = m_aTableInfoList.back(); // open the INF file - aURL.setExtension(rtl::OUString::createFromAscii("inf")); + aURL.setExtension(OUString::createFromAscii("inf")); OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL); Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) ); aInfFile.SetGroup( aGroupIdent ); // fill the indexes list - rtl::OString aNDX; + OString aNDX; sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); - rtl::OString aKeyName; + OString aKeyName; String aEntry; for( sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++ ) @@ -355,7 +355,7 @@ void ODbaseIndexDialog::Init() // yes -> add to the tables index list if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX"))) { - aEntry = rtl::OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding()); + aEntry = OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding()); rTabInfo.aIndexList.push_back( OTableIndex( aEntry ) ); // and remove it from the free index list @@ -439,21 +439,21 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const } aURL.SetSmartURL(aDsn); aURL.Append(aTableName); - aURL.setExtension(rtl::OUString::createFromAscii("inf")); + aURL.setExtension(OUString::createFromAscii("inf")); OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL); Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) ); aInfFile.SetGroup( aGroupIdent ); // first, delete all table indizes - rtl::OString aNDX; + OString aNDX; sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); sal_uInt16 nKey = 0; while( nKey < nKeyCnt ) { // Does the key point to an index file?... - rtl::OString aKeyName = aInfFile.GetKeyName( nKey ); + OString aKeyName = aInfFile.GetKeyName( nKey ); aNDX = aKeyName.copy(0,3); //...if yes, delete index file, nKey is at subsequent key @@ -474,12 +474,12 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const ++aIndex, ++nPos ) { - rtl::OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX")); + OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX")); if( nPos > 0 ) // first index contains no number aKeyName.append(static_cast<sal_Int32>(nPos)); aInfFile.WriteKey( aKeyName.makeStringAndClear(), - rtl::OUStringToOString(aIndex->GetIndexFileName(), + OUStringToOString(aIndex->GetIndexFileName(), osl_getThreadTextEncoding())); } @@ -491,7 +491,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const try { ::ucbhelper::Content aContent(aURL.GetURLNoPass(),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext()); - aContent.executeCommand( rtl::OUString("delete"),makeAny( sal_Bool( sal_True ) ) ); + aContent.executeCommand( OUString("delete"),makeAny( sal_Bool( sal_True ) ) ); } catch (const Exception& e ) { diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index b8e5273be615..639febdf98f7 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -231,7 +231,7 @@ Reference< XDriver > ODbTypeWizDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const +OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -320,7 +320,7 @@ sal_Bool ODbTypeWizDialog::leaveState(WizardState _nState) return sal_True; } // ----------------------------------------------------------------------------- -void ODbTypeWizDialog::setTitle(const ::rtl::OUString& _sTitle) +void ODbTypeWizDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } @@ -342,7 +342,7 @@ sal_Bool ODbTypeWizDialog::saveDatasource() if ( pPage ) pPage->FillItemSet(*m_pOutSet); - ::rtl::OUString sOldURL; + OUString sOldURL; if ( m_pImpl->getCurrentDataSource().is() ) m_pImpl->getCurrentDataSource()->getPropertyValue(PROPERTY_URL) >>= sOldURL; DataSourceInfoConverter::convert( getORB(), m_pCollection,sOldURL,m_eType,m_pImpl->getCurrentDataSource()); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index a0e8983c68f1..89aebb22b3df 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -176,7 +176,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent ::dbaccess::ODsnTypeCollection::TypeIterator aEnd = m_pCollection->end(); for(PathId i = 1;aIter != aEnd;++aIter,++i) { - const ::rtl::OUString sURLPrefix = aIter.getURLPrefix(); + const OUString sURLPrefix = aIter.getURLPrefix(); svt::RoadmapWizardTypes::WizardPath aPath; aPath.push_back(PAGE_DBSETUPWIZARD_INTRO); m_pCollection->fillPageIds(sURLPrefix,aPath); @@ -199,7 +199,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent ActivatePage(); } -void ODbTypeWizDialogSetup::declareAuthDepPath( const ::rtl::OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths) +void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths) { bool bHasAuthentication = DataSourceMetaData::getAuthentication( _sURL ) != AuthNone; @@ -313,7 +313,7 @@ void lcl_removeUnused(const ::comphelper::NamedValueCollection& _aOld,const ::co } } // ----------------------------------------------------------------------------- -void DataSourceInfoConverter::convert(const Reference<XComponentContext> & xContext, const ::dbaccess::ODsnTypeCollection* _pCollection,const ::rtl::OUString& _sOldURLPrefix,const ::rtl::OUString& _sNewURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDatasource) +void DataSourceInfoConverter::convert(const Reference<XComponentContext> & xContext, const ::dbaccess::ODsnTypeCollection* _pCollection,const OUString& _sOldURLPrefix,const OUString& _sNewURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDatasource) { if ( _pCollection->getPrefix(_sOldURLPrefix) == _pCollection->getPrefix(_sNewURLPrefix) ) return ; @@ -339,7 +339,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath() { sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf( m_pCollection->getEmbeddedDatabase() ); if ( nCreateNewDBIndex == -1 ) - nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString("sdbc:dbase:") ); + nCreateNewDBIndex = m_pCollection->getIndexOf( OUString("sdbc:dbase:") ); OSL_ENSURE( nCreateNewDBIndex != -1, "ODbTypeWizDialogSetup::activateDatabasePath: the GeneralPage should have prevented this!" ); activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), sal_True ); @@ -349,7 +349,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath() break; case OGeneralPageWizard::eConnectExternal: { - ::rtl::OUString sOld = m_sURL; + OUString sOld = m_sURL; m_sURL = m_pGeneralPage->GetSelectedType(); DataSourceInfoConverter::convert(getORB(), m_pCollection,sOld,m_sURL,m_pImpl->getCurrentDataSource()); ::dbaccess::DATASOURCE_TYPE eType = VerifyDataSourceType(m_pCollection->determineType(m_sURL)); @@ -469,21 +469,21 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const +OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const { - ::rtl::OUString sRet = m_pImpl->getDatasourceType(_rSet); + OUString sRet = m_pImpl->getDatasourceType(_rSet); if (m_pMySQLIntroPage != NULL && m_pMySQLIntroPage->IsVisible() ) { switch( m_pMySQLIntroPage->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_JDBC: - sRet = ::rtl::OUString("sdbc:mysql:jdbc:"); + sRet = OUString("sdbc:mysql:jdbc:"); break; case OMySQLIntroPageSetup::VIA_NATIVE: - sRet = ::rtl::OUString("sdbc:mysql:mysqlc:"); + sRet = OUString("sdbc:mysql:mysqlc:"); break; case OMySQLIntroPageSetup::VIA_ODBC: - sRet = ::rtl::OUString("sdbc:mysql:odbc:"); + sRet = OUString("sdbc:mysql:odbc:"); break; } } @@ -534,16 +534,16 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) break; case PAGE_DBSETUPWIZARD_MYSQL_ODBC: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:odbc:")))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(OUString("sdbc:mysql:odbc:")))); pPage = OConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet); break; case PAGE_DBSETUPWIZARD_MYSQL_JDBC: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:jdbc:")))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(OUString("sdbc:mysql:jdbc:")))); pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( this, *m_pOutSet); break; case PAGE_DBSETUPWIZARD_MYSQL_NATIVE: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:mysqlc:")))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(OUString("sdbc:mysql:mysqlc:")))); pPage = MySQLNativeSetupPage::Create( this, *m_pOutSet); break; @@ -618,17 +618,17 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage*, _ // ----------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup) { - ::rtl::OUString sURLPrefix; + OUString sURLPrefix; switch( _pMySQLIntroPageSetup->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_ODBC: - sURLPrefix = ::rtl::OUString("sdbc:mysql:odbc:"); + sURLPrefix = OUString("sdbc:mysql:odbc:"); break; case OMySQLIntroPageSetup::VIA_JDBC: - sURLPrefix = ::rtl::OUString("sdbc:mysql:jdbc:"); + sURLPrefix = OUString("sdbc:mysql:jdbc:"); break; case OMySQLIntroPageSetup::VIA_NATIVE: - sURLPrefix = ::rtl::OUString("sdbc:mysql:mysqlc:"); + sURLPrefix = OUString("sdbc:mysql:mysqlc:"); break; } activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), sal_True); @@ -699,7 +699,7 @@ sal_Bool ODbTypeWizDialogSetup::leaveState(WizardState _nState) } // ----------------------------------------------------------------------------- -void ODbTypeWizDialogSetup::setTitle(const ::rtl::OUString& /*_sTitle*/) +void ODbTypeWizDialogSetup::setTitle(const OUString& /*_sTitle*/) { OSL_FAIL( "ODbTypeWizDialogSetup::setTitle: not implemented!" ); // why? @@ -746,7 +746,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() aArgs.put( "InteractionHandler", xHandler ); aArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG ); - ::rtl::OUString sPath = m_pImpl->getDocumentUrl( *m_pOutSet ); + OUString sPath = m_pImpl->getDocumentUrl( *m_pOutSet ); xStore->storeAsURL( sPath, aArgs.getPropertyValues() ); if ( !m_pFinalPage || m_pFinalPage->IsDatabaseDocumentToBeRegistered() ) @@ -802,18 +802,18 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } //------------------------------------------------------------------------- - ::rtl::OUString ODbTypeWizDialogSetup::getDefaultDatabaseType() const + OUString ODbTypeWizDialogSetup::getDefaultDatabaseType() const { - ::rtl::OUString sEmbeddedURL = m_pCollection->getEmbeddedDatabase(); + OUString sEmbeddedURL = m_pCollection->getEmbeddedDatabase(); ::connectivity::DriversConfig aDriverConfig(getORB()); try { if ( aDriverConfig.getDriverFactoryName(sEmbeddedURL).isEmpty() || !m_pImpl->getDriver(sEmbeddedURL).is() ) - sEmbeddedURL = ::rtl::OUString("sdbc:dbase:"); + sEmbeddedURL = OUString("sdbc:dbase:"); } catch(const Exception&) { - sEmbeddedURL = ::rtl::OUString("sdbc:dbase:"); + sEmbeddedURL = OUString("sdbc:dbase:"); } return sEmbeddedURL; @@ -822,8 +822,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() //------------------------------------------------------------------------- void ODbTypeWizDialogSetup::CreateDatabase() { - ::rtl::OUString sUrl; - ::rtl::OUString eType = getDefaultDatabaseType(); + OUString sUrl; + OUString eType = getDefaultDatabaseType(); if ( m_pCollection->isEmbeddedDatabase(eType) ) { sUrl = eType; @@ -839,7 +839,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() INetURLObject aDBPathURL(m_sWorkPath); aDBPathURL.Append(m_aDocURL.getBase()); createUniqueFolderName(&aDBPathURL); - ::rtl::OUString sPrefix = eType; + OUString sPrefix = eType; sUrl = aDBPathURL.GetMainURL( INetURLObject::NO_DECODE); xSimpleFileAccess->createFolder(sUrl); sUrl = sPrefix.concat(sUrl); @@ -849,14 +849,14 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } //------------------------------------------------------------------------- - void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(const ::rtl::OUString& _sPath) + void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(const OUString& _sPath) { Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); Reference< XDatabaseContext > xDatabaseContext( DatabaseContext::create(getORB()) ); Reference< XNameAccess > xNameAccessDatabaseContext(xDatabaseContext, UNO_QUERY_THROW ); INetURLObject aURL( _sPath ); - ::rtl::OUString sFilename = aURL.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - ::rtl::OUString sDatabaseName = ::dbtools::createUniqueName(xNameAccessDatabaseContext, sFilename,sal_False); + OUString sFilename = aURL.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString sDatabaseName = ::dbtools::createUniqueName(xNameAccessDatabaseContext, sFilename,sal_False); xDatabaseContext->registerObject(sDatabaseName, xDatasource); } @@ -874,9 +874,9 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() INetURLObject aWorkURL( m_sWorkPath ); aFileDlg.SetDisplayFolder( aWorkURL.GetMainURL( INetURLObject::NO_DECODE )); - ::rtl::OUString sDefaultName = String( ModuleRes( STR_DATABASEDEFAULTNAME ) ); - ::rtl::OUString sExtension = pFilter->GetDefaultExtension(); - sDefaultName += sExtension.replaceAt( 0, 1, ::rtl::OUString() ); + OUString sDefaultName = String( ModuleRes( STR_DATABASEDEFAULTNAME ) ); + OUString sExtension = pFilter->GetDefaultExtension(); + sDefaultName += sExtension.replaceAt( 0, 1, OUString() ); aWorkURL.Append( sDefaultName ); sDefaultName = createUniqueFileName( aWorkURL ); aFileDlg.SetFileName( sDefaultName ); @@ -890,7 +890,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() if( m_aDocURL.GetProtocol() != INET_PROT_NOT_VALID ) { - ::rtl::OUString sFileName = m_aDocURL.GetMainURL( INetURLObject::NO_DECODE ); + OUString sFileName = m_aDocURL.GetMainURL( INetURLObject::NO_DECODE ); if ( ::utl::UCBContentHelper::IsDocument(sFileName) ) ::utl::UCBContentHelper::Kill(sFileName); m_pOutSet->Put(SfxStringItem(DSID_DOCUMENT_URL, sFileName)); @@ -904,7 +904,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() void ODbTypeWizDialogSetup::createUniqueFolderName(INetURLObject* pURL) { Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); - :: rtl::OUString sLastSegmentName = pURL->getName(); + :: OUString sLastSegmentName = pURL->getName(); sal_Bool bFolderExists = sal_True; sal_Int32 i = 1; while (bFolderExists == sal_True) @@ -913,7 +913,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() if (bFolderExists == sal_True) { i++; - pURL->setName(sLastSegmentName.concat(::rtl::OUString::valueOf(i))); + pURL->setName(sLastSegmentName.concat(OUString::valueOf(i))); } } } @@ -922,7 +922,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() String ODbTypeWizDialogSetup::createUniqueFileName(const INetURLObject& _rURL) { Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); - ::rtl::OUString BaseName = _rURL.getBase(); + OUString BaseName = _rURL.getBase(); sal_Bool bElementExists = sal_True; @@ -932,7 +932,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() bElementExists = xSimpleFileAccess->exists( aExistenceCheck.GetMainURL( INetURLObject::NO_DECODE ) ); if ( bElementExists ) { - aExistenceCheck.setBase( BaseName.concat( ::rtl::OUString::valueOf( i ) ) ); + aExistenceCheck.setBase( BaseName.concat( OUString::valueOf( i ) ) ); ++i; } } @@ -957,11 +957,11 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() Reference< XComponentLoader > m_xFrameLoader; Reference< XDesktop2 > m_xDesktop; Reference< XInteractionHandler2 > m_xInteractionHandler; - ::rtl::OUString m_sURL; + OUString m_sURL; OAsyncronousLink m_aAsyncCaller; public: - AsyncLoader( const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rURL ); + AsyncLoader( const Reference< XComponentContext >& _rxORB, const OUString& _rURL ); void doLoadAsync(); @@ -976,7 +976,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() }; // ............................................................................. - AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rURL ) + AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const OUString& _rURL ) :m_sURL( _rURL ) ,m_aAsyncCaller( LINK( this, AsyncLoader, OnOpenDocument ) ) { @@ -1023,7 +1023,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() aLoadArgs >>= aLoadArgPV; m_xFrameLoader->loadComponentFromURL( m_sURL, - ::rtl::OUString( "_default" ), + OUString( "_default" ), FrameSearchFlag::ALL, aLoadArgPV ); diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 61392de4d379..fe5c9721b90f 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -38,7 +38,6 @@ namespace dbaui using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; - using ::rtl::OStringBuffer; //==================================================================== //= LargeEntryListBox @@ -226,7 +225,7 @@ DBG_NAME(DirectSQLDialog) OSL_ENSURE(xStatement.is(), "DirectSQLDialog::implExecuteStatement: no statement returned by the connection!"); // clear the output box - m_aOutput.SetText(rtl::OUString()); + m_aOutput.SetText(OUString()); if (xStatement.is()) { if (OUString(_rStatement).toAsciiUpperCase().startsWith("SELECT") && m_pShowOutput->IsChecked()) @@ -239,7 +238,7 @@ DBG_NAME(DirectSQLDialog) while (xResultSet->next()) { // initialise the output line for each row - String out = ::rtl::OUString(""); + String out = OUString(""); // work along the columns until that are none left int i = 1; try @@ -247,7 +246,7 @@ DBG_NAME(DirectSQLDialog) for (;;) { // be dumb, treat everything as a string - out += xRow->getString(i) + ::rtl::OUString(","); + out += xRow->getString(i) + OUString(","); i++; } } @@ -256,7 +255,7 @@ DBG_NAME(DirectSQLDialog) { } // report the output - addOutputText(::rtl::OUString(out)); + addOutputText(OUString(out)); } } else { // execute it @@ -298,7 +297,7 @@ DBG_NAME(DirectSQLDialog) void DirectSQLDialog::addOutputText(const String& _rMessage) { String sAppendMessage = _rMessage; - sAppendMessage += rtl::OUString("\n"); + sAppendMessage += OUString("\n"); String sCompleteMessage = m_aOutput.GetText(); sCompleteMessage += sAppendMessage; diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index bcb599f97952..18d934094ccc 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -92,11 +92,11 @@ OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, sal_Int32 _nFlags) :m_aDescription(_pParent, ModuleRes (FT_DESCRIPTION)) ,m_aCatalogLbl(_pParent, ModuleRes (FT_CATALOG)) - ,m_aCatalog(_pParent, ModuleRes (ET_CATALOG), ::rtl::OUString()) + ,m_aCatalog(_pParent, ModuleRes (ET_CATALOG), OUString()) ,m_aSchemaLbl(_pParent, ModuleRes (FT_SCHEMA)) - ,m_aSchema(_pParent, ModuleRes (ET_SCHEMA), ::rtl::OUString()) + ,m_aSchema(_pParent, ModuleRes (ET_SCHEMA), OUString()) ,m_aLabel(_pParent, ModuleRes (FT_TITLE)) - ,m_aTitle(_pParent, ModuleRes (ET_TITLE), ::rtl::OUString()) + ,m_aTitle(_pParent, ModuleRes (ET_TITLE), OUString()) ,m_aPB_OK(_pParent, ModuleRes( PB_OK ) ) ,m_aPB_CANCEL(_pParent, ModuleRes( PB_CANCEL )) ,m_aPB_HELP(_pParent, ModuleRes( PB_HELP)) @@ -112,7 +112,7 @@ OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, if ( m_xMetaData.is() ) { - ::rtl::OUString sExtraNameChars( m_xMetaData->getExtraNameCharacters() ); + OUString sExtraNameChars( m_xMetaData->getExtraNameCharacters() ); m_aCatalog.setAllowedChars( sExtraNameChars ); m_aSchema.setAllowedChars( sExtraNameChars ); m_aTitle.setAllowedChars( sExtraNameChars ); @@ -156,7 +156,7 @@ namespace typedef Reference< XResultSet > (SAL_CALL XDatabaseMetaData::*FGetMetaStrings)(); void lcl_fillComboList( ComboBox& _rList, const Reference< XConnection >& _rxConnection, - FGetMetaStrings _GetAll, const ::rtl::OUString& _rCurrent ) + FGetMetaStrings _GetAll, const OUString& _rCurrent ) { try { @@ -164,7 +164,7 @@ namespace Reference< XResultSet > xRes = (xMetaData.get()->*_GetAll)(); Reference< XRow > xRow( xRes, UNO_QUERY_THROW ); - ::rtl::OUString sValue; + OUString sValue; while ( xRes->next() ) { sValue = xRow->getString( 1 ); @@ -248,7 +248,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, OSL_ENSURE(m_pImpl->m_xMetaData.is(),"The metadata can not be null!"); if(m_pImpl->m_aName.Search('.') != STRING_NOTFOUND) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_pImpl->m_xMetaData, m_pImpl->m_aName, sCatalog, @@ -327,7 +327,7 @@ IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton) { m_pImpl->m_aName = m_pImpl->m_aTitle.GetText(); - ::rtl::OUString sNameToCheck( m_pImpl->m_aName ); + OUString sNameToCheck( m_pImpl->m_aName ); if ( m_pImpl->m_nType == CommandType::TABLE ) { diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index db56e6af9465..3fe579f10139 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -142,7 +142,7 @@ IMPL_LINK( ODatasourceSelectDialog, ManageProcessFinished, void*, /**/ ) // ----------------------------------------------------------------------------- void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) { - ::rtl::OUString sSelected; + OUString sSelected; if (m_aDatasource.GetEntryCount()) sSelected = m_aDatasource.GetSelectEntry(); m_aDatasource.Clear(); diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 5117f2ec50bd..fb3bbf162da1 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -58,7 +58,7 @@ namespace dbaui //= OGeneralPage //========================================================================= //------------------------------------------------------------------------- - OGeneralPage::OGeneralPage( Window* pParent, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) + OGeneralPage::OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) :OGenericAdministrationPage( pParent, "PageGeneral", _rUIXMLDescription, _rItems ) ,m_pSpecialMessage ( NULL ) ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN ) diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index a10e5ff10c38..197b1bc5dc22 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -38,7 +38,7 @@ namespace dbaui class OGeneralPage : public OGenericAdministrationPage { protected: - OGeneralPage( Window* pParent, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rItems ); + OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ); ~OGeneralPage(); private: diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 50c874248831..0530b1f9cb1e 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -97,9 +97,9 @@ namespace dbaui { } - extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars); + extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars); //------------------------------------------------------------------ - sal_Bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const rtl::OUString& _rNewText ) + sal_Bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const OUString& _rNewText ) { // first check if this is valid SQL92 name if ( isSQL92CheckEnabled(m_xConnection) ) @@ -107,7 +107,7 @@ namespace dbaui Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData(); if ( xMeta.is() ) { - ::rtl::OUString sAlias = ::dbtools::convertName2SQLName(_rNewText, xMeta->getExtraNameCharacters()); + OUString sAlias = ::dbtools::convertName2SQLName(_rNewText, xMeta->getExtraNameCharacters()); if ( ( xMeta->supportsMixedCaseQuotedIdentifiers() ) ? sAlias != _rNewText @@ -173,13 +173,13 @@ namespace dbaui //================================================================== DBG_NAME(DbaIndexDialog) //------------------------------------------------------------------ - DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames, + DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< OUString >& _rFieldNames, const Reference< XNameAccess >& _rxIndexes, const Reference< XConnection >& _rxConnection, const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex) :ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN)) ,m_xConnection(_rxConnection) - ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString("dbaccess.tabledesign.indexdialog")) + ,m_aGeometrySettings(E_DIALOG, OUString("dbaccess.tabledesign.indexdialog")) ,m_aActions (this, ModuleRes(TLB_ACTIONS)) ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 4bb717831cad..74b6acd6fd8c 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -219,13 +219,13 @@ DBG_NAME(IndexFieldsControl) sal_Int32 nWidthAsc = GetTextWidth(m_sAscendingText) + GetSettings().GetStyleSettings().GetScrollBarSize(); sal_Int32 nWidthDesc = GetTextWidth(m_sDescendingText) + GetSettings().GetStyleSettings().GetScrollBarSize(); // maximum plus some additional space - return (nWidthAsc > nWidthDesc ? nWidthAsc : nWidthDesc) + GetTextWidth(rtl::OUString('0')) * 2; + return (nWidthAsc > nWidthDesc ? nWidthAsc : nWidthDesc) + GetTextWidth(OUString('0')) * 2; } return EditBrowseBox::GetTotalCellWidth(_nRow, _nColId); } //------------------------------------------------------------------ - void IndexFieldsControl::Init(const Sequence< ::rtl::OUString >& _rAvailableFields) + void IndexFieldsControl::Init(const Sequence< OUString >& _rAvailableFields) { RemoveColumns(); @@ -249,7 +249,7 @@ DBG_NAME(IndexFieldsControl) nOther = GetTextWidth(m_sDescendingText) + GetSettings().GetStyleSettings().GetScrollBarSize(); nSortOrderColumnWidth = nSortOrderColumnWidth > nOther ? nSortOrderColumnWidth : nOther; // (plus some additional space) - nSortOrderColumnWidth += GetTextWidth(rtl::OUString('0')) * 2; + nSortOrderColumnWidth += GetTextWidth(OUString('0')) * 2; InsertDataColumn(COLUMN_ID_ORDER, sColumnName, nSortOrderColumnWidth, HIB_STDSTYLE, 1); m_pSortingCell = new ListBoxControl(&GetDataWindow()); @@ -271,8 +271,8 @@ DBG_NAME(IndexFieldsControl) m_pFieldNameCell = new ListBoxControl(&GetDataWindow()); m_pFieldNameCell->InsertEntry(String()); m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); - const ::rtl::OUString* pFields = _rAvailableFields.getConstArray(); - const ::rtl::OUString* pFieldsEnd = pFields + _rAvailableFields.getLength(); + const OUString* pFields = _rAvailableFields.getConstArray(); + const OUString* pFieldsEnd = pFields + _rAvailableFields.getLength(); for (;pFields < pFieldsEnd; ++pFields) m_pFieldNameCell->InsertEntry(*pFields); } diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index e4a589e8e5b0..d6434010e1ab 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -122,7 +122,7 @@ OOdbcLibWrapper::OOdbcLibWrapper() //------------------------------------------------------------------------- sal_Bool OOdbcLibWrapper::load(const sal_Char* _pLibPath) { - m_sLibPath = ::rtl::OUString::createFromAscii(_pLibPath); + m_sLibPath = OUString::createFromAscii(_pLibPath); #ifdef HAVE_ODBC_SUPPORT // load the module m_pOdbcLib = osl_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW); @@ -147,7 +147,7 @@ void OOdbcLibWrapper::unload() //------------------------------------------------------------------------- oslGenericFunction OOdbcLibWrapper::loadSymbol(const sal_Char* _pFunctionName) { - return osl_getFunctionSymbol(m_pOdbcLib, ::rtl::OUString::createFromAscii(_pFunctionName).pData); + return osl_getFunctionSymbol(m_pOdbcLib, OUString::createFromAscii(_pFunctionName).pData); } //------------------------------------------------------------------------- @@ -281,7 +281,7 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) break; else { - ::rtl::OUString aCurrentDsn(reinterpret_cast<const char*>(szDSN),pcbDSN, nTextEncoding); + OUString aCurrentDsn(reinterpret_cast<const char*>(szDSN),pcbDSN, nTextEncoding); _rNames.insert(aCurrentDsn); } } @@ -343,7 +343,7 @@ bool OOdbcManagement::manageDataSources_async() // this is done in an external process, due to #i78733# // (and note this whole functionality is supported on Windows only, ATM) - ::rtl::OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" ); + OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" ); ::rtl::Bootstrap::expandMacros( sExecutableName ); //TODO: detect failure oslProcess hProcessHandle(0); oslProcessError eError = osl_executeProcess( sExecutableName.pData, NULL, 0, 0, NULL, NULL, NULL, 0, &hProcessHandle ); diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 7ecadd29c9e9..1feeab014c40 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -48,7 +48,7 @@ namespace dbaui class OOdbcLibWrapper { oslModule m_pOdbcLib; // the library handle - ::rtl::OUString m_sLibPath; // the path to the library + OUString m_sLibPath; // the path to the library public: #ifdef HAVE_ODBC_SUPPORT @@ -56,7 +56,7 @@ public: #else sal_Bool isLoaded() const { return sal_False; } #endif - ::rtl::OUString getLibraryName() const { return m_sLibPath; } + OUString getLibraryName() const { return m_sLibPath; } protected: #ifndef HAVE_ODBC_SUPPORT diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 130ee03ab2a9..381291e661f8 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -107,9 +107,9 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, try { // ... also write it into the remaining fields - Sequence< ::rtl::OUString> aNames = m_xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = m_xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); Reference<XPropertySet> xColumn; for(;pIter != pEnd;++pIter) { @@ -306,7 +306,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom sal_Bool bHaving = sal_False; try { - ::rtl::OUString sTableName; + OUString sTableName; sal_Bool bFunction = sal_False; _rFilter.Name = _rField.GetSelectEntry(); Reference< XPropertySet > xColumn = getQueryColumn(_rFilter.Name); @@ -322,26 +322,26 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom { // properly quote all parts of the table name, so // e.g. <schema>.<table> becomes "<schema>"."<table>" - ::rtl::OUString aCatlog,aSchema,aTable; + OUString aCatlog,aSchema,aTable; ::dbtools::qualifiedNameComponents( m_xMetaData, sTableName, aCatlog, aSchema, aTable, ::dbtools::eInDataManipulation ); sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, sal_True, ::dbtools::eInDataManipulation ); } } xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; - static ::rtl::OUString sAgg("AggregateFunction"); + static OUString sAgg("AggregateFunction"); if ( xInfo->hasPropertyByName(sAgg) ) xColumn->getPropertyValue(sAgg) >>= bHaving; - static ::rtl::OUString sFunction("Function"); + static OUString sFunction("Function"); if ( xInfo->hasPropertyByName(sFunction) ) xColumn->getPropertyValue(sFunction) >>= bFunction; } if ( !bFunction ) { - const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); + const OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : OUString(); _rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name); if ( !sTableName.isEmpty() ) { - static ::rtl::OUString sSep("."); + static OUString sSep("."); sTableName += sSep; sTableName += _rFilter.Name; _rFilter.Name = sTableName; @@ -360,12 +360,12 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom if ( _rFilter.Handle == SQLFilterOperator::LIKE || _rFilter.Handle == SQLFilterOperator::NOT_LIKE ) ::Replace_OS_PlaceHolder( sPredicateValue ); - _rFilter.Value <<= ::rtl::OUString(sPredicateValue); + _rFilter.Value <<= OUString(sPredicateValue); } return bHaving; } -Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFieldName ) const +Reference< XPropertySet > DlgFilterCrit::getColumn( const OUString& _rFieldName ) const { Reference< XPropertySet > xColumn; try @@ -376,15 +376,15 @@ Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFie Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns(); if ( xColumns.is() && !xColumn.is() ) { - Sequence< ::rtl::OUString> aSeq = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + Sequence< OUString> aSeq = xColumns->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xProp(xColumns->getByName(*pIter),UNO_QUERY); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { - ::rtl::OUString sRealName; + OUString sRealName; xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; if ( sRealName == _rFieldName ) { @@ -404,7 +404,7 @@ Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFie return xColumn; } -Reference< XPropertySet > DlgFilterCrit::getQueryColumn( const ::rtl::OUString& _rFieldName ) const +Reference< XPropertySet > DlgFilterCrit::getQueryColumn( const OUString& _rFieldName ) const { Reference< XPropertySet > xColumn; try @@ -424,7 +424,7 @@ Reference< XPropertySet > DlgFilterCrit::getQueryColumn( const ::rtl::OUString& Reference< XPropertySet > DlgFilterCrit::getMatchingColumn( const Edit& _rValueInput ) const { // the name - ::rtl::OUString sField; + OUString sField; if ( &_rValueInput == &aET_WHEREVALUE1 ) { sField = aLB_WHEREFIELD1.GetSelectEntry(); @@ -455,7 +455,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField ) // and normalize it's content if ( xColumn.is() ) { - ::rtl::OUString sText( _pField->GetText() ); + OUString sText( _pField->GetText() ); m_aPredicateInput.normalizePredicateString( sText, xColumn ); _pField->SetText( sText ); } @@ -467,7 +467,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField ) void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Bool _bOr ) { DBG_CHKTHIS(DlgFilterCrit,NULL); - ::rtl::OUString aCondition; + OUString aCondition; _rItem.Value >>= aCondition; String aStr = aCondition; if ( _rItem.Handle == SQLFilterOperator::LIKE || @@ -542,7 +542,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo if ( pColumnListControl && pPredicateListControl && pPredicateValueControl ) { - ::rtl::OUString sName; + OUString sName; if ( xColumn.is() ) xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; else @@ -555,7 +555,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo pPredicateListControl->SelectEntryPos( GetSelectionPos( (sal_Int32)_rItem.Handle, *pPredicateListControl ) ); // initially normalize this value - ::rtl::OUString aString( aStr ); + OUString aString( aStr ); m_aPredicateInput.normalizePredicateString( aString, xColumn ); pPredicateValueControl->SetText( aString ); } diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 33d1bef259c3..60860c32d4cc 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -99,9 +99,9 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent, try { // ... also the remaining fields - Sequence< ::rtl::OUString> aNames = m_xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = m_xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); Reference<XPropertySet> xColumn; for(;pIter != pEnd;++pIter) { @@ -154,8 +154,8 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() { try { - const ::rtl::OUString sNameProperty = ::rtl::OUString( "Name" ); - const ::rtl::OUString sAscendingProperty = ::rtl::OUString( "IsAscending" ); + const OUString sNameProperty = OUString( "Name" ); + const OUString sAscendingProperty = OUString( "IsAscending" ); Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_QUERY_THROW ); sal_Int32 nColumns = xOrderColumns->getCount(); @@ -166,7 +166,7 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() { Reference< XPropertySet > xColumn( xOrderColumns->getByIndex( i ), UNO_QUERY_THROW ); - ::rtl::OUString sColumnName; + OUString sColumnName; sal_Bool bIsAscending( sal_True ); xColumn->getPropertyValue( sNameProperty ) >>= sColumnName; @@ -215,23 +215,23 @@ void DlgOrderCrit::EnableLines() } } -::rtl::OUString DlgOrderCrit::GetOrderList( ) const +OUString DlgOrderCrit::GetOrderList( ) const { DBG_CHKTHIS(DlgOrderCrit,NULL); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); - ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); - static const ::rtl::OUString sDESC(" DESC "); - static const ::rtl::OUString sASC(" ASC "); + OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : OUString(); + static const OUString sDESC(" DESC "); + static const OUString sASC(" ASC "); Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns(); - ::rtl::OUString sOrder; + OUString sOrder; for( sal_uInt16 i=0 ; i<DOG_ROWS; i++ ) { if(m_aColumnList[i]->GetSelectEntryPos() != 0) { if(!sOrder.isEmpty()) - sOrder += ::rtl::OUString(","); + sOrder += OUString(","); String sName = m_aColumnList[i]->GetSelectEntry(); try @@ -242,10 +242,10 @@ void DlgOrderCrit::EnableLines() { if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { - ::rtl::OUString sRealName; + OUString sRealName; xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; sName = sRealName; - static ::rtl::OUString sFunction("Function"); + static OUString sFunction("Function"); if ( xColumn->getPropertySetInfo()->hasPropertyByName(sFunction) ) xColumn->getPropertyValue(sFunction) >>= bFunction; } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 4b3c1a51ee2d..d263417cb5e6 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -216,11 +216,11 @@ namespace //------------------------------------------------------------------------------ /// strips the [OOoBase] vendor identifier from the given error message, if applicable - ::rtl::OUString lcl_stripOOoBaseVendor( const ::rtl::OUString& _rErrorMessage ) + OUString lcl_stripOOoBaseVendor( const OUString& _rErrorMessage ) { - ::rtl::OUString sErrorMessage( _rErrorMessage ); + OUString sErrorMessage( _rErrorMessage ); - const ::rtl::OUString sVendorIdentifier( ::connectivity::SQLError::getMessagePrefix() ); + const OUString sVendorIdentifier( ::connectivity::SQLError::getMessagePrefix() ); if ( sErrorMessage.indexOf( sVendorIdentifier ) == 0 ) { // characters to strip @@ -630,14 +630,14 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) { lcl_addButton( *this, BUTTON_HELP, false ); - rtl::OUString aTmp; + OUString aTmp; INetURLObject aHID( m_sHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) aTmp = aHID.GetURLPath(); else aTmp = m_sHelpURL; - SetHelpId( rtl::OUStringToOString( aTmp, RTL_TEXTENCODING_UTF8 ) ); + SetHelpId( OUStringToOString( aTmp, RTL_TEXTENCODING_UTF8 ) ); } } @@ -679,7 +679,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) { SetText( utl::ConfigManager::getProductName() + - rtl::OUString( " Base" ) ); + OUString( " Base" ) ); // position and size the controls and the dialog, depending on whether we have one or two texts to display impl_positionControls(); @@ -704,7 +704,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) } //------------------------------------------------------------------------------ -OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const ::rtl::OUString& _rHelpURL ) +OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const OUString& _rHelpURL ) :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG ) ,m_aInfoImage( this ) ,m_aTitle( this, WB_WORDBREAK | WB_LEFT ) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 7817ddff32c6..d8996a85045f 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -154,7 +154,7 @@ DBG_NAME(OTableSubscriptionPage) } } //------------------------------------------------------------------------ - void OTableSubscriptionPage::implCheckTables(const Sequence< ::rtl::OUString >& _rTables) + void OTableSubscriptionPage::implCheckTables(const Sequence< OUString >& _rTables) { // the meta data for the current connection, used for splitting up table names Reference< XDatabaseMetaData > xMeta; @@ -172,13 +172,13 @@ DBG_NAME(OTableSubscriptionPage) CheckAll(sal_False); // check the ones which are in the list - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; SvTreeListEntry* pRootEntry = m_aTablesList.getAllObjectsEntry(); sal_Bool bAllTables = sal_False; sal_Bool bAllSchemas = sal_False; - const ::rtl::OUString* pIncludeTable = _rTables.getConstArray(); + const OUString* pIncludeTable = _rTables.getConstArray(); for (sal_Int32 i=0; i<_rTables.getLength(); ++i, ++pIncludeTable) { if (xMeta.is()) @@ -221,7 +221,7 @@ DBG_NAME(OTableSubscriptionPage) } //------------------------------------------------------------------------ - void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter ) + void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter ) { if (!_rTableFilter.getLength()) { // no tables visible @@ -304,11 +304,11 @@ DBG_NAME(OTableSubscriptionPage) Reference<XModifiable> xModi(getDataSourceOrModel(xProp),UNO_QUERY); sal_Bool bModified = ( xModi.is() && xModi->isModified() ); - Sequence< ::rtl::OUString > aNewTableFilter(1); - aNewTableFilter[0] = ::rtl::OUString("%"); + Sequence< OUString > aNewTableFilter(1); + aNewTableFilter[0] = OUString("%"); xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aNewTableFilter)); - xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< ::rtl::OUString >() ) ); + xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< OUString >() ) ); Reference< ::com::sun::star::lang::XEventListener> xEvt; aErrorInfo = ::dbaui::createConnection(xProp, m_xORB, xEvt, m_xCurrentConnection); @@ -351,7 +351,7 @@ DBG_NAME(OTableSubscriptionPage) else { // in addition, we need some infos about the connection used - m_sCatalogSeparator = ::rtl::OUString("."); // (default) + m_sCatalogSeparator = OUString("."); // (default) m_bCatalogAtStart = sal_True; // (default) try { @@ -376,7 +376,7 @@ DBG_NAME(OTableSubscriptionPage) // get the current table filter SFX_ITEMSET_GET(_rSet, pTableFilter, OStringListItem, DSID_TABLEFILTER, sal_True); - Sequence< ::rtl::OUString > aTableFilter; + Sequence< OUString > aTableFilter; if (pTableFilter) aTableFilter = pTableFilter->getList(); @@ -464,13 +464,13 @@ DBG_NAME(OTableSubscriptionPage) } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > OTableSubscriptionPage::collectDetailedSelection() const + Sequence< OUString > OTableSubscriptionPage::collectDetailedSelection() const { - Sequence< ::rtl::OUString > aTableFilter; - static const ::rtl::OUString sDot("."); - static const ::rtl::OUString sWildcard("%"); + Sequence< OUString > aTableFilter; + static const OUString sDot("."); + static const OUString sWildcard("%"); - ::rtl::OUString sComposedName; + OUString sComposedName; const SvTreeListEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry(); if (!pAllObjectsEntry) return aTableFilter; @@ -484,7 +484,7 @@ DBG_NAME(OTableSubscriptionPage) if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChildren(pEntry)) { // checked and a leaf, which means it's no catalog, no schema, but a real table - ::rtl::OUString sCatalog; + OUString sCatalog; if(m_aTablesList.GetModel()->HasParent(pEntry)) { pSchema = m_aTablesList.GetModel()->GetParent(pEntry); @@ -516,7 +516,7 @@ DBG_NAME(OTableSubscriptionPage) if (bCatalogWildcard) sCatalog = sWildcard; else - sCatalog = ::rtl::OUString(); + sCatalog = OUString(); sCatalog += m_sCatalogSeparator; sCatalog += m_aTablesList.GetEntryText( pCatalog ); } @@ -543,7 +543,7 @@ DBG_NAME(OTableSubscriptionPage) aTableFilter[nOldLen] = sComposedName; // reset the composed name - sComposedName = ::rtl::OUString(); + sComposedName = OUString(); } if (bCatalogWildcard) @@ -584,11 +584,11 @@ DBG_NAME(OTableSubscriptionPage) // create the output string which contains all the table names if ( m_xCurrentConnection.is() ) { // collect the table filter data only if we have a connection - else no tables are displayed at all - Sequence< ::rtl::OUString > aTableFilter; + Sequence< OUString > aTableFilter; if (m_aTablesList.isWildcardChecked(m_aTablesList.getAllObjectsEntry())) { aTableFilter.realloc(1); - aTableFilter[0] = ::rtl::OUString("%", 1, RTL_TEXTENCODING_ASCII_US); + aTableFilter[0] = OUString("%", 1, RTL_TEXTENCODING_ASCII_US); } else { diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 6a64c2e2c31c..9bc084b1e12f 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -46,7 +46,7 @@ namespace dbaui OTableTreeListBox m_aTablesList; FixedText m_aExplanation; - ::rtl::OUString m_sCatalogSeparator; + OUString m_sCatalogSeparator; sal_Bool m_bCatalogAtStart : 1; ::osl::Mutex m_aNotifierMutex; @@ -85,14 +85,14 @@ namespace dbaui /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> */ - void implCheckTables(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTables); + void implCheckTables(const ::com::sun::star::uno::Sequence< OUString >& _rTables); /// returns the next sibling, if not available, the next sibling of the parent, a.s.o. SvTreeListEntry* implNextSibling(SvTreeListEntry* _pEntry) const; /** return the current selection in <member>m_aTablesList</member> */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > collectDetailedSelection() const; + ::com::sun::star::uno::Sequence< OUString > collectDetailedSelection() const; /// (un)check all entries void CheckAll( sal_Bool bCheck = sal_True ); @@ -101,7 +101,7 @@ namespace dbaui // checks the tables according to the filter given // in oppsofite to implCheckTables, this method handles the case of an empty sequence, too ... - void implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter ); + void implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter ); }; //......................................................................... |