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

drop unnecessary includes

Browse Source 
Change-Id: I3e71a9eda34dd836c29af02f7b0adc8acccd1244
Reviewed-on: https://gerrit.libreoffice.org/78373
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-09-01 20:22:45 +01:00
parent 4a95ae505d
commit e1f31d2079
5 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/source/abpilot/abspilot.cxx
View File

@@ -27,7 +27,6 @@
#include "tableselectionpage.hxx"
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/weld.hxx>
#include <osl/diagnose.h>
#include "abpfinalpage.hxx"

5
extensions/source/abpilot/admininvokationimpl.cxx
View File

@@ -24,15 +24,12 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/sdbc/DriverManager.hpp>
#include <comphelper/propertysequence.hxx>
#include <vcl/stdtext.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <strings.hrc>
#include <componentmodule.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
#include <vcl/waitobj.hxx>
#include <osl/diagnose.h>
namespace abp
{

10
extensions/source/dbpilots/commonpagesdbp.cxx
View File

@@ -34,8 +34,6 @@
#include <comphelper/interaction.hxx>
#include <connectivity/dbtools.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/layout.hxx>
#include <sfx2/docfilt.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/filedlghelper.hxx>
@@ -190,7 +188,7 @@ namespace dbp
{
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
FileDialogFlags::NONE, GetFrameWeld());
FileDialogFlags::NONE, getDialog()->getDialog());
aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() );
std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)");
@@ -242,7 +240,7 @@ namespace dbp
{
m_xTable->clear();
WaitObject aWaitCursor(this);
weld::WaitObject aWaitCursor(getDialog()->getDialog());
// will be the table tables of the selected data source
Sequence< OUString > aTableNames;
@@ -273,7 +271,7 @@ namespace dbp
if (m_xDSContext->getByName(sCurrentDatasource) >>= xDatasource)
{ // connect
// get the default SDB interaction handler
Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(GetFrameWeld());
Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(getDialog()->getDialog());
if (!xHandler.is() )
return;
xConn = xDatasource->connectWithCompletion(xHandler);
@@ -333,7 +331,7 @@ namespace dbp
try
{
// get the default SDB interaction handler
Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(GetFrameWeld());
Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(getDialog()->getDialog());
if ( xHandler.is() )
xHandler->handle(xRequest);
}

1
extensions/source/dbpilots/controlwizard.cxx
View File

@@ -41,7 +41,6 @@
#include <connectivity/conncleanup.hxx>
#include <com/sun/star/sdbc/DataType.hpp>
#include <tools/urlobj.hxx>
#include <vcl/layout.hxx>
#include <osl/diagnose.h>
#define WINDOW_SIZE_X 240

2
extensions/source/propctrlr/formlinkdialog.cxx
View File

@@ -25,10 +25,8 @@
#include "formstrings.hxx"
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include <vcl/waitobj.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbexception.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/sequence.hxx>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>