diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/inc/rangeseq.hxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/rangeseq.hxx')
| -rw-r--r-- | sc/inc/rangeseq.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx index 3923958b969d..abb7c56e0403 100644 --- a/sc/inc/rangeseq.hxx +++ b/sc/inc/rangeseq.hxx @@ -40,21 +40,21 @@ class ScRange; class ScRangeToSequence { public: - static BOOL FillLongArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillLongArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillLongArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillLongArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix ); - static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillDoubleArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillDoubleArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix ); - static BOOL FillStringArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillStringArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillStringArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillStringArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix, SvNumberFormatter* pFormatter ); - static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillMixedArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange, - BOOL bAllowNV = FALSE ); + sal_Bool bAllowNV = false ); /** @param bDataTypes Additionally to the differentiation between string and double allow @@ -62,7 +62,7 @@ public: implementation of XFormulaParser. If <FALSE/>, boolean values are treated as ordinary double values 1 (true) and 0 (false). */ - static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, + static sal_Bool FillMixedArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix, bool bDataTypes = false ); }; @@ -107,7 +107,7 @@ class ScByteSequenceToString public: // rAny must contain Sequence<sal_Int8>, // may or may not contain 0-bytes at the end - static BOOL GetString( String& rString, const com::sun::star::uno::Any& rAny, + static sal_Bool GetString( String& rString, const com::sun::star::uno::Any& rAny, sal_uInt16 nEncoding ); }; |