merge ftp::ResultSetFactory with ResultSetFactoryI

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

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