From 8a2222b6246e32c6ecf70cb9c99a8ff7548af924 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Fri, 12 Feb 2010 15:01:35 +0100
Subject: changefileheader2: #i109125#: change source file copyright notice
from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile,
Revision)
---
sw/source/ui/uiview/uivwimp.cxx | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'sw/source/ui/uiview/uivwimp.cxx')
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx
index 1930856661..d58e80a542 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/ui/uiview/uivwimp.cxx
@@ -1,14 +1,11 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: uivwimp.cxx,v $
- * $Revision: 1.25 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
--
cgit v1.2.3
From b8001240a7b1365860164d3116390bc9ed36b06b Mon Sep 17 00:00:00 2001
From: Malte Timmermann
Date: Fri, 25 Jun 2010 13:15:03 +0200
Subject: codecleanup02: #i112685# Removed ifdefs and code for WIN,W30,W31
---
starmath/inc/applicat.hxx | 4 ----
sw/source/core/doc/doc.cxx | 2 +-
sw/source/core/except/errhdl.cxx | 9 ---------
sw/source/core/frmedt/feshview.cxx | 4 ----
sw/source/core/txtnode/fntcache.cxx | 4 ++--
sw/source/core/txtnode/swfont.cxx | 4 ++--
sw/source/filter/ascii/wrtasc.cxx | 2 +-
sw/source/filter/ww8/dump/ww8struc.hxx | 2 +-
sw/source/ui/envelp/envimg.cxx | 2 +-
sw/source/ui/inc/swlbox.hxx | 4 ----
sw/source/ui/inc/view.hxx | 2 +-
sw/source/ui/uiview/uivwimp.cxx | 2 +-
sw/source/ui/uiview/view.cxx | 2 +-
sw/source/ui/uiview/view2.cxx | 2 +-
sw/source/ui/uiview/viewstat.cxx | 2 +-
15 files changed, 13 insertions(+), 34 deletions(-)
mode change 100755 => 100644 sw/source/core/doc/doc.cxx
(limited to 'sw/source/ui/uiview/uivwimp.cxx')
diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx
index 1c29e26d1d..fd3936adac 100644
--- a/starmath/inc/applicat.hxx
+++ b/starmath/inc/applicat.hxx
@@ -51,10 +51,6 @@ class SvxErrorHandler;
**
**/
-#ifdef WIN
-#define RELEASE "WIN304"
-#endif
-
#ifdef PM2
#define RELEASE "PM304"
#endif
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
old mode 100755
new mode 100644
index d25e4bd169..7007179ff4
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1182,7 +1182,7 @@ static void lcl_FormatPostIt(
pIDCO->SplitNode( *aPam.GetPoint(), false );
aStr = pField->GetPar2();
-#if defined( WIN ) || defined( WNT ) || defined( PM2 )
+#if defined( WNT ) || defined( PM2 )
// Bei Windows und Co alle CR rausschmeissen
aStr.EraseAllChars( '\r' );
#endif
diff --git a/sw/source/core/except/errhdl.cxx b/sw/source/core/except/errhdl.cxx
index 2c48c28c1c..a09d1c1f59 100644
--- a/sw/source/core/except/errhdl.cxx
+++ b/sw/source/core/except/errhdl.cxx
@@ -31,21 +31,12 @@
#include "stdlib.h"
-#ifdef WIN
-#endif
#include
#include
#include
#include
#include // fuer die defines von ERR_SW6MSG_ ...
-// break into CodeView
-#if defined(ZTC) && defined(WIN)
-#define CVBREAK asm( 0xCC );
-#endif
-#if defined(MSC) && defined(WIN)
-#define CVBREAK __asm int 3;
-#endif
#ifndef CVBREAK
#define CVBREAK
#endif
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 2eb597f887..045ffe54ac 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -30,10 +30,6 @@
#include
#include "hintids.hxx"
-#ifdef WIN
-#define _FESHVIEW_ONLY_INLINE_NEEDED
-#endif
-
#include
#include
#include
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index f88df01a6d..e1a540a3d5 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -538,7 +538,7 @@ void SwFntObj::CreateScrFont( const ViewShell& rSh, const OutputDevice& rOut )
void SwFntObj::GuessLeading( const ViewShell&
-#if defined(WNT) || defined(WIN) || defined(PM2)
+#if defined(WNT) || defined(PM2)
rSh
#endif
, const FontMetric& rMet )
@@ -551,7 +551,7 @@ void SwFntObj::GuessLeading( const ViewShell&
return;
}
-#if defined(WNT) || defined(WIN) || defined(PM2)
+#if defined(WNT) || defined(PM2)
OutputDevice *pWin = rSh.GetWin() ?
rSh.GetWin() :
GetpApp()->GetDefaultDevice();
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 66508628c1..199cb8b166 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -77,11 +77,11 @@
#include // SwTxtFrm
#include
-#if defined(WIN) || defined(WNT) || defined(PM2)
+#if defined(WNT) || defined(PM2)
#define FNT_LEADING_HACK
#endif
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
#define FNT_ATM_HACK
#endif
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index bc4882cfd1..1c362b16ed 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -69,7 +69,7 @@ SwASCWriter::SwASCWriter( const String& rFltNm )
break;
case 'A':
-#if !defined(WIN) && !defined(WNT)
+#if !defined(WNT)
aNewOpts.SetCharSet( RTL_TEXTENCODING_MS_1252 );
aNewOpts.SetParaFlags( LINEEND_CRLF );
#endif
diff --git a/sw/source/filter/ww8/dump/ww8struc.hxx b/sw/source/filter/ww8/dump/ww8struc.hxx
index 9591523ac0..344fc9d1b1 100644
--- a/sw/source/filter/ww8/dump/ww8struc.hxx
+++ b/sw/source/filter/ww8/dump/ww8struc.hxx
@@ -62,7 +62,7 @@ inline void Set_UInt32( BYTE *& p, UINT32 n )
#if defined OSL_BIGENDIAN || SAL_TYPES_ALIGNMENT4 > 2 || defined UNX
#define __WW8_NEEDS_COPY
#else
-#if defined WNT || defined WIN || defined OS2
+#if defined WNT || defined OS2
#define __WW8_NEEDS_PACK
#pragma pack(2)
#endif
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index 2bf989f833..85acf6e37c 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -51,7 +51,7 @@
#include
-#ifdef WIN
+#ifdef WNT
#define NEXTLINE UniString::CreateFromAscii("\r\n")
#else
#define NEXTLINE '\n'
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx
index 5488f0ef2b..ab4435772f 100644
--- a/sw/source/ui/inc/swlbox.hxx
+++ b/sw/source/ui/inc/swlbox.hxx
@@ -76,11 +76,7 @@ namespace nsSwComboBoxStyle
const SwComboBoxStyle CBS_LOWER = 0x02;
const SwComboBoxStyle CBS_ALL = 0x04;
const SwComboBoxStyle CBS_FILENAME = 0x08;
-#ifdef WIN
- const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER;
-#else
const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME;
-#endif
}
class SW_DLLPUBLIC SwComboBox : public ComboBox
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 039f9ff32c..85b33fda78 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -452,7 +452,7 @@ public:
inline SwEditWin &GetEditWin() { return *pEditWin; }
inline const SwEditWin &GetEditWin () const { return *pEditWin; }
-#if defined WIN || defined WNT || defined UNX
+#if defined WNT || defined UNX
void ScannerEventHdl( const ::com::sun::star::lang::EventObject& rEventObject );
#endif
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx
index d58e80a542..8060006c3f 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/ui/uiview/uivwimp.cxx
@@ -294,7 +294,7 @@ SwScannerEventListener::~SwScannerEventListener()
void SAL_CALL SwScannerEventListener::disposing( const EventObject& rEventObject) throw(uno::RuntimeException)
{
vos::OGuard aGuard(Application::GetSolarMutex());
-#if defined WIN || defined WNT || defined UNX
+#if defined WNT || defined UNX
if( pView )
pView->ScannerEventHdl( rEventObject );
#endif
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 10b3c58bd8..8d750d9234 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -1759,7 +1759,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
/*-----------------02.12.96 12:36-------------------
--------------------------------------------------*/
-#if defined WIN || defined WNT || defined UNX
+#if defined WNT || defined UNX
void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ )
{
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 6bba1778e8..8fd614acf0 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -910,7 +910,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
GetViewFrame()->GetBindings().Invalidate( nSlot );
}
break;
-#if defined WIN || defined WNT || defined UNX
+#if defined WNT || defined UNX
case SID_TWAIN_SELECT:
case SID_TWAIN_TRANSFER:
GetViewImpl()->ExecuteScan( rReq );
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index ff452ef209..ccd7a13381 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -228,7 +228,7 @@ void SwView::GetState(SfxItemSet &rSet)
break;
case SID_TWAIN_SELECT:
case SID_TWAIN_TRANSFER:
-#if defined WIN || defined WNT || defined UNX
+#if defined WNT || defined UNX
{
if(!SW_MOD()->GetScannerManager().is())
rSet.DisableItem(nWhich);
--
cgit v1.2.3