diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:00:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:05 +0100 |
| commit | 871426533f7afe31bc451fa6b407b83db8e52827 (patch) | |
| tree | ed60cee61ebee91994eaffc9c9a3638836ed2ab4 /basctl | |
| parent | should be > 4, not > 5 (diff) | |
| download | core-871426533f7afe31bc451fa6b407b83db8e52827.tar.gz core-871426533f7afe31bc451fa6b407b83db8e52827.zip | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/bastype2.cxx | 4 | ||||
| -rw-r--r-- | basctl/source/basicide/moduldlg.cxx | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 3f8ecf15fef5..9820cc1f22f1 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -235,11 +235,13 @@ void BasicTreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocati String aRootName( GetRootEntryName( rDocument, eLocation ) ); Image aImage; GetRootEntryBitmaps( rDocument, aImage ); + SAL_WNODEPRECATED_DECLARATIONS_PUSH pDocumentRootEntry = AddEntry( aRootName, aImage, 0, true, std::auto_ptr< BasicEntry >( new BasicDocumentEntry( rDocument, eLocation ) ) ); + SAL_WNODEPRECATED_DECLARATIONS_POP } SetUpdateMode( sal_True ); @@ -696,6 +698,7 @@ sal_Bool BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry ) return bProtected; } +SAL_WNODEPRECATED_DECLARATIONS_PUSH SvLBoxEntry* BasicTreeListBox::AddEntry( const String& rText, const Image& rImage, @@ -709,6 +712,7 @@ SvLBoxEntry* BasicTreeListBox::AddEntry( aUserData.release() ); // XXX possible leak return p; } +SAL_WNODEPRECATED_DECLARATIONS_POP void BasicTreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage ) { diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index b7258cf0b6d7..c3912bd1da41 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -56,6 +56,7 @@ #include "localizationmgr.hxx" #include <basic/sbx.hxx> #include <tools/diagnose_ex.h> +#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -818,7 +819,7 @@ void ObjectPage::NewDialog() { aDocument.getOrCreateLibrary( E_DIALOGS, aLibName ); - std::auto_ptr< NewObjectDialog > xNewDlg( + boost::scoped_ptr< NewObjectDialog > xNewDlg( new NewObjectDialog(this, NEWOBJECTMODE_DLG, true)); xNewDlg->SetObjectName( aDocument.createObjectName( E_DIALOGS, aLibName ) ); @@ -863,11 +864,13 @@ void ObjectPage::NewDialog() SvLBoxEntry* pEntry = aBasicBox.FindEntry( pLibEntry, aDlgName, OBJ_TYPE_DIALOG ); if ( !pEntry ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH pEntry = aBasicBox.AddEntry( aDlgName, Image( IDEResId( RID_IMG_DIALOG ) ), pLibEntry, false, std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_DIALOG ) ) ); + SAL_WNODEPRECATED_DECLARATIONS_POP DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" ); } aBasicBox.SetCurEntry( pEntry ); @@ -979,7 +982,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, if ( !aModName.Len() ) aModName = rDocument.createObjectName( E_SCRIPTS, aLibName ); - std::auto_ptr< NewObjectDialog > xNewDlg( + boost::scoped_ptr< NewObjectDialog > xNewDlg( new NewObjectDialog( pWin, NEWOBJECTMODE_MOD, true ) ); xNewDlg->SetObjectName( aModName ); @@ -1036,11 +1039,13 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, SvLBoxEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE ); if ( !pEntry ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH pEntry = rBasicBox.AddEntry( aModName, Image( IDEResId( RID_IMG_MODULE ) ), pSubRootEntry, false, std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) ); + SAL_WNODEPRECATED_DECLARATIONS_POP DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" ); } rBasicBox.SetCurEntry( pEntry ); |