diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-08 17:11:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-08 18:30:13 +0000 |
| commit | 9f20f7adec3ca69d702cb02593fca231c25770af (patch) | |
| tree | e602e40bab5c851911c9eaf897831f96de7fbfbb /ucb | |
| parent | 7f47d68c4310b8bae09286a81036a6fa669a1705 (diff) | |
-Werror=return-local-addr
(the first case with OUString would technically be OK, but better change all
three of them)
regression introduced with 0e4ca9b0cfe015f7ab3b964d1b90de7c2cba42de "Clean up
uses of Any::getValue() in ucb"; thanks to tml for finding it via
--enable-fuzz-options
Change-Id: I79e70cff8d8b96e1eb6b0bacda52be06eb0f108b
(cherry picked from commit 912fda1d7b21e7f7c8983c449d5d50fdf000e5bc)
Reviewed-on: https://gerrit.libreoffice.org/31766
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/cacher/cachedcontentresultset.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/cacher/cachedcontentresultset.hxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 44e9aa78ab43..06e9b5b156fc 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -295,7 +295,7 @@ const Any& SAL_CALL CachedContentResultSet::CCRS_Cache return (*rRow)[nColumnIndex-1]; } -const OUString& SAL_CALL CachedContentResultSet::CCRS_Cache +OUString SAL_CALL CachedContentResultSet::CCRS_Cache ::getContentIdentifierString( sal_Int32 nRow ) throw( css::uno::RuntimeException ) { @@ -317,7 +317,7 @@ const OUString& SAL_CALL CachedContentResultSet::CCRS_Cache } } -const Reference< XContentIdentifier >& SAL_CALL CachedContentResultSet::CCRS_Cache +Reference< XContentIdentifier > SAL_CALL CachedContentResultSet::CCRS_Cache ::getContentIdentifier( sal_Int32 nRow ) throw( css::uno::RuntimeException ) { @@ -339,7 +339,7 @@ const Reference< XContentIdentifier >& SAL_CALL CachedContentResultSet::CCRS_Cac } } -const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache +Reference< XContent > SAL_CALL CachedContentResultSet::CCRS_Cache ::getContent( sal_Int32 nRow ) throw( css::uno::RuntimeException ) { diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index 12ff58132f73..1d9b9f4ce430 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -94,15 +94,15 @@ class CachedContentResultSet throw( css::sdbc::SQLException, css::uno::RuntimeException ); - const OUString& SAL_CALL + OUString SAL_CALL getContentIdentifierString( sal_Int32 nRow ) throw( css::uno::RuntimeException ); - const css::uno::Reference< css::ucb::XContentIdentifier >& SAL_CALL + css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL getContentIdentifier( sal_Int32 nRow ) throw( css::uno::RuntimeException ); - const css::uno::Reference< css::ucb::XContent >& SAL_CALL + css::uno::Reference< css::ucb::XContent > SAL_CALL getContent( sal_Int32 nRow ) throw( css::uno::RuntimeException ); }; |