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

Tor Lillqvist tml at kemper.freedesktop.org
Tue Feb 8 04:05:25 PST 2011 

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

New commits:
commit 5f8ce98726e3b442815bc449069178569ff55cef
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Feb 8 13:06:29 2011 +0200

    Adapt to move of prewin.h and postwin.h

diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index bb3678d..60abcb5 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -26,14 +26,14 @@
  *
  ************************************************************************/
 
-#include <tools/prewin.h>
+#include <prewin.h>
 #include <windows.h>
 #include <objbase.h>
 #include <strmif.h>
 #include <Amvideo.h>
 #include <Qedit.h>
 #include <uuids.h>
-#include <tools/postwin.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 59a9217..852a291 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <tools/prewin.h>
+#include <prewin.h>
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
@@ -44,7 +44,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include <tools/postwin.h>
+#include <postwin.h>
 
 #include "framegrabber.hxx"
 #include "player.hxx"
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 5f45b50..afafc25 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <tools/prewin.h>
+#include <prewin.h>
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
@@ -40,7 +40,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include <tools/postwin.h>
+#include <postwin.h>
 
 #include "player.hxx"
 #include "framegrabber.hxx"
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 917d9f7..05bbfbd 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <tools/prewin.h>
+#include <prewin.h>
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
@@ -39,7 +39,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include <tools/postwin.h>
+#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 397eaad..5e7a78d 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -31,9 +31,9 @@
 
 
 #ifdef WNT
-#include    <tools/prewin.h>
+#include    <prewin.h>
 #include "winbase.h"
-#include    <tools/postwin.h>
+#include    <postwin.h>
 #endif
 #include <tools/errcode.hxx>
 #include <basic/sbxcore.hxx>
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 6ff6418..8e5f356 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -52,9 +52,9 @@
 #include "runtime.hxx"
 #include "sbunoobj.hxx"
 #ifdef WNT
-#include <tools/prewin.h>
+#include <prewin.h>
 #include "winbase.h"
-#include <tools/postwin.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 85d5509..cbe93dd 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -34,7 +34,7 @@
 
 #undef WB_LEFT
 #undef WB_RIGHT
-#include <tools/prewin.h>
+#include <prewin.h>
 }	// close extern "C" {
 
 #ifndef __MINGW32__
@@ -43,7 +43,7 @@
 #include <oleauto.h>
 
 extern "C" {	// reopen extern "C" {
-#include <tools/postwin.h>
+#include <postwin.h>
 
 #endif
 #endif
diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx
index 6194855..5c1f218 100644
--- a/desktop/source/app/appsys.cxx
+++ b/desktop/source/app/appsys.cxx
@@ -35,9 +35,9 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/prewin.h>
+#include <prewin.h>
 #include <winreg.h>
-#include <tools/postwin.h>
+#include <postwin.h>
 #include <tools/urlobj.hxx>
 
 
diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx
index 79c8bca..cbeb474 100644
--- a/desktop/source/app/lockfile.cxx
+++ b/desktop/source/app/lockfile.cxx
@@ -31,9 +31,9 @@
 #include <stdlib.h>
 #include <time.h>
 #ifdef WNT
-#include <tools/prewin.h>
+#include <prewin.h>
 #include <windows.h>
-#include <tools/postwin.h>
+#include <postwin.h>
 #else
 #include <unistd.h>
 #endif
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 867023b..d377441 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -102,9 +102,9 @@
 #endif
 
 #ifdef WNT
-#include "tools/prewin.h"
+#include "prewin.h"
 #include <objbase.h>
-#include "tools/postwin.h"
+#include "postwin.h"
 #endif
 
 
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index cf2251f..867ed72 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -35,8 +35,8 @@
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 
 #ifdef WNT
-#include <tools/prewin.h>
-#include <tools/postwin.h>
+#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 685da9f..80b767d 100644
--- a/fpicker/source/odma/ODMAFilePicker.cxx
+++ b/fpicker/source/odma/ODMAFilePicker.cxx
@@ -49,8 +49,8 @@
 #include <unotools/ucbhelper.hxx>
 
 #ifndef ODMA_LIB_HXX
-#include <tools/prewin.h>
-#include <tools/postwin.h>
+#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 5c9536a..15490f4 100644
--- a/fpicker/source/odma/ODMAFolderPicker.cxx
+++ b/fpicker/source/odma/ODMAFolderPicker.cxx
@@ -43,9 +43,9 @@
 #include <unotools/pathoptions.hxx>
 
 #ifndef ODMA_LIB_HXX
-#include <tools/prewin.h>
+#include <prewin.h>
 #include <odma_lib.hxx>
-#include <tools/postwin.h>
+#include <postwin.h>
 #endif
 
 // using ----------------------------------------------------------------
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index a2c34f9..7fcbb29 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -59,8 +59,8 @@
 #include <cppuhelper/implbase1.hxx>
 #include <osl/file.hxx>
 #ifdef WNT
-#include <tools/prewin.h>
-#include <tools/postwin.h>
+#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 46a9d45..0038a17 100644
--- a/ucb/source/ucp/odma/odma_lib.cxx
+++ b/ucb/source/ucp/odma/odma_lib.cxx
@@ -30,8 +30,8 @@
 #include "precompiled_ucb.hxx"
 #include <osl/module.h>
 #include <rtl/ustring.hxx>
-#include <tools/prewin.h>
-#include <tools/postwin.h>
+#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 4880c6e..ce0e3d1 100644
--- a/ucb/source/ucp/odma/odma_provider.hxx
+++ b/ucb/source/ucp/odma/odma_provider.hxx
@@ -30,8 +30,8 @@
 #define ODMA_PROVIDER_HXX
 
 #include <ucbhelper/providerhelper.hxx>
-#include <tools/prewin.h>
-#include <tools/postwin.h>
+#include <prewin.h>
+#include <postwin.h>
 #include "odma_lib.hxx"
 
 #include "rtl/ref.hxx"

More information about the Libreoffice-commits mailing list