[Libreoffice-commits] .: sfx2/inc sfx2/source

[Norbert Thiebaud]

 sfx2/inc/pch/precompiled_sfx2.hxx |    3 +--
 sfx2/source/appl/appbas.cxx       |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 32d0d2161a6005bb170a4c618cb66dbc09c0dcc8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 00:10:32 2010 -0500

    merge vosremoval-socket patch

diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 308d41e..74f64c4 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -465,6 +465,7 @@
 #include "osl/mutex.hxx"
 #include "osl/process.h"
 #include "osl/security.hxx"
+#include "osl/socket.hxx"
 #include "osl/thread.h"
 #include "osl/thread.hxx"
 #include "rsc/rscsfx.hxx"
@@ -661,8 +662,6 @@
 #include "vos/mutex.hxx"
 #include "vos/process.hxx"
 #include "vos/security.hxx"
-#include "vos/socket.hxx"
-#include "osl/thread.hxx"
 #include "vos/xception.hxx"
 //---MARKER---
 #endif
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 2482f98..6612ebb 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -87,7 +87,7 @@
 #define ITEMID_SEARCH SID_SEARCH_ITEM
 
 #include <svl/srchitem.hxx>
-#include <vos/socket.hxx>
+#include <osl/socket.hxx>
 
 #define SFX_TYPEMAP
 #define Selection