summaryrefslogtreecommitdiff
path: root/vcl/osx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/osx')
-rw-r--r--vcl/osx/DataFlavorMapping.cxx4
-rw-r--r--vcl/osx/DataFlavorMapping.hxx14
-rw-r--r--vcl/osx/DragActionConversion.cxx4
-rw-r--r--vcl/osx/DragActionConversion.hxx4
-rw-r--r--vcl/osx/DragSource.hxx38
-rw-r--r--vcl/osx/DragSourceContext.hxx10
-rw-r--r--vcl/osx/DropTarget.hxx62
-rw-r--r--vcl/osx/HtmlFmtFlt.hxx6
-rw-r--r--vcl/osx/OSXTransferable.hxx26
-rw-r--r--vcl/osx/PictToBmpFlt.cxx8
-rw-r--r--vcl/osx/PictToBmpFlt.hxx8
-rw-r--r--vcl/osx/a11yfactory.mm2
-rw-r--r--vcl/osx/a11yfocuslistener.hxx2
-rw-r--r--vcl/osx/a11yrolehelper.h2
-rw-r--r--vcl/osx/a11ytextattributeswrapper.mm12
-rw-r--r--vcl/osx/a11yutil.h4
-rw-r--r--vcl/osx/a11ywrapper.mm8
-rw-r--r--vcl/osx/a11ywrappercombobox.h2
-rw-r--r--vcl/osx/clipboard.hxx50
-rw-r--r--vcl/osx/documentfocuslistener.hxx52
-rw-r--r--vcl/osx/salframeview.mm90
21 files changed, 204 insertions, 204 deletions
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 081f6e5f53dc..09bc77d6fe73 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -640,7 +640,7 @@ bool DataFlavorMapper::isValidMimeContentType(const OUString& contentType) const
return result;
}
-NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno::Sequence<com::sun::star::datatransfer::DataFlavor>& flavors) const
+NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const css::uno::Sequence<css::datatransfer::DataFlavor>& flavors) const
{
sal_uInt32 nFlavors = flavors.getLength();
NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity: 1];
@@ -676,7 +676,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno:
return [array autorelease];
}
-com::sun::star::uno::Sequence<com::sun::star::datatransfer::DataFlavor> DataFlavorMapper::typesArrayToFlavorSequence(NSArray* types) const
+css::uno::Sequence<css::datatransfer::DataFlavor> DataFlavorMapper::typesArrayToFlavorSequence(NSArray* types) const
{
int nFormats = [types count];
Sequence<DataFlavor> flavors;
diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index 9632313c8a0b..10cde7ab5330 100644
--- a/vcl/osx/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -48,7 +48,7 @@ public:
/* Get the clipboard data in OOo format.
*/
- virtual com::sun::star::uno::Any getOOoData() = 0;
+ virtual css::uno::Any getOOoData() = 0;
};
typedef std::unique_ptr<DataProvider> DataProviderPtr_t;
@@ -67,13 +67,13 @@ public:
mapping from a system data flavor to a OpenOffice data
flavor.
*/
- com::sun::star::datatransfer::DataFlavor systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const;
+ css::datatransfer::DataFlavor systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const;
/* Map an OpenOffice data flavor to a system data flavor.
If there is no suitable mapping available NULL will
be returned.
*/
- const NSString* openOfficeToSystemFlavor(const com::sun::star::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal) const;
+ const NSString* openOfficeToSystemFlavor(const css::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal) const;
/* Select the best available image data type
If there is no suitable mapping available NULL will
@@ -85,7 +85,7 @@ public:
be put on to the system clipboard.
*/
DataProviderPtr_t getDataProvider( const NSString* systemFlavor,
- const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > rTransferable) const;
+ const css::uno::Reference< css::datatransfer::XTransferable > rTransferable) const;
/* Get a data provider which is able to provide 'systemData' in the OOo expected format.
*/
@@ -99,13 +99,13 @@ public:
Only those DataFlavors for which a suitable mapping to a system
type exist will be contained in the returned types array.
*/
- NSArray* flavorSequenceToTypesArray(const com::sun::star::uno::Sequence<com::sun::star::datatransfer::DataFlavor>& flavors) const;
+ NSArray* flavorSequenceToTypesArray(const css::uno::Sequence<css::datatransfer::DataFlavor>& flavors) const;
/* Translate a NSArray of system types into a sequence of DataFlavors.
Only those types for which a suitable mapping to a DataFlavor
exist will be contained in the new DataFlavor Sequence.
*/
- com::sun::star::uno::Sequence<com::sun::star::datatransfer::DataFlavor> typesArrayToFlavorSequence(NSArray* types) const;
+ css::uno::Sequence<css::datatransfer::DataFlavor> typesArrayToFlavorSequence(NSArray* types) const;
/* Returns an NSArray containing all pasteboard types supported by OOo
*/
@@ -117,7 +117,7 @@ private:
bool isValidMimeContentType(const OUString& contentType) const;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
+ css::uno::Reference< css::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
typedef std::unordered_map< OUString, NSString*, OUStringHash > OfficeOnlyTypes;
mutable OfficeOnlyTypes maOfficeOnlyTypes;
};
diff --git a/vcl/osx/DragActionConversion.cxx b/vcl/osx/DragActionConversion.cxx
index e0c80a09313e..3af6cd010a3f 100644
--- a/vcl/osx/DragActionConversion.cxx
+++ b/vcl/osx/DragActionConversion.cxx
@@ -23,7 +23,7 @@
using namespace com::sun::star::datatransfer::dnd;
/* Convert office drag actions as defined in
- <type>com::sun::star::datatransfer::dnd::DNDConstants</type>
+ <type>css::datatransfer::dnd::DNDConstants</type>
into system conform drag actions.
*/
unsigned int OfficeToSystemDragActions(sal_Int8 dragActions)
@@ -50,7 +50,7 @@ unsigned int OfficeToSystemDragActions(sal_Int8 dragActions)
/* Convert system conform drag actions into office conform
drag actions as defined in
- <type>com::sun::star::datatransfer::dnd::DNDConstants</type>.
+ <type>css::datatransfer::dnd::DNDConstants</type>.
*/
sal_Int8 SystemToOfficeDragActions(unsigned int dragActions)
{
diff --git a/vcl/osx/DragActionConversion.hxx b/vcl/osx/DragActionConversion.hxx
index fbb5ea362b44..47e6ebed5041 100644
--- a/vcl/osx/DragActionConversion.hxx
+++ b/vcl/osx/DragActionConversion.hxx
@@ -27,14 +27,14 @@
#include <postmac.h>
/* Convert office drag actions as defined in
- <type>com::sun::star::datatransfer::dnd::DNDConstants</type>
+ <type>css::datatransfer::dnd::DNDConstants</type>
into system conform drag actions.
*/
unsigned int OfficeToSystemDragActions(sal_Int8 dragActions);
/* Convert system conform drag actions into office conform
drag actions as defined in
- <type>com::sun::star::datatransfer::dnd::DNDConstants</type>.
+ <type>css::datatransfer::dnd::DNDConstants</type>.
*/
sal_Int8 SystemToOfficeDragActions(unsigned int dragActions);
diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx
index 59fbc2575036..e96a3deb0ffc 100644
--- a/vcl/osx/DragSource.hxx
+++ b/vcl/osx/DragSource.hxx
@@ -70,9 +70,9 @@ class AquaSalFrame;
@end
class DragSource : public ::cppu::BaseMutex,
- public ::cppu::WeakComponentImplHelper< com::sun::star::datatransfer::dnd::XDragSource,
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XServiceInfo >,
+ public ::cppu::WeakComponentImplHelper< css::datatransfer::dnd::XDragSource,
+ css::lang::XInitialization,
+ css::lang::XServiceInfo >,
private ::boost::noncopyable
{
public:
@@ -80,47 +80,47 @@ public:
virtual ~DragSource();
// XInitialization
- virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
- throw(com::sun::star::uno::Exception, std::exception/*, com::sun::star::uno::RuntimeException*/) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw(css::uno::Exception, std::exception/*, css::uno::RuntimeException*/) override;
// XDragSource
- virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction)
- throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL startDrag( const com::sun::star::datatransfer::dnd::DragGestureEvent& trigger,
+ virtual void SAL_CALL startDrag( const css::datatransfer::dnd::DragGestureEvent& trigger,
sal_Int8 sourceActions,
sal_Int32 cursor,
sal_Int32 image,
- const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& transferable,
- const com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDragSourceListener >& listener )
- throw(com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::datatransfer::XTransferable >& transferable,
+ const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener )
+ throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
void saveMouseEvent(NSEvent* theEvent);
unsigned int getSupportedDragOperations(bool isLocal) const;
public:
// The context notifies the XDragSourceListeners
- com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDragSourceContext > mXCurrentContext;
+ css::uno::Reference< css::datatransfer::dnd::XDragSourceContext > mXCurrentContext;
id mView;
AquaSalFrame* mpFrame;
NSEvent* mLastMouseEventBeforeStartDrag;
DragSourceHelper* mDragSourceHelper;
- com::sun::star::awt::MouseEvent mMouseEvent;
- com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > mXTransferable;
- com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDragSourceListener > mXDragSrcListener;
+ css::awt::MouseEvent mMouseEvent;
+ css::uno::Reference< css::datatransfer::XTransferable > mXTransferable;
+ css::uno::Reference< css::datatransfer::dnd::XDragSourceListener > mXDragSrcListener;
// The mouse button that set off the drag and drop operation
short m_MouseButton;
sal_Int8 mDragSourceActions;
- static com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > g_XTransferable;
+ static css::uno::Reference< css::datatransfer::XTransferable > g_XTransferable;
static NSView* g_DragSourceView;
static bool g_DropSuccessSet;
static bool g_DropSuccess;
diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx
index 28b4a3ccf89f..da5a3a8bac87 100644
--- a/vcl/osx/DragSourceContext.hxx
+++ b/vcl/osx/DragSourceContext.hxx
@@ -33,7 +33,7 @@
// An instance of SourceContext only lives as long as the drag and drop
// operation lasts.
class DragSourceContext: public cppu::BaseMutex,
- public cppu::WeakComponentImplHelper<com::sun::star::datatransfer::dnd::XDragSourceContext>,
+ public cppu::WeakComponentImplHelper<css::datatransfer::dnd::XDragSourceContext>,
private ::boost::noncopyable
{
public:
@@ -41,16 +41,16 @@ public:
virtual ~DragSourceContext();
virtual sal_Int32 SAL_CALL getCurrentCursor( )
- throw( com::sun::star::uno::RuntimeException, std::exception) override;
+ throw( css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setCursor( sal_Int32 cursorId )
- throw( com::sun::star::uno::RuntimeException, std::exception) override;
+ throw( css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setImage( sal_Int32 imageId )
- throw( com::sun::star::uno::RuntimeException, std::exception) override;
+ throw( css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL transferablesFlavorsChanged( )
- throw( com::sun::star::uno::RuntimeException, std::exception) override;
+ throw( css::uno::RuntimeException, std::exception) override;
};
#endif // INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx
index 9b5a3dcabbc1..a54d390167b4 100644
--- a/vcl/osx/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -73,11 +73,11 @@ class AquaSalFrame;
@end
class DropTarget: public cppu::BaseMutex,
- public cppu::WeakComponentImplHelper< com::sun::star::lang::XInitialization,
- com::sun::star::datatransfer::dnd::XDropTarget,
- com::sun::star::datatransfer::dnd::XDropTargetDragContext,
- com::sun::star::datatransfer::dnd::XDropTargetDropContext,
- com::sun::star::lang::XServiceInfo >,
+ public cppu::WeakComponentImplHelper< css::lang::XInitialization,
+ css::datatransfer::dnd::XDropTarget,
+ css::datatransfer::dnd::XDropTargetDragContext,
+ css::datatransfer::dnd::XDropTargetDropContext,
+ css::lang::XServiceInfo >,
private boost::noncopyable
{
public:
@@ -90,35 +90,35 @@ public:
virtual void SAL_CALL disposing() override;
// XInitialization
- virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
- throw(com::sun::star::uno::Exception, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw(css::uno::Exception, std::exception) override;
// XDropTarget
- virtual void SAL_CALL addDropTargetListener( const com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl )
- throw(com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl )
+ throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeDropTargetListener( const com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl )
- throw(com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl )
+ throw(css::uno::RuntimeException, std::exception) override;
// Default is not active
- virtual sal_Bool SAL_CALL isActive() throw(com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setActive(sal_Bool isActive) throw(com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int8 SAL_CALL getDefaultActions() throw(com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isActive() throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setActive(sal_Bool isActive) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int8 SAL_CALL getDefaultActions() throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(css::uno::RuntimeException, std::exception) override;
// XDropTargetDragContext
- virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL rejectDrag() throw(com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL rejectDrag() throw(css::uno::RuntimeException, std::exception) override;
// XDropTargetDragContext
- virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL rejectDrop() throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL rejectDrop() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dropComplete(sal_Bool success) throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
// NSDraggingDestination protocol functions
NSDragOperation draggingEntered(id sender);
@@ -136,16 +136,16 @@ public:
sal_Int8 determineDropAction(sal_Int8 dropActions, id sender) const;
private:
- void fire_drop(const com::sun::star::datatransfer::dnd::DropTargetDropEvent& dte);
- void fire_dragEnter(const com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee);
- void fire_dragExit(const com::sun::star::datatransfer::dnd::DropTargetEvent& dte);
- void fire_dragOver(const com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde);
- void fire_dropActionChanged(const com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde);
+ void fire_drop(const css::datatransfer::dnd::DropTargetDropEvent& dte);
+ void fire_dragEnter(const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee);
+ void fire_dragExit(const css::datatransfer::dnd::DropTargetEvent& dte);
+ void fire_dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde);
+ void fire_dropActionChanged(const css::datatransfer::dnd::DropTargetDragEvent& dtde);
private:
- com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetDragContext > mXCurrentDragContext;
- com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetDropContext > mXCurrentDropContext;
- com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > mXCurrentDragClipboard;
+ css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext > mXCurrentDragContext;
+ css::uno::Reference< css::datatransfer::dnd::XDropTargetDropContext > mXCurrentDropContext;
+ css::uno::Reference< css::datatransfer::clipboard::XClipboard > mXCurrentDragClipboard;
DataFlavorMapperPtr_t mDataFlavorMapper;
id mView;
AquaSalFrame* mpFrame;
diff --git a/vcl/osx/HtmlFmtFlt.hxx b/vcl/osx/HtmlFmtFlt.hxx
index 77a92493bad6..38ee4c4face8 100644
--- a/vcl/osx/HtmlFmtFlt.hxx
+++ b/vcl/osx/HtmlFmtFlt.hxx
@@ -24,17 +24,17 @@
/* Transform plain HTML into the format expected by MS Office.
*/
-com::sun::star::uno::Sequence<sal_Int8> TextHtmlToHTMLFormat(com::sun::star::uno::Sequence<sal_Int8>& aTextHtml);
+css::uno::Sequence<sal_Int8> TextHtmlToHTMLFormat(css::uno::Sequence<sal_Int8>& aTextHtml);
/* Transform the MS Office HTML format into plain HTML.
*/
-com::sun::star::uno::Sequence<sal_Int8> HTMLFormatToTextHtml(const com::sun::star::uno::Sequence<sal_Int8>& aHTMLFormat);
+css::uno::Sequence<sal_Int8> HTMLFormatToTextHtml(const css::uno::Sequence<sal_Int8>& aHTMLFormat);
/* Detects whether the given byte sequence contains the MS Office Html format.
@returns True if the MS Office Html format will be detected False otherwise.
*/
-bool isHTMLFormat (const com::sun::star::uno::Sequence<sal_Int8>& aHtmlSequence);
+bool isHTMLFormat (const css::uno::Sequence<sal_Int8>& aHtmlSequence);
#endif // INCLUDED_VCL_OSX_HTMLFMTFLT_HXX
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index bdf93457a0c8..b8c06fcf09f8 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -35,11 +35,11 @@
#include <memory>
#include <vector>
-class OSXTransferable : public ::cppu::WeakImplHelper<com::sun::star::datatransfer::XTransferable>,
+class OSXTransferable : public ::cppu::WeakImplHelper<css::datatransfer::XTransferable>,
private ::boost::noncopyable
{
public:
- explicit OSXTransferable(com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> rXMimeCntFactory,
+ explicit OSXTransferable(css::uno::Reference< css::datatransfer::XMimeContentTypeFactory> rXMimeCntFactory,
DataFlavorMapperPtr_t pDataFlavorMapper,
NSPasteboard* pasteboard);
@@ -47,27 +47,27 @@ public:
// XTransferable
- virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
- throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
+ throw( css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
+ throw( css::uno::RuntimeException, std::exception ) override;
// Helper functions not part of the XTransferable interface
void initClipboardItemList();
- //com::sun::star::uno::Any getClipboardItemData(ClipboardItemPtr_t clipboardItem);
+ //css::uno::Any getClipboardItemData(ClipboardItemPtr_t clipboardItem);
- bool compareDataFlavors( const com::sun::star::datatransfer::DataFlavor& lhs,
- const com::sun::star::datatransfer::DataFlavor& rhs );
+ bool compareDataFlavors( const css::datatransfer::DataFlavor& lhs,
+ const css::datatransfer::DataFlavor& rhs );
private:
- com::sun::star::uno::Sequence< com::sun::star::datatransfer::DataFlavor > mFlavorList;
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
+ css::uno::Sequence< css::datatransfer::DataFlavor > mFlavorList;
+ css::uno::Reference< css::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
DataFlavorMapperPtr_t mDataFlavorMapper;
NSPasteboard* mPasteboard;
};
diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index dc04348754b4..af8740be8960 100644
--- a/vcl/osx/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
@@ -26,8 +26,8 @@
#include "PictToBmpFlt.hxx"
-bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData,
- com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+bool ImageToPNG( css::uno::Sequence<sal_Int8>& rImgData,
+ css::uno::Sequence<sal_Int8>& rPngData,
NSBitmapImageFileType eInFormat)
{
(void) eInFormat; // Really not needed? Weird.
@@ -50,8 +50,8 @@ bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData,
return (nPngSize > 0);
}
-bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
- com::sun::star::uno::Sequence<sal_Int8>& rImgData,
+bool PNGToImage( css::uno::Sequence<sal_Int8>& rPngData,
+ css::uno::Sequence<sal_Int8>& rImgData,
NSBitmapImageFileType eOutFormat
)
{
diff --git a/vcl/osx/PictToBmpFlt.hxx b/vcl/osx/PictToBmpFlt.hxx
index 59f1f2d3fa99..b90fa817516a 100644
--- a/vcl/osx/PictToBmpFlt.hxx
+++ b/vcl/osx/PictToBmpFlt.hxx
@@ -26,12 +26,12 @@
#include <Cocoa/Cocoa.h>
#include <postmac.h>
-bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData,
- com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+bool ImageToPNG( css::uno::Sequence<sal_Int8>& rImgData,
+ css::uno::Sequence<sal_Int8>& rPngData,
NSBitmapImageFileType eInFormat);
-bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
- com::sun::star::uno::Sequence<sal_Int8>& rImgData,
+bool PNGToImage( css::uno::Sequence<sal_Int8>& rPngData,
+ css::uno::Sequence<sal_Int8>& rImgData,
NSBitmapImageFileType eOutFormat);
#endif // INCLUDED_VCL_OSX_PICTTOBMPFLT_HXX
diff --git a/vcl/osx/a11yfactory.mm b/vcl/osx/a11yfactory.mm
index 30437a837936..79ddf64bf6cf 100644
--- a/vcl/osx/a11yfactory.mm
+++ b/vcl/osx/a11yfactory.mm
@@ -189,7 +189,7 @@ static bool enabled = false;
[ dAllWrapper setObject: viewElement forKey: [ AquaA11yFactory keyForAccessibleContext: rxAccessibleContext ] ];
}
-+(void)removeFromWrapperRepositoryFor: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext {
++(void)removeFromWrapperRepositoryFor: (css::uno::Reference < css::accessibility::XAccessibleContext >) rxAccessibleContext {
// TODO: when RADIO_BUTTON search for associated RadioGroup-wrapper and delete that as well
AquaA11yWrapper * theWrapper = [ AquaA11yFactory wrapperForAccessibleContext: rxAccessibleContext createIfNotExists: NO ];
if ( theWrapper != nil ) {
diff --git a/vcl/osx/a11yfocuslistener.hxx b/vcl/osx/a11yfocuslistener.hxx
index dbc9e4739daa..0b4a012a92bc 100644
--- a/vcl/osx/a11yfocuslistener.hxx
+++ b/vcl/osx/a11yfocuslistener.hxx
@@ -38,7 +38,7 @@ public:
id getFocusedUIElement();
// KeyboardFocusListener
- virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) override;
+ virtual void SAL_CALL focusedObjectChanged(const css::uno::Reference< css::accessibility::XAccessible >& xAccessible) override;
};
#endif // INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
diff --git a/vcl/osx/a11yrolehelper.h b/vcl/osx/a11yrolehelper.h
index afa8af4bf3a7..7a4df6dbe967 100644
--- a/vcl/osx/a11yrolehelper.h
+++ b/vcl/osx/a11yrolehelper.h
@@ -25,7 +25,7 @@
@interface AquaA11yRoleHelper : NSObject
{
}
-+(id)getNativeRoleFrom: (::com::sun::star::accessibility::XAccessibleContext *) accessibleContext;
++(id)getNativeRoleFrom: (css::accessibility::XAccessibleContext *) accessibleContext;
+(id)getNativeSubroleFrom: (sal_Int16) nRole;
+(id)getRoleDescriptionFrom: (NSString *) role with: (NSString *) subRole;
@end
diff --git a/vcl/osx/a11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm
index 3ac368ea17c8..546c3122bc0b 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -273,10 +273,10 @@ using namespace ::com::sun::star::uno;
property.Value >>= alignment;
NSNumber *textAlignment = nil;
switch(alignment) {
- case ::com::sun::star::style::ParagraphAdjust_RIGHT : textAlignment = [NSNumber numberWithInteger:NSRightTextAlignment] ; break;
- case ::com::sun::star::style::ParagraphAdjust_CENTER: textAlignment = [NSNumber numberWithInteger:NSCenterTextAlignment] ; break;
- case ::com::sun::star::style::ParagraphAdjust_BLOCK : textAlignment = [NSNumber numberWithInteger:NSJustifiedTextAlignment]; break;
- case ::com::sun::star::style::ParagraphAdjust_LEFT :
+ case css::style::ParagraphAdjust_RIGHT : textAlignment = [NSNumber numberWithInteger:NSRightTextAlignment] ; break;
+ case css::style::ParagraphAdjust_CENTER: textAlignment = [NSNumber numberWithInteger:NSCenterTextAlignment] ; break;
+ case css::style::ParagraphAdjust_BLOCK : textAlignment = [NSNumber numberWithInteger:NSJustifiedTextAlignment]; break;
+ case css::style::ParagraphAdjust_LEFT :
default : textAlignment = [NSNumber numberWithInteger:NSLeftTextAlignment] ; break;
}
NSDictionary *paragraphStyle = [NSDictionary dictionaryWithObjectsAndKeys:textAlignment, @"AXTextAlignment", textAlignment, @"AXVisualTextAlignment", nil];
@@ -303,7 +303,7 @@ using namespace ::com::sun::star::uno;
if (markupRange.length > 0) {
markupRange.location -= range.location;
switch(type) {
- case ::com::sun::star::text::TextMarkupType::SPELLCHECK: {
+ case css::text::TextMarkupType::SPELLCHECK: {
[string addAttribute:NSAccessibilityMisspelledTextAttribute value:[NSNumber numberWithBool:YES] range:markupRange];
[string addAttribute:@"AXMarkedMisspelled" value:[NSNumber numberWithBool:YES] range:markupRange];
break;
@@ -314,7 +314,7 @@ using namespace ::com::sun::star::uno;
}
+(void)addMarkup:(XAccessibleTextMarkup*)markup toString:(NSMutableAttributedString*)string inRange:(NSRange)range {
- [AquaA11yTextAttributesWrapper addMarkup:markup withType:(::com::sun::star::text::TextMarkupType::SPELLCHECK) toString:string inRange:range];
+ [AquaA11yTextAttributesWrapper addMarkup:markup withType:(css::text::TextMarkupType::SPELLCHECK) toString:string inRange:range];
}
+(NSMutableAttributedString *)createAttributedStringForElement:(AquaA11yWrapper *)wrapper inOrigRange:(id)origRange {
diff --git a/vcl/osx/a11yutil.h b/vcl/osx/a11yutil.h
index 5cc5dc4582f9..56778e76dd80 100644
--- a/vcl/osx/a11yutil.h
+++ b/vcl/osx/a11yutil.h
@@ -24,8 +24,8 @@
@interface AquaA11yUtil : NSObject {
}
-+(NSValue *)vclPointToNSPoint:(::com::sun::star::awt::Point)vclPoint;
-+(::com::sun::star::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint;
++(NSValue *)vclPointToNSPoint:(css::awt::Point)vclPoint;
++(css::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint;
@end
#endif // INCLUDED_VCL_OSX_A11YUTIL_H
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index cd6a28b3d041..a59a99d7b784 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -972,15 +972,15 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
return hit;
}
-Reference < XAccessibleContext > hitTestRunner ( com::sun::star::awt::Point point,
+Reference < XAccessibleContext > hitTestRunner ( css::awt::Point point,
Reference < XAccessibleContext > rxAccessibleContext ) {
Reference < XAccessibleContext > hitChild;
Reference < XAccessibleContext > emptyReference;
try {
Reference < XAccessibleComponent > rxAccessibleComponent ( rxAccessibleContext, UNO_QUERY );
if ( rxAccessibleComponent.is() ) {
- com::sun::star::awt::Point location = rxAccessibleComponent -> getLocationOnScreen();
- com::sun::star::awt::Point hitPoint ( point.X - location.X , point.Y - location.Y);
+ css::awt::Point location = rxAccessibleComponent -> getLocationOnScreen();
+ css::awt::Point hitPoint ( point.X - location.X , point.Y - location.Y);
Reference < XAccessible > rxAccessible = rxAccessibleComponent -> getAccessibleAtPoint ( hitPoint );
if ( rxAccessible.is() && rxAccessible -> getAccessibleContext().is() &&
rxAccessible -> getAccessibleContext() -> getAccessibleChildCount() == 0 ) {
@@ -1031,7 +1031,7 @@ Reference < XAccessibleContext > hitTestRunner ( com::sun::star::awt::Point poin
}
Reference < XAccessibleContext > hitChild;
NSRect screenRect = [ [ NSScreen mainScreen ] frame ];
- com::sun::star::awt::Point hitPoint ( static_cast<long>(point.x) , static_cast<long>(screenRect.size.height - point.y) );
+ css::awt::Point hitPoint ( static_cast<long>(point.x) , static_cast<long>(screenRect.size.height - point.y) );
// check child windows first
NSWindow * window = (NSWindow *) [ self accessibilityAttributeValue: NSAccessibilityWindowAttribute ];
NSArray * childWindows = [ window childWindows ];
diff --git a/vcl/osx/a11ywrappercombobox.h b/vcl/osx/a11ywrappercombobox.h
index 13058844b746..4b7534805104 100644
--- a/vcl/osx/a11ywrappercombobox.h
+++ b/vcl/osx/a11ywrappercombobox.h
@@ -27,7 +27,7 @@
{
AquaA11yWrapper * textArea;
}
--(id)initWithAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) anAccessibleContext;
+-(id)initWithAccessibleContext: (css::uno::Reference < css::accessibility::XAccessibleContext >) anAccessibleContext;
-(id)valueAttribute;
-(id)numberOfCharactersAttribute;
-(id)selectedTextAttribute;
diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx
index 5e0edecbe8a3..67e76515c52c 100644
--- a/vcl/osx/clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -63,9 +63,9 @@ class AquaClipboard;
@end
class AquaClipboard : public ::cppu::BaseMutex,
- public ::cppu::WeakComponentImplHelper< com::sun::star::datatransfer::clipboard::XSystemClipboard,
- com::sun::star::datatransfer::clipboard::XFlushableClipboard,
- com::sun::star::lang::XServiceInfo >,
+ public ::cppu::WeakComponentImplHelper< css::datatransfer::clipboard::XSystemClipboard,
+ css::datatransfer::clipboard::XFlushableClipboard,
+ css::lang::XServiceInfo >,
private ::boost::noncopyable
{
public:
@@ -87,43 +87,43 @@ public:
// XClipboard
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents()
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setContents( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable,
- const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setContents( const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable,
+ const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL getName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XClipboardEx
virtual sal_Int8 SAL_CALL getRenderingCapabilities()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XClipboardNotifier
- virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL addClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XFlushableClipboard
- virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException, std::exception ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw(css::uno::RuntimeException, std::exception) override;
/* Get a reference to the used pastboard.
*/
@@ -131,8 +131,8 @@ public:
/* Notify the current clipboard owner that he is no longer the clipboard owner.
*/
- void fireLostClipboardOwnershipEvent(::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner> oldOwner,
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > oldContent);
+ void fireLostClipboardOwnershipEvent(css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner> oldOwner,
+ css::uno::Reference< css::datatransfer::XTransferable > oldContent);
void pasteboardChangedOwner();
@@ -148,10 +148,10 @@ private:
void fireClipboardChangedEvent();
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory > mrXMimeCntFactory;
- ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener > > mClipboardListeners;
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > mXClipboardContent;
- com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboardOwner > mXClipboardOwner;
+ css::uno::Reference< css::datatransfer::XMimeContentTypeFactory > mrXMimeCntFactory;
+ ::std::list< css::uno::Reference< css::datatransfer::clipboard::XClipboardListener > > mClipboardListeners;
+ css::uno::Reference< css::datatransfer::XTransferable > mXClipboardContent;
+ css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner > mXClipboardOwner;
DataFlavorMapperPtr_t mpDataFlavorMapper;
bool mIsSystemPasteboard;
NSPasteboard* mPasteboard;
diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx
index f7a592387865..9f8949206863 100644
--- a/vcl/osx/documentfocuslistener.hxx
+++ b/vcl/osx/documentfocuslistener.hxx
@@ -31,7 +31,7 @@
// - DocumentFocusListener -
class DocumentFocusListener :
- public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleEventListener >
+ public ::cppu::WeakImplHelper< css::accessibility::XAccessibleEventListener >
{
public:
@@ -39,48 +39,48 @@ public:
explicit DocumentFocusListener(AquaA11yFocusTracker& rTracker);
void attachRecursive(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible
- ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ const css::uno::Reference< css::accessibility::XAccessible >& xAccessible
+ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
void attachRecursive(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& xContext
- ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ const css::uno::Reference< css::accessibility::XAccessible >& xAccessible,
+ const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext
+ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
void attachRecursive(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& xContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet >& xStateSet
- ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ const css::uno::Reference< css::accessibility::XAccessible >& xAccessible,
+ const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext,
+ const css::uno::Reference< css::accessibility::XAccessibleStateSet >& xStateSet
+ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
void detachRecursive(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible
- ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ const css::uno::Reference< css::accessibility::XAccessible >& xAccessible
+ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
void detachRecursive(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& xContext
- ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ const css::uno::Reference< css::accessibility::XAccessible >& xAccessible,
+ const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext
+ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
void detachRecursive(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& xContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet >& xStateSet
- ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ const css::uno::Reference< css::accessibility::XAccessible >& xAccessible,
+ const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext,
+ const css::uno::Reference< css::accessibility::XAccessibleStateSet >& xStateSet
+ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
- static ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessible(const ::com::sun::star::lang::EventObject& aEvent )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ static css::uno::Reference< css::accessibility::XAccessible > getAccessible(const css::lang::EventObject& aEvent )
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
+ throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleEventListener
- virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
private:
- std::set< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > m_aRefList;
+ std::set< css::uno::Reference< css::uno::XInterface > > m_aRefList;
AquaA11yFocusTracker& m_aFocusTracker;
};
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index c67d55218281..d16316906f64 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -399,7 +399,7 @@ static AquaSalFrame* getMouseContainerFrame()
mpFrame->ToTop( SAL_FRAME_TOTOP_RESTOREWHENMIN | SAL_FRAME_TOTOP_GRABFOCUS );
}
--(::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >)accessibleContext
+-(css::uno::Reference < css::accessibility::XAccessibleContext >)accessibleContext
{
return mpFrame -> GetWindow() -> GetAccessible() -> getAccessibleContext();
}
@@ -1131,7 +1131,7 @@ private:
-(void)moveBackwardAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_BACKWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_BACKWARD character: 0 modifiers: 0];
}
-(void)moveRight: (id)aSender
@@ -1149,189 +1149,189 @@ private:
-(void)moveForwardAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_FORWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_FORWARD character: 0 modifiers: 0];
}
-(void)moveWordLeft: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0];
}
-(void)moveWordBackward: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0];
}
-(void)moveWordBackwardAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0];
}
-(void)moveWordLeftAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0];
}
-(void)moveWordRight: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0];
}
-(void)moveWordForward: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0];
}
-(void)moveWordForwardAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0];
}
-(void)moveWordRightAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0];
}
-(void)moveToEndOfLine: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToRightEndOfLine: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToEndOfLineAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToRightEndOfLineAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToBeginningOfLine: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToLeftEndOfLine: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToBeginningOfLineAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToLeftEndOfLineAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToEndOfParagraph: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveToEndOfParagraphAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveParagraphForward: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveParagraphForwardAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveToBeginningOfParagraph: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveParagraphBackward: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveToBeginningOfParagraphAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveParagraphBackwardAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveToEndOfDocument: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)scrollToEndOfDocument: (id)aSender
{
(void)aSender;
// this is not exactly what we should do, but it makes "End" and "Shift-End" behave consistent
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)moveToEndOfDocumentAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_END_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)moveToBeginningOfDocument: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)scrollToBeginningOfDocument: (id)aSender
{
(void)aSender;
// this is not exactly what we should do, but it makes "Home" and "Shift-Home" behave consistent
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)moveToBeginningOfDocumentAndModifySelection: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)moveUp: (id)aSender
@@ -1374,73 +1374,73 @@ private:
-(void)deleteWordBackward: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_BACKWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_WORD_BACKWARD character: 0 modifiers: 0];
}
-(void)deleteWordForward: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_FORWARD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_WORD_FORWARD character: 0 modifiers: 0];
}
-(void)deleteToBeginningOfLine: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
}
-(void)deleteToEndOfLine: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_TO_END_OF_LINE character: 0 modifiers: 0];
}
-(void)deleteToBeginningOfParagraph: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)deleteToEndOfParagraph: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::DELETE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)insertLineBreak: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_LINEBREAK character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::INSERT_LINEBREAK character: 0 modifiers: 0];
}
-(void)insertParagraphSeparator: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::INSERT_PARAGRAPH character: 0 modifiers: 0];
}
-(void)selectWord: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_WORD character: 0 modifiers: 0];
}
-(void)selectLine: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_LINE character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_LINE character: 0 modifiers: 0];
}
-(void)selectParagraph: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_PARAGRAPH character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_PARAGRAPH character: 0 modifiers: 0];
}
-(void)selectAll: (id)aSender
{
(void)aSender;
- [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_ALL character: 0 modifiers: 0];
+ [self sendKeyInputAndReleaseToFrame: css::awt::Key::SELECT_ALL character: 0 modifiers: 0];
}
-(void)cancelOperation: (id)aSender