[Libreoffice-commits] core.git: basctl/source basic/source include/basic sw/source

[Mike Kaganski (via logerrit)]

 basctl/source/basicide/basobj2.cxx |    4 ++--
 basic/source/classes/sbxmod.cxx    |    6 ------
 include/basic/sbmod.hxx            |    1 -
 sw/source/filter/html/htmlbas.cxx  |    2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 919375354c769ac9cc6a49ebfbfb84aa0f15df39
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Dec 9 14:39:59 2019 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Dec 9 15:34:38 2019 +0100

    GetSource32 and GetSource are identical
    
    Change-Id: Ia7c6687586b5a37b7556f1bae9ffd5b5b954db47
    Reviewed-on: https://gerrit.libreoffice.org/84747
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 9a9656d0d160..77e9afe9f795 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -370,7 +370,7 @@ Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUSt
         SbModuleRef xModule;
         // Only reparse modules if ScriptDocument source is out of sync
         // with basic's Module
-        if ( !pMod || pMod->GetSource() != aOUSource )
+        if ( !pMod || pMod->GetSource32() != aOUSource )
         {
             xModule = new SbModule( rModName );
             xModule->SetSource32( aOUSource );
@@ -420,7 +420,7 @@ bool HasMethod (
         SbModuleRef xModule;
         // Only reparse modules if ScriptDocument source is out of sync
         // with basic's Module
-        if ( !pMod || pMod->GetSource() != aOUSource )
+        if ( !pMod || pMod->GetSource32() != aOUSource )
         {
             xModule = new SbModule( rModName );
             xModule->SetSource32( aOUSource );
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index c1e34eb8b7b1..e0b85995b406 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -663,12 +663,6 @@ SbxVariable* SbModule::Find( const OUString& rName, SbxClassType t )
     return pRes;
 }
 
-
-const OUString& SbModule::GetSource() const
-{
-    return aOUSource;
-}
-
 // Parent and BASIC are one!
 
 void SbModule::SetParent( SbxObject* p )
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index 8ba26e4568ae..cc9ab469d3a5 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -100,7 +100,6 @@ public:
 
     virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
 
-    const OUString&  GetSource() const;
     const OUString&  GetSource32() const { return aOUSource;}
     void             SetSource32( const OUString& r );
 
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 7be428fe3957..0a105d95da8c 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -293,7 +293,7 @@ void SwHTMLWriter::OutBasic()
 
             const OUString& rModName = pModule->GetName();
             Strm().WriteCharPtr( SAL_NEWLINE_STRING );   // don't indent!
-            HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource(),
+            HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource32(),
                                      sLang, STARBASIC, OUString(),
                                      &rLibName, &rModName,
                                      m_eDestEnc, &m_aNonConvertableCharacters );