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

[Chris Sherlock]

 vcl/source/filter/wmf/enhwmf.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ddaceeaf227f5e0f2dbc6016ac20632421758adc
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Jan 6 20:58:56 2014 +1100

    Move default: to end of switch
    
    This helps prevent silly people like myself from asking about it on
    IRC. Basically it is a coding convention, I've moved the default to
    the end of the switch block.
    
    Change-Id: I43ace7cb9fee4cff0b12be8d3f6b3669b270b898
    Reviewed-on: https://gerrit.libreoffice.org/7277
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 3ad4481..4af22a9 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -748,9 +748,9 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
                                 bTransparent = sal_True;
                                 aLineInfo.SetStyle( LINE_NONE );
                             break;
-                            default :
                             case PS_INSIDEFRAME :
                             case PS_SOLID :
+                            default :
                                 aLineInfo.SetStyle( LINE_SOLID );
                         }
                         if ( nDashCount | nDotCount )
@@ -802,9 +802,9 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
                                 aLineInfo.SetStyle( LINE_NONE );
                             break;
 
-                            default :
                             case PS_INSIDEFRAME :
                             case PS_SOLID :
+                            default :
                                 aLineInfo.SetStyle( LINE_SOLID );
                         }
                         if ( nDashCount | nDotCount )
@@ -1378,7 +1378,6 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
                 }
                 break;
 
-                default :                           SAL_INFO("vcl.emf", "Unknown Meta Action");                                     break;
                 case EMR_MASKBLT :                  SAL_INFO("vcl.emf", "not implemented '" << "MaskBlt" << "'");                   break;
                 case EMR_PLGBLT :                   SAL_INFO("vcl.emf", "not implemented '" << "PlgBlt" << "'");                    break;
                 case EMR_SETDIBITSTODEVICE :        SAL_INFO("vcl.emf", "not implemented '" << "SetDIBitsToDevice" << "'");         break;
@@ -1433,6 +1432,8 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
                 case EMR_GDICOMMENT :
                 case EMR_HEADER :               // has already been read at ReadHeader()
                 break;
+
+                default :                           SAL_INFO("vcl.emf", "Unknown Meta Action");                                     break;
             }
         }
         pWMF->Seek( nNextPos );