diff options
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/BitmapReadAccess.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/BitmapTools.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/font.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/jsdialog/executor.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/vcllayout.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/include/vcl/BitmapReadAccess.hxx b/include/vcl/BitmapReadAccess.hxx index 3d6a47b33535..32a9dd023952 100644 --- a/include/vcl/BitmapReadAccess.hxx +++ b/include/vcl/BitmapReadAccess.hxx @@ -85,7 +85,7 @@ public: BitmapColor GetPixel(const Point& point) const { return GetPixel(point.Y(), point.X()); } - BitmapColor GetColorFromData(sal_uInt8* pData, tools::Long nX) const + BitmapColor GetColorFromData(const sal_uInt8* pData, tools::Long nX) const { if (HasPalette()) return GetPaletteColor(GetIndexFromData(pData, nX)); diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx index 5e5a48ad6fae..c3bc9cf3bf96 100644 --- a/include/vcl/BitmapTools.hxx +++ b/include/vcl/BitmapTools.hxx @@ -68,7 +68,7 @@ VCL_DLLPUBLIC BitmapEx CanvasTransformBitmap( const BitmapEx& rBitmap, ::basegfx::B2DRectangle const & rDestRect, ::basegfx::B2DHomMatrix const & rLocalTransform ); -VCL_DLLPUBLIC void DrawAlphaBitmapAndAlphaGradient(BitmapEx & rBitmapEx, bool bFixedTransparence, float fTransparence, AlphaMask & rNewMask); +VCL_DLLPUBLIC void DrawAlphaBitmapAndAlphaGradient(BitmapEx & rBitmapEx, bool bFixedTransparence, float fTransparence, const AlphaMask & rNewMask); VCL_DLLPUBLIC void DrawAndClipBitmap(const Point& rPos, const Size& rSize, const BitmapEx& rBitmap, BitmapEx & aBmpEx, basegfx::B2DPolyPolygon const & rClipPath); @@ -78,7 +78,7 @@ VCL_DLLPUBLIC css::uno::Sequence< sal_Int8 > GetMaskDIB(BitmapEx const & aBmpEx) * @param data will be filled with alpha data, if xBitmap is alpha/transparent image * @param bHasAlpha will be set to true if resulting surface has alpha **/ -VCL_DLLPUBLIC void CanvasCairoExtractBitmapData( BitmapEx const & rBmpEx, Bitmap & rBitmap, unsigned char*& data, bool& bHasAlpha, tools::Long& rnWidth, tools::Long& rnHeight ); +VCL_DLLPUBLIC void CanvasCairoExtractBitmapData( BitmapEx const & rBmpEx, Bitmap const & rBitmap, unsigned char*& data, bool& bHasAlpha, tools::Long& rnWidth, tools::Long& rnHeight ); VCL_DLLPUBLIC css::uno::Sequence< sal_Int8 > CanvasExtractBitmapData(BitmapEx const & rBitmapEx, const css::geometry::IntegerRectangle2D& rect); diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index ae29172989e7..16f946fc61cd 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -56,17 +56,17 @@ public: virtual ~Font(); const OUString& GetFamilyName() const; - FontFamily GetFamilyType(); + FontFamily GetFamilyTypeMaybeAskConfig(); FontFamily GetFamilyType() const; const OUString& GetStyleName() const; - FontWeight GetWeight(); + FontWeight GetWeightMaybeAskConfig(); FontWeight GetWeight() const; - FontItalic GetItalic(); + FontItalic GetItalicMaybeAskConfig(); FontItalic GetItalic() const; - FontPitch GetPitch(); + FontPitch GetPitchMaybeAskConfig(); FontPitch GetPitch() const; - FontWidth GetWidthType(); + FontWidth GetWidthTypeMaybeAskConfig(); FontWidth GetWidthType() const; TextAlign GetAlignment() const; rtl_TextEncoding GetCharSet() const; diff --git a/include/vcl/jsdialog/executor.hxx b/include/vcl/jsdialog/executor.hxx index 83515ca65ef1..957d7c864bb4 100644 --- a/include/vcl/jsdialog/executor.hxx +++ b/include/vcl/jsdialog/executor.hxx @@ -112,27 +112,27 @@ public: static void trigger_closed(weld::Popover& rPopover) { rPopover.popdown(); } - static void trigger_key_press(weld::Widget& rWidget, const KeyEvent& rEvent) + static void trigger_key_press(const weld::Widget& rWidget, const KeyEvent& rEvent) { rWidget.m_aKeyPressHdl.Call(rEvent); } - static void trigger_key_release(weld::Widget& rWidget, const KeyEvent& rEvent) + static void trigger_key_release(const weld::Widget& rWidget, const KeyEvent& rEvent) { rWidget.m_aKeyReleaseHdl.Call(rEvent); } - static void command(weld::DrawingArea& rArea, const CommandEvent& rCmd) + static void command(const weld::DrawingArea& rArea, const CommandEvent& rCmd) { rArea.m_aCommandHdl.Call(rCmd); } - static void enter_page(weld::Notebook& rNotebook, const OUString& rPage) + static void enter_page(const weld::Notebook& rNotebook, const OUString& rPage) { rNotebook.m_aEnterPageHdl.Call(rPage); } - static void leave_page(weld::Notebook& rNotebook, const OUString& rPage) + static void leave_page(const weld::Notebook& rNotebook, const OUString& rPage) { rNotebook.m_aLeavePageHdl.Call(rPage); } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 67208d9ad55e..1fcd408b950d 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1230,7 +1230,7 @@ public: void createEmphasisMarks( FontEmphasisMark nFontEmphasisMark, tools::Long nEmphasisHeight, - SalLayout& rSalLayout, + const SalLayout& rSalLayout, const std::function<void(const basegfx::B2DPoint&, const basegfx::B2DPolyPolygon&, bool, const tools::Rectangle&, const tools::Rectangle&)>& rCallback) const; diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx index 0bb529402202..23daba62693a 100644 --- a/include/vcl/vcllayout.hxx +++ b/include/vcl/vcllayout.hxx @@ -116,7 +116,7 @@ public: virtual bool GetOutline(basegfx::B2DPolyPolygonVector&) const; bool GetBoundRect(basegfx::B2DRectangle&) const; - static tools::Rectangle BoundRect2Rectangle(basegfx::B2DRectangle&); + static tools::Rectangle BoundRect2Rectangle(const basegfx::B2DRectangle&); virtual SalLayoutGlyphs GetGlyphs() const; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 791baf025abd..c8f4491caa6a 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -666,8 +666,8 @@ private: SAL_DLLPRIVATE bool ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ); 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 ); + SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( const vcl::Window* pWindow, bool bGetFocus ); + SAL_DLLPRIVATE vcl::Window* ImplFindDlgCtrlWindow( const vcl::Window* pWindow ); SAL_DLLPRIVATE static void ImplNewInputContext(); |