Tag: cws_src680_dba24 User: oj Date: 05/03/08 02:17:10 Modified: /dba/dbaccess/source/ui/browser/ genericcontroller.cxx
Log: RESYNC: (1.61-1.62); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.59.4.4&r2=1.59.4.5 Delta lines: +4 -4 ------------------- --- genericcontroller.cxx 21 Feb 2005 13:10:49 -0000 1.59.4.4 +++ genericcontroller.cxx 8 Mar 2005 10:17:08 -0000 1.59.4.5 @@ -985,10 +985,10 @@ ::dbaui::showError(_rInfo,getView(),getORB()); } // ----------------------------------------------------------------------------- -Reference< drafts::com::sun::star::frame::XLayoutManager > OGenericUnoController::getLayoutManager(const Reference< XFrame >& _xFrame) const +Reference< ::com::sun::star::frame::XLayoutManager > OGenericUnoController::getLayoutManager(const Reference< XFrame >& _xFrame) const { Reference< XPropertySet > xPropSet( _xFrame, UNO_QUERY ); - Reference< drafts::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { try @@ -1005,7 +1005,7 @@ void OGenericUnoController::loadMenu(const Reference< XFrame >& _xFrame) { - Reference< drafts::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(_xFrame); + Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(_xFrame); if ( xLayoutManager.is() ) @@ -1021,7 +1021,7 @@ } // ----------------------------------------------------------------------------- -void OGenericUnoController::onLoadedMenu(const Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager) +void OGenericUnoController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) { // not interested in } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
