diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-24 10:44:59 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-24 10:44:59 +0100 |
| commit | c80267e6ed2feef852066981b3c98f37de800c83 (patch) | |
| tree | 3cbc0552fca6c3d34247472e0f28e50890b6b698 /vcl/inc/svdata.hxx | |
| parent | d67e92069b9fb109e33a5133326eef51bf99aeb8 (diff) | |
vcl2gnumake: solve some merge problems
Diffstat (limited to 'vcl/inc/svdata.hxx')
| -rw-r--r-- | vcl/inc/svdata.hxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 9c91915823b2..5dba6441cd1c 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -29,20 +29,27 @@ #define _SV_SVDATA_HXX #include "rtl/ref.hxx" + #include "vos/thread.hxx" + #include "tools/string.hxx" #include "tools/gen.hxx" #include "tools/shl.hxx" #include "tools/link.hxx" #include "tools/fldunit.hxx" -#include "vcl/vclevent.hxx" -#include "vcl/sv.h" #include "tools/color.hxx" #include "tools/debug.hxx" + +#include "vcl/vclevent.hxx" +#include "vcl/sv.h" #include "vcl/dllapi.h" -#include "com/sun/star/uno/Reference.hxx" + #include "unotools/options.hxx" +#include "xconnection.hxx" + +#include "com/sun/star/uno/Reference.hxx" + #include <hash_map> namespace com { |