diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-07-28 16:08:26 +0200 |
---|---|---|
committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-08-02 11:35:57 +0000 |
commit | ed904af8665f6f7590fedd4ad608018f78c686c1 (patch) | |
tree | 2590bb19a2621feed3b2b490a91342a382621d0a /include/toolkit | |
parent | 784cfa382be438240dfc936b7551c5012aada9ae (diff) |
fdo#67235 adapt form control code to time nanosecond API change
Conflicts:
offapi/type_reference/offapi.rdb
Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805
Reviewed-on: https://gerrit.libreoffice.org/5149
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'include/toolkit')
-rw-r--r-- | include/toolkit/awt/vclxwindows.hxx | 20 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrolbase.hxx | 3 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrols.hxx | 20 | ||||
-rw-r--r-- | include/toolkit/helper/property.hxx | 6 |
4 files changed, 26 insertions, 23 deletions
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index f822b0cc0e33..a3a9f1b64d00 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -1019,16 +1019,16 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTimeField - void SAL_CALL setTime( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setMin( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setMax( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setFirst( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setLast( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setTime( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); + sal_Int64 SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setMin( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); + sal_Int64 SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setMax( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); + sal_Int64 SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setFirst( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); + sal_Int64 SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setLast( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); + sal_Int64 SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException); diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index 30f1bf664206..1fa03a8735e7 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -39,9 +39,12 @@ protected: void ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis ); ::com::sun::star::uno::Any ImplGetPropertyValue( const OUString& aPropertyName ); + template <typename T> T ImplGetPropertyValuePOD( sal_uInt16 nProp ); + template <typename T> T ImplGetPropertyValueClass( sal_uInt16 nProp ); sal_Bool ImplGetPropertyValue_BOOL( sal_uInt16 nProp ); sal_Int16 ImplGetPropertyValue_INT16( sal_uInt16 nProp ); sal_Int32 ImplGetPropertyValue_INT32( sal_uInt16 nProp ); + sal_Int64 ImplGetPropertyValue_INT64( sal_uInt16 nProp ); double ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp ); OUString ImplGetPropertyValue_UString( sal_uInt16 nProp ); diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 0d3119fd8025..fdcb44af3197 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -1179,16 +1179,16 @@ public: void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); //XTimeField - void SAL_CALL setTime( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setMin( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setMax( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setFirst( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setLast( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setTime( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); + sal_Int64 SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setMin( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); + sal_Int64 SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setMax( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); + sal_Int64 SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setFirst( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); + sal_Int64 SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setLast( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); + sal_Int64 SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException); diff --git a/include/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx index fa1fbbf2a125..5f009ddbbc68 100644 --- a/include/toolkit/helper/property.hxx +++ b/include/toolkit/helper/property.hxx @@ -68,9 +68,9 @@ namespace uno { #define BASEPROPERTY_DATE 30 // sal_Int32 #define BASEPROPERTY_DATEMIN 31 // sal_Int32 #define BASEPROPERTY_DATEMAX 32 // sal_Int32 -#define BASEPROPERTY_TIME 33 // sal_Int32 -#define BASEPROPERTY_TIMEMIN 34 // sal_Int32 -#define BASEPROPERTY_TIMEMAX 35 // sal_Int32 +#define BASEPROPERTY_TIME 33 // sal_Int64 +#define BASEPROPERTY_TIMEMIN 34 // sal_Int64 +#define BASEPROPERTY_TIMEMAX 35 // sal_Int64 #define BASEPROPERTY_VALUE_INT32 36 // sal_Int32 #define BASEPROPERTY_VALUEMIN_INT32 37 // sal_Int32 #define BASEPROPERTY_VALUEMAX_INT32 38 // sal_Int32 |