diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-30 15:28:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-30 19:00:57 +0200 |
| commit | 7183b3ba237dc7718501acb512d5ae1c5d0d5f6b (patch) | |
| tree | ea8b5535f6dbed45f54fa27c8dd492a327644626 /include | |
| parent | b1f085d66c1d354485edec527fda6abf539af325 (diff) | |
loplugin:constmethod handle more cases
remove some of the naming limitations, and handle pointer parameters
better.
I only let the plugin run up till vcl/
Change-Id: Ice916e0157031ab531c47f10778f406b07966251
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122892
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
27 files changed, 70 insertions, 70 deletions
diff --git a/include/basegfx/matrix/b2dhommatrix.hxx b/include/basegfx/matrix/b2dhommatrix.hxx index 60b32fb09f00..d7fa5b4421ef 100644 --- a/include/basegfx/matrix/b2dhommatrix.hxx +++ b/include/basegfx/matrix/b2dhommatrix.hxx @@ -61,17 +61,17 @@ namespace basegfx } // Convenience accessor for value at 0,0 position in the matrix - double a() { return get(0,0); } + double a() const { return get(0,0); } // Convenience accessor for value at 1,0 position in the matrix - double b() { return get(1,0); } + double b() const { return get(1,0); } // Convenience accessor for value at 0,1 position in the matrix - double c() { return get(0,1); } + double c() const { return get(0,1); } // Convenience accessor for value at 1,1 position in the matrix - double d() { return get(1,1); } + double d() const { return get(1,1); } // Convenience accessor for value at 0,2 position in the matrix - double e() { return get(0,2); } + double e() const { return get(0,2); } // Convenience accessor for value at 1,2 position in the matrix - double f() { return get(1,2); } + double f() const { return get(1,2); } /** constructor to allow setting all needed values for a 3x2 matrix at once. The parameter f_0x1 e.g. is the same as using set(0, 1, f) diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index 21f7b6e2f940..92bbca72b09f 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -42,7 +42,7 @@ class SVL_DLLPUBLIC INetURLHistory final : public SfxBroadcaster SAL_DLLPRIVATE static void NormalizeUrl_Impl (INetURLObject &rUrl); void PutUrl_Impl (const INetURLObject &rUrl); - bool QueryUrl_Impl (const INetURLObject &rUrl); + bool QueryUrl_Impl (const INetURLObject &rUrl) const; /** Not implemented. */ @@ -66,7 +66,7 @@ public: /** QueryUrl. */ - bool QueryUrl (const INetURLObject &rUrl) + bool QueryUrl (const INetURLObject &rUrl) const { if (QueryProtocol (rUrl.GetProtocol())) return QueryUrl_Impl (rUrl); @@ -74,7 +74,7 @@ public: return false; } - bool QueryUrl (const OUString &rUrl) + bool QueryUrl (const OUString &rUrl) const { INetProtocol eProto = INetURLObject::CompareProtocolScheme (rUrl); diff --git a/include/tools/XmlWalker.hxx b/include/tools/XmlWalker.hxx index 65beb4531003..ba9d18e856a6 100644 --- a/include/tools/XmlWalker.hxx +++ b/include/tools/XmlWalker.hxx @@ -49,7 +49,7 @@ public: void parent(); void next(); bool isValid() const; - OString attribute(const OString& sName); + OString attribute(const OString& sName) const; }; } // end tools namespace diff --git a/include/vcl/BinaryDataContainer.hxx b/include/vcl/BinaryDataContainer.hxx index d6c6848c48f6..b7421e9874c0 100644 --- a/include/vcl/BinaryDataContainer.hxx +++ b/include/vcl/BinaryDataContainer.hxx @@ -58,9 +58,9 @@ public: size_t calculateHash() const; - auto cbegin() { return mpData->cbegin(); } + auto cbegin() const { return mpData->cbegin(); } - auto cend() { return mpData->cend(); } + auto cend() const { return mpData->cend(); } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/BitmapInfoAccess.hxx b/include/vcl/BitmapInfoAccess.hxx index a6bca5627aa2..c0ef7fb5be1e 100644 --- a/include/vcl/BitmapInfoAccess.hxx +++ b/include/vcl/BitmapInfoAccess.hxx @@ -77,7 +77,7 @@ public: return mpBuffer ? mpBuffer->mnBitCount : 0; } - BitmapColor GetBestMatchingColor(const BitmapColor& rBitmapColor) + BitmapColor GetBestMatchingColor(const BitmapColor& rBitmapColor) const { if (HasPalette()) return BitmapColor(static_cast<sal_uInt8>(GetBestPaletteIndex(rBitmapColor))); diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx index 980f686f6ba9..7ebaa274e047 100644 --- a/include/vcl/GraphicObject.hxx +++ b/include/vcl/GraphicObject.hxx @@ -144,7 +144,7 @@ private: int nNumTilesY, const Size& rTileSize, const GraphicAttr* pAttr - ); + ) const; void VCL_DLLPRIVATE ImplTransformBitmap( BitmapEx& rBmpEx, @@ -221,7 +221,7 @@ public: bool Draw(OutputDevice& rOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr = nullptr); + const GraphicAttr* pAttr = nullptr) const; /** Draw the graphic repeatedly into the given output rectangle diff --git a/include/vcl/RawBitmap.hxx b/include/vcl/RawBitmap.hxx index 19fe94cd2c59..12c924dbb8ba 100644 --- a/include/vcl/RawBitmap.hxx +++ b/include/vcl/RawBitmap.hxx @@ -69,8 +69,8 @@ public: } // so we don't accidentally leave any code in that uses palette color indexes void SetPixel(tools::Long nY, tools::Long nX, BitmapColor nColor) = delete; - tools::Long Height() { return maSize.Height(); } - tools::Long Width() { return maSize.Width(); } + tools::Long Height() const { return maSize.Height(); } + tools::Long Width() const { return maSize.Width(); } sal_uInt8 GetBitCount() const { return mnBitCount; } }; diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 8c276e40e32a..504438bdab40 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -374,7 +374,7 @@ private: void handleSizeGroup(xmlreader::XmlReader &reader); - stringmap handleAtkObject(xmlreader::XmlReader &reader); + stringmap handleAtkObject(xmlreader::XmlReader &reader) const; static void applyAtkProperties(vcl::Window *pWindow, const stringmap& rProperties); diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 790589e68225..ad4caebc7b86 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -101,7 +101,7 @@ public: bool IsNative() const; - bool LoadNative( Graphic& rGraphic ); + bool LoadNative( Graphic& rGraphic ) const; bool ExportNative( SvStream& rOStream ) const; diff --git a/include/vcl/imapcirc.hxx b/include/vcl/imapcirc.hxx index e7dac3b32b3c..4fc5808afe63 100644 --- a/include/vcl/imapcirc.hxx +++ b/include/vcl/imapcirc.hxx @@ -57,7 +57,7 @@ public: void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; - bool IsEqual( const IMapCircleObject& rEqObj ); + bool IsEqual( const IMapCircleObject& rEqObj ) const; // import/export void WriteCERN( SvStream& rOStm ) const; diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx index 14a7a647e884..54498a65cc34 100644 --- a/include/vcl/imapobj.hxx +++ b/include/vcl/imapobj.hxx @@ -117,7 +117,7 @@ public: bool IsActive() const { return bActive; } void SetActive( bool bSetActive ) { bActive = bSetActive; } - bool IsEqual( const IMapObject& rEqObj ); + bool IsEqual( const IMapObject& rEqObj ) const; // IMap-Events const SvxMacroTableDtor& GetMacroTable() const { return aEventList;} diff --git a/include/vcl/imaprect.hxx b/include/vcl/imaprect.hxx index 5870779f4912..6637bb771935 100644 --- a/include/vcl/imaprect.hxx +++ b/include/vcl/imaprect.hxx @@ -55,7 +55,7 @@ public: void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; - bool IsEqual( const IMapRectangleObject& rEqObj ); + bool IsEqual( const IMapRectangleObject& rEqObj ) const; // import/export void WriteCERN( SvStream& rOStm ) const; diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 286a64b48bda..eb74ae2f248e 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -967,7 +967,7 @@ public: sal_uLong nLayoutWidth = 0, const tools::Long* pDXArray = nullptr, const SalLayoutGlyphs* pGlyphs = nullptr ) const; - tools::Rectangle ImplGetTextBoundRect( const SalLayout& ); + tools::Rectangle ImplGetTextBoundRect( const SalLayout& ) const; bool GetTextOutline( tools::PolyPolygon&, const OUString& rStr ) const; @@ -1132,7 +1132,7 @@ public: ImplGetEmphasisMarkStyle( const vcl::Font& rFont ); bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, - int nLen, std::vector< tools::Rectangle >& rVector ); + int nLen, std::vector< tools::Rectangle >& rVector ) const; sal_Int32 HasGlyphs( const vcl::Font& rFont, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1 ) const; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index b6ea7000436c..f67145335357 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -246,7 +246,7 @@ public: const Size& GetPaperSizePixel() const { return maPaperSize; } Size GetPaperSize() const { return PixelToLogic( maPaperSize ); } - Size GetPaperSize( int nPaper ); + Size GetPaperSize( int nPaper ) const; const Point& GetPageOffsetPixel() const { return maPageOffset; } Point GetPageOffset() const { return PixelToLogic( maPageOffset ); } diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index a85df6665f2c..77cbbb657b5a 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -70,8 +70,8 @@ private: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true ); - SAL_DLLPRIVATE tools::Long ImplCalcThumbPos( tools::Long nPixPos ); - SAL_DLLPRIVATE tools::Long ImplCalcThumbPosPix( tools::Long nPos ); + SAL_DLLPRIVATE tools::Long ImplCalcThumbPos( tools::Long nPixPos ) const; + SAL_DLLPRIVATE tools::Long ImplCalcThumbPosPix( tools::Long nPos ) const; SAL_DLLPRIVATE void ImplCalc( bool bUpdate = true ); SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext); using Window::ImplScroll; diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 834fbe4bd7ba..91a6ed64374f 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -91,7 +91,7 @@ private: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplFormat(); - SAL_DLLPRIVATE bool ImplIsItemUpdate(); + SAL_DLLPRIVATE bool ImplIsItemUpdate() const; SAL_DLLPRIVATE void ImplDrawText(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, bool bOffScreen, diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 7ad2a7e85b91..0a532afb2891 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -185,7 +185,7 @@ class VCL_DLLPUBLIC TextEngine : public SfxBroadcaster static void ImpInitLayoutMode( OutputDevice* pOutDev ); TxtAlign ImpGetAlign() const; - tools::Long CalcTextHeight(); + tools::Long CalcTextHeight() const; tools::Long CalcParaHeight( sal_uInt32 nParagraph ) const; tools::Long CalcTextWidth( sal_uInt32 nPara ); tools::Long CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nPortionLen); diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 116d4d59e1e5..0983fa8eb660 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -93,7 +93,7 @@ class VCL_DLLPUBLIC TextView final : public vcl::unohelper::DragAndDropClient TextSelection const & ImpMoveCursor( const KeyEvent& rKeyEvent ); TextPaM ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ); - bool IsInSelection( const TextPaM& rPaM ); + bool IsInSelection( const TextPaM& rPaM ) const; void ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartPos, tools::Rectangle const* pPaintArea, TextSelection const* pSelection); void ImpPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); @@ -105,7 +105,7 @@ class VCL_DLLPUBLIC TextView final : public vcl::unohelper::DragAndDropClient void ImpShowDDCursor(); bool ImplTruncateNewText( OUString& rNewText ) const; - bool ImplCheckTextLen( const OUString& rNewText ); + bool ImplCheckTextLen( const OUString& rNewText ) const; // DragAndDropClient virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) override; @@ -141,8 +141,8 @@ public: void SetSelection( const TextSelection& rNewSel, bool bGotoCursor ); bool HasSelection() const; - OUString GetSelected(); - OUString GetSelected( LineEnd aSeparator ); + OUString GetSelected() const; + OUString GetSelected( LineEnd aSeparator ) const; void DeleteSelected(); void InsertText( const OUString& rNew ); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 68a57930b2e0..cdbc032ea509 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -211,7 +211,7 @@ private: SAL_DLLPRIVATE bool ImplIsInPopupMode() const; SAL_DLLPRIVATE const OUString& ImplGetHelpText( ToolBoxItemId nItemId ) const; SAL_DLLPRIVATE Size ImplGetOptimalFloatingSize(); - SAL_DLLPRIVATE bool ImplHasExternalMenubutton(); + SAL_DLLPRIVATE bool ImplHasExternalMenubutton() const; SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext& rRenderContext, ImplToolItem const * pItem ); DECL_DLLPRIVATE_LINK( ImplUpdateHdl, Timer*, void ); @@ -239,7 +239,7 @@ public: SAL_DLLPRIVATE void ImplDrawGrip(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDrawGradientBackground(vcl::RenderContext& rRenderContext); - SAL_DLLPRIVATE bool ImplDrawNativeBackground(vcl::RenderContext& rRenderContext); + SAL_DLLPRIVATE bool ImplDrawNativeBackground(vcl::RenderContext& rRenderContext) const; SAL_DLLPRIVATE void ImplDrawTransparentBackground(const vcl::Region &rRegion); SAL_DLLPRIVATE static void ImplDrawConstantBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion, bool bIsInPopupMode); SAL_DLLPRIVATE void ImplDrawBackground(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect); diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index b2799f573fee..e68818ab62de 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -49,7 +49,7 @@ private: Button (const Button &) = delete; Button & operator= (const Button &) = delete; public: - SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( WinBits nWinStyle, SystemTextColorFlags nSystemTextColorFlags ); + SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( WinBits nWinStyle, SystemTextColorFlags nSystemTextColorFlags ) const; SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, Size& rSize, sal_Int32 nImageSep, DrawTextFlags nTextStyle, tools::Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false ); @@ -384,7 +384,7 @@ private: bool mbUsesExplicitGroup; Link<RadioButton&,void> maToggleHdl; SAL_DLLPRIVATE void ImplInitRadioButtonData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ) const; SAL_DLLPRIVATE void ImplInitSettings( bool bBackground ); SAL_DLLPRIVATE void ImplDrawRadioButtonState(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, SystemTextColorFlags nSystemTextColorFlags, diff --git a/include/vcl/toolkit/edit.hxx b/include/vcl/toolkit/edit.hxx index f59d12f9d9fd..6cba936040eb 100644 --- a/include/vcl/toolkit/edit.hxx +++ b/include/vcl/toolkit/edit.hxx @@ -143,7 +143,7 @@ protected: virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: // public because needed in button.cxx - SAL_DLLPRIVATE bool ImplUseNativeBorder(vcl::RenderContext const & rRenderContext, WinBits nStyle); + SAL_DLLPRIVATE bool ImplUseNativeBorder(vcl::RenderContext const & rRenderContext, WinBits nStyle) const; Edit( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); virtual ~Edit() override; diff --git a/include/vcl/toolkit/fixedhyper.hxx b/include/vcl/toolkit/fixedhyper.hxx index 084a508a427b..ebfbd558644f 100644 --- a/include/vcl/toolkit/fixedhyper.hxx +++ b/include/vcl/toolkit/fixedhyper.hxx @@ -42,7 +42,7 @@ private: void Initialize(); /** is position X position hitting text */ - SAL_DLLPRIVATE bool ImplIsOverText(Point rPosition); + SAL_DLLPRIVATE bool ImplIsOverText(Point rPosition) const; DECL_LINK(HandleClick, FixedHyperlink&, void); diff --git a/include/vcl/toolkit/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx index 4f2909d9477e..b4b8fd2715a5 100644 --- a/include/vcl/toolkit/svtabbx.hxx +++ b/include/vcl/toolkit/svtabbx.hxx @@ -123,7 +123,7 @@ public: // Accessible ------------------------------------------------------------- - bool IsCellCheckBox( sal_Int32 _nRow, sal_uInt16 _nColumn, TriState& _rState ); + bool IsCellCheckBox( sal_Int32 _nRow, sal_uInt16 _nColumn, TriState& _rState ) const; /** @return The count of the rows. */ virtual sal_Int32 GetRowCount() const override; diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx index ae3ad91f09b6..478cf2f05145 100644 --- a/include/vcl/toolkit/treelistbox.hxx +++ b/include/vcl/toolkit/treelistbox.hxx @@ -128,7 +128,7 @@ public: virtual SvLBoxItemType GetType() const = 0; virtual int CalcWidth(const SvTreeListBox* pView) const; int GetWidth(const SvTreeListBox* pView, const SvTreeListEntry* pEntry) const; - int GetWidth(const SvTreeListBox* pView, const SvViewDataEntry* pData, sal_uInt16 nItemPos); + int GetWidth(const SvTreeListBox* pView, const SvViewDataEntry* pData, sal_uInt16 nItemPos) const; int GetHeight(const SvTreeListBox* pView, const SvTreeListEntry* pEntry) const; static int GetHeight(const SvViewDataEntry* pData, sal_uInt16 nItemPos); void Enable(bool bEnabled) { mbDisabled = !bEnabled; } @@ -275,7 +275,7 @@ private: VCL_DLLPRIVATE void CheckBoxInserted(SvTreeListEntry* pEntry); VCL_DLLPRIVATE void DrawCustomEntry(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, const SvTreeListEntry& rEntry); - VCL_DLLPRIVATE Size MeasureCustomEntry(vcl::RenderContext& rRenderContext, const SvTreeListEntry& rEntry); + VCL_DLLPRIVATE Size MeasureCustomEntry(vcl::RenderContext& rRenderContext, const SvTreeListEntry& rEntry) const; /** Handles the given key event. @@ -626,7 +626,7 @@ public: virtual tools::Rectangle GetFocusRect(const SvTreeListEntry*, tools::Long nLine ); // Respects indentation - sal_IntPtr GetTabPos(const SvTreeListEntry*, const SvLBoxTab*); + sal_IntPtr GetTabPos(const SvTreeListEntry*, const SvLBoxTab*) const; void InvalidateEntry( SvTreeListEntry* ); SvLBoxItem* GetItem( SvTreeListEntry*, tools::Long nX, SvLBoxTab** ppTab); SvLBoxItem* GetItem( SvTreeListEntry*, tools::Long nX ); diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx index 45fa55176e3a..6e546cc38a2a 100644 --- a/include/vcl/transfer.hxx +++ b/include/vcl/transfer.hxx @@ -321,11 +321,11 @@ public: css::uno::Any GetAny( SotClipboardFormatId nFormat, const OUString& rDestDoc ) const; css::uno::Any GetAny( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) const; - bool GetString( SotClipboardFormatId nFormat, OUString& rStr ); - bool GetString( const css::datatransfer::DataFlavor& rFlavor, OUString& rStr ); + bool GetString( SotClipboardFormatId nFormat, OUString& rStr ) const; + bool GetString( const css::datatransfer::DataFlavor& rFlavor, OUString& rStr ) const; - bool GetBitmapEx( SotClipboardFormatId nFormat, BitmapEx& rBmp ); - bool GetBitmapEx( const css::datatransfer::DataFlavor& rFlavor, BitmapEx& rBmp ); + bool GetBitmapEx( SotClipboardFormatId nFormat, BitmapEx& rBmp ) const; + bool GetBitmapEx( const css::datatransfer::DataFlavor& rFlavor, BitmapEx& rBmp ) const; /** Return as GDI metafile. @@ -335,35 +335,35 @@ public: metafile, with over 3 million (!) actions; which is just too large for any reasonable handling - and you need to set a limit. */ - bool GetGDIMetaFile( SotClipboardFormatId nFormat, GDIMetaFile& rMtf, size_t nMaxActions = 0 ); - bool GetGDIMetaFile( const css::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf ); + bool GetGDIMetaFile( SotClipboardFormatId nFormat, GDIMetaFile& rMtf, size_t nMaxActions = 0 ) const; + bool GetGDIMetaFile( const css::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf ) const; - bool GetGraphic( SotClipboardFormatId nFormat, Graphic& rGraphic ); - bool GetGraphic( const css::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ); + bool GetGraphic( SotClipboardFormatId nFormat, Graphic& rGraphic ) const; + bool GetGraphic( const css::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ) const; - bool GetImageMap( SotClipboardFormatId nFormat, ImageMap& rIMap ); - bool GetImageMap( const css::datatransfer::DataFlavor& rFlavor, ImageMap& rImap ); + bool GetImageMap( SotClipboardFormatId nFormat, ImageMap& rIMap ) const; + bool GetImageMap( const css::datatransfer::DataFlavor& rFlavor, ImageMap& rImap ) const; bool GetTransferableObjectDescriptor( SotClipboardFormatId nFormat, TransferableObjectDescriptor& rDesc ); bool GetTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc ); - bool GetINetBookmark( SotClipboardFormatId nFormat, INetBookmark& rBmk ); - bool GetINetBookmark( const css::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ); + bool GetINetBookmark( SotClipboardFormatId nFormat, INetBookmark& rBmk ) const; + bool GetINetBookmark( const css::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ) const; - bool GetINetImage( SotClipboardFormatId nFormat, INetImage& rINtImg ); - bool GetINetImage( const css::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ); + bool GetINetImage( SotClipboardFormatId nFormat, INetImage& rINtImg ) const; + bool GetINetImage( const css::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ) const; - bool GetFileList( SotClipboardFormatId nFormat, FileList& rFileList ); - bool GetFileList( FileList& rFileList ); + bool GetFileList( SotClipboardFormatId nFormat, FileList& rFileList ) const; + bool GetFileList( FileList& rFileList ) const; - css::uno::Sequence<sal_Int8> GetSequence( SotClipboardFormatId nFormat, const OUString& rDestDoc ); - css::uno::Sequence<sal_Int8> GetSequence( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); + css::uno::Sequence<sal_Int8> GetSequence( SotClipboardFormatId nFormat, const OUString& rDestDoc ) const; + css::uno::Sequence<sal_Int8> GetSequence( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) const; - bool GetSotStorageStream( SotClipboardFormatId nFormat, tools::SvRef<SotTempStream>& rStreamRef ); - bool GetSotStorageStream( const css::datatransfer::DataFlavor& rFlavor, tools::SvRef<SotTempStream>& rStreamRef ); + bool GetSotStorageStream( SotClipboardFormatId nFormat, tools::SvRef<SotTempStream>& rStreamRef ) const; + bool GetSotStorageStream( const css::datatransfer::DataFlavor& rFlavor, tools::SvRef<SotTempStream>& rStreamRef ) const; - css::uno::Reference<css::io::XInputStream> GetInputStream( SotClipboardFormatId nFormat, const OUString& rDestDoc ); - css::uno::Reference<css::io::XInputStream> GetInputStream( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); + css::uno::Reference<css::io::XInputStream> GetInputStream( SotClipboardFormatId nFormat, const OUString& rDestDoc ) const; + css::uno::Reference<css::io::XInputStream> GetInputStream( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) const; static TransferableDataHelper CreateFromClipboard(const css::uno::Reference<css::datatransfer::clipboard::XClipboard>& rClipboard); static TransferableDataHelper CreateFromSystemClipboard( vcl::Window * pWindow ); diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index 479cfbe8dccd..186fbe1ad611 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -131,8 +131,8 @@ public: inline void Expand( sal_Int32 nDiff ); inline void Collaps( sal_Int32 nDiff ); - inline bool IsIn( sal_Int32 nIndex ); - inline bool IsInside( sal_Int32 nIndex ); + inline bool IsIn( sal_Int32 nIndex ) const; + inline bool IsInside( sal_Int32 nIndex ) const; inline bool IsEmpty() const; }; @@ -169,12 +169,12 @@ inline void TextCharAttrib::Collaps( sal_Int32 nDiff ) mnEnd = mnEnd - nDiff; } -inline bool TextCharAttrib::IsIn( sal_Int32 nIndex ) +inline bool TextCharAttrib::IsIn( sal_Int32 nIndex ) const { return ( ( mnStart <= nIndex ) && ( mnEnd >= nIndex ) ); } -inline bool TextCharAttrib::IsInside( sal_Int32 nIndex ) +inline bool TextCharAttrib::IsInside( sal_Int32 nIndex ) const { return ( ( mnStart < nIndex ) && ( mnEnd > nIndex ) ); } diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx index 765c972df21a..d9e06ddd8055 100644 --- a/include/vcl/xtextedt.hxx +++ b/include/vcl/xtextedt.hxx @@ -31,7 +31,7 @@ public: virtual ~ExtTextEngine() override; TextSelection MatchGroup( const TextPaM& rCursor ) const; - bool Search( TextSelection& rSel, const i18nutil::SearchOptions& rSearchOptions, bool bForward = true ); + bool Search( TextSelection& rSel, const i18nutil::SearchOptions& rSearchOptions, bool bForward = true ) const; }; #endif // INCLUDED_VCL_XTEXTEDT_HXX |