diff options
| author | Jack Leigh <leighman@gmx.se> | 2012-10-03 16:35:47 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-10-04 10:35:48 +0100 |
| commit | af4df7ac089134df888ada3cd36b27a0b62babab (patch) | |
| tree | c237c91be40d55d4f5b2ee8a1eb775e63172f106 /basic/source/runtime | |
| parent | eff6d4e01b87df58cc218cf0663d0f711fe06fde (diff) | |
fdo#48257 collect function prototypes from basic/ into single header file
Change-Id: I1666e64b2b611054e1a713a76575e2f06781f80a
Diffstat (limited to 'basic/source/runtime')
| -rw-r--r-- | basic/source/runtime/methods.cxx | 8 | ||||
| -rw-r--r-- | basic/source/runtime/methods1.cxx | 13 |
2 files changed, 2 insertions, 19 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index a90cc0e72817..054de265eb46 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -63,6 +63,7 @@ using namespace com::sun::star; #include <comphelper/string.hxx> +#include "date.hxx" #include "stdobj.hxx" #include <basic/sbstdobj.hxx> #include "rtlproto.hxx" @@ -103,9 +104,6 @@ SbxVariable* getDefaultProp( SbxVariable* pRef ); #ifndef DISABLE_SCRIPTING -// forward decl. -bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet ); - // from source/classes/sbxmod.cxx uno::Reference< frame::XModel > getDocumentModel( StarBASIC* ); @@ -1701,8 +1699,6 @@ sal_Int16 implGetDateMonth( double aDate ) return nRet; } -sal_Int16 implGetDateYear( double aDate ); - // Function to convert date to ISO 8601 date format RTLFUNC(CDateToIso) { @@ -1956,8 +1952,6 @@ RTLFUNC(Hour) } } -sal_Int16 implGetMinute( double dDate ); - RTLFUNC(Minute) { (void)pBasic; diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 3e1d94900f76..4692ca49d47d 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -32,6 +32,7 @@ #include <vcl/jobset.hxx> #include <basic/sbobjmod.hxx> +#include "date.hxx" #include "sbintern.hxx" #include "runtime.hxx" #include "stdobj.hxx" @@ -57,7 +58,6 @@ using namespace com::sun::star::i18n; void unoToSbxValue( SbxVariable* pVar, const Any& aValue ); Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, com::sun::star::beans::Property* pUnoProperty = NULL ); -sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 ); static Reference< XCalendar3 > getLocaleCalendar( void ) { @@ -1906,17 +1906,6 @@ IntervalInfo* getIntervalInfo( const String& rStringCode ) return pInfo; } -// From methods.cxx -bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet ); -sal_Int16 implGetDateDay( double aDate ); -sal_Int16 implGetDateMonth( double aDate ); -sal_Int16 implGetDateYear( double aDate ); - -sal_Int16 implGetHour( double dDate ); -sal_Int16 implGetMinute( double dDate ); -sal_Int16 implGetSecond( double dDate ); - - inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate ) { rnDay = implGetDateDay( dDate ); |