diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-28 21:35:43 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-06-04 16:45:17 +0100 |
| commit | 07074e0e072f33fe8954eded5cd2495822f5f0e4 (patch) | |
| tree | 5d8ea28f63974fda098fb8514a25c22f5244817c /sfx2 | |
| parent | 0ae00643fc87ca30ddf788df9f31cec8dae4e544 (diff) | |
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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/securitypage.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index b39ab71d1e1e..c3e25657c08e 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -327,7 +327,7 @@ void LinkManager::UpdateAllLinks( if( bAskUpdate ) { - int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ).toString() ).Execute(); + int nRet = ScopedVclPtr<QueryBox>::Create( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ).toString() )->Execute(); if( RET_YES != nRet ) { SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist(); diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 713634552312..48bf28dfdbc8 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -540,7 +540,7 @@ bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter ) { #ifdef DBG_UTIL // Start Setup - InfoBox( NULL, "Here should the Setup now be starting!" ).Execute(); + ScopedVclPtr<InfoBox>::Create( nullptr, "Here should the Setup now be starting!" )->Execute(); #endif // Installation must still give feedback if it worked or not, // then the Filterflag be deleted @@ -552,7 +552,7 @@ bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter ) { OUString aText( SfxResId(STR_FILTER_CONSULT_SERVICE).toString() ); aText = aText.replaceFirst( "$(FILTER)", pFilter->GetUIName() ); - InfoBox ( NULL, aText ).Execute(); + ScopedVclPtr<InfoBox>::Create( nullptr, aText )->Execute(); return false; } else diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index e5de1d3c99c5..2af8ef50e1ff 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -126,7 +126,7 @@ static bool lcl_IsPasswordCorrect( const OUString &rPassword ) if (SvPasswordHelper::CompareHashPassword( aPasswordHash, rPassword )) bRes = true; // password was correct else - InfoBox( NULL, SFX2_RESSTR(RID_SVXSTR_INCORRECT_PASSWORD) ).Execute(); + ScopedVclPtr<InfoBox>::Create( nullptr, SFX2_RESSTR(RID_SVXSTR_INCORRECT_PASSWORD) )->Execute(); return bRes; } |