diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-30 11:07:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-31 17:11:14 +0100 |
| commit | 36022becbe25c412460411ab50ecaf7740933dca (patch) | |
| tree | e0c2154a49efccc1135b380d13b3749f14994411 /dbaccess | |
| parent | 29a27f92a5b3b0b6b60a6108730c8197eb88f255 (diff) | |
avoid intermediate vcl::Windows
Change-Id: I5d6a03baed2af5801132f3e3a0411867ba60186e
Reviewed-on: https://gerrit.libreoffice.org/81760
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/browser/sbagrid.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/TokenWriter.hxx | 12 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/RowSetDrop.cxx | 21 |
3 files changed, 17 insertions, 18 deletions
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 32562da141e7..42ed0377446c 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1390,7 +1390,7 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent, void*, void) if ( !bCountFinal ) setDataSource(nullptr); // detach from grid control Reference< XResultSetUpdate > xResultSetUpdate(xDataSource,UNO_QUERY); - rtl::Reference<ODatabaseImportExport> pImExport = new ORowSetImportExport(this,xResultSetUpdate,m_aDataDescriptor, getContext()); + rtl::Reference<ODatabaseImportExport> pImExport = new ORowSetImportExport(GetFrameWeld(),xResultSetUpdate,m_aDataDescriptor, getContext()); Hide(); try { diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index bebbcff2803f..ca03617b052f 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -184,8 +184,8 @@ namespace dbaui css::uno::Reference< css::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; css::uno::Reference< css::sdbc::XRowUpdate > m_xTargetRowUpdate; css::uno::Reference< css::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; - VclPtr<vcl::Window> m_pParent; - bool m_bAlreadyAsked; + weld::Window* m_pParent; + bool m_bAlreadyAsked; bool insertNewRow(); protected: @@ -193,10 +193,10 @@ namespace dbaui public: // export data - ORowSetImportExport(vcl::Window* _pParent, - const css::uno::Reference< css::sdbc::XResultSetUpdate >& _xResultSetUpdate, - const svx::ODataAccessDescriptor& _aDataDescriptor, - const css::uno::Reference< css::uno::XComponentContext >& _rM); + ORowSetImportExport(weld::Window* pParent, + const css::uno::Reference< css::sdbc::XResultSetUpdate >& xResultSetUpdate, + const svx::ODataAccessDescriptor& aDataDescriptor, + const css::uno::Reference< css::uno::XComponentContext >& rM); virtual bool Write() override; virtual bool Read() override; diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index c402ff3e9f4a..4d67664e011a 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -40,18 +40,17 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::lang; // export data -ORowSetImportExport::ORowSetImportExport( vcl::Window* _pParent, - const Reference< XResultSetUpdate >& _xResultSetUpdate, - const svx::ODataAccessDescriptor& _aDataDescriptor, - const Reference< XComponentContext >& _rM - ) - : ODatabaseImportExport(_aDataDescriptor,_rM,nullptr) - ,m_xTargetResultSetUpdate(_xResultSetUpdate) - ,m_xTargetRowUpdate(_xResultSetUpdate,UNO_QUERY) - ,m_pParent(_pParent) +ORowSetImportExport::ORowSetImportExport(weld::Window* pParent, + const Reference< XResultSetUpdate >& xResultSetUpdate, + const svx::ODataAccessDescriptor& aDataDescriptor, + const Reference< XComponentContext >& rM) + : ODatabaseImportExport(aDataDescriptor,rM,nullptr) + ,m_xTargetResultSetUpdate(xResultSetUpdate) + ,m_xTargetRowUpdate(xResultSetUpdate,UNO_QUERY) + ,m_pParent(pParent) ,m_bAlreadyAsked(false) { - OSL_ENSURE(_pParent,"Window can't be null!"); + OSL_ENSURE(pParent,"Window can't be null!"); } void ORowSetImportExport::initialize() @@ -235,7 +234,7 @@ bool ORowSetImportExport::insertNewRow() if(!m_bAlreadyAsked) { OUString sAskIfContinue = DBA_RES(STR_ERROR_OCCURRED_WHILE_COPYING); - OSQLWarningBox aDlg(m_pParent ? m_pParent->GetFrameWeld() : nullptr, sAskIfContinue, MessBoxStyle::YesNo | MessBoxStyle::DefaultYes); + OSQLWarningBox aDlg(m_pParent, sAskIfContinue, MessBoxStyle::YesNo | MessBoxStyle::DefaultYes); if (aDlg.run() == RET_YES) m_bAlreadyAsked = true; else |