User: kz      
Date: 05/03/01 11:16:55

Modified:
 /dba/dbaccess/source/ui/inc/
  genericcontroller.hxx

Log:
 INTEGRATION: CWS removedrafts (1.32.32); FILE MERGED
 2005/02/17 12:40:53 cd 1.32.32.1: #i42557# move UNOIDL types from drafts to com

File Changes:

Directory: /dba/dbaccess/source/ui/inc/
=======================================

File [changed]: genericcontroller.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/genericcontroller.hxx?r1=1.32&r2=1.33
Delta lines:  +4 -4
-------------------
--- genericcontroller.hxx       5 Jan 2005 12:36:24 -0000       1.32
+++ genericcontroller.hxx       1 Mar 2005 19:16:51 -0000       1.33
@@ -73,8 +73,8 @@
 #ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTOR_HPP_
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_
-#include <drafts/com/sun/star/frame/XLayoutManager.hpp>
+#ifndef _COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_
+#include <com/sun/star/frame/XLayoutManager.hpp>
 #endif
 #ifndef _COM_SUN_STAR_FRAME_XDISPATCHINFORMATIONPROVIDER_HPP_
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
@@ -296,7 +296,7 @@
             @param _xLayoutManager
                                The layout manager.
                */
-               virtual void                    onLoadedMenu(const 
::com::sun::star::uno::Reference< drafts::com::sun::star::frame::XLayoutManager 
>& _xLayoutManager);
+        virtual void                   onLoadedMenu(const 
::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& 
_xLayoutManager);
 
                // all the features which should be handled by this class
                virtual void                    describeSupportedFeatures();
@@ -427,7 +427,7 @@
                        @return
                                The layout manager of the frame, can be <NULL/> 
if the frame isn't initialized.
                */
-               ::com::sun::star::uno::Reference< 
drafts::com::sun::star::frame::XLayoutManager > getLayoutManager(const 
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame) 
const;
+        ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XLayoutManager > getLayoutManager(const 
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame) 
const;
 
                // IController
                virtual void executeUnChecked(const 
::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue>& aArgs);




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to