diff options
Diffstat (limited to 'include')
548 files changed, 6600 insertions, 6595 deletions
diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx index 14f9c0730ab4..b75edc1791da 100644 --- a/include/basegfx/color/bcolormodifier.hxx +++ b/include/basegfx/color/bcolormodifier.hxx @@ -100,10 +100,10 @@ namespace basegfx virtual ~BColorModifier_gray(); // compare operator - virtual bool operator==(const BColorModifier& rCompare) const; + virtual bool operator==(const BColorModifier& rCompare) const SAL_OVERRIDE; // compute modified color - virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const; + virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const SAL_OVERRIDE; }; } // end of namespace basegfx @@ -128,10 +128,10 @@ namespace basegfx virtual ~BColorModifier_invert(); // compare operator - virtual bool operator==(const BColorModifier& rCompare) const; + virtual bool operator==(const BColorModifier& rCompare) const SAL_OVERRIDE; // compute modified color - virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const; + virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const SAL_OVERRIDE; }; } // end of namespace basegfx @@ -160,10 +160,10 @@ namespace basegfx virtual ~BColorModifier_luminance_to_alpha(); // compare operator - virtual bool operator==(const BColorModifier& rCompare) const; + virtual bool operator==(const BColorModifier& rCompare) const SAL_OVERRIDE; // compute modified color - virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const; + virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const SAL_OVERRIDE; }; } // end of namespace basegfx @@ -196,10 +196,10 @@ namespace basegfx const ::basegfx::BColor& getBColor() const { return maBColor; } // compare operator - virtual bool operator==(const BColorModifier& rCompare) const; + virtual bool operator==(const BColorModifier& rCompare) const SAL_OVERRIDE; // compute modified color - virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const; + virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const SAL_OVERRIDE; }; } // end of namespace basegfx @@ -236,10 +236,10 @@ namespace basegfx double getValue() const { return mfValue; } // compare operator - virtual bool operator==(const BColorModifier& rCompare) const; + virtual bool operator==(const BColorModifier& rCompare) const SAL_OVERRIDE; // compute modified color - virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const; + virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const SAL_OVERRIDE; }; } // end of namespace basegfx @@ -271,10 +271,10 @@ namespace basegfx double getValue() const { return mfValue; } // compare operator - virtual bool operator==(const BColorModifier& rCompare) const; + virtual bool operator==(const BColorModifier& rCompare) const SAL_OVERRIDE; // compute modified color - virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const; + virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const SAL_OVERRIDE; }; } // end of namespace basegfx @@ -308,10 +308,10 @@ namespace basegfx double getValue() const { return mfValue; } // compare operator - virtual bool operator==(const BColorModifier& rCompare) const; + virtual bool operator==(const BColorModifier& rCompare) const SAL_OVERRIDE; // compute modified color - virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const; + virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const SAL_OVERRIDE; }; } // end of namespace basegfx @@ -358,10 +358,10 @@ namespace basegfx double getContrast() const { return mfContrast; } // compare operator - virtual bool operator==(const BColorModifier& rCompare) const; + virtual bool operator==(const BColorModifier& rCompare) const SAL_OVERRIDE; // compute modified color - virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const; + virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const SAL_OVERRIDE; }; } // end of namespace basegfx diff --git a/include/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx index dd6740988a4d..a05d9c09c0a4 100644 --- a/include/basegfx/tools/unopolypolygon.hxx +++ b/include/basegfx/tools/unopolypolygon.hxx @@ -49,30 +49,30 @@ namespace unotools explicit UnoPolyPolygon( const B2DPolyPolygon& ); // XPolyPolygon2D - virtual void SAL_CALL addPolyPolygon( const ::com::sun::star::geometry::RealPoint2D& position, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& polyPolygon ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getNumberOfPolygons( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getNumberOfPolygonPoints( ::sal_Int32 polygon ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::rendering::FillRule SAL_CALL getFillRule( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFillRule( ::com::sun::star::rendering::FillRule fillRule ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isClosed( ::sal_Int32 index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setClosed( ::sal_Int32 index, ::sal_Bool closedState ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPolyPolygon( const ::com::sun::star::geometry::RealPoint2D& position, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& polyPolygon ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getNumberOfPolygons( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getNumberOfPolygonPoints( ::sal_Int32 polygon ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::rendering::FillRule SAL_CALL getFillRule( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFillRule( ::com::sun::star::rendering::FillRule fillRule ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isClosed( ::sal_Int32 index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setClosed( ::sal_Int32 index, ::sal_Bool closedState ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLinePolyPolygon2D - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > > SAL_CALL getPoints( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPoints( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& points, ::sal_Int32 nPolygonIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::geometry::RealPoint2D SAL_CALL getPoint( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPoint( const ::com::sun::star::geometry::RealPoint2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > > SAL_CALL getPoints( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPoints( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& points, ::sal_Int32 nPolygonIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::geometry::RealPoint2D SAL_CALL getPoint( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPoint( const ::com::sun::star::geometry::RealPoint2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XBezierPolyPolygon2D - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > > SAL_CALL getBezierSegments( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setBezierSegments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& points, ::sal_Int32 nPolygonIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::geometry::RealBezierSegment2D SAL_CALL getBezierSegment( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setBezierSegment( const ::com::sun::star::geometry::RealBezierSegment2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > > SAL_CALL getBezierSegments( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBezierSegments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& points, ::sal_Int32 nPolygonIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::geometry::RealBezierSegment2D SAL_CALL getBezierSegment( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBezierSegment( const ::com::sun::star::geometry::RealBezierSegment2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::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; B2DPolyPolygon getPolyPolygon() const; diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx index fae9ffc05196..7b6a12769c46 100644 --- a/include/basic/modsizeexceeded.hxx +++ b/include/basic/modsizeexceeded.hxx @@ -35,8 +35,8 @@ class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< ::com // UNO interface public: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return m_lContinuations; } - com::sun::star::uno::Any SAL_CALL getRequest() throw( com::sun::star::uno::RuntimeException, std::exception ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return m_lContinuations; } + com::sun::star::uno::Any SAL_CALL getRequest() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return m_aRequest; } diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx index 1b2ab4c84736..134748041306 100644 --- a/include/basic/sbmeth.hxx +++ b/include/basic/sbmeth.hxx @@ -46,14 +46,14 @@ class BASIC_DLLPUBLIC SbMethod : public SbxMethod SbxArrayRef refStatics; BASIC_DLLPRIVATE SbMethod( const OUString&, SbxDataType, SbModule* ); BASIC_DLLPRIVATE SbMethod( const SbMethod& ); - virtual sal_Bool LoadData( SvStream&, sal_uInt16 ); - virtual sal_Bool StoreData( SvStream& ) const; + virtual sal_Bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; + virtual sal_Bool StoreData( SvStream& ) const SAL_OVERRIDE; virtual ~SbMethod(); public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMETHOD,2); TYPEINFO_OVERRIDE(); - virtual SbxInfo* GetInfo(); + virtual SbxInfo* GetInfo() SAL_OVERRIDE; SbxArray* GetStatics(); void ClearStatics(); SbModule* GetModule() { return pMod; } @@ -64,7 +64,7 @@ public: // Interface to execute a method from the applications virtual ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL ); - virtual void Broadcast( sal_uIntPtr nHintId ); + virtual void Broadcast( sal_uIntPtr nHintId ) SAL_OVERRIDE; }; SV_DECL_IMPL_REF(SbMethod) diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index 6d67e8c9e760..e1cc3ea62a54 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -85,21 +85,21 @@ protected: const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16& ) const; const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16&, sal_Bool bFollowJumps, const SbiImage* pImg=NULL ) const; - virtual sal_Bool LoadData( SvStream&, sal_uInt16 ); - virtual sal_Bool StoreData( SvStream& ) const; - virtual sal_Bool LoadCompleted(); + virtual sal_Bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; + virtual sal_Bool StoreData( SvStream& ) const SAL_OVERRIDE; + virtual sal_Bool LoadCompleted() SAL_OVERRIDE; virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; void handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual ~SbModule(); public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2); TYPEINFO_OVERRIDE(); SbModule( const OUString&, sal_Bool bCompat = sal_False ); - virtual void SetParent( SbxObject* ); - virtual void Clear(); + virtual void SetParent( SbxObject* ) SAL_OVERRIDE; + virtual void Clear() SAL_OVERRIDE; - virtual SbxVariable* Find( const OUString&, SbxClassType ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; virtual const OUString& GetSource() const; const OUString& GetSource32() const; @@ -153,9 +153,9 @@ public: ~SbClassModuleObject(); // Overridden to support NameAccess etc. - virtual SbxVariable* Find( const OUString&, SbxClassType ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; - virtual void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ); + virtual void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE; SbModule* getClassModule( void ) { return mpClassModule; } diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index d24c80369861..bf63b6cd1232 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -75,8 +75,8 @@ private: BASIC_DLLPRIVATE sal_Bool RTError( SbError, const OUString& rMsg, sal_Int32, sal_Int32, sal_Int32 ); BASIC_DLLPRIVATE sal_uInt16 BreakPoint( sal_Int32 nLine, sal_Int32 nCol1, sal_Int32 nCol2 ); BASIC_DLLPRIVATE sal_uInt16 StepPoint( sal_Int32 nLine, sal_Int32 nCol1, sal_Int32 nCol2 ); - virtual sal_Bool LoadData( SvStream&, sal_uInt16 ); - virtual sal_Bool StoreData( SvStream& ) const; + virtual sal_Bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; + virtual sal_Bool StoreData( SvStream& ) const SAL_OVERRIDE; protected: virtual sal_Bool ErrorHdl(); @@ -92,15 +92,15 @@ public: // #51727 SetModified overridden so that the Modfied-State is // not delivered to Parent. - virtual void SetModified( sal_Bool ); + virtual void SetModified( sal_Bool ) SAL_OVERRIDE; void* operator new( size_t ); void operator delete( void* ); - virtual void Insert( SbxVariable* ); + virtual void Insert( SbxVariable* ) SAL_OVERRIDE; using SbxObject::Remove; - virtual void Remove( SbxVariable* ); - virtual void Clear(); + virtual void Remove( SbxVariable* ) SAL_OVERRIDE; + virtual void Clear() SAL_OVERRIDE; BasicLibInfo* GetLibInfo() { return pLibInfo; } void SetLibInfo( BasicLibInfo* p ) { pLibInfo = p; } @@ -121,8 +121,8 @@ public: static OUString GetErrorMsg(); static sal_Int32 GetErl(); - virtual SbxVariable* Find( const OUString&, SbxClassType ); - virtual sal_Bool Call( const OUString&, SbxArray* = NULL ); + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; + virtual sal_Bool Call( const OUString&, SbxArray* = NULL ) SAL_OVERRIDE; SbxArray* GetModules() { return pModules; } SbxObject* GetRtl() { return pRtl; } diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index 949a1d3e9c60..ab97b8c345d4 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -103,9 +103,9 @@ class BASIC_DLLPUBLIC SbxAlias : public SbxVariable, public SfxListener { SbxVariableRef xAlias; virtual ~SbxAlias(); - virtual void Broadcast( sal_uIntPtr ); + virtual void Broadcast( sal_uIntPtr ) SAL_OVERRIDE; virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; public: SbxAlias( const SbxAlias& ); SbxAlias& operator=( const SbxAlias& ); @@ -131,8 +131,8 @@ class BASIC_DLLPUBLIC SbxArray : public SbxBase protected: SbxDataType eType; // Data type of the array virtual ~SbxArray(); - virtual sal_Bool LoadData( SvStream&, sal_uInt16 ); - virtual sal_Bool StoreData( SvStream& ) const; + virtual sal_Bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; + virtual sal_Bool StoreData( SvStream& ) const SAL_OVERRIDE; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_ARRAY,1); @@ -140,10 +140,10 @@ public: SbxArray( SbxDataType=SbxVARIANT ); SbxArray( const SbxArray& ); SbxArray& operator=( const SbxArray& ); - virtual void Clear(); + virtual void Clear() SAL_OVERRIDE; sal_uInt16 Count() const; - virtual SbxDataType GetType() const; - virtual SbxClassType GetClass() const; + virtual SbxDataType GetType() const SAL_OVERRIDE; + virtual SbxClassType GetClass() const SAL_OVERRIDE; SbxVariableRef& GetRef( sal_uInt16 ); SbxVariable* Get( sal_uInt16 ); void Put( SbxVariable*, sal_uInt16 ); @@ -178,8 +178,8 @@ protected: sal_uInt16 Offset( const short* ); sal_uInt32 Offset32( const sal_Int32* ); sal_uInt32 Offset32( SbxArray* ); - virtual sal_Bool LoadData( SvStream&, sal_uInt16 ); - virtual sal_Bool StoreData( SvStream& ) const; + virtual sal_Bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; + virtual sal_Bool StoreData( SvStream& ) const SAL_OVERRIDE; virtual ~SbxDimArray(); public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_DIMARRAY,1); @@ -187,7 +187,7 @@ public: SbxDimArray( SbxDataType=SbxVARIANT ); SbxDimArray( const SbxDimArray& ); SbxDimArray& operator=( const SbxDimArray& ); - virtual void Clear(); + virtual void Clear() SAL_OVERRIDE; using SbxArray::GetRef; using SbxArray::Get; SbxVariable* Get( const short* ); @@ -217,9 +217,9 @@ class BASIC_DLLPUBLIC SbxCollection : public SbxObject BASIC_DLLPRIVATE void Initialize(); protected: virtual ~SbxCollection(); - virtual sal_Bool LoadData( SvStream&, sal_uInt16 ); + virtual sal_Bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; // Overridable methods (why not pure virtual?): virtual void CollAdd( SbxArray* pPar ); virtual void CollItem( SbxArray* pPar ); @@ -231,9 +231,9 @@ public: SbxCollection( const OUString& rClassname ); SbxCollection( const SbxCollection& ); SbxCollection& operator=( const SbxCollection& ); - virtual SbxVariable* FindUserData( sal_uInt32 nUserData ); - virtual SbxVariable* Find( const OUString&, SbxClassType ); - virtual void Clear(); + virtual SbxVariable* FindUserData( sal_uInt32 nUserData ) SAL_OVERRIDE; + virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; + virtual void Clear() SAL_OVERRIDE; }; class BASIC_DLLPUBLIC SbxStdCollection : public SbxCollection @@ -242,17 +242,17 @@ protected: OUString aElemClass; sal_Bool bAddRemoveOk; virtual ~SbxStdCollection(); - virtual sal_Bool LoadData( SvStream&, sal_uInt16 ); - virtual sal_Bool StoreData( SvStream& ) const; - virtual void CollAdd( SbxArray* pPar ); - virtual void CollRemove( SbxArray* pPar ); + virtual sal_Bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; + virtual sal_Bool StoreData( SvStream& ) const SAL_OVERRIDE; + virtual void CollAdd( SbxArray* pPar ) SAL_OVERRIDE; + virtual void CollRemove( SbxArray* pPar ) SAL_OVERRIDE; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_FIXCOLLECTION,1); TYPEINFO_OVERRIDE(); SbxStdCollection( const OUString& rClassname, const OUString& rElemClass, sal_Bool=sal_True ); SbxStdCollection( const SbxStdCollection& ); SbxStdCollection& operator=( const SbxStdCollection& ); - virtual void Insert( SbxVariable* ); + virtual void Insert( SbxVariable* ) SAL_OVERRIDE; const OUString& GetElementClass() const { return aElemClass; } }; diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index 78208982c8f5..c7c240d38da7 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -36,15 +36,17 @@ class SvStream; // This version of the Macros does not define Load/StorePrivateData()-methods #define SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer ) \ - virtual sal_uInt32 GetCreator() const { return nCre; } \ - virtual sal_uInt16 GetVersion() const { return nVer; } \ - virtual sal_uInt16 GetSbxId() const { return nSbxId; } + virtual sal_uInt32 GetCreator() const SAL_OVERRIDE { return nCre; } \ + virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return nVer; } \ + virtual sal_uInt16 GetSbxId() const SAL_OVERRIDE { return nSbxId; } // This version of the macro defines Load/StorePrivateData()-methods #define SBX_DECL_PERSIST( nCre, nSbxId, nVer ) \ virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); \ virtual sal_Bool StorePrivateData( SvStream& ) const; \ - SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer ) + virtual sal_uInt32 GetCreator() const { return nCre; } \ + virtual sal_uInt16 GetVersion() const { return nVer; } \ + virtual sal_uInt16 GetSbxId() const { return nSbxId; } class SbxBase; class SbxFactory; diff --git a/include/basic/sbxmeth.hxx b/include/basic/sbxmeth.hxx index 2c07361ac9d7..c442bacaebc1 100644 --- a/include/basic/sbxmeth.hxx +++ b/include/basic/sbxmeth.hxx @@ -32,7 +32,7 @@ public: SbxMethod( const SbxMethod& r ); ~SbxMethod(); SbxMethod& operator=( const SbxMethod& r ) { SbxVariable::operator=( r ); return *this; } - virtual SbxClassType GetClass() const; + virtual SbxClassType GetClass() const SAL_OVERRIDE; }; #endif diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx index 6a06cca53570..57c92bfd2eb8 100644 --- a/include/basic/sbxobj.hxx +++ b/include/basic/sbxobj.hxx @@ -37,20 +37,20 @@ protected: SbxProperty* pDfltProp; // Default-Property OUString aClassName; // Classname OUString aDfltPropName; - virtual sal_Bool LoadData( SvStream&, sal_uInt16 ); - virtual sal_Bool StoreData( SvStream& ) const; + virtual sal_Bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; + virtual sal_Bool StoreData( SvStream& ) const SAL_OVERRIDE; virtual ~SbxObject(); virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_OBJECT,1); TYPEINFO_OVERRIDE(); SbxObject( const OUString& rClassname ); SbxObject( const SbxObject& ); SbxObject& operator=( const SbxObject& ); - virtual SbxDataType GetType() const; - virtual SbxClassType GetClass() const; - virtual void Clear(); + virtual SbxDataType GetType() const SAL_OVERRIDE; + virtual SbxClassType GetClass() const SAL_OVERRIDE; + virtual void Clear() SAL_OVERRIDE; virtual sal_Bool IsClass( const OUString& ) const; const OUString& GetClassName() const { return aClassName; } diff --git a/include/basic/sbxprop.hxx b/include/basic/sbxprop.hxx index a58616ed900b..3a9cd23c2545 100644 --- a/include/basic/sbxprop.hxx +++ b/include/basic/sbxprop.hxx @@ -33,7 +33,7 @@ public: virtual ~SbxProperty(); SbxProperty& operator=( const SbxProperty& r ) { SbxVariable::operator=( r ); return *this; } - virtual SbxClassType GetClass() const; + virtual SbxClassType GetClass() const SAL_OVERRIDE; }; SV_DECL_REF(SbxProperty) diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 04a88eb15265..686577ac0a74 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -99,8 +99,8 @@ protected: virtual void Broadcast( sal_uIntPtr ); // Broadcast-Call virtual ~SbxValue(); - virtual sal_Bool LoadData( SvStream&, sal_uInt16 ); - virtual sal_Bool StoreData( SvStream& ) const; + virtual sal_Bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; + virtual sal_Bool StoreData( SvStream& ) const SAL_OVERRIDE; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1); TYPEINFO_OVERRIDE(); @@ -108,8 +108,8 @@ public: SbxValue( SbxDataType, void* = NULL ); SbxValue( const SbxValue& ); SbxValue& operator=( const SbxValue& ); - virtual void Clear(); - virtual sal_Bool IsFixed() const; + virtual void Clear() SAL_OVERRIDE; + virtual sal_Bool IsFixed() const SAL_OVERRIDE; sal_Bool IsInteger() const { return sal_Bool( GetType() == SbxINTEGER ); } sal_Bool IsLong() const { return sal_Bool( GetType() == SbxLONG ); } @@ -135,8 +135,8 @@ public: sal_Bool IsNumericRTL() const; // #41692 Interface for Basic sal_Bool ImpIsNumeric( bool bOnlyIntntl ) const; // Implementation - virtual SbxClassType GetClass() const; - virtual SbxDataType GetType() const; + virtual SbxClassType GetClass() const SAL_OVERRIDE; + virtual SbxDataType GetType() const SAL_OVERRIDE; SbxDataType GetFullType() const; sal_Bool SetType( SbxDataType ); @@ -300,8 +300,8 @@ protected: sal_uIntPtr nUserData; // User data for Call() SbxObject* pParent; // Currently attached object virtual ~SbxVariable(); - virtual sal_Bool LoadData( SvStream&, sal_uInt16 ); - virtual sal_Bool StoreData( SvStream& ) const; + virtual sal_Bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE; + virtual sal_Bool StoreData( SvStream& ) const SAL_OVERRIDE; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2); TYPEINFO_OVERRIDE(); @@ -316,13 +316,13 @@ public: virtual const OUString& GetName( SbxNameType = SbxNAME_NONE ) const; sal_uInt16 GetHashCode() const { return nHash; } - virtual void SetModified( sal_Bool ); + virtual void SetModified( sal_Bool ) SAL_OVERRIDE; sal_uIntPtr GetUserData() const { return nUserData; } void SetUserData( sal_uIntPtr n ) { nUserData = n; } - virtual SbxDataType GetType() const; - virtual SbxClassType GetClass() const; + virtual SbxDataType GetType() const SAL_OVERRIDE; + virtual SbxClassType GetClass() const SAL_OVERRIDE; // Parameter-Interface virtual SbxInfo* GetInfo(); @@ -334,7 +334,7 @@ public: // Due to data reduction and better DLL-hierarchie currently via casting SfxBroadcaster& GetBroadcaster(); sal_Bool IsBroadcaster() const { return sal_Bool( pCst != NULL ); } - virtual void Broadcast( sal_uIntPtr nHintId ); + virtual void Broadcast( sal_uIntPtr nHintId ) SAL_OVERRIDE; inline const SbxObject* GetParent() const { return pParent; } SbxObject* GetParent(); diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx index 75700e6a287d..2d5794bd8ad4 100644 --- a/include/canvas/base/cachedprimitivebase.hxx +++ b/include/canvas/base/cachedprimitivebase.hxx @@ -66,15 +66,15 @@ namespace canvas bool bFailForChangedViewTransform ); /// Dispose all internal references - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XCachedPrimitive - virtual ::sal_Int8 SAL_CALL redraw( const ::com::sun::star::rendering::ViewState& aState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int8 SAL_CALL redraw( const ::com::sun::star::rendering::ViewState& aState ) throw (::com::sun::star::lang::IllegalArgumentException, ::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; protected: ~CachedPrimitiveBase(); // we're a ref-counted UNO class. _We_ destroy ourselves. diff --git a/include/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx index f3f79a389885..8c6a9d0f24fe 100644 --- a/include/canvas/parametricpolypolygon.hxx +++ b/include/canvas/parametricpolypolygon.hxx @@ -99,18 +99,18 @@ namespace canvas const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ); /// Dispose all internal references - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XParametricPolyPolygon2D - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL getOutline( double t ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getColor( double t ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getPointColor( const ::com::sun::star::geometry::RealPoint2D& point ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL getOutline( double t ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getColor( double t ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getPointColor( const ::com::sun::star::geometry::RealPoint2D& point ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace() 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; /// Query all defining values of this object atomically Values getValues() const; diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx index 1b900a6c9fc7..8c7c35fa8e5d 100644 --- a/include/comphelper/ChainablePropertySet.hxx +++ b/include/comphelper/ChainablePropertySet.hxx @@ -97,41 +97,41 @@ namespace comphelper // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } #endif diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx index fc6cb5d35101..1df28f6d4c2d 100644 --- a/include/comphelper/ChainablePropertySetInfo.hxx +++ b/include/comphelper/ChainablePropertySetInfo.hxx @@ -48,11 +48,11 @@ namespace comphelper // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; PropertyInfoHash maMap; com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties; diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx index 3b363b264da4..0444a6d71617 100644 --- a/include/comphelper/MasterPropertySet.hxx +++ b/include/comphelper/MasterPropertySet.hxx @@ -102,41 +102,41 @@ namespace comphelper // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } #endif diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx index 4973699f7e4c..60d2515aaa8f 100644 --- a/include/comphelper/MasterPropertySetInfo.hxx +++ b/include/comphelper/MasterPropertySetInfo.hxx @@ -41,11 +41,11 @@ namespace comphelper // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; PropertyDataHash maMap; com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties; diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx index 06b19406d932..67c71324731c 100644 --- a/include/comphelper/SelectionMultiplex.hxx +++ b/include/comphelper/SelectionMultiplex.hxx @@ -82,10 +82,10 @@ namespace comphelper OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier>& _rxSet, bool _bAutoReleaseSet = true); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSelectionChangeListener - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// incremental lock void lock(); diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index b670b4830bad..c39b02486871 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -89,11 +89,11 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleComponent - default implementations - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -120,11 +120,11 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleComponent - default implementations - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 18890be35ece..fe2cdb5f7c08 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -152,30 +152,30 @@ namespace comphelper public: // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - still waiting to be overwritten - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; // XAccessibleContext - default implementations /** default implementation for retrieving the index of this object within the parent <p>This basic implementation here returns the index <code>i</code> of the child for which <code><parent>.getAccessibleChild( i )</code> equals our creator.</p> */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** default implementation for retrieving the locale <p>This basic implementation returns the locale of the parent context, as retrieved via getAccessibleParent()->getAccessibleContext.</p> */ - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // helper struct for granting selective access rights @@ -195,7 +195,7 @@ namespace comphelper protected: // OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: // helper diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx index 48ba71f6c7d4..0a1105c884f6 100644 --- a/include/comphelper/accessiblekeybindinghelper.hxx +++ b/include/comphelper/accessiblekeybindinghelper.hxx @@ -62,8 +62,8 @@ namespace comphelper void AddKeyBinding( const ::com::sun::star::awt::KeyStroke& rKeyStroke ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleKeyBinding - virtual sal_Int32 SAL_CALL getAccessibleKeyBindingCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyStroke > SAL_CALL getAccessibleKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleKeyBindingCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyStroke > SAL_CALL getAccessibleKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index 1c3c4e493fe4..161797f603d2 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -97,7 +97,7 @@ namespace comphelper OAccessibleSelectionHelper( IMutex* _pExternalLock ); // return ourself here by default - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > implGetAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > implGetAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; public: @@ -106,13 +106,13 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleSelection - default implementations - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index 5e350f20bd36..bb516125927e 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -123,16 +123,16 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleText - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index a6504c8bb7a5..3e7dab3f22af 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -103,7 +103,7 @@ namespace comphelper protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getParent() const { return m_xParentAccessible; } @@ -195,7 +195,7 @@ namespace comphelper protected: // XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider DECLARE_XTYPEPROVIDER( ) @@ -206,13 +206,13 @@ namespace comphelper ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > baseGetAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent/OComponentProxyAggregationHelper - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // own overridables /** notify an accessible event which has been translated (if necessary) @@ -279,34 +279,34 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OAccessibleContextWrapper - virtual void notifyTranslatedEvent( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void notifyTranslatedEvent( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } // OComponentHelper using OAccessibleContextWrapperHelper::disposing; - virtual void SAL_CALL disposing() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: virtual ~OAccessibleContextWrapper(); @@ -391,7 +391,7 @@ namespace comphelper protected: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: void implTranslateChildEventValue( const ::com::sun::star::uno::Any& _rInValue, ::com::sun::star::uno::Any& _rOutValue ); diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx index de4f8382627f..202777216af8 100644 --- a/include/comphelper/accimplaccess.hxx +++ b/include/comphelper/accimplaccess.hxx @@ -92,7 +92,7 @@ namespace comphelper virtual ~OAccessibleImplementationAccess( ); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: /** tries to access the implementation of an OAccessibleImplementationAccess derivee which is known as diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx index 0b1d74786f1e..263531ba249e 100644 --- a/include/comphelper/anycompare.hxx +++ b/include/comphelper/anycompare.hxx @@ -74,7 +74,7 @@ namespace comphelper class ScalarPredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const + virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const SAL_OVERRIDE { SCALAR lhs(0), rhs(0); if ( !( _lhs >>= lhs ) @@ -91,7 +91,7 @@ namespace comphelper class StringPredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const + virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const SAL_OVERRIDE { OUString lhs, rhs; if ( !( _lhs >>= lhs ) @@ -113,7 +113,7 @@ namespace comphelper { } - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const + virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const SAL_OVERRIDE { OUString lhs, rhs; if ( !( _lhs >>= lhs ) @@ -133,7 +133,7 @@ namespace comphelper class TypePredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const + virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const SAL_OVERRIDE { ::com::sun::star::uno::Type lhs, rhs; if ( !( _lhs >>= lhs ) @@ -155,7 +155,7 @@ namespace comphelper { } - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const + virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const SAL_OVERRIDE { sal_Int32 lhs(0), rhs(0); if ( !::cppu::enum2int( lhs, _lhs ) @@ -177,7 +177,7 @@ namespace comphelper class InterfacePredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const + virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const SAL_OVERRIDE { if ( ( _lhs.getValueTypeClass() != ::com::sun::star::uno::TypeClass_INTERFACE ) || ( _rhs.getValueTypeClass() != ::com::sun::star::uno::TypeClass_INTERFACE ) diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx index 40aa21ae243d..19f9fa850145 100644 --- a/include/comphelper/asyncnotification.hxx +++ b/include/comphelper/asyncnotification.hxx @@ -46,8 +46,8 @@ namespace comphelper public: AnyEvent(); - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; protected: virtual ~AnyEvent(); @@ -114,7 +114,7 @@ namespace comphelper SAL_DLLPRIVATE virtual ~AsyncEventNotifier(); // Thread - SAL_DLLPRIVATE virtual void execute(); + SAL_DLLPRIVATE virtual void execute() SAL_OVERRIDE; public: /** constructs a notifier thread @@ -132,7 +132,7 @@ namespace comphelper itself, it will return immediately, and the thread will be terminated as soon as the current notification is finished. */ - virtual void SAL_CALL terminate(); + virtual void SAL_CALL terminate() SAL_OVERRIDE; /** adds an event to the queue, together with the instance which is responsible for processing it diff --git a/include/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx index ea6f87e620fd..483a7d8a6535 100644 --- a/include/comphelper/attributelist.hxx +++ b/include/comphelper/attributelist.hxx @@ -45,17 +45,17 @@ public: // ::com::sun::star::xml::sax::XAttributeList virtual sal_Int16 SAL_CALL getLength(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByName(const OUString& aName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getValueByName(const OUString& aName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx index 2a56f1e77e50..97fff52d653f 100644 --- a/include/comphelper/containermultiplexer.hxx +++ b/include/comphelper/containermultiplexer.hxx @@ -88,12 +88,12 @@ namespace comphelper const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _rxContainer); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // locking the multiplexer sal_Int32 locked() const { return m_nLockCount; } diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx index e9257939dae4..952658d12940 100644 --- a/include/comphelper/docpasswordrequest.hxx +++ b/include/comphelper/docpasswordrequest.hxx @@ -54,8 +54,8 @@ public: private: // XInteractionRequest - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: ::com::sun::star::uno::Any maRequest; @@ -88,8 +88,8 @@ public: private: // XInteractionRequest - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: ::com::sun::star::uno::Any maRequest; diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx index b9acb584f2e6..4a13989d0897 100644 --- a/include/comphelper/enumhelper.hxx +++ b/include/comphelper/enumhelper.hxx @@ -69,11 +69,11 @@ public: const staruno::Sequence< OUString >& _aNames ); virtual ~OEnumerationByName(); - virtual sal_Bool SAL_CALL hasMoreElements( ) throw(staruno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasMoreElements( ) throw(staruno::RuntimeException, std::exception) SAL_OVERRIDE; virtual staruno::Any SAL_CALL nextElement( ) - throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception); + throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(const starlang::EventObject& aEvent) throw(staruno::RuntimeException, std::exception); + virtual void SAL_CALL disposing(const starlang::EventObject& aEvent) throw(staruno::RuntimeException, std::exception) SAL_OVERRIDE; private: COMPHELPER_DLLPRIVATE void impl_startDisposeListening(); @@ -98,11 +98,11 @@ public: OEnumerationByIndex(const staruno::Reference< starcontainer::XIndexAccess >& _rxAccess); virtual ~OEnumerationByIndex(); - virtual sal_Bool SAL_CALL hasMoreElements( ) throw(staruno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasMoreElements( ) throw(staruno::RuntimeException, std::exception) SAL_OVERRIDE; virtual staruno::Any SAL_CALL nextElement( ) - throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception); + throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(const starlang::EventObject& aEvent) throw(staruno::RuntimeException, std::exception); + virtual void SAL_CALL disposing(const starlang::EventObject& aEvent) throw(staruno::RuntimeException, std::exception) SAL_OVERRIDE; private: COMPHELPER_DLLPRIVATE void impl_startDisposeListening(); @@ -126,9 +126,9 @@ public: OAnyEnumeration(const staruno::Sequence< staruno::Any >& lItems); virtual ~OAnyEnumeration(); - virtual sal_Bool SAL_CALL hasMoreElements( ) throw(staruno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasMoreElements( ) throw(staruno::RuntimeException, std::exception) SAL_OVERRIDE; virtual staruno::Any SAL_CALL nextElement( ) - throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception); + throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx index 957b21aa5052..9b04f7c80d8e 100644 --- a/include/comphelper/evtlistenerhlp.hxx +++ b/include/comphelper/evtlistenerhlp.hxx @@ -40,7 +40,7 @@ namespace comphelper ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XEventListener> m_xListener; public: OEventListenerHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rxListener); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace comphelper diff --git a/include/comphelper/ihwrapnofilter.hxx b/include/comphelper/ihwrapnofilter.hxx index d7fb2a85300e..0daa123428f3 100644 --- a/include/comphelper/ihwrapnofilter.hxx +++ b/include/comphelper/ihwrapnofilter.hxx @@ -49,27 +49,27 @@ namespace comphelper { virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionHandler2 virtual sal_Bool SAL_CALL handleInteractionRequest( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest) - 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 ); + 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; }; } diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx index 9fbfb2d849f7..8e49d727c210 100644 --- a/include/comphelper/interaction.hxx +++ b/include/comphelper/interaction.hxx @@ -119,8 +119,8 @@ namespace comphelper } // XInteractionPassword - virtual void SAL_CALL setPassword( const OUString& _Password ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPassword( const OUString& _Password ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OUString m_sPassword; @@ -148,8 +148,8 @@ namespace comphelper void addContinuation(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >& _rxContinuation); // XInteractionRequest - virtual ::com::sun::star::uno::Any SAL_CALL getRequest( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getRequest( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace comphelper diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx index 22deb018f876..cac3a79765b6 100644 --- a/include/comphelper/listenernotification.hxx +++ b/include/comphelper/listenernotification.hxx @@ -206,7 +206,7 @@ namespace comphelper inline virtual bool implNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener, const ::com::sun::star::lang::EventObject& _rEvent - ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); + ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) SAL_OVERRIDE; }; @@ -270,7 +270,7 @@ namespace comphelper inline virtual bool implNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener, const ::com::sun::star::lang::EventObject& _rEvent - ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); + ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) SAL_OVERRIDE; virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ListenerClass >& _rxListener, diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx index 7e1b549e91fa..82af127d0e99 100644 --- a/include/comphelper/numberedcollection.hxx +++ b/include/comphelper/numberedcollection.hxx @@ -110,24 +110,24 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex /** @see css.frame.XUntitledNumbers */ virtual ::sal_Int32 SAL_CALL leaseNumber(const css::uno::Reference< css::uno::XInterface >& xComponent) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @see css.frame.XUntitledNumbers */ virtual void SAL_CALL releaseNumber(::sal_Int32 nNumber) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @see css.frame.XUntitledNumbers */ virtual void SAL_CALL releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** @see css.frame.XUntitledNumbers */ virtual OUString SAL_CALL getUntitledPrefix() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // internal diff --git a/include/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx index 3ad91ec6866c..bd831158acb3 100644 --- a/include/comphelper/ofopxmlhelper.hxx +++ b/include/comphelper/ofopxmlhelper.hxx @@ -113,14 +113,14 @@ public: throw( ::com::sun::star::uno::Exception ); // XDocumentHandler - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace comphelper diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx index 59e0566de396..f559426257d9 100644 --- a/include/comphelper/oslfile2streamwrap.hxx +++ b/include/comphelper/oslfile2streamwrap.hxx @@ -45,11 +45,11 @@ public: virtual ~OSLInputStreamWrapper(); // stario::XInputStream - virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL available() throw(stario::NotConnectedException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, staruno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL available() throw(stario::NotConnectedException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -65,9 +65,9 @@ private: virtual ~OSLOutputStreamWrapper(); // stario::XOutputStream - virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); + virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; ::osl::File& rFile; }; diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx index 75eb1e11fe4a..3a7dec8271a5 100644 --- a/include/comphelper/propagg.hxx +++ b/include/comphelper/propagg.hxx @@ -126,20 +126,20 @@ public: /// inherited from IPropertyArrayHelper virtual sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString* _pPropName, sal_Int16* _pAttributes, - sal_Int32 _nHandle) ; + sal_Int32 _nHandle) SAL_OVERRIDE ; /// inherited from IPropertyArrayHelper - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> SAL_CALL getProperties(); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> SAL_CALL getProperties() SAL_OVERRIDE; /// inherited from IPropertyArrayHelper virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& _rPropertyName) - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; /// inherited from IPropertyArrayHelper - virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& _rPropertyName) ; + virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& _rPropertyName) SAL_OVERRIDE ; /// inherited from IPropertyArrayHelper - virtual sal_Int32 SAL_CALL getHandleByName(const OUString & _rPropertyName); + virtual sal_Int32 SAL_CALL getHandleByName(const OUString & _rPropertyName) SAL_OVERRIDE; /// inherited from IPropertyArrayHelper - virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< OUString >& _rPropNames ); + virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< OUString >& _rPropNames ) SAL_OVERRIDE; /** returns information about a property of the aggregate. @param _pPropName points to a string to receive the property name. No name is returned if this is NULL. @@ -211,54 +211,54 @@ protected: public: OPropertySetAggregationHelper( ::cppu::OBroadcastHelper& rBHelper ); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& aType) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& aType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertiesChangeListener - virtual void SAL_CALL propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XVetoableChangeListener - virtual void SAL_CALL vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& aEvent) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& aEvent) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper /** still waiting to be overwritten ... you <B>must<B/> use an OPropertyArrayAggregationHelper here, as the implementation strongly relies on this. */ - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() = 0; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE = 0; /** only implemented for "forwarded" properties, every other property must be handled in the derivee, and will assert if passed herein */ - virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw(::com::sun::star::lang::IllegalArgumentException); + virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw(::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; /** only implemented for "forwarded" properties, every other property must be handled in the derivee, and will assert if passed herein */ - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw ( ::com::sun::star::uno::Exception, std::exception ); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw ( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; protected: ~OPropertySetAggregationHelper(); - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; + virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; void disposing(); sal_Int32 getOriginalHandle( sal_Int32 _nHandle ) const; diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx index a674e2b55125..70ec84e0350f 100644 --- a/include/comphelper/propertycontainer.hxx +++ b/include/comphelper/propertycontainer.hxx @@ -57,24 +57,24 @@ protected: ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException); + throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, - std::exception); + std::exception) SAL_OVERRIDE; using OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle - ) const; + ) const SAL_OVERRIDE; // disambiguate a base class method (XFastPropertySet) virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx index 05f8fde728b6..10be5a9034dd 100644 --- a/include/comphelper/propertysethelper.hxx +++ b/include/comphelper/propertysethelper.hxx @@ -59,27 +59,27 @@ public: virtual ~PropertySetHelper() throw(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx index 5ee554f2b8b9..4676875d83a8 100644 --- a/include/comphelper/propertysetinfo.hxx +++ b/include/comphelper/propertysetinfo.hxx @@ -75,9 +75,9 @@ public: /** removes an already added PropertyMapEntry which string in mpName equals to aName */ void remove( const OUString& aName ) throw(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx index 2c41d3bf098a..3c928b27d984 100644 --- a/include/comphelper/propertystatecontainer.hxx +++ b/include/comphelper/propertystatecontainer.hxx @@ -59,10 +59,10 @@ namespace comphelper // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // own overridables @@ -93,7 +93,7 @@ namespace comphelper protected: // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider DECLARE_XTYPEPROVIDER( ) diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx index 5e520faf6d49..a543ac634ec5 100644 --- a/include/comphelper/propmultiplex.hxx +++ b/include/comphelper/propmultiplex.hxx @@ -85,10 +85,10 @@ namespace comphelper OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxSet, bool _bAutoReleaseSet = true); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// incremental lock void lock(); diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx index c62ae63acda2..a8029a6b849d 100644 --- a/include/comphelper/propstate.hxx +++ b/include/comphelper/propstate.hxx @@ -53,17 +53,17 @@ namespace comphelper OPropertyStateHelper(::cppu::OBroadcastHelper& rBHlp, ::cppu::IEventNotificationHook *i_pFireEvents); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& aType) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& aType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL - getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL - getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL - getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // access via handle virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index ad950dc7e698..8be7b69c3dd2 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -145,7 +145,7 @@ namespace comphelper using OProxyAggregation::getComponentContext; // XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider DECLARE_XTYPEPROVIDER( ) @@ -165,7 +165,7 @@ namespace comphelper ); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; @@ -197,13 +197,13 @@ namespace comphelper DECLARE_XTYPEPROVIDER() // OComponentHelper - virtual void SAL_CALL disposing() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent/OComponentProxyAggregationHelper - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: // be called from within the dtor of derived classes diff --git a/include/comphelper/scoped_disposing_ptr.hxx b/include/comphelper/scoped_disposing_ptr.hxx index 6044d654598a..b029849b1dcd 100644 --- a/include/comphelper/scoped_disposing_ptr.hxx +++ b/include/comphelper/scoped_disposing_ptr.hxx @@ -100,7 +100,7 @@ private: private: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvt ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { bool shutDown = (rEvt.Source == m_xComponent); @@ -121,12 +121,12 @@ private: // XTerminateListener virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::frame::TerminationVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { } virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEvt ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { disposing(rEvt); } diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx index 6f74e0e3aa37..d1c69e5cb4ee 100644 --- a/include/comphelper/seekableinput.hxx +++ b/include/comphelper/seekableinput.hxx @@ -57,16 +57,16 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XInputStream - virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL available() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL closeInput() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL available() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeInput() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx index 857620bbe22c..a5c27e2e07d7 100644 --- a/include/comphelper/seqstream.hxx +++ b/include/comphelper/seqstream.hxx @@ -51,25 +51,25 @@ public: // com::sun::star::io::XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence<sal_Int8>& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: inline sal_Int32 avail(); @@ -119,14 +119,14 @@ public: ); /// same as XOutputStream::writeBytes (as expected :) - virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// this is a dummy in this implementation, no buffering is used - virtual void SAL_CALL flush( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL flush( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** closes the output stream. In the case of this class, this means that the sequence used for writing is resized to the really used size and not used any further, every subsequent call to one of the XOutputStream methods will throw a <code>NotConnectedException</code>. */ - virtual void SAL_CALL closeOutput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL closeOutput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace comphelper diff --git a/include/comphelper/servicehelper.hxx b/include/comphelper/servicehelper.hxx index 7ec99b0f5670..a96285e83fb5 100644 --- a/include/comphelper/servicehelper.hxx +++ b/include/comphelper/servicehelper.hxx @@ -53,7 +53,7 @@ public: #define UNO3_GETIMPLEMENTATION_DECL( classname ) \ static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); \ static classname* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInt ); \ - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; #define UNO3_GETIMPLEMENTATION_BASE_IMPL( classname ) \ namespace \ diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx index 673e3e239b67..b9bbcbe3cf56 100644 --- a/include/comphelper/serviceinfohelper.hxx +++ b/include/comphelper/serviceinfohelper.hxx @@ -35,8 +35,8 @@ class COMPHELPER_DLLPUBLIC ServiceInfoHelper : public ::com::sun::star::lang::XS { public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // helper static void addToSequence( ::com::sun::star::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw(); diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx index 2b758ed3fc28..0143faab4ed1 100644 --- a/include/comphelper/stillreadwriteinteraction.hxx +++ b/include/comphelper/stillreadwriteinteraction.hxx @@ -47,7 +47,7 @@ public: private: virtual ucbhelper::InterceptedInteraction::EInterceptionState intercepted(const ::ucbhelper::InterceptedInteraction::InterceptedRequest& aRequest, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest); + const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest) SAL_OVERRIDE; }; } diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx index 643e5c12d8d0..0bebb9fa91aa 100644 --- a/include/comphelper/uno3.hxx +++ b/include/comphelper/uno3.hxx @@ -43,17 +43,17 @@ namespace comphelper /** used for declaring UNO3-Defaults, i.e. acquire/release */ #define DECLARE_UNO3_DEFAULTS(classname, baseclass) \ - virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() { baseclass::release(); } \ + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); } \ + virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); } \ void SAL_CALL PUT_SEMICOLON_AT_THE_END() /** used for declaring UNO3-Defaults, i.e. acquire/release if you want to forward all queryInterfaces to the base class, (e.g. if you overload queryAggregation) */ #define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \ - virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() { baseclass::release(); } \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); } \ + virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); } \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return baseclass::queryInterface(_rType); } \ void SAL_CALL PUT_SEMICOLON_AT_THE_END() @@ -122,21 +122,21 @@ namespace comphelper that would be ::cppu::WeakComponentImplHelperBase */ #define DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS(classname, baseclass, implhelper) \ - virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() { baseclass::release(); } \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); } \ + virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); } \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return baseclass::queryInterface(_rType); } \ - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) \ + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { \ implhelper::dispose(); \ } \ virtual void SAL_CALL addEventListener( \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { \ implhelper::addEventListener(xListener); \ } \ virtual void SAL_CALL removeEventListener( \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { \ implhelper::removeEventListener(xListener); \ } \ @@ -149,9 +149,9 @@ namespace comphelper //= forwarding/merging XInterface funtionality #define DECLARE_XINTERFACE( ) \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ - virtual void SAL_CALL acquire() throw(); \ - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; \ + virtual void SAL_CALL release() throw() SAL_OVERRIDE; #define IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \ void SAL_CALL classname::acquire() throw() { refcountbase::acquire(); } \ @@ -185,8 +185,8 @@ namespace comphelper //= forwarding/merging XTypeProvider funtionality #define DECLARE_XTYPEPROVIDER( ) \ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; #define IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) \ ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx index d56a8f069993..a88352cf6758 100644 --- a/include/comphelper/weak.hxx +++ b/include/comphelper/weak.hxx @@ -40,11 +40,11 @@ public: OWeakTypeObject(); virtual ~OWeakTypeObject(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 89876fab640f..23c57b6f6ea0 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -146,7 +146,7 @@ namespace comphelper protected: using OWeakEventListenerAdapter_Base::disposing; - virtual void SAL_CALL disposing( ); + virtual void SAL_CALL disposing( ) SAL_OVERRIDE; }; diff --git a/include/connectivity/BlobHelper.hxx b/include/connectivity/BlobHelper.hxx index df4e12114135..193efc0276ed 100644 --- a/include/connectivity/BlobHelper.hxx +++ b/include/connectivity/BlobHelper.hxx @@ -31,11 +31,11 @@ namespace connectivity public: BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val); private: - virtual ::sal_Int64 SAL_CALL length( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int64 pos, ::sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int64 SAL_CALL position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& pattern, ::sal_Int64 start ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int64 SAL_CALL positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& pattern, ::sal_Int64 start ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int64 SAL_CALL length( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int64 pos, ::sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& pattern, ::sal_Int64 start ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& pattern, ::sal_Int64 start ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index e022bc3f8626..f98e18e2c2bb 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.hxx @@ -172,9 +172,9 @@ namespace connectivity } #define DECLARE_SERVICE_INFO() \ - 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 \ #define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \ OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ diff --git a/include/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx index e578fb51bbb6..21bafca49c92 100644 --- a/include/connectivity/ConnectionWrapper.hxx +++ b/include/connectivity/ConnectionWrapper.hxx @@ -62,11 +62,11 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com::sun::star::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); /** method to create unique ids @param _rURL diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx index 9fab5038ab9c..0bbe03fea928 100644 --- a/include/connectivity/PColumn.hxx +++ b/include/connectivity/PColumn.hxx @@ -52,8 +52,8 @@ namespace connectivity sal_Bool m_bIsSearchable; protected: - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual ~OParseColumn(); public: @@ -73,7 +73,7 @@ namespace connectivity const OUString& _SchemaName, const OUString& _TableName); - virtual void construct(); + virtual void construct() SAL_OVERRIDE; void setRealName(const OUString& _rName) { m_aRealName = _rName; } void setLabel(const OUString& i_sLabel) { m_sLabel = i_sLabel; } @@ -126,8 +126,8 @@ namespace connectivity const sal_Bool m_bAscending; protected: - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual ~OOrderColumn(); public: @@ -144,9 +144,9 @@ namespace connectivity sal_Bool _bAscending ); - virtual void construct(); + virtual void construct() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) 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) SAL_OVERRIDE; private: using OOrderColumn_BASE::createArrayHelper; }; diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx index e67c0dddcb21..b87e1c36dfbb 100644 --- a/include/connectivity/ParameterCont.hxx +++ b/include/connectivity/ParameterCont.hxx @@ -38,7 +38,7 @@ namespace dbtools ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getValues() const { return m_aValues; } // XInteractionSupplyParameters - virtual void SAL_CALL setParameters( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rValues ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setParameters( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rValues ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual ~OParameterContinuation() { } diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx index 1b095a06cf36..4e3fee488d8e 100644 --- a/include/connectivity/TColumnsHelper.hxx +++ b/include/connectivity/TColumnsHelper.hxx @@ -37,11 +37,11 @@ namespace connectivity protected: OTableHelper* m_pTable; - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName); + virtual sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE; + virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() SAL_OVERRIDE; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) SAL_OVERRIDE; + virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) SAL_OVERRIDE; public: OColumnsHelper( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx index 440cec3652db..7612768931f1 100644 --- a/include/connectivity/TIndex.hxx +++ b/include/connectivity/TIndex.hxx @@ -31,7 +31,7 @@ namespace connectivity { OTableHelper* m_pTable; public: - virtual void refreshColumns(); + virtual void refreshColumns() SAL_OVERRIDE; public: OIndexHelper( OTableHelper* _pTable); OIndexHelper( OTableHelper* _pTable, diff --git a/include/connectivity/TIndexColumns.hxx b/include/connectivity/TIndexColumns.hxx index ee684669d8ec..57b79f9d67d7 100644 --- a/include/connectivity/TIndexColumns.hxx +++ b/include/connectivity/TIndexColumns.hxx @@ -30,9 +30,9 @@ namespace connectivity { OIndexHelper* m_pIndex; protected: - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); + virtual sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() SAL_OVERRIDE; + virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; public: OIndexColumns( OIndexHelper* _pIndex, ::osl::Mutex& _rMutex, diff --git a/include/connectivity/TIndexes.hxx b/include/connectivity/TIndexes.hxx index 2ed59229e6db..791c834238d0 100644 --- a/include/connectivity/TIndexes.hxx +++ b/include/connectivity/TIndexes.hxx @@ -31,11 +31,11 @@ namespace connectivity { OTableHelper* m_pTable; protected: - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName); + virtual sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE; + virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() SAL_OVERRIDE; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) SAL_OVERRIDE; + virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) SAL_OVERRIDE; public: OIndexesHelper(OTableHelper* _pTable, ::osl::Mutex& _rMutex, diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx index f4c85b049801..72c12fdf0958 100644 --- a/include/connectivity/TKey.hxx +++ b/include/connectivity/TKey.hxx @@ -31,7 +31,7 @@ namespace connectivity { OTableHelper* m_pTable; public: - virtual void refreshColumns(); + virtual void refreshColumns() SAL_OVERRIDE; public: OTableKeyHelper( OTableHelper* _pTable); OTableKeyHelper( OTableHelper* _pTable diff --git a/include/connectivity/TKeyColumns.hxx b/include/connectivity/TKeyColumns.hxx index a136c1710a92..12ae605043d9 100644 --- a/include/connectivity/TKeyColumns.hxx +++ b/include/connectivity/TKeyColumns.hxx @@ -30,9 +30,9 @@ namespace connectivity { OTableKeyHelper* m_pKey; protected: - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); + virtual sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() SAL_OVERRIDE; + virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; public: OKeyColumnsHelper( OTableKeyHelper* _pKey, ::osl::Mutex& _rMutex, diff --git a/include/connectivity/TKeys.hxx b/include/connectivity/TKeys.hxx index 14226005ec05..0930ade12549 100644 --- a/include/connectivity/TKeys.hxx +++ b/include/connectivity/TKeys.hxx @@ -32,11 +32,11 @@ namespace connectivity { OTableHelper* m_pTable; protected: - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName); + virtual sdbcx::ObjectType createObject(const OUString& _rName) SAL_OVERRIDE; + virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() SAL_OVERRIDE; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) SAL_OVERRIDE; + virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) SAL_OVERRIDE; virtual OUString getDropForeignKey() const; diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index 274b6ef213c5..9f4081d1bc47 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -107,7 +107,7 @@ namespace connectivity /** this function is called upon disposing the component */ - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** The default returns "RENAME TABLE " or "RENAME VIEW " depending on the type. * @@ -118,9 +118,9 @@ namespace connectivity virtual ~OTableHelper(); public: - virtual void refreshColumns(); - virtual void refreshKeys(); - virtual void refreshIndexes(); + virtual void refreshColumns() SAL_OVERRIDE; + virtual void refreshKeys() SAL_OVERRIDE; + virtual void refreshIndexes() SAL_OVERRIDE; const ColumnDesc* getColumnDescription(const OUString& _sName) const; @@ -138,19 +138,19 @@ namespace connectivity const OUString& _CatalogName = OUString() ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const; - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XRename - virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAlterTable - virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // helper method to get key properties sdbcx::TKeyProperties getKeyProperties(const OUString& _sName) const; diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx index 716a444c31ab..ea271b308a0d 100644 --- a/include/connectivity/conncleanup.hxx +++ b/include/connectivity/conncleanup.hxx @@ -59,15 +59,15 @@ namespace dbtools protected: // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRowSetListener - virtual void SAL_CALL cursorMoved( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL rowChanged( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL rowSetChanged( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cursorMoved( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rowChanged( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rowSetChanged( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void clearConnection(); diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index ba2e7fc47f78..7233529c451f 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -90,7 +90,10 @@ namespace param ); DECLARE_XINTERFACE() - DECLARE_XTYPEPROVIDER() + + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ); diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx index cefc3c6abf53..ef2d3b8be7e0 100644 --- a/include/connectivity/sdbcx/VCatalog.hxx +++ b/include/connectivity/sdbcx/VCatalog.hxx @@ -103,18 +103,18 @@ namespace connectivity // the other refresh methods come from base classes IRefreshableGroups and IRefreshableUsers // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(void) SAL_OVERRIDE; // XInterface - void SAL_CALL acquire() throw(); - void SAL_CALL release() throw(); + void SAL_CALL acquire() throw() SAL_OVERRIDE; + void SAL_CALL release() throw() SAL_OVERRIDE; // XTablesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XViewsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getViews( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getViews( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUsersSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XGroupsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index 52fb708865d2..c282ed0eb12c 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -187,42 +187,42 @@ namespace connectivity // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); // dispatch the refcounting to the parent - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XRefreshable - virtual void SAL_CALL refresh( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL refresh( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAppend - virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dropByName( const OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void notifyElementRemoved(const OUString& _sName); void disposeElements(); diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx index 4e750c3a47ea..6f97e62ae86f 100644 --- a/include/connectivity/sdbcx/VColumn.hxx +++ b/include/connectivity/sdbcx/VColumn.hxx @@ -68,13 +68,13 @@ namespace connectivity OUString m_TableName; using OColumnDescriptor_BASE::rBHelper; - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual ~OColumn(); public: - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; OColumn( sal_Bool _bCase); OColumn( const OUString& _Name, @@ -95,20 +95,20 @@ namespace connectivity DECLARE_SERVICE_INFO(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ODescriptor - virtual void construct(); + virtual void construct() SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(void) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx index 2e7cb64e9504..f5358dab1c06 100644 --- a/include/connectivity/sdbcx/VDescriptor.hxx +++ b/include/connectivity/sdbcx/VDescriptor.hxx @@ -70,7 +70,7 @@ namespace connectivity virtual void construct(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // compare @@ -80,7 +80,7 @@ namespace connectivity } // com::sun::star::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); static ODescriptor* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSomeComp ); diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx index 7e61472cc416..bbda1cc3d49d 100644 --- a/include/connectivity/sdbcx/VGroup.hxx +++ b/include/connectivity/sdbcx/VGroup.hxx @@ -60,9 +60,9 @@ namespace connectivity using OGroup_BASE::rBHelper; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; public: OGroup(sal_Bool _bCase); OGroup( const OUString& _Name,sal_Bool _bCase); @@ -70,29 +70,29 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XInterface - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(void) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUsersSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx index d968142f5f1f..2087f4821403 100644 --- a/include/connectivity/sdbcx/VIndex.hxx +++ b/include/connectivity/sdbcx/VIndex.hxx @@ -60,10 +60,10 @@ namespace connectivity OCollection* m_pColumns; using ODescriptor_BASE::rBHelper; - virtual void refreshColumns(); + virtual void refreshColumns() SAL_OVERRIDE; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: OIndex(sal_Bool _bCase); OIndex( const OUString& _Name, @@ -78,25 +78,25 @@ namespace connectivity DECLARE_SERVICE_INFO(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ODescriptor - virtual void construct(); + virtual void construct() SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(void) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } diff --git a/include/connectivity/sdbcx/VIndexColumn.hxx b/include/connectivity/sdbcx/VIndexColumn.hxx index b8771cd3fa3c..c70670eb7be9 100644 --- a/include/connectivity/sdbcx/VIndexColumn.hxx +++ b/include/connectivity/sdbcx/VIndexColumn.hxx @@ -35,8 +35,8 @@ namespace connectivity { protected: sal_Bool m_IsAscending; - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: OIndexColumn( sal_Bool _bCase); OIndexColumn( sal_Bool _IsAscending, @@ -55,7 +55,7 @@ namespace connectivity const OUString& _SchemaName, const OUString& _TableName); - virtual void construct(); + virtual void construct() SAL_OVERRIDE; DECLARE_SERVICE_INFO(); }; } diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx index 77faec58b7b8..94bb1a66e36f 100644 --- a/include/connectivity/sdbcx/VKey.hxx +++ b/include/connectivity/sdbcx/VKey.hxx @@ -74,9 +74,9 @@ namespace connectivity using ODescriptor_BASE::rBHelper; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; public: OKey(sal_Bool _bCase); OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase); @@ -91,26 +91,26 @@ namespace connectivity DECLARE_SERVICE_INFO(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ODescriptor - virtual void construct(); + virtual void construct() SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx index d56e1de62832..dcbc416b63d5 100644 --- a/include/connectivity/sdbcx/VKeyColumn.hxx +++ b/include/connectivity/sdbcx/VKeyColumn.hxx @@ -35,8 +35,8 @@ namespace connectivity { protected: OUString m_ReferencedColumn; - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: OKeyColumn(sal_Bool _bCase); OKeyColumn( const OUString& _ReferencedColumn, @@ -57,7 +57,7 @@ namespace connectivity // just to make it not inline virtual ~OKeyColumn(); - virtual void construct(); + virtual void construct() SAL_OVERRIDE; DECLARE_SERVICE_INFO(); }; } diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx index 54399acf1e35..609d0f98e0e4 100644 --- a/include/connectivity/sdbcx/VTable.hxx +++ b/include/connectivity/sdbcx/VTable.hxx @@ -80,9 +80,9 @@ namespace connectivity using OTableDescriptor_BASE::rBHelper; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 _nId ) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 _nId ) const SAL_OVERRIDE; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; public: OTable( OCollection* _pTables, sal_Bool _bCase); @@ -98,37 +98,37 @@ namespace connectivity DECLARE_SERVICE_INFO(); //XInterface - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ODescriptor - virtual void construct(); - virtual void refreshColumns(); + virtual void construct() SAL_OVERRIDE; + virtual void refreshColumns() SAL_OVERRIDE; virtual void refreshKeys(); virtual void refreshIndexes(); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(void) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XKeysSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getKeys( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getKeys( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( void ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( void ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getIndexes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getIndexes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRename - virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAlterTable - virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // helper method virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const; diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx index 3e6110a64d43..38f3f4435b62 100644 --- a/include/connectivity/sdbcx/VUser.hxx +++ b/include/connectivity/sdbcx/VUser.hxx @@ -57,9 +57,9 @@ namespace connectivity using OUser_BASE::rBHelper; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; public: OUser(sal_Bool _bCase); OUser(const OUString& _Name,sal_Bool _bCase); @@ -69,28 +69,28 @@ namespace connectivity DECLARE_SERVICE_INFO(); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(void) SAL_OVERRIDE; //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUser - virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XGroupsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx index b05050dc569a..0e1fd2e6d579 100644 --- a/include/connectivity/sdbcx/VView.hxx +++ b/include/connectivity/sdbcx/VView.hxx @@ -58,9 +58,9 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const SAL_OVERRIDE; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; public: DECLARE_SERVICE_INFO(); @@ -76,22 +76,22 @@ namespace connectivity virtual ~OView(); // ODescriptor - virtual void construct(); + virtual void construct() SAL_OVERRIDE; // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx index 10fd1f957dd2..4bb97169b147 100644 --- a/include/connectivity/sqlparse.hxx +++ b/include/connectivity/sqlparse.hxx @@ -76,13 +76,13 @@ namespace connectivity virtual ~OParseContext(); // retrieves language specific error messages - virtual OUString getErrorMessage(ErrorCode _eCodes) const; + virtual OUString getErrorMessage(ErrorCode _eCodes) const SAL_OVERRIDE; // retrieves language specific keyword strings (only ASCII allowed) - virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const; + virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const SAL_OVERRIDE; // finds out, if we have an international keyword (only ASCII allowed) - virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const; + virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const SAL_OVERRIDE; // determines the default international setting static const ::com::sun::star::lang::Locale& getDefaultLocale(); @@ -90,7 +90,7 @@ namespace connectivity /** get's a locale instance which should be used when parsing in the context specified by this instance <p>if this is not overridden by derived classes, it returns the static default locale.</p> */ - virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const; + virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const SAL_OVERRIDE; }; diff --git a/include/connectivity/warningscontainer.hxx b/include/connectivity/warningscontainer.hxx index 89cf6086b1e7..4d652b2ba3a6 100644 --- a/include/connectivity/warningscontainer.hxx +++ b/include/connectivity/warningscontainer.hxx @@ -84,9 +84,9 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext ); // IWarningsContainer - virtual void appendWarning(const ::com::sun::star::sdbc::SQLException& _rWarning); - virtual void appendWarning(const ::com::sun::star::sdbc::SQLWarning& _rWarning); - virtual void appendWarning(const ::com::sun::star::sdb::SQLContext& _rContext); + virtual void appendWarning(const ::com::sun::star::sdbc::SQLException& _rWarning) SAL_OVERRIDE; + virtual void appendWarning(const ::com::sun::star::sdbc::SQLWarning& _rWarning) SAL_OVERRIDE; + virtual void appendWarning(const ::com::sun::star::sdb::SQLContext& _rContext) SAL_OVERRIDE; // XWarningsSupplier equivalents ::com::sun::star::uno::Any SAL_CALL getWarnings( ) const; diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx index 2be384ad2a86..555376eade6a 100644 --- a/include/cppuhelper/compbase_ex.hxx +++ b/include/cppuhelper/compbase_ex.hxx @@ -68,19 +68,19 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release() - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /** Implementation helper base class for components. Inherits from ::cppu::OWeakAggObject and @@ -113,22 +113,22 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release() - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /** WeakComponentImplHelper diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx index e14d8f4d4062..2f39ec83a11d 100644 --- a/include/cppuhelper/component.hxx +++ b/include/cppuhelper/component.hxx @@ -62,35 +62,35 @@ public: // XAggregation virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release() - throw (); + throw () SAL_OVERRIDE; /** @attention XTypeProvider::getImplementationId() has to be implemented separately! */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) = 0; + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; /** @attention XTypeProvider::getTypes() has to be re-implemented! */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** Called in dispose method after the listeners were notified. diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index 511f8f612712..88d460ba7058 100644 --- a/include/cppuhelper/propertysetmixin.hxx +++ b/include/cppuhelper/propertysetmixin.hxx @@ -264,13 +264,13 @@ protected: */ virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & type) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // @see com::sun::star::beans::XPropertySet::getPropertySetInfo virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // @see com::sun::star::beans::XPropertySet::setPropertyValue virtual void SAL_CALL setPropertyValue( @@ -281,7 +281,7 @@ protected: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // @see com::sun::star::beans::XPropertySet::getPropertyValue virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( @@ -289,7 +289,7 @@ protected: throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @short Adds a @@ -307,7 +307,7 @@ protected: throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // @see com::sun::star::beans::XPropertySet::removePropertyChangeListener virtual void SAL_CALL removePropertyChangeListener( @@ -317,7 +317,7 @@ protected: throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @short Adds a @@ -335,7 +335,7 @@ protected: throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // @see com::sun::star::beans::XPropertySet::removeVetoableChangeListener virtual void SAL_CALL removeVetoableChangeListener( @@ -345,7 +345,7 @@ protected: throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // @see com::sun::star::beans::XFastPropertySet::setFastPropertyValue virtual void SAL_CALL setFastPropertyValue( @@ -355,7 +355,7 @@ protected: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // @see com::sun::star::beans::XFastPropertySet::getFastPropertyValue virtual com::sun::star::uno::Any SAL_CALL getFastPropertyValue( @@ -363,13 +363,13 @@ protected: throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // @see com::sun::star::beans::XPropertyAccess::getPropertyValues virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // @see com::sun::star::beans::XPropertyAccess::setPropertyValues virtual void SAL_CALL setPropertyValues( @@ -380,7 +380,7 @@ protected: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: PropertySetMixinImpl( const PropertySetMixinImpl&); // not defined diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index acbe6cdd4140..381f2719ed74 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -156,11 +156,11 @@ public: @return True, if the handle exist, otherwise false. */ virtual sal_Bool SAL_CALL fillPropertyMembersByHandle( - ::rtl::OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ); + ::rtl::OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ) SAL_OVERRIDE; /** Return the sequence of properties. The sequence is sorted by name. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) SAL_OVERRIDE; /** Return the property with the name rPropertyName. @param rPropertyName the name of the property. @@ -168,25 +168,25 @@ public: */ virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& rPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException); + throw (::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; /** Return true if the property with the name rPropertyName exist, otherwise false. @param rPropertyName the name of the property. */ - virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& rPropertyName); + virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& rPropertyName) SAL_OVERRIDE; /** Return the handle of the property with the name rPropertyName. If the property does not exist -1 is returned. @param rPropertyName the name of the property. */ - virtual sal_Int32 SAL_CALL getHandleByName( const ::rtl::OUString & rPropertyName ); + virtual sal_Int32 SAL_CALL getHandleByName( const ::rtl::OUString & rPropertyName ) SAL_OVERRIDE; /** Fill the array with the handles of the properties. @return the handles of the names from the pHandles array. -1 indicates an unknown property name. */ virtual sal_Int32 SAL_CALL fillHandles( - /*out*/sal_Int32 * pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPropNames ); + /*out*/sal_Int32 * pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPropNames ) SAL_OVERRIDE; protected: /** reserved for future use. do not use. @@ -426,7 +426,7 @@ public: XEventListener. */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** eases implementing XTypeProvider::getTypes, returns the types of XMultiPropertySet, XFastPropertySet, XPropertySet */ @@ -447,36 +447,36 @@ public: value and setFastPropertyValue is called. */ virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Throw UnknownPropertyException if the property with the name rPropertyName does not exist. */ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Ignored if the property is not bound. */ virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Ignored if the property is not bound. */ virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertyChangeListener >& aListener) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Ignored if the property is not constrained. */ virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Ignored if the property is not constrained. */ virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Throw UnknownPropertyException or PropertyVetoException if the property with the name @@ -486,38 +486,38 @@ public: notified. */ virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @exception com::sun::star::beans::UnknownPropertyException if the property with the handle nHandle does not exist. */ virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener > & Listener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The property sequence is created in the call. The interface isn't used after the call. @@ -705,11 +705,11 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySetOption virtual void SAL_CALL enableChangeListenerNotification( sal_Bool bEnable ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx index 67bc0b74614b..dcddbb6d08c7 100644 --- a/include/cppuhelper/weak.hxx +++ b/include/cppuhelper/weak.hxx @@ -132,22 +132,22 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** increasing m_refCount */ virtual void SAL_CALL acquire() - throw (); + throw () SAL_OVERRIDE; /** decreasing m_refCount */ virtual void SAL_CALL release() - throw (); + throw () SAL_OVERRIDE; /** XWeak::queryAdapter() implementation @return a \::com::sun::star::uno::XAdapter reference */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter > SAL_CALL queryAdapter() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Cast operator to XInterface reference. diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx index 3b7b9b14a3a2..0514fd6bacec 100644 --- a/include/cppuhelper/weakagg.hxx +++ b/include/cppuhelper/weakagg.hxx @@ -50,11 +50,11 @@ public: /** If a delegator is set, then the delegators gets acquired. Otherwise call is delegated to base class ::cppu::OWeakObject. */ - virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; /** If a delegator is set, then the delegators gets released. Otherwise call is delegated to base class ::cppu::OWeakObject. */ - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL release() throw() SAL_OVERRIDE; /** If a delegator is set, then the delegator is queried for the demanded interface. If the delegator cannot provide the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -64,21 +64,21 @@ public: @see queryAggregation. */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Set the delegator. The delegator member reference is a weak reference. @param Delegator the object that delegate its queryInterface to this aggregate. */ virtual void SAL_CALL setDelegator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Delegator ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Called by the delegator or queryInterface. Re-implement this method instead of queryInterface. @see queryInterface */ virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** Virtual dtor. Called when reference count is 0. diff --git a/include/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx index ef46e4c841f1..27e7ba176a57 100644 --- a/include/drawinglayer/animation/animationtiming.hxx +++ b/include/drawinglayer/animation/animationtiming.hxx @@ -60,12 +60,12 @@ namespace drawinglayer public: AnimationEntryFixed(double fDuration, double fState = 0.0); virtual ~AnimationEntryFixed(); - virtual AnimationEntry* clone() const; + virtual AnimationEntry* clone() const SAL_OVERRIDE; - virtual bool operator==(const AnimationEntry& rCandidate) const; - virtual double getDuration() const; - virtual double getStateAtTime(double fTime) const; - virtual double getNextEventTime(double fTime) const; + virtual bool operator==(const AnimationEntry& rCandidate) const SAL_OVERRIDE; + virtual double getDuration() const SAL_OVERRIDE; + virtual double getStateAtTime(double fTime) const SAL_OVERRIDE; + virtual double getNextEventTime(double fTime) const SAL_OVERRIDE; }; @@ -81,12 +81,12 @@ namespace drawinglayer public: AnimationEntryLinear(double fDuration, double fFrequency = 250.0, double fStart = 0.0, double fStop = 1.0); virtual ~AnimationEntryLinear(); - virtual AnimationEntry* clone() const; + virtual AnimationEntry* clone() const SAL_OVERRIDE; - virtual bool operator==(const AnimationEntry& rCandidate) const; - virtual double getDuration() const; - virtual double getStateAtTime(double fTime) const; - virtual double getNextEventTime(double fTime) const; + virtual bool operator==(const AnimationEntry& rCandidate) const SAL_OVERRIDE; + virtual double getDuration() const SAL_OVERRIDE; + virtual double getStateAtTime(double fTime) const SAL_OVERRIDE; + virtual double getNextEventTime(double fTime) const SAL_OVERRIDE; }; @@ -103,13 +103,13 @@ namespace drawinglayer public: AnimationEntryList(); virtual ~AnimationEntryList(); - virtual AnimationEntry* clone() const; + virtual AnimationEntry* clone() const SAL_OVERRIDE; - virtual bool operator==(const AnimationEntry& rCandidate) const; + virtual bool operator==(const AnimationEntry& rCandidate) const SAL_OVERRIDE; void append(const AnimationEntry& rCandidate); - virtual double getDuration() const; - virtual double getStateAtTime(double fTime) const; - virtual double getNextEventTime(double fTime) const; + virtual double getDuration() const SAL_OVERRIDE; + virtual double getStateAtTime(double fTime) const SAL_OVERRIDE; + virtual double getNextEventTime(double fTime) const SAL_OVERRIDE; }; @@ -122,12 +122,12 @@ namespace drawinglayer public: AnimationEntryLoop(sal_uInt32 nRepeat = 0xffffffff); virtual ~AnimationEntryLoop(); - virtual AnimationEntry* clone() const; + virtual AnimationEntry* clone() const SAL_OVERRIDE; - virtual bool operator==(const AnimationEntry& rCandidate) const; - virtual double getDuration() const; - virtual double getStateAtTime(double fTime) const; - virtual double getNextEventTime(double fTime) const; + virtual bool operator==(const AnimationEntry& rCandidate) const SAL_OVERRIDE; + virtual double getDuration() const SAL_OVERRIDE; + virtual double getStateAtTime(double fTime) const SAL_OVERRIDE; + virtual double getNextEventTime(double fTime) const SAL_OVERRIDE; }; diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx index 371b07bbac2d..486434f26ef2 100644 --- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -83,7 +83,7 @@ namespace drawinglayer bool isGraphicAnimation() const { return !isTextAnimation(); } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -91,7 +91,7 @@ namespace drawinglayer /** The getDecomposition is overloaded here since the decompose is dependent of the point in time, so the default implementation is nut useful here, it needs to be handled locally */ - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -119,7 +119,7 @@ namespace drawinglayer bool bIsTextAnimation); /// create local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -156,7 +156,7 @@ namespace drawinglayer bool bIsTextAnimation); /// create local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 3cffeaafb69e..2df84d4f5d4d 100644 --- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -65,16 +65,16 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get B2Drange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// Overload standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 74ba4034fc67..94280d46f1dc 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -36,7 +36,7 @@ */ #define DeclPrimitive2DIDBlock() \ - virtual sal_uInt32 getPrimitive2DID() const; + virtual sal_uInt32 getPrimitive2DID() const SAL_OVERRIDE; #define ImplPrimitive2DIDBlock(TheClass, TheID) \ sal_uInt32 TheClass::getPrimitive2DID() const { return TheID; } @@ -174,12 +174,12 @@ namespace drawinglayer /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It will construct a ViewInformation2D from the ViewParameters for that purpose */ - virtual Primitive2DSequence SAL_CALL getDecomposition( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual Primitive2DSequence SAL_CALL getDecomposition( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** The getRange implementation for UNO API will use getRange from this implementation. It will construct a ViewInformation2D from the ViewParameters for that purpose */ - virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL getRange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL getRange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -250,7 +250,7 @@ namespace drawinglayer overloaded and the ViewInformation2D for the last decomposition need to be remembered, too, and be used in the next call to decide if the buffered decomposition may be reused or not. */ - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx index 922c479a638a..ada3de9aadb3 100644 --- a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -62,10 +62,10 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index 5650ee09cf0e..f59cf4816a71 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -95,7 +95,7 @@ namespace drawinglayer const geometry::ViewInformation2D& rViewInformation) const; /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -134,7 +134,7 @@ namespace drawinglayer double getPatternScale() const { return mfPatternScale; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx index aaa2095fb9d3..6861b352a2cc 100644 --- a/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx @@ -31,7 +31,7 @@ namespace drawinglayer protected: virtual basegfx::B2DPolyPolygon getClipPolygon( - const geometry::ViewInformation2D& rViewInformation) const; + const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -50,7 +50,7 @@ namespace drawinglayer double fPatternScale = 1.0 ); /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index e93a65bbf296..38a6d87b1f31 100644 --- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -64,7 +64,7 @@ namespace drawinglayer protected: /// local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -92,16 +92,16 @@ namespace drawinglayer const com::sun::star::uno::Reference< com::sun::star::awt::XControl >& getXControl() const; /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// Overload standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx index 969bb86b8c5b..01c63499197a 100644 --- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx @@ -84,10 +84,10 @@ namespace drawinglayer double getCropBottom() const { return mfCropBottom; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index 2cfcd9ad5870..aa9a51084510 100644 --- a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -50,7 +50,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -63,7 +63,7 @@ namespace drawinglayer const basegfx::B2DPoint& getTopLeft() const { return maTopLeft; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index b7f94cd58fb5..20fb1faa6899 100644 --- a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -90,7 +90,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -103,10 +103,10 @@ namespace drawinglayer const DiscreteShadow& getDiscreteShadow() const { return maDiscreteShadow; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index 55a5e44f22f6..354705577f0b 100644 --- a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -83,7 +83,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -104,10 +104,10 @@ namespace drawinglayer const basegfx::B3DRange& getScene3DRange() const { return maScene3DRange; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx index 08b282730927..d8a711f1229d 100644 --- a/include/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -46,7 +46,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -61,10 +61,10 @@ namespace drawinglayer const GDIMetaFile& getMetaFile() const { return maMetaFile; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get B2Drange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index 690028b3b38a..515d1f60934d 100644 --- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -79,7 +79,7 @@ namespace drawinglayer Primitive2DSequence createFill(bool bOverlapping) const; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -92,10 +92,10 @@ namespace drawinglayer const attribute::FillGradientAttribute& getFillGradient() const { return maFillGradient; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx index d5e6bb765a89..dedd26fe7c4e 100644 --- a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx @@ -56,7 +56,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -69,10 +69,10 @@ namespace drawinglayer const attribute::FillGraphicAttribute& getFillGraphic() const { return maFillGraphic; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index 78454281ef51..9234cec15857 100644 --- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -62,7 +62,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -77,13 +77,13 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx index f87ab2441e43..1446412c0081 100644 --- a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -61,7 +61,7 @@ namespace drawinglayer protected: /// local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor(s) @@ -80,10 +80,10 @@ namespace drawinglayer bool isTransparent() const; /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx index 0ff6a44198bc..bf2976619e00 100644 --- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -71,7 +71,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -98,16 +98,16 @@ namespace drawinglayer const BitmapEx& getCrossMarker() const { return maCrossMarker; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get 2d range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// Overload standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx index a4b1680b36fe..d44e84eefc38 100644 --- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -77,10 +77,10 @@ namespace drawinglayer const Primitive2DSequence& getChildren() const { return maChildren; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// local decomposition. Implementation will just return children - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx index 6e4b9afe56c5..9b101d946794 100644 --- a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -75,7 +75,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -96,13 +96,13 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// Overload standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index d9ad23dd937e..0da0052c70b3 100644 --- a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -46,10 +46,10 @@ namespace drawinglayer // despite returning an empty decomposition since it's no visualisation data, // range calculation is intended to use hidden geometry, so // the local implementation will return the children's range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// local decomposition. Implementation will return empty Primitive2DSequence - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index 1862b0ef89d5..92dab7cb070a 100644 --- a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -57,7 +57,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -70,10 +70,10 @@ namespace drawinglayer const BitmapEx& getMarker() const { return maMarker; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index ba988a6c974d..e2111c79b26a 100644 --- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -61,10 +61,10 @@ namespace drawinglayer const basegfx::B2DPolyPolygon& getMask() const { return maMask; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx index 56b348437b29..9998633e2256 100644 --- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -61,7 +61,7 @@ namespace drawinglayer protected: /// local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -79,10 +79,10 @@ namespace drawinglayer sal_uInt32 getDiscreteBorder() const { return mnDiscreteBorder; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx index 726b6b24f9bc..7b75a21a441a 100644 --- a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -64,7 +64,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor MetafilePrimitive2D( @@ -76,10 +76,10 @@ namespace drawinglayer const GDIMetaFile& getMetaFile() const { return maMetaFile; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index 761feb907b57..1f37fbcfc819 100644 --- a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -66,7 +66,7 @@ namespace drawinglayer const basegfx::BColorModifierSharedPtr& getColorModifier() const { return maColorModifier; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx index 79f9213406b3..164cbd5d0c77 100644 --- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx @@ -58,7 +58,7 @@ namespace drawinglayer const OUString& getDesc() const { return maDesc; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/openglprimitive2d.hxx b/include/drawinglayer/primitive2d/openglprimitive2d.hxx index 832a657c46ef..386b6c4a362d 100644 --- a/include/drawinglayer/primitive2d/openglprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/openglprimitive2d.hxx @@ -24,7 +24,7 @@ public: const Point& getPos() const { return m_aPos; } - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index cbaff76db65c..4b39b204d833 100644 --- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -65,7 +65,7 @@ namespace drawinglayer protected: /// local decomposition. Implementation will just return children - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -86,10 +86,10 @@ namespace drawinglayer bool getKeepAspectRatio() const { return mbKeepAspectRatio; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// own getB2DRange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index b35c2d96262d..a22a891206a6 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -63,10 +63,10 @@ namespace drawinglayer const basegfx::B2DRange& getReferenceRange() const { return maReferenceRange; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index daccdc9bed2f..9b01e4278057 100644 --- a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx @@ -65,10 +65,10 @@ namespace drawinglayer const basegfx::BColor& getRGBColor() const { return maRGBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx index e92de81f7cbc..53d86fc477ab 100644 --- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -65,10 +65,10 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -110,7 +110,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -127,13 +127,13 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -168,7 +168,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -188,10 +188,10 @@ namespace drawinglayer const attribute::StrokeAttribute& getStrokeAttribute() const { return maStrokeAttribute; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -220,7 +220,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -243,10 +243,10 @@ namespace drawinglayer double getWaveHeight() const { return mfWaveHeight; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -276,7 +276,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -299,10 +299,10 @@ namespace drawinglayer const attribute::LineStartEndAttribute& getEnd() const { return maEnd; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index 71163f44f149..972972727f91 100644 --- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -57,7 +57,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -68,10 +68,10 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -107,7 +107,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -124,10 +124,10 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -162,7 +162,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -181,10 +181,10 @@ namespace drawinglayer const attribute::StrokeAttribute& getStrokeAttribute() const { return maStrokeAttribute; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -225,10 +225,10 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -260,7 +260,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -273,7 +273,7 @@ namespace drawinglayer const attribute::FillGradientAttribute& getFillGradient() const { return maFillGradient; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -308,7 +308,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -323,7 +323,7 @@ namespace drawinglayer const attribute::FillHatchAttribute& getFillHatch() const { return maFillHatch; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -355,7 +355,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -368,7 +368,7 @@ namespace drawinglayer const attribute::FillGraphicAttribute& getFillGraphic() const { return maFillGraphic; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -410,7 +410,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -429,10 +429,10 @@ namespace drawinglayer bool getFill() const { return mbFill; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx index 7e5cbbf03c4c..e592a956f8f8 100644 --- a/include/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx @@ -66,7 +66,7 @@ namespace drawinglayer double getDiscreteUnit() const { return mfDiscreteUnit; } /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -105,7 +105,7 @@ namespace drawinglayer const basegfx::B2DRange& getViewport() const { return maViewport; } /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -144,7 +144,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getViewTransformation() const { return maViewTransformation; } /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -187,7 +187,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; } /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index fb65285bc8ec..e0f6ca506aa5 100644 --- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -100,7 +100,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// public helpers @@ -138,16 +138,16 @@ namespace drawinglayer const geometry::ViewInformation3D& getViewInformation3D() const { return maViewInformation3D; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// get local decomposition. Overloaded since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx index f8f0769cbabc..c7b9424a0219 100644 --- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -67,13 +67,13 @@ namespace drawinglayer const basegfx::BColor& getShadowColor() const { return maShadowColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// create decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx index 84b6cec8266f..8c3b32a3d2d8 100644 --- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx @@ -193,11 +193,11 @@ namespace drawinglayer Primitive2DVector& rTargetOpacity, const SvgGradientEntry& rFrom, const SvgGradientEntry& rTo, - sal_Int32 nOffset) const; - virtual void checkPreconditions(); + sal_Int32 nOffset) const SAL_OVERRIDE; + virtual void checkPreconditions() SAL_OVERRIDE; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -215,10 +215,10 @@ namespace drawinglayer const basegfx::B2DPoint& getEnd() const { return maEnd; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -262,11 +262,11 @@ namespace drawinglayer Primitive2DVector& rTargetOpacity, const SvgGradientEntry& rFrom, const SvgGradientEntry& rTo, - sal_Int32 nOffset) const; - virtual void checkPreconditions(); + sal_Int32 nOffset) const SAL_OVERRIDE; + virtual void checkPreconditions() SAL_OVERRIDE; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -287,10 +287,10 @@ namespace drawinglayer bool isFocalSet() const { return mbFocalSet; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -321,7 +321,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -336,7 +336,7 @@ namespace drawinglayer double getOffsetB() const { return mfOffsetB; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -383,7 +383,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -405,7 +405,7 @@ namespace drawinglayer basegfx::B2DVector getTranslateB() const { if(mpTranslate) return mpTranslate->maTranslateB; return basegfx::B2DVector(); } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index a14ce4ba788e..05f062142ba8 100644 --- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -80,7 +80,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -128,10 +128,10 @@ namespace drawinglayer bool decoratedIsNeeded() const; /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx index abf001c7a3dd..1bef85e02bad 100644 --- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -65,7 +65,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// construcor @@ -82,19 +82,19 @@ namespace drawinglayer TextEffectStyle2D getTextEffectStyle2D() const { return meTextEffectStyle2D; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /** own get range implementation to solve more effective. Content is by definition displaced by a fixed discrete unit, thus the contained geometry needs only once be asked for it's own basegfx::B2DRange */ - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() /// Overload standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index 2a64e3b74bbb..4553aa9a8094 100644 --- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -168,7 +168,7 @@ namespace drawinglayer const OUString& getString() const { return maString; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx index 170c151119fc..48f41978382f 100644 --- a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -69,7 +69,7 @@ namespace drawinglayer const basegfx::BColor& getLineColor() const { return maLineColor; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index db2087e8f51b..da5b665587b3 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -124,7 +124,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -159,10 +159,10 @@ namespace drawinglayer long getWidthToFill() const { return mnWidthToFill; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index bf1b5da11b42..82b455a54123 100644 --- a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -58,7 +58,7 @@ namespace drawinglayer const basegfx::BColor& getFontColor() const { return maFontColor; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -78,7 +78,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -96,7 +96,7 @@ namespace drawinglayer const ::com::sun::star::lang::Locale& getLocale() const { return maLocale; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() @@ -119,7 +119,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -137,7 +137,7 @@ namespace drawinglayer TextStrikeout getTextStrikeout() const { return meTextStrikeout; } /// compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx index 0f8f043b04b6..efc9fa318e7f 100644 --- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -66,10 +66,10 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getTransformation() const { return maTransformation; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx index 7646bdcb4675..76aaea6d761e 100644 --- a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -73,7 +73,7 @@ namespace drawinglayer const Primitive2DSequence& getTransparence() const { return maTransparence; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 7f86ee1a9b9f..95db70985f4a 100644 --- a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -55,13 +55,13 @@ namespace drawinglayer double getTransparence() const { return mfTransparence; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// own getB2DRange implementation to include transparent geometries to BoundRect calculations - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// create decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index d528ffd91e2d..ccb4a950f00c 100644 --- a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -69,10 +69,10 @@ namespace drawinglayer WallpaperStyle getWallpaperStyle() const { return meWallpaperStyle; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// get B2Drange - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index 9410fb7f8d94..b3971108d558 100644 --- a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -60,7 +60,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -77,7 +77,7 @@ namespace drawinglayer const basegfx::BColor& getColor() const { return maColor; } /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index 7f227a2eda03..a40b5c1cef90 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -36,7 +36,7 @@ */ #define DeclPrimitive3DIDBlock() \ - virtual sal_uInt32 getPrimitive3DID() const; + virtual sal_uInt32 getPrimitive3DID() const SAL_OVERRIDE; #define ImplPrimitive3DIDBlock(TheClass, TheID) \ sal_uInt32 TheClass::getPrimitive3DID() const { return TheID; } @@ -117,12 +117,12 @@ namespace drawinglayer /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It will get the ViewInformation from the ViewParameters for that purpose */ - virtual Primitive3DSequence SAL_CALL getDecomposition( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual Primitive3DSequence SAL_CALL getDecomposition( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** the getRange default implemenation will use getDecomposition to create the range information from merging getRange results from the single local decomposition primitives. */ - virtual ::com::sun::star::geometry::RealRectangle3D SAL_CALL getRange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::geometry::RealRectangle3D SAL_CALL getRange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; } // end of namespace primitive3d } // end of namespace drawinglayer @@ -171,7 +171,7 @@ namespace drawinglayer overloaded and the ViewInformation for the last decomposition needs to be remembered, too, and be used in the next call to decide if the buffered decomposition may be reused or not. */ - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive3d/groupprimitive3d.hxx b/include/drawinglayer/primitive3d/groupprimitive3d.hxx index f9a0aee95cfa..0fae848618b7 100644 --- a/include/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -63,10 +63,10 @@ namespace drawinglayer Primitive3DSequence getChildren() const { return maChildren; } /// compare operator - virtual bool operator==( const BasePrimitive3D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive3D& rPrimitive ) const SAL_OVERRIDE; /// local decomposition. Implementation will just return children - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index d5cd9b9f6ab0..33055b5ae6b5 100644 --- a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -68,10 +68,10 @@ namespace drawinglayer const attribute::FillHatchAttribute& getHatch() const { return maHatch; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// local decomposition. - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx index 0a510e7dc029..7f47c8817048 100644 --- a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -48,10 +48,10 @@ namespace drawinglayer // despite returning an empty decomposition since it's no visualisation data, // range calculation is intended to use hidden geometry, so // the local implementation will return the children's range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// The default implementation returns an empty sequence - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; // provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index ad75029a8979..437355104054 100644 --- a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer const basegfx::BColorModifierSharedPtr& getColorModifier() const { return maColorModifier; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx index a0b8dc032ec6..85670f97d9b2 100644 --- a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -62,10 +62,10 @@ namespace drawinglayer const basegfx::BColor& getBColor() const { return maBColor; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() @@ -99,7 +99,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -114,7 +114,7 @@ namespace drawinglayer const attribute::StrokeAttribute& getStrokeAttribute() const { return maStrokeAttribute; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index ed811a13857b..cfd092c1d8ae 100644 --- a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -88,12 +88,12 @@ namespace drawinglayer com::sun::star::drawing::LineCap getLineCap() const { return maLineCap; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /** local decomposition. Use own buffering since we are not derived from BufferedDecompositionPrimitive3D */ - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 767d77fdc739..d9bebf964674 100644 --- a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -65,10 +65,10 @@ namespace drawinglayer bool getDoubleSided() const { return mbDoubleSided; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index 8f3be710a860..c4c489d8aea2 100644 --- a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -40,7 +40,7 @@ namespace drawinglayer { protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -51,10 +51,10 @@ namespace drawinglayer const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute); /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 23c925050eb6..9155378f7112 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -74,7 +74,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -108,13 +108,13 @@ namespace drawinglayer bool getCloseBack() const { return mbCloseBack; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// Overloaded to allow for reduced line mode to decide if to buffer decomposition or not - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index a83a733e228d..fe030c9a6fe8 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -88,7 +88,7 @@ namespace drawinglayer const basegfx::B2DPoint& rEnd) const; /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -126,13 +126,13 @@ namespace drawinglayer bool getCloseBack() const { return mbCloseBack; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// Overloaded to allow for reduced line mode to decide if to buffer decomposition or not - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 7b494b46b58f..906ec31da96b 100644 --- a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -63,10 +63,10 @@ namespace drawinglayer const basegfx::B3DPolyPolygon& getPolyPolygon3D() const { return maPolyPolygon3D; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx index bf3af11b5dee..b8244f4a2a16 100644 --- a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -76,7 +76,7 @@ namespace drawinglayer const attribute::Sdr3DObjectAttribute getSdr3DObjectAttribute() const { return maSdr3DObjectAttribute; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index d0cba005d002..dc4f0d85b10a 100644 --- a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -45,7 +45,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; public: /// constructor @@ -62,10 +62,10 @@ namespace drawinglayer sal_uInt32 getVerticalSegments() const { return mnVerticalSegments; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx index 40f427de943b..1e58bbbde5b6 100644 --- a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -69,7 +69,7 @@ namespace drawinglayer bool getShadow3D() const { return mbShadow3D; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/textureprimitive3d.hxx b/include/drawinglayer/primitive3d/textureprimitive3d.hxx index bac2d71f60a0..8ee487e6b7b9 100644 --- a/include/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -67,7 +67,7 @@ namespace drawinglayer bool getFilter() const { return mbFilter; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; }; } // end of namespace primitive3d } // end of namespace drawinglayer @@ -100,13 +100,13 @@ namespace drawinglayer double getTransparence() const { return mfTransparence; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// own getB3DRange implementation to include transparent geometries to BoundRect calculations - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// local decomposition. - virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; + virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() @@ -145,7 +145,7 @@ namespace drawinglayer const attribute::FillGradientAttribute& getGradient() const { return maGradient; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() @@ -184,7 +184,7 @@ namespace drawinglayer const attribute::FillGraphicAttribute& getFillGraphicAttribute() const { return maFillGraphicAttribute; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() @@ -215,7 +215,7 @@ namespace drawinglayer const basegfx::B2DVector& rTextureSize); /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/primitive3d/transformprimitive3d.hxx b/include/drawinglayer/primitive3d/transformprimitive3d.hxx index 105d8cd9056f..2751f03b7eff 100644 --- a/include/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -56,10 +56,10 @@ namespace drawinglayer const basegfx::B3DHomMatrix& getTransformation() const { return maTransformation; } /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const; + virtual bool operator==(const BasePrimitive3D& rPrimitive) const SAL_OVERRIDE; /// get range - virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; + virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE; /// provide unique ID DeclPrimitive3DIDBlock() diff --git a/include/drawinglayer/processor2d/contourextractor2d.hxx b/include/drawinglayer/processor2d/contourextractor2d.hxx index e3fdd5f3ca01..7fcf6d332fa9 100644 --- a/include/drawinglayer/processor2d/contourextractor2d.hxx +++ b/include/drawinglayer/processor2d/contourextractor2d.hxx @@ -47,7 +47,7 @@ namespace drawinglayer bool mbExtractFillOnly : 1; /// tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate); + void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE; public: explicit ContourExtractor2D( diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx index 11678e854822..e1cd88702284 100644 --- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx @@ -67,7 +67,7 @@ namespace drawinglayer bool mbHitTextOnly : 1; /// tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate); + void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE; bool checkHairlineHitWithTolerance( const basegfx::B2DPolygon& rPolygon, double fDiscreteHitTolerance); diff --git a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx index 3f9e46187165..e7d64e0d9c11 100644 --- a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx @@ -47,7 +47,7 @@ namespace drawinglayer bool mbInLineGeometry : 1; /// tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate); + void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE; public: LineGeometryExtractor2D(const geometry::ViewInformation2D& rViewInformation); diff --git a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx index 85be428a2eec..bee24bb69f42 100644 --- a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx +++ b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx @@ -44,7 +44,7 @@ namespace drawinglayer const primitive2d::ObjectInfoPrimitive2D* mpFound; /// tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate); + void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE; public: ObjectInfoPrimitiveExtractor2D(const geometry::ViewInformation2D& rViewInformation); diff --git a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx index 3da6b52ff4df..2cb798a39197 100644 --- a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -79,7 +79,7 @@ namespace drawinglayer sal_uInt32 mnInText; // tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate); + void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE; public: explicit TextAsPolygonExtractor2D(const geometry::ViewInformation2D& rViewInformation); diff --git a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx index c8073b3bb5ed..1d6b76abc9cd 100644 --- a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -62,7 +62,7 @@ namespace drawinglayer /* as tooling, the process() implementation takes over API handling and calls this virtual render method when the primitive implementation is BasePrimitive3D-based. */ - virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate); + virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) SAL_OVERRIDE; public: CutFindProcessor(const geometry::ViewInformation3D& rViewInformation, diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx index 2d52334606c4..8b9773d26863 100644 --- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -123,7 +123,7 @@ namespace drawinglayer virtual void rasterconvertB3DPolyPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolyPolygon& rFill) const = 0; // the processing method for a single, known primitive - virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rBasePrimitive); + virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rBasePrimitive) SAL_OVERRIDE; public: DefaultProcessor3D( diff --git a/include/drawinglayer/processor3d/geometry2dextractor.hxx b/include/drawinglayer/processor3d/geometry2dextractor.hxx index 2a4218dc7c1f..194f38c9422a 100644 --- a/include/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/include/drawinglayer/processor3d/geometry2dextractor.hxx @@ -55,7 +55,7 @@ namespace drawinglayer /* as tooling, the process() implementation takes over API handling and calls this virtual render method when the primitive implementation is BasePrimitive3D-based. */ - virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate); + virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) SAL_OVERRIDE; public: Geometry2DExtractingProcessor( diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx index 945129f1a7e8..12710b3f327a 100644 --- a/include/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx @@ -85,7 +85,7 @@ namespace drawinglayer /* as tooling, the process() implementation takes over API handling and calls this virtual render method when the primitive implementation is BasePrimitive3D-based. */ - virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate); + virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) SAL_OVERRIDE; public: Shadow3DExtractingProcessor( diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx index c42d18475022..5f6403081b73 100644 --- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -76,8 +76,8 @@ namespace drawinglayer // rasterconversions for filled and non-filled polygons - virtual void rasterconvertB3DPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolygon& rHairline) const; - virtual void rasterconvertB3DPolyPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolyPolygon& rFill) const; + virtual void rasterconvertB3DPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolygon& rHairline) const SAL_OVERRIDE; + virtual void rasterconvertB3DPolyPolygon(const attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolyPolygon& rFill) const SAL_OVERRIDE; public: ZBufferProcessor3D( diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx index 896685ce97e3..0fa666d19411 100644 --- a/include/drawinglayer/texture/texture.hxx +++ b/include/drawinglayer/texture/texture.hxx @@ -91,7 +91,7 @@ namespace drawinglayer virtual ~GeoTexSvxGradient(); // compare operator - virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE; // virtual base methods virtual void appendTransformationsAndColors( @@ -125,8 +125,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -151,8 +151,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -178,8 +178,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -206,8 +206,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -234,8 +234,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -262,8 +262,8 @@ namespace drawinglayer virtual void appendTransformationsAndColors( std::vector< B2DHomMatrixAndBColor >& rEntries, - basegfx::BColor& rOutmostColor); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; + basegfx::BColor& rOutmostColor) SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -291,7 +291,7 @@ namespace drawinglayer virtual ~GeoTexSvxHatch(); // compare operator - virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE; virtual void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices); double getDistanceToHatch(const basegfx::B2DPoint& rUV) const; @@ -330,7 +330,7 @@ namespace drawinglayer virtual ~GeoTexSvxTiled(); // compare operator - virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE; virtual void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices); }; diff --git a/include/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx index ec5925ed46ca..2068218d5354 100644 --- a/include/drawinglayer/texture/texture3d.hxx +++ b/include/drawinglayer/texture/texture3d.hxx @@ -50,9 +50,9 @@ namespace drawinglayer double fOpacity); // compare operator - virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const; - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; - virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const; + virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -89,8 +89,8 @@ namespace drawinglayer const basegfx::B2DRange& rRange); virtual ~GeoTexSvxBitmapEx(); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; - virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -121,8 +121,8 @@ namespace drawinglayer double fOffsetX = 0.0, double fOffsetY = 0.0); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; - virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const SAL_OVERRIDE; }; } // end of namespace texture } // end of namespace drawinglayer @@ -151,8 +151,8 @@ namespace drawinglayer public: GeoTexSvxMultiHatch(const primitive3d::HatchTexturePrimitive3D& rPrimitive, double fLogicPixelSize); virtual ~GeoTexSvxMultiHatch(); - virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; - virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const; + virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE; + virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const SAL_OVERRIDE; // dada access bool getFillBackground() const { return mbFillBackground; } diff --git a/include/editeng/AccessibleComponentBase.hxx b/include/editeng/AccessibleComponentBase.hxx index f14817f6702e..9e866fc5bb5a 100644 --- a/include/editeng/AccessibleComponentBase.hxx +++ b/include/editeng/AccessibleComponentBase.hxx @@ -55,7 +55,7 @@ public: */ virtual sal_Bool SAL_CALL containsPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty reference. */ @@ -63,30 +63,30 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty rectangle. */ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation uses the result of <member>getBounds</member> to determine the location. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty position, i.e. the * result of the default constructor of com::sun::star::awt::Point. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation uses the result of <member>getBounds</member> to determine the size. */ virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation ignores this call. */ @@ -104,26 +104,26 @@ public: /** The default implementation does nothing. */ virtual void SAL_CALL grabFocus (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns black as the default foreground color. */ virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns white as the default background color. */ virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleExtendedComponent ==================================== virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTitledBorderText (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getToolTipText (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index b02c0cf68bd6..ebc864d5177d 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -175,56 +175,56 @@ public: /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. @@ -232,7 +232,7 @@ public: virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception); + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================== @@ -240,13 +240,13 @@ public: addAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -255,20 +255,20 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== @@ -277,13 +277,13 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** The state set. @@ -298,7 +298,7 @@ protected: ::com::sun::star::accessibility::XAccessibleRelationSet> mxRelationSet; // This method is called from the component helper base class while disposing. - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** Create the accessible object's name. This method may be called more than once for a single object. diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index e169edd1a228..68b8e8cd980b 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -63,11 +63,11 @@ namespace accessibility protected: // override OCommonAccessibleText methods - virtual OUString implGetText(); - virtual ::com::sun::star::lang::Locale implGetLocale(); - virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ); - virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual OUString implGetText() SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale implGetLocale() SAL_OVERRIDE; + virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) SAL_OVERRIDE; + virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ) SAL_OVERRIDE; + virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ) SAL_OVERRIDE; public: /// Create accessible object for given parent @@ -81,90 +81,90 @@ namespace accessibility virtual ~AccessibleEditableTextPara (); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface (const ::com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface (const ::com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Maximal length of text returned by getAccessibleDescription() enum { MaxDescriptionLen = 40 }; - virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleText (this comes implicitely inherited by XAccessibleEditableText AND by XAccessibleMultiLineText) - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEditableText - virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleTextAttributes - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( ::sal_Int32 Index, const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( ::sal_Int32 Index, const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleHypertext - virtual ::sal_Int32 SAL_CALL getHyperLinkCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( ::sal_Int32 nLinkIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getHyperLinkIndex( ::sal_Int32 nCharIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getHyperLinkCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( ::sal_Int32 nLinkIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getHyperLinkIndex( ::sal_Int32 nCharIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleMultiLineText - virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index 2960a64223d5..297d687bd2cc 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -54,44 +54,44 @@ namespace accessibility virtual ~AccessibleImageBullet (); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface (const ::com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface (const ::com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Maximal length of text returned by getAccessibleDescription() enum { MaxDescriptionLen = 40 }; - virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/include/editeng/AccessibleSelectionBase.hxx b/include/editeng/AccessibleSelectionBase.hxx index 41f01b0979aa..1a44a3eda315 100644 --- a/include/editeng/AccessibleSelectionBase.hxx +++ b/include/editeng/AccessibleSelectionBase.hxx @@ -46,13 +46,13 @@ namespace accessibility public: // XAccessibleSelection - default implementations - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx index 1fae905ea04b..6ccc0be6b3b6 100644 --- a/include/editeng/AccessibleStaticTextBase.hxx +++ b/include/editeng/AccessibleStaticTextBase.hxx @@ -224,32 +224,32 @@ namespace accessibility virtual void Dispose(); // XAccessibleText interface implementation - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleTextAttributes - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 Index, const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 Index, const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // child-related methods from XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception); diff --git a/include/editeng/UnoForbiddenCharsTable.hxx b/include/editeng/UnoForbiddenCharsTable.hxx index 9c4bc5259301..d073c4ee6855 100644 --- a/include/editeng/UnoForbiddenCharsTable.hxx +++ b/include/editeng/UnoForbiddenCharsTable.hxx @@ -44,14 +44,14 @@ public: ~SvxUnoForbiddenCharsTable(); // XForbiddenCharacters - virtual com::sun::star::i18n::ForbiddenCharacters SAL_CALL getForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::container::NoSuchElementException, com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setForbiddenCharacters( const com::sun::star::lang::Locale& rLocale, const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) throw(com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::i18n::ForbiddenCharacters SAL_CALL getForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::container::NoSuchElementException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setForbiddenCharacters( const com::sun::star::lang::Locale& rLocale, const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSupportedLocales - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasLocale( const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasLocale( const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_EDITENG_UNOFORBIDDENCHARSTABLE_HXX diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx index 974e7a7e1496..73ab582e7551 100644 --- a/include/editeng/acorrcfg.hxx +++ b/include/editeng/acorrcfg.hxx @@ -34,8 +34,8 @@ public: ~SvxBaseAutoCorrCfg(); void Load(bool bInit); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; void SetModified() {ConfigItem::SetModified();} }; @@ -49,8 +49,8 @@ public: ~SvxSwAutoCorrCfg(); void Load(bool bInit); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; void SetModified() {ConfigItem::SetModified();} }; /*-------------------------------------------------------------------- diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index d38ed4d13e04..038822ce9801 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -54,23 +54,23 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; - virtual sal_uInt16 GetValueCount() const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual sal_uInt16 GetEnumValue() const; - virtual void SetEnumValue( sal_uInt16 nNewVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual sal_uInt16 GetEnumValue() const SAL_OVERRIDE; + virtual void SetEnumValue( sal_uInt16 nNewVal ) SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; inline void SetOneWord( const SvxAdjust eType ) { diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 591eccd5456a..2c4f0b4426d2 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -40,14 +40,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) { diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index d60b119a48ef..be813385c542 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -40,13 +40,13 @@ public: SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { SetValue(rBlink.GetValue()); diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index fc09f7d43a43..d0fde67ab107 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -70,22 +70,22 @@ public: SvxBoxItem &operator=( const SvxBoxItem& rBox ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; const editeng::SvxBorderLine* GetTop() const { return pTop; } const editeng::SvxBorderLine* GetBottom() const { return pBottom; } @@ -180,19 +180,19 @@ public: SvxBoxInfoItem &operator=( const SvxBoxInfoItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; const editeng::SvxBorderLine* GetHori() const { return pHori; } const editeng::SvxBorderLine* GetVert() const { return pVert; } diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index fdae5f70743b..24b9220d26e9 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -83,16 +83,16 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; const Color& GetColor() const { return aColor; } Color& GetColor() { return aColor; } diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index b58e71bbcad8..2dc62288f39d 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -85,9 +85,9 @@ public: SvxBulletItem( const SvxBulletItem& ); ~SvxBulletItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; OUString GetFullText() const; sal_Unicode GetSymbol() const { return cSymbol; } @@ -115,12 +115,12 @@ public: void SetFont( const Font& rNew) { aFont = rNew; } void SetScale( sal_uInt16 nNew ) { nScale = nNew; } - virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; static void StoreFont( SvStream&, const Font& ); static Font CreateFont( SvStream&, sal_uInt16 nVer ); diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index b2271784bd8d..6f49c5e58677 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -36,11 +36,11 @@ public: SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) { SetValue(rHidden.GetValue()); diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 1014ea0bd87a..459ea435f111 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -39,22 +39,22 @@ public: SvxCharReliefItem( FontRelief eValue /*= RELIEF_NONE*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual sal_uInt16 GetValueCount() const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; inline SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem ) { diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 5d6e2580c30a..8dad9e7f0c98 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -43,19 +43,19 @@ public: bool bFitIntoLine /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; inline SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem ) { @@ -64,7 +64,7 @@ public: return *this; } - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; // our currently only degree values void SetTopToBotton() { SetValue( 2700 ); } diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 4d5146478be7..74bb3f438dde 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -40,19 +40,19 @@ public: SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; inline SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem ) { diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index 8eca973b8fdf..54ee7f4e4f52 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -44,11 +44,11 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; inline rtl_TextEncoding& GetCharSet() { return eFrom; } inline rtl_TextEncoding GetCharSet() const { return eFrom; } diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index 01f20e9c694b..59bc82f14600 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -44,13 +44,13 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // MS VC4.0 kommt durcheinander void SetValue( sal_uInt16 nNewVal ) @@ -67,8 +67,8 @@ public: { return (SvxCaseMap)GetValue(); } void SetCaseMap( SvxCaseMap eNew ) { SetValue( (sal_uInt16)eNew ); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 65d2260aae1f..08801f5b07d4 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -49,19 +49,19 @@ public: ~SvxColorItem(); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; inline SvxColorItem& operator=(const SvxColorItem& rColor) { diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index b61807c6b7d8..072a0ace1a59 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -37,14 +37,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxContourItem& operator=(const SvxContourItem& rCont) { diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 8fd95d4d0828..5163653daccf 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -43,23 +43,23 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual sal_uInt16 GetValueCount() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; // MS VC4.0 messes things up void SetValue( sal_uInt16 nNewVal ) {SfxEnumItem::SetValue(nNewVal); } - virtual bool HasBoolValue() const; - virtual bool GetBoolValue() const; - virtual void SetBoolValue( sal_Bool bVal ); + virtual bool HasBoolValue() const SAL_OVERRIDE; + virtual bool GetBoolValue() const SAL_OVERRIDE; + virtual void SetBoolValue( sal_Bool bVal ) SAL_OVERRIDE; inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross) { diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index 0b5d9a357169..c14fe88286dd 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -142,7 +142,7 @@ public: // #i102062# bool isWrongListEqual(const EditTextObject& rCompare) const; - virtual void ObjectInDestruction(const SfxItemPool& rSfxItemPool); + virtual void ObjectInDestruction(const SfxItemPool& rSfxItemPool) SAL_OVERRIDE; #if DEBUG_EDIT_ENGINE void Dump() const; diff --git a/include/editeng/editund2.hxx b/include/editeng/editund2.hxx index 70849f25b718..52c11ca3acc4 100644 --- a/include/editeng/editund2.hxx +++ b/include/editeng/editund2.hxx @@ -36,8 +36,8 @@ class EDITENG_DLLPUBLIC EditUndoManager : public SfxUndoManager public: EditUndoManager(sal_uInt16 nMaxUndoActionCount = 20); - virtual bool Undo(); - virtual bool Redo(); + virtual bool Undo() SAL_OVERRIDE; + virtual bool Redo() SAL_OVERRIDE; }; @@ -55,12 +55,12 @@ public: EditEngine* GetEditEngine(); - virtual void Undo() = 0; - virtual void Redo() = 0; + virtual void Undo() SAL_OVERRIDE = 0; + virtual void Redo() SAL_OVERRIDE = 0; - virtual bool CanRepeat(SfxRepeatTarget&) const; - virtual OUString GetComment() const; - virtual sal_uInt16 GetId() const; + virtual bool CanRepeat(SfxRepeatTarget&) const SAL_OVERRIDE; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual sal_uInt16 GetId() const SAL_OVERRIDE; }; #endif // INCLUDED_EDITENG_EDITUND2_HXX diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 5caf156d4b29..3c62e8635ffa 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -45,15 +45,15 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem ) { diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 9b02f95af49a..829ddcbeb9be 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -52,18 +52,18 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; inline void SetEscapement( const SvxEscapement eNew ) { @@ -90,10 +90,10 @@ public: return *this; } - virtual sal_uInt16 GetValueCount() const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual sal_uInt16 GetEnumValue() const; - virtual void SetEnumValue( sal_uInt16 nNewVal ); + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual sal_uInt16 GetEnumValue() const SAL_OVERRIDE; + virtual void SetEnumValue( sal_uInt16 nNewVal ) SAL_OVERRIDE; }; #endif diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 2a3f400eb453..1655a982e379 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -48,21 +48,21 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nItemVersion) const; - virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) { diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 021f95e1434a..d91fc1d59f0d 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -81,10 +81,10 @@ public: SvxFieldItem( const SvxFieldItem& rItem ); ~SvxFieldItem(); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVer ) const; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; const SvxFieldData* GetField() const { return pField; } static SvClassManager& GetClassManager(); @@ -135,10 +135,10 @@ public: OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; static OUString GetFormatted( Date& rDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; - virtual MetaAction* createBeginComment() const; + virtual MetaAction* createBeginComment() const SAL_OVERRIDE; }; @@ -173,10 +173,10 @@ public: SvxURLFormat GetFormat() const { return eFormat; } void SetFormat( SvxURLFormat eFmt ) { eFormat = eFmt; } - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; - virtual MetaAction* createBeginComment() const; + virtual MetaAction* createBeginComment() const SAL_OVERRIDE; }; class EDITENG_DLLPUBLIC SvxPageField : public SvxFieldData @@ -185,10 +185,10 @@ public: SV_DECL_PERSIST1( SvxPageField, SvxFieldData, com::sun::star::text::textfield::Type::PAGE ) SvxPageField(); - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; - virtual MetaAction* createBeginComment() const; + virtual MetaAction* createBeginComment() const SAL_OVERRIDE; }; class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData @@ -197,8 +197,8 @@ public: SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, com::sun::star::text::textfield::Type::PAGES ) SvxPagesField(); - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; }; class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData @@ -207,10 +207,10 @@ public: SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, com::sun::star::text::textfield::Type::TIME ) SvxTimeField(); - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; - virtual MetaAction* createBeginComment() const; + virtual MetaAction* createBeginComment() const SAL_OVERRIDE; }; class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData @@ -219,8 +219,8 @@ public: SV_DECL_PERSIST1( SvxFileField, SvxFieldData, com::sun::star::text::textfield::Type::DOCINFO_TITLE ) SvxFileField(); - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; }; class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData @@ -234,8 +234,8 @@ public: void SetTab(int nTab); int GetTab() const; - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; }; @@ -282,10 +282,10 @@ public: OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; static OUString GetFormatted( Time& rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; - virtual MetaAction* createBeginComment() const; + virtual MetaAction* createBeginComment() const SAL_OVERRIDE; }; @@ -323,8 +323,8 @@ public: OUString GetFormatted() const; - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; }; @@ -371,8 +371,8 @@ public: OUString GetFormatted() const; - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; }; /** this field is used as a placeholder for a header&footer in impress. The actual @@ -383,8 +383,8 @@ public: SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_HEADER ) SvxHeaderField(); - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; }; /** this field is used as a placeholder for a header&footer in impress. The actual @@ -394,8 +394,8 @@ class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData public: SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_FOOTER ) SvxFooterField(); - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; }; /** this field is used as a placeholder for a header&footer in impress. The actual @@ -408,8 +408,8 @@ public: static OUString GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); - virtual SvxFieldData* Clone() const; - virtual bool operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; }; diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index a4ae508c961d..c1f90c135d05 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -48,15 +48,15 @@ public: const sal_uInt16 nId ); SvxFontListItem( const SvxFontListItem& rItem ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; const FontList* GetFontList() const { return pFontList; } }; diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index 37a1fcfb8d22..0d2f27571c46 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -54,17 +54,17 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; // Access methods: void SetFamilyName( const OUString& rFamilyName ) { aFamilyName = rFamilyName; } diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 85b807073cee..56262a7f7919 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -37,15 +37,15 @@ public: SvxForbiddenRuleItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxForbiddenRuleItem& operator=( const SvxForbiddenRuleItem& rItem ) diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 7dc0df5aee76..84da2ca376e6 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -44,21 +44,21 @@ public: inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; - virtual sal_uInt16 GetValueCount() const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // MS VC4.0 messes things up void SetValue( sal_uInt16 nNewVal ) diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index 0d73942d77f9..e8f962928d1e 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -41,20 +41,20 @@ public: sal_uInt16 nWhich ); virtual ~SvxFrameDirectionItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; inline SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem ) { diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index 16691062a364..b4d16475e05b 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -42,20 +42,20 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; inline SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem ) { diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index 7acb9aae6b29..7358d550e74a 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -36,15 +36,15 @@ public: SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxHangingPunctuationItem& operator=( const SvxHangingPunctuationItem& rItem ) diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index b71b869f83f0..771880a625d7 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -49,18 +49,18 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; inline void SetHyphen( const bool bNew ) { bHyphen = bNew; } inline bool IsHyphen() const { return bHyphen; } diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 9da2bb48d8dd..3a002b97146a 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -39,15 +39,15 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; virtual OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) { @@ -72,15 +72,15 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; virtual OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) { @@ -101,15 +101,15 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; virtual OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; SvxJustifyMethodItem& operator=(const SvxJustifyMethodItem& r); }; diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index a2b28691a2b7..7cfc750044b8 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -40,14 +40,14 @@ public: inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; inline SvxFmtKeepItem::SvxFmtKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) : diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index af940c53a4cc..f4d52bad4e5d 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -42,24 +42,24 @@ public: SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxKerningItem& operator=(const SvxKerningItem& rKern) { SetValue( rKern.GetValue() ); return *this; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index e44a9a5d25af..60d740230645 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -44,12 +44,12 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang) { @@ -62,8 +62,8 @@ public: { return (LanguageType)GetValue(); } void SetLanguage( const LanguageType eLang ) { SetValue( (sal_uInt16)eLang ); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx index f92f183a36e4..a4cd049d8cf9 100644 --- a/include/editeng/lcolitem.hxx +++ b/include/editeng/lcolitem.hxx @@ -41,7 +41,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) - const; + const SAL_OVERRIDE; inline SvxLineColorItem& operator=(const SvxLineColorItem& rColor) { return (SvxLineColorItem&)SvxColorItem:: diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index b2cf40d2bdd0..92fd26d43706 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -46,19 +46,19 @@ public: ~SvxLineItem(); SvxLineItem &operator=( const SvxLineItem& rLine ); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; const editeng::SvxBorderLine* GetLine () const { return pLine; } void SetLine ( const editeng::SvxBorderLine *pNew ); diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index f5871a009e60..6ccce38c0efe 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -73,22 +73,22 @@ public: inline SvxLRSpaceItem& operator=( const SvxLRSpaceItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; - virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; + virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; // Die "Layout-Schnittstelle": inline void SetLeft ( const long nL, const sal_uInt16 nProp = 100 ); diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index 2e6fa0acdf6e..e866c72a411d 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -53,18 +53,18 @@ public: SvxLineSpacingItem( sal_uInt16 nHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; // Methods to query and edit. InterlineSpace is added to the height. inline short GetInterLineSpace() const { return nInterLineSpace; } @@ -96,10 +96,10 @@ public: inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; } inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; } - virtual sal_uInt16 GetValueCount() const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual sal_uInt16 GetEnumValue() const; - virtual void SetEnumValue( sal_uInt16 nNewVal ); + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual sal_uInt16 GetEnumValue() const SAL_OVERRIDE; + virtual void SetEnumValue( sal_uInt16 nNewVal ) SAL_OVERRIDE; }; #endif diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx index 2e7e213f735b..17e7e88737aa 100644 --- a/include/editeng/measfld.hxx +++ b/include/editeng/measfld.hxx @@ -44,8 +44,8 @@ public: SdrMeasureField(): eMeasureFieldKind(SDRMEASUREFIELD_VALUE) {} SdrMeasureField(SdrMeasureFieldKind eNewKind): eMeasureFieldKind(eNewKind) {} virtual ~SdrMeasureField(); - virtual SvxFieldData* Clone() const; - virtual bool operator==(const SvxFieldData&) const; + virtual SvxFieldData* Clone() const SAL_OVERRIDE; + virtual bool operator==(const SvxFieldData&) const SAL_OVERRIDE; SdrMeasureFieldKind GetMeasureFieldKind() const { return eMeasureFieldKind; } void SetMeasureFieldKind(SdrMeasureFieldKind eNewKind) { eMeasureFieldKind=eNewKind; } }; diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index 6c02b7b72b2c..eda9a193304d 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -32,14 +32,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH) { diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index 0dfc61db4ccd..704b392930ee 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -32,14 +32,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB) { diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index a4709c3f07c1..57f63b95d06a 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -295,16 +295,16 @@ public: SvxNumBulletItem(const SvxNumBulletItem& rCopy); virtual ~SvxNumBulletItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &rStream, sal_uInt16 nItemVersion) const; - sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; - virtual SvStream& Store(SvStream &rStream, sal_uInt16 nItemVersion ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &rStream, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &rStream, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; SvxNumRule* GetNumRule() const {return pNumRule;} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; class SvxNodeNum diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 37c6f7698a9a..5ef06a9398b5 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -41,14 +41,14 @@ public: inline SvxOpaqueItem &operator=( const SvxOpaqueItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const bool bOpa ) diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 6f7cb9f8b437..077f9cc3e270 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -45,10 +45,10 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > @@ -73,15 +73,15 @@ public: SfxHyphenRegionItem( const sal_uInt16 nId ); SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const; - virtual SvStream& Store( SvStream& rStrm, sal_uInt16 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& rStrm, sal_uInt16 ) const SAL_OVERRIDE; inline sal_uInt8 &GetMinLead() { return nMinLead; } inline sal_uInt8 GetMinLead() const { return nMinLead; } diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index d19788061937..99bd179898f2 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -40,14 +40,14 @@ public: SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans ) { diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index a84213a59260..62dfd68fdd64 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -40,19 +40,19 @@ public: SvxParaVertAlignItem( sal_uInt16 nValue /*= 0*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; inline SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem ) { @@ -60,7 +60,7 @@ public: return *this; } - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; }; diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index d3c14ea84afb..1d3acfe5e886 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -43,13 +43,13 @@ public: inline SvxPaperBinItem &operator=( const SvxPaperBinItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT ) diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index e5ca9a53c7c2..05ffd0e1c6ea 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -39,14 +39,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index 16abd6db1604..1a9eaf704dbb 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -42,15 +42,15 @@ public: sal_uInt16 nWh ); inline SvxPageModelItem& operator=( const SvxPageModelItem& rModel ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; bool IsAuto() const { return bAuto; } }; diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 45d3b20257e9..ae19bb660308 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -44,20 +44,20 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual bool HasBoolValue() const; - virtual bool GetBoolValue() const; - virtual void SetBoolValue( sal_Bool bVal ); + virtual bool HasBoolValue() const SAL_OVERRIDE; + virtual bool GetBoolValue() const SAL_OVERRIDE; + virtual void SetBoolValue( sal_Bool bVal ) SAL_OVERRIDE; inline SvxPostureItem& operator=(const SvxPostureItem& rPost) { SetValue( rPost.GetValue() ); diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index 25e66dc9e82a..b80318bec8a3 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -42,14 +42,14 @@ public: inline SvxPrintItem &operator=( const SvxPrintItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const bool bPrt ) diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index 079b77aa4626..46b9e37d9652 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -45,17 +45,17 @@ public: inline SvxProtectItem &operator=( const SvxProtectItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; bool IsCntntProtected() const { return bCntnt; } bool IsSizeProtected() const { return bSize; } @@ -64,8 +64,8 @@ public: void SetSizeProtect ( bool bNew ) { bSize = bNew; } void SetPosProtect ( bool bNew ) { bPos = bNew; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId ) diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx index 6594b1a4b0a9..2abe4b506c08 100644 --- a/include/editeng/prszitem.hxx +++ b/include/editeng/prszitem.hxx @@ -38,14 +38,14 @@ public: const sal_uInt16 nID ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize) { diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx index da658aee445b..160d906dd019 100644 --- a/include/editeng/rsiditem.hxx +++ b/include/editeng/rsiditem.hxx @@ -24,11 +24,11 @@ public: SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId, nRsid ) {} SvxRsidItem( SvStream& rIn, sal_uInt16 nId ) : SfxUInt32Item( nId, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif // INCLUDED_EDITENG_RSIDITEM_HXX diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 7233c98e6b81..8a3f503ff5e9 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -38,15 +38,15 @@ public: SvxScriptSpaceItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem ) { diff --git a/include/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx index 8afb993012d8..6e098b05d3e8 100644 --- a/include/editeng/scripttypeitem.hxx +++ b/include/editeng/scripttypeitem.hxx @@ -41,7 +41,7 @@ public: TYPEINFO_OVERRIDE(); explicit SvxScriptTypeItem( sal_uInt16 nType = SCRIPTTYPE_LATIN ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; @@ -52,8 +52,8 @@ public: SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE; static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet, sal_uInt16 nWhich ); diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 91b52642d305..36c589a7cbd1 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -52,20 +52,20 @@ public: inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; const Color& GetColor() const { return aShadowColor;} void SetColor( const Color &rNew ) { aShadowColor = rNew; } @@ -79,10 +79,10 @@ public: // Calculate width of the shadow on the page. sal_uInt16 CalcShadowSpace( sal_uInt16 nShadow ) const; - virtual sal_uInt16 GetValueCount() const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual sal_uInt16 GetEnumValue() const; - virtual void SetEnumValue( sal_uInt16 nNewVal ); + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual sal_uInt16 GetEnumValue() const SAL_OVERRIDE; + virtual void SetEnumValue( sal_uInt16 nNewVal ) SAL_OVERRIDE; }; inline SvxShadowItem &SvxShadowItem::operator=( const SvxShadowItem& rFmtShadow ) diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 81c404349a2f..3bfd6c2d15f6 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -40,14 +40,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { SetValue(rShadow.GetValue()); diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index 4963f0537842..3f605af62cce 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -44,20 +44,20 @@ public: inline SvxSizeItem& operator=( const SvxSizeItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; const Size& GetSize() const { return aSize; } void SetSize(const Size& rSize) { aSize = rSize; } diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 3e147b56e504..5207d7e00e9d 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -42,14 +42,14 @@ public: inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; inline SvxFmtSplitItem::SvxFmtSplitItem( const bool bSplit, const sal_uInt16 nWh ) : diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 7c2f816deedb..cc0f2b8218a6 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -249,10 +249,10 @@ protected: OUString& DelCharAtEnd( OUString& rStr, const sal_Unicode cDel ); // is called for each token that is recognized in CallParser - virtual void NextToken( int nToken ); + virtual void NextToken( int nToken ) SAL_OVERRIDE; - virtual void ReadBitmapData(); - virtual void ReadOLEData(); + virtual void ReadBitmapData() SAL_OVERRIDE; + virtual void ReadOLEData() SAL_OVERRIDE; void ReadStyleTable(); void ReadColorTable(); @@ -323,7 +323,7 @@ protected: public: - virtual SvParserState CallParser(); + virtual SvParserState CallParser() SAL_OVERRIDE; inline const Color& GetColor( size_t nId ) const; const Font& GetFont( sal_uInt16 nId ); // Changes the dflt Font @@ -343,7 +343,7 @@ public: void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef=sal_False ); // for asynchronous read from the SvStream - virtual void Continue( int nToken ); + virtual void Continue( int nToken ) SAL_OVERRIDE; // get RTF default ItemSets. Must be used by pard/plain tokens or in // reset of Style-Items diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index ba5081f54539..a02983d41dbb 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -146,18 +146,18 @@ public: } // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; }; diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index 73f9e2d0f796..9c21c8c04355 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -39,20 +39,20 @@ public: virtual ~SvxTwoLinesItem(); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetVersion( sal_uInt16 nFFVer ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFFVer ) const SAL_OVERRIDE; SvxTwoLinesItem& operator=( const SvxTwoLinesItem& rCpy ) { diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index d7de5d5285bc..ebeac9447720 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -43,25 +43,25 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; // MS VC4.0 messes things up void SetValue( sal_uInt16 nNewVal ) {SfxEnumItem::SetValue(nNewVal); } - virtual bool HasBoolValue() const; - virtual bool GetBoolValue() const; - virtual void SetBoolValue( sal_Bool bVal ); + virtual bool HasBoolValue() const SAL_OVERRIDE; + virtual bool GetBoolValue() const SAL_OVERRIDE; + virtual void SetBoolValue( sal_Bool bVal ) SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; inline SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine) { @@ -92,9 +92,9 @@ public: SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; }; // class SvxOverlineItem ------------------------------------------------ @@ -109,9 +109,9 @@ public: SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; }; #endif // INCLUDED_EDITENG_UDLNITEM_HXX diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index fb5fff8c0d65..de30339b1c2e 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -47,22 +47,22 @@ public: inline SvxULSpaceItem& operator=( const SvxULSpaceItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; - virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; + virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; inline void SetUpper( const sal_uInt16 nU, const sal_uInt16 nProp = 100 ); inline void SetLower( const sal_uInt16 nL, const sal_uInt16 nProp = 100 ); diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index a459c8b31607..770cec8ca115 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -33,65 +33,65 @@ public: SvxAccessibleTextAdapter(); virtual ~SvxAccessibleTextAdapter(); - virtual sal_Int32 GetParagraphCount() const; - virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; - virtual OUString GetText( const ESelection& rSel ) const; - virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const; - virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; - virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const; + virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE; + virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE; + virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE; + virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const SAL_OVERRIDE; + virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE; + virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const SAL_OVERRIDE; virtual sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); - virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; - virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const; - - virtual void QuickInsertText( const OUString& rText, const ESelection& rSel ); - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - virtual void QuickInsertLineBreak( const ESelection& rSel ); - - virtual SfxItemPool* GetPool() const; - - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - - virtual bool IsValid() const; - - virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; - virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; - virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const; - virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; - virtual MapMode GetMapMode() const; - virtual OutputDevice* GetRefDevice() const; - virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; - virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; - virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const; - virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; - virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; - virtual void SetUpdateModeForAcc( bool bUp); - virtual bool GetUpdateModeForAcc() const; - virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; - virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; - - virtual bool Delete( const ESelection& ); - virtual bool InsertText( const OUString&, const ESelection& ); - virtual bool QuickFormatDoc( bool bFull = false ); - virtual sal_Int16 GetDepth( sal_Int32 nPara ) const; - virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); - - virtual const SfxItemSet* GetEmptyItemSetPtr(); + virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const SAL_OVERRIDE; + + virtual void QuickInsertText( const OUString& rText, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickInsertLineBreak( const ESelection& rSel ) SAL_OVERRIDE; + + virtual SfxItemPool* GetPool() const SAL_OVERRIDE; + + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ) SAL_OVERRIDE; + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) SAL_OVERRIDE; + + virtual bool IsValid() const SAL_OVERRIDE; + + virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const SAL_OVERRIDE; + virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; + virtual Rectangle GetParaBounds( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual MapMode GetMapMode() const SAL_OVERRIDE; + virtual OutputDevice* GetRefDevice() const SAL_OVERRIDE; + virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const SAL_OVERRIDE; + virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const SAL_OVERRIDE; + virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const SAL_OVERRIDE; + virtual void SetUpdateModeForAcc( bool bUp) SAL_OVERRIDE; + virtual bool GetUpdateModeForAcc() const SAL_OVERRIDE; + virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; + + virtual bool Delete( const ESelection& ) SAL_OVERRIDE; + virtual bool InsertText( const OUString&, const ESelection& ) SAL_OVERRIDE; + virtual bool QuickFormatDoc( bool bFull = false ) SAL_OVERRIDE; + virtual sal_Int16 GetDepth( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) SAL_OVERRIDE; + + virtual const SfxItemSet* GetEmptyItemSetPtr() SAL_OVERRIDE; // implementation functions for XParagraphAppend and XTextPortionAppend // (not needed for accessibility, only for new import API) - virtual void AppendParagraph(); - virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); + virtual void AppendParagraph() SAL_OVERRIDE; + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) SAL_OVERRIDE; //XTextCopy - virtual void CopyText(const SvxTextForwarder& rSource); + virtual void CopyText(const SvxTextForwarder& rSource) SAL_OVERRIDE; void SetForwarder( SvxTextForwarder& ); bool HaveImageBullet( sal_Int32 nPara ) const; @@ -117,17 +117,17 @@ public: virtual ~SvxAccessibleTextEditViewAdapter(); // SvxViewForwarder interface - virtual bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; // SvxEditViewForwarder interface - virtual bool GetSelection( ESelection& rSelection ) const; - virtual bool SetSelection( const ESelection& rSelection ); - virtual bool Copy(); - virtual bool Cut(); - virtual bool Paste(); + virtual bool GetSelection( ESelection& rSelection ) const SAL_OVERRIDE; + virtual bool SetSelection( const ESelection& rSelection ) SAL_OVERRIDE; + virtual bool Copy() SAL_OVERRIDE; + virtual bool Cut() SAL_OVERRIDE; + virtual bool Paste() SAL_OVERRIDE; void SetForwarder( SvxEditViewForwarder&, SvxAccessibleTextAdapter& ); @@ -142,14 +142,14 @@ public: SvxEditSourceAdapter(); ~SvxEditSourceAdapter(); - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); + virtual SvxEditSource* Clone() const SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; SvxAccessibleTextAdapter* GetTextForwarderAdapter(); // covariant return types don't work on MSVC - virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE; SvxAccessibleTextEditViewAdapter* GetEditViewForwarderAdapter( bool bCreate = false ); // covariant return types don't work on MSVC - virtual void UpdateData(); - virtual SfxBroadcaster& GetBroadcaster() const; + virtual void UpdateData() SAL_OVERRIDE; + virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE; SAL_WNODEPRECATED_DECLARATIONS_PUSH void SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee ); diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx index d3d7d65f47ad..c44ec6740886 100644 --- a/include/editeng/unofield.hxx +++ b/include/editeng/unofield.hxx @@ -66,46 +66,46 @@ public: void SetAnchor( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xAnchor ) { mxAnchor = xAnchor; } static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::uno::XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextField - virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent - virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getImplementationName() 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() 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; }; #endif diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx index ea8a9cc99b8a..5ea61a7bcedf 100644 --- a/include/editeng/unofored.hxx +++ b/include/editeng/unofored.hxx @@ -35,57 +35,57 @@ public: SvxEditEngineForwarder( EditEngine& rEngine ); virtual ~SvxEditEngineForwarder(); - virtual sal_Int32 GetParagraphCount() const; - virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; - virtual OUString GetText( const ESelection& rSel ) const; - virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const; - virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; - virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const; + virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE; + virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE; + virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE; + virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE; + virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE; + virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const SAL_OVERRIDE; - virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; - virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const; + virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const SAL_OVERRIDE; - virtual void QuickInsertText( const OUString& rText, const ESelection& rSel ); - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - virtual void QuickInsertLineBreak( const ESelection& rSel ); + virtual void QuickInsertText( const OUString& rText, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickInsertLineBreak( const ESelection& rSel ) SAL_OVERRIDE; - virtual SfxItemPool* GetPool() const; + virtual SfxItemPool* GetPool() const SAL_OVERRIDE; - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - virtual bool IsValid() const; + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ) SAL_OVERRIDE; + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; - virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; - virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; - virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const; - virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; - virtual MapMode GetMapMode() const; - virtual OutputDevice* GetRefDevice() const; - virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; - virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; - virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const; - virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; - virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; - virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; - virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual bool Delete( const ESelection& ); - virtual bool InsertText( const OUString&, const ESelection& ); - virtual bool QuickFormatDoc( bool bFull = false ); - virtual sal_Int16 GetDepth( sal_Int32 nPara ) const; - virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); + virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const SAL_OVERRIDE; + virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; + virtual Rectangle GetParaBounds( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual MapMode GetMapMode() const SAL_OVERRIDE; + virtual OutputDevice* GetRefDevice() const SAL_OVERRIDE; + virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const SAL_OVERRIDE; + virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const SAL_OVERRIDE; + virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const SAL_OVERRIDE; + virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; + virtual bool Delete( const ESelection& ) SAL_OVERRIDE; + virtual bool InsertText( const OUString&, const ESelection& ) SAL_OVERRIDE; + virtual bool QuickFormatDoc( bool bFull = false ) SAL_OVERRIDE; + virtual sal_Int16 GetDepth( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) SAL_OVERRIDE; - virtual const SfxItemSet* GetEmptyItemSetPtr(); + virtual const SfxItemSet* GetEmptyItemSetPtr() SAL_OVERRIDE; // implementation functions for XParagraphAppend and XTextPortionAppend - virtual void AppendParagraph(); - virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); + virtual void AppendParagraph() SAL_OVERRIDE; + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) SAL_OVERRIDE; //XTextCopy - virtual void CopyText(const SvxTextForwarder& rSource); + virtual void CopyText(const SvxTextForwarder& rSource) SAL_OVERRIDE; }; #endif diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx index b26f2c48df58..22d89a175d83 100644 --- a/include/editeng/unoforou.hxx +++ b/include/editeng/unoforou.hxx @@ -53,68 +53,68 @@ public: SvxOutlinerForwarder( Outliner& rOutl, bool bOutlText = false ); virtual ~SvxOutlinerForwarder(); - virtual sal_Int32 GetParagraphCount() const; - virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; - virtual OUString GetText( const ESelection& rSel ) const; - virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const; - virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; - virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const; + virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE; + virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE; + virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE; + virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const SAL_OVERRIDE; + virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE; + virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const SAL_OVERRIDE; - virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; - virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const; + virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const SAL_OVERRIDE; - virtual void QuickInsertText( const OUString& rText, const ESelection& rSel ); - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - virtual void QuickInsertLineBreak( const ESelection& rSel ); + virtual void QuickInsertText( const OUString& rText, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickInsertLineBreak( const ESelection& rSel ) SAL_OVERRIDE; - virtual SfxItemPool* GetPool() const; + virtual SfxItemPool* GetPool() const SAL_OVERRIDE; - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ) SAL_OVERRIDE; + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) SAL_OVERRIDE; - virtual bool IsValid() const; + virtual bool IsValid() const SAL_OVERRIDE; Outliner& GetOutliner() const { return rOutliner; } - virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; - virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; - virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const; - virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; - virtual MapMode GetMapMode() const; - virtual OutputDevice* GetRefDevice() const; - virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; - virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; - virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const; - virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; - virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; - virtual void GetLineBoundaries( /*out*/sal_Int32& rStart, /*out*/sal_Int32& rEnd, sal_Int32 nPara, sal_Int32 nLine ) const; - virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual bool Delete( const ESelection& ); - virtual bool InsertText( const OUString&, const ESelection& ); - virtual bool QuickFormatDoc( bool bFull = false ); - virtual sal_Int16 GetDepth( sal_Int32 nPara ) const; - virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); - virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara ); - virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int32 nNumberingStartValue ); - - virtual bool IsParaIsNumberingRestart( sal_Int32 nPara ); - virtual void SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart ); + virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const SAL_OVERRIDE; + virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; + virtual Rectangle GetParaBounds( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual MapMode GetMapMode() const SAL_OVERRIDE; + virtual OutputDevice* GetRefDevice() const SAL_OVERRIDE; + virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const SAL_OVERRIDE; + virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const SAL_OVERRIDE; + virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const SAL_OVERRIDE; + virtual void GetLineBoundaries( /*out*/sal_Int32& rStart, /*out*/sal_Int32& rEnd, sal_Int32 nPara, sal_Int32 nLine ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; + virtual bool Delete( const ESelection& ) SAL_OVERRIDE; + virtual bool InsertText( const OUString&, const ESelection& ) SAL_OVERRIDE; + virtual bool QuickFormatDoc( bool bFull = false ) SAL_OVERRIDE; + virtual sal_Int16 GetDepth( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) SAL_OVERRIDE; + virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara ) SAL_OVERRIDE; + virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int32 nNumberingStartValue ) SAL_OVERRIDE; + + virtual bool IsParaIsNumberingRestart( sal_Int32 nPara ) SAL_OVERRIDE; + virtual void SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart ) SAL_OVERRIDE; /* this method flushes internal caches for this forwarder */ void flushCache(); - virtual const SfxItemSet* GetEmptyItemSetPtr(); + virtual const SfxItemSet* GetEmptyItemSetPtr() SAL_OVERRIDE; // implementation functions for XParagraphAppend and XTextPortionAppend - virtual void AppendParagraph(); - virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); + virtual void AppendParagraph() SAL_OVERRIDE; + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) SAL_OVERRIDE; //XTextCopy - virtual void CopyText(const SvxTextForwarder& rSource); + virtual void CopyText(const SvxTextForwarder& rSource) SAL_OVERRIDE; }; #endif diff --git a/include/editeng/unonrule.hxx b/include/editeng/unonrule.hxx index e16967fe0c54..88d57e7ff60c 100644 --- a/include/editeng/unonrule.hxx +++ b/include/editeng/unonrule.hxx @@ -49,27 +49,27 @@ public: //XIndexReplace virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const com::sun::star::uno::Any& Element ) throw( - com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IndexOutOfBoundsException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IndexOutOfBoundsException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(com::sun::star::uno::RuntimeException, std::exception) ; + virtual sal_Int32 SAL_CALL getCount() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(com::sun::star::lang::IndexOutOfBoundsException, - com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XElementAccess - virtual com::sun::star::uno::Type SAL_CALL getElementType() throw(com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Type SAL_CALL getElementType() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAnyCompare - virtual sal_Int16 SAL_CALL compare( const com::sun::star::uno::Any& Any1, const com::sun::star::uno::Any& Any2 ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL compare( const com::sun::star::uno::Any& Any1, const com::sun::star::uno::Any& Any2 ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable - virtual com::sun::star::uno::Reference< com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Reference< com::sun::star::util::XCloneable > SAL_CALL createClone( ) 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; // internal com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getNumberingRuleByIndex( sal_Int32 nIndex) const throw(); diff --git a/include/editeng/unopracc.hxx b/include/editeng/unopracc.hxx index 7a3782c40e66..953bf6f01326 100644 --- a/include/editeng/unopracc.hxx +++ b/include/editeng/unopracc.hxx @@ -40,22 +40,22 @@ public: virtual ~SvxAccessibleTextPropertySet() throw(); // XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // uno::XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ) 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& ) 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; // lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index b8c758c8d2f7..3250ec33de78 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -169,64 +169,64 @@ public: // SvxEditSource virtual ~SvxDummyTextSource(); - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual SvxEditSource* Clone() const SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual void UpdateData() SAL_OVERRIDE; // SvxTextForwarder - virtual sal_Int32 GetParagraphCount() const; - virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; - virtual OUString GetText( const ESelection& rSel ) const; - virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const; - virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; - virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const; + virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE; + virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE; + virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE; + virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const SAL_OVERRIDE; + virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE; + virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const SAL_OVERRIDE; - sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; - sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const; + sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const SAL_OVERRIDE; + sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const SAL_OVERRIDE; - virtual SfxItemPool* GetPool() const; + virtual SfxItemPool* GetPool() const SAL_OVERRIDE; - virtual void QuickInsertText( const OUString& rText, const ESelection& rSel ); - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - virtual void QuickInsertLineBreak( const ESelection& rSel ); + virtual void QuickInsertText( const OUString& rText, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickInsertLineBreak( const ESelection& rSel ) SAL_OVERRIDE; - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ) SAL_OVERRIDE; + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) SAL_OVERRIDE; - virtual bool IsValid() const; + virtual bool IsValid() const SAL_OVERRIDE; virtual void SetNotifyHdl( const Link& ); - virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; - virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; - virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const; - virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; - virtual MapMode GetMapMode() const; - virtual OutputDevice* GetRefDevice() const; - virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; - virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; - virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const; - virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; - virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; - virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; - virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual bool Delete( const ESelection& ); - virtual bool InsertText( const OUString&, const ESelection& ); - virtual bool QuickFormatDoc( bool bFull = false ); - virtual sal_Int16 GetDepth( sal_Int32 nPara ) const; - virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); - - virtual const SfxItemSet* GetEmptyItemSetPtr(); + virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const SAL_OVERRIDE; + virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; + virtual Rectangle GetParaBounds( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual MapMode GetMapMode() const SAL_OVERRIDE; + virtual OutputDevice* GetRefDevice() const SAL_OVERRIDE; + virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const SAL_OVERRIDE; + virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const SAL_OVERRIDE; + virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const SAL_OVERRIDE; + virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; + virtual bool Delete( const ESelection& ) SAL_OVERRIDE; + virtual bool InsertText( const OUString&, const ESelection& ) SAL_OVERRIDE; + virtual bool QuickFormatDoc( bool bFull = false ) SAL_OVERRIDE; + virtual sal_Int16 GetDepth( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) SAL_OVERRIDE; + + virtual const SfxItemSet* GetEmptyItemSetPtr() SAL_OVERRIDE; // implementation functions for XParagraphAppend and XTextPortionAppend - virtual void AppendParagraph(); - virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); + virtual void AppendParagraph() SAL_OVERRIDE; + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) SAL_OVERRIDE; //XTextCopy - virtual void CopyText(const SvxTextForwarder& rSource); + virtual void CopyText(const SvxTextForwarder& rSource) SAL_OVERRIDE; }; namespace accessibility @@ -303,48 +303,48 @@ public: UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextRangeBase ) // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertyStates //virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextRangeCompare - virtual ::sal_Int16 SAL_CALL compareRegionStarts( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2 ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int16 SAL_CALL compareRegionEnds( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2 ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL compareRegionStarts( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2 ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL compareRegionEnds( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2 ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - 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 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; static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) SAL_THROW(()); }; @@ -365,20 +365,20 @@ public: virtual ~SvxUnoTextRange() throw(); // ::com::sun::star::uno::XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class EDITENG_DLLPUBLIC SvxUnoTextBase : public SvxUnoTextRangeBase, @@ -409,52 +409,52 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::text::XSimpleText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::text::XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::text::XTextRangeMover - virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nParagraphs ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nParagraphs ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com::sun::star::text::XParagraphAppend (new import API) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL finishParagraph( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL finishParagraphInsert( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xInsertPosition ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL finishParagraph( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL finishParagraphInsert( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xInsertPosition ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com::sun::star::text::XTextPortionAppend (new import API) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendTextPortion( const OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendTextPortion( const OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL insertTextPortion( const OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties, const com::sun::star::uno::Reference< com::sun::star::text::XTextRange>& rTextRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL insertTextPortion( const OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties, const com::sun::star::uno::Reference< com::sun::star::text::XTextRange>& rTextRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com::sun::star::text::XTextCopy - virtual void SAL_CALL copyText( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCopy >& xSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL copyText( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCopy >& xSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) SAL_THROW(()); // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -470,17 +470,17 @@ public: // Internal static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::uno::XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -498,8 +498,8 @@ public: virtual ~SvxUnoTextContentEnumeration() throw(); // ::com::sun::star::container::XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasMoreElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -532,50 +532,50 @@ public: virtual ~SvxUnoTextContent() throw(); // ::com::sun::star::uno::XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::text::XTextContent -> ::com::sun::star::lang::XComponent - virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XPropertySet - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -595,8 +595,8 @@ public: virtual ~SvxUnoTextRangeEnumeration() throw(); // ::com::sun::star::container::XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasMoreElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -615,36 +615,36 @@ public: virtual ~SvxUnoTextCursor() throw(); // ::com::sun::star::uno::XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::text::XTextCursor -> ::com::sun::star::text::XTextRange - virtual void SAL_CALL collapseToStart( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL collapseToEnd( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isCollapsed( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL collapseToStart( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL collapseToEnd( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isCollapsed( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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; // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/editeng/unoviwou.hxx b/include/editeng/unoviwou.hxx index 50f4c68f4d93..699a3085d308 100644 --- a/include/editeng/unoviwou.hxx +++ b/include/editeng/unoviwou.hxx @@ -39,17 +39,17 @@ public: SvxDrawOutlinerViewForwarder( OutlinerView& rOutl, const Point& rShapePosTopLeft ); virtual ~SvxDrawOutlinerViewForwarder(); - virtual bool IsValid() const; + virtual bool IsValid() const SAL_OVERRIDE; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; - virtual bool GetSelection( ESelection& rSelection ) const; - virtual bool SetSelection( const ESelection& rSelection ); - virtual bool Copy(); - virtual bool Cut(); - virtual bool Paste(); + virtual bool GetSelection( ESelection& rSelection ) const SAL_OVERRIDE; + virtual bool SetSelection( const ESelection& rSelection ) SAL_OVERRIDE; + virtual bool Copy() SAL_OVERRIDE; + virtual bool Cut() SAL_OVERRIDE; + virtual bool Paste() SAL_OVERRIDE; }; #endif diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 105d3577e7fa..0615cbeed02f 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -44,20 +44,20 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual bool HasBoolValue() const; - virtual bool GetBoolValue() const; - virtual void SetBoolValue( sal_Bool bVal ); + virtual bool HasBoolValue() const SAL_OVERRIDE; + virtual bool GetBoolValue() const SAL_OVERRIDE; + virtual void SetBoolValue( sal_Bool bVal ) SAL_OVERRIDE; inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) { SetValue( rWeight.GetValue() ); diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index e6aa013abfea..c60bac0b40fb 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -40,14 +40,14 @@ public: SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const; - virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxWidowsItem& operator=( const SvxWidowsItem& rWidows ) { diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index f87ffdea4cff..9435a18acf65 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -36,20 +36,20 @@ public: SvxWritingModeItem& operator=( const SvxWritingModeItem& rItem ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif // INCLUDED_EDITENG_WRITINGMODEITEM_HXX diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index 78acf3f7c2ca..4e4a6814cc4d 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -41,14 +41,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; inline SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) { diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 4329a476259d..3899784f7b16 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -40,23 +40,23 @@ public: SvXMLAttrContainerItem( const SvXMLAttrContainerItem& ); virtual ~SvXMLAttrContainerItem(); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare( const SfxPoolItem &rWith ) const; + virtual int Compare( const SfxPoolItem &rWith ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, - const IntlWrapper *pIntlWrapper = 0 ) const; + const IntlWrapper *pIntlWrapper = 0 ) const SAL_OVERRIDE; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem *Clone( SfxItemPool * = 0) const + virtual SfxPoolItem *Clone( SfxItemPool * = 0) const SAL_OVERRIDE { return new SvXMLAttrContainerItem( *this ); } bool AddAttr( const OUString& rLName, diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index 84385b2548ef..f863697ab514 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -53,26 +53,26 @@ protected: private: // XFormulaOpCodeMapper // Attributes - virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getMappings( const ::com::sun::star::uno::Sequence< OUString >& rNames, sal_Int32 nLanguage ) throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaOpCodeMapEntry > SAL_CALL getAvailableMappings( sal_Int32 nLanguage, sal_Int32 nGroups ) throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::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; }; diff --git a/include/formula/token.hxx b/include/formula/token.hxx index f65220b38144..d1654cce5f12 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -160,12 +160,12 @@ public: virtual bool TextEqual( const formula::FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const; - virtual bool isFunction() const + virtual bool isFunction() const SAL_OVERRIDE { return IsFunction(); } - virtual sal_uInt32 getArgumentCount() const + virtual sal_uInt32 getArgumentCount() const SAL_OVERRIDE { return GetParamCount(); } @@ -213,12 +213,12 @@ public: FormulaToken( r ), nByte( r.nByte ), bHasForceArray( r.bHasForceArray ) {} - virtual FormulaToken* Clone() const { return new FormulaByteToken(*this); } - virtual sal_uInt8 GetByte() const; - virtual void SetByte( sal_uInt8 n ); - virtual bool HasForceArray() const; - virtual void SetForceArray( bool b ); - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaByteToken(*this); } + virtual sal_uInt8 GetByte() const SAL_OVERRIDE; + virtual void SetByte( sal_uInt8 n ) SAL_OVERRIDE; + virtual bool HasForceArray() const SAL_OVERRIDE; + virtual void SetForceArray( bool b ) SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken ) }; @@ -237,9 +237,9 @@ public: FormulaFAPToken( const FormulaFAPToken& r ) : FormulaByteToken( r ), pOrigToken( r.pOrigToken ) {} - virtual FormulaToken* Clone() const { return new FormulaFAPToken(*this); } - virtual FormulaToken* GetFAPOrigToken() const; - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaFAPToken(*this); } + virtual FormulaToken* GetFAPOrigToken() const SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; class FORMULA_DLLPUBLIC FormulaDoubleToken : public FormulaToken @@ -252,10 +252,10 @@ public: FormulaDoubleToken( const FormulaDoubleToken& r ) : FormulaToken( r ), fDouble( r.fDouble ) {} - virtual FormulaToken* Clone() const { return new FormulaDoubleToken(*this); } - virtual double GetDouble() const; - virtual double& GetDoubleAsReference(); - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaDoubleToken(*this); } + virtual double GetDouble() const SAL_OVERRIDE; + virtual double& GetDoubleAsReference() SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken ) }; @@ -268,9 +268,9 @@ public: FormulaStringToken( const svl::SharedString& r ); FormulaStringToken( const FormulaStringToken& r ); - virtual FormulaToken* Clone() const; - virtual svl::SharedString GetString() const; - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE; + virtual svl::SharedString GetString() const SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken ) }; @@ -285,9 +285,9 @@ public: FormulaStringOpToken( OpCode e, const svl::SharedString& r ); FormulaStringOpToken( const FormulaStringOpToken& r ); - virtual FormulaToken* Clone() const; - virtual svl::SharedString GetString() const; - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE; + virtual svl::SharedString GetString() const SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken @@ -301,12 +301,12 @@ public: FormulaIndexToken( const FormulaIndexToken& r ) : FormulaToken( r ), nIndex( r.nIndex ), mbGlobal( r.mbGlobal ) {} - virtual FormulaToken* Clone() const { return new FormulaIndexToken(*this); } - virtual sal_uInt16 GetIndex() const; - virtual void SetIndex( sal_uInt16 n ); - virtual bool IsGlobal() const; - virtual void SetGlobal( bool b ); - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaIndexToken(*this); } + virtual sal_uInt16 GetIndex() const SAL_OVERRIDE; + virtual void SetIndex( sal_uInt16 n ) SAL_OVERRIDE; + virtual bool IsGlobal() const SAL_OVERRIDE; + virtual void SetGlobal( bool b ) SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; @@ -326,11 +326,11 @@ public: FormulaToken( r ), aExternal( r.aExternal ), nByte( r.nByte ) {} - virtual FormulaToken* Clone() const { return new FormulaExternalToken(*this); } - virtual const OUString& GetExternal() const; - virtual sal_uInt8 GetByte() const; - virtual void SetByte( sal_uInt8 n ); - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaExternalToken(*this); } + virtual const OUString& GetExternal() const SAL_OVERRIDE; + virtual sal_uInt8 GetByte() const SAL_OVERRIDE; + virtual void SetByte( sal_uInt8 n ) SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; @@ -342,10 +342,10 @@ public: FormulaMissingToken( const FormulaMissingToken& r ) : FormulaToken( r ) {} - virtual FormulaToken* Clone() const { return new FormulaMissingToken(*this); } - virtual double GetDouble() const; - virtual svl::SharedString GetString() const; - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaMissingToken(*this); } + virtual double GetDouble() const SAL_OVERRIDE; + virtual svl::SharedString GetString() const SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; class FORMULA_DLLPUBLIC FormulaJumpToken : public FormulaToken @@ -366,9 +366,9 @@ public: memcpy( pJump, r.pJump, (r.pJump[0] + 1) * sizeof(short) ); } virtual ~FormulaJumpToken(); - virtual short* GetJump() const; - virtual bool operator==( const formula::FormulaToken& rToken ) const; - virtual FormulaToken* Clone() const { return new FormulaJumpToken(*this); } + virtual short* GetJump() const SAL_OVERRIDE; + virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaJumpToken(*this); } }; @@ -380,8 +380,8 @@ public: FormulaToken( svSubroutine, ocCall ), mpArray( pArray) {} FormulaSubroutineToken( const FormulaSubroutineToken& r ); virtual ~FormulaSubroutineToken(); - virtual FormulaToken* Clone() const { return new FormulaSubroutineToken(*this); } - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaSubroutineToken(*this); } + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; private: const FormulaTokenArray* mpArray; @@ -396,8 +396,8 @@ public: FormulaUnknownToken( const FormulaUnknownToken& r ) : FormulaToken( r ) {} - virtual FormulaToken* Clone() const { return new FormulaUnknownToken(*this); } - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaUnknownToken(*this); } + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; @@ -410,10 +410,10 @@ public: FormulaErrorToken( const FormulaErrorToken& r ) : FormulaToken( r ), nError( r.nError) {} - virtual FormulaToken* Clone() const { return new FormulaErrorToken(*this); } - virtual sal_uInt16 GetError() const; - virtual void SetError( sal_uInt16 nErr ); - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaErrorToken(*this); } + virtual sal_uInt16 GetError() const SAL_OVERRIDE; + virtual void SetError( sal_uInt16 nErr ) SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx index ca858aecec34..125dd405e310 100644 --- a/include/formula/vectortoken.hxx +++ b/include/formula/vectortoken.hxx @@ -58,7 +58,7 @@ class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken public: SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength ); - virtual FormulaToken* Clone() const; + virtual FormulaToken* Clone() const SAL_OVERRIDE; inline const VectorRefArray& GetArray() const { return maArray; } inline size_t GetArrayLength() const { return mnArrayLength; } @@ -86,7 +86,7 @@ public: const std::vector<VectorRefArray>& rArrays, size_t nReqLength, size_t nArrayLength, size_t nRefRowSize, bool bStartFixed, bool bEndFixed ); - virtual FormulaToken* Clone() const; + virtual FormulaToken* Clone() const SAL_OVERRIDE; inline const std::vector<VectorRefArray>& GetArrays() const { return maArrays; } inline size_t GetArrayLength() const { return mnArrayLength; } diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx index 3345537b4be3..0de2d72d424e 100644 --- a/include/framework/preventduplicateinteraction.hxx +++ b/include/framework/preventduplicateinteraction.hxx @@ -122,7 +122,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @threadsafe yes */ virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @@ -136,7 +136,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @threadsafe yes */ virtual ::sal_Bool SAL_CALL handleInteractionRequest( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @@ -147,7 +147,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @threadsafe yes */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // c++ interface public: diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index 361c83e83971..7123de31e4b3 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -103,42 +103,42 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex /** @see XTitle */ virtual OUString SAL_CALL getTitle() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @see XTitle */ virtual void SAL_CALL setTitle(const OUString& sTitle) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @see XTitleChangeBroadcaster */ virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @see XTitleChangeBroadcaster */ virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @see XTitleChangeListener */ virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @see css.document.XEventListener */ virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @see css.lang.XEventListener */ virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @see css.frame.XFrameActionListener */ virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // internal diff --git a/include/i18nutil/oneToOneMapping.hxx b/include/i18nutil/oneToOneMapping.hxx index e384ff2930a8..72a0b9375cd8 100644 --- a/include/i18nutil/oneToOneMapping.hxx +++ b/include/i18nutil/oneToOneMapping.hxx @@ -70,7 +70,7 @@ public: void makeIndex(); // index search - virtual sal_Unicode find( const sal_Unicode nKey ) const; + virtual sal_Unicode find( const sal_Unicode nKey ) const SAL_OVERRIDE; protected: UnicodePairWithFlag *mpTableWF; UnicodePairFlag mnFlag; diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx index 34a75555b524..71aece26b929 100644 --- a/include/linguistic/hyphdta.hxx +++ b/include/linguistic/hyphdta.hxx @@ -53,22 +53,22 @@ public: // XHyphenatedWord virtual OUString SAL_CALL getWord() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getHyphenationPos() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getHyphenatedWord() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getHyphenPos() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAlternativeSpelling() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; OUString GetWord() { return aWord; } OUString GetHyphenatedWord() { return aHyphenatedWord; } @@ -106,16 +106,16 @@ public: // XPossibleHyphens virtual OUString SAL_CALL getWord() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getPossibleHyphens() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getHyphenationPositions() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; OUString GetWord() { return aWord; } sal_Int16 GetLanguage() { return nLanguage; } diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx index af0ed99995b2..05e8d9d87e76 100644 --- a/include/linguistic/lngprophelp.hxx +++ b/include/linguistic/lngprophelp.hxx @@ -109,24 +109,24 @@ public: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyChangeListener virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLinguServiceEventBroadcaster virtual sal_Bool SAL_CALL addLinguServiceEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // non-UNO functions void LNG_DLLPUBLIC AddAsPropListener(); @@ -166,7 +166,7 @@ public: // XPropertyChangeListener virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class LNG_DLLPUBLIC PropertyHelper_Thesaurus @@ -212,10 +212,10 @@ class LNG_DLLPUBLIC PropertyHelper_Spell : protected: // PropertyChgHelper - virtual void SetDefaultValues(); - virtual void GetCurrentValues(); + virtual void SetDefaultValues() SAL_OVERRIDE; + virtual void GetCurrentValues() SAL_OVERRIDE; virtual sal_Bool propertyChange_Impl( - const ::com::sun::star::beans::PropertyChangeEvent& rEvt ); + const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) SAL_OVERRIDE; public: PropertyHelper_Spell( @@ -225,12 +225,12 @@ public: ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet ); virtual ~PropertyHelper_Spell(); - virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ); + virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) SAL_OVERRIDE; // XPropertyChangeListener virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 GetDefaultNumberOfSuggestions() const; @@ -294,10 +294,10 @@ class PropertyHelper_Hyphen : protected: // PropertyChgHelper - virtual void SetDefaultValues(); - virtual void GetCurrentValues(); + virtual void SetDefaultValues() SAL_OVERRIDE; + virtual void GetCurrentValues() SAL_OVERRIDE; virtual sal_Bool propertyChange_Impl( - const ::com::sun::star::beans::PropertyChangeEvent& rEvt ); + const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) SAL_OVERRIDE; public: PropertyHelper_Hyphen( @@ -307,12 +307,12 @@ public: ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet); virtual ~PropertyHelper_Hyphen(); - virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ); + virtual void SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) SAL_OVERRIDE; // XPropertyChangeListener virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Int16 GetMinLeading() const { return nResHyphMinLeading; } sal_Int16 GetMinTrailing() const { return nResHyphMinTrailing; } diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx index 1c1c47097f8a..277d298d1c4d 100644 --- a/include/linguistic/misc.hxx +++ b/include/linguistic/misc.hxx @@ -204,11 +204,11 @@ public: void Deactivate(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace linguistic diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx index 21f961cce40c..3aa5d1e18793 100644 --- a/include/linguistic/spelldta.hxx +++ b/include/linguistic/spelldta.hxx @@ -80,15 +80,15 @@ public: virtual ~SpellAlternatives(); // XSpellAlternatives - virtual OUString SAL_CALL getWord( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int16 SAL_CALL getFailureType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getWord( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getFailureType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSetSpellAlternatives - virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // non-interface specific functions void LNG_DLLPUBLIC SetWordLanguage(const OUString &rWord, sal_Int16 nLang); diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx index 28eca0cb9a72..5c5aa8fc9969 100644 --- a/include/salhelper/refobj.hxx +++ b/include/salhelper/refobj.hxx @@ -69,12 +69,12 @@ public: /** IReference. */ - virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(()) + virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(()) SAL_OVERRIDE { return osl_atomic_increment (&m_nReferenceCount); } - virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()) + virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()) SAL_OVERRIDE { oslInterlockedCount result; result = ::osl_atomic_decrement (&m_nReferenceCount); diff --git a/include/salhelper/thread.hxx b/include/salhelper/thread.hxx index 32ecaf678d9a..d74d729f5ffd 100644 --- a/include/salhelper/thread.hxx +++ b/include/salhelper/thread.hxx @@ -79,9 +79,9 @@ protected: virtual void execute() = 0; private: - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; char const * name_; }; diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index 29ed1f913e8f..62e16f7364f4 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -90,13 +90,13 @@ public: bool getAsChar( sal_Int32 nToken, const char*& rPos ) const; // XFastAttributeList - virtual ::sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getValueToken( ::sal_Int32 Token ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getValue( ::sal_Int32 Token ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getOptionalValue( ::sal_Int32 Token ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::xml::Attribute > SAL_CALL getUnknownAttributes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::xml::FastAttribute > SAL_CALL getFastAttributes() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getValueToken( ::sal_Int32 Token ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getValue( ::sal_Int32 Token ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getOptionalValue( ::sal_Int32 Token ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::xml::Attribute > SAL_CALL getUnknownAttributes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::xml::FastAttribute > SAL_CALL getFastAttributes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: inline sal_Int32 AttributeValueLength(sal_Int32 i); diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx index 1bf190fc270a..29f0ad61596e 100644 --- a/include/sax/fastparser.hxx +++ b/include/sax/fastparser.hxx @@ -53,19 +53,19 @@ public: virtual ~FastSaxParser(); // XFastParser - virtual void SAL_CALL parseStream( const ::com::sun::star::xml::sax::InputSource& aInputSource ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFastDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTokenHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getNamespaceURL( const OUString& rPrefix ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XErrorHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEntityResolver( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XEntityResolver >& Resolver ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& rLocale ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL parseStream( const ::com::sun::star::xml::sax::InputSource& aInputSource ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFastDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTokenHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getNamespaceURL( const OUString& rPrefix ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XErrorHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEntityResolver( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XEntityResolver >& Resolver ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& rLocale ) 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; bool hasNamespaceURL( const OUString& rPrefix ) const; }; diff --git a/include/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx index 79ff8262a2d7..bba7c9735c25 100644 --- a/include/sax/tools/documenthandleradapter.hxx +++ b/include/sax/tools/documenthandleradapter.hxx @@ -29,13 +29,13 @@ namespace sax public: // XDocumentHandler virtual void SAL_CALL - startDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + startDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->startDocument(); } virtual void SAL_CALL - endDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + endDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->endDocument(); } @@ -43,40 +43,40 @@ namespace sax virtual void SAL_CALL startElement(const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->startElement(aName, xAttribs); } virtual void SAL_CALL endElement(const OUString& aName) throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->endElement(aName); } virtual void SAL_CALL characters(const OUString& aChars) throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->characters(aChars); } virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->ignorableWhitespace(aWhitespaces); } virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->processingInstruction(aTarget, aData); } virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->setDocumentLocator(xLocator); } @@ -121,13 +121,13 @@ namespace sax public: // XDocumentHandler virtual void SAL_CALL - startDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + startDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->startDocument(); } virtual void SAL_CALL - endDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + endDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->endDocument(); } @@ -135,67 +135,67 @@ namespace sax virtual void SAL_CALL startElement(const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->startElement(aName, xAttribs); } virtual void SAL_CALL endElement(const OUString& aName) throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->endElement(aName); } virtual void SAL_CALL characters(const OUString& aChars) throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->characters(aChars); } virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->ignorableWhitespace(aWhitespaces); } virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->processingInstruction(aTarget, aData); } virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->setDocumentLocator(xLocator); } // XExtendedDocumentHandler virtual void SAL_CALL - startCDATA(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + startCDATA(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->startCDATA(); } virtual void SAL_CALL - endCDATA(void) throw (::com::sun::star::uno::RuntimeException, std::exception) + endCDATA(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->endCDATA(); } virtual void SAL_CALL comment(const OUString& sComment) throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->comment(sComment); } virtual void SAL_CALL - unknown(const OUString& sString) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + unknown(const OUString& sString) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->unknown(sString); } virtual void SAL_CALL - allowLineBreak(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) + allowLineBreak(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->allowLineBreak(); } diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx index 56290770235e..847f498be097 100644 --- a/include/sot/filelist.hxx +++ b/include/sot/filelist.hxx @@ -34,9 +34,9 @@ class SOT_DLLPUBLIC FileList : public SvDataCopyStream protected: // SvData-Methoden - virtual void Load( SvStream& ); - virtual void Save( SvStream& ); - virtual void Assign( const SvDataCopyStream& ); + virtual void Load( SvStream& ) SAL_OVERRIDE; + virtual void Save( SvStream& ) SAL_OVERRIDE; + virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE; // Liste loeschen; void ClearAll( void ); diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index 70066e21708f..f2c72fffe8b3 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -158,20 +158,20 @@ protected: public: TYPEINFO_OVERRIDE(); StorageStream( StgIo*, StgDirEntry*, StreamMode ); - virtual sal_uLong Read( void * pData, sal_uLong nSize ); - virtual sal_uLong Write( const void* pData, sal_uLong nSize ); - virtual sal_uLong Seek( sal_uLong nPos ); - virtual sal_uLong Tell() { return nPos; } - virtual void Flush(); - virtual bool SetSize( sal_uLong nNewSize ); - virtual sal_uLong GetSize() const; - virtual bool CopyTo( BaseStorageStream * pDestStm ); - virtual bool Commit(); - virtual bool Revert(); - virtual bool Validate( bool=false ) const; - virtual bool ValidateMode( StreamMode ) const; - const SvStream* GetSvStream() const; - virtual bool Equals( const BaseStorageStream& rStream ) const; + virtual sal_uLong Read( void * pData, sal_uLong nSize ) SAL_OVERRIDE; + virtual sal_uLong Write( const void* pData, sal_uLong nSize ) SAL_OVERRIDE; + virtual sal_uLong Seek( sal_uLong nPos ) SAL_OVERRIDE; + virtual sal_uLong Tell() SAL_OVERRIDE { return nPos; } + virtual void Flush() SAL_OVERRIDE; + virtual bool SetSize( sal_uLong nNewSize ) SAL_OVERRIDE; + virtual sal_uLong GetSize() const SAL_OVERRIDE; + virtual bool CopyTo( BaseStorageStream * pDestStm ) SAL_OVERRIDE; + virtual bool Commit() SAL_OVERRIDE; + virtual bool Revert() SAL_OVERRIDE; + virtual bool Validate( bool=false ) const SAL_OVERRIDE; + virtual bool ValidateMode( StreamMode ) const SAL_OVERRIDE; + const SvStream* GetSvStream() const SAL_OVERRIDE; + virtual bool Equals( const BaseStorageStream& rStream ) const SAL_OVERRIDE; }; class UCBStorageStream; @@ -193,50 +193,50 @@ public: static bool IsStorageFile( const OUString & rFileName ); static bool IsStorageFile( SvStream* ); - virtual const OUString& GetName() const; - virtual bool IsRoot() const { return bIsRoot; } - virtual void SetClassId( const ClsId& ); - virtual const ClsId& GetClassId() const; - virtual void SetDirty(); + virtual const OUString& GetName() const SAL_OVERRIDE; + virtual bool IsRoot() const SAL_OVERRIDE { return bIsRoot; } + virtual void SetClassId( const ClsId& ) SAL_OVERRIDE; + virtual const ClsId& GetClassId() const SAL_OVERRIDE; + virtual void SetDirty() SAL_OVERRIDE; virtual void SetClass( const SvGlobalName & rClass, sal_uLong nOriginalClipFormat, - const OUString & rUserTypeName ); + const OUString & rUserTypeName ) SAL_OVERRIDE; virtual void SetConvertClass( const SvGlobalName & rConvertClass, sal_uLong nOriginalClipFormat, - const OUString & rUserTypeName ); - virtual SvGlobalName GetClassName(); - virtual sal_uLong GetFormat(); - virtual OUString GetUserName(); - virtual bool ShouldConvert(); - virtual void FillInfoList( SvStorageInfoList* ) const; - virtual bool CopyTo( BaseStorage* pDestStg ) const; - virtual bool Commit(); - virtual bool Revert(); + const OUString & rUserTypeName ) SAL_OVERRIDE; + virtual SvGlobalName GetClassName() SAL_OVERRIDE; + virtual sal_uLong GetFormat() SAL_OVERRIDE; + virtual OUString GetUserName() SAL_OVERRIDE; + virtual bool ShouldConvert() SAL_OVERRIDE; + virtual void FillInfoList( SvStorageInfoList* ) const SAL_OVERRIDE; + virtual bool CopyTo( BaseStorage* pDestStg ) const SAL_OVERRIDE; + virtual bool Commit() SAL_OVERRIDE; + virtual bool Revert() SAL_OVERRIDE; virtual BaseStorageStream* OpenStream( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = true, const OString* pKey=0 ); + bool bDirect = true, const OString* pKey=0 ) SAL_OVERRIDE; virtual BaseStorage* OpenStorage( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = false ); + bool bDirect = false ) SAL_OVERRIDE; virtual BaseStorage* OpenUCBStorage( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = false ); + bool bDirect = false ) SAL_OVERRIDE; virtual BaseStorage* OpenOLEStorage( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = false ); - virtual bool IsStream( const OUString& rEleName ) const; - virtual bool IsStorage( const OUString& rEleName ) const; - virtual bool IsContained( const OUString& rEleName ) const; - virtual bool Remove( const OUString & rEleName ); - virtual bool Rename( const OUString & rEleName, const OUString & rNewName ); - virtual bool CopyTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ); - virtual bool MoveTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ); - virtual bool ValidateFAT(); - virtual bool Validate( bool=false ) const; - virtual bool ValidateMode( StreamMode ) const; + bool bDirect = false ) SAL_OVERRIDE; + virtual bool IsStream( const OUString& rEleName ) const SAL_OVERRIDE; + virtual bool IsStorage( const OUString& rEleName ) const SAL_OVERRIDE; + virtual bool IsContained( const OUString& rEleName ) const SAL_OVERRIDE; + virtual bool Remove( const OUString & rEleName ) SAL_OVERRIDE; + virtual bool Rename( const OUString & rEleName, const OUString & rNewName ) SAL_OVERRIDE; + virtual bool CopyTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ) SAL_OVERRIDE; + virtual bool MoveTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ) SAL_OVERRIDE; + virtual bool ValidateFAT() SAL_OVERRIDE; + virtual bool Validate( bool=false ) const SAL_OVERRIDE; + virtual bool ValidateMode( StreamMode ) const SAL_OVERRIDE; bool ValidateMode( StreamMode, StgDirEntry* p ) const; - virtual const SvStream* GetSvStream() const; - virtual bool Equals( const BaseStorage& rStream ) const; + virtual const SvStream* GetSvStream() const SAL_OVERRIDE; + virtual bool Equals( const BaseStorage& rStream ) const SAL_OVERRIDE; }; class UCBStorageStream_Impl; @@ -253,20 +253,20 @@ public: UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress ); UCBStorageStream( UCBStorageStream_Impl* ); - virtual sal_uLong Read( void * pData, sal_uLong nSize ); - virtual sal_uLong Write( const void* pData, sal_uLong nSize ); - virtual sal_uLong Seek( sal_uLong nPos ); - virtual sal_uLong Tell(); - virtual void Flush(); - virtual bool SetSize( sal_uLong nNewSize ); - virtual sal_uLong GetSize() const; - virtual bool CopyTo( BaseStorageStream * pDestStm ); - virtual bool Commit(); - virtual bool Revert(); - virtual bool Validate( bool=false ) const; - virtual bool ValidateMode( StreamMode ) const; - const SvStream* GetSvStream() const; - virtual bool Equals( const BaseStorageStream& rStream ) const; + virtual sal_uLong Read( void * pData, sal_uLong nSize ) SAL_OVERRIDE; + virtual sal_uLong Write( const void* pData, sal_uLong nSize ) SAL_OVERRIDE; + virtual sal_uLong Seek( sal_uLong nPos ) SAL_OVERRIDE; + virtual sal_uLong Tell() SAL_OVERRIDE; + virtual void Flush() SAL_OVERRIDE; + virtual bool SetSize( sal_uLong nNewSize ) SAL_OVERRIDE; + virtual sal_uLong GetSize() const SAL_OVERRIDE; + virtual bool CopyTo( BaseStorageStream * pDestStm ) SAL_OVERRIDE; + virtual bool Commit() SAL_OVERRIDE; + virtual bool Revert() SAL_OVERRIDE; + virtual bool Validate( bool=false ) const SAL_OVERRIDE; + virtual bool ValidateMode( StreamMode ) const SAL_OVERRIDE; + const SvStream* GetSvStream() const SAL_OVERRIDE; + virtual bool Equals( const BaseStorageStream& rStream ) const SAL_OVERRIDE; bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue ); SvStream* GetModifySvStream(); @@ -309,49 +309,49 @@ public: UCBStorage( SvStream& rStrm, bool bDirect = true ); TYPEINFO_OVERRIDE(); - virtual const OUString& GetName() const; - virtual bool IsRoot() const; - virtual void SetClassId( const ClsId& ); - virtual const ClsId& GetClassId() const; - virtual void SetDirty(); + virtual const OUString& GetName() const SAL_OVERRIDE; + virtual bool IsRoot() const SAL_OVERRIDE; + virtual void SetClassId( const ClsId& ) SAL_OVERRIDE; + virtual const ClsId& GetClassId() const SAL_OVERRIDE; + virtual void SetDirty() SAL_OVERRIDE; virtual void SetClass( const SvGlobalName & rClass, sal_uLong nOriginalClipFormat, - const OUString & rUserTypeName ); + const OUString & rUserTypeName ) SAL_OVERRIDE; virtual void SetConvertClass( const SvGlobalName & rConvertClass, sal_uLong nOriginalClipFormat, - const OUString & rUserTypeName ); - virtual SvGlobalName GetClassName(); - virtual sal_uLong GetFormat(); - virtual OUString GetUserName(); - virtual bool ShouldConvert(); - virtual void FillInfoList( SvStorageInfoList* ) const; - virtual bool CopyTo( BaseStorage* pDestStg ) const; - virtual bool Commit(); - virtual bool Revert(); + const OUString & rUserTypeName ) SAL_OVERRIDE; + virtual SvGlobalName GetClassName() SAL_OVERRIDE; + virtual sal_uLong GetFormat() SAL_OVERRIDE; + virtual OUString GetUserName() SAL_OVERRIDE; + virtual bool ShouldConvert() SAL_OVERRIDE; + virtual void FillInfoList( SvStorageInfoList* ) const SAL_OVERRIDE; + virtual bool CopyTo( BaseStorage* pDestStg ) const SAL_OVERRIDE; + virtual bool Commit() SAL_OVERRIDE; + virtual bool Revert() SAL_OVERRIDE; virtual BaseStorageStream* OpenStream( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = true, const OString* pKey=0 ); + bool bDirect = true, const OString* pKey=0 ) SAL_OVERRIDE; virtual BaseStorage* OpenStorage( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = false ); + bool bDirect = false ) SAL_OVERRIDE; virtual BaseStorage* OpenUCBStorage( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = false ); + bool bDirect = false ) SAL_OVERRIDE; virtual BaseStorage* OpenOLEStorage( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = false ); - virtual bool IsStream( const OUString& rEleName ) const; - virtual bool IsStorage( const OUString& rEleName ) const; - virtual bool IsContained( const OUString& rEleName ) const; - virtual bool Remove( const OUString & rEleName ); - virtual bool Rename( const OUString & rEleName, const OUString & rNewName ); - virtual bool CopyTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ); - virtual bool MoveTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ); - virtual bool ValidateFAT(); - virtual bool Validate( bool=false ) const; - virtual bool ValidateMode( StreamMode ) const; - virtual const SvStream* GetSvStream() const; - virtual bool Equals( const BaseStorage& rStream ) const; + bool bDirect = false ) SAL_OVERRIDE; + virtual bool IsStream( const OUString& rEleName ) const SAL_OVERRIDE; + virtual bool IsStorage( const OUString& rEleName ) const SAL_OVERRIDE; + virtual bool IsContained( const OUString& rEleName ) const SAL_OVERRIDE; + virtual bool Remove( const OUString & rEleName ) SAL_OVERRIDE; + virtual bool Rename( const OUString & rEleName, const OUString & rNewName ) SAL_OVERRIDE; + virtual bool CopyTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ) SAL_OVERRIDE; + virtual bool MoveTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ) SAL_OVERRIDE; + virtual bool ValidateFAT() SAL_OVERRIDE; + virtual bool Validate( bool=false ) const SAL_OVERRIDE; + virtual bool ValidateMode( StreamMode ) const SAL_OVERRIDE; + virtual const SvStream* GetSvStream() const SAL_OVERRIDE; + virtual bool Equals( const BaseStorage& rStream ) const SAL_OVERRIDE; bool GetProperty( const OUString& rEleName, const OUString& rName, ::com::sun::star::uno::Any& rValue ); UCBStorageElement_Impl* FindElement_Impl( const OUString& rName ) const; diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 9613b457d32e..2ce9bf565bb0 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -54,10 +54,10 @@ class SOT_DLLPUBLIC SotStorageStream : virtual public SotObject, public SvStream friend class SotStorage; BaseStorageStream * pOwnStm;// Zeiger auf den eigenen Stream protected: - virtual sal_uLong GetData( void* pData, sal_uLong nSize ); - virtual sal_uLong PutData( const void* pData, sal_uLong nSize ); - virtual sal_uLong SeekPos( sal_uLong nPos ); - virtual void FlushData(); + virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE; + virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE; + virtual sal_uLong SeekPos( sal_uLong nPos ) SAL_OVERRIDE; + virtual void FlushData() SAL_OVERRIDE; ~SotStorageStream(); public: SotStorageStream( const OUString &, @@ -72,18 +72,18 @@ private: public: static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); - virtual const SotFactory * GetSvFactory() const; - virtual void * Cast( const SotFactory * ); + virtual const SotFactory * GetSvFactory() const SAL_OVERRIDE; + virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; - virtual void ResetError(); + virtual void ResetError() SAL_OVERRIDE; - virtual void SetSize( sal_uLong nNewSize ); + virtual void SetSize( sal_uLong nNewSize ) SAL_OVERRIDE; sal_uInt32 GetSize() const; bool CopyTo( SotStorageStream * pDestStm ); virtual bool Commit(); virtual bool Revert(); bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue ); - virtual sal_Size remainingSize(); + virtual sal_Size remainingSize() SAL_OVERRIDE; }; #ifndef SOT_DECL_SOTSTORAGESTREAM_DEFINED @@ -135,8 +135,8 @@ private: public: static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); - virtual const SotFactory * GetSvFactory() const; - virtual void * Cast( const SotFactory * ); + virtual const SotFactory * GetSvFactory() const SAL_OVERRIDE; + virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; SvMemoryStream * CreateMemoryStream(); diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index 7cd4e0bd8685..26e2a8b5b05c 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -47,14 +47,14 @@ public: void InsertValue( sal_uInt16 nValue, const OUString &rText ); void RemoveValue( sal_uInt16 nValue ); - sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const; - - virtual sal_uInt16 GetValueCount() const; - virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; - virtual bool IsEnabled( sal_uInt16 ) const; + sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const SAL_OVERRIDE; + + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE; + virtual bool IsEnabled( sal_uInt16 ) const SAL_OVERRIDE; void DisableValue( sal_uInt16 ); }; diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index 31a97d909639..6d41420b295a 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -38,17 +38,17 @@ protected: public: TYPEINFO_OVERRIDE(); - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; - virtual bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const; + virtual bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const SAL_OVERRIDE; - virtual bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 = 0); + virtual bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 = 0) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const = 0; diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 77c3bde33d6d..b36571842aad 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -43,28 +43,28 @@ public: virtual ~CntByteItem() { DBG_DTOR(CntByteItem, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue(com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0) const; + sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; virtual bool PutValue(const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_uInt8 GetMin() const; @@ -105,28 +105,28 @@ public: virtual ~CntUInt16Item() { DBG_DTOR(CntUInt16Item, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue(com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0) const; + sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; virtual bool PutValue(const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_uInt16 GetMin() const; @@ -167,28 +167,28 @@ public: virtual ~CntInt32Item() { DBG_DTOR(CntInt32Item, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue(com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0) const; + sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; virtual bool PutValue(const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream &, sal_uInt16) const; + virtual SvStream & Store(SvStream &, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_Int32 GetMin() const; @@ -229,28 +229,28 @@ public: virtual ~CntUInt32Item() { DBG_DTOR(CntUInt32Item, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue(com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0) const; + sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; virtual bool PutValue(const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_uInt32 GetMin() const; diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx index f9882b789303..4214c57228f7 100644 --- a/include/svl/cntwall.hxx +++ b/include/svl/cntwall.hxx @@ -43,17 +43,17 @@ public: CntWallpaperItem( const CntWallpaperItem& rCpy ); ~CntWallpaperItem(); - virtual sal_uInt16 GetVersion(sal_uInt16) const; + virtual sal_uInt16 GetVersion(sal_uInt16) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItemVersion ) const; - virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue ( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; void SetBitmapURL( const OUString& rURL ) { _aURL = rURL; } void SetColor( Color nColor ) { _nColor = nColor; } diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index fb68140f165e..b8315ab51994 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -38,30 +38,30 @@ public: CntContentTypeItem( const CntContentTypeItem& rOrig ); virtual SfxPoolItem* Create( SvStream& rStream, - sal_uInt16 nItemVersion ) const; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& rOrig ) const; + virtual bool operator==( const SfxPoolItem& rOrig ) const SAL_OVERRIDE; - virtual sal_uInt16 GetVersion(sal_uInt16) const; + virtual sal_uInt16 GetVersion(sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = NULL ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = NULL ) const SAL_OVERRIDE; void SetValue( const OUString& rNewVal ); using SfxPoolItem::Compare; - virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const; + virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString & rText, - const IntlWrapper* pIntlWrapper = 0 ) const; + const IntlWrapper* pIntlWrapper = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue ( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; INetContentType GetEnumValue() const; diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 052381ea9e9a..da5fe7ceb420 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -47,26 +47,26 @@ public: virtual ~CntUnencodedStringItem() { DBG_DTOR(CntUnencodedStringItem, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual int Compare(SfxPoolItem const & rWith, - IntlWrapper const & rIntlWrapper) const; + IntlWrapper const & rIntlWrapper) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue(com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0) const; + sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; virtual bool PutValue(const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; const OUString & GetValue() const { return m_aValue; } diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index 7494c01f410b..4286608f4ebd 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -42,16 +42,16 @@ public: virtual sal_uInt8 GetFlagCount() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString & rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; sal_uInt16 GetValue() const { return nVal; } void SetValue( sal_uInt16 nNewVal ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index 461cee61b8e8..764bf0e15b55 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.hxx @@ -34,14 +34,14 @@ public: SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& ); ~SfxGlobalNameItem(); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; SvGlobalName GetValue() const { return m_aName; } virtual bool PutValue ( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index 13f253299378..0d70b9662cb5 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -32,11 +32,11 @@ public: const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const; - virtual bool operator==(const SfxPoolItem&) const; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; + virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0); - virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) const; + virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) SAL_OVERRIDE; + virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index fd351a3ec79c..1f581f363409 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -45,10 +45,10 @@ public: void GetList( ::std::vector < sal_Int32 >& rList ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; }; #endif // INCLUDED_SVL_ILSTITEM_HXX diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index 57d84b8ef1a4..3e9f916b0b89 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -33,10 +33,10 @@ public: SfxImageItem( const SfxImageItem& ); virtual ~SfxImageItem(); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; void SetRotation( long nValue ); long GetRotation() const; diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 06988a8bafcf..149b0f74059a 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -43,15 +43,15 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream SVL_DLLPRIVATE bool open(); - SVL_DLLPRIVATE virtual sal_uLong GetData(void * pData, sal_uLong nSize); + SVL_DLLPRIVATE virtual sal_uLong GetData(void * pData, sal_uLong nSize) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual sal_uLong PutData(void const *, sal_uLong); + SVL_DLLPRIVATE virtual sal_uLong PutData(void const *, sal_uLong) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual sal_uLong SeekPos(sal_uLong nPos); + SVL_DLLPRIVATE virtual sal_uLong SeekPos(sal_uLong nPos) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual void FlushData(); + SVL_DLLPRIVATE virtual void FlushData() SAL_OVERRIDE; - SVL_DLLPRIVATE virtual void SetSize(sal_uLong); + SVL_DLLPRIVATE virtual void SetSize(sal_uLong) SAL_OVERRIDE; public: SvInputStream( @@ -61,7 +61,7 @@ public: virtual ~SvInputStream(); - virtual sal_uInt16 IsA() const; + virtual sal_uInt16 IsA() const SAL_OVERRIDE; virtual void AddMark(sal_uLong nPos); diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index 2d6fd676417a..06876e63d7dc 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -24,26 +24,26 @@ public: virtual ~SfxInt64Item(); - virtual bool operator== ( const SfxPoolItem& rItem ) const; + virtual bool operator== ( const SfxPoolItem& rItem ) const SAL_OVERRIDE; - virtual int Compare( const SfxPoolItem& r ) const; - virtual int Compare( const SfxPoolItem& r, const IntlWrapper& rIntlWrapper ) const; + virtual int Compare( const SfxPoolItem& r ) const SAL_OVERRIDE; + virtual int Compare( const SfxPoolItem& r, const IntlWrapper& rIntlWrapper ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, - OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const; + OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const SAL_OVERRIDE; virtual bool QueryValue( - com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( - const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const; + virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool* pOther = NULL ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pOther = NULL ) const SAL_OVERRIDE; sal_Int64 GetValue() const; diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 06b6fdd06aa9..0aa876042f75 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -32,9 +32,9 @@ public: explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0): CntByteItem(which, nValue) {} - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE { return new SfxByteItem(*this); } }; @@ -60,28 +60,28 @@ public: virtual ~SfxInt16Item() { DBG_DTOR(SfxInt16Item, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_Int16 GetMin() const; @@ -112,10 +112,10 @@ public: SfxUInt16Item(sal_uInt16 which, SvStream & rStream): CntUInt16Item(which, rStream) {} - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE { return new SfxUInt16Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE { return new SfxUInt16Item(*this); } }; @@ -131,10 +131,10 @@ public: SfxInt32Item(sal_uInt16 which, SvStream & rStream): CntInt32Item(which, rStream) {} - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE { return new SfxInt32Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE { return new SfxInt32Item(*this); } }; @@ -151,10 +151,10 @@ public: SfxUInt32Item(sal_uInt16 which, SvStream & rStream): CntUInt32Item(which, rStream) {} - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE { return new SfxUInt32Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE { return new SfxUInt32Item(*this); } }; diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index d1071b1644db..37d2d12addb3 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -164,16 +164,16 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -188,15 +188,15 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 18298f2216a8..a05b33cdce11 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -170,8 +170,8 @@ public: SfxAllItemSet( const SfxItemSet & ); SfxAllItemSet( const SfxAllItemSet & ); - virtual SfxItemSet * Clone( sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0 ) const; - virtual const SfxPoolItem* Put( const SfxPoolItem&, sal_uInt16 nWhich ); + virtual SfxItemSet * Clone( sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0 ) const SAL_OVERRIDE; + virtual const SfxPoolItem* Put( const SfxPoolItem&, sal_uInt16 nWhich ) SAL_OVERRIDE; using SfxItemSet::Put; }; diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx index a05b978aade5..a804ad82594a 100644 --- a/include/svl/languageoptions.hxx +++ b/include/svl/languageoptions.hxx @@ -104,8 +104,8 @@ public: SvtSystemLanguageOptions(); ~SvtSystemLanguageOptions(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE; LanguageType GetWin16SystemLanguage() const; diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index 1d6fa4caa98b..748deba0d986 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -35,17 +35,17 @@ public: SfxLockBytesItem( const SfxLockBytesItem& ); ~SfxLockBytesItem(); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; SvLockBytes* GetValue() const { return _xVal; } virtual bool PutValue ( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 3cd42c4ccaa4..9b3d7eef812e 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -137,16 +137,16 @@ public: explicit inline SvxMacroItem ( const sal_uInt16 nId ); // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; inline const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;} inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; } diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx index 73ba594286b2..9bd5eb11a8ed 100644 --- a/include/svl/metitem.hxx +++ b/include/svl/metitem.hxx @@ -36,8 +36,8 @@ public: ~SfxMetricItem() { DBG_DTOR(SfxMetricItem, 0); } - virtual bool ScaleMetrics( long lMult, long lDiv ); - virtual bool HasMetrics() const; + virtual bool ScaleMetrics( long lMult, long lDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; }; diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 6b3b5cc9c474..9a24568d4eb6 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -69,15 +69,15 @@ public: // XNumberFormatsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static SvNumberFormatsSupplierObj* getImplementation( const com::sun::star::uno::Reference< diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx index 450bde03f24c..8ab49a6d1da3 100644 --- a/include/svl/outstrm.hxx +++ b/include/svl/outstrm.hxx @@ -34,15 +34,15 @@ class SVL_DLLPUBLIC SvOutputStream: public SvStream com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > m_xStream; - SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong); + SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual sal_uLong PutData(void const * pData, sal_uLong nSize); + SVL_DLLPRIVATE virtual sal_uLong PutData(void const * pData, sal_uLong nSize) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual sal_uLong SeekPos(sal_uLong); + SVL_DLLPRIVATE virtual sal_uLong SeekPos(sal_uLong) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual void FlushData(); + SVL_DLLPRIVATE virtual void FlushData() SAL_OVERRIDE; - SVL_DLLPRIVATE virtual void SetSize(sal_uLong); + SVL_DLLPRIVATE virtual void SetSize(sal_uLong) SAL_OVERRIDE; public: SvOutputStream(com::sun::star::uno::Reference< @@ -51,7 +51,7 @@ public: virtual ~SvOutputStream(); - virtual sal_uInt16 IsA() const; + virtual sal_uInt16 IsA() const SAL_OVERRIDE; }; #endif // INCLUDED_SVL_OUTSTRM_HXX diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 03de6889afb0..5d74e506897d 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -338,16 +338,16 @@ public: SfxVoidItem( const SfxVoidItem& ); ~SfxVoidItem(); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; // von sich selbst eine Kopie erzeugen - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; void SetWhich(sal_uInt16 nWh) { m_nWhich = nWh; } }; @@ -366,18 +366,18 @@ public: SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = 0 ); ~SfxSetItem(); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; // von sich selbst eine Kopie erzeugen - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const = 0; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const = 0; - virtual SvStream& Store(SvStream &, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE = 0; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE = 0; + virtual SvStream& Store(SvStream &, sal_uInt16 nVer) const SAL_OVERRIDE; const SfxItemSet& GetItemSet() const { return *pSet; } diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 30f907cdb3a5..22ee52b36ea4 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -45,13 +45,13 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; const Point& GetValue() const { return aVal; } void SetValue( const Point& rNewVal ) { @@ -60,9 +60,9 @@ public: } virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index ad4523341c66..9b41539ec987 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -46,12 +46,12 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; const Rectangle& GetValue() const { return aVal; } void SetValue( const Rectangle& rNewVal ) { @@ -59,9 +59,9 @@ public: aVal = rNewVal; } virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 7e4d2137df80..7f5b17c618c1 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -37,20 +37,20 @@ public: SfxRangeItem(); SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo ); SfxRangeItem( const SfxRangeItem& rItem ); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; inline sal_uInt16& From() { return nFrom; } inline sal_uInt16 From() const { return nFrom; } inline sal_uInt16& To() { return nTo; } inline sal_uInt16 To() const { return nTo; } inline bool HasRange() const { return nTo>nFrom; } - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; }; @@ -66,16 +66,16 @@ public: SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream ); SfxUShortRangesItem( const SfxUShortRangesItem& rItem ); virtual ~SfxUShortRangesItem(); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; inline const sal_uInt16* GetRanges() const { return _pRanges; } - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; }; #endif diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 67868d546fb5..c3d60f080ca3 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -53,20 +53,20 @@ public: void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ); void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual bool PutValue ( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 0eb0edd139db..3a681afc546c 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -81,18 +81,18 @@ public: SvxSearchItem( const SvxSearchItem& rItem ); virtual ~SvxSearchItem(); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual bool operator == ( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + virtual bool operator == ( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; // ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; sal_uInt16 GetCommand() const { return nCommand; } void SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; } diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index 00e4765553ae..8e3f0614b145 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -36,11 +36,11 @@ public: SfxStringItem(sal_uInt16 nWhich, SvStream & rStream); - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; }; #endif // INCLUDED_SVL_STRITEM_HXX diff --git a/include/svl/strmadpt.hxx b/include/svl/strmadpt.hxx index 9d4797f8aa6f..7117a6e54e5a 100644 --- a/include/svl/strmadpt.hxx +++ b/include/svl/strmadpt.hxx @@ -43,25 +43,25 @@ public: rTheOutputStream): m_xOutputStream(rTheOutputStream), m_nPosition(0) {} - virtual ErrCode ReadAt(sal_uLong, void *, sal_uLong, sal_uLong *) const; + virtual ErrCode ReadAt(sal_uLong, void *, sal_uLong, sal_uLong *) const SAL_OVERRIDE; virtual ErrCode WriteAt(sal_uLong nPos, const void * pBuffer, sal_uLong nCount, - sal_uLong * pWritten); + sal_uLong * pWritten) SAL_OVERRIDE; - virtual ErrCode Flush() const; + virtual ErrCode Flush() const SAL_OVERRIDE; - virtual ErrCode SetSize(sal_uLong); + virtual ErrCode SetSize(sal_uLong) SAL_OVERRIDE; - virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const; + virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const SAL_OVERRIDE; virtual ErrCode FillAppend(const void * pBuffer, sal_uLong nCount, - sal_uLong * pWritten); + sal_uLong * pWritten) SAL_OVERRIDE; - virtual sal_uLong Tell() const; + virtual sal_uLong Tell() const SAL_OVERRIDE; - virtual sal_uLong Seek(sal_uLong); + virtual sal_uLong Seek(sal_uLong) SAL_OVERRIDE; - virtual void Terminate(); + virtual void Terminate() SAL_OVERRIDE; }; @@ -78,48 +78,48 @@ public: virtual com::sun::star::uno::Any SAL_CALL queryInterface(const com::sun::star::uno::Type & rType) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL release() throw() SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead) throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead) throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available() throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput() throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL seek(sal_Int64 nLocation) throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getPosition() throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getLength() throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_SVL_STRMADPT_HXX diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 026f0d05bc10..5d2174f431df 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -290,11 +290,11 @@ public: SfxStyleSheet( const OUString&, const SfxStyleSheetBasePool&, SfxStyleFamily, sal_uInt16 ); SfxStyleSheet( const SfxStyleSheet& ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual bool isUsedByModel() const; + virtual bool isUsedByModel() const SAL_OVERRIDE; - virtual bool SetParent( const OUString& ); + virtual bool SetParent( const OUString& ) SAL_OVERRIDE; protected: SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2 @@ -311,7 +311,7 @@ class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool { protected: using SfxStyleSheetBasePool::Create; - virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask); + virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask) SAL_OVERRIDE; virtual SfxStyleSheetBase* Create(const SfxStyleSheet &); public: @@ -382,7 +382,7 @@ public: static SfxUnoStyleSheet* getUnoStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle ); // XUnoTunnel - virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SfxUnoStyleSheet(); // not implemented diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index 1c50c00ec32d..dc8266bc06d3 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -45,17 +45,17 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; const Size& GetValue() const { return aVal; } void SetValue( const Size& rNewVal ) { diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 95538603a19c..0555ab4fd80d 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -167,18 +167,18 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra SfxListUndoAction( const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 Id, SfxUndoArray *pFather); - virtual void Undo(); - virtual void UndoWithContext( SfxUndoContext& i_context ); - virtual void Redo(); - virtual void RedoWithContext( SfxUndoContext& i_context ); - virtual void Repeat(SfxRepeatTarget&); - virtual bool CanRepeat(SfxRepeatTarget&) const; + virtual void Undo() SAL_OVERRIDE; + virtual void UndoWithContext( SfxUndoContext& i_context ) SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void RedoWithContext( SfxUndoContext& i_context ) SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget&) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget&) const SAL_OVERRIDE; - virtual bool Merge( SfxUndoAction *pNextAction ); + virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; - virtual OUString GetComment() const; - virtual OUString GetRepeatComment(SfxRepeatTarget&) const; - virtual sal_uInt16 GetId() const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetRepeatComment(SfxRepeatTarget&) const SAL_OVERRIDE; + virtual sal_uInt16 GetId() const SAL_OVERRIDE; void SetComment(const OUString& rComment); @@ -347,36 +347,36 @@ public: virtual ~SfxUndoManager(); // IUndoManager overridables - virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ); - virtual size_t GetMaxUndoActionCount() const; - virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ); - virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const; - virtual sal_uInt16 GetUndoActionId() const; - virtual OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; - virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const; - virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const; - virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; - virtual SfxUndoAction* GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; - virtual bool Undo(); - virtual bool Redo(); - virtual void Clear(); - virtual void ClearRedo(); - virtual void Reset(); - virtual bool IsDoing() const; - virtual size_t GetRepeatActionCount() const; - virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const; - virtual bool Repeat( SfxRepeatTarget &rTarget ); - virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const; - virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0); - virtual size_t LeaveListAction(); - virtual size_t LeaveAndMergeListAction(); - virtual bool IsInListAction() const; - virtual size_t GetListActionDepth() const; - virtual void RemoveLastUndoAction(); - virtual void EnableUndo( bool bEnable ); - virtual bool IsUndoEnabled() const; - virtual void AddUndoListener( SfxUndoListener& i_listener ); - virtual void RemoveUndoListener( SfxUndoListener& i_listener ); + virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ) SAL_OVERRIDE; + virtual size_t GetMaxUndoActionCount() const SAL_OVERRIDE; + virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) SAL_OVERRIDE; + virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; + virtual sal_uInt16 GetUndoActionId() const SAL_OVERRIDE; + virtual OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; + virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const SAL_OVERRIDE; + virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; + virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; + virtual SfxUndoAction* GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; + virtual bool Undo() SAL_OVERRIDE; + virtual bool Redo() SAL_OVERRIDE; + virtual void Clear() SAL_OVERRIDE; + virtual void ClearRedo() SAL_OVERRIDE; + virtual void Reset() SAL_OVERRIDE; + virtual bool IsDoing() const SAL_OVERRIDE; + virtual size_t GetRepeatActionCount() const SAL_OVERRIDE; + virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const SAL_OVERRIDE; + virtual bool Repeat( SfxRepeatTarget &rTarget ) SAL_OVERRIDE; + virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const SAL_OVERRIDE; + virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) SAL_OVERRIDE; + virtual size_t LeaveListAction() SAL_OVERRIDE; + virtual size_t LeaveAndMergeListAction() SAL_OVERRIDE; + virtual bool IsInListAction() const SAL_OVERRIDE; + virtual size_t GetListActionDepth() const SAL_OVERRIDE; + virtual void RemoveLastUndoAction() SAL_OVERRIDE; + virtual void EnableUndo( bool bEnable ) SAL_OVERRIDE; + virtual bool IsUndoEnabled() const SAL_OVERRIDE; + virtual void AddUndoListener( SfxUndoListener& i_listener ) SAL_OVERRIDE; + virtual void RemoveUndoListener( SfxUndoListener& i_listener ) SAL_OVERRIDE; /** marks the current top-level element of the Undo stack, and returns a unique ID for it */ @@ -457,15 +457,15 @@ public: SfxLinkUndoAction(::svl::IUndoManager *pManager); ~SfxLinkUndoAction(); - virtual void Undo(); - virtual void Redo(); - virtual bool CanRepeat(SfxRepeatTarget& r) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& r) const SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget&r); + virtual void Repeat(SfxRepeatTarget&r) SAL_OVERRIDE; - virtual OUString GetComment() const; - virtual OUString GetRepeatComment(SfxRepeatTarget&r) const; - virtual sal_uInt16 GetId() const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetRepeatComment(SfxRepeatTarget&r) const SAL_OVERRIDE; + virtual sal_uInt16 GetId() const SAL_OVERRIDE; SfxUndoAction* GetAction() const { return pAction; } diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 60bd4931790e..5fcc79fa247e 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -50,28 +50,28 @@ public: virtual ~SfxVisibilityItem() { DBG_DTOR(SfxVisibilityItem, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const; diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index fd162f353586..8f21baac5177 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -45,7 +45,7 @@ public: virtual ~ODocumentInfoPreview(); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void clear(); diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index 6155b4b394b2..9bc37a41c52d 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -65,9 +65,9 @@ class HostDetailsContainer : public DetailsContainer HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, const OUString& sScheme ); virtual ~HostDetailsContainer( ) { }; - virtual void show( bool bShow = true ); - virtual INetURLObject getUrl( ); - virtual bool setUrl( const INetURLObject& rUrl ); + virtual void show( bool bShow = true ) SAL_OVERRIDE; + virtual INetURLObject getUrl( ) SAL_OVERRIDE; + virtual bool setUrl( const INetURLObject& rUrl ) SAL_OVERRIDE; protected: void setScheme( const OUString& sScheme ) { m_sScheme = sScheme; } @@ -87,10 +87,10 @@ class DavDetailsContainer : public HostDetailsContainer DavDetailsContainer( VclBuilderContainer* pBuilder ); ~DavDetailsContainer( ) { }; - virtual void show( bool bShow = true ); + virtual void show( bool bShow = true ) SAL_OVERRIDE; protected: - virtual bool verifyScheme( const OUString& rScheme ); + virtual bool verifyScheme( const OUString& rScheme ) SAL_OVERRIDE; private: DECL_LINK ( ToggledDavsHdl, CheckBox * pCheckBox ); @@ -107,8 +107,8 @@ class SmbDetailsContainer : public DetailsContainer SmbDetailsContainer( VclBuilderContainer* pBuilder ); ~SmbDetailsContainer( ) { }; - virtual INetURLObject getUrl( ); - virtual bool setUrl( const INetURLObject& rUrl ); + virtual INetURLObject getUrl( ) SAL_OVERRIDE; + virtual bool setUrl( const INetURLObject& rUrl ) SAL_OVERRIDE; }; class CmisDetailsContainer : public DetailsContainer @@ -130,9 +130,9 @@ class CmisDetailsContainer : public DetailsContainer CmisDetailsContainer( VclBuilderContainer* pBuilder ); ~CmisDetailsContainer( ) { }; - virtual INetURLObject getUrl( ); - virtual bool setUrl( const INetURLObject& rUrl ); - virtual void setUsername( const OUString& rUsername ); + virtual INetURLObject getUrl( ) SAL_OVERRIDE; + virtual bool setUrl( const INetURLObject& rUrl ) SAL_OVERRIDE; + virtual void setUsername( const OUString& rUsername ) SAL_OVERRIDE; private: void selectRepository( ); diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index e483be94abe9..cd2cae45e1b6 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -63,7 +63,7 @@ public: void Commit(); //SfxListener: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void SetVCLSettings(); }; diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index cdb76f1b1db4..13c0a6ba6a2f 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -70,27 +70,27 @@ public: //===== XAccessible ===================================================== virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL - containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL - getBounds() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getBounds() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL - getLocation() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getLocation() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL - getLocationOnScreen() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getLocationOnScreen() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL - getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isShowing() throw( ::com::sun::star::uno::RuntimeException ); @@ -112,72 +112,72 @@ public: throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int32 SAL_CALL - getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL - getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL - getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( void ) throw( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ); + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ===================================== virtual void SAL_CALL - addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )throw( com::sun::star::uno::RuntimeException, std::exception ); + addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL - removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ); + removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual ::rtl::OUString SAL_CALL - getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL - getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: @@ -188,7 +188,7 @@ protected: virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; /// @returns true if it's disposed or in disposing inline bool IsAlive( void ) const; diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 68b9ff80c867..8a5d1a386db9 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -109,7 +109,7 @@ namespace svt void implConstruct(); // Window overridables - virtual bool PreNotify( NotifyEvent& _rNEvt ); + virtual bool PreNotify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; // implementations void implScrollFields(sal_Int32 _nPos, bool _bAdjustFocus, bool _bAdjustScrollbar); diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index f08ec1a19b86..63ccad654ab6 100644 --- a/include/svtools/apearcfg.hxx +++ b/include/svtools/apearcfg.hxx @@ -60,8 +60,8 @@ public: SvtTabAppearanceCfg( ); ~SvtTabAppearanceCfg( ); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; sal_uInt16 GetDragMode () const { return nDragMode; } diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 154f6462d0a6..576358fd05d0 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -327,7 +327,7 @@ protected: // (ueber RowInserted und RowRemoved), daher ist das Ueberladen // dieser Methode ueberfluessig! public: - virtual long GetRowCount() const; + virtual long GetRowCount() const SAL_OVERRIDE; protected: // fuer Anzeige im VScrollBar z.B. auf "?" oder setzen @@ -411,21 +411,21 @@ public: ~BrowseBox(); // ererbte ueberladene Handler - virtual void StateChanged( StateChangedType nStateChange ); - virtual void MouseButtonDown( const MouseEvent& rEvt ); - virtual void MouseMove( const MouseEvent& rEvt ); - virtual void MouseButtonUp( const MouseEvent& rEvt ); - virtual void KeyInput( const KeyEvent& rEvt ); - virtual void LoseFocus(); - virtual void GetFocus(); - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Command( const CommandEvent& rEvt ); - virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ); - - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); // will forward everything got to the second AcceptDrop method - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); // will forward everything got to the second ExecuteDrop method + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) SAL_OVERRIDE; + + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; // will forward everything got to the second AcceptDrop method + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; // will forward everything got to the second ExecuteDrop method virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); @@ -504,16 +504,16 @@ public: bool GoToRowColumnId( long nRow, sal_uInt16 nColId ); // selections - virtual void SetNoSelection(); - virtual void SelectAll(); - virtual void SelectRow( long nRow, bool _bSelect = true, bool bExpand = true ); + virtual void SetNoSelection() SAL_OVERRIDE; + virtual void SelectAll() SAL_OVERRIDE; + virtual void SelectRow( long nRow, bool _bSelect = true, bool bExpand = true ) SAL_OVERRIDE; void SelectColumnPos( sal_uInt16 nCol, bool _bSelect = true ) { SelectColumnPos( nCol, _bSelect, true); } void SelectColumnId( sal_uInt16 nColId, bool _bSelect = true ) { SelectColumnPos( GetColumnPos(nColId), _bSelect, true); } long GetSelectRowCount() const; sal_uInt16 GetSelectColumnCount() const; - virtual bool IsRowSelected( long nRow ) const; + virtual bool IsRowSelected( long nRow ) const SAL_OVERRIDE; bool IsColumnSelected( sal_uInt16 nColumnId ) const; long FirstSelectedRow( bool bInverse = false ); long LastSelectedRow(); @@ -592,7 +592,7 @@ public: /** @return the current column count */ - sal_uInt16 GetColumnCount() const { return ColCount(); } + sal_uInt16 GetColumnCount() const SAL_OVERRIDE { return ColCount(); } /** commitBrowseBoxEvent commit the event at all listeners of the browsebox @param nEventId @@ -641,7 +641,7 @@ public: @return the Rectangle */ - virtual Rectangle calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen = true); + virtual Rectangle calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen = true) SAL_OVERRIDE; /** calculates the Rectangle of the table @param _bOnScreen @@ -649,7 +649,7 @@ public: @return the Rectangle */ - virtual Rectangle calcTableRect(bool _bOnScreen = true); + virtual Rectangle calcTableRect(bool _bOnScreen = true) SAL_OVERRIDE; /** @param _nRowId @@ -661,7 +661,7 @@ public: @return the Rectangle */ - virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true); + virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true) SAL_OVERRIDE; /// return <TRUE/> if and only if the accessible object for this instance has been created and is alive bool isAccessibleAlive( ) const; @@ -670,7 +670,7 @@ public: public: /** Creates and returns the accessible object of the whole BrowseBox. */ virtual css::uno::Reference< - css::accessibility::XAccessible > CreateAccessible(); + css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; // Children --------------------------------------------------------------- @@ -680,31 +680,31 @@ public: @return The XAccessible interface of the specified cell. */ virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ); + CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) SAL_OVERRIDE; /** Creates the accessible object of a row header. @param nRow The row index of the header. @return The XAccessible interface of the specified row header. */ virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleRowHeader( sal_Int32 nRow ); + CreateAccessibleRowHeader( sal_Int32 nRow ) SAL_OVERRIDE; /** Creates the accessible object of a column header. @param nColumnId The column ID of the header. @return The XAccessible interface of the specified column header. */ virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleColumnHeader( sal_uInt16 nColumnPos ); + CreateAccessibleColumnHeader( sal_uInt16 nColumnPos ) SAL_OVERRIDE; /** @return The count of additional controls of the control area. */ - virtual sal_Int32 GetAccessibleControlCount() const; + virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; /** Creates the accessible object of an additional control. @param nIndex The 0-based index of the control. @return The XAccessible interface of the specified control. */ virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleControl( sal_Int32 nIndex ); + CreateAccessibleControl( sal_Int32 nIndex ) SAL_OVERRIDE; // Conversions ------------------------------------------------------------ @@ -714,28 +714,28 @@ public: @param rPoint The position in pixels relative to the data window. @return <TRUE/>, if the point could be converted to a valid address. */ virtual bool ConvertPointToCellAddress( - sal_Int32& rnRow, sal_uInt16& rnColumnId, const Point& rPoint ); + sal_Int32& rnRow, sal_uInt16& rnColumnId, const Point& rPoint ) SAL_OVERRIDE; /** Converts a point relative to the row header bar origin to a row header index. @param rnRow Out-parameter that takes the row index. @param rPoint The position in pixels relative to the header bar. @return <TRUE/>, if the point could be converted to a valid index. */ - virtual bool ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ); + virtual bool ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ) SAL_OVERRIDE; /** Converts a point relative to the column header bar origin to a column header index. @param rnColumnId Out-parameter that takes the column ID. @param rPoint The position in pixels relative to the header bar. @return <TRUE/>, if the point could be converted to a valid index. */ - virtual bool ConvertPointToColumnHeader( sal_uInt16& rnColumnPos, const Point& rPoint ); + virtual bool ConvertPointToColumnHeader( sal_uInt16& rnColumnPos, const Point& rPoint ) SAL_OVERRIDE; /** Converts a point relative to the BrowseBox origin to the index of an existing control. @param rnRow Out-parameter that takes the 0-based control index. @param rPoint The position in pixels relative to the BrowseBox. @return <TRUE/>, if the point could be converted to a valid index. */ - virtual bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ); + virtual bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ) SAL_OVERRIDE; // Object data and state -------------------------------------------------- @@ -747,7 +747,7 @@ public: @return The name of the specified object. */ - virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE; /** return the description of the specified object. @param eObjType @@ -757,49 +757,49 @@ public: @return The description of the specified object. */ - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE; /** @return The header text of the specified row. */ - virtual OUString GetRowDescription( sal_Int32 nRow ) const; + virtual OUString GetRowDescription( sal_Int32 nRow ) const SAL_OVERRIDE; /** @return The header text of the specified column. */ - virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const; + virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const SAL_OVERRIDE; /** Fills the StateSet with all states (except DEFUNC and SHOWING, done by the accessible object), depending on the specified object type. */ virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, - ::svt::AccessibleBrowseBoxObjType eObjType ) const; + ::svt::AccessibleBrowseBoxObjType eObjType ) const SAL_OVERRIDE; /** Fills the StateSet with all states for one cell (except DEFUNC and SHOWING, done by the accessible object). */ virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, - sal_Int32 _nRow, sal_uInt16 _nColumn ) const; + sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; /** Sets focus to current cell of the data table. */ - virtual void GrabTableFocus(); + virtual void GrabTableFocus() SAL_OVERRIDE; // IAccessibleTableProvider - virtual sal_Int32 GetCurrRow() const; - virtual sal_uInt16 GetCurrColumn() const; - virtual bool HasRowHeader() const; - virtual bool IsCellFocusable() const; - virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); - virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ); - virtual bool IsColumnSelected( long _nColumn ) const; - virtual sal_Int32 GetSelectedRowCount() const; - virtual sal_Int32 GetSelectedColumnCount() const; - virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const; - virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const; - virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; - virtual OUString GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const; - virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; - virtual void GrabFocus(); - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); - virtual Window* GetAccessibleParentWindow() const; - virtual Window* GetWindowInstance(); + virtual sal_Int32 GetCurrRow() const SAL_OVERRIDE; + virtual sal_uInt16 GetCurrColumn() const SAL_OVERRIDE; + virtual bool HasRowHeader() const SAL_OVERRIDE; + virtual bool IsCellFocusable() const SAL_OVERRIDE; + virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) SAL_OVERRIDE; + virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) SAL_OVERRIDE; + virtual bool IsColumnSelected( long _nColumn ) const SAL_OVERRIDE; + virtual sal_Int32 GetSelectedRowCount() const SAL_OVERRIDE; + virtual sal_Int32 GetSelectedColumnCount() const SAL_OVERRIDE; + virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const SAL_OVERRIDE; + virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const SAL_OVERRIDE; + virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; + virtual OUString GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const SAL_OVERRIDE; + virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) SAL_OVERRIDE; + virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual void GrabFocus() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; + virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual Window* GetWindowInstance() SAL_OVERRIDE; private: // the following declares some Window/OutputDevice methods private. This happened in the course diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx index 17d547d2116a..e60949100731 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -32,9 +32,9 @@ class SVT_DLLPUBLIC BrowserHeader: public HeaderBar BrowseBox* _pBrowseBox; protected: - virtual void Command( const CommandEvent& rCEvt ); - virtual void Select(); - virtual void EndDrag(); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; + virtual void EndDrag() SAL_OVERRIDE; public: BrowserHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG ); diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index e92d9d513ac7..9fd8e8abccb7 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -260,19 +260,19 @@ public: Calendar( Window* pParent, WinBits nWinStyle = 0 ); ~Calendar(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void SelectionChanging(); virtual void DateRangeChanged(); @@ -420,7 +420,7 @@ public: virtual void Select(); - virtual bool ShowDropDown( bool bShow ); + virtual bool ShowDropDown( bool bShow ) SAL_OVERRIDE; virtual Calendar* CreateCalendar( Window* pParent ); Calendar* GetCalendar(); @@ -439,7 +439,7 @@ public: const Link& GetSelectHdl() const { return maSelectHdl; } protected: - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; }; #endif // INCLUDED_SVTOOLS_CALENDAR_HXX diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 5003d1e222da..5557c491bf70 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -43,10 +43,10 @@ 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; // XClipboardListener virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& event ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index c4aedb7a8899..62388ba437da 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -166,7 +166,7 @@ public: ColorListBox( Window* pParent, const ResId& rResId ); virtual ~ColorListBox(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; using ListBox::InsertEntry; virtual sal_Int32 InsertEntry( const OUString& rStr, @@ -304,7 +304,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); bool UpdatePaintLineColor( void ); // returns sal_True if maPaintCol has changed - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void UpdateEntries( long nOldWidth ); sal_Int32 GetStylePos( sal_Int32 nListPos, long nWidth ); @@ -423,7 +423,7 @@ public: WinBits nWinStyle = WB_SORT ); virtual ~FontNameBox(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; void Fill( const FontList* pList ); @@ -455,12 +455,12 @@ public: FontStyleBox( Window* pParent, WinBits nBits ); virtual ~FontStyleBox(); - virtual void Select(); - virtual void LoseFocus(); - virtual void Modify(); - virtual Size GetOptimalSize() const; + virtual void Select() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetText( const OUString& rText ); + void SetText( const OUString& rText ) SAL_OVERRIDE; void Fill( const OUString& rName, const FontList* pList ); private: @@ -498,14 +498,14 @@ class SVT_DLLPUBLIC FontSizeBox : public MetricBox SVT_DLLPRIVATE void ImplInit(); protected: - virtual OUString CreateFieldText( sal_Int64 nValue ) const; + virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; public: FontSizeBox( Window* pParent, WinBits nWinStyle = 0 ); virtual ~FontSizeBox(); - void Reformat(); - void Modify(); + void Reformat() SAL_OVERRIDE; + void Modify() SAL_OVERRIDE; void Fill( const FontInfo* pInfo, const FontList* pList ); @@ -520,10 +520,10 @@ public: { bPtRelative = bPtRel; SetRelative( true ); } bool IsPtRelative() const { return bPtRelative; } - virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); - virtual void SetValue( sal_Int64 nNewValue ); - virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; - virtual sal_Int64 GetValue() const; + virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ) SAL_OVERRIDE; + virtual void SetValue( sal_Int64 nNewValue ) SAL_OVERRIDE; + virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const SAL_OVERRIDE; + virtual sal_Int64 GetValue() const SAL_OVERRIDE; private: // declared as private because some compilers would generate the default functions diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index b42a51be03fd..86d5dff1c7c9 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -54,10 +54,10 @@ namespace svt inline void SetDialogClosedLink( const Link& rLink ) { m_aDialogClosedLink = rLink; } // XDialogClosedListener methods - virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener methods - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index c9875b4bac55..1b7bf1ed5bc7 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -215,7 +215,7 @@ namespace svt { } - virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, Window& _rOperateOn ) const + virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, Window& _rOperateOn ) const SAL_OVERRIDE { _rOperateOn.Enable( m_rCheckable.IsChecked() ); } @@ -239,7 +239,7 @@ namespace svt { } - bool payAttentionTo( const VclWindowEvent& _rEvent ) const + bool payAttentionTo( const VclWindowEvent& _rEvent ) const SAL_OVERRIDE { if ( ( _rEvent.GetWindow() == &m_rWindow ) && ( ( _rEvent.GetId() == VCLEVENT_RADIOBUTTON_TOGGLE ) diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 978eb2a4ce02..b4706b6039e5 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -162,28 +162,28 @@ namespace svt EDIT& GetEditWindow() { return static_cast< EDIT& >( GetControl() ); } - virtual Control& GetControl(); + virtual Control& GetControl() SAL_OVERRIDE; - virtual OUString GetText( LineEnd aSeparator ) const; - virtual void SetText( const OUString& _rStr ); + virtual OUString GetText( LineEnd aSeparator ) const SAL_OVERRIDE; + virtual void SetText( const OUString& _rStr ) SAL_OVERRIDE; - virtual bool IsReadOnly() const; - virtual void SetReadOnly( bool bReadOnly ); + virtual bool IsReadOnly() const SAL_OVERRIDE; + virtual void SetReadOnly( bool bReadOnly ) SAL_OVERRIDE; - virtual sal_Int32 GetMaxTextLen() const; - virtual void SetMaxTextLen( sal_Int32 _nMaxLen ); + virtual sal_Int32 GetMaxTextLen() const SAL_OVERRIDE; + virtual void SetMaxTextLen( sal_Int32 _nMaxLen ) SAL_OVERRIDE; - virtual Selection GetSelection() const; - virtual void SetSelection( const Selection& _rSelection ); + virtual Selection GetSelection() const SAL_OVERRIDE; + virtual void SetSelection( const Selection& _rSelection ) SAL_OVERRIDE; - virtual void ReplaceSelected( const OUString& _rStr ); - virtual void DeleteSelected(); - virtual OUString GetSelected( LineEnd aSeparator ) const; + virtual void ReplaceSelected( const OUString& _rStr ) SAL_OVERRIDE; + virtual void DeleteSelected() SAL_OVERRIDE; + virtual OUString GetSelected( LineEnd aSeparator ) const SAL_OVERRIDE; - virtual void SetModified(); - virtual bool IsModified() const; - virtual void ClearModified(); - virtual void SetModifyHdl( const Link& _rLink ); + virtual void SetModified() SAL_OVERRIDE; + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; + virtual void SetModifyHdl( const Link& _rLink ) SAL_OVERRIDE; }; #include <svtools/editimplementation.hxx> @@ -203,10 +203,10 @@ namespace svt protected: // Window overridables - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; // MultiLineEdit overridables - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; private: bool dispatchKeyEvent( const KeyEvent& _rEvent ); @@ -225,8 +225,8 @@ namespace svt { } - virtual OUString GetText( LineEnd aSeparator ) const; - virtual OUString GetSelected( LineEnd aSeparator ) const; + virtual OUString GetText( LineEnd aSeparator ) const SAL_OVERRIDE; + virtual OUString GetSelected( LineEnd aSeparator ) const SAL_OVERRIDE; }; @@ -246,13 +246,13 @@ namespace svt const IEditImplementation* GetEditImplementation( ) const { return m_pEditImplementation; } IEditImplementation* GetEditImplementation( ) { return m_pEditImplementation; } - virtual void SetModified(); - virtual bool IsModified() const; - virtual void ClearModified(); + virtual void SetModified() SAL_OVERRIDE; + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const; - virtual void SetModifyHdl(const Link& rLink); + virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; + virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; }; @@ -265,13 +265,13 @@ namespace svt SpinCellController(SpinField* pSpinField); SpinField& GetSpinWindow() const {return (SpinField &)GetWindow();} - virtual void SetModified(); - virtual bool IsModified() const; - virtual void ClearModified(); + virtual void SetModified() SAL_OVERRIDE; + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const; - virtual void SetModifyHdl(const Link& rLink); + virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; + virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; }; @@ -287,13 +287,13 @@ namespace svt CheckBoxControl(Window* pParent, WinBits nWinStyle = 0); ~CheckBoxControl(); - virtual void GetFocus(); - virtual bool PreNotify(NotifyEvent& rEvt); - virtual void Paint(const Rectangle& rClientRect); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& _rEvent ); - virtual void Resize(); + virtual void GetFocus() SAL_OVERRIDE; + virtual bool PreNotify(NotifyEvent& rEvt) SAL_OVERRIDE; + virtual void Paint(const Rectangle& rClientRect) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& _rEvent ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void SetClickHdl(const Link& rHdl) {m_aClickLink = rHdl;} const Link& GetClickHdl() const {return m_aClickLink;} @@ -318,12 +318,12 @@ namespace svt CheckBoxCellController(CheckBoxControl* pWin):CellController(pWin){} CheckBox& GetCheckBox() const; - virtual bool IsModified() const; - virtual void ClearModified(); + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; protected: - virtual void SetModifyHdl(const Link& rLink); - virtual bool WantMouseEvent() const; + virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; + virtual bool WantMouseEvent() const SAL_OVERRIDE; }; @@ -337,7 +337,7 @@ namespace svt ComboBoxControl(Window* pParent, WinBits nWinStyle = 0); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; @@ -351,12 +351,12 @@ namespace svt ComboBoxCellController(ComboBoxControl* pParent); ComboBoxControl& GetComboBox() const {return (ComboBoxControl &)GetWindow();} - virtual bool IsModified() const; - virtual void ClearModified(); + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const; - virtual void SetModifyHdl(const Link& rLink); + virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; + virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; }; @@ -370,7 +370,7 @@ namespace svt ListBoxControl(Window* pParent, WinBits nWinStyle = 0); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; @@ -384,12 +384,12 @@ namespace svt ListBoxCellController(ListBoxControl* pParent); ListBoxControl& GetListBox() const {return (ListBoxControl &)GetWindow();} - virtual bool IsModified() const; - virtual void ClearModified(); + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const; - virtual void SetModifyHdl(const Link& rLink); + virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; + virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; }; @@ -401,7 +401,7 @@ namespace svt TYPEINFO_OVERRIDE(); FormattedFieldCellController( FormattedField* _pFormatted ); - virtual void CommitModifications(); + virtual void CommitModifications() SAL_OVERRIDE; }; @@ -414,7 +414,7 @@ namespace svt :BrowserHeader(pParent, nWinBits){} protected: - virtual void DoubleClick(); + virtual void DoubleClick() SAL_OVERRIDE; }; @@ -505,32 +505,32 @@ namespace svt protected: BrowserHeader* GetHeaderBar() const {return pHeader;} - virtual BrowserHeader* CreateHeaderBar(BrowseBox* pParent); + virtual BrowserHeader* CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; // if you want to have an own header ... virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent); - virtual void ColumnMoved(sal_uInt16 nId); - virtual void ColumnResized(sal_uInt16 nColId); - virtual void Resize(); + virtual void ColumnMoved(sal_uInt16 nId) SAL_OVERRIDE; + virtual void ColumnResized(sal_uInt16 nColId) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); - virtual bool SeekRow(long nRow); + virtual bool SeekRow(long nRow) SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void KeyInput(const KeyEvent& rEvt); - virtual void MouseButtonDown(const BrowserMouseEvent& rEvt); - virtual void MouseButtonUp(const BrowserMouseEvent& rEvt); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; + virtual void MouseButtonDown(const BrowserMouseEvent& rEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const BrowserMouseEvent& rEvt) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; using BrowseBox::MouseButtonUp; using BrowseBox::MouseButtonDown; - virtual bool PreNotify(NotifyEvent& rNEvt ); - virtual bool Notify(NotifyEvent& rNEvt); + virtual bool PreNotify(NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; - virtual void EndScroll(); + virtual void EndScroll() SAL_OVERRIDE; // should be used instead of GetFieldRectPixel, 'cause this method here takes into account the borders Rectangle GetCellRect(long nRow, sal_uInt16 nColId, bool bRelToBrowser = true) const; @@ -542,19 +542,19 @@ namespace svt virtual RowStatus GetRowStatus(long nRow) const; - virtual void RowHeightChanged(); + virtual void RowHeightChanged() SAL_OVERRIDE; // callbacks for the data window - virtual void ImplStartTracking(); - virtual void ImplTracking(); - virtual void ImplEndTracking(); + virtual void ImplStartTracking() SAL_OVERRIDE; + virtual void ImplTracking() SAL_OVERRIDE; + virtual void ImplEndTracking() SAL_OVERRIDE; // when changing a row: // CursorMoving: cursor is beeing moved, but GetCurRow() still provides the old row virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); // cursor has been moved - virtual void CursorMoved(); + virtual void CursorMoved() SAL_OVERRIDE; virtual void CellModified(); // called whenever a cell has been modified virtual bool SaveModified(); // called whenever a cell should be left, and it's content should be saved @@ -567,7 +567,7 @@ namespace svt virtual void InitController(CellControllerRef& rController, long nRow, sal_uInt16 nCol); virtual void ResizeController(CellControllerRef& rController, const Rectangle&); virtual void ReleaseController(CellControllerRef& pController, long nRow, sal_uInt16 nCol); - virtual void DoubleClick(const BrowserMouseEvent&); + virtual void DoubleClick(const BrowserMouseEvent&) SAL_OVERRIDE; void ActivateCell() { ActivateCell(GetCurRow(), GetCurColumnId()); } @@ -583,7 +583,7 @@ namespace svt // result in traveling to the next or to th previous cell virtual bool IsTabAllowed(bool bForward) const; - virtual bool IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const; + virtual bool IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const SAL_OVERRIDE; void PaintTristate(OutputDevice& rDev, const Rectangle& rRect, const TriState& eState, bool _bEnabled=true) const; @@ -621,10 +621,10 @@ namespace svt The XAccessible interface of the specified cell. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ); + CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) SAL_OVERRIDE; /** @return The count of additional controls of the control area. */ - virtual sal_Int32 GetAccessibleControlCount() const; + virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; /** Creates the accessible object of an additional control. @param nIndex @@ -633,7 +633,7 @@ namespace svt The XAccessible interface of the specified control. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessibleControl( sal_Int32 nIndex ); + CreateAccessibleControl( sal_Int32 nIndex ) SAL_OVERRIDE; /** Creates the accessible object of a column header. @param nColumnId @@ -642,13 +642,13 @@ namespace svt The XAccessible interface of the specified column header. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessibleRowHeader( sal_Int32 _nRow ); + CreateAccessibleRowHeader( sal_Int32 _nRow ) SAL_OVERRIDE; /** Sets focus to current cell of the data table. */ - virtual void GrabTableFocus(); + virtual void GrabTableFocus() SAL_OVERRIDE; - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); + virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE; + virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState); @@ -658,7 +658,7 @@ namespace svt private: virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, - sal_uInt16 nColumnId ) const; + sal_uInt16 nColumnId ) const SAL_OVERRIDE; using Control::ImplInitSettings; SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SVT_DLLPRIVATE void DetermineFocus( const sal_uInt16 _nGetFocusFlags = 0); diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx index 2276e0132644..a7c1291e4de1 100644 --- a/include/svtools/editsyntaxhighlighter.hxx +++ b/include/svtools/editsyntaxhighlighter.hxx @@ -36,15 +36,15 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit virtual void DoBracketHilight(sal_uInt16 aKey); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); ~MultiLineEditSyntaxHighlight(); - virtual void UpdateData(); - virtual void SetText(const OUString& rNewText); - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) + virtual void UpdateData() SAL_OVERRIDE; + virtual void SetText(const OUString& rNewText) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE { SetText( rStr ); SetSelection( rNewSelection ); } Color GetColorValue(TokenTypes aToken); diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 0f5a4dbae228..3efcfb8d4247 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -38,7 +38,7 @@ public: SfxErrorContext( sal_uInt16 nCtxIdP, const OUString &aArg1, Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); - bool GetString(sal_uLong nErrId, OUString &rStr); + bool GetString(sal_uLong nErrId, OUString &rStr) SAL_OVERRIDE; private: sal_uInt16 nCtxId; @@ -66,7 +66,7 @@ private: ResMgr *pFreeMgr; SVT_DLLPRIVATE bool GetClassString(sal_uLong lErrId, OUString &) const; - virtual bool CreateString( const ErrorInfo *, OUString &, sal_uInt16 &) const; + virtual bool CreateString( const ErrorInfo *, OUString &, sal_uInt16 &) const SAL_OVERRIDE; }; #endif diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index f77148c9dae9..f3808dbfe066 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -35,9 +35,9 @@ private: protected: - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; public: // object, replacement image, and the aspect diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index 495ced772ffd..e4dbacaab765 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -69,7 +69,7 @@ public: ExtendedColorConfig(); ~ExtendedColorConfig(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; // get the configured value ExtendedColorConfigValue GetColorValue(const OUString& _sComponentName,const OUString& _sName)const; diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index dd80a3f938c6..47809595576f 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -57,9 +57,9 @@ private: SVT_DLLPRIVATE void ImplBrowseFile( ); protected: - SVT_DLLPRIVATE void Resize(); - SVT_DLLPRIVATE void GetFocus(); - SVT_DLLPRIVATE void StateChanged( StateChangedType nType ); + SVT_DLLPRIVATE void Resize() SAL_OVERRIDE; + SVT_DLLPRIVATE void GetFocus() SAL_OVERRIDE; + SVT_DLLPRIVATE void StateChanged( StateChangedType nType ) SAL_OVERRIDE; SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); DECL_DLLPRIVATE_LINK( ButtonHdl, void* ); @@ -70,13 +70,13 @@ public: Edit& GetEdit() { return maEdit; } PushButton& GetButton() { return maButton; } - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; void SetOpenDialog( bool bOpen ) { mbOpenDlg = bOpen; } bool IsOpenDialog() const { return mbOpenDlg; } - void SetText( const OUString& rStr ); - OUString GetText() const; + void SetText( const OUString& rStr ) SAL_OVERRIDE; + OUString GetText() const SAL_OVERRIDE; OUString GetSelectedText() const { return maEdit.GetSelected(); } void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); } diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 1ba68e71f1dd..f75cb5c0ec4a 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -40,8 +40,8 @@ namespace svt FileURLBox( Window* _pParent, WinBits _nStyle ); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: /** transforms the given URL content into a system-dependent notation, if possible, and diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 4d845b6527c2..a1a2aa835ce0 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -77,7 +77,7 @@ private: DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar * ); protected: - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; public: SvtFileView( Window* pParent, const ResId& rResId, bool bOnlyFolder, bool bMultiSelection ); @@ -93,8 +93,8 @@ public: void SetHelpId( const OString& rHelpId ); const OString& GetHelpId( ) const; - void SetSizePixel( const Size& rNewSize ); - virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); + void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; + virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE; void SetSortColumn( bool bValue ) { bSortColumn = bValue; } bool GetSortColumn() { return bSortColumn; } @@ -195,7 +195,7 @@ public: void EndInplaceEditing( bool _bCancel ); protected: - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; }; // struct SvtContentEntry ------------------------------------------------ diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index 3dc58ab5e912..3c83d6d8fc62 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -158,11 +158,11 @@ public: // Formatueberpruefung waehrend der Eingabe ? // Spin-Handling - virtual void Up(); - virtual void Down(); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; // Standard-Implementierung : hoch- oder runterzaehlen des aktuellen double einfach um die gesetzte SpinSize - virtual void First(); - virtual void Last(); + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; // Standard-Implementierung : aktuelles double setzen auf eingestellten first respektive last value void SetSpinSize(double dStep) { m_dSpinSize = dStep; } @@ -178,8 +178,8 @@ public: void TreatAsNumber(bool bDoSo) { m_bTreatAsNumber = bDoSo; } public: - virtual void SetText( const OUString& rStr ); - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE; // die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf sal_False sitzt /** nehmen wir mal an, irgendjemand will das ganze schoene double-Handling gar nicht haben, sondern @@ -234,9 +234,9 @@ public: bool IsUsingInputStringForFormatting() const; protected: - virtual bool Notify(NotifyEvent& rNEvt); + virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; void impl_Modify(bool makeValueDirty = true); - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; // CheckText ueberschreiben fuer Ueberpruefung zur Eingabezeit virtual bool CheckText(const OUString&) const { return true; } @@ -254,7 +254,7 @@ protected: virtual SvNumberFormatter* CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; } SvNumberFormatter* ImplGetFormatter() const { return m_pFormatter ? m_pFormatter : ((FormattedField*)this)->CreateFormatter(); } - bool PreNotify(NotifyEvent& rNEvt); + bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; virtual void ReFormat(); }; @@ -276,9 +276,9 @@ public: virtual ~DoubleNumericField(); protected: - virtual bool CheckText(const OUString& sText) const; + virtual bool CheckText(const OUString& sText) const SAL_OVERRIDE; - virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat); + virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat) SAL_OVERRIDE; void ResetConformanceTester(); }; @@ -303,7 +303,7 @@ public: void setPrependCurrSym(bool _bPrepend); protected: - virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat); + virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat) SAL_OVERRIDE; void UpdateCurrencyFormat(); }; diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index 0ad275989cb1..4bac9db32dd7 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.hxx @@ -41,8 +41,8 @@ public: SvtFontSubstConfig(); virtual ~SvtFontSubstConfig(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; bool IsEnabled() const {return bIsEnabled;} void Enable(bool bSet) {bIsEnabled = bSet; SetModified();} diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index fe735a20d515..22babad68288 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -54,23 +54,23 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu bool isBound() const; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XFrameActionListener - virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: struct Listener diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index b02698a926ff..15b542cc3458 100644 --- a/include/svtools/generictoolboxcontroller.hxx +++ b/include/svtools/generictoolboxcontroller.hxx @@ -39,13 +39,13 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController virtual ~GenericToolboxController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, ExecuteInfo* ); diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 217de45144ad..3ec3b7b255d0 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -97,27 +97,27 @@ namespace svt public: // UNO DECLARE_UNO3_DEFAULTS(OGenericUnoDialog, OGenericUnoDialogBase); - virtual com::sun::star::uno::Any SAL_CALL queryInterface(const com::sun::star::uno::Type& _rType) throw (com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Any SAL_CALL queryInterface(const com::sun::star::uno::Type& _rType) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual com::sun::star::uno::Sequence<com::sun::star::uno::Type> SAL_CALL getTypes( ) throw(com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual com::sun::star::uno::Sequence<com::sun::star::uno::Type> SAL_CALL getTypes( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception); - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; // OPropertySetHelper - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception); - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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, com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** create the concret dialog instance. note that m_aMutex is not locked when this method get's called, diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 09fdbfdfa7ad..4b392a9693e1 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -304,9 +304,9 @@ protected: virtual void GraphicManagerDestroyed(); virtual SvStream* GetSwapStream() const; - virtual void Load( SvStream& ); - virtual void Save( SvStream& ); - virtual void Assign( const SvDataCopyStream& ); + virtual void Load( SvStream& ) SAL_OVERRIDE; + virtual void Save( SvStream& ) SAL_OVERRIDE; + virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE; public: diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 94f30889b849..940633dfa810 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -294,16 +294,16 @@ public: HeaderBar( Window* pParent, WinBits nWinBits = WB_STDHEADERBAR ); ~HeaderBar(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void StartDrag(); @@ -370,9 +370,9 @@ public: /** Creates and returns the accessible object of the header bar. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( sal_Bool bCreate ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( sal_Bool bCreate ) SAL_OVERRIDE; }; diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index e06c7e93b77e..6aca1a439c87 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -46,8 +46,8 @@ public: SvxHtmlOptions(); ~SvxHtmlOptions(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; sal_uInt16 GetFontSize(sal_uInt16 nPos) const; void SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize); diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index 954cd4d6a96b..4b6de2647dc0 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -40,10 +40,10 @@ namespace svt HyperLabelImpl* m_pImpl; Link maClickHdl; - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; void DeactivateHyperMode(Font aFont, const Color aColor); void ActivateHyperMode(Font aFont, const Color aColor); @@ -55,7 +55,7 @@ namespace svt HyperLabel( Window* _pParent, WinBits _nWinStyle = 0 ); ~HyperLabel( ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetID( sal_Int16 _ID ); sal_Int16 GetID() const; diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx index 1750dc7638a0..ac4cb9ad9bae 100644 --- a/include/svtools/imapcirc.hxx +++ b/include/svtools/imapcirc.hxx @@ -35,8 +35,8 @@ class SVT_DLLPUBLIC IMapCircleObject : public IMapObject protected: // Binaer-Im-/Export - virtual void WriteIMapObject( SvStream& rOStm ) const; - virtual void ReadIMapObject( SvStream& rIStm ); + virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE; + virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE; public: @@ -51,14 +51,14 @@ public: bool bPixelCoords = true ); virtual ~IMapCircleObject() {}; - virtual sal_uInt16 GetType() const; - virtual bool IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual bool IsHit( const Point& rPoint ) const SAL_OVERRIDE; Point GetCenter( bool bPixelCoords = true ) const; sal_uLong GetRadius( bool bPixelCoords = true ) const; // liefert das BoundRect des Kreis-Objektes in 1/100mm - virtual Rectangle GetBoundRect() const; + virtual Rectangle GetBoundRect() const SAL_OVERRIDE; void Scale( const Fraction& rFractX, const Fraction& rFracY ); diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx index 5c7615e1c41e..7089e140854b 100644 --- a/include/svtools/imappoly.hxx +++ b/include/svtools/imappoly.hxx @@ -37,8 +37,8 @@ class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject protected: // Binaer-Im-/Export - virtual void WriteIMapObject( SvStream& rOStm ) const; - virtual void ReadIMapObject( SvStream& rIStm ); + virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE; + virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE; bool ReadPreProLine( SvStream& rIStm, OUString& rStr ); @@ -54,13 +54,13 @@ public: bool bPixelCoords = true ); virtual ~IMapPolygonObject() {}; - virtual sal_uInt16 GetType() const; - virtual bool IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual bool IsHit( const Point& rPoint ) const SAL_OVERRIDE; Polygon GetPolygon( bool bPixelCoords = true ) const; // liefert das BoundRect des Polygon-Objektes in 1/100mm - virtual Rectangle GetBoundRect() const { return aPoly.GetBoundRect(); } + virtual Rectangle GetBoundRect() const SAL_OVERRIDE { return aPoly.GetBoundRect(); } bool HasExtraEllipse() const { return bEllipse; } const Rectangle& GetExtraEllipse() const { return aEllipse; } diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx index 72106265577b..17c96841a5d1 100644 --- a/include/svtools/imaprect.hxx +++ b/include/svtools/imaprect.hxx @@ -34,8 +34,8 @@ class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject protected: // Binaer-Im-/Export - virtual void WriteIMapObject( SvStream& rOStm ) const; - virtual void ReadIMapObject( SvStream& rIStm ); + virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE; + virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE; public: @@ -50,13 +50,13 @@ public: bool bPixelCoords = true ); virtual ~IMapRectangleObject() {}; - virtual sal_uInt16 GetType() const; - virtual bool IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual bool IsHit( const Point& rPoint ) const SAL_OVERRIDE; Rectangle GetRectangle( bool bPixelCoords = true ) const; // liefert das BoundRect des Rechteck-Objektes in 1/100mm - virtual Rectangle GetBoundRect() const { return aRect; } + virtual Rectangle GetBoundRect() const SAL_OVERRIDE { return aRect; } void Scale( const Fraction& rFractX, const Fraction& rFracY ); diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 0d14ba13d913..0c314de0dd70 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -52,10 +52,10 @@ friend class SvtURLBox_Impl; SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID); protected: - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Select(); - virtual void Modify(); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: SvtURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 82ee15894e68..46478a47c69b 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -229,23 +229,23 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control protected: - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled ); virtual void DocumentRectChanged(); virtual void VisibleRectChanged(); virtual bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; virtual void ClickIcon(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual void DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, @@ -255,7 +255,7 @@ protected: SvxIconChoiceCtrlEntry* pEntry, bool bInplaceEdit ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; void CallImplEventListeners(sal_uLong nEvent, void* pData); @@ -346,7 +346,7 @@ public: /** Creates and returns the accessible object of the Box. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; #endif // INCLUDED_SVTOOLS_IVCTRL_HXX diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx index 9cd45830b0dd..08e4f75f4304 100644 --- a/include/svtools/javacontext.hxx +++ b/include/svtools/javacontext.hxx @@ -52,15 +52,15 @@ namespace svt // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw (); + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SVT_DLLPRIVATE JavaContext(); //not implemented diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx index c20aeabc756f..2425cee6df96 100644 --- a/include/svtools/javainteractionhandler.hxx +++ b/include/svtools/javainteractionhandler.hxx @@ -44,16 +44,16 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XCurrentContext virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& Request ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: oslInterlockedCount m_aRefCount; diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index 7ff7a9198fd2..ca854d07b9e1 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -54,14 +54,14 @@ class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1< public: // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing ( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDropTargetListener - virtual void SAL_CALL drop ( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragEnter ( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragExit ( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragOver ( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL drop ( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragEnter ( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragExit ( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragOver ( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void implts_BeginDrag( const css::uno::Sequence< css::datatransfer::DataFlavor >& rSupportedDataFlavors ); diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 67497cac07e4..ed4f4c386fcf 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -154,7 +154,7 @@ protected: int _GetNextRawToken(); // scanne das naechste Token, - virtual int _GetNextToken(); + virtual int _GetNextToken() SAL_OVERRIDE; virtual ~HTMLParser(); @@ -163,7 +163,7 @@ protected: public: HTMLParser( SvStream& rIn, bool bReadNewDoc = true ); - virtual SvParserState CallParser(); // Aufruf des Parsers + virtual SvParserState CallParser() SAL_OVERRIDE; // Aufruf des Parsers bool IsNewDoc() const { return bNewDoc; } bool IsInHeader() const { return bIsInHeader; } @@ -217,7 +217,7 @@ public: const HTMLOptions& GetOptions( sal_uInt16 *pNoConvertToken=0 ); // fuers asynchrone lesen aus dem SvStream - virtual void Continue( int nToken ); + virtual void Continue( int nToken ) SAL_OVERRIDE; protected: diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx index 3deb006c17c4..8b596eaa5594 100644 --- a/include/svtools/parrtf.hxx +++ b/include/svtools/parrtf.hxx @@ -53,7 +53,7 @@ protected: void SkipGroup(); // scanne das naechste Token, - virtual int _GetNextToken(); + virtual int _GetNextToken() SAL_OVERRIDE; virtual void ReadUnknownData(); virtual void ReadBitmapData(); @@ -70,14 +70,14 @@ protected: public: SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize = 3 ); - virtual SvParserState CallParser(); // Aufruf des Parsers + virtual SvParserState CallParser() SAL_OVERRIDE; // Aufruf des Parsers int GetOpenBrakets() const { return nOpenBrakets; } // fuers asynchrone lesen aus dem SvStream // virtual void SaveState( int nToken ); // virtual void RestoreState(); - virtual void Continue( int nToken ); + virtual void Continue( int nToken ) SAL_OVERRIDE; }; #endif // INCLUDED_SVTOOLS_PARRTF_HXX diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index 1164f93cdb70..168c43b79076 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -63,37 +63,37 @@ namespace svt virtual ~PopupMenuControllerBase(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - 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) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + 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 = 0; // XPopupMenuController - virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) 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, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XMenuListener - virtual void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); @@ -105,7 +105,7 @@ namespace svt /** this function is called upon disposing the component */ - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); virtual void impl_setPopupMenu(); diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index 49513fe86d2d..8925481980a8 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -44,30 +44,30 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ) = 0; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; - 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 ) = 0; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; + 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 = 0; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: boost::scoped_ptr< PopupWindowControllerImpl > mpImpl; }; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 7b0daef856f1..c83feda4609c 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -65,10 +65,10 @@ public: void SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; } Printer* GetPrinter() const { return mpPrinter; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; void SetOptionsHdl( const Link& rLink ); }; diff --git a/include/svtools/roadmap.hxx b/include/svtools/roadmap.hxx index 2a7b0e44cff4..a35e217b82e4 100644 --- a/include/svtools/roadmap.hxx +++ b/include/svtools/roadmap.hxx @@ -52,7 +52,7 @@ namespace svt protected: RoadmapImpl* m_pImpl; // Window overridables - void Paint( const Rectangle& _rRect ); + void Paint( const Rectangle& _rRect ) SAL_OVERRIDE; void implInit(); public: @@ -84,12 +84,12 @@ namespace svt void SetItemSelectHdl( const Link& _rHdl ); Link GetItemSelectHdl( ) const; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void GetFocus(); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; protected: - bool PreNotify( NotifyEvent& rNEvt ); + bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; protected: /// called when an item has been selected by any means diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index f8165a1204f9..c2dcc819e88d 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -82,15 +82,15 @@ namespace svt void SetRoadmapHelpId( const OString& _rId ); void SetRoadmapInteractive( bool _bInteractive ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; // returns whether a given state is enabled bool isStateEnabled( WizardState _nState ) const; // WizardDialog overridables - virtual bool canAdvance() const; - virtual void updateTravelUI(); + virtual bool canAdvance() const SAL_OVERRIDE; + virtual void updateTravelUI() SAL_OVERRIDE; protected: /** declares a valid path in the wizard @@ -165,7 +165,7 @@ protected: @see activatePath */ - virtual WizardState determineNextState( WizardState _nCurrentState ) const; + virtual WizardState determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE; /** en- or disables a state @@ -194,7 +194,7 @@ protected: bool knowsState( WizardState _nState ) const; // OWizardMachine overriables - virtual void enterState( WizardState _nState ); + virtual void enterState( WizardState _nState ) SAL_OVERRIDE; /** returns a human readable name for a given state @@ -210,7 +210,7 @@ protected: This member is inherited from OWizardMachine, and default-implemented in this class for all states which have been described using describeState. */ - virtual TabPage* createPage( WizardState _nState ); + virtual TabPage* createPage( WizardState _nState ) SAL_OVERRIDE; /** asks for a new label of the wizard page diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 1924153b3d55..d162639627d0 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -715,13 +715,13 @@ public: Ruler( Window* pParent, WinBits nWinStyle = WB_STDRULER ); virtual ~Ruler(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual long StartDrag(); virtual void Drag(); @@ -730,8 +730,8 @@ public: virtual void DoubleClick(); virtual void ExtraDown(); - void Activate(); - void Deactivate(); + void Activate() SAL_OVERRIDE; + void Deactivate() SAL_OVERRIDE; bool IsActive() const { return mbActive; } void SetWinPos( long nOff = 0, long nWidth = 0 ); @@ -823,7 +823,7 @@ public: void DrawTicks(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; #endif // _RULER_HXX diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 512498f2d6d7..a85c9cd64253 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -65,22 +65,22 @@ public: ScrollableWindow( Window* pParent, WinBits nBits = 0, ScrollableWindowFlags = SCRWIN_DEFAULT ); - virtual void Resize(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void DataChanged( const DataChangedEvent& rDEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDEvt ) SAL_OVERRIDE; virtual void StartScroll(); virtual void EndScroll( long nDeltaX, long nDeltaY ); using OutputDevice::SetMapMode; - virtual void SetMapMode( const MapMode& rNewMapMode ); + virtual void SetMapMode( const MapMode& rNewMapMode ) SAL_OVERRIDE; virtual MapMode GetMapMode() const; void SetTotalSize( const Size& rNewSize ); Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } using Window::Scroll; - virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 ); + virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; private: SVT_DLLPRIVATE Size GetOutputSizePixel() const; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index f1615604420e..0b458e7ef8b0 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -31,7 +31,7 @@ private: SvSimpleTable* m_pTable; protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: SvSimpleTableContainer( Window* pParent, const ResId& rResId ); @@ -39,9 +39,9 @@ public: void SetTable(SvSimpleTable* pTable); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; }; class SVT_DLLPUBLIC SvSimpleTable : public SvHeaderTabListBox @@ -69,10 +69,10 @@ private: protected: - virtual void NotifyScrolled(); + virtual void NotifyScrolled() SAL_OVERRIDE; - virtual void SetTabs(); - virtual void Paint( const Rectangle& rRect ); + virtual void SetTabs() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void HBarClick(); virtual void HBarDblClick(); @@ -80,7 +80,7 @@ protected: virtual void HBarDrag(); virtual void HBarEndDrag(); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual sal_Int32 ColCompare(SvTreeListEntry*,SvTreeListEntry*); public: diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index ccb0aaa57774..957aa5315c59 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -58,40 +58,40 @@ class SVT_DLLPUBLIC StatusbarController : ::Rectangle getControlRect() const; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () 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, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusbarController - virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, ::sal_Int32 nCommand, ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception); + const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: struct Listener diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx index b6e23763065b..7f61dd8f9bf8 100644 --- a/include/svtools/stdmenu.hxx +++ b/include/svtools/stdmenu.hxx @@ -112,8 +112,8 @@ public: FontNameMenu(); virtual ~FontNameMenu(); - virtual void Select(); - virtual void Highlight(); + virtual void Select() SAL_OVERRIDE; + virtual void Highlight() SAL_OVERRIDE; void Fill( const FontList* pList ); @@ -142,8 +142,8 @@ public: FontSizeMenu(); ~FontSizeMenu(); - virtual void Select(); - virtual void Highlight(); + virtual void Select() SAL_OVERRIDE; + virtual void Highlight() SAL_OVERRIDE; void Fill( const FontInfo& rInfo, const FontList* pList ); diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index d0dad086a4a4..67197be94add 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -41,8 +41,8 @@ namespace svt protected: // TransferableHelper overridables - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ) SAL_OVERRIDE; }; diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index d270cb6c9ef5..8c66b83511e7 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -98,17 +98,17 @@ public: SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const OUString& rStr); SvLBoxString(); virtual ~SvLBoxString(); - virtual sal_uInt16 GetType() const; - virtual void InitViewData(SvTreeListBox*, SvTreeListEntry*, SvViewDataItem*); + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual void InitViewData(SvTreeListBox*, SvTreeListEntry*, SvViewDataItem*) SAL_OVERRIDE; OUString GetText() const { return maText; } virtual OUString GetExtendText() const { return OUString(); } void SetText( const OUString& rText ) { maText = rText; } virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; - virtual SvLBoxItem* Create() const; - virtual void Clone( SvLBoxItem* pSource ); + virtual SvLBoxItem* Create() const SAL_OVERRIDE; + virtual void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; }; class SvLBoxBmp : public SvLBoxItem @@ -117,12 +117,12 @@ class SvLBoxBmp : public SvLBoxItem public: SvLBoxBmp(); virtual ~SvLBoxBmp(); - virtual sal_uInt16 GetType() const; - virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); - virtual SvLBoxItem* Create() const; - virtual void Clone( SvLBoxItem* pSource ); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; + virtual SvLBoxItem* Create() const SAL_OVERRIDE; + virtual void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; }; @@ -152,13 +152,13 @@ public: SvLBoxButtonData* pBData ); SvLBoxButton(); virtual ~SvLBoxButton(); - virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); - virtual sal_uInt16 GetType() const; + virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; + virtual sal_uInt16 GetType() const SAL_OVERRIDE; virtual bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* ); virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); - virtual SvLBoxItem* Create() const; - virtual void Clone( SvLBoxItem* pSource ); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; + virtual SvLBoxItem* Create() const SAL_OVERRIDE; + virtual void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; sal_uInt16 GetButtonFlags() const { return nItemFlags; } bool IsStateChecked() const { return (nItemFlags & SV_ITEMSTATE_CHECKED)!=0; } bool IsStateUnchecked() const { return (nItemFlags & SV_ITEMSTATE_UNCHECKED)!=0; } @@ -214,12 +214,12 @@ public: SvLBoxContextBmp(); virtual ~SvLBoxContextBmp(); - virtual sal_uInt16 GetType() const; - virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); - virtual SvLBoxItem* Create() const; - virtual void Clone( SvLBoxItem* pSource ); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; + virtual SvLBoxItem* Create() const SAL_OVERRIDE; + virtual void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; bool SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 ); diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx index 64d81bd721fe..7d84c2efee4d 100644 --- a/include/svtools/svmedit.hxx +++ b/include/svtools/svmedit.hxx @@ -35,7 +35,7 @@ public: MultiLineEdit( Window* pParent, const ResId& rResId ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface(sal_Bool bCreate = sal_True); + GetComponentInterface(sal_Bool bCreate = sal_True) SAL_OVERRIDE; }; diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index a084f568597b..c8d1551735e2 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -55,8 +55,8 @@ protected: static OUString GetToken( const OUString &sStr, sal_Int32 &nIndex ); - virtual void SetTabs(); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); + virtual void SetTabs() SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; OUString GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const; SvTreeListEntry* GetEntryOnPos( sal_uLong _nEntryPos ) const; @@ -76,7 +76,7 @@ public: virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = 0, bool bChildrenOnDemand = false, sal_uLong nPos=TREELIST_APPEND, void* pUserData = 0, - SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); + SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) SAL_OVERRIDE; virtual SvTreeListEntry* InsertEntry( const OUString& rText, const Image& rExpandedEntryBmp, @@ -84,7 +84,7 @@ public: SvTreeListEntry* pParent = 0, bool bChildrenOnDemand = false, sal_uLong nPos = TREELIST_APPEND, void* pUserData = 0, - SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); + SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) SAL_OVERRIDE; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); @@ -94,7 +94,7 @@ public: const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL, sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); - virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const; + virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; OUString GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ) const; OUString GetEntryText( sal_uLong nPos, sal_uInt16 nCol = 0xffff ) const; using SvTreeListBox::SetEntryText; @@ -104,7 +104,7 @@ public: sal_uLong GetEntryPos( const OUString&, sal_uInt16 nCol = 0xffff ); sal_uLong GetEntryPos( const SvTreeListEntry* pEntry ) const; - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void SetTabJustify( sal_uInt16 nTab, SvTabJustify ); }; @@ -142,20 +142,20 @@ public: SvHeaderTabListBox( Window* pParent, WinBits nBits ); ~SvHeaderTabListBox(); - virtual void Paint( const Rectangle& ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; void InitHeaderBar( HeaderBar* pHeaderBar ); bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND, - sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); + sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) SAL_OVERRIDE; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent, - sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); + sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ) SAL_OVERRIDE; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL, - sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); - virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND); - virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = TREELIST_APPEND ); + sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) SAL_OVERRIDE; + virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND) SAL_OVERRIDE; + virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = TREELIST_APPEND ) SAL_OVERRIDE; void RemoveEntry( SvTreeListEntry* _pEntry ); void Clear(); @@ -167,85 +167,85 @@ public: bool IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState ); /** @return The count of the rows. */ - virtual long GetRowCount() const; + virtual long GetRowCount() const SAL_OVERRIDE; /** @return The count of the columns. */ - virtual sal_uInt16 GetColumnCount() const; + virtual sal_uInt16 GetColumnCount() const SAL_OVERRIDE; /** @return The position of the current row. */ - virtual sal_Int32 GetCurrRow() const; + virtual sal_Int32 GetCurrRow() const SAL_OVERRIDE; /** @return The position of the current column. */ - virtual sal_uInt16 GetCurrColumn() const; + virtual sal_uInt16 GetCurrColumn() const SAL_OVERRIDE; /** @return The description of a row. @param _nRow The row which description is in demand. */ - virtual OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const SAL_OVERRIDE; /** @return The description of a column. @param _nColumn The column which description is in demand. */ - virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const; + virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const SAL_OVERRIDE; /** @return <TRUE/>, if the object has a row header. */ - virtual bool HasRowHeader() const; //GetColumnId + virtual bool HasRowHeader() const SAL_OVERRIDE; //GetColumnId /** @return <TRUE/>, if the object can focus a cell. */ - virtual bool IsCellFocusable() const; - virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); + virtual bool IsCellFocusable() const SAL_OVERRIDE; + virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) SAL_OVERRIDE; - virtual void SetNoSelection(); + virtual void SetNoSelection() SAL_OVERRIDE; using SvListView::SelectAll; - virtual void SelectAll(); - virtual void SelectAll( bool bSelect, bool bPaint = true ); - virtual void SelectRow( long _nRow, bool _bSelect = true, bool bExpand = true ); - virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ); - virtual sal_Int32 GetSelectedRowCount() const; - virtual sal_Int32 GetSelectedColumnCount() const; + virtual void SelectAll() SAL_OVERRIDE; + virtual void SelectAll( bool bSelect, bool bPaint = true ) SAL_OVERRIDE; + virtual void SelectRow( long _nRow, bool _bSelect = true, bool bExpand = true ) SAL_OVERRIDE; + virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) SAL_OVERRIDE; + virtual sal_Int32 GetSelectedRowCount() const SAL_OVERRIDE; + virtual sal_Int32 GetSelectedColumnCount() const SAL_OVERRIDE; /** @return <TRUE/>, if the row is selected. */ - virtual bool IsRowSelected( long _nRow ) const; - virtual bool IsColumnSelected( long _nColumn ) const; - virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const; - virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const; + virtual bool IsRowSelected( long _nRow ) const SAL_OVERRIDE; + virtual bool IsColumnSelected( long _nColumn ) const SAL_OVERRIDE; + virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const SAL_OVERRIDE; + virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const SAL_OVERRIDE; /** @return <TRUE/>, if the cell is visible. */ - virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; - virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const; + virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; + virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const SAL_OVERRIDE; - virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ); - virtual Rectangle calcTableRect( bool _bOnScreen = true ); - virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen = true ); + virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) SAL_OVERRIDE; + virtual Rectangle calcTableRect( bool _bOnScreen = true ) SAL_OVERRIDE; + virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen = true ) SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ); - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ); + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) SAL_OVERRIDE; - virtual sal_Int32 GetAccessibleControlCount() const; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ); - virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ); + virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) SAL_OVERRIDE; + virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) SAL_OVERRIDE; - virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ); - virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ); - virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ); + virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ) SAL_OVERRIDE; + virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) SAL_OVERRIDE; + virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) SAL_OVERRIDE; - virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; - virtual Window* GetWindowInstance(); + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const SAL_OVERRIDE; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const SAL_OVERRIDE; + virtual Window* GetWindowInstance() SAL_OVERRIDE; using SvTreeListBox::FillAccessibleStateSet; - virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const; - virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const; - virtual void GrabTableFocus(); + virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const SAL_OVERRIDE; + virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; + virtual void GrabTableFocus() SAL_OVERRIDE; // OutputDevice - virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); + virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) SAL_OVERRIDE; // Window - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; - virtual void GrabFocus(); - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); - virtual Window* GetAccessibleParentWindow() const; + virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual void GrabFocus() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; + virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; /** Creates and returns the accessible object of the whole BrowseBox. */ - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); + virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE; + virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE; }; #endif // INCLUDED_SVTOOLS_SVTABBX_HXX diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index ca025cc86396..0c7751a404fe 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -412,14 +412,14 @@ public: TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); virtual ~TabBar(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Select(); virtual void DoubleClick(); @@ -555,7 +555,7 @@ public: const Link& GetScrollAreaContextHdl() const { return maScrollAreaContextHdl; } // accessibility - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; #endif // INCLUDED_SVTOOLS_TABBAR_HXX diff --git a/include/svtools/table/defaultinputhandler.hxx b/include/svtools/table/defaultinputhandler.hxx index 11544fd5369c..e1079163cf91 100644 --- a/include/svtools/table/defaultinputhandler.hxx +++ b/include/svtools/table/defaultinputhandler.hxx @@ -44,16 +44,16 @@ namespace svt { namespace table DefaultInputHandler(); ~DefaultInputHandler(); - virtual bool MouseMove ( ITableControl& _rControl, const MouseEvent& rMEvt ); - virtual bool MouseButtonDown ( ITableControl& _rControl, const MouseEvent& rMEvt ); - virtual bool MouseButtonUp ( ITableControl& _rControl, const MouseEvent& rMEvt ); - virtual bool KeyInput ( ITableControl& _rControl, const KeyEvent& rKEvt ); - virtual bool GetFocus ( ITableControl& _rControl ); - virtual bool LoseFocus ( ITableControl& _rControl ); - virtual bool RequestHelp ( ITableControl& _rControl, const HelpEvent& rHEvt ); - virtual bool Command ( ITableControl& _rControl, const CommandEvent& rCEvt ); - virtual bool PreNotify ( ITableControl& _rControl, NotifyEvent& rNEvt ); - virtual bool Notify ( ITableControl& _rControl, NotifyEvent& rNEvt ); + virtual bool MouseMove ( ITableControl& _rControl, const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual bool MouseButtonDown ( ITableControl& _rControl, const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual bool MouseButtonUp ( ITableControl& _rControl, const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual bool KeyInput ( ITableControl& _rControl, const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual bool GetFocus ( ITableControl& _rControl ) SAL_OVERRIDE; + virtual bool LoseFocus ( ITableControl& _rControl ) SAL_OVERRIDE; + virtual bool RequestHelp ( ITableControl& _rControl, const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual bool Command ( ITableControl& _rControl, const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual bool PreNotify ( ITableControl& _rControl, NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify ( ITableControl& _rControl, NotifyEvent& rNEvt ) SAL_OVERRIDE; }; diff --git a/include/svtools/table/gridtablerenderer.hxx b/include/svtools/table/gridtablerenderer.hxx index 6842fc33cda2..8022c81ec6af 100644 --- a/include/svtools/table/gridtablerenderer.hxx +++ b/include/svtools/table/gridtablerenderer.hxx @@ -68,34 +68,34 @@ namespace svt { namespace table virtual void PaintHeaderArea( OutputDevice& _rDevice, const Rectangle& _rArea, bool _bIsColHeaderArea, bool _bIsRowHeaderArea, - const StyleSettings& _rStyle ); + const StyleSettings& _rStyle ) SAL_OVERRIDE; virtual void PaintColumnHeader( ColPos _nCol, bool _bActive, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle ); + const StyleSettings& _rStyle ) SAL_OVERRIDE; virtual void PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rRowArea, - const StyleSettings& _rStyle ); + const StyleSettings& _rStyle ) SAL_OVERRIDE; virtual void PaintRowHeader( bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle ); + const StyleSettings& _rStyle ) SAL_OVERRIDE; virtual void PaintCell( ColPos const i_col, bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle ); - virtual void ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect); - virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect); + const StyleSettings& _rStyle ) SAL_OVERRIDE; + virtual void ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; + virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; virtual bool FitsIntoCell( ::com::sun::star::uno::Any const & i_cellContent, ColPos const i_colPos, RowPos const i_rowPos, bool const i_active, bool const i_selected, OutputDevice& i_targetDevice, Rectangle const & i_targetArea - ) const; + ) const SAL_OVERRIDE; virtual bool GetFormattedCellString( ::com::sun::star::uno::Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, OUString & o_cellString - ) const; + ) const SAL_OVERRIDE; private: struct CellRenderContext; diff --git a/include/svtools/table/tablecontrol.hxx b/include/svtools/table/tablecontrol.hxx index e04ba5bbbc57..d8c5bf24c2a9 100644 --- a/include/svtools/table/tablecontrol.hxx +++ b/include/svtools/table/tablecontrol.hxx @@ -82,7 +82,7 @@ namespace svt { namespace table if there is no active cell, e.g. because the table does not contain any rows or columns. */ - sal_Int32 GetCurrentRow() const; + sal_Int32 GetCurrentRow() const SAL_OVERRIDE; ITableControl& getTableControlInterface(); @@ -96,7 +96,7 @@ namespace svt { namespace table if there is no active cell, e.g. because the table does not contain any rows or columns. */ - sal_Int32 GetCurrentColumn() const; + sal_Int32 GetCurrentColumn() const SAL_OVERRIDE; /** activates the cell at the given position @@ -134,7 +134,7 @@ namespace svt { namespace table return GoTo( GetCurrentColumn(), _nRow ); } - SVT_DLLPRIVATE virtual void Resize(); + SVT_DLLPRIVATE virtual void Resize() SAL_OVERRIDE; virtual void Select(); /**after removing a row, updates the vector which contains the selected rows @@ -144,18 +144,18 @@ namespace svt { namespace table Window& getDataWindow(); // Window overridables - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void StateChanged( StateChangedType i_nStateChange ); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType i_nStateChange ) SAL_OVERRIDE; /** Creates and returns the accessible object of the whole GridControl. */ - SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); - SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ); - SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const; - SVT_DLLPRIVATE virtual bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ); - SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const; - SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const; + SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) SAL_OVERRIDE; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const SAL_OVERRIDE; + SVT_DLLPRIVATE virtual bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ) SAL_OVERRIDE; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const SAL_OVERRIDE; + SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const SAL_OVERRIDE; // temporary methods // Those do not really belong into the public API - they're intended for firing A11Y-related events. However, @@ -166,38 +166,38 @@ namespace svt { namespace table // IAccessibleTable - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; - virtual void GrabFocus(); - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); - virtual Window* GetAccessibleParentWindow() const; - virtual Window* GetWindowInstance(); - virtual sal_Int32 GetAccessibleControlCount() const; - virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ); - virtual long GetRowCount() const; - virtual long GetColumnCount() const; - virtual bool HasRowHeader() const; - virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ); - virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ); - virtual Rectangle calcHeaderCellRect( bool _bIsColumnBar, sal_Int32 nPos); - virtual Rectangle calcTableRect( bool _bOnScreen = true ); - virtual Rectangle calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos ); - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); - virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const; - virtual OUString GetRowDescription( sal_Int32 _nRow ) const; - virtual OUString GetRowName(sal_Int32 _nIndex) const; - virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const; - virtual OUString GetColumnName( sal_Int32 _nIndex ) const; - virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const; - virtual bool HasRowHeader(); - virtual bool HasColHeader(); - virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const; - - virtual sal_Int32 GetSelectedRowCount() const; - virtual sal_Int32 GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const; - virtual bool IsRowSelected( sal_Int32 const i_rowIndex ) const; - virtual void SelectRow( sal_Int32 const i_rowIndex, bool const i_select ); - virtual void SelectAllRows( bool const i_select ); + virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual void GrabFocus() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; + virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual Window* GetWindowInstance() SAL_OVERRIDE; + virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; + virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) SAL_OVERRIDE; + virtual long GetRowCount() const SAL_OVERRIDE; + virtual long GetColumnCount() const SAL_OVERRIDE; + virtual bool HasRowHeader() const SAL_OVERRIDE; + virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ) SAL_OVERRIDE; + virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) SAL_OVERRIDE; + virtual Rectangle calcHeaderCellRect( bool _bIsColumnBar, sal_Int32 nPos) SAL_OVERRIDE; + virtual Rectangle calcTableRect( bool _bOnScreen = true ) SAL_OVERRIDE; + virtual Rectangle calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos ) SAL_OVERRIDE; + virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE; + virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE; + virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const SAL_OVERRIDE; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const SAL_OVERRIDE; + virtual OUString GetRowName(sal_Int32 _nIndex) const SAL_OVERRIDE; + virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const SAL_OVERRIDE; + virtual OUString GetColumnName( sal_Int32 _nIndex ) const SAL_OVERRIDE; + virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const SAL_OVERRIDE; + virtual bool HasRowHeader() SAL_OVERRIDE; + virtual bool HasColHeader() SAL_OVERRIDE; + virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const SAL_OVERRIDE; + + virtual sal_Int32 GetSelectedRowCount() const SAL_OVERRIDE; + virtual sal_Int32 GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const SAL_OVERRIDE; + virtual bool IsRowSelected( sal_Int32 const i_rowIndex ) const SAL_OVERRIDE; + virtual void SelectRow( sal_Int32 const i_rowIndex, bool const i_select ) SAL_OVERRIDE; + virtual void SelectAllRows( bool const i_select ) SAL_OVERRIDE; private: diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 61853ac29a8a..238fa2a6083e 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -56,15 +56,15 @@ public: ~ToolbarMenu(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; void appendEntry( int nEntryId, const OUString& rStr, MenuItemBits nItemBits = 0 ); void appendEntry( int nEntryId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits = 0 ); @@ -92,7 +92,7 @@ public: void highlightFirstEntry(); protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; // todo: move to new base class that will replace SfxPopupWindow void AddStatusListener( const OUString& rCommandURL ); @@ -104,8 +104,8 @@ protected: // the status updates): virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: DECL_LINK( HighlightHdl, Control * ); diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 06127e027312..a8a6e657bc4b 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -75,44 +75,44 @@ class SVT_DLLPUBLIC ToolboxController : void updateStatus(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) 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, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener using cppu::OPropertySetHelper::disposing; - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception); - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; const OUString& getCommandURL() const { return m_aCommandURL; } diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index c5867111db14..ed829ea21de7 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -56,22 +56,22 @@ namespace svt DECLARE_IREFERENCE() // IDeckLayouter - virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ); - virtual void Destroy(); - virtual void SetFocusToPanelSelector(); - virtual size_t GetAccessibleChildCount() const; + virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ) SAL_OVERRIDE; + virtual void Destroy() SAL_OVERRIDE; + virtual void SetFocusToPanelSelector() SAL_OVERRIDE; + virtual size_t GetAccessibleChildCount() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessibleChild( const size_t i_nChildIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible - ); + ) SAL_OVERRIDE; // IToolPanelDeckListener - virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ); - virtual void PanelRemoved( const size_t i_nPosition ); - virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); - virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ); - virtual void Dying(); + virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) SAL_OVERRIDE; + virtual void PanelRemoved( const size_t i_nPosition ) SAL_OVERRIDE; + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) SAL_OVERRIDE; + virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ) SAL_OVERRIDE; + virtual void Dying() SAL_OVERRIDE; private: // triggers a re-arrance of the panel deck elements diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index 35323d7aee6e..b4f7b6ac58b3 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -65,23 +65,23 @@ namespace svt PushButton& GetScrollButton( const bool i_bForward ); // Window overridables - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; protected: // Window overridables - virtual void Paint( const Rectangle& i_rRect ); - virtual void Resize(); - virtual void MouseMove( const MouseEvent& i_rMouseEvent ); - virtual void MouseButtonDown( const MouseEvent& i_rMouseEvent ); - virtual void MouseButtonUp( const MouseEvent& i_rMouseEvent ); - virtual void RequestHelp( const HelpEvent& i_rHelpEvent ); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void KeyInput( const KeyEvent& i_rKeyEvent ); - virtual void DataChanged( const DataChangedEvent& i_rDataChanedEvent ); + virtual void Paint( const Rectangle& i_rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& i_rMouseEvent ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& i_rMouseEvent ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& i_rMouseEvent ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& i_rHelpEvent ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& i_rKeyEvent ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& i_rDataChanedEvent ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool i_bCreate ); + GetComponentInterface( sal_Bool i_bCreate ) SAL_OVERRIDE; private: ::std::auto_ptr< PanelTabBar_Impl > m_pImpl; diff --git a/include/svtools/toolpanel/refbase.hxx b/include/svtools/toolpanel/refbase.hxx index 7de482b37693..15fda1805fb1 100644 --- a/include/svtools/toolpanel/refbase.hxx +++ b/include/svtools/toolpanel/refbase.hxx @@ -44,16 +44,16 @@ namespace svt { } - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; private: oslInterlockedCount m_refCount; }; #define DECLARE_IREFERENCE() \ - virtual oslInterlockedCount SAL_CALL acquire(); \ - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; \ + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; #define IMPLEMENT_IREFERENCE( classname ) \ diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx index 72e234ea5fc1..8f9106cd2142 100644 --- a/include/svtools/toolpanel/tablayouter.hxx +++ b/include/svtools/toolpanel/tablayouter.hxx @@ -73,15 +73,15 @@ namespace svt TabAlignment GetTabAlignment() const; // IDeckLayouter - virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ); - virtual void Destroy(); - virtual void SetFocusToPanelSelector(); - virtual size_t GetAccessibleChildCount() const; + virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ) SAL_OVERRIDE; + virtual void Destroy() SAL_OVERRIDE; + virtual void SetFocusToPanelSelector() SAL_OVERRIDE; + virtual size_t GetAccessibleChildCount() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessibleChild( const size_t i_nChildIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible - ); + ) SAL_OVERRIDE; // IReference DECLARE_IREFERENCE() diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index 7423d75e0488..0a046553f7ce 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -152,24 +152,24 @@ namespace svt const ::Window& GetPanelWindowAnchor() const; // IToolPanelDeck - virtual size_t GetPanelCount() const; - virtual PToolPanel GetPanel( const size_t i_nPos ) const; + virtual size_t GetPanelCount() const SAL_OVERRIDE; + virtual PToolPanel GetPanel( const size_t i_nPos ) const SAL_OVERRIDE; virtual ::boost::optional< size_t > - GetActivePanel() const; - virtual void ActivatePanel( const ::boost::optional< size_t >& i_rPanel ); - virtual size_t InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ); - virtual PToolPanel RemovePanel( const size_t i_nPosition ); - virtual void AddListener( IToolPanelDeckListener& i_rListener ); - virtual void RemoveListener( IToolPanelDeckListener& i_rListener ); + GetActivePanel() const SAL_OVERRIDE; + virtual void ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) SAL_OVERRIDE; + virtual size_t InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) SAL_OVERRIDE; + virtual PToolPanel RemovePanel( const size_t i_nPosition ) SAL_OVERRIDE; + virtual void AddListener( IToolPanelDeckListener& i_rListener ) SAL_OVERRIDE; + virtual void RemoveListener( IToolPanelDeckListener& i_rListener ) SAL_OVERRIDE; protected: // Window overridables - virtual void Resize(); - virtual bool Notify( NotifyEvent& i_rNotifyEvent ); - virtual void GetFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& i_rNotifyEvent ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool i_bCreate ); + GetComponentInterface( sal_Bool i_bCreate ) SAL_OVERRIDE; private: ::std::auto_ptr< ToolPanelDeck_Impl > m_pImpl; diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 87d998dcf0fd..866c4faa4715 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -144,11 +144,11 @@ private: private: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: @@ -174,24 +174,24 @@ protected: private: // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) 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) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDragSourceListener - virtual void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: // XClipboardOwner - virtual void SAL_CALL lostOwnership( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL lostOwnership( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // derivees need to access lostOwnership in case hey override it @@ -260,7 +260,7 @@ public: public: - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; struct TransferableDataHelper_Impl; @@ -384,10 +384,10 @@ private: private: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDragGestureListener - virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: @@ -431,14 +431,14 @@ private: private: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDropTargetListener - virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: @@ -492,9 +492,9 @@ class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper protected: - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; public: diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 470c4468611b..a8c072e3b343 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -294,7 +294,7 @@ protected: virtual void ReadDragServerInfo( const Point&,SvLBoxDDInfo* ); // Invalidate children on enable/disable - virtual void StateChanged( StateChangedType eType ); + virtual void StateChanged( StateChangedType eType ) SAL_OVERRIDE; virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND); virtual sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = TREELIST_APPEND ); @@ -309,10 +309,10 @@ protected: bool IsEmptyTextAllowed() const; // Return value must be derived from SvViewDataEntry! - virtual SvViewDataEntry* CreateViewData( SvTreeListEntry* ); + virtual SvViewDataEntry* CreateViewData( SvTreeListEntry* ) SAL_OVERRIDE; // InitViewData is called right after CreateViewData // The Entry is has not yet been added to the View in InitViewData! - virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry ); + virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry ) SAL_OVERRIDE; // Calls InitViewData for all Items void RecalcViewData(); // Callback of RecalcViewData @@ -332,15 +332,15 @@ protected: void OnCurrentEntryChanged(); // IMnemonicEntryList - virtual const void* FirstSearchEntry( OUString& _rEntryText ) const; - virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, OUString& _rEntryText ) const; - virtual void SelectSearchEntry( const void* _pEntry ); - virtual void ExecuteSearchEntry( const void* _pEntry ) const; + virtual const void* FirstSearchEntry( OUString& _rEntryText ) const SAL_OVERRIDE; + virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, OUString& _rEntryText ) const SAL_OVERRIDE; + virtual void SelectSearchEntry( const void* _pEntry ) SAL_OVERRIDE; + virtual void ExecuteSearchEntry( const void* _pEntry ) const SAL_OVERRIDE; // ISearchableStringList - virtual ::vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const; - virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const; - virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ); + virtual ::vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE; + virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE; + virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE; public: @@ -350,7 +350,7 @@ public: SvTreeList* GetModel() const { return pModel; } using SvListView::SetModel; - void SetModel(SvTreeList* pNewModel); + void SetModel(SvTreeList* pNewModel) SAL_OVERRIDE; sal_uLong GetEntryCount() const {return pModel->GetEntryCount();} SvTreeListEntry* First() const { return pModel->First(); } @@ -456,9 +456,9 @@ public: // Drag & Drop // New D'n'D API - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* ); virtual void DragFinished( sal_Int8 nDropAction ); @@ -491,7 +491,7 @@ public: /** Creates and returns the accessible object of the Box. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; /** Fills the StateSet with all states (except DEFUNC, done by the accessible object). */ virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet ) const; @@ -521,7 +521,7 @@ public: void set_min_width_in_chars(sal_Int32 nChars); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; protected: using SvListView::SelectAll; @@ -578,12 +578,12 @@ protected: // This can be used to hide Elements which are painted from outside into the Control virtual void NotifyInvalidating(); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual void CursorMoved( SvTreeListEntry* pNewCursor ); virtual void PreparePaint( SvTreeListEntry* ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void InitSettings(bool bFont, bool bForeground, bool bBackground); bool IsCellFocusEnabled() const; @@ -671,25 +671,25 @@ public: virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; void SetUpdateMode( bool ); - virtual void ModelHasCleared(); - virtual void ModelHasInserted( SvTreeListEntry* pEntry ); - virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry ); + virtual void ModelHasCleared() SAL_OVERRIDE; + virtual void ModelHasInserted( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry ) SAL_OVERRIDE; virtual void ModelIsMoving(SvTreeListEntry* pSource, - SvTreeListEntry* pTargetParent, sal_uLong nChildPos ); - virtual void ModelHasMoved(SvTreeListEntry* pSource ); - virtual void ModelIsRemoving( SvTreeListEntry* pEntry ); - virtual void ModelHasRemoved( SvTreeListEntry* pEntry ); - void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ); + SvTreeListEntry* pTargetParent, sal_uLong nChildPos ) SAL_OVERRIDE; + virtual void ModelHasMoved(SvTreeListEntry* pSource ) SAL_OVERRIDE; + virtual void ModelIsRemoving( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + virtual void ModelHasRemoved( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ) SAL_OVERRIDE; void ShowTargetEmphasis( SvTreeListEntry*, bool bShow ); void ScrollOutputArea( short nDeltaEntries ); @@ -736,14 +736,14 @@ public: bool Collapse( SvTreeListEntry* pParent ); virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ); sal_uLong SelectChildren( SvTreeListEntry* pParent, bool bSelect ); - virtual void SelectAll( bool bSelect, bool bPaint = true ); + virtual void SelectAll( bool bSelect, bool bPaint = true ) SAL_OVERRIDE; void SetCurEntry( SvTreeListEntry* _pEntry ); SvTreeListEntry* GetCurEntry() const; using Window::Invalidate; - virtual void Invalidate( sal_uInt16 nFlags = 0); - virtual void Invalidate( const Rectangle&, sal_uInt16 nFlags = 0 ); + virtual void Invalidate( sal_uInt16 nFlags = 0) SAL_OVERRIDE; + virtual void Invalidate( const Rectangle&, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; void SetHighlightRange(sal_uInt16 nFirstTab=0,sal_uInt16 nLastTab=0xffff); @@ -752,7 +752,7 @@ public: DECL_LINK( DefaultCompare, SvSortData* ); virtual void ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1, - SvTreeListEntry* pEntry2, sal_uLong nPos ); + SvTreeListEntry* pEntry2, sal_uLong nPos ) SAL_OVERRIDE; void EndSelection(); void RepaintScrollBars() const; @@ -779,7 +779,7 @@ public: long getPreferredDimensions(std::vector<long> &rWidths) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; #define SV_LBOX_DD_FORMAT "SV_LBOX_DD_FORMAT" diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 91bd9ea4a0b8..c2fc7bf1c36a 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -95,7 +95,7 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess (via XNameReplace) /// calls getByName(sal_uInt16) @@ -104,39 +104,39 @@ public: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAxcess (via XNameReplace) virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess (via XNameReplace) virtual sal_Bool SAL_CALL hasByName( const OUString& rName ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess (via XNameReplace) virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess (via XNameReplace) virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo /// must be implemented in subclass virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XServiceInfo 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; // XServiceInfo virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: @@ -220,7 +220,7 @@ protected: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; using SvBaseEventDescriptor::getByName; virtual void getByName( @@ -229,7 +229,7 @@ protected: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Get the SvxMacroItem from the parent. @@ -264,7 +264,7 @@ public: //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: @@ -278,7 +278,7 @@ protected: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; using SvBaseEventDescriptor::getByName; virtual void getByName( @@ -287,7 +287,7 @@ protected: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// do we have an event? /// return sal_True: we have a macro for the event diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index 443f8f6c3665..33442d864d15 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -41,8 +41,8 @@ namespace svt OFileURLControl(Window* _pParent, WinBits nStyle); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index e3d9207a0902..fc1fd0768e5b 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -282,27 +282,27 @@ protected: protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; public: ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren = false ); ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false ); ~ValueSet(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Resize(); - virtual Size GetOptimalSize() const; - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Select(); virtual void DoubleClick(); diff --git a/include/svtools/vclxaccessibleheaderbar.hxx b/include/svtools/vclxaccessibleheaderbar.hxx index 013322adb791..e3e3f91a9ffe 100644 --- a/include/svtools/vclxaccessibleheaderbar.hxx +++ b/include/svtools/vclxaccessibleheaderbar.hxx @@ -43,23 +43,23 @@ public: HeaderBar* m_pHeadBar; virtual ~VCLXAccessibleHeaderBar(); - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; + virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow ); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateChild(sal_Int32 i); private: @@ -74,7 +74,7 @@ public: VCLXHeaderBar(Window* pHeaderBar); virtual ~VCLXHeaderBar(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; }; diff --git a/include/svtools/vclxaccessibleheaderbaritem.hxx b/include/svtools/vclxaccessibleheaderbaritem.hxx index 7fe18b29b11b..10a343904f82 100644 --- a/include/svtools/vclxaccessibleheaderbaritem.hxx +++ b/include/svtools/vclxaccessibleheaderbaritem.hxx @@ -65,7 +65,7 @@ protected: virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; public: VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ); @@ -78,35 +78,35 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 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& rServiceName ) 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; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception){}; - virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {}; + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // _SVTOOLS_VCLACCESSIBLEHEADBARITEM_HXX_ diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 94e7a4a23759..0e0ba2dbaf83 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -103,13 +103,13 @@ namespace svt ~OWizardPage(); // IWizardPageController overridables - virtual void initializePage(); - virtual bool commitPage( WizardTypes::CommitPageReason _eReason ); - virtual bool canAdvance() const; + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; protected: // TabPage overridables - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; /** updates the travel-related UI elements of the OWizardMachine we live in (if any) @@ -202,8 +202,8 @@ namespace svt protected: // WizardDialog overridables - virtual void ActivatePage(); - virtual long DeactivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual long DeactivatePage() SAL_OVERRIDE; // our own overridables diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 836fd6a7682c..698fb3680c5c 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -256,14 +256,14 @@ public: WizardDialog( Window* pParent, const ResId& rResId ); ~WizardDialog(); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void ActivatePage(); virtual long DeactivatePage(); - virtual void queue_resize(); + virtual void queue_resize() SAL_OVERRIDE; bool ShowPrevPage(); bool ShowNextPage(); diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index f99ce60e0ce4..139c51786005 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -44,8 +44,8 @@ public: XWindowItem( const XWindowItem &rItem ); ~XWindowItem(); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual bool operator == ( const SfxPoolItem& rAttr ) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual bool operator == ( const SfxPoolItem& rAttr ) const SAL_OVERRIDE; Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } com::sun::star::uno::Reference< com::sun::star::awt::XWindow > GetXWindow() const { return m_xWin; } diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx index f7e40e6af101..069e470be156 100644 --- a/include/test/bootstrapfixture.hxx +++ b/include/test/bootstrapfixture.hxx @@ -51,8 +51,8 @@ public: BootstrapFixture( bool bAssertOnDialog = true, bool bNeedUCB = true ); virtual ~BootstrapFixture(); - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() SAL_OVERRIDE; + virtual void tearDown() SAL_OVERRIDE; static void validate(const OUString& rURL, ValidationFormat); }; diff --git a/include/test/calc_unoapi_test.hxx b/include/test/calc_unoapi_test.hxx index c31c35c33fd3..6db43c103a27 100644 --- a/include/test/calc_unoapi_test.hxx +++ b/include/test/calc_unoapi_test.hxx @@ -16,8 +16,8 @@ class OOO_DLLPUBLIC_TEST CalcUnoApiTest : public UnoApiTest public: CalcUnoApiTest(const OUString& path); - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() SAL_OVERRIDE; + virtual void tearDown() SAL_OVERRIDE; private: css::uno::Reference<css::uno::XInterface> m_xCalcComponent; diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx index 0555472f1778..f0c1e9f8d7c5 100644 --- a/include/test/unoapi_test.hxx +++ b/include/test/unoapi_test.hxx @@ -22,8 +22,8 @@ public: void createFileURL(const OUString& aFileBase, OUString& rFilePath); - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() SAL_OVERRIDE; + virtual void tearDown() SAL_OVERRIDE; protected: void closeDocument( css::uno::Reference< css::lang::XComponent > xDocument ); diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index 0006e089fd89..9931be7eca66 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -56,30 +56,30 @@ namespace toolkit public: // XAnimation - virtual void SAL_CALL startAnimation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL stopAnimation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isAnimationRunning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startAnimation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL stopAnimation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isAnimationRunning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // VclWindowPeer - virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - void ProcessWindowEvent( const VclWindowEvent& i_windowEvent ); + void ProcessWindowEvent( const VclWindowEvent& i_windowEvent ) SAL_OVERRIDE; private: /** updates our images with the ones from the givem XAnimatedImages component diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx index f2f2e060f653..86be3cbc7c66 100644 --- a/include/toolkit/awt/scrollabledialog.hxx +++ b/include/toolkit/awt/scrollabledialog.hxx @@ -59,14 +59,14 @@ namespace toolkit public: ScrollableWrapper( Window* pParent, WinBits nStyle = WB_STDDIALOG ); virtual ~ScrollableWrapper(); - virtual void SetScrollWidth( long nWidth ); - virtual long GetScrollWidth() { return maScrollArea.Width(); } - virtual void SetScrollHeight( long nHeight ); - virtual long GetScrollHeight() { return maScrollArea.Height(); } - virtual void SetScrollLeft( long nLeft ); - virtual long GetScrollLeft() { return mnScrollPos.X(); } - virtual void SetScrollTop( long Top ); - virtual long GetScrollTop() { return mnScrollPos.Y() ; } + virtual void SetScrollWidth( long nWidth ) SAL_OVERRIDE; + virtual long GetScrollWidth() SAL_OVERRIDE { return maScrollArea.Width(); } + virtual void SetScrollHeight( long nHeight ) SAL_OVERRIDE; + virtual long GetScrollHeight() SAL_OVERRIDE { return maScrollArea.Height(); } + virtual void SetScrollLeft( long nLeft ) SAL_OVERRIDE; + virtual long GetScrollLeft() SAL_OVERRIDE { return mnScrollPos.X(); } + virtual void SetScrollTop( long Top ) SAL_OVERRIDE; + virtual long GetScrollTop() SAL_OVERRIDE { return mnScrollPos.Y() ; } void setScrollVisibility( ScrollBarVisibility rState ); DECL_LINK( ScrollBarHdl, ScrollBar* ); diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 6ae19d4650fe..b4a5d42e1f45 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -85,7 +85,7 @@ public: VCLXWindow* GetVCLXWindow() const { return mpVCLXindow; } Window* GetWindow() const; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::uno::XInterface DECLARE_XINTERFACE() @@ -93,33 +93,33 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 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& rServiceName ) 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; // ::com::sun::star::accessibility::XAccessibleContext - sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::accessibility::XAccessibleComponent - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::accessibility::XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // base class overridables diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx index 31c32c7d6002..e1f9864af193 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/include/toolkit/awt/vclxbitmap.hxx @@ -53,23 +53,23 @@ public: // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); static VCLXBitmap* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XBitmap - ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx index aeea9ca140ef..b765b9a7995c 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/include/toolkit/awt/vclxcontainer.hxx @@ -43,29 +43,29 @@ public: ~VCLXContainer(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XVclContainer - void SAL_CALL addVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > SAL_CALL getWindows( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > SAL_CALL getWindows( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XVclContainerPeer - void SAL_CALL enableDialogControl( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setTabOrder( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& WindowOrder, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Tabs, sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Windows ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL enableDialogControl( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setTabOrder( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& WindowOrder, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Tabs, sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Windows ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index 1657c14a97e7..8fb4428a447f 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -67,33 +67,33 @@ public: void SetCreatedWithToolkit( bool bCreatedWithToolkit ); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); static VCLXDevice* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDevice, - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL createGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor > SAL_CALL getFontDescriptors( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( const ::com::sun::star::awt::FontDescriptor& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& Bitmap ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL createGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor > SAL_CALL getFontDescriptors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( const ::com::sun::star::awt::FontDescriptor& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& Bitmap ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XUnitConversion - ::com::sun::star::awt::Point SAL_CALL convertPointToLogic( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Point SAL_CALL convertPointToPixel( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Point SAL_CALL convertPointToLogic( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Point SAL_CALL convertPointToPixel( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index 3d0f46a59976..21abe13a2847 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -56,30 +56,30 @@ public: const Font& GetFont() const { return maFont; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); static VCLXFont* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XFont - ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getStringWidth( const OUString& str ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getStringWidthArray( const OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars1, ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars2, ::com::sun::star::uno::Sequence< sal_Int16 >& rnKerns ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getStringWidth( const OUString& str ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getStringWidthArray( const OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars1, ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars2, ::com::sun::star::uno::Sequence< sal_Int16 >& rnKerns ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XFont2 - sal_Bool SAL_CALL hasGlyphs( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL hasGlyphs( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 7290e6a8f814..9f8c12660e89 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -80,59 +80,59 @@ public: const Font& GetFont() const { return maFont; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); static VCLXGraphics* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XGraphics Attributes - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL getDevice() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL getDevice() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::sal_Int32 getTextColor() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::sal_Int32 getTextFillColor() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::sal_Int32 getLineColor() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::sal_Int32 getFillColor() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::awt::RasterOperation getRasterOp() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation _rasterop ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation _rasterop ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > getFont() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& _font ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& _font ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XGraphics Methods - virtual void SAL_CALL selectFont( const ::com::sun::star::awt::FontDescriptor& aDescription ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& Clipping ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& xClipping ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL push( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL pop( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL clear( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& xSource, ::sal_Int32 nSourceX, ::sal_Int32 nSourceY, ::sal_Int32 nSourceWidth, ::sal_Int32 nSourceHeight, ::sal_Int32 nDestX, ::sal_Int32 nDestY, ::sal_Int32 nDestWidth, ::sal_Int32 nDestHeight ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& xBitmapHandle, ::sal_Int32 SourceX, ::sal_Int32 SourceY, ::sal_Int32 SourceWidth, ::sal_Int32 SourceHeight, ::sal_Int32 DestX, ::sal_Int32 DestY, ::sal_Int32 DestWidth, ::sal_Int32 DestHeight ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawPixel( ::sal_Int32 X, ::sal_Int32 Y ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawLine( ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawRoundedRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 nHorzRound, ::sal_Int32 nVertRound ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawPolyLine( const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataY ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawPolygon( const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataY ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::sal_Int32 > >& DataY ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawEllipse( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawArc( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawPie( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawChord( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int32 nX1, ::sal_Int32 nY1, ::sal_Int32 nX2, ::sal_Int32 nY2 ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawGradient( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 Height, const ::com::sun::star::awt::Gradient& aGradient ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawText( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawTextArray( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& Longs ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& aGraphic ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectFont( const ::com::sun::star::awt::FontDescriptor& aDescription ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& Clipping ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& xClipping ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL push( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL pop( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clear( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& xSource, ::sal_Int32 nSourceX, ::sal_Int32 nSourceY, ::sal_Int32 nSourceWidth, ::sal_Int32 nSourceHeight, ::sal_Int32 nDestX, ::sal_Int32 nDestY, ::sal_Int32 nDestWidth, ::sal_Int32 nDestHeight ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& xBitmapHandle, ::sal_Int32 SourceX, ::sal_Int32 SourceY, ::sal_Int32 SourceWidth, ::sal_Int32 SourceHeight, ::sal_Int32 DestX, ::sal_Int32 DestY, ::sal_Int32 DestWidth, ::sal_Int32 DestHeight ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawPixel( ::sal_Int32 X, ::sal_Int32 Y ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawLine( ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawRoundedRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 nHorzRound, ::sal_Int32 nVertRound ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawPolyLine( const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataY ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawPolygon( const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataY ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::sal_Int32 > >& DataY ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawEllipse( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawArc( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawPie( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawChord( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int32 nX1, ::sal_Int32 nY1, ::sal_Int32 nX2, ::sal_Int32 nY2 ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawGradient( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 Height, const ::com::sun::star::awt::Gradient& aGradient ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawText( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawTextArray( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& Longs ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& aGraphic ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 63fab5e97694..63b6d7ff7fd8 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -79,66 +79,66 @@ public: bool IsPopupMenu() const; // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // css::lang::XUnoTunnel static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); static VCLXMenu* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception); - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception); + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::awt::XMenu - virtual void SAL_CALL addMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL insertItem( sal_Int16 nItemId, const OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeItem( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL clear( ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getItemCount( ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getItemId( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getItemPos( sal_Int16 nId ) throw(css::uno::RuntimeException, std::exception); - virtual css::awt::MenuItemType SAL_CALL getItemType( ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL enableItem( sal_Int16 nItemId, sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isItemEnabled( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL hideDisabledEntries( ::sal_Bool bHide ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL enableAutoMnemonics( ::sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setItemText( sal_Int16 nItemId, const OUString& aText ) throw(css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getItemText( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCommand( sal_Int16 nItemId, const OUString& aCommand ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getCommand( sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHelpCommand( sal_Int16 nItemId, const OUString& aHelp ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getHelpCommand( sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const OUString& sHelpText ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const OUString& sTipHelpText ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception); - - virtual ::sal_Bool SAL_CALL isPopupMenu( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPopupMenu( sal_Int16 nItemId, const css::uno::Reference< css::awt::XPopupMenu >& aPopupMenu ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::awt::XPopupMenu > SAL_CALL getPopupMenu( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertItem( sal_Int16 nItemId, const OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeItem( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clear( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getItemCount( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getItemId( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getItemPos( sal_Int16 nId ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::MenuItemType SAL_CALL getItemType( ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL enableItem( sal_Int16 nItemId, sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isItemEnabled( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL hideDisabledEntries( ::sal_Bool bHide ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL enableAutoMnemonics( ::sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setItemText( sal_Int16 nItemId, const OUString& aText ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getItemText( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCommand( sal_Int16 nItemId, const OUString& aCommand ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getCommand( sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHelpCommand( sal_Int16 nItemId, const OUString& aHelp ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getHelpCommand( sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const OUString& sHelpText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const OUString& sTipHelpText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual ::sal_Bool SAL_CALL isPopupMenu( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPopupMenu( sal_Int16 nItemId, const css::uno::Reference< css::awt::XPopupMenu >& aPopupMenu ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XPopupMenu > SAL_CALL getPopupMenu( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::awt::XPopupMenu - virtual void SAL_CALL insertSeparator( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultItem( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getDefaultItem( ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL checkItem( sal_Int16 nItemId, sal_Bool bCheck ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isItemChecked( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception); - virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Rectangle& Position, ::sal_Int16 Direction ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isInExecute( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL endExecute( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const css::awt::KeyEvent& aKeyEvent ) throw (css::uno::RuntimeException, std::exception); - virtual css::awt::KeyEvent SAL_CALL getAcceleratorKeyEvent( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setItemImage( ::sal_Int16 nItemId, const css::uno::Reference< css::graphic::XGraphic >& xGraphic, ::sal_Bool bScale ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getItemImage( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertSeparator( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultItem( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getDefaultItem( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL checkItem( sal_Int16 nItemId, sal_Bool bCheck ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isItemChecked( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Rectangle& Position, ::sal_Int16 Direction ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isInExecute( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endExecute( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const css::awt::KeyEvent& aKeyEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::KeyEvent SAL_CALL getAcceleratorKeyEvent( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setItemImage( ::sal_Int16 nItemId, const css::uno::Reference< css::graphic::XGraphic >& xGraphic, ::sal_Bool bScale ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getItemImage( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class TOOLKIT_DLLPUBLIC VCLXMenuBar : public VCLXMenu diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 38c7f08f460d..08dd4fcf3e83 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -52,22 +52,22 @@ public: const Pointer& GetPointer() const { return maPointer; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); static VCLXPointer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XPointer - void SAL_CALL setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx index adf82e682879..a893aefaed7e 100644 --- a/include/toolkit/awt/vclxprinter.hxx +++ b/include/toolkit/awt/vclxprinter.hxx @@ -75,27 +75,27 @@ public: DECLARE_XTYPEPROVIDER(); // ::com::sun::star::beans::XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); } - ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { return OPropertySetHelper::getPropertyValue( rPropertyName ); } - void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); } + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); } + ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OPropertySetHelper::getPropertyValue( rPropertyName ); } + void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); } // ::cppu::OPropertySetHelper - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException); - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; using cppu::OPropertySetHelper::getFastPropertyValue; - void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; + void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; // ::com::sun::star::awt::XPrinterPropertySet - void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -114,27 +114,27 @@ public: ~VCLXPrinter(); // ::com::sun::star::beans::XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return VCLXPrinterPropertySet::getPropertySetInfo(); } - void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } - ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } - void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return VCLXPrinterPropertySet::getPropertySetInfo(); } + void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } + ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } + void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } // ::com::sun::star::awt::XPrinterPropertySet - void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return VCLXPrinterPropertySet::getFormDescriptions(); } - void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::selectForm( aFormDescription ); } - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return VCLXPrinterPropertySet::getBinarySetup(); } - void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::setBinarySetup( data ); } + void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return VCLXPrinterPropertySet::getFormDescriptions(); } + void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::selectForm( aFormDescription ); } + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return VCLXPrinterPropertySet::getBinarySetup(); } + void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::setBinarySetup( data ); } // ::com::sun::star::awt::XPrinter - sal_Bool SAL_CALL start( const OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL end( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL terminate( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL startPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL endPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL start( const OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL end( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL terminate( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL startPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL endPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -151,23 +151,23 @@ public: ~VCLXInfoPrinter(); // ::com::sun::star::beans::XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return VCLXPrinterPropertySet::getPropertySetInfo(); } - void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } - ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } - void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return VCLXPrinterPropertySet::getPropertySetInfo(); } + void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } + ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } + void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } // ::com::sun::star::awt::XPrinterPropertySet - void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return VCLXPrinterPropertySet::getFormDescriptions(); } - void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::selectForm( aFormDescription ); } - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return VCLXPrinterPropertySet::getBinarySetup(); } - void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { VCLXPrinterPropertySet::setBinarySetup( data ); } + void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return VCLXPrinterPropertySet::getFormDescriptions(); } + void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::selectForm( aFormDescription ); } + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return VCLXPrinterPropertySet::getBinarySetup(); } + void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { VCLXPrinterPropertySet::setBinarySetup( data ); } // ::com::sun::star::awt::XInfoPrinter - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -180,9 +180,9 @@ class VCLXPrinterServer : public VCLXPrinterServer_Base { public: // ::com::sun::star::awt::XPrinterServer - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > SAL_CALL createPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > SAL_CALL createPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 6e6948f18709..2306b41f086b 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -53,32 +53,32 @@ public: const Region& GetRegion() const { return maRegion; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); static VCLXRegion* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XRegion - ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL unionRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL intersectRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL excludeRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL xOrRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL unionRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL intersectRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL excludeRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL xOrRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::awt::Rectangle > SAL_CALL getRectangles() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL unionRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL intersectRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL excludeRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL xOrRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL unionRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL intersectRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL excludeRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL xOrRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::awt::Rectangle > SAL_CALL getRectangles() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index 1743583a2d1a..2128d477bba1 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -55,29 +55,29 @@ namespace toolkit DECLARE_XTYPEPROVIDER() // XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSpinValue - virtual void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( sal_Int32 n ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMinimum( sal_Int32 minValue ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getMinimum( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getMaximum( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSpinIncrement( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getOrientation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( sal_Int32 n ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMinimum( sal_Int32 minValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getMinimum( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getMaximum( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSpinIncrement( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getOrientation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // VclWindowPeer - virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // VCLXWindow - void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ); + void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) SAL_OVERRIDE; private: VCLXSpinButton( const VCLXSpinButton& ); // never implemented diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx index e00e65660977..d930b4c003af 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx @@ -40,16 +40,16 @@ public: ~VCLXSystemDependentWindow(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XSystemDependendtWindowPeer - ::com::sun::star::uno::Any SAL_CALL getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx index 19b9d3ca7b54..a1e72cbf493e 100644 --- a/include/toolkit/awt/vclxtabpagecontainer.hxx +++ b/include/toolkit/awt/vclxtabpagecontainer.hxx @@ -45,33 +45,33 @@ public: ~VCLXTabPageContainer(); // ::com::sun::star::awt::XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDevice, - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::grid::XTabPageContainer - virtual ::sal_Int16 SAL_CALL getActiveTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int16 SAL_CALL getTabPageCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL getActiveTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getTabPageCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; private: TabPageListenerMultiplexer m_aTabPageListeners; ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > > m_aTabPages; diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index e37fb0314ec6..08599fb0556f 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -55,27 +55,27 @@ public: virtual ~VCLXTopWindow_Base(); // XInterface equivalents - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider equivalents - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XSystemDependentWindowPeer - ::com::sun::star::uno::Any SAL_CALL getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTopWindow - void SAL_CALL addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL toFront() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL toBack() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& xMenu ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL toFront() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL toBack() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& xMenu ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTopWindow2 - virtual ::sal_Bool SAL_CALL getIsMaximized() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setIsMaximized( ::sal_Bool _ismaximized ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getIsMinimized() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setIsMinimized( ::sal_Bool _isminimized ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getDisplay() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + virtual ::sal_Bool SAL_CALL getIsMaximized() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setIsMaximized( ::sal_Bool _ismaximized ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getIsMinimized() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setIsMinimized( ::sal_Bool _isminimized ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getDisplay() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; }; @@ -86,24 +86,24 @@ class TOOLKIT_DLLPUBLIC VCLXTopWindow: public VCLXTopWindow_Base, public VCLXContainer { protected: - virtual Window* GetWindowImpl(); - virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl(); + virtual Window* GetWindowImpl() SAL_OVERRIDE; + virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() SAL_OVERRIDE; public: VCLXTopWindow(bool bWHWND = false); ~VCLXTopWindow(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index 399459a17649..b9bfceefe958 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -139,97 +139,97 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); static VCLXWindow* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XWindow - void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setEnable( sal_Bool Enable ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setEnable( sal_Bool Enable ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XWindowPeer - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > SAL_CALL getToolkit( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setPointer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer >& Pointer ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setBackground( sal_Int32 Color ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL invalidate( sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL invalidateRect( const ::com::sun::star::awt::Rectangle& Rect, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > SAL_CALL getToolkit( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setPointer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer >& Pointer ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setBackground( sal_Int32 Color ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL invalidate( sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL invalidateRect( const ::com::sun::star::awt::Rectangle& Rect, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XVclWindowPeer - sal_Bool SAL_CALL isChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Peer ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isDesignMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL enableClipSiblings( sal_Bool bClip ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setForeground( sal_Int32 Color ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setControlFont( const ::com::sun::star::awt::FontDescriptor& aFont ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Peer ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isDesignMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL enableClipSiblings( sal_Bool bClip ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setForeground( sal_Int32 Color ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setControlFont( const ::com::sun::star::awt::FontDescriptor& aFont ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, - std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XView - sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& aDevice ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& aDevice ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::accessibility::XAccessible - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDockableWindow - void SAL_CALL addDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL enableDocking( sal_Bool bEnable ) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isFloating( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFloatingMode( sal_Bool bFloating ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL unlock( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL startPopupMode( const ::com::sun::star::awt::Rectangle& WindowRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isInPopupMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL enableDocking( sal_Bool bEnable ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isFloating( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFloatingMode( sal_Bool bFloating ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL unlock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL startPopupMode( const ::com::sun::star::awt::Rectangle& WindowRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isInPopupMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XWindow2 - void SAL_CALL setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getOutputSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isEnabled( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL hasFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getOutputSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isEnabled( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL hasFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XPropertySetInfo - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - ::sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStyleSettingsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 3ace6c255019..90e2f804f583 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -120,11 +120,11 @@ protected: protected: // ::com::sun::star::awt::XWindow - void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** forward our bitmap to our window @@ -138,7 +138,7 @@ protected: public: static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -157,38 +157,38 @@ private: ItemListenerMultiplexer maItemListeners; protected: - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: VCLXButton(); ~VCLXButton(); // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XButton - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XToggleButton // ::com::sun::star::awt::XItemEventBroadcaster - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -201,19 +201,19 @@ public: ~VCLXImageControl(); // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } protected: - virtual void ImplSetNewImage(); + virtual void ImplSetNewImage() SAL_OVERRIDE; }; @@ -229,49 +229,49 @@ private: ItemListenerMultiplexer maItemListeners; protected: - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: VCLXCheckBox(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XCheckBox - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setState( sal_Int16 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setState( sal_Int16 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XButton: - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -288,47 +288,47 @@ private: protected: void ImplClickedOrToggled( bool bToggled ); - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: VCLXRadioButton(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XRadioButton - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XButton: - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -343,27 +343,27 @@ public: ~VCLXMessageBox(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XMessageBox - void SAL_CALL setCaptionText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getCaptionText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMessageText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getMessageText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setCaptionText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getCaptionText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMessageText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getMessageText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -372,32 +372,32 @@ public: class VCLXFrame : public VCLXContainer { protected: - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; public: VCLXFrame(); ~VCLXFrame(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDevice, - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -413,35 +413,35 @@ public: ~VCLXDialog(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDialog2 - virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHelpId( const OUString& Id ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHelpId( const OUString& Id ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDialog - void SAL_CALL setTitle( const OUString& Title ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getTitle( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL endExecute( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setTitle( const OUString& Title ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getTitle( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL endExecute( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDevice, - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -455,26 +455,26 @@ public: ~VCLXTabPage(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDevice, - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; TabPage* getTabPage() const throw ( ::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; class VCLXMultiPage : public ::com::sun::star::awt::XSimpleTabController, public VCLXContainer @@ -482,49 +482,49 @@ class VCLXMultiPage : public ::com::sun::star::awt::XSimpleTabController, public TabListenerMultiplexer maTabListeners; sal_Int32 mTabId; protected: - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; public: VCLXMultiPage(); ~VCLXMultiPage(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDevice, - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSimpleTabController - virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // C++ TabControl* getTabControl() const throw ( ::com::sun::star::uno::RuntimeException); sal_uInt16 insertTab( TabPage*, OUString& sTitle ); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -538,48 +538,48 @@ private: ActionListenerMultiplexer maActionListeners; protected: - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - CreateAccessibleContext(); + CreateAccessibleContext() SAL_OVERRIDE; public: VCLXFixedHyperlink(); ~VCLXFixedHyperlink(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XFixedHyperlink - void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getURL( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getURL( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -589,34 +589,34 @@ class VCLXFixedText : public ::com::sun::star::awt::XFixedText, public VCLXWindow { protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: VCLXFixedText(); ~VCLXFixedText(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XFixedText - void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -629,55 +629,55 @@ private: AdjustmentListenerMultiplexer maAdjustmentListeners; protected: - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: VCLXScrollBar(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XScrollbar - void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getMaximum( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getLineIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getBlockIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getVisibleSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getOrientation( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getMaximum( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getLineIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getBlockIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getVisibleSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getOrientation( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // why isn't this part of the XScrollbar? void SAL_CALL setMinimum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException); sal_Int32 SAL_CALL getMinimum( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static ::com::sun::star::awt::Size SAL_CALL implGetMinimumSize( Window* p ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -692,8 +692,8 @@ private: TextListenerMultiplexer maTextListeners; protected: - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: @@ -702,50 +702,50 @@ public: TextListenerMultiplexer& GetTextListeners() { return maTextListeners; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTextComponent - void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getMaxTextLen( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getMaxTextLen( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTextEditField: - void SAL_CALL setEchoChar( sal_Unicode cEcho ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setEchoChar( sal_Unicode cEcho ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTextLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -763,66 +763,66 @@ private: ItemListenerMultiplexer maItemListeners; protected: - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - CreateAccessibleContext(); + CreateAccessibleContext() SAL_OVERRIDE; void ImplCallItemListeners(); public: VCLXListBox(); // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XListBox - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getSelectedItemPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getSelectedItem( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isMutipleMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL makeVisible( sal_Int16 nEntry ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getSelectedItemPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getSelectedItem( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isMutipleMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL makeVisible( sal_Int16 nEntry ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTextLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XItemListListener - virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -838,8 +838,8 @@ private: ItemListenerMultiplexer maItemListeners; protected: - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: @@ -847,46 +847,46 @@ public: ~VCLXComboBox(); // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XComboBox - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTextLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XItemListListener - virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -899,32 +899,32 @@ private: SpinListenerMultiplexer maSpinListeners; protected: - void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; public: VCLXSpinField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XSpinField - void SAL_CALL addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL up( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL down( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL first( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL last( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL up( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL down( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL first( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL last( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -948,11 +948,11 @@ public: bool isStrictFormat(); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -962,45 +962,45 @@ class TOOLKIT_DLLPUBLIC VCLXDateField : public ::com::sun::star::awt::XDateField public VCLXFormattedSpinField { protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: VCLXDateField(); ~VCLXDateField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDateField - void SAL_CALL setDate( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Date SAL_CALL getDate( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMin( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Date SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMax( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Date SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFirst( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Date SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLast( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Date SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isLongFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setDate( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Date SAL_CALL getDate( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMin( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Date SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMax( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Date SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFirst( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Date SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLast( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Date SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isLongFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -1010,42 +1010,42 @@ class VCLXTimeField : public ::com::sun::star::awt::XTimeField, public VCLXFormattedSpinField { protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: VCLXTimeField(); ~VCLXTimeField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTimeField - void SAL_CALL setTime( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Time SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMin( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Time SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMax( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Time SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFirst( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Time SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLast( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Time SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setTime( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Time SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMin( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Time SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMax( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Time SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFirst( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Time SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLast( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Time SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -1059,38 +1059,38 @@ public: ~VCLXNumericField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XNumericField - void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -1109,40 +1109,40 @@ public: ~VCLXMetricField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XMetricField - virtual void SAL_CALL setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int64 SAL_CALL getValue( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int64 SAL_CALL getCorrectedValue( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMin( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int64 SAL_CALL getMin( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMax( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int64 SAL_CALL getMax( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFirst( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int64 SAL_CALL getFirst( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLast( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int64 SAL_CALL getLast( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSpinSize( ::sal_Int64 Value ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int64 SAL_CALL getSpinSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDecimalDigits( ::sal_Int16 nDigits ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int16 SAL_CALL getDecimalDigits( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStrictFormat( ::sal_Bool bStrict ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isStrictFormat( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getValue( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getCorrectedValue( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMin( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getMin( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMax( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getMax( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFirst( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getFirst( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLast( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getLast( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSpinSize( ::sal_Int64 Value ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getSpinSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDecimalDigits( ::sal_Int16 nDigits ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getDecimalDigits( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStrictFormat( ::sal_Bool bStrict ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isStrictFormat( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -1156,39 +1156,39 @@ public: ~VCLXCurrencyField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XCurrencyField - void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -1202,29 +1202,29 @@ public: ~VCLXPatternField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XPatternField - void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getString( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } }; @@ -1236,7 +1236,7 @@ private: protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - CreateAccessibleContext(); + CreateAccessibleContext() SAL_OVERRIDE; public: VCLXToolBox(); diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index 6df972d1bdd9..3c151804847a 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -88,25 +88,25 @@ namespace toolkit DECLARE_XTYPEPROVIDER( ) // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener using comphelper::OAccessibleContextHelper::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: // retrieves the value of a string property from the model, if the property is present diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx index 58e7b2f337da..075fcf91906f 100644 --- a/include/toolkit/controls/animatedimages.hxx +++ b/include/toolkit/controls/animatedimages.hxx @@ -46,41 +46,41 @@ namespace toolkit AnimatedImagesControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_factory ); AnimatedImagesControlModel( const AnimatedImagesControlModel& i_copySource ); - virtual UnoControlModel* Clone() const; + virtual UnoControlModel* Clone() const SAL_OVERRIDE; // XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAnimatedImages - virtual ::sal_Int32 SAL_CALL getStepTime() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStepTime( ::sal_Int32 _steptime ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoRepeat() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoRepeat( ::sal_Bool _autorepeat ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int16 SAL_CALL getScaleMode() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getImageSetCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getImageSet( ::sal_Int32 i_index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL insertImageSet( ::sal_Int32 i_index, const ::com::sun::star::uno::Sequence< OUString >& i_imageURLs ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL replaceImageSet( ::sal_Int32 i_index, const ::com::sun::star::uno::Sequence< OUString >& i_imageURLs ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeImageSet( ::sal_Int32 i_index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getStepTime() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStepTime( ::sal_Int32 _steptime ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoRepeat() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoRepeat( ::sal_Bool _autorepeat ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getScaleMode() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getImageSetCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getImageSet( ::sal_Int32 i_index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertImageSet( ::sal_Int32 i_index, const ::com::sun::star::uno::Sequence< OUString >& i_imageURLs ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL replaceImageSet( ::sal_Int32 i_index, const ::com::sun::star::uno::Sequence< OUString >& i_imageURLs ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeImageSet( ::sal_Int32 i_index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAnimatedImages::XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: ~AnimatedImagesControlModel(); - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; private: ::boost::scoped_ptr< AnimatedImagesControlModel_Data > diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index 90abe782b8db..b52eca5a3c3c 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -91,8 +91,8 @@ protected: void Clone_Impl(ControlModelContainerBase& _rClone) const; protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; UnoControlModelHolderList::iterator ImplFindElement( const OUString& rName ); @@ -102,73 +102,73 @@ public: ControlModelContainerBase( const ControlModelContainerBase& rModel ); ~ControlModelContainerBase(); - UnoControlModel* Clone() const; + UnoControlModel* Clone() const SAL_OVERRIDE; // ::com::sun::star::container::XContainer - void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XElementAcces - ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess - void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XMultiServiceFactory - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTabControllerModel - virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getGroupCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, OUString& Name ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL getGroupByName( const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getGroupCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, OUString& Name ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL getGroupByName( const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChangesNotifier - virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener using cppu::OPropertySetHelper::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED(ControlModelContainerBase, ControlModel_Base, "toolkit.ControlModelContainerBase" ) // XInitialization virtual void SAL_CALL initialize (const com::sun::star::uno::Sequence<com::sun::star::uno::Any>& rArguments) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::tab::XTabPageModel - virtual ::sal_Int16 SAL_CALL getTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getEnabled() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getToolTip() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL getTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getEnabled() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getToolTip() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: void startControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel ); @@ -191,15 +191,15 @@ class ResourceListener :public ::com::sun::star::util::XModifyListener, void stopListening(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > m_xResource; @@ -240,30 +240,30 @@ public: DECLIMPL_SERVICEINFO_DERIVED( ControlContainerBase, UnoControlBase, "toolkit.ControlContainerBase" ) - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XContainerListener - void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChangesListener - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyListener // Using a dummy/no-op implementation here, not sure if every container control needs // to implement this, certainly Dialog does, lets see about others - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) {} + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {} protected: - virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ) throw(::com::sun::star::uno::RuntimeException); - virtual void removingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); - virtual void addingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); + virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual void removingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ) SAL_OVERRIDE; + virtual void addingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ) SAL_OVERRIDE; }; #endif diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx index 33e259ec9c68..6f86969590cf 100644 --- a/include/toolkit/controls/dialogcontrol.hxx +++ b/include/toolkit/controls/dialogcontrol.hxx @@ -50,105 +50,105 @@ public: UnoDialogControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ~UnoDialogControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTopWindow - void SAL_CALL addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL toFront( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL toBack( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& xMenu ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL toFront( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL toBack( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& xMenu ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XWindowListener - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDialog2 - virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHelpId( const OUString& Id ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHelpId( const OUString& Id ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XDialog - void SAL_CALL setTitle( const OUString& Title ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getTitle() throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL execute() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL endExecute() throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setTitle( const OUString& Title ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getTitle() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL execute() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL endExecute() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // resolve some ambigous methods - virtual com::sun::star::uno::Reference<com::sun::star::awt::XWindowPeer> SAL_CALL getPeer() throw (com::sun::star::uno::RuntimeException, std::exception) + virtual com::sun::star::uno::Reference<com::sun::star::awt::XWindowPeer> SAL_CALL getPeer() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoDialogControl_Base::ControlContainerBase::getPeer(); } - virtual void SAL_CALL addWindowListener(const com::sun::star::uno::Reference<com::sun::star::awt::XWindowListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addWindowListener(const com::sun::star::uno::Reference<com::sun::star::awt::XWindowListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::addWindowListener(p1); } - virtual com::sun::star::uno::Reference<com::sun::star::awt::XControlModel> SAL_CALL getModel() throw (com::sun::star::uno::RuntimeException, std::exception) + virtual com::sun::star::uno::Reference<com::sun::star::awt::XControlModel> SAL_CALL getModel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoDialogControl_Base::ControlContainerBase::getModel(); } - virtual void SAL_CALL addEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::addEventListener(p1); } - virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::removeEventListener(p1); } - virtual void SAL_CALL setContext(const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL setContext(const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::setContext(p1); } - virtual com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL getContext() throw (com::sun::star::uno::RuntimeException, std::exception) + virtual com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL getContext() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoDialogControl_Base::ControlContainerBase::getContext(); } - virtual com::sun::star::uno::Reference<com::sun::star::awt::XView> SAL_CALL getView() throw (com::sun::star::uno::RuntimeException, std::exception) + virtual com::sun::star::uno::Reference<com::sun::star::awt::XView> SAL_CALL getView() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoDialogControl_Base::ControlContainerBase::getView(); } - virtual void SAL_CALL setDesignMode(sal_Bool p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL setDesignMode(sal_Bool p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::setDesignMode(p1); } - virtual sal_Bool SAL_CALL isDesignMode() throw (com::sun::star::uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL isDesignMode() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoDialogControl_Base::ControlContainerBase::isDesignMode(); } - virtual sal_Bool SAL_CALL isTransparent() throw (com::sun::star::uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL isTransparent() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoDialogControl_Base::ControlContainerBase::isTransparent(); } - virtual void SAL_CALL setPosSize(sal_Int32 p1, sal_Int32 p2, sal_Int32 p3, sal_Int32 p4, sal_Int16 p5) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL setPosSize(sal_Int32 p1, sal_Int32 p2, sal_Int32 p3, sal_Int32 p4, sal_Int16 p5) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::setPosSize(p1, p2, p3, p4, p5); } - virtual com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw (com::sun::star::uno::RuntimeException, std::exception) + virtual com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoDialogControl_Base::ControlContainerBase::getPosSize(); } - virtual void SAL_CALL setVisible(sal_Bool p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL setVisible(sal_Bool p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::setVisible(p1); } - virtual void SAL_CALL setEnable(sal_Bool p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL setEnable(sal_Bool p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::setEnable(p1); } - virtual void SAL_CALL setFocus() throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL setFocus() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::setFocus(); } - virtual void SAL_CALL removeWindowListener(const com::sun::star::uno::Reference<com::sun::star::awt::XWindowListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeWindowListener(const com::sun::star::uno::Reference<com::sun::star::awt::XWindowListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::removeWindowListener(p1); } - virtual void SAL_CALL addFocusListener(const com::sun::star::uno::Reference<com::sun::star::awt::XFocusListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addFocusListener(const com::sun::star::uno::Reference<com::sun::star::awt::XFocusListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::addFocusListener(p1); } - virtual void SAL_CALL removeFocusListener(const com::sun::star::uno::Reference<com::sun::star::awt::XFocusListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeFocusListener(const com::sun::star::uno::Reference<com::sun::star::awt::XFocusListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::removeFocusListener(p1); } - virtual void SAL_CALL addKeyListener(const com::sun::star::uno::Reference<com::sun::star::awt::XKeyListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addKeyListener(const com::sun::star::uno::Reference<com::sun::star::awt::XKeyListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::addKeyListener(p1); } - virtual void SAL_CALL removeKeyListener(const com::sun::star::uno::Reference<com::sun::star::awt::XKeyListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeKeyListener(const com::sun::star::uno::Reference<com::sun::star::awt::XKeyListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::removeKeyListener(p1); } - virtual void SAL_CALL addMouseListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addMouseListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::addMouseListener(p1); } - virtual void SAL_CALL removeMouseListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeMouseListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::removeMouseListener(p1); } - virtual void SAL_CALL addMouseMotionListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseMotionListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addMouseMotionListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseMotionListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::addMouseMotionListener(p1); } - virtual void SAL_CALL removeMouseMotionListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseMotionListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeMouseMotionListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseMotionListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::removeMouseMotionListener(p1); } - virtual void SAL_CALL addPaintListener(const com::sun::star::uno::Reference<com::sun::star::awt::XPaintListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addPaintListener(const com::sun::star::uno::Reference<com::sun::star::awt::XPaintListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::addPaintListener(p1); } - virtual void SAL_CALL removePaintListener(const com::sun::star::uno::Reference<com::sun::star::awt::XPaintListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removePaintListener(const com::sun::star::uno::Reference<com::sun::star::awt::XPaintListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::removePaintListener(p1); } - virtual void SAL_CALL setStatusText(const rtl::OUString& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL setStatusText(const rtl::OUString& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::setStatusText(p1); } - virtual com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::awt::XControl> > SAL_CALL getControls() throw (com::sun::star::uno::RuntimeException, std::exception) + virtual com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::awt::XControl> > SAL_CALL getControls() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoDialogControl_Base::ControlContainerBase::getControls(); } - virtual com::sun::star::uno::Reference<com::sun::star::awt::XControl> SAL_CALL getControl(const rtl::OUString& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual com::sun::star::uno::Reference<com::sun::star::awt::XControl> SAL_CALL getControl(const rtl::OUString& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoDialogControl_Base::ControlContainerBase::getControl(p1); } - virtual void SAL_CALL addControl(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::awt::XControl>& p2) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addControl(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::awt::XControl>& p2) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::addControl(p1, p2); } - virtual void SAL_CALL removeControl(const com::sun::star::uno::Reference<com::sun::star::awt::XControl>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeControl(const com::sun::star::uno::Reference<com::sun::star::awt::XControl>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoDialogControl_Base::ControlContainerBase::removeControl(p1); } @@ -156,8 +156,8 @@ public: DECLIMPL_SERVICEINFO( UnoDialogControl, szServiceName2_UnoControlDialog ) protected: - virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ); - virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ) throw(::com::sun::star::uno::RuntimeException); + virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ) SAL_OVERRIDE; + virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: }; @@ -168,20 +168,20 @@ public: ~UnoMultiPageModel(); UnoMultiPageModel( const UnoMultiPageModel& rModel ); - UnoControlModel* Clone() const; + UnoControlModel* Clone() const SAL_OVERRIDE; DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, ControlModelContainerBase, szServiceName_UnoMultiPageModel ) - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamedContainer - void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Override the method of parent Class - virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; }; @@ -194,44 +194,44 @@ class UnoMultiPageControl : public ControlContainerBase public: UnoMultiPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ~UnoMultiPageControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, ControlContainerBase, szServiceName_UnoMultiPageControl ) - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return ControlContainerBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE { return ControlContainerBase::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com::sun::star::awt::XSimpleTabController - virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTabListener - virtual void SAL_CALL inserted( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removed( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL changed( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL activated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL deactivated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL inserted( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removed( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL changed( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL activated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL deactivated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual void impl_createControlPeerIfNecessary( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl - ); + ) SAL_OVERRIDE; }; @@ -243,18 +243,18 @@ public: ~UnoPageModel(); UnoPageModel( const UnoPageModel& rModel ); - UnoControlModel* Clone() const; + UnoControlModel* Clone() const SAL_OVERRIDE; DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, ControlModelContainerBase, szServiceName_UnoPageModel ) - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Override the method of parent Class - virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; }; @@ -263,7 +263,7 @@ class UnoPageControl : public ControlContainerBase public: UnoPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ~UnoPageControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo @@ -277,26 +277,26 @@ public: ~UnoFrameModel(); UnoFrameModel( const UnoFrameModel& rModel ); - UnoControlModel* Clone() const; + UnoControlModel* Clone() const SAL_OVERRIDE; DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, ControlModelContainerBase, szServiceName_UnoFrameModel ) - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; }; class UnoFrameControl : public ControlContainerBase { protected: - virtual void ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl ); + virtual void ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl ) SAL_OVERRIDE; public: UnoFrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ~UnoFrameControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, szServiceName_UnoFrameControl ) diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx index 20f622219c29..ee1e671ffec6 100644 --- a/include/toolkit/controls/eventcontainer.hxx +++ b/include/toolkit/controls/eventcontainer.hxx @@ -80,43 +80,43 @@ public: // Methods XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods XContainer void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class ScriptEventContainer : public NameContainer_Impl diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index 87f4db117ac7..9219c6c302f4 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -37,8 +37,8 @@ namespace toolkit class UnoControlFormattedFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; ::com::sun::star::uno::Any m_aCachedFormat; bool m_bRevokedAsClient; bool m_bSettingValueAndText; @@ -51,12 +51,12 @@ namespace toolkit ::com::sun::star::uno::Any& rOldValue, sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue - ) throw (::com::sun::star::lang::IllegalArgumentException); + ) throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue - ) throw (::com::sun::star::uno::Exception, std::exception); + ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; public: UnoControlFormattedFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); @@ -67,13 +67,13 @@ namespace toolkit { } - UnoControlModel* Clone() const { return new UnoControlFormattedFieldModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlFormattedFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo @@ -83,10 +83,10 @@ namespace toolkit ~UnoControlFormattedFieldModel(); // XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UnoControlModel virtual void ImplNormalizePropertySequence( @@ -94,7 +94,7 @@ namespace toolkit sal_Int32* _pHandles, /// the handles of the properties to set ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted - ) const SAL_THROW(()); + ) const SAL_THROW(()) SAL_OVERRIDE; private: void impl_updateTextFromValue_nothrow(); void impl_updateCachedFormatter_nothrow(); @@ -108,10 +108,10 @@ namespace toolkit { public: UnoFormattedFieldControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; // ::com::sun::star::awt::XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFormattedFieldControl, UnoEditControl, szServiceName2_UnoControlFormattedField ) diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index 3c7144445d1a..f5e331cc8894 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -111,47 +111,47 @@ namespace com { namespace sun { namespace star { ~OGeometryControlModel_Base(); // XAggregation - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper overridables virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw (::com::sun::star::lang::IllegalArgumentException); + throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue) - throw (::com::sun::star::uno::Exception, std::exception); + throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; using comphelper::OPropertySetAggregationHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle) const; + ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle) const SAL_OVERRIDE; // OPropertyStateHelper overridables - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); - virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; + virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle) SAL_OVERRIDE; + virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetAggregationHelper overridables using OPropertySetAggregationHelper::getInfoHelper; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XScriptEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > - SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable implementation - to be overwritten virtual OGeometryControlModel_Base* createClone_Impl( @@ -159,7 +159,7 @@ namespace com { namespace sun { namespace star { // XComponent using comphelper::OPropertySetAggregationHelper::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: void registerProperties(); @@ -235,22 +235,22 @@ namespace com { namespace sun { namespace star { ); // OIdPropertyArrayUsageHelper overridables - virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const SAL_OVERRIDE; // OPropertySetAggregationHelper overridables - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OGeometryControlModel_Base virtual OGeometryControlModel_Base* createClone_Impl( - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance); + ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue) - throw (::com::sun::star::uno::Exception, std::exception); + throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; }; #include <toolkit/controls/geometrycontrolmodel_impl.hxx> diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index d9e332d4add3..f530faf97891 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -91,8 +91,8 @@ namespace toolkit protected: - css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlRoadmapModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ); @@ -100,7 +100,7 @@ namespace toolkit UnoControlRoadmapModel_Base( rModel ), UnoControlRoadmapModel_IBase( rModel ), maContainerListeners( *this ) {} - UnoControlModel* Clone() const { return new UnoControlRoadmapModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlRoadmapModel( *this ); } // XTypeProvider @@ -108,37 +108,37 @@ namespace toolkit // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, szServiceName2_UnoControlRoadmapModel ) - sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); + sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any & _Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any & _Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any & _Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any & _Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { return UnoControlRoadmapModel_Base::queryInterface(rType); } - css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { UnoControlRoadmapModel_Base::acquire(); } - void SAL_CALL release() throw() { UnoControlRoadmapModel_Base::release(); } + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoControlRoadmapModel_Base::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { UnoControlRoadmapModel_Base::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { UnoControlRoadmapModel_Base::release(); } // ::com::sun::star::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< XInterface > SAL_CALL createInstance( ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< XInterface > SAL_CALL createInstance( ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -153,26 +153,26 @@ namespace toolkit ItemListenerMultiplexer maItemListeners; public: UnoRoadmapControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) { UnoControlBase::disposing( Source ); } + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoControlBase::disposing( Source ); } - void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw ( css::uno::RuntimeException, std::exception ); + sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - void SAL_CALL elementInserted( const css::container::ContainerEvent& rEvent ) throw (css::uno::RuntimeException, std::exception); - void SAL_CALL elementRemoved( const css::container::ContainerEvent& rEvent ) throw (css::uno::RuntimeException, std::exception); - void SAL_CALL elementReplaced( const css::container::ContainerEvent& rEvent ) throw (css::uno::RuntimeException, std::exception); + void SAL_CALL elementInserted( const css::container::ContainerEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL elementRemoved( const css::container::ContainerEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL elementReplaced( const css::container::ContainerEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider DECLARE_XTYPEPROVIDER( ) diff --git a/include/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx index 7d7beff9d6a0..6d59a82bc936 100644 --- a/include/toolkit/controls/roadmapentry.hxx +++ b/include/toolkit/controls/roadmapentry.hxx @@ -51,17 +51,17 @@ protected: /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; - 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; // other stuff diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx index fc0eb0c7bb90..6745ef93fcd0 100644 --- a/include/toolkit/controls/stdtabcontroller.hxx +++ b/include/toolkit/controls/stdtabcontroller.hxx @@ -55,26 +55,26 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > FindControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & rxCtrlModel ); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OWeakAggObject::queryInterface(rType); } - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface(rType); } + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTabController - void SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& Container ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL getContainer( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL autoTabOrder( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL activateTabOrder( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL activateFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL activateLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& Container ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL getContainer( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL autoTabOrder( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL activateTabOrder( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL activateFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL activateLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo DECLIMPL_SERVICEINFO( StdTabController, szServiceName2_TabController ) diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx index b00cecf08223..2a31266633aa 100644 --- a/include/toolkit/controls/stdtabcontrollermodel.hxx +++ b/include/toolkit/controls/stdtabcontrollermodel.hxx @@ -102,30 +102,30 @@ public: ~StdTabControllerModel(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OWeakAggObject::queryInterface(rType); } - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface(rType); } + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTabControllerModel - sal_Bool SAL_CALL getGroupControl( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getGroupCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getGroupByName( const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL getGroupControl( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getGroupCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getGroupByName( const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo DECLIMPL_SERVICEINFO( StdTabControllerModel, szServiceName2_TabControllerModel ) diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx index 150b9b30778a..63fb3428a277 100644 --- a/include/toolkit/controls/tabpagecontainer.hxx +++ b/include/toolkit/controls/tabpagecontainer.hxx @@ -45,50 +45,50 @@ private: std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > > m_aTabPageVector; ContainerListenerMultiplexer maContainerListeners; protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: UnoControlTabPageContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); UnoControlTabPageContainerModel( const UnoControlTabPageContainerModel& rModel ) : UnoControlTabPageContainerModel_Base( rModel ),maContainerListeners( *this ) {;} - UnoControlModel* Clone() const { return new UnoControlTabPageContainerModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlTabPageContainerModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainerModel, UnoControlModel, "com.sun.star.awt.tab.UnoControlTabPageContainerModel" ) // XTabPageContainerModel - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > SAL_CALL createTabPage( ::sal_Int16 TabPageID ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > SAL_CALL loadTabPage( ::sal_Int16 TabPageID, const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > SAL_CALL createTabPage( ::sal_Int16 TabPageID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > SAL_CALL loadTabPage( ::sal_Int16 TabPageID, const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexReplace virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XContainer - void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; // = UnoControlTabPageContainer @@ -100,31 +100,31 @@ class UnoControlTabPageContainer : public UnoControlTabPageContainer_Base { public: UnoControlTabPageContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XControl - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::tab::XTabPageContainer - virtual ::sal_Int16 SAL_CALL getActiveTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int16 SAL_CALL getTabPageCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - - virtual void SAL_CALL addControl( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL getActiveTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getTabPageCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual void SAL_CALL addControl( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainer, UnoControlBase, "com.sun.star.awt.tab.UnoControlTabPageContainer" ) // using UnoControl::getPeer; protected: - virtual void updateFromModel(); + virtual void updateFromModel() SAL_OVERRIDE; private: TabPageListenerMultiplexer m_aTabPageListeners; }; diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx index 780fbd1be69f..5d7e04f4a4a9 100644 --- a/include/toolkit/controls/tabpagemodel.hxx +++ b/include/toolkit/controls/tabpagemodel.hxx @@ -35,24 +35,24 @@ class UnoControlTabPageModel : public ControlModelContainerBase { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlTabPageModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_factory); // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize (const com::sun::star::uno::Sequence<com::sun::star::uno::Any>& rArguments) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception); + OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception); + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -70,26 +70,26 @@ public: UnoControlTabPage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ~UnoControlTabPage(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XWindowListener - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx index 7b552a29e218..7b54c0c36ab7 100644 --- a/include/toolkit/controls/tkscrollbar.hxx +++ b/include/toolkit/controls/tkscrollbar.hxx @@ -38,20 +38,20 @@ namespace toolkit class UnoControlScrollBarModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlScrollBarModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); UnoControlScrollBarModel( const UnoControlScrollBarModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlScrollBarModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlScrollBarModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlScrollBarModel, UnoControlModel, szServiceName2_UnoControlScrollBarModel ) @@ -69,39 +69,39 @@ namespace toolkit public: UnoScrollBarControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) { UnoControlBase::disposing( Source ); } - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoControlBase::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoControlBase::disposing( Source ); } + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XAdjustmentListener - void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XScrollBar - void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getMaximum( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getLineIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getBlockIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getVisibleSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int32 SAL_CALL getOrientation( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getMaximum( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getLineIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getBlockIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getVisibleSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 SAL_CALL getOrientation( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoScrollBarControl, UnoControlBase, szServiceName2_UnoControlScrollBar ) diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index 6a9e97fcb789..5bd146b0d0b0 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -145,88 +145,88 @@ public: virtual OUString GetComponentServiceName(); // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XWindow2 - virtual void SAL_CALL setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getOutputSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isEnabled( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getOutputSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isEnabled( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XWindow - void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setEnable( sal_Bool Enable ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setEnable( sal_Bool Enable ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XView - sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& aDevice ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& aDevice ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XControl - void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isDesignMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isDesignMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModeChangeBroadcaster - virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnitConversion - virtual ::com::sun::star::awt::Point SAL_CALL convertPointToLogic( const ::com::sun::star::awt::Point& Point, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL convertPointToPixel( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL convertPointToLogic( const ::com::sun::star::awt::Point& Point, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL convertPointToPixel( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStyleSettingsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: // ::com::sun::star::beans::XPropertiesChangeListener - void SAL_CALL propertiesChange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL propertiesChange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index 7f8cd2787d01..81c5a108f837 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -62,53 +62,53 @@ public: // ::com::sun::star::lang::XComponent - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XContainer - void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XIdentifierContainer - virtual ::sal_Int32 SAL_CALL insert( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL insert( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XIdentifierReplace - virtual void SAL_CALL removeByIdentifier( ::sal_Int32 Identifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL replaceByIdentifer( ::sal_Int32 Identifier, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeByIdentifier( ::sal_Int32 Identifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL replaceByIdentifer( ::sal_Int32 Identifier, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XIdentifierAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByIdentifier( ::sal_Int32 Identifierr ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getIdentifiers( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByIdentifier( ::sal_Int32 Identifierr ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getIdentifiers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XControlContainer - void SAL_CALL setStatusText( const OUString& StatusText ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addControl( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setStatusText( const OUString& StatusText ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addControl( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XUnoControlContainer - void SAL_CALL setTabControllers( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > >& TabControllers ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > SAL_CALL getTabControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addTabController( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& TabController ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeTabController( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& TabController ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setTabControllers( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > >& TabControllers ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > SAL_CALL getTabControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addTabController( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& TabController ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeTabController( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& TabController ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XControl - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XWindow - void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECLIMPL_SERVICEINFO_DERIVED( UnoControlContainer, UnoControlBase, szServiceName2_UnoControlContainer ) protected: - virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ); + virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ) SAL_OVERRIDE; virtual void removingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); virtual void addingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx index ff8dd4374604..22416f9aa5eb 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/include/toolkit/controls/unocontrolcontainermodel.hxx @@ -32,20 +32,20 @@ class UnoControlContainerModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); UnoControlContainerModel( const UnoControlContainerModel& rModel ) : UnoControlModel( rModel ) {} - UnoControlModel* Clone() const { return new UnoControlContainerModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlContainerModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlContainerModel, UnoControlModel, szServiceName2_UnoControlContainerModel ) diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index 6fdd1a37c64b..f971dd300fdc 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -119,59 +119,59 @@ public: virtual UnoControlModel* Clone() const = 0; // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OWeakAggObject::queryInterface(rType); } - void SAL_CALL acquire() throw(); - void SAL_CALL release() throw(); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface(rType); } + void SAL_CALL acquire() throw() SAL_OVERRIDE; + void SAL_CALL release() throw() SAL_OVERRIDE; // ::com::sun::star::uno::XAggregation - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XCloneable - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider DECLARE_XTYPEPROVIDER() // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XPropertyState - ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OPropertySetHelper - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() = 0; - sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException); - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE = 0; + sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; using cppu::OPropertySetHelper::getFastPropertyValue; - void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; + void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; // setValue-Methoden ueberladen, um die Einzelproperties des FontDescriptors abzufangen // ::com::sun::star::beans::XPropertySet - void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XFastPropertySet - void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #define UNO_CONTROL_MODEL_REGISTER_PROPERTIES(a) \ diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 112342649f10..d98fa10778e1 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -81,20 +81,20 @@ public: class UnoControlEditModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlEditModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlEditModel( const UnoControlEditModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlEditModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlEditModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo @@ -128,55 +128,55 @@ private: public: UnoEditControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; TextListenerMultiplexer& GetTextListeners() { return maTextListeners; } - void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ) SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) { UnoControlBase::disposing( Source ); } - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoControlBase::disposing( Source ); } + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // disambiguate XInterface DECLARE_XINTERFACE() // XAggregation - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider DECLARE_XTYPEPROVIDER() // XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextComponent - void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getMaxTextLen( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getMaxTextLen( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -185,20 +185,20 @@ public: class UnoControlFileControlModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlFileControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlFileControlModel( const UnoControlFileControlModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlFileControlModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlFileControlModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlFileControlModel, UnoControlModel, szServiceName2_UnoControlFileControlModel ) @@ -211,7 +211,7 @@ class UnoFileControl : public UnoEditControl { public: UnoFileControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFileControl, UnoEditControl, szServiceName2_UnoControlFileControl ) @@ -238,10 +238,10 @@ protected: GraphicControlModel( const GraphicControlModel& _rSource ) : UnoControlModel( _rSource ), mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { } // ::cppu::OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; // UnoControlModel - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; private: GraphicControlModel& operator=( const GraphicControlModel& ); // never implemented @@ -253,20 +253,20 @@ private: class UnoControlButtonModel : public GraphicControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlButtonModel( const UnoControlButtonModel& rModel ) : GraphicControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlButtonModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlButtonModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlButtonModel, GraphicControlModel, szServiceName2_UnoControlButtonModel ) @@ -291,32 +291,32 @@ private: public: UnoButtonControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XButton - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XToggleButton // ::com::sun::star::awt::XItemEventBroadcaster - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XItemListener - virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoButtonControl, UnoControlBase, szServiceName2_UnoControlButton ) @@ -331,26 +331,26 @@ private: bool mbAdjustingImageScaleMode; protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlImageControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : GraphicControlModel( rModel ), mbAdjustingImageScaleMode( false ) { } - UnoControlModel* Clone() const { return new UnoControlImageControlModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlImageControlModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlImageControlModel, GraphicControlModel, szServiceName2_UnoControlImageControlModel ) // ::cppu::OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; }; @@ -368,17 +368,17 @@ private: public: UnoImageControlControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoImageControlControl, UnoControlBase, szServiceName2_UnoControlImageControl ) @@ -391,20 +391,20 @@ class UnoControlRadioButtonModel : public GraphicControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlRadioButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlRadioButtonModel( const UnoControlRadioButtonModel& rModel ) : GraphicControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlRadioButtonModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlRadioButtonModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlRadioButtonModel, GraphicControlModel, szServiceName2_UnoControlRadioButtonModel ) @@ -430,34 +430,34 @@ private: public: UnoRadioButtonControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) { UnoControlBase::disposing( Source ); } + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoControlBase::disposing( Source ); } // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XButton - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XRadioButton - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XItemListener - void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoRadioButtonControl, UnoControlBase, szServiceName2_UnoControlRadioButton ) @@ -470,20 +470,20 @@ public: class UnoControlCheckBoxModel : public GraphicControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlCheckBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlCheckBoxModel( const UnoControlCheckBoxModel& rModel ) : GraphicControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlCheckBoxModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlCheckBoxModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlCheckBoxModel, GraphicControlModel, szServiceName2_UnoControlCheckBoxModel ) @@ -509,36 +509,36 @@ public: UnoCheckBoxControl(); ~UnoCheckBoxControl(){;} - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) { UnoControlBase::disposing( Source ); } + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoControlBase::disposing( Source ); } // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XButton - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Int16 SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setState( sal_Int16 n ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int16 SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setState( sal_Int16 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XItemListener - void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoCheckBoxControl, UnoControlBase, szServiceName2_UnoControlCheckBox ) @@ -551,20 +551,20 @@ public: class UnoControlFixedHyperlinkModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlFixedHyperlinkModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlFixedHyperlinkModel( const UnoControlFixedHyperlinkModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlFixedHyperlinkModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlFixedHyperlinkModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedHyperlinkModel, UnoControlModel, szServiceName_UnoControlFixedHyperlinkModel ) @@ -583,37 +583,37 @@ private: public: UnoFixedHyperlinkControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoControlBase::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XFixedHyperlink - void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getURL( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getURL( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFixedHyperlinkControl, UnoControlBase, szServiceName_UnoControlFixedHyperlink ) @@ -625,20 +625,20 @@ public: class UnoControlFixedTextModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlFixedTextModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlFixedTextModel( const UnoControlFixedTextModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlFixedTextModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlFixedTextModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedTextModel, UnoControlModel, szServiceName2_UnoControlFixedTextModel ) @@ -654,30 +654,30 @@ class UnoFixedTextControl : public UnoControlBase, { public: UnoFixedTextControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoControlBase::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XFixedText - void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFixedTextControl, UnoControlBase, szServiceName2_UnoControlFixedText ) @@ -690,20 +690,20 @@ public: class UnoControlGroupBoxModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlGroupBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlGroupBoxModel( const UnoControlGroupBoxModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlGroupBoxModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlGroupBoxModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlGroupBoxModel, UnoControlModel, szServiceName2_UnoControlGroupBoxModel ) @@ -717,9 +717,9 @@ class UnoGroupBoxControl : public UnoControlBase { public: UnoGroupBoxControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoGroupBoxControl, UnoControlBase, szServiceName2_UnoControlGroupBox ) @@ -750,50 +750,50 @@ public: UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource ); ~UnoControlListBoxModel(); - UnoControlModel* Clone() const { return new UnoControlListBoxModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlListBoxModel( *this ); } virtual void ImplNormalizePropertySequence( const sal_Int32 _nCount, /// the number of entries in the arrays sal_Int32* _pHandles, /// the handles of the properties to set ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted - ) const SAL_THROW(()); + ) const SAL_THROW(()) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XItemList - virtual ::sal_Int32 SAL_CALL getItemCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL insertItem( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL insertItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL insertItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeItem( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeAllItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setItemTextAndImage( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setItemData( ::sal_Int32 Position, const ::com::sun::star::uno::Any& DataValue ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getItemText( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getItemImage( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::beans::Pair< OUString, OUString > SAL_CALL getItemTextAndImage( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getItemData( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Pair< OUString, OUString > > SAL_CALL getAllItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addItemListListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeItemListListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getItemCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertItem( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeItem( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeAllItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setItemTextAndImage( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setItemData( ::sal_Int32 Position, const ::com::sun::star::uno::Any& DataValue ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getItemText( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getItemImage( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::beans::Pair< OUString, OUString > SAL_CALL getItemTextAndImage( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getItemData( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Pair< OUString, OUString > > SAL_CALL getAllItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addItemListListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeItemListListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; private: void impl_notifyItemListEvent_nolck( @@ -844,66 +844,66 @@ class TOOLKIT_DLLPUBLIC UnoListBoxControl : public UnoListBoxControl_Base { public: UnoListBoxControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) { UnoControlBase::disposing( Source ); } + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoControlBase::disposing( Source ); } // ::com::sun::star::awt::XListBox - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getSelectedItemPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getSelectedItem( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isMutipleMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL makeVisible( sal_Int16 nEntry ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getSelectedItemPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getSelectedItem( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isMutipleMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL makeVisible( sal_Int16 nEntry ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XItemListener - void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTextLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoControl - sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XItemListListener - virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: void ImplUpdateSelectedItemsProperty(); - virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); - virtual void updateFromModel(); + virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ) SAL_OVERRIDE; + virtual void updateFromModel() SAL_OVERRIDE; private: ActionListenerMultiplexer maActionListeners; @@ -916,26 +916,26 @@ private: class UnoControlComboBoxModel : public UnoControlListBoxModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlComboBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlComboBoxModel( const UnoControlComboBoxModel& rModel ) : UnoControlListBoxModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlComboBoxModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlComboBoxModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -954,55 +954,55 @@ private: public: UnoComboBoxControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) { UnoEditControl::disposing( Source ); } - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { UnoEditControl::disposing( Source ); } + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoEditControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoEditControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XComboBox - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoControl - virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XItemListListener - virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XItemListener - virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); - virtual void updateFromModel(); + virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ) SAL_OVERRIDE; + virtual void updateFromModel() SAL_OVERRIDE; ActionListenerMultiplexer& getActionListeners(); ItemListenerMultiplexer& getItemListeners(); @@ -1021,25 +1021,25 @@ private: public: UnoSpinFieldControl(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoEditControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoEditControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XSpinField - void SAL_CALL addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL up() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL down() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL first() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL last() throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL up() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL down() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL first() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL last() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo @@ -1053,20 +1053,20 @@ public: class UnoControlDateFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlDateFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlDateFieldModel( const UnoControlDateFieldModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlDateFieldModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlDateFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlDateFieldModel, UnoControlModel, szServiceName2_UnoControlDateFieldModel ) @@ -1085,39 +1085,39 @@ private: TriState mbLongFormat; public: UnoDateFieldControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoSpinFieldControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XDateField - void SAL_CALL setDate( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Date SAL_CALL getDate( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMin( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Date SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMax( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Date SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFirst( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Date SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLast( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Date SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isLongFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setDate( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Date SAL_CALL getDate( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMin( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Date SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMax( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Date SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFirst( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Date SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLast( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Date SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isLongFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoDateFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlDateField ) @@ -1129,20 +1129,20 @@ public: class UnoControlTimeFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlTimeFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlTimeFieldModel( const UnoControlTimeFieldModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlTimeFieldModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlTimeFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlTimeFieldModel, UnoControlModel, szServiceName2_UnoControlTimeFieldModel ) @@ -1161,37 +1161,37 @@ private: public: UnoTimeFieldControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoSpinFieldControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTimeField - void SAL_CALL setTime( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Time SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMin( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Time SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMax( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Time SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFirst( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Time SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLast( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::util::Time SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setTime( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Time SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMin( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Time SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMax( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Time SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFirst( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Time SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLast( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::util::Time SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoTimeFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlTimeField ) @@ -1204,20 +1204,20 @@ public: class UnoControlNumericFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlNumericFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlNumericFieldModel( const UnoControlNumericFieldModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlNumericFieldModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlNumericFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlNumericFieldModel, UnoControlModel, szServiceName2_UnoControlNumericFieldModel ) @@ -1236,39 +1236,39 @@ private: public: UnoNumericFieldControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoSpinFieldControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XNumericField - void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoNumericFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlNumericField ) @@ -1281,20 +1281,20 @@ public: class UnoControlCurrencyFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlCurrencyFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlCurrencyFieldModel( const UnoControlCurrencyFieldModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlCurrencyFieldModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlCurrencyFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlCurrencyFieldModel, UnoControlModel, szServiceName2_UnoControlCurrencyFieldModel ) @@ -1313,39 +1313,39 @@ private: public: UnoCurrencyFieldControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoSpinFieldControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XCurrencyField - void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoCurrencyFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlCurrencyField ) @@ -1357,20 +1357,20 @@ public: class UnoControlPatternFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlPatternFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlPatternFieldModel( const UnoControlPatternFieldModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlPatternFieldModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlPatternFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlPatternFieldModel, UnoControlModel, szServiceName2_UnoControlPatternFieldModel ) @@ -1384,28 +1384,28 @@ class UnoPatternFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XPatternField { protected: - void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ) SAL_OVERRIDE; public: UnoPatternFieldControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoSpinFieldControl::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XPatternField - void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getString( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoPatternFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlPatternField ) @@ -1418,20 +1418,20 @@ public: class UnoControlProgressBarModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlProgressBarModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlProgressBarModel( const UnoControlProgressBarModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlProgressBarModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlProgressBarModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlProgressBarModel, UnoControlModel, szServiceName2_UnoControlProgressBarModel ) @@ -1445,23 +1445,23 @@ class UnoProgressBarControl : public UnoControlBase, { public: UnoProgressBarControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); } - void SAL_CALL release() throw() { OWeakAggObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return UnoControlBase::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XProgressBar - void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception ); - sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoProgressBarControl, UnoControlBase, szServiceName2_UnoControlProgressBar ) @@ -1474,20 +1474,20 @@ public: class UnoControlFixedLineModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; public: UnoControlFixedLineModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); UnoControlFixedLineModel( const UnoControlFixedLineModel& rModel ) : UnoControlModel( rModel ) {;} - UnoControlModel* Clone() const { return new UnoControlFixedLineModel( *this ); } + UnoControlModel* Clone() const SAL_OVERRIDE { return new UnoControlFixedLineModel( *this ); } // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedLineModel, UnoControlModel, szServiceName2_UnoControlFixedLineModel ) @@ -1501,9 +1501,9 @@ class UnoFixedLineControl : public UnoControlBase { public: UnoFixedLineControl(); - OUString GetComponentServiceName(); + OUString GetComponentServiceName() SAL_OVERRIDE; - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFixedLineControl, UnoControlBase, szServiceName2_UnoControlFixedLine ) diff --git a/include/toolkit/helper/externallock.hxx b/include/toolkit/helper/externallock.hxx index 11fda9a000e7..bb611b7f2705 100644 --- a/include/toolkit/helper/externallock.hxx +++ b/include/toolkit/helper/externallock.hxx @@ -29,8 +29,8 @@ class TOOLKIT_DLLPUBLIC VCLExternalSolarLock : public ::comphelper::IMutex { public: - virtual void acquire(); - virtual void release(); + virtual void acquire() SAL_OVERRIDE; + virtual void release() SAL_OVERRIDE; }; #endif // INCLUDED_TOOLKIT_HELPER_EXTERNALLOCK_HXX diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index 982ec4b44ac3..a3de5ff60c5d 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -68,9 +68,9 @@ public: virtual ~ListenerMultiplexerBase(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { mrContext.acquire(); } - void SAL_CALL release() throw() { mrContext.release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { mrContext.acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { mrContext.release(); } }; @@ -84,8 +84,8 @@ DECL_LISTENERMULTIPLEXER_END // class FocusListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) - void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END @@ -93,10 +93,10 @@ DECL_LISTENERMULTIPLEXER_END // class WindowListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) - void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END @@ -105,162 +105,162 @@ DECL_LISTENERMULTIPLEXER_END // class VclContainerListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener ) - void SAL_CALL windowAdded( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL windowRemoved( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL windowAdded( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL windowRemoved( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class KeyListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) - void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class MouseListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener ) - void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class MouseMotionListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) - void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class PaintListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) - void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class TopWindowListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener ) - void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class TextListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener ) - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class ActionListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener ) - void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class ItemListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener ) - void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class TabListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener ) - void SAL_CALL inserted( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removed( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL changed( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL activated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL deactivated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL inserted( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removed( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL changed( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL activated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL deactivated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class ContainerListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener ) - void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class SpinListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener ) - void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL first( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL first( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class AdjustmentListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener ) - void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class MenuListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener ) - void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class TreeSelectionListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener ) - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class TreeExpansionListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener ) - virtual void SAL_CALL requestChildNodes( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL treeExpanding( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL treeCollapsing( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL treeExpanded( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL treeCollapsed( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL requestChildNodes( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL treeExpanding( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL treeCollapsing( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL treeExpanded( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL treeCollapsed( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class TreeEditListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener ) - virtual void SAL_CALL nodeEditing( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException,::com::sun::star::util::VetoException, std::exception); - virtual void SAL_CALL nodeEdited( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node, const OUString& NewText ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL nodeEditing( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException,::com::sun::star::util::VetoException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL nodeEdited( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node, const OUString& NewText ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class SelectionListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener ) - void SAL_CALL selectionChanged( const ::com::sun::star::awt::grid::GridSelectionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL selectionChanged( const ::com::sun::star::awt::grid::GridSelectionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END // class TabPageListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabPageListenerMultiplexer, ::com::sun::star::awt::tab::XTabPageContainerListener ) - void SAL_CALL tabPageActivated( const ::com::sun::star::awt::tab::TabPageActivatedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL tabPageActivated( const ::com::sun::star::awt::tab::TabPageActivatedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END #endif // INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 22ae92f34bca..e048e751cce4 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -111,10 +111,10 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ { \ public: \ ClassName( ::cppu::OWeakObject& rSource ); \ - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); \ - void SAL_CALL acquire() throw() { ListenerMultiplexerBase::acquire(); } \ - void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \ + void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \ + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -123,10 +123,10 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter { \ public: \ ClassName( ::cppu::OWeakObject& rSource ); \ - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); \ - void SAL_CALL acquire() throw() { ListenerMultiplexerBase::acquire(); } \ - void SAL_CALL release() throw() { ListenerMultiplexerBase::release(); } \ - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \ + void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \ + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -250,7 +250,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa #define DECLIMPL_SUPPORTS_SERVICE( ) \ - sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ + sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { \ ::com::sun::star::uno::Sequence< OUString > aServiceNames( getSupportedServiceNames() ); \ const OUString* pSupported = aServiceNames.getConstArray(); \ @@ -264,8 +264,8 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa #define DECLIMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \ - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit." #ImplName ); } \ - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) \ + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("stardiv.Toolkit." #ImplName ); } \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { \ ::com::sun::star::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \ aNames.realloc( aNames.getLength() + 1 ); \ @@ -276,8 +276,8 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa #define DECLIMPL_SERVICEINFO( ImplName, ServiceName ) \ - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit." #ImplName ); } \ - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) \ + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("stardiv.Toolkit." #ImplName ); } \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { \ ::com::sun::star::uno::Sequence< OUString > aNames( 1 ); \ aNames[ 0 ] = OUString::createFromAscii( ServiceName ); \ diff --git a/include/toolkit/helper/unopropertyarrayhelper.hxx b/include/toolkit/helper/unopropertyarrayhelper.hxx index 2c45c641ee0b..12ee104a1338 100644 --- a/include/toolkit/helper/unopropertyarrayhelper.hxx +++ b/include/toolkit/helper/unopropertyarrayhelper.hxx @@ -42,12 +42,12 @@ public: UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs ); // ::cppu::IPropertyArrayHelper - sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(); - ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException); - sal_Bool SAL_CALL hasPropertyByName(const OUString& rPropertyName); - sal_Int32 SAL_CALL getHandleByName( const OUString & rPropertyName ); - sal_Int32 SAL_CALL fillHandles( sal_Int32* pHandles, const ::com::sun::star::uno::Sequence< OUString > & rPropNames ); + sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() SAL_OVERRIDE; + ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + sal_Bool SAL_CALL hasPropertyByName(const OUString& rPropertyName) SAL_OVERRIDE; + sal_Int32 SAL_CALL getHandleByName( const OUString & rPropertyName ) SAL_OVERRIDE; + sal_Int32 SAL_CALL fillHandles( sal_Int32* pHandles, const ::com::sun::star::uno::Sequence< OUString > & rPropNames ) SAL_OVERRIDE; }; diff --git a/include/toolkit/helper/unowrapper.hxx b/include/toolkit/helper/unowrapper.hxx index f00977734e29..b5aaa282ded0 100644 --- a/include/toolkit/helper/unowrapper.hxx +++ b/include/toolkit/helper/unowrapper.hxx @@ -42,20 +42,20 @@ private: public: UnoWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>& rxToolkit ); - virtual void Destroy(); + virtual void Destroy() SAL_OVERRIDE; // Toolkit - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> GetVCLToolkit(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> GetVCLToolkit() SAL_OVERRIDE; // Graphics - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics> CreateGraphics( OutputDevice* pOutDev ); - virtual void ReleaseAllGraphics( OutputDevice* pOutDev ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics> CreateGraphics( OutputDevice* pOutDev ) SAL_OVERRIDE; + virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) SAL_OVERRIDE; // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate ); - virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate ) SAL_OVERRIDE; + virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) SAL_OVERRIDE; - void WindowDestroyed( Window* pWindow ); + void WindowDestroyed( Window* pWindow ) SAL_OVERRIDE; void WindowEvent_Move( Window* pWindow ); void WindowEvent_Resize( Window* pWindow ); void WindowEvent_Show( Window* pWindow, bool bShow ); @@ -75,7 +75,7 @@ public: // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessible( Menu* pMenu, sal_Bool bIsMenuBar ); + CreateAccessible( Menu* pMenu, sal_Bool bIsMenuBar ) SAL_OVERRIDE; private: virtual ~UnoWrapper(); diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx index 2ec8763f9e5c..7787da5709e7 100644 --- a/include/tools/b3dtrans.hxx +++ b/include/tools/b3dtrans.hxx @@ -251,7 +251,7 @@ protected: void CalcNewViewportValues(); bool CalcFocalLength(); - virtual void DeviceRectangleChange(); + virtual void DeviceRectangleChange() SAL_OVERRIDE; }; #endif diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index fbbe88c1b7b7..72fd678d5e62 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -896,7 +896,7 @@ class INetMIMEStringOutputSink: public INetMIMEOutputSink using INetMIMEOutputSink::writeSequence; virtual void writeSequence(const sal_Char * pBegin, - const sal_Char * pEnd); + const sal_Char * pEnd) SAL_OVERRIDE; public: inline INetMIMEStringOutputSink(sal_uInt32 nColumn = 0, @@ -904,7 +904,7 @@ public: = INetMIME::SOFT_LINE_LENGTH_LIMIT): INetMIMEOutputSink(nColumn, nLineLengthLimit) {} - virtual ErrCode getError() const; + virtual ErrCode getError() const SAL_OVERRIDE; OString takeBuffer() { diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx index 0e954ca82792..062f1bbe926a 100644 --- a/include/tools/inetmsg.hxx +++ b/include/tools/inetmsg.hxx @@ -230,8 +230,8 @@ class TOOLS_DLLPUBLIC INetRFC822Message : public INetMessage sal_uIntPtr m_nIndex[INETMSG_RFC822_NUMHDR]; protected: - virtual SvStream& operator<< (SvStream& rStrm) const; - virtual SvStream& operator>> (SvStream& rStrm); + virtual SvStream& operator<< (SvStream& rStrm) const SAL_OVERRIDE; + virtual SvStream& operator>> (SvStream& rStrm) SAL_OVERRIDE; public: INetRFC822Message(); @@ -247,7 +247,7 @@ public: virtual sal_uIntPtr SetHeaderField ( const INetMessageHeader &rHeader, sal_uIntPtr nIndex = ((sal_uIntPtr)-1) - ); + ) SAL_OVERRIDE; // Header fields. @@ -411,8 +411,8 @@ class TOOLS_DLLPUBLIC INetMIMEMessage : public INetRFC822Message void SetHeaderParsed() { bHeaderParsed = true; } protected: - virtual SvStream& operator<< (SvStream& rStrm) const; - virtual SvStream& operator>> (SvStream& rStrm); + virtual SvStream& operator<< (SvStream& rStrm) const SAL_OVERRIDE; + virtual SvStream& operator>> (SvStream& rStrm) SAL_OVERRIDE; public: INetMIMEMessage(); @@ -430,7 +430,7 @@ public: virtual sal_uIntPtr SetHeaderField ( const INetMessageHeader &rHeader, sal_uIntPtr nIndex = ((sal_uIntPtr)-1) - ); + ) SAL_OVERRIDE; // Header fields. diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx index 5a95e4397b93..89c715fc2ab3 100644 --- a/include/tools/inetstrm.hxx +++ b/include/tools/inetstrm.hxx @@ -96,7 +96,7 @@ class INetMessageIStream : public INetIStream sal_Char *pMsgRead; sal_Char *pMsgWrite; - virtual int GetData (sal_Char *pData, sal_uIntPtr nSize); + virtual int GetData (sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE; // Not implemented. INetMessageIStream (const INetMessageIStream& rStrm); @@ -126,7 +126,7 @@ class INetMessageOStream : public INetOStream SvMemoryStream *pMsgBuffer; - virtual int PutData (const sal_Char *pData, sal_uIntPtr nSize); + virtual int PutData (const sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE; // Not implemented. INetMessageOStream (const INetMessageOStream& rStrm); @@ -189,8 +189,8 @@ class TOOLS_DLLPUBLIC INetMIMEMessageStream : public INetMessageIOStream INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm); protected: - virtual int GetMsgLine (sal_Char *pData, sal_uIntPtr nSize); - virtual int PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize); + virtual int GetMsgLine (sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE; + virtual int PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE; public: INetMIMEMessageStream (sal_uIntPtr nBufferSize = 2048); diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index 14d14493e95c..f43603e8c6c4 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -59,9 +59,9 @@ SV_DECL_IMPL_REF(SvRttiBase) static void * CreateInstance( SvPersistBase ** ppBase ); \ friend SvPersistStream& operator >> ( SvPersistStream & rStm, \ Class *& rpObj); \ - virtual sal_Int32 GetClassId() const; \ - virtual void Load( SvPersistStream & ); \ - virtual void Save( SvPersistStream & ); + virtual sal_Int32 GetClassId() const SAL_OVERRIDE; \ + virtual void Load( SvPersistStream & ) SAL_OVERRIDE; \ + virtual void Save( SvPersistStream & ) SAL_OVERRIDE; #define SV_DECL_PERSIST1( Class, Super1, CLASS_ID ) \ SV_DECL_PERSIST( Class, CLASS_ID ) @@ -127,9 +127,9 @@ class SvDeclPersistList : public SvRefMemberList<T>, { public: // implement the reader/writer adapter methods - size_t size() const { return SvRefMemberList<T>::size(); } - SvPersistBase* GetPersistBase(size_t idx) const { return SvRefMemberList<T>::operator[](idx); } - void push_back(SvPersistBase* p) { SvRefMemberList<T>::push_back(static_cast<T>(p)); } + size_t size() const SAL_OVERRIDE { return SvRefMemberList<T>::size(); } + SvPersistBase* GetPersistBase(size_t idx) const SAL_OVERRIDE { return SvRefMemberList<T>::operator[](idx); } + void push_back(SvPersistBase* p) SAL_OVERRIDE { SvRefMemberList<T>::push_back(static_cast<T>(p)); } void WriteObjects(SvPersistStream & rStm, bool bOnlyStreamed ) const { WritePersistListObjects(*this, rStm, bOnlyStreamed); } }; @@ -195,10 +195,10 @@ class TOOLS_DLLPUBLIC SvPersistStream : public SvStream const SvPersistStream * pRefStm; sal_uInt32 nFlags; - virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ); - virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ); - virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos ); - virtual void FlushData(); + virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ) SAL_OVERRIDE; + virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ) SAL_OVERRIDE; + virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos ) SAL_OVERRIDE; + virtual void FlushData() SAL_OVERRIDE; protected: void WriteObj( sal_uInt8 nHdr, SvPersistBase * pObj ); @@ -207,7 +207,7 @@ protected: public: bool IsStreamed( SvPersistBase * pObj ) const { return 0 != GetIndex( pObj ); } - virtual void ResetError(); + virtual void ResetError() SAL_OVERRIDE; SvPersistStream( SvClassManager &, SvStream * pStream, sal_uInt32 nStartIdx = 1 ); @@ -215,7 +215,7 @@ public: void SetStream( SvStream * pStream ); SvStream * GetStream() const { return pStm; } - virtual sal_uInt16 IsA() const; + virtual sal_uInt16 IsA() const SAL_OVERRIDE; SvPersistBase * GetObject( sal_uIntPtr nIdx ) const; sal_uIntPtr GetIndex( SvPersistBase * ) const; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 3eb2fd4ea279..929432a88650 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -180,18 +180,18 @@ public: SvOpenLockBytes(pStream, bOwner), m_nSize(0), m_bTerminated(false) {} virtual ErrCode ReadAt(sal_Size nPos, void * pBuffer, sal_Size nCount, - sal_Size * pRead) const; + sal_Size * pRead) const SAL_OVERRIDE; virtual ErrCode WriteAt(sal_Size nPos, const void * pBuffer, sal_Size nCount, - sal_Size * pWritten); + sal_Size * pWritten) SAL_OVERRIDE; virtual ErrCode FillAppend(const void * pBuffer, sal_Size nCount, - sal_Size * pWritten); + sal_Size * pWritten) SAL_OVERRIDE; - virtual sal_Size Tell() const { return m_nSize; } + virtual sal_Size Tell() const SAL_OVERRIDE { return m_nSize; } - virtual sal_Size Seek(sal_Size nPos); + virtual sal_Size Seek(sal_Size nPos) SAL_OVERRIDE; - virtual void Terminate() { m_bTerminated = true; } + virtual void Terminate() SAL_OVERRIDE { m_bTerminated = true; } }; SV_DECL_IMPL_REF(SvAsyncLockBytes); @@ -660,11 +660,11 @@ private: bool UnlockFile(); protected: - virtual sal_Size GetData( void* pData, sal_Size nSize ); - virtual sal_Size PutData( const void* pData, sal_Size nSize ); - virtual sal_Size SeekPos( sal_Size nPos ); - virtual void SetSize( sal_Size nSize ); - virtual void FlushData(); + virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE; + virtual sal_Size PutData( const void* pData, sal_Size nSize ) SAL_OVERRIDE; + virtual sal_Size SeekPos( sal_Size nPos ) SAL_OVERRIDE; + virtual void SetSize( sal_Size nSize ) SAL_OVERRIDE; + virtual void FlushData() SAL_OVERRIDE; public: // Switches to Read StreamMode on failed attempt of Write opening @@ -672,13 +672,13 @@ public: SvFileStream(); ~SvFileStream(); - virtual void ResetError(); + virtual void ResetError() SAL_OVERRIDE; void Open( const OUString& rFileName, StreamMode eOpenMode ); void Close(); bool IsOpen() const { return bIsOpen; } bool IsLocked() const { return ( nLockCounter!=0 ); } - virtual sal_uInt16 IsA() const; + virtual sal_uInt16 IsA() const SAL_OVERRIDE; const OUString& GetFileName() const { return aFilename; } }; @@ -701,11 +701,11 @@ protected: sal_uInt8* pBuf; bool bOwnsData; - virtual sal_Size GetData( void* pData, sal_Size nSize ); - virtual sal_Size PutData( const void* pData, sal_Size nSize ); - virtual sal_Size SeekPos( sal_Size nPos ); - virtual void SetSize( sal_Size nSize ); - virtual void FlushData(); + virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE; + virtual sal_Size PutData( const void* pData, sal_Size nSize ) SAL_OVERRIDE; + virtual sal_Size SeekPos( sal_Size nPos ) SAL_OVERRIDE; + virtual void SetSize( sal_Size nSize ) SAL_OVERRIDE; + virtual void FlushData() SAL_OVERRIDE; /// AllocateMemory must update pBuf accordingly /// - pBuf: Address of new block @@ -730,14 +730,14 @@ public: SvMemoryStream( sal_Size nInitSize=512, sal_Size nResize=64 ); ~SvMemoryStream(); - virtual void ResetError(); + virtual void ResetError() SAL_OVERRIDE; const void* GetBuffer(); sal_uIntPtr GetSize(); sal_Size GetEndOfData() const { return nEndOfData; } const void* GetData() { Flush(); return pBuf; } operator const void*() { Flush(); return pBuf; } - virtual sal_uInt16 IsA() const; + virtual sal_uInt16 IsA() const SAL_OVERRIDE; void* SwitchBuffer( sal_Size nInitSize=512, sal_Size nResize=64 ); void* SetBuffer( void* pBuf, sal_Size nSize, @@ -747,7 +747,7 @@ public: bool IsObjectMemoryOwner() { return bOwnsData; } void SetResizeOffset( sal_Size nNewResize ) { nResize = nNewResize; } sal_Size GetResizeOffset() const { return nResize; } - virtual sal_Size remainingSize() { return GetBufSize() - Tell(); } + virtual sal_Size remainingSize() SAL_OVERRIDE { return GetBufSize() - Tell(); } }; class TOOLS_DLLPUBLIC SvScriptStream: public SvStream diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx index 1ec6782c7c07..e6911f71d7aa 100644 --- a/include/tools/zcodec.hxx +++ b/include/tools/zcodec.hxx @@ -101,7 +101,7 @@ class GZCodec : public ZCodec public: GZCodec(){}; ~GZCodec(){}; - virtual void BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT ) + virtual void BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT ) SAL_OVERRIDE { ZCodec::BeginCompression( nCompressMethod | ZCODEC_GZ_LIB ); }; diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx index 3a8470f769ed..1c2372eb44ec 100644 --- a/include/ucbhelper/activedatasink.hxx +++ b/include/ucbhelper/activedatasink.hxx @@ -41,10 +41,10 @@ class UCBHELPER_DLLPUBLIC ActiveDataSink : public: // XActiveDataSink methods. virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream() - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; } /* namespace ucbhelper */ diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx index 71b96750562e..17db937161b7 100644 --- a/include/ucbhelper/activedatastreamer.hxx +++ b/include/ucbhelper/activedatastreamer.hxx @@ -43,10 +43,10 @@ public: // XActiveDataStreamer methods. virtual void SAL_CALL setStream( const css::uno::Reference< css::io::XStream >& xStream ) throw( css::uno::RuntimeException, - std::exception ); + std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::io::XStream > SAL_CALL getStream() throw( css::uno::RuntimeException, - std::exception ); + std::exception ) SAL_OVERRIDE; }; } /* namespace ucbhelper */ diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx index 172eb77774f9..3501422a9c93 100644 --- a/include/ucbhelper/commandenvironment.hxx +++ b/include/ucbhelper/commandenvironment.hxx @@ -61,11 +61,11 @@ public: // XCommandEnvironemnt virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw ( css::uno::RuntimeException, - std::exception ); + std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() throw ( css::uno::RuntimeException, - std::exception ); + std::exception ) SAL_OVERRIDE; }; } /* namespace ucbhelper */ diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index ed832a72c972..a0d1b863b21a 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -325,67 +325,67 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - 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 ) = 0; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; 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 ) = 0; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XComponent virtual void SAL_CALL dispose() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XContent virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) = 0; + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; virtual void SAL_CALL addContentEventListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeContentEventListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XCommandProcessor virtual sal_Int32 SAL_CALL createCommandIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Any SAL_CALL execute( const com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, @@ -393,10 +393,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) = 0; + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) = 0; + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XPropertiesChangeNotifier virtual void SAL_CALL @@ -404,25 +404,25 @@ public: const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removePropertiesChangeListener( const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XCommandInfoChangeNotifier virtual void SAL_CALL addCommandInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeCommandInfoChangeListener( const com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertyContainer @@ -443,7 +443,7 @@ public: throw( com::sun::star::beans::PropertyExistException, com::sun::star::beans::IllegalTypeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * This method removes a property from the content according to the @@ -459,19 +459,19 @@ public: removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertySetInfoChangeNotifier virtual void SAL_CALL addPropertySetInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removePropertySetInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XChild @@ -483,7 +483,7 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getParent() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * The implementation of this method always throws a NoSupportException. @@ -492,7 +492,7 @@ public: setParent( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& Parent ) throw( com::sun::star::lang::NoSupportException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Non-interface methods. diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx index f17ed6ef5cbc..12d733ecf9f8 100644 --- a/include/ucbhelper/contentidentifier.hxx +++ b/include/ucbhelper/contentidentifier.hxx @@ -51,27 +51,27 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL - acquire() throw(); + acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL - release() throw(); + release() throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XContentIdentifier virtual OUString SAL_CALL getContentIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getContentProviderScheme() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: ContentIdentifier_Impl* m_pImpl; diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx index 2b4864adf900..032337e5c059 100644 --- a/include/ucbhelper/contentinfo.hxx +++ b/include/ucbhelper/contentinfo.hxx @@ -69,32 +69,32 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertySetInfo virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > SAL_CALL getProperties() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Non-Interface methods. void reset(); @@ -137,39 +137,39 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XCommandInfo virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL getCommands() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::ucb::CommandInfo SAL_CALL getCommandInfoByName( const OUString& Name ) throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Non-Interface methods. void reset(); diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx index f5d0057fd0d0..c1b4125c4f93 100644 --- a/include/ucbhelper/fd_inputstream.hxx +++ b/include/ucbhelper/fd_inputstream.hxx @@ -59,7 +59,7 @@ namespace ucbhelper throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, @@ -67,26 +67,26 @@ namespace ucbhelper throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available(void) throw(css::io::NotConnectedException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL closeInput(void) throw(css::io::NotConnectedException, css::io::IOException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** XSeekable @@ -96,19 +96,19 @@ namespace ucbhelper seek(sal_Int64 location) throw(css::lang::IllegalArgumentException, css::io::IOException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getPosition(void) throw(css::io::IOException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getLength(void) throw(css::io::IOException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: oslFileHandle m_tmpfl; diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index 1fdd3797fded..3ed97818f28f 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -93,29 +93,29 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionRequest virtual com::sun::star::uno::Any SAL_CALL getRequest() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Non-interface methods. @@ -191,23 +191,23 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -228,23 +228,23 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -265,23 +265,23 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -302,23 +302,23 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -431,76 +431,76 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionSupplyAuthentication virtual sal_Bool SAL_CALL canSetRealm() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setRealm( const OUString& Realm ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL canSetUserName() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setUserName( const OUString& UserName ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL canSetPassword() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPassword( const OUString& Password ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > SAL_CALL getRememberPasswordModes( com::sun::star::ucb::RememberAuthentication& Default ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setRememberPassword( com::sun::star::ucb::RememberAuthentication Remember ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL canSetAccount() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setAccount( const OUString& Account ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > SAL_CALL getRememberAccountModes( com::sun::star::ucb::RememberAuthentication& Default ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setRememberAccount( com::sun::star::ucb::RememberAuthentication Remember ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionSupplyAuthentication2 virtual ::sal_Bool SAL_CALL canUseSystemCredentials( ::sal_Bool& Default ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setUseSystemCredentials( ::sal_Bool UseSystemCredentials ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Non-interface methods. @@ -643,27 +643,27 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionSupplyName virtual void SAL_CALL setName( const OUString& Name ) - throw ( com::sun::star::uno::RuntimeException, std::exception ); + throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Non-interface methods. @@ -695,23 +695,23 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; } // namespace ucbhelper diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx index 7d4ba5a27081..a55458cf35be 100644 --- a/include/ucbhelper/interceptedinteraction.hxx +++ b/include/ucbhelper/interceptedinteraction.hxx @@ -294,7 +294,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper the interaction request, which should be intercepted. */ virtual void SAL_CALL handle(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // helper diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx index 506e5b3accef..33dc3f99eb56 100644 --- a/include/ucbhelper/propertyvalueset.hxx +++ b/include/ucbhelper/propertyvalueset.hxx @@ -80,115 +80,115 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XRow virtual sal_Bool SAL_CALL wasNull() throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XColumnLocate virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Non-interface methods diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx index b49d8ecfd64e..4e708f319435 100644 --- a/include/ucbhelper/providerhelper.hxx +++ b/include/ucbhelper/providerhelper.hxx @@ -143,34 +143,34 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - 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 ) = 0; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; 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 ) = 0; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XContentProvider @@ -192,13 +192,13 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; virtual sal_Int32 SAL_CALL compareContentIds( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Id1, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Non-interface methods. diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 46e504dbbfb0..32d4301824a9 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -109,27 +109,27 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - 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( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -137,212 +137,212 @@ public: // XComponent virtual void SAL_CALL dispose() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL queryContent() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XResultSetMetaDataSupplier virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XResultSet virtual sal_Bool SAL_CALL next() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isBeforeFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAfterLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL beforeFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL afterLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL first() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL last() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getRow() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL previous() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL refreshRow() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL rowUpdated() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL rowInserted() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL rowDeleted() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getStatement() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XRow virtual sal_Bool SAL_CALL wasNull() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XCloseable virtual void SAL_CALL close() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertySet virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) @@ -350,40 +350,40 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Non-interface methods. diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index e47c612ab74f..28fb060b0579 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -136,27 +136,27 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - 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( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -164,34 +164,34 @@ public: // XComponent ( base class of XDynamicResultSet ) virtual void SAL_CALL dispose() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDynamicResultSet virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > SAL_CALL getStaticResultSet() throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener >& Listener ) throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL connectToCache( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > & xCache ) throw( com::sun::star::ucb::ListenerAlreadySetException, com::sun::star::ucb::AlreadyInitializedException, com::sun::star::ucb::ServiceNotFoundException, - com::sun::star::uno::RuntimeException, std::exception ); + com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * The implementation of this method always returns 0. Override this @@ -199,7 +199,7 @@ public: */ virtual sal_Int16 SAL_CALL getCapabilities() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // Non-interface methods. diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx index 1e6ce2bf01b7..a368d04013c5 100644 --- a/include/ucbhelper/resultsetmetadata.hxx +++ b/include/ucbhelper/resultsetmetadata.hxx @@ -195,19 +195,19 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() - throw(); + throw() SAL_OVERRIDE; virtual void SAL_CALL release() - throw(); + throw() SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XResultSetMetaData @@ -219,7 +219,7 @@ public: virtual sal_Int32 SAL_CALL getColumnCount() throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Checks whether column is automatically numbered, which makes it * read-only. @@ -231,7 +231,7 @@ public: virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Checks whether column is case sensitive. * @@ -242,7 +242,7 @@ public: virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Checks whether the value stored in column can be used in a * WHERE clause. @@ -254,7 +254,7 @@ public: virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Checks whether column is a cash value. * @@ -265,7 +265,7 @@ public: virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Checks whether a NULL can be stored in column. * @@ -279,7 +279,7 @@ public: virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Checks whether the value stored in column is a signed number. * @@ -290,7 +290,7 @@ public: virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Gets the normal maximum width in characters for column. * @@ -301,7 +301,7 @@ public: virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Gets the suggested column title for column, to be used in print- * outs and displays. @@ -313,7 +313,7 @@ public: virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Gets the name of column. * @@ -324,7 +324,7 @@ public: virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Gets the schema name for the table from which column of this * result set was derived. @@ -338,7 +338,7 @@ public: virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * For number types, getprecision gets the number of decimal digits * in column. @@ -353,7 +353,7 @@ public: virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Gets the number of digits to the right of the decimal point for * values in column. @@ -365,7 +365,7 @@ public: virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Gets the name of the table from which column of this result set * was derived or "" if there is none (for example, for a join). @@ -379,7 +379,7 @@ public: virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL /** * Gets the catalog name for the table from which column of this @@ -393,7 +393,7 @@ public: */ getCatalogName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Gets the JDBC type for the value stored in column. ... The STRUCT * and DISTINCT type codes are always returned for structured and @@ -408,7 +408,7 @@ public: virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Gets the type name used by this particular data source for the * values stored in column. If the type code for the type of value @@ -422,7 +422,7 @@ public: virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Indicates whether a column is definitely not writable. * @@ -433,7 +433,7 @@ public: virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Indicates whether it is possible for a write on the column to succeed. * @@ -444,7 +444,7 @@ public: virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Indicates whether a write on the column will definitely succeed. * @@ -455,7 +455,7 @@ public: virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** * Returns the fully-qualified name of the service whose instances * are manufactured if the method @@ -470,7 +470,7 @@ public: virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; } // namespace ucbhelper diff --git a/include/ucbhelper/std_inputstream.hxx b/include/ucbhelper/std_inputstream.hxx index c0b09854dd36..896a1c1c064e 100644 --- a/include/ucbhelper/std_inputstream.hxx +++ b/include/ucbhelper/std_inputstream.hxx @@ -39,11 +39,11 @@ namespace ucbhelper ~StdInputStream(); virtual css::uno::Any SAL_CALL queryInterface ( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw ( ); + virtual void SAL_CALL acquire( ) throw ( ) SAL_OVERRIDE; - virtual void SAL_CALL release( ) throw ( ); + virtual void SAL_CALL release( ) throw ( ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readBytes ( css::uno::Sequence< sal_Int8 >& aData, @@ -51,7 +51,7 @@ namespace ucbhelper throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes ( css::uno::Sequence< sal_Int8 >& aData, @@ -59,26 +59,26 @@ namespace ucbhelper throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL skipBytes ( sal_Int32 nBytesToSkip ) throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available ( ) throw ( css::io::NotConnectedException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL closeInput ( ) throw ( css::io::NotConnectedException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** XSeekable @@ -88,18 +88,18 @@ namespace ucbhelper seek ( sal_Int64 location ) throw ( css::lang::IllegalArgumentException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getPosition ( ) - throw ( css::io::IOException, css::uno::RuntimeException, std::exception ); + throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getLength ( ) throw ( css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/include/ucbhelper/std_outputstream.hxx b/include/ucbhelper/std_outputstream.hxx index 9706bf861182..1b8c812e2068 100644 --- a/include/ucbhelper/std_outputstream.hxx +++ b/include/ucbhelper/std_outputstream.hxx @@ -35,29 +35,29 @@ namespace ucbhelper ~StdOutputStream( ); virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire ( ) throw ( ); + virtual void SAL_CALL acquire ( ) throw ( ) SAL_OVERRIDE; - virtual void SAL_CALL release ( ) throw ( ); + virtual void SAL_CALL release ( ) throw ( ) SAL_OVERRIDE; virtual void SAL_CALL writeBytes ( const css::uno::Sequence< sal_Int8 >& aData ) throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL flush ( ) throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL closeOutput ( ) throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx index c447f4fa626e..477fa1c275c6 100644 --- a/include/unotest/bootstrapfixturebase.hxx +++ b/include/unotest/bootstrapfixturebase.hxx @@ -68,8 +68,8 @@ public: // return a Path to a given c-str path from the workdir directory OUString getPathFromWorkdir( const char *pPath ); - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() SAL_OVERRIDE; + virtual void tearDown() SAL_OVERRIDE; }; diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index 135492c420a0..85ca0a34a43c 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -68,7 +68,7 @@ public: Returns the number of relations or zero if there are none. */ virtual sal_Int32 SAL_CALL getRelationCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns the relation of this relation set that is specified by the given index. @@ -86,7 +86,7 @@ public: virtual ::com::sun::star::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Tests whether the relation set contains a relation matching the specified key. @@ -101,7 +101,7 @@ public: given type and <FALSE/> if there is no such relation in the set. */ virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Retrieve and return the relation with the given relation type. @@ -116,7 +116,7 @@ public: */ virtual ::com::sun::star::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void AddRelation( const ::com::sun::star::accessibility::AccessibleRelation& rRelation) @@ -128,13 +128,13 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Mutex guarding this object. diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index bbccf61937b5..2d50da737d1b 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -80,7 +80,7 @@ public: <FALSE/> if there is at least one state set in it. */ virtual sal_Bool SAL_CALL isEmpty () - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Checks if the given state is a member of the state set of this object. @@ -94,7 +94,7 @@ public: state set and <FALSE/> otherwise. */ virtual sal_Bool SAL_CALL contains (sal_Int16 aState) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Checks if all of the given states are in this object's state set. @@ -113,12 +113,12 @@ public: */ virtual sal_Bool SAL_CALL containsAll ( const ::com::sun::star::uno::Sequence<sal_Int16>& rStateSet) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a sequence of all states. */ virtual com::sun::star::uno::Sequence<sal_Int16> SAL_CALL getStates() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Adds a state to the set. */ @@ -136,13 +136,13 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Mutex guarding this object. diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx index 9c89affe7c7b..c87268176c54 100644 --- a/include/unotools/componentresmodule.hxx +++ b/include/unotools/componentresmodule.hxx @@ -58,8 +58,8 @@ namespace utl protected: // OModule overridables - virtual void onFirstClient(); - virtual void onLastClient(); + virtual void onFirstClient() SAL_OVERRIDE; + virtual void onLastClient() SAL_OVERRIDE; }; diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index 50ed8e98af2b..d269ecbb6b26 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -200,7 +200,7 @@ namespace utl protected: // OEventListenerAdapter - virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ); + virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) SAL_OVERRIDE; protected: enum NAMEORIGIN @@ -313,7 +313,7 @@ namespace utl bool commit() const throw(); /// invalidate the object - virtual void clear() throw(); + virtual void clear() throw() SAL_OVERRIDE; }; diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index b492a7b031e5..4f0c600352e1 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -74,8 +74,8 @@ public: GlobalEventConfig_Impl( ); ~GlobalEventConfig_Impl( ); - void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); - void Commit(); + void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; + void Commit() SAL_OVERRIDE; void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -94,13 +94,13 @@ class UNOTOOLS_DLLPUBLIC GlobalEventConfig: ~GlobalEventConfig( ); static ::osl::Mutex& GetOwnStaticMutex(); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static OUString GetEventName( sal_Int32 nID ); private: diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx index b95242fe4b12..7a793e64686e 100644 --- a/include/unotools/fltrcfg.hxx +++ b/include/unotools/fltrcfg.hxx @@ -34,8 +34,8 @@ public: SvtFilterOptions(); virtual ~SvtFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; void Load(); void SetLoadWordBasicCode( bool bFlag ); diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx index 86b9bea021e6..a176aaf1c413 100644 --- a/include/unotools/options.hxx +++ b/include/unotools/options.hxx @@ -85,7 +85,7 @@ private: UNOTOOLS_DLLPRIVATE void operator =(Options &); // not defined protected: - virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, sal_uInt32 nHint=0 ); + virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, sal_uInt32 nHint=0 ) SAL_OVERRIDE; }; } } diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx index 9f6f7e785b24..28238a58eeeb 100644 --- a/include/unotools/progresshandlerwrap.hxx +++ b/include/unotools/progresshandlerwrap.hxx @@ -36,11 +36,11 @@ public: // XProgressHandler virtual void SAL_CALL push( const ::com::sun::star::uno::Any& Status ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL update( const ::com::sun::star::uno::Any& Status ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL pop() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace utl diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx index bc24baebeef9..7f4d19dac859 100644 --- a/include/unotools/streamhelper.hxx +++ b/include/unotools/streamhelper.hxx @@ -55,19 +55,19 @@ public: ,m_nAvailable(_nAvailable){} // staruno::XInterface - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // stario::XInputStream - virtual sal_Int32 SAL_CALL readBytes( staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL readSomeBytes( staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL available( ) throw(stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL closeInput( ) throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL readBytes( staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL readSomeBytes( staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL available( ) throw(stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeInput( ) throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL seek( sal_Int64 location ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL getPosition( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL getLength( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL seek( sal_Int64 location ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getPosition( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLength( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace utl diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index fc0bc7e44903..e6e536ba5502 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -61,11 +61,11 @@ public: virtual ~OInputStreamWrapper(); // stario::XInputStream - virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL available() throw(stario::NotConnectedException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, staruno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL available() throw(stario::NotConnectedException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// throws a NotConnectedException if the object is not connected anymore @@ -91,9 +91,9 @@ public: OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner = false); // XSeekable - virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -110,9 +110,9 @@ protected: virtual ~OOutputStreamWrapper(); // stario::XOutputStream - virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); + virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; /// throws an exception according to the error flag of m_pSvStream void checkError() const; @@ -140,14 +140,14 @@ private: virtual ~OSeekableOutputStreamWrapper(); // disambiguate XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; // XSeekable - virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class UNOTOOLS_DLLPUBLIC OStreamWrapper : public ::cppu::ImplInheritanceHelper3 < OSeekableInputStreamWrapper, com::sun::star::io::XStream, com::sun::star::io::XOutputStream, com::sun::star::io::XTruncate > @@ -156,14 +156,14 @@ public: OStreamWrapper(SvStream& _rStream); // stario::XStream - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // stario::XOutputStream - virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception); - virtual void SAL_CALL truncate() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL truncate() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx index 3821128fd18b..8439d7fd7d71 100644 --- a/include/unotools/syslocaleoptions.hxx +++ b/include/unotools/syslocaleoptions.hxx @@ -47,7 +47,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSysLocaleOptions : public utl::detai static sal_Int32 nRefCount; UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetMutex(); - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 nHint ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 nHint ) SAL_OVERRIDE; public: @@ -91,7 +91,7 @@ public: BlockBroadcasts(false) or otherwise pending hints would never be broadcasted again. */ - virtual void BlockBroadcasts( bool bBlock ); + virtual void BlockBroadcasts( bool bBlock ) SAL_OVERRIDE; // config value access methods diff --git a/include/unotools/ucblockbytes.hxx b/include/unotools/ucblockbytes.hxx index da557858cfb2..049ca69e6828 100644 --- a/include/unotools/ucblockbytes.hxx +++ b/include/unotools/ucblockbytes.hxx @@ -131,12 +131,12 @@ public: static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xContent ); // SvLockBytes - virtual void SetSynchronMode (bool bSynchron); - virtual ErrCode ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount, sal_uLong *pRead) const; - virtual ErrCode WriteAt ( sal_uLong, const void*, sal_uLong, sal_uLong *pWritten); - virtual ErrCode Flush (void) const; - virtual ErrCode SetSize (sal_uLong); - virtual ErrCode Stat ( SvLockBytesStat *pStat, SvLockBytesStatFlag) const; + virtual void SetSynchronMode (bool bSynchron) SAL_OVERRIDE; + virtual ErrCode ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount, sal_uLong *pRead) const SAL_OVERRIDE; + virtual ErrCode WriteAt ( sal_uLong, const void*, sal_uLong, sal_uLong *pWritten) SAL_OVERRIDE; + virtual ErrCode Flush (void) const SAL_OVERRIDE; + virtual ErrCode SetSize (sal_uLong) SAL_OVERRIDE; + virtual ErrCode Stat ( SvLockBytesStat *pStat, SvLockBytesStatFlag) const SAL_OVERRIDE; void SetError( ErrCode nError ) { m_nError = nError; } diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx index 92f06e736bda..2e880e35f7fa 100644 --- a/include/unotools/xmlaccelcfg.hxx +++ b/include/unotools/xmlaccelcfg.hxx @@ -47,33 +47,33 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume virtual ~OReadAccelatorDocumentHandler() {} // XInterface - virtual void SAL_CALL acquire() throw() + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs ) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endElement(const OUString& aName) throw - ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: OUString getErrorLineString(); diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index a37399215d03..9485a5a22b54 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -213,8 +213,8 @@ class Lanczos3Kernel : public Kernel boost::math::policies::promote_double<false> > SincPolicy; public: Lanczos3Kernel() : Kernel () {} - virtual double GetWidth() const { return 3.0; } - virtual double Calculate (double x) const + virtual double GetWidth() const SAL_OVERRIDE { return 3.0; } + virtual double Calculate (double x) const SAL_OVERRIDE { return (-3.0 <= x && x < 3.0) ? SincFilter(x) * SincFilter( x / 3.0 ) : 0.0; } @@ -234,8 +234,8 @@ class BicubicKernel : public Kernel { public: BicubicKernel() : Kernel () {} private: - virtual double GetWidth() const { return 2.0; } - virtual double Calculate (double x) const + virtual double GetWidth() const SAL_OVERRIDE { return 2.0; } + virtual double Calculate (double x) const SAL_OVERRIDE { if (x < 0.0) { @@ -258,8 +258,8 @@ class BilinearKernel : public Kernel { public: BilinearKernel() : Kernel () {} private: - virtual double GetWidth() const { return 1.0; } - virtual double Calculate (double x) const + virtual double GetWidth() const SAL_OVERRIDE { return 1.0; } + virtual double Calculate (double x) const SAL_OVERRIDE { if (x < 0.0) { @@ -277,8 +277,8 @@ class BoxKernel : public Kernel { public: BoxKernel() : Kernel () {} private: - virtual double GetWidth() const { return 0.5; } - virtual double Calculate (double x) const + virtual double GetWidth() const SAL_OVERRIDE { return 0.5; } + virtual double Calculate (double x) const SAL_OVERRIDE { if (-0.5 <= x && x < 0.5) return 1.0; diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 4575cee5e803..1c1dc6cafa59 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -64,8 +64,8 @@ public: ButtonDialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); ~ButtonDialog(); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void Click(); diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index a27a1840b580..9abba3e9d812 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -86,7 +86,7 @@ public: void SetFocusRect( const Rectangle& rFocusRect ); bool IsSmallSymbol() const; void SetSmallSymbol(bool bSmall = true); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; @@ -139,28 +139,28 @@ public: protected: explicit PushButton( WindowType nType ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; virtual const Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const; + GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: explicit PushButton( Window* pParent, WinBits nStyle = 0 ); explicit PushButton( Window* pParent, const ResId& ); virtual ~PushButton(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void KeyUp( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Toggle(); @@ -187,11 +187,11 @@ public: TriState GetSavedValue() const { return meSaveValue; } Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } const Link& GetToggleHdl() const { return maToggleHdl; } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; inline void PushButton::Check( bool bCheck ) @@ -223,7 +223,7 @@ public: explicit OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON ); explicit OKButton( Window* pParent, const ResId& ); - virtual void Click(); + virtual void Click() SAL_OVERRIDE; }; @@ -245,7 +245,7 @@ public: explicit CancelButton( Window* pParent, WinBits nStyle = 0 ); explicit CancelButton( Window* pParent, const ResId& ); - virtual void Click(); + virtual void Click() SAL_OVERRIDE; }; class VCL_DLLPUBLIC CloseButton : public CancelButton @@ -274,7 +274,7 @@ public: explicit HelpButton( Window* pParent, WinBits nStyle = 0 ); explicit HelpButton( Window* pParent, const ResId& ); - virtual void Click(); + virtual void Click() SAL_OVERRIDE; }; @@ -327,11 +327,11 @@ public: SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); protected: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; virtual const Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const; + GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; inline void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; } inline const Rectangle& GetMouseRect( ) const { return maMouseRect; } @@ -347,18 +347,18 @@ public: explicit RadioButton( Window* pParent, const ResId& ); virtual ~RadioButton(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void KeyUp( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void Toggle(); @@ -380,7 +380,7 @@ public: static Image GetRadioImage( const AllSettings& rSettings, sal_uInt16 nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } const Link& GetToggleHdl() const { return maToggleHdl; } @@ -400,7 +400,7 @@ public: */ std::vector<RadioButton*> GetRadioButtonGroup(bool bIncludeThis = true) const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; /* * Group this RadioButton with another @@ -447,9 +447,9 @@ protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - virtual void FillLayoutData() const; - virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const; - virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + virtual void FillLayoutData() const SAL_OVERRIDE; + virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual void ImplDrawCheckBoxState(); SAL_DLLPRIVATE const Rectangle& GetStateRect() const { return maStateRect; } @@ -462,18 +462,18 @@ public: explicit CheckBox( Window* pParent, WinBits nStyle = 0 ); explicit CheckBox( Window* pParent, const ResId& ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void KeyUp( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void Toggle(); @@ -492,14 +492,14 @@ public: static Image GetCheckImage( const AllSettings& rSettings, sal_uInt16 nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } const Link& GetToggleHdl() const { return maToggleHdl; } bool IsLegacyNoTextAlign() { return mbLegacyNoTextAlign; } void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; inline void CheckBox::Check( bool bCheck ) @@ -558,11 +558,11 @@ public: class VCL_DLLPUBLIC DisclosureButton : public CheckBox { protected: - SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(); + SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState() SAL_OVERRIDE; public: explicit DisclosureButton( Window* pParent, WinBits nStyle = 0 ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_BUTTON_HXX diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 2fa396cfaf57..51770b2b5e73 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -88,29 +88,29 @@ protected: explicit ComboBox( WindowType nType ); bool IsDropDownBox() const { return mpFloatWin ? true : false; } - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; public: explicit ComboBox( Window* pParent, WinBits nStyle = 0 ); explicit ComboBox( Window* pParent, const ResId& ); virtual ~ComboBox(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Select(); virtual void DoubleClick(); - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual const Wallpaper& GetDisplayBackground() const; + virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; - virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) + virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE { Edit::SetPosSizePixel( rNewPos, rNewSize ); } void SetDropDownSizePixel( const Size& rNewSize ) { if( IsDropDownBox() ) setPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); } @@ -126,8 +126,8 @@ public: void EnableDDAutoWidth( bool b ); - virtual void SetText( const OUString& rStr ); - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE; virtual sal_Int32 InsertEntry(const OUString& rStr, sal_Int32 nPos = COMBOBOX_APPEND); void InsertEntryWithImage( const OUString& rStr, const Image& rImage, sal_Int32 nPos = COMBOBOX_APPEND ); @@ -169,8 +169,8 @@ public: void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - Size CalcMinimumSize() const; - virtual Size GetOptimalSize() const; + Size CalcMinimumSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; Size CalcAdjustedSize( const Size& rPrefSize ) const; Size CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; @@ -219,7 +219,7 @@ public: sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; #endif // _COMBOBOX_HXX diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx index 93fee293eb11..ae0c0e28e25c 100644 --- a/include/vcl/configsettings.hxx +++ b/include/vcl/configsettings.hxx @@ -42,7 +42,7 @@ namespace vcl boost::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE; void getValues(); SettingsConfigItem(); @@ -54,7 +54,7 @@ namespace vcl const OUString& getValue( const OUString& rGroup, const OUString& rKey ) const; void setValue( const OUString& rGroup, const OUString& rKey, const OUString& rValue ); - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; }; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 6c00e460d814..4c707327ede2 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -129,19 +129,19 @@ public: explicit Control( Window* pParent, const ResId& ); virtual ~Control(); - virtual void EnableRTL ( bool bEnable = true ); + virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // invalidates layout data - virtual void SetText( const OUString& rStr ); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; // gets the displayed text - virtual OUString GetDisplayText() const; + virtual OUString GetDisplayText() const SAL_OVERRIDE; // returns the bounding box for the character at index nIndex (in control coordinates) Rectangle GetCharacterBounds( long nIndex ) const; // returns the character index for corresponding to rPoint (in control coordinates) @@ -175,7 +175,7 @@ public: void SetLayoutDataParent( const Control* pParent ) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; /** sets a reference device used for rendering control text @see DrawControlText diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 53e88f4ee4e3..e98ec6dad008 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -83,7 +83,7 @@ public: protected: explicit Dialog( WindowType nType ); explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; protected: friend class VclBuilder; @@ -95,27 +95,27 @@ public: explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const; - virtual void Resize(); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; bool isLayoutEnabled() const; void setOptimalLayoutSize(); bool isCalculatingInitialLayoutSize() const { return mbIsCalculatingInitialLayoutSize; } - virtual void queue_resize(); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual void queue_resize() SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; VclButtonBox* get_action_area(); VclBox* get_content_area(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; virtual short Execute(); bool IsInExecute() const { return mbInExecute; } - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; // Dialog::Execute replacement API diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index c1924caa3108..a1dbf14014f5 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -109,29 +109,29 @@ public: ~DragAndDropWrapper(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XEventListener - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::datatransfer::dnd::XDragGestureListener - void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::datatransfer::dnd::XDragSourceListener - void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::datatransfer::dnd::XDropTargetListener - void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; }} // namespace vcl::unohelper diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index 6d88ca02d06f..0208557ca0e5 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -43,10 +43,10 @@ public: WindowAlign GetAlign() const; bool IsHorizontal() const; - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void StateChanged( StateChangedType nType ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; }; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 21d7fd4822bb..0f7199d60542 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -295,10 +295,10 @@ public: virtual void PopupModeEnd(); virtual void Resizing( Size& rSize ); virtual bool Close(); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetPin( bool bPin ); bool IsPinned() const; @@ -333,13 +333,13 @@ public: virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, - sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); + sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; void SetPosSizePixel( const Point& rNewPos, - const Size& rNewSize ) + const Size& rNewSize ) SAL_OVERRIDE { Window::SetPosSizePixel( rNewPos, rNewSize ); } - Point GetPosPixel() const; - Size GetSizePixel() const; - void SetOutputSizePixel( const Size& rNewSize ); + Point GetPosPixel() const SAL_OVERRIDE; + Size GetSizePixel() const SAL_OVERRIDE; + void SetOutputSizePixel( const Size& rNewSize ) SAL_OVERRIDE; Size GetOutputSizePixel() const; }; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 2e22e25d9a2d..8c06faa72ee9 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -135,15 +135,15 @@ protected: using vcl::unohelper::DragAndDropClient::dragEnter; using vcl::unohelper::DragAndDropClient::dragExit; using vcl::unohelper::DragAndDropClient::dragOver; - virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; Edit( WindowType nType ); public: @@ -154,19 +154,19 @@ public: Edit( Window* pParent, const ResId& rResId ); virtual ~Edit(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual Window* GetPreferredKeyInputWindow(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual void Modify(); virtual void UpdateData(); @@ -209,9 +209,9 @@ public: virtual void Paste(); void Undo(); - virtual void SetText( const OUString& rStr ); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); - virtual OUString GetText() const; + virtual OUString GetText() const SAL_OVERRIDE; virtual void SetPlaceholderText( const OUString& rStr ); virtual OUString GetPlaceholderText() const; @@ -232,7 +232,7 @@ public: virtual Size CalcMinimumSize() const; virtual Size CalcMinimumSizeForText(const OUString &rString) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual Size CalcSize(sal_Int32 nChars) const; virtual sal_Int32 GetMaxVisChars() const; @@ -247,9 +247,9 @@ public: static PopupMenu* CreatePopupMenu(); static void DeletePopupMenu( PopupMenu* pMenu ); - virtual OUString GetSurroundingText() const; - virtual Selection GetSurroundingTextSelection() const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual OUString GetSurroundingText() const SAL_OVERRIDE; + virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; // returns the minimum size a bordered Edit should have given the current // global style settings (needed by sc's inputwin.cxx) diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 435bed63eb32..38d1cc523439 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -121,7 +121,7 @@ protected: public: virtual ~PatternFormatter(); - virtual void Reformat(); + virtual void Reformat() SAL_OVERRIDE; void SetMask(const OString& rEditMask, const OUString& rLiteralMask ); const OString& GetEditMask() const { return m_aEditMask; } @@ -177,7 +177,7 @@ protected: public: virtual ~NumericFormatter(); - virtual void Reformat(); + virtual void Reformat() SAL_OVERRIDE; void SetMin( sal_Int64 nNewMin ); sal_Int64 GetMin() const { return mnMin; } @@ -238,7 +238,7 @@ public: virtual ~MetricFormatter(); virtual void CustomConvert() = 0; - virtual void Reformat(); + virtual void Reformat() SAL_OVERRIDE; virtual void SetUnit( FieldUnit meUnit ); FieldUnit GetUnit() const { return meUnit; } @@ -258,12 +258,12 @@ public: sal_Int64 GetBaseValue( FieldUnit eOutUnit = FUNIT_NONE ) const; virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); - virtual void SetValue( sal_Int64 nValue ); + virtual void SetValue( sal_Int64 nValue ) SAL_OVERRIDE; using NumericFormatter::SetUserValue; void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ); virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; - virtual sal_Int64 GetValue() const; - virtual OUString CreateFieldText( sal_Int64 nValue ) const; + virtual sal_Int64 GetValue() const SAL_OVERRIDE; + virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; using NumericFormatter::GetCorrectedValue; sal_Int64 GetCorrectedValue( FieldUnit eOutUnit ) const; @@ -288,13 +288,13 @@ protected: public: virtual ~CurrencyFormatter(); - virtual void Reformat(); + virtual void Reformat() SAL_OVERRIDE; OUString GetCurrencySymbol() const; - virtual void SetValue( sal_Int64 nNewValue ); - virtual sal_Int64 GetValue() const; - virtual OUString CreateFieldText( sal_Int64 nValue ) const; + virtual void SetValue( sal_Int64 nNewValue ) SAL_OVERRIDE; + virtual sal_Int64 GetValue() const SAL_OVERRIDE; + virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; }; @@ -338,10 +338,10 @@ protected: public: virtual ~DateFormatter(); - virtual void Reformat(); - virtual void ReformatAll(); + virtual void Reformat() SAL_OVERRIDE; + virtual void ReformatAll() SAL_OVERRIDE; - virtual void SetLocale( const ::com::sun::star::lang::Locale& rLocale ); + virtual void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) SAL_OVERRIDE; void SetExtDateFormat( ExtDateFieldFormat eFormat ); @@ -433,8 +433,8 @@ public: virtual ~TimeFormatter(); - virtual void Reformat(); - virtual void ReformatAll(); + virtual void Reformat() SAL_OVERRIDE; + virtual void ReformatAll() SAL_OVERRIDE; void SetMin( const Time& rNewMin ); const Time& GetMin() const { return maMin; } @@ -486,9 +486,9 @@ public: explicit PatternField( Window* pParent, WinBits nWinStyle ); virtual ~PatternField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Modify(); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; }; @@ -506,19 +506,19 @@ public: explicit NumericField( Window* pParent, const ResId& ); virtual ~NumericField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; @@ -536,21 +536,21 @@ public: explicit MetricField( Window* pParent, const ResId& ); virtual ~MetricField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); - virtual void CustomConvert(); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; + virtual void CustomConvert() SAL_OVERRIDE; - virtual void SetUnit( FieldUnit meUnit ); + virtual void SetUnit( FieldUnit meUnit ) SAL_OVERRIDE; void SetFirst( sal_Int64 nNewFirst, FieldUnit eInUnit ); inline void SetFirst(sal_Int64 first) { SetFirst(first, FUNIT_NONE); } @@ -589,7 +589,7 @@ public: MapUnit eInUnit, FieldUnit eOutUnit ) { return ConvertDoubleValue( static_cast<double>(nValue), nDecDigits, eInUnit, eOutUnit ); } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; @@ -603,16 +603,16 @@ public: CurrencyField( Window* pParent, WinBits nWinStyle ); ~CurrencyField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; }; @@ -635,16 +635,16 @@ public: explicit DateField( Window* pParent, const ResId& ); virtual ~DateField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; void SetFirst( const Date& rNewFirst ) { maFirst = rNewFirst; } Date GetFirst() const { return maFirst; } @@ -671,16 +671,16 @@ public: explicit TimeField( Window* pParent, const ResId& ); virtual ~TimeField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; void SetFirst( const Time& rNewFirst ) { maFirst = rNewFirst; } Time GetFirst() const { return maFirst; } @@ -701,12 +701,12 @@ public: PatternBox( Window* pParent, WinBits nWinStyle ); ~PatternBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void ReformatAll(); + virtual void ReformatAll() SAL_OVERRIDE; }; @@ -721,15 +721,15 @@ public: explicit NumericBox( Window* pParent, const ResId& ); virtual ~NumericBox(); - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void ReformatAll(); + virtual void ReformatAll() SAL_OVERRIDE; void InsertValue( sal_Int64 nValue, sal_Int32 nPos = COMBOBOX_APPEND ); }; @@ -745,16 +745,16 @@ public: explicit MetricBox( Window* pParent, WinBits nWinStyle ); virtual ~MetricBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void CustomConvert(); - virtual void ReformatAll(); + virtual void CustomConvert() SAL_OVERRIDE; + virtual void ReformatAll() SAL_OVERRIDE; void InsertValue( sal_Int64 nValue, FieldUnit eInUnit = FUNIT_NONE, sal_Int32 nPos = COMBOBOX_APPEND ); @@ -763,8 +763,8 @@ public: FieldUnit eInUnit = FUNIT_NONE ) const; // Needed, because GetValue() with nPos hide these functions - virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; - virtual sal_Int64 GetValue() const; + virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const SAL_OVERRIDE; + virtual sal_Int64 GetValue() const SAL_OVERRIDE; }; @@ -778,15 +778,15 @@ public: explicit CurrencyBox( Window* pParent, WinBits nWinStyle ); virtual ~CurrencyBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void ReformatAll(); + virtual void ReformatAll() SAL_OVERRIDE; - virtual sal_Int64 GetValue() const; + virtual sal_Int64 GetValue() const SAL_OVERRIDE; }; @@ -799,13 +799,13 @@ public: explicit DateBox( Window* pParent, WinBits nWinStyle ); virtual ~DateBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void ReformatAll(); + virtual void ReformatAll() SAL_OVERRIDE; }; @@ -819,13 +819,13 @@ public: explicit TimeBox( Window* pParent, WinBits nWinStyle ); virtual ~TimeBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void ReformatAll(); + virtual void ReformatAll() SAL_OVERRIDE; }; #endif // INCLUDED_VCL_FIELD_HXX diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index e3193841bf92..9d182ad54f1d 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -50,24 +50,24 @@ private: public: SAL_DLLPRIVATE static sal_uInt16 ImplGetTextStyle( WinBits nWinBits ); protected: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; virtual const Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const; + GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; - virtual Window* getAccessibleRelationLabelFor() const; + virtual Window* getAccessibleRelationLabelFor() const SAL_OVERRIDE; public: explicit FixedText( Window* pParent, WinBits nStyle = 0 ); explicit FixedText( Window* pParent, const ResId& rResId ); virtual ~FixedText(); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void setMaxWidthChars(sal_Int32 nWidth); sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } @@ -76,8 +76,8 @@ public: static Size CalcMinimumTextSize(Control const* pControl, long nMaxWidth = 0x7fffffff); static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth); Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const; - virtual Size GetOptimalSize() const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; void set_mnemonic_widget(Window *pWindow); Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; @@ -87,7 +87,7 @@ class VCL_DLLPUBLIC SelectableFixedText : public Edit public: explicit SelectableFixedText( Window* pParent, WinBits nStyle = 0 ); - virtual void LoseFocus(); + virtual void LoseFocus() SAL_OVERRIDE; }; @@ -105,23 +105,23 @@ private: SAL_DLLPRIVATE void ImplDraw( bool bLayout = false ); protected: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; virtual const Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const; + GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: explicit FixedLine( Window* pParent, WinBits nStyle = WB_HORZ ); explicit FixedLine( Window* pParent, const ResId& ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; @@ -149,11 +149,11 @@ public: explicit FixedBitmap( Window* pParent, const ResId& ); virtual ~FixedBitmap(); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetBitmap( const Bitmap& rBitmap ); using OutputDevice::GetBitmap; @@ -187,20 +187,20 @@ public: explicit FixedImage( Window* pParent, const ResId& ); virtual ~FixedImage(); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetImage( const Image& rImage ); const Image& GetImage() const { return maImage; } bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; static Image loadThemeImage(const OString &rFileName); }; diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 224c4fecab07..1b8fcd554d32 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -45,19 +45,19 @@ Changes the pointer only over the text. */ - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; /** overwrites Window::MouseButtonUp(). Calls the set link if the mouse is over the text. */ - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; /** overwrites Window::RequestHelp(). Shows tooltip only if the mouse is over the text. */ - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: /** ctors @@ -76,21 +76,21 @@ Changes the color of the text and shows a focus rectangle. */ - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; /** overwrites Window::LoseFocus(). Changes the color of the text and hides the focus rectangle. */ - virtual void LoseFocus(); + virtual void LoseFocus() SAL_OVERRIDE; /** overwrites Window::KeyInput(). KEY_RETURN and KEY_SPACE calls the link handler. */ - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; /** sets m_aClickHdl with rLink. @@ -119,7 +119,7 @@ OUString GetURL() const; /** sets new text and recalculates the text length. */ - virtual void SetText(const OUString& rNewDescription); + virtual void SetText(const OUString& rNewDescription) SAL_OVERRIDE; }; #endif diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 92d1f488e3d7..e58873eb62a3 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -120,9 +120,9 @@ public: explicit FloatingWindow( Window* pParent, const ResId& ); virtual ~FloatingWindow(); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void PopupModeEnd(); diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 34b9ebc66db9..e248efe66b84 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -193,9 +193,9 @@ public: public: - virtual void Load( SvStream& ); - virtual void Save( SvStream& ); - virtual void Assign( const SvDataCopyStream& ); + virtual void Load( SvStream& ) SAL_OVERRIDE; + virtual void Save( SvStream& ) SAL_OVERRIDE; + virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE; const SvgDataPtr& getSvgData() const; diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 449788a90cbe..7e5e11cb9913 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -39,21 +39,21 @@ private: SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout = false ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; virtual const Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const; + GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: explicit GroupBox( Window* pParent, WinBits nStyle = 0 ); explicit GroupBox( Window* pParent, const ResId& ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_GROUP_HXX diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index 337746f66815..dfd42c16d68f 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -42,11 +42,11 @@ public: void SetScaleMode( const ::sal_Int16 _nMode ); ::sal_Int16 GetScaleMode() const { return mnScaleMode; } - virtual void Resize(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Paint( const Rectangle& rRect ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; protected: void ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) const; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index e876ac6cb888..577b8273e780 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -40,7 +40,7 @@ public: m_bLayoutDirty = true; } - virtual void queue_resize(); + virtual void queue_resize() SAL_OVERRIDE; protected: //these are the two that need to be implemented by //containers, figure out how much space you want... @@ -48,13 +48,13 @@ protected: //..and decide what to do when set to this size virtual void setAllocation(const Size &rAllocation) = 0; - virtual sal_uInt16 getDefaultAccessibleRole() const; + virtual sal_uInt16 getDefaultAccessibleRole() const SAL_OVERRIDE; public: //you don't want to override these - virtual Size GetOptimalSize() const; - virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize); - virtual void SetPosPixel(const Point& rAllocPos); - virtual void SetSizePixel(const Size& rAllocation); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) SAL_OVERRIDE; + virtual void SetPosPixel(const Point& rAllocPos) SAL_OVERRIDE; + virtual void SetSizePixel(const Size& rAllocation) SAL_OVERRIDE; private: bool m_bLayoutDirty; }; @@ -89,14 +89,14 @@ public: { return m_bHomogeneous; } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; protected: - virtual sal_uInt16 getDefaultAccessibleRole() const; + virtual sal_uInt16 getDefaultAccessibleRole() const SAL_OVERRIDE; void accumulateMaxes(const Size &rChildSize, Size &rSize) const; Size finalizeMaxes(const Size &rSize, sal_uInt16 nVisibleChildren) const; - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; virtual long getPrimaryDimension(const Size &rSize) const = 0; virtual void setPrimaryDimension(Size &rSize, long) const = 0; @@ -119,39 +119,39 @@ public: m_bVerticalContainer = true; } protected: - virtual long getPrimaryDimension(const Size &rSize) const + virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getHeight(); } - virtual void setPrimaryDimension(Size &rSize, long nHeight) const + virtual void setPrimaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE { rSize.setHeight(nHeight); } - virtual long getPrimaryCoordinate(const Point &rPos) const + virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getY(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setY(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const + virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getWidth(); } - virtual void setSecondaryDimension(Size &rSize, long nWidth) const + virtual void setSecondaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE { rSize.setWidth(nWidth); } - virtual long getSecondaryCoordinate(const Point &rPos) const + virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getX(); } - virtual void setSecondaryCoordinate(Point &rPos, long nPos) const + virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setX(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const + virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -166,39 +166,39 @@ public: m_bVerticalContainer = false; } protected: - virtual long getPrimaryDimension(const Size &rSize) const + virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getWidth(); } - virtual void setPrimaryDimension(Size &rSize, long nWidth) const + virtual void setPrimaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE { rSize.setWidth(nWidth); } - virtual long getPrimaryCoordinate(const Point &rPos) const + virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getX(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setX(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const + virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getHeight(); } - virtual void setSecondaryDimension(Size &rSize, long nHeight) const + virtual void setSecondaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE { rSize.setHeight(nHeight); } - virtual long getSecondaryCoordinate(const Point &rPos) const + virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getY(); } - virtual void setSecondaryCoordinate(Point &rPos, long nPos) const + virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setY(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const + virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -230,11 +230,11 @@ public: { return m_eLayoutStyle; } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; void sort_native_button_order(); protected: - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; Size addSpacing(const Size &rSize, sal_uInt16 nVisibleChildren) const; private: VclButtonBoxStyle m_eLayoutStyle; @@ -258,39 +258,39 @@ public: m_bVerticalContainer = true; } protected: - virtual long getPrimaryDimension(const Size &rSize) const + virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getHeight(); } - virtual void setPrimaryDimension(Size &rSize, long nHeight) const + virtual void setPrimaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE { rSize.setHeight(nHeight); } - virtual long getPrimaryCoordinate(const Point &rPos) const + virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getY(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setY(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const + virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getWidth(); } - virtual void setSecondaryDimension(Size &rSize, long nWidth) const + virtual void setSecondaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE { rSize.setWidth(nWidth); } - virtual long getSecondaryCoordinate(const Point &rPos) const + virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getX(); } - virtual void setSecondaryCoordinate(Point &rPos, long nPos) const + virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setX(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const + virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -305,39 +305,39 @@ public: m_bVerticalContainer = false; } protected: - virtual long getPrimaryDimension(const Size &rSize) const + virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getWidth(); } - virtual void setPrimaryDimension(Size &rSize, long nWidth) const + virtual void setPrimaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE { rSize.setWidth(nWidth); } - virtual long getPrimaryCoordinate(const Point &rPos) const + virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getX(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setX(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const + virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getHeight(); } - virtual void setSecondaryDimension(Size &rSize, long nHeight) const + virtual void setSecondaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE { rSize.setHeight(nHeight); } - virtual long getSecondaryCoordinate(const Point &rPos) const + virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getY(); } - virtual void setSecondaryCoordinate(Point &rPos, long nPos) const + virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setY(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const + virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -392,8 +392,8 @@ private: void calcMaxs(const array_type &A, std::vector<Value> &rWidths, std::vector<Value> &rHeights) const; Size calculateRequisitionForSpacings(sal_Int32 nRowSpacing, sal_Int32 nColSpacing) const; - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; public: VclGrid(Window *pParent) : VclContainer(pParent) @@ -433,7 +433,7 @@ public: { return m_nColumnSpacing; } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; VCL_DLLPUBLIC void setGridAttach(Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, @@ -448,8 +448,8 @@ public: } virtual Window *get_child(); virtual const Window *get_child() const; - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; }; class VCL_DLLPUBLIC VclFrame : public VclBin @@ -467,14 +467,14 @@ public: } void set_label(const OUString &rLabel); OUString get_label() const; - virtual Window *get_child(); - virtual const Window *get_child() const; + virtual Window *get_child() SAL_OVERRIDE; + virtual const Window *get_child() const SAL_OVERRIDE; Window *get_label_widget(); const Window *get_label_widget() const; protected: - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); - virtual OUString getDefaultAccessibleName() const; + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual OUString getDefaultAccessibleName() const SAL_OVERRIDE; }; class VCL_DLLPUBLIC VclAlignment : public VclBin @@ -492,10 +492,10 @@ public: , m_fYScale(1.0) { } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; protected: - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; private: sal_Int32 m_nBottomPadding; sal_Int32 m_nLeftPadding; @@ -518,9 +518,9 @@ public: m_aDisclosureButton.SetToggleHdl(LINK(this, VclExpander, ClickHdl)); m_aDisclosureButton.Show(); } - virtual Window *get_child(); - virtual const Window *get_child() const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual Window *get_child() SAL_OVERRIDE; + virtual const Window *get_child() const SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; bool get_expanded() const { return m_aDisclosureButton.IsChecked(); @@ -537,12 +537,12 @@ public: { return m_aDisclosureButton.GetText(); } - virtual void StateChanged(StateChangedType nType); + virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE; void SetExpandedHdl( const Link& rLink ) { maExpandedHdl = rLink; } const Link& GetExpandedHdl() const { return maExpandedHdl; } protected: - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; private: bool m_bResizeTopLevel; DisclosureButton m_aDisclosureButton; @@ -554,9 +554,9 @@ class VCL_DLLPUBLIC VclScrolledWindow : public VclBin { public: VclScrolledWindow(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); - virtual Window *get_child(); - virtual const Window *get_child() const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual Window *get_child() SAL_OVERRIDE; + virtual const Window *get_child() const SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; ScrollBar& getVertScrollBar() { return m_aVScroll; } ScrollBar& getHorzScrollBar() { return m_aHScroll; } Size getVisibleChildSize() const; @@ -564,11 +564,11 @@ public: //to override it void setUserManagedScrolling(bool bUserManagedScrolling) { m_bUserManagedScrolling = bUserManagedScrolling;} protected: - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; DECL_LINK(ScrollBarHdl, void *); void InitScrollBars(const Size &rRequest); - virtual bool Notify(NotifyEvent& rNEvt); + virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; private: bool m_bUserManagedScrolling; ScrollBar m_aVScroll; @@ -598,7 +598,7 @@ private: SetPaintTransparent(true); SetBackground(); } - virtual void Command(const CommandEvent& rCEvt) + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE { GetParent()->Command(rCEvt); } @@ -612,12 +612,12 @@ public: { m_aEventBoxHelper.Show(); } - virtual Window *get_child(); - virtual const Window *get_child() const; - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Window *get_child() SAL_OVERRIDE; + virtual const Window *get_child() const SAL_OVERRIDE; + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; - virtual void Command(const CommandEvent& rCEvt); + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; }; enum VclSizeGroupMode @@ -717,8 +717,8 @@ public: WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); MessageDialog(Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); MessageDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription); - virtual bool set_property(const OString &rKey, const OString &rValue); - virtual short Execute(); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual short Execute() SAL_OVERRIDE; ///Emitted when an action widget is clicked virtual void response(short nResponseId); OUString get_primary_text() const; diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index 94814afe0563..0f0197ee94fa 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -238,7 +238,7 @@ namespace vcl class DeleteOnDeinit : public DeleteOnDeinitBase { T* m_pT; - virtual void doCleanup() { delete m_pT; m_pT = NULL; } + virtual void doCleanup() SAL_OVERRIDE { delete m_pT; m_pT = NULL; } public: DeleteOnDeinit( T* i_pT ) : m_pT( i_pT ) { addDeinitContainer( this ); } virtual ~DeleteOnDeinit() {} @@ -271,7 +271,7 @@ namespace vcl class DeleteUnoReferenceOnDeinit : public ::vcl::DeleteOnDeinitBase { ::com::sun::star::uno::Reference<I> m_xI; - virtual void doCleanup() { set(NULL); } + virtual void doCleanup() SAL_OVERRIDE { set(NULL); } public: DeleteUnoReferenceOnDeinit(const ::com::sun::star::uno::Reference<I>& r_xI ) : m_xI( r_xI ) { addDeinitContainer( this ); } diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 7a912388e4b8..c307fa071c87 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -51,8 +51,8 @@ protected: public: ~LongCurrencyFormatter(); - virtual void Reformat(); - virtual void ReformatAll(); + virtual void Reformat() SAL_OVERRIDE; + virtual void ReformatAll() SAL_OVERRIDE; void SetUseThousandSep( bool b ); bool IsUseThousandSep() const { return mbThousandSep; } @@ -92,14 +92,14 @@ public: LongCurrencyField( Window* pParent, WinBits nWinStyle ); ~LongCurrencyField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void Modify(); - void Up(); - void Down(); - void First(); - void Last(); + void Modify() SAL_OVERRIDE; + void Up() SAL_OVERRIDE; + void Down() SAL_OVERRIDE; + void First() SAL_OVERRIDE; + void Last() SAL_OVERRIDE; void SetFirst( BigInt nNewFirst ) { mnFirst = nNewFirst; } BigInt GetFirst() const { return mnFirst; } @@ -119,11 +119,11 @@ public: LongCurrencyBox( Window* pParent, WinBits nWinStyle ); ~LongCurrencyBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void Modify(); - void ReformatAll(); + void Modify() SAL_OVERRIDE; + void ReformatAll() SAL_OVERRIDE; BigInt GetValue() const { return LongCurrencyFormatter::GetValue(); } diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index a6564f9fd546..791f9a360019 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -75,31 +75,31 @@ protected: protected: explicit ListBox( WindowType nType ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; public: explicit ListBox( Window* pParent, WinBits nStyle = WB_BORDER ); explicit ListBox( Window* pParent, const ResId& ); virtual ~ListBox(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Select(); virtual void DoubleClick(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual Window* GetPreferredKeyInputWindow(); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; - virtual const Wallpaper& GetDisplayBackground() const; + virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; virtual void setPosSizePixel( long nX, long nY, - long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) + long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE { Control::SetPosSizePixel( rNewPos, rNewSize ); } void SetDropDownSizePixel( const Size& rNewSize ) { if( IsDropDownBox() ) setPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); } @@ -194,7 +194,7 @@ public: Size CalcSubEditSize() const; //size of area inside lstbox, i.e. no scrollbar/dropdown Size CalcMinimumSize() const; //size of lstbox area, i.e. including scrollbar/dropdown - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; Size CalcAdjustedSize( const Size& rPrefSize ) const; Size CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; @@ -230,7 +230,7 @@ public: sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; void EnableQuickSelection( const bool& b ); }; diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index bce98e96f1f7..f62c3cbdcb48 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -62,10 +62,10 @@ public: explicit MenuButton( Window* pParent, const ResId& ); virtual ~MenuButton(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; virtual void Select(); void SetMenuMode( sal_uInt16 nMode ); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 1720b4148d27..183aca952a6a 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -118,10 +118,10 @@ struct ImplMetaWriteData protected: \ virtual ~Meta##Name##Action(); \ public: \ - virtual void Execute( OutputDevice* pOut ); \ - virtual MetaAction* Clone(); \ - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); \ - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); + virtual void Execute( OutputDevice* pOut ) SAL_OVERRIDE; \ + virtual MetaAction* Clone() SAL_OVERRIDE; \ + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; \ + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; #define IMPL_META_ACTION( Name, nType ) \ Meta##Name##Action::Meta##Name##Action() : \ @@ -169,15 +169,15 @@ private: Point maPt; Color maColor; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Pixel, META_PIXEL_ACTION ) MetaPixelAction( const Point& rPt, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetPoint() const { return maPt; } const Color& GetColor() const { return maColor; } @@ -188,15 +188,15 @@ class VCL_DLLPUBLIC MetaPointAction : public MetaAction private: Point maPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Point, META_POINT_ACTION ) explicit MetaPointAction( const Point& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetPoint() const { return maPt; } }; @@ -209,7 +209,7 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Line, META_LINE_ACTION ) @@ -218,8 +218,8 @@ public: MetaLineAction( const Point& rStart, const Point& rEnd, const LineInfo& rLineInfo ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetStartPoint() const { return maStartPt; } const Point& GetEndPoint() const { return maEndPt; } @@ -232,14 +232,14 @@ private: Rectangle maRect; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Rect, META_RECT_ACTION ) explicit MetaRectAction( const Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } }; @@ -252,7 +252,7 @@ private: sal_uInt32 mnHorzRound; sal_uInt32 mnVertRound; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION ) @@ -260,8 +260,8 @@ public: MetaRoundRectAction( const Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } sal_uInt32 GetHorzRound() const { return mnHorzRound; } @@ -274,15 +274,15 @@ private: Rectangle maRect; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) explicit MetaEllipseAction( const Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } }; @@ -295,7 +295,7 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Arc, META_ARC_ACTION ) @@ -303,8 +303,8 @@ public: MetaArcAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } @@ -319,7 +319,7 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Pie, META_PIE_ACTION ) @@ -327,8 +327,8 @@ public: MetaPieAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } @@ -343,7 +343,7 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Chord, META_CHORD_ACTION ) @@ -351,8 +351,8 @@ public: MetaChordAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } @@ -366,7 +366,7 @@ private: LineInfo maLineInfo; Polygon maPoly; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) @@ -374,8 +374,8 @@ public: explicit MetaPolyLineAction( const Polygon& ); explicit MetaPolyLineAction( const Polygon&, const LineInfo& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Polygon& GetPolygon() const { return maPoly; } const LineInfo& GetLineInfo() const { return maLineInfo; } @@ -387,15 +387,15 @@ private: Polygon maPoly; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Polygon, META_POLYGON_ACTION ) explicit MetaPolygonAction( const Polygon& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Polygon& GetPolygon() const { return maPoly; } }; @@ -406,15 +406,15 @@ private: PolyPolygon maPolyPoly; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) explicit MetaPolyPolygonAction( const PolyPolygon& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } }; @@ -428,7 +428,7 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Text, META_TEXT_ACTION ) @@ -436,8 +436,8 @@ public: MetaTextAction( const Point& rPt, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetPoint() const { return maPt; } const OUString& GetText() const { return maStr; } @@ -455,7 +455,7 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; protected: virtual ~MetaTextArrayAction(); @@ -467,15 +467,15 @@ public: const sal_Int32* pDXAry, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Execute( OutputDevice* pOut ); + virtual void Execute( OutputDevice* pOut ) SAL_OVERRIDE; - virtual MetaAction* Clone(); + virtual MetaAction* Clone() SAL_OVERRIDE; - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; const Point& GetPoint() const { return maStartPt; } const OUString& GetText() const { return maStr; } @@ -494,7 +494,7 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) @@ -503,8 +503,8 @@ public: const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetPoint() const { return maPt; } const OUString& GetText() const { return maStr; } @@ -521,7 +521,7 @@ private: OUString maStr; sal_uInt16 mnStyle; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) @@ -529,8 +529,8 @@ public: MetaTextRectAction( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const OUString& GetText() const { return maStr; } @@ -547,7 +547,7 @@ private: FontUnderline meUnderline; FontUnderline meOverline; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextLine, META_TEXTLINE_ACTION ) @@ -556,8 +556,8 @@ public: FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetStartPoint() const { return maPos; } long GetWidth() const { return mnWidth; } @@ -573,15 +573,15 @@ private: Bitmap maBmp; Point maPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Bmp, META_BMP_ACTION ) MetaBmpAction( const Point& rPt, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Point& GetPoint() const { return maPt; } @@ -595,7 +595,7 @@ private: Point maPt; Size maSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( BmpScale, META_BMPSCALE_ACTION ) @@ -603,8 +603,8 @@ public: MetaBmpScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Point& GetPoint() const { return maPt; } @@ -621,7 +621,7 @@ private: Point maSrcPt; Size maSrcSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION ) @@ -630,8 +630,8 @@ public: const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Point& GetDestPoint() const { return maDstPt; } @@ -647,15 +647,15 @@ private: BitmapEx maBmpEx; Point maPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( BmpEx, META_BMPEX_ACTION ) MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const BitmapEx& GetBitmapEx() const { return maBmpEx; } const Point& GetPoint() const { return maPt; } @@ -669,7 +669,7 @@ private: Point maPt; Size maSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION ) @@ -677,8 +677,8 @@ public: MetaBmpExScaleAction( const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx ) ; - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const BitmapEx& GetBitmapEx() const { return maBmpEx; } const Point& GetPoint() const { return maPt; } @@ -695,7 +695,7 @@ private: Point maSrcPt; Size maSrcSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION ) @@ -704,8 +704,8 @@ public: const Point& rSrcPt, const Size& rSrcSz, const BitmapEx& rBmpEx ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const BitmapEx& GetBitmapEx() const { return maBmpEx; } const Point& GetDestPoint() const { return maDstPt; } @@ -722,7 +722,7 @@ private: Color maColor; Point maPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Mask, META_MASK_ACTION ) @@ -731,8 +731,8 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Color& GetColor() const { return maColor; } @@ -748,7 +748,7 @@ private: Point maPt; Size maSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( MaskScale, META_MASKSCALE_ACTION ) @@ -757,8 +757,8 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Color& GetColor() const { return maColor; } @@ -777,7 +777,7 @@ private: Point maSrcPt; Size maSrcSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION ) @@ -787,8 +787,8 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Color& GetColor() const { return maColor; } @@ -805,15 +805,15 @@ private: Rectangle maRect; Gradient maGradient; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Gradient, META_GRADIENT_ACTION ) MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const Gradient& GetGradient() const { return maGradient; } @@ -826,15 +826,15 @@ private: PolyPolygon maPolyPoly; Gradient maGradient; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( GradientEx, META_GRADIENTEX_ACTION ) MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } const Gradient& GetGradient() const { return maGradient; } @@ -847,15 +847,15 @@ private: PolyPolygon maPolyPoly; Hatch maHatch; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Hatch, META_HATCH_ACTION ) MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } const Hatch& GetHatch() const { return maHatch; } @@ -868,7 +868,7 @@ private: Rectangle maRect; Wallpaper maWallpaper; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION ) @@ -876,8 +876,8 @@ public: MetaWallpaperAction( const Rectangle& rRect, const Wallpaper& rPaper ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const Wallpaper& GetWallpaper() const { return maWallpaper; } @@ -890,15 +890,15 @@ private: Region maRegion; bool mbClip; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) MetaClipRegionAction( const Region& rRegion, bool bClip ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Region& GetRegion() const { return maRegion; } bool IsClipping() const { return mbClip; } @@ -910,15 +910,15 @@ private: Rectangle maRect; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) explicit MetaISectRectClipRegionAction( const Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } }; @@ -929,15 +929,15 @@ private: Region maRegion; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) explicit MetaISectRegionClipRegionAction( const Region& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Region& GetRegion() const { return maRegion; } }; @@ -949,14 +949,14 @@ private: long mnHorzMove; long mnVertMove; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION ) MetaMoveClipRegionAction( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; long GetHorzMove() const { return mnHorzMove; } long GetVertMove() const { return mnVertMove; } @@ -969,7 +969,7 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) @@ -987,7 +987,7 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) @@ -1004,7 +1004,7 @@ private: Color maColor; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) @@ -1021,7 +1021,7 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) @@ -1039,7 +1039,7 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) @@ -1057,7 +1057,7 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) @@ -1074,7 +1074,7 @@ private: TextAlign maAlign; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) @@ -1090,14 +1090,14 @@ private: MapMode maMapMode; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( MapMode, META_MAPMODE_ACTION ) explicit MetaMapModeAction( const MapMode& ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const MapMode& GetMapMode() const { return maMapMode; } }; @@ -1108,14 +1108,14 @@ private: Font maFont; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Font, META_FONT_ACTION ) explicit MetaFontAction( const Font& ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Font& GetFont() const { return maFont; } }; @@ -1126,7 +1126,7 @@ private: sal_uInt16 mnFlags; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Push, META_PUSH_ACTION ) @@ -1149,7 +1149,7 @@ private: RasterOp meRasterOp; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) @@ -1166,15 +1166,15 @@ private: PolyPolygon maPolyPoly; sal_uInt16 mnTransPercent; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } sal_uInt16 GetTransparence() const { return mnTransPercent; } @@ -1189,7 +1189,7 @@ private: Size maSize; Gradient maGradient; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION ) @@ -1197,8 +1197,8 @@ public: MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const GDIMetaFile& GetGDIMetaFile() const { return maMtf; } const Point& GetPoint() const { return maPoint; } @@ -1215,7 +1215,7 @@ private: Point maPoint; Size maSize; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( EPS, META_EPS_ACTION ) @@ -1223,8 +1223,8 @@ public: MetaEPSAction( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, const GDIMetaFile& rSubst ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const GfxLink& GetLink() const { return maGfxLink; } const GDIMetaFile& GetSubstitute() const { return maSubst; } @@ -1239,7 +1239,7 @@ private: Point maRefPoint; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) @@ -1260,7 +1260,7 @@ private: sal_uInt8* mpData; SAL_DLLPRIVATE void ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize ); - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; protected: virtual ~MetaCommentAction(); @@ -1270,13 +1270,13 @@ public: explicit MetaCommentAction( const MetaCommentAction& rAct ); explicit MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - virtual void Execute( OutputDevice* pOut ); - virtual MetaAction* Clone(); - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); + virtual void Execute( OutputDevice* pOut ) SAL_OVERRIDE; + virtual MetaAction* Clone() SAL_OVERRIDE; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; const OString& GetComment() const { return maComment; } sal_Int32 GetValue() const { return mnValue; } @@ -1289,7 +1289,7 @@ class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction private: sal_uInt32 mnLayoutMode; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) @@ -1304,7 +1304,7 @@ class VCL_DLLPUBLIC MetaTextLanguageAction : public MetaAction private: LanguageType meTextLanguage; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index ae2482804bff..12293fec20e3 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -52,7 +52,7 @@ public: explicit MoreButton( Window* pParent, WinBits nStyle = 0 ); virtual ~MoreButton(); - void Click(); + void Click() SAL_OVERRIDE; void SetDelta( sal_uLong nNewDelta ) { mnDelta = nNewDelta; } sal_uLong GetDelta() const { return mnDelta; } @@ -64,8 +64,8 @@ public: void SetState( bool bNewState = true ); bool GetState() const { return mbState; } - void SetText( const OUString& rNewText ); - OUString GetText() const; + void SetText( const OUString& rNewText ) SAL_OVERRIDE; + OUString GetText() const SAL_OVERRIDE; }; inline void MoreButton::SetState( bool bNewState ) diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index 93a296494452..336671fe0234 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -54,7 +54,7 @@ public: MessBox( Window* pParent, const ResId& rResId ); ~MessBox(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void SetMessText( const OUString& rText ) { maMessText = rText; } const OUString& GetMessText() const { return maMessText; } @@ -67,7 +67,7 @@ public: void SetCheckBoxState( bool bCheck ); bool GetCheckBoxState() const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; class VCL_DLLPUBLIC InfoBox : public MessBox diff --git a/include/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx index 7f6b5fa11820..356257f6a899 100644 --- a/include/vcl/oldprintadaptor.hxx +++ b/include/vcl/oldprintadaptor.hxx @@ -35,9 +35,9 @@ namespace vcl void StartPage(); void EndPage(); - virtual int getPageCount() const; - virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const; - virtual void printPage( int i_nPage ) const; + virtual int getPageCount() const SAL_OVERRIDE; + virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const SAL_OVERRIDE; + virtual void printPage( int i_nPage ) const SAL_OVERRIDE; }; } diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 81e5be62ac33..71afd654ea6f 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -327,7 +327,7 @@ public: Dest( -1 ), Submit( false ), SubmitGet( false ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new PushButtonWidget( *this ); } @@ -344,7 +344,7 @@ public: ButtonIsLeft( true ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new CheckBoxWidget( *this ); } @@ -364,7 +364,7 @@ public: ButtonIsLeft( true ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new RadioButtonWidget( *this ); } @@ -393,7 +393,7 @@ public: MaxLen( 0 ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new EditWidget( *this ); } @@ -417,7 +417,7 @@ public: MultiSelect( false ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new ListBoxWidget( *this ); } @@ -435,7 +435,7 @@ public: Sort( false ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new ComboBoxWidget( *this ); } @@ -457,7 +457,7 @@ public: SigHidden( true ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new SignatureWidget( *this ); } diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 7fc653a7d507..0cf1006aaaf8 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -75,11 +75,11 @@ public: ProgressBar( Window* pParent, const ResId& rResId ); ~ProgressBar(); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual Size GetOptimalSize() const; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetValue( sal_uInt16 nNewPercent ); sal_uInt16 GetValue() const { return mnPercent; } diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index e92786cb30b8..d3e075fed57c 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -247,9 +247,9 @@ private: bool mbUserSetupResult; Link maErrorHdl; - bool ImplInitGraphics() const; - void ImplReleaseGraphics( bool bRelease = true ); - void ImplReleaseFonts(); + bool ImplInitGraphics() const SAL_OVERRIDE; + void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; + void ImplReleaseFonts() SAL_OVERRIDE; SAL_DLLPRIVATE void ImplInitData(); SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow ); @@ -273,8 +273,8 @@ public: SAL_DLLPRIVATE void ImplEndPage(); protected: - long ImplGetGradientStepCount( long nMinRect ); - void ScaleBitmap ( Bitmap&, SalTwoRect& ) { }; + long ImplGetGradientStepCount( long nMinRect ) SAL_OVERRIDE; + void ScaleBitmap ( Bitmap&, SalTwoRect& ) SAL_OVERRIDE { }; public: void DrawGradientEx( OutputDevice* pOut, const Rectangle& rRect, const Gradient& rGradient ); @@ -285,15 +285,15 @@ protected: bool IsQueuePrinter() const { return mbIsQueuePrinter; } virtual void ImplPrintMask ( const Bitmap& rMask, const Color& rMaskColor, const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPtPixel, const Size& rSrcSizePixel ); + const Point& rSrcPtPixel, const Size& rSrcSizePixel ) SAL_OVERRIDE; bool DrawTransformBitmapExDirect( const basegfx::B2DHomMatrix& aFullTransform, - const BitmapEx& rBitmapEx); + const BitmapEx& rBitmapEx) SAL_OVERRIDE; bool TransformReduceBitmapExTargetRange( const basegfx::B2DHomMatrix& aFullTransform, basegfx::B2DRange &aVisibleRange, - double &fMaximumArea); + double &fMaximumArea) SAL_OVERRIDE; void DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, @@ -396,16 +396,16 @@ public: static void PrintJob( const boost::shared_ptr<vcl::PrinterController>& i_pController, const JobSetup& i_rInitSetup ); - virtual bool HasMirroredGraphics() const; + virtual bool HasMirroredGraphics() const SAL_OVERRIDE; virtual void DrawOutDev( const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPt, const Size& rSrcSize ); + const Point& rSrcPt, const Size& rSrcSize ) SAL_OVERRIDE; virtual void DrawOutDev( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPt, const Size& rSrcSize, - const OutputDevice& rOutDev ); + const OutputDevice& rOutDev ) SAL_OVERRIDE; virtual void CopyArea( const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize, - sal_uInt16 nFlags = 0 ); + sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; // implementation detail of PrintJob being asynchronous diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 6f540c74f31e..eb2d7238b8b3 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -326,7 +326,7 @@ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue mnThumbState = 0; mnPage1State = 0; mnPage2State = 0; }; virtual ~ScrollbarValue(); - virtual ScrollbarValue* clone() const; + virtual ScrollbarValue* clone() const SAL_OVERRIDE; }; class VCL_DLLPUBLIC SliderValue : public ImplControlValue @@ -343,7 +343,7 @@ class VCL_DLLPUBLIC SliderValue : public ImplControlValue , mnMin( 0 ), mnMax( 0 ), mnCur( 0 ), mnThumbState( 0 ) {} virtual ~SliderValue(); - virtual SliderValue* clone() const; + virtual SliderValue* clone() const SAL_OVERRIDE; }; /* TabitemValue: @@ -369,7 +369,7 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue mnAlignment = 0; }; virtual ~TabitemValue(); - virtual TabitemValue* clone() const; + virtual TabitemValue* clone() const SAL_OVERRIDE; bool isLeftAligned() const { return (mnAlignment & TABITEM_LEFTALIGNED) != 0; } bool isRightAligned() const { return (mnAlignment & TABITEM_RIGHTALIGNED) != 0; } @@ -401,7 +401,7 @@ class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue mnUpperState = mnLowerState = 0; }; virtual ~SpinbuttonValue(); - virtual SpinbuttonValue* clone() const; + virtual SpinbuttonValue* clone() const SAL_OVERRIDE; }; /* Toolbarvalue: @@ -414,7 +414,7 @@ public: ToolbarValue() : ImplControlValue( CTRL_TOOLBAR, BUTTONVALUE_DONTKNOW, 0 ) { mbIsTopDockingArea = false; } virtual ~ToolbarValue(); - virtual ToolbarValue* clone() const; + virtual ToolbarValue* clone() const SAL_OVERRIDE; Rectangle maGripRect; bool mbIsTopDockingArea; // indicates that this is the top aligned dockingarea // adjacent to the menubar @@ -430,7 +430,7 @@ public: MenubarValue() : ImplControlValue( CTRL_MENUBAR, BUTTONVALUE_DONTKNOW, 0 ) { maTopDockingAreaHeight=0; } virtual ~MenubarValue(); - virtual MenubarValue* clone() const; + virtual MenubarValue* clone() const SAL_OVERRIDE; int maTopDockingAreaHeight; }; @@ -449,7 +449,7 @@ public: , maItemRect( i_rItemRect ) {} virtual ~MenupopupValue(); - virtual MenupopupValue* clone() const; + virtual MenupopupValue* clone() const SAL_OVERRIDE; Rectangle maItemRect; }; @@ -464,7 +464,7 @@ public: : ImplControlValue( CTRL_PUSHBUTTON, BUTTONVALUE_DONTKNOW, 0 ) , mbBevelButton( false ), mbSingleLine( true ) {} virtual ~PushButtonValue(); - virtual PushButtonValue* clone() const; + virtual PushButtonValue* clone() const SAL_OVERRIDE; bool mbBevelButton:1; bool mbSingleLine:1; diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index f9b1e5df66e0..c1e55644160a 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -94,17 +94,17 @@ public: explicit ScrollBar( Window* pParent, const ResId& ); virtual ~ScrollBar(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; using Window::Scroll; virtual void Scroll(); @@ -140,7 +140,7 @@ public: void SetEndScrollHdl( const Link& rLink ) { maEndScrollHdl = rLink; } const Link& GetEndScrollHdl() const { return maEndScrollHdl; } - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; @@ -157,8 +157,8 @@ private: public: explicit ScrollBarBox( Window* pParent, WinBits nStyle = 0 ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_SCRBAR_HXX diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index ca11facf2b1e..92b2a56f1f94 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -74,15 +74,15 @@ private: public: Slider( Window* pParent, WinBits nStyle = WB_HORZ ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Slide(); virtual void EndSlide(); diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 206a5c3ab9f9..5ba88e9cd19b 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -62,16 +62,16 @@ public: virtual void Up(); virtual void Down(); - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; void SetRangeMin( long nNewRange ); long GetRangeMin() const { return mnMinRange; } @@ -83,7 +83,7 @@ public: long GetValue() const { return mnValue; } void SetValueStep( long nNewStep ) { mnValueStep = nNewStep; } long GetValueStep() const { return mnValueStep; } - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } const Link& GetUpHdl() const { return maUpHdlLink; } diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 47441800e0d9..2d09032d4e2e 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -61,12 +61,12 @@ private: protected: explicit SpinField( WindowType nTyp ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; void EndDropDown(); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; Rectangle * ImplFindPartRect( const Point& rPt ); public: @@ -81,15 +81,15 @@ public: virtual void First(); virtual void Last(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } const Link& GetUpHdl() const { return maUpHdlLink; } @@ -100,10 +100,10 @@ public: void SetLastHdl( const Link& rLink ) { maLastHdlLink = rLink; } const Link& GetLastHdl() const { return maLastHdlLink; } - virtual Size CalcMinimumSize() const; - virtual Size CalcMinimumSizeForText(const OUString &rString) const; - virtual Size GetOptimalSize() const; - virtual Size CalcSize(sal_Int32 nChars) const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; + virtual Size CalcMinimumSizeForText(const OUString &rString) const SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size CalcSize(sal_Int32 nChars) const SAL_OVERRIDE; }; #endif // INCLUDED_VCL_SPINFLD_HXX diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index ab60906564bd..65cc90ec17e9 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -71,17 +71,17 @@ public: virtual void Split(); virtual void Splitting( Point& rSplitPos ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rPaintRect ); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rPaintRect ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void StartDrag(); diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index a2d715006c16..35948731ba3c 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -135,16 +135,16 @@ public: virtual void FadeIn(); virtual void FadeOut(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Move(); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void InsertItem( sal_uInt16 nId, Window* pWindow, long nSize, sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 830c0ac951ab..fb51b0e72e12 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -114,13 +114,13 @@ public: WinBits nWinStyle = WB_BORDER | WB_RIGHT ); ~StatusBar(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Move(); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Click(); virtual void DoubleClick(); @@ -180,7 +180,7 @@ public: void EndProgressMode(); bool IsProgressMode() const { return mbProgressMode; } - void SetText( const OUString& rText ); + void SetText( const OUString& rText ) SAL_OVERRIDE; void SetHelpText( const OUString& rText ) { Window::SetHelpText( rText ); } diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 50bdd55b0c4a..32a6f92147d0 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -175,8 +175,8 @@ protected: public: ~SystemWindow(); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool Close(); virtual void TitleButtonClick( sal_uInt16 nButton ); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index ba483b82e622..d062a16810ac 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -75,9 +75,9 @@ protected: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - virtual void FillLayoutData() const; - virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const; - virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + virtual void FillLayoutData() const SAL_OVERRIDE; + virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); public: @@ -86,23 +86,23 @@ public: TabControl( Window* pParent, const ResId& rResId ); ~TabControl(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void ActivatePage(); virtual bool DeactivatePage(); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetTabPageSizePixel( const Size& rSize ); Size GetTabPageSizePixel() const; @@ -181,9 +181,9 @@ public: // returns the rectangle of the tab for page nPageId Rectangle GetTabBounds( sal_uInt16 nPageId ) const; - virtual void SetPosPixel(const Point& rPos); - virtual void SetSizePixel(const Size& rNewSize); - virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize); + virtual void SetPosPixel(const Point& rPos) SAL_OVERRIDE; + virtual void SetSizePixel(const Size& rNewSize) SAL_OVERRIDE; + virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) SAL_OVERRIDE; Size calculateRequisition() const; void setAllocation(const Size &rAllocation); @@ -193,7 +193,7 @@ public: mbLayoutDirty = true; } - virtual void queue_resize(); + virtual void queue_resize() SAL_OVERRIDE; }; #endif // INCLUDED_VCL_TABCTRL_HXX diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index 096d5053e66b..ecce55a00d7f 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -44,7 +44,7 @@ public: TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); ~TabDialog(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void AdjustLayout(); diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index e37469e1d68e..a8ac279af746 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -44,20 +44,20 @@ public: explicit TabPage( Window* pParent, const ResId& rResId ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void ActivatePage(); virtual void DeactivatePage(); //To-Do, consider inheriting from VclContainer - virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize); - virtual void SetPosPixel(const Point& rNewPos); - virtual void SetSizePixel(const Size& rNewSize); - virtual Size GetOptimalSize() const; + virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) SAL_OVERRIDE; + virtual void SetPosPixel(const Point& rNewPos) SAL_OVERRIDE; + virtual void SetSizePixel(const Size& rNewSize) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; #endif // INCLUDED_VCL_TABPAGE_HXX diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index fe3a4a34810f..935504125316 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -89,12 +89,12 @@ protected: VirtualDevice* GetVirtualDevice(); // DragAndDropClient - virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; using DragAndDropClient::dragEnter; using DragAndDropClient::dragExit; diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 9433e394df39..2b375bc444ac 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -79,7 +79,7 @@ private: explicit GenericSolarThreadExecutor( FuncT const& func ) : m_exc(), m_func(func), m_result() {} - virtual long doIt() + virtual long doIt() SAL_OVERRIDE { try { m_result.reset( m_func() ); @@ -115,7 +115,7 @@ private: explicit GenericSolarThreadExecutor( FuncT const& func ) : m_exc(), m_func(func) {} - virtual long doIt() + virtual long doIt() SAL_OVERRIDE { try { m_func(); diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index 80c9d7dd764a..e5ec8236f3c8 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -71,7 +71,7 @@ public: protected: // Window overridables - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; private: SAL_DLLPRIVATE void initImages(); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 3013f4abe78c..2bc306a0a881 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -291,37 +291,37 @@ public: virtual void Click(); virtual void DoubleClick(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; virtual void Highlight(); virtual void Select(); virtual void Customize( const ToolBoxCustomizeEvent& rCEvt ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Move(); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void KeyInput( const KeyEvent& rKEvt ); - - virtual bool PrepareToggleFloatingMode(); - virtual void ToggleFloatingMode(); - virtual void StartDocking(); - virtual bool Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ); - virtual void Resizing( Size& rSize ); - virtual Size GetOptimalSize() const; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + + virtual bool PrepareToggleFloatingMode() SAL_OVERRIDE; + virtual void ToggleFloatingMode() SAL_OVERRIDE; + virtual void StartDocking() SAL_OVERRIDE; + virtual bool Docking( const Point& rPos, Rectangle& rRect ) SAL_OVERRIDE; + virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void InsertItem( const ResId& rResId, sal_uInt16 nPos = TOOLBOX_APPEND ); @@ -559,7 +559,7 @@ public: // accessibility helpers // gets the displayed text - OUString GetDisplayText() const; + OUString GetDisplayText() const SAL_OVERRIDE; // returns the bounding box for the character at index nIndex // where nIndex is relative to the starting index of the item // with id nItemId (in coordinates of the displaying window) diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index be0d3bd0024e..86dcbd0efa5b 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -73,9 +73,9 @@ public: const Color& GetColor() const { return maColor; } - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; }; @@ -89,9 +89,9 @@ public: TextAttribFontWeight( const TextAttribFontWeight& rAttr ); ~TextAttribFontWeight(); - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; inline FontWeight getFontWeight() const { return meWeight; } }; @@ -117,9 +117,9 @@ public: void SetColor( const Color& rColor ) { maColor = rColor; } const Color& GetColor() const { return maColor; } - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; }; class VCL_DLLPUBLIC TextAttribProtect : public TextAttrib @@ -129,9 +129,9 @@ public: TextAttribProtect( const TextAttribProtect& rAttr ); ~TextAttribProtect(); - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; }; diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx index 4e2067f9cc4f..e835bbde95f0 100644 --- a/include/vcl/unohelp2.hxx +++ b/include/vcl/unohelp2.hxx @@ -46,14 +46,14 @@ namespace vcl { namespace unohelper { OUString& GetString() { return maText; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::datatransfer::XTransferable - ::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); - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::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; + ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// copies a given string to a given clipboard static void CopyStringTo( diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 97c77c91dde3..b29436f55fc3 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -45,10 +45,10 @@ private: protected: DECL_LINK( ImpUpdateDataHdl, void* ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; using Control::ImplInitSettings; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); WinBits ImplInitStyle( WinBits nStyle ); @@ -65,42 +65,42 @@ public: void SelectionChanged(); void CaretChanged(); - virtual void Modify(); - virtual void UpdateData(); + virtual void Modify() SAL_OVERRIDE; + virtual void UpdateData() SAL_OVERRIDE; - virtual void SetModifyFlag(); - virtual void ClearModifyFlag(); + virtual void SetModifyFlag() SAL_OVERRIDE; + virtual void ClearModifyFlag() SAL_OVERRIDE; virtual bool IsModified() const SAL_OVERRIDE; - virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ); - virtual void DisableUpdateData() { delete pUpdateDataTimer; pUpdateDataTimer = NULL; } + virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ) SAL_OVERRIDE; + virtual void DisableUpdateData() SAL_OVERRIDE { delete pUpdateDataTimer; pUpdateDataTimer = NULL; } - virtual void SetReadOnly( bool bReadOnly = true ); - virtual bool IsReadOnly() const; + virtual void SetReadOnly( bool bReadOnly = true ) SAL_OVERRIDE; + virtual bool IsReadOnly() const SAL_OVERRIDE; void EnableFocusSelectionHide( bool bHide ); - virtual void SetMaxTextLen(sal_Int32 nMaxLen = 0); - virtual sal_Int32 GetMaxTextLen() const; + virtual void SetMaxTextLen(sal_Int32 nMaxLen = 0) SAL_OVERRIDE; + virtual sal_Int32 GetMaxTextLen() const SAL_OVERRIDE; void SetMaxTextWidth( sal_uLong nMaxWidth ); - virtual void SetSelection( const Selection& rSelection ); - virtual const Selection& GetSelection() const; + virtual void SetSelection( const Selection& rSelection ) SAL_OVERRIDE; + virtual const Selection& GetSelection() const SAL_OVERRIDE; - virtual void ReplaceSelected( const OUString& rStr ); - virtual void DeleteSelected(); - virtual OUString GetSelected() const; + virtual void ReplaceSelected( const OUString& rStr ) SAL_OVERRIDE; + virtual void DeleteSelected() SAL_OVERRIDE; + virtual OUString GetSelected() const SAL_OVERRIDE; virtual OUString GetSelected( LineEnd aSeparator ) const; - virtual void Cut(); - virtual void Copy(); - virtual void Paste(); + virtual void Cut() SAL_OVERRIDE; + virtual void Copy() SAL_OVERRIDE; + virtual void Paste() SAL_OVERRIDE; - virtual void SetText( const OUString& rStr ); - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE { SetText( rStr ); SetSelection( rNewSelection ); } - OUString GetText() const; + OUString GetText() const SAL_OVERRIDE; OUString GetText( LineEnd aSeparator ) const; OUString GetTextLines( LineEnd aSeparator ) const; @@ -109,20 +109,20 @@ public: void SaveValue() { aSaveValue = GetText(); } const OUString& GetSavedValue() const { return aSaveValue; } - void SetModifyHdl( const Link& rLink ) { aModifyHdlLink = rLink; } - const Link& GetModifyHdl() const { return aModifyHdlLink; } + void SetModifyHdl( const Link& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; } + const Link& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; } - void SetUpdateDataHdl( const Link& rLink ) { aUpdateDataHdlLink = rLink; } + void SetUpdateDataHdl( const Link& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; } - virtual void Resize(); - virtual void GetFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; Size CalcAdjustedSize( const Size& rPrefSize ) const; Size CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; void SetLeftMargin( sal_uInt16 n ); @@ -130,7 +130,7 @@ public: void EnableCursor( bool bEnable ); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_VCLMEDIT_HXX diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index f413e4852323..2713567b0608 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -61,8 +61,8 @@ private: SAL_DLLPRIVATE bool ForceZeroExtleadBug() const { return ((meRefDevMode & REFDEV_FORCE_ZERO_EXTLEAD) != 0); } public: - bool ImplInitGraphics() const; - void ImplReleaseGraphics( bool bRelease = true ); + bool ImplInitGraphics() const SAL_OVERRIDE; + void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; public: /** Create a virtual device of size 1x1 @@ -113,7 +113,7 @@ public: virtual ~VirtualDevice(); - virtual void EnableRTL( bool bEnable = true ); + virtual void EnableRTL( bool bEnable = true ) SAL_OVERRIDE; bool SetOutputSizePixel( const Size& rNewSize, bool bErase = true ); bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer ); @@ -134,8 +134,8 @@ public: void SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); - sal_uInt16 GetBitCount() const; - sal_uInt16 GetAlphaBitCount() const; + sal_uInt16 GetBitCount() const SAL_OVERRIDE; + sal_uInt16 GetAlphaBitCount() const SAL_OVERRIDE; private: SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 3a3851ca449d..5751489fe1c7 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -375,8 +375,8 @@ private: friend Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); public: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); - bool ImplInitGraphics() const; - void ImplReleaseGraphics( bool bRelease = true ); + bool ImplInitGraphics() const SAL_OVERRIDE; + void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; SAL_DLLPRIVATE WinBits ImplInitRes( const ResId& rResId ); SAL_DLLPRIVATE WindowResHeader ImplLoadResHeader( const ResId& rResId ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -579,11 +579,11 @@ protected: virtual sal_uInt16 getDefaultAccessibleRole() const; virtual OUString getDefaultAccessibleName() const; - virtual void CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags); - virtual void ClipToPaintRegion( Rectangle& rDstRect ); + virtual void CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags) SAL_OVERRIDE; + virtual void ClipToPaintRegion( Rectangle& rDstRect ) SAL_OVERRIDE; public: - bool HasMirroredGraphics() const; + bool HasMirroredGraphics() const SAL_OVERRIDE; public: // Single argument ctors shall be explicit. @@ -595,7 +595,7 @@ public: OutputDevice const* GetOutDev() const { return mpOutputDevice; }; OutputDevice* GetOutDev() { return mpOutputDevice; }; - virtual void EnableRTL ( bool bEnable = true ); + virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); @@ -697,7 +697,7 @@ public: void SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical = false ); using OutputDevice::SetSettings; - virtual void SetSettings( const AllSettings& rSettings ); + virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE; virtual void SetSettings( const AllSettings& rSettings, sal_Bool bChild ); void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); void NotifyAllChildren( DataChangedEvent& rDCEvt ); diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index ac4b09bba13e..1c06d52d83bc 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -67,7 +67,7 @@ public: explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version virtual ~WorkWindow(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; void ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScreen ); diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx index f4f676675619..da3919ea1234 100644 --- a/include/xmloff/DocumentSettingsContext.hxx +++ b/include/xmloff/DocumentSettingsContext.hxx @@ -43,8 +43,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; private: XMLDocumentSettingsContext(); // never implemented diff --git a/include/xmloff/EnumPropertyHdl.hxx b/include/xmloff/EnumPropertyHdl.hxx index 5e473e5063f7..8b01bd56f2cf 100644 --- a/include/xmloff/EnumPropertyHdl.hxx +++ b/include/xmloff/EnumPropertyHdl.hxx @@ -37,8 +37,8 @@ public: XMLEnumPropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) : mpEnumMap( pEnumMap ), mrType( rType ) {} virtual ~XMLEnumPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_ENUMPROPERTYHDL_HXX diff --git a/include/xmloff/NamedBoolPropertyHdl.hxx b/include/xmloff/NamedBoolPropertyHdl.hxx index 1e5a2d8fa9fd..c4b37c4c4cfb 100644 --- a/include/xmloff/NamedBoolPropertyHdl.hxx +++ b/include/xmloff/NamedBoolPropertyHdl.hxx @@ -47,8 +47,8 @@ public: virtual ~XMLNamedBoolPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_NAMEDBOOLPROPERTYHDL_HXX diff --git a/include/xmloff/WordWrapPropertyHdl.hxx b/include/xmloff/WordWrapPropertyHdl.hxx index b08e9127a92f..379e3c5efdeb 100644 --- a/include/xmloff/WordWrapPropertyHdl.hxx +++ b/include/xmloff/WordWrapPropertyHdl.hxx @@ -38,8 +38,8 @@ public: XMLWordWrapPropertyHdl( SvXMLImport* pImport ); virtual ~XMLWordWrapPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_WORDWRAPPROPERTYHDL_HXX diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx index 27a67ee33995..078cec4682b4 100644 --- a/include/xmloff/XMLBase64ImportContext.hxx +++ b/include/xmloff/XMLBase64ImportContext.hxx @@ -46,9 +46,9 @@ public: virtual ~XMLBase64ImportContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; }; diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index c4993583c9d1..99a7e055422b 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -54,7 +54,7 @@ public: // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions // that require virtual methods. The default is to do nothing. - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; virtual void InsertControlCharacter(sal_Int16 _nControl); virtual void InsertString(const OUString& _sString); diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx index fef11b831a14..5d0236841a4c 100644 --- a/include/xmloff/XMLConstantsPropertyHandler.hxx +++ b/include/xmloff/XMLConstantsPropertyHandler.hxx @@ -49,13 +49,13 @@ public: virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; /// Exports the given value in cas of the given XML-data-type virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const; + const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_XMLCONSTANTSPROPERTYHANDLER_HXX diff --git a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx index 3a98fcec851e..a4a1b25155cc 100644 --- a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx +++ b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx @@ -42,41 +42,41 @@ public: // ::com::sun::star::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL startElement(const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XExtendedDocumentHandler - virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL comment(const OUString& sComment) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL allowLineBreak(void) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL unknown(const OUString& sString) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) 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, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::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; }; diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx index 6c50f23277f8..153b68097b1c 100644 --- a/include/xmloff/XMLEventsImportContext.hxx +++ b/include/xmloff/XMLEventsImportContext.hxx @@ -115,15 +115,15 @@ protected: virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; }; #endif diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx index b8730ddfcd70..b3ddeda9fdd4 100644 --- a/include/xmloff/XMLFontStylesContext.hxx +++ b/include/xmloff/XMLFontStylesContext.hxx @@ -49,7 +49,7 @@ protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; public: diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx index d39d9ea51e79..15af26d8852f 100644 --- a/include/xmloff/XMLGraphicsDefaultStyle.hxx +++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx @@ -45,10 +45,10 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; // This method is called for every default style - virtual void SetDefaults(); + virtual void SetDefaults() SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_XMLGRAPHICSDEFAULTSTYLE_HXX diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index 6b86280ce638..ab3da6dc2296 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -40,7 +40,7 @@ protected: protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -56,13 +56,13 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void Finish( bool bOverwrite ); + virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; virtual void FillPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ); + ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_XMLSHAPESTYLECONTEXT_HXX diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx index f0620ceceaf2..cfe9664351b7 100644 --- a/include/xmloff/XMLTextMasterPageContext.hxx +++ b/include/xmloff/XMLTextMasterPageContext.hxx @@ -71,7 +71,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, @@ -81,7 +81,7 @@ public: const bool bLeft, const bool bFirst ); - virtual void Finish( bool bOverwrite ); + virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; }; #endif diff --git a/include/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx index 495db63884ba..dd626bbdea6d 100644 --- a/include/xmloff/XMLTextMasterPageExport.hxx +++ b/include/xmloff/XMLTextMasterPageExport.hxx @@ -56,7 +56,7 @@ protected: virtual void exportMasterPageContent( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, - bool bAutoStyles ); + bool bAutoStyles ) SAL_OVERRIDE; public: XMLTextMasterPageExport( SvXMLExport& rExp ); diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx index 2034628f4a45..6f65c3875566 100644 --- a/include/xmloff/XMLTextMasterStylesContext.hxx +++ b/include/xmloff/XMLTextMasterStylesContext.hxx @@ -30,14 +30,14 @@ protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); diff --git a/include/xmloff/XMLTextShapeImportHelper.hxx b/include/xmloff/XMLTextShapeImportHelper.hxx index 4c7f27704fce..18f00ec68ecd 100644 --- a/include/xmloff/XMLTextShapeImportHelper.hxx +++ b/include/xmloff/XMLTextShapeImportHelper.hxx @@ -43,7 +43,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& rShapes ); + ::com::sun::star::drawing::XShapes >& rShapes ) SAL_OVERRIDE; }; #endif diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx index 22fc3cad331c..0466914b7ea3 100644 --- a/include/xmloff/XMLTextShapeStyleContext.hxx +++ b/include/xmloff/XMLTextShapeStyleContext.hxx @@ -35,7 +35,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; public: @@ -52,13 +52,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; sal_Bool IsAutoUpdate() const { return bAutoUpdate; } - virtual void CreateAndInsert( sal_Bool bOverwrite ); + virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE; - virtual void Finish( bool bOverwrite ); + virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; }; #endif diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx index dd9c66bb799e..7f3f78c2c223 100644 --- a/include/xmloff/attrlist.hxx +++ b/include/xmloff/attrlist.hxx @@ -53,18 +53,18 @@ public: static SvXMLAttributeList* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw(); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int16 SAL_CALL getLength(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::util::XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // methods that are not contained in any interface void AddAttribute( const OUString &sName , const OUString &sValue ); diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx index 5b7775f421b0..ed59bfd0833f 100644 --- a/include/xmloff/controlpropertyhdl.hxx +++ b/include/xmloff/controlpropertyhdl.hxx @@ -46,8 +46,8 @@ namespace xmloff public: ORotationAngleHandler(); - virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const SAL_OVERRIDE; }; @@ -58,8 +58,8 @@ namespace xmloff public: OFontWidthHandler(); - virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const SAL_OVERRIDE; }; @@ -76,8 +76,8 @@ namespace xmloff OControlBorderHandler( const BorderFacet _eFacet ); - virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const SAL_OVERRIDE; private: BorderFacet m_eFacet; @@ -91,8 +91,8 @@ namespace xmloff public: OControlTextEmphasisHandler(); - virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const SAL_OVERRIDE; }; @@ -124,7 +124,7 @@ namespace xmloff public: OControlPropertyHandlerFactory(); - virtual const XMLPropertyHandler* GetPropertyHandler(sal_Int32 _nType) const; + virtual const XMLPropertyHandler* GetPropertyHandler(sal_Int32 _nType) const SAL_OVERRIDE; }; diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index e727003987b8..059ad70e28bd 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -48,7 +48,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; SvXMLStylesContext *GetStyles() { return (SvXMLStylesContext *)&mxStyles; } ::std::vector< XMLPropertyState > & GetProperties() { return maProperties; } @@ -72,7 +72,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual void FillPropertySet( const ::com::sun::star::uno::Reference< @@ -88,10 +88,10 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStl) { mxStyle = xStl; } - virtual void SetDefaults(); + virtual void SetDefaults() SAL_OVERRIDE; - virtual void CreateAndInsert( sal_Bool bOverwrite ); - virtual void Finish( bool bOverwrite ); + virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE; + virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; }; #endif diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx index a2e44d56bfc9..2290786b8b81 100644 --- a/include/xmloff/txtimppr.hxx +++ b/include/xmloff/txtimppr.hxx @@ -53,7 +53,7 @@ protected: ::std::vector< XMLPropertyState >& rProperties, const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap ) const; + const SvXMLNamespaceMap& rNamespaceMap ) const SAL_OVERRIDE; public: XMLTextImportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, @@ -63,7 +63,7 @@ public: /** This method is called when all attributes have benn processed. It may be used to remove items that are incomplete */ virtual void finished( ::std::vector< XMLPropertyState >& rProperties, - sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const; + sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_TXTIMPPR_HXX diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 87b32fc30ef5..da1ae7df3b0d 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -270,7 +270,7 @@ protected: virtual void exportStyleAttributes( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ); + ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE; void exportPageFrames( sal_Bool bAutoStyles, sal_Bool bProgress ); void exportFrameFrames( sal_Bool bAutoStyles, sal_Bool bProgress, diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx index 336f5f915a3b..bd34ed337f0e 100644 --- a/include/xmloff/txtstyli.hxx +++ b/include/xmloff/txtstyli.hxx @@ -59,7 +59,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; public: @@ -76,7 +76,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; sal_Bool IsAutoUpdate() const { return bAutoUpdate; } @@ -92,14 +92,14 @@ public: const OUString& GetDropCapStyleName() const { return sDropCapTextStyleName; } const OUString& GetDataStyleName() const { return sDataStyleName; } - virtual void CreateAndInsert( sal_Bool bOverwrite ); - virtual void Finish( bool bOverwrite ); - virtual void SetDefaults(); + virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE; + virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; + virtual void SetDefaults() SAL_OVERRIDE; // overload FillPropertySet, so we can get at the combined characters virtual void FillPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ); + ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; inline sal_Bool HasCombinedCharactersLetter() { return bHasCombinedCharactersLetter; } diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx index dd576a0d4bdc..429f0ebf7769 100644 --- a/include/xmloff/unoatrcn.hxx +++ b/include/xmloff/unoatrcn.hxx @@ -50,28 +50,28 @@ public: SvXMLAttrContainerData* GetContainerImpl() const { return mpContainer; } static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL replaceByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL insertByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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 OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; friend ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvUnoAttributeContainer_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) throw( ::com::sun::star::uno::Exception ); }; diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 825c3bfb04fb..ed7571f33ceb 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -292,26 +292,26 @@ public: static SvXMLExport* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw(); // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception) 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, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) 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_FINAL; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL; + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** ensures that the given namespace is in scope at the next started element. diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index adbc45577fb0..4368b5df15eb 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -198,56 +198,56 @@ public: virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument() throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL startElement(const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XExtendedDocumentHandler - virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL comment(const OUString& sComment) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL allowLineBreak(void) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL unknown(const OUString& sString) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL cancel( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 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_FINAL; + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL; + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL; + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_FINAL SAL_OVERRIDE; // may be called by certain subclasses that handle document meta-data // override to provide customized handling of document statistics diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx index 83a33eb15122..aefcac251b22 100644 --- a/include/xmloff/xmlmetae.hxx +++ b/include/xmloff/xmlmetae.hxx @@ -84,34 +84,34 @@ public: // ::com::sun::star::xml::sax::XDocumentHandler: virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception); + ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception); + ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startElement(const OUString & i_rName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & i_xAttribs) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception); + ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endElement(const OUString & i_rName) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception); + ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters(const OUString & i_rChars) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception); + ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace( const OUString & i_rWhitespaces) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception); + ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL processingInstruction( const OUString & i_rTarget, const OUString & i_rData) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception); + ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & i_xLocator) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception); + ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE; }; diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx index 40a25afd26e5..76e91d9661c6 100644 --- a/include/xmloff/xmlmetai.hxx +++ b/include/xmloff/xmlmetai.hxx @@ -52,12 +52,12 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; public: static void setBuildId(const OUString & rGenerator, diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index 2a7b41fdaa79..1651716afae0 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -174,9 +174,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void CreateAndInsert(sal_Bool bOverwrite); - virtual void Finish(bool bOverwrite); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void CreateAndInsert(sal_Bool bOverwrite) SAL_OVERRIDE; + virtual void Finish(bool bOverwrite) SAL_OVERRIDE; SvXMLNumImpData* GetData() const { return pData; } sal_Int32 GetKey(); diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx index fae4482c785f..58071ec281d3 100644 --- a/include/xmloff/xmlnumi.hxx +++ b/include/xmloff/xmlnumi.hxx @@ -49,7 +49,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; public: @@ -68,7 +68,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; void FillUnoNumRule( const ::com::sun::star::uno::Reference< @@ -94,7 +94,7 @@ public: sal_Int16 nLevel, sal_Bool bOrdered ); - virtual void CreateAndInsertLate( sal_Bool bOverwrite ); + virtual void CreateAndInsertLate( sal_Bool bOverwrite ) SAL_OVERRIDE; void CreateAndInsertAuto() const; }; diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx index 3d10c6284956..e7a9d1606143 100644 --- a/include/xmloff/xmlprcon.hxx +++ b/include/xmloff/xmlprcon.hxx @@ -52,7 +52,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; // This method is called from this instance implementation of // CreateChildContext if the element matches an entry in the diff --git a/include/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx index c07fb9dea084..d1af12bc52c5 100644 --- a/include/xmloff/xmlscripti.hxx +++ b/include/xmloff/xmlscripti.hxx @@ -44,9 +44,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_XMLSCRIPTI_HXX diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index 78e82522bc36..e0932a284ff0 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -103,11 +103,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; const OUString& GetName() const { return maName; } const OUString& GetDisplayName() const { return maDisplayName.getLength() ? maDisplayName : maName; } @@ -227,10 +227,10 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; // This method must be overloaded to insert styles into the document. - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; // This allows to add an SvXMLStyleContext to this context from extern void AddStyle(SvXMLStyleContext& rNew); diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx index c2c08cc1394a..0c64b42634ab 100644 --- a/include/xmlscript/xml_helper.hxx +++ b/include/xmlscript/xml_helper.hxx @@ -93,17 +93,17 @@ public: // XAttributeList virtual sal_Int16 SAL_CALL getLength() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex( sal_Int16 nPos ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByIndex( sal_Int16 nPos ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByName( OUString const & rName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getValueByIndex( sal_Int16 nPos ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getValueByName( OUString const & rName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: OUString _name; |