diff options
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/commandinfoprovider.hxx | 8 | ||||
-rw-r--r-- | include/vcl/edit.hxx | 2 | ||||
-rw-r--r-- | include/vcl/helper.hxx | 4 | ||||
-rw-r--r-- | include/vcl/layout.hxx | 4 | ||||
-rw-r--r-- | include/vcl/longcurr.hxx | 2 | ||||
-rw-r--r-- | include/vcl/mnemonic.hxx | 2 | ||||
-rw-r--r-- | include/vcl/tabctrl.hxx | 2 | ||||
-rw-r--r-- | include/vcl/texteng.hxx | 6 |
8 files changed, 15 insertions, 15 deletions
diff --git a/include/vcl/commandinfoprovider.hxx b/include/vcl/commandinfoprovider.hxx index 2560745c9d58..4f76dbe1af7f 100644 --- a/include/vcl/commandinfoprovider.hxx +++ b/include/vcl/commandinfoprovider.hxx @@ -119,10 +119,10 @@ public: CommandInfoProvider(); ~CommandInfoProvider(); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration(); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration(); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(); - OUString GetModuleIdentifier(); + css::uno::Reference<css::ui::XAcceleratorConfiguration> const & GetDocumentAcceleratorConfiguration(); + css::uno::Reference<css::ui::XAcceleratorConfiguration> const & GetModuleAcceleratorConfiguration(); + css::uno::Reference<css::ui::XAcceleratorConfiguration> const & GetGlobalAcceleratorConfiguration(); + OUString const & GetModuleIdentifier(); css::uno::Sequence<css::beans::PropertyValue> GetCommandProperties ( const OUString& rsCommandName); OUString GetCommandProperty(const OUString& rsProperty, const OUString& rsCommandName); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index c78ea3ad18c3..28c29af61c9e 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -123,7 +123,7 @@ private: SAL_DLLPRIVATE void ImplCopy(css::uno::Reference<css::datatransfer::clipboard::XClipboard>& rxClipboard); SAL_DLLPRIVATE void ImplPaste(css::uno::Reference<css::datatransfer::clipboard::XClipboard>& rxClipboard); SAL_DLLPRIVATE long ImplGetTextYPosition() const; - SAL_DLLPRIVATE css::uno::Reference<css::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker(); + SAL_DLLPRIVATE css::uno::Reference<css::i18n::XExtendedInputSequenceChecker > const & ImplGetInputSequenceChecker(); SAL_DLLPRIVATE css::uno::Reference<css::i18n::XBreakIterator > ImplGetBreakIterator() const; SAL_DLLPRIVATE void filterText(); diff --git a/include/vcl/helper.hxx b/include/vcl/helper.hxx index dcdcd923ba18..cbefea363676 100644 --- a/include/vcl/helper.hxx +++ b/include/vcl/helper.hxx @@ -40,7 +40,7 @@ void VCL_DLLPUBLIC getPrinterPathList( std::list< OUString >& rPathList, const c // note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here // seems to be a bug in gcc, now we return an object instead of a reference -OUString VCL_DLLPUBLIC getFontPath(); +VCL_DLLPUBLIC OUString const & getFontPath(); bool VCL_DLLPUBLIC convertPfbToPfa( osl::File& rInFile, osl::File& rOutFile ); @@ -54,7 +54,7 @@ void VCL_DLLPUBLIC splitPath( OString& rOrgPath, OString& rDir, OString& rBase ) enum class whichOfficePath { InstallationRootPath, UserPath, ConfigPath }; // note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here // seems to be a bug in gcc, now we return an object instead of a reference -OUString VCL_DLLPUBLIC getOfficePath( whichOfficePath ePath ); +VCL_DLLPUBLIC OUString const & getOfficePath( whichOfficePath ePath ); } // namespace diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 59d7d6c6ae45..02fcaad564e9 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -665,8 +665,8 @@ public: virtual short Execute() override; ///Emitted when an action widget is clicked virtual void response(short nResponseId); - OUString get_primary_text() const; - OUString get_secondary_text() const; + OUString const & get_primary_text() const; + OUString const & get_secondary_text() const; void set_primary_text(const OUString &rPrimaryString); void set_secondary_text(const OUString &rSecondaryString); virtual ~MessageDialog(); diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 7c03c0fd190a..011237c6d8ef 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -55,7 +55,7 @@ public: bool IsUseThousandSep() const { return mbThousandSep; } void SetCurrencySymbol( const OUString& rStr ); - OUString GetCurrencySymbol() const; + OUString const & GetCurrencySymbol() const; void SetMin(const BigInt& rNewMin); const BigInt& GetMin() const { return mnMin; } diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index 9822db32b458..9d5fa1944e27 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -65,7 +65,7 @@ public: void RegisterMnemonic( const OUString& rKey ); OUString CreateMnemonic( const OUString& rKey ); - css::uno::Reference< css::i18n::XCharacterClassification > GetCharClass(); + css::uno::Reference< css::i18n::XCharacterClassification > const & GetCharClass(); // returns a string where all '~'-characters and CJK mnemonics of the form (~A) are completely removed static OUString EraseAllMnemonicChars( const OUString& rStr ); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 5b26c830ecac..e162b19f6681 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -141,7 +141,7 @@ public: TabPage* GetTabPage( sal_uInt16 nPageId ) const; void SetPageText( sal_uInt16 nPageId, const OUString& rText ); - OUString GetPageText( sal_uInt16 nPageId ) const; + OUString const & GetPageText( sal_uInt16 nPageId ) const; void SetHelpText( sal_uInt16 nPageId, const OUString& rText ); const OUString& GetHelpText( sal_uInt16 nPageId ) const; diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 5f2fda1a701f..400d08060264 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -159,7 +159,7 @@ protected: // gets not exported. First and second parameter swapped to have a different signatur. SAL_DLLPRIVATE TextPaM ImpInsertText( sal_Unicode c, const TextSelection& rSel, bool bOverwrite = false, bool bIsUserInput = false ); // some other new functions needed that must not be exported to remain compatible - SAL_DLLPRIVATE css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker(); + SAL_DLLPRIVATE css::uno::Reference< css::i18n::XExtendedInputSequenceChecker > const & GetInputSequenceChecker(); SAL_DLLPRIVATE bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; // broadcast or adjust selections @@ -306,8 +306,8 @@ public: void Draw( OutputDevice* pDev, const Point& rPos ); void SetLocale( const css::lang::Locale& rLocale ); - css::lang::Locale GetLocale(); - css::uno::Reference< css::i18n::XBreakIterator > GetBreakIterator(); + css::lang::Locale const & GetLocale(); + css::uno::Reference< css::i18n::XBreakIterator > const & GetBreakIterator(); static bool DoesKeyChangeText( const KeyEvent& rKeyEvent ); static bool IsSimpleCharInput( const KeyEvent& rKeyEvent ); |