[Libreoffice-commits] core.git: i18npool/inc i18npool/qa i18npool/source
Takeshi Abe
tabe at fixedpoint.jp
Tue Aug 18 00:12:50 PDT 2015
i18npool/inc/breakiteratorImpl.hxx | 4 ++--
i18npool/inc/calendarImpl.hxx | 4 ++--
i18npool/inc/cclass_unicode.hxx | 4 ++--
i18npool/inc/characterclassificationImpl.hxx | 4 ++--
i18npool/inc/collatorImpl.hxx | 4 ++--
i18npool/inc/collator_unicode.hxx | 4 ++--
i18npool/inc/defaultnumberingprovider.hxx | 4 ++--
i18npool/inc/indexentrysupplier.hxx | 4 ++--
i18npool/inc/indexentrysupplier_common.hxx | 4 ++--
i18npool/inc/inputsequencechecker.hxx | 4 ++--
i18npool/inc/localedata.hxx | 4 ++--
i18npool/inc/nativenumbersupplier.hxx | 4 ++--
i18npool/inc/numberformatcode.hxx | 4 ++--
i18npool/inc/ordinalsuffix.hxx | 4 ++--
i18npool/inc/textconversion.hxx | 4 ++--
i18npool/inc/textconversionImpl.hxx | 4 ++--
i18npool/inc/transliterationImpl.hxx | 4 ++--
i18npool/inc/transliteration_commonclass.hxx | 4 ++--
i18npool/inc/unoscripttypedetector.hxx | 4 ++--
i18npool/qa/cppunit/test_breakiterator.cxx | 1 -
i18npool/qa/cppunit/test_characterclassification.cxx | 1 -
i18npool/qa/cppunit/test_textsearch.cxx | 1 -
i18npool/source/localedata/LocaleNode.hxx | 3 ---
i18npool/source/localedata/localedata.cxx | 4 ++--
i18npool/source/localedata/saxparser.cxx | 7 +++----
i18npool/source/search/textsearch.hxx | 4 ++--
26 files changed, 45 insertions(+), 52 deletions(-)
New commits:
commit 0a4c482a8aa2e421668a6607916c9656a3f18b19
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Aug 15 15:26:43 2015 +0900
i18npool: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: I0381de7fde198df74556355984bdaba2ecdedd4b
Reviewed-on: https://gerrit.libreoffice.org/17768
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index f97133c..4dc6ee9 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <com/sun/star/i18n/CharType.hpp>
#include <com/sun/star/i18n/XLocaleData.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
// class BreakIterator
-class BreakIteratorImpl : public cppu::WeakImplHelper2
+class BreakIteratorImpl : public cppu::WeakImplHelper
<
XBreakIterator,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 0f67c1e..7d5964f 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/i18n/CalendarDisplayCode.hpp>
#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <vector>
@@ -34,7 +34,7 @@
namespace com { namespace sun { namespace star { namespace i18n {
-class CalendarImpl : public cppu::WeakImplHelper2
+class CalendarImpl : public cppu::WeakImplHelper
<
com::sun::star::i18n::XCalendar4,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 3ff2aed..90f2c0e 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
#include <com/sun/star/i18n/XCharacterClassification.hpp>
#include <com/sun/star/i18n/XLocaleData4.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <transliteration_body.hxx>
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
typedef sal_uInt32 UPT_FLAG_TYPE;
-class cclass_Unicode : public cppu::WeakImplHelper2 < XCharacterClassification, css::lang::XServiceInfo >
+class cclass_Unicode : public cppu::WeakImplHelper < XCharacterClassification, css::lang::XServiceInfo >
{
public:
cclass_Unicode(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 59f84b7..091d7df 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_I18NPOOL_INC_CHARACTERCLASSIFICATIONIMPL_HXX
#include <com/sun/star/i18n/XCharacterClassification.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
#include <com/sun/star/i18n/KCharacterType.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -28,7 +28,7 @@
namespace com { namespace sun { namespace star { namespace i18n {
-class CharacterClassificationImpl : public cppu::WeakImplHelper2
+class CharacterClassificationImpl : public cppu::WeakImplHelper
<
XCharacterClassification,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 60fd79f..0acd37a 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/i18n/XCollator.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <sal/alloca.h>
#include <vector>
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
// ----------------------------------------------------
// class CollatorImpl
// ----------------------------------------------------
-class CollatorImpl : public cppu::WeakImplHelper2
+class CollatorImpl : public cppu::WeakImplHelper
<
XCollator,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index 951de9c..dd67088 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/i18n/XCollator.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/module.h>
#include <unicode/tblcoll.h>
@@ -33,7 +33,7 @@
namespace com { namespace sun { namespace star { namespace i18n {
-class Collator_Unicode : public cppu::WeakImplHelper2 < XCollator, com::sun::star::lang::XServiceInfo >
+class Collator_Unicode : public cppu::WeakImplHelper < XCollator, com::sun::star::lang::XServiceInfo >
{
public:
// Constructors
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 572b1d2..7e1269d 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/text/XNumberingFormatter.hpp>
#include <com/sun/star/text/XNumberingTypeInfo.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/i18n/XTransliteration.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -31,7 +31,7 @@
namespace com { namespace sun { namespace star { namespace i18n {
-class DefaultNumberingProvider : public cppu::WeakImplHelper4
+class DefaultNumberingProvider : public cppu::WeakImplHelper
<
com::sun::star::text::XDefaultNumberingProvider,
com::sun::star::text::XNumberingFormatter,
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index 56f4fcc..f350326 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_HXX
#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
// class IndexEntrySupplier
-class IndexEntrySupplier : public cppu::WeakImplHelper2
+class IndexEntrySupplier : public cppu::WeakImplHelper
<
com::sun::star::i18n::XExtendedIndexEntrySupplier,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index a743f55..4464213 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_COMMON_HXX
#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <collatorImpl.hxx>
@@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
// class IndexEntrySupplier_Common
-class IndexEntrySupplier_Common : public cppu::WeakImplHelper2
+class IndexEntrySupplier_Common : public cppu::WeakImplHelper
<
com::sun::star::i18n::XExtendedIndexEntrySupplier,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index e985177..2daeeb0 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HXX
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
// class InputSequenceCheckerImpl
-class InputSequenceCheckerImpl : public cppu::WeakImplHelper2
+class InputSequenceCheckerImpl : public cppu::WeakImplHelper
<
com::sun::star::i18n::XExtendedInputSequenceChecker,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index e5adbe7..fb567ad 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/i18n/XLocaleData4.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppu/macros.hxx>
#include <com/sun/star/uno/Reference.h>
@@ -62,7 +62,7 @@ inline bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::
return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant;
};
-class LocaleDataImpl : public cppu::WeakImplHelper2
+class LocaleDataImpl : public cppu::WeakImplHelper
<
com::sun::star::i18n::XLocaleData4,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index 14d17f6..189ead2c 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
#include <com/sun/star/i18n/NativeNumberMode.hpp>
#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
namespace com { namespace sun { namespace star { namespace i18n {
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
// ----------------------------------------------------
// class NativeNumberSupplierService
// ----------------------------------------------------
-class NativeNumberSupplierService : public cppu::WeakImplHelper2
+class NativeNumberSupplierService : public cppu::WeakImplHelper
<
com::sun::star::i18n::XNativeNumberSupplier,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index 466acb2..fa1e43a 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -22,14 +22,14 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/i18n/XNumberFormatCode.hpp>
#include <com/sun/star/i18n/XLocaleData4.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-class NumberFormatCodeMapper : public cppu::WeakImplHelper2
+class NumberFormatCodeMapper : public cppu::WeakImplHelper
<
::com::sun::star::i18n::XNumberFormatCode,
::com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index 36a6d18..02d4553 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -21,14 +21,14 @@
#define INCLUDED_I18NPOOL_INC_ORDINALSUFFIX_HXX
#include <com/sun/star/i18n/XOrdinalSuffix.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/Locale.hpp>
namespace com { namespace sun { namespace star { namespace i18n {
-class OrdinalSuffixService : public cppu::WeakImplHelper2
+class OrdinalSuffixService : public cppu::WeakImplHelper
<
XOrdinalSuffix,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index a7f81ce..fa050de 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/linguistic2/XConversionDictionary.hpp>
#include <com/sun/star/linguistic2/XConversionDictionaryList.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/module.h>
namespace com { namespace sun { namespace star { namespace i18n {
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
// class TextConversionService
-class TextConversionService: public cppu::WeakImplHelper2
+class TextConversionService: public cppu::WeakImplHelper
<
com::sun::star::i18n::XExtendedTextConversion,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index 93fdabf..366ba81 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -23,14 +23,14 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/i18n/XExtendedTextConversion.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
namespace com { namespace sun { namespace star { namespace i18n {
// class TextConversion
-class TextConversionImpl : public cppu::WeakImplHelper2
+class TextConversionImpl : public cppu::WeakImplHelper
<
com::sun::star::i18n::XExtendedTextConversion,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index d31fa9f..fb21601 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -21,7 +21,7 @@
#include <com/sun/star/i18n/XLocaleData4.hpp>
#include <com/sun/star/i18n/XExtendedTransliteration.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <sal/types.h>
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
#define RETURN_DEBUG_NUMBER
#endif
-class TransliterationImpl : public cppu::WeakImplHelper2
+class TransliterationImpl : public cppu::WeakImplHelper
<
com::sun::star::i18n::XExtendedTransliteration,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index d9580b2..32e511a 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.hxx
@@ -22,13 +22,13 @@
#include <com/sun/star/i18n/XExtendedTransliteration.hpp>
#include <com/sun/star/i18n/TransliterationType.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ustrbuf.h>
#include <rtl/ustring.hxx>
namespace com { namespace sun { namespace star { namespace i18n {
-class transliteration_commonclass : public cppu::WeakImplHelper2<
+class transliteration_commonclass : public cppu::WeakImplHelper<
com::sun::star::i18n::XExtendedTransliteration,
com::sun::star::lang::XServiceInfo
>
diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx
index eae7a05..0f6c84b 100644
--- a/i18npool/inc/unoscripttypedetector.hxx
+++ b/i18npool/inc/unoscripttypedetector.hxx
@@ -22,12 +22,12 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/i18n/XScriptTypeDetector.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
// class UnoScriptTypeDetector
-class UnoScriptTypeDetector : public cppu::WeakImplHelper2
+class UnoScriptTypeDetector : public cppu::WeakImplHelper
<
::com::sun::star::i18n::XScriptTypeDetector,
::com::sun::star::lang::XServiceInfo
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index d06c2b2..22aa0d7 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/i18n/XBreakIterator.hpp>
diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx
index 0de2bbb..24c53c4 100644
--- a/i18npool/qa/cppunit/test_characterclassification.cxx
+++ b/i18npool/qa/cppunit/test_characterclassification.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/i18n/XCharacterClassification.hpp>
diff --git a/i18npool/qa/cppunit/test_textsearch.cxx b/i18npool/qa/cppunit/test_textsearch.cxx
index 3de164a..8290930 100644
--- a/i18npool/qa/cppunit/test_textsearch.cxx
+++ b/i18npool/qa/cppunit/test_textsearch.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/util/SearchFlags.hpp>
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index cbecd44..2be8140 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -28,9 +28,6 @@
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
-
using namespace ::std;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index f831309..453df39 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1327,7 +1327,7 @@ LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) thro
// OutlineNumbering helper class
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace com{ namespace sun{ namespace star{ namespace lang {
struct Locale;
@@ -1348,7 +1348,7 @@ struct OutlineNumberingLevel_Impl
sal_Int32 nNatNum;
};
-class OutlineNumbering : public cppu::WeakImplHelper1 < container::XIndexAccess >
+class OutlineNumbering : public cppu::WeakImplHelper < container::XIndexAccess >
{
// OutlineNumbering helper class
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index e8474e9..f3d4dcea 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -37,8 +37,7 @@
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/diagnose.h>
@@ -59,7 +58,7 @@ using namespace ::com::sun::star::io;
/************
* Sequence of bytes -> InputStream
************/
-class OInputStream : public WeakImplHelper1 < XInputStream >
+class OInputStream : public WeakImplHelper < XInputStream >
{
public:
explicit OInputStream( const Sequence< sal_Int8 >&seq )
@@ -153,7 +152,7 @@ Reference< XInputStream > createStreamFromFile(
class TestDocumentHandler :
- public WeakImplHelper3< XExtendedDocumentHandler , XEntityResolver , XErrorHandler >
+ public WeakImplHelper< XExtendedDocumentHandler , XEntityResolver , XErrorHandler >
{
public:
TestDocumentHandler(const char* locale, const char* outFile )
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index 4b3a93d..26837eb 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_I18NPOOL_SOURCE_SEARCH_TEXTSEARCH_HXX
#define INCLUDED_I18NPOOL_SOURCE_SEARCH_TEXTSEARCH_HXX
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/util/XTextSearch.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <com/sun/star/i18n/XExtendedTransliteration.hpp>
@@ -37,7 +37,7 @@ typedef U_ICU_NAMESPACE::UnicodeString IcuUniString;
class WLevDistance;
typedef ::std::map< sal_Unicode, sal_Int32 > TextSearchJumpTable;
-class TextSearch: public cppu::WeakImplHelper2
+class TextSearch: public cppu::WeakImplHelper
<
::com::sun::star::util::XTextSearch,
::com::sun::star::lang::XServiceInfo
More information about the Libreoffice-commits
mailing list