diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-22 16:57:42 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-22 16:57:42 +0100 |
commit | fd3abe7a85c883cc8ecbfdd2403256d4cebd7c10 (patch) | |
tree | 98e032dfcf126483a797955861aa49fc7c95af79 | |
parent | New sal/log.h obsoletes osl/diagnose.h and tools/debug.hxx. (diff) | |
download | binfilter-fd3abe7a85c883cc8ecbfdd2403256d4cebd7c10.tar.gz binfilter-fd3abe7a85c883cc8ecbfdd2403256d4cebd7c10.zip |
Fix --disable-dbgutil --enable-werror failures.
9 files changed, 13 insertions, 11 deletions
diff --git a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx index df1af4e00..7fad1b0f8 100644 --- a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx @@ -743,6 +743,7 @@ BOOL SwDBNumSetField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE /*N*/ String SwDBNameFieldType::Expand(ULONG nFmt) const /*N*/ { /*N*/ OSL_ENSURE( nFmt < FF_END, "Expand: kein guelt. Fmt!" ); + (void) nFmt; // avoid warnings /*N*/ const SwDBData aData = pDoc->GetDBData(); /*N*/ String sRet(aData.sDataSource); /*N*/ sRet += '.'; diff --git a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx index e2f59c1e4..3b74552a6 100644 --- a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx @@ -700,6 +700,7 @@ void SwPageFrm::RemoveVirtDrawObj( SwDrawContact*, SwDrawVirtObj* _pDrawVirtObj /*N*/ { /*N*/ //Der Fly will immer an der Seite direkt haengen. /*N*/ OSL_ENSURE( pAnch->GetAnchorId() == FLY_PAGE, "Unerwartete AnchorId." ); + (void) pAnch; // avoid warnings /*N*/ /*N*/ //Wenn ein Fly uebergeben wurde, so benutzen wir diesen, ansonsten wird /*N*/ //mit dem Format einer erzeugt. diff --git a/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx index cf5de1a27..07cf5bcec 100644 --- a/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx @@ -347,6 +347,7 @@ namespace binfilter { /*N*/ CurrShell::CurrShell( ViewShell *pNew ) /*N*/ { /*N*/ OSL_ENSURE( pNew, "0-Shell einsetzen?" ); + (void) pNew; // avoid warnings /*?*/ pPrev = 0; /*N*/ } diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx index e008a44a9..1eacbce9a 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx @@ -378,6 +378,7 @@ SfxPoolItem* SwFmtNoBalancedColumns::Create(SvStream &rStrm, USHORT) const /*M*/ SOFFICE_FILEFORMAT_40==nFFVer || /*M*/ SOFFICE_FILEFORMAT_50==nFFVer, /*M*/ "SwHeaderAndFooterEatSpacingItem: Gibt es ein neues Fileformat?" ); + (void) nFFVer; // avoid warnings /*M*/ return USHRT_MAX; /*M*/ } @@ -417,6 +418,7 @@ SfxPoolItem* SwFmtNoBalancedColumns::Create(SvStream &rStrm, USHORT) const /*N*/ SOFFICE_FILEFORMAT_40==nFFVer || /*N*/ SOFFICE_FILEFORMAT_50==nFFVer, /*N*/ "SwCropGrf: Gibt es ein neues Fileformat?" ); + (void) nFFVer; // avoid warnings /*N*/ /*N*/ return GRFCROP_VERSION_SWDEFAULT; /*N*/ } diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx index e8da6cd74..76f4a79cc 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx @@ -697,6 +697,7 @@ public: /*N*/ nLvl--; /*N*/ OSL_ENSURE( cType == aRecTypes[nLvl], /*N*/ "CloseRec: Falscher Block-Header" ); + (void) cType; // avoid warnings /*N*/ sal_uInt32 nPos = pStrm->Tell(); /*N*/ if( bOut ) /*N*/ { diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx index 2526b6059..7fb26e323 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx @@ -674,6 +674,7 @@ SfxPoolItem* SwTextGridItem::Create(SvStream& rStrm, USHORT /*nIVer*/) const /*N*/ SOFFICE_FILEFORMAT_40==nFFVer || /*N*/ SOFFICE_FILEFORMAT_50==nFFVer, /*N*/ "SwTextGridItem: Gibt es ein neues Fileformat?" ); + (void) nFFVer; // avoid warnings /*N*/ /*N*/ return USHRT_MAX; /*N*/ } diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr1.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr1.cxx index 8e96a4193..d46b67766 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr1.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr1.cxx @@ -52,6 +52,7 @@ namespace binfilter { /*N*/ OSL_ENSURE( !bCheck || (' ' != cCh && '-' != cCh), /*N*/ "Invalid character for the HardBlank attribute - " /*N*/ "must be a normal unicode character" ); + (void) bCheck; // avoid warnings /*N*/ } diff --git a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx index 147bd24fd..8ebf9e916 100644 --- a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx +++ b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx @@ -1043,7 +1043,7 @@ void SwExcelParser::Bof5() double SwExcelParser::RkToDouble( const UINT32 &nRk ) { //PLATTFORMABHAENGIG// - double fVal; + union { UINT32 words[2]; double fVal; }; // jetzt kommt Code aus'm Excel-Developer's-Kit-Buch V5 (S.223) if( nRk & 0x02 ) @@ -1053,12 +1053,12 @@ double SwExcelParser::RkToDouble( const UINT32 &nRk ) {// 64-Bit IEEE-Float #ifdef OSL_BIGENDIAN //680xx und alle anderen vernuenftigen Prozessoren... - *( ( UINT32 * ) &fVal + 1 ) = 0; // unteren 32 Bits = 0 - *( ( UINT32 * ) &fVal ) = nRk & 0xFFFFFFFC; // Bit 0, 1 = 0 + words[1] = 0; // unteren 32 Bits = 0 + words[0] = nRk & 0xFFFFFFFC; // Bit 0, 1 = 0 #else //Intel-Sch... - *( ( UINT32 * ) &fVal ) = 0; // unteren 32 Bits = 0 - *( ( UINT32 * ) &fVal + 1 ) = nRk & 0xFFFFFFFC; // Bit 0, 1 = 0 + words[0] = 0; // unteren 32 Bits = 0 + words[1] = nRk & 0xFFFFFFFC; // Bit 0, 1 = 0 #endif } diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx index dc1a1af01..e4ade6f4a 100644 --- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx +++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx @@ -491,13 +491,11 @@ void OServiceManager_Listener::disposing(const EventObject & rEvt ) } catch( const IllegalArgumentException & e ) { - (void) e; // avoid warnings SAL_WARN_S( "binfilter", "IllegalArgumentException caught: " << e.Message); } catch( const NoSuchElementException & e ) { - (void) e; // avoid warnings SAL_WARN_S( "binfilter", "NoSuchElementException caught: " << e.Message); } @@ -806,7 +804,6 @@ void OServiceManager::disposing() } catch (const RuntimeException & e) { - (void) e; // avoid warnings SAL_WARN_S( "binfilter", "RuntimeException occurred upon disposing factory: " @@ -1017,7 +1014,6 @@ Reference< XInterface > OServiceManager::createInstanceWithContext( } catch (const lang::DisposedException & e) { - (void) e; // avoid warnings SAL_WARN_S( "binfilter", "DisposedException occurred: " << e.Message); } @@ -1065,7 +1061,6 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( } catch (const lang::DisposedException & e) { - (void) e; // avoid warnings SAL_WARN_S( "binfilter", "DisposedException occurred: " << e.Message); } @@ -2093,7 +2088,6 @@ void * SAL_CALL legacysmgr_component_getFactory( } catch (const Exception & e) { - (void) e; // avoid warnings SAL_WARN_S( "binfilter", "unexpected exception in legacysmgr_component_getFactory: \"" |