summaryrefslogtreecommitdiffstats
path: root/ucb
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-25 14:45:38 +0200
committerNoel Grandin <noel@peralex.com>2015-11-26 13:26:25 +0200
commitabc6071b7a8af354a56c91e4caecd8afc79f55cc (patch)
treeff8b64d3763a6192f8c67e750e830d7f3a6b13bf /ucb
parenti126615 - Allow build on FreeBSD Mac PowerPCG5 (diff)
downloadcore-abc6071b7a8af354a56c91e4caecd8afc79f55cc.tar.gz
core-abc6071b7a8af354a56c91e4caecd8afc79f55cc.zip
loplugin:unusedfields various
Change-Id: I18f94269a1172cf195ee402384f7144610e1e82d
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx1
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetI.cxx3
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetI.hxx1
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetbase.cxx4
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetbase.hxx28
5 files changed, 14 insertions, 23 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 03685c743f63..54166dabeb26 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -254,7 +254,6 @@ public:
return new ResultSetI(m_xContext,
m_xProvider,
m_seq,
- m_seqSort,
m_dirvec);
}
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 424c05d8dd9e..2456e8a80540 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -41,9 +41,8 @@ using namespace com::sun::star::sdbc;
ResultSetI::ResultSetI(const Reference<XComponentContext>& rxContext,
const Reference<XContentProvider>& xProvider,
const Sequence<Property>& seqProp,
- const Sequence< NumberedSortingInfo >& seqSort,
const std::vector<FTPDirentry>& dirvec)
- : ResultSetBase(rxContext,xProvider,seqProp,seqSort)
+ : ResultSetBase(rxContext,xProvider,seqProp)
{
for( size_t i = 0; i < dirvec.size(); ++i)
m_aPath.push_back(dirvec[i].m_aURL);
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.hxx b/ucb/source/ucp/ftp/ftpresultsetI.hxx
index adf290645545..3906e84f9c62 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.hxx
@@ -38,7 +38,6 @@ namespace ftp {
const css::uno::Reference< css::uno::XComponentContext>& rxContext,
const css::uno::Reference< css::ucb::XContentProvider>& xProvider,
const css::uno::Sequence< css::beans::Property >& seq,
- const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort,
const std::vector<FTPDirentry>& dirvec);
private:
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index bd09094e18e7..12acee990451 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -33,15 +33,13 @@ using namespace com::sun::star;
ResultSetBase::ResultSetBase(
const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Reference< ucb::XContentProvider >& xProvider,
- const uno::Sequence< beans::Property >& seq,
- const uno::Sequence< ucb::NumberedSortingInfo >& seqSort )
+ const uno::Sequence< beans::Property >& seq )
: m_xContext( rxContext ),
m_xProvider( xProvider ),
m_nRow( -1 ),
m_nWasNull( true ),
m_bRowCountFinal( true ),
m_sProperty( seq ),
- m_sSortingInfo( seqSort ),
m_pDisposeEventListeners( nullptr ),
m_pRowCountListeners( nullptr ),
m_pIsFinalListeners( nullptr )
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 1f151101b03f..b98e7f8756f0 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
@@ -52,8 +52,7 @@ namespace ftp {
ResultSetBase(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::ucb::XContentProvider >& xProvider,
- const css::uno::Sequence< css::beans::Property >& seq,
- const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort);
+ const css::uno::Sequence< css::beans::Property >& seq);
virtual ~ResultSetBase();
@@ -516,29 +515,26 @@ namespace ftp {
protected:
- css::uno::Reference<
- css::uno::XComponentContext > m_xContext;
- css::uno::Reference<
- css::ucb::XContentProvider > m_xProvider;
+ css::uno::Reference< css::uno::XComponentContext >
+ m_xContext;
+ css::uno::Reference< css::ucb::XContentProvider >
+ m_xProvider;
sal_Int32 m_nRow;
bool m_nWasNull;
bool m_bRowCountFinal;
- typedef std::vector< css::uno::Reference<
- css::ucb::XContentIdentifier > > IdentSet;
- typedef std::vector< css::uno::Reference<
- css::sdbc::XRow > > ItemSet;
- typedef std::vector< OUString >
- PathSet;
+ typedef std::vector< css::uno::Reference<css::ucb::XContentIdentifier > >
+ IdentSet;
+ typedef std::vector< css::uno::Reference< css::sdbc::XRow > >
+ ItemSet;
+ typedef std::vector< OUString > PathSet;
IdentSet m_aIdents;
ItemSet m_aItems;
PathSet m_aPath;
- css::uno::Sequence<
- css::beans::Property > m_sProperty;
- css::uno::Sequence<
- css::ucb::NumberedSortingInfo > m_sSortingInfo;
+ css::uno::Sequence< css::beans::Property >
+ m_sProperty;
osl::Mutex m_aMutex;
cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;