diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-01-21 13:49:22 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-01-21 13:49:22 +0100 |
| commit | e1418e1b155368d8e9be649c2ce809d012d565fa (patch) | |
| tree | b6627dc74804b255dbc28f0a6199324deb128482 /svl | |
| parent | 9fe074cacb027df327a00e39724ece4166b68147 (diff) | |
| parent | 7f5f6c30e89c27422a1576ccceb9b0d79c8e3f0d (diff) | |
resync to DEV300_m70
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/solar.hrc | 8 | ||||
| -rw-r--r-- | svl/inc/svl/svarray.hxx | 2 | ||||
| -rw-r--r-- | svl/source/numbers/numhead.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc index 75cfdc229a62..66bf16f0e2a8 100644 --- a/svl/inc/svl/solar.hrc +++ b/svl/inc/svl/solar.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: solar.hrc,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -165,6 +162,9 @@ #define HID_START 32768 +#define HID_VCL_START (HID_START+100) +#define HID_VCL_END (HID_START+150) + #define HID_SVTOOLS_START (HID_START+200) #define HID_SVTOOLS_END (HID_START+299) diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index d2479cd5364f..555b7ad5fe84 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -1034,7 +1034,7 @@ public:\ #define C40_PTR_REPLACE( c, p) Replace( (c const *) p ) #define C40_GETPOS( c, r) GetPos( (c const *)r ) #else -#if defined WTC || defined IRIX || defined ICC || defined HPUX || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400) +#if defined WTC || defined ICC || defined HPUX || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400) #define C40_INSERT( c, p, n ) Insert( (c const *&) p, n ) #define C40_PUSH( c, p) Push( (c const *&) p ) #define C40_PTR_INSERT( c, p ) Insert( (c const *&) p ) diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx index 99ff33433de3..3bb650b0c9ae 100644 --- a/svl/source/numbers/numhead.cxx +++ b/svl/source/numbers/numhead.cxx @@ -139,7 +139,7 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) : ImpSvNumMultipleReadHeader::~ImpSvNumMultipleReadHeader() { - DBG_ASSERT( pMemStream->Tell() == pMemStream->GetSize(), + DBG_ASSERT( pMemStream->Tell() == pMemStream->GetEndOfData(), "Sizes nicht vollstaendig gelesen" ); delete pMemStream; delete [] pBuf; |