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

[Luboš Luňák]

 sw/source/core/inc/frmtool.hxx                    |    2 +-
 sw/source/core/layout/frmtool.cxx                 |    2 +-
 sw/source/core/layout/tabfrm.cxx                  |    4 ++--
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit cb0d80209534c42a1a0fa7ba3c65369a434a00ba
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Sun Sep 21 21:26:47 2014 +0200

    do not use number-of-enum-items as an enum item itself
    
    Because that breaks warning about all cases (not) being handled in switch.
    
    Change-Id: I8fadccd4e5d125cc37b8e10087e9170f07e65440

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 2360a46..0407a08 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -104,9 +104,9 @@ enum ContextType
     CONTEXT_PARAGRAPH,
     CONTEXT_CHARACTER,
     CONTEXT_STYLESHEET,
-    CONTEXT_LIST,
-    NUMBER_OF_CONTEXTS
+    CONTEXT_LIST
 };
+enum { NUMBER_OF_CONTEXTS = CONTEXT_LIST + 1 };
 
 enum BreakType
 {
commit baa06b23845cd266e2b9d456ce08b7c0b67ec00f
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Sun Sep 21 16:40:50 2014 +0200

    fix typo
    
    Change-Id: I08eff921ab2de64e5734807963c542818456dd8e

diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 1fdaee5..8df9df1 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -120,7 +120,7 @@ extern bool bSetCompletePaintOnInvalidate;
 
 // for table settings via keyboard
 long CalcRowRstHeight( SwLayoutFrm *pRow );
-long CalcHeightWidthFlys( const SwFrm *pFrm );
+long CalcHeightWithFlys( const SwFrm *pFrm );
 
 SwPageFrm *InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
                           bool bOdd, bool bFirst, bool bInsertEmpty, bool bFtn,
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index ceacf4a..76a06b7 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3137,7 +3137,7 @@ static SwTwips lcl_CalcCellRstHeight( SwLayoutFrm *pCell )
             else if( pLow->IsSctFrm() && ((SwSectionFrm*)pLow)->IsUndersized() )
                 nLow += ((SwSectionFrm*)pLow)->Undersize();
             nFlyAdd = std::max( 0L, nFlyAdd - nLow );
-            nFlyAdd = std::max( nFlyAdd, ::CalcHeightWidthFlys( pLow ) );
+            nFlyAdd = std::max( nFlyAdd, ::CalcHeightWithFlys( pLow ) );
             nHeight += nLow;
             pLow = pLow->GetNext();
         } while ( pLow );
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index a946293..5ca1929 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3577,7 +3577,7 @@ void SwRowFrm::MakeAll()
     SwLayoutFrm::MakeAll();
 }
 
-long CalcHeightWidthFlys( const SwFrm *pFrm )
+long CalcHeightWithFlys( const SwFrm *pFrm )
 {
     SWRECTFN( pFrm )
     long nHeight = 0;
@@ -3739,7 +3739,7 @@ static SwTwips lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell,
                 if ( _bConsiderObjs )
                 {
                     nFlyAdd = std::max( 0L, nFlyAdd - nLowHeight );
-                    nFlyAdd = std::max( nFlyAdd, ::CalcHeightWidthFlys( pLow ) );
+                    nFlyAdd = std::max( nFlyAdd, ::CalcHeightWithFlys( pLow ) );
                 }
             }