[Libreoffice-commits] core.git: 2 commits - sc/source

[Fridrich Å trba]

 sc/source/filter/xml/xmlcondformat.cxx |    2 ++
 sc/source/filter/xml/xmldpimp.cxx      |   15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit f4883ae27d834ed14547d5762780cd8596a930a4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 1 09:37:27 2013 +0100

    Add breaks to default and don't overflow to defaut
    
    Change-Id: Id0c34041fc7f86bc737f69bfcaacee1c25fe818e

diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index afe0890..208cfb5 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -311,13 +311,12 @@ const ScDPSaveDimension* getDimension(
 
             return rPageDims[nPos];
         }
-        break;
         case ScDPOutputGeometry::Data:
         break;
         case ScDPOutputGeometry::None:
         break;
         default:
-            ;
+            break;
     }
     return NULL;
 }
@@ -335,8 +334,9 @@ ScDPOutputGeometry::FieldType toFieldType(sal_uInt16 nOrient)
         case sheet::DataPilotFieldOrientation_ROW:
             return ScDPOutputGeometry::Row;
         case sheet::DataPilotFieldOrientation_HIDDEN:
+            break;
         default:
-            ;
+            break;
     }
     return ScDPOutputGeometry::None;
 }
@@ -442,8 +442,9 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim)
                 ++mnDataFieldCount;
             break;
             case sheet::DataPilotFieldOrientation_HIDDEN:
+                break;
             default:
-                ;
+                break;
         }
 
         pDPSave->AddDimension(pDim);
@@ -575,7 +576,7 @@ void ScXMLDataPilotTableContext::SetGrandTotal(
             maColGrandTotal.maDisplayName = rDisplayName;
         break;
         default:
-            ;
+            break;
     }
 }
 
@@ -863,7 +864,7 @@ ScXMLDataPilotGrandTotalContext::ScXMLDataPilotGrandTotalContext(
                 maDisplayName = rAttrValue;
             break;
             default:
-                ;
+                break;
         }
     }
 }
@@ -893,7 +894,7 @@ void ScXMLDataPilotGrandTotalContext::EndElement()
             eOrient = XML_COLUMN;
         break;
         default:
-            ;
+            break;
     }
     mpTableContext->SetGrandTotal(eOrient, mbVisible, maDisplayName);
 }
commit a752069170acef13ea93f062bf61070313a69c14
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 1 09:32:02 2013 +0100

    Don't overflow case to default so that adding of case will never overflow
    
    Change-Id: I3503a185b02a512d1f13f805b8d51fb48f34971e

diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index 424e041..5ca2cb7 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -573,6 +573,7 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                 break;
             case XML_TOK_CONDITION_BASE_CELL_ADDRESS:
                 sAddress = sValue;
+                break;
             default:
                 break;
         }
@@ -767,6 +768,7 @@ ScXMLDateContext::ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                 break;
             case XML_TOK_COND_DATE_STYLE:
                 sStyle = sValue;
+                break;
             default:
                 break;
         }