summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationwizard.cxx6
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.cxx4
-rw-r--r--dbaccess/source/sdbtools/connection/tablename.cxx4
-rw-r--r--dbaccess/source/ui/app/AppController.cxx2
-rw-r--r--dbaccess/source/ui/app/AppControllerGen.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx6
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx16
7 files changed, 20 insertions, 20 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index d20e6246617e..96201b2f801f 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -157,7 +157,7 @@ namespace dbmm
if ( _rArguments.getLength() != 1 )
throw IllegalArgumentException(
- OUString(MacroMigrationResId(STR_INVALID_NUMBER_ARGS)),
+ MacroMigrationResId(STR_INVALID_NUMBER_ARGS),
*this,
1
);
@@ -165,7 +165,7 @@ namespace dbmm
m_xDocument.set( _rArguments[0], UNO_QUERY );
if ( !m_xDocument.is() )
throw IllegalArgumentException(
- OUString(MacroMigrationResId(STR_NO_DATABASE)),
+ MacroMigrationResId(STR_NO_DATABASE),
*this,
1
);
@@ -173,7 +173,7 @@ namespace dbmm
Reference< XStorable > xDocStor( m_xDocument, UNO_QUERY_THROW );
if ( xDocStor->isReadonly() )
throw IllegalArgumentException(
- OUString(MacroMigrationResId(STR_NOT_READONLY)),
+ MacroMigrationResId(STR_NOT_READONLY),
*this,
1
);
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 921c8a1b65bc..d423cfc12382 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -288,7 +288,7 @@ namespace sdbtools
&& ( _nCommandType != CommandType::QUERY )
)
throw IllegalArgumentException(
- OUString( SdbtRes( STR_INVALID_COMMAND_TYPE ) ),
+ SdbtRes( STR_INVALID_COMMAND_TYPE ),
nullptr,
0
);
@@ -311,7 +311,7 @@ namespace sdbtools
catch( const Exception& )
{
throw IllegalArgumentException(
- OUString( SdbtRes( STR_CONN_WITHOUT_QUERIES_OR_TABLES ) ),
+ SdbtRes( STR_CONN_WITHOUT_QUERIES_OR_TABLES ),
nullptr,
0
);
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index 08ea5adcb9bb..e51e997c13e0 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -152,7 +152,7 @@ namespace sdbtools
|| !xPSI->hasPropertyByName( PROPERTY_NAME )
)
throw IllegalArgumentException(
- OUString( SdbtRes( STR_NO_TABLE_OBJECT ) ),
+ SdbtRes( STR_NO_TABLE_OBJECT ),
*this,
0
);
@@ -199,7 +199,7 @@ namespace sdbtools
found = true;
if ( !found )
throw IllegalArgumentException(
- OUString( SdbtRes( STR_INVALID_COMPOSITION_TYPE ) ),
+ SdbtRes( STR_INVALID_COMPOSITION_TYPE ),
nullptr,
0
);
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index e3533ddf65aa..8496e7d1f11d 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2782,7 +2782,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection )
case DatabaseObjectContainer::REPORTS:
if ( eSelectedCategory != E_NONE )
throw IllegalArgumentException(
- OUString(ModuleRes(RID_STR_NO_DIFF_CAT)),
+ ModuleRes(RID_STR_NO_DIFF_CAT),
*this, sal_Int16( pObject - aSelectedObjects.getConstArray() ) );
eSelectedCategory =
( pObject->Type == DatabaseObjectContainer::TABLES ) ? E_TABLE
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index c4f7fc4bf020..027b7eb08a91 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -119,7 +119,7 @@ void OApplicationController::convertToView(const OUString& _sName)
::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, false, ::dbtools::EComposeRule::InTableDefinitions ) );
Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject);
if ( !xView.is() )
- throw SQLException(OUString(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*this,OUString( "S1000" ) ,0,Any());
+ throw SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE),*this,OUString( "S1000" ) ,0,Any());
getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView));
}
}
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index c328f1c2863b..432778abcd5d 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -618,7 +618,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
if ( m_pSqlIterator->getStatementType() != OSQLStatementType::Select || rTabs.begin() == rTabs.end() )
{
aError = SQLException(
- OUString( ModuleRes( STR_QRY_NOSELECT ) ),
+ ModuleRes( STR_QRY_NOSELECT ),
nullptr,
"S1000",
1000,
@@ -641,7 +641,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
else
{
aError = SQLException(
- OUString( ModuleRes( STR_QRY_SYNTAX ) ),
+ ModuleRes( STR_QRY_SYNTAX ),
nullptr,
"S1000",
1000,
@@ -981,7 +981,7 @@ void OQueryController::impl_initialize()
if ( !( aView >>= m_xAlterView ) )
{
throw IllegalArgumentException(
- OUString( ModuleRes( STR_NO_ALTER_VIEW_SUPPORT ) ),
+ ModuleRes( STR_NO_ALTER_VIEW_SUPPORT ),
*this,
1
);
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index d61bda15a8cd..b68b0a6f30d7 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -459,7 +459,7 @@ void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation )
&& !OCopyTableWizard::supportsViews( m_xDestConnection )
)
throw IllegalArgumentException(
- OUString( ModuleRes( STR_CTW_NO_VIEWS_SUPPORT ) ),
+ ModuleRes( STR_CTW_NO_VIEWS_SUPPORT ),
*this,
1
);
@@ -491,7 +491,7 @@ void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >&
if ( _newPrimaryKey.IsPresent && !OCopyTableWizard::supportsPrimaryKey( m_xDestConnection ) )
throw IllegalArgumentException(
- OUString( ModuleRes( STR_CTW_NO_PRIMARY_KEY_SUPPORT ) ),
+ ModuleRes( STR_CTW_NO_PRIMARY_KEY_SUPPORT ),
*this,
1
);
@@ -656,7 +656,7 @@ Reference< XPropertySet > CopyTableWizard::impl_ensureDataAccessDescriptor_throw
if ( !bIsValid )
{
throw IllegalArgumentException(
- OUString( ModuleRes( STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ) ),
+ ModuleRes( STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ),
*const_cast< CopyTableWizard* >( this ),
_nArgPos + 1
);
@@ -748,7 +748,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
break;
default:
throw IllegalArgumentException(
- OUString( ModuleRes( STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ) ),
+ ModuleRes( STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ),
*const_cast< CopyTableWizard* >( this ),
1
);
@@ -767,7 +767,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
if ( _out_rCommandType == CommandType::QUERY )
// we cannot copy a query if the connection cannot provide it ...
throw IllegalArgumentException(
- OUString(ModuleRes( STR_CTW_ERROR_NO_QUERY )),
+ ModuleRes( STR_CTW_ERROR_NO_QUERY ),
*const_cast< CopyTableWizard* >( this ),
1
);
@@ -1457,7 +1457,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
sal_Int32 nArgCount( _rArguments.getLength() );
if ( ( nArgCount != 2 ) && ( nArgCount != 3 ) )
throw IllegalArgumentException(
- OUString( ModuleRes( STR_CTW_ILLEGAL_PARAMETER_COUNT ) ),
+ ModuleRes( STR_CTW_ILLEGAL_PARAMETER_COUNT ),
*this,
1
);
@@ -1468,7 +1468,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
{ // ->createWithInteractionHandler
if ( !( _rArguments[2] >>= m_xInteractionHandler ) )
throw IllegalArgumentException(
- OUString(ModuleRes( STR_CTW_ERROR_INVALID_INTERACTIONHANDLER )),
+ ModuleRes( STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ),
*this,
3
);
@@ -1493,7 +1493,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
catch( const Exception& )
{
throw WrappedTargetException(
- OUString( ModuleRes( STR_CTW_ERROR_DURING_INITIALIZATION ) ),
+ ModuleRes( STR_CTW_ERROR_DURING_INITIALIZATION ),
*this,
::cppu::getCaughtException()
);
generated by cgit (git 2.34.1) at 2024-12-28 08:39:19 +0000