[Libreoffice-commits] core.git: 2 commits - crashrep/source include/tools

[Michael Stahl]

 crashrep/source/unx/main.cxx |   68 -------------------------------------------
 include/tools/ref.hxx        |    3 +
 2 files changed, 3 insertions(+), 68 deletions(-)

New commits:
commit 146c2e006ef5974ea952ce96eba0109c182db237
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 15 15:58:03 2014 +0200

    crashrep: loplugin:unreffun
    
    Change-Id: I83d4c3ee02e59d40e793288d705c3fd06ebe3219

diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index a49ef7e..65d70e2 100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -258,35 +258,6 @@ static void printSettings( const boost::unordered_map<string,string>& rSettings
 }
 #endif
 
-bool save_crash_report( const string& rFileName, const boost::unordered_map< string, string >& /*rSettings*/ )
-{
-    bool bSuccess = false;
-    FILE    *fpout = fopen( rFileName.c_str(), "w" );
-
-    if ( fpout )
-    {
-        FILE *fpin = fopen( g_szStackFile, "r" );
-
-        if ( fpin )
-        {
-            char    buf[1024];
-
-            while (fgets(buf, sizeof(buf), fpin) != NULL)
-            {
-                fputs(buf, fpout);
-            }
-
-            bSuccess = true;
-
-            fclose ( fpin );
-        }
-
-        fclose( fpout );
-    }
-
-    return bSuccess;
-}
-
 bool SendHTTPRequest(
                 FILE *fp,
                 const char *pszServer,
@@ -516,45 +487,6 @@ bool send_crash_report( const boost::unordered_map< string, string >& rSettings
 }
 
 
-static bool append_file( const char *filename, string& rString )
-{
-    FILE *fp = fopen( filename, "r" );
-    if ( fp )
-    {
-        char buf[1024];
-        while (fgets(buf, sizeof(buf), fp) != NULL)
-        {
-            rString.append( buf );
-        }
-        fclose( fp );
-        return true;
-    }
-
-    return false;
-}
-
-string crash_get_details( const boost::unordered_map< string, string >& rSettings )
-{
-    string aRet;
-
-    write_description( rSettings );
-    write_report( rSettings );
-
-    aRet.append( rSettings.find( "TITLE" )->second.c_str() );
-    aRet.append( "\n\n" );
-    append_file( g_szDescriptionFile, aRet );
-    aRet.append( "\n\n-------\n\n" );
-    append_file( g_szReportFile, aRet );
-    aRet.append( "\n\n-------\n\n" );
-    append_file( g_szStackFile, aRet );
-
-    unlink( g_szDescriptionFile );
-    unlink( g_szReportFile );
-
-    return aRet;
-}
-
-
 // ensure validity of program relative paths
 static void setup_program_dir( const char* progname )
 {
commit 9bb70e18070e40228be5c55ba9720fff72eec54c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 15 15:41:33 2014 +0200

    Revert "remove unused SvRefBase constructor"
    
    This reverts commit 09a90c2ff5d39c3ae61b4041c3b39d3da0c640c1.
    
    Apparently causes a crash in CppunitTest_sc_macros_test; it is
    suspicious that the copy ctor is not made private in this commit, since
    the compiler generated one would do something different.
    
    Change-Id: Icb1121332d83e9f08d89535e3da6e10d690ac88a

diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 6a8a01d..1cd1474 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -157,6 +157,9 @@ public:
                     SvRefBase()
                     { nRefCount = SV_NO_DELETE_REFCOUNT; }
 
+                    SvRefBase( const SvRefBase & /* rObj */ )
+                    { nRefCount = SV_NO_DELETE_REFCOUNT; }
+
     SvRefBase &     operator = ( const SvRefBase & )
                     { return *this; }