Author: alg
Date: Fri Feb 3 14:45:29 2012
New Revision: 1240195
URL: http://svn.apache.org/viewvc?rev=1240195&view=rev
Log:
#118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is
requested
Modified:
incubator/ooo/trunk/main/svx/source/unodraw/UnoGraphicExporter.cxx
Modified: incubator/ooo/trunk/main/svx/source/unodraw/UnoGraphicExporter.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/unodraw/UnoGraphicExporter.cxx?rev=1240195&r1=1240194&r2=1240195&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/unodraw/UnoGraphicExporter.cxx
(original)
+++ incubator/ooo/trunk/main/svx/source/unodraw/UnoGraphicExporter.cxx Fri Feb
3 14:45:29 2012
@@ -843,8 +843,12 @@ bool GraphicExporter::GetGraphic( Export
aBmpEx.Scale( Size(
rSettings.mnWidth, rSettings.mnHeight ) );
aGraphic = aBmpEx;
}
+
+ // #118804# only accept for bitmap graphics, else the
+ // conversion to bitmap will happen anywhere without
size control
+ // as evtl. defined in rSettings.mnWidth/mnHeight
+ bSingleGraphic = sal_True;
}
- bSingleGraphic = sal_True;
}
}
else if( rSettings.mbScrollText )
