summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrisztian Pinter <pin.terminator@gmail.com>2014-07-07 13:36:19 +0200
committerKrisztian Pinter <pin.terminator@gmail.com>2014-07-25 17:14:13 +0200
commit6ad7cd500108adb452ada83ecf59dbd4a4f58ff5 (patch)
treec84fef4e136f6566b1f55f1158902f6c677e2cbe
parent455c6437b55a9de4478d0c9488b6d6a6368a43cd (diff)
Make SvColorDialog allocate on stack
Change-Id: Ia47feda85bcde1ed44a2fbbcd28bbb5be0abafc8
-rw-r--r--cui/source/tabpages/tpcolor.cxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 9a1218a266ef..8caa3963c994 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -803,15 +803,15 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
{
- SvColorDialog* pColorDlg = new SvColorDialog( GetParentDialog() );
+ SvColorDialog pColorDlg( GetParentDialog() );
- pColorDlg->SetColor (aCurrentColor);
- pColorDlg->SetMode( svtools::ColorPickerMode_MODIFY );
+ pColorDlg.SetColor (aCurrentColor);
+ pColorDlg.SetMode( svtools::ColorPickerMode_MODIFY );
- if( pColorDlg->Execute() == RET_OK )
+ if( pColorDlg.Execute() == RET_OK )
{
sal_uInt16 nK = 0;
- Color aPreviewColor = pColorDlg->GetColor();
+ Color aPreviewColor = pColorDlg.GetColor();
aCurrentColor = aPreviewColor;
if (eCM != CM_RGB)
{
@@ -836,7 +836,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
m_pCtlPreviewNew->Invalidate();
}
- delete( pColorDlg );
return 0;
}