CWS-TOOLING: integrate CWS cmcfixes51

2008-12-08 10:12:55 +0100 cmc  r264975 : #i96203# protect with ifdefs to avoid unused symbol on mac
2008-12-05 12:23:47 +0100 cmc  r264898 : CWS-TOOLING: rebase CWS cmcfixes51 to trunk@264807 (milestone: DEV300:m37)
2008-12-01 14:45:17 +0100 cmc  r264606 : #i76655# ehlos apparently required
2008-11-28 17:49:30 +0100 cmc  r264567 : #i96655# remove newly unused method
2008-11-28 10:41:28 +0100 cmc  r264531 : #i96647# better ppc-bridges flushCode impl
2008-11-27 12:58:40 +0100 cmc  r264478 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 12:32:49 +0100 cmc  r264476 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 12:26:02 +0100 cmc  r264475 : #i96655# redundant old table export helpers
2008-11-27 11:49:06 +0100 cmc  r264473 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:38:35 +0100 cmc  r264471 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:14:21 +0100 cmc  r264467 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:06:22 +0100 cmc  r264464 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:58:18 +0100 cmc  r264462 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:41:44 +0100 cmc  r264461 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:19:24 +0100 cmc  r264460 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:13:39 +0100 cmc  r264459 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:06:14 +0100 cmc  r264458 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:59:54 +0100 cmc  r264457 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:52:51 +0100 cmc  r264456 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:48:26 +0100 cmc  r264454 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:40:20 +0100 cmc  r264452 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:35:26 +0100 cmc  r264451 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:31:00 +0100 cmc  r264450 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:24:08 +0100 cmc  r264449 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:26:15 +0100 cmc  r264443 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:21:01 +0100 cmc  r264442 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:09:40 +0100 cmc  r264441 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 23:51:56 +0100 cmc  r264440 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 23:49:09 +0100 cmc  r264439 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 18:09:54 +0100 cmc  r264432 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 18:07:40 +0100 cmc  r264431 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:28:02 +0100 cmc  r264429 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:27:39 +0100 cmc  r264428 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:18:36 +0100 cmc  r264426 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 16:22:16 +0100 cmc  r264415 : #i96624# make implicit braces and brackets explicit to avoid warnings
2008-11-26 16:00:23 +0100 cmc  r264409 : #i90426# remove warnings from svtools
2008-11-26 15:59:17 +0100 cmc  r264408 : #i90426# remove warnings
2008-11-26 15:47:32 +0100 cmc  r264404 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:46:57 +0100 cmc  r264394 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:19:50 +0100 cmc  r264387 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:15:26 +0100 cmc  r264386 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:11:26 +0100 cmc  r264384 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 13:44:23 +0100 cmc  r264380 : #i96084# comfirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 13:12:24 +0100 cmc  r264372 : #i96604# silence new warnings
2008-11-26 12:35:02 +0100 cmc  r264369 : #i96203# make qstarter work in 3-layer land
2008-11-26 12:33:04 +0100 cmc  r264368 : #i96170# ensure gtypes are up and running

7 files changed, 29 insertions, 19 deletions

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 37ab973a6a..bbefbf2119 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -2082,7 +2082,7 @@ void SmSymDefineDialog::UpdateButtons()
         // oder wenn es noch kein Symbol des neuen Namens gibt (wuerde implizites
         // loeschen des bereits vorhandenen Symbols erfordern)
         BOOL  bEqualName = pOrigSymbol && aTmpSymbolName == pOrigSymbol->GetName();
