1 files changed, 12 insertions, 19 deletions
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 3f7062f6be52..cc6f65e64541 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -44,7 +44,7 @@ namespace connectivity
         static SharedResources_Impl&
                         getInstance();
 
-        OUString getResourceString(const char* pId);
+        OUString getResourceString(TranslateId pId) const;
 
     private:
         SharedResources_Impl();
@@ -66,7 +66,7 @@ namespace connectivity
     {
     }
 
-    OUString SharedResources_Impl::getResourceString(const char* pId)
+    OUString SharedResources_Impl::getResourceString(TranslateId pId) const
     {
         return Translate::get(pId, m_aLocale);
     }
@@ -100,20 +100,13 @@ namespace connectivity
 
     namespace
     {
-        size_t lcl_substitute( OUString& _inout_rString,
-            const char* _pAsciiPattern, const OUString& _rReplace )
+        bool lcl_substitute( OUString& _inout_rString,
+            const char* _pAsciiPattern, std::u16string_view _rReplace )
         {
-            size_t nOccurrences = 0;
-
+            OUString oldString = _inout_rString;
             OUString sPattern( OUString::createFromAscii( _pAsciiPattern ) );
-            sal_Int32 nIndex = 0;
-            while ( ( nIndex = _inout_rString.indexOf( sPattern ) ) > -1 )
-            {
-                ++nOccurrences;
-                _inout_rString = _inout_rString.replaceAt( nIndex, sPattern.getLength(), _rReplace );
-            }
-
-            return nOccurrences;
+            _inout_rString = _inout_rString.replaceAll(sPattern, _rReplace);
+            return oldString != _inout_rString;
         }
     }
 
@@ -129,13 +122,13 @@ namespace connectivity
     }
 
 
-    OUString SharedResources::getResourceString(const char* pResId) const
+    OUString SharedResources::getResourceString(TranslateId pResId) const
     {
         return SharedResources_Impl::getInstance().getResourceString(pResId);
     }
 
 
-    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
+    OUString SharedResources::getResourceStringWithSubstitution(TranslateId pResId,
                 const char* _pAsciiPatternToReplace, const OUString& _rStringToSubstitute ) const
     {
         OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
@@ -145,7 +138,7 @@ namespace connectivity
     }
 
 
-    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
+    OUString SharedResources::getResourceStringWithSubstitution(TranslateId pResId,
                 const char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1,
                 const char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2 ) const
     {
@@ -158,7 +151,7 @@ namespace connectivity
     }
 
 
-    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
+    OUString SharedResources::getResourceStringWithSubstitution(TranslateId pResId,
                 const char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1,
                 const char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2,
                 const char* _pAsciiPatternToReplace3, const OUString& _rStringToSubstitute3 ) const
@@ -173,7 +166,7 @@ namespace connectivity
         return sString;
     }
 
-    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
+    OUString SharedResources::getResourceStringWithSubstitution(TranslateId pResId,
                     const std::vector< std::pair<const char* , OUString > >& _rStringToSubstitutes) const
     {
         OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );