From c7e172b2d9036c788fe00552ded841340d115033 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Fri, 18 Sep 2009 10:15:03 +0000
Subject: CWS-TOOLING: integrate CWS mba32issues02 2009-09-17 mb93783 merge
 commit 2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial
 2009-09-01 mba #101455#: code simplification 2009-08-31 mb93783 iso locales
 for norwegian builds are nb and nn, not no 2009-08-25 mba merge to m55
 2009-07-29 mba cleanup after rebase 2009-07-29 mba #i103200#: wrong order of
 first and last name in CJK UI 2009-07-27 mba adding dictionary changes from
 broken svn CWS 2009-07-27 mba adding dictionary changes from broken svn CWS
 2009-07-27 mba apply patch from broken svn CWS

---
 idl/source/objects/bastype.cxx | 39 ++++++++++-----------------------------
 idl/source/prj/command.cxx     |  2 +-
 idl/source/prj/globals.cxx     |  2 +-
 3 files changed, 12 insertions(+), 31 deletions(-)

(limited to 'idl')

diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 9fc48737e34c..4c9d9bb08926 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -44,50 +44,31 @@
 #ifdef IDL_COMPILER
 /************************************************************************/
 static BOOL ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
-                            long nMin, ULONG nMax, long * pValue )
+                            ULONG nMin, ULONG nMax, ULONG* pValue )
 {
     UINT32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
-
     if( pTok->Is( pName ) )
     {
-        BOOL bOk = TRUE;
-        BOOL bBraket = rInStm.Read( '(' );
-        if( bBraket || rInStm.Read( '=' ) )
+        BOOL bOk = FALSE;
+        if( rInStm.Read( '=' ) )
         {
-            short nSign = 1;
             pTok = rInStm.GetToken_Next();
-            if( pTok->IsChar() && pTok->GetChar() == '-' )
-            {
-                nSign = -1;
-                pTok = rInStm.GetToken_Next();
-            }
-            else if( pTok->IsChar() && pTok->GetChar() == '+' )
-                pTok = rInStm.GetToken_Next();
-
             if( pTok->IsInteger() )
             {
                 ULONG n = pTok->GetNumber();
-                if( nSign == -1 || n <= nMax )
-                { // nicht ueber dem Maximum
-                    if( (nSign == -1 && n < 0x8000000
-                         && -(long)n >= nMin)
-                      || ( (nSign == 1 && n >= 0x8000000) || (long)n > nMin) )
-                    {
-                        *pValue = (long)n;
-                    }
-                    else
-                        bOk = FALSE;
+                if ( n >= nMin && n <= nMax )
+                {
+                    *pValue = n;
+                    bOk = TRUE;
                 }
-                if( bOk && bBraket )
-                    bOk = rInStm.Read( ')' );
             }
-            else
-                bOk = pTok->IsChar() && pTok->GetChar() == ')';
         }
+
         if( bOk )
             return TRUE;
     }
+
     rInStm.Seek( nTokPos );
     return FALSE;
 }
@@ -590,7 +571,7 @@ BOOL SvUUId::WriteSvIdl( SvStream & rOutStm )
 *************************************************************************/
 BOOL SvVersion::ReadSvIdl( SvTokenStream & rInStm )
 {
-    long n = 0;
+    ULONG n = 0;
 
     UINT32 nTokPos = rInStm.Tell();
     if( ReadRangeSvIdl( SvHash_Version(), rInStm, 0 , 0xFFFF, &n ) )
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index cd3e64c24084..66790b457334 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -93,7 +93,7 @@ char const * SyntaxStrings[] = {
 "\t\tAccelConfig, MenuConfig, StatusBarConfig, ToolbarConfig",
 "\t\tAutomation*",
 "\t\tAutoUpdate",
-"\t\tCachable*, Volatile",
+// "\t\tCachable*, Volatile",
 "\t\tContainer",
 "\t\tDefault        = Identifier",
 "\t\tExecMethod     = Identifier",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 893831a27394..8e7547934616 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -132,7 +132,7 @@ SvGlobalHashNames::SvGlobalHashNames()
     , MM_SlotId( INS( "SlotId" ) )
     , MM_HasCoreId( INS( "HasCoreId" ) )
     , MM_Cachable( INS( "Cachable" ) )
-    , MM_Volatile( INS( "Volatile" ) )
+//    , MM_Volatile( INS( "Volatile" ) )
     , MM_Toggle( INS( "Toggle" ) )
     , MM_AutoUpdate( INS( "AutoUpdate" ) )
     , MM_Synchron( INS( "Synchron" ) )
-- 
cgit