From 0f49c6c3d8d0e8d7410e0346fda31ebf7cd9b00c Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@suse.com>
Date: Fri, 2 Dec 2011 13:53:58 -0500
Subject: [PATCH] Encapsulate implementation of CMtaOleClipboard under win32.

This class is used only for win32 clipboard implementation.  Better
move it to where only the win32 implementation code can access it.
---
 dtrans/Library_sysdtrans.mk                           | 2 +-
 dtrans/source/win32/{mtaole => clipb}/MtaOleClipb.cxx | 2 +-
 dtrans/source/{inc => win32/clipb}/MtaOleClipb.hxx    | 0
 dtrans/source/win32/clipb/WinClipbImpl.hxx            | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename dtrans/source/win32/{mtaole => clipb}/MtaOleClipb.cxx (99%)
 rename dtrans/source/{inc => win32/clipb}/MtaOleClipb.hxx (100%)

diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index ad365db6112e..8fb7a418c139 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -66,8 +66,8 @@ $(eval $(call gb_Library_add_exception_objects,sysdtrans,\
 	dtrans/source/win32/clipb/WinClipbImpl \
 	dtrans/source/win32/clipb/WinClipboard \
 	dtrans/source/win32/clipb/wcbentry \
+	dtrans/source/win32/clipb/MtaOleClipb \
 	dtrans/source/win32/misc/ImplHelper \
-	dtrans/source/win32/mtaole/MtaOleClipb \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/dtrans/source/win32/mtaole/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
similarity index 99%
rename from dtrans/source/win32/mtaole/MtaOleClipb.cxx
rename to dtrans/source/win32/clipb/MtaOleClipb.cxx
index ecf10eb44590..6ad8c3049e72 100644
--- a/dtrans/source/win32/mtaole/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -47,7 +47,7 @@
 //#define UNICODE
 #include <osl/diagnose.h>
 
-#include "../../inc/MtaOleClipb.hxx"
+#include "MtaOleClipb.hxx"
 #include <osl/conditn.hxx>
 
 #include <wchar.h>
diff --git a/dtrans/source/inc/MtaOleClipb.hxx b/dtrans/source/win32/clipb/MtaOleClipb.hxx
similarity index 100%
rename from dtrans/source/inc/MtaOleClipb.hxx
rename to dtrans/source/win32/clipb/MtaOleClipb.hxx
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index aa7a98d62e00..032147850481 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
-#include "../../inc/MtaOleClipb.hxx"
+#include "MtaOleClipb.hxx"
 
 #if defined _MSC_VER
 #pragma warning(push,1)