diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 18:36:40 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 18:36:40 +0100 |
| commit | cf13f787033a6517877dd38163fdabf1c14e9fbf (patch) | |
| tree | 98d35592d02f057fe0682d9a0a0dd9728b0f3b61 /basctl/source | |
| parent | f9a55aa248b83721737a8e543d440734436a615b (diff) | |
Lost more cleanup and fixing post re-basing.
Change-Id: Ia5317b93484d31af978a5276bc6697848130225d
Diffstat (limited to 'basctl/source')
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 5 | ||||
| -rw-r--r-- | basctl/source/basicide/basobj2.cxx | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index db6136ba742b..5f1cfed5cf78 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -258,10 +258,7 @@ void Shell::onDocumentCreated( const ScriptDocument& /*_rDocument*/ ) // for VBA documents, show a warning that we can save them only in ODF if (pCurWin->GetDocument().isInVBAMode()) - { - std::vector< VclPtr<PushButton> > aButtons; - GetViewFrame()->AppendInfoBar("vba_save", IDE_RESSTR(RID_STR_CANNOTSAVEVBA), aButtons); - } + GetViewFrame()->AppendInfoBar("vba_save", IDE_RESSTR(RID_STR_CANNOTSAVEVBA)); } UpdateWindows(); diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 61e5e419a8c4..95010111963b 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; - ScopedVclPtr< MacroChooser > pChooser( NULL, true ); + ScopedVclPtrInstance< MacroChooser > pChooser( NULL, true ); if ( bChooseOnly || !SvtModuleOptions().IsBasicIDE() ) pChooser->SetMode(MacroChooser::ChooseOnly); |