mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup osx/clipboard.{cxx,hxx}

Browse Source 
Change-Id: Iff472d81f7ef0a3371a0735f025a72c595321efd
Reviewed-on: https://gerrit.libreoffice.org/71352
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2019-04-26 14:24:58 +09:00
committed by Tomaž Vajngerl
parent 43f8ea2195
commit 785b300a26
2 changed files with 87 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
vcl/osx/clipboard.cxx
View File

@@ -26,14 +26,7 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
using namespace com::sun::star::datatransfer; using namespace css;
using namespace com::sun::star::datatransfer::clipboard;
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
using namespace cppu;
using namespace osl;
using namespace std;
using namespace comphelper;
@implementation EventListener; @implementation EventListener;
@@ -71,18 +64,18 @@ static OUString clipboard_getImplementationName()
return OUString("com.sun.star.datatransfer.clipboard.AquaClipboard"); return OUString("com.sun.star.datatransfer.clipboard.AquaClipboard");
} }
static Sequence<OUString> clipboard_getSupportedServiceNames() static uno::Sequence<OUString> clipboard_getSupportedServiceNames()
{ {
return { OUString("com.sun.star.datatransfer.clipboard.SystemClipboard") }; return { OUString("com.sun.star.datatransfer.clipboard.SystemClipboard") };
} }
AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard) : AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard)
WeakComponentImplHelper<XSystemClipboard, XFlushableClipboard, XServiceInfo>(m_aMutex), : WeakComponentImplHelper<XSystemClipboard, XFlushableClipboard, XServiceInfo>(m_aMutex)
mIsSystemPasteboard(bUseSystemPasteboard) , mIsSystemPasteboard(bUseSystemPasteboard)
{ {
Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); uno::Reference<uno::XComponentContext> xContext = comphelper::getProcessComponentContext();
mrXMimeCntFactory = MimeContentTypeFactory::create(xContext); mrXMimeCntFactory = datatransfer::MimeContentTypeFactory::create(xContext);
mpDataFlavorMapper = DataFlavorMapperPtr_t(new DataFlavorMapper()); mpDataFlavorMapper = DataFlavorMapperPtr_t(new DataFlavorMapper());
@@ -100,7 +93,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard
if (mPasteboard == nil) if (mPasteboard == nil)
{ {
throw RuntimeException("AquaClipboard: Cannot create Cocoa pasteboard", throw uno::RuntimeException("AquaClipboard: Cannot create Cocoa pasteboard",
static_cast<XClipboardEx*>(this)); static_cast<XClipboardEx*>(this));
} }
} }
@@ -113,7 +106,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard
{ {
[mPasteboard release]; [mPasteboard release];
throw RuntimeException( throw uno::RuntimeException(
"AquaClipboard: Cannot create pasteboard change listener", "AquaClipboard: Cannot create pasteboard change listener",
static_cast<XClipboardEx*>(this)); static_cast<XClipboardEx*>(this));
} }
@@ -143,9 +136,9 @@ AquaClipboard::~AquaClipboard()
[mPasteboard release]; [mPasteboard release];
} }
Reference<XTransferable> SAL_CALL AquaClipboard::getContents() uno::Reference<datatransfer::XTransferable> SAL_CALL AquaClipboard::getContents()
{ {
MutexGuard aGuard(m_aMutex); osl::MutexGuard aGuard(m_aMutex);
// Shortcut: If we are clipboard owner already we don't need // Shortcut: If we are clipboard owner already we don't need
// to drag the data through the system clipboard // to drag the data through the system clipboard
@@ -154,24 +147,26 @@ Reference<XTransferable> SAL_CALL AquaClipboard::getContents()
return mXClipboardContent; return mXClipboardContent;
} }
return Reference<XTransferable>(new OSXTransferable(mrXMimeCntFactory, return uno::Reference<datatransfer::XTransferable>(
mpDataFlavorMapper, new OSXTransferable(mrXMimeCntFactory,
mPasteboard)); mpDataFlavorMapper,
mPasteboard));
} }
void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransferable, void SAL_CALL AquaClipboard::setContents(
const Reference<XClipboardOwner>& xClipboardOwner) uno::Reference<datatransfer::XTransferable> const & xTransferable,
uno::Reference<datatransfer::clipboard::XClipboardOwner> const & xClipboardOwner)
{ {
NSArray* types = xTransferable.is() ? NSArray* types = xTransferable.is() ?
mpDataFlavorMapper->flavorSequenceToTypesArray(xTransferable->getTransferDataFlavors()) : mpDataFlavorMapper->flavorSequenceToTypesArray(xTransferable->getTransferDataFlavors()) :
[NSArray array]; [NSArray array];
ClearableMutexGuard aGuard(m_aMutex); osl::ClearableMutexGuard aGuard(m_aMutex);
Reference<XClipboardOwner> oldOwner(mXClipboardOwner); uno::Reference<datatransfer::clipboard::XClipboardOwner> oldOwner(mXClipboardOwner);
mXClipboardOwner = xClipboardOwner; mXClipboardOwner = xClipboardOwner;
Reference<XTransferable> oldContent(mXClipboardContent); uno::Reference<datatransfer::XTransferable> oldContent(mXClipboardContent);
mXClipboardContent = xTransferable; mXClipboardContent = xTransferable;
mPasteboardChangeCount = [mPasteboard declareTypes: types owner: mEventListener]; mPasteboardChangeCount = [mPasteboard declareTypes: types owner: mEventListener];
@@ -198,88 +193,97 @@ sal_Int8 SAL_CALL AquaClipboard::getRenderingCapabilities()
return 0; return 0;
} }
void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardListener >& listener) void SAL_CALL AquaClipboard::addClipboardListener(uno::Reference<datatransfer::clipboard::XClipboardListener> const & listener)
{ {
MutexGuard aGuard(m_aMutex); osl::MutexGuard aGuard(m_aMutex);
if (!listener.is()) if (!listener.is())
throw IllegalArgumentException("empty reference", throw lang::IllegalArgumentException("empty reference",
static_cast<XClipboardEx*>(this), 1); static_cast<XClipboardEx*>(this), 1);
mClipboardListeners.push_back(listener); mClipboardListeners.push_back(listener);
} }
void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboardListener >& listener) void SAL_CALL AquaClipboard::removeClipboardListener(uno::Reference<datatransfer::clipboard::XClipboardListener> const & listener)
{ {
MutexGuard aGuard(m_aMutex); osl::MutexGuard aGuard(m_aMutex);
if (!listener.is()) if (!listener.is())
throw IllegalArgumentException("empty reference", throw lang::IllegalArgumentException("empty reference",
static_cast<XClipboardEx*>(this), 1); static_cast<XClipboardEx*>(this), 1);
mClipboardListeners.remove(listener); mClipboardListeners.remove(listener);
} }
void AquaClipboard::applicationDidBecomeActive(NSNotification*) void AquaClipboard::applicationDidBecomeActive(NSNotification*)
{ {
ClearableMutexGuard aGuard(m_aMutex); osl::ClearableMutexGuard aGuard(m_aMutex);
int currentPboardChgCount = [mPasteboard changeCount]; int currentPboardChgCount = [mPasteboard changeCount];
if (currentPboardChgCount != mPasteboardChangeCount) if (currentPboardChgCount != mPasteboardChangeCount)
{ {
mPasteboardChangeCount = currentPboardChgCount; mPasteboardChangeCount = currentPboardChgCount;
// Clear clipboard content and owner and send lostOwnership // Clear clipboard content and owner and send lostOwnership
// notification to the old clipboard owner as well as // notification to the old clipboard owner as well as
// ClipboardChanged notification to any clipboard listener // ClipboardChanged notification to any clipboard listener
Reference<XClipboardOwner> oldOwner(mXClipboardOwner); uno::Reference<datatransfer::clipboard::XClipboardOwner> oldOwner(mXClipboardOwner);
mXClipboardOwner.clear(); mXClipboardOwner.clear();
Reference<XTransferable> oldContent(mXClipboardContent); uno::Reference<datatransfer::XTransferable> oldContent(mXClipboardContent);
mXClipboardContent.clear(); mXClipboardContent.clear();
aGuard.clear(); aGuard.clear();
if (oldOwner.is()) if (oldOwner.is())
{ {
fireLostClipboardOwnershipEvent(oldOwner, oldContent); fireLostClipboardOwnershipEvent(oldOwner, oldContent);
} }
fireClipboardChangedEvent(); fireClipboardChangedEvent();
} }
} }
void AquaClipboard::fireClipboardChangedEvent() void AquaClipboard::fireClipboardChangedEvent()
{ {
ClearableMutexGuard aGuard(m_aMutex); osl::ClearableMutexGuard aGuard(m_aMutex);
list<Reference< XClipboardListener > > listeners(mClipboardListeners); datatransfer::clipboard::ClipboardEvent aEvent;
ClipboardEvent aEvent;
if (!listeners.empty()) if (!mClipboardListeners.empty())
{ {
aEvent = ClipboardEvent(static_cast<OWeakObject*>(this), getContents()); aEvent = datatransfer::clipboard::ClipboardEvent(static_cast<OWeakObject*>(this), getContents());
} }
aGuard.clear(); aGuard.clear();
for (auto const& listener : listeners) for (auto const& rListener : mClipboardListeners)
{ {
if (listener.is()) if (rListener.is())
{ {
try { listener->changedContents(aEvent); } try
catch (RuntimeException&) { } {
rListener->changedContents(aEvent);
}
catch (uno::RuntimeException& )
{}
} }
} }
} }
void AquaClipboard::fireLostClipboardOwnershipEvent(Reference<XClipboardOwner> const & oldOwner, Reference<XTransferable> const & oldContent) void AquaClipboard::fireLostClipboardOwnershipEvent(
uno::Reference<datatransfer::clipboard::XClipboardOwner> const & rOldOwner,
uno::Reference<datatransfer::XTransferable> const & rOldContent)
{ {
assert(oldOwner.is()); assert(rOldOwner.is());
try { oldOwner->lostOwnership(static_cast<XClipboardEx*>(this), oldContent); } try
catch(RuntimeException&) { } {
rOldOwner->lostOwnership(static_cast<XClipboardEx*>(this), rOldContent);
}
catch(uno::RuntimeException&)
{}
} }
void AquaClipboard::provideDataForType(NSPasteboard* sender, const NSString* type) void AquaClipboard::provideDataForType(NSPasteboard* sender, const NSString* type)
@@ -301,7 +305,7 @@ void SAL_CALL AquaClipboard::flushClipboard()
{ {
if (mXClipboardContent.is()) if (mXClipboardContent.is())
{ {
Sequence<DataFlavor> flavorList = mXClipboardContent->getTransferDataFlavors(); uno::Sequence<datatransfer::DataFlavor> flavorList = mXClipboardContent->getTransferDataFlavors();
sal_uInt32 nFlavors = flavorList.getLength(); sal_uInt32 nFlavors = flavorList.getLength();
bool bInternal(false); bool bInternal(false);
@@ -328,12 +332,12 @@ OUString SAL_CALL AquaClipboard::getImplementationName()
return clipboard_getImplementationName(); return clipboard_getImplementationName();
} }
sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName ) sal_Bool SAL_CALL AquaClipboard::supportsService(OUString const & rServiceName)
{ {
return cppu::supportsService(this, ServiceName); return cppu::supportsService(this, rServiceName);
} }
Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames() uno::Sequence<OUString> SAL_CALL AquaClipboard::getSupportedServiceNames()
{ {
return clipboard_getSupportedServiceNames(); return clipboard_getSupportedServiceNames();
} }

33
vcl/osx/clipboard.hxx
View File

@@ -62,9 +62,9 @@ class AquaClipboard;
@end @end
class AquaClipboard : public ::cppu::BaseMutex, class AquaClipboard : public ::cppu::BaseMutex,
public ::cppu::WeakComponentImplHelper< css::datatransfer::clipboard::XSystemClipboard, public ::cppu::WeakComponentImplHelper<css::datatransfer::clipboard::XSystemClipboard,
css::datatransfer::clipboard::XFlushableClipboard, css::datatransfer::clipboard::XFlushableClipboard,
css::lang::XServiceInfo > css::lang::XServiceInfo>
{ {
public: public:
/* Create a clipboard instance. /* Create a clipboard instance.
@@ -87,10 +87,10 @@ public:
// XClipboard // XClipboard
virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override; virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getContents() override;
virtual void SAL_CALL setContents( const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable, virtual void SAL_CALL setContents(css::uno::Reference<css::datatransfer::XTransferable> const & xTransferable,
const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override; css::uno::Reference<css::datatransfer::clipboard::XClipboardOwner> const & xClipboardOwner) override;
virtual OUString SAL_CALL getName() override; virtual OUString SAL_CALL getName() override;
@@ -100,20 +100,17 @@ public:
// XClipboardNotifier // XClipboardNotifier
virtual void SAL_CALL addClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; virtual void SAL_CALL addClipboardListener(css::uno::Reference<css::datatransfer::clipboard::XClipboardListener> const & listener) override;
virtual void SAL_CALL removeClipboardListener(css::uno::Reference<css::datatransfer::clipboard::XClipboardListener> const & listener) override;
virtual void SAL_CALL removeClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
// XFlushableClipboard // XFlushableClipboard
virtual void SAL_CALL flushClipboard( ) override; virtual void SAL_CALL flushClipboard() override;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() override; virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
/* Get a reference to the used pastboard. /* Get a reference to the used pastboard.
@@ -122,8 +119,8 @@ public:
/* Notify the current clipboard owner that he is no longer the clipboard owner. /* Notify the current clipboard owner that he is no longer the clipboard owner.
*/ */
void fireLostClipboardOwnershipEvent(css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner> const & oldOwner, void fireLostClipboardOwnershipEvent(css::uno::Reference<css::datatransfer::clipboard::XClipboardOwner> const & oldOwner,
css::uno::Reference< css::datatransfer::XTransferable > const & oldContent); css::uno::Reference<css::datatransfer::XTransferable> const & oldContent);
void pasteboardChangedOwner(); void pasteboardChangedOwner();
@@ -139,10 +136,10 @@ private:
void fireClipboardChangedEvent(); void fireClipboardChangedEvent();
private: private:
css::uno::Reference< css::datatransfer::XMimeContentTypeFactory > mrXMimeCntFactory; css::uno::Reference<css::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
::std::list< css::uno::Reference< css::datatransfer::clipboard::XClipboardListener > > mClipboardListeners; std::list<css::uno::Reference<css::datatransfer::clipboard::XClipboardListener>> mClipboardListeners;
css::uno::Reference< css::datatransfer::XTransferable > mXClipboardContent; css::uno::Reference<css::datatransfer::XTransferable> mXClipboardContent;
css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner > mXClipboardOwner; css::uno::Reference<css::datatransfer::clipboard::XClipboardOwner> mXClipboardOwner;
DataFlavorMapperPtr_t mpDataFlavorMapper; DataFlavorMapperPtr_t mpDataFlavorMapper;
bool mIsSystemPasteboard; bool mIsSystemPasteboard;
NSPasteboard* mPasteboard; NSPasteboard* mPasteboard;