diff options
| -rw-r--r-- | include/svx/fmtools.hxx | 2 | ||||
| -rw-r--r-- | svx/source/form/fmvwimp.cxx | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 90eb6d74c49c..b00b33cb0443 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -51,7 +51,7 @@ namespace vcl { class Window; } // display info about a simple css::sdbc::SQLException void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent); SVXCORE_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent); -void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = nullptr); +void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent); void displayException(const css::uno::Any&, vcl::Window* _pParent = nullptr); sal_Int32 getElementPos(const css::uno::Reference< css::container::XIndexAccess>& xCont, const css::uno::Reference< css::uno::XInterface>& xElement); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index f776d28ab4d7..8a52fbefb118 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -565,7 +565,6 @@ void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC ) } } - void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) { DBG_ASSERT( nullptr == m_nErrorMessageEvent, "FmXFormView::displayAsyncErrorMessage: not too fast, please!" ); @@ -575,28 +574,24 @@ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) m_nErrorMessageEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnDelayedErrorMessage ) ); } - IMPL_LINK_NOARG(FmXFormView, OnDelayedErrorMessage, void*, void) { m_nErrorMessageEvent = nullptr; - displayException( m_aAsyncError ); + displayException(m_aAsyncError, VCLUnoHelper::GetWindow(GetParentWindow())); } - void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel ) { if ( _pDocModel && _pDocModel->GetAutoControlFocus() ) m_nAutoFocusEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnAutoFocus ) ); } - void FmXFormView::suspendTabOrderUpdate() { OSL_ENSURE( !m_isTabOrderUpdateSuspended, "FmXFormView::suspendTabOrderUpdate: nesting not allowed!" ); m_isTabOrderUpdateSuspended = true; } - void FmXFormView::resumeTabOrderUpdate() { OSL_ENSURE( m_isTabOrderUpdateSuspended, "FmXFormView::resumeTabOrderUpdate: not suspended!" ); |