diff options
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/propctrlr/commoncontrol.hxx | 13 | ||||
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.hxx | 27 | ||||
| -rw-r--r-- | extensions/source/resource/ResourceIndexAccess.cxx | 11 | ||||
| -rw-r--r-- | extensions/source/resource/ResourceIndexAccess.hxx | 2 |
4 files changed, 0 insertions, 53 deletions
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index b74e985a766e..9b06ff02a60d 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -54,10 +54,6 @@ namespace pcr /// sets a ControlHelper instance which some functionality is delegated to inline virtual void setControlHelper( ControlHelper& _rControlHelper ); - - protected: - // Window overridables - inline virtual bool PreNotify( NotifyEvent& rNEvt ); }; @@ -230,15 +226,6 @@ namespace pcr } - template< class WINDOW > - inline bool ControlWindow< WINDOW >::PreNotify( NotifyEvent& rNEvt ) - { - if ( m_pHelper && m_pHelper->handlePreNotify( rNEvt ) ) - return true; - return WindowType::PreNotify( rNEvt ); - } - - //= CommonBehaviourControl - implementation diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 7345543ffd5e..a5940fd71e0a 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -64,36 +64,9 @@ namespace pcr } void SetModifyHdl( const Link<>& _rLink ) { ListBoxType::SetSelectHdl( _rLink ); } - - protected: - bool PreNotify( NotifyEvent& _rNEvt ); }; - template< class LISTBOX_WINDOW > - bool ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::PreNotify( NotifyEvent& _rNEvt ) - { - if ( _rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) - { - const ::KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); - if ( ( pKeyEvent->GetKeyCode().GetModifier() == 0 ) - && ( ( pKeyEvent->GetKeyCode().GetCode() == KEY_PAGEUP ) - || ( pKeyEvent->GetKeyCode().GetCode() == KEY_PAGEDOWN ) - ) - ) - { - if ( !ListBoxType::IsInDropDown() ) - { - // don't give the base class a chance to consume the event, in the property browser, it is - // intended to scroll the complete property page - return ListBoxType::GetParent()->PreNotify( _rNEvt ); - } - } - } - return ListBoxType::PreNotify( _rNEvt ); - } - - //= OTimeControl typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< TimeField > > OTimeControl_Base; diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index 403aaf4b9c99..985d331acf0f 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -87,17 +87,6 @@ ResourceIndexAccess::ResourceIndexAccess(Sequence<Any> const& rArgs, Reference<X : m_pResMgr(GetResMgr(rArgs)) {}; -Reference<XInterface> initResourceIndexAccess(ResourceIndexAccess* pResourceIndexAccess) -{ - Reference<XInterface> xResult(static_cast<cppu::OWeakObject*>(pResourceIndexAccess)); - if(!pResourceIndexAccess->hasElements()) - // xResult does not help the client to analyse the problem - // and will crash on getByIndex calls, better just give back an empty Reference - // so that such ResourceStringIndexAccess instances are never release into the wild - throw RuntimeException("resource manager could not get initialized"); - return xResult; -} - Any SAL_CALL ResourceIndexAccess::getByName(const OUString& aName) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx index 97a6a49c361f..2eabc8460b35 100644 --- a/extensions/source/resource/ResourceIndexAccess.hxx +++ b/extensions/source/resource/ResourceIndexAccess.hxx @@ -50,7 +50,5 @@ namespace extensions { namespace resource }; }} -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> initResourceIndexAccess(::extensions::resource::ResourceIndexAccess*); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |