summaryrefslogtreecommitdiff
path: root/vcl/source/window/status.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2004-01-06 13:16:28 +0000
committerVladimir Glazounov <vg@openoffice.org>2004-01-06 13:16:28 +0000
commit5f3fcffee9c789be5c6c5f78421803a1044d3add (patch)
tree01497c61026fd158ef9aa776dc705d6ac5a22074 /vcl/source/window/status.cxx
parentbb60e56bbe68c720bcf76d5fd1930b2ededa612b (diff)
INTEGRATION: CWS vclcleanup02 (1.10.4); FILE MERGED
2003/12/17 16:05:50 mt 1.10.4.3: #i23061# header cleanup, remove #ifdef ???_CXX and #define ???_CXX, also removed .impl files and fixed soke windows compiler warnings 2003/12/16 18:15:33 mt 1.10.4.2: #i23061# And more cleanups... 2003/12/10 15:59:40 mt 1.10.4.1: #i23061# VCL cleanup, removed headers, methods and types...
Diffstat (limited to 'vcl/source/window/status.cxx')
-rw-r--r--vcl/source/window/status.cxx16
1 files changed, 3 insertions, 13 deletions
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 8ef32e210051..c3a2d83cd3ba 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: status.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: rt $ $Date: 2003-12-01 13:40:01 $
+ * last change: $Author: vg $ $Date: 2004-01-06 14:16:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,8 +59,6 @@
*
************************************************************************/
-#define _SV_STATUS_CXX
-
#ifndef _LIST_HXX
#include <tools/list.hxx>
#endif
@@ -69,7 +67,7 @@
#endif
#ifndef _SV_RC_H
-#include <rc.h>
+#include <tools/rc.h>
#endif
#ifndef _SV_SVDATA_HXX
#include <svdata.hxx>
@@ -497,10 +495,6 @@ void StatusBar::ImplDrawItem( BOOL bOffScreen, USHORT nPos, BOOL bDrawText, BOOL
// -----------------------------------------------------------------------
-#ifdef _MSC_VER
-#pragma optimize( "", off )
-#endif
-
void DrawProgress( Window* pWindow, const Point& rPos,
long nOffset, long nPrgsWidth, long nPrgsHeight,
USHORT nPercent1, USHORT nPercent2, USHORT nPercentCount )
@@ -570,10 +564,6 @@ void DrawProgress( Window* pWindow, const Point& rPos,
}
}
-#ifdef _MSC_VER
-#pragma optimize( "", on )
-#endif
-
// -----------------------------------------------------------------------
void StatusBar::ImplDrawProgress( BOOL bPaint,