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

Stephan Bergmann sbergman at redhat.com
Tue Jan 19 01:45:18 PST 2016


 filter/source/msfilter/msdffimp.cxx |   25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

New commits:
commit e96eaea07dde9a375c4d771c27ee7e7da9ef53b6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 19 10:44:50 2016 +0100

    -Werror=misleading-indentation (GCC 6)
    
    Change-Id: Idcb4386f37d4f945301934e4f2e65d81cf1db2bd

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 8e5d8ae..e88d9e8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2215,11 +2215,26 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
                     nCnt = (sal_Int16)( nTmp & 0x1fff );//Last 13 bits for segment points number
                     switch( nTmp >> 13 )//First 3 bits for command type
                     {
-                        case 0x0: nCommand = EnhancedCustomShapeSegmentCommand::LINETO; if ( !nCnt ) nCnt = 1; break;
-                        case 0x1: nCommand = EnhancedCustomShapeSegmentCommand::CURVETO; if ( !nCnt ) nCnt = 1; break;
-                        case 0x2: nCommand = EnhancedCustomShapeSegmentCommand::MOVETO; if ( !nCnt ) nCnt = 1; break;
-                        case 0x3: nCommand = EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; nCnt = 0; break;
-                        case 0x4: nCommand = EnhancedCustomShapeSegmentCommand::ENDSUBPATH; nCnt = 0; break;
+                        case 0x0:
+                            nCommand = EnhancedCustomShapeSegmentCommand::LINETO;
+                            if ( !nCnt ) nCnt = 1;
+                            break;
+                        case 0x1:
+                            nCommand = EnhancedCustomShapeSegmentCommand::CURVETO;
+                            if ( !nCnt ) nCnt = 1;
+                            break;
+                        case 0x2:
+                            nCommand = EnhancedCustomShapeSegmentCommand::MOVETO;
+                            if ( !nCnt ) nCnt = 1;
+                            break;
+                        case 0x3:
+                            nCommand = EnhancedCustomShapeSegmentCommand::CLOSESUBPATH;
+                            nCnt = 0;
+                            break;
+                        case 0x4:
+                            nCommand = EnhancedCustomShapeSegmentCommand::ENDSUBPATH;
+                            nCnt = 0;
+                            break;
                         case 0x5:
                         case 0x6:
                         {


More information about the Libreoffice-commits mailing list