[Libreoffice-commits] .: avmedia/source basic/source desktop/source fpicker/source framework/source ucb/source

Fridrich Strba fridrich at kemper.freedesktop.org
Fri Mar 25 10:58:21 PDT 2011 

 avmedia/source/gstreamer/gstframegrabber.cxx               |    2 --
 avmedia/source/win/framegrabber.cxx                        |    2 --
 avmedia/source/win/player.cxx                              |    2 --
 avmedia/source/win/window.cxx                              |    2 --
 basic/source/app/process.cxx                               |    4 ----
 basic/source/runtime/methods.cxx                           |    2 --
 basic/source/sbx/sbxdec.hxx                                |    5 -----
 desktop/source/app/appsys.cxx                              |    2 --
 desktop/source/app/lockfile.cxx                            |    5 +----
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |    2 --
 fpicker/source/generic/fpicker.cxx                         |    2 --
 fpicker/source/odma/ODMAFilePicker.cxx                     |    2 --
 fpicker/source/odma/ODMAFolderPicker.cxx                   |    2 --
 framework/source/uielement/recentfilesmenucontroller.cxx   |    2 --
 ucb/source/ucp/odma/odma_lib.cxx                           |    2 --
 ucb/source/ucp/odma/odma_provider.hxx                      |    2 --
 16 files changed, 1 insertion(+), 39 deletions(-)

New commits:
commit 4aeaf2e0b8856d1617a301467c15d8fef00be2b5
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 25 18:57:59 2011 +0100

    Wholesale prewin.h/postwin.h removal

diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index e0b161c..fc775fe 100755
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -26,13 +26,11 @@
  *
  ************************************************************************/
 
-#include <prewin.h>
 #include <objbase.h>
 #include <strmif.h>
 #include <Amvideo.h>
 #include <Qedit.h>
 #include <uuids.h>
-#include <postwin.h>
 
 #include "framegrabber.hxx"
 #include "player.hxx"
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 9633aa7..ced849b 100755
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <prewin.h>
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
@@ -43,7 +42,6 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include <postwin.h>
 
 #include "framegrabber.hxx"
 #include "player.hxx"
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index f44f22f..133d26e 100755
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <prewin.h>
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
@@ -39,7 +38,6 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include <postwin.h>
 
 #include "player.hxx"
 #include "framegrabber.hxx"
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 1f9dd0f..7d7a1cd 100755
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <prewin.h>
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
@@ -38,7 +37,6 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include <postwin.h>
 #include <com/sun/star/awt/SystemPointer.hdl>
 
 #include "window.hxx"
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 6289b5d..7d507ec 100755
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -30,10 +30,6 @@
 #include "precompiled_basic.hxx"
 
 
-#ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
-#endif
 #include <tools/errcode.hxx>
 #include <basic/sbxcore.hxx>
 #include <tools/string.hxx>
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 2a319c4..52ead18 100755
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -52,8 +52,6 @@
 #include "runtime.hxx"
 #include "sbunoobj.hxx"
 #ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
 #include <tools/fsys.hxx>
 #else
 #include <osl/file.hxx>
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index 69ca707..f94167b 100755
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -34,17 +34,12 @@
 
 #undef WB_LEFT
 #undef WB_RIGHT
-#include <prewin.h>
-}	// close extern "C" {
 
 #ifndef __MINGW32__
 #include <comutil.h>
 #endif
 #include <oleauto.h>
 
-extern "C" {	// reopen extern "C" {
-#include <postwin.h>
-
 #endif
 #endif
 #include <basic/sbx.hxx>
diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx
index 06264c3..d28ddae 100755
--- a/desktop/source/app/appsys.cxx
+++ b/desktop/source/app/appsys.cxx
@@ -35,8 +35,6 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <prewin.h>
-#include <postwin.h>
 #include <tools/urlobj.hxx>
 
 
diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx
index c2b2b1b..a41f652 100755
--- a/desktop/source/app/lockfile.cxx
+++ b/desktop/source/app/lockfile.cxx
@@ -30,10 +30,7 @@
 #include "precompiled_desktop.hxx"
 #include <stdlib.h>
 #include <time.h>
-#ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
-#else
+#ifndef WNT
 #include <unistd.h>
 #endif
 #include <sal/types.h>
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 4fa87eb..0c7f736 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -102,9 +102,7 @@
 #endif
 
 #ifdef WNT
-#include "prewin.h"
 #include <objbase.h>
-#include "postwin.h"
 #endif
 
 
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 83f336b..69bb2ff 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -35,8 +35,6 @@
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 
 #ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
 #include <odma_lib.hxx>
 #endif
 
diff --git a/fpicker/source/odma/ODMAFilePicker.cxx b/fpicker/source/odma/ODMAFilePicker.cxx
index 80b767d..cd87c80 100644
--- a/fpicker/source/odma/ODMAFilePicker.cxx
+++ b/fpicker/source/odma/ODMAFilePicker.cxx
@@ -49,8 +49,6 @@
 #include <unotools/ucbhelper.hxx>
 
 #ifndef ODMA_LIB_HXX
-#include <prewin.h>
-#include <postwin.h>
 #include <odma_lib.hxx>
 #endif
 
diff --git a/fpicker/source/odma/ODMAFolderPicker.cxx b/fpicker/source/odma/ODMAFolderPicker.cxx
index 15490f4..49963c3 100644
--- a/fpicker/source/odma/ODMAFolderPicker.cxx
+++ b/fpicker/source/odma/ODMAFolderPicker.cxx
@@ -43,9 +43,7 @@
 #include <unotools/pathoptions.hxx>
 
 #ifndef ODMA_LIB_HXX
-#include <prewin.h>
 #include <odma_lib.hxx>
-#include <postwin.h>
 #endif
 
 // using ----------------------------------------------------------------
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index dd0c954..9f5e81e 100755
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -59,8 +59,6 @@
 #include <cppuhelper/implbase1.hxx>
 #include <osl/file.hxx>
 #ifdef WNT
-#include <prewin.h>
-#include <postwin.h>
 #include <odma_lib.hxx>
 #endif
 #include <dispatch/uieventloghelper.hxx>
diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx
index e83962f..54d2f02 100755
--- a/ucb/source/ucp/odma/odma_lib.cxx
+++ b/ucb/source/ucp/odma/odma_lib.cxx
@@ -30,8 +30,6 @@
 #include "precompiled_ucb.hxx"
 #include <osl/module.h>
 #include <rtl/ustring.hxx>
-#include <prewin.h>
-#include <postwin.h>
 #include "odma_lib.hxx"
 
 
diff --git a/ucb/source/ucp/odma/odma_provider.hxx b/ucb/source/ucp/odma/odma_provider.hxx
index ce0e3d1..691ca71 100755
--- a/ucb/source/ucp/odma/odma_provider.hxx
+++ b/ucb/source/ucp/odma/odma_provider.hxx
@@ -30,8 +30,6 @@
 #define ODMA_PROVIDER_HXX
 
 #include <ucbhelper/providerhelper.hxx>
-#include <prewin.h>
-#include <postwin.h>
 #include "odma_lib.hxx"
 
 #include "rtl/ref.hxx"

More information about the Libreoffice-commits mailing list