summaryrefslogtreecommitdiff
path: root/vcl/osx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-02 16:45:44 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-02 16:54:18 +0300
commit50bf123ddbeb457b89636621a99c971834adf3ab (patch)
treeb7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/osx
parentdb1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff)
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/osx')
-rw-r--r--vcl/osx/DataFlavorMapping.cxx23
-rw-r--r--vcl/osx/DataFlavorMapping.hxx11
-rw-r--r--vcl/osx/DragActionConversion.cxx2
-rw-r--r--vcl/osx/DragActionConversion.hxx2
-rw-r--r--vcl/osx/DragSource.cxx4
-rw-r--r--vcl/osx/DragSource.hxx3
-rw-r--r--vcl/osx/DragSourceContext.cxx2
-rw-r--r--vcl/osx/DropTarget.cxx4
-rw-r--r--vcl/osx/DropTarget.hxx2
-rw-r--r--vcl/osx/HtmlFmtFlt.cxx3
-rw-r--r--vcl/osx/OSXTransferable.cxx10
-rw-r--r--vcl/osx/OSXTransferable.hxx4
-rw-r--r--vcl/osx/a11yfocuslistener.cxx14
-rw-r--r--vcl/osx/a11yfocustracker.cxx24
-rw-r--r--vcl/osx/a11ylistener.cxx8
-rw-r--r--vcl/osx/clipboard.cxx2
-rw-r--r--vcl/osx/clipboard.hxx11
-rw-r--r--vcl/osx/documentfocuslistener.cxx21
-rw-r--r--vcl/osx/documentfocuslistener.hxx2
-rw-r--r--vcl/osx/salframe.cxx79
-rw-r--r--vcl/osx/salinst.cxx88
-rw-r--r--vcl/osx/salmenu.cxx11
-rw-r--r--vcl/osx/salobj.cxx23
-rw-r--r--vcl/osx/salprn.cxx53
-rw-r--r--vcl/osx/salsys.cxx5
-rw-r--r--vcl/osx/saltimer.cxx5
-rw-r--r--vcl/osx/service_entry.cxx2
27 files changed, 0 insertions, 418 deletions
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index b971b05e4e7a..1f8fd70ced68 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -45,7 +45,6 @@ using namespace com::sun::star::lang;
using namespace cppu;
using namespace std;
-
namespace // private
{
/* Determine whether or not a DataFlavor is valid.
@@ -99,7 +98,6 @@ namespace // private
const char* FLAVOR_DUMMY_INTERNAL = "application/x-openoffice-internal";
-
struct FlavorMap
{
const NSString* SystemFlavor;
@@ -130,10 +128,8 @@ namespace // private
{ PBTYPE_DUMMY_INTERNAL, FLAVOR_DUMMY_INTERNAL, "internal data",false }
};
-
#define SIZE_FLAVOR_MAP (sizeof(flavorMap)/sizeof(FlavorMap))
-
inline bool isByteSequenceType(const Type& theType)
{
return (theType == getCppuType((Sequence<sal_Int8>*)0));
@@ -146,9 +142,6 @@ namespace // private
} // namespace private
-
-
-
/* A base class for other data provider.
*/
class DataProviderBaseImpl : public DataProvider
@@ -176,7 +169,6 @@ DataProviderBaseImpl::DataProviderBaseImpl(id data) :
[mSystemData retain];
}
-
DataProviderBaseImpl::~DataProviderBaseImpl()
{
if (mSystemData)
@@ -185,8 +177,6 @@ DataProviderBaseImpl::~DataProviderBaseImpl()
}
}
-
-
class UniDataProvider : public DataProviderBaseImpl
{
public:
@@ -238,8 +228,6 @@ Any UniDataProvider::getOOoData()
return oOOData;
}
-
-
class ByteSequenceDataProvider : public DataProviderBaseImpl
{
public:
@@ -262,7 +250,6 @@ ByteSequenceDataProvider::ByteSequenceDataProvider(NSData* data) :
{
}
-
NSData* ByteSequenceDataProvider::getSystemData()
{
Sequence<sal_Int8> rawData;
@@ -291,9 +278,6 @@ Any ByteSequenceDataProvider::getOOoData()
return oOOData;
}
-
-
-
class HTMLFormatDataProvider : public DataProviderBaseImpl
{
public:
@@ -357,8 +341,6 @@ Any HTMLFormatDataProvider::getOOoData()
return oOOData;
}
-
-
class PNGDataProvider : public DataProviderBaseImpl
{
NSBitmapImageFileType meImageType;
@@ -423,8 +405,6 @@ Any PNGDataProvider::getOOoData()
return oOOData;
}
-
-
class FileListDataProvider : public DataProviderBaseImpl
{
public:
@@ -487,8 +467,6 @@ Any FileListDataProvider::getOOoData()
return oOOData;
}
-
-
DataFlavorMapper::DataFlavorMapper()
{
Reference<XComponentContext> xContext = comphelper::getProcessComponentContext();
@@ -727,7 +705,6 @@ com::sun::star::uno::Sequence<com::sun::star::datatransfer::DataFlavor> DataFlav
return flavors;
}
-
NSArray* DataFlavorMapper::getAllSupportedPboardTypes() const
{
NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity: SIZE_FLAVOR_MAP];
diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index b22813795e19..f8b09df85f23 100644
--- a/vcl/osx/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -33,7 +33,6 @@
#include <memory>
#include <boost/shared_ptr.hpp>
-
/* An interface to get the clipboard data in either
system or OOo format.
*/
@@ -55,10 +54,6 @@ public:
typedef std::auto_ptr<DataProvider> DataProviderPtr_t;
-
-
-
-
class DataFlavorMapper
{
public:
@@ -68,7 +63,6 @@ public:
DataFlavorMapper();
~DataFlavorMapper();
-
/* Map a system data flavor to an OpenOffice data flavor.
Return an empty string if there is not suiteable
mapping from a system data flavor to a OpenOffice data
@@ -76,7 +70,6 @@ public:
*/
com::sun::star::datatransfer::DataFlavor systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const;
-
/* Map an OpenOffice data flavor to a system data flavor.
If there is no suiteable mapping available NULL will
be returned.
@@ -95,18 +88,14 @@ public:
DataProviderPtr_t getDataProvider( const NSString* systemFlavor,
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > rTransferable) const;
-
-
/* Get a data provider which is able to provide 'systemData' in the OOo expected format.
*/
DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSArray* systemData) const;
-
/* Get a data provider which is able to provide 'systemData' in the OOo expected format.
*/
DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSData* systemData) const;
-
/* Translate a sequence of DataFlavors into a NSArray of system types.
Only those DataFlavors for which a suitable mapping to a system
type exist will be contained in the returned types array.
diff --git a/vcl/osx/DragActionConversion.cxx b/vcl/osx/DragActionConversion.cxx
index d4bb9e5c3c86..e0c80a09313e 100644
--- a/vcl/osx/DragActionConversion.cxx
+++ b/vcl/osx/DragActionConversion.cxx
@@ -20,10 +20,8 @@
#include "DragActionConversion.hxx"
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
-
using namespace com::sun::star::datatransfer::dnd;
-
/* Convert office drag actions as defined in
<type>com::sun::star::datatransfer::dnd::DNDConstants</type>
into system conform drag actions.
diff --git a/vcl/osx/DragActionConversion.hxx b/vcl/osx/DragActionConversion.hxx
index 8c9b057bff0f..8539a79fc3c6 100644
--- a/vcl/osx/DragActionConversion.hxx
+++ b/vcl/osx/DragActionConversion.hxx
@@ -17,14 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sal/types.h>
#include <premac.h>
#import <Cocoa/Cocoa.h>
#include <postmac.h>
-
/* Convert office drag actions as defined in
<type>com::sun::star::datatransfer::dnd::DNDConstants</type>
into system conform drag actions.
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index 10a0b80f0abd..6435041fe5c7 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/awt/MouseButton.hpp>
@@ -37,7 +36,6 @@
#include <cassert>
#include <memory>
-
using namespace cppu;
using namespace osl;
using namespace com::sun::star;
@@ -52,7 +50,6 @@ using namespace com::sun::star::lang;
using namespace comphelper;
using namespace std;
-
// For OOo internal D&D we provide the Transferable without NSDragPboard
// interference as a shortcut
uno::Reference<XTransferable> DragSource::g_XTransferable;
@@ -60,7 +57,6 @@ NSView* DragSource::g_DragSourceView = nil;
bool DragSource::g_DropSuccessSet = false;
bool DragSource::g_DropSuccess = false;
-
OUString dragSource_getImplementationName()
{
return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1");
diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx
index 27554975b1d0..491716d87f4c 100644
--- a/vcl/osx/DragSource.hxx
+++ b/vcl/osx/DragSource.hxx
@@ -36,7 +36,6 @@
#import <Cocoa/Cocoa.h>
#include <postmac.h>
-
class DragSource;
class AquaSalFrame;
@@ -53,7 +52,6 @@ class AquaSalFrame;
-(void)unregisterMouseEventListener:(id)theHandler;
@end
-
@interface DragSourceHelper : NSObject
{
DragSource* mDragSource;
@@ -71,7 +69,6 @@ class AquaSalFrame;
@end
-
class DragSource : public ::cppu::BaseMutex,
public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::dnd::XDragSource,
com::sun::star::lang::XInitialization,
diff --git a/vcl/osx/DragSourceContext.cxx b/vcl/osx/DragSourceContext.cxx
index ff1e98069f2d..ac3b9221d98a 100644
--- a/vcl/osx/DragSourceContext.cxx
+++ b/vcl/osx/DragSourceContext.cxx
@@ -21,7 +21,6 @@
#include "DragSourceContext.hxx"
-
using namespace com::sun::star::datatransfer::dnd;
using namespace com::sun::star::datatransfer::dnd::DNDConstants;
using namespace com::sun::star::uno;
@@ -57,5 +56,4 @@ void SAL_CALL DragSourceContext::transferablesFlavorsChanged( )
{
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index c7bb86ba8f02..307181cbb904 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -46,7 +46,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star;
using namespace comphelper;
-
OUString dropTarget_getImplementationName()
{
return OUString("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1");
@@ -69,10 +68,8 @@ namespace /* private */
}
}
-
@implementation DropTargetHelper
-
-(DropTargetHelper*)initWithDropTarget:(DropTarget*)pdt
{
self = [super init];
@@ -85,7 +82,6 @@ namespace /* private */
return self;
}
-
-(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
{
return mDropTarget->draggingEntered(sender);
diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx
index cb7a575c7953..d67b647b7111 100644
--- a/vcl/osx/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -56,7 +56,6 @@ class AquaSalFrame;
-(void)unregisterDraggingDestinationHandler:(id)theHandler;
@end
-
@interface DropTargetHelper : NSObject
{
DropTarget* mDropTarget;
@@ -73,7 +72,6 @@ class AquaSalFrame;
@end
-
class DropTarget: public cppu::BaseMutex,
public cppu::WeakComponentImplHelper5< com::sun::star::lang::XInitialization,
com::sun::star::datatransfer::dnd::XDropTarget,
diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
index 11ef00fdd6d6..aee4863c4836 100644
--- a/vcl/osx/HtmlFmtFlt.cxx
+++ b/vcl/osx/HtmlFmtFlt.cxx
@@ -29,7 +29,6 @@
using namespace com::sun::star::uno;
-
// converts the openoffice text/html clipboard format to the HTML Format
// well known under MS Windows
// the MS HTML Format has a header before the real html data
@@ -53,7 +52,6 @@ using namespace com::sun::star::uno;
// <!--StartFragment--> and <!--EndFragment--> (no space between !-- and the
// text
-
namespace // private
{
std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFragment, size_t endFragment)
@@ -69,7 +67,6 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFr
} // namespace private
-
// the office always writes the start and end html tag in upper cases and
// without spaces both tags don't allow parameters
const std::string TAG_HTML = std::string("<html>");
diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index d01b4aaf470c..1a4f5d9814ac 100644
--- a/vcl/osx/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star::io;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
-
namespace // private
{
bool isValidFlavor( const DataFlavor& aFlavor )
@@ -44,7 +43,6 @@ namespace // private
} // namespace private
-
OSXTransferable::OSXTransferable(const Reference<XMimeContentTypeFactory> rXMimeCntFactory,
DataFlavorMapperPtr_t pDataFlavorMapper,
NSPasteboard* pasteboard) :
@@ -57,13 +55,11 @@ OSXTransferable::OSXTransferable(const Reference<XMimeContentTypeFactory> rXMime
initClipboardItemList();
}
-
OSXTransferable::~OSXTransferable()
{
[mPasteboard release];
}
-
Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
throw( UnsupportedFlavorException, IOException, RuntimeException, std::exception )
{
@@ -100,20 +96,17 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
return dp->getOOoData();
}
-
bool OSXTransferable::isUnicodeText(const DataFlavor& flavor)
{
return (flavor.DataType == getCppuType((OUString*)0));
}
-
Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors( )
throw( RuntimeException, std::exception )
{
return mFlavorList;
}
-
sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlavor)
throw( RuntimeException, std::exception )
{
@@ -124,7 +117,6 @@ sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlav
return false;
}
-
void OSXTransferable::initClipboardItemList()
{
NSArray* pboardFormats = [mPasteboard types];
@@ -138,7 +130,6 @@ void OSXTransferable::initClipboardItemList()
mFlavorList = mDataFlavorMapper->typesArrayToFlavorSequence(pboardFormats);
}
-
/* Compares two DataFlavors. Returns true if both DataFlavor have the same media type
and the number of parameter and all parameter values do match otherwise false
is returned.
@@ -165,7 +156,6 @@ bool OSXTransferable::compareDataFlavors(const DataFlavor& lhs, const DataFlavor
return true;
}
-
bool OSXTransferable::cmpAllContentTypeParameter(const Reference<XMimeContentType> xLhs,
const Reference<XMimeContentType> xRhs) const
{
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index aa794c8c7def..29a1d98b8641 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _TRANSFERABLE_HXX_
#define _TRANSFERABLE_HXX_
@@ -36,7 +35,6 @@
#include <boost/utility.hpp>
#include <vector>
-
class OSXTransferable : public ::cppu::WeakImplHelper1<com::sun::star::datatransfer::XTransferable>,
private ::boost::noncopyable
{
@@ -49,10 +47,8 @@ public:
virtual ~OSXTransferable();
-
// 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 ) SAL_OVERRIDE;
diff --git a/vcl/osx/a11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx
index 225473069d28..264a51eff719 100644
--- a/vcl/osx/a11yfocuslistener.cxx
+++ b/vcl/osx/a11yfocuslistener.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <salhelper/refobj.hxx>
#include "osx/a11yfocustracker.hxx"
@@ -28,11 +27,8 @@
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
-
rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::theListener;
-
-
rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::get()
{
if ( ! theListener.is() )
@@ -41,14 +37,10 @@ rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::get()
return theListener;
}
-
-
AquaA11yFocusListener::AquaA11yFocusListener() : m_focusedObject(nil)
{
}
-
-
id AquaA11yFocusListener::getFocusedUIElement()
{
if ( nil == m_focusedObject ) {
@@ -67,8 +59,6 @@ id AquaA11yFocusListener::getFocusedUIElement()
return m_focusedObject;
}
-
-
void SAL_CALL
AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAccessible)
{
@@ -91,16 +81,12 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAcc
}
}
-
-
oslInterlockedCount SAL_CALL
AquaA11yFocusListener::acquire() SAL_THROW(())
{
return ReferenceObject::acquire();
}
-
-
oslInterlockedCount SAL_CALL
AquaA11yFocusListener::release() SAL_THROW(())
{
diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
index cbd634251fab..1ce09a61a89b 100644
--- a/vcl/osx/a11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "vcl/svapp.hxx"
#include "vcl/window.hxx"
#include "vcl/toolbox.hxx"
@@ -36,17 +35,12 @@
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
-
-
static inline Window *
getWindow(const ::VclSimpleEvent *pEvent)
{
return static_cast< const ::VclWindowEvent *> (pEvent)->GetWindow();
}
-
-
-
// callback function for Application::addEventListener
long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent)
@@ -94,8 +88,6 @@ long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracke
return 0;
}
-
-
AquaA11yFocusTracker::AquaA11yFocusTracker() :
m_aWindowEventLink(this, (PSTUB) WindowEventHandler),
m_xDocumentFocusListener(new DocumentFocusListener(*this))
@@ -104,8 +96,6 @@ AquaA11yFocusTracker::AquaA11yFocusTracker() :
window_got_focus(Application::GetFocusWindow());
}
-
-
void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAccessible)
{
if( xAccessible != m_xFocusedObject )
@@ -117,8 +107,6 @@ void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAcc
}
}
-
-
void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox)
{
Reference< XAccessible > xAccessible( pToolBox->GetAccessible() );
@@ -136,8 +124,6 @@ void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox)
}
}
-
-
void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow)
{
bool bToolboxFound = false;
@@ -171,8 +157,6 @@ void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow)
}
}
-
-
void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow)
{
// Make sure either the toolbox or its parent toolbox has the focus
@@ -186,8 +170,6 @@ void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow)
notify_toolbox_item_focus(static_cast <ToolBox *> (pWindow));
}
-
-
void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow)
{
ToolBox* pToolBoxParent = dynamic_cast< ToolBox * >( pWindow->GetParent() );
@@ -197,8 +179,6 @@ void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow)
notify_toolbox_item_focus( pToolBoxParent );
}
-
-
void AquaA11yFocusTracker::tabpage_activated(Window *pWindow)
{
Reference< XAccessible > xAccessible( pWindow->GetAccessible() );
@@ -212,8 +192,6 @@ void AquaA11yFocusTracker::tabpage_activated(Window *pWindow)
}
}
-
-
void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent)
{
Menu * pMenu = pEvent->GetMenu();
@@ -227,8 +205,6 @@ void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent)
}
}
-
-
void AquaA11yFocusTracker::window_got_focus(Window *pWindow)
{
// The menu bar is handled through VCLEVENT_MENU_HIGHLIGHTED
diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx
index cd1a450d61b4..bc966361633a 100644
--- a/vcl/osx/a11ylistener.cxx
+++ b/vcl/osx/a11ylistener.cxx
@@ -50,30 +50,22 @@ NSString * getTableNotification( const AccessibleEventObject& aEvent )
return notification;
}
-
-
AquaA11yEventListener::AquaA11yEventListener(id wrapperObject, sal_Int16 role) : m_wrapperObject(wrapperObject), m_role(role)
{
[ m_wrapperObject retain ];
}
-
-
AquaA11yEventListener::~AquaA11yEventListener()
{
[ m_wrapperObject release ];
}
-
-
void SAL_CALL
AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException, std::exception )
{
[ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ];
}
-
-
void SAL_CALL
AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException, std::exception )
{
diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx
index f27f0d37d7a9..8a223f5f3e12 100644
--- a/vcl/osx/clipboard.cxx
+++ b/vcl/osx/clipboard.cxx
@@ -36,7 +36,6 @@ using namespace osl;
using namespace std;
using namespace comphelper;
-
@implementation EventListener;
-(EventListener*)initWithAquaClipboard: (AquaClipboard*) pcb
@@ -131,7 +130,6 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard
mPasteboardChangeCount = [mPasteboard changeCount];
}
-
AquaClipboard::~AquaClipboard()
{
if (mIsSystemPasteboard)
diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx
index bcacc6348edb..1fd71e623bfc 100644
--- a/vcl/osx/clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -62,7 +62,6 @@ class AquaClipboard;
-(void)disposing;
@end
-
class AquaClipboard : public ::cppu::BaseMutex,
public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::clipboard::XSystemClipboard,
com::sun::star::datatransfer::clipboard::XFlushableClipboard,
@@ -86,10 +85,8 @@ public:
virtual ~AquaClipboard();
-
// XClipboard
-
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
@@ -100,33 +97,25 @@ public:
virtual OUString SAL_CALL getName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
// XClipboardEx
-
virtual sal_Int8 SAL_CALL getRenderingCapabilities()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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 ) SAL_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 ) SAL_OVERRIDE;
-
// XFlushableClipboard
-
virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
// XServiceInfo
-
virtual OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx
index 4ab3949eaf83..908700383704 100644
--- a/vcl/osx/documentfocuslistener.cxx
+++ b/vcl/osx/documentfocuslistener.cxx
@@ -29,16 +29,11 @@ using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-
-
-
DocumentFocusListener::DocumentFocusListener(AquaA11yFocusTracker& rTracker) :
m_aFocusTracker(rTracker)
{
}
-
-
void SAL_CALL
DocumentFocusListener::disposing( const EventObject& aEvent )
throw (RuntimeException, std::exception)
@@ -49,8 +44,6 @@ DocumentFocusListener::disposing( const EventObject& aEvent )
m_aRefList.erase(aEvent.Source);
}
-
-
void SAL_CALL
DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
throw( RuntimeException, std::exception )
@@ -97,8 +90,6 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
}
}
-
-
Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& aEvent )
throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -125,8 +116,6 @@ Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject&
return Reference< XAccessible >();
}
-
-
void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAccessible)
throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -136,8 +125,6 @@ void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAcc
attachRecursive(xAccessible, xContext);
}
-
-
void DocumentFocusListener::attachRecursive(
const Reference< XAccessible >& xAccessible,
const Reference< XAccessibleContext >& xContext
@@ -152,8 +139,6 @@ void DocumentFocusListener::attachRecursive(
}
}
-
-
void DocumentFocusListener::attachRecursive(
const Reference< XAccessible >& xAccessible,
const Reference< XAccessibleContext >& xContext,
@@ -185,8 +170,6 @@ void DocumentFocusListener::attachRecursive(
}
}
-
-
void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAccessible)
throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -196,8 +179,6 @@ void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAcc
detachRecursive(xAccessible, xContext);
}
-
-
void DocumentFocusListener::detachRecursive(
const Reference< XAccessible >& xAccessible,
const Reference< XAccessibleContext >& xContext
@@ -209,8 +190,6 @@ void DocumentFocusListener::detachRecursive(
detachRecursive(xAccessible, xContext, xStateSet);
}
-
-
void DocumentFocusListener::detachRecursive(
const Reference< XAccessible >&,
const Reference< XAccessibleContext >& xContext,
diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx
index 82abb5ff67db..05b1fc2331ea 100644
--- a/vcl/osx/documentfocuslistener.hxx
+++ b/vcl/osx/documentfocuslistener.hxx
@@ -28,10 +28,8 @@
#include <set>
-
// - DocumentFocusListener -
-
class DocumentFocusListener :
public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
{
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index fa4fe5464261..23748fe7fe49 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string>
#include "rtl/ustrbuf.hxx"
@@ -54,12 +53,8 @@
using namespace std;
-
-
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
-
-
AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) :
mpNSWindow(nil),
mpNSView(nil),
@@ -99,8 +94,6 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) :
pSalData->maFrameCheck.insert( this );
}
-
-
AquaSalFrame::~AquaSalFrame()
{
// if the frame is destroyed and has the current menubar
@@ -135,8 +128,6 @@ AquaSalFrame::~AquaSalFrame()
[mpNSWindow release];
}
-
-
void AquaSalFrame::initWindowAndView()
{
// initialize mirroring parameters
@@ -227,8 +218,6 @@ void AquaSalFrame::initWindowAndView()
[mpNSWindow setContentView: mpNSView];
}
-
-
void AquaSalFrame::CocoaToVCL( NSRect& io_rRect, bool bRelativeToScreen )
{
if( bRelativeToScreen )
@@ -261,8 +250,6 @@ void AquaSalFrame::VCLToCocoa( NSPoint& io_rPoint, bool bRelativeToScreen )
io_rPoint.y = maGeometry.nHeight - io_rPoint.y;
}
-
-
void AquaSalFrame::screenParametersChanged()
{
UpdateFrameGeometry();
@@ -272,8 +259,6 @@ void AquaSalFrame::screenParametersChanged()
CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
}
-
-
SalGraphics* AquaSalFrame::AcquireGraphics()
{
if ( mbGraphics )
@@ -289,8 +274,6 @@ SalGraphics* AquaSalFrame::AcquireGraphics()
return mpGraphics;
}
-
-
void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
{
(void)pGraphics;
@@ -298,15 +281,12 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
mbGraphics = FALSE;
}
-
-
bool AquaSalFrame::PostEvent( void *pData )
{
GetSalData()->mpFirstInstance->PostUserEvent( this, SALEVENT_USEREVENT, pData );
return TRUE;
}
-
void AquaSalFrame::SetTitle(const OUString& rTitle)
{
if ( !mpNSWindow )
@@ -343,14 +323,10 @@ void AquaSalFrame::SetTitle(const OUString& rTitle)
[pTitle release];
}
-
-
void AquaSalFrame::SetIcon( sal_uInt16 )
{
}
-
-
void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL )
{
// #i113170# may not be the main thread if called from UNO API
@@ -369,8 +345,6 @@ void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL )
}
}
-
-
void AquaSalFrame::initShow()
{
mbInitShow = false;
@@ -422,8 +396,6 @@ void AquaSalFrame::SendPaintEvent( const Rectangle* pRect )
CallCallback(SALEVENT_PAINT, &aPaintEvt);
}
-
-
void AquaSalFrame::Show(bool bVisible, bool bNoActivate)
{
if ( !mpNSWindow )
@@ -485,14 +457,10 @@ void AquaSalFrame::Show(bool bVisible, bool bNoActivate)
}
}
-
-
void AquaSalFrame::Enable( bool )
{
}
-
-
void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight )
{
// #i113170# may not be the main thread if called from UNO API
@@ -516,8 +484,6 @@ void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight )
}
}
-
-
void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
{
// #i113170# may not be the main thread if called from UNO API
@@ -545,8 +511,6 @@ void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
}
}
-
-
void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight )
{
if( mbShown || mbInitShow )
@@ -561,8 +525,6 @@ void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight )
}
}
-
-
void AquaSalFrame::SetWindowState( const SalFrameState* pState )
{
// #i113170# may not be the main thread if called from UNO API
@@ -591,7 +553,6 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
else if( [mpNSWindow isMiniaturized] )
[mpNSWindow deminiaturize: NSApp];
-
/* ZOOMED is not really maximized (actually it toggles between a user set size and
the program specified one), but comes closest since the default behavior is
"maximized" if the user did not intervene
@@ -637,8 +598,6 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
}
}
-
-
bool AquaSalFrame::GetWindowState( SalFrameState* pState )
{
if ( !mpNSWindow )
@@ -671,8 +630,6 @@ bool AquaSalFrame::GetWindowState( SalFrameState* pState )
return TRUE;
}
-
-
void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
{
if ( !mpNSWindow )
@@ -711,8 +668,6 @@ void AquaSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ )
{
}
-
-
void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
{
if ( !mpNSWindow )
@@ -808,8 +763,6 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
SendPaintEvent();
}
-
-
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
class PreventSleepTimer : public AutoTimer
{
@@ -866,14 +819,10 @@ void AquaSalFrame::StartPresentation( bool bStart )
}
}
-
-
void AquaSalFrame::SetAlwaysOnTop( bool )
{
}
-
-
void AquaSalFrame::ToTop(sal_uInt16 nFlags)
{
if ( !mpNSWindow )
@@ -893,8 +842,6 @@ void AquaSalFrame::ToTop(sal_uInt16 nFlags)
[mpNSWindow orderFront: NSApp];
}
-
-
NSCursor* AquaSalFrame::getCurrentCursor() const
{
NSCursor* pCursor = nil;
@@ -949,8 +896,6 @@ void AquaSalFrame::SetPointer( PointerStyle ePointerStyle )
[mpNSWindow invalidateCursorRectsForView: mpNSView];
}
-
-
void AquaSalFrame::SetPointerPos( long nX, long nY )
{
// FIXME: use Cocoa functions
@@ -961,8 +906,6 @@ void AquaSalFrame::SetPointerPos( long nX, long nY )
CGDisplayMoveCursorToPoint( mainDisplayID, aPoint );
}
-
-
void AquaSalFrame::Flush( void )
{
if( !(mbGraphics && mpGraphics && mpNSView && mbShown) )
@@ -971,7 +914,6 @@ void AquaSalFrame::Flush( void )
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
-
[mpNSView setNeedsDisplay: YES];
// outside of the application's event loop (e.g. IntroWindow)
@@ -983,8 +925,6 @@ void AquaSalFrame::Flush( void )
}
}
-
-
void AquaSalFrame::Flush( const Rectangle& rRect )
{
if( !(mbGraphics && mpGraphics && mpNSView && mbShown) )
@@ -1006,8 +946,6 @@ void AquaSalFrame::Flush( const Rectangle& rRect )
}
}
-
-
void AquaSalFrame::Sync()
{
if( mbGraphics && mpGraphics && mpNSView && mbShown )
@@ -1020,8 +958,6 @@ void AquaSalFrame::Sync()
}
}
-
-
void AquaSalFrame::SetInputContext( SalInputContext* pContext )
{
if (!pContext)
@@ -1036,14 +972,10 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext )
return;
}
-
-
void AquaSalFrame::EndExtTextInput( sal_uInt16 )
{
}
-
-
OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
{
static std::map< sal_uInt16, OUString > aKeyMap;
@@ -1129,8 +1061,6 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
return aResult.makeStringAndClear();
}
-
-
static void getAppleScrollBarVariant(StyleSettings &rSettings)
{
bool bIsScrollbarDoubleMax = true; // default is DoubleMax
@@ -1328,22 +1258,16 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
[mpNSView unlockFocus];
}
-
-
const SystemEnvData* AquaSalFrame::GetSystemData() const
{
return &maSysData;
}
-
-
void AquaSalFrame::Beep()
{
NSBeep();
}
-
-
void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags)
{
if ( !mpNSWindow )
@@ -1534,7 +1458,6 @@ SalPointerState AquaSalFrame::GetPointerState()
state.mnState |= KEY_MOD1;
}
-
return state;
}
@@ -1663,8 +1586,6 @@ void AquaSalFrame::UpdateFrameGeometry()
maGeometry.nHeight = static_cast<unsigned int>(aContentRect.size.height);
}
-
-
void AquaSalFrame::CaptureMouse( bool bCapture )
{
/* Remark:
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 2c28ac9a915b..fce9e95b1178 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -70,7 +70,6 @@ static NSMenu* pDockMenu = nil;
static bool bNoSVMain = true;
static bool bLeftMain = false;
-
class AquaDelayedSettingsChanged : public Timer
{
bool mbInvalidate;
@@ -108,7 +107,6 @@ void AquaSalInstance::delayedSettingsChanged( bool bInvalidate )
pTimer->Start();
}
-
// the AppEventList must be available before any SalData/SalInst/etc. objects are ready
AquaSalInstance::AppEventList AquaSalInstance::aAppEventList;
@@ -132,7 +130,6 @@ bool AquaSalInstance::isOnCommandLine( const OUString& rArg )
return false;
}
-
// initialize the cocoa VCL_NSApplication object
// returns an NSAutoreleasePool that must be released when the event loop begins
static void initNSApp()
@@ -210,8 +207,6 @@ bool ImplSVMainHook( int * pnInit )
return TRUE; // indicate that ImplSVMainHook is implemented
}
-
-
void SalAbort( const OUString& rErrorText, bool bDumpCore )
{
if( rErrorText.isEmpty() )
@@ -225,24 +220,18 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore )
_exit(1);
}
-
-
void InitSalData()
{
SalData *pSalData = new SalData;
SetSalData( pSalData );
}
-
-
const OUString& SalGetDesktopEnvironment()
{
static OUString aDesktopEnvironment( "MacOSX" );
return aDesktopEnvironment;
}
-
-
void DeInitSalData()
{
SalData *pSalData = GetSalData();
@@ -255,20 +244,14 @@ void DeInitSalData()
SetSalData( NULL );
}
-
-
extern "C" {
#include <crt_externs.h>
}
-
-
void InitSalMain()
{
}
-
-
SalYieldMutex::SalYieldMutex()
{
mnCount = 0;
@@ -305,8 +288,6 @@ bool SalYieldMutex::tryToAcquire()
return false;
}
-
-
// some convenience functions regarding the yield mutex, aka solar mutex
bool ImplSalYieldMutexTryToAcquire()
@@ -332,8 +313,6 @@ void ImplSalYieldMutexRelease()
pInst->mpSalYieldMutex->release();
}
-
-
SalInstance* CreateSalInstance()
{
// this is the case for not using SVMain
@@ -362,15 +341,11 @@ SalInstance* CreateSalInstance()
return pInst;
}
-
-
void DestroySalInstance( SalInstance* pInst )
{
delete pInst;
}
-
-
AquaSalInstance::AquaSalInstance()
{
mpSalYieldMutex = new SalYieldMutex;
@@ -383,8 +358,6 @@ AquaSalInstance::AquaSalInstance()
maWaitingYieldCond = osl_createCondition();
}
-
-
AquaSalInstance::~AquaSalInstance()
{
::tools::SolarMutex::SetSolarMutex( 0 );
@@ -394,8 +367,6 @@ AquaSalInstance::~AquaSalInstance()
osl_destroyCondition( maWaitingYieldCond );
}
-
-
void AquaSalInstance::wakeupYield()
{
// wakeup :Yield
@@ -416,8 +387,6 @@ void AquaSalInstance::wakeupYield()
}
}
-
-
void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, void* pData )
{
osl_acquireMutex( maUserEventListMutex );
@@ -428,15 +397,11 @@ void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, voi
wakeupYield();
}
-
-
comphelper::SolarMutex* AquaSalInstance::GetYieldMutex()
{
return mpSalYieldMutex;
}
-
-
sal_uLong AquaSalInstance::ReleaseYieldMutex()
{
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
@@ -457,8 +422,6 @@ sal_uLong AquaSalInstance::ReleaseYieldMutex()
return 0;
}
-
-
void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount )
{
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
@@ -469,8 +432,6 @@ void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount )
}
}
-
-
bool AquaSalInstance::CheckYieldMutex()
{
bool bRet = true;
@@ -484,15 +445,11 @@ bool AquaSalInstance::CheckYieldMutex()
return bRet;
}
-
-
bool AquaSalInstance::isNSAppThread() const
{
return osl::Thread::getCurrentIdentifier() == maMainThread;
}
-
-
void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
{
switch( [pEvent subtype] )
@@ -590,8 +547,6 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
};
}
-
-
class ReleasePoolHolder
{
NSAutoreleasePool* mpPool;
@@ -746,8 +701,6 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
}
}
-
-
bool AquaSalInstance::AnyInput( sal_uInt16 nType )
{
if( nType & VCL_INPUT_APPEVENT )
@@ -792,15 +745,11 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType )
return (pEvent != NULL);
}
-
-
SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData*, sal_uLong /*nSalFrameStyle*/ )
{
return NULL;
}
-
-
SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle )
{
SalData::ensureThreadAutoreleasePool();
@@ -809,15 +758,11 @@ SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameSt
return pFrame;
}
-
-
void AquaSalInstance::DestroyFrame( SalFrame* pFrame )
{
delete pFrame;
}
-
-
SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /* pWindowData */, bool /* bShow */ )
{
// SystemWindowData is meaningless on Mac OS X
@@ -829,29 +774,21 @@ SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /
return pObject;
}
-
-
void AquaSalInstance::DestroyObject( SalObject* pObject )
{
delete ( pObject );
}
-
-
SalPrinter* AquaSalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter )
{
return new AquaSalPrinter( dynamic_cast<AquaSalInfoPrinter*>(pInfoPrinter) );
}
-
-
void AquaSalInstance::DestroyPrinter( SalPrinter* pPrinter )
{
delete pPrinter;
}
-
-
void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
{
NSArray* pNames = [NSPrinter printerNames];
@@ -878,21 +815,15 @@ void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
}
}
-
-
void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* )
{
}
-
-
void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
{
delete pInfo;
}
-
-
OUString AquaSalInstance::GetDefaultPrinter()
{
// #i113170# may not be the main thread if called from UNO API
@@ -917,8 +848,6 @@ OUString AquaSalInstance::GetDefaultPrinter()
return maDefaultPrinter;
}
-
-
SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData )
{
@@ -936,8 +865,6 @@ SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueI
return pNewInfoPrinter;
}
-
-
void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
{
// #i113170# may not be the main thread if called from UNO API
@@ -946,8 +873,6 @@ void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
delete pPrinter;
}
-
-
void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes )
{
rReturnedBytes = 1;
@@ -1017,37 +942,26 @@ void AquaSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OU
}
}
-
-
-
SalTimer* AquaSalInstance::CreateSalTimer()
{
return new AquaSalTimer();
}
-
-
SalSystem* AquaSalInstance::CreateSalSystem()
{
return new AquaSalSystem();
}
-
-
SalBitmap* AquaSalInstance::CreateSalBitmap()
{
return new QuartzSalBitmap();
}
-
-
SalSession* AquaSalInstance::CreateSalSession()
{
return NULL;
}
-
-
class MacImeStatus : public SalI18NImeStatus
{
public:
@@ -1060,8 +974,6 @@ public:
virtual void toggle() SAL_OVERRIDE {}
};
-
-
SalI18NImeStatus* AquaSalInstance::CreateI18NImeStatus()
{
return new MacImeStatus();
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 30b9a37b5edc..303c1fe21073 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -89,7 +89,6 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL;
}
@end
-
// FIXME: currently this is leaked
static MainMenuSelector* pMainMenuSelector = nil;
@@ -203,8 +202,6 @@ static void initAppMenu()
}
}
-
-
SalMenu* AquaSalInstance::CreateMenu( bool bMenuBar, Menu* pVCLMenu )
{
initAppMenu();
@@ -235,10 +232,6 @@ void AquaSalInstance::DestroyMenuItem( SalMenuItem* pSalMenuItem )
delete pSalMenuItem;
}
-
-
-
-
/*
* AquaSalMenu
*/
@@ -904,8 +897,6 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame
);
}
-
-
/*
* SalMenuItem
*/
@@ -954,6 +945,4 @@ AquaSalMenuItem::~AquaSalMenuItem()
[mpMenuItem autorelease];
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 016979ae3d83..7f9df92c739d 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -17,15 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include "osx/saldata.hxx"
#include "osx/salobj.h"
#include "osx/salframe.h"
-
-
AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) :
mpFrame( pFrame ),
mnClipX( -1 ),
@@ -56,8 +53,6 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) :
}
}
-
-
AquaSalObject::~AquaSalObject()
{
if( maSysData.mpNSView )
@@ -93,30 +88,22 @@ AquaSalObject::~AquaSalObject()
This is gives us an 80% solution only, though.
*/
-
-
void AquaSalObject::ResetClipRegion()
{
mbClip = false;
setClippedPosSize();
}
-
-
sal_uInt16 AquaSalObject::GetClipRegionType()
{
return SAL_OBJECT_CLIP_INCLUDERECTS;
}
-
-
void AquaSalObject::BeginSetClipRegion( sal_uLong )
{
mbClip = false;
}
-
-
void AquaSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
{
if( mbClip )
@@ -146,15 +133,11 @@ void AquaSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight
}
}
-
-
void AquaSalObject::EndSetClipRegion()
{
setClippedPosSize();
}
-
-
void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
{
mnX = nX;
@@ -164,8 +147,6 @@ void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
setClippedPosSize();
}
-
-
void AquaSalObject::setClippedPosSize()
{
NSRect aViewRect = { NSZeroPoint, NSMakeSize( mnWidth, mnHeight) };
@@ -194,16 +175,12 @@ void AquaSalObject::setClippedPosSize()
[mpClipView scrollToPoint: aClipPt];
}
-
-
void AquaSalObject::Show( bool bVisible )
{
if( mpClipView )
[mpClipView setHidden: (bVisible ? NO : YES)];
}
-
-
const SystemEnvData* AquaSalObject::GetSystemData() const
{
return &maSysData;
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index dfaaf7eb8bca..a973505bbf5b 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -45,9 +45,6 @@ using namespace vcl;
using namespace com::sun::star;
using namespace com::sun::star::beans;
-
-
-
AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
mpGraphics( 0 ),
mbGraphics( false ),
@@ -91,8 +88,6 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
}
}
-
-
AquaSalInfoPrinter::~AquaSalInfoPrinter()
{
delete mpGraphics;
@@ -102,8 +97,6 @@ AquaSalInfoPrinter::~AquaSalInfoPrinter()
CFRelease( mrContext );
}
-
-
void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
{
if( mpGraphics )
@@ -147,8 +140,6 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
}
}
-
-
SalGraphics* AquaSalInfoPrinter::AcquireGraphics()
{
SalGraphics* pGraphics = mbGraphics ? NULL : mpGraphics;
@@ -156,29 +147,22 @@ SalGraphics* AquaSalInfoPrinter::AcquireGraphics()
return pGraphics;
}
-
-
void AquaSalInfoPrinter::ReleaseGraphics( SalGraphics* )
{
mbGraphics = false;
}
-
-
bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
{
return false;
}
-
-
bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
{
// FIXME: implement driver data
if( io_pSetupData && io_pSetupData->mpDriverData )
return SetData( ~0, io_pSetupData );
-
bool bSuccess = true;
// set system type
@@ -214,12 +198,9 @@ bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
else
bSuccess = false;
-
return bSuccess;
}
-
-
void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation )
{
@@ -240,14 +221,11 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio
mePageOrientation = i_eSetOrientation;
}
-
-
bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupData )
{
if( ! io_pSetupData || io_pSetupData->mnSystem != JOBSETUP_SYSTEM_MAC )
return false;
-
if( mpPrintInfo )
{
if( (i_nFlags & SAL_JOBSET_ORIENTATION) != 0 )
@@ -280,22 +258,16 @@ bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupDat
return mpPrintInfo != nil;
}
-
-
sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* )
{
return 0;
}
-
-
OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong )
{
return OUString();
}
-
-
sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i_nType )
{
switch( i_nType )
@@ -328,8 +300,6 @@ sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i
return 0;
}
-
-
void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
long& o_rOutWidth, long& o_rOutHeight,
long& o_rPageOffX, long& o_rPageOffY,
@@ -422,7 +392,6 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName,
// how do I know when that might be ?
i_rController.jobStarted();
-
int nCopies = i_rController.getPrinter()->GetCopyCount();
int nJobs = 1;
if( bSinglePrintJobs )
@@ -506,7 +475,6 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName,
// is a mystery.
[pPrintDict setObject: [NSNumber numberWithInt: mnCurPageRangeCount] forKey: NSPrintLastPage];
-
// create print operation
NSPrintOperation* pPrintOperation = [NSPrintOperation printOperationWithView: pPrintView printInfo: mpPrintInfo];
@@ -594,28 +562,20 @@ bool AquaSalInfoPrinter::EndPage()
return true;
}
-
-
sal_uLong AquaSalInfoPrinter::GetErrorCode() const
{
return 0;
}
-
-
AquaSalPrinter::AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter ) :
mpInfoPrinter( i_pInfoPrinter )
{
}
-
-
AquaSalPrinter::~AquaSalPrinter()
{
}
-
-
bool AquaSalPrinter::StartJob( const OUString* i_pFileName,
const OUString& i_rJobName,
const OUString& i_rAppName,
@@ -625,8 +585,6 @@ bool AquaSalPrinter::StartJob( const OUString* i_pFileName,
return mpInfoPrinter->StartJob( i_pFileName, i_rJobName, i_rAppName, i_pSetupData, i_rController );
}
-
-
bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/,
const OUString& /*i_rJobName*/,
const OUString& /*i_rAppName*/,
@@ -639,36 +597,26 @@ bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/,
return false;
}
-
-
bool AquaSalPrinter::EndJob()
{
return mpInfoPrinter->EndJob();
}
-
-
bool AquaSalPrinter::AbortJob()
{
return mpInfoPrinter->AbortJob();
}
-
-
SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData )
{
return mpInfoPrinter->StartPage( i_pSetupData, i_bNewJobData );
}
-
-
bool AquaSalPrinter::EndPage()
{
return mpInfoPrinter->EndPage();
}
-
-
sal_uLong AquaSalPrinter::GetErrorCode()
{
return mpInfoPrinter->GetErrorCode();
@@ -744,5 +692,4 @@ int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* )
return 900;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx
index 5fd29a8b9acb..f10ba61b62e0 100644
--- a/vcl/osx/salsys.cxx
+++ b/vcl/osx/salsys.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "rtl/ustrbuf.hxx"
#include "vcl/button.hxx"
@@ -29,9 +28,6 @@
#include "svids.hrc"
-
-
-
AquaSalSystem::~AquaSalSystem()
{
}
@@ -154,7 +150,6 @@ int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle,
}
}
-
int nResult = NSRunAlertPanel( pTitle, @"%@", pDefText, pAltText, pOthText, pMessage );
if( pTitle )
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index 15a960117c93..17c4d80ac3c0 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -17,19 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "osx/saltimer.h"
#include "osx/salnstimer.h"
#include "osx/saldata.hxx"
#include "osx/salframe.h"
#include "osx/salinst.h"
-
-
NSTimer* AquaSalTimer::pRunningTimer = nil;
bool AquaSalTimer::bDispatchTimer = false;
-
void ImplSalStartTimer( sal_uLong nMS )
{
SalData* pSalData = GetSalData();
@@ -121,5 +117,4 @@ void AquaSalTimer::Stop()
ImplSalStopTimer();
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/service_entry.cxx b/vcl/osx/service_entry.cxx
index d4fa284c2ddb..63b616b3fb9a 100644
--- a/vcl/osx/service_entry.cxx
+++ b/vcl/osx/service_entry.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "osl/diagnose.h"
#include "vcl/svapp.hxx"
@@ -37,7 +36,6 @@ using namespace ::cppu;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::datatransfer::clipboard;
-
uno::Reference< XInterface > AquaSalInstance::CreateClipboard( const Sequence< Any >& i_rArguments )
{
if ( Application::IsHeadlessModeEnabled() )