diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-12-16 11:11:45 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-12-16 11:11:45 -0500 |
| commit | 4d457dd56af84135bf5902449f545edfd55d59f2 (patch) | |
| tree | b62d7e41d6d68fcbad45621d6c19b3c3482db5bd /sc/source/core/data/validat.cxx | |
| parent | 65b13f00df2786cb4c3597c4dc0c447ddd93a0ba (diff) | |
| parent | edf1c529b28144af5cd766e796f5caec97ea1d2a (diff) | |
Merge branch 'master' into feature/calc-matrix-rework
Conflicts:
chart2/source/controller/dialogs/ChartTypeDialogController.cxx
chart2/source/controller/dialogs/TabPages.hrc
sc/inc/dpshttab.hxx
sc/inc/global.hxx
sc/source/core/data/dpobject.cxx
sc/source/core/data/dptablecache.cxx
sc/source/core/data/drwlayer.cxx
sc/source/filter/excel/xecontent.cxx
sc/source/filter/inc/ftools.hxx
sc/source/filter/inc/xehelper.hxx
sc/source/filter/inc/xihelper.hxx
sc/source/filter/inc/xistyle.hxx
sc/source/filter/xml/XMLExportDDELinks.cxx
sc/source/filter/xml/XMLExportDDELinks.hxx
sc/source/ui/docshell/docfunc.cxx
sc/source/ui/optdlg/opredlin.cxx
sc/source/ui/unoobj/styleuno.cxx
Diffstat (limited to 'sc/source/core/data/validat.cxx')
| -rw-r--r-- | sc/source/core/data/validat.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 7e2d138891c2..2476d9cc4d5b 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -645,7 +645,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings, const ScMatrix *pValues = aValidationSrc.GetMatrix(); if (!pValues) { - // The somewhat nasty case of either an error occured, or the + // The somewhat nasty case of either an error occurred, or the // dereferenced value of a single cell reference or an immediate result // is stored as a single value. |