[Libreoffice-commits] core.git: editeng/source include/editeng

[Stephan Bergmann (via logerrit)]

 editeng/source/misc/svxacorr.cxx |    7 ++-----
 include/editeng/svxacorr.hxx     |    4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit c386994e78f69cb2e9babf42bb54bdfa1f8bd28e
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Dec 23 10:48:30 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Dec 23 14:54:20 2020 +0100

    Directly pass in OUString instances
    
    All the passed-in pStrmName are either pXMLImplCplStt_ExcptLstStr or
    pXMLImplWrdStt_ExcptLstStr, both of which are ASCII-only, so using
    RTL_TEXTENCODING_MS_1252 wasn't relevant.
    
    Change-Id: Idc6fa06b31641f4004da090378adaed73e07e5bf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108234
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index e6fd6ec459cb..3b9da426dc64 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2181,7 +2181,7 @@ bool SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
 
 void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp(
                                         std::unique_ptr<SvStringsISortDtor>& rpLst,
-                                        const char* pStrmName,
+                                        const OUString& sStrmName,
                                         tools::SvRef<SotStorage>& rStg)
 {
     if( rpLst )
@@ -2190,8 +2190,6 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp(
         rpLst.reset( new SvStringsISortDtor );
 
     {
-        const OUString sStrmName( pStrmName, strlen(pStrmName), RTL_TEXTENCODING_MS_1252 );
-
         if( rStg.is() && rStg->IsStream( sStrmName ) )
         {
             tools::SvRef<SotStorageStream> xStrm = rStg->OpenSotStream( sStrmName,
@@ -2254,14 +2252,13 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp(
 
 void SvxAutoCorrectLanguageLists::SaveExceptList_Imp(
                             const SvStringsISortDtor& rLst,
-                            const char* pStrmName,
+                            const OUString& sStrmName,
                             tools::SvRef<SotStorage> const &rStg,
                             bool bConvert )
 {
     if( !rStg.is() )
         return;
 
-    OUString sStrmName( pStrmName, strlen(pStrmName), RTL_TEXTENCODING_MS_1252 );
     if( rLst.empty() )
     {
         rStg->Remove( sStrmName );
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 4e5d929405f0..d386a6888f9a 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -196,10 +196,10 @@ class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists
 
     bool IsFileChanged_Imp();
     void LoadXMLExceptList_Imp( std::unique_ptr<SvStringsISortDtor>& rpLst,
-                                const char* pStrmName,
+                                const OUString& sStrmName,
                                 tools::SvRef<SotStorage>& rStg);
     static void SaveExceptList_Imp( const SvStringsISortDtor& rLst,
-                                const char* pStrmName,
+                                const OUString& sStrmName,
                                 tools::SvRef<SotStorage> const & rStg,
                                 bool bConvert = false);