diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/image.h | 2 | ||||
-rw-r--r-- | vcl/inc/impgraph.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/sft.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/freetype_glyphcache.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/glyphcache.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/verticaltabctrl.hxx | 4 | ||||
-rw-r--r-- | vcl/source/control/ivctrl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/graph.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/pdfbuildin_fonts.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/pdfbuildin_fonts.hxx | 2 | ||||
-rw-r--r-- | vcl/source/uitest/logger.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/NotebookBarAddonsMerger.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 4 |
14 files changed, 19 insertions, 17 deletions
diff --git a/vcl/inc/image.h b/vcl/inc/image.h index 6fb19bd615da..633c38c4a34e 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -47,7 +47,7 @@ public: return maStockName.getLength() > 0; } - OUString getStock() const + const OUString & getStock() const { return maStockName; } diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 6287be0df1b1..a9b75697d399 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -192,7 +192,7 @@ private: void setDummyContext( bool value ) { mbDummyContext = value; } bool isDummyContext() const { return mbDummyContext; } void setGfxLink( const std::shared_ptr<GfxLink>& ); - std::shared_ptr<GfxLink> getSharedGfxLink() const; + const std::shared_ptr<GfxLink> & getSharedGfxLink() const; GfxLink getGfxLink(); bool isGfxLink() const; diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index 6a844002711d..aabdfdb7368f 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -741,7 +741,7 @@ public: sal_uInt32 horzMetricCount() const { return m_nHorzMetrics; } sal_uInt32 vertMetricCount() const { return m_nVertMetrics; } sal_uInt32 unitsPerEm() const { return m_nUnitsPerEm; } - FontCharMapRef GetCharMap() const { return m_xCharMap; } + const FontCharMapRef & GetCharMap() const { return m_xCharMap; } virtual bool hasTable(sal_uInt32 ord) const = 0; virtual const sal_uInt8* table(sal_uInt32 ord, sal_uInt32& size) const = 0; diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx index 4586c6fd2e6d..625f7c828d80 100644 --- a/vcl/inc/unx/freetype_glyphcache.hxx +++ b/vcl/inc/unx/freetype_glyphcache.hxx @@ -72,7 +72,7 @@ public: void AnnounceFont( PhysicalFontCollection* ); - FontCharMapRef GetFontCharMap() const; + const FontCharMapRef & GetFontCharMap() const; bool GetFontCapabilities(vcl::FontCapabilities&) const; private: diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index 21b196623f30..b41076844df2 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -122,7 +122,7 @@ public: void GetFontMetric(ImplFontMetricDataRef const &) const; const unsigned char* GetTable( const char* pName, sal_uLong* pLength ) const; - FontCharMapRef GetFontCharMap() const; + const FontCharMapRef & GetFontCharMap() const; bool GetFontCapabilities(vcl::FontCapabilities &) const; bool GetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const; diff --git a/vcl/inc/verticaltabctrl.hxx b/vcl/inc/verticaltabctrl.hxx index 1152d702ea60..f3522c2fe697 100644 --- a/vcl/inc/verticaltabctrl.hxx +++ b/vcl/inc/verticaltabctrl.hxx @@ -54,11 +54,11 @@ public: sal_uInt16 GetPageCount() const { return m_xChooser->GetEntryCount(); } - OString GetCurPageId() const { return m_sCurrentPageId; } + const OString& GetCurPageId() const { return m_sCurrentPageId; } void SetCurPageId(const OString& rId); sal_uInt16 GetPagePos(std::string_view rPageId) const; - OString GetPageId(sal_uInt16 nIndex) const; + const OString& GetPageId(sal_uInt16 nIndex) const; VclPtr<vcl::Window> GetPage(std::string_view rPageId); void RemovePage(std::string_view rPageId); diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx index f59e6784c7da..998a44888aee 100644 --- a/vcl/source/control/ivctrl.cxx +++ b/vcl/source/control/ivctrl.cxx @@ -547,7 +547,7 @@ void VerticalTabControl::SetCurPageId(const OString& rId) collectUIInformation(get_id(),OStringToOUString(m_sCurrentPageId,RTL_TEXTENCODING_UTF8), GetPageParent()->get_id()); } -OString VerticalTabControl::GetPageId(sal_uInt16 nIndex) const +const OString & VerticalTabControl::GetPageId(sal_uInt16 nIndex) const { return maPageList[nIndex]->sId; } diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 74a61e871e78..ac47534058bb 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -500,7 +500,7 @@ void Graphic::SetGfxLink( const std::shared_ptr<GfxLink>& rGfxLink ) mxImpGraphic->setGfxLink(rGfxLink); } -std::shared_ptr<GfxLink> Graphic::GetSharedGfxLink() const +const std::shared_ptr<GfxLink> & Graphic::GetSharedGfxLink() const { return mxImpGraphic->getSharedGfxLink(); } diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 99fe4d8ca63a..9e57ff26ce98 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1659,7 +1659,7 @@ void ImpGraphic::setGfxLink(const std::shared_ptr<GfxLink>& rGfxLink) mpGfxLink = rGfxLink; } -std::shared_ptr<GfxLink> ImpGraphic::getSharedGfxLink() const +const std::shared_ptr<GfxLink> & ImpGraphic::getSharedGfxLink() const { return mpGfxLink; } diff --git a/vcl/source/gdi/pdfbuildin_fonts.cxx b/vcl/source/gdi/pdfbuildin_fonts.cxx index 4d74cf899069..92cf2c7e2145 100644 --- a/vcl/source/gdi/pdfbuildin_fonts.cxx +++ b/vcl/source/gdi/pdfbuildin_fonts.cxx @@ -41,7 +41,7 @@ OString BuildinFont::getNameObject() const return aBuf.makeStringAndClear(); } -FontCharMapRef BuildinFont::GetFontCharMap() const +const FontCharMapRef& BuildinFont::GetFontCharMap() const { assert(false && "pdf::BuildinFont doesn't provide correct char maps!"); if (m_xFontCharMap.is()) diff --git a/vcl/source/gdi/pdfbuildin_fonts.hxx b/vcl/source/gdi/pdfbuildin_fonts.hxx index b7bf17fdb405..6c3c03ffc7ea 100644 --- a/vcl/source/gdi/pdfbuildin_fonts.hxx +++ b/vcl/source/gdi/pdfbuildin_fonts.hxx @@ -41,7 +41,7 @@ struct BuildinFont mutable FontCharMapRef m_xFontCharMap; OString getNameObject() const; - FontCharMapRef GetFontCharMap() const; + const FontCharMapRef& GetFontCharMap() const; FontAttributes GetFontAttributes() const; }; diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx index 0193bf76074e..13eea80c71e1 100644 --- a/vcl/source/uitest/logger.cxx +++ b/vcl/source/uitest/logger.cxx @@ -345,7 +345,8 @@ OUString StringMapToOUString(const std::map<OUString, OUString>& rParameters) return aParameterString.makeStringAndClear(); } -OUString GetValueInMapWithIndex(const std::map<OUString, OUString>& rParameters, sal_Int32 index) +const OUString& GetValueInMapWithIndex(const std::map<OUString, OUString>& rParameters, + sal_Int32 index) { sal_Int32 j = 0; @@ -359,7 +360,8 @@ OUString GetValueInMapWithIndex(const std::map<OUString, OUString>& rParameters, return itr->second; } -OUString GetKeyInMapWithIndex(const std::map<OUString, OUString>& rParameters, sal_Int32 index) +const OUString& GetKeyInMapWithIndex(const std::map<OUString, OUString>& rParameters, + sal_Int32 index) { sal_Int32 j = 0; diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx index f6f9fe37db56..d5446032a248 100644 --- a/vcl/source/window/NotebookBarAddonsMerger.cxx +++ b/vcl/source/window/NotebookBarAddonsMerger.cxx @@ -65,7 +65,7 @@ static void GetAddonNotebookBarItem(const css::uno::Sequence<css::beans::Propert static void CreateNotebookBarToolBox(vcl::Window* pNotebookbarToolBox, const css::uno::Reference<css::frame::XFrame>& m_xFrame, const AddonNotebookBarItem& aAddonNotebookBarItem, - const std::vector<Image>& aImageVec, const tools::ULong& nIter) + const std::vector<Image>& aImageVec, const tools::ULong nIter) { sal_uInt16 nItemId = 0; ToolBox* pToolbox = dynamic_cast<ToolBox*>(pNotebookbarToolBox); diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 9e4a4d44974c..cdbbb58a42b6 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -673,7 +673,7 @@ bool FreetypeFont::GetAntialiasAdvice() const // determine unicode ranges in font -FontCharMapRef FreetypeFont::GetFontCharMap() const +const FontCharMapRef & FreetypeFont::GetFontCharMap() const { return mxFontInfo->GetFontCharMap(); } @@ -683,7 +683,7 @@ bool FreetypeFont::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) return mxFontInfo->GetFontCapabilities(rFontCapabilities); } -FontCharMapRef FreetypeFontInfo::GetFontCharMap() const +const FontCharMapRef & FreetypeFontInfo::GetFontCharMap() const { // check if the charmap is already cached if( mxFontCharMap.is() ) |