diff options
| -rw-r--r-- | include/svx/clipboardctl.hxx | 4 | ||||
| -rw-r--r-- | svx/source/mnuctrls/clipboardctl.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx index 135498be439e..e825035cd34d 100644 --- a/include/svx/clipboardctl.hxx +++ b/include/svx/clipboardctl.hxx @@ -25,6 +25,7 @@ #include <svl/poolitem.hxx> #include <svx/svxdllapi.h> #include <vcl/vclptr.hxx> +#include <memory> class PopupMenu; class SfxModule; @@ -32,7 +33,8 @@ class ToolBox; class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl { - SfxPoolItem* pClipboardFmtItem; + std::unique_ptr<SfxPoolItem> + pClipboardFmtItem; VclPtr<PopupMenu> pPopup; bool bDisabled; diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 22c00fe7e8fd..6d5c2e9fe25b 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -42,7 +42,6 @@ SvxClipBoardControl::SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), - pClipboardFmtItem( nullptr ), pPopup( nullptr ), bDisabled( false ) { @@ -56,13 +55,12 @@ SvxClipBoardControl::SvxClipBoardControl( SvxClipBoardControl::~SvxClipBoardControl() { DelPopup(); - delete pClipboardFmtItem; } VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow() { - const SvxClipboardFormatItem* pFmtItem = dynamic_cast<SvxClipboardFormatItem*>( pClipboardFmtItem ); + const SvxClipboardFormatItem* pFmtItem = dynamic_cast<SvxClipboardFormatItem*>( pClipboardFmtItem.get() ); if ( pFmtItem ) { if (pPopup) @@ -111,10 +109,10 @@ void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co { if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID ) { - DELETEZ( pClipboardFmtItem ); + pClipboardFmtItem.reset(); if ( eState >= SfxItemState::DEFAULT ) { - pClipboardFmtItem = pState->Clone(); + pClipboardFmtItem.reset( pState->Clone() ); GetToolBox().SetItemBits( GetId(), GetToolBox().GetItemBits( GetId() ) | ToolBoxItemBits::DROPDOWN ); } else if ( !bDisabled ) |