diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 19:33:50 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 19:33:50 +0100 |
| commit | e985155bc506c84efba297751c76242406351de7 (patch) | |
| tree | 8d6b9878f33c6cb0011f9dde60db1424bee0f23d | |
| parent | e33d74ff2ef2493b9de558b033c2d05b6ce97069 (diff) | |
Misc. other fixing.
Change-Id: Iffdb9951daaf38489f6b788e07d9b14256459fd4
| -rw-r--r-- | basctl/source/basicide/basobj2.cxx | 2 | ||||
| -rw-r--r-- | cui/source/dialogs/zoom.cxx | 3 | ||||
| -rw-r--r-- | extensions/source/bibliography/bibview.hxx | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 95010111963b..85050610a7f3 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -242,7 +242,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, OUString aScriptURL; SbMethod* pMethod = NULL; - ScopedVclPtrInstance< MacroChooser > pChooser( NULL, true ); + ScopedVclPtrInstance< MacroChooser > pChooser( nullptr, true ); if ( bChooseOnly || !SvtModuleOptions().IsBasicIDE() ) pChooser->SetMode(MacroChooser::ChooseOnly); diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 21a70bc38a5f..5b2dff90d8d0 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -295,8 +295,7 @@ SvxZoomDialog::~SvxZoomDialog() void SvxZoomDialog::dispose() { - delete mpOutSet; - mpOutSet = 0; + mpOutSet.reset(); m_pOptimalBtn.clear(); m_pWholePageBtn.clear(); m_pPageWidthBtn.clear(); diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index 0ab5744244da..1f797c6e990f 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -65,7 +65,7 @@ namespace bib private: DECL_STATIC_LINK(BibView, CallMappingHdl, BibView*); - protected: + public: // Window overridables virtual void Resize() SAL_OVERRIDE; |