diff options
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/control/curledit.cxx | 13 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/DExport.cxx | 13 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/dsntypes.cxx | 10 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/singledoccontroller.cxx | 35 |
4 files changed, 56 insertions, 15 deletions
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 01ead622f571..185a0562350c 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: curledit.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: fs $ $Date: 2000-10-24 12:08:19 $ + * last change: $Author: oj $ $Date: 2001-08-15 13:17:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ namespace dbaui { //......................................................................... - + DBG_NAME(OConnectionURLEdit); //========================================================================= //= OConnectionURLEdit //========================================================================= @@ -79,6 +79,7 @@ OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nStyle) :Edit(_pParent, _nStyle) ,m_pForcedPrefix(NULL) { + DBG_CTOR(OConnectionURLEdit ,NULL); } //------------------------------------------------------------------------- @@ -86,6 +87,7 @@ OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, const ResId& _rResId) :Edit(_pParent, _rResId) ,m_pForcedPrefix(NULL) { + DBG_CTOR(OConnectionURLEdit ,NULL); } //------------------------------------------------------------------------- @@ -96,6 +98,8 @@ OConnectionURLEdit::~OConnectionURLEdit() SetSubEdit(NULL); delete pSubEdit; delete m_pForcedPrefix; + + DBG_DTOR(OConnectionURLEdit ,NULL); } //------------------------------------------------------------------------- @@ -183,6 +187,9 @@ String OConnectionURLEdit::GetText() const /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.3 2000/10/24 12:08:19 fs + * S/GetTextNoPrefix + * * Revision 1.2 2000/10/18 16:00:47 fs * use the system's DialogColor as background for the fixed text - looks much better * diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 5a5c96475670..807072785408 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DExport.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: oj $ $Date: 2001-07-16 13:40:36 $ + * last change: $Author: oj $ $Date: 2001-08-15 13:16:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,7 +130,9 @@ #ifndef _MEMORY_ #include <memory> #endif - +#ifndef _TOOLS_DEBUG_HXX +#include <tools/debug.hxx> +#endif #define CONTAINER_ENTRY_NOTFOUND ((ULONG)0xFFFFFFFF) @@ -149,6 +151,7 @@ using namespace ::com::sun::star::lang; // ========================================================================== // ODatabaseExport // ========================================================================== +DBG_NAME(ODatabaseExport); ODatabaseExport::ODatabaseExport(sal_Int32 nRows, const ::std::vector<sal_Int32> &_rColumnPositions, const Reference< XNumberFormatter >& _rxNumberF, @@ -172,6 +175,8 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows, ,m_vColumns(_rColumnPositions) ,m_bFoundTable(sal_False) { + DBG_CTOR(ODatabaseExport,NULL); + m_nDefToken = gsl_getSystemTextEncoding(); m_nRows += nRows; @@ -220,6 +225,7 @@ ODatabaseExport::ODatabaseExport(const Reference< XConnection >& _rxConnection, ,m_pTypeInfo(NULL) ,m_bFoundTable(sal_False) { + DBG_CTOR(ODatabaseExport,NULL); try { Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); @@ -269,6 +275,7 @@ ODatabaseExport::ODatabaseExport(const Reference< XConnection >& _rxConnection, ODatabaseExport::~ODatabaseExport() { delete m_pTypeInfo; + DBG_DTOR(ODatabaseExport,NULL); } //------------------------------------------------------------------------------ String ODatabaseExport::ShortenFieldName( const String& rName, xub_StrLen nNewLength, diff --git a/dbaccess/source/ui/misc/dsntypes.cxx b/dbaccess/source/ui/misc/dsntypes.cxx index 3a4ba8e8dfb8..a829911aeaed 100644 --- a/dbaccess/source/ui/misc/dsntypes.cxx +++ b/dbaccess/source/ui/misc/dsntypes.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dsntypes.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: fs $ $Date: 2001-08-07 15:55:24 $ + * last change: $Author: oj $ $Date: 2001-08-15 13:16:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,7 @@ namespace dbaui //========================================================================= //= ODsnTypeCollection //========================================================================= +DBG_NAME(ODsnTypeCollection); //------------------------------------------------------------------------- ODsnTypeCollection::ODsnTypeCollection() :Resource(ModuleRes(RSC_DATASOURCE_TYPES)) @@ -87,6 +88,7 @@ ODsnTypeCollection::ODsnTypeCollection() ,m_nLivingIterators(0) #endif { + DBG_CTOR(ODsnTypeCollection,NULL); String sConnectionTypes = String(ResId(STR_CONNTYPES)); String sConnectionTypeNames = String(ResId(STR_CONNUINAMES)); DBG_ASSERT(sConnectionTypes.GetTokenCount(';') == sConnectionTypeNames.GetTokenCount(';'), @@ -107,6 +109,7 @@ ODsnTypeCollection::ODsnTypeCollection() ODsnTypeCollection::~ODsnTypeCollection() { DBG_ASSERT(0 == m_nLivingIterators, "ODsnTypeCollection::~ODsnTypeCollection : there are still living iterator objects!"); + DBG_DTOR(ODsnTypeCollection,NULL); } //------------------------------------------------------------------------- @@ -432,6 +435,9 @@ ADDRESSBOOK_TYPE AddressBookTypes::getAddressType( const String& _rAddressURL ) /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.11 2001/08/07 15:55:24 fs + * #88431# +isFileSystemBased + * * Revision 1.10 2001/08/01 08:32:49 fs * #88530# getAddressType: allow for invalid URLs without assertion * diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 2b07fbc1d1ab..b057225bc503 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: singledoccontroller.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: fs $ $Date: 2001-08-14 12:00:02 $ + * last change: $Author: oj $ $Date: 2001-08-15 13:16:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,10 +124,12 @@ namespace dbaui ~OConnectionChangeBroadcaster(); }; + DBG_NAME(OConnectionChangeBroadcaster); //-------------------------------------------------------------------- OConnectionChangeBroadcaster::OConnectionChangeBroadcaster( OSingleDocumentController* _pController ) :m_pController( _pController ) { + DBG_CTOR(OConnectionChangeBroadcaster,NULL); DBG_ASSERT( m_pController, "OConnectionChangeBroadcaster::OConnectionChangeBroadcaster: invalid controller!" ); if ( m_pController ) m_xOldConnection = m_pController->getConnection(); @@ -149,6 +151,7 @@ namespace dbaui m_pController->fire( &mHandle, &aNewValue, &aOldValue, 1, sal_False ); } } + DBG_DTOR(OConnectionChangeBroadcaster,NULL); } //==================================================================== @@ -160,7 +163,7 @@ namespace dbaui ,OSingleDocumentController_PBASE( getBroadcastHelper() ) ,m_bOwnConnection( sal_False ) { - registerProperty( PROPERTY_ACTIVECONNECTION, PROPERTY_ID_ACTIVECONNECTION, PropertyAttribute::READONLY, + registerProperty( PROPERTY_ACTIVECONNECTION, PROPERTY_ID_ACTIVECONNECTION, PropertyAttribute::READONLY | PropertyAttribute::BOUND, &m_xConnection, ::getCppuType( &m_xConnection ) ); } @@ -188,8 +191,17 @@ namespace dbaui //-------------------------------------------------------------------- Sequence<sal_Int8> SAL_CALL OSingleDocumentController::getImplementationId( ) throw(RuntimeException) { - static ::cppu::OImplementationId aId; - return aId.getImplementationId(); + static ::cppu::OImplementationId * pId = 0; + if (! pId) + { + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); + if (! pId) + { + static ::cppu::OImplementationId aId; + pId = &aId; + } + } + return pId->getImplementationId(); } //-------------------------------------------------------------------- @@ -349,8 +361,14 @@ namespace dbaui OConnectionChangeBroadcaster( this ); stopConnectionListening(m_xConnection); - if ( m_bOwnConnection ) - ::comphelper::disposeComponent( m_xConnection ); + try + { + if ( m_bOwnConnection ) + ::comphelper::disposeComponent( m_xConnection ); + } + catch(const Exception&) + { + } m_xConnection = NULL; m_bOwnConnection = sal_False; @@ -392,6 +410,9 @@ namespace dbaui /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.1 2001/08/14 12:00:02 fs + * initial checkin - base class for controller which work on one single object belonging to a data source connection + * * * Revision 1.0 14.08.01 09:45:39 fs ************************************************************************/ |