diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 12:07:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 12:07:24 +0000 |
| commit | 250b18c3903bf2a60b43609b2e63ece7f80448c7 (patch) | |
| tree | 81123c980fc2ce46b8b5fcbeafbc4560be7758be /sc/source/ui/docshell/docsh3.cxx | |
| parent | 66d27cbc47d9e5c03369f11273922bbdced4a2fe (diff) | |
INTEGRATION: CWS calcwarnings (1.27.2); FILE MERGED
2007/02/01 10:44:01 nn 1.27.2.2: fix for #i73877# from CWS calcdocmerge
2006/12/01 08:53:26 nn 1.27.2.1: #i69284# warning-free: ui, wntmsci10
Diffstat (limited to 'sc/source/ui/docshell/docsh3.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 60bdd7cb44ff..55b7f5897f1b 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.28 $ + * $Revision: 1.29 $ * - * last change: $Author: vg $ $Date: 2007-02-05 11:43:39 $ + * last change: $Author: vg $ $Date: 2007-02-27 13:07:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -434,7 +434,7 @@ void ScDocShell::InitOptions() // Fortsetzung von InitNew (CLOOKs) aViewOpt.SetHideAutoSpell( bHideAuto ); // zweistellige Jahreszahleneingabe aus Extras->Optionen->Allgemein->Sonstiges - aDocOpt.SetYear2000( SFX_APP()->GetMiscConfig()->GetYear2000() ); + aDocOpt.SetYear2000( sal::static_int_cast<USHORT>( SFX_APP()->GetMiscConfig()->GetYear2000() ) ); aDocument.SetDocOptions( aDocOpt ); aDocument.SetViewOptions( aViewOpt ); @@ -611,6 +611,10 @@ ScChangeAction* ScDocShell::GetChangeAction( const ScAddress& rPos ) case SC_CAT_MOVE : pFoundMove = pAction; break; + default: + { + // added to avoid warnings + } } ++nModified; } @@ -852,6 +856,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc ) pMove->GetBigRange().MakeRange(), NULL ); } break; + default: + { + // added to avoid warnings + } } pThisAction = pThisAction->GetNext(); } @@ -1003,6 +1011,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc ) aSourceRange.aStart, TRUE, TRUE, FALSE, FALSE ); } break; + default: + { + // added to avoid warnings + } } } const String& rComment = pSourceAction->GetComment(); |