vcl2gnumake: solve some merge problems

6 files changed, 16 insertions, 12 deletions

diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index 28e427dbd536..f3e73b765c94 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -146,7 +146,7 @@ Sequence<OUString> dragSource_getSupportedServiceNames()
                              bDropSuccess );
 
     mDragSource->mXDragSrcListener->dragDropEnd(dsde);
-    mDragSource->mXDragSrcListener = Reference<XDragSourceListener>();
+    mDragSource->mXDragSrcListener = uno::Reference<XDragSourceListener>();
 }
 
 
@@ -252,10 +252,6 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
                                     sal_Int8 sourceActions,
                                     sal_Int32 /*cursor*/,
                                     sal_Int32 /*image*/,
-                                    const Reference<XTransferable >& transferable,
-                                    const Reference<XDragSourceListener >& listener )
-                                    sal_Int32 cursor,
-                                    sal_Int32 image,
                                     const uno::Reference<XTransferable >& transferable,
                                     const uno::Reference<XDragSourceListener >& listener )
   throw( RuntimeException)
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index ecd3e241dd7c..b55a70872372 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -50,8 +50,8 @@
 #include <Carbon/Carbon.h>
 #include <postmac.h>
 
-#include <salframe.h>
-#include <salframeview.h>
+#include <aqua/salframe.h>
+#include <aqua/salframeview.h>
 
 using namespace rtl;
 using namespace cppu;
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 8a9c52d33379..3c228ffcfa40 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -44,7 +44,6 @@
 
 #include "vcl/sysdata.hxx"
 #include "vcl/svapp.hxx"
-#include "vcl/region.h"
 
 #include "aqua/salconst.h"
 #include "aqua/salgdi.h"
@@ -55,6 +54,7 @@
 
 #include "fontsubset.hxx"
 #include "impfont.hxx"
+#include "region.h"
 #include "sallayout.hxx"
 #include "sft.hxx"
 
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 {
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 09d3e7372c22..01f6a3b60f6d 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -63,6 +63,7 @@
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/lineinfo.hxx>
+#include "vcl/cvtgrf.hxx"
 #include "vcl/strhelper.hxx"
 
 #include <fontsubset.hxx>
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index daf0d6352c46..9d8bee00ef24 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -44,13 +44,13 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/print.hxx>
-#include <vcl/svids.hrc>
 
 #include <salinst.hxx>
 #include <salgdi.hxx>
 #include <salptype.hxx>
 #include <salprn.hxx>
 #include <svdata.hxx>
+#include <svids.hrc>
 #include <jobset.h>
 #include <outdev.h>
 #include <print.h>