summaryrefslogtreecommitdiff
path: root/include/formula
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2014-02-02 22:16:48 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-02-03 07:44:28 +0000
commit3cbfcee36dd16e451d76c561eaaaee0ff29b01a5 (patch)
tree7377a9e1d8cd56279104429abce73aec334569d5 /include/formula
parent5c39b6b997ddc85e6848efc230a427a124b97264 (diff)
xub_StrLen and tools/string.hxx final straw
Thre is still some 0xffff limit left and possibly some less than gracefully handled overflow/error cases Change-Id: I00957ee3a30b02f73918ea49d7353056263dc638 Reviewed-on: https://gerrit.libreoffice.org/7787 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'include/formula')
-rw-r--r--include/formula/token.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 002cefbb8a21..b72897d8ad31 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -178,9 +178,9 @@ public:
struct PrivateAccess { friend class FormulaCompiler; private: PrivateAccess() { } };
inline void NewOpCode( OpCode e, const PrivateAccess& ) { eOp = e; }
- static size_t GetStrLenBytes( xub_StrLen nLen )
+ static sal_Int32 GetStrLenBytes( sal_Int32 nLen )
{ return nLen * sizeof(sal_Unicode); }
- static size_t GetStrLenBytes( const OUString& rStr )
+ static sal_Int32 GetStrLenBytes( const OUString& rStr )
{ return GetStrLenBytes( rStr.getLength() ); }
};