CWS-TOOLING: integrate CWS cmcfixes56

2009-03-26 14:46:13 +0100 cmc  r270080 : #i100517# merge changes of locales32 to match
2009-03-26 14:31:32 +0100 cmc  r270079 : #i100517# add some brackets and remove stray ;
2009-03-25 13:30:36 +0100 cmc  r270021 : #i100503# make tralay work again
2009-03-25 10:13:35 +0100 cmc  r269999 : #i100536# remove last unused method
2009-03-24 15:13:50 +0100 cmc  r269955 : #i100517# fix straight-forward warnings
2009-03-24 14:36:37 +0100 cmc  r269947 : #i100469# keep ia64 and arm alignments after fork-exec to signal change, but hackaround for arm to keep userlevel qemu-arm working
2009-03-24 14:02:27 +0100 cmc  r269943 : #i100223# make stl headers warning free for extra gcc 4.3 warnings
2009-03-24 13:58:15 +0100 cmc  r269942 : #i100504# drawinglayer is warning free on ix86 linux
2009-03-24 13:56:15 +0100 cmc  r269940 : #i100469# keep ia64 and arm alignments after fork-exec to signal change

5 files changed, 11 insertions, 9 deletions

diff --git a/svx/source/dialog/SpellDialog.cxx b/svx/source/dialog/SpellDialog.cxx
index b8976071f3..bead9b97bf 100644
--- a/svx/source/dialog/SpellDialog.cxx
+++ b/svx/source/dialog/SpellDialog.cxx
@@ -1488,8 +1488,8 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                 }
             }
             //Here we have to determine if the error found is the one currently active
-            bool bIsErrorActive = pErrorAttr && pErrorAttr->GetStart() == m_nErrorStart ||
-                    pErrorAttrLeft && pErrorAttrLeft->GetStart() == m_nErrorStart;
+            bool bIsErrorActive = (pErrorAttr && pErrorAttr->GetStart() == m_nErrorStart) ||
+                    (pErrorAttrLeft && pErrorAttrLeft->GetStart() == m_nErrorStart);
 
             DBG_ASSERT(nSelectionType != INVALID, "selection type not set!");
 
diff --git a/svx/source/dialog/hangulhanja.cxx b/svx/source/dialog/hangulhanja.cxx
index c66d42f033..cb7ef22f73 100644
--- a/svx/source/dialog/hangulhanja.cxx
+++ b/svx/source/dialog/hangulhanja.cxx
@@ -313,8 +313,8 @@ namespace svx
         // determine conversion type
         if (m_nSourceLang == LANGUAGE_KOREAN && m_nTargetLang == LANGUAGE_KOREAN)
             m_eConvType = HHC::eConvHangulHanja;
-        else if (m_nSourceLang == LANGUAGE_CHINESE_TRADITIONAL && m_nTargetLang == LANGUAGE_CHINESE_SIMPLIFIED  ||
-                 m_nSourceLang == LANGUAGE_CHINESE_SIMPLIFIED  && m_nTargetLang == LANGUAGE_CHINESE_TRADITIONAL)
+        else if ( (m_nSourceLang == LANGUAGE_CHINESE_TRADITIONAL && m_nTargetLang == LANGUAGE_CHINESE_SIMPLIFIED)  ||
+                 (m_nSourceLang == LANGUAGE_CHINESE_SIMPLIFIED  && m_nTargetLang == LANGUAGE_CHINESE_TRADITIONAL) )
             m_eConvType = HHC::eConvSimplifiedTraditional;
         else
         {
diff --git a/svx/source/dialog/swpossizetabpage.cxx b/svx/source/dialog/swpossizetabpage.cxx
index 338ca71988..b3aecc4405 100644
--- a/svx/source/dialog/swpossizetabpage.cxx
+++ b/svx/source/dialog/swpossizetabpage.cxx
@@ -751,9 +751,11 @@ BOOL SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
                 short nRel = GetRelation(m_pHMap, m_aHoriToLB);
                 const long nHoriByPos =
                             static_cast<long>(m_aHoriByMF.Denormalize(m_aHoriByMF.GetValue(FUNIT_TWIP)));
-                if(nAlign != rHoriOrient.GetValue()||
-                    nRel != rHoriRelation.GetValue()||
-                        m_aHoriByMF.IsEnabled() && nHoriByPos != rHoriPosition.GetValue())
+                if (
+                    nAlign != rHoriOrient.GetValue() ||
+                    nRel != rHoriRelation.GetValue() ||
+                    (m_aHoriByMF.IsEnabled() && nHoriByPos != rHoriPosition.GetValue())
+                   )
                 {
                     rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_ORIENT, nAlign));
                     rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_RELATION, nRel));
diff --git a/svx/source/form/fmctrler.cxx b/svx/source/form/fmctrler.cxx
index 1187a5e598..af7f7bc3b9 100644
--- a/svx/source/form/fmctrler.cxx
+++ b/svx/source/form/fmctrler.cxx
@@ -1912,7 +1912,7 @@ void FmXFormController::setControlLock(const Reference< XControl > & xControl)
     // a.) wenn der ganze Datensatz gesperrt ist
     // b.) wenn das zugehoerige Feld gespeert ist
     Reference< XBoundControl >  xBound(xControl, UNO_QUERY);
-    if (xBound.is() && ((bLocked && bLocked != xBound->getLock() ||
+    if (xBound.is() && (( (bLocked && bLocked != xBound->getLock()) ||
                          !bLocked)))    // beim entlocken immer einzelne Felder ueberprüfen
     {
         // gibt es eine Datenquelle
diff --git a/svx/uiconfig/layout/layout.mk b/svx/uiconfig/layout/layout.mk
index f6bea876d8..8daa1c5e8f 100644
--- a/svx/uiconfig/layout/layout.mk
+++ b/svx/uiconfig/layout/layout.mk
@@ -1,7 +1,7 @@
 # TODO: move to solenv/inc
 # copies: sw/uiconfig/layout svx/uiconfig/layout
 
-TRALAY=tralay
+TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
 XML_DEST=$(DLLDEST)
 XML_LANGS=$(alllangiso)