drop unnecessary includes
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:
@@ -27,7 +27,6 @@
|
|||||||
#include "tableselectionpage.hxx"
|
#include "tableselectionpage.hxx"
|
||||||
#include <vcl/settings.hxx>
|
#include <vcl/settings.hxx>
|
||||||
#include <vcl/svapp.hxx>
|
#include <vcl/svapp.hxx>
|
||||||
#include <vcl/waitobj.hxx>
|
|
||||||
#include <vcl/weld.hxx>
|
#include <vcl/weld.hxx>
|
||||||
#include <osl/diagnose.h>
|
#include <osl/diagnose.h>
|
||||||
#include "abpfinalpage.hxx"
|
#include "abpfinalpage.hxx"
|
||||||
|
@@ -24,15 +24,12 @@
|
|||||||
#include <com/sun/star/awt/XWindow.hpp>
|
#include <com/sun/star/awt/XWindow.hpp>
|
||||||
#include <com/sun/star/sdbc/DriverManager.hpp>
|
#include <com/sun/star/sdbc/DriverManager.hpp>
|
||||||
#include <comphelper/propertysequence.hxx>
|
#include <comphelper/propertysequence.hxx>
|
||||||
#include <vcl/stdtext.hxx>
|
|
||||||
#include <toolkit/helper/vclunohelper.hxx>
|
|
||||||
#include <strings.hrc>
|
#include <strings.hrc>
|
||||||
#include <componentmodule.hxx>
|
#include <componentmodule.hxx>
|
||||||
|
#include <vcl/stdtext.hxx>
|
||||||
#include <vcl/weld.hxx>
|
#include <vcl/weld.hxx>
|
||||||
#include <vcl/waitobj.hxx>
|
|
||||||
#include <osl/diagnose.h>
|
#include <osl/diagnose.h>
|
||||||
|
|
||||||
|
|
||||||
namespace abp
|
namespace abp
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@@ -34,8 +34,6 @@
|
|||||||
#include <comphelper/interaction.hxx>
|
#include <comphelper/interaction.hxx>
|
||||||
#include <connectivity/dbtools.hxx>
|
#include <connectivity/dbtools.hxx>
|
||||||
#include <vcl/stdtext.hxx>
|
#include <vcl/stdtext.hxx>
|
||||||
#include <vcl/waitobj.hxx>
|
|
||||||
#include <vcl/layout.hxx>
|
|
||||||
#include <sfx2/docfilt.hxx>
|
#include <sfx2/docfilt.hxx>
|
||||||
#include <unotools/pathoptions.hxx>
|
#include <unotools/pathoptions.hxx>
|
||||||
#include <sfx2/filedlghelper.hxx>
|
#include <sfx2/filedlghelper.hxx>
|
||||||
@@ -190,7 +188,7 @@ namespace dbp
|
|||||||
{
|
{
|
||||||
::sfx2::FileDialogHelper aFileDlg(
|
::sfx2::FileDialogHelper aFileDlg(
|
||||||
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
|
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
|
||||||
FileDialogFlags::NONE, GetFrameWeld());
|
FileDialogFlags::NONE, getDialog()->getDialog());
|
||||||
aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() );
|
aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() );
|
||||||
|
|
||||||
std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)");
|
std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)");
|
||||||
@@ -242,7 +240,7 @@ namespace dbp
|
|||||||
{
|
{
|
||||||
m_xTable->clear();
|
m_xTable->clear();
|
||||||
|
|
||||||
WaitObject aWaitCursor(this);
|
weld::WaitObject aWaitCursor(getDialog()->getDialog());
|
||||||
|
|
||||||
// will be the table tables of the selected data source
|
// will be the table tables of the selected data source
|
||||||
Sequence< OUString > aTableNames;
|
Sequence< OUString > aTableNames;
|
||||||
@@ -273,7 +271,7 @@ namespace dbp
|
|||||||
if (m_xDSContext->getByName(sCurrentDatasource) >>= xDatasource)
|
if (m_xDSContext->getByName(sCurrentDatasource) >>= xDatasource)
|
||||||
{ // connect
|
{ // connect
|
||||||
// get the default SDB interaction handler
|
// get the default SDB interaction handler
|
||||||
Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(GetFrameWeld());
|
Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(getDialog()->getDialog());
|
||||||
if (!xHandler.is() )
|
if (!xHandler.is() )
|
||||||
return;
|
return;
|
||||||
xConn = xDatasource->connectWithCompletion(xHandler);
|
xConn = xDatasource->connectWithCompletion(xHandler);
|
||||||
@@ -333,7 +331,7 @@ namespace dbp
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// get the default SDB interaction handler
|
// get the default SDB interaction handler
|
||||||
Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(GetFrameWeld());
|
Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(getDialog()->getDialog());
|
||||||
if ( xHandler.is() )
|
if ( xHandler.is() )
|
||||||
xHandler->handle(xRequest);
|
xHandler->handle(xRequest);
|
||||||
}
|
}
|
||||||
|
@@ -41,7 +41,6 @@
|
|||||||
#include <connectivity/conncleanup.hxx>
|
#include <connectivity/conncleanup.hxx>
|
||||||
#include <com/sun/star/sdbc/DataType.hpp>
|
#include <com/sun/star/sdbc/DataType.hpp>
|
||||||
#include <tools/urlobj.hxx>
|
#include <tools/urlobj.hxx>
|
||||||
#include <vcl/layout.hxx>
|
|
||||||
#include <osl/diagnose.h>
|
#include <osl/diagnose.h>
|
||||||
|
|
||||||
#define WINDOW_SIZE_X 240
|
#define WINDOW_SIZE_X 240
|
||||||
|
@@ -25,10 +25,8 @@
|
|||||||
#include "formstrings.hxx"
|
#include "formstrings.hxx"
|
||||||
#include <sal/log.hxx>
|
#include <sal/log.hxx>
|
||||||
#include <vcl/svapp.hxx>
|
#include <vcl/svapp.hxx>
|
||||||
#include <vcl/waitobj.hxx>
|
|
||||||
#include <connectivity/dbtools.hxx>
|
#include <connectivity/dbtools.hxx>
|
||||||
#include <connectivity/dbexception.hxx>
|
#include <connectivity/dbexception.hxx>
|
||||||
#include <toolkit/helper/vclunohelper.hxx>
|
|
||||||
#include <comphelper/sequence.hxx>
|
#include <comphelper/sequence.hxx>
|
||||||
|
|
||||||
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
|
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
|
||||||
|
Reference in New Issue
Block a user