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

INTEGRATION: CWS impress144 (1.4.8); FILE MERGED

Browse source 
2008/06/07 20:23:12 cl 1.4.8.1: #i85768# replaced hack properties XModel and IsChart with Model and CLSID
This commit is contained in:
Vladimir Glazounov 2008-07-01 12:45:09 +00:00
parent b9dd1fb017
commit 06a5166cb0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
slideshow/source/engine/shapes/drawshape.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: drawshape.cxx,v $
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* This file is part of OpenOffice.org.
*
@ -101,7 +101,7 @@ namespace slideshow
//get the chart model
uno::Reference< beans::XPropertySet > xPropSet( xSource, uno::UNO_QUERY );
uno::Reference< frame::XModel > xChartModel;
getPropertyValue( xChartModel, xPropSet, OUSTR("XModel"));
getPropertyValue( xChartModel, xPropSet, OUSTR("Model"));
uno::Reference< lang::XMultiServiceFactory > xFact( xChartModel, uno::UNO_QUERY );
OSL_ENSURE( xFact.is(), "Chart cannot be painted pretty!\n" );
if(!xFact.is())
@ -207,9 +207,9 @@ namespace slideshow
const uno::Reference< uno::XComponentContext >& rxContext )
{
uno::Reference<beans::XPropertySet> xProp( xSource, uno::UNO_QUERY );
sal_Bool bIsChart = sal_False;
getPropertyValue( bIsChart, xProp, OUSTR("IsChart"));
if( bIsChart && local_getMetafileForChart( xSource, xContainingPage, rMtf ) )
rtl::OUString sCLSID;
getPropertyValue( sCLSID, xProp, OUSTR("CLSID"));
if( sCLSID.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("12DCAE26-281F-416F-a234-c3086127382e")) && local_getMetafileForChart( xSource, xContainingPage, rMtf ) )
return true;
return getMetaFile( xSource, xContainingPage, rMtf, mtfLoadFlags, rxContext );
}