diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 15:12:05 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 15:12:05 +0000 |
| commit | 91fd084de2823fd2daa5c47b46d85e722b082a12 (patch) | |
| tree | f6393a4b2ff06b064e5bb9e01bddaaf553cd5140 /sc/source/ui/docshell/docsh3.cxx | |
| parent | 1a7caf65c1d49b23675325dd584d9c85ea35c05b (diff) | |
INTEGRATION: CWS odff (1.31.4); FILE MERGED
2008/02/27 18:35:10 er 1.31.4.2: RESYNC: (1.31-1.32); FILE MERGED
2008/02/15 14:23:07 er 1.31.4.1: #i81063# grammar here, grammar there, grammar everywhere
Diffstat (limited to 'sc/source/ui/docshell/docsh3.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 7568ac6f8143..24ce231cd7c0 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docsh3.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: obo $ $Date: 2008-02-26 14:55:32 $ + * last change: $Author: kz $ $Date: 2008-03-06 16:12:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -966,7 +966,9 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc ) aSourceRange.aEnd.SetRow( aPos.Row() + nRows - 1 ); aValue.Erase( 0, 1 ); aValue.Erase( aValue.Len()-1, 1 ); - GetDocFunc().EnterMatrix( aSourceRange, NULL, NULL, aValue, FALSE, FALSE ); + GetDocFunc().EnterMatrix( aSourceRange, + NULL, NULL, aValue, FALSE, FALSE, + ScGrammar::GRAM_DEFAULT ); } break; case MM_REFERENCE : // do nothing |