diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-21 12:15:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:29 +0200 |
| commit | f61dbc302975aaa253b00ea6b141bb12474b3c95 (patch) | |
| tree | 7150ea10f0111c4e6677030ac568c7be03424e08 /include | |
| parent | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (diff) | |
followup code removal after changing virtual methods to non-virtual
This cleanups up indentation and removes dead classes.
This is a followup patch to commit
272b1dd55797aacf511fb4342b0054e3697243f6
"new loplugin: change virtual methods to non-virtual"
Change-Id: I1c2139589cf8cb23bb9808defe22c51039d38de1
Diffstat (limited to 'include')
84 files changed, 342 insertions, 468 deletions
diff --git a/include/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx index 8700823e87cb..7aada8913406 100644 --- a/include/basegfx/tools/unopolypolygon.hxx +++ b/include/basegfx/tools/unopolypolygon.hxx @@ -36,9 +36,9 @@ namespace basegfx namespace unotools { typedef ::cppu::WeakComponentImplHelper3< - ::com::sun::star::rendering::XLinePolyPolygon2D, - ::com::sun::star::rendering::XBezierPolyPolygon2D, - ::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase; + ::com::sun::star::rendering::XLinePolyPolygon2D, + ::com::sun::star::rendering::XBezierPolyPolygon2D, + ::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase; class BASEGFX_DLLPUBLIC UnoPolyPolygon : private cppu::BaseMutex diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx index 8b9297a8054a..002589c006ab 100644 --- a/include/basic/sbmeth.hxx +++ b/include/basic/sbmeth.hxx @@ -63,7 +63,7 @@ public: void GetLineRange( sal_uInt16&, sal_uInt16& ); // Interface to execute a method from the applications - ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL ); + ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL ); virtual void Broadcast( sal_uIntPtr nHintId ) SAL_OVERRIDE; }; diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index f0cd12a30976..3af8dacdc9ec 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -102,10 +102,10 @@ public: virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; - const OUString& GetSource() const; + const OUString& GetSource() const; const OUString& GetSource32() const { return aOUSource;} const OUString& GetComment() const { return aComment; } - void SetSource( const OUString& r ); + void SetSource( const OUString& r ); void SetSource32( const OUString& r ); bool Compile(); @@ -116,14 +116,14 @@ public: bool IsBP( sal_uInt16 nLine ) const; bool SetBP( sal_uInt16 nLine ); bool ClearBP( sal_uInt16 nLine ); - void ClearAllBP(); + void ClearAllBP(); // Store only image, no source (needed for new password protection) - bool StoreBinaryData( SvStream& ); - bool StoreBinaryData( SvStream&, sal_uInt16 nVer ); - bool LoadBinaryData( SvStream&, sal_uInt16 nVer ); - bool LoadBinaryData( SvStream& ); - bool ExceedsLegacyModuleSize(); + bool StoreBinaryData( SvStream& ); + bool StoreBinaryData( SvStream&, sal_uInt16 nVer ); + bool LoadBinaryData( SvStream&, sal_uInt16 nVer ); + bool LoadBinaryData( SvStream& ); + bool ExceedsLegacyModuleSize(); void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const; bool HasExeCode(); bool IsVBACompat() const { return mbVBACompat;} @@ -134,8 +134,8 @@ public: void AddVarName( const OUString& aName ); void RemoveVars(); ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > GetUnoModule(); - bool createCOMWrapperForIface( ::com::sun::star::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject ); - void GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache); + bool createCOMWrapperForIface( ::com::sun::star::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject ); + void GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache); SbxArrayRef GetMethods() { return pMethods;} OUString GetKeywordCase( const OUString& sKeyword ) const; }; diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index 12de6e03057f..98f984196dd6 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -84,13 +84,13 @@ public: virtual SbxDataType GetType() const; virtual SbxClassType GetClass() const; - virtual void Clear(); + virtual void Clear(); static SbxBase* Load( SvStream& ); static void Skip( SvStream& ); bool Store( SvStream& ); virtual bool LoadCompleted(); - bool StoreCompleted(); + bool StoreCompleted(); static SbxError GetError(); static void SetError( SbxError ); diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index 1ccd03ee4aff..6edef5b11c2a 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -52,17 +52,17 @@ namespace comphelper ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > implGetBreakIterator(); ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification > implGetCharacterClassification(); - bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); - bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); - bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); + bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); + bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); + bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); virtual OUString implGetText() = 0; virtual ::com::sun::star::lang::Locale implGetLocale() = 0; - virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0; - void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - bool implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - void implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - 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 void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0; + void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + bool implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + void implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); /** non-virtual versions of the methods */ diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index 6d193e7697e8..35b45d25c642 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -82,19 +82,19 @@ namespace dbtools virtual ~FormattedColumnValue(); - void clear(); + void clear(); // access to the details of the formatting we determined sal_Int32 getFormatKey() const; sal_Int32 getFieldType() const; sal_Int16 getKeyType() const; const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& - getColumn() const; + getColumn() const; const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate >& - getColumnUpdate() const; + getColumnUpdate() const; - bool setFormattedValue( const OUString& _rFormattedStringValue ) const; - OUString getFormattedValue() const; + bool setFormattedValue( const OUString& _rFormattedStringValue ) const; + OUString getFormattedValue() const; private: ::std::unique_ptr< FormattedColumnValue_Data > m_pData; diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx index fb7292d8a8b9..4c5ae155580d 100644 --- a/include/connectivity/sdbcx/VDescriptor.hxx +++ b/include/connectivity/sdbcx/VDescriptor.hxx @@ -61,11 +61,11 @@ namespace connectivity virtual ~ODescriptor(); - bool isNew() const { return m_bNew; } - bool getNew() const { return m_bNew; } + bool isNew() const { return m_bNew; } + bool getNew() const { return m_bNew; } void setNew(bool _bNew); - bool isCaseSensitive() const { return m_aCase.isCaseSensitive(); } + bool isCaseSensitive() const { return m_aCase.isCaseSensitive(); } virtual void construct(); diff --git a/include/cppcanvas/basegfxfactory.hxx b/include/cppcanvas/basegfxfactory.hxx index de958efc7875..d1ed17d3a7d0 100644 --- a/include/cppcanvas/basegfxfactory.hxx +++ b/include/cppcanvas/basegfxfactory.hxx @@ -26,7 +26,6 @@ #include <cppcanvas/polypolygon.hxx> #include <cppcanvas/bitmap.hxx> #include <cppcanvas/renderer.hxx> -#include <cppcanvas/text.hxx> #include <cppcanvas/sprite.hxx> #include <basegfx/vector/b2isize.hxx> diff --git a/include/cppcanvas/text.hxx b/include/cppcanvas/text.hxx deleted file mode 100644 index 622e553a5ad9..000000000000 --- a/include/cppcanvas/text.hxx +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_CPPCANVAS_TEXT_HXX -#define INCLUDED_CPPCANVAS_TEXT_HXX - -#include <boost/shared_ptr.hpp> -#include <cppcanvas/canvasgraphic.hxx> - - - - -/* Definition of Text interface */ - -namespace cppcanvas -{ - class Text : public virtual CanvasGraphic - { - public: - ; - ; - }; - - typedef ::boost::shared_ptr< ::cppcanvas::Text > TextSharedPtr; -} - -#endif // INCLUDED_CPPCANVAS_TEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx index a48c62416569..de599c0ad53a 100644 --- a/include/cppcanvas/vclfactory.hxx +++ b/include/cppcanvas/vclfactory.hxx @@ -26,7 +26,6 @@ #include <cppcanvas/polypolygon.hxx> #include <cppcanvas/bitmap.hxx> #include <cppcanvas/renderer.hxx> -#include <cppcanvas/text.hxx> #include <cppcanvas/sprite.hxx> #include <cppcanvas/cppcanvasdllapi.h> diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index fd1d2567a57f..6cf592e4f072 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -166,7 +166,7 @@ namespace dbaui DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxORB); virtual ~DBSubComponentController(); - void disconnect(); + void disconnect(); virtual void reconnect( bool _bUI ); bool ensureConnected( bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index f85c43b00836..3bff7c932dc6 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -297,7 +297,7 @@ public: void SetText(sal_Int32 nPara, const OUString& rText); - virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); + virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); const SfxItemSet& GetParaAttribs( sal_Int32 nPara ) const; void GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const; @@ -464,7 +464,7 @@ public: virtual void ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ); virtual void ParaAttribsChanged( sal_Int32 nParagraph ); virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); - void ParagraphHeightChanged( sal_Int32 nPara ); + void ParagraphHeightChanged( sal_Int32 nPara ); virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, @@ -508,7 +508,6 @@ public: static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet ); static bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); } static bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable ); - SdrObject* GetCurTextObj() { return NULL; } /** sets a link that is called at the beginning of a drag operation at an edit view */ void SetBeginDropHdl( const Link& rLink ); Link GetBeginDropHdl() const; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 7386faea93af..0c41aa8827a6 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -58,8 +58,8 @@ public: virtual SvxFieldData* Clone() const; virtual bool operator==( const SvxFieldData& ) const; - virtual MetaAction* createBeginComment() const; - MetaAction* createEndComment() const; + virtual MetaAction* createBeginComment() const; + MetaAction* createEndComment() const; }; /** diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index de71bd96f1a2..9189171a546b 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -44,10 +44,10 @@ public: 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 SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) 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) { @@ -77,10 +77,10 @@ public: 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 SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) 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) { @@ -106,10 +106,10 @@ public: 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 SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) 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/outliner.hxx b/include/editeng/outliner.hxx index b56ac7fd6878..836ad0665d3f 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -638,7 +638,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster bool ImpCanDeleteSelectedPages( OutlinerView* pCurView ); bool ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 nFirstPage, sal_Int32 nPages ); - sal_uInt16 ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } + sal_uInt16 ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } void ImplCheckDepth( sal_Int16& rnDepth ) const; protected: @@ -646,7 +646,7 @@ protected: void ParagraphDeleted( sal_Int32 nParagraph ); void ParaAttribsChanged( sal_Int32 nParagraph ); - void StyleSheetChanged( SfxStyleSheet* pStyle ); + void StyleSheetChanged( SfxStyleSheet* pStyle ); void InvalidateBullet(sal_Int32 nPara); void PaintBullet( sal_Int32 nPara, const Point& rStartPos, @@ -663,7 +663,7 @@ public: virtual ~Outliner(); void Init( sal_uInt16 nOutlinerMode ); - sal_uInt16 GetMode() const { return nOutlinerMode; } + sal_uInt16 GetMode() const { return nOutlinerMode; } void SetVertical( bool bVertical ); bool IsVertical() const; @@ -744,28 +744,28 @@ public: Paragraph* GetHdlParagraph() const { return pHdlParagraph; } bool IsExpanding() const { return bIsExpanding; } - void ExpandHdl(); + void ExpandHdl(); void SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; } Link GetExpandHdl() const { return aExpandHdl; } - void ParagraphInsertedHdl(); + void ParagraphInsertedHdl(); void SetParaInsertedHdl(const Link& rLink){aParaInsertedHdl=rLink;} Link GetParaInsertedHdl() const { return aParaInsertedHdl; } - void ParagraphRemovingHdl(); + void ParagraphRemovingHdl(); void SetParaRemovingHdl(const Link& rLink){aParaRemovingHdl=rLink;} Link GetParaRemovingHdl() const { return aParaRemovingHdl; } - void DepthChangedHdl(); + void DepthChangedHdl(); void SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;} Link GetDepthChangedHdl() const { return aDepthChangedHdl; } sal_Int16 GetPrevDepth() const { return static_cast<sal_Int16>(nDepthChangedHdlPrevDepth); } sal_uInt16 GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; } - long RemovingPagesHdl( OutlinerView* ); + long RemovingPagesHdl( OutlinerView* ); void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;} Link GetRemovingPagesHdl() const { return aRemovingPagesHdl; } - long IndentingPagesHdl( OutlinerView* ); + long IndentingPagesHdl( OutlinerView* ); void SetIndentingPagesHdl(const Link& rLink){aIndentingPagesHdl=rLink;} Link GetIndentingPagesHdl() const { return aIndentingPagesHdl; } // valid only in the two upper handlers @@ -806,9 +806,9 @@ public: void SetFirstPageNumber( sal_Int32 n ) { nFirstPage = n; } sal_Int32 GetFirstPageNumber() const { return nFirstPage; } - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); - void ClearPolygon(); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); + void ClearPolygon(); const Size& GetMinAutoPaperSize() const; void SetMinAutoPaperSize( const Size& rSz ); @@ -828,9 +828,9 @@ public: EBulletInfo GetBulletInfo( sal_Int32 nPara ); - void SetWordDelimiters( const OUString& rDelimiters ); - OUString GetWordDelimiters() const; - OUString GetWord( sal_Int32 nPara, sal_Int32 nIndex ); + void SetWordDelimiters( const OUString& rDelimiters ); + OUString GetWordDelimiters() const; + OUString GetWord( sal_Int32 nPara, sal_Int32 nIndex ); void StripPortions(); @@ -910,8 +910,8 @@ public: bool UpdateFields(); void RemoveFields( bool bKeepFieldText, TypeId aType = NULL ); - void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); void SetSpeller( ::com::sun::star::uno::Reference< diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index a9404de5862c..b135c7e7a1d6 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -42,7 +42,7 @@ public: 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 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); + sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); virtual SfxItemState GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const SAL_OVERRIDE; virtual SfxItemState GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const SAL_OVERRIDE; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 1612e5db3130..1c2cf6f0aedc 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -199,7 +199,7 @@ public: virtual bool IsValid() const SAL_OVERRIDE; - void SetNotifyHdl( const Link& ); + void SetNotifyHdl( const Link& ); 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; diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 257642fe8d3c..f48fcd28ed8d 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -44,7 +44,7 @@ protected: virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; virtual void implWriteExtHeader() SAL_OVERRIDE; virtual void implDumpRecordBody() SAL_OVERRIDE; - void implDumpClientAnchor(); + void implDumpClientAnchor(); private: sal_uInt32 dumpDffSimpleColor( const String& rName ); diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index e055832c2445..926d6e46356d 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -963,8 +963,8 @@ protected: const OUString& rSysFileName ); virtual bool implIsValid() const SAL_OVERRIDE; - const OUString* implGetOption( const OUString& rKey ) const; - NameListRef implGetNameList( const OUString& rListName ) const; + const OUString* implGetOption( const OUString& rKey ) const; + NameListRef implGetNameList( const OUString& rListName ) const; private: typedef ::boost::shared_ptr< SharedConfigData > SharedConfigDataRef; diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 282d3a0e40bf..e3a7199fe355 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -406,8 +406,8 @@ public: protected: virtual void importControlData( BinaryInputStream& rInStrm ) = 0; - void importCommonExtraData( BinaryInputStream& rInStrm ); - void importCommonTrailingData( BinaryInputStream& rInStrm ); + void importCommonExtraData( BinaryInputStream& rInStrm ); + void importCommonTrailingData( BinaryInputStream& rInStrm ); private: /** Returns the data part identifier according to the model version. */ diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 0c996acfd999..72a225b55b22 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -152,7 +152,7 @@ protected: /** Called when the import process of the VBA project has been started. */ virtual void prepareImport(); /** Called when the import process of the VBA project is finished. */ - void finalizeImport(); + void finalizeImport(); private: VbaProject( const VbaProject& ); diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 9001c5d1b5a3..d4a8efbcc494 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -127,7 +127,7 @@ public: FloatingWindow* GetFloatingWindow() const; virtual void Resizing( Size& rSize ); - bool Close(); + bool Close(); static void RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); }; diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 91ae1f25ac5e..fa5b7b9ac853 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -65,11 +65,11 @@ public: SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewLink ); void SetId( sal_uInt16 nItemId ); - sal_uInt16 GetId() const { return nId; } + sal_uInt16 GetId() const { return nId; } virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - void DeleteFloatingWindow(); + void DeleteFloatingWindow(); SfxMapUnit GetCoreMetric() const; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index e5c919900fe5..6fc50597ba3d 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -103,7 +103,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); Size GetMinOutputSizePixel() const; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void FadeIn( bool ); + void FadeIn( bool ); DECL_LINK(TimerHdl, void *); SAL_DLLPRIVATE void Initialize_Impl(); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 1bb50587d722..cf778f417fe7 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -236,7 +236,7 @@ public: SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - OUString GetValueText() const; + OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index 6474682c0d7c..da7563457b1e 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -50,7 +50,7 @@ private: protected: virtual ~SfxHintPoster(); - void Event( SfxHint* pPostedHint ); + void Event( SfxHint* pPostedHint ); public: SfxHintPoster( const GenLink& rLink ); diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 173e259bf8e0..b3646bcdbb94 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -75,7 +75,7 @@ public: SfxObjectFactory* pFactoryP, ... ); virtual ~SfxModule(); - ResMgr* GetResMgr(); + ResMgr* GetResMgr(); SfxSlotPool* GetSlotPool() const; void RegisterToolBoxControl(SfxTbxCtrlFactory*); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 0b1bb68d8d07..ddec48274d31 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -191,7 +191,7 @@ protected: SfxObjectShell( const sal_uInt64 i_nCreationFlags ); // see sfxmodelfactory.hxx virtual ~SfxObjectShell(); - void ModifyChanged(); + void ModifyChanged(); virtual bool Close() SAL_OVERRIDE; /** declares the document to have capabilities to contain basic/dialog libraries @@ -247,7 +247,7 @@ public: void UpdateDocInfoForSave( ); void FlushDocInfo(); bool HasName() const { return bHasName; } - OUString GetAPIName() const; + OUString GetAPIName() const; void SetReadOnly(); bool IsReadOnly() const; bool IsReadOnlyMedium() const; @@ -257,7 +257,7 @@ public: void SetNoName(); bool IsInModalMode() const; bool IsInPrepareClose() const; - bool AcceptStateUpdate() const; + bool AcceptStateUpdate() const; bool IsHelpDocument() const; bool IsDocShared() const; @@ -296,7 +296,7 @@ public: // TODO/LATER: currently only overridden in Calc, should be made non-virtual virtual bool DoSaveCompleted( SfxMedium* pNewStor=0 ); - bool LoadOwnFormat( SfxMedium& pMedium ); + bool LoadOwnFormat( SfxMedium& pMedium ); virtual bool SaveAsOwnFormat( SfxMedium& pMedium ); virtual bool ConvertFrom( SfxMedium &rMedium ); virtual bool ConvertTo( SfxMedium &rMedium ); @@ -306,7 +306,7 @@ public: virtual bool Save(); virtual bool SaveAs( SfxMedium &rMedium ); virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - bool SwitchPersistance( + bool SwitchPersistance( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual void UpdateLinks(); virtual bool LoadExternal( SfxMedium& rMedium ); @@ -402,17 +402,17 @@ public: static sal_uInt32 HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc ); - void ViewAssigned(); + void ViewAssigned(); virtual bool PrepareClose(bool bUI = true); virtual bool IsInformationLost(); virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ); - bool HasSecurityOptOpenReadOnly() const; + bool HasSecurityOptOpenReadOnly() const; bool IsSecurityOptOpenReadOnly() const; void SetSecurityOptOpenReadOnly( bool bOpenReadOnly = true ); virtual Size GetFirstPageSize(); - bool DoClose(); + bool DoClose(); virtual void PrepareReload(); ::boost::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const; virtual void CancelTransfers(); @@ -453,7 +453,7 @@ public: void InvalidateName(); // Re-set to unnamed // DDE-Interface - long DdeExecute( const OUString& rCmd ); + long DdeExecute( const OUString& rCmd ); virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); @@ -473,7 +473,7 @@ public: // Determine the position of the "Automatic" filter in the stylist void SetAutoStyleFilterIndex(sal_uInt16 nSet); sal_uInt16 GetAutoStyleFilterIndex(); - bool HasBasic() const; + bool HasBasic() const; BasicManager* GetBasicManager() const; com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > GetBasicContainer(); @@ -497,7 +497,7 @@ public: virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; - SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); + SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() const; @@ -508,7 +508,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); - vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); + vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > @@ -518,7 +518,7 @@ public: bool IsInPlaceActive(); bool IsUIActive(); virtual void InPlaceActivate( bool ); - void UIActivate( bool ); + void UIActivate( bool ); static bool CopyStoragesOfUnknownMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource, @@ -560,12 +560,12 @@ public: // The functions from SvEmbeddedObject virtual Printer * GetDocumentPrinter(); - virtual OutputDevice* GetDocumentRefDev(); + virtual OutputDevice* GetDocumentRefDev(); virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ); virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const; - virtual void SetVisArea( const Rectangle & rVisArea ); + virtual void SetVisArea( const Rectangle & rVisArea ); const Rectangle & GetVisArea() const; - void SetVisAreaSize( const Size & rVisSize ); + void SetVisAreaSize( const Size & rVisSize ); virtual sal_uIntPtr GetMiscStatus() const; MapUnit GetMapUnit() const; @@ -800,7 +800,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - OUString GetValueText() const; + OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 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; diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index ba3404ee3676..b833ce17c335 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -387,7 +387,7 @@ public: SfxShell::Activate() */ - void ParentActivate(); + void ParentActivate(); /** The active parent of the <SfxDispatcher> on which the SfxShell is located, @@ -399,7 +399,7 @@ public: SfxShell::Deactivate() */ - void ParentDeactivate(); + void ParentDeactivate(); /** This method returns a pointer to the <SfxDispatcher>, when the SfxShell diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index e3046c624398..07121f89fa00 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -98,11 +98,11 @@ protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); - void DoubleClick(); + void DoubleClick(); virtual void Command( const CommandEvent& rCEvt ); virtual bool MouseButtonDown( const MouseEvent & ); virtual bool MouseMove( const MouseEvent & ); - bool MouseButtonUp( const MouseEvent & ); + bool MouseButtonUp( const MouseEvent & ); virtual void Paint( const UserDrawEvent &rUDEvt ); static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ); diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index f64401823ab8..5495c0b0bc6d 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -73,26 +73,6 @@ namespace sfx2 }; - //= IToolPanelCompare - - class SFX2_DLLPUBLIC SAL_NO_VTABLE IToolPanelCompare - { - public: - /** compares to tool panel URLs - @return - <ul> - <li>-1 if the tool panel described by i_rLHS should precede the one described by i_rRHS</li> - <li>0 if the two panels have no particular relative order</li> - <li>1 if the tool panel described by i_rLHS should succeed the one described by i_rRHS</li> - - */ - ; - - protected: - ~IToolPanelCompare() {} - }; - - //= ModuleTaskPane class ModuleTaskPane_Impl; diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index f3ca152c5f2a..168b8c4aaebf 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -120,9 +120,9 @@ private: protected: virtual void PopupModeEnd() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - void DeleteFloatingWindow(); + void DeleteFloatingWindow(); - sal_uInt16 GetId() const { return m_nId; } + sal_uInt16 GetId() const { return m_nId; } const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; } void BindListener(); diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 91361265ed3f..a56376304d84 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -46,10 +46,10 @@ public: virtual ~SfxTemplatePanelControl(); void Update(); - virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void FreeResource (void); private: diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 5f8232872e96..18a3158158dd 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -115,11 +115,11 @@ public: SfxViewFrame* GetParentViewFrame() const; using SfxShell::GetDispatcher; - SfxDispatcher* GetDispatcher() { return pDispatcher; } + SfxDispatcher* GetDispatcher() { return pDispatcher; } SfxBindings& GetBindings() { return *pBindings; } const SfxBindings& GetBindings() const { return *pBindings; } - vcl::Window& GetWindow() const; - void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); + vcl::Window& GetWindow() const; + void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); SfxProgress* GetProgress() const; @@ -136,19 +136,19 @@ public: bool IsVisible() const; void ToTop(); void Enable( bool bEnable ); - bool Close(); + bool Close(); virtual void Activate( bool bUI ) SAL_OVERRIDE; virtual void Deactivate( bool bUI ) SAL_OVERRIDE; // DDE-Interface - long DdeExecute( const OUString& rCmd ); - bool DdeGetData( const OUString& rItem, + long DdeExecute( const OUString& rCmd ); + bool DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); - bool DdeSetData( const OUString& rItem, + bool DdeSetData( const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); - ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); + ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); void UpdateTitle(); @@ -160,12 +160,12 @@ public: SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh ); virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; - sal_uInt16 GetCurViewId() const; + sal_uInt16 GetCurViewId() const; SfxFrame& GetFrame() const; SfxViewFrame* GetTopViewFrame() const; bool DoClose(); - sal_uIntPtr GetFrameType() const + sal_uIntPtr GetFrameType() const { return GetFrame().GetFrameType(); } SfxFrame& GetTopFrame() const { return GetFrame().GetTopFrame(); } @@ -178,14 +178,14 @@ public: bool IsInModalMode() const; void Resize(bool bForce=false); - void SetChildWindow(sal_uInt16 nId, bool bVisible, bool bSetFocus=true); - void ToggleChildWindow(sal_uInt16); - bool HasChildWindow(sal_uInt16); - bool KnowsChildWindow(sal_uInt16); - void ShowChildWindow(sal_uInt16,bool bVisible=true); - SfxChildWindow* GetChildWindow(sal_uInt16); - void ChildWindowExecute(SfxRequest&); - void ChildWindowState(SfxItemSet&); + void SetChildWindow(sal_uInt16 nId, bool bVisible, bool bSetFocus=true); + void ToggleChildWindow(sal_uInt16); + bool HasChildWindow(sal_uInt16); + bool KnowsChildWindow(sal_uInt16); + void ShowChildWindow(sal_uInt16,bool bVisible=true); + SfxChildWindow* GetChildWindow(sal_uInt16); + void ChildWindowExecute(SfxRequest&); + void ChildWindowState(SfxItemSet&); /** Append a new InfoBar (see https://wiki.documentfoundation.org/Design/Whiteboards/Infobar). diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 3498dc98a5b7..39bebeec25d8 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -172,9 +172,9 @@ public: virtual ErrCode DoVerb(long nVerb); - void OutplaceActivated( bool bActive, SfxInPlaceClient* pClient ); - void InplaceActivating( SfxInPlaceClient* pClient ); - void InplaceDeactivated( SfxInPlaceClient* pClient ); + void OutplaceActivated( bool bActive, SfxInPlaceClient* pClient ); + void InplaceActivating( SfxInPlaceClient* pClient ); + void InplaceDeactivated( SfxInPlaceClient* pClient ); virtual void UIActivating( SfxInPlaceClient* pClient ); virtual void UIDeactivated( SfxInPlaceClient* pClient ); @@ -188,7 +188,7 @@ public: * has been set. By the time this is called the document has been fully * imported. */ - void Initialize(); + void Initialize(); virtual bool PrepareClose( bool bUI = true ); virtual OUString GetSelectionText( bool bCompleteWords = false ); virtual bool HasSelection( bool bText = true ) const; @@ -210,7 +210,7 @@ public: bool Escape(); // Viewing Interface - vcl::Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void SetWindow( vcl::Window *pViewPort ); virtual void AdjustPosSizePixel( const Point &rOfs, const Size &rSize ); const SvBorder& GetBorderPixel() const; @@ -223,7 +223,7 @@ public: virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual bool HasPrintOptionsPage() const; virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ); - JobSetup GetJobSetup() const; + JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; // Working set @@ -256,7 +256,7 @@ public: const Size& GetMargin() const; void SetMargin( const Size& ); void DisconnectAllClients(); - SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); + SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); bool NewWindowAllowed() const { return !bNoNewWindow; } void SetNewWindowAllowed( bool bSet ) { bNoNewWindow = !bSet; } diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx index e08847b93f30..078a32be6ffc 100644 --- a/include/sot/factory.hxx +++ b/include/sot/factory.hxx @@ -58,7 +58,7 @@ public: const OUString & rClassName, CreateInstanceType ); void PutSuperClass( const SotFactory * ); - void * CreateInstance( SotObject ** ppObj = NULL ) const; + void * CreateInstance( SotObject ** ppObj = NULL ) const; bool Is( const SotFactory * pSuperClass ) const; const SotFactory * GetSuper( sal_uInt16 nPos ) const diff --git a/include/sot/object.hxx b/include/sot/object.hxx index 19428d6183bd..f23f1835825d 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -110,13 +110,13 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotObjectFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); + static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual const SotFactory * GetSvFactory() const; - virtual void * Cast( const SotFactory * ); + virtual void * Cast( const SotFactory * ); // only for the macros in So3 not to get out of hand - IUnknown * GetInterface( const SvGlobalName & ); + IUnknown * GetInterface( const SvGlobalName & ); bool Owner() const { return bOwner; } diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 10940c4bd7f5..830faf8a36fc 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -65,18 +65,18 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotStorageStreamFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); + static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual const SotFactory * GetSvFactory() const SAL_OVERRIDE; - virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; + virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; virtual void ResetError() SAL_OVERRIDE; virtual void SetSize( sal_uInt64 nNewSize ) SAL_OVERRIDE; - sal_uInt32 GetSize() const; + sal_uInt32 GetSize() const; bool CopyTo( SotStorageStream * pDestStm ); - bool Commit(); - bool Revert(); + bool Commit(); + bool Revert(); bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue ); virtual sal_uInt64 remainingSize() SAL_OVERRIDE; }; @@ -127,19 +127,19 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotStorageFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); + static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual const SotFactory * GetSvFactory() const SAL_OVERRIDE; - virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; + virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; SvMemoryStream * CreateMemoryStream(); static bool IsStorageFile( const OUString & rFileName ); static bool IsStorageFile( SvStream* pStream ); - const OUString& GetName() const; + const OUString& GetName() const; - bool Validate(); + bool Validate(); const OString& GetKey() const { return m_aKey;} @@ -152,36 +152,36 @@ public: return m_nVersion; } - sal_uLong GetErrorCode() const { return m_nError; } - sal_uLong GetError() const { return ERRCODE_TOERROR(m_nError); } + sal_uLong GetErrorCode() const { return m_nError; } + sal_uLong GetError() const { return ERRCODE_TOERROR(m_nError); } void SetError( sal_uLong nErrorCode ) { if( m_nError == SVSTREAM_OK ) m_nError = nErrorCode; } - void ResetError(); + void ResetError(); bool IsRoot() const { return m_bIsRoot; } void SignAsRoot( bool b = true ) { m_bIsRoot = b; } void SetDeleteStream( bool bDelete ) { m_bDelStm = bDelete; } // own data sector - void SetClass( const SvGlobalName & rClass, + void SetClass( const SvGlobalName & rClass, sal_uLong bOriginalClipFormat, const OUString & rUserTypeName ); - void SetConvertClass( const SvGlobalName & rConvertClass, + void SetConvertClass( const SvGlobalName & rConvertClass, sal_uLong bOriginalClipFormat, const OUString & rUserTypeName ); - SvGlobalName GetClassName(); // type of data in the storage - sal_uLong GetFormat(); - OUString GetUserName(); - bool ShouldConvert(); + SvGlobalName GetClassName(); // type of data in the storage + sal_uLong GetFormat(); + OUString GetUserName(); + bool ShouldConvert(); // list of all elements - void FillInfoList( SvStorageInfoList * ) const; - bool CopyTo( SotStorage * pDestStg ); - bool Commit(); - bool Revert(); + void FillInfoList( SvStorageInfoList * ) const; + bool CopyTo( SotStorage * pDestStg ); + bool Commit(); + bool Revert(); // create stream with connection to Storage, // more or less a Parent-Child relationship @@ -192,17 +192,17 @@ public: StreamMode = STREAM_STD_READWRITE, bool transacted = true ); // query whether Storage or Stream - bool IsStream( const OUString & rEleName ) const; - bool IsStorage( const OUString & rEleName ) const; - bool IsContained( const OUString & rEleName ) const; + bool IsStream( const OUString & rEleName ) const; + bool IsStorage( const OUString & rEleName ) const; + bool IsContained( const OUString & rEleName ) const; // remove element - bool Remove( const OUString & rEleName ); + bool Remove( const OUString & rEleName ); // change element's name - bool Rename( const OUString & rEleName, + bool Rename( const OUString & rEleName, const OUString & rNewName ); - bool CopyTo( const OUString & rEleName, SotStorage * pDest, + bool CopyTo( const OUString & rEleName, SotStorage * pDest, const OUString & rNewName ); - bool MoveTo( const OUString & rEleName, SotStorage * pDest, + bool MoveTo( const OUString & rEleName, SotStorage * pDest, const OUString & rNewName ); bool IsOLEStorage() const; diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx index a35b62a2d694..60727de9c5aa 100644 --- a/include/svl/SfxBroadcaster.hxx +++ b/include/svl/SfxBroadcaster.hxx @@ -38,7 +38,6 @@ private: protected: void Forward(SfxBroadcaster& rBC, const SfxHint& rHint); - void ListenersGone(); public: TYPEINFO(); diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 5a64eb1d1435..1a9b2e685f47 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -473,7 +473,7 @@ public: void NewContent(); - sal_uInt32 Close( bool bSeekToEndOfRec = true ); + sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; /** write record with multiple content items with identical size diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 7fc64e1189f2..c458cef78443 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -151,7 +151,7 @@ public: virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ); virtual void Remove( const SfxPoolItem& ); - const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; + const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; const SfxPoolItem* LoadItem( SvStream &rStream, bool bDirect = false, @@ -170,7 +170,7 @@ public: bool StoreSurrogate(SvStream& rStream, const SfxPoolItem *pItem ) const; - SvStream & Load(SvStream &); + SvStream & Load(SvStream &); virtual SvStream & Store(SvStream &) const; bool HasPersistentRefCounts() const; void LoadCompleted(); diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index cc9009d5942d..05ee6e9d4a4f 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -106,7 +106,7 @@ class SVL_DLLPUBLIC SfxItemPropertySet SfxItemPropertyMap m_aMap; mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo; protected: - bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, bool bGetProperty) const; + bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, bool bGetProperty) const; public: SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) : @@ -127,12 +127,12 @@ public: const SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - void setPropertyValue( const SfxItemPropertySimpleEntry& rEntry, + void setPropertyValue( const SfxItemPropertySimpleEntry& rEntry, const com::sun::star::uno::Any& aVal, SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException); - void setPropertyValue( const OUString& rPropertyName, + void setPropertyValue( const OUString& rPropertyName, const com::sun::star::uno::Any& aVal, SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 8fd2e3f997fd..5184e9b940be 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -80,15 +80,15 @@ public: virtual SfxItemSet * Clone(bool bItems = true, SfxItemPool *pToPool = 0) const; // Get number of items - sal_uInt16 Count() const { return _nCount; } - sal_uInt16 TotalCount() const; + sal_uInt16 Count() const { return _nCount; } + sal_uInt16 TotalCount() const; - const SfxPoolItem& Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const; + const SfxPoolItem& Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const; const SfxPoolItem* GetItem( sal_uInt16 nWhich, bool bSrchInParent = true, TypeId aItemType = 0 ) const; // Get Which-value of the item at position nPos - sal_uInt16 GetWhichByPos(sal_uInt16 nPos) const; + sal_uInt16 GetWhichByPos(sal_uInt16 nPos) const; // Get item-status SfxItemState GetItemState( sal_uInt16 nWhich, @@ -97,12 +97,12 @@ public: bool HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem = NULL) const; - void DisableItem(sal_uInt16 nWhich); - void InvalidateItem( sal_uInt16 nWhich ); - sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); - void ClearInvalidItems( bool bHardDefault = false ); - void InvalidateAllItems(); // HACK(via nWhich = 0) ??? - void InvalidateDefaultItems(); + void DisableItem(sal_uInt16 nWhich); + void InvalidateItem( sal_uInt16 nWhich ); + sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); + void ClearInvalidItems( bool bHardDefault = false ); + void InvalidateAllItems(); // HACK(via nWhich = 0) ??? + void InvalidateDefaultItems(); inline void SetParent( const SfxItemSet* pNew ); @@ -116,22 +116,22 @@ public: SfxItemState eDontCareAs = SfxItemState::UNKNOWN, SfxItemState eDefaultAs = SfxItemState::UNKNOWN ); - bool Set( const SfxItemSet&, bool bDeep = true ); + bool Set( const SfxItemSet&, bool bDeep = true ); - void Intersect( const SfxItemSet& rSet ); - void MergeValues( const SfxItemSet& rSet, bool bOverwriteDefaults = false ); - void Differentiate( const SfxItemSet& rSet ); - void MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false ); + void Intersect( const SfxItemSet& rSet ); + void MergeValues( const SfxItemSet& rSet, bool bOverwriteDefaults = false ); + void Differentiate( const SfxItemSet& rSet ); + void MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false ); SfxItemPool* GetPool() const { return _pPool; } - const sal_uInt16* GetRanges() const { return _pWhichRanges; } + const sal_uInt16* GetRanges() const { return _pWhichRanges; } void SetRanges( const sal_uInt16 *pRanges ); void MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo ); const SfxItemSet* GetParent() const { return _pParent; } - SvStream & Load( SvStream &, bool bDirect = false, + SvStream & Load( SvStream &, bool bDirect = false, const SfxItemPool *pRefPool = 0 ); - SvStream & Store( SvStream &, bool bDirect = false ) const; + SvStream & Store( SvStream &, bool bDirect = false ) const; bool operator==(const SfxItemSet &) const; sal_Int32 getHash() const; diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 9c416a2f561f..8a3f7abab782 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -63,9 +63,9 @@ public: SvNumberFormatter* GetNumberFormatter() const; // override to adapt attributes in the document - void NumberFormatDeleted(sal_uInt32 nKey); + void NumberFormatDeleted(sal_uInt32 nKey); // override to possibly format something anew - void SettingsChanged(); + void SettingsChanged(); // XNumberFormatsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 738e867a616f..c1e724992415 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -47,14 +47,14 @@ public: const std::vector<OUString>& GetList() const; // String-Separator: \n - void SetString( const OUString& ); - OUString GetString(); + void SetString( const OUString& ); + OUString GetString(); 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 SAL_OVERRIDE; - virtual bool GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 1dd3ca44d244..3be7495c6d44 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -362,9 +362,9 @@ protected: nRow starts at 0 */ virtual bool SeekRow( long nRow ) = 0; - void DrawCursor(); - void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); - void PaintData( vcl::Window& rWin, const Rectangle& rRect ); + void DrawCursor(); + void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); + void PaintData( vcl::Window& rWin, const Rectangle& rRect ); virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const = 0; // Advice for the subclass: the visible scope of rows has changed. @@ -384,10 +384,10 @@ protected: virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows); // number of visible rows in the window (incl. "truncated" rows) - sal_uInt16 GetVisibleRows() + sal_uInt16 GetVisibleRows() { return (sal_uInt16)((pDataWin->GetOutputSizePixel().Height() - 1 )/ GetDataRowHeight() + 1); } long GetTopRow() { return nTopRow; } - sal_uInt16 GetFirstVisibleColNumber() const { return nFirstCol; } + sal_uInt16 GetFirstVisibleColNumber() const { return nFirstCol; } // Focus-Rect enable / disable void DoShowCursor( const char *pWhoLog ); @@ -450,9 +450,9 @@ public: // neue Handler virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ); - void MouseMove( const BrowserMouseEvent& rEvt ); + void MouseMove( const BrowserMouseEvent& rEvt ); virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ); - void StartScroll(); + void StartScroll(); virtual void EndScroll(); virtual void Select(); virtual void DoubleClick( const BrowserMouseEvent& rEvt ); @@ -460,7 +460,7 @@ public: virtual void CursorMoved(); virtual void ColumnMoved( sal_uInt16 nColId ); virtual void ColumnResized( sal_uInt16 nColId ); - long QueryColumnResize( sal_uInt16 nColId, long nWidth ); + long QueryColumnResize( sal_uInt16 nColId, long nWidth ); /// called when the row height has been changed interactively virtual void RowHeightChanged(); virtual long QueryMinimumRowHeight(); @@ -497,8 +497,8 @@ public: void SetDataRowHeight( long nPixel ); long GetDataRowHeight() const; void SetTitleLines( sal_uInt16 nLines ); - sal_uInt16 GetTitleLines() const { return nTitleLines; } - long GetTitleHeight() const; + sal_uInt16 GetTitleLines() const { return nTitleLines; } + long GetTitleHeight() const; // access to dynamic values of cursor row OUString GetColumnTitle( sal_uInt16 nColumnId ) const; @@ -554,7 +554,7 @@ public: bool bComplete = false ) const; long GetRowAtYPosPixel( long nY, bool bRelToBrowser = true ) const; - sal_uInt16 GetColumnAtXPosPixel( long nX, + sal_uInt16 GetColumnAtXPosPixel( long nX, bool bRelToBrowser = true ) const; // invalidations @@ -816,8 +816,8 @@ public: virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; - virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; + virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; private: // the following declares some Window/OutputDevice methods private. This happened in the course diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 10dff86e49a8..e970842480a7 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -274,11 +274,11 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void SelectionChanging(); - void DateRangeChanged(); - void RequestDateInfo(); - void DoubleClick(); - void Select(); + void SelectionChanging(); + void DateRangeChanged(); + void RequestDateInfo(); + void DoubleClick(); + void Select(); const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; } diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index a898b08bc658..1919ba0666c4 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -47,12 +47,12 @@ public: void SetMode( sal_Int16 eMode ); - short Execute(); + short Execute(); private: vcl::Window* mpParent; - Color maColor; - sal_Int16 meMode; + Color maColor; + sal_Int16 meMode; }; #endif // INCLUDED_SVTOOLS_COLRDLG_HXX diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 377f92b29f95..42d9a708edb3 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -311,8 +311,8 @@ private: void SVT_DLLPRIVATE ImplAfterDataChange(); protected: - void GraphicManagerDestroyed(); - SvStream* GetSwapStream() const; + void GraphicManagerDestroyed(); + SvStream* GetSwapStream() const; void SetSwapState(); virtual void Load( SvStream& ) SAL_OVERRIDE; diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index e9ff21b7d364..f7cb8c14ca1d 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -297,9 +297,9 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void UserDraw( const UserDrawEvent& rUDEvt ); - void StartDrag(); - void Drag(); + void UserDraw( const UserDrawEvent& rUDEvt ); + void StartDrag(); + void Drag(); virtual void EndDrag(); virtual void Select(); virtual void DoubleClick(); diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index 874614ba214a..22b3d3546785 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -87,9 +87,9 @@ public: bool bActive ); virtual ~IMapObject() {}; - sal_uInt16 GetVersion() const; - virtual sal_uInt16 GetType() const = 0; - virtual bool IsHit( const Point& rPoint ) const = 0; + sal_uInt16 GetVersion() const; + virtual sal_uInt16 GetType() const = 0; + virtual bool IsHit( const Point& rPoint ) const = 0; void Write ( SvStream& rOStm, const OUString& rBaseURL ) const; void Read( SvStream& rIStm, const OUString& rBaseURL ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 2c086637bddc..84ec8d8748f8 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -228,10 +228,10 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control protected: virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled ); - void DocumentRectChanged(); - void VisibleRectChanged(); - bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); + bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled ); + void DocumentRectChanged(); + void VisibleRectChanged(); + bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -240,11 +240,11 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - void ClickIcon(); + void ClickIcon(); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - void DrawEntryImage( + void DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev ); @@ -320,10 +320,10 @@ public: void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); #endif - bool HasBackground() const; - bool HasFont() const; - bool HasFontTextColor() const; - bool HasFontFillColor() const; + bool HasBackground() const; + bool HasFont() const; + bool HasFontTextColor() const; + bool HasFontFillColor() const; void SetFontColorToBackground ( bool bDo = true ) { _bAutoFontColor = bDo; } bool AutoFontColor () { return _bAutoFontColor; } diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index f165f5a91b50..86b7773568ee 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -744,7 +744,7 @@ public: virtual void Drag(); virtual void EndDrag(); virtual void Click(); - void DoubleClick(); + void DoubleClick(); virtual void ExtraDown(); void Activate() SAL_OVERRIDE; diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index a3f3bf4629ed..505397087896 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -69,8 +69,8 @@ public: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDEvt ) SAL_OVERRIDE; - void StartScroll(); - void EndScroll( long nDeltaX, long nDeltaY ); + void StartScroll(); + void EndScroll( long nDeltaX, long nDeltaY ); using OutputDevice::SetMapMode; virtual void SetMapMode( const MapMode& rNewMapMode ) SAL_OVERRIDE; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 1f702147f894..b8414851256c 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -77,10 +77,10 @@ protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void HBarClick(); - void HBarDblClick(); - void HBarStartDrag(); - void HBarDrag(); - void HBarEndDrag(); + void HBarDblClick(); + void HBarStartDrag(); + void HBarDrag(); + void HBarEndDrag(); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index e41f52e8cbb2..675999d9cdb2 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -403,7 +403,7 @@ public: virtual void Select(); virtual void DoubleClick(); - void Split(); + void Split(); virtual void ActivatePage(); virtual bool DeactivatePage(); virtual bool StartRenaming(); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index f3558583a1d7..96c501d6ad8e 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -564,7 +564,7 @@ protected: void NotifyBeginScroll(); virtual void NotifyEndScroll(); // nLines == 0 => horizontal Scrolling - void NotifyScrolling( long nLines ); + void NotifyScrolling( long nLines ); virtual void NotifyScrolled(); void SetScrolledHdl( const Link& rLink ) { aScrolledHdl = rLink; } const Link& GetScrolledHdl() const { return aScrolledHdl; } @@ -577,7 +577,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - void CursorMoved( SvTreeListEntry* pNewCursor ); + void CursorMoved( SvTreeListEntry* pNewCursor ); virtual void PreparePaint( SvTreeListEntry* ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -595,7 +595,7 @@ protected: void AdjustEntryHeightAndRecalc( const vcl::Font& rFont ); public: - void SetExtendedWinBits( ExtendedWinBits _nBits ); + void SetExtendedWinBits( ExtendedWinBits _nBits ); void DisconnectFromModel(); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 8342b603eee6..fe6f8e5597f7 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -303,7 +303,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Select(); - void DoubleClick(); + void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void InsertItem( sal_uInt16 nItemId, const Image& rImage, diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 3851b8e349a3..bacf8a322360 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -50,8 +50,8 @@ public: 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 SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index f66294fbebde..b7daff733d68 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -42,8 +42,8 @@ public: void SetSize(const Size& rSize); void CopyBackground( const DialControlBmp& rSrc ); void DrawBackground( const Size& rSize, bool bEnabled ); - void DrawBackground(); - void DrawElements( const OUString& rText, sal_Int32 nAngle ); + void DrawBackground(); + void DrawElements( const OUString& rText, sal_Int32 nAngle ); protected: Rectangle maRect; @@ -58,7 +58,7 @@ private: void Init(); - vcl::Window& mrParent; + vcl::Window& mrParent; long mnCenterX; long mnCenterY; }; @@ -150,7 +150,7 @@ protected: std::unique_ptr< DialControl_Impl > mpImpl; virtual void HandleMouseEvent( const Point& rPos, bool bInitial ); - void HandleEscapeEvent(); + void HandleEscapeEvent(); void SetRotation( sal_Int32 nAngle, bool bBroadcast ); diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 05799ed8347b..a84e56019db2 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -43,11 +43,11 @@ public: SvxRotateModeItem( const SvxRotateModeItem& rItem ); virtual ~SvxRotateModeItem(); - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + OUString GetValueText( sal_uInt16 nVal ) 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 sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index fdb56896a0fe..bd20470df7ce 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem 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; - OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -229,7 +229,7 @@ private: protected: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - OUString GetValueText() const; + OUString GetValueText() const; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 3982175f2f22..e723a3768992 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -141,9 +141,9 @@ protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; virtual void ModelHasChanged() SAL_OVERRIDE; // Is called by the PaintView virtual void SetMarkHandles(); // aHdl - fill (List of handles) - void SetMarkRects(); // Rects at the PageViews - void CheckMarked(); // Scan MarkList after Del and Lock Layer ... - void AddDragModeHdl(SdrDragMode eMode); + void SetMarkRects(); // Rects at the PageViews + void CheckMarked(); // Scan MarkList after Del and Lock Layer ... + void AddDragModeHdl(SdrDragMode eMode); virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; // add custom handles (used by other apps, e.g. AnchorPos) diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 27854e05c051..dcb2b713d9b6 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -130,7 +130,7 @@ public: const SvStream * GetStream() const { return m_pStream; } virtual void SetSynchronMode(bool bTheSync = true) { m_bSync = bTheSync; } - bool IsSynchronMode() const { return m_bSync; } + bool IsSynchronMode() const { return m_bSync; } virtual ErrCode ReadAt(sal_uInt64 nPos, void * pBuffer, sal_Size nCount, sal_Size * pRead) const; @@ -247,7 +247,7 @@ private: protected: sal_uInt64 m_nBufFilePos; ///< File position of pBuf[0] - StreamMode eStreamMode; + StreamMode eStreamMode; bool bIsWritable; virtual sal_Size GetData( void* pData, sal_Size nSize ); @@ -385,7 +385,7 @@ public: bool WriteByteStringLine( const OUString& rStr, rtl_TextEncoding eDestCharSet ); /// Switch to no endian swapping and write 0xfeff - bool StartWritingUnicodeText(); + bool StartWritingUnicodeText(); /** If eReadBomCharSet==RTL_TEXTENCODING_DONTKNOW: read 16bit, if 0xfeff do nothing (UTF-16), if 0xfffe switch endian swapping (UTF-16), if 0xefbb @@ -396,7 +396,7 @@ public: If eReadBomCharSet!=RTL_TEXTENCODING_DONTKNOW: only read a BOM of that encoding and switch endian swapping if UTF-16 and 0xfffe. */ - bool StartReadingUnicodeText( rtl_TextEncoding eReadBomCharSet ); + bool StartReadingUnicodeText( rtl_TextEncoding eReadBomCharSet ); /** Read a line of Unicode. @@ -404,7 +404,7 @@ public: Maximum of codepoints (UCS-2 or UTF-16 pairs, not bytes) to read, if line is longer it will be truncated. */ - bool ReadUniStringLine(OUString& rStr, sal_Int32 nMaxCodepointsToRead); + bool ReadUniStringLine(OUString& rStr, sal_Int32 nMaxCodepointsToRead); /** Read a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, otherwise read a 16bit length prefixed sequence of bytes and convert from eSrcCharSet */ diff --git a/include/vcl/ImageListProvider.hxx b/include/vcl/ImageListProvider.hxx deleted file mode 100644 index 1aa35dc238cd..000000000000 --- a/include/vcl/ImageListProvider.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_VCL_IMAGELISTPROVIDER_HXX -#define INCLUDED_VCL_IMAGELISTPROVIDER_HXX - -#include <sal/types.h> - -namespace com { namespace sun { namespace star { namespace lang { class IllegalArgumentException; }}}} - -class ImageList; - - -namespace vcl -{ - enum ImageListType - { - IMAGELISTTYPE_UNKNOWN = 0, - HIGHCONTRAST_NO = 1, - HIGHCONTRAST_YES = 2 - }; - - /* abstract */ class IImageListProvider - { - public: - ; - - protected: - ~IImageListProvider() {} - }; -} /* vcl */ - -#endif // INCLUDED_VCL_IMAGELISTPROVIDER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index d0394bb94cf5..d7d9d296ca2d 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -68,9 +68,9 @@ public: Accelerator( const ResId& rResId ); virtual ~Accelerator(); - void Activate(); - void Deactivate(); - void Select(); + void Activate(); + void Deactivate(); + void Select(); void InsertItem( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode ); void InsertItem( const ResId& rResId ); diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 5601f1ffc93d..d537592de190 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -44,7 +44,7 @@ public: virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - void Click(); + void Click(); void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } const Size& GetPageSizePixel() const { return maPageSize; } diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 7e59b06e3ede..3ea832d9525d 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -168,16 +168,16 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void UserDraw( const UserDrawEvent& rUDEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); - void Toggle(); + void Toggle(); void SetSymbol( SymbolType eSymbol ); SymbolType GetSymbol() const { return meSymbol; } void SetSymbolAlign( SymbolAlign eAlign ); void SetDropDown( sal_uInt16 nStyle ); - sal_uInt16 GetDropDown() const { return mnDDStyle; } + sal_uInt16 GetDropDown() const { return mnDDStyle; } void SetState( TriState eState ); TriState GetState() const { return meState; } diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index ca9325a1494f..1ae7479a19db 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -173,7 +173,7 @@ public: void SetFloatStyle( WinBits nWinStyle ); WinBits GetFloatStyle() const { return mnFloatBits;} - void setPosSizePixel( long nX, long nY, + void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); void SetPosSizePixel( const Point& rNewPos, @@ -311,10 +311,10 @@ public: virtual bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); - void TitleButtonClick( sal_uInt16 nButton ); - void Pin(); - void Roll(); - void PopupModeEnd(); + void TitleButtonClick( sal_uInt16 nButton ); + void Pin(); + void Roll(); + void PopupModeEnd(); virtual void Resizing( Size& rSize ); virtual bool Close(); virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 9479fcbdeba8..d4169265a024 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -223,8 +223,8 @@ public: virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); virtual OUString GetText() const SAL_OVERRIDE; - void SetPlaceholderText( const OUString& rStr ); - OUString GetPlaceholderText() const; + void SetPlaceholderText( const OUString& rStr ); + OUString GetPlaceholderText() const; void SaveValue() { maSaveValue = GetText(); } const OUString& GetSavedValue() const { return maSaveValue; } @@ -244,7 +244,7 @@ public: virtual Size CalcMinimumSizeForText(const OUString &rString) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual Size CalcSize(sal_Int32 nChars) const; - sal_Int32 GetMaxVisChars() const; + sal_Int32 GetMaxVisChars() const; sal_Int32 GetCharPos( const Point& rWindowPos ) const; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 92b0967127f3..0119e9dc0d5f 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -185,15 +185,15 @@ public: virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void UserDraw( const UserDrawEvent& rUDEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetImage( const Image& rImage ); const Image& GetImage() const { return maImage; } - bool SetModeImage( const Image& rImage ); + bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const { return maImage;} - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; static Image loadThemeImage(const OString &rFileName); }; diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 8ff335346d8f..05ab48ad2c98 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -118,8 +118,8 @@ private: protected: - void Linker( OutputDevice* pOut, bool bLink ); - long Hook(); + void Linker( OutputDevice* pOut, bool bLink ); + long Hook(); public: GDIMetaFile(); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index a1986ba634f0..8bd9c77a2b27 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -213,11 +213,11 @@ protected: public: virtual ~Menu(); - void Activate(); - void Deactivate(); + void Activate(); + void Deactivate(); virtual void Highlight(); virtual void Select(); - void RequestHelp( const HelpEvent& rHEvt ); + void RequestHelp( const HelpEvent& rHEvt ); void InsertItem( sal_uInt16 nItemId, const OUString& rStr, MenuItemBits nItemBits = MenuItemBits::NONE, @@ -243,9 +243,9 @@ public: void CreateAutoMnemonics(); void SetMenuFlags( sal_uInt16 nFlags ) { nMenuFlags = nFlags; } - sal_uInt16 GetMenuFlags() const { return nMenuFlags; } + sal_uInt16 GetMenuFlags() const { return nMenuFlags; } - sal_uInt16 GetItemCount() const; + sal_uInt16 GetItemCount() const; sal_uInt16 GetItemId(sal_uInt16 nPos) const; sal_uInt16 GetItemId(const OString &rIdent) const; sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; @@ -280,17 +280,17 @@ public: { EnableItem(GetItemId(rIdent), bEnable); } - bool IsItemEnabled( sal_uInt16 nItemId ) const; + bool IsItemEnabled( sal_uInt16 nItemId ) const; void ShowItem( sal_uInt16 nItemId, bool bVisible = true ); void HideItem( sal_uInt16 nItemId ) { ShowItem( nItemId, false ); } - bool IsItemPosVisible( sal_uInt16 nItemPos ) const; - bool IsMenuVisible() const; + bool IsItemPosVisible( sal_uInt16 nItemPos ) const; + bool IsMenuVisible() const; virtual bool IsMenuBar() const = 0; void RemoveDisabledEntries( bool bCheckPopups = true, bool bRemoveEmptyPopups = false ); - bool HasValidEntries( bool bCheckPopups = true ); + bool HasValidEntries( bool bCheckPopups = true ); void SetItemText( sal_uInt16 nItemId, const OUString& rStr ); OUString GetItemText( sal_uInt16 nItemId ) const; @@ -359,15 +359,15 @@ public: void SetAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible ); // gets the activation key of the specified item - KeyEvent GetActivationKey( sal_uInt16 nItemId ) const; + KeyEvent GetActivationKey( sal_uInt16 nItemId ) const; - vcl::Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr ); OUString GetAccessibleName( sal_uInt16 nItemId ) const; // returns whether the item a position nItemPos is highlighted or not. - bool IsHighlighted( sal_uInt16 nItemPos ) const; + bool IsHighlighted( sal_uInt16 nItemPos ) const; void HighlightItem( sal_uInt16 nItemPos ); void DeHighlight() { HighlightItem( 0xFFFF ); } // MENUITEMPOS_INVALID diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index c8adafd90137..6a2aaa2ea85e 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -498,8 +498,8 @@ public: sal_uInt16 nFlags = 0 ); // Call before and after a paint operation to reduce flushing - void BeginPaint(); - void EndPaint(); + void BeginPaint(); + void EndPaint(); protected: @@ -1569,9 +1569,9 @@ public: void EnableMapMode( bool bEnable = true ); bool IsMapModeEnabled() const { return mbMap; } - void SetMapMode(); + void SetMapMode(); virtual void SetMapMode( const MapMode& rNewMapMode ); - void SetRelativeMapMode( const MapMode& rNewMapMode ); + void SetRelativeMapMode( const MapMode& rNewMapMode ); const MapMode& GetMapMode() const { return maMapMode; } // #i75163# diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index bfa9469f5a48..d6cfc2d1010b 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -304,7 +304,7 @@ public: static const QueueInfo* GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate ); static OUString GetDefaultPrinterName(); - void Error(); + void Error(); const OUString& GetName() const { return maPrinterName; } const OUString& GetDriverName() const { return maDriver; } diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 0208635477ce..da949dfdf8d2 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -105,7 +105,7 @@ public: virtual void LoseFocus() SAL_OVERRIDE; using Window::Scroll; - void Scroll(); + void Scroll(); virtual void EndScroll(); long DoScroll( long nNewPos ); diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index 859852e458c1..3eb720a89fc4 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -83,8 +83,8 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void Slide(); - void EndSlide(); + void Slide(); + void EndSlide(); void EnableDrag( bool bEnable = true ) { mbFullDrag = bEnable; } diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 243107afd804..4fb25f31829f 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -59,8 +59,8 @@ public: explicit SpinButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SpinButton(); - void Up(); - void Down(); + void Up(); + void Down(); virtual void Resize() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 81ffe4ffe14f..c24556e5d72f 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -65,9 +65,9 @@ public: explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL ); virtual ~Splitter(); - void StartSplit(); - void EndSplit(); - void Split(); + void StartSplit(); + void EndSplit(); + void Split(); virtual void Splitting( Point& rSplitPos ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -87,12 +87,12 @@ public: void SetDragRectPixel( const Rectangle& rDragRect, vcl::Window* pRefWin = NULL ); const Rectangle& GetDragRectPixel() const { return maDragRect; } - vcl::Window* GetDragWindow() const { return mpRefWin; } + vcl::Window* GetDragWindow() const { return mpRefWin; } - void SetSplitPosPixel( long nPos ); + void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } - bool IsHorizontal() const { return mbHorzSplit; } + bool IsHorizontal() const { return mbHorzSplit; } void SetHorizontal(bool bNew); // set the stepsize of the splitter for cursor movement diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 124f26c9302e..a9ad080e8715 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -125,8 +125,8 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void Click(); - void DoubleClick(); + void Click(); + void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 602bad2b4aea..8da2381cd7e7 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -110,7 +110,7 @@ class VCL_DLLPUBLIC Idle : public Timer void Start() { Timer::Start(); } void Stop() { Timer::Stop(); } - void DoIdle(); + void DoIdle(); virtual void Timeout() SAL_OVERRIDE { DoIdle(); } }; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 9b9d2c21f6e9..d4baf3e16800 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -36,11 +36,6 @@ struct ImplToolBoxPrivateData; class ImplTrackRect; class PopupMenu; -namespace vcl -{ - class IImageListProvider; -} - #define TOOLBOX_CUSTOMIZE_RESIZE ((sal_uInt16)0xFFFE) class VCL_DLLPUBLIC ToolBoxCustomizeEvent @@ -249,7 +244,6 @@ private: SAL_DLLPRIVATE ToolBox (const ToolBox &); SAL_DLLPRIVATE ToolBox& operator= (const ToolBox &); - SAL_DLLPRIVATE void ImplUpdateImageList(); // called if StateChanged public: SAL_DLLPRIVATE void ImplFloatControl( bool bStart, FloatingWindow* pWindow = NULL ); SAL_DLLPRIVATE void ImplDisableFlatButtons(); @@ -290,13 +284,13 @@ public: virtual ~ToolBox(); virtual void Click(); - void DoubleClick(); + void DoubleClick(); virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; - void Highlight(); + void Highlight(); virtual void Select(); - void Customize( const ToolBoxCustomizeEvent& rCEvt ); - void UserDraw( const UserDrawEvent& rUDEvt ); + void Customize( const ToolBoxCustomizeEvent& rCEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -368,19 +362,19 @@ public: bool IsHorizontal() const { return mbHorz; } void SetLineCount( sal_uInt16 nNewLines ); - sal_uInt16 GetLineCount() const { return mnLines; } - sal_uInt16 GetCurLine() const { return mnCurLine; } + sal_uInt16 GetLineCount() const { return mnLines; } + sal_uInt16 GetCurLine() const { return mnCurLine; } void ShowLine( bool bNext ); // Used to enable/disable scrolling one page at a time for toolbar void SetPageScroll( bool b ); - sal_uInt16 GetItemCount() const; + sal_uInt16 GetItemCount() const; ToolBoxItemType GetItemType( sal_uInt16 nPos ) const; - sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; - sal_uInt16 GetItemPos( const Point& rPos ) const; - sal_uInt16 GetItemId( sal_uInt16 nPos ) const; - sal_uInt16 GetItemId( const Point& rPos ) const; + sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; + sal_uInt16 GetItemPos( const Point& rPos ) const; + sal_uInt16 GetItemId( sal_uInt16 nPos ) const; + sal_uInt16 GetItemId( const Point& rPos ) const; /// Map the command name (like .uno:Save) back to item id. sal_uInt16 GetItemId( const OUString& rCommand ) const; Rectangle GetItemRect( sal_uInt16 nItemId ) const; @@ -393,11 +387,11 @@ public: Point GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const; Rectangle GetScrollRect() const; - sal_uInt16 GetCurItemId() const { return mnCurItemId; } - sal_uInt16 GetDownItemId() const { return mnDownItemId; } - sal_uInt16 GetClicks() const { return mnMouseClicks; } - sal_uInt16 GetModifier() const { return mnMouseModifier; } - sal_uInt16 GetKeyModifier() const { return mnKeyModifier; } + sal_uInt16 GetCurItemId() const { return mnCurItemId; } + sal_uInt16 GetDownItemId() const { return mnDownItemId; } + sal_uInt16 GetClicks() const { return mnMouseClicks; } + sal_uInt16 GetModifier() const { return mnMouseModifier; } + sal_uInt16 GetKeyModifier() const { return mnKeyModifier; } void SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits ); ToolBoxItemBits GetItemBits( sal_uInt16 nItemId ) const; @@ -413,8 +407,8 @@ public: void SetItemText( sal_uInt16 nItemId, const OUString& rText ); const OUString& GetItemText( sal_uInt16 nItemId ) const; void SetItemWindow( sal_uInt16 nItemId, vcl::Window* pNewWindow ); - vcl::Window* GetItemWindow( sal_uInt16 nItemId ) const; - sal_uInt16 GetHighlightItemId() const { return mnHighItemId; } + vcl::Window* GetItemWindow( sal_uInt16 nItemId ) const; + sal_uInt16 GetHighlightItemId() const { return mnHighItemId; } void StartSelection(); void EndSelection(); @@ -478,7 +472,7 @@ public: void SetDockingRects( const Rectangle& rOutRect, const Rectangle& rInRect ); void SetFloatingLines( sal_uInt16 nFloatLines ); - sal_uInt16 GetFloatingLines() const; + sal_uInt16 GetFloatingLines() const; void SetStyle( WinBits nNewStyle ); WinBits GetStyle() const { return mnWinStyle; } @@ -493,7 +487,7 @@ public: bool IsMenuStringsEnabled() const { return mbMenuStrings; } void SetOutStyle( sal_uInt16 nNewStyle ); - sal_uInt16 GetOutStyle() const { return mnOutStyle; } + sal_uInt16 GetOutStyle() const { return mnOutStyle; } void EnableCustomize( bool bEnable = true ); bool IsCustomize() { return mbCustomize; } @@ -538,7 +532,7 @@ public: // to allow for customization of the menu the coresponding handler is called // when the menu button was clicked and before the menu is executed void SetMenuType( sal_uInt16 aType = TOOLBOX_MENUTYPE_CUSTOMIZE ); - sal_uInt16 GetMenuType() const; + sal_uInt16 GetMenuType() const; bool IsMenuEnabled() const; PopupMenu* GetMenu() const; void UpdateCustomMenu(); diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 786764bdf7bf..d0ecd51c0b06 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -89,7 +89,7 @@ public: virtual void ReplaceSelected( const OUString& rStr ) SAL_OVERRIDE; virtual void DeleteSelected() SAL_OVERRIDE; virtual OUString GetSelected() const SAL_OVERRIDE; - OUString GetSelected( LineEnd aSeparator ) const; + OUString GetSelected( LineEnd aSeparator ) const; virtual void Cut() SAL_OVERRIDE; virtual void Copy() SAL_OVERRIDE; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index d4827439bfd5..72fc3cc72bc2 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -704,7 +704,7 @@ public: virtual void Erase() SAL_OVERRIDE; virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); } - void PostPaint(); + void PostPaint(); virtual void Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Move(); virtual void Resize(); @@ -797,7 +797,7 @@ public: using ::OutputDevice::SetSettings; virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE; - void SetSettings( const AllSettings& rSettings, bool bChild ); + void SetSettings( const AllSettings& rSettings, bool bChild ); void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); void NotifyAllChildren( DataChangedEvent& rDCEvt ); @@ -959,10 +959,10 @@ public: // window extents of the client window, coordinates to be used in SetPosPixel Rectangle GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; - bool IsScrollable() const; + bool IsScrollable() const; virtual void Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags = 0 ); - void Scroll( long nHorzScroll, long nVertScroll, + void Scroll( long nHorzScroll, long nVertScroll, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); virtual void Invalidate( sal_uInt16 nFlags = 0 ); virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); |