mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb88 (1.11.10); FILE MERGED

Browse Source 
2008/06/03 15:29:46 sb 1.11.10.1: #i89553 applied patch by cmc
This commit is contained in:
Rüdiger Timm
2008-06-16 12:34:28 +00:00
parent d67c57ffe8
commit cdc16fe0b9
3 changed files with 3 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
configmgr/source/api2/confignotifier.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: confignotifier.cxx,v $ * $RCSfile: confignotifier.cxx,v $
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -156,13 +156,6 @@ void Notifier::addForOne(NodeRef const& aNode, uno::Reference< css::beans::XVeto
} }
// --------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------
void Notifier::add(NodeRef const& aNode, uno::Reference< css::beans::XPropertiesChangeListener > const& xListener) const
{
if (xListener.is())
m_aImpl->add( NodeID(m_pTree->getTree(),aNode), xListener );
}
// ---------------------------------------------------------------------------------------------------
void Notifier::add(NodeRef const& aNode, uno::Reference< css::beans::XPropertiesChangeListener > const& xListener, uno::Sequence<OUString> const& aNames) const void Notifier::add(NodeRef const& aNode, uno::Reference< css::beans::XPropertiesChangeListener > const& xListener, uno::Sequence<OUString> const& aNames) const
{ {
if (xListener.is()) if (xListener.is())
@@ -233,11 +226,6 @@ void Notifier::remove(NodeRef const& aNode, uno::Reference< css::beans::XPropert
// --------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------
// --------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------
DisposeGuardImpl::DisposeGuardImpl(NotifierImpl&) throw()
{
}
// ---------------------------------------------------------------------------------------------------
DisposeGuardImpl::DisposeGuardImpl(Notifier const&) throw() DisposeGuardImpl::DisposeGuardImpl(Notifier const&) throw()
{ {
} }
@@ -246,37 +234,18 @@ DisposeGuardImpl::~DisposeGuardImpl() throw ()
{ {
} }
// --------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------
GuardedNotifier::GuardedNotifier(Notifier const& rNotifier) throw()
: m_aNotifier(rNotifier)
, m_aImpl(rNotifier)
{
}
// ---------------------------------------------------------------------------------------------------
GuardedNotifier::GuardedNotifier(NodeAccess& rNode) throw() GuardedNotifier::GuardedNotifier(NodeAccess& rNode) throw()
: m_aNotifier(rNode.getNotifier()) : m_aNotifier(rNode.getNotifier())
, m_aImpl(m_aNotifier) , m_aImpl(m_aNotifier)
{ {
} }
// --------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------
GuardedNotifier::GuardedNotifier(TreeElement& rTree) throw()
: m_aNotifier(rTree.getNotifier())
, m_aImpl(m_aNotifier)
{
}
// ---------------------------------------------------------------------------------------------------
DisposeGuard::DisposeGuard(NodeAccess& rNode) throw(css::lang::DisposedException) DisposeGuard::DisposeGuard(NodeAccess& rNode) throw(css::lang::DisposedException)
: m_aImpl(rNode.getNotifier()) : m_aImpl(rNode.getNotifier())
{ {
rNode.checkAlive(); rNode.checkAlive();
} }
// ---------------------------------------------------------------------------------------------------
DisposeGuard::DisposeGuard(TreeElement& rTree) throw(css::lang::DisposedException)
: m_aImpl(rTree.getNotifier())
{
rTree.checkAlive();
}
// --------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------
} }
} }

8
configmgr/source/backend/binaryreadhandler.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: binaryreadhandler.cxx,v $ * $RCSfile: binaryreadhandler.cxx,v $
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -262,12 +262,6 @@ namespace configmgr
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void BinaryReadHandler::readString(rtl::OUString &_aString)
SAL_THROW( (io::IOException, uno::RuntimeException) )
{
m_BinaryReader.read (_aString);
}
void BinaryReadHandler::readName(rtl::OUString &_aString) void BinaryReadHandler::readName(rtl::OUString &_aString)
SAL_THROW( (io::IOException, uno::RuntimeException) ) SAL_THROW( (io::IOException, uno::RuntimeException) )
{ {

11
configmgr/source/backend/binarywritehandler.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: binarywritehandler.cxx,v $ * $RCSfile: binarywritehandler.cxx,v $
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -354,15 +354,6 @@ namespace configmgr
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void BinaryWriteHandler::writeType(uno::Type const& _aType)
SAL_THROW( (io::IOException, uno::RuntimeException) )
{
ValueFlags::Type eType = convertTypeToValueType(_aType);
sal_Int8 nValueType = sal_Int8(eType);
m_BinaryWriter.write(nValueType);
}
// -----------------------------------------------------------------------------
void BinaryWriteHandler::writeValueNode(rtl::OUString const& _aName, void BinaryWriteHandler::writeValueNode(rtl::OUString const& _aName,
node::Attributes const& _aAttributes, node::Attributes const& _aAttributes,
uno::Type const& _aType, uno::Type const& _aType,