Anonymous avatar Anonymous committed a35a433

impress186: fixed warnings

Comments (0)

Files changed (2)

svtools/source/filter.vcl/filter/exportdialog.cxx

 // to determine the exact graphic output size and preview for jpg
 sal_Bool ExportDialog::IsTempExportAvailable() const
 {
-	return GetRawFileSize() < mnMaxFilesizeForRealtimePreview;
+	return GetRawFileSize() < static_cast< sal_uInt32 >( mnMaxFilesizeForRealtimePreview );
 }
 
 ExportDialog::ExportDialog( FltCallDialogParameter& rPara,
 				maCbRLEEncoding			( this, ResId( CB_RLE_ENCODING, *rPara.pResMgr ) ),
 				maFlGIFDrawingObjects	( this, ResId( FL_GIF_DRAWING_OBJECTS, *rPara.pResMgr ) ),
 				maCbSaveTransparency	( this, ResId( CB_SAVE_TRANSPARENCY, *rPara.pResMgr ) ),
+				maRbBinary				( this, ResId( RB_BINARY, *rPara.pResMgr ) ),
+				maRbText				( this, ResId( RB_TEXT, *rPara.pResMgr ) ),
 				maFlEPSPreview			( this, ResId( FL_EPS_PREVIEW, *rPara.pResMgr ) ),
 				maCbEPSPreviewTIFF		( this, ResId( CB_EPS_PREVIEW_TIFF, *rPara.pResMgr ) ),
 				maCbEPSPreviewEPSI		( this, ResId( CB_EPS_PREVIEW_EPSI, *rPara.pResMgr ) ),
 				maFlCompression			( this, ResId( FL_COMPRESSION, *rPara.pResMgr ) ),
 				maRbEPSCompressionLZW	( this, ResId( RB_EPS_COMPRESSION_LZW, *rPara.pResMgr ) ),
 				maRbEPSCompressionNone	( this, ResId( RB_EPS_COMPRESSION_NONE, *rPara.pResMgr ) ),
-				maRbBinary				( this, ResId( RB_BINARY, *rPara.pResMgr ) ),
-				maRbText				( this, ResId( RB_TEXT, *rPara.pResMgr ) ),
 				maFlEstimatedSize		( this, ResId( FL_ESTIMATED_SIZE, *rPara.pResMgr ) ),
 				maFtEstimatedSize		( this, ResId( FT_ESTIMATED_SIZE, *rPara.pResMgr ) ),
 				msEstimatedSizePix1		( ResId( STR_ESTIMATED_SIZE_PIX_1, *rPara.pResMgr ) ),
 			case MAP_CM :		maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.01 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break;
 			case MAP_MM :		maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.001 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break;
 			case MAP_POINT :	maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * maMfSizeX.GetValue() / 100.0 * 72 + 0.5 ); break; 
+			default:
 			case MAP_PIXEL :	maSize.Width = maMfSizeX.GetValue(); break;
 		}
 		maSize.Height = static_cast< sal_Int32 >( fRatio * maSize.Width + 0.5 );
 			case MAP_CM :		maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.01 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break;
 			case MAP_MM :		maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.001 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break;
 			case MAP_POINT :	maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * maMfSizeY.GetValue() / 100.0 * 72 + 0.5 ); break; 
+			default:
 			case MAP_PIXEL :	maSize.Height = maMfSizeY.GetValue(); break;
 		}
 		maSize.Width = static_cast< sal_Int32 >( fRatio * maSize.Height + 0.5 );

svtools/source/filter.vcl/filter/exportdialog.hxx

 	String				maEstimatedSizeText;
 	sal_Int16			mnFormat;
 	sal_Int32			mnMaxFilesizeForRealtimePreview;
-
-	sal_Bool			mbPreview;
-	sal_Bool			mbIsPixelFormat;
-	sal_Bool			mbExportSelection;
-	sal_Bool			mbPreserveAspectRatio;
 	
 	Rectangle			maRectFlButtons;
 	Rectangle			maRectBtnHelp;
 						maOriginalSize;		// the original graphic size in 1/100mm
 	com::sun::star::awt::Size
 						maSize;				// for vector graphics it always contains the logical size in 1/100mm
-											// for pixel graphics it always contains the pixel count
+
+	sal_Bool			mbPreview;
+	sal_Bool			mbIsPixelFormat;
+	sal_Bool			mbExportSelection;
+	sal_Bool			mbPreserveAspectRatio;
+
+	// for pixel graphics it always contains the pixel count
 	com::sun::star::awt::Size
 						maResolution;		// it always contains the number of pixels per meter
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.