strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS pchfix04 (1.15.16); FILE MERGED

Browse source 
2007/01/12 15:57:56 hjs 1.15.16.1: #i73422# prefixing HELP_INDEX and HELP_HELPONHELP with OOO_ to solve clash with defines from compiler includes on windows
This commit is contained in:
Kurt Zenker 2007-05-10 16:06:11 +00:00
parent b02c7709f1
commit 1e5411e501
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rsc/source/parser/rscinit.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: rscinit.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: obo $ $Date: 2006-09-17 15:59:30 $
* last change: $Author: kz $ $Date: 2007-05-10 17:06:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -241,8 +241,8 @@ void RscTypCont::Init()
aNmTb.Put( "FALSE", BOOLEAN, (long)FALSE );
/* Vordefinierte HilfeId's */
aNmTb.Put( "HELP_INDEX", NUMBER, HELP_INDEX );
aNmTb.Put( "HELP_HELPONHELP", NUMBER, HELP_HELPONHELP );
aNmTb.Put( "HELP_INDEX", NUMBER, OOO_HELP_INDEX );
aNmTb.Put( "HELP_HELPONHELP", NUMBER, OOO_HELP_HELPONHELP );
aNmTb.Put( "XSCALE", XSCALE , (long)0 );
aNmTb.Put( "YSCALE", YSCALE , (long)0 );