diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-03-14 10:18:50 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-03-14 10:18:50 +0000 |
commit | d40bcc0beb25620fb95a68b4c974fe5249f37b25 (patch) | |
tree | a69e8176dccad1df594233c4cd8bf8a025f99ac7 /extensions/source | |
parent | 937088e9bafca457b9dd836c537c91006ee9b97c (diff) |
INTEGRATION: CWS pbrwuno (1.3.130); FILE MERGED
2005/11/02 11:43:36 fs 1.3.130.11: #i10000# exception specifications
2005/10/25 11:52:40 fs 1.3.130.10: #i53095# some exception specifications, and some conceptual changes for multiple handlers supporting the same property
2005/10/25 07:13:06 fs 1.3.130.9: #i53095# knitting lose ends (amongst others, make the handlers available as service)
2005/10/24 08:41:38 fs 1.3.130.8: start making the handlers full-fledged components, with using a new infrastructure replacing extensions/source/inc/componentmodule.*
2005/10/13 13:00:58 fs 1.3.130.7: #i53095# introduce an XObjectInspector/Model
2005/10/11 13:28:50 fs 1.3.130.6: #i53095# phase 3:
introduced XPropertyHandler and XObjectInspectorUI
same open issues as in previous phase
(plus probably some more, since not everything is tested, yet :-\)
2005/10/05 06:51:03 fs 1.3.130.5: RESYNC: (1.3-1.4); FILE MERGED
2005/08/18 12:44:26 fs 1.3.130.4: #i53095#, phase 2
moved (nearly) all property handling to dedicated handlers, the controller is
now simply managing a set of handlers
open issues for making the property browser completely generic:
- target page for a property - at the moment, the pbrw uses form-specific
knowledge
- relative position of properties. Again, the pbrw uses the OPropertyInfoService
which is not generic
- isComposeable for a given property. Also OPropertyInfoService-dependent ATM
- help ids of pages and the pbrw as a whole. They're hard-coded at the moment
other open issues:
everything in the code which is tagged with TOD/UNOize. Those are items which
do not immediately hinder phase 3 (real UNOization, i.e. definition of new
UNO interfaces for the handlers, the controller, and so on), but need to be
addressed in phase 4 (knit lose ends)
2005/08/16 05:38:55 fs 1.3.130.3: #i53095# completely moved the handling of actuating properties into dedicated handlers
2005/08/10 15:41:43 fs 1.3.130.2: #i53095#
get rid of nearly all [1] the implementations in OPropertyBrowserController::Clicked,
and move them to a FormComponentHandler
[1] still to migrate:
- browsing for events (needs a dedicated event property handler)
- handling for clicking the button of the Command property - this
is kind of asynchronous, and IPropertyHandler is not yet prepared for this
2005/08/09 13:59:55 fs 1.3.130.1: #i53095# phase 1:
- don't use strings to transver values between controls and introspectee, but Anys
- first version of a dedicated property handler for form-component-related properties
(not yet completed)
known regressions over previous phase:
- handlers for events not yet implemented, thus some assertions
- click handlers for form-component-related properties do not yet work,
thus the browse buttons mostly do not work
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/propctrlr/buttonnavigationhandler.hxx | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx index bfe6c068e..d9cef4af0 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.hxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx @@ -4,9 +4,9 @@ * * $RCSfile: buttonnavigationhandler.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 20:05:21 $ + * last change: $Author: vg $ $Date: 2006-03-14 11:18:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,40 +51,33 @@ namespace pcr //==================================================================== //= ButtonNavigationHandler //==================================================================== + class ButtonNavigationHandler; + typedef HandlerComponentBase< ButtonNavigationHandler > ButtonNavigationHandler_Base; /** a property handler for any virtual string properties */ - class ButtonNavigationHandler : public PropertyHandler + class ButtonNavigationHandler : public ButtonNavigationHandler_Base { public: - // HandlerFactory - inline static IPropertyHandler* Create( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxIntrospectee, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >& _rxTypeConverter - ) - { - return new ButtonNavigationHandler( _rxIntrospectee, _rxTypeConverter ); - } - - static bool isNavigationCapableButton( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxComponent ); - - protected: ButtonNavigationHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxIntrospectee, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >& _rxTypeConverter + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); + static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + + protected: ~ButtonNavigationHandler(); + static bool isNavigationCapableButton( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxComponent ); + protected: - // IPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( PropertyId _nPropId, bool _bLazy = true ) const; - virtual void SAL_CALL setPropertyValue( PropertyId _nPropId, const ::com::sun::star::uno::Any& _rValue ); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( PropertyId _nPropId ) const; + // XPropertyHandler overriables + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables - virtual ::std::vector< ::com::sun::star::beans::Property > - SAL_CALL implDescribeSupportedProperties() const; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > + SAL_CALL doDescribeSupportedProperties() const; }; //........................................................................ |