2010-10-14 01:30:07 -05:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2000-09-18 09:29:57 -05:00
|
|
|
/*************************************************************************
|
|
|
|
*
|
2008-04-11 05:38:55 -05:00
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
2000-09-18 09:29:57 -05:00
|
|
|
*
|
2010-02-12 08:01:35 -06:00
|
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
2000-09-18 09:29:57 -05:00
|
|
|
*
|
2008-04-11 05:38:55 -05:00
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2000-09-18 09:29:57 -05:00
|
|
|
*
|
2008-04-11 05:38:55 -05:00
|
|
|
* This file is part of OpenOffice.org.
|
2000-09-18 09:29:57 -05:00
|
|
|
*
|
2008-04-11 05:38:55 -05:00
|
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
|
|
* only, as published by the Free Software Foundation.
|
2000-09-18 09:29:57 -05:00
|
|
|
*
|
2008-04-11 05:38:55 -05:00
|
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Lesser General Public License version 3 for more details
|
|
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
2000-09-18 09:29:57 -05:00
|
|
|
*
|
2008-04-11 05:38:55 -05:00
|
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
|
|
* <http://www.openoffice.org/license.html>
|
|
|
|
* for a copy of the LGPLv3 License.
|
2000-09-18 09:29:57 -05:00
|
|
|
*
|
|
|
|
************************************************************************/
|
2006-09-16 06:43:37 -05:00
|
|
|
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
|
|
#include "precompiled_cppuhelper.hxx"
|
2000-09-18 09:29:57 -05:00
|
|
|
#include <osl/mutex.hxx>
|
|
|
|
#include <cppuhelper/weakagg.hxx>
|
|
|
|
#include <cppuhelper/interfacecontainer.hxx>
|
2007-06-27 07:22:10 -05:00
|
|
|
#include "cppuhelper/exc_hlp.hxx"
|
2000-09-18 09:29:57 -05:00
|
|
|
|
|
|
|
using namespace osl;
|
|
|
|
using namespace com::sun::star::uno;
|
|
|
|
|
|
|
|
/** */ //for docpp
|
|
|
|
namespace cppu
|
|
|
|
{
|
|
|
|
|
|
|
|
// due to static Reflection destruction from usr, ther must be a mutex leak (#73272#)
|
2001-03-09 05:15:28 -06:00
|
|
|
inline static Mutex & getWeakMutex() SAL_THROW( () )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
|
|
|
static Mutex * s_pMutex = 0;
|
|
|
|
if (! s_pMutex)
|
|
|
|
s_pMutex = new Mutex();
|
|
|
|
return *s_pMutex;
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
//-- OWeakConnectionPoint ----------------------------------------------------
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
class OWeakConnectionPoint : public XAdapter
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
/**
|
|
|
|
Hold the weak object without an acquire (only the pointer).
|
|
|
|
*/
|
2001-03-09 05:15:28 -06:00
|
|
|
OWeakConnectionPoint( OWeakObject* pObj ) SAL_THROW( () )
|
2000-09-18 09:29:57 -05:00
|
|
|
: m_aRefCount( 0 )
|
|
|
|
, m_pObject(pObj)
|
|
|
|
, m_aReferences( getWeakMutex() )
|
|
|
|
{}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException);
|
|
|
|
void SAL_CALL acquire() throw();
|
|
|
|
void SAL_CALL release() throw();
|
|
|
|
|
|
|
|
// XAdapter
|
|
|
|
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL queryAdapted() throw(::com::sun::star::uno::RuntimeException);
|
|
|
|
void SAL_CALL addReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException);
|
|
|
|
void SAL_CALL removeReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException);
|
|
|
|
|
|
|
|
/// Called from the weak object if the reference count goes to zero.
|
|
|
|
void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
|
2006-06-19 04:35:43 -05:00
|
|
|
|
|
|
|
private:
|
|
|
|
OWeakConnectionPoint(OWeakConnectionPoint &); // not defined
|
|
|
|
void operator =(OWeakConnectionPoint &); // not defined
|
|
|
|
|
|
|
|
virtual ~OWeakConnectionPoint() {}
|
|
|
|
|
2000-09-18 09:29:57 -05:00
|
|
|
/// The reference counter.
|
|
|
|
oslInterlockedCount m_aRefCount;
|
|
|
|
/// The weak object
|
|
|
|
OWeakObject* m_pObject;
|
|
|
|
/// The container to hold the weak references
|
|
|
|
OInterfaceContainerHelper m_aReferences;
|
|
|
|
};
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
Any SAL_CALL OWeakConnectionPoint::queryInterface( const Type & rType )
|
|
|
|
throw(com::sun::star::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
return ::cppu::queryInterface(
|
|
|
|
rType, static_cast< XAdapter * >( this ), static_cast< XInterface * >( this ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
void SAL_CALL OWeakConnectionPoint::acquire() throw()
|
|
|
|
{
|
|
|
|
osl_incrementInterlockedCount( &m_aRefCount );
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
void SAL_CALL OWeakConnectionPoint::release() throw()
|
|
|
|
{
|
|
|
|
if (! osl_decrementInterlockedCount( &m_aRefCount ))
|
|
|
|
delete this;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SAL_CALL OWeakConnectionPoint::dispose() throw(::com::sun::star::uno::RuntimeException)
|
|
|
|
{
|
2007-06-27 07:22:10 -05:00
|
|
|
Any ex;
|
2000-09-18 09:29:57 -05:00
|
|
|
OInterfaceIteratorHelper aIt( m_aReferences );
|
|
|
|
while( aIt.hasMoreElements() )
|
2007-06-27 07:22:10 -05:00
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
((XReference *)aIt.next())->dispose();
|
|
|
|
}
|
|
|
|
catch (com::sun::star::lang::DisposedException &) {}
|
|
|
|
catch (RuntimeException &)
|
|
|
|
{
|
|
|
|
ex = cppu::getCaughtException();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (ex.hasValue())
|
|
|
|
{
|
|
|
|
cppu::throwException(ex);
|
|
|
|
}
|
2000-09-18 09:29:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::com::sun::star::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
Reference< XInterface > ret;
|
|
|
|
|
|
|
|
ClearableMutexGuard guard(getWeakMutex());
|
|
|
|
|
|
|
|
if (m_pObject)
|
|
|
|
{
|
|
|
|
oslInterlockedCount n = osl_incrementInterlockedCount( &m_pObject->m_refCount );
|
|
|
|
|
|
|
|
if (n > 1)
|
|
|
|
{
|
|
|
|
// The refence is incremented. The object cannot be destroyed.
|
|
|
|
// Release the guard at the earliest point.
|
|
|
|
guard.clear();
|
|
|
|
// WeakObject has a (XInterface *) cast operator
|
|
|
|
ret = *m_pObject;
|
|
|
|
n = osl_decrementInterlockedCount( &m_pObject->m_refCount );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
// Another thread wait in the dispose method at the guard
|
|
|
|
n = osl_decrementInterlockedCount( &m_pObject->m_refCount );
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
void SAL_CALL OWeakConnectionPoint::addReference(const Reference< XReference >& rRef)
|
|
|
|
throw(::com::sun::star::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
m_aReferences.addInterface( (const Reference< XInterface > &)rRef );
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference >& rRef)
|
|
|
|
throw(::com::sun::star::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
m_aReferences.removeInterface( (const Reference< XInterface > &)rRef );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
//-- OWeakObject -------------------------------------------------------
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
|
2002-11-18 02:59:15 -06:00
|
|
|
#ifdef _MSC_VER
|
|
|
|
// Accidentally occurs in msvc mapfile = > had to be outlined.
|
|
|
|
OWeakObject::OWeakObject() SAL_THROW( () )
|
|
|
|
: m_refCount( 0 ),
|
|
|
|
m_pWeakConnectionPoint( 0 )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2000-09-18 09:29:57 -05:00
|
|
|
// XInterface
|
|
|
|
Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
return ::cppu::queryInterface(
|
|
|
|
rType,
|
|
|
|
static_cast< XWeak * >( this ), static_cast< XInterface * >( this ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
void SAL_CALL OWeakObject::acquire() throw()
|
|
|
|
{
|
|
|
|
osl_incrementInterlockedCount( &m_refCount );
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
void SAL_CALL OWeakObject::release() throw()
|
|
|
|
{
|
2006-03-06 03:11:16 -06:00
|
|
|
if (osl_decrementInterlockedCount( &m_refCount ) == 0) {
|
|
|
|
// notify/clear all weak-refs before object's dtor is executed
|
|
|
|
// (which may check weak-refs to this object):
|
dba33a: summary migration from SVN
2009-11-06 13:10:39 +0000 msc r277387 : minor fix for automatic test
2009-11-06 13:09:33 +0000 msc r277385 : minor fix for automatic test
2009-11-06 12:30:57 +0000 fs r277383 : argh. On some virtual machines, waiting 5 seconds for the event to arrive is not enough. Increasing the timeout ...
2009-11-06 12:13:34 +0000 fs r277382 : this diagnostic code should not have slipped in
2009-11-05 13:21:06 +0000 fs r277369 : SHL2NOCHECK=TRUE (requested by hjs)
2009-11-04 14:09:46 +0000 msc r277355 : minor fix for automatic testing
2009-11-04 13:23:02 +0000 msc r277352 : minor fix for automatic testing
2009-11-04 10:53:28 +0000 msc r277341 : minor fix for automated testscript
2009-11-04 08:30:58 +0000 msc r277333 : minor fix for automatic test
2009-11-04 08:15:43 +0000 msc r277332 : minor fix for automatic test
2009-11-03 14:25:44 +0000 fs r277324 : #i10000#
2009-11-03 09:47:47 +0000 fs r277315 : found yet another help ID zombie ... moved formhelpid.hrc content to propctrlr.hrc, where it belongs
2009-11-03 08:50:24 +0000 fs r277312 : use createTempFileURL, which cares for some more specialities ...
2009-11-03 08:44:55 +0000 fs r277311 : when creating a temp file for purpose of getting a temp file URL, the delete the file immediately. On some machines/JVMs, the file exists, with write access denied, which isn't Good (TM)
2009-10-22 13:06:17 +0000 fs r277126 : removed wrong assertion
2009-10-21 08:10:35 +0000 fs r277077 : reverted the previous change, which was nonsense
2009-10-21 07:19:43 +0000 fs r277076 : export the component_foo functions, now that some of the objects are built with VISIBILITY_HIDDEN=TRUE
2009-10-21 07:08:35 +0000 fs r277075 : spare useless call
2009-10-20 21:26:31 +0000 fs r277072 : #i10000#
2009-10-20 08:06:04 +0000 fs r277039 : CWS-TOOLING: rebase CWS dba33a to trunk@277035 (milestone: DEV300:m62)
2009-10-16 09:55:25 +0000 fs r276960 : remove one of the superfluous implts_doLayout calls introduced with the previous patch
2009-10-15 13:18:52 +0000 fs r276941 : removed the basic tests. According to cn, they're not used anymore (for a long time), and according to 'du -h', they take up 6.0M on my hard disc. For too much for useless code, /me thinks.
2009-10-15 13:06:51 +0000 fs r276940 : #i10000# remove useless include (otherwise the compiler warning it provokes would need to be fixed by declaring VISIBILITY_HIDDEN=TRUE in the makefile.mk)
2009-10-15 12:52:39 +0000 fs r276939 : #i10000#
2009-10-15 12:44:26 +0000 fs r276938 : #i10000#
2009-10-15 12:00:33 +0000 fs r276936 : #i10000#
2009-10-15 10:31:37 +0000 fs r276934 : #i105259# prepare for the Hidden arg
2009-10-15 10:31:05 +0000 fs r276933 : IsMaximized -> const
2009-10-15 09:50:15 +0000 fs r276932 : during #i105259#:
introduce an option to the layout manager to preserve, if possible, the size of the content window
when layouting. Enable this option for embedded (SFX-based) documents opened for outplace editing.
(the option is incompatible with in-place editing, anyway)
This is because such embedded objects couple the (content) window size to the VisAreaSize, in that
both are used interchangeably. When an embedded object is closed, it remembers the VisAreaSize,
and restores it upon next open. This, however, leads to different content window sizes when the
window is closed with another toolbar set than used during opening.
This patch here prevents those different content window sizes. Also, now the content window size
doesn't change when, explicitly or implicitly, a toolbar is shown or hidden. Instead, the content
window size stays the same, and the container window size is adjusted.
2009-10-15 09:32:41 +0000 fs r276931 : during #i105259#: UNO access to more attributes of top windows
2009-10-15 09:30:28 +0000 fs r276930 : indention corrected (better readable)
2009-10-15 09:26:46 +0000 fs r276929 : during #i105259#: access to more attributes of top windows
2009-10-14 10:04:39 +0000 fs r276889 : connecting via services manager, not naming service
2009-10-12 11:31:08 +0000 fs r276831 : during #i105806# FillPropertySet: do not attempt to set *AutoStyleName if it doesn't exist
2009-10-12 11:24:44 +0000 fs r276830 : #i105806# getPropertyValue: throw an UnknownPropertyException for, well, unknown properties
2009-10-08 08:20:58 +0000 fs r276774 : implSubmit: re-throw WrappedTargetExceptions unmodified
2009-10-07 19:19:42 +0000 fs r276770 : #i105198# do not pass an CommandType if we do not have a command
2009-10-07 17:39:36 +0000 fs r276768 : export the OWeakObject::disposeWeakConnectionPoint symbol
2009-10-07 12:59:17 +0000 fs r276754 : #i87693#
2009-10-07 11:19:22 +0000 fs r276752 : #i10000#
2009-10-07 10:21:08 +0000 fs r276748 : #105482# do not require a controller, at least not in *all* circumstances (executed reports have a model, the ReportDefinition, but no Controller)
2009-10-07 10:04:08 +0000 fs r276747 : copying the changes from CWS fwk121 herein, in particular the fix for
issue #i105371#
2009-10-07 09:58:30 +0000 fs r276746 : copying the changes from CWS fwk121 herein, in particular the fix for
issue #i105371#
2009-10-07 09:48:14 +0000 fs r276744 : removed (now) pointless assertion
2009-10-07 06:59:19 +0000 fs r276740 : export the OWeakObject::disposeWeakConnectionPoint symbol
2009-10-07 06:44:43 +0000 fs r276739 : OComponentHelper::release & WeakAggComponentImplHelperBase::release:
when our ref count drops to 0, call OWeakObject's disposeWeakConnectionPoint before (temporarily) incrementing
the ref count, again. This ensures that our adapter cannot create references to the dying object anymore.
(A complex test case in dbaccess (#i105505#) triggered such a situation, but in another class using an analogous
release/dispose/destroy pattern, namely WeakComponentImplHelperBase)
2009-10-07 06:37:20 +0000 fs r276738 : found during some new complex test cases: call disposeWeakConnectionPoint before actually starting to destroy the object, this ensures no other threads will resurrect it while it is dying
2009-10-06 21:58:24 +0000 fs r276734 : oops, two small corrections to the previous fix (hey, complex test cases are cool)
2009-10-06 21:51:16 +0000 fs r276733 : log the name of the data source which cannot be revoked
2009-10-06 21:50:41 +0000 fs r276732 : more detailed error message when cleanup fails
2009-10-06 21:50:01 +0000 fs r276731 : reworked the ModelImpl caching. The new and improved UNO API test for css.sdb.RowSet
revealed some inconsistencies, in whether the objects are cached by their URL, or by their
registration name. This has been changed to caching by registration name.
2009-10-06 13:50:34 +0000 fs r276714 : print diagnostics when we cannot clean up the test case
2009-10-06 13:45:02 +0000 fs r276713 : this test failed all the time, since the core (rightfully) threw an exception. Disabled it for the moment, until issue 84253 is fixed
2009-10-06 12:52:46 +0000 fs r276711 : rewrote this test. Now we do not re-use the same .odb across different test cases, as this leads to unreliable
(timing-dependent) results/failures. Instead, every test sets up a new odb file.
Also, did some re-factoring, improved the cleanup code, and caught a few more errors.
2009-10-06 12:51:07 +0000 fs r276710 : DBTools taking a logger now
2009-10-06 12:50:42 +0000 fs r276709 : taking a PrintWriter for logging purpose
2009-10-06 12:50:03 +0000 fs r276708 : DBTools taking a logger now
2009-10-06 12:49:22 +0000 fs r276707 : typo
2009-10-06 12:49:03 +0000 fs r276706 : typo
2009-10-06 12:48:52 +0000 fs r276705 : wrappers around some database-related services - initial versions only, to evolve over time, and intended to finally replace the DBTools class
2009-10-06 12:48:02 +0000 fs r276704 : typo
2009-10-06 12:38:42 +0000 fs r276702 : some better diagnostics, done during getting the API tests to work more reliably
2009-10-06 10:35:51 +0000 fs r276698 : when living in, e.g., the DataSourceBrowser, we can't expect to find an XModifiable2, so don't assert its existence
2009-10-05 12:47:52 +0000 oj r276677 : #i105607# check for read moved into if scope
2009-10-05 11:37:06 +0000 fs r276676 : when saving a file fails, retrieve the error message from the InteractionRequestStringResolver - this is better than any generic message we can create
2009-10-05 10:04:23 +0000 oj r276673 : #i105607# check for read moved into if scope
2009-10-05 09:46:17 +0000 fs r276671 : #i10000#
2009-10-05 08:43:58 +0000 fs r276664 : #i105505#
release: dispose the (base classes) weak connection point before disposing ourself,
and in particular before temporarily incrementing our ref count, again.
This way, we prevent that a separate thread re-surrects us (using the weak connection
point's queryAdapted) while we're in the process of destruction
2009-10-05 08:41:49 +0000 fs r276663 : #i105505# +disposeWeakConnectionPoint (outsourced into dedicated method from ::release)
2009-10-05 08:40:26 +0000 fs r276662 : no need to derived from OSubComponent, its features are not used, directly derive from WeakComponentImplFoo instead
2009-10-05 08:39:38 +0000 fs r276661 : #i105505# diagnostics
2009-10-05 08:39:16 +0000 fs r276660 : #i105505# +testDocumentRevenants
2009-10-05 08:36:01 +0000 fs r276659 : #i105560# reverted the removal of GenericController::openHelpAgent - this is needed in module reportdesign
2009-10-04 19:53:30 +0000 fs r276657 : #105560#
remove unused code
thanks to cmc@openoffice.org for submitting the patch
2009-10-04 19:50:28 +0000 fs r276656 : #i105550# remove unused 'fire' method (thanks to cmc)
2009-10-03 16:13:15 +0000 fs r276655 : CWS-TOOLING: rebase CWS dba33a to trunk@276429 (milestone: DEV300:m60)
2009-10-02 19:20:48 +0000 fs r276651 : #i104117# lotta changed IDs ...
2009-10-02 10:52:24 +0000 fs r276634 : #i105505#
If a model is created, and is a revenant of a previous incarnation, then ensure it is properly initialized.
In particular, in its ctor, set the state to "Initializing", not "Initialized", and then let the ModelImpl
call attachResource. This ensures that the model is initialized completely, including firing the necessary
events.
2009-10-02 10:51:08 +0000 fs r276633 : #i105505# always do an attachResource at the newly loaded model, even if it (internally) was not really loaded, but only a revenant of a previous incarnation of this document
2009-10-01 11:10:13 +0000 fs r276597 : do not rely on the name 'Standard' for the one and only form in a document
2009-10-01 10:36:29 +0000 fs r276590 : #i105509# don't rely on default form component names, use indexes
2009-10-01 09:12:20 +0000 fs r276582 : #i105505#
2009-09-30 07:55:21 +0000 fs r276542 : removed some unsed methods / spared some unnecessary pixel<->logic conversion
2009-09-30 07:53:22 +0000 fs r276541 : removed unneeded methods
2009-09-30 06:35:59 +0000 fs r276538 : #i10000#
2009-09-29 13:45:02 +0000 fs r276531 : refactored the Roadmap* classes, to be able to fix above-mentioned #i105113#
2009-09-29 10:27:10 +0000 fs r276520 : #i105367#
2009-09-29 08:46:45 +0000 fs r276510 : #i104956# cleaned up the makefiles
2009-09-28 21:00:07 +0000 fs r276505 : #i104117# sourced those IDs out from extension.hrc
2009-09-28 20:59:05 +0000 fs r276504 : no need to let one FREE...
2009-09-28 20:53:36 +0000 fs r276503 : #i104117#
cleaned up the mess with help IDs in module extensions.
Formerly, extensions used to use help IDs which were declared in module svx, and vice versa.
Also, help ID ranges were not respected.
2009-09-28 11:25:36 +0000 fs r276489 : typo
2009-09-28 11:25:10 +0000 fs r276488 : #i105235#
2009-09-24 11:53:16 +0000 fs r276423 : #i105234# do not zoom the control when they view information is still uninitialized (happens at least in Writer when opening a form document)
2009-09-24 09:42:28 +0000 fs r276415 : #i105234# proper zoom handling for the nav bar
2009-09-24 09:42:19 +0000 fs r276414 : #i105234# setZoom: care for precision errors caused by implicit conversion float->double
2009-09-16 11:11:43 +0000 fs r276195 : #i105082#
consolidated the sub storage handling, by delegating more functionality into
the DocumentStorageAccess class. As a result, there won't be that many unnecessary
commits anymore. Also, the two different storage caches (in ModelImpl::m_aStorages
and DocumentStorageAccess::m_aExposedStorages) have been consolidated.
This is not really part of the fix of issue 105082, but it helped reducing the
calls to the storage/package implementation.
2009-09-15 21:42:27 +0000 fs r276190 : don't calculate space for BOLD if the text is not really bold (speeds up rendering for large tree structures)
2009-09-15 20:20:23 +0000 fs r276188 : getTypeInfo: fill m_aTypeInfoRows only if really all type infos could be retrieved
2009-09-15 20:19:29 +0000 fs r276187 : do not continue loading when the controller initialization throws an error
2009-09-14 12:25:57 +0000 fs r276119 : oops, this patch was not intended for this CWS
2009-09-14 12:13:57 +0000 fs r276114 : #cr6875455# introduce a ReferenceDevice property for various control models
2009-09-14 10:33:02 +0000 fs r276106 : removed dead file
2009-09-09 08:37:31 +0000 fs r275972 : remove OSL_TRACE in VCLXButton dtor
2009-09-08 11:19:17 +0000 oj r275926 : i76534# remove mnemonic from fixed text
2009-09-07 08:39:37 +0000 fs r275874 : create CWS dba33a from cws/dba32g@275857 (CWS: dba32g)
2009-11-27 06:39:32 -06:00
|
|
|
disposeWeakConnectionPoint();
|
2006-03-06 03:11:16 -06:00
|
|
|
// destroy object:
|
2000-09-18 09:29:57 -05:00
|
|
|
delete this;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
dba33a: summary migration from SVN
2009-11-06 13:10:39 +0000 msc r277387 : minor fix for automatic test
2009-11-06 13:09:33 +0000 msc r277385 : minor fix for automatic test
2009-11-06 12:30:57 +0000 fs r277383 : argh. On some virtual machines, waiting 5 seconds for the event to arrive is not enough. Increasing the timeout ...
2009-11-06 12:13:34 +0000 fs r277382 : this diagnostic code should not have slipped in
2009-11-05 13:21:06 +0000 fs r277369 : SHL2NOCHECK=TRUE (requested by hjs)
2009-11-04 14:09:46 +0000 msc r277355 : minor fix for automatic testing
2009-11-04 13:23:02 +0000 msc r277352 : minor fix for automatic testing
2009-11-04 10:53:28 +0000 msc r277341 : minor fix for automated testscript
2009-11-04 08:30:58 +0000 msc r277333 : minor fix for automatic test
2009-11-04 08:15:43 +0000 msc r277332 : minor fix for automatic test
2009-11-03 14:25:44 +0000 fs r277324 : #i10000#
2009-11-03 09:47:47 +0000 fs r277315 : found yet another help ID zombie ... moved formhelpid.hrc content to propctrlr.hrc, where it belongs
2009-11-03 08:50:24 +0000 fs r277312 : use createTempFileURL, which cares for some more specialities ...
2009-11-03 08:44:55 +0000 fs r277311 : when creating a temp file for purpose of getting a temp file URL, the delete the file immediately. On some machines/JVMs, the file exists, with write access denied, which isn't Good (TM)
2009-10-22 13:06:17 +0000 fs r277126 : removed wrong assertion
2009-10-21 08:10:35 +0000 fs r277077 : reverted the previous change, which was nonsense
2009-10-21 07:19:43 +0000 fs r277076 : export the component_foo functions, now that some of the objects are built with VISIBILITY_HIDDEN=TRUE
2009-10-21 07:08:35 +0000 fs r277075 : spare useless call
2009-10-20 21:26:31 +0000 fs r277072 : #i10000#
2009-10-20 08:06:04 +0000 fs r277039 : CWS-TOOLING: rebase CWS dba33a to trunk@277035 (milestone: DEV300:m62)
2009-10-16 09:55:25 +0000 fs r276960 : remove one of the superfluous implts_doLayout calls introduced with the previous patch
2009-10-15 13:18:52 +0000 fs r276941 : removed the basic tests. According to cn, they're not used anymore (for a long time), and according to 'du -h', they take up 6.0M on my hard disc. For too much for useless code, /me thinks.
2009-10-15 13:06:51 +0000 fs r276940 : #i10000# remove useless include (otherwise the compiler warning it provokes would need to be fixed by declaring VISIBILITY_HIDDEN=TRUE in the makefile.mk)
2009-10-15 12:52:39 +0000 fs r276939 : #i10000#
2009-10-15 12:44:26 +0000 fs r276938 : #i10000#
2009-10-15 12:00:33 +0000 fs r276936 : #i10000#
2009-10-15 10:31:37 +0000 fs r276934 : #i105259# prepare for the Hidden arg
2009-10-15 10:31:05 +0000 fs r276933 : IsMaximized -> const
2009-10-15 09:50:15 +0000 fs r276932 : during #i105259#:
introduce an option to the layout manager to preserve, if possible, the size of the content window
when layouting. Enable this option for embedded (SFX-based) documents opened for outplace editing.
(the option is incompatible with in-place editing, anyway)
This is because such embedded objects couple the (content) window size to the VisAreaSize, in that
both are used interchangeably. When an embedded object is closed, it remembers the VisAreaSize,
and restores it upon next open. This, however, leads to different content window sizes when the
window is closed with another toolbar set than used during opening.
This patch here prevents those different content window sizes. Also, now the content window size
doesn't change when, explicitly or implicitly, a toolbar is shown or hidden. Instead, the content
window size stays the same, and the container window size is adjusted.
2009-10-15 09:32:41 +0000 fs r276931 : during #i105259#: UNO access to more attributes of top windows
2009-10-15 09:30:28 +0000 fs r276930 : indention corrected (better readable)
2009-10-15 09:26:46 +0000 fs r276929 : during #i105259#: access to more attributes of top windows
2009-10-14 10:04:39 +0000 fs r276889 : connecting via services manager, not naming service
2009-10-12 11:31:08 +0000 fs r276831 : during #i105806# FillPropertySet: do not attempt to set *AutoStyleName if it doesn't exist
2009-10-12 11:24:44 +0000 fs r276830 : #i105806# getPropertyValue: throw an UnknownPropertyException for, well, unknown properties
2009-10-08 08:20:58 +0000 fs r276774 : implSubmit: re-throw WrappedTargetExceptions unmodified
2009-10-07 19:19:42 +0000 fs r276770 : #i105198# do not pass an CommandType if we do not have a command
2009-10-07 17:39:36 +0000 fs r276768 : export the OWeakObject::disposeWeakConnectionPoint symbol
2009-10-07 12:59:17 +0000 fs r276754 : #i87693#
2009-10-07 11:19:22 +0000 fs r276752 : #i10000#
2009-10-07 10:21:08 +0000 fs r276748 : #105482# do not require a controller, at least not in *all* circumstances (executed reports have a model, the ReportDefinition, but no Controller)
2009-10-07 10:04:08 +0000 fs r276747 : copying the changes from CWS fwk121 herein, in particular the fix for
issue #i105371#
2009-10-07 09:58:30 +0000 fs r276746 : copying the changes from CWS fwk121 herein, in particular the fix for
issue #i105371#
2009-10-07 09:48:14 +0000 fs r276744 : removed (now) pointless assertion
2009-10-07 06:59:19 +0000 fs r276740 : export the OWeakObject::disposeWeakConnectionPoint symbol
2009-10-07 06:44:43 +0000 fs r276739 : OComponentHelper::release & WeakAggComponentImplHelperBase::release:
when our ref count drops to 0, call OWeakObject's disposeWeakConnectionPoint before (temporarily) incrementing
the ref count, again. This ensures that our adapter cannot create references to the dying object anymore.
(A complex test case in dbaccess (#i105505#) triggered such a situation, but in another class using an analogous
release/dispose/destroy pattern, namely WeakComponentImplHelperBase)
2009-10-07 06:37:20 +0000 fs r276738 : found during some new complex test cases: call disposeWeakConnectionPoint before actually starting to destroy the object, this ensures no other threads will resurrect it while it is dying
2009-10-06 21:58:24 +0000 fs r276734 : oops, two small corrections to the previous fix (hey, complex test cases are cool)
2009-10-06 21:51:16 +0000 fs r276733 : log the name of the data source which cannot be revoked
2009-10-06 21:50:41 +0000 fs r276732 : more detailed error message when cleanup fails
2009-10-06 21:50:01 +0000 fs r276731 : reworked the ModelImpl caching. The new and improved UNO API test for css.sdb.RowSet
revealed some inconsistencies, in whether the objects are cached by their URL, or by their
registration name. This has been changed to caching by registration name.
2009-10-06 13:50:34 +0000 fs r276714 : print diagnostics when we cannot clean up the test case
2009-10-06 13:45:02 +0000 fs r276713 : this test failed all the time, since the core (rightfully) threw an exception. Disabled it for the moment, until issue 84253 is fixed
2009-10-06 12:52:46 +0000 fs r276711 : rewrote this test. Now we do not re-use the same .odb across different test cases, as this leads to unreliable
(timing-dependent) results/failures. Instead, every test sets up a new odb file.
Also, did some re-factoring, improved the cleanup code, and caught a few more errors.
2009-10-06 12:51:07 +0000 fs r276710 : DBTools taking a logger now
2009-10-06 12:50:42 +0000 fs r276709 : taking a PrintWriter for logging purpose
2009-10-06 12:50:03 +0000 fs r276708 : DBTools taking a logger now
2009-10-06 12:49:22 +0000 fs r276707 : typo
2009-10-06 12:49:03 +0000 fs r276706 : typo
2009-10-06 12:48:52 +0000 fs r276705 : wrappers around some database-related services - initial versions only, to evolve over time, and intended to finally replace the DBTools class
2009-10-06 12:48:02 +0000 fs r276704 : typo
2009-10-06 12:38:42 +0000 fs r276702 : some better diagnostics, done during getting the API tests to work more reliably
2009-10-06 10:35:51 +0000 fs r276698 : when living in, e.g., the DataSourceBrowser, we can't expect to find an XModifiable2, so don't assert its existence
2009-10-05 12:47:52 +0000 oj r276677 : #i105607# check for read moved into if scope
2009-10-05 11:37:06 +0000 fs r276676 : when saving a file fails, retrieve the error message from the InteractionRequestStringResolver - this is better than any generic message we can create
2009-10-05 10:04:23 +0000 oj r276673 : #i105607# check for read moved into if scope
2009-10-05 09:46:17 +0000 fs r276671 : #i10000#
2009-10-05 08:43:58 +0000 fs r276664 : #i105505#
release: dispose the (base classes) weak connection point before disposing ourself,
and in particular before temporarily incrementing our ref count, again.
This way, we prevent that a separate thread re-surrects us (using the weak connection
point's queryAdapted) while we're in the process of destruction
2009-10-05 08:41:49 +0000 fs r276663 : #i105505# +disposeWeakConnectionPoint (outsourced into dedicated method from ::release)
2009-10-05 08:40:26 +0000 fs r276662 : no need to derived from OSubComponent, its features are not used, directly derive from WeakComponentImplFoo instead
2009-10-05 08:39:38 +0000 fs r276661 : #i105505# diagnostics
2009-10-05 08:39:16 +0000 fs r276660 : #i105505# +testDocumentRevenants
2009-10-05 08:36:01 +0000 fs r276659 : #i105560# reverted the removal of GenericController::openHelpAgent - this is needed in module reportdesign
2009-10-04 19:53:30 +0000 fs r276657 : #105560#
remove unused code
thanks to cmc@openoffice.org for submitting the patch
2009-10-04 19:50:28 +0000 fs r276656 : #i105550# remove unused 'fire' method (thanks to cmc)
2009-10-03 16:13:15 +0000 fs r276655 : CWS-TOOLING: rebase CWS dba33a to trunk@276429 (milestone: DEV300:m60)
2009-10-02 19:20:48 +0000 fs r276651 : #i104117# lotta changed IDs ...
2009-10-02 10:52:24 +0000 fs r276634 : #i105505#
If a model is created, and is a revenant of a previous incarnation, then ensure it is properly initialized.
In particular, in its ctor, set the state to "Initializing", not "Initialized", and then let the ModelImpl
call attachResource. This ensures that the model is initialized completely, including firing the necessary
events.
2009-10-02 10:51:08 +0000 fs r276633 : #i105505# always do an attachResource at the newly loaded model, even if it (internally) was not really loaded, but only a revenant of a previous incarnation of this document
2009-10-01 11:10:13 +0000 fs r276597 : do not rely on the name 'Standard' for the one and only form in a document
2009-10-01 10:36:29 +0000 fs r276590 : #i105509# don't rely on default form component names, use indexes
2009-10-01 09:12:20 +0000 fs r276582 : #i105505#
2009-09-30 07:55:21 +0000 fs r276542 : removed some unsed methods / spared some unnecessary pixel<->logic conversion
2009-09-30 07:53:22 +0000 fs r276541 : removed unneeded methods
2009-09-30 06:35:59 +0000 fs r276538 : #i10000#
2009-09-29 13:45:02 +0000 fs r276531 : refactored the Roadmap* classes, to be able to fix above-mentioned #i105113#
2009-09-29 10:27:10 +0000 fs r276520 : #i105367#
2009-09-29 08:46:45 +0000 fs r276510 : #i104956# cleaned up the makefiles
2009-09-28 21:00:07 +0000 fs r276505 : #i104117# sourced those IDs out from extension.hrc
2009-09-28 20:59:05 +0000 fs r276504 : no need to let one FREE...
2009-09-28 20:53:36 +0000 fs r276503 : #i104117#
cleaned up the mess with help IDs in module extensions.
Formerly, extensions used to use help IDs which were declared in module svx, and vice versa.
Also, help ID ranges were not respected.
2009-09-28 11:25:36 +0000 fs r276489 : typo
2009-09-28 11:25:10 +0000 fs r276488 : #i105235#
2009-09-24 11:53:16 +0000 fs r276423 : #i105234# do not zoom the control when they view information is still uninitialized (happens at least in Writer when opening a form document)
2009-09-24 09:42:28 +0000 fs r276415 : #i105234# proper zoom handling for the nav bar
2009-09-24 09:42:19 +0000 fs r276414 : #i105234# setZoom: care for precision errors caused by implicit conversion float->double
2009-09-16 11:11:43 +0000 fs r276195 : #i105082#
consolidated the sub storage handling, by delegating more functionality into
the DocumentStorageAccess class. As a result, there won't be that many unnecessary
commits anymore. Also, the two different storage caches (in ModelImpl::m_aStorages
and DocumentStorageAccess::m_aExposedStorages) have been consolidated.
This is not really part of the fix of issue 105082, but it helped reducing the
calls to the storage/package implementation.
2009-09-15 21:42:27 +0000 fs r276190 : don't calculate space for BOLD if the text is not really bold (speeds up rendering for large tree structures)
2009-09-15 20:20:23 +0000 fs r276188 : getTypeInfo: fill m_aTypeInfoRows only if really all type infos could be retrieved
2009-09-15 20:19:29 +0000 fs r276187 : do not continue loading when the controller initialization throws an error
2009-09-14 12:25:57 +0000 fs r276119 : oops, this patch was not intended for this CWS
2009-09-14 12:13:57 +0000 fs r276114 : #cr6875455# introduce a ReferenceDevice property for various control models
2009-09-14 10:33:02 +0000 fs r276106 : removed dead file
2009-09-09 08:37:31 +0000 fs r275972 : remove OSL_TRACE in VCLXButton dtor
2009-09-08 11:19:17 +0000 oj r275926 : i76534# remove mnemonic from fixed text
2009-09-07 08:39:37 +0000 fs r275874 : create CWS dba33a from cws/dba32g@275857 (CWS: dba32g)
2009-11-27 06:39:32 -06:00
|
|
|
void OWeakObject::disposeWeakConnectionPoint()
|
|
|
|
{
|
|
|
|
OSL_PRECOND( m_refCount == 0, "OWeakObject::disposeWeakConnectionPoint: only to be called with a ref count of 0!" );
|
|
|
|
if (m_pWeakConnectionPoint != 0) {
|
|
|
|
OWeakConnectionPoint * const p = m_pWeakConnectionPoint;
|
|
|
|
m_pWeakConnectionPoint = 0;
|
|
|
|
try {
|
|
|
|
p->dispose();
|
|
|
|
}
|
|
|
|
catch (RuntimeException const& exc) {
|
|
|
|
OSL_ENSURE(
|
|
|
|
false, OUStringToOString(
|
|
|
|
exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
|
|
|
|
static_cast<void>(exc);
|
|
|
|
}
|
|
|
|
p->release();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-11-09 06:49:16 -06:00
|
|
|
OWeakObject::~OWeakObject() SAL_THROW( (RuntimeException) )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
// XWeak
|
2001-02-14 03:17:32 -06:00
|
|
|
Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter()
|
|
|
|
throw (::com::sun::star::uno::RuntimeException)
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
|
|
|
if (!m_pWeakConnectionPoint)
|
|
|
|
{
|
|
|
|
// only acquire mutex if member is not created
|
|
|
|
MutexGuard aGuard( getWeakMutex() );
|
|
|
|
if( !m_pWeakConnectionPoint )
|
|
|
|
{
|
|
|
|
OWeakConnectionPoint * p = new OWeakConnectionPoint(this);
|
|
|
|
p->acquire();
|
|
|
|
m_pWeakConnectionPoint = p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return m_pWeakConnectionPoint;
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
//-- OWeakAggObject ----------------------------------------------------
|
|
|
|
//------------------------------------------------------------------------
|
2001-11-09 06:49:16 -06:00
|
|
|
OWeakAggObject::~OWeakAggObject() SAL_THROW( (RuntimeException) )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
void OWeakAggObject::acquire() throw()
|
|
|
|
{
|
|
|
|
Reference<XInterface > x( xDelegator );
|
|
|
|
if (x.is())
|
|
|
|
x->acquire();
|
|
|
|
else
|
|
|
|
OWeakObject::acquire();
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
void OWeakAggObject::release() throw()
|
|
|
|
{
|
|
|
|
Reference<XInterface > x( xDelegator );
|
|
|
|
if (x.is())
|
|
|
|
x->release();
|
|
|
|
else
|
|
|
|
OWeakObject::release();
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
Any OWeakAggObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
Reference< XInterface > x( xDelegator ); // harden ref
|
|
|
|
return (x.is() ? x->queryInterface( rType ) : queryAggregation( rType ));
|
|
|
|
}
|
|
|
|
|
|
|
|
// XAggregation
|
|
|
|
Any OWeakAggObject::queryAggregation( const Type & rType ) throw(::com::sun::star::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
return ::cppu::queryInterface(
|
|
|
|
rType,
|
|
|
|
static_cast< XInterface * >( static_cast< OWeakObject * >( this ) ),
|
|
|
|
static_cast< XAggregation * >( this ),
|
|
|
|
static_cast< XWeak * >( this ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
// XAggregation
|
|
|
|
void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator ) throw(::com::sun::star::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
xDelegator = rDelegator;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/** */ //for docpp
|
|
|
|
namespace com
|
|
|
|
{
|
|
|
|
/** */ //for docpp
|
|
|
|
namespace sun
|
|
|
|
{
|
|
|
|
/** */ //for docpp
|
|
|
|
namespace star
|
|
|
|
{
|
|
|
|
/** */ //for docpp
|
|
|
|
namespace uno
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
//-- OWeakRefListener -----------------------------------------------------
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
class OWeakRefListener : public XReference
|
|
|
|
{
|
|
|
|
public:
|
2001-03-09 05:15:28 -06:00
|
|
|
OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () );
|
|
|
|
OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () );
|
2006-06-19 04:35:43 -05:00
|
|
|
virtual ~OWeakRefListener() SAL_THROW( () );
|
2000-09-18 09:29:57 -05:00
|
|
|
|
|
|
|
// XInterface
|
2001-03-09 05:15:28 -06:00
|
|
|
Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException);
|
2000-09-18 09:29:57 -05:00
|
|
|
void SAL_CALL acquire() throw();
|
|
|
|
void SAL_CALL release() throw();
|
|
|
|
|
|
|
|
// XReference
|
|
|
|
void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
|
|
|
|
|
|
|
|
/// The reference counter.
|
|
|
|
oslInterlockedCount m_aRefCount;
|
|
|
|
/// The connection point of the weak object
|
|
|
|
Reference< XAdapter > m_XWeakConnectionPoint;
|
|
|
|
|
|
|
|
private:
|
2001-03-09 05:15:28 -06:00
|
|
|
OWeakRefListener& SAL_CALL operator=(const OWeakRefListener& rRef) SAL_THROW( () );
|
2000-09-18 09:29:57 -05:00
|
|
|
};
|
|
|
|
|
2001-03-09 05:15:28 -06:00
|
|
|
OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () )
|
2006-06-19 04:35:43 -05:00
|
|
|
: com::sun::star::uno::XReference()
|
|
|
|
, m_aRefCount( 1 )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
2002-03-13 02:47:37 -06:00
|
|
|
try
|
|
|
|
{
|
2000-09-18 09:29:57 -05:00
|
|
|
m_XWeakConnectionPoint = rRef.m_XWeakConnectionPoint;
|
|
|
|
|
|
|
|
if (m_XWeakConnectionPoint.is())
|
2003-03-19 10:23:42 -06:00
|
|
|
{
|
2000-09-18 09:29:57 -05:00
|
|
|
m_XWeakConnectionPoint->addReference((XReference*)this);
|
2002-03-13 02:47:37 -06:00
|
|
|
}
|
2003-03-19 10:23:42 -06:00
|
|
|
}
|
2002-03-13 02:47:37 -06:00
|
|
|
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
|
2003-03-19 10:23:42 -06:00
|
|
|
osl_decrementInterlockedCount( &m_aRefCount );
|
2000-09-18 09:29:57 -05:00
|
|
|
}
|
|
|
|
|
2001-03-09 05:15:28 -06:00
|
|
|
OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () )
|
2003-03-19 10:23:42 -06:00
|
|
|
: m_aRefCount( 1 )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
2002-03-13 02:47:37 -06:00
|
|
|
try
|
|
|
|
{
|
2000-09-18 09:29:57 -05:00
|
|
|
Reference< XWeak > xWeak( Reference< XWeak >::query( xInt ) );
|
|
|
|
|
|
|
|
if (xWeak.is())
|
|
|
|
{
|
|
|
|
m_XWeakConnectionPoint = xWeak->queryAdapter();
|
|
|
|
|
|
|
|
if (m_XWeakConnectionPoint.is())
|
|
|
|
{
|
|
|
|
m_XWeakConnectionPoint->addReference((XReference*)this);
|
|
|
|
}
|
|
|
|
}
|
2002-03-13 02:47:37 -06:00
|
|
|
}
|
|
|
|
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
|
2003-03-19 10:23:42 -06:00
|
|
|
osl_decrementInterlockedCount( &m_aRefCount );
|
2000-09-18 09:29:57 -05:00
|
|
|
}
|
|
|
|
|
2001-03-09 05:15:28 -06:00
|
|
|
OWeakRefListener::~OWeakRefListener() SAL_THROW( () )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
2002-03-13 02:47:37 -06:00
|
|
|
try
|
|
|
|
{
|
2000-09-18 09:29:57 -05:00
|
|
|
if (m_XWeakConnectionPoint.is())
|
2003-03-19 10:23:42 -06:00
|
|
|
{
|
|
|
|
acquire(); // dont die again
|
2000-09-18 09:29:57 -05:00
|
|
|
m_XWeakConnectionPoint->removeReference((XReference*)this);
|
2002-03-13 02:47:37 -06:00
|
|
|
}
|
2003-03-19 10:23:42 -06:00
|
|
|
}
|
2002-03-13 02:47:37 -06:00
|
|
|
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
|
2000-09-18 09:29:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
2001-03-09 05:15:28 -06:00
|
|
|
Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType ) throw(RuntimeException)
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
|
|
|
return ::cppu::queryInterface(
|
|
|
|
rType, static_cast< XReference * >( this ), static_cast< XInterface * >( this ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
void SAL_CALL OWeakRefListener::acquire() throw()
|
|
|
|
{
|
|
|
|
osl_incrementInterlockedCount( &m_aRefCount );
|
|
|
|
}
|
|
|
|
|
|
|
|
// XInterface
|
|
|
|
void SAL_CALL OWeakRefListener::release() throw()
|
|
|
|
{
|
|
|
|
if( ! osl_decrementInterlockedCount( &m_aRefCount ) )
|
|
|
|
delete this;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SAL_CALL OWeakRefListener::dispose()
|
|
|
|
throw(::com::sun::star::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
Reference< XAdapter > xAdp;
|
|
|
|
{
|
|
|
|
MutexGuard guard(cppu::getWeakMutex());
|
|
|
|
if( m_XWeakConnectionPoint.is() )
|
|
|
|
{
|
|
|
|
xAdp = m_XWeakConnectionPoint;
|
|
|
|
m_XWeakConnectionPoint.clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( xAdp.is() )
|
|
|
|
xAdp->removeReference((XReference*)this);
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
//-- WeakReferenceHelper ----------------------------------------------------------
|
|
|
|
//------------------------------------------------------------------------
|
2001-03-09 05:15:28 -06:00
|
|
|
WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SAL_THROW( () )
|
2000-12-06 09:48:11 -06:00
|
|
|
: m_pImpl( 0 )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
2000-12-06 09:48:11 -06:00
|
|
|
if (xInt.is())
|
|
|
|
{
|
|
|
|
m_pImpl = new OWeakRefListener(xInt);
|
|
|
|
m_pImpl->acquire();
|
|
|
|
}
|
2000-09-18 09:29:57 -05:00
|
|
|
}
|
|
|
|
|
2001-03-09 05:15:28 -06:00
|
|
|
WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SAL_THROW( () )
|
2000-12-06 09:48:11 -06:00
|
|
|
: m_pImpl( 0 )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
2000-12-06 09:48:11 -06:00
|
|
|
Reference< XInterface > xInt( rWeakRef.get() );
|
|
|
|
if (xInt.is())
|
|
|
|
{
|
|
|
|
m_pImpl = new OWeakRefListener(xInt);
|
2000-09-18 09:29:57 -05:00
|
|
|
m_pImpl->acquire();
|
2000-12-06 09:48:11 -06:00
|
|
|
}
|
2000-09-18 09:29:57 -05:00
|
|
|
}
|
|
|
|
|
2010-01-13 10:55:09 -06:00
|
|
|
void WeakReferenceHelper::clear() SAL_THROW( () )
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
if (m_pImpl)
|
|
|
|
{
|
|
|
|
if (m_pImpl->m_XWeakConnectionPoint.is())
|
|
|
|
{
|
|
|
|
m_pImpl->m_XWeakConnectionPoint->removeReference(
|
|
|
|
(XReference*)m_pImpl);
|
|
|
|
m_pImpl->m_XWeakConnectionPoint.clear();
|
|
|
|
}
|
|
|
|
m_pImpl->release();
|
|
|
|
m_pImpl = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
|
|
|
|
}
|
|
|
|
|
2001-03-09 05:15:28 -06:00
|
|
|
WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW( () )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
2010-01-08 15:22:08 -06:00
|
|
|
if (this == &rWeakRef)
|
2002-03-13 02:47:37 -06:00
|
|
|
{
|
2010-01-08 15:22:08 -06:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
Reference< XInterface > xInt( rWeakRef.get() );
|
|
|
|
return operator = ( xInt );
|
|
|
|
}
|
|
|
|
|
|
|
|
WeakReferenceHelper & SAL_CALL
|
|
|
|
WeakReferenceHelper::operator= (const Reference< XInterface > & xInt)
|
|
|
|
SAL_THROW( () )
|
|
|
|
{
|
|
|
|
try
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
2010-01-13 10:55:09 -06:00
|
|
|
clear();
|
2000-12-06 09:48:11 -06:00
|
|
|
if (xInt.is())
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
2000-12-06 09:48:11 -06:00
|
|
|
m_pImpl = new OWeakRefListener(xInt);
|
2000-09-18 09:29:57 -05:00
|
|
|
m_pImpl->acquire();
|
|
|
|
}
|
|
|
|
}
|
2002-03-13 02:47:37 -06:00
|
|
|
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
|
2000-09-18 09:29:57 -05:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2001-03-09 05:15:28 -06:00
|
|
|
WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW( () )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
2010-01-13 10:55:09 -06:00
|
|
|
clear();
|
2000-09-18 09:29:57 -05:00
|
|
|
}
|
|
|
|
|
2001-03-09 05:15:28 -06:00
|
|
|
Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () )
|
2000-09-18 09:29:57 -05:00
|
|
|
{
|
2002-03-13 02:47:37 -06:00
|
|
|
try
|
|
|
|
{
|
2000-09-18 09:29:57 -05:00
|
|
|
Reference< XAdapter > xAdp;
|
|
|
|
{
|
|
|
|
MutexGuard guard(cppu::getWeakMutex());
|
|
|
|
if( m_pImpl && m_pImpl->m_XWeakConnectionPoint.is() )
|
|
|
|
xAdp = m_pImpl->m_XWeakConnectionPoint;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xAdp.is())
|
|
|
|
return xAdp->queryAdapted();
|
2002-03-13 02:47:37 -06:00
|
|
|
}
|
|
|
|
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
|
2000-09-18 09:29:57 -05:00
|
|
|
|
|
|
|
return Reference< XInterface >();
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-14 01:30:07 -05:00
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|