[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang sfx2/source

[Libreoffice Gerrit user]

 compilerplugins/clang/singlevalfields.results |   18 +++++++++---------
 sfx2/source/doc/objmisc.cxx                   |    8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Dec 7 16:42:16 2018 +0000
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Dec 8 12:48:34 2018 +0100

    crashtesting: doubly deleted reloadtimer
    
    since...
    
    commit 0cc702232e4799f03a468d1e8014d050a683165e
    Date:   Tue Dec 4 15:00:43 2018 +0200
    
        use unique_ptr in SfxObjectShell_Impl
    
        Change-Id: I3f3b0514bdb87f59d9c5f34d2d36dc63e8b1e33d
        Reviewed-on: https://gerrit.libreoffice.org/64527
    
    Change-Id: I00e2cd2bcbb9a252a45d31da650e327506d2990d
    Reviewed-on: https://gerrit.libreoffice.org/64780
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index a7fc00a38aa8..b3e00909e375 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1284,14 +1284,14 @@ void AutoReloadTimer_Impl::Invoke()
                 SfxStringItem(SID_REFERER, pObjSh->GetMedium()->GetName()));
         }
         SfxRequest aReq( SID_RELOAD, SfxCallMode::SLOT, aSet );
-        pObjSh->Get_Impl()->pReloadTimer = nullptr;
-        delete this;
+        // this will delete this
+        pObjSh->Get_Impl()->pReloadTimer.reset();
         pFrame->ExecReload_Impl( aReq );
         return;
     }
 
-    pObjSh->Get_Impl()->pReloadTimer = nullptr;
-    delete this;
+    // this will delete this
+    pObjSh->Get_Impl()->pReloadTimer.reset();
 }
 
 SfxModule* SfxObjectShell::GetModule() const
commit e5efd197ad403619ac274c88e2e3be648886aa3d
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Dec 7 16:55:55 2018 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Dec 8 12:48:24 2018 +0100

    Removed spurious chars
    
    $ file compilerplugins/clang/singlevalfields.results -i
    
    Before:
        compilerplugins/clang/singlevalfields.results: application/octet-stream; charset=binary
    
    After:
        compilerplugins/clang/singlevalfields.results: text/x-c; charset=iso-8859-1
    
    Then converted to UTF-8, to avoid troubles reading it with Python/Editors without
    forcing latin-1, like this:
    
    UnicodeDecodeError('utf-8', b'    SwWW8ImplReader::Read_F_DocInfo aName41
        ZULETZTGEDRUCKT
    sw/source/filter/ww8/ww8par5.cxx:1569
        SwWW8ImplReader::Read_F_DocInfo aName42
        DERNI\xc8REIMPRESSION
    ', 155, 156, 'invalid continuation byte')
    
    See here:
    https://stackoverflow.com/questions/5552555/unicodedecodeerror-invalid-continuation-byte
    
    Change-Id: Ie54c25e069b3f12b6a28e3724f5b2d323f26f737
    Reviewed-on: https://gerrit.libreoffice.org/64786
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results
index adb9651d72cc..4fd98669fde5 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -1536,7 +1536,7 @@ sw/source/filter/ww8/ww8par3.cxx:370
     1
 sw/source/filter/ww8/ww8par5.cxx:1539
     SwWW8ImplReader::Read_F_DocInfo aName10
-    
+
 sw/source/filter/ww8/ww8par5.cxx:1540
     SwWW8ImplReader::Read_F_DocInfo aName11
     TITEL
@@ -1551,13 +1551,13 @@ sw/source/filter/ww8/ww8par5.cxx:1546
     TITRO
 sw/source/filter/ww8/ww8par5.cxx:1548
     SwWW8ImplReader::Read_F_DocInfo aName20
-    
+
 sw/source/filter/ww8/ww8par5.cxx:1549
     SwWW8ImplReader::Read_F_DocInfo aName21
     ERSTELLDATUM
 sw/source/filter/ww8/ww8par5.cxx:1551
     SwWW8ImplReader::Read_F_DocInfo aName22
-    CRÉÉ
+    CRÉÉ
 sw/source/filter/ww8/ww8par5.cxx:1553
     SwWW8ImplReader::Read_F_DocInfo aName23
     CREATED
@@ -1566,7 +1566,7 @@ sw/source/filter/ww8/ww8par5.cxx:1555
     CREADO
 sw/source/filter/ww8/ww8par5.cxx:1557
     SwWW8ImplReader::Read_F_DocInfo aName30
-    
+
 sw/source/filter/ww8/ww8par5.cxx:1558
     SwWW8ImplReader::Read_F_DocInfo aName31
     ZULETZTGESPEICHERTZEIT
@@ -1581,13 +1581,13 @@ sw/source/filter/ww8/ww8par5.cxx:1564
     MODIFICADO
 sw/source/filter/ww8/ww8par5.cxx:1566
     SwWW8ImplReader::Read_F_DocInfo aName40
-    
+
 sw/source/filter/ww8/ww8par5.cxx:1567
     SwWW8ImplReader::Read_F_DocInfo aName41
     ZULETZTGEDRUCKT
 sw/source/filter/ww8/ww8par5.cxx:1569
     SwWW8ImplReader::Read_F_DocInfo aName42
-    DERNIÈREIMPRESSION
+    DERNIÈREIMPRESSION
 sw/source/filter/ww8/ww8par5.cxx:1571
     SwWW8ImplReader::Read_F_DocInfo aName43
     LASTPRINTED
@@ -1596,13 +1596,13 @@ sw/source/filter/ww8/ww8par5.cxx:1573
     HUPS PUPS
 sw/source/filter/ww8/ww8par5.cxx:1575
     SwWW8ImplReader::Read_F_DocInfo aName50
-    
+
 sw/source/filter/ww8/ww8par5.cxx:1576
     SwWW8ImplReader::Read_F_DocInfo aName51
-    ÜBERARBEITUNGSNUMMER
+    ÜBERARBEITUNGSNUMMER
 sw/source/filter/ww8/ww8par5.cxx:1578
     SwWW8ImplReader::Read_F_DocInfo aName52
-    NUMÉRODEREVISION
+    NUMÉRODEREVISION
 sw/source/filter/ww8/ww8par5.cxx:1580
     SwWW8ImplReader::Read_F_DocInfo aName53
     REVISIONNUMBER