merge vosremoval-socket patch

This commit is contained in:
Norbert Thiebaud 2010-10-11 00:10:32 -05:00
parent 90090c5684
commit 2e75f8d75c
2 changed files with 2 additions and 3 deletions

View file

@ -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

View file

@ -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