vcl/osx/DataFlavorMapping.cxx | 8 ++--
vcl/osx/DataFlavorMapping.hxx | 8 ++--
vcl/osx/DropTarget.cxx | 2 -
vcl/osx/OSXTransferable.cxx | 74 +++++++++++++++++++++---------------------
vcl/osx/OSXTransferable.hxx | 3 -
5 files changed, 46 insertions(+), 49 deletions(-)
New commits:
commit 3a298c37c451d2b6c259dae2c8efb35a3513562c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon May 11 08:41:14 2015 +0200
loplugin:staticmethods
Change-Id: If28afc6a2936b150e6659ed84c5ecac9f4c54edc
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index cf7d527..6d25ce6 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -531,7 +531,7 @@ const NSString* DataFlavorMapper::openOfficeToSystemFlavor(
const DataFlavor& oO
return sysFlavor;
}
-NSString* DataFlavorMapper::openOfficeImageToSystemFlavor(NSPasteboard*
pPasteboard) const
+NSString* DataFlavorMapper::openOfficeImageToSystemFlavor(NSPasteboard*
pPasteboard)
{
NSArray *supportedTypes = [NSArray arrayWithObjects: NSTIFFPboardType,
nil];
NSString *sysFlavor = [pPasteboard availableTypeFromArray:supportedTypes];
@@ -592,12 +592,12 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(
const NSString* systemFlavo
return dp;
}
-DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString*
/*systemFlavor*/, NSArray* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString*
/*systemFlavor*/, NSArray* systemData)
{
return DataProviderPtr_t(new FileListDataProvider(systemData));
}
-DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString*
systemFlavor, NSData* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString*
systemFlavor, NSData* systemData)
{
DataProviderPtr_t dp;
@@ -697,7 +697,7 @@
com::sun::star::uno::Sequence<com::sun::star::datatransfer::DataFlavor> DataFlav
return flavors;
}
-NSArray* DataFlavorMapper::getAllSupportedPboardTypes() const
+NSArray* DataFlavorMapper::getAllSupportedPboardTypes()
{
NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity:
SIZE_FLAVOR_MAP];
diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index 1917aeb..b05d122 100644
--- a/vcl/osx/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -80,7 +80,7 @@ public:
If there is no suitable mapping available NULL will
be returned.
*/
- NSString* openOfficeImageToSystemFlavor(NSPasteboard* pPasteboard) const;
+ static NSString* openOfficeImageToSystemFlavor(NSPasteboard* pPasteboard);
/* Get a data provider which is able to provide the data 'rTransferable'
offers in a format that can
be put on to the system clipboard.
@@ -90,11 +90,11 @@ public:
/* Get a data provider which is able to provide 'systemData' in the OOo
expected format.
*/
- DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSArray*
systemData) const;
+ static DataProviderPtr_t getDataProvider( const NSString* systemFlavor,
NSArray* systemData);
/* Get a data provider which is able to provide 'systemData' in the OOo
expected format.
*/
- DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSData*
systemData) const;
+ static DataProviderPtr_t getDataProvider( const NSString* systemFlavor,
NSData* systemData);
/* Translate a sequence of DataFlavors into a NSArray of system types.
Only those DataFlavors for which a suitable mapping to a system
@@ -110,7 +110,7 @@ public:
/* Returns an NSArray containing all pasteboard types supported by OOo
*/
- NSArray* getAllSupportedPboardTypes() const;
+ static NSArray* getAllSupportedPboardTypes();
private:
/* Determines if the provided Mime content type is valid.
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index 13190ff..2b90bd5 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -369,7 +369,7 @@ void SAL_CALL DropTarget::initialize(const Sequence< Any >&
aArguments)
mDropTargetHelper = [[DropTargetHelper alloc] initWithDropTarget: this];
[(id <DraggingDestinationHandler>)mView
registerDraggingDestinationHandler:mDropTargetHelper];
- [mView registerForDraggedTypes:
mDataFlavorMapper->getAllSupportedPboardTypes()];
+ [mView registerForDraggedTypes:
DataFlavorMapper::getAllSupportedPboardTypes()];
id wnd = [mView window];
NSWindow* parentWnd = [wnd parentWindow];
diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index 1da368a..120f6b1 100644
--- a/vcl/osx/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
@@ -42,6 +42,40 @@ namespace // private
return ((len > 0) && ((dtype ==
cppu::UnoType<Sequence<sal_Int8>>::get()) || (dtype ==
cppu::UnoType<OUString>::get())));
}
+bool cmpAllContentTypeParameter(const Reference<XMimeContentType> xLhs,
+ const
Reference<XMimeContentType> xRhs)
+{
+ Sequence<OUString> xLhsFlavors = xLhs->getParameters();
+ Sequence<OUString> xRhsFlavors = xRhs->getParameters();
+
+ // Stop here if the number of parameters is different already
+ if (xLhsFlavors.getLength() != xRhsFlavors.getLength())
+ return false;
+
+ try
+ {
+ OUString pLhs;
+ OUString pRhs;
+
+ for (sal_Int32 i = 0; i < xLhsFlavors.getLength(); i++)
+ {
+ pLhs = xLhs->getParameterValue(xLhsFlavors[i]);
+ pRhs = xRhs->getParameterValue(xLhsFlavors[i]);
+
+ if (!pLhs.equalsIgnoreAsciiCase(pRhs))
+ {
+ return false;
+ }
+ }
+ }
+ catch(IllegalArgumentException&)
+ {
+ return false;
+ }
+
+ return true;
+}
+
} // namespace private
OSXTransferable::OSXTransferable(const Reference<XMimeContentTypeFactory>
rXMimeCntFactory,
@@ -73,19 +107,19 @@ Any SAL_CALL OSXTransferable::getTransferData( const
DataFlavor& aFlavor )
bool bInternal(false);
NSString* sysFormat =
(aFlavor.MimeType.startsWith("image/png"))
- ? mDataFlavorMapper->openOfficeImageToSystemFlavor( mPasteboard )
+ ? DataFlavorMapper::openOfficeImageToSystemFlavor( mPasteboard )
: mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor, bInternal);
DataProviderPtr_t dp;
if ([sysFormat caseInsensitiveCompare: NSFilenamesPboardType] ==
NSOrderedSame)
{
NSArray* sysData = [mPasteboard propertyListForType: sysFormat];
- dp = mDataFlavorMapper->getDataProvider(sysFormat, sysData);
+ dp = DataFlavorMapper::getDataProvider(sysFormat, sysData);
}
else
{
NSData* sysData = [mPasteboard dataForType: sysFormat];
- dp = mDataFlavorMapper->getDataProvider(sysFormat, sysData);
+ dp = DataFlavorMapper::getDataProvider(sysFormat, sysData);
}
if (dp.get() == NULL)
@@ -152,38 +186,4 @@ bool OSXTransferable::compareDataFlavors(const DataFlavor&
lhs, const DataFlavor
return true;
}
-bool OSXTransferable::cmpAllContentTypeParameter(const
Reference<XMimeContentType> xLhs,
- const
Reference<XMimeContentType> xRhs) const
-{
- Sequence<OUString> xLhsFlavors = xLhs->getParameters();
- Sequence<OUString> xRhsFlavors = xRhs->getParameters();
-
- // Stop here if the number of parameters is different already
- if (xLhsFlavors.getLength() != xRhsFlavors.getLength())
- return false;
-
- try
- {
- OUString pLhs;
- OUString pRhs;
-
- for (sal_Int32 i = 0; i < xLhsFlavors.getLength(); i++)
- {
- pLhs = xLhs->getParameterValue(xLhsFlavors[i]);
- pRhs = xRhs->getParameterValue(xLhsFlavors[i]);
-
- if (!pLhs.equalsIgnoreAsciiCase(pRhs))
- {
- return false;
- }
- }
- }
- catch(IllegalArgumentException&)
- {
- return false;
- }
-
- return true;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index 5724a19..5b8df02 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -67,9 +67,6 @@ public:
bool compareDataFlavors( const com::sun::star::datatransfer::DataFlavor& lhs,
const com::sun::star::datatransfer::DataFlavor& rhs
);
- bool cmpAllContentTypeParameter( const com::sun::star::uno::Reference<
com::sun::star::datatransfer::XMimeContentType > xLhs,
- const com::sun::star::uno::Reference<
com::sun::star::datatransfer::XMimeContentType > xRhs ) const;
-
private:
com::sun::star::uno::Sequence< com::sun::star::datatransfer::DataFlavor >
mFlavorList;
::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
