summaryrefslogtreecommitdiff
path: root/sc/source/core/data/validat.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-02-27 11:10:47 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-02-27 11:10:47 +0000
commit578bb3368ceee34a7efcfd7b0e2964a52fbddda8 (patch)
tree0563a87ba8f40fb9f2922dccc3e07db555959356 /sc/source/core/data/validat.cxx
parentc04b5b66c0137cbf7feafefc6eedbdf79e30c2b3 (diff)
INTEGRATION: CWS calcwarnings (1.18.110); FILE MERGED
2006/12/06 13:34:18 nn 1.18.110.3: #i69284# warning-free: core, unxlngi6 2006/12/01 15:51:24 nn 1.18.110.2: #i69284# warning-free: wntmsci10.pro changes 2006/11/28 13:24:42 nn 1.18.110.1: #i69284# warning-free: core, wntmsci10
Diffstat (limited to 'sc/source/core/data/validat.cxx')
-rw-r--r--sc/source/core/data/validat.cxx25
1 files changed, 19 insertions, 6 deletions
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index b5012ffe5..8a7c8a00a 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: validat.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: kz $ $Date: 2006-07-21 11:11:34 $
+ * last change: $Author: vg $ $Date: 2007-02-27 12:10:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -391,8 +391,6 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
SbMethod* pMethod = (SbMethod*)pVar;
SbModule* pModule = pMethod->GetModule();
SbxObject* pObject = pModule->GetParent();
- StarBASIC* pBasic = PTR_CAST(StarBASIC,pObject);
- DBG_ASSERT(pBasic, "Kein Basic gefunden!");
String aMacroStr = pObject->GetName();
aMacroStr += '.';
aMacroStr += pModule->GetName();
@@ -415,7 +413,7 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
// 1) eingegebener / berechneter Wert
String aValStr = rInput;
- double nValue;
+ double nValue = 0.0;
BOOL bIsValue = FALSE;
if ( pCell ) // wenn Zelle gesetzt, aus Interpret gerufen
{
@@ -508,6 +506,10 @@ BOOL ScValidationData::DoError( Window* pParent, const String& rInput,
case SC_VALERR_INFO:
nStyle = WB_OK_CANCEL | WB_DEF_OK;
break;
+ default:
+ {
+ // added to avoid warnings
+ }
}
MessBox aBox( pParent, WinBits(nStyle), aTitle, aMessage );
@@ -758,9 +760,19 @@ bool ScValidationData::GetRangeFromFormula( ScRange& rRange, const ScAddress& rB
}
}
break;
+
+ default:
+ {
+ // added to avoid warnings
+ }
}
}
break;
+
+ default:
+ {
+ // added to avoid warnings
+ }
}
}
@@ -912,7 +924,8 @@ bool ScValidationData::IsListValid( ScBaseCell* pCell, const ScAddress& rPos ) c
// ============================================================================
// ============================================================================
-ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList)
+ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList) :
+ ScValidationEntries_Impl()
{
// fuer Ref-Undo - echte Kopie mit neuen Tokens!