summaryrefslogtreecommitdiff
path: root/cui/source/customize
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-26 10:21:41 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-07-26 11:26:52 +0100
commita860df25dd7bf62ecb6b3d3ed38803b981f56d52 (patch)
tree591e39d4fc9b3da4d3b84882e69baf88baa05507 /cui/source/customize
parent87e2b0142a1724b9075f31acfc44011082ce8e12 (diff)
masses of MessBoxes not being disposed promptly
since... commit ba81e5c6bd420b41a84ade6ccd774011a8089f7f Date: Thu May 28 21:35:43 2015 +0100 tdf#91702 - fix stack-based MessBox allocation. There is no special ScopedVclPtr<X>::Create or ScopedVclPtrInstance<X>::Create just VclPtr<X>::Create and a raw VclPtr<X>::Create()->foo doesn't call dispose on the owned X Change-Id: Ifacc8d5e742820701307c3c37b9b86487667d84f
Diffstat (limited to 'cui/source/customize')
-rw-r--r--cui/source/customize/cfg.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5595e6bd7316..ada85afcbdd1 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2346,9 +2346,9 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI(
IMPL_LINK_NOARG_TYPED( SvxConfigPage, AsyncInfoMsg, void*, void )
{
// Asynchronous msg because of D&D
- ScopedVclPtr<MessageDialog>::Create( this,
+ ScopedVclPtrInstance<MessageDialog>(this,
CUI_RES( RID_SVXSTR_MNUCFG_ALREADY_INCLUDED ),
- VclMessageType::Info )->Execute();
+ VclMessageType::Info)->Execute();
}
IMPL_LINK_TYPED( SvxConfigPage, MoveHdl, Button *, pButton, void )
@@ -5233,7 +5233,7 @@ IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, ImportHdl, Button *, void)
IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, DeleteHdl, Button *, void )
{
OUString message = CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM );
- if ( ScopedVclPtr<WarningBox>::Create( this, WinBits(WB_OK_CANCEL), message )->Execute() == RET_OK )
+ if (ScopedVclPtrInstance<WarningBox>(this, WinBits(WB_OK_CANCEL), message)->Execute() == RET_OK)
{
sal_uInt16 nCount = pTbSymbol->GetItemCount();
@@ -5355,7 +5355,7 @@ void SvxIconSelectorDialog::ImportGraphics(
{
aIndex = rPaths[0].lastIndexOf( '/' );
aIconName = rPaths[0].copy( aIndex+1 );
- ret = ScopedVclPtr<SvxIconReplacementDialog>::Create( this, aIconName )->ShowDialog();
+ ret = ScopedVclPtrInstance<SvxIconReplacementDialog>(this, aIconName)->ShowDialog();
if ( ret == 2 )
{
ReplaceGraphicItem( rPaths[0] );
@@ -5383,7 +5383,7 @@ void SvxIconSelectorDialog::ImportGraphics(
{
aIndex = rPaths[i].lastIndexOf( '/' );
aIconName = rPaths[i].copy( aIndex+1 );
- ret = ScopedVclPtr<SvxIconReplacementDialog>::Create( this, aIconName, true )->ShowDialog();
+ ret = ScopedVclPtrInstance<SvxIconReplacementDialog>(this, aIconName, true)->ShowDialog();
if ( ret == 2 )
{
ReplaceGraphicItem( aPath );