From 12191a4f30078bb81c39a74a994ba7b2b410adaf Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 9 May 2017 12:14:32 +0200 Subject: make loplugin constantparam smarter about string params Change-Id: Id3df69b38fd35f46735246a6d307a89aa10d4294 Reviewed-on: https://gerrit.libreoffice.org/37426 Tested-by: Jenkins Reviewed-by: Noel Grandin --- dbaccess/source/ui/app/AppController.cxx | 1 - dbaccess/source/ui/inc/TableConnectionData.hxx | 3 +-- dbaccess/source/ui/inc/TokenWriter.hxx | 5 ++--- dbaccess/source/ui/misc/RowSetDrop.cxx | 2 +- dbaccess/source/ui/misc/TokenWriter.cxx | 14 ++------------ dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 2 +- dbaccess/source/ui/querydesign/TableConnectionData.cxx | 4 +--- 7 files changed, 8 insertions(+), 23 deletions(-) (limited to 'dbaccess/source') diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 5dd81df801b4..a3949f974372 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -388,7 +388,6 @@ void SAL_CALL OApplicationController::disposing() aURL.GetURLNoPass( INetURLObject::DecodeMechanism::NONE ), aFilter, getStrippedDatabaseName(), - OUString(), boost::none); // add to recent document list diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index 9a4484c2222c..52b2792f6fe4 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -51,8 +51,7 @@ namespace dbaui public: OTableConnectionData(); OTableConnectionData( const TTableWindowData::value_type& _pReferencingTable, - const TTableWindowData::value_type& _pReferencedTable, - const OUString& rConnName = OUString() ); + const TTableWindowData::value_type& _pReferencedTable ); OTableConnectionData( const OTableConnectionData& rConnData ); virtual ~OTableConnectionData(); diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 0a8320a9b1d9..ceca8068ae8c 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -86,8 +86,7 @@ namespace dbaui // export data ODatabaseImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, const css::uno::Reference< css::uno::XComponentContext >& _rM, - const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, - const OUString& rExchange = OUString()); + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF); // import data ODatabaseImportExport( const SharedConnection& _rxConnection, @@ -127,7 +126,7 @@ namespace dbaui ORTFImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, const css::uno::Reference< css::uno::XComponentContext >& _rM, const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF) - : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,OUString()) {}; + : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF) {}; // import data ORTFImportExport( const SharedConnection& _rxConnection, diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index e178dea9416c..06beb6157fd7 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -43,7 +43,7 @@ ORowSetImportExport::ORowSetImportExport( vcl::Window* _pParent, const svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM ) - : ODatabaseImportExport(_aDataDescriptor,_rM,nullptr,OUString()) + : ODatabaseImportExport(_aDataDescriptor,_rM,nullptr) ,m_xTargetResultSetUpdate(_xResultSetUpdate) ,m_xTargetRowUpdate(_xResultSetUpdate,UNO_QUERY) ,m_pParent(_pParent) diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 982d2bad9800..b3c390171ec3 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -74,13 +74,11 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::util; -#define SBA_FORMAT_SELECTION_COUNT 4 #define CELL_X 1437 ODatabaseImportExport::ODatabaseImportExport(const svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, - const Reference< css::util::XNumberFormatter >& _rxNumberF, - const OUString& rExchange) + const Reference< css::util::XNumberFormatter >& _rxNumberF) :m_bBookmarkSelection( false ) ,m_xFormatter(_rxNumberF) ,m_xContext(_rM) @@ -95,14 +93,6 @@ ODatabaseImportExport::ODatabaseImportExport(const svx::ODataAccessDescriptor& _ osl_atomic_increment( &m_refCount ); impl_initFromDescriptor( _aDataDescriptor, false ); - - sal_Int32 nCount = comphelper::string::getTokenCount(rExchange, char(11)); - if( nCount > SBA_FORMAT_SELECTION_COUNT && !rExchange.getToken(4, ';').isEmpty()) - { - m_pRowMarker = new sal_Int32[nCount-SBA_FORMAT_SELECTION_COUNT]; - for(sal_Int32 i=SBA_FORMAT_SELECTION_COUNT; i