diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 12:45:09 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 12:45:09 +0000 |
| commit | 06a5166cb07e231c387c4c0a32e35a2604ec98f1 (patch) | |
| tree | 7635506d1817c33fc830df396edbf9bef6b26744 /slideshow | |
| parent | b9dd1fb0178218438fa1d36e2645fb48354b1d2b (diff) | |
INTEGRATION: CWS impress144 (1.4.8); FILE MERGED
2008/06/07 20:23:12 cl 1.4.8.1: #i85768# replaced hack properties XModel and IsChart with Model and CLSID
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/drawshape.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 9b2f4741005d..a7ae95cfe0b2 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -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 ); } |