diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /dbaccess | |
parent | WaE: Potentially uninitialized local variable (diff) | |
download | core-8b27d78b4afaa9c47ca0fda144c8060f2f14046b.tar.gz core-8b27d78b4afaa9c47ca0fda144c8060f2f14046b.zip |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'dbaccess')
45 files changed, 168 insertions, 168 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 4a0b57a37e13..dc51d3c6c675 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1826,12 +1826,12 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes Reference<XPropertySet> xFormSet = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats()->getByKey(nFormatKey); OSL_ENSURE(xFormSet.is(),"XPropertySet is null!"); ::rtl::OUString sFormat; - xFormSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatString"))) >>= sFormat; + xFormSet->getPropertyValue(::rtl::OUString("FormatString")) >>= sFormat; if ( !bTextFormat ) { Locale aLocale; - ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))) >>= aLocale; + ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString("Locale")) >>= aLocale; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey); if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 886cdc11e3d5..1ae7fe74a4b4 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -205,7 +205,7 @@ namespace dbaui Sequence< Sequence< PropertyValue> > aHistory = SvtHistoryOptions().GetList( ePICKLIST ); Reference< XNameAccess > xFilterFactory; xFilterFactory = xFilterFactory.query( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ) ) ); + ::rtl::OUString( "com.sun.star.document.FilterFactory" ) ) ); sal_uInt32 nCount = aHistory.getLength(); for ( sal_uInt32 nItem = 0; nItem < nCount; ++nItem ) @@ -226,7 +226,7 @@ namespace dbaui ::comphelper::SequenceAsHashMap aFilterProperties( aProps ); ::rtl::OUString sDocumentService = aFilterProperties.getUnpackedValueOrDefault( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentService" ) ), ::rtl::OUString() ); + ::rtl::OUString( "DocumentService" ), ::rtl::OUString() ); if ( sDocumentService.equalsAscii( _pAsciiModuleName ) ) { // yes, it's a Base document diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index feee0a084aab..349a50fa3506 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -95,8 +95,8 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : m_notifier = n; } css::uno::Sequence< rtl::OUString > s(2); - s[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight")); - s[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontName")); + s[0] = rtl::OUString("FontHeight"); + s[1] = rtl::OUString("FontName"); n->addPropertiesChangeListener(s, m_listener.get()); m_ColorConfig.AddListener(this); diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index d768adf0358b..6baf9d09bbf3 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -106,19 +106,19 @@ namespace dbaui if ( m_aCommandURL == ".uno:DBNewForm" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewForm")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewView")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewViewSQL")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuery")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuerySql")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReportAutoPilot")),sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewTable")) ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewForm") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewView") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewViewSQL") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewQuery") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewQuerySql") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewReport") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewReportAutoPilot"),sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewTable") ,sal_True)); } else { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Refresh")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBRebuildData")) ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:Refresh") ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBRebuildData") ,sal_True)); } TCommandState::iterator aIter = m_aStates.begin(); @@ -187,7 +187,7 @@ namespace dbaui try { Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(getServiceManager()))); - Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"))); + Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument")); Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 1cb79146415d..3660aa5de92e 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -154,12 +154,12 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) { Sequence< Any > aValues(2); PropertyValue aValue; - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName")); + aValue.Name = ::rtl::OUString("ResourceName"); aValue.Value <<= sSubFolder; aValues[0] <<= aValue; - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceType")); - aValue.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("folder")); + aValue.Name = ::rtl::OUString("ResourceType"); + aValue.Value <<= ::rtl::OUString("folder"); aValues[1] <<= aValue; InteractionClassification eClass = InteractionClassification_ERROR; diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index b51ecc0211c1..9c4cc2ef6b13 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -589,18 +589,18 @@ DBG_NAME(OConnectionHelper) ::rtl::OUString sContentType; if ( INET_PROT_FILE == eProtocol ) { - sContentType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder")); + sContentType = ::rtl::OUString("application/vnd.sun.staroffice.fsys-folder"); // the file UCP currently does not support the ContentType property } else { - Any aContentType = aParent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")) ); + Any aContentType = aParent.getPropertyValue( ::rtl::OUString("ContentType") ); aContentType >>= sContentType; } // the properties which need to be set on the new content Sequence< ::rtl::OUString > aNewDirectoryProperties(1); - aNewDirectoryProperties[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); + aNewDirectoryProperties[0] = ::rtl::OUString("Title"); // the values to be set Sequence< Any > aNewDirectoryAttributes(1); diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index 1176326d0dc5..e60236d7608b 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -68,28 +68,28 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR } #endif typedef ::std::pair<sal_uInt16, ::rtl::OUString> TProperties; - TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowDeleted"))) - ,TProperties(DSID_CHARSET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet"))) - ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldDelimiter"))) - ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StringDelimiter"))) - ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalDelimiter"))) - ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ThousandDelimiter"))) - ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extension"))) - ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderLine"))) - ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SystemDriverSettings"))) - ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShutdownDatabase"))) - ,TProperties(DSID_CONN_DATAINC,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSizeIncrement"))) - ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSize"))) - ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlUser"))) - ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlPassword"))) - ,TProperties(DSID_USECATALOG,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalog"))) - ,TProperties(DSID_CONN_SOCKET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalSocket"))) - ,TProperties(DSID_NAMED_PIPE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedPipe"))) - ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass"))) - ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN"))) - ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRowCount"))) - ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSSL"))) - ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreCurrency"))) + 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()) }; // TODO: This mapping between IDs and property names already exists - in ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper. diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 30e52f18813a..404cefcf5a9c 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(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); + throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any()); } } catch(const SQLException&) diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 62c3cdabbb1d..559f04a2ed9c 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -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(RTL_CONSTASCII_USTRINGPARAM("delete")),makeAny( sal_Bool( sal_True ) ) ); + aContent.executeCommand( rtl::OUString("delete"),makeAny( sal_Bool( sal_True ) ) ); } catch (const Exception& e ) { diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 424db244bf36..7a9afc377d1e 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -344,7 +344,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath() { sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf( m_pCollection->getEmbeddedDatabase() ); if ( nCreateNewDBIndex == -1 ) - nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")) ); + nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString("sdbc:dbase:") ); OSL_ENSURE( nCreateNewDBIndex != -1, "ODbTypeWizDialogSetup::activateDatabasePath: the GeneralPage should have prevented this!" ); activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), sal_True ); @@ -482,13 +482,13 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() switch( m_pMySQLIntroPage->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_JDBC: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:jdbc:")); + sRet = ::rtl::OUString("sdbc:mysql:jdbc:"); break; case OMySQLIntroPageSetup::VIA_NATIVE: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:")); + sRet = ::rtl::OUString("sdbc:mysql:mysqlc:"); break; case OMySQLIntroPageSetup::VIA_ODBC: - sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:odbc:")); + sRet = ::rtl::OUString("sdbc:mysql:odbc:"); break; } } @@ -539,16 +539,16 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) break; case PAGE_DBSETUPWIZARD_MYSQL_ODBC: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:odbc:"))))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::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(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:jdbc:"))))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::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(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:"))))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:mysqlc:")))); pPage = MySQLNativeSetupPage::Create( this, *m_pOutSet); break; @@ -627,13 +627,13 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLInt switch( _pMySQLIntroPageSetup->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_ODBC: - sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:odbc:")); + sURLPrefix = ::rtl::OUString("sdbc:mysql:odbc:"); break; case OMySQLIntroPageSetup::VIA_JDBC: - sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:jdbc:")); + sURLPrefix = ::rtl::OUString("sdbc:mysql:jdbc:"); break; case OMySQLIntroPageSetup::VIA_NATIVE: - sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:")); + sURLPrefix = ::rtl::OUString("sdbc:mysql:mysqlc:"); break; } activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), sal_True); @@ -814,11 +814,11 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() try { if ( aDriverConfig.getDriverFactoryName(sEmbeddedURL).isEmpty() || !m_pImpl->getDriver(sEmbeddedURL).is() ) - sEmbeddedURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")); + sEmbeddedURL = ::rtl::OUString("sdbc:dbase:"); } catch(const Exception&) { - sEmbeddedURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")); + sEmbeddedURL = ::rtl::OUString("sdbc:dbase:"); } return sEmbeddedURL; @@ -1028,7 +1028,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() aLoadArgs >>= aLoadArgPV; m_xFrameLoader->loadComponentFromURL( m_sURL, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), + ::rtl::OUString( "_default" ), FrameSearchFlag::ALL, aLoadArgPV ); diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 96bafbcdef93..61392de4d379 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -239,7 +239,7 @@ DBG_NAME(DirectSQLDialog) while (xResultSet->next()) { // initialise the output line for each row - String out = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); + String out = ::rtl::OUString(""); // work along the columns until that are none left int i = 1; try @@ -247,7 +247,7 @@ DBG_NAME(DirectSQLDialog) for (;;) { // be dumb, treat everything as a string - out += xRow->getString(i) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + out += xRow->getString(i) + ::rtl::OUString(","); i++; } } diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 49e9697f6d02..4d646974aa68 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -179,7 +179,7 @@ DBG_NAME(DbaIndexDialog) const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex) :ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN)) ,m_xConnection(_rxConnection) - ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dbaccess.tabledesign.indexdialog"))) + ,m_aGeometrySettings(E_DIALOG, ::rtl::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/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 67216909840c..1f1b2e5e17dd 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -154,8 +154,8 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() { try { - const ::rtl::OUString sNameProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ); - const ::rtl::OUString sAscendingProperty = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAscending" ) ); + const ::rtl::OUString sNameProperty = ::rtl::OUString( "Name" ); + const ::rtl::OUString sAscendingProperty = ::rtl::OUString( "IsAscending" ); Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_QUERY_THROW ); sal_Int32 nColumns = xOrderColumns->getCount(); @@ -231,7 +231,7 @@ void DlgOrderCrit::EnableLines() if(m_aColumnList[i]->GetSelectEntryPos() != 0) { if(!sOrder.isEmpty()) - sOrder += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + sOrder += ::rtl::OUString(","); String sName = m_aColumnList[i]->GetSelectEntry(); try diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 874311a625bb..f9deebacf8b5 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -679,7 +679,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) { SetText( utl::ConfigManager::getProductName() + - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " Base" ) ) ); + rtl::OUString( " Base" ) ); // position and size the controls and the dialog, depending on whether we have one or two texts to display impl_positionControls(); diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 41754803c643..f31c32af66f9 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -305,7 +305,7 @@ DBG_NAME(OTableSubscriptionPage) sal_Bool bModified = ( xModi.is() && xModi->isModified() ); Sequence< ::rtl::OUString > aNewTableFilter(1); - aNewTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); + aNewTableFilter[0] = ::rtl::OUString("%"); xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aNewTableFilter)); xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< ::rtl::OUString >() ) ); @@ -351,7 +351,7 @@ DBG_NAME(OTableSubscriptionPage) else { // in addition, we need some infos about the connection used - m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default) + m_sCatalogSeparator = ::rtl::OUString("."); // (default) m_bCatalogAtStart = sal_True; // (default) try { diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 48f5d6b9f480..5d199166bb5e 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -823,7 +823,7 @@ void ODatabaseExport::ensureFormatter() SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId())); m_pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL; Reference<XPropertySet> xNumberFormatSettings = xSupplier->getNumberFormatSettings(); - xNumberFormatSettings->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= m_aNullDate; + xNumberFormatSettings->getPropertyValue(::rtl::OUString("NullDate")) >>= m_aNullDate; } } // ----------------------------------------------------------------------------- @@ -832,11 +832,11 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R ,const TPositions& _rvColumns) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::createPreparedStatment" ); - ::rtl::OUString aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT INTO "))); + ::rtl::OUString aSql(::rtl::OUString("INSERT INTO ")); ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); aSql += sComposedTableName; - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ( ")); + aSql += ::rtl::OUString(" ( "); // set values and column names ::rtl::OUString aValues(RTL_CONSTASCII_USTRINGPARAM(" VALUES ( ")); static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,")); diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index a4eaf1b23460..5bdd129a6f3a 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -66,7 +66,7 @@ void ORowSetImportExport::initialize() m_xTargetResultSetMetaData = Reference<XResultSetMetaDataSupplier>(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData(); if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() ) - throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); + throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,::rtl::OUString("S1000") ,0,Any()); sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount(); m_aColumnMapping.reserve(nCount); diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 856a8b477def..1405204dda8a 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -213,7 +213,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId; aTrans.sDefaultTableName = GetTableNameForAppend(); if ( !copyTagTable(aTrans,sal_False,_xConnection) ) - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); } catch(const SQLException&) { @@ -225,7 +225,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId } } else - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); } // ----------------------------------------------------------------------------- @@ -324,7 +324,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc else if ( !_rDesc.bError ) pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection); else - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); } // ----------------------------------------------------------------------------- //........................................................................ diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 70c1bb12c5d1..3f409cf51eaa 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1146,7 +1146,7 @@ void fillAutoIncrementValue(const Reference<XPropertySet>& _xDatasource, pValue->Value >>= _rsAutoIncrementValue; pValue =::std::find_if(aInfo.getConstArray(), aInfo.getConstArray() + aInfo.getLength(), - ::std::bind2nd(TPropertyValueEqualFunctor(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled")) )); + ::std::bind2nd(TPropertyValueEqualFunctor(),::rtl::OUString("IsAutoRetrievingEnabled") )); if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) ) pValue->Value >>= _rAutoIncrementValueEnabled; } @@ -1189,15 +1189,15 @@ void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark ) // query part exists? if ( _bQuestionMark ) // no, so start with '?' - _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?")); + _rURL += ::rtl::OUString("?"); else // yes, so only append with '&' - _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&")); + _rURL += ::rtl::OUString("&"); // set parameters - _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Language=")); + _rURL += ::rtl::OUString("Language="); _rURL += utl::ConfigManager::getLocale(); - _rURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&System=")); + _rURL += ::rtl::OUString("&System="); _rURL += SvtHelpOptions().GetSystem(); } @@ -1215,7 +1215,7 @@ namespace ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ), Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - if ( ( aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorName")) ) >>= sAnchor ) ) + if ( ( aCnt.getPropertyValue( ::rtl::OUString("AnchorName") ) >>= sAnchor ) ) { if ( !sAnchor.isEmpty() ) @@ -1242,9 +1242,9 @@ namespace ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName, const rtl::OString& sHelpId) { ::com::sun::star::util::URL aURL; - aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) ); + aURL.Complete = ::rtl::OUString( "vnd.sun.star.help://" ); aURL.Complete += _sModuleName; - aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + aURL.Complete += ::rtl::OUString( "/" ); aURL.Complete += ::rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8); ::rtl::OUString sAnchor; @@ -1254,7 +1254,7 @@ namespace AppendConfigToken(aURL.Complete,sal_True); if ( bHasAnchor ) { - aURL.Complete += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#")); + aURL.Complete += ::rtl::OUString("#"); aURL.Complete += sAnchor; } return aURL; @@ -1486,7 +1486,7 @@ Reference<XPropertySet> createView( const ::rtl::OUString& _rName, const Referen } else { - sCommand = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SELECT * FROM " ) ); + sCommand = ::rtl::OUString( "SELECT * FROM " ); sCommand += composeTableNameForSelect( _rxConnection, _rxSourceObject ); } return createView( _rName, _rxConnection, sCommand ); @@ -1557,7 +1557,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon { String sError(ModuleRes(STR_NAME_ALREADY_EXISTS)); sError.SearchAndReplaceAscii("#",sNewName); - throw SQLException(sError,NULL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); + throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any()); } try @@ -1566,11 +1566,11 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon Sequence< Any > aArguments(3); PropertyValue aValue; // set as folder - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")); + aValue.Name = ::rtl::OUString("Name"); aValue.Value <<= sNewName; aArguments[0] <<= aValue; //parent - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent")); + aValue.Name = ::rtl::OUString("Parent"); aValue.Value <<= xNameAccess; aArguments[1] <<= aValue; diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 8a3a8bc300de..edf5aeab57d1 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -168,21 +168,21 @@ void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObj void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _xConnection,const Reference< XPropertySet >& _rxObject ) const { ::std::pair< ::rtl::OUString, ::rtl::OUString > aProperties[] = { - ::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_FILTER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND "))) - ,::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_ORDER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY "))) + ::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_FILTER,::rtl::OUString(" AND ")) + ,::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_ORDER,::rtl::OUString(" ORDER BY ")) }; size_t i = 0; try { - const String sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))); + const String sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + ::rtl::OUString(".")); const ::rtl::OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject); - const String sTargetNameTemp = (sTargetName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))); + const String sTargetNameTemp = (sTargetName + ::rtl::OUString(".")); ::rtl::OUString sStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM ")); sStatement += sTargetName; - sStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE 0=1")); + sStatement += ::rtl::OUString(" WHERE 0=1"); for ( i=0; i < sizeof( aProperties ) / sizeof( aProperties[0] ); ++i ) @@ -942,7 +942,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) m_bCreatePrimaryKeyColumn = sal_True; m_aKeyName = pPage->GetKeyName(); if ( m_aKeyName.isEmpty() ) - m_aKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ) ); + m_aKeyName = ::rtl::OUString( "ID" ); m_aKeyName = createUniqueName( m_aKeyName ); sal_Int32 nBreakPos2 = 0; CheckColumns(nBreakPos2); diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index d5dae84f709f..28c21278515f 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -225,7 +225,7 @@ namespace dbaui { if ( _rData.m_xDocEventBroadcaster.is() ) { - ::rtl::OUString sEventName = _bActive ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnFocus")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnUnfocus")); + ::rtl::OUString sEventName = _bActive ? rtl::OUString("OnFocus") : rtl::OUString("OnUnfocus"); Reference< XController2 > xController( _rData.m_rController.getXController(), UNO_QUERY_THROW ); _rData.m_xDocEventBroadcaster->notifyDocumentEvent( sEventName, xController, Any() ); } diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 16b748d0f3c1..33013cb3887f 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -124,11 +124,11 @@ namespace dbaui NamedValue aProp; sal_Int32 nArg = 0; - aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentFrame")); + aProp.Name = ::rtl::OUString("ParentFrame"); aProp.Value <<= m_xParentFrame; lArgs[nArg++] <<= aProp; - aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopWindow")); + aProp.Name = ::rtl::OUString("TopWindow"); aProp.Value <<= sal_True; lArgs[nArg++] <<= aProp; @@ -147,7 +147,7 @@ namespace dbaui Reference< XComponentLoader > xFrameLoader( m_xFrameLoader, UNO_QUERY_THROW ); xReturn = xFrameLoader->loadComponentFromURL( m_sComponentURL, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), + ::rtl::OUString("_self"), 0, i_rDispatchArgs.getPropertyValues() ); diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index d28540383ba2..82deb2502ae2 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -165,9 +165,9 @@ namespace dbaui } // set the properties - static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUnique")); - static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAscending")); - static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")); + static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString("IsUnique"); + static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString("IsAscending"); + static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString("Name"); // the index' own props xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, ::cppu::bool2any(_rPos->bUnique)); xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName)); @@ -271,10 +271,10 @@ namespace dbaui //------------------------------------------------------------------ void OIndexCollection::implFillIndexInfo(OIndex& _rIndex, Reference< XPropertySet > _rxDescriptor) SAL_THROW((Exception)) { - static const ::rtl::OUString s_sPrimaryIndexPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsPrimaryKeyIndex")); - static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUnique")); - static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAscending")); - static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog")); + static const ::rtl::OUString s_sPrimaryIndexPropertyName = ::rtl::OUString("IsPrimaryKeyIndex"); + static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString("IsUnique"); + static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString("IsAscending"); + static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString("Catalog"); _rIndex.bPrimaryKey = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sPrimaryIndexPropertyName)); _rIndex.bUnique = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sUniquePropertyName)); diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index a89876dae742..0f6a854ac524 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -148,7 +148,7 @@ namespace dbaui switch ( _eOpenMode ) { case E_OPEN_NORMAL: - sOpenMode = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ); + sOpenMode = ::rtl::OUString( "open" ); break; case E_OPEN_FOR_MAIL: @@ -156,7 +156,7 @@ namespace dbaui // fall through case E_OPEN_DESIGN: - sOpenMode = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "openDesign" ) ); + sOpenMode = ::rtl::OUString( "openDesign" ); break; default: @@ -215,7 +215,7 @@ namespace dbaui ), UNO_QUERY_THROW ); } - xWizard->trigger( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "start" ) ) ); + xWizard->trigger( ::rtl::OUString( "start" ) ); ::comphelper::disposeComponent( xWizard ); } catch(const Exception&) @@ -317,7 +317,7 @@ namespace dbaui aCommandArgs.put( "OpenMode", aOpenModeArg ); Command aCommand; - aCommand.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "openDesign" ) ); + aCommand.Name = ::rtl::OUString( "openDesign" ); aCommand.Argument <<= aCommandArgs.getPropertyValues(); WaitObject aWaitCursor( m_pDialogParent ); xNewDocument.set( xContent->execute( aCommand, xContent->createCommandIdentifier(), NULL ), UNO_QUERY ); @@ -379,7 +379,7 @@ namespace dbaui aInfo = dbtools::SQLExceptionInfo(aSQLException); // more like a hack, insert an empty message - aInfo.prepend(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" \n"))); + aInfo.prepend(::rtl::OUString(" \n")); String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 393f4397b143..5cab1e4a9bc7 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -69,7 +69,7 @@ namespace dbaui // ----------------------------------------------------------------------------- ::rtl::OUString OConnectionLineAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ConnectionLineAccessibility")); + return ::rtl::OUString("org.openoffice.comp.dbu.ConnectionLineAccessibility"); } // ----------------------------------------------------------------------------- // XAccessibleContext diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index c84bb7790106..37e1e260a384 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -45,7 +45,7 @@ namespace dbaui // ----------------------------------------------------------------------------- ::rtl::OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.JoinViewAccessibility")); + return ::rtl::OUString("org.openoffice.comp.dbu.JoinViewAccessibility"); } // ----------------------------------------------------------------------------- void OJoinDesignViewAccess::clearTableView() diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 4ad229061658..4bc0556f2be3 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -440,7 +440,7 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV aWindowData.put( "WindowHeight", static_cast<sal_Int32>((*aIter)->GetSize().Height()) ); aWindowData.put( "ShowAll", (*aIter)->IsShowAll() ); - const ::rtl::OUString sTableName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Table" ) ) + ::rtl::OUString::valueOf( i ) ); + const ::rtl::OUString sTableName( ::rtl::OUString( "Table" ) + ::rtl::OUString::valueOf( i ) ); aAllTablesData.put( sTableName, aWindowData.getPropertyValues() ); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index d2577693d504..4bb97c530104 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -374,9 +374,9 @@ namespace OUString aQuote = xMetaData->getIdentifierQuoteString(); if ( _bForce || isAppendTableAliasEnabled( _xConnection ) || pEntryTab->GetAliasName() != aDBName ) { - aTableListStr += OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + aTableListStr += OUString(" "); if ( generateAsBeforeTableAlias( _xConnection ) ) - aTableListStr += OUString(RTL_CONSTASCII_USTRINGPARAM("AS ")); + aTableListStr += OUString("AS "); aTableListStr += ::dbtools::quoteName( aQuote, pEntryTab->GetAliasName() ); } aDBName = aTableListStr; @@ -865,7 +865,7 @@ namespace else { aWhereStr += aWork; - aWhereStr += OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + aWhereStr += OUString("="); aWhereStr += aCriteria; } } @@ -999,7 +999,7 @@ namespace eErrorCode = eStatementTooLong; else { - _rsRet = OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY ")); + _rsRet = OUString(" ORDER BY "); _rsRet += aWorkStr; } } @@ -1107,17 +1107,17 @@ namespace { // create outer join if ( bUseEscape ) - aStr += OUString(RTL_CONSTASCII_USTRINGPARAM("{ OJ ")); + aStr += OUString("{ OJ "); aStr += aJoin; if ( bUseEscape ) - aStr += OUString(RTL_CONSTASCII_USTRINGPARAM(" }")); + aStr += OUString(" }"); } break; default: aStr += aJoin; break; } - aStr += OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + aStr += OUString(","); aTableListStr += aStr; } } @@ -1584,7 +1584,7 @@ namespace for(;aIter != aTabEnd;++aIter) { OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second); - if (pTabWin->ExistsField( OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aDragLeft )) + if (pTabWin->ExistsField( OUString("*"), aDragLeft )) { aDragLeft->SetAlias(String()); aDragLeft->SetTable(String()); @@ -1698,22 +1698,22 @@ namespace case SQL_NODE_LESS: // take the opposite as we change the order i--; - aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM(">")); + aCondition = aCondition + OUString(">"); break; case SQL_NODE_LESSEQ: // take the opposite as we change the order i--; - aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); + aCondition = aCondition + OUString(">="); break; case SQL_NODE_GREAT: // take the opposite as we change the order i--; - aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM("<")); + aCondition = aCondition + OUString("<"); break; case SQL_NODE_GREATEQ: // take the opposite as we change the order i--; - aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); + aCondition = aCondition + OUString("<="); break; default: break; @@ -2258,7 +2258,7 @@ namespace for(;aIter != aEnd;++aIter) { OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second); - if (pTabWin->ExistsField( OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aInfo )) + if (pTabWin->ExistsField( OUString("*"), aInfo )) { aInfo->SetAlias(String()); aInfo->SetTable(String()); @@ -2943,16 +2943,16 @@ OUString OQueryDesignView::getStatement() aCriteriaListStr = aTmp; } // ----------------- construct statement ---------------------- - OUStringBuffer aSqlCmd(OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT "))); + OUStringBuffer aSqlCmd(OUString("SELECT ")); if(rController.isDistinct()) - aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" DISTINCT "))); + aSqlCmd.append(OUString(" DISTINCT ")); aSqlCmd.append(aFieldListStr); - aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "))); + aSqlCmd.append(OUString(" FROM ")); aSqlCmd.append(aTableListStr); if (aCriteriaListStr.getLength()) { - aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); + aSqlCmd.append(OUString(" WHERE ")); aSqlCmd.append(aCriteriaListStr.makeStringAndClear()); } // ----------------- construct GroupBy and attachen ------------ @@ -2967,7 +2967,7 @@ OUString OQueryDesignView::getStatement() // ----------------- attache having ------------ if(aHavingStr.getLength()) { - aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING "))); + aSqlCmd.append(OUString(" HAVING ")); aSqlCmd.append(aHavingStr.makeStringAndClear()); } // ----------------- construct sorting and attach ------------ @@ -3108,8 +3108,8 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE { // first try the international version OUString sSql; - sSql += OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * ")); - sSql += OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x WHERE ")); + sSql += OUString("SELECT * "); + sSql += OUString(" FROM x WHERE "); sSql += pEntry->GetField(); sSql += _sCriteria; SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 249fd03165c8..3556f0e58aa7 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -721,13 +721,13 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& else sSql += sFullFieldName; - sSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")) + sSql; + sSql = ::rtl::OUString("SELECT ") + sSql; if ( !sFieldAlias.isEmpty() ) { // always quote the alias name: there cannot be a function in it - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + sSql += ::rtl::OUString(" "); sSql += ::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), sFieldAlias ); } - sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x")); + sSql += ::rtl::OUString(" FROM x"); pParseNode = rParser.parseTree( sErrorMsg, sSql, bInternational ); } @@ -822,7 +822,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& if ( nFunCount == 4 && SQL_ISRULE(pColumnRef->getChild(3),column_ref) ) bError = fillColumnRef( pColumnRef->getChild(3), xConnection, aSelEntry, _bListAction ); else if ( nFunCount == 3 ) // we have a COUNT(*) here, so take the first table - bError = fillColumnRef( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), ::rtl::OUString(), xMetaData, aSelEntry, _bListAction ); + bError = fillColumnRef( ::rtl::OUString("*"), ::rtl::OUString(), xMetaData, aSelEntry, _bListAction ); else { nFunctionType |= FKT_NUMERIC; diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index 902132aa084e..9a4e5005f52f 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -216,7 +216,7 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con ++crit, ++c ) { - aCriteria[c].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Criterion_" ) ) + ::rtl::OUString::valueOf( c ); + aCriteria[c].Name = ::rtl::OUString( "Criterion_" ) + ::rtl::OUString::valueOf( c ); aCriteria[c].Value <<= *crit; } diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 413b3abf2540..03f57e2b37f9 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -183,7 +183,7 @@ sal_Bool OTableWindow::FillListBox() if (GetData()->IsShowAll()) { - SvTreeListEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) ); + SvTreeListEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString("*") ); pEntry->SetUserData( createUserData(NULL,false) ); } diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 3d88257e5204..b7350b15bfd9 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -88,14 +88,14 @@ namespace dbaui Sequence< ::rtl::OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.Accessible")); - aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext")); + aSupported[0] = ::rtl::OUString("com.sun.star.accessibility.Accessible"); + aSupported[1] = ::rtl::OUString("com.sun.star.accessibility.AccessibleContext"); return aSupported; } // ----------------------------------------------------------------------------- ::rtl::OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.TableWindowAccessibility")); + return ::rtl::OUString("org.openoffice.comp.dbu.TableWindowAccessibility"); } // ----------------------------------------------------------------------------- // XAccessibleContext diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index dc342f56ae04..174fb8d49e71 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -195,7 +195,7 @@ namespace dbaui ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::AddWindow)); - Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")), m_pViewSwitch->getORB()),UNO_QUERY ); + Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.frame.Frame"), m_pViewSwitch->getORB()),UNO_QUERY ); m_xBeamer.set( xBeamerFrame ); OSL_ENSURE(m_xBeamer.is(),"No frame created!"); m_xBeamer->initialize( VCLUnoHelper::GetInterface ( m_pBeamer ) ); diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 526202d29f52..083a76ff7b54 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -98,13 +98,13 @@ using namespace ::osl; //------------------------------------------------------------------------------ ::rtl::OUString ORelationController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ORelationDesign")); + return ::rtl::OUString("org.openoffice.comp.dbu.ORelationDesign"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RelationDesign")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.RelationDesign"); return aSupported; } //------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 3734961ef531..f1ab891036dd 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -390,7 +390,7 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) Reference<XPropertySet> xTable = GetView()->getController().getTable(); if (IsReadOnly() || ( xTable.is() && xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && - ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))) + ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString("VIEW"))) return NULL; ////////////////////////////////////////////////////////////////////// diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index a0d375d791b6..77ec4fce4827 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -132,13 +132,13 @@ namespace //------------------------------------------------------------------------------ ::rtl::OUString OTableController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OTableDesign")); + return ::rtl::OUString("org.openoffice.comp.dbu.OTableDesign"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.TableDesign")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableDesign"); return aSupported; } //------------------------------------------------------------------------- @@ -999,7 +999,7 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew) throw(::com::sun::star:: pActFieldDescr->SetAutoIncrement(sal_False); pActFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); - pActFieldDescr->SetName( createUniqueName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) )); + pActFieldDescr->SetName( createUniqueName(::rtl::OUString("ID") )); pActFieldDescr->SetPrimaryKey( sal_True ); m_vRowList.insert(m_vRowList.begin(),pNewRow); @@ -1258,7 +1258,7 @@ void OTableController::alterColumns() SQLException aNewException; aNewException.Message = sError; - aNewException.SQLState = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")); + aNewException.SQLState = ::rtl::OUString("S1000"); aNewException.NextException = ::cppu::getCaughtException(); throw aNewException; diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index f3690eb29de1..5a01b0491d8e 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -99,7 +99,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt ) if( rEvt.GetKeyCode().GetCode() == KEY_F2 ) { ::com::sun::star::util::URL aUrl; - aUrl.Complete =::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DSBEditDoc")); + aUrl.Complete =::rtl::OUString(".uno:DSBEditDoc"); GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() ); } } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index ad28ad1719fc..9b56fe1c5cdb 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -57,7 +57,7 @@ sal_Bool OTableFieldControl::IsReadOnly() { // Die Spalten einer ::com::sun::star::sdbcx::View können nicht verändert werden Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable(); - if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))) + if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString("VIEW")) bRead = sal_True; else { diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 14bbf350c855..41c2e7ce9299 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -95,7 +95,7 @@ namespace dbaui //------------------------------------------------------------------------- ::rtl::OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OAdvancedSettingsDialog")); + return ::rtl::OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog"); } //------------------------------------------------------------------------- @@ -108,7 +108,7 @@ namespace dbaui ::comphelper::StringSequence OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdvancedDatabaseSettingsDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.AdvancedDatabaseSettingsDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 7682a612250e..47ad0d93d140 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -55,7 +55,7 @@ Reference< XInterface > SAL_CALL OColumnControl::Create(const Reference< XMultiS // ----------------------------------------------------------------------------- ::rtl::OUString OColumnControl::GetComponentServiceName() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ColumnDescriptorControl")); + return ::rtl::OUString("com.sun.star.sdb.ColumnDescriptorControl"); } // ----------------------------------------------------------------------------- void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer) throw( RuntimeException ) diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index 95dd38e4fa0d..a18510f0ef5b 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -66,7 +66,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult //------------------------------------------------------------------------- ::rtl::OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ODBTypeWizDialog")); + return ::rtl::OUString("org.openoffice.comp.dbu.ODBTypeWizDialog"); } //------------------------------------------------------------------------- @@ -79,7 +79,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult ::comphelper::StringSequence ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DataSourceTypeChangeDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DataSourceTypeChangeDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 5ab3fb7d0dbe..31d30112d6be 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -52,10 +52,10 @@ ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XMultiServiceFacto ,m_bOpenDatabase(sal_True) ,m_bStartTableWizard(sal_False) { - registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenDatabase")), 3, PropertyAttribute::TRANSIENT, + registerProperty(::rtl::OUString("OpenDatabase"), 3, PropertyAttribute::TRANSIENT, &m_bOpenDatabase, getBooleanCppuType()); - registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartTableWizard")), 4, PropertyAttribute::TRANSIENT, + registerProperty(::rtl::OUString("StartTableWizard"), 4, PropertyAttribute::TRANSIENT, &m_bStartTableWizard, getBooleanCppuType()); } //------------------------------------------------------------------------- @@ -81,7 +81,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< //------------------------------------------------------------------------- ::rtl::OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ODBTypeWizDialogSetup")); + return ::rtl::OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"); } //------------------------------------------------------------------------- @@ -94,7 +94,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< ::comphelper::StringSequence ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseWizardDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DatabaseWizardDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index b39d12693b3f..7538e8e44448 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -67,7 +67,7 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu //------------------------------------------------------------------------- ::rtl::OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OTableFilterDialog")); + return ::rtl::OUString("org.openoffice.comp.dbu.OTableFilterDialog"); } //------------------------------------------------------------------------- @@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu ::comphelper::StringSequence OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.TableFilterDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableFilterDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 6284fe40f9cb..0ccace7fd67f 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -67,7 +67,7 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM //------------------------------------------------------------------------- ::rtl::OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OUserSettingsDialog")); + return ::rtl::OUString("org.openoffice.comp.dbu.OUserSettingsDialog"); } //------------------------------------------------------------------------- @@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM ::comphelper::StringSequence OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.UserAdministrationDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.UserAdministrationDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index e054018dc8c3..613a2822d548 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -67,7 +67,7 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen //------------------------------------------------------------------------- ::rtl::OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ODatasourceAdministrationDialog")); + return ::rtl::OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"); } //------------------------------------------------------------------------- @@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen ::comphelper::StringSequence ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatasourceAdministrationDialog")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DatasourceAdministrationDialog"); return aSupported; } |