Tag: cws_src680_dba24 User: oj Date: 05/03/08 02:21:17 Modified: /dba/dbaccess/source/ui/inc/ genericcontroller.hxx
Log: RESYNC: (1.32-1.33); FILE MERGED 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.20.2&r2=1.32.20.3 Delta lines: +4 -4 ------------------- --- genericcontroller.hxx 3 Feb 2005 13:52:13 -0000 1.32.20.2 +++ genericcontroller.hxx 8 Mar 2005 10:21:14 -0000 1.32.20.3 @@ -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(); @@ -434,7 +434,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]
