diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 00:10:32 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 00:10:32 -0500 |
| commit | 2e75f8d75c1e214eb22b1ccf6cf6f3d01b05007f (patch) | |
| tree | 2e8068048cd89e7dcfd2e852b897e3f7808cc6a8 /sfx2 | |
| parent | 90090c56845dcd942638a2852b9a09e3972d05d6 (diff) | |
merge vosremoval-socket patch
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/pch/precompiled_sfx2.hxx | 3 | ||||
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 34f810f8dd50..187f914c536d 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 f3da4e634e41..14935f0e8a91 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 |