[Libreoffice-commits] core.git: sc/source

[Stephan Bergmann]

 sc/source/ui/dbgui/asciiopt.cxx |   32 --------------------------------
 sc/source/ui/inc/asciiopt.hxx   |    3 ---
 2 files changed, 35 deletions(-)

New commits:
commit 75b3f109f674a295c88c29bf03f6c4d10d7d7343
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 3 09:48:52 2018 +0200

    ScAsciiOptions copy assignment op can be left implicitly defined
    
    ...which removes a -Wdeprecated-copy (because the copy ctor is already not user-
    declared) with GCC trunk towards GCC 9 (and makes SetColInfo unused).
    
    Curiously, the user-provided copy assignment op didn't copy the eLang member,
    but assume that was by accident rather than on purpose.
    
    Change-Id: I3116500b748f0625acf1368d0106ade94f0dfa26
    Reviewed-on: https://gerrit.libreoffice.org/56845
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index d8ea57518e93..94bcb4494544 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -47,17 +47,6 @@ ScAsciiOptions::~ScAsciiOptions()
 {
 }
 
-void ScAsciiOptions::SetColInfo( sal_uInt16 nCount, const sal_Int32* pStart, const sal_uInt8* pFormat )
-{
-    mvColStart.resize(nCount);
-    mvColFormat.resize(nCount);
-    for (sal_uInt16 i=0; i<nCount; i++)
-    {
-        mvColStart[i] = pStart[i];
-        mvColFormat[i] = pFormat[i];
-    }
-}
-
 void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec )
 {
     sal_uInt16 nInfoCount = static_cast< sal_uInt16 >( rDataVec.size() );
@@ -70,27 +59,6 @@ void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec )
     }
 }
 
-ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy )
-{
-    SetColInfo( rCpy.mvColStart.size(), rCpy.mvColStart.data(), rCpy.mvColFormat.data() );
-
-    bFixedLen       = rCpy.bFixedLen;
-    aFieldSeps      = rCpy.aFieldSeps;
-    bMergeFieldSeps = rCpy.bMergeFieldSeps;
-    bRemoveSpace    = rCpy.bRemoveSpace;
-    bQuotedFieldAsText = rCpy.bQuotedFieldAsText;
-    bDetectSpecialNumber = rCpy.bDetectSpecialNumber;
-    bSkipEmptyCells = rCpy.bSkipEmptyCells;
-    bSaveAsShown    = rCpy.bSaveAsShown;
-    bSaveFormulas   = rCpy.bSaveFormulas;
-    cTextSep        = rCpy.cTextSep;
-    eCharSet        = rCpy.eCharSet;
-    bCharSetSystem  = rCpy.bCharSetSystem;
-    nStartRow       = rCpy.nStartRow;
-
-    return *this;
-}
-
 static OUString lcl_decodeSepString( const OUString & rSepNums, bool & o_bMergeFieldSeps )
 {
     OUString aFieldSeps;
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index d89fd6e1369a..c91ac25a5be5 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -51,8 +51,6 @@ public:
 
     static const sal_Unicode cDefaultTextSep = '"';
 
-    ScAsciiOptions& operator=( const ScAsciiOptions& rCpy );
-
     void            ReadFromString( const OUString& rString );
     OUString        WriteToString() const;
 
@@ -84,7 +82,6 @@ public:
     void    SetStartRow( long nRow)             { nStartRow= nRow; }
     void    SetLanguage(LanguageType e)         { eLang = e; }
 
-    void    SetColInfo( sal_uInt16 nCount, const sal_Int32* pStart, const sal_uInt8* pFormat );
     void    SetColumnInfo( const ScCsvExpDataVec& rDataVec );
 
     /** From the import field separators obtain the one most likely to be used