diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 11:24:06 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 11:24:06 +0000 |
| commit | d778f4ea172c222f76e38cd692fa7745b0b55ff6 (patch) | |
| tree | cbf758d5512f7151abb92643212462ae1507507a /sc/source/filter/excel/xecontent.cxx | |
| parent | fd4cf5be1ef639f11f53da6850904ef547588599 (diff) | |
INTEGRATION: CWS calcwarnings (1.17.108); FILE MERGED
2007/02/19 15:54:02 nn 1.17.108.3: RESYNC: (1.17-1.18); FILE MERGED
2006/12/12 16:42:44 dr 1.17.108.2: #i69284# remove compiler warnings for unxlngi6
2006/12/01 14:42:24 dr 1.17.108.1: #i69284# remove compiler warnings for wntmsci10
Diffstat (limited to 'sc/source/filter/excel/xecontent.cxx')
| -rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 1df38bd2c51f..ee558cc3df22 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xecontent.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: ihi $ $Date: 2006-12-19 13:20:02 $ + * last change: $Author: vg $ $Date: 2007-02-27 12:24:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -582,13 +582,13 @@ private: sal_uInt32 mnFontColorId; /// Font color ID. sal_uInt8 mnType; /// Type of the condition (cell/formula). sal_uInt8 mnOperator; /// Comparison operator for cell type. + bool mbFontUsed; /// true = Any font attribute used. bool mbHeightUsed; /// true = Font height used. bool mbWeightUsed; /// true = Font weight used. bool mbColorUsed; /// true = Font color used. bool mbUnderlUsed; /// true = Font underline type used. bool mbItalicUsed; /// true = Font posture used. bool mbStrikeUsed; /// true = Font strikeout used. - bool mbFontUsed; /// true = Any font attribute used. bool mbBorderUsed; /// true = Border attribute used. bool mbPattUsed; /// true = Pattern attribute used. }; @@ -1107,7 +1107,7 @@ XclExpDV& XclExpDval::SearchOrCreateDv( ULONG nScHandle ) size_t nFirstPos = 0; size_t nLastPos = maDVList.Size() - 1; bool bLoop = true; - ULONG nCurrScHandle; + ULONG nCurrScHandle = ::std::numeric_limits< ULONG >::max(); while( (nFirstPos <= nLastPos) && bLoop ) { nCurrPos = (nFirstPos + nLastPos) / 2; @@ -1249,7 +1249,6 @@ void XclExpWebQuery::Save( XclExpStream& rStrm ) XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) { SCTAB nScTab = rRoot.GetCurrScTab(); - ScDocument& rDoc = rRoot.GetDoc(); SfxObjectShell* pShell = rRoot.GetDocShell(); if( !pShell ) return; ScfPropertySet aModelProp( pShell->GetModel() ); |