diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-25 07:23:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-25 07:23:14 +0000 |
| commit | 60bab7f4ad7835a0cd796b4278890d050415496c (patch) | |
| tree | 5e73c56ac6cc588619a999ce32523791e5a64f0d /svx/source/unodraw/UnoGraphicExporter.cxx | |
| parent | d701c628447a801b6d6679cba5a97a51c5803128 (diff) | |
INTEGRATION: CWS chart07 (1.38.16); FILE MERGED
2007/07/12 13:16:47 iha 1.38.16.1: #i75867# Poor quality of OLE's alternative view for 3D scenes
Diffstat (limited to 'svx/source/unodraw/UnoGraphicExporter.cxx')
| -rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.cxx | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index f17972418ec7..395bceae41fa 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: UnoGraphicExporter.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: hr $ $Date: 2007-06-27 19:21:23 $ + * last change: $Author: rt $ $Date: 2007-07-25 08:23:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -650,6 +650,8 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicRenderer > xGraphicRenderer; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteractionHandler; + Fraction aScaleX( mpDoc->GetScaleFraction() ); + Fraction aScaleY( mpDoc->GetScaleFraction() ); { sal_Int32 nArgs = aDescriptor.getLength(); const PropertyValue* pValues = aDescriptor.getConstArray(); @@ -766,6 +768,30 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes mpCurrentPage = pUnoPage->GetSdrPage(); } } + else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleXNumerator" ) ) ) + { + sal_Int32 nVal = 1; + if( pDataValues->Value >>= nVal ) + aScaleX = Fraction( nVal, aScaleX.GetDenominator() ); + } + else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleXDenominator" ) ) ) + { + sal_Int32 nVal = 1; + if( pDataValues->Value >>= nVal ) + aScaleX = Fraction( aScaleX.GetNumerator(), nVal ); + } + else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleYNumerator" ) ) ) + { + sal_Int32 nVal = 1; + if( pDataValues->Value >>= nVal ) + aScaleY = Fraction( nVal, aScaleY.GetDenominator() ); + } + else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ScaleYDenominator" ) ) ) + { + sal_Int32 nVal = 1; + if( pDataValues->Value >>= nVal ) + aScaleY = Fraction( aScaleY.GetNumerator(), nVal ); + } pDataValues++; } @@ -789,8 +815,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes Graphic aGraphic; VirtualDevice aVDev; - const Fraction aFrac( mpDoc->GetScaleFraction() ); - const MapMode aMap( mpDoc->GetScaleUnit(), Point(), aFrac, aFrac ); + const MapMode aMap( mpDoc->GetScaleUnit(), Point(), aScaleX, aScaleY ); const sal_uInt16 nFilter = aMediaType.getLength() ? pFilter->GetExportFormatNumberForMediaType( aMediaType ) : pFilter->GetExportFormatNumberForShortName( aFilterName ); |