diff options
Diffstat (limited to 'include')
31 files changed, 57 insertions, 47 deletions
diff --git a/include/basegfx/matrix/b2dhommatrix.hxx b/include/basegfx/matrix/b2dhommatrix.hxx index 531b1dbfd9c0..46b9de840bbb 100644 --- a/include/basegfx/matrix/b2dhommatrix.hxx +++ b/include/basegfx/matrix/b2dhommatrix.hxx @@ -132,7 +132,7 @@ namespace basegfx private: void computeAdjoint(double (&dst)[6]) const; - double computeDeterminant(double (&dst)[6]) const; + double computeDeterminant(const double (&dst)[6]) const; void doMulMatrix(const B2DHomMatrix& rMat); }; diff --git a/include/basegfx/point/b2dpoint.hxx b/include/basegfx/point/b2dpoint.hxx index 14687d5e87d5..fd92cabf5294 100644 --- a/include/basegfx/point/b2dpoint.hxx +++ b/include/basegfx/point/b2dpoint.hxx @@ -105,7 +105,7 @@ namespace basegfx /** assignment operator to allow assigning the results of B2DTuple calculations */ - BASEGFX_DLLPUBLIC B2DPoint& operator=(Tuple2D<double>& rPoint) + BASEGFX_DLLPUBLIC B2DPoint& operator=(const Tuple2D<double>& rPoint) { mnX = rPoint.getX(); mnY = rPoint.getY(); diff --git a/include/comphelper/propshlp.hxx b/include/comphelper/propshlp.hxx index a55909e7cd92..cf0503d7f7e0 100644 --- a/include/comphelper/propshlp.hxx +++ b/include/comphelper/propshlp.hxx @@ -181,7 +181,7 @@ protected: @param bVetoable true means fire to VetoableChangeListener, false means fire to XPropertyChangedListener and XMultiPropertyChangedListener. */ - void fire(std::unique_lock<std::mutex>& rGuard, sal_Int32* pnHandles, + void fire(std::unique_lock<std::mutex>& rGuard, const sal_Int32* pnHandles, const css::uno::Any* pNewValues, const css::uno::Any* pOldValues, sal_Int32 nCount, bool bVetoable); diff --git a/include/desktop/dllapi.h b/include/desktop/dllapi.h index 5cf948ce08a4..46b5c3af41be 100644 --- a/include/desktop/dllapi.h +++ b/include/desktop/dllapi.h @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_DESKTOP_SOURCE_INC_DESKTOPDLLAPI_H -#define INCLUDED_DESKTOP_SOURCE_INC_DESKTOPDLLAPI_H +#pragma once #include <sal/config.h> #include <sal/types.h> @@ -25,6 +24,4 @@ #define CRASHREPORT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif - /* vim: set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/BufferedDecompositionFlusher.hxx b/include/drawinglayer/primitive2d/BufferedDecompositionFlusher.hxx index 26fbea502414..e1afcb75d31d 100644 --- a/include/drawinglayer/primitive2d/BufferedDecompositionFlusher.hxx +++ b/include/drawinglayer/primitive2d/BufferedDecompositionFlusher.hxx @@ -34,6 +34,9 @@ public: BufferedDecompositionFlusher(); + /// Only called by FlusherDeinit + void onTeardown(); + private: virtual void SAL_CALL onShot() override; void updateImpl(const BufferedDecompositionPrimitive2D*); diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx index 3c5de8eedf3d..ee071fd3bf16 100644 --- a/include/o3tl/cow_wrapper.hxx +++ b/include/o3tl/cow_wrapper.hxx @@ -37,7 +37,7 @@ namespace o3tl typedef std::size_t ref_count_t; static void incrementCount( ref_count_t& rCount ) { ++rCount; } static bool decrementCount( ref_count_t& rCount ) { return --rCount != 0; } - static std::size_t getCount( ref_count_t& rCount) { return rCount; } + static std::size_t getCount( ref_count_t rCount) { return rCount; } }; /** Thread-safe refcounting @@ -53,7 +53,7 @@ namespace o3tl { return (--rCount) != 0; } - static std::size_t getCount( ref_count_t& rCount) { return rCount; } + static std::size_t getCount( const ref_count_t& rCount) { return rCount; } }; /** Copy-on-write wrapper. diff --git a/include/oox/drawingml/connectorshapecontext.hxx b/include/oox/drawingml/connectorshapecontext.hxx index 9130d9091db5..c5f2470fd61f 100644 --- a/include/oox/drawingml/connectorshapecontext.hxx +++ b/include/oox/drawingml/connectorshapecontext.hxx @@ -44,7 +44,7 @@ class ConnectorShapePropertiesContext : public ::oox::core::ContextHandler2 public: ConnectorShapePropertiesContext( - ::oox::core::ContextHandler2Helper const& rParent, ShapePtr& pShapePtr, + ::oox::core::ContextHandler2Helper const& rParent, const ShapePtr& pShapePtr, std::vector<ConnectorShapeProperties>& rConnectorShapePropertiesList); virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 aElementToken, diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index 9a7937e2a4d2..0e46d86a7399 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -58,7 +58,7 @@ private: void saveThemeToGrabBag(const oox::drawingml::ThemePtr& pThemePtr, sal_Int32 nThemeIdx); void saveColorMapToGrabBag(const oox::drawingml::ClrMapPtr& pClrMapPtr); void importCustomSlideShow(std::vector<CustomShow>& rCustomShowList); - static void importSlideNames(::oox::core::XmlFilterBase& rFilter, const std::vector<SlidePersistPtr>& rSlidePersist); + static void importSlideNames(const ::oox::core::XmlFilterBase& rFilter, const std::vector<SlidePersistPtr>& rSlidePersist); std::vector< OUString > maSlideMasterVector; std::vector< OUString > maSlidesVector; diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index c8cd4cc7647f..d5b07909c3d7 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -125,7 +125,7 @@ public: CommentList& getCommentsList() { return maCommentsList; } CommentAuthorList& getCommentAuthors() { return maCommentAuthors; } - void createConnectorShapeConnection(oox::drawingml::ShapePtr& pConnector); + void createConnectorShapeConnection(const oox::drawingml::ShapePtr& pConnector); private: OUString maPath; diff --git a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx index f4d460a2bf99..0a16d442a251 100644 --- a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx +++ b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx @@ -44,7 +44,7 @@ private: // treeview sort and compare comphelper::string::NaturalStringSorter mxSorter; void setSortFunction(std::unique_ptr<weld::TreeView>& pTreeView); - sal_Int32 compare(std::unique_ptr<weld::TreeView>& pTreeView, const weld::TreeIter& rLeft, + sal_Int32 compare(const std::unique_ptr<weld::TreeView>& pTreeView, const weld::TreeIter& rLeft, const weld::TreeIter& rRight); // treeview manipulation diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index 2f87faf82e78..c0d8efb6eb0d 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -284,7 +284,7 @@ class SfxLokLanguageGuard const SfxViewShell* m_pOldShell; public: - SfxLokLanguageGuard(SfxViewShell* pNewShell); + SfxLokLanguageGuard(const SfxViewShell* pNewShell); ~SfxLokLanguageGuard(); }; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index c59b2b1e7084..badeddf332b7 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -449,7 +449,7 @@ public: bool SetModifyPasswordInfo( const css::uno::Sequence< css::beans::PropertyValue >& aInfo ); static void DetectCharSet(SvStream& stream, rtl_TextEncoding& eCharSet, SvStreamEndian& endian); - static void DetectCsvSeparators(SvStream& stream, rtl_TextEncoding& eCharSet, OUString& separators, sal_Unicode cStringDelimiter); + static void DetectCsvSeparators(SvStream& stream, rtl_TextEncoding eCharSet, OUString& separators, sal_Unicode cStringDelimiter); static void DetectCsvFilterOptions(SvStream& stream, OUString& aFilterOptions); static void DetectFilterOptions(SfxMedium* pMedium); static ErrCode HandleFilter( SfxMedium* pMedium, SfxObjectShell const * pDoc ); diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx index 9ac1130cc29b..c3ea9abbc940 100644 --- a/include/sfx2/sidebar/ResourceManager.hxx +++ b/include/sfx2/sidebar/ResourceManager.hxx @@ -20,6 +20,7 @@ #include <unotools/confignode.hxx> #include <map> +#include <vcl/EnumContext.hxx> #include <vector> #include <set> @@ -89,6 +90,11 @@ public: const css::uno::Reference<css::frame::XController>& rxController); const OUString& GetLastActiveDeck( const Context& rContext ); + const std::map<OUString, OUString>& GetDeckOverrides() { + if (maApplicationDeckOverrides.empty()) + SetupOverrides(); + return maApplicationDeckOverrides; + } void SetLastActiveDeck( const Context& rContext, const OUString& rsDeckId ); /** Remember the expansions state per panel and context. @@ -107,10 +113,13 @@ private: PanelContainer maPanels; mutable std::set<OUString> maProcessedApplications; std::map<OUString, OUString> maLastActiveDecks; + // always jump to Deck on Application type, override last used + std::map<OUString, OUString> maApplicationDeckOverrides; void ReadDeckList(); void ReadPanelList(); void ReadLastActive(); + void SetupOverrides(); static void ReadContextList(const utl::OConfigurationNode& rNode, ContextList& rContextList, const OUString& rsDefaultMenuCommand); diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index d4e078d94b90..de43d4c5355e 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -155,7 +155,7 @@ class SVL_DLLPUBLIC SfxItemPool : public salhelper::SimpleReferenceObject friend class SfxAllItemSet; // allow ItemSetTooling to access - friend SfxPoolItem const* implCreateItemEntry(SfxItemPool&, SfxPoolItem const*, bool); + friend SfxPoolItem const* implCreateItemEntry(const SfxItemPool&, SfxPoolItem const*, bool); friend void implCleanupItemEntry(SfxPoolItem const*); SfxBroadcaster aBC; @@ -186,7 +186,7 @@ public: const std::function<SfxPoolItem*(sal_uInt16)>& rCallback = std::function<SfxPoolItem*(sal_uInt16)>()); protected: const ItemInfo* impCheckItemInfoForClone(const ItemInfo* pInfo); - void impClearUserDefault(userItemInfos::iterator& rHit); + void impClearUserDefault(const userItemInfos::iterator& rHit); void impCreateUserDefault(const SfxPoolItem& rItem); private: void cleanupItemInfos(); diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index fe510a8c4c78..f6d825832374 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -42,7 +42,7 @@ SVL_DLLPUBLIC void listSfxItemSetUsage(); #endif // ItemSet/ItemPool helpers -SfxPoolItem const* implCreateItemEntry(SfxItemPool& rPool, SfxPoolItem const* pSource, bool bPassingOwnership); +SfxPoolItem const* implCreateItemEntry(const SfxItemPool& rPool, SfxPoolItem const* pSource, bool bPassingOwnership); void implCleanupItemEntry(const SfxPoolItem* pSource); // coverity[ missing_move_assignment : SUPPRESS] - don't report about missing move assignment @@ -85,7 +85,7 @@ class SAL_WARN_UNUSED SVL_DLLPUBLIC SfxItemSet friend class SfxAllItemSet; // allow ItemSetTooling to access - friend SfxPoolItem const* implCreateItemEntry(SfxItemPool&, SfxPoolItem const*, bool); + friend SfxPoolItem const* implCreateItemEntry(const SfxItemPool&, SfxPoolItem const*, bool); friend void implCleanupItemEntry(const SfxPoolItem*); SfxItemPool* m_pPool; ///< pool that stores the items diff --git a/include/svl/nfengine.hxx b/include/svl/nfengine.hxx index 497f4ed65178..3b5c02380762 100644 --- a/include/svl/nfengine.hxx +++ b/include/svl/nfengine.hxx @@ -294,7 +294,7 @@ public: SvNFFormatData::DefaultFormatKeysMap& rFormatCache); static void ChangeIntl(SvNFLanguageData& rCurrentLanguage, LanguageType eLnge); - static void ChangeNullDate(SvNFLanguageData& rCurrentLanguage, sal_uInt16 nDay, + static void ChangeNullDate(const SvNFLanguageData& rCurrentLanguage, sal_uInt16 nDay, sal_uInt16 nMonth, sal_Int16 nYear); static sal_uInt32 GetFormatIndex(SvNFLanguageData& rCurrentLanguage, const Accessor& rFuncs, @@ -344,7 +344,7 @@ public: const SvNFFormatData& rFormatData, sal_uInt32 nFormat); /// Count of decimals - static sal_uInt16 GetFormatPrecision(SvNFLanguageData& rCurrentLanguage, + static sal_uInt16 GetFormatPrecision(const SvNFLanguageData& rCurrentLanguage, const SvNFFormatData& rFormatData, sal_uInt32 nFormat); static OUString GetInputLineString(SvNFLanguageData& rCurrentLanguage, diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index f6f76dc5479d..f63d14494473 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -577,7 +577,7 @@ class SVL_DLLPUBLIC SfxPoolItem friend class ItemInfoDynamic; // allow ItemSetTooling to access - friend SfxPoolItem const* implCreateItemEntry(SfxItemPool&, SfxPoolItem const*, bool); + friend SfxPoolItem const* implCreateItemEntry(const SfxItemPool&, SfxPoolItem const*, bool); friend void implCleanupItemEntry(SfxPoolItem const*); mutable sal_uInt32 m_nRefCount; @@ -761,7 +761,7 @@ private: class SVL_DLLPUBLIC ItemInstanceManager { // allow *only* ItemSetTooling to access - friend SfxPoolItem const* implCreateItemEntry(SfxItemPool&, SfxPoolItem const*, bool); + friend SfxPoolItem const* implCreateItemEntry(const SfxItemPool&, SfxPoolItem const*, bool); friend void implCleanupItemEntry(SfxPoolItem const*); // Define for which SfxItemType to register diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx index fec311d9f502..43cef249333e 100644 --- a/include/svl/urihelper.hxx +++ b/include/svl/urihelper.hxx @@ -122,7 +122,7 @@ SVL_DLLPUBLIC OUString FindFirstURLInText(OUString const & rText, SVL_DLLPUBLIC OUString FindFirstDOIInText(std::u16string_view rText, sal_Int32 & rBegin, - sal_Int32 & rEnd, + const sal_Int32 & rEnd, CharClass const & rCharClass); /** Remove any password component from both absolute and relative URLs. diff --git a/include/svx/dialog/ThemeColorEditDialog.hxx b/include/svx/dialog/ThemeColorEditDialog.hxx index 067d89d606fa..800cae7f4508 100644 --- a/include/svx/dialog/ThemeColorEditDialog.hxx +++ b/include/svx/dialog/ThemeColorEditDialog.hxx @@ -40,7 +40,7 @@ private: std::unique_ptr<ColorListBox> mxFollowHyperlink; public: - ThemeColorEditDialog(weld::Window* pParent, model::ColorSet& rColorSet); + ThemeColorEditDialog(weld::Window* pParent, const model::ColorSet& rColorSet); virtual ~ThemeColorEditDialog() override; model::ColorSet getColorSet(); }; diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx index 9de7b0994b8b..83798789844c 100644 --- a/include/svx/sdr/contact/viewcontact.hxx +++ b/include/svx/sdr/contact/viewcontact.hxx @@ -122,7 +122,7 @@ public: virtual void ActionChanged(); // IASS: helpers for IASS invalidates - void ActionChangedIfDifferentPageView(SdrPageView& rSdrPageView); + void ActionChangedIfDifferentPageView(const SdrPageView& rSdrPageView); bool hasMultipleViewObjectContacts() const; // access to the local primitive. This will ensure that the primitive is diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index 393a23599a6e..9ef43e669539 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -101,7 +101,7 @@ public: virtual void ActionChanged(); // IASS: helper for IASS invalidates - void ActionChangedIfDifferentPageView(SdrPageView& rSdrPageView); + void ActionChangedIfDifferentPageView(const SdrPageView& rSdrPageView); // LazyInvalidate handling void triggerLazyInvalidate(); diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 90d5f3ebab79..f6723dee04aa 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -1410,6 +1410,7 @@ #define RID_SVXSTR_FINDBAR_FIND NC_("RID_SVXSTR_FINDBAR_FIND", "Find") #define RID_SVXSTR_FINDBAR_MATCHCASE NC_("RID_SVXSTR_FINDBAR_MATCHCASE", "Match Case") +#define RID_SVXSTR_FINDBAR_MATCHDIACRITICS NC_("RID_SVXSTR_FINDBAR_MATCHDIACRITICS", "Match Diacritics") #define RID_SVXSTR_FINDBAR_SEARCHFORMATTED NC_("RID_SVXSTR_FINDBAR_SEARCHFORMATTED", "Formatted Display") #define STR_IMAGE_ORIGINAL_SIZE NC_("STR_IMAGE_ORIGINAL_SIZE", "$(WIDTH) × $(HEIGHT) ($(WIDTH_IN_PX) × $(HEIGHT_IN_PX) px)") @@ -1801,7 +1802,7 @@ #define RID_SUBSETSTR_KAWI NC_("RID_SUBSETMAP", "Kawi") #define RID_SUBSETSTR_NAG_MUNDARI NC_("RID_SUBSETMAP", "Nag Mundari") #define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension I") -#define RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS_EXTENDED_A NC_("RID_SUBSETMAP", "Egyptian Hieroglyphs Extended-A") +#define RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS_EXTENDED_A NC_("RID_SUBSETMAP", "Egyptian Hieroglyphs Extended-A") #define RID_SUBSETSTR_GARAY NC_("RID_SUBSETMAP", "Garay") #define RID_SUBSETSTR_GURUNG_KHEMA NC_("RID_SUBSETMAP", "Gurung Khema") #define RID_SUBSETSTR_KIRAT_RAI NC_("RID_SUBSETMAP", "Kirat Rai") diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 4520c5411b5e..88125349e08b 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -231,7 +231,7 @@ public: void SetMarkedObjRect(const tools::Rectangle& rRect); void MoveMarkedObj(const Size& rSiz, bool bCopy=false); void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); - bool IsMarkedObjSizeValid(Size& aTargetSize); + bool IsMarkedObjSizeValid(const Size& aTargetSize); SAL_DLLPRIVATE void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bWdh, const bool bHgt); SAL_DLLPRIVATE Degree100 GetMarkedObjRotate() const; void RotateMarkedObj(const Point& rRef, Degree100 nAngle, bool bCopy=false); diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 21cc57e6caac..7bd7056960c2 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -235,7 +235,7 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrUndoDiagramModelData final : public void implUndoRedo(bool bUndo); public: - SdrUndoDiagramModelData(SdrObject& rNewObj, std::shared_ptr< svx::diagram::DiagramDataState >& rStartState); + SdrUndoDiagramModelData(SdrObject& rNewObj, const std::shared_ptr< svx::diagram::DiagramDataState >& rStartState); virtual ~SdrUndoDiagramModelData() override; virtual void Undo() override; 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(); |