2 files changed, 6 insertions, 5 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 1aa482769711..1215433044ab 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -791,7 +791,7 @@ EnhancedCustomShape2d::EnhancedCustomShape2d(SdrObjCustomShape& rSdrObjCustomSha
             }
             else if (sShapeType.getLength() > 4 && sShapeType.match( "col-" ))
             {
-                nColorData = sShapeType.copy( 4 ).toUInt32( 16 );
+                nColorData = o3tl::toUInt32(sShapeType.subView( 4 ), 16);
             }
         }
         break;
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 2e715fa95071..27ba2634d451 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -53,6 +53,7 @@
 #include <memory>
 #include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
+#include <o3tl/string_view.hxx>
 
 GalleryBrowserMode GalleryBrowser2::meInitMode = GALLERYBROWSERMODE_ICON;
 
@@ -112,7 +113,7 @@ private:
     static void Execute( const CommandInfo &rCmdInfo,
                   const css::uno::Sequence< css::beans::PropertyValue > &rArguments );
 
-    void MenuSelectHdl(const OString& rIdent);
+    void MenuSelectHdl(std::string_view rIdent);
     void BackgroundMenuSelectHdl(sal_uInt16 nId);
 public:
     GalleryThemePopup(weld::Widget* pParent,
@@ -286,12 +287,12 @@ void GalleryThemePopup::ExecutePopup(weld::Widget* pParent, const ::Point &rPos)
     MenuSelectHdl(mxPopupMenu->popup_at_rect(pParent, tools::Rectangle(rPos, Size(1,1))));
 }
 
-void GalleryThemePopup::MenuSelectHdl(const OString& rIdent)
+void GalleryThemePopup::MenuSelectHdl(std::string_view rIdent)
 {
-    if (rIdent.isEmpty())
+    if (rIdent.empty())
         return;
 
-    sal_uInt16 nSubMenuId = rIdent.toUInt32();
+    sal_uInt16 nSubMenuId = o3tl::toUInt32(rIdent);
     if (nSubMenuId)
     {
         BackgroundMenuSelectHdl(nSubMenuId-1);