diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 07:38:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 07:38:28 +0000 |
| commit | e4a22a6e43459e38d58b100c4dc6233590253a1d (patch) | |
| tree | bc26956ad53e7a1d42da098aa9e2775d0b136dc0 /basic/source/runtime/methods.cxx | |
| parent | 598ba6abf4d65f7e5882c6321cdd8ee3ef300729 (diff) | |
INTEGRATION: CWS ab25 (1.64.24); FILE MERGED
2006/04/18 11:23:10 ab 1.64.24.1: #129905# Changed RGB behaviour for compatibility mode
Diffstat (limited to 'basic/source/runtime/methods.cxx')
| -rw-r--r-- | basic/source/runtime/methods.cxx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index d3aebc2a3e..992acb3e69 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -4,9 +4,9 @@ * * $RCSfile: methods.cxx,v $ * - * $Revision: 1.66 $ + * $Revision: 1.67 $ * - * last change: $Author: vg $ $Date: 2006-04-07 14:51:53 $ + * last change: $Author: rt $ $Date: 2006-05-05 08:38:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3541,7 +3541,18 @@ RTLFUNC(RGB) ULONG nRed = rPar.Get(1)->GetInteger() & 0xFF; ULONG nGreen = rPar.Get(2)->GetInteger() & 0xFF; ULONG nBlue = rPar.Get(3)->GetInteger() & 0xFF; - ULONG nRGB = (nRed << 16) | (nGreen << 8) | nBlue; + ULONG nRGB; + + SbiInstance* pInst = pINST; + bool bCompatibility = ( pInst && pInst->IsCompatibility() ); + if( bCompatibility ) + { + nRGB = (nBlue << 16) | (nGreen << 8) | nRed; + } + else + { + nRGB = (nRed << 16) | (nGreen << 8) | nBlue; + } rPar.Get(0)->PutLong( nRGB ); } |