User: kz      
Date: 05/03/01 11:15:50

Modified:
 /dba/dbaccess/source/ui/browser/
  genericcontroller.cxx

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

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.61&r2=1.62
Delta lines:  +4 -4
-------------------
--- genericcontroller.cxx       17 Feb 2005 11:06:30 -0000      1.61
+++ genericcontroller.cxx       1 Mar 2005 19:15:47 -0000       1.62
@@ -962,10 +962,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
@@ -982,7 +982,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() )
@@ -998,7 +998,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]

Reply via email to