diff options
author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
---|---|---|
committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
commit | 3491b4ac4fe34cacea5f4d0a4594d4a88cbbe7b2 (patch) | |
tree | 8dc60b794b88dd87c965d149c93fa3ac81e3096c /rsc | |
parent | removetooltypes01: #i112600# remove tooltypes from toolkit, svtools and frame... (diff) | |
parent | CWS-TOOLING: integrate CWS vcl116 (diff) | |
download | core-3491b4ac4fe34cacea5f4d0a4594d4a88cbbe7b2.tar.gz core-3491b4ac4fe34cacea5f4d0a4594d4a88cbbe7b2.zip |
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'rsc')
-rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
-rw-r--r-- | rsc/inc/vclrsc.hxx | 6 | ||||
-rw-r--r-- | rsc/source/parser/erscerr.cxx | 2 | ||||
-rw-r--r-- | rsc/source/parser/rscdb.cxx | 3 | ||||
-rw-r--r-- | rsc/source/parser/rscicpx.cxx | 10 | ||||
-rw-r--r-- | rsc/source/parser/rscinit.cxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | rsc/source/parser/rsclex.cxx | 11 | ||||
-rw-r--r-- | rsc/source/parser/rscyacc.cxx | 4 | ||||
-rw-r--r-- | rsc/source/rsc/rsc.cxx | 4 | ||||
-rw-r--r-- | rsc/source/tools/rsctools.cxx | 6 |
10 files changed, 24 insertions, 25 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index c9cc02cfaa40..4ddfb24df289 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -285,6 +285,7 @@ public: RscRange a0to9999Short; RscIdRange aIdLong; RscString aString; + RscString aStringLiteral; RscFlag aWinBits; RscLangEnum aLangType; RscLangArray aLangString; diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx index 0bcc1d03fd07..d4084f2bc239 100644 --- a/rsc/inc/vclrsc.hxx +++ b/rsc/inc/vclrsc.hxx @@ -162,9 +162,11 @@ typedef sal_Int64 WinBits; // - Help-Types - // -------------- +#if 0 // from vcl/inc/help.hxx -#define OOO_HELP_INDEX ((sal_uIntPtr)0xFFFFFFFF) -#define OOO_HELP_HELPONHELP ((sal_uIntPtr)0xFFFFFFFE) +#define OOO_HELP_INDEX ".help:index" +#define OOO_HELP_HELPONHELP ".help:helponhelp" +#endif // -------------- // - FieldTypes - diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index 158aea21b6e3..ed63510737aa 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.cxx @@ -88,10 +88,8 @@ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel ) *************************************************************************/ void RscError::StdErr( const char * pStr ) { -#ifndef WIN if( pStr ) fprintf( stderr, "%s", pStr ); -#endif } /************************************************************************* diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index b0b40e47a08e..fdbf6459ac63 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -81,6 +81,7 @@ RscTypCont :: RscTypCont( RscError * pErrHdl, a0to9999Short( pHS->getID( "YearShort" ), RSC_NOTYPE ), aIdLong( pHS->getID( "IDLONG" ), RSC_NOTYPE ), aString( pHS->getID( "Chars" ), RSC_NOTYPE ), + aStringLiteral( pHS->getID( "Chars" ), RSC_NOTYPE ), aWinBits( pHS->getID( "WinBits" ), RSC_NOTYPE ), aLangType(), aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType ), @@ -125,7 +126,7 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont, else rLang = rtl::OString(); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, " %s (0x%hx)", aL.getStr(), nRet ); + fprintf( stderr, " %s (0x%hx)", aL.getStr(), (int)nRet ); #endif return nRet; } diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index d3afafdc2d29..eab06b3ea8ec 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -297,7 +297,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, InsWinBit( pClassWindow, "DialogControl", nTabControlId ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassWindow->SetVariable( nId, &aIdLong ); + pClassWindow->SetVariable( nId, &aStringLiteral, NULL, 0, WINDOW_HELPID ); nRsc_XYMAPMODEId = nId = aNmTb.Put( "_XYMapMode", VARNAME ); @@ -325,7 +325,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, nId = aNmTb.Put( "ExtraLong", VARNAME ); pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_EXTRALONG ); nId = aNmTb.Put( "UniqueId", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_UNIQUEID ); + pClassWindow->SetVariable( nId, &aString, NULL, 0, WINDOW_UNIQUEID ); // BorderStyle RscEnum* pBorderStyleEnum = new RscEnum( pHS->getID( "WindowBorderStyle" ), RSC_NOTYPE ); @@ -1201,7 +1201,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, pClassMenuItem->SetVariable( nId, &aLangString, NULL, 0, RSC_MENUITEM_HELPTEXT ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassMenuItem->SetVariable( nId, &aIdLong, NULL, 0, + pClassMenuItem->SetVariable( nId, &aStringLiteral, NULL, 0, RSC_MENUITEM_HELPID ); nId = aNmTb.Put( "AccelKey", VARNAME ); pClassMenuItem->SetVariable( nId, pClassKeyCode, NULL, 0, @@ -1276,7 +1276,7 @@ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper, nId = aNmTb.Put( "DefButton", VARNAME ); pClassMessBox->SetVariable( nId, pMessDefButton ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassMessBox->SetVariable( nId, &aIdLong ); + pClassMessBox->SetVariable( nId, &aStringLiteral ); nId = aNmTb.Put( "SysModal", VARNAME ); pClassMessBox->SetVariable( nId, &aBool ); nId = aNmTb.Put( "Title", VARNAME ); @@ -2015,7 +2015,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); } nId = aNmTb.Put( "HelpID", VARNAME ); - pClassToolBoxItem->SetVariable( nId, &aIdLong, NULL, 0, + pClassToolBoxItem->SetVariable( nId, &aStringLiteral, NULL, 0, RSC_TOOLBOXITEM_HELPID ); nId = aNmTb.Put( "Text", VARNAME ); pClassToolBoxItem->SetVariable( nId, &aLangString, NULL, 0, diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index a65756502968..1b7a2b3ca269 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -210,9 +210,11 @@ void RscTypCont::Init() aNmTb.Put( "TRUE", BOOLEAN, (long)sal_True ); aNmTb.Put( "FALSE", BOOLEAN, (long)sal_False ); + #if 0 /* Vordefinierte HilfeId's */ aNmTb.Put( "HELP_INDEX", NUMBER, OOO_HELP_INDEX ); aNmTb.Put( "HELP_HELPONHELP", NUMBER, OOO_HELP_HELPONHELP ); + #endif aNmTb.Put( "XSCALE", XSCALE , (long)0 ); aNmTb.Put( "YSCALE", YSCALE , (long)0 ); diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index 42466dc3f490..b165d1bb6abb 100644..100755 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -175,11 +175,16 @@ int MakeToken( YYSTYPE * pTokenVal ){ c = pFI->GetFastChar(); if( c == '"' ) { - c = pFI->GetFastChar(); + do + { + c = pFI->GetFastChar(); + } + while( c == ' ' || c == '\t' ); if( c == '"' ) { - aBuf.append( '"' ); - aBuf.append( '"' ); + // this is a continued string + // note: multiline string continuations are handled by the parser + // see rscyacc.y } else bDone = sal_True; diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx index f6c9d9a17cc8..63be87f43649 100644 --- a/rsc/source/parser/rscyacc.cxx +++ b/rsc/source/parser/rscyacc.cxx @@ -253,12 +253,8 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop ) #ifdef UNX #define YYMAXDEPTH 2000 #else -#ifdef W30 -#define YYMAXDEPTH 300 -#else #define YYMAXDEPTH 800 #endif -#endif #if defined _MSC_VER #pragma warning(push, 1) diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 00c105b7fca6..c1eb0f85b36b 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -474,10 +474,8 @@ ERRTYPE RscCompiler::Start() if( PRINTSYNTAX_FLAG & pCL->nCommands ) { -#ifndef W30 pTC->WriteSyntax( stdout ); -printf( "khg\n" ); -#endif + printf( "khg\n" ); return ERR_OK; } diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 9632df25c641..57345d0aa893 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -32,7 +32,7 @@ // C and C++ Includes. #include <stdlib.h> #include <stdio.h> -#if defined ( DOS ) || defined ( WIN ) || defined (WNT ) +#if defined (WNT ) #include <direct.h> #endif #if defined ( OS2 ) && !defined ( GCC ) @@ -51,10 +51,6 @@ #include <rtl/alloc.h> #include <rtl/memory.h> -#if defined (WIN) -#define ONLY_NEW -#endif - using namespace rtl; /****************** C o d e **********************************************/ |