[Libreoffice-commits] core.git: 5 commits - Repository.mk sw/source

[Caolán McNamara]

 Repository.mk                     |    3 ---
 sw/source/filter/ww1/w1filter.cxx |    2 ++
 sw/source/filter/ww8/ww8par2.cxx  |    1 +
 sw/source/filter/xml/xmltbli.cxx  |    1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit cbce7443b2fa0c1304ff94a54eb48da0c4518146
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 21 16:20:27 2014 +0000

    missing another libspa
    
    Change-Id: I1e9a9e97ea2f6bdd43e6143830a3ab45177f9b05

diff --git a/Repository.mk b/Repository.mk
index 4e1e379..9fd036e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -323,9 +323,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	simplecanvas \
 	slideshow \
 	sot \
-	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
-		$(if $(ENABLE_HEADLESS),,spa) \
-	) \
 	spell \
 	$(if $(ENABLE_HEADLESS),,spl) \
 	$(if $(DISABLE_SCRIPTING),,stringresource) \
commit 9cb77ae1d0ef6c820800adaa234a0fbb50465db6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 21 16:09:38 2014 +0000

    coverity#982649 Missing break in switch
    
    Change-Id: I25ffff8576aca6891060283c55eff7125a9d4681

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index c248b54..9209ea3 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3011,6 +3011,7 @@ SvxFrameDirection MakeDirection(sal_uInt16 nCode, bool bIsBiDi)
     {
         default:
             OSL_ENSURE(eDir == 4, "unknown direction code, maybe it's a bitfield");
+            //fall-through
         case 3:
             eDir = bIsBiDi ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; // #i38158# - Consider RTL tables
             break;
commit 0c5d6e657244d54a1eb15d06159cd217516d666c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 21 16:01:51 2014 +0000

    coverity#705313 Missing break in switch
    
    Change-Id: I71c7c1af3f4ec804b1722003099869994199939d

diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index ced4c19..826c1f6 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1494,6 +1494,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
         break;
     case XML_TOK_TABLE_HEADER_ROWS:
         bHeader = sal_True;
+        //fall-through
     case XML_TOK_TABLE_ROWS:
         pContext = new SwXMLTableRowsContext_Impl( GetSwImport(), nPrefix,
                                                    rLocalName, xAttrList,
commit db4dc451efe6afe7a20a000b9ef4bbb2e94ac724
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 21 15:58:47 2014 +0000

    coverity#705310 Missing break in switch
    
    Change-Id: Ibadcc7c4da119989b57fcf96c5a2413f1346fca5

diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index ea38549..cbf59bf 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1125,6 +1125,7 @@ void W1_CHP::Out(Ww1Shell& rOut, Ww1Manager& rMan)
     if (fsIcoGet())
         switch(icoGet()) {
         default: OSL_ENSURE(false, "Chpx");
+        //fall-through
         case 0: { rOut.EndItem(RES_CHRATR_COLOR); } break;
         case 1: { rOut << SvxColorItem(Color(COL_BLACK), RES_CHRATR_COLOR); } break;
         case 2: { rOut << SvxColorItem(Color(COL_LIGHTBLUE), RES_CHRATR_COLOR); } break;
commit 37148c375504066839417eb4e6d0bd1dc161ed97
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 21 15:58:02 2014 +0000

    coverity#705309 Missing break in switch
    
    Change-Id: Ia1522c645793af8bc316885def415beb2a5d50d5

diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 3659f88..ea38549 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1907,6 +1907,7 @@ void Ww1Picture::Out(Ww1Shell& rOut, Ww1Manager& /*rMan*/)
         ReadDIB(aBmp, aOut, true);
         pGraphic = new Graphic(aBmp);
     }
+    //fall-through
     default:
         OSL_ENSURE(pPic->mfp.mmGet() == 97, "Ww1Picture");
     }