[Libreoffice-commits] core.git: 3 commits - include/sfx2 sc/inc sw/qa sw/source ucb/source

[Caolán McNamara]

 include/sfx2/sfxbasecontroller.hxx   |    4 ++--
 sc/inc/chart2uno.hxx                 |   10 ++++------
 sw/qa/core/data/ww6/pass/crash-3.doc |binary
 sw/source/filter/ww8/ww8par2.cxx     |    1 +
 ucb/source/sorter/sortresult.hxx     |    4 ++--
 ucb/source/ucp/file/filrset.hxx      |    8 +++-----
 6 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit 6405203750f7f779a3655bc5f415e8e0a2071d1b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 21 13:04:57 2015 +0100

    fix another ww6 crash
    
    Change-Id: I47b4ffb1d96041d51dde313c080ed1d9cd4000be

diff --git a/sw/qa/core/data/ww6/pass/crash-3.doc b/sw/qa/core/data/ww6/pass/crash-3.doc
new file mode 100644
index 0000000..8646b7a
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/crash-3.doc differ
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index a58cf9f..5a8072c 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4327,6 +4327,7 @@ void WW8RStyle::ImportOldFormatStyles()
         {
             rSt.SeekRel(cbPapx-nByteCount);
             nByteCount += cbPapx-nByteCount;
+            break;
         }
 
         sal_uInt8 cb(0);
commit 773d5c69261f0b2511c7a0124804449bf664bfb5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 21 12:10:18 2015 +0100

    remove last WeakImplHelper8 uses
    
    Change-Id: I7ecadedb77832fb3073870880dbfba121fdae826

diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 4dfdbeb..03e988c 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -42,9 +42,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 #include <svl/itemprop.hxx>
 
@@ -59,7 +57,7 @@ class ScDocument;
 
 // DataProvider
 class ScChart2DataProvider : public
-                ::cppu::WeakImplHelper5<
+                ::cppu::WeakImplHelper<
                     ::com::sun::star::chart2::data::XDataProvider,
                     ::com::sun::star::chart2::data::XSheetDataProvider,
                     ::com::sun::star::chart2::data::XRangeXMLConversion,
@@ -193,7 +191,7 @@ private:
 
 // DataSource
 class ScChart2DataSource : public
-                ::cppu::WeakImplHelper2<
+                ::cppu::WeakImplHelper<
                     ::com::sun::star::chart2::data::XDataSource,
                     ::com::sun::star::lang::XServiceInfo>,
                 SfxListener
@@ -234,7 +232,7 @@ private:
 
 // DataSequence
 class ScChart2DataSequence : public
-                ::cppu::WeakImplHelper8<
+                ::cppu::WeakImplHelper<
                     ::com::sun::star::chart2::data::XDataSequence,
                     ::com::sun::star::chart2::data::XTextualDataSequence,
                     ::com::sun::star::chart2::data::XNumericalDataSequence,
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index a225fb9..f5f7469 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/ucb/NumberedSortingInfo.hpp>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/ucb/ListAction.hpp>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <deque>
 
 namespace cppu {
@@ -113,7 +113,7 @@ public:
 
 
 
-class SortedResultSet: public cppu::WeakImplHelper8 <
+class SortedResultSet: public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::lang::XComponent,
     css::ucb::XContentAccess,
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index a50645b..c8e104a 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -35,16 +35,14 @@
 #include <com/sun/star/beans/Property.hpp>
 #include "filrow.hxx"
 #include "filnot.hxx"
-#include <cppuhelper/implbase8.hxx>
-
-
+#include <cppuhelper/implbase.hxx>
 
 namespace fileaccess {
 
-    class Notifier;
+class Notifier;
 
 class XResultSet_impl : public Notifier,
-        public cppu::WeakImplHelper8< css::lang::XEventListener,
+        public cppu::WeakImplHelper<  css::lang::XEventListener,
                                       css::sdbc::XRow,
                                       css::sdbc::XResultSet,
                                       css::ucb::XDynamicResultSet,
commit 75899a2b57ae54ac7d9d2ae27183c915ee238455
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 21 12:08:06 2015 +0100

    remove last WeakImplHelper10 use
    
    Change-Id: I7b58249a93b5014d3e930bc5d041d8d80aed6512

diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index d387d80..7b5ca73 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/implbase10.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
@@ -63,7 +63,7 @@ sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID );
 //  class declarations
 
 
-typedef ::cppu::WeakImplHelper10 <   css::frame::XController2
+typedef ::cppu::WeakImplHelper  <   css::frame::XController2
                                 ,   css::frame::XControllerBorder
                                 ,   css::frame::XDispatchProvider
                                 ,   css::task::XStatusIndicatorSupplier