[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - config_host/config_features.h.in editeng/source sfx2/source

Marco Cecchetti marco.cecchetti at collabora.com
Fri Sep 9 20:48:37 UTC 2016


 config_host/config_features.h.in |    6 ++++++
 editeng/source/rtf/svxrtf.cxx    |    2 --
 sfx2/source/control/unoctitm.cxx |    2 --
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit e4ea53067c54698b0a8d68f4746cb3ae81b43e3d
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Wed Sep 7 15:38:30 2016 +0200

    Fixed several Werrors
    
    Change-Id: I97617049830dbab0ff04640a2eaecfbe39cf8305
    Reviewed-on: https://gerrit.libreoffice.org/28786
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 77fea97..2a60b9e 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -146,4 +146,10 @@
  */
 #define HAVE_FEATURE_COLLADA 0
 
+/*
+ * Whether we support breakpad as crash reporting lib.
+ */
+#define HAVE_FEATURE_BREAKPAD 0
+
+
 #endif
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index dd2105f..4cd43b0 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -657,7 +657,6 @@ void SvxRTFParser::ReadInfo()
     DBG_ASSERT(m_xDocProps.is(),
         "SvxRTFParser::ReadInfo: no DocumentProperties");
     OUString sStr, sComment;
-    long nVersNo = 0;
 
     while( _nOpenBrakets && IsParserWorking() )
     {
@@ -732,7 +731,6 @@ void SvxRTFParser::ReadInfo()
             break;
 
         case RTF_VERN:
-            nVersNo = nTokenValue;
             break;
 
         case RTF_EDMINS:
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 77a86ba..44cfcb99 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -80,8 +80,6 @@
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
 
-#define USAGE "file:///~/.config/libreofficedev/4/user/usage.txt"
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;


More information about the Libreoffice-commits mailing list