summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/misc
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/misc')
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx6
-rw-r--r--dbaccess/source/ui/misc/RowSetDrop.cxx2
-rw-r--r--dbaccess/source/ui/misc/TableCopyHelper.cxx6
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx26
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx12
-rw-r--r--dbaccess/source/ui/misc/controllerframe.cxx2
-rw-r--r--dbaccess/source/ui/misc/databaseobjectview.cxx6
-rw-r--r--dbaccess/source/ui/misc/indexcollection.cxx14
-rw-r--r--dbaccess/source/ui/misc/linkeddocuments.cxx10
9 files changed, 42 insertions, 42 deletions
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);
generated by cgit (git 2.34.1) at 2024-07-09 22:42:48 +0000