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/aqua | |
| parent | d67e92069b9fb109e33a5133326eef51bf99aeb8 (diff) | |
vcl2gnumake: solve some merge problems
Diffstat (limited to 'vcl/aqua')
| -rw-r--r-- | vcl/aqua/source/dtrans/DragSource.cxx | 6 | ||||
| -rw-r--r-- | vcl/aqua/source/dtrans/DropTarget.cxx | 4 | ||||
| -rw-r--r-- | vcl/aqua/source/gdi/salgdi.cxx | 2 |
3 files changed, 4 insertions, 8 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" |