mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge ftp::ResultSetFactory with ResultSetFactoryI

Browse Source 
Change-Id: I061145fefef33aa3e7349adf7da03222c3b2a911
Reviewed-on: https://gerrit.libreoffice.org/26898
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin 2016-07-04 11:44:42 +02:00 committed by Noel Grandin
parent 20b9cbd0e5
commit 3459ab4a5d
3 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@ -266,7 +266,6 @@ merge frm::ITextAttributeListener with frm::OAttributeDispatcher
merge frm::ITextSelectionListener with frm::ORichTextPeer
merge frm::OFormComponents with frm::ODatabaseForm
merge ftp::CurlInput with InsertData
merge ftp::ResultSetFactory with ResultSetFactoryI
merge gio::Seekable with gio::OutputStream
merge i_xml_parser_event_handler with (anonymous namespace)::recently_used_file_filter
merge oglcanvas::CanvasHelper with oglcanvas::BitmapCanvasHelper

23
ucb/source/ucp/ftp/ftpcontent.cxx
View File

@ -221,17 +221,8 @@ void SAL_CALL FTPContent::abort( sal_Int32 /*CommandId*/ )
{
}
/***************************************************************************/
/* */
/* Internal implementation class. */
/* */
/***************************************************************************/
class ResultSetFactoryI : public ResultSetFactory
{
public:
ResultSetFactoryI(const Reference<XComponentContext >& rxContext,
ResultSetFactory::ResultSetFactory(const Reference<XComponentContext >& rxContext,
const Reference<XContentProvider >& xProvider,
const Sequence<Property>& seq,
const std::vector<FTPDirentry>& dirvec)
@ -242,7 +233,8 @@ public:
{
}
virtual ResultSetBase* createResultSet() override
ResultSetBase* ResultSetFactory::createResultSet()
{
return new ResultSetI(m_xContext,
m_xProvider,
@ -250,13 +242,6 @@ public:
m_dirvec);
}
public:
Reference< XComponentContext > m_xContext;
Reference< XContentProvider > m_xProvider;
Sequence< Property > m_seq;
std::vector<FTPDirentry> m_dirvec;
};
// XCommandProcessor methods.
@ -547,7 +532,7 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand,
= new DynamicResultSet(
m_xContext,
aOpenCommand,
new ResultSetFactoryI(m_xContext,
new ResultSetFactory(m_xContext,
m_xProvider.get(),
aOpenCommand.Properties,
resvec));

17
ucb/source/ucp/ftp/ftpresultsetfactory.hxx
View File

@ -26,7 +26,9 @@
#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPRESULTSETFACTORY_HXX
#include "ftpresultsetbase.hxx"
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/beans/Property.hpp>
#include <vector>
namespace ftp {
@ -35,10 +37,17 @@ namespace ftp {
class ResultSetFactory
{
public:
ResultSetFactory(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 std::vector<FTPDirentry>& dirvec);
virtual ~ResultSetFactory() { };
virtual ResultSetBase* createResultSet() = 0;
ResultSetBase* createResultSet();
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::ucb::XContentProvider > m_xProvider;
css::uno::Sequence< css::beans::Property > m_seq;
std::vector<FTPDirentry> m_dirvec;
};
}