7 files changed, 6 insertions, 10 deletions
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index 298e5cb7611e..436f4bd27df6 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -51,7 +51,7 @@
 
 #include <unomid.h>
 
-#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 0c31a9ab977f..a0d7ebf03ca1 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 d63149eb7c4f..a21dc8cfb30e 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 20dc6035dc36..73ec9ab71dd4 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 4396ff03807c..15c94782883f 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 3a7003ff7bca..eeab95b5bccd 100755..100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -913,7 +913,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 b0d5f71744c9..40ba6e3c6d2d 100755..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);