diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/impfontcharmap.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/printdlg.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/freetype_glyphcache.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx | 2 | ||||
-rw-r--r-- | vcl/source/control/edit.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/field2.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/longcurr.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/tabctrl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/edit/texteng.cxx | 6 | ||||
-rw-r--r-- | vcl/source/font/fontcharmap.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/commandinfoprovider.cxx | 8 | ||||
-rw-r--r-- | vcl/source/window/layout.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/mnemonic.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/printdlg.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/helper.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkhypertext.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 2 |
18 files changed, 25 insertions, 25 deletions
diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx index 80c05b9ae799..82f65a86360f 100644 --- a/vcl/inc/impfontcharmap.hxx +++ b/vcl/inc/impfontcharmap.hxx @@ -41,7 +41,7 @@ private: ImplFontCharMap( const ImplFontCharMap& ) = delete; void operator=( const ImplFontCharMap& ) = delete; - static ImplFontCharMapPtr getDefaultMap( bool bSymbols=false); + static ImplFontCharMapPtr const & getDefaultMap( bool bSymbols=false); bool isDefaultMap() const; private: diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index cf1dea21243b..71af53dfd7d7 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -212,7 +212,7 @@ namespace vcl bool mbShowLayoutPage; - Size getJobPageSize(); + Size const & getJobPageSize(); void updateNup(); void updateNupFromPages(); void preparePreview( bool i_bPrintChanged = true, bool i_bMayUseCache = false ); diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx index 3b8d315e5a5c..0a8cfbe14f31 100644 --- a/vcl/inc/unx/freetype_glyphcache.hxx +++ b/vcl/inc/unx/freetype_glyphcache.hxx @@ -82,7 +82,7 @@ public: void CacheGlyphIndex( sal_UCS4 cChar, int nGI ) const; bool GetFontCodeRanges( CmapResult& ) const; - const FontCharMapPtr GetFontCharMap(); + const FontCharMapPtr& GetFontCharMap(); private: FT_FaceRec_* maFaceFT; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index e29d221129a8..02550fe0f3ce 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -242,7 +242,7 @@ public: void RemoveTimer (SalTimer *pTimer); - std::shared_ptr<vcl::unx::GtkPrintWrapper> getPrintWrapper() const; + std::shared_ptr<vcl::unx::GtkPrintWrapper> const & getPrintWrapper() const; private: std::vector<GtkSalTimer *> m_aTimers; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 2152c28ceca0..0f64127df81b 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -785,7 +785,7 @@ uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const return i18n::BreakIterator::create(xContext); } -uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenceChecker() +uno::Reference < i18n::XExtendedInputSequenceChecker > const & Edit::ImplGetInputSequenceChecker() { if ( !mxISC.is() ) { diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 60760748d3ea..eb32e17bc0e6 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -57,7 +57,7 @@ using namespace ::comphelper; #define EDITMASK_ALLCHAR 'x' #define EDITMASK_UPPERALLCHAR 'X' -uno::Reference< i18n::XCharacterClassification > ImplGetCharClass() +uno::Reference< i18n::XCharacterClassification > const & ImplGetCharClass() { static uno::Reference< i18n::XCharacterClassification > xCharClass; if ( !xCharClass.is() ) diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index b9283666c79d..75ddd72c9285 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -309,7 +309,7 @@ void LongCurrencyFormatter::SetCurrencySymbol( const OUString& rStr ) ReformatAll(); } -OUString LongCurrencyFormatter::GetCurrencySymbol() const +OUString const & LongCurrencyFormatter::GetCurrencySymbol() const { return !maCurrencySymbol.isEmpty() ? maCurrencySymbol : GetLocaleDataWrapper().getCurrSymbol(); } diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 9441dea04ef6..d165f21467f2 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1943,7 +1943,7 @@ void TabControl::SetPageText( sal_uInt16 nPageId, const OUString& rText ) } } -OUString TabControl::GetPageText( sal_uInt16 nPageId ) const +OUString const & TabControl::GetPageText( sal_uInt16 nPageId ) const { ImplTabItem* pItem = ImplGetItem( nPageId ); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 8f7765410fa4..deaad286e0dc 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -615,7 +615,7 @@ void TextEngine::ImpRemoveParagraph( sal_uInt32 nPara ) ImpParagraphRemoved( nPara ); } -uno::Reference < i18n::XExtendedInputSequenceChecker > TextEngine::GetInputSequenceChecker() +uno::Reference < i18n::XExtendedInputSequenceChecker > const & TextEngine::GetInputSequenceChecker() { if ( !mxISC.is() ) { @@ -2793,7 +2793,7 @@ void TextEngine::SetLeftMargin( sal_uInt16 n ) mpDoc->SetLeftMargin( n ); } -uno::Reference< i18n::XBreakIterator > TextEngine::GetBreakIterator() +uno::Reference< i18n::XBreakIterator > const & TextEngine::GetBreakIterator() { if ( !mxBreakIterator.is() ) mxBreakIterator = vcl::unohelper::CreateBreakIterator(); @@ -2808,7 +2808,7 @@ void TextEngine::SetLocale( const css::lang::Locale& rLocale ) mpLocaleDataWrapper = nullptr; } -css::lang::Locale TextEngine::GetLocale() +css::lang::Locale const & TextEngine::GetLocale() { if ( maLocale.Language.isEmpty() ) { diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 821427db93bf..3443cdb6f45f 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -63,7 +63,7 @@ ImplFontCharMap::ImplFontCharMap( const CmapResult& rCR ) } } -ImplFontCharMapPtr ImplFontCharMap::getDefaultMap( bool bSymbols ) +ImplFontCharMapPtr const & ImplFontCharMap::getDefaultMap( bool bSymbols ) { const sal_UCS4* pRangeCodes = aDefaultUnicodeRanges; int nCodesCount = sizeof(aDefaultUnicodeRanges) / sizeof(*pRangeCodes); diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx index 00fa0c8cc093..956b4bafe55b 100644 --- a/vcl/source/helper/commandinfoprovider.cxx +++ b/vcl/source/helper/commandinfoprovider.cxx @@ -323,7 +323,7 @@ void CommandInfoProvider::SetFrame (const Reference<frame::XFrame>& rxFrame) } } -Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceleratorConfiguration() +Reference<ui::XAcceleratorConfiguration> const & CommandInfoProvider::GetDocumentAcceleratorConfiguration() { if ( ! mxCachedDocumentAcceleratorConfiguration.is()) { @@ -354,7 +354,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceler return mxCachedDocumentAcceleratorConfiguration; } -Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAcceleratorConfiguration() +Reference<ui::XAcceleratorConfiguration> const & CommandInfoProvider::GetModuleAcceleratorConfiguration() { if ( ! mxCachedModuleAcceleratorConfiguration.is()) { @@ -375,7 +375,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAccelerat return mxCachedModuleAcceleratorConfiguration; } -Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAcceleratorConfiguration() +Reference<ui::XAcceleratorConfiguration> const & CommandInfoProvider::GetGlobalAcceleratorConfiguration() { // Get the global accelerator configuration. if ( ! mxCachedGlobalAcceleratorConfiguration.is()) @@ -386,7 +386,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAccelerat return mxCachedGlobalAcceleratorConfiguration; } -OUString CommandInfoProvider::GetModuleIdentifier() +OUString const & CommandInfoProvider::GetModuleIdentifier() { if (msCachedModuleIdentifier.getLength() == 0) { diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index f93aaaaa2af5..dd776a5b68dc 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2271,14 +2271,14 @@ short MessageDialog::Execute() return Dialog::Execute(); } -OUString MessageDialog::get_primary_text() const +OUString const & MessageDialog::get_primary_text() const { const_cast<MessageDialog*>(this)->setDeferredProperties(); return m_sPrimaryString; } -OUString MessageDialog::get_secondary_text() const +OUString const & MessageDialog::get_secondary_text() const { const_cast<MessageDialog*>(this)->setDeferredProperties(); diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 530e5ff626fa..fe57879d6444 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -296,7 +296,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) return rKey; } -uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass() +uno::Reference< i18n::XCharacterClassification > const & MnemonicGenerator::GetCharClass() { if ( !mxCharClass.is() ) mxCharClass = vcl::unohelper::CreateCharacterClassification(); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index f8d51a006293..258df1778a59 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1356,7 +1356,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache ) } } -Size PrintDialog::getJobPageSize() +Size const & PrintDialog::getJobPageSize() { if( maFirstPageSize.Width() == 0 && maFirstPageSize.Height() == 0) { diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx index 8b7c2ed722b4..2f83b96e5f0c 100644 --- a/vcl/unx/generic/fontmanager/helper.cxx +++ b/vcl/unx/generic/fontmanager/helper.cxx @@ -37,7 +37,7 @@ using ::rtl::Bootstrap; namespace psp { -OUString getOfficePath( whichOfficePath ePath ) +OUString const & getOfficePath( whichOfficePath ePath ) { static OUString aInstallationRootPath; static OUString aUserPath; @@ -185,7 +185,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub } } -OUString psp::getFontPath() +OUString const & psp::getFontPath() { static OUString aPath; diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 7023a5f1b9ea..2f26cceb13ea 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -977,7 +977,7 @@ const FontCharMapPtr ServerFont::GetFontCharMap() const return xFCMap; } -const FontCharMapPtr FreetypeFontInfo::GetFontCharMap() +const FontCharMapPtr& FreetypeFontInfo::GetFontCharMap() { // check if the charmap is already cached if( mxFontCharMap ) diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index 1b6529040798..e7f7773ac0a6 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -29,7 +29,7 @@ typedef struct { uno::Reference< accessibility::XAccessibleHyperlink > xLink; } HyperLink; -static uno::Reference< accessibility::XAccessibleHyperlink > +static uno::Reference< accessibility::XAccessibleHyperlink > const & getHyperlink( AtkHyperlink *pHyperlink ) { HyperLink *pLink = reinterpret_cast<HyperLink *>(pHyperlink); diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index 22cdca8f1938..c131721a00c6 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -469,7 +469,7 @@ GenPspGraphics *GtkInstance::CreatePrintGraphics() return new GenPspGraphics(); } -std::shared_ptr<vcl::unx::GtkPrintWrapper> +std::shared_ptr<vcl::unx::GtkPrintWrapper> const & GtkInstance::getPrintWrapper() const { if (!m_xPrintWrapper) |