[Libreoffice-commits] core.git: vcl/source

[Thorsten Behrens]

 vcl/source/filter/graphicfilter.cxx |   15 ++++++++-------
 vcl/source/filter/wmf/winmtf.cxx    |    2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 9349a8793bd2cb930b88d3bb1d1622fb084dd555
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Tue Apr 30 10:29:27 2013 +0200

    Fixup German translation.
    
    This touches up lightly on e986d3e396174096abb46075bf7488677b9a35f9
    
    Change-Id: If4d940433b27abec63a85c5975f5e9ebf672b79a

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index d9944fa..36389ea 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -236,7 +236,7 @@ bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen)
  *            Output parameters:
  *              Return value     - sal_True if success
  *              rFormatExtension - on success: normal file extension in capitals
- *        2.) Start reading file, check file format
+ *        2.) Start reading file, verify file format
  *            Input parameters:
  *              rPath            - file path
  *              rFormatExtension - normal file extension in capitals
@@ -301,13 +301,13 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
     // if the format (rFormatExtension) has not yet been set.
     sal_Bool bSomethingTested = sal_False;
 
-    // Now the different formats are checked. The order does not matter. e.g. a MET file
+    // Now the different formats are checked. The order *does* matter. e.g. a MET file
     // could also go through the BMP test, howeve a BMP file can hardly go through the MET test.
     // So MET should be tested prior to BMP. However, theoretically a BMP file could conceivably
     // go through the MET test. These problems are of course not only in MET and BMP.
-    // Therefore, in the case of a format check (bTest == sal_True)  we only test this format.
-    // Everything else could have fatal consequences, for example if the user says it is a BMP file
-    // (and it is a BMP) file, and the file would go through the MET test ...
+    // Therefore, in the case of a format check (bTest == sal_True)  we only test *exactly* this
+    // format. Everything else could have fatal consequences, for example if the user says it is
+    // a BMP file (and it is a BMP) file, and the file would go through the MET test ...
     //--------------------------- MET ------------------------------------
     if( !bTest || ( rFormatExtension.CompareToAscii( "MET", 3 ) == COMPARE_EQUAL ) )
     {
@@ -342,8 +342,9 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
 
         bSomethingTested=sal_True;
 
-        // We could be reading an OS/2 bitmap array ('BA'), therefore we must adjust
-        // the offset to discover the first bitmap in the array
+        // We're possibly also able to read an OS/2 bitmap array
+        // ('BA'), therefore we must adjust the offset to discover the
+        // first bitmap in the array
         if ( sFirstBytes[0] == 0x42 && sFirstBytes[1] == 0x41 )
             nOffs = 14;
         else
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 1fc47f5..c8c6652 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -537,7 +537,7 @@ Rectangle WinMtfOutput::ImplMap( const Rectangle& rRect )
 void WinMtfOutput::ImplMap( Font& rFont )
 {
     // !!! HACK: we now always set the width to zero because the OS width is interpreted differently;
-    // must later be made portable in SV (CA 08/02/96)
+    // must later be made portable in SV (KA 1996-02-08)
     Size  aFontSize = ImplMap ( rFont.GetSize() );
 
     if( aFontSize.Height() < 0 )