diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-09-08 14:32:31 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-09-08 14:32:31 +0000 |
commit | f1feff6f1b620a79b9942533ea0065cb93d1d8cf (patch) | |
tree | 8739114f0971be335411c78cdaf0e68b3d489c70 /sfx2/source/appl/appcfg.cxx | |
parent | 6270742bee32f23cd3f95af106e95d8395c7775d (diff) |
INTEGRATION: CWS ooo20040704 (1.51.112); FILE MERGED
2004/07/19 20:15:30 svesik 1.51.112.2: RESYNC: (1.51-1.52); FILE MERGED
2004/06/28 14:04:55 waratah 1.51.112.1: #I30812# remove unused variables
bracket pragma not defined for gcc
Diffstat (limited to 'sfx2/source/appl/appcfg.cxx')
-rw-r--r-- | sfx2/source/appl/appcfg.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 67205f6f80..287e51ea41 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appcfg.cxx,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: obo $ $Date: 2004-07-06 13:30:57 $ + * last change: $Author: rt $ $Date: 2004-09-08 15:32:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -134,7 +134,9 @@ #include <sot/exchange.hxx> #endif +#ifndef GCC #pragma hdrstop +#endif //#include <svtools/agprop.hxx> #include <sj2/sjapplet.hxx> @@ -249,6 +251,7 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pTimer) return 0L; } + /* const USHORT* SfxApplication::GetOptionsRanges() const { @@ -265,7 +268,7 @@ const USHORT* SfxApplication::GetOptionsRanges() const if (0 == pRange[0]) { - SfxItemPool &rPool = GetPool(); + GetPool(); // -Wall required ?? pRange[ 0] = SID_OPTIONS_START; pRange[ 1] = SID_OPTIONS_FIRSTFREE-1; pRange[ 2] = SID_HELPBALLOONS; |