summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmloff/source/draw/shapeexport.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 9463b3e64eb8..65709b7bfba3 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2416,9 +2416,9 @@ OUString getNameFromStreamURL(std::u16string_view rURL)
if (o3tl::starts_with(rURL, sPackageURL))
{
std::u16string_view sRequestedName = rURL.substr(sPackageURL.size());
- size_t nLastIndex = sRequestedName.rfind('/') + 1;
- if ((nLastIndex > 0) && (nLastIndex < sRequestedName.size()))
- sRequestedName = sRequestedName.substr(nLastIndex);
+ size_t nLastIndex = sRequestedName.rfind('/');
+ if (nLastIndex != std::u16string_view::npos && nLastIndex + 1 < sRequestedName.size())
+ sRequestedName = sRequestedName.substr(nLastIndex + 1);
nLastIndex = sRequestedName.rfind('.');
if (nLastIndex != std::u16string_view::npos)
sRequestedName = sRequestedName.substr(0, nLastIndex);