sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx | 4 ++-- sd/source/ui/remotecontrol/OSXNetworkService.hxx | 4 ++-- writerfilter/source/dmapper/DomainMapperTableManager.hxx | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 65db69dd9c1febf4920b09918bf84ee4bb6ec2f6 Author: Stephan Bergmann <[email protected]> Date: Thu Mar 27 21:57:31 2014 +0100 SAL_OVERRIDE, Mac OS X sd redux Change-Id: I9b2959bf77fc79bba2f4abb09681872f6d3a4300 diff --git a/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx b/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx index 01ad404..1ccc242 100644 --- a/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx +++ b/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx @@ -29,8 +29,8 @@ namespace sd public: OSXBluetoothWrapper( IOBluetoothRFCOMMChannel* channel ); - virtual sal_Int32 readLine( OString& aLine ); - virtual sal_Int32 write( const void* pBuffer, sal_uInt32 len ); + virtual sal_Int32 readLine( OString& aLine ) SAL_OVERRIDE; + virtual sal_Int32 write( const void* pBuffer, sal_uInt32 len ) SAL_OVERRIDE; void appendData(void* pBuffer, size_t len ); void channelClosed(); }; diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.hxx b/sd/source/ui/remotecontrol/OSXNetworkService.hxx index fd6a3df..5873c1a 100644 --- a/sd/source/ui/remotecontrol/OSXNetworkService.hxx +++ b/sd/source/ui/remotecontrol/OSXNetworkService.hxx @@ -34,10 +34,10 @@ namespace sd { OSXNetworkService(const std::string& aname = "", unsigned int aport = 1599) : ZeroconfService(aname, aport){} - void clear() { + void clear() SAL_OVERRIDE { [osxservice dealloc]; } - void setup() { + void setup() SAL_OVERRIDE { osxservice = [[OSXBonjourService alloc] init]; [osxservice publishImpressRemoteServiceOnLocalNetworkWithName: @""]; }; commit b8b85207196dcf2c59a0062df69262e084dbb90e Author: Stephan Bergmann <[email protected]> Date: Thu Mar 27 21:32:56 2014 +0100 Work around MSC "'override' cannot be used with 'inline'" bug Change-Id: Ibf7094c750c665cf14a104091e8ff148d743bccc diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index ad6dedb..b733f48 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -95,7 +95,7 @@ public: const OUString& getTableStyleName() const { return m_sTableStyleName; } const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getCurrentTablePosition(); - inline virtual void cellProps(TablePropertyMapPtr pProps) SAL_OVERRIDE + virtual void cellProps(TablePropertyMapPtr pProps) SAL_OVERRIDE { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); @@ -103,7 +103,7 @@ public: DomainMapperTableManager_Base_t::cellProps( pProps ); }; - inline virtual void cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps) SAL_OVERRIDE + virtual void cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps) SAL_OVERRIDE { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); @@ -111,7 +111,7 @@ public: DomainMapperTableManager_Base_t::cellPropsByCell( i, pProps ); }; - inline virtual void insertRowProps(TablePropertyMapPtr pProps) SAL_OVERRIDE + virtual void insertRowProps(TablePropertyMapPtr pProps) SAL_OVERRIDE { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); @@ -119,7 +119,7 @@ public: DomainMapperTableManager_Base_t::insertRowProps( pProps ); }; - inline virtual void insertTableProps(TablePropertyMapPtr pProps) SAL_OVERRIDE + virtual void insertTableProps(TablePropertyMapPtr pProps) SAL_OVERRIDE { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