-        bChange = pOrigSymbol && (bEqualName && !bEqual || !bEqualName && bAdd);
+        bChange = pOrigSymbol && ( (bEqualName && !bEqual) || (!bEqualName && bAdd) );
     }
 
     aAddBtn   .Enable(bAdd);
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index a1c60fd5b5..c05597cf6d 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -822,8 +822,16 @@ BOOL SmDocShell::Load( SfxMedium& rMedium )
     {
         uno::Reference < embed::XStorage > xStorage = pMedium->GetStorage();
         uno::Reference < container::XNameAccess > xAccess (xStorage, uno::UNO_QUERY);
-        if ( xAccess->hasByName( C2S( "content.xml" ) ) && xStorage->isStreamElement( C2S( "content.xml" ) ) ||
-             xAccess->hasByName( C2S( "Content.xml" ) ) && xStorage->isStreamElement( C2S( "Content.xml" ) ) )
+        if (
+            (
+             xAccess->hasByName( C2S( "content.xml" ) ) &&
+             xStorage->isStreamElement( C2S( "content.xml" ) )
+            ) ||
+            (
+             xAccess->hasByName( C2S( "Content.xml" ) ) && 
+             xStorage->isStreamElement( C2S( "Content.xml" ) )
+            )
+           )
         {
             // is this a fabulous math package ?
             Reference<com::sun::star::frame::XModel> xModel(GetModel());
diff --git a/starmath/source/mathml.cxx b/starmath/source/mathml.cxx
index 274cf949f7..a395efd436 100644
--- a/starmath/source/mathml.cxx
+++ b/starmath/source/mathml.cxx
@@ -1323,6 +1323,7 @@ void SmXMLContext_Helper::RetrieveAttrs(const uno::Reference<
                 rContext.GetSmImport().GetMM100UnitConverter().
                     setXMLMeasureUnit(MAP_POINT);
                 if (-1 == sValue.indexOf(GetXMLToken(XML_UNIT_PT)))
+                {
                     if (-1 == sValue.indexOf('%'))
                         nFontSize=0.0;
                     else
@@ -1330,6 +1331,7 @@ void SmXMLContext_Helper::RetrieveAttrs(const uno::Reference<
                         rContext.GetSmImport().GetMM100UnitConverter().
                             setXMLMeasureUnit(MAP_RELATIVE);
                     }
+                }
                 break;
             case XML_TOK_FONTFAMILY:
                 sFontFamily = sValue;
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index bd7fbfc362..ea060bcd7d 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -213,9 +213,13 @@ void SmNode::SetColor(const Color& rColor)
 
 void SmNode::SetAttribut(USHORT nAttrib)
 {
-    if (   nAttrib == ATTR_BOLD	 &&  !(Flags() & FLG_BOLD)
-        || nAttrib == ATTR_ITALIC  &&  !(Flags() & FLG_ITALIC))
+    if (
+        (nAttrib == ATTR_BOLD && !(Flags() & FLG_BOLD)) ||
+        (nAttrib == ATTR_ITALIC && !(Flags() & FLG_ITALIC))
+       )
+    {
         nAttributes |= nAttrib;
+    }
 
     SmNode *pNode;
     USHORT nSize = GetNumSubNodes();
@@ -227,9 +231,13 @@ void SmNode::SetAttribut(USHORT nAttrib)
 
 void SmNode::ClearAttribut(USHORT nAttrib)
 {
-    if (   nAttrib == ATTR_BOLD	 &&  !(Flags() & FLG_BOLD)
-        || nAttrib == ATTR_ITALIC  &&  !(Flags() & FLG_ITALIC))
+    if (
+        (nAttrib == ATTR_BOLD && !(Flags() & FLG_BOLD)) ||
+        (nAttrib == ATTR_ITALIC && !(Flags() & FLG_ITALIC))
+       )
+    {
         nAttributes &= ~nAttrib;
+    }
 
     SmNode *pNode;
     USHORT nSize = GetNumSubNodes();
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index c7513f6649..5829eab063 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2104,6 +2104,7 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
 }
 
 
+#if 0
 /*  */
 
 USHORT SwWW8Writer::StartTableFromFrmFmt(WW8Bytes &rAt, const SwFrmFmt *pFmt,
@@ -2222,7 +2223,7 @@ bool RowContainsProblematicGraphic(const SwWriteTableCellPtr *pRow,
     }
     return bHasGraphic;
 }
-
+#endif
 //---------------------------------------------------------------------------
 //       Tabellen
 //---------------------------------------------------------------------------
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index ee2a3844f6..69941a37d2 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -594,10 +594,11 @@ public:
     void WriteText();
     void WriteCR(ww8::WW8TableNodeInfo::Pointer_t pTableTextNodeInfo = ww8::WW8TableNodeInfo::Pointer_t());
     void WriteChar( sal_Unicode c );
-    void WriteCellEnd();
     void WriteRowEnd(sal_uInt32 nDepth = 1);
+#if 0
     USHORT StartTableFromFrmFmt(WW8Bytes &rAt, const SwFrmFmt *pFmt,
         SwTwips &rPageSize);
+#endif
 
     void OutSwString(const String&, xub_StrLen nStt, xub_StrLen nLen,
         bool bUnicode, rtl_TextEncoding eChrSet);
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index e884746de3..3dde865e55 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3449,16 +3449,6 @@ ULONG SwWW8Writer::ReplaceCr( BYTE nChar )
     return nRetPos;
 }
 
-void SwWW8Writer::WriteCellEnd()
-{
-    //Technically in a word document this is a different value for a
-    //cell without a graphic. But it doesn't seem to make a difference
-    ULONG nOffset = ReplaceCr( (BYTE)0x07 );
-    ASSERT(nOffset, "Eek!, no para end mark to replace with row end mark");
-    if (nOffset)
-        pMagicTable->Append(Fc2Cp(nOffset),0x122);
-}
-
 void SwWW8Writer::WriteRowEnd(sal_uInt32 nDepth)
 {
     if (nDepth == 1)