include/sfx2/sfxbasemodel.hxx | 6 +++--- include/sfx2/sidebar/EnumContext.hxx | 4 ++-- sfx2/source/notify/globalevents.cxx | 22 +++++++++++----------- sfx2/source/sidebar/EnumContext.cxx | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-)
New commits: commit 6a37ea928d2c0ef9dd7fd7031b3e4e6341a162e2 Author: Stephan Bergmann <[email protected]> Date: Wed Apr 6 19:25:20 2016 +0200 Avoid reserved identifiers Change-Id: I57d2efee3e89a2793d0b9620c894a14f8970f284 diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 638d9e8..8e678ca 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -586,9 +586,9 @@ public: // XDocumentEventBroadcaster - virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XUnoTunnel diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index 960890d..0711b66 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -105,9 +105,9 @@ public: throw(css::uno::RuntimeException, std::exception) override; // css.document.XDocumentEventBroadcaster - virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // css.document.XEventListener virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) @@ -202,17 +202,17 @@ void SAL_CALL SfxGlobalEvents_Impl::removeEventListener(const uno::Reference< do } -void SAL_CALL SfxGlobalEvents_Impl::addDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& _Listener ) +void SAL_CALL SfxGlobalEvents_Impl::addDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& Listener ) throw(uno::RuntimeException, std::exception) { - m_aDocumentListeners.addInterface( _Listener ); + m_aDocumentListeners.addInterface( Listener ); } -void SAL_CALL SfxGlobalEvents_Impl::removeDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& _Listener ) +void SAL_CALL SfxGlobalEvents_Impl::removeDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& Listener ) throw(uno::RuntimeException, std::exception) { - m_aDocumentListeners.removeInterface( _Listener ); + m_aDocumentListeners.removeInterface( Listener ); } @@ -235,12 +235,12 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const document::EventObject& aEv } -void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const document::DocumentEvent& _Event ) +void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const document::DocumentEvent& Event ) throw (uno::RuntimeException, std::exception) { - implts_notifyJobExecution(document::EventObject(_Event.Source, _Event.EventName)); - implts_checkAndExecuteEventBindings(_Event); - implts_notifyListener(_Event); + implts_notifyJobExecution(document::EventObject(Event.Source, Event.EventName)); + implts_checkAndExecuteEventBindings(Event); + implts_notifyListener(Event); } commit f5b325a748f388bb9283a4dcd16d13670b40aa6f Author: Stephan Bergmann <[email protected]> Date: Wed Apr 6 19:25:04 2016 +0200 Avoid reserved identifiers Change-Id: I3f077d9937a86b362942173e787dd7cc65a0bbce diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx index 080a818..2dfa5a2 100644 --- a/include/sfx2/sidebar/EnumContext.hxx +++ b/include/sfx2/sidebar/EnumContext.hxx @@ -59,7 +59,7 @@ public: // wish to disable a deck or panel during debugging. Application_None, - __LastApplicationEnum = Application_None + LastApplicationEnum = Application_None }; enum Context { @@ -107,7 +107,7 @@ public: Context_Unknown, - __LastContextEnum = Context_Unknown + LastContextEnum = Context_Unknown }; EnumContext(); diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx index c44e434..281e63f 100644 --- a/sfx2/source/sidebar/EnumContext.cxx +++ b/sfx2/source/sidebar/EnumContext.cxx @@ -104,7 +104,7 @@ bool EnumContext::operator!= (const EnumContext& rOther) void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eApplication) { maApplicationMap[rsName] = eApplication; - OSL_ASSERT(eApplication<=__LastApplicationEnum); + OSL_ASSERT(eApplication<=LastApplicationEnum); if (maApplicationVector.size() <= size_t(eApplication)) maApplicationVector.resize(eApplication+1); maApplicationVector[eApplication]=rsName; @@ -114,7 +114,7 @@ void EnumContext::ProvideApplicationContainers() { if (maApplicationMap.empty()) { - maApplicationVector.resize(static_cast<size_t>(EnumContext::__LastApplicationEnum)+1); + maApplicationVector.resize(static_cast<size_t>(EnumContext::LastApplicationEnum)+1); AddEntry("com.sun.star.text.TextDocument", EnumContext::Application_Writer); AddEntry("com.sun.star.text.GlobalDocument", EnumContext::Application_WriterGlobal); AddEntry("com.sun.star.text.WebDocument", EnumContext::Application_WriterWeb); @@ -148,7 +148,7 @@ const ::rtl::OUString& EnumContext::GetApplicationName (const Application eAppli ProvideApplicationContainers(); const sal_Int32 nIndex (eApplication); - if (nIndex<0 || nIndex>= __LastApplicationEnum) + if (nIndex<0 || nIndex>= LastApplicationEnum) return maApplicationVector[Application_None]; else return maApplicationVector[nIndex]; @@ -157,7 +157,7 @@ const ::rtl::OUString& EnumContext::GetApplicationName (const Application eAppli void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Context eApplication) { maContextMap[rsName] = eApplication; - OSL_ASSERT(eApplication<=__LastContextEnum); + OSL_ASSERT(eApplication<=LastContextEnum); if (maContextVector.size() <= size_t(eApplication)) maContextVector.resize(eApplication+1); maContextVector[eApplication] = rsName; @@ -167,7 +167,7 @@ void EnumContext::ProvideContextContainers() { if (maContextMap.empty()) { - maContextVector.resize(static_cast<size_t>(__LastContextEnum)+1); + maContextVector.resize(static_cast<size_t>(LastContextEnum)+1); AddEntry("any", Context_Any); AddEntry("default", Context_Default); AddEntry("empty", Context_Empty); @@ -221,7 +221,7 @@ const ::rtl::OUString& EnumContext::GetContextName (const Context eContext) ProvideContextContainers(); const sal_Int32 nIndex (eContext); - if (nIndex<0 || nIndex>= __LastContextEnum) + if (nIndex<0 || nIndex>= LastContextEnum) return maContextVector[Context_Unknown]; else return maContextVector[nIndex]; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
