summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-02-27 11:58:14 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-02-27 11:58:14 +0000
commite93b3f8518af87a9a5d4ad4869cbcaf2e9ff8dde (patch)
treead0daf9f998ab27f85070321df8c72041b683844
parentfe9489997b86e8ca0d5ee3bcb9c25a46757d0b50 (diff)
INTEGRATION: CWS calcwarnings (1.36.8); FILE MERGED
2006/12/01 08:53:21 nn 1.36.8.1: #i69284# warning-free: ui, wntmsci10
-rw-r--r--sc/source/ui/app/scdll.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 647ca681f4bc..e21330b6187b 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: scdll.cxx,v $
*
- * $Revision: 1.36 $
+ * $Revision: 1.37 $
*
- * last change: $Author: ihi $ $Date: 2006-11-14 15:49:06 $
+ * last change: $Author: vg $ $Date: 2007-02-27 12:58:14 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -310,7 +310,8 @@ void ScDLL::Init()
// Hack: Eingabezeile mit 42 registrieren, damit sie im PlugIn immer sichtbar ist
ScInputWindowWrapper ::RegisterChildWindow(42, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK);
- ScNavigatorDialogWrapper ::RegisterChildWindowContext(pMod);
+ ScNavigatorDialogWrapper ::RegisterChildWindowContext(
+ sal::static_int_cast<sal_uInt16>(ScTabViewShell::GetInterfaceId()), pMod);
ScSolverDlgWrapper ::RegisterChildWindow(FALSE, pMod);
ScNameDlgWrapper ::RegisterChildWindow(FALSE, pMod);
ScPivotLayoutWrapper ::RegisterChildWindow(FALSE, pMod);
@@ -362,7 +363,7 @@ void ScDLL::Init()
// ::com::sun::star::form::component::Form-Objekt-Factory eintragen
FmFormObjFactory();
- pMod->PutItem( SfxUInt16Item( SID_ATTR_METRIC, pMod->GetAppOptions().GetAppMetric() ) );
+ pMod->PutItem( SfxUInt16Item( SID_ATTR_METRIC, sal::static_int_cast<UINT16>(pMod->GetAppOptions().GetAppMetric()) ) );
// StarOne Services are now handled in the registry
}