[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/quartz
Tor Lillqvist
tml at collabora.com
Fri Feb 28 06:33:35 PST 2014
vcl/inc/osx/a11yfocustracker.hxx | 14 ++---
vcl/inc/osx/a11ylistener.hxx | 4 -
vcl/inc/osx/salframe.h | 98 ++++++++++++++++++--------------------
vcl/inc/osx/salinst.h | 82 +++++++++++++++----------------
vcl/inc/osx/salmenu.h | 35 ++++++-------
vcl/inc/osx/salobj.h | 16 +++---
vcl/inc/osx/salprn.h | 36 ++++++-------
vcl/inc/osx/salsys.h | 8 +--
vcl/osx/DataFlavorMapping.cxx | 20 +++----
vcl/osx/DragSource.hxx | 18 +++---
vcl/osx/DragSourceContext.hxx | 8 +--
vcl/osx/DropTarget.hxx | 44 ++++++++---------
vcl/osx/OSXTransferable.hxx | 6 +-
vcl/osx/a11yfocuslistener.hxx | 6 +-
vcl/osx/clipboard.hxx | 20 +++----
vcl/osx/documentfocuslistener.hxx | 4 -
vcl/osx/salframe.cxx | 21 --------
vcl/osx/salinst.cxx | 32 +-----------
vcl/osx/salnativewidgets.cxx | 2
vcl/quartz/salbmp.cxx | 42 ++++++++--------
20 files changed, 233 insertions(+), 283 deletions(-)
New commits:
commit ce433069f1b1c39ba368d5d2fc8008b6e9148324
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Feb 28 14:27:15 2014 +0200
Add SAL_OVERRIDE markup for the vcl OS X and iOS code, and follow-up cleanup
Thanks to SAL_OVERRIDE, I found a couple of unused functions and
several that were virtual even if they did not override anything and
were not overridden in any derived class.
Change-Id: I5981111d2fc38f75a384c52359546a973e772393
diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index f1bae09..2b5e96f 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -55,25 +55,25 @@ public:
protected:
// received a WINDOW_GETFOCUS event for this window
- virtual void window_got_focus(Window *pWindow);
+ void window_got_focus(Window *pWindow);
// received a TOOLBOX_HIGHLIGHT event for this window
- virtual void toolbox_highlight_on(Window *pWindow);
+ void toolbox_highlight_on(Window *pWindow);
// received a TOOLBOX_HIGHLIGHTOFF event for this window
- virtual void toolbox_highlight_off(Window *pWindow);
+ void toolbox_highlight_off(Window *pWindow);
// received a TABPAGE_ACTIVATE event for this window
- virtual void tabpage_activated(Window *pWindow);
+ void tabpage_activated(Window *pWindow);
// received a MENU_HIGHLIGHT event for this window
- virtual void menu_highlighted(const ::VclMenuEvent *pEvent);
+ void menu_highlighted(const ::VclMenuEvent *pEvent);
// toolbox items are widgets in gtk+ and Cocoa
- virtual void notify_toolbox_item_focus(ToolBox *pToolBox);
+ void notify_toolbox_item_focus(ToolBox *pToolBox);
// toolbox item opened a floating window (e.g. color chooser)
- virtual void toolbox_open_floater(Window *pWindow);
+ void toolbox_open_floater(Window *pWindow);
// callback function for Application::addEventListener
static long WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent);
diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx
index 7d15345..503e986 100644
--- a/vcl/inc/osx/a11ylistener.hxx
+++ b/vcl/inc/osx/a11ylistener.hxx
@@ -42,11 +42,11 @@ public:
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
const id m_wrapperObject;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index bbd638b..ff7c972 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -112,62 +112,60 @@ public:
virtual ~AquaSalFrame();
- virtual SalGraphics* GetGraphics();
- virtual void ReleaseGraphics( SalGraphics* pGraphics );
- virtual bool PostEvent( void* pData );
- virtual void SetTitle( const OUString& rTitle );
- virtual void SetIcon( sal_uInt16 nIcon );
- virtual void SetRepresentedURL( const OUString& );
- virtual void SetMenu( SalMenu* pSalMenu );
- virtual void DrawMenuBar();
- virtual void Show( bool bVisible, bool bNoActivate = false );
- virtual void Enable( bool bEnable );
- virtual void SetMinClientSize( long nWidth, long nHeight );
- virtual void SetMaxClientSize( long nWidth, long nHeight );
- virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags );
- virtual void GetClientSize( long& rWidth, long& rHeight );
- virtual void GetWorkArea( Rectangle& rRect );
- virtual SalFrame* GetParent() const;
- virtual void SetWindowState( const SalFrameState* pState );
- virtual bool GetWindowState( SalFrameState* pState );
- virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay );
- virtual void StartPresentation( bool bStart );
- virtual void SetAlwaysOnTop( bool bOnTop );
- virtual void ToTop( sal_uInt16 nFlags );
- virtual void SetPointer( PointerStyle ePointerStyle );
- virtual void CaptureMouse( bool bMouse );
- virtual void SetPointerPos( long nX, long nY );
- virtual void Flush( void );
- virtual void Flush( const Rectangle& );
- virtual void Sync();
- virtual void SetInputContext( SalInputContext* pContext );
- virtual void EndExtTextInput( sal_uInt16 nFlags );
- virtual OUString GetKeyName( sal_uInt16 nKeyCode );
- virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
- virtual LanguageType GetInputLanguage();
- virtual void UpdateSettings( AllSettings& rSettings );
- virtual void Beep();
- virtual const SystemEnvData* GetSystemData() const;
- virtual SalPointerState GetPointerState();
- virtual SalIndicatorState GetIndicatorState();
- virtual void SimulateKeyPress( sal_uInt16 nKeyCode );
- virtual void SetParent( SalFrame* pNewParent );
- virtual bool SetPluginParent( SystemParentData* pNewParent );
- virtual void SetExtendedFrameStyle( SalExtStyle );
- virtual void SetScreenNumber(unsigned int);
- virtual void SetApplicationID( const OUString &rApplicationID );
+ virtual SalGraphics* GetGraphics() SAL_OVERRIDE;
+ virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
+ virtual bool PostEvent( void* pData ) SAL_OVERRIDE;
+ virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
+ virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
+ virtual void SetRepresentedURL( const OUString& ) SAL_OVERRIDE;
+ virtual void SetMenu( SalMenu* pSalMenu ) SAL_OVERRIDE;
+ virtual void DrawMenuBar() SAL_OVERRIDE;
+ virtual void Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE;
+ virtual void Enable( bool bEnable ) SAL_OVERRIDE;
+ virtual void SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
+ virtual void SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
+ virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
+ virtual void GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
+ virtual void GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE;
+ virtual SalFrame* GetParent() const SAL_OVERRIDE;
+ virtual void SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE;
+ virtual bool GetWindowState( SalFrameState* pState ) SAL_OVERRIDE;
+ virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE;
+ virtual void StartPresentation( bool bStart ) SAL_OVERRIDE;
+ virtual void SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE;
+ virtual void ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE;
+ virtual void SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE;
+ virtual void CaptureMouse( bool bMouse ) SAL_OVERRIDE;
+ virtual void SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
+ virtual void Flush( void ) SAL_OVERRIDE;
+ virtual void Flush( const Rectangle& ) SAL_OVERRIDE;
+ virtual void Sync() SAL_OVERRIDE;
+ virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
+ virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
+ virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
+ virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) SAL_OVERRIDE;
+ virtual LanguageType GetInputLanguage() SAL_OVERRIDE;
+ virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
+ virtual void Beep() SAL_OVERRIDE;
+ virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE;
+ virtual SalPointerState GetPointerState() SAL_OVERRIDE;
+ virtual SalIndicatorState GetIndicatorState() SAL_OVERRIDE;
+ virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
+ virtual void SetParent( SalFrame* pNewParent ) SAL_OVERRIDE;
+ virtual bool SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE;
+ virtual void SetExtendedFrameStyle( SalExtStyle ) SAL_OVERRIDE;
+ virtual void SetScreenNumber(unsigned int) SAL_OVERRIDE;
+ virtual void SetApplicationID( const OUString &rApplicationID ) SAL_OVERRIDE;
// shaped system windows
// set clip region to none (-> rectangular windows, normal state)
- virtual void ResetClipRegion();
+ virtual void ResetClipRegion() SAL_OVERRIDE;
// start setting the clipregion consisting of nRects rectangles
- virtual void BeginSetClipRegion( sal_uLong nRects );
+ virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
// add a rectangle to the clip region
- virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+ virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
// done setting up the clipregion
- virtual void EndSetClipRegion();
-
- virtual void SetClientSize( long nWidth, long nHeight );
+ virtual void EndSetClipRegion() SAL_OVERRIDE;
void UpdateFrameGeometry();
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index c0b41c2..f3a05c0 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -44,10 +44,10 @@ class SalYieldMutex : public vcl::SolarMutexObject
public:
SalYieldMutex();
- virtual void acquire();
- virtual void release();
- virtual bool tryToAcquire();
- sal_uLong GetAcquireCount() const { return mnCount; }
+ virtual void acquire() SAL_OVERRIDE;
+ virtual void release() SAL_OVERRIDE;
+ virtual bool tryToAcquire() SAL_OVERRIDE;
+ sal_uLong GetAcquireCount() const { return mnCount; }
oslThreadIdentifier GetThreadId() const { return mnThreadId; }
};
@@ -83,52 +83,48 @@ public:
AquaSalInstance();
virtual ~AquaSalInstance();
- virtual SalSystem* CreateSystem();
- virtual void DestroySystem(SalSystem*);
- virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle );
- virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle );
- virtual void DestroyFrame( SalFrame* pFrame );
- virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true );
- virtual void DestroyObject( SalObject* pObject );
+ virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
+ virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
+ virtual void DestroyFrame( SalFrame* pFrame ) SAL_OVERRIDE;
+ virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE;
+ virtual void DestroyObject( SalObject* pObject ) SAL_OVERRIDE;
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY,
- sal_uInt16 nBitCount, const SystemGraphicsData *pData );
- virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice );
+ sal_uInt16 nBitCount, const SystemGraphicsData *pData ) SAL_OVERRIDE;
+ virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ) SAL_OVERRIDE;
virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
- ImplJobSetup* pSetupData );
- virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter );
- virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter );
- virtual void DestroyPrinter( SalPrinter* pPrinter );
- virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList );
- virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
- virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
- virtual OUString GetDefaultPrinter();
- virtual SalTimer* CreateSalTimer();
- virtual SalI18NImeStatus* CreateI18NImeStatus();
- virtual SalSystem* CreateSalSystem();
- virtual SalBitmap* CreateSalBitmap();
- virtual comphelper::SolarMutex* GetYieldMutex();
- virtual sal_uLong ReleaseYieldMutex();
- virtual void AcquireYieldMutex( sal_uLong nCount );
- virtual bool CheckYieldMutex();
- virtual void Yield( bool bWait, bool bHandleAllCurrentEvents );
- virtual bool AnyInput( sal_uInt16 nType );
- virtual SalMenu* CreateMenu( bool bMenuBar, Menu* pVCLMenu );
- virtual void DestroyMenu( SalMenu* );
- virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData );
- virtual void DestroyMenuItem( SalMenuItem* );
- virtual SalSession* CreateSalSession();
- virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
- virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService);
- virtual void SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
- virtual void SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
+ ImplJobSetup* pSetupData ) SAL_OVERRIDE;
+ virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) SAL_OVERRIDE;
+ virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) SAL_OVERRIDE;
+ virtual void DestroyPrinter( SalPrinter* pPrinter ) SAL_OVERRIDE;
+ virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) SAL_OVERRIDE;
+ virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
+ virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
+ virtual OUString GetDefaultPrinter() SAL_OVERRIDE;
+ virtual SalTimer* CreateSalTimer() SAL_OVERRIDE;
+ virtual SalI18NImeStatus* CreateI18NImeStatus() SAL_OVERRIDE;
+ virtual SalSystem* CreateSalSystem() SAL_OVERRIDE;
+ virtual SalBitmap* CreateSalBitmap() SAL_OVERRIDE;
+ virtual comphelper::SolarMutex* GetYieldMutex() SAL_OVERRIDE;
+ virtual sal_uLong ReleaseYieldMutex() SAL_OVERRIDE;
+ virtual void AcquireYieldMutex( sal_uLong nCount ) SAL_OVERRIDE;
+ virtual bool CheckYieldMutex() SAL_OVERRIDE;
+ virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ) SAL_OVERRIDE;
+ virtual bool AnyInput( sal_uInt16 nType ) SAL_OVERRIDE;
+ virtual SalMenu* CreateMenu( bool bMenuBar, Menu* pVCLMenu ) SAL_OVERRIDE;
+ virtual void DestroyMenu( SalMenu* ) SAL_OVERRIDE;
+ virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ) SAL_OVERRIDE;
+ virtual void DestroyMenuItem( SalMenuItem* ) SAL_OVERRIDE;
+ virtual SalSession* CreateSalSession() SAL_OVERRIDE;
+ virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) SAL_OVERRIDE;
+ virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE;
// dtrans implementation
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
- CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments );
- virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource();
- virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget();
+ CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments ) SAL_OVERRIDE;
+ virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource() SAL_OVERRIDE;
+ virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget() SAL_OVERRIDE;
static void handleAppDefinedEvent( NSEvent* pEvent );
diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index 66ec2f0..6997495 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -56,23 +56,24 @@ public:
AquaSalMenu( bool bMenuBar );
virtual ~AquaSalMenu();
- virtual bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars
- // otherwise only menu messages are processed (eg, OLE on Windows)
-
- virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos );
- virtual void RemoveItem( unsigned nPos );
- virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos );
- virtual void SetFrame( const SalFrame* pFrame );
- virtual void CheckItem( unsigned nPos, bool bCheck );
- virtual void EnableItem( unsigned nPos, bool bEnable );
- virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText );
- virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage);
- virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName );
- virtual void GetSystemMenuData( SystemMenuData* pData );
- virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags);
- virtual bool AddMenuBarButton( const SalMenuButtonItem& );
- virtual void RemoveMenuBarButton( sal_uInt16 nId );
- virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame );
+ virtual bool VisibleMenuBar() SAL_OVERRIDE;
+ // must return true to actually display native menu bars
+ // otherwise only menu messages are processed (eg, OLE on Windows)
+
+ virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE;
+ virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE;
+ virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE;
+ virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE;
+ virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE;
+ virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE;
+ virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE;
+ virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) SAL_OVERRIDE;
+ virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
+ virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
+ virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags) SAL_OVERRIDE;
+ virtual bool AddMenuBarButton( const SalMenuButtonItem& ) SAL_OVERRIDE;
+ virtual void RemoveMenuBarButton( sal_uInt16 nId ) SAL_OVERRIDE;
+ virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) SAL_OVERRIDE;
int getItemIndexByPos( sal_uInt16 nPos ) const;
const AquaSalFrame* getFrame() const;
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index f289b72..26eac4d 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -60,14 +60,14 @@ public:
AquaSalObject( AquaSalFrame* pFrame );
virtual ~AquaSalObject();
- virtual void ResetClipRegion();
- virtual sal_uInt16 GetClipRegionType();
- virtual void BeginSetClipRegion( sal_uLong nRects );
- virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
- virtual void EndSetClipRegion();
- virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight );
- virtual void Show( bool bVisible );
- virtual const SystemEnvData* GetSystemData() const;
+ virtual void ResetClipRegion() SAL_OVERRIDE;
+ virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE;
+ virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
+ virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+ virtual void EndSetClipRegion() SAL_OVERRIDE;
+ virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+ virtual void Show( bool bVisible ) SAL_OVERRIDE;
+ virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_INC_OSX_SALOBJ_H
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 1906cda..4a1cdb3 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -71,20 +71,20 @@ class AquaSalInfoPrinter : public SalInfoPrinter
void SetupPrinterGraphics( CGContextRef i_xContext ) const;
- virtual SalGraphics* GetGraphics();
- virtual void ReleaseGraphics( SalGraphics* i_pGraphics );
- virtual bool Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData );
- virtual bool SetPrinterData( ImplJobSetup* pSetupData );
- virtual bool SetData( sal_uLong i_nFlags, ImplJobSetup* i_pSetupData );
+ virtual SalGraphics* GetGraphics() SAL_OVERRIDE;
+ virtual void ReleaseGraphics( SalGraphics* i_pGraphics ) SAL_OVERRIDE;
+ virtual bool Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
+ virtual bool SetPrinterData( ImplJobSetup* pSetupData ) SAL_OVERRIDE;
+ virtual bool SetData( sal_uLong i_nFlags, ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
virtual void GetPageInfo( const ImplJobSetup* i_pSetupData,
long& o_rOutWidth, long& o_rOutHeight,
long& o_rPageOffX, long& o_rPageOffY,
- long& o_rPageWidth, long& o_rPageHeight );
- virtual sal_uLong GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType );
- virtual sal_uLong GetPaperBinCount( const ImplJobSetup* i_pSetupData );
- virtual OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin );
- virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData );
- virtual int GetLandscapeAngle( const ImplJobSetup* i_pSetupData );
+ long& o_rPageWidth, long& o_rPageHeight ) SAL_OVERRIDE;
+ virtual sal_uLong GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType ) SAL_OVERRIDE;
+ virtual sal_uLong GetPaperBinCount( const ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
+ virtual OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ) SAL_OVERRIDE;
+ virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
+ virtual int GetLandscapeAngle( const ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
// the artificial separation between InfoPrinter and Printer
// is not really useful for us
@@ -133,19 +133,19 @@ class AquaSalPrinter : public SalPrinter
sal_uLong i_nCopies,
bool i_bCollate,
bool i_bDirect,
- ImplJobSetup* i_pSetupData );
+ ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
// implement pull model print system
virtual bool StartJob( const OUString* i_pFileName,
const OUString& rJobName,
const OUString& i_rAppName,
ImplJobSetup* i_pSetupData,
- vcl::PrinterController& i_rListener );
+ vcl::PrinterController& i_rListener ) SAL_OVERRIDE;
- virtual bool EndJob();
- virtual bool AbortJob();
- virtual SalGraphics* StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData );
- virtual bool EndPage();
- virtual sal_uLong GetErrorCode();
+ virtual bool EndJob() SAL_OVERRIDE;
+ virtual bool AbortJob() SAL_OVERRIDE;
+ virtual SalGraphics* StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) SAL_OVERRIDE;
+ virtual bool EndPage() SAL_OVERRIDE;
+ virtual sal_uLong GetErrorCode() SAL_OVERRIDE;
private:
AquaSalPrinter( const AquaSalPrinter& );
diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h
index cb07be0..6373624 100644
--- a/vcl/inc/osx/salsys.h
+++ b/vcl/inc/osx/salsys.h
@@ -35,14 +35,14 @@ public:
virtual ~AquaSalSystem();
// get info about the display
- virtual unsigned int GetDisplayScreenCount();
- virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
+ virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
+ virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
- virtual OUString GetDisplayScreenName( unsigned int nScreen );
+ virtual OUString GetDisplayScreenName( unsigned int nScreen ) SAL_OVERRIDE;
virtual int ShowNativeMessageBox( const OUString& rTitle,
const OUString& rMessage,
int nButtonCombination,
- int nDefaultButton, bool bUseResources);
+ int nDefaultButton, bool bUseResources) SAL_OVERRIDE;
};
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 25ec32e..b971b05 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -194,9 +194,9 @@ public:
UniDataProvider(NSData* data);
- virtual NSData* getSystemData();
+ virtual NSData* getSystemData() SAL_OVERRIDE;
- virtual Any getOOoData();
+ virtual Any getOOoData() SAL_OVERRIDE;
};
UniDataProvider::UniDataProvider(const Any& data) :
@@ -247,9 +247,9 @@ public:
ByteSequenceDataProvider(NSData* data);
- virtual NSData* getSystemData();
+ virtual NSData* getSystemData() SAL_OVERRIDE;
- virtual Any getOOoData();
+ virtual Any getOOoData() SAL_OVERRIDE;
};
ByteSequenceDataProvider::ByteSequenceDataProvider(const Any& data) :
@@ -301,9 +301,9 @@ public:
HTMLFormatDataProvider(NSData* data);
- virtual NSData* getSystemData();
+ virtual NSData* getSystemData() SAL_OVERRIDE;
- virtual Any getOOoData();
+ virtual Any getOOoData() SAL_OVERRIDE;
};
HTMLFormatDataProvider::HTMLFormatDataProvider(const Any& data) :
@@ -367,9 +367,9 @@ public:
PNGDataProvider( NSData*, NSBitmapImageFileType);
- virtual NSData* getSystemData();
+ virtual NSData* getSystemData() SAL_OVERRIDE;
- virtual Any getOOoData();
+ virtual Any getOOoData() SAL_OVERRIDE;
};
PNGDataProvider::PNGDataProvider( const Any& data, NSBitmapImageFileType eImageType) :
@@ -431,8 +431,8 @@ public:
FileListDataProvider(const Any& data);
FileListDataProvider(NSArray* data);
- virtual NSData* getSystemData();
- virtual Any getOOoData();
+ virtual NSData* getSystemData() SAL_OVERRIDE;
+ virtual Any getOOoData() SAL_OVERRIDE;
};
FileListDataProvider::FileListDataProvider(const Any& data) :
diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx
index 475cd70..2755497 100644
--- a/vcl/osx/DragSource.hxx
+++ b/vcl/osx/DragSource.hxx
@@ -84,13 +84,13 @@ public:
// 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*/);
+ throw(com::sun::star::uno::Exception, std::exception/*, com::sun::star::uno::RuntimeException*/) SAL_OVERRIDE;
// XDragSource
- virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction)
- throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception);
+ throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL startDrag( const com::sun::star::datatransfer::dnd::DragGestureEvent& trigger,
sal_Int8 sourceActions,
@@ -98,15 +98,15 @@ public:
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);
+ throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception);
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void saveMouseEvent(NSEvent* theEvent);
- virtual unsigned int getSupportedDragOperations(bool isLocal) const;
+ void saveMouseEvent(NSEvent* theEvent);
+ unsigned int getSupportedDragOperations(bool isLocal) const;
public:
// The context notifies the XDragSourceListeners
diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx
index 183dd6b..826c583 100644
--- a/vcl/osx/DragSourceContext.hxx
+++ b/vcl/osx/DragSourceContext.hxx
@@ -42,16 +42,16 @@ public:
~DragSourceContext();
virtual sal_Int32 SAL_CALL getCurrentCursor( )
- throw( com::sun::star::uno::RuntimeException, std::exception);
+ throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setCursor( sal_Int32 cursorId )
- throw( com::sun::star::uno::RuntimeException, std::exception);
+ throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setImage( sal_Int32 imageId )
- throw( com::sun::star::uno::RuntimeException, std::exception);
+ throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL transferablesFlavorsChanged( )
- throw( com::sun::star::uno::RuntimeException, std::exception);
+ throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx
index 7e21930..cb7a575 100644
--- a/vcl/osx/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -89,46 +89,46 @@ public:
// Overrides WeakComponentImplHelper::disposing which is called by
// WeakComponentImplHelper::dispose
// Must be called.
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() SAL_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);
+ throw(com::sun::star::uno::Exception, std::exception) SAL_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);
+ throw(com::sun::star::uno::RuntimeException, std::exception) SAL_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);
+ throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Default is not active
- virtual sal_Bool SAL_CALL isActive() throw(com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setActive(sal_Bool isActive) throw(com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int8 SAL_CALL getDefaultActions() throw(com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL isActive() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setActive(sal_Bool isActive) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int8 SAL_CALL getDefaultActions() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDropTargetDragContext
- virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL rejectDrag() throw(com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL rejectDrag() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDropTargetDragContext
- virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL rejectDrop() throw (com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL rejectDrop() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception);
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// NSDraggingDestination protocol functions
- virtual NSDragOperation draggingEntered(id sender);
- virtual NSDragOperation draggingUpdated(id sender);
- virtual void draggingExited(id sender);
- virtual BOOL prepareForDragOperation(id sender);
- virtual BOOL performDragOperation(id sender);
- virtual void concludeDragOperation(id sender);
+ NSDragOperation draggingEntered(id sender);
+ NSDragOperation draggingUpdated(id sender);
+ void draggingExited(id sender);
+ BOOL prepareForDragOperation(id sender);
+ BOOL performDragOperation(id sender);
+ void concludeDragOperation(id sender);
/* If multiple actions are supported by the drag source and
the user did not choose a specific action by pressing a
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index 7177bef..aa794c8 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -54,13 +54,13 @@ public:
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 );
+ throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// Helper functions not part of the XTransferable interface
diff --git a/vcl/osx/a11yfocuslistener.hxx b/vcl/osx/a11yfocuslistener.hxx
index 42d5c35..493466e 100644
--- a/vcl/osx/a11yfocuslistener.hxx
+++ b/vcl/osx/a11yfocuslistener.hxx
@@ -42,11 +42,11 @@ public:
id getFocusedUIElement();
// KeyboardFocusListener
- virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible);
+ virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) SAL_OVERRIDE;
// rtl::IReference
- virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(());
- virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
+ virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(()) SAL_OVERRIDE;
+ virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()) SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx
index cc98cc6..d03e766 100644
--- a/vcl/osx/clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -91,50 +91,50 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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 );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ 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 );
+ 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 );
+ 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 );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XFlushableClipboard
- virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException, std::exception );
+ 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);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/* Get a reference to the used pastboard.
*/
diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx
index 3ed1a37..82abb5f 100644
--- a/vcl/osx/documentfocuslistener.hxx
+++ b/vcl/osx/documentfocuslistener.hxx
@@ -75,11 +75,11 @@ public:
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
std::set< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > m_aRefList;
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index e790bf1..80d2aa7 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -547,25 +547,6 @@ void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
-void AquaSalFrame::SetClientSize( long nWidth, long nHeight )
-{
- // #i113170# may not be the main thread if called from UNO API
- SalData::ensureThreadAutoreleasePool();
-
- if( mpNSWindow )
- {
- NSSize aSize = { static_cast<CGFloat>(nWidth), static_cast<CGFloat>(nHeight) };
-
- [mpNSWindow setContentSize: aSize];
- UpdateFrameGeometry();
- if( mbShown )
- // trigger filling our backbuffer
- SendPaintEvent();
- }
-}
-
-
-
void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight )
{
if( mbShown || mbInitShow )
@@ -843,7 +824,7 @@ public:
{
}
- virtual void Timeout()
+ virtual void Timeout() SAL_OVERRIDE
{
UpdateSystemActivity(OverallAct);
}
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 1eb1dff..28480b8 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -81,7 +81,7 @@ class AquaDelayedSettingsChanged : public Timer
{
}
- virtual void Timeout()
+ virtual void Timeout() SAL_OVERRIDE
{
SalData* pSalData = GetSalData();
if( ! pSalData->maFrames.empty() )
@@ -949,32 +949,6 @@ void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
-SalSystem* AquaSalInstance::CreateSystem()
-{
- return new AquaSalSystem();
-}
-
-
-
-void AquaSalInstance::DestroySystem( SalSystem* pSystem )
-{
- delete pSystem;
-}
-
-
-
-void AquaSalInstance::SetEventCallback( void*, bool(*)(void*,void*,int) )
-{
-}
-
-
-
-void AquaSalInstance::SetErrorEventCallback( void*, bool(*)(void*,void*,int) )
-{
-}
-
-
-
void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes )
{
rReturnedBytes = 1;
@@ -1083,8 +1057,8 @@ public:
// asks whether there is a status window available
// to toggle into menubar
- virtual bool canToggle() { return false; }
- virtual void toggle() {}
+ virtual bool canToggle() SAL_OVERRIDE { return false; }
+ virtual void toggle() SAL_OVERRIDE {}
};
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 574010a..d73ced9 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -61,7 +61,7 @@ class AquaBlinker : public Timer
static void Blink( AquaSalFrame*, const Rectangle&, int nTimeout = 80 );
- virtual void Timeout()
+ virtual void Timeout() SAL_OVERRIDE
{
Stop();
if( AquaSalFrame::isAlive( mpFrame ) && mpFrame->mbShown )
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 50a7513..fb3ca3c 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -402,17 +402,17 @@ class ImplPixelFormat32 : public ImplPixelFormat
// currently ARGB-format for 32bit depth
{
public:
- virtual void SkipPixel( sal_uInt32 nPixel )
+ virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
{
pData += nPixel << 2;
}
- virtual ColorData ReadPixel()
+ virtual ColorData ReadPixel() SAL_OVERRIDE
{
const ColorData c = RGB_COLORDATA( pData[1], pData[2], pData[3] );
pData += 4;
return c;
}
- virtual void WritePixel( ColorData nColor )
+ virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
{
*pData++ = 0;
*pData++ = COLORDATA_RED( nColor );
@@ -425,17 +425,17 @@ class ImplPixelFormat24 : public ImplPixelFormat
// currently BGR-format for 24bit depth
{
public:
- virtual void SkipPixel( sal_uInt32 nPixel )
+ virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
{
pData += (nPixel << 1) + nPixel;
}
- virtual ColorData ReadPixel()
+ virtual ColorData ReadPixel() SAL_OVERRIDE
{
const ColorData c = RGB_COLORDATA( pData[2], pData[1], pData[0] );
pData += 3;
return c;
}
- virtual void WritePixel( ColorData nColor )
+ virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
{
*pData++ = COLORDATA_BLUE( nColor );
*pData++ = COLORDATA_GREEN( nColor );
@@ -450,21 +450,21 @@ protected:
sal_uInt16* pData16;
public:
- virtual void StartLine( sal_uInt8* pLine )
+ virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE
{
pData16 = (sal_uInt16*)pLine;
}
- virtual void SkipPixel( sal_uInt32 nPixel )
+ virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
{
pData += nPixel;
}
- virtual ColorData ReadPixel()
+ virtual ColorData ReadPixel() SAL_OVERRIDE
{
const ColorData c = RGB_COLORDATA( (*pData & 0x7c00) >> 7, (*pData & 0x03e0) >> 2 , (*pData & 0x001f) << 3 );
pData++;
return c;
}
- virtual void WritePixel( ColorData nColor )
+ virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
{
*pData++ = ((COLORDATA_RED( nColor ) & 0xf8 ) << 7 ) ||
((COLORDATA_GREEN( nColor ) & 0xf8 ) << 2 ) ||
@@ -482,15 +482,15 @@ public:
: mrPalette( rPalette )
{
}
- virtual void SkipPixel( sal_uInt32 nPixel )
+ virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
{
pData += nPixel;
}
- virtual ColorData ReadPixel()
+ virtual ColorData ReadPixel() SAL_OVERRIDE
{
return mrPalette[ *pData++ ].operator Color().GetColor();
}
- virtual void WritePixel( ColorData nColor )
+ virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
{
const BitmapColor aColor( COLORDATA_RED( nColor ), COLORDATA_GREEN( nColor ), COLORDATA_BLUE( nColor ) );
*pData++ = static_cast< sal_uInt8 >( mrPalette.GetBestIndex( aColor ) );
@@ -509,26 +509,26 @@ public:
: mrPalette( rPalette )
{
}
- virtual void SkipPixel( sal_uInt32 nPixel )
+ virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
{
mnX += nPixel;
if( (nPixel & 1) )
mnShift ^= 4;
}
- virtual void StartLine( sal_uInt8* pLine )
+ virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE
{
pData = pLine;
mnX = 0;
mnShift = 4;
}
- virtual ColorData ReadPixel()
+ virtual ColorData ReadPixel() SAL_OVERRIDE
{
const BitmapColor& rColor = mrPalette[( pData[mnX >> 1] >> mnShift) & 0x0f];
mnX++;
mnShift ^= 4;
return rColor.operator Color().GetColor();
}
- virtual void WritePixel( ColorData nColor )
+ virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
{
const BitmapColor aColor( COLORDATA_RED( nColor ), COLORDATA_GREEN( nColor ), COLORDATA_BLUE( nColor ) );
pData[mnX>>1] &= (0xf0 >> mnShift);
@@ -549,22 +549,22 @@ public:
: mrPalette( rPalette )
{
}
- virtual void SkipPixel( sal_uInt32 nPixel )
+ virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
{
mnX += nPixel;
}
- virtual void StartLine( sal_uInt8* pLine )
+ virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE
{
pData = pLine;
mnX = 0;
}
- virtual ColorData ReadPixel()
+ virtual ColorData ReadPixel() SAL_OVERRIDE
{
const BitmapColor& rColor = mrPalette[ (pData[mnX >> 3 ] >> ( 7 - ( mnX & 7 ) )) & 1];
mnX++;
return rColor.operator Color().GetColor();
}
- virtual void WritePixel( ColorData nColor )
+ virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
{
const BitmapColor aColor( COLORDATA_RED( nColor ), COLORDATA_GREEN( nColor ), COLORDATA_BLUE( nColor ) );
if( mrPalette.GetBestIndex( aColor ) & 1 )
More information about the Libreoffice-commits
mailing list