summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-05-10 12:37:04 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-05-11 09:26:28 +0200
commit2962ceec4b96758bec7e7a0390d5ec60e3ce708f (patch)
tree54b1f57a5ee59babeef28b2f624024cecef8f4c3 /dbaccess
parentb5303563b785115075b5f9b7b4abccd8f9d916e2 (diff)
remove some unnecessary temporary OUStrings
found with: git grep -nP 'OUString\(\s*\w+\s*\)' | grep -v new | grep -v return Change-Id: I923109b4339210aed2639e423fbc4d5f19233f02 Reviewed-on: https://gerrit.libreoffice.org/37463 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx4
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx4
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.cxx6
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.cxx2
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx2
5 files changed, 9 insertions, 9 deletions
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index a192a99daf06..744e5afb3269 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -310,8 +310,8 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal
if (!sPassword.isEmpty())
aReturn.push_back(
- PropertyValue( "password", 0,
- makeAny(OUString(sPassword)), PropertyState_DIRECT_VALUE));
+ PropertyValue( "password", 0,
+ makeAny(sPassword), PropertyState_DIRECT_VALUE));
}
if ( !aReturn.empty() )
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 0b65295bc8c3..1ced37e208db 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -193,7 +193,7 @@ namespace dbaui
m_pOutput->SetText(OUString());
if (xStatement.is())
{
- if (OUString(_rStatement).toAsciiUpperCase().startsWith("SELECT") && m_pShowOutput->IsChecked())
+ if (_rStatement.toAsciiUpperCase().startsWith("SELECT") && m_pShowOutput->IsChecked())
{
// execute it as a query
xResultSet = xStatement->executeQuery(_rStatement);
@@ -220,7 +220,7 @@ namespace dbaui
{
}
// report the output
- addOutputText(OUString(out));
+ addOutputText(out);
}
} else {
// execute it
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 1ab5b914c9b7..680766a3006a 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -158,7 +158,7 @@ void lcl_fillComboList( ComboBox& _rList, const Reference< XConnection >& _rxCon
_rList.InsertEntry( sValue );
}
- sal_Int32 nPos = _rList.GetEntryPos( OUString( _rCurrent ) );
+ sal_Int32 nPos = _rList.GetEntryPos( _rCurrent );
if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
_rList.SelectEntryPos( nPos );
else
@@ -217,12 +217,12 @@ OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent,
sTable,
::dbtools::EComposeRule::InDataManipulation);
- sal_Int32 nPos = m_pImpl->m_pCatalog->GetEntryPos(OUString(sCatalog));
+ sal_Int32 nPos = m_pImpl->m_pCatalog->GetEntryPos(sCatalog);
if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
m_pImpl->m_pCatalog->SelectEntryPos(nPos);
if ( !sSchema.isEmpty() ) {
- nPos = m_pImpl->m_pSchema->GetEntryPos(OUString(sSchema));
+ nPos = m_pImpl->m_pSchema->GetEntryPos(sSchema);
if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
m_pImpl->m_pSchema->SelectEntryPos(nPos);
}
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index acfc9376d32a..a2f7c04fdd24 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -367,7 +367,7 @@ bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,co
if ( _rFilter.Handle == SQLFilterOperator::LIKE ||
_rFilter.Handle == SQLFilterOperator::NOT_LIKE )
::Replace_OS_PlaceHolder( sPredicateValue );
- _rFilter.Value <<= OUString(sPredicateValue);
+ _rFilter.Value <<= sPredicateValue;
}
return bHaving;
}
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 460bebf4fa4b..127d6ffee4ef 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -329,7 +329,7 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight,
if(_pRight == m_pNewColumnNames)
{
// we copy the column into the new format for the dest
- OFieldDescription* pSrcField = static_cast<OFieldDescription*>(_pLeft->GetEntryData(_pLeft->GetEntryPos(OUString(_sColumnName))));
+ OFieldDescription* pSrcField = static_cast<OFieldDescription*>(_pLeft->GetEntryData(_pLeft->GetEntryPos(_sColumnName)));
createNewColumn(_pRight,pSrcField,_rRightColumns,_sColumnName,_sExtraChars,_nMaxNameLen,_aCase);
}
else