#i88015# buildfixes

2 files changed, 24 insertions, 24 deletions

diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx
index c2afc03ea..4aba58a1e 100644
--- a/dbaccess/inc/genericcontroller.hxx
+++ b/dbaccess/inc/genericcontroller.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: genericcontroller.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: kz $ $Date: 2008-04-04 14:29:58 $
+ *  last change: $Author: kz $ $Date: 2008-04-08 12:42:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -67,8 +67,7 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/stl_types.hxx>
 #include <connectivity/dbexception.hxx>
-#include <cppuhelper/compbase10.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase11.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 #include <boost/optional.hpp>
@@ -186,27 +185,25 @@ namespace dbaui
         }
     };
 
-
-    typedef ::cppu::WeakComponentImplHelper10	<	::com::sun::star::frame::XDispatch
-                                                ,	::com::sun::star::frame::XDispatchProviderInterceptor
-                                                ,	::com::sun::star::util::XModifyListener
-                                                ,	::com::sun::star::view::XSelectionSupplier
-                                                ,	::com::sun::star::frame::XFrameActionListener
-                                                ,	::com::sun::star::lang::XInitialization
-                                                ,	::com::sun::star::lang::XServiceInfo
-                                                ,	::com::sun::star::frame::XDispatchInformationProvider
+    typedef ::comphelper::OBaseMutex	OGenericUnoController_MBASE;
+
+    typedef ::cppu::WeakComponentImplHelper11   <   ::com::sun::star::frame::XDispatch
+                                                ,   ::com::sun::star::frame::XDispatchProviderInterceptor
+                                                ,   ::com::sun::star::util::XModifyListener
+                                                ,   ::com::sun::star::view::XSelectionSupplier
+                                                ,   ::com::sun::star::frame::XFrameActionListener
+                                                ,   ::com::sun::star::lang::XInitialization
+                                                ,   ::com::sun::star::lang::XServiceInfo
+                                                ,   ::com::sun::star::frame::XDispatchInformationProvider
+                                                ,   ::com::sun::star::frame::XController
                                                 ,   ::com::sun::star::frame::XTitle
                                                 ,   ::com::sun::star::frame::XTitleChangeBroadcaster
-                                                >	OGenericUnoController_COMPBASE;
-
-    typedef ::cppu::ImplHelper1	<	::com::sun::star::frame::XController
-                                >	OGenericUnoController_CTRBASE;
+                                                >   OGenericUnoController_Base;
 
     // ====================================================================
     class DBACCESS_DLLPUBLIC OGenericUnoController
                                 :public OGenericUnoController_MBASE
                                 ,public OGenericUnoController_Base
-                                ,public OGenericUnoController_CTRBASE
                                 ,public IController
     {
     private:
@@ -502,8 +499,6 @@ namespace dbaui
         virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 ) throw (::com::sun::star::uno::RuntimeException);
 
-    protected:
-        OGenericUnoController();    // never implemented
         // XTitle
         virtual ::rtl::OUString SAL_CALL getTitle(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException);
@@ -511,6 +506,9 @@ namespace dbaui
         // XTitleChangeBroadcaster
         virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL removeTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    protected:
+        OGenericUnoController();    // never implemented
     };
 }
 
diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx
index 5b8845165..d845b016d 100644
--- a/dbaccess/inc/singledoccontroller.hxx
+++ b/dbaccess/inc/singledoccontroller.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: singledoccontroller.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: kz $ $Date: 2008-04-04 14:29:15 $
+ *  last change: $Author: kz $ $Date: 2008-04-08 12:42:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -178,6 +178,7 @@ namespace dbaui
 
         // ::com::sun::star::frame::XController
         virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL attachModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel) throw( ::com::sun::star::uno::RuntimeException );
 
         // XScriptInvocationContext
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (::com::sun::star::uno::RuntimeException);
@@ -214,10 +215,11 @@ namespace dbaui
         // XTypeProvider
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
 
+    protected:
+        sal_Int32 getCurrentStartNumber() const;
+
     private:
         OSingleDocumentController();    // never implemented
-
-        sal_Int32 getCurrentStartNumber() const;
     };
 
 //........................................................................