[ooo-build-commit] .: 4 commits - sw/source

[Caolán McNamara]

 sw/source/core/text/frmform.cxx |    4 ++--
 sw/source/ui/fldui/fldmgr.cxx   |    6 +++---
 sw/source/ui/frmdlg/frmpage.cxx |    2 +-
 sw/source/ui/table/tabledlg.cxx |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9a88c3104675e15d5b8a5399cd21360703c7bfec
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 30 16:02:09 2010 +0100

    #i113310# silence gcc warning

diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 4e707ce..1ff5f90 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -559,10 +559,10 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill)
                        (nTypeId == TYP_SEQFLD && nWhich == RES_SETEXPFLD  &&
                        (((SwSetExpFieldType*)pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) ||
 
-                       ((nTypeId == TYP_INPUTFLD  || nTypeId == TYP_FORMELFLD) &&
+                       ((nTypeId == TYP_INPUTFLD || nTypeId == TYP_FORMELFLD) &&
                          (nWhich == RES_USERFLD ||
-                          nWhich == RES_SETEXPFLD &&
-                          !(((SwSetExpFieldType*)pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) ) )
+                          (nWhich == RES_SETEXPFLD &&
+                          !(((SwSetExpFieldType*)pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ))) ) )
                     {
                         String* pNew = new String(pFldType->GetName());
                         rToFill.Insert(pNew, rToFill.Count());
commit 5557f3cb55558d636a2930fd22e48a16daf10b11
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 30 16:01:29 2010 +0100

    #i113311# silence gcc warning

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index e1fe1b1..53eb804 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1539,7 +1539,7 @@ BOOL  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
     if ( bState != aPageCollCB.GetSavedValue() ||
          ( bState &&
            aPageCollLB.GetSelectEntryPos() != aPageCollLB.GetSavedValue() )
-           || aPageNoNF.IsEnabled() && aPageNoNF.IsValueModified())
+           || (aPageNoNF.IsEnabled() && aPageNoNF.IsValueModified()) )
     {
         String sPage;
 
commit 921f949041fe5c9eaaf4467883b6f307bde5e509
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 30 15:59:54 2010 +0100

    && || ambiguity in frmpage.cxx

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 7939957..8d37155 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1080,7 +1080,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
                             aWidthED .GetValue() == aWidthED .GetMin() &&
                             aHeightED.GetValue() == aHeightED.GetMin());
 
-    if ((bNew && !bFormat) || (bValueModified || bCheckChanged) && bLegalValue)
+    if ((bNew && !bFormat) || ((bValueModified || bCheckChanged) && bLegalValue))
     {
         sal_Int64 nNewWidth  = aWidthED.DenormalizePercent(aWidthED.GetRealValue(FUNIT_TWIP));
         sal_Int64 nNewHeight = aHeightED.DenormalizePercent(aHeightED.GetRealValue(FUNIT_TWIP));
commit 9f6add2e253a7f9010d56c87b754594b2a43d2b9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 30 15:58:53 2010 +0100

    #i113316# silence gcc warning

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index c674203..01b4d52 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -81,8 +81,8 @@ void ValidateTxt( SwFrm *pFrm )		// Freund vom Frame
 {
     if ( ( ! pFrm->IsVertical() &&
              pFrm->Frm().Width() == pFrm->GetUpper()->Prt().Width() ) ||
-             pFrm->IsVertical() &&
-             pFrm->Frm().Height() == pFrm->GetUpper()->Prt().Height() )
+         (   pFrm->IsVertical() &&
+             pFrm->Frm().Height() == pFrm->GetUpper()->Prt().Height() ) )
         pFrm->bValidSize = sal_True;
 /*
     pFrm->bValidPrtArea = sal_True;