diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:33 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:33 +0100 |
| commit | 932fb7b958f8e7204275cb709965b30e390c76ad (patch) | |
| tree | 75f695663a97693416f8a84e140fa61805cf5bd2 /dtrans/source | |
| parent | bb54b94e5f48c4f6dce72f59dc6bc83f17d2c590 (diff) | |
| parent | 78f80b020fe009bc48e9e5f8b7862de51f1f8381 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
dtrans/source/win32/dtobj/XTDataObject.cxx
dtrans/source/win32/dtobj/XTDataObject.hxx
sot/source/sdstor/stgio.cxx
tools/source/debug/debug.cxx
vcl/source/gdi/jobset.cxx
vcl/unx/kde4/KDEData.cxx
vcl/unx/kde4/KDEData.hxx
vcl/unx/kde4/KDESalDisplay.cxx
vcl/unx/kde4/KDESalFrame.cxx
vcl/unx/kde4/KDESalFrame.hxx
vcl/unx/kde4/KDESalGraphics.cxx
vcl/unx/kde4/KDESalGraphics.hxx
vcl/unx/kde4/KDESalInstance.cxx
vcl/unx/kde4/KDESalInstance.hxx
vcl/unx/kde4/KDEXLib.cxx
vcl/unx/kde4/VCLKDEApplication.cxx
vcl/unx/kde4/VCLKDEApplication.hxx
Diffstat (limited to 'dtrans/source')
| -rw-r--r-- | dtrans/source/win32/dtobj/XTDataObject.cxx | 2 | ||||
| -rw-r--r-- | dtrans/source/win32/dtobj/XTDataObject.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index 6d59f9a7445a..e263f7e58292 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -35,7 +35,7 @@ #include <osl/diagnose.h> #include "XTDataObject.hxx" -#include <com/sun/star/datatransfer/dataflavor.hpp> +#include <com/sun/star/datatransfer/DataFlavor.hpp> #include "..\misc\ImplHelper.hxx" #include "DTransHelper.hxx" #include "TxtCnvtHlp.hxx" diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx index 1958be4afcbe..f817d602b0ed 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.hxx +++ b/dtrans/source/win32/dtobj/XTDataObject.hxx @@ -40,7 +40,7 @@ #include "DataFmtTransl.hxx" -#include "FEtcList.hxx" +#include "FetcList.hxx" #if defined _MSC_VER #pragma warning(push,1) |