diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-11-12 09:56:30 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-11-12 11:23:14 +0100 |
| commit | f8a30a87a9d0c68dc16d5fa2ca63f687b1d90da1 (patch) | |
| tree | 8ab83492dadcebf05308ba883c30ca924a14fd9a /sfx2 | |
| parent | 9c8076f438dfac311a9c7dce559e8ab3ea4fd6e0 (diff) | |
Fix (mis-)uses of temporary O[U]StringLiteral
...as sub-expressions of ternary operators, which happened to keep compiling
after 4b9e440c51be3e40326bc90c33ae69885bfb51e4 "Turn OStringLiteral into a
consteval'ed, static-refcound rtl_String" and
e6dfaf9f44f9939abc338c83b3024108431d0f69 "Turn OUStringLiteral into a
consteval'ed, static-refcound rtl_uString" because both branches are of the same
type O[U]StringLiteral<N>, and which didn't cause any issues because no dangling
pointers to those temporary objects escaped the surrounding full expressions.
This was found with an experimental build with VS 2022 with
--enable-latest-c++, which would support HAVE_CPP_CONSTEVAL after some linking
fix in the configure.ac detection code (which is forthcoming in a later commit)
and flagged all these uses in ternary operators as error C7595 "call to
immediate function is not a constant expression". That error looks bogus (and
it also caused a false
> sd/source/ui/unoidl/unoobj.cxx(742): error C7595: 'Color::Color': call to immediate function is not a constant expression
so HAVE_CPP_CONSTEVAL will need to remain undefined for VS 2022 until that
compiler bug is fixed), but it nicely found all these cases that should arguably
be cleaned up.
Change-Id: I81de94e8af5a6c50e5fe7dfa1a4b253e0c2a68f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125082
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/bastyp/helper.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index d9d1a4bb4da4..5138a790e15a 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <string_view> #include <helper.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> @@ -134,7 +137,7 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin bool bFolder = xRow->getBoolean(2); OUString aRow = aTitle + "\t" + xContentAccess->queryContentIdentifierString() + "\t" + - (bFolder ? OUStringLiteral(u"1") : OUStringLiteral(u"0")); + (bFolder ? std::u16string_view(u"1") : std::u16string_view(u"0")); aProperties.push_back( aRow ); } } |