summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2010-12-21 13:08:15 +0000
committerNoel Power <noel.power@novell.com>2010-12-21 13:08:15 +0000
commita01175fa1235043d56036483bd65afc0c2bd5689 (patch)
tree0aaa0c9ae005ea5a208e79875cd96bb139127fc2
parent1c645a9db4254e96cbfb340deb80afaef6149ac4 (diff)
parent2ab0207cd2ac8f18b7dcc8b000d911e21fb6ec7b (diff)
Merge remote branch 'origin/feature/currency-64bit'
-rw-r--r--automation/source/testtool/cmdstrm.cxx8
-rw-r--r--automation/source/testtool/objtest.cxx4
2 files changed, 6 insertions, 6 deletions
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index c6522417e2eb..23eb3bc7e1bb 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -183,8 +183,8 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString )
{
case SbxLONG: // alles immer als Short �bertragen
case SbxULONG:
- case SbxLONG64:
- case SbxULONG64:
+ case SbxSALINT64:
+ case SbxSALUINT64:
case SbxDOUBLE:
case SbxINTEGER:
case SbxBYTE:
@@ -348,8 +348,8 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar )
break;
case SbxLONG:
case SbxULONG:
- case SbxLONG64:
- case SbxULONG64:
+ case SbxSALINT64:
+ case SbxSALUINT64:
case SbxDOUBLE:
if ( !bWriteUnoSlot )
Write( (USHORT)BinULONG );
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index ad1c1aab7799..c1c0d5c54b6f 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -2267,8 +2267,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
{
case SbxLONG: // alles immer als Short �bertragen
case SbxULONG:
- case SbxLONG64:
- case SbxULONG64:
+ case SbxSALINT64:
+ case SbxSALUINT64:
case SbxDOUBLE:
case SbxINTEGER:
case SbxBYTE: