diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-28 21:35:43 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:21:54 +0200 |
commit | 12278b37cea48e660d7068d67349701d1accbe97 (patch) | |
tree | f0da8cd9794888ae6b9da5f656f4b60b0ad823b5 /chart2 | |
parent | GetWin seen as NULL sometimes (diff) | |
download | core-12278b37cea48e660d7068d67349701d1accbe97.tar.gz core-12278b37cea48e660d7068d67349701d1accbe97.zip |
tdf#91702 - fix stack-based MessBox allocation.
Change-Id: I62dd164e281911d9db3de453789a5badc7cd5fd7
Reviewed-on: https://gerrit.libreoffice.org/15954
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/controller/dialogs/DataBrowser.cxx | 8 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/tp_Scale.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/main/ChartController_Window.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 8f0f979c0eff..e39213f77bf3 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -136,8 +136,8 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent& rMEvt ) Edit::MouseButtonDown( rMEvt ); if( m_bShowWarningBox ) - WarningBox(this, WinBits( WB_OK ), - SCH_RESSTR(STR_INVALID_NUMBER)).Execute(); + ScopedVclPtr<WarningBox>::Create(this, WinBits( WB_OK ), + SCH_RESSTR(STR_INVALID_NUMBER))->Execute(); } class SeriesHeader @@ -767,8 +767,8 @@ void DataBrowser::MouseButtonDown( const BrowserMouseEvent& rEvt ) void DataBrowser::ShowWarningBox() { - WarningBox(this, WinBits( WB_OK ), - SCH_RESSTR(STR_INVALID_NUMBER)).Execute(); + ScopedVclPtr<WarningBox>::Create(this, WinBits( WB_OK ), + SCH_RESSTR(STR_INVALID_NUMBER))->Execute(); } bool DataBrowser::ShowQueryBox() diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 0e1265170368..f27f8e8cf64c 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -621,7 +621,7 @@ bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* = if( nResIdMessage == 0 ) return false; - WarningBox( this, WinBits( WB_OK ), SCH_RESSTR( nResIdMessage ) ).Execute(); + ScopedVclPtr<WarningBox>::Create( this, WinBits( WB_OK ), SCH_RESSTR( nResIdMessage ) )->Execute(); if( pControl ) { pControl->GrabFocus(); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 5ee102575377..1da4e2cd8735 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1536,7 +1536,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) if( ! bReturn ) { SolarMutexGuard aGuard; - InfoBox( m_pChartWindow, SCH_RESSTR( STR_ACTION_NOTPOSSIBLE )).Execute(); + ScopedVclPtr<InfoBox>::Create( m_pChartWindow, SCH_RESSTR( STR_ACTION_NOTPOSSIBLE ))->Execute(); } } |