diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:08:49 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:08:49 +0000 |
| commit | f278aa5cb92602084f8486abc5cbcb06ebe6f3f5 (patch) | |
| tree | 2b55f9a5a0481b2986b8484c16ecc2705c2052ae /embeddedobj | |
| parent | 03cd6856d383402e66bbfb92bd64d4eb8c5b4c79 (diff) | |
INTEGRATION: CWS oj14 (1.28.12); FILE MERGED
2007/06/08 07:10:22 oj 1.28.12.3: hamdle reportdefinition correctly
2007/06/04 19:06:32 oj 1.28.12.2: RESYNC: (1.28-1.30); FILE MERGED
2007/03/14 15:48:05 mav 1.28.12.1: #i75401# no need to use implementation service names any more
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 2d72ac472398..cff540aa61ae 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docholder.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: vg $ $Date: 2007-05-22 19:35:56 $ + * last change: $Author: rt $ $Date: 2007-07-06 10:08:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,6 +66,12 @@ #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> #endif +#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ +#include <com/sun/star/lang/XServiceInfo.hpp> +#endif +#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ +#include <com/sun/star/lang/XServiceInfo.hpp> +#endif #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> #endif @@ -1085,31 +1091,23 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace ) aArgs[2].Name = ::rtl::OUString::createFromAscii( "PluginMode" ); aArgs[2].Value <<= sal_Int16(1); } - - bool bIsChart = false; - uno::Reference< lang::XServiceInfo > xInfo( xDoc, uno::UNO_QUERY ); - if( xInfo.is()) - { - bIsChart = xInfo->supportsService( - ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocument")); - } - - if( bIsChart ) + ::rtl::OUString sUrl; + uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY); + if ( xServiceInfo.is() + && xServiceInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportDefinition"))) ) { - xComponentLoader->loadComponentFromURL( - ::rtl::OUString::createFromAscii( "private:factory/schart" ), - ::rtl::OUString::createFromAscii( "_self" ), - 0, - aArgs ); + sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/ReportDesign")); } + else if( xServiceInfo.is() + && xServiceInfo->supportsService( ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocument")) ) + sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/schart")); else - { - xComponentLoader->loadComponentFromURL( rtl::OUString::createFromAscii( "private:object" ), + sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:object")); + + xComponentLoader->loadComponentFromURL( sUrl, rtl::OUString::createFromAscii( "_self" ), 0, aArgs ); - } - // ::rtl::OUString aDocumentName; // uno::Reference < frame::XModel > xDocument( m_xComponent, uno::UNO_QUERY ); |