[Libreoffice-commits] core.git: 3 commits - oox/source rsc/source sd/source svgio/source writerfilter/source

[Julien Nabet]

 oox/source/drawingml/shapecontext.cxx      |    1 -
 rsc/source/rscpp/cpp2.c                    |    1 -
 sd/source/ui/dlg/docprev.cxx               |    2 +-
 svgio/source/svgreader/svgtools.cxx        |    1 -
 writerfilter/source/dmapper/ThemeTable.cxx |    1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 839dde414f88c095237a956d2d9b97afc0d05a0d
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu May 29 20:45:46 2014 +0200

    cppcheck: consecutive return/break/...
    
    Change-Id: I171df68539fc41046b706157c04ab1e8cc1e60ca

diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index bc246d2..74cc2d9 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -104,7 +104,6 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const
     {
         mpShapePtr->getTextBody()->getTextProperties().moRotation = rAttribs.getInteger( XML_rot );
         return 0;
-        break;
     }
     case XML_cNvSpPr:
         break;
diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
index 1431e15..578052c 100644
--- a/rsc/source/rscpp/cpp2.c
+++ b/rsc/source/rscpp/cpp2.c
@@ -278,7 +278,6 @@ nest_err:       cerror("#%s must be in an #if", token);
                 cput(c);
             fprintf( pCppOut, "\n" );
             exit( 1 );
-            break;
         }
         default:
             /*
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index afc6fec..8c7ba0f 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -186,7 +186,6 @@ namespace svgio
                         }
 
                         return fRetval;
-                        break;
                     }
                     default:
                     {
commit c46cc5751b5af4ce180fca63f998fe7eb405f93c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu May 29 20:45:00 2014 +0200

    cppcheck: zerodiv
    
    Change-Id: I09e1c86bdda301c11700ffe05d4a3d83b7a1104d

diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index cd015cd..4c4293c 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -87,7 +87,7 @@ void SdDocPreviewWin::CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rP
     long nWidth = rSize.Width() - 2*FRAME;
     long nHeight = rSize.Height() - 2*FRAME;
     if( nWidth < 0 ) nWidth = 0;
-    if( nHeight < 0 ) nHeight = 0;
+    if( nHeight < 0 ) nHeight = 1;
 
     double dRatio=((double)aTmpSize.Width())/aTmpSize.Height();
     double dRatioPreV=((double) nWidth ) / nHeight;
commit 1af3579ecbe3747bcb9535d026d2a34792cd9106
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu May 29 20:44:49 2014 +0200

    cppcheck: unused variable
    
    Change-Id: If497a2bbcc13702a960f510b3daf3bf7dc12d4c7

diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 2cc3566..7817175 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -177,7 +177,6 @@ void ThemeTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Poi
 
 OUString ThemeTable::getStringForTheme(const Id id)
 {
-    std::map<sal_uInt32, OUString> tmpThemeFontMap;
     switch (id)
     {
         case NS_ooxml::LN_Value_ST_Theme_majorEastAsia: