[Libreoffice-commits] .: 3 commits - binfilter/bf_basic binfilter/bf_sd binfilter/bf_sfx2
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Jan 9 07:52:00 PST 2011
binfilter/bf_basic/source/basmgr/basmgr.cxx | 136 ++--------------------
binfilter/bf_basic/source/classes/sbintern.cxx | 1
binfilter/bf_basic/source/classes/sbunoobj.cxx | 1
binfilter/bf_sd/source/ui/unoidl/sd_unowcntr.cxx | 45 +++----
binfilter/bf_sd/source/ui/unoidl/unowcntr.hxx | 10 -
binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx | 2
binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx | 2
binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx | 1
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx | 43 +++---
binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx | 3
binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx | 2
11 files changed, 78 insertions(+), 168 deletions(-)
New commits:
commit b1a11db4ff3c09b8ea750f06af67e8a41edd475a
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Jan 9 07:51:45 2011 -0800
Revert DECLARE_LIST( BasicLibsBase, BasicLibInfo* )
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index ae90822..d9d3742 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -482,104 +482,14 @@ public:
{ mxScriptCont = xScriptCont; }
};
-typedef vector< BasicLibInfo* > BasicLibsBase;
+DECLARE_LIST( BasicLibsBase, BasicLibInfo* )
-class BasicLibs
+class BasicLibs : public BasicLibsBase
{
-private:
- BasicLibsBase mpList;
- size_t current;
-
public:
String aBasicLibPath; // soll eigentlich Member vom Manager werden, aber jetzt nicht inkompatibel!
- BasicLibInfo* GetObject( size_t i );
- void Insert( BasicLibInfo* item, size_t i );
- void Clear() { mpList.clear(); }
- size_t Count() { return mpList.size(); }
- size_t GetPos( BasicLibInfo* pItem );
- size_t GetCurPos() { return current; }
- BasicLibInfo* First();
- BasicLibInfo* Next();
- BasicLibInfo* Prev();
- BasicLibInfo* Last();
- BasicLibInfo* Remove( BasicLibInfo* pItem );
};
-size_t BasicLibs::GetPos( BasicLibInfo* pItem )
-{
- for ( size_t i = 0, n = mpList.size(); i < n; ++i )
- if ( mpList[ i ] == pItem )
- return i;
- return size_t(-1);
-}
-
-void BasicLibs::Insert( BasicLibInfo* pItem, size_t i )
-{
- if ( i >= mpList.size() )
- {
- mpList.push_back( pItem );
- current = mpList.size() - 1;
- }
- else
- {
- BasicLibsBase::iterator it = mpList.begin();
- ::std::advance( it, i );
- mpList.insert( it, pItem );
- current = i;
- }
-}
-
-BasicLibInfo* BasicLibs::Remove( BasicLibInfo* pItem )
-{
- size_t pos = GetPos( pItem );
- if ( pos == size_t(-1) ) return NULL;
-
- BasicLibsBase::iterator it = mpList.begin();
- ::std::advance( it, pos );
- mpList.erase( it );
- return pItem;
-}
-
-BasicLibInfo* BasicLibs::GetObject( size_t i )
-{
- if ( i >= mpList.size() ) return NULL;
- return mpList[ i ];
-}
-
-BasicLibInfo* BasicLibs::First()
-{
- current = 0;
- if ( mpList.empty() ) return NULL;
- return mpList[ current ];
-}
-
-BasicLibInfo* BasicLibs::Next()
-{
- if ( mpList.empty()
- || current+1 > mpList.size()
- )
- return NULL;
- current++;
- return mpList[ current ];
-}
-
-BasicLibInfo* BasicLibs::Prev()
-{
- if ( mpList.empty()
- || current == 0
- )
- return NULL;
- current--;
- return mpList[ current ];
-}
-
-BasicLibInfo* BasicLibs::Last()
-{
- if ( mpList.empty() ) return NULL;
- current = mpList.size() - 1;
- return mpList[ current ];
-}
-
BasicLibInfo::BasicLibInfo()
{
bReference = FALSE;
commit ee3ea556694001d167b31de1618ce7341abc2cb8
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Jan 9 07:25:49 2011 -0800
Remove DECLARE_LIST( WeakRefList, uno::WeakReference< uno::XInterface >* )
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unowcntr.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unowcntr.cxx
index eab7aaf..889b451 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unowcntr.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unowcntr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -34,8 +34,6 @@ namespace binfilter {
using namespace ::rtl;
using namespace ::com::sun::star;
-DECLARE_LIST( WeakRefList, uno::WeakReference< uno::XInterface >* )//STRIP008 ;
-
SvUnoWeakContainer::SvUnoWeakContainer() throw()
{
mpList = new WeakRefList;
@@ -43,52 +41,53 @@ SvUnoWeakContainer::SvUnoWeakContainer() throw()
SvUnoWeakContainer::~SvUnoWeakContainer() throw()
{
- uno::WeakReference< uno::XInterface >* pRef = mpList->First();
- while( pRef )
- {
- delete mpList->Remove();
- pRef = mpList->GetCurObject();
- }
+ for ( size_t i = 0, n = mpList->size(); i < n ; ++i )
+ delete (*mpList)[ i ];
+ mpList->clear();
delete mpList;
}
/** inserts the given ref into this container */
void SvUnoWeakContainer::insert( uno::WeakReference< uno::XInterface > xRef ) throw()
{
- uno::WeakReference< uno::XInterface >* pRef = mpList->First();
- while( pRef )
+ for ( size_t i = 0; i < mpList->size(); )
{
+ uno::WeakReference< uno::XInterface >* pRef = (*mpList)[ i ];
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xTestRef( *pRef );
if(! xTestRef.is() )
{
- delete mpList->Remove();
- pRef = mpList->GetCurObject();
+ delete pRef;
+ WeakRefList::iterator it = mpList->begin();
+ ::std::advance( it, i );
+ mpList->erase( it );
}
else
{
if( *pRef == xRef )
return;
- pRef = mpList->Next();
+ ++i;
}
}
- mpList->Insert( new uno::WeakReference< uno::XInterface >( xRef ) );
+ mpList->push_back( new uno::WeakReference< uno::XInterface >( xRef ) );
}
-/** searches the container for a ref that returns true on the given
+/** searches the container for a ref that returns true on the given
search function
*/
sal_Bool SvUnoWeakContainer::findRef( uno::WeakReference< uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc )
{
- uno::WeakReference< uno::XInterface >* pRef = mpList->First();
- while( pRef )
+ for ( size_t i = 0; i < mpList->size(); )
{
- uno::Reference< ::com::sun::star::uno::XInterface > xTestRef( *pRef );
- if(!xTestRef.is())
+ uno::WeakReference< uno::XInterface >* pRef = (*mpList)[ i ];
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xTestRef( *pRef );
+ if(! xTestRef.is() )
{
- delete mpList->Remove();
- pRef = mpList->GetCurObject();
+ delete pRef;
+ WeakRefList::iterator it = mpList->begin();
+ ::std::advance( it, i );
+ mpList->erase( it );
}
else
{
@@ -98,7 +97,7 @@ sal_Bool SvUnoWeakContainer::findRef( uno::WeakReference< uno::XInterface >& rRe
return sal_True;
}
- pRef = mpList->Next();
+ ++i;
}
}
diff --git a/binfilter/bf_sd/source/ui/unoidl/unowcntr.hxx b/binfilter/bf_sd/source/ui/unoidl/unowcntr.hxx
index 0bc5381..26273bf 100644
--- a/binfilter/bf_sd/source/ui/unoidl/unowcntr.hxx
+++ b/binfilter/bf_sd/source/ui/unoidl/unowcntr.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,11 +30,13 @@
#define _SV_UNOWCNTR_HXX_
#include <cppuhelper/weakref.hxx>
+#include <vector>
+
namespace binfilter {
typedef sal_Bool (*weakref_searchfunc)( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef, void* pSearchData );
-class WeakRefList;
+typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >* > WeakRefList;
class SvUnoWeakContainer
{
@@ -48,10 +50,10 @@ public:
/** inserts the given ref into this container */
void insert( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef ) throw();
- /** searches the container for a ref that returns true on the given
+ /** searches the container for a ref that returns true on the given
search function
*/
- sal_Bool findRef( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc );
+ sal_Bool findRef( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc );
};
} //namespace binfilter
commit b308d6036ea17c13308ff2a757dc78b877d0c7ef
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Jan 9 07:25:32 2011 -0800
Revert DECLARE_LIST( BasErrorLst, BasicError* )
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index 69276dd..ae90822 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -61,7 +61,6 @@
#include <com/sun/star/script/XStarBasicLibraryInfo.hpp>
#include <cppuhelper/implbase1.hxx>
-#include <vector>
namespace binfilter {
@@ -71,7 +70,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::script;
using namespace cppu;
using namespace rtl;
-using ::std::vector;
typedef WeakImplHelper1< XNameContainer > NameContainerHelper;
typedef WeakImplHelper1< XStarBasicModuleInfo > ModuleInfoHelper;
@@ -113,7 +111,7 @@ DBG_NAME( BasicManager );
StreamMode eStreamReadMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL;
StreamMode eStorageReadMode = STREAM_READ | STREAM_SHARE_DENYWRITE;
-typedef vector< BasicError* > BasErrorLst;
+DECLARE_LIST( BasErrorLst, BasicError* )
//----------------------------------------------------------------------------
@@ -368,18 +366,16 @@ class BasicErrorManager
{
private:
BasErrorLst aErrorList;
- size_t CurrentError;
public:
- BasicErrorManager() { CurrentError = 0; }
~BasicErrorManager();
void Reset();
void InsertError( const BasicError& rError );
- BOOL HasErrors() { return !aErrorList.empty(); }
- BasicError* GetFirstError();
- BasicError* GetNextError();
+ BOOL HasErrors() { return (BOOL)aErrorList.Count(); }
+ BasicError* GetFirstError() { return aErrorList.First(); }
+ BasicError* GetNextError() { return aErrorList.Next(); }
};
@@ -388,34 +384,20 @@ BasicErrorManager::~BasicErrorManager()
Reset();
}
-BasicError* BasicErrorManager::GetFirstError()
-{
- CurrentError = 0;
- if ( aErrorList.empty() )
- return NULL;
- return aErrorList[ 0 ];
-}
-
-BasicError* BasicErrorManager::GetNextError()
-{
- if ( aErrorList.empty()
- || CurrentError + 1 >= aErrorList.size()
- )
- return NULL;
- CurrentError++;
- return aErrorList[ CurrentError ];
-}
-
void BasicErrorManager::Reset()
{
- for ( size_t i = 0, n = aErrorList.size(); i < n; ++i )
- delete aErrorList[ i ];
- aErrorList.clear();
+ BasicError* pError = (BasicError*)aErrorList.First();
+ while ( pError )
+ {
+ delete pError;
+ pError = (BasicError*)aErrorList.Next();
+ }
+ aErrorList.Clear();
}
void BasicErrorManager::InsertError( const BasicError& rError )
{
- aErrorList.push_back( new BasicError( rError ) );
+ aErrorList.Insert( new BasicError( rError ), LIST_APPEND );
}
BasicError::BasicError( ULONG nId, USHORT nR, const String& rErrStr ) :
diff --git a/binfilter/bf_basic/source/classes/sbintern.cxx b/binfilter/bf_basic/source/classes/sbintern.cxx
index 9ad2336..7406b4b 100644
--- a/binfilter/bf_basic/source/classes/sbintern.cxx
+++ b/binfilter/bf_basic/source/classes/sbintern.cxx
@@ -30,6 +30,7 @@
#include "sbunoobj.hxx"
#include "token.hxx" // Tokenizer
#include "codegen.hxx" // Code-Generator
+#include "basmgr.hxx"
namespace binfilter {
diff --git a/binfilter/bf_basic/source/classes/sbunoobj.cxx b/binfilter/bf_basic/source/classes/sbunoobj.cxx
index c31f836..742bc2f 100644
--- a/binfilter/bf_basic/source/classes/sbunoobj.cxx
+++ b/binfilter/bf_basic/source/classes/sbunoobj.cxx
@@ -83,6 +83,7 @@ using namespace rtl;
#include "sberrors.hxx"
#include "sbunoobj.hxx"
#include "sbjsmod.hxx"
+#include "basmgr.hxx"
#include "sbintern.hxx"
#include<math.h>
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
index 2d1701d..3a14e24 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
@@ -51,6 +51,8 @@
#include "appimp.hxx"
#include "dlgcont.hxx"
+#include "bf_basic/basmgr.hxx"
+
#include "scriptcont.hxx"
#define ITEMID_SEARCH SID_SEARCH_ITEM
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx
index 0a1c792..1a4ec4e 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appquit.cxx
@@ -25,6 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+#include "bf_basic/basmgr.hxx"
+
#ifdef WIN
#define _TL_LANG_SPECIAL
#endif
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
index fc34120..65b7cf2 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
@@ -35,6 +35,7 @@
#include <bf_svtools/rectitem.hxx>
#include <tools/urlobj.hxx>
#include <bf_basic/sbmeth.hxx>
+#include <bf_basic/basmgr.hxx>
#include <bf_basic/sbxcore.hxx>
#include <bf_basic/sbx.hxx>
#include <bf_svtools/stritem.hxx>
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index f77a1d7..ad251e0 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+
+
#include <rtl/uri.hxx>
@@ -36,6 +38,7 @@
#include <bf_svtools/pathoptions.hxx>
#include <bf_svtools/sfxecode.hxx>
#include <bf_svtools/ehdl.hxx>
+#include "bf_basic/basmgr.hxx"
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
@@ -199,7 +202,7 @@ namespace SfxContainer_Impl
/*?*/ void NameContainer_Impl::removeByName( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
@@ -256,6 +259,8 @@ namespace SfxContainer_Impl
/*N*/ SfxLibraryContainer_Impl::~SfxLibraryContainer_Impl()
/*N*/ {
+/*N*/ if( mbOwnBasMgr )
+/*?*/ BasicManager::LegacyDeleteBasicManager( mpBasMgr );
/*N*/ }
@@ -289,7 +294,7 @@ namespace SfxContainer_Impl
/*N*/ const OUString& aLibrariesDir,
/*N*/ SotStorageRef xStorage )
/*N*/ {
-/*N*/ maInitialisationParam = aInitialisationParam;
+/*N*/ maInitialisationParam = aInitialisationParam;
/*N*/ maInfoFileName = aInfoFileName;
/*N*/ maOldInfoFileName = aOldInfoFileName;
/*N*/ maLibElementFileExtension = aLibElementFileExtension;
@@ -300,10 +305,15 @@ namespace SfxContainer_Impl
/*N*/ OUString aInitFileName = aInitUrlInetObj.GetMainURL( INetURLObject::NO_DECODE );
/*N*/ if( aInitFileName.getLength() )
/*N*/ {
+/*N*/ // We need a BasicManager to avoid problems
+/*?*/ StarBASIC* pBas = new StarBASIC();
+/*?*/ mpBasMgr = new BasicManager( pBas );
+/*?*/ mbOwnBasMgr = sal_True;
+/*?*/
/*?*/ OUString aExtension = aInitUrlInetObj.getExtension();
/*?*/ if( aExtension.compareToAscii( "xlc" ) == COMPARE_EQUAL )
/*?*/ {
-/*?*/ meInitMode = CONTAINER_INIT_FILE;
+/*?*/ meInitMode = CONTAINER_INIT_FILE;
/*?*/ INetURLObject aLibPathInetObj( aInitUrlInetObj );
/*?*/ aLibPathInetObj.removeSegment();
/*?*/ maLibraryPath = aLibPathInetObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -667,7 +677,7 @@ namespace SfxContainer_Impl
/*?*/ aFolder60 = aUserBasic60InetObj.GetMainURL( INetURLObject::NO_DECODE );
/*N*/ }
/*N*/ if( mxSFI->isFolder( aFolder60 ) )
-/*?*/ {
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
/*?*/ }
/*N*/ }
/*N*/
@@ -1341,7 +1351,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::removeLibrary( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
/*N*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryLoaded( const OUString& Name )
@@ -1457,9 +1467,7 @@ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryLink( const OUString& Name
/*?*/ OUString SAL_CALL SfxLibraryContainer_Impl::getLibraryLinkURL( const OUString& /*Name*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {
- OUString aRetStr;
- return aRetStr;
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); OUString aRetStr;return aRetStr;
/*?*/ }
sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& Name )
@@ -1472,39 +1480,36 @@ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& N
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::setLibraryReadOnly( const OUString& /*Name*/, sal_Bool /*bReadOnly*/ )
/*?*/ throw (NoSuchElementException, RuntimeException)
-/*?*/ {
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::renameLibrary( const OUString& /*Name*/, const OUString& /*NewName*/ )
/*?*/ throw (NoSuchElementException, ElementExistException, RuntimeException)
-/*?*/ {
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// Methods XLibraryContainerPassword
/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordProtected( const OUString& /*Name*/ )
/*?*/ throw (NoSuchElementException, RuntimeException)
-/*?*/ {
- return sal_False;
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
/*?*/ }
/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordVerified( const OUString& /*Name*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {
- return sal_False;
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
/*?*/ }
/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::verifyLibraryPassword
/*?*/ ( const OUString& /*Name*/, const OUString& /*Password*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {
- return sal_False;
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
/*?*/ }
/*?*/ void SAL_CALL SfxLibraryContainer_Impl::changeLibraryPassword( const OUString& /*Name*/,
/*?*/ const OUString& /*OldPassword*/, const OUString& /*NewPassword*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// Methods XContainer
@@ -1694,7 +1699,7 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
// Methods XNameReplace
/*?*/ void SfxLibrary_Impl::replaceByName( const OUString& /*aName*/, const Any& /*aElement*/ )
/*?*/ throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*?*/ }
@@ -1711,7 +1716,7 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
/*?*/ void SfxLibrary_Impl::removeByName( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// XTypeProvider
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
index 661ca22..c80801b 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
@@ -34,6 +34,8 @@
#include "namecont.hxx"
+#include "bf_basic/basmgr.hxx"
+
#include "scriptcont.hxx"
#include <unotools/streamwrap.hxx>
@@ -44,6 +46,7 @@
#include <bf_svtools/sfxecode.hxx>
#include <bf_svtools/ehdl.hxx>
+#include "bf_basic/basmgr.hxx"
#include <xmlscript/xmlmod_imexp.hxx>
#include <app.hxx>
namespace binfilter {
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
index a560fc3..6a549a9 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
@@ -164,6 +164,8 @@ extern AsynchronLink* pPendingCloser;
/*N*/ pSfxApp->ReleaseIndex(pImp->nVisualDocumentNumber);
/*N*/
/*N*/ // Basic-Manager zerst"oren
+/*N*/ if ( pImp->pBasicMgr )
+/*N*/ BasicManager::LegacyDeleteBasicManager( pImp->pBasicMgr );
/*N*/ if( pImp->pBasicLibContainer )
/*N*/ pImp->pBasicLibContainer->release();
/*N*/ if( pImp->pDialogLibContainer )
More information about the Libreoffice-commits
mailing list