[Libreoffice-commits] core.git: include/sfx2

[Miklos Vajna]

 include/sfx2/sfxbasemodel.hxx |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 840810d41e7f865752d1af09c9d99e955467ce6c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jan 13 09:09:27 2015 +0100

    sfx2: stop using comphelper/implbase_var.hxx
    
    Change-Id: I3dc9e9305883c890e5e3c10ffcd8a9a5dbf09cc7

diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 028236f..a074263 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -84,13 +84,7 @@
 #include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
-
-#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
-#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
-#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 32
-#include <comphelper/implbase_var.hxx>
-#endif
-
+#include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 
 class SfxMedium;
@@ -129,7 +123,7 @@ namespace sfx { namespace intern {
                  SfxListener
 */
 
-typedef ::comphelper::WeakImplHelper32  <   css::container::XChild
+typedef ::cppu::WeakImplHelper  <   css::container::XChild
                                         ,   css::document::XDocumentPropertiesSupplier
                                         ,   css::document::XCmisDocument
                                         ,   css::rdf::XDocumentMetadataAccess