strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS filtercfg (1.65.16); FILE MERGED

Browse source 
2003/12/08 09:17:54 as 1.65.16.3: RESYNC: (1.66-1.67); FILE MERGED
2003/12/02 11:19:03 as 1.65.16.2: RESYNC: (1.65-1.66); FILE MERGED
2003/11/14 08:22:08 as 1.65.16.1: #111770# dont register for generic document services
This commit is contained in:
Kurt Zenker 2004-01-28 12:04:49 +00:00
parent 6bdb360b37
commit fd29a6dab6
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sd/source/ui/unoidl/unomodel.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: unomodel.cxx,v $
*
* $Revision: 1.68 $
* $Revision: 1.69 $
*
* last change: $Author: obo $ $Date: 2004-01-20 12:34:47 $
* last change: $Author: kz $ $Date: 2004-01-28 13:04:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1203,20 +1203,31 @@ OUString SAL_CALL SdXImpressDocument::getImplementationName()
sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& ServiceName )
throw(uno::RuntimeException)
{
return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
if (
(ServiceName.equalsAscii("com.sun.star.document.OfficeDocument" )) ||
(ServiceName.equalsAscii("com.sun.star.drawing.GenericDrawingDocument")) ||
(ServiceName.equalsAscii("com.sun.star.drawing.DrawingDocumentFactory"))
)
{
return sal_True;
}
return (
( mbImpressDoc && ServiceName.equalsAscii("com.sun.star.presentation.PresentationDocument")) ||
(!mbImpressDoc && ServiceName.equalsAscii("com.sun.star.drawing.DrawingDocument" ))
);
}
uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames() throw(uno::RuntimeException)
{
uno::Sequence< OUString > aSeq( mbImpressDoc ? 4 : 3 );
uno::Sequence< OUString > aSeq( 2 );
OUString* pServices = aSeq.getArray();
*pServices++ = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.OfficeDocument"));
*pServices++ = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocument"));
*pServices++ = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentFactory"));
if( mbImpressDoc )
*pServices++ = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"));
else
*pServices++ = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocument"));
return aSeq;
}