[Libreoffice-commits] .: binfilter/bf_sw

[Caolán McNamara]

 binfilter/bf_sw/source/core/draw/sw_dcontact.cxx  |    7 +++----
 binfilter/bf_sw/source/core/fields/sw_fldbas.cxx  |   15 ---------------
 binfilter/bf_sw/source/core/layout/sw_pagechg.cxx |    6 +++++-
 binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx  |    1 +
 4 files changed, 9 insertions(+), 20 deletions(-)

New commits:
commit 3edba3ecd90d425b34b7236b991472b4347d02ff
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 9 10:32:14 2011 +0000

    throw out some warnings

diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 065ba15..9afd1e6 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -948,16 +948,15 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                 }
             }
             break;
-#ifdef DBG_UTIL
-        default:	ASSERT( FALSE, "Unknown Anchor." );
-#endif
+        default:
+            break;
     }
     if ( GetAnchor() )
     {
         if( bSetAnchorPos )
         {
             GetMaster()->SetAnchorPos( GetAnchor()->GetFrmAnchorPos( ::binfilter::HasWrap( GetMaster() ) ) );
-    }
+        }
         if ( !pDrawFrmFmt->GetDoc()->IsVisibleLayerId( GetMaster()->GetLayer() ) )
         {
             SdrLayerID nVisibleLayerId =
diff --git a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
index 02d7f2e..99c0bac 100644
--- a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
@@ -477,21 +477,6 @@ SwFieldType* SwValueField::ChgTyp( SwFieldType* pNewType )
 }
 
 /*--------------------------------------------------------------------
-    Beschreibung: Format aendern
- --------------------------------------------------------------------*/
-/*
- Was sollte das denn?
-void SwValueField::ChangeFormat(ULONG n)
-{
-    nFormat = n;
-}
-
-/*--------------------------------------------------------------------
-    Beschreibung: Format in Office-Sprache ermitteln
- --------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------
     Beschreibung: Sprache im Format anpassen
  --------------------------------------------------------------------*/
 
diff --git a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
index 6c29f6f..9eba7f1 100644
--- a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
@@ -1826,6 +1826,9 @@ void SwRootFrm::RemoveSuperfluous()
 /*N*/ 								case HORI_LEFT:
 /*?*/ 									if ( PRTAREA == rHori.GetRelationOrient() )
 /*?*/ 										nWidth += pFrm->Prt().Left();
+/*N*/ 									break;
+/*N*/ 								default:
+/*N*/ 									break;
 /*N*/ 							}
 /*N*/ 						}
 /*N*/ 						else
@@ -1842,7 +1845,8 @@ void SwRootFrm::RemoveSuperfluous()
 /*N*/ //						nWidth += rLR.GetLeft() + rLR.GetRight();
 /*N*/ 						}
 /*N*/ 						break;
-/*N*/ 					default:	/* do nothing */;
+/*N*/ 					default:
+/*N*/ 						break;
 /*N*/ 				}
 /*N*/ 				nBrowseWidth = Max( nBrowseWidth, nWidth );
 /*N*/ 			}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx
index 24c2959..f598723 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx
@@ -94,6 +94,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
     const SwFmt* pParent = rFmt.DerivedFrom();
     // Parent-Namen nur uebernehmen, wenn kein Default
     ASSERT( !pParent || pParent->IsDefault(), "unexpected parent" );
+    (void)pParent;
 
     ASSERT( USHRT_MAX == rFmt.GetPoolFmtId(), "pool ids arent'supported" );
     ASSERT( USHRT_MAX == rFmt.GetPoolHelpId(), "help ids arent'supported" );