commit e985155bc506c84efba297751c76242406351de7
author Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 19:33:50 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 19:33:50 2015 +0100
tree 8d6b9878f33c6cb0011f9dde60db1424bee0f23d
parent e33d74ff2ef2493b9de558b033c2d05b6ce97069

Misc. other fixing.

Change-Id: Iffdb9951daaf38489f6b788e07d9b14256459fd4

basctl/source/basicide/basobj2.cxx

diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 9501011..8505061 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);

cui/source/dialogs/zoom.cxx

diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 21a70bc..5b2dff9 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();

extensions/source/bibliography/bibview.hxx

diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index 0ab5744..1f797c6 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;