[Libreoffice-commits] core.git: 8 commits - basctl/source basic/source dbaccess/source framework/inc framework/source include/comphelper include/framework include/svx sd/source svx/source sw/source
Stephan Bergmann
sbergman at redhat.com
Wed Apr 22 06:43:46 PDT 2015
basctl/source/basicide/scriptdocument.cxx | 1
basic/source/classes/sbxmod.cxx | 12 ++++----
dbaccess/source/core/dataaccess/datasource.cxx | 1
dbaccess/source/core/dataaccess/intercept.cxx | 12 ++++----
dbaccess/source/core/dataaccess/intercept.hxx | 8 ++---
framework/inc/helper/mischelper.hxx | 16 +++++------
framework/source/fwe/helper/titlehelper.cxx | 8 ++---
framework/source/services/autorecovery.cxx | 20 +++++++-------
include/comphelper/evtlistenerhlp.hxx | 2 -
include/framework/titlehelper.hxx | 8 ++---
include/svx/AccessibleShapeTreeInfo.hxx | 12 --------
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2 -
svx/source/accessibility/AccessibleShapeTreeInfo.cxx | 20 --------------
sw/source/core/access/accmap.cxx | 4 +-
14 files changed, 46 insertions(+), 80 deletions(-)
New commits:
commit 5dc81ae20145d66019d3853e033514a9b1bc9c57
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 22 15:22:13 2015 +0200
Remove some deprecated AccessibleShapeTreeInfo member functions
Change-Id: I3cdf1cb2feef1cd107b4d554679038eeb5003898
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx
index d7dc02c..65aae3b 100644
--- a/include/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
@@ -76,18 +76,6 @@ public:
::com::sun::star::accessibility::XAccessibleComponent>
GetDocumentWindow() const { return mxDocumentWindow;}
- /** Deprecated. Use the correctly named SetModelBroadcaster method
- instead.
- */
- void SetControllerBroadcaster (const ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XEventBroadcaster>& rxControllerBroadcaster);
- /** Deprecated. Use the correctly named GetModelBroadcaster method
- instead.
- */
- ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XEventBroadcaster>
- GetControllerBroadcaster() const { return mxModelBroadcaster;}
-
/** Set a new broadcaster that sends events indicating shape changes.
The broadcaster usually is or belongs to a document model.
@param rxModelBroadcaster
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 00dd5f9..f21dfdb 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -516,7 +516,7 @@ void AccessibleDocumentViewBase::impl_dispose()
}
// Propagate change of controller down the shape tree.
- maShapeTreeInfo.SetControllerBroadcaster (NULL);
+ maShapeTreeInfo.SetModelBroadcaster (NULL);
// Reset the model reference.
mxModel = NULL;
diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
index 89476a4..5b8d23a 100644
--- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
@@ -83,26 +83,6 @@ void AccessibleShapeTreeInfo::SetDocumentWindow (
mxDocumentWindow = rxDocumentWindow;
}
-
-
-
-
-
-
-
-void AccessibleShapeTreeInfo::SetControllerBroadcaster (
- const uno::Reference<document::XEventBroadcaster>& rxControllerBroadcaster)
-{
- mxModelBroadcaster = rxControllerBroadcaster;
-}
-
-
-
-
-
-
-
-
void AccessibleShapeTreeInfo::SetModelBroadcaster (
const Reference<document::XEventBroadcaster>& rxModelBroadcaster)
{
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index af55bef..7ebdc99 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -244,7 +244,7 @@ public:
uno::Reference < document::XEventBroadcaster > xModelBroadcaster =
new SwDrawModellListener_Impl(
pMap->GetShell()->getIDocumentDrawModelAccess()->GetOrCreateDrawModel() );
- maInfo.SetControllerBroadcaster( xModelBroadcaster );
+ maInfo.SetModelBroadcaster( xModelBroadcaster );
}
~SwAccessibleShapeMap_Impl();
@@ -267,7 +267,7 @@ public:
SwAccessibleShapeMap_Impl::~SwAccessibleShapeMap_Impl()
{
- uno::Reference < document::XEventBroadcaster > xBrd( maInfo.GetControllerBroadcaster() );
+ uno::Reference < document::XEventBroadcaster > xBrd( maInfo.GetModelBroadcaster() );
if( xBrd.is() )
static_cast < SwDrawModellListener_Impl * >( xBrd.get() )->Dispose();
}
commit afa58a03bc5d5c1055aa74c434701fdec6fb2357
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 22 15:12:45 2015 +0200
Fix comment
Change-Id: I29b3d3e4e9261200b9fedace0c43f4f09d3ac129
diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx
index 9b04f7c..bc0720f 100644
--- a/include/comphelper/evtlistenerhlp.hxx
+++ b/include/comphelper/evtlistenerhlp.hxx
@@ -33,7 +33,7 @@ namespace comphelper
//= OCommandsListener
// is helper class to avoid a cycle in refcount between the XEventListener
- // and the member XEventBroadcaster
+ // and the member XComponent
class COMPHELPER_DLLPUBLIC OEventListenerHelper : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
{
commit 79e0e713f798718902fed9740f147ce143bf7b76
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 22 15:05:17 2015 +0200
Update to XDocumentEventBroadcaster et al
Change-Id: I11633dc1629eac6a1ba79e4b45972a1e4f5fc833
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 6868237..6aa0015 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
+#include <com/sun/star/document/XDocumentEventListener.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/util/XChangesListener.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
@@ -267,13 +267,13 @@ class WeakEventListener : public ::cppu::WeakImplHelper1<com::sun::star::lang::X
}
};
-class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star::document::XEventListener>
+class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star::document::XDocumentEventListener>
{
private:
- com::sun::star::uno::WeakReference<com::sun::star::document::XEventListener> mxOwner;
+ com::sun::star::uno::WeakReference<com::sun::star::document::XDocumentEventListener> mxOwner;
public:
- WeakDocumentEventListener(com::sun::star::uno::Reference<com::sun::star::document::XEventListener> xOwner)
+ WeakDocumentEventListener(com::sun::star::uno::Reference<com::sun::star::document::XDocumentEventListener> xOwner)
: mxOwner(xOwner)
{
}
@@ -282,13 +282,13 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star:
{
}
- virtual void SAL_CALL notifyEvent(const com::sun::star::document::EventObject& rEvent)
+ virtual void SAL_CALL documentEventOccured(const com::sun::star::document::DocumentEvent& rEvent)
throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
- com::sun::star::uno::Reference<com::sun::star::document::XEventListener> xOwner(mxOwner.get(),
+ com::sun::star::uno::Reference<com::sun::star::document::XDocumentEventListener> xOwner(mxOwner.get(),
com::sun::star::uno::UNO_QUERY);
if (xOwner.is())
- xOwner->notifyEvent(rEvent);
+ xOwner->documentEventOccured(rEvent);
}
@@ -296,7 +296,7 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star:
virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent)
throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
- com::sun::star::uno::Reference<com::sun::star::document::XEventListener> xOwner(mxOwner.get(),
+ com::sun::star::uno::Reference<com::sun::star::document::XDocumentEventListener> xOwner(mxOwner.get(),
com::sun::star::uno::UNO_QUERY);
if (xOwner.is())
xOwner->disposing(rEvent);
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index c2e8994..31051e5 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -62,8 +62,8 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/document/XDocumentEventListener.hpp>
+#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/util/XChangesListener.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
@@ -162,7 +162,7 @@ public:
typedef ::cppu::WeakComponentImplHelper5<
css::lang::XServiceInfo,
css::frame::XDispatch,
- css::document::XEventListener, // => css.lang.XEventListener
+ css::document::XDocumentEventListener, // => css.lang.XEventListener
css::util::XChangesListener, // => css.lang.XEventListener
css::util::XModifyListener > // => css.lang.XEventListener
AutoRecovery_BASE;
@@ -363,7 +363,7 @@ private:
/** @short proxy weak binding to forward Events to ourself without
an ownership cycle
*/
- css::uno::Reference< css::document::XEventListener > m_xNewDocBroadcasterListener;
+ css::uno::Reference< css::document::XDocumentEventListener > m_xNewDocBroadcasterListener;
/** @short because we stop/restart listening sometimes, it's a good idea to know
if we already registered as listener .-)
@@ -499,7 +499,7 @@ public:
const css::util::URL& aURL )
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // css.document.XEventListener
+ // css.document.XDocumentEventListener
/** @short informs about created/opened documents.
@descr Every new opened/created document will be saved internally
@@ -509,7 +509,7 @@ public:
@param aEvent
points to the new created/opened document.
*/
- virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent)
+ virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// css.util.XChangesListener
@@ -1589,7 +1589,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css:
m_lListener.removeInterface(aURL.Complete, xListener);
}
-void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent)
+void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEvent& aEvent)
throw(css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY);
@@ -2210,7 +2210,7 @@ void AutoRecovery::implts_startListening()
)
{
m_xNewDocBroadcasterListener = new WeakDocumentEventListener(this);
- xBroadcaster->addEventListener(m_xNewDocBroadcasterListener);
+ xBroadcaster->addDocumentEventListener(m_xNewDocBroadcasterListener);
/* SAFE */ {
osl::MutexGuard g2(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
m_bListenForDocEvents = true;
@@ -2221,7 +2221,7 @@ void AutoRecovery::implts_startListening()
void AutoRecovery::implts_stopListening()
{
css::uno::Reference< css::util::XChangesNotifier > xCFG;
- css::uno::Reference< css::document::XEventBroadcaster > xGlobalEventBroadcaster;
+ css::uno::Reference< css::document::XDocumentEventBroadcaster > xGlobalEventBroadcaster;
/* SAFE */ {
osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
// Attention: Dont reset our internal members here too.
@@ -2236,7 +2236,7 @@ void AutoRecovery::implts_stopListening()
(m_bListenForDocEvents )
)
{
- xGlobalEventBroadcaster->removeEventListener(m_xNewDocBroadcasterListener);
+ xGlobalEventBroadcaster->removeDocumentEventListener(m_xNewDocBroadcasterListener);
m_bListenForDocEvents = false;
}
diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx
index 63d86e5..a1653d7 100644
--- a/include/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
+#include <com/sun/star/document/XDocumentEventListener.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/weakref.hxx>
@@ -55,7 +55,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
css::frame::XTitleChangeBroadcaster,
css::frame::XTitleChangeListener ,
css::frame::XFrameActionListener ,
- css::document::XEventListener >
+ css::document::XDocumentEventListener >
{
// interface
@@ -125,8 +125,8 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- /** @see css.document.XEventListener */
- virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent)
+ /** @see css.document.XDocumentEventListener */
+ virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
commit ba150afb07c942d6d87a3b4d7e6535229d9b2013
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 22 14:56:05 2015 +0200
Update to XDocumentEventBroadcaster et al
Change-Id: I27904a961a30042608ae4facae9772d30b86696b
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 4e2cfda..d8c44d3 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/beans/XMaterialHolder.hpp>
#include <unotools/configmgr.hxx>
@@ -166,7 +166,7 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv
impl_updateTitle ();
}
-void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent)
+void SAL_CALL TitleHelper::documentEventOccured(const css::document::DocumentEvent& aEvent)
throw (css::uno::RuntimeException, std::exception)
{
if ( ! aEvent.EventName.equalsIgnoreAsciiCase("OnSaveAsDone")
@@ -562,11 +562,11 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer&)
void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel)
{
- css::uno::Reference< css::document::XEventBroadcaster > xBroadcaster(xModel, css::uno::UNO_QUERY);
+ css::uno::Reference< css::document::XDocumentEventBroadcaster > xBroadcaster(xModel, css::uno::UNO_QUERY);
if ( ! xBroadcaster.is ())
return;
- xBroadcaster->addEventListener (static_cast< css::document::XEventListener* >(this));
+ xBroadcaster->addDocumentEventListener (static_cast< css::document::XDocumentEventListener* >(this));
}
void TitleHelper::impl_startListeningForController (const css::uno::Reference< css::frame::XController >& xController)
commit 252b0c4364690e00b45175693d35eb64a07324b4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 22 14:50:10 2015 +0200
Update to XDocumentEventBroadcaster et al
Change-Id: Idf481726e322067af8730ef1eb1e663a174a6e3e
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 19d9273..96751d7 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -22,7 +22,7 @@
#include "dbastrings.hrc"
#include <com/sun/star/embed/EmbedStates.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <cppuhelper/weak.hxx>
@@ -191,9 +191,9 @@ IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher )
Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(pHelper->aURL, "_self", 0 );
if ( xDispatch.is() )
{
- Reference< ::com::sun::star::document::XEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY);
+ Reference< ::com::sun::star::document::XDocumentEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY);
if ( xEvtB.is() )
- xEvtB->removeEventListener(this);
+ xEvtB->removeDocumentEventListener(this);
Reference< XInterface > xKeepContentHolderAlive( *m_pContentHolder );
xDispatch->dispatch( pHelper->aURL,pHelper->aArguments);
@@ -257,9 +257,9 @@ void SAL_CALL OInterceptor::addStatusListener(
}
m_pStatCL->addInterface(_URL.Complete,Control);
- Reference< ::com::sun::star::document::XEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY);
+ Reference< ::com::sun::star::document::XDocumentEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY);
if ( xEvtB.is() )
- xEvtB->addEventListener(this);
+ xEvtB->addDocumentEventListener(this);
}
else
{
@@ -401,7 +401,7 @@ void SAL_CALL OInterceptor::setMasterDispatchProvider(
m_xMasterDispatchProvider = NewSupplier;
}
-void SAL_CALL OInterceptor::notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL OInterceptor::documentEventOccured( const ::com::sun::star::document::DocumentEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
osl::ResettableMutexGuard _rGuard(m_aMutex);
if ( m_pStatCL && Event.EventName == "OnModifyChanged" )
diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx
index 43490e2..85b6482 100644
--- a/dbaccess/source/core/dataaccess/intercept.hxx
+++ b/dbaccess/source/core/dataaccess/intercept.hxx
@@ -25,7 +25,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XInterceptorInfo.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
+#include <com/sun/star/document/XDocumentEventListener.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include "documentdefinition.hxx"
#include <vcl/svapp.hxx>
@@ -37,7 +37,7 @@ namespace dbaccess
class OInterceptor : public ::cppu::WeakImplHelper4< ::com::sun::star::frame::XDispatchProviderInterceptor,
::com::sun::star::frame::XInterceptorInfo,
::com::sun::star::frame::XDispatch,
- ::com::sun::star::document::XEventListener>
+ ::com::sun::star::document::XDocumentEventListener>
{
DECL_LINK( OnDispatch, void* _aURL );
protected:
@@ -133,8 +133,8 @@ public:
::com::sun::star::uno::RuntimeException, std::exception
) SAL_OVERRIDE;
- // XEventListener
- virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ // XDocumentEventListener
+ virtual void SAL_CALL documentEventOccured( const ::com::sun::star::document::DocumentEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
commit fd42a226246470d5083441b976bbe0017d78fcf2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 22 14:50:00 2015 +0200
Unused #include
Change-Id: I228ba798ccec3f582643734f08ca52e8de3a16df
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index b638765..4b8d579 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/reflection/ProxyFactory.hpp>
commit b87db6a1874f089ac275976d383c4f7fc866d2fc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 22 14:42:23 2015 +0200
Update to XDocumentEventBroadcaster et al
Change-Id: Ie09223824af45e5e214169182a5cd189fd04f6ef
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 8ac5bee..91fac4c 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -51,8 +51,8 @@
#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <com/sun/star/script/vba/VBAScriptEventId.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
+#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
+#include <com/sun/star/document/XDocumentEventListener.hpp>
#ifdef UNX
#include <sys/resource.h>
@@ -2245,7 +2245,7 @@ void SbObjModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
typedef ::cppu::WeakImplHelper3<
awt::XTopWindowListener,
awt::XWindowListener,
- document::XEventListener > FormObjEventListener_BASE;
+ document::XDocumentEventListener > FormObjEventListener_BASE;
class FormObjEventListenerImpl:
public FormObjEventListener_BASE, private boost::noncopyable
@@ -2282,7 +2282,7 @@ public:
{
try
{
- uno::Reference< document::XEventBroadcaster >( mxModel, uno::UNO_QUERY_THROW )->addEventListener( this );
+ uno::Reference< document::XDocumentEventBroadcaster >( mxModel, uno::UNO_QUERY_THROW )->addDocumentEventListener( this );
}
catch(const uno::Exception& ) {}
}
@@ -2317,7 +2317,7 @@ public:
{
try
{
- uno::Reference< document::XEventBroadcaster >( mxModel, uno::UNO_QUERY_THROW )->removeEventListener( this );
+ uno::Reference< document::XDocumentEventBroadcaster >( mxModel, uno::UNO_QUERY_THROW )->removeDocumentEventListener( this );
}
catch(const uno::Exception& ) {}
}
@@ -2427,7 +2427,7 @@ public:
{
}
- virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL documentEventOccured( const document::DocumentEvent& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
{
// early dosposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate"
if( rEvent.EventName == GlobalEventConfig::GetEventName( STR_EVENT_CLOSEDOC ) )
commit 620318cfdd43869808ae61ae52bb735ac1207aa6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 22 14:41:37 2015 +0200
Unused using declaration
Change-Id: I17ed15d857c0887f426fe9e0dfa869752bb4b52f
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index f137d7a..f582e47 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -104,7 +104,6 @@ namespace basctl
using ::com::sun::star::document::XEventListener;
using ::com::sun::star::lang::EventObject;
using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::document::XEventBroadcaster;
using ::com::sun::star::document::XEmbeddedScripts;
using ::com::sun::star::script::ModuleInfo;
using ::com::sun::star::script::vba::XVBACompatibility;
More information about the Libreoffice-commits
mailing list