[Libreoffice-commits] core.git: include/oox oox/inc oox/source

Takeshi Abe tabe at fixedpoint.jp
Sat Aug 22 23:06:24 PDT 2015 

 include/oox/core/contexthandler.hxx       |    4 ++--
 include/oox/core/fasttokenhandler.hxx     |    4 ++--
 include/oox/core/filterbase.hxx           |    4 ++--
 include/oox/core/filterdetect.hxx         |    7 +++----
 include/oox/core/fragmenthandler.hxx      |    4 ++--
 include/oox/vml/vmlinputstream.hxx        |    4 ++--
 oox/inc/pch/precompiled_oox.hxx           |    3 +--
 oox/source/core/recordparser.cxx          |    4 ++--
 oox/source/crypto/DocumentDecryption.cxx  |    6 +++---
 oox/source/docprop/docprophandler.hxx     |    4 ++--
 oox/source/docprop/ooxmldocpropimport.hxx |    4 ++--
 oox/source/export/ColorPropertySet.cxx    |    4 ++--
 oox/source/export/ColorPropertySet.hxx    |    4 ++--
 oox/source/helper/propertymap.cxx         |    4 ++--
 oox/source/helper/textinputstream.cxx     |    4 ++--
 oox/source/ole/olestorage.cxx             |    4 ++--
 oox/source/ole/vbamodule.cxx              |    1 -
 oox/source/shape/ShapeContextHandler.hxx  |    4 ++--
 18 files changed, 35 insertions(+), 38 deletions(-)

New commits:
commit 7f4e0d6aa29da640408cf4cc84b2fc1a0c11f8ba
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Sat Aug 22 17:06:40 2015 +0900

    oox: tdf#88206 replace cppu::WeakImplHelper* etc.
    
    with the variadic variants.
    
    Change-Id: I8a82df7ea24874d8e246dc983418d872f1943c8e
    Reviewed-on: https://gerrit.libreoffice.org/17919
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index 85f1552..a6de85d 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
 
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
@@ -48,7 +48,7 @@ typedef ::rtl::Reference< ContextHandler > ContextHandlerRef;
 struct FragmentBaseData;
 typedef std::shared_ptr< FragmentBaseData > FragmentBaseDataRef;
 
-typedef ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastContextHandler > ContextHandler_BASE;
+typedef ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastContextHandler > ContextHandler_BASE;
 
 class OOX_DLLPUBLIC ContextHandler : public ContextHandler_BASE
 {
diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx
index cdb9682..ff6fd2c 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -23,7 +23,7 @@
 #include <oox/dllapi.h>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <sax/fastattribs.hxx>
 
 namespace oox { class TokenMap; }
@@ -37,7 +37,7 @@ namespace core {
     that provides access to the tokens generated from the internal token name list.
  */
 class OOX_DLLPUBLIC FastTokenHandler :
-    public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo,
+    public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,
                                     ::com::sun::star::xml::sax::XFastTokenHandler >,
     public sax_fastparser::FastTokenHandlerBase
 {
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 0273716..471377f 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <oox/helper/binarystreambase.hxx>
 #include <oox/helper/storagebase.hxx>
@@ -82,7 +82,7 @@ enum OoxmlVersion
 
 struct FilterBaseImpl;
 
-typedef ::cppu::WeakImplHelper5<
+typedef ::cppu::WeakImplHelper<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::lang::XInitialization,
         ::com::sun::star::document::XImporter,
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index 23bd36e..622027f 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -24,8 +24,7 @@
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
@@ -47,7 +46,7 @@ namespace core {
     It takes a reference to the filter string object via its constructor, and
     puts the name of the detected filter to it, if it successfully finds one.
  */
-class FilterDetectDocHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastDocumentHandler >
+class FilterDetectDocHandler : public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastDocumentHandler >
 {
 public:
     explicit            FilterDetectDocHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, OUString& rFilter );
@@ -85,7 +84,7 @@ private:
 
 
 
-class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
+class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
 {
 public:
     explicit            FilterDetect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx
index 99ad120..26c9edb 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX
 
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <oox/core/contexthandler.hxx>
 #include <oox/core/relations.hxx>
 #include <oox/dllapi.h>
@@ -74,7 +74,7 @@ struct RecordInfo
 
 
 
-typedef ::cppu::ImplInheritanceHelper1< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandler_BASE;
+typedef ::cppu::ImplInheritanceHelper< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandler_BASE;
 
 class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE
 {
diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx
index 3f7efe0..fa1ff1d 100644
--- a/include/oox/vml/vmlinputstream.hxx
+++ b/include/oox/vml/vmlinputstream.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_VML_VMLINPUTSTREAM_HXX
 
 #include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/string.hxx>
 
 namespace com { namespace sun { namespace star {
@@ -51,7 +51,7 @@ namespace vml {
     3)  Line breaks represented by a single <br> element (without matching
         </br> element) are replaced by a literal LF character.
  */
-class InputStream : public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream >
+class InputStream : public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream >
 {
 public:
     explicit            InputStream(
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 990b686..7b81b90 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -348,8 +348,7 @@
 #include <comphelper/string.hxx>
 #include <config_folders.h>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cstdio>
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 708632b..4fe4b04 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -22,7 +22,7 @@
 #include <vector>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/xml/sax/XLocator.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 #include "oox/core/fragmenthandler.hxx"
 
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace prv {
 
-class Locator : public ::cppu::WeakImplHelper1< XLocator >
+class Locator : public ::cppu::WeakImplHelper< XLocator >
 {
 public:
     inline explicit         Locator( RecordParser* pParser ) : mpParser( pParser ) {}
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index d582c7d..1d68344 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -12,7 +12,7 @@
 
 #include <comphelper/sequenceashashmap.hxx>
 #include <sax/tools/converter.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -44,7 +44,7 @@ vector<sal_uInt8> convertToVector(Sequence<sal_Int8>& input)
     return vector<sal_uInt8>(inputArray, inputArray + input.getLength());
 }
 
-class AgileTokenHandler : public cppu::WeakImplHelper1< XFastTokenHandler >
+class AgileTokenHandler : public cppu::WeakImplHelper< XFastTokenHandler >
 {
 public:
     virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE
@@ -58,7 +58,7 @@ public:
     }
 };
 
-class AgileDocumentHandler : public ::cppu::WeakImplHelper1< XFastDocumentHandler >
+class AgileDocumentHandler : public ::cppu::WeakImplHelper< XFastDocumentHandler >
 {
     AgileEncryptionInfo& mInfo;
 
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index daabc03..26d3593 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "oox/token/namespaces.hxx"
 #include "oox/token/tokens.hxx"
@@ -39,7 +39,7 @@ namespace docprop {
 #define DC_TOKEN( token )       (::oox::NMSP_dc | XML_##token)
 #define DCT_TOKEN( token )      (::oox::NMSP_dcTerms | XML_##token)
 
-class OOXMLDocPropHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastDocumentHandler >
+class OOXMLDocPropHandler : public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastDocumentHandler >
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocProp;
diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx
index 861825a..c186eb0 100644
--- a/oox/source/docprop/ooxmldocpropimport.hxx
+++ b/oox/source/docprop/ooxmldocpropimport.hxx
@@ -24,13 +24,13 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace oox {
 namespace docprop {
 
 class DocumentPropertiesImport :
-    public ::cppu::WeakImplHelper2<
+    public ::cppu::WeakImplHelper<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::document::XOOXMLDocumentPropertiesImporter >
 {
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index aa32446..ebdfb1cb 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -21,7 +21,7 @@
 
 #include "ColorPropertySet.hxx"
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/drawing/FillStyle.hpp>
 
@@ -34,7 +34,7 @@ using ::com::sun::star::uno::RuntimeException;
 
 namespace
 {
-class lcl_ColorPropertySetInfo : public ::cppu::WeakImplHelper1<
+class lcl_ColorPropertySetInfo : public ::cppu::WeakImplHelper<
         XPropertySetInfo  >
 {
 public:
diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx
index 0463163..522a0e0 100644
--- a/oox/source/export/ColorPropertySet.hxx
+++ b/oox/source/export/ColorPropertySet.hxx
@@ -22,7 +22,7 @@
 
 // FIXME? this file is identical to xmloff/source/chart/ColorPropertySet.hxx
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -32,7 +32,7 @@ namespace oox
 namespace drawingml
 {
 
-class ColorPropertySet : public ::cppu::WeakImplHelper2<
+class ColorPropertySet : public ::cppu::WeakImplHelper<
         ::com::sun::star::beans::XPropertySet,
         ::com::sun::star::beans::XPropertyState >
 {
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 22e8e6f..8fc744f 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -45,7 +45,7 @@ using ::com::sun::star::text::WritingMode;
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include "oox/token/propertynames.hxx"
@@ -97,7 +97,7 @@ namespace {
     Properties of all names and types can be set and later retrieved.
     TODO: move this to comphelper or better find an existing implementation
  */
-class GenericPropertySet : public ::cppu::WeakImplHelper2< XPropertySet, XPropertySetInfo >
+class GenericPropertySet : public ::cppu::WeakImplHelper< XPropertySet, XPropertySetInfo >
 {
 public:
     explicit            GenericPropertySet( const PropertyMap& rPropMap );
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index b292e56..10bda13 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/TextInputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 #include <rtl/tencinfo.h>
 #include "oox/helper/binaryinputstream.hxx"
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::uno;
 
 namespace {
 
-typedef ::cppu::WeakImplHelper1< XInputStream > UnoBinaryInputStream_BASE;
+typedef ::cppu::WeakImplHelper< XInputStream > UnoBinaryInputStream_BASE;
 
 /** Implementation of a UNO input stream wrapping a binary input stream.
  */
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index 2a961cb..7e254a3 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
@@ -51,7 +51,7 @@ namespace {
 /** Implementation of an OLE storage output stream that inserts itself into the
     storage when it is closed.
  */
-class OleOutputStream : public ::cppu::WeakImplHelper2< XSeekable, XOutputStream >
+class OleOutputStream : public ::cppu::WeakImplHelper< XSeekable, XOutputStream >
 {
 public:
     explicit            OleOutputStream(
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 8a0c83e..f8b8535 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
 #include <com/sun/star/awt/KeyEvent.hpp>
 #include <osl/diagnose.h>
-#include <cppuhelper/implbase1.hxx>
 #include <filter/msfilter/msvbahelper.hxx>
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/storagebase.hxx"
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index ad57ad9..72b9f88 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -21,7 +21,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
 #include "oox/drawingml/graphicshapecontext.hxx"
 #include "oox/drawingml/shape.hxx"
@@ -47,7 +47,7 @@ public:
 };
 
 class ShapeContextHandler:
-    public ::cppu::WeakImplHelper2< css::xml::sax::XFastShapeContextHandler,
+    public ::cppu::WeakImplHelper< css::xml::sax::XFastShapeContextHandler,
                                     css::lang::XServiceInfo >
 {
 public:

More information about the Libreoffice-commits mailing list