Tag: cws_dev300_odbmacros3 User: fs Date: 2008-05-08 12:59:52+0000 Modified: dba/dbaccess/source/ui/browser/dbloader.cxx
Log: #i49133# don't let the controller plug itself into the frame, do this in the loader File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dbloader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dbloader.cxx?r1=1.36&r2=1.36.2.1 Delta lines: +9 -6 ------------------- --- dbloader.cxx 2008-04-10 14:05:28+0000 1.36 +++ dbloader.cxx 2008-05-08 12:59:49+0000 1.36.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbloader.cxx,v $ - * $Revision: 1.36 $ + * $Revision: 1.36.2.1 $ * * This file is part of OpenOffice.org. * @@ -40,7 +40,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/document/XEventListener.hpp> -#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrameLoader.hpp> #include <com/sun/star/frame/XLoadEventListener.hpp> @@ -215,7 +215,7 @@ }; INetURLObject aParser( rURL ); - Reference< XController > xController; + Reference< XController2 > xController; const ::rtl::OUString sComponentURL( aParser.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); for ( size_t i=0; i < sizeof( aImplementations ) / sizeof( aImplementations[0] ); ++i ) @@ -268,8 +268,8 @@ if ( xController.is() ) { xController->attachModel( xReportModel ); - xReportModel->connectController( xController ); - xReportModel->setCurrentController( xController ); + xReportModel->connectController( xController.get() ); + xReportModel->setCurrentController( xController.get() ); } } } @@ -329,7 +329,10 @@ if ( bSuccess ) { if ( xController.is() && rFrame.is() ) + { + rFrame->setComponent( xController->getComponentWindow(), xController.get() ); xController->attachFrame(rFrame); + } if ( xDatabaseDocument.is() ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
