From db378d64a9ca8675066fda31f3bd77dc37c52398 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 27 Oct 2017 09:03:20 +0200 Subject: loplugin:constmethod in vcl and stoc Change-Id: I7c02eecc16ca7cf89d9f7021116b0226885dbf06 Reviewed-on: https://gerrit.libreoffice.org/44044 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/vcl/builder.hxx | 4 +- include/vcl/dialog.hxx | 2 +- include/vcl/dockwin.hxx | 4 +- include/vcl/gfxlink.hxx | 4 +- include/vcl/menu.hxx | 2 +- include/vcl/toolbox.hxx | 2 +- include/vcl/window.hxx | 18 +++--- io/source/TextOutputStream/TextOutputStream.cxx | 4 +- io/source/stm/streamhelper.hxx | 2 +- stoc/source/corereflection/criface.cxx | 8 +-- stoc/source/implementationregistration/implreg.cxx | 4 +- stoc/source/servicemanager/servicemanager.cxx | 6 +- stoc/source/uriproc/UriReference.cxx | 2 +- stoc/source/uriproc/UriReference.hxx | 4 +- .../UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 4 +- vcl/inc/ControlCacheKey.hxx | 4 +- vcl/inc/impfontmetricdata.hxx | 70 +++++++++++----------- vcl/inc/salgdi.hxx | 2 +- vcl/inc/salobj.hxx | 4 +- vcl/source/window/builder.cxx | 4 +- vcl/source/window/clipping.cxx | 16 ++--- vcl/source/window/dialog.cxx | 2 +- vcl/source/window/dlgctrl.cxx | 2 +- vcl/source/window/settings.cxx | 2 +- 24 files changed, 88 insertions(+), 88 deletions(-) diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 6d1fe7eed0a2..e696c1dc04d8 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -341,7 +341,7 @@ private: static std::vector handleStyle(xmlreader::XmlReader &reader, int &nPriority); static OString getStyleClass(xmlreader::XmlReader &reader); void applyPackingProperty(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader); - void collectProperty(xmlreader::XmlReader &reader, stringmap &rVec); + void collectProperty(xmlreader::XmlReader &reader, stringmap &rVec) const; static void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap); static void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rMap); static void collectAccelerator(xmlreader::XmlReader &reader, accelmap &rMap); @@ -361,7 +361,7 @@ private: void handleRow(xmlreader::XmlReader &reader, const OString &rID); void handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &reader); void handleMenu(xmlreader::XmlReader &reader, const OString &rID); - std::vector handleItems(xmlreader::XmlReader &reader); + std::vector handleItems(xmlreader::XmlReader &reader) const; void handleSizeGroup(xmlreader::XmlReader &reader); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 4ae5e040103a..d7d7ce292cf6 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -85,7 +85,7 @@ public: virtual void LogicInvalidate(const tools::Rectangle* pRectangle) override; void InvalidateFloatingWindow(const Point& rPos); void CloseFloatingWindow(); - Size PaintActiveFloatingWindow(VirtualDevice& rDevice); + Size PaintActiveFloatingWindow(VirtualDevice& rDevice) const; /// Necessary to register dialog renderable instance to emit LOK callbacks void registerDialogRenderable(vcl::IDialogRenderable* pDialogRenderable, const OUString& aDialogId); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 00e8f58d87fa..63301f56c369 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -110,14 +110,14 @@ private: DECL_LINK( PopupModeEnd, FloatingWindow*, void ); void ImplEnableStartDocking() { mbStartDockingEnabled = true; } - bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } + bool ImplStartDockingEnabled() const { return mbStartDockingEnabled; } void ImplPreparePopupMode( FloatWinPopupFlags nFlags ); public: ImplDockingWindowWrapper( const vcl::Window *pWindow ); ~ImplDockingWindowWrapper(); - vcl::Window* GetWindow() { return mpDockingWindow; } + vcl::Window* GetWindow() { return mpDockingWindow; } bool ImplStartDocking( const Point& rPos ); // those methods actually call the corresponding handlers diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index d8eef9e3ce3a..2d84fd293e4f 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -95,11 +95,11 @@ public: const Size& GetPrefSize() const { return maPrefSize;} void SetPrefSize( const Size& rPrefSize ); - bool IsPrefSizeValid() { return mbPrefSizeValid;} + bool IsPrefSizeValid() const { return mbPrefSizeValid;} const MapMode& GetPrefMapMode() const { return maPrefMapMode;} void SetPrefMapMode( const MapMode& rPrefMapMode ); - bool IsPrefMapModeValid() { return mbPrefMapModeValid;} + bool IsPrefMapModeValid() const { return mbPrefMapModeValid;} bool IsNative() const; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 669271494f4c..d8d61f72bdbd 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -334,7 +334,7 @@ public: aSelectHdl = rLink; } - sal_uInt16 GetTitleHeight() + sal_uInt16 GetTitleHeight() const { return nTitleHeight; } diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 3ee08e7fea24..d5dc93a63770 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -452,7 +452,7 @@ public: sal_uInt16 GetOutStyle() const { return mnOutStyle; } void EnableCustomize( bool bEnable = true ); - bool IsCustomize() { return mbCustomize; } + bool IsCustomize() const { return mbCustomize; } using DockingWindow::SetHelpText; using DockingWindow::GetHelpText; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index c4d3540df1d9..bc51c1f8de3d 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -664,21 +664,21 @@ private: SAL_DLLPRIVATE void ImplIntersectWindowClipRegion( vcl::Region& rRegion ); SAL_DLLPRIVATE void ImplIntersectWindowRegion( vcl::Region& rRegion ); SAL_DLLPRIVATE void ImplExcludeWindowRegion( vcl::Region& rRegion ); - SAL_DLLPRIVATE void ImplExcludeOverlapWindows( vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplExcludeOverlapWindows( vcl::Region& rRegion ) const; SAL_DLLPRIVATE void ImplExcludeOverlapWindows2( vcl::Region& rRegion ); SAL_DLLPRIVATE void ImplClipBoundaries( vcl::Region& rRegion, bool bThis, bool bOverlaps ); - SAL_DLLPRIVATE bool ImplClipChildren( vcl::Region& rRegion ); - SAL_DLLPRIVATE void ImplClipAllChildren( vcl::Region& rRegion ); - SAL_DLLPRIVATE void ImplClipSiblings( vcl::Region& rRegion ); + SAL_DLLPRIVATE bool ImplClipChildren( vcl::Region& rRegion ) const; + SAL_DLLPRIVATE void ImplClipAllChildren( vcl::Region& rRegion ) const; + SAL_DLLPRIVATE void ImplClipSiblings( vcl::Region& rRegion ) const; SAL_DLLPRIVATE void ImplInitWinClipRegion(); SAL_DLLPRIVATE void ImplInitWinChildClipRegion(); SAL_DLLPRIVATE vcl::Region* ImplGetWinChildClipRegion(); - SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows( const vcl::Region& rInterRegion, vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows( const vcl::Region& rInterRegion, vcl::Region& rRegion ) const; SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows2( const vcl::Region& rInterRegion, vcl::Region& rRegion ); - SAL_DLLPRIVATE void ImplCalcOverlapRegionOverlaps( const vcl::Region& rInterRegion, vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplCalcOverlapRegionOverlaps( const vcl::Region& rInterRegion, vcl::Region& rRegion ) const; SAL_DLLPRIVATE void ImplCalcOverlapRegion( const tools::Rectangle& rSourceRect, vcl::Region& rRegion, bool bChildren, bool bSiblings ); @@ -699,7 +699,7 @@ private: SAL_DLLPRIVATE bool ImplUpdatePos(); SAL_DLLPRIVATE void ImplUpdateSysObjPos(); - SAL_DLLPRIVATE void ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl = true ); + SAL_DLLPRIVATE void ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl = true ) const; SAL_DLLPRIVATE void ImplToBottomChild(); @@ -712,7 +712,7 @@ private: SAL_DLLPRIVATE void ImplHideAllOverlaps(); SAL_DLLPRIVATE bool ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ); - SAL_DLLPRIVATE bool ImplHasDlgCtrl(); + SAL_DLLPRIVATE bool ImplHasDlgCtrl() const; SAL_DLLPRIVATE void ImplDlgCtrlNextWindow(); SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( vcl::Window* pWindow, bool bGetFocus ); SAL_DLLPRIVATE vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pWindow ); @@ -1192,7 +1192,7 @@ public: ScrollBar* pVScrl ); void SaveBackground( const Point& rPos, const Size& rSize, - VirtualDevice& rSaveDevice ); + VirtualDevice& rSaveDevice ) const; virtual const SystemEnvData* GetSystemData() const; css::uno::Any GetSystemDataAny() const; diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index c3705f336f5b..d33cc9d3b6c7 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -62,7 +62,7 @@ class OTextOutputStream : public WeakImplHelper< XTextOutputStream2, XServiceInf Sequence implConvert( const OUString& rSource ); /// @throws IOException - void checkOutputStream(); + void checkOutputStream() const; public: OTextOutputStream(); @@ -202,7 +202,7 @@ void OTextOutputStream::closeOutput( ) } -void OTextOutputStream::checkOutputStream() +void OTextOutputStream::checkOutputStream() const { if (! mxStream.is() ) throw IOException("output stream is not initialized, you have to use setOutputStream first"); diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx index 12eb3fdb76ab..c03673d6f4df 100644 --- a/io/source/stm/streamhelper.hxx +++ b/io/source/stm/streamhelper.hxx @@ -51,7 +51,7 @@ public: private: /// @throws css::io::BufferSizeExceededException void resizeBuffer(sal_Int32 nMinSize); - void checkInvariants() { + void checkInvariants() const { assert( m_nBufferLen >= 0 ); assert( m_nOccupiedBuffer >= 0 ); assert( m_nOccupiedBuffer <= m_nBufferLen ); diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 9ead12622f54..50290d0b5c6b 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -64,7 +64,7 @@ class IdlAttributeFieldImpl , public XIdlField2 { public: - typelib_InterfaceAttributeTypeDescription * getAttributeTypeDescr() + typelib_InterfaceAttributeTypeDescription * getAttributeTypeDescr() const { return reinterpret_cast(getTypeDescr()); } IdlAttributeFieldImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName, @@ -94,7 +94,7 @@ public: private: void checkException( - uno_Any * exception, Reference< XInterface > const & context); + uno_Any * exception, Reference< XInterface > const & context) const; }; // XInterface @@ -301,7 +301,7 @@ void IdlAttributeFieldImpl::set( const Any & rObj, const Any & rValue ) } void IdlAttributeFieldImpl::checkException( - uno_Any * exception, Reference< XInterface > const & context) + uno_Any * exception, Reference< XInterface > const & context) const { if (exception != nullptr) { Any e; @@ -332,7 +332,7 @@ class IdlInterfaceMethodImpl Sequence< ParamInfo > * _pParamInfos; public: - typelib_InterfaceMethodTypeDescription * getMethodTypeDescr() + typelib_InterfaceMethodTypeDescription * getMethodTypeDescr() const { return reinterpret_cast(getTypeDescr()); } IdlInterfaceMethodImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName, diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 4dae09f124f5..d9beabfe48b7 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -1243,7 +1243,7 @@ private: // helper methods static void doRevoke( const Reference < XSimpleRegistry >& xDest, const OUString& locationUrl ); // throw( InvalidRegistryException, RuntimeException ) - Reference< XSimpleRegistry > getRegistryFromServiceManager(); + Reference< XSimpleRegistry > getRegistryFromServiceManager() const; static Reference< XSimpleRegistry > createTemporarySimpleRegistry( const Reference< XMultiComponentFactory > &rSMgr, @@ -1281,7 +1281,7 @@ Sequence< OUString > ImplementationRegistration::getSupportedServiceNames() return seqNames; } -Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceManager() +Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceManager() const { Reference < XPropertySet > xPropSet( m_xSMgr, UNO_QUERY ); Reference < XSimpleRegistry > xRegistry; diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index e35ac7427996..a44d788d3ecb 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -464,7 +464,7 @@ class OServiceManagerWrapper : public OServiceManagerMutex, public t_OServiceMan { Reference< XComponentContext > m_xContext; Reference< XMultiComponentFactory > m_root; - Reference< XMultiComponentFactory > const & getRoot() + Reference< XMultiComponentFactory > const & getRoot() const { if (! m_root.is()) { @@ -1221,7 +1221,7 @@ private: Reference getRootKey(); Reference loadWithImplementationName( const OUString & rImplName, Reference< XComponentContext > const & xContext ); - Sequence getFromServiceName(const OUString& serviceName); + Sequence getFromServiceName(const OUString& serviceName) const; Reference loadWithServiceName( const OUString & rImplName, Reference< XComponentContext > const & xContext ); void fillAllNamesFromRegistry( HashSet_OWString & ); @@ -1333,7 +1333,7 @@ Reference ORegistryServiceManager::loadWithImplementationName( * Return all implementation out of the registry. */ Sequence ORegistryServiceManager::getFromServiceName( - const OUString& serviceName ) + const OUString& serviceName ) const { OUStringBuffer buf; buf.append( "/SERVICES/" ); diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx index 2baa1f3b9b20..18ada1d3cf0b 100644 --- a/stoc/source/uriproc/UriReference.cxx +++ b/stoc/source/uriproc/UriReference.cxx @@ -67,7 +67,7 @@ OUString UriReference::getUriReference() return buf.makeStringAndClear(); } -bool UriReference::isAbsolute() { +bool UriReference::isAbsolute() const { return !m_scheme.isEmpty(); } diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx index 05fdc37f6e09..b117b5710955 100644 --- a/stoc/source/uriproc/UriReference.hxx +++ b/stoc/source/uriproc/UriReference.hxx @@ -41,10 +41,10 @@ public: OUString getUriReference(); /// @throws css::uno::RuntimeException - bool isAbsolute(); + bool isAbsolute() const; /// @throws css::uno::RuntimeException - const OUString& getScheme() { return m_scheme;} + const OUString& getScheme() const { return m_scheme;} /// @throws css::uno::RuntimeException OUString getSchemeSpecificPart(); diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index 6df3cd3e33ca..f7f13c6eb046 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -265,7 +265,7 @@ public: private: virtual ~UrlReference() override {} - sal_Int32 findParameter(OUString const & key); + sal_Int32 findParameter(OUString const & key) const; stoc::uriproc::UriReference m_base; }; @@ -335,7 +335,7 @@ void UrlReference::setParameter(OUString const & key, OUString const & value) m_base.m_path = newPath.makeStringAndClear(); } -sal_Int32 UrlReference::findParameter(OUString const & key) { +sal_Int32 UrlReference::findParameter(OUString const & key) const { sal_Int32 i = 0; parsePart(m_base.m_path, true, &i); // skip name for (;;) { diff --git a/vcl/inc/ControlCacheKey.hxx b/vcl/inc/ControlCacheKey.hxx index 20baa6e3759b..810d6e19f0f7 100644 --- a/vcl/inc/ControlCacheKey.hxx +++ b/vcl/inc/ControlCacheKey.hxx @@ -47,7 +47,7 @@ public: && maSize.Height() == aOther.maSize.Height(); } - bool canCacheControl() + bool canCacheControl() const { switch(mnType) { @@ -76,4 +76,4 @@ public: } }; -#endif // INCLUDED_VCL_INC_CONTROLCACHEKEY_HXX \ No newline at end of file +#endif // INCLUDED_VCL_INC_CONTROLCACHEKEY_HXX diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx index c3865ce06018..14ad323b9b77 100644 --- a/vcl/inc/impfontmetricdata.hxx +++ b/vcl/inc/impfontmetricdata.hxx @@ -38,55 +38,55 @@ public: explicit ImplFontMetricData( const FontSelectPattern& ); // font instance attributes from the font request - long GetWidth() { return mnWidth; } - short GetOrientation() { return mnOrientation; } + long GetWidth() const { return mnWidth; } + short GetOrientation() const { return mnOrientation; } void SetWidth(long nWidth) { mnWidth=nWidth; } void SetOrientation(short nOrientation) { mnOrientation=nOrientation; } // font metrics measured for the font instance - long GetAscent() { return mnAscent; } - long GetDescent() { return mnDescent; } - long GetInternalLeading() { return mnIntLeading; } - long GetExternalLeading() { return mnExtLeading; } - int GetSlant() { return mnSlant; } - long GetMinKashida() { return mnMinKashida; } + long GetAscent() const { return mnAscent; } + long GetDescent() const { return mnDescent; } + long GetInternalLeading() const { return mnIntLeading; } + long GetExternalLeading() const { return mnExtLeading; } + int GetSlant() const { return mnSlant; } + long GetMinKashida() const { return mnMinKashida; } void SetSlant(int nSlant) { mnSlant=nSlant; } void SetMinKashida( long nMinKashida ) { mnMinKashida=nMinKashida; } // font attributes queried from the font instance - bool IsFullstopCentered() { return mbFullstopCentered; } - long GetBulletOffset() { return mnBulletOffset; } + bool IsFullstopCentered() const { return mbFullstopCentered; } + long GetBulletOffset() const { return mnBulletOffset; } void SetFullstopCenteredFlag(bool bFullstopCentered) { mbFullstopCentered = bFullstopCentered; } // font metrics that are usually derived from the measurements - long GetUnderlineSize() { return mnUnderlineSize; } - long GetUnderlineOffset() { return mnUnderlineOffset; } - long GetBoldUnderlineSize() { return mnBUnderlineSize; } - long GetBoldUnderlineOffset() { return mnBUnderlineOffset; } - long GetDoubleUnderlineSize() { return mnDUnderlineSize; } - long GetDoubleUnderlineOffset1() { return mnDUnderlineOffset1; } - long GetDoubleUnderlineOffset2() { return mnDUnderlineOffset2; } - long GetWavelineUnderlineSize() { return mnWUnderlineSize; } - long GetWavelineUnderlineOffset() { return mnWUnderlineOffset; } - long GetAboveUnderlineSize() { return mnAboveUnderlineSize; } - long GetAboveUnderlineOffset() { return mnAboveUnderlineOffset; } - long GetAboveBoldUnderlineSize() { return mnAboveBUnderlineSize; } - long GetAboveBoldUnderlineOffset() { return mnAboveBUnderlineOffset; } - long GetAboveDoubleUnderlineSize() { return mnAboveDUnderlineSize; } - long GetAboveDoubleUnderlineOffset1() { return mnAboveDUnderlineOffset1; } - long GetAboveDoubleUnderlineOffset2() { return mnAboveDUnderlineOffset2; } - long GetAboveWavelineUnderlineSize() { return mnAboveWUnderlineSize; } - long GetAboveWavelineUnderlineOffset() { return mnAboveWUnderlineOffset; } - long GetStrikeoutSize() { return mnStrikeoutSize; } - long GetStrikeoutOffset() { return mnStrikeoutOffset; } - long GetBoldStrikeoutSize() { return mnBStrikeoutSize; } - long GetBoldStrikeoutOffset() { return mnBStrikeoutOffset; } - long GetDoubleStrikeoutSize() { return mnDStrikeoutSize; } - long GetDoubleStrikeoutOffset1() { return mnDStrikeoutOffset1; } - long GetDoubleStrikeoutOffset2() { return mnDStrikeoutOffset2; } + long GetUnderlineSize() const { return mnUnderlineSize; } + long GetUnderlineOffset() const { return mnUnderlineOffset; } + long GetBoldUnderlineSize() const { return mnBUnderlineSize; } + long GetBoldUnderlineOffset() const { return mnBUnderlineOffset; } + long GetDoubleUnderlineSize() const { return mnDUnderlineSize; } + long GetDoubleUnderlineOffset1() const { return mnDUnderlineOffset1; } + long GetDoubleUnderlineOffset2() const { return mnDUnderlineOffset2; } + long GetWavelineUnderlineSize() const { return mnWUnderlineSize; } + long GetWavelineUnderlineOffset() const { return mnWUnderlineOffset; } + long GetAboveUnderlineSize() const { return mnAboveUnderlineSize; } + long GetAboveUnderlineOffset() const { return mnAboveUnderlineOffset; } + long GetAboveBoldUnderlineSize() const { return mnAboveBUnderlineSize; } + long GetAboveBoldUnderlineOffset() const { return mnAboveBUnderlineOffset; } + long GetAboveDoubleUnderlineSize() const { return mnAboveDUnderlineSize; } + long GetAboveDoubleUnderlineOffset1() const { return mnAboveDUnderlineOffset1; } + long GetAboveDoubleUnderlineOffset2() const { return mnAboveDUnderlineOffset2; } + long GetAboveWavelineUnderlineSize() const { return mnAboveWUnderlineSize; } + long GetAboveWavelineUnderlineOffset() const { return mnAboveWUnderlineOffset; } + long GetStrikeoutSize() const { return mnStrikeoutSize; } + long GetStrikeoutOffset() const { return mnStrikeoutOffset; } + long GetBoldStrikeoutSize() const { return mnBStrikeoutSize; } + long GetBoldStrikeoutOffset() const { return mnBStrikeoutOffset; } + long GetDoubleStrikeoutSize() const { return mnDStrikeoutSize; } + long GetDoubleStrikeoutOffset1() const { return mnDStrikeoutOffset1; } + long GetDoubleStrikeoutOffset2() const { return mnDStrikeoutOffset2; } void ImplInitTextLineSize( const OutputDevice* pDev ); void ImplInitAboveTextLineSize(); diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 99249e7ba2f3..61f8bb3539cc 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -198,7 +198,7 @@ public: virtual bool supportsOperation( OutDevSupportType ) const = 0; // mirroring specifics - SalLayoutFlags GetLayout() { return m_nLayout; } + SalLayoutFlags GetLayout() const { return m_nLayout; } void SetLayout( SalLayoutFlags aLayout ) { m_nLayout = aLayout;} void mirror( long& nX, const OutputDevice *pOutDev ) const; diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 07f1843fadcc..e4c8b918c09b 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -59,12 +59,12 @@ public: void SetMouseTransparent( bool bMouseTransparent ) { m_bMouseTransparent = bMouseTransparent; } - bool IsMouseTransparent() + bool IsMouseTransparent() const { return m_bMouseTransparent; } void EnableEraseBackground( bool bEnable ) { m_bEraseBackground = bEnable; } - bool IsEraseBackgroundEnabled() + bool IsEraseBackgroundEnabled() const { return m_bEraseBackground; } }; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 9d1fedeebdf5..da1e806d3a4d 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -2364,7 +2364,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, vcl::Window *pWin } } -std::vector VclBuilder::handleItems(xmlreader::XmlReader &reader) +std::vector VclBuilder::handleItems(xmlreader::XmlReader &reader) const { int nLevel = 1; @@ -3120,7 +3120,7 @@ OString VclBuilder::getStyleClass(xmlreader::XmlReader &reader) return aRet; } -void VclBuilder::collectProperty(xmlreader::XmlReader &reader, stringmap &rMap) +void VclBuilder::collectProperty(xmlreader::XmlReader &reader, stringmap &rMap) const { xmlreader::Span name; int nsId; diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx index 9d0f619e833d..922ff7104e30 100644 --- a/vcl/source/window/clipping.cxx +++ b/vcl/source/window/clipping.cxx @@ -190,7 +190,7 @@ void Window::ImplClipBoundaries( vcl::Region& rRegion, bool bThis, bool bOverlap ImplGetParent()->ImplIntersectWindowClipRegion( rRegion ); } -bool Window::ImplClipChildren( vcl::Region& rRegion ) +bool Window::ImplClipChildren( vcl::Region& rRegion ) const { bool bOtherClip = false; vcl::Window* pWindow = mpWindowImpl->mpFirstChild; @@ -213,7 +213,7 @@ bool Window::ImplClipChildren( vcl::Region& rRegion ) return bOtherClip; } -void Window::ImplClipAllChildren( vcl::Region& rRegion ) +void Window::ImplClipAllChildren( vcl::Region& rRegion ) const { vcl::Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) @@ -224,7 +224,7 @@ void Window::ImplClipAllChildren( vcl::Region& rRegion ) } } -void Window::ImplClipSiblings( vcl::Region& rRegion ) +void Window::ImplClipSiblings( vcl::Region& rRegion ) const { vcl::Window* pWindow = ImplGetParent()->mpWindowImpl->mpFirstChild; while ( pWindow ) @@ -528,7 +528,7 @@ void Window::ImplExcludeWindowRegion( vcl::Region& rRegion ) } } -void Window::ImplExcludeOverlapWindows( vcl::Region& rRegion ) +void Window::ImplExcludeOverlapWindows( vcl::Region& rRegion ) const { vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) @@ -551,7 +551,7 @@ void Window::ImplExcludeOverlapWindows2( vcl::Region& rRegion ) ImplExcludeOverlapWindows( rRegion ); } -void Window::ImplIntersectAndUnionOverlapWindows( const vcl::Region& rInterRegion, vcl::Region& rRegion ) +void Window::ImplIntersectAndUnionOverlapWindows( const vcl::Region& rInterRegion, vcl::Region& rRegion ) const { vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) @@ -580,10 +580,10 @@ void Window::ImplIntersectAndUnionOverlapWindows2( const vcl::Region& rInterRegi ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion ); } -void Window::ImplCalcOverlapRegionOverlaps( const vcl::Region& rInterRegion, vcl::Region& rRegion ) +void Window::ImplCalcOverlapRegionOverlaps( const vcl::Region& rInterRegion, vcl::Region& rRegion ) const { // Clip Overlap Siblings - vcl::Window* pStartOverlapWindow; + vcl::Window const * pStartOverlapWindow; if ( !ImplIsOverlapWindow() ) pStartOverlapWindow = mpWindowImpl->mpOverlapWindow; else @@ -674,7 +674,7 @@ void Window::ImplCalcOverlapRegion( const tools::Rectangle& rSourceRect, vcl::Re } void Window::SaveBackground( const Point& rPos, const Size& rSize, - VirtualDevice& rSaveDevice ) + VirtualDevice& rSaveDevice ) const { if ( mpWindowImpl->mpPaintRegion ) { diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index eb196997c4b6..43e3ff7362ff 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -894,7 +894,7 @@ void Dialog::paintDialog(VirtualDevice& rDevice) PaintToDevice(&rDevice, Point(0, 0), Size()); } -Size Dialog::PaintActiveFloatingWindow(VirtualDevice& rDevice) +Size Dialog::PaintActiveFloatingWindow(VirtualDevice& rDevice) const { Size aRet; ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 9e7e21c0b42b..386abfaeac4f 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -944,7 +944,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) } // checks if this window has dialog control -bool Window::ImplHasDlgCtrl() +bool Window::ImplHasDlgCtrl() const { vcl::Window* pDlgCtrlParent; diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx index 4234d5327d20..f9ca0d2cb87b 100644 --- a/vcl/source/window/settings.cxx +++ b/vcl/source/window/settings.cxx @@ -145,7 +145,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) } } -void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) +void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) const { StyleSettings aTmpSt( rSettings.GetStyleSettings() ); aTmpSt.SetHighContrastMode( false ); -- cgit