diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-26 22:59:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-27 08:00:32 +0200 |
commit | 9c8fd7d1c5553e1e50dba7c7c32ef15fcdb0b49d (patch) | |
tree | 345951559eba7aca1ead5ea9ff37450792a6833e /dbaccess/source | |
parent | a6050c32f30796743f9ab9b2a5c793ced9b8f747 (diff) |
Clean up sEmpty
Change-Id: If1b2bfe308caa2bce92e73d2c5c86ee273faed93
Diffstat (limited to 'dbaccess/source')
-rw-r--r-- | dbaccess/source/core/api/KeySet.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/formadapter.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/querydlg.cxx | 3 |
5 files changed, 8 insertions, 16 deletions
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 060f028ebd80..429ff3040cdf 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -549,8 +549,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), SQL_GENERAL_ERROR, m_xConnection ); // now create end execute the prepared statement - OUString sEmpty; - executeUpdate(_rInsertRow ,_rOriginalRow,aSql.makeStringAndClear(),sEmpty,aIndexColumnPositions); + executeUpdate(_rInsertRow ,_rOriginalRow,aSql.makeStringAndClear(),"",aIndexColumnPositions); } void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions) @@ -657,8 +656,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi aValues[aValues.getLength() - 1] = ')'; aSql.append(aValues.makeStringAndClear()); // now create,fill and execute the prepared statement - OUString sEmpty; - executeInsert(_rInsertRow,aSql.makeStringAndClear(),sEmpty,bRefetch); + executeInsert(_rInsertRow,aSql.makeStringAndClear(),"",bRefetch); } void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQL,const OUString& i_sTableName,bool bRefetch ) diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index e97ebf0cd1aa..c2a18e142569 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -1617,8 +1617,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert if ( nType != DataType::BOOLEAN && DataType::BIT != nType ) { - OUString sEmpty; - lcl_addFilterCriteria_throw(filterOperator,sEmpty,aSQL); + lcl_addFilterCriteria_throw(filterOperator,"",aSQL); } switch(nType) @@ -1690,8 +1689,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert sal_Int32 nFilterOp = filterOperator; if ( filterOperator != SQLFilterOperator::SQLNULL && filterOperator != SQLFilterOperator::NOT_SQLNULL ) nFilterOp = SQLFilterOperator::SQLNULL; - OUString sEmpty; - lcl_addFilterCriteria_throw(nFilterOp,sEmpty,aSQL); + lcl_addFilterCriteria_throw(nFilterOp,"",aSQL); } // Attach filter diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index d6f67c3b02ee..e2ac9570173d 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1064,9 +1064,8 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa ::std::vector<SotClipboardFormatId> aFormatIds; getSupportedFormats(getContainer()->getElementType(),aFormatIds); const ::std::vector<SotClipboardFormatId>::iterator aEnd = aFormatIds.end(); - OUString sEmpty; for (::std::vector<SotClipboardFormatId>::iterator aIter = aFormatIds.begin();aIter != aEnd; ++aIter) - pDlg->Insert(*aIter,sEmpty); + pDlg->Insert(*aIter,""); const TransferableDataHelper& rClipboard = getViewClipboard(); pasteFormat(pDlg->GetFormat(rClipboard.GetTransferable())); diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 87c8a5af1b21..43e481ed4e7e 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -142,9 +142,8 @@ void SbaXFormAdapter::StartListening() if (m_aPropertiesChangeListeners.getLength()) { Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); - OUString sEmpty; if (xBroadcaster.is()) - xBroadcaster->addPropertiesChangeListener(css::uno::Sequence<OUString>(&sEmpty, 1), &m_aPropertiesChangeListeners); + xBroadcaster->addPropertiesChangeListener(css::uno::Sequence<OUString>{""}, &m_aPropertiesChangeListeners); } // log off ourself @@ -1257,9 +1256,8 @@ void SAL_CALL SbaXFormAdapter::addPropertiesChangeListener(const Sequence< OUStr if (m_aPropertiesChangeListeners.getLength() == 1) { Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); - OUString sEmpty; if (xBroadcaster.is()) - xBroadcaster->addPropertiesChangeListener(Sequence< OUString>(&sEmpty, 1), &m_aPropertiesChangeListeners); + xBroadcaster->addPropertiesChangeListener(Sequence< OUString>{""}, &m_aPropertiesChangeListeners); } } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index cb9dff43fee2..6d4d2ad386bd 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -204,8 +204,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) m_pTableControl->lateInit(); m_pCBNatural->Check(false); m_pTableControl->enableRelation(false); - OUString sEmpty; - m_pConnData->AppendConnLine(sEmpty,sEmpty); + m_pConnData->AppendConnLine("",""); m_pPB_OK->Enable(true); } break; |