diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:40:03 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:40:03 +0000 |
| commit | c98826b77ce1d115663393fb9b62c83ce61e7060 (patch) | |
| tree | de940d7b55da11db1a056bb435d774d0bd4d23a4 /tools/source/rc | |
| parent | 4ecde85354eba62cd038143f5688182d40e4ae6a (diff) | |
INTEGRATION: CWS os2port03 (1.48.22); FILE MERGED
2008/07/16 13:46:01 obr 1.48.22.4: RESYNC: (1.49.6.1-1.52); FILE MERGED
2008/02/08 08:32:11 obr 1.48.22.3: RESYNC: (1.49-1.49.6.1); FILE MERGED
2008/01/15 14:34:56 obr 1.48.22.2: RESYNC: (1.48-1.49); FILE MERGED
2008/01/14 17:03:52 ydario 1.48.22.1: restored os2 code.
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'tools/source/rc')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 8d6bdb89ebf2..f3eef50fbc4b 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: resmgr.cxx,v $ - * $Revision: 1.52 $ + * $Revision: 1.53 $ * * This file is part of OpenOffice.org. * @@ -657,7 +657,9 @@ BOOL InternalResMgr::Create() } } rtl_freeMemory( pContentBuf ); +#ifndef OS2 OSL_ENSURE( bSorted, "content not sorted" ); +#endif OSL_ENSURE( bEqual2Content, "resource structure wrong" ); if( !bSorted ) ::std::sort(pContent,pContent+nEntries,ImpContentLessCompare()); |