User: rt Date: 2008-06-06 14:08:04+0000 Modified: dba/dbaccess/source/ui/browser/dbloader.cxx
Log: INTEGRATION: CWS dba30c (1.36.8); FILE MERGED 2008/05/13 08:56:50 fs 1.36.8.2: joining changes from CWS odbmacros3 to CWS dba30c: 2008/05/08 12:59:49 fs 1.36.2.1: #i49133# don't let the controller plug itself into the frame, do this in the loader 2008/04/30 13:46:15 oj 1.36.8.1: #i88873# merge problem with titles02 and odbmacros 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.37 Delta lines: +9 -5 ------------------- --- dbloader.cxx 2008-04-10 14:05:28+0000 1.36 +++ dbloader.cxx 2008-06-06 14:08:01+0000 1.37 @@ -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> @@ -211,11 +211,12 @@ ServiceNameToImplName( URL_COMPONENT_DATASOURCEBROWSER, "org.openoffice.comp.dbu.ODatasourceBrowser" ), ServiceNameToImplName( URL_COMPONENT_QUERYDESIGN, "org.openoffice.comp.dbu.OQueryDesign" ), ServiceNameToImplName( URL_COMPONENT_TABLEDESIGN, "org.openoffice.comp.dbu.OTableDesign" ), - ServiceNameToImplName( URL_COMPONENT_RELATIONDESIGN, "org.openoffice.comp.dbu.ORelationDesign" ) + ServiceNameToImplName( URL_COMPONENT_RELATIONDESIGN, "org.openoffice.comp.dbu.ORelationDesign" ), + ServiceNameToImplName( URL_COMPONENT_VIEWDESIGN, "org.openoffice.comp.dbu.OViewDesign" ) }; 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 +269,8 @@ if ( xController.is() ) { xController->attachModel( xReportModel ); - xReportModel->connectController( xController ); - xReportModel->setCurrentController( xController ); + xReportModel->connectController( xController.get() ); + xReportModel->setCurrentController( xController.get() ); } } } @@ -329,7 +330,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]
