summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-05-09 12:14:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-05-09 13:52:30 +0200
commit12191a4f30078bb81c39a74a994ba7b2b410adaf (patch)
tree394626ae75e6b77e4159657847f894e4f7c9495b /dbaccess
parent3a9854a92923df8013ca832c48aa9f284bcb1adc (diff)
make loplugin constantparam smarter about string params
Change-Id: Id3df69b38fd35f46735246a6d307a89aa10d4294 Reviewed-on: https://gerrit.libreoffice.org/37426 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/app/AppController.cxx1
-rw-r--r--dbaccess/source/ui/inc/TableConnectionData.hxx3
-rw-r--r--dbaccess/source/ui/inc/TokenWriter.hxx5
-rw-r--r--dbaccess/source/ui/misc/RowSetDrop.cxx2
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx14
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnectionData.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/TableConnectionData.cxx4
7 files changed, 8 insertions, 23 deletions
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<nCount; ++i)
- m_pRowMarker[i-SBA_FORMAT_SELECTION_COUNT] = rExchange.getToken(i,char(11)).toInt32();
- }
osl_atomic_decrement( &m_refCount );
}
@@ -626,7 +616,7 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\
OHTMLImportExport::OHTMLImportExport(const svx::ODataAccessDescriptor& _aDataDescriptor,
const Reference< XComponentContext >& _rM,
const Reference< css::util::XNumberFormatter >& _rxNumberF)
- : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,OUString())
+ : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF)
,m_nIndent(0)
#if OSL_DEBUG_LEVEL > 0
,m_bCheckFont(false)
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index 7f5fb4c59ed1..bfecb4906cde 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -48,7 +48,7 @@ OQueryTableConnectionData::OQueryTableConnectionData( const OQueryTableConnectio
OQueryTableConnectionData::OQueryTableConnectionData(const TTableWindowData::value_type& _pReferencingTable,
const TTableWindowData::value_type& _pReferencedTable)
- : OTableConnectionData( _pReferencingTable,_pReferencedTable, OUString() )
+ : OTableConnectionData( _pReferencingTable,_pReferencedTable )
, m_nFromEntryIndex(0)
, m_nDestEntryIndex(0)
, m_eJoinType (INNER_JOIN)
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index 161945620a00..22fff0de020f 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -29,11 +29,9 @@ OTableConnectionData::OTableConnectionData()
}
OTableConnectionData::OTableConnectionData(const TTableWindowData::value_type& _pReferencingTable
- ,const TTableWindowData::value_type& _pReferencedTable
- ,const OUString& rConnName )
+ ,const TTableWindowData::value_type& _pReferencedTable )
:m_pReferencingTable(_pReferencingTable)
,m_pReferencedTable(_pReferencedTable)
- ,m_aConnName( rConnName )
{
Init();
}