diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 11:35:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 11:35:48 +0000 |
| commit | dfaa9cbda0a764bd2deb94dc71673a3435572c3b (patch) | |
| tree | 2f748424a32bc0b594796e19b0ef70f60a76722f /starmath/source/toolbox.cxx | |
| parent | f53675eae2e01488fa197bb4290c9fe99269770b (diff) | |
INTEGRATION: CWS tl32 (1.18.20); FILE MERGED
2006/11/01 13:10:08 tl 1.18.20.2: #i69286# make starmath warning-free for unxlngi6(.pro)
2006/10/30 10:35:12 tl 1.18.20.1: #i69286# make starmath warning-free
Diffstat (limited to 'starmath/source/toolbox.cxx')
| -rw-r--r-- | starmath/source/toolbox.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index 7a4c7ce8f0..084688c8d6 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: toolbox.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2007-04-26 08:15:07 $ + * last change: $Author: vg $ $Date: 2007-05-25 12:35:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -146,7 +146,11 @@ static USHORT GetCategoryRID( USHORT nResId ) case RID_ILH_MISC : nRes = RID_MISC_CAT; break; default : if (nResId != RID_IL_CATALOG && nResId != RID_ILH_CATALOG) + { +#if OSL_DEBUG_LEVEL > 1 DBG_ERROR( "unkown category" ); +#endif + } } return nRes; } @@ -155,19 +159,19 @@ static USHORT GetCategoryRID( USHORT nResId ) //////////////////////////////////////////////////////////// -SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pBindings, +SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings, SfxChildWindow *pChildWindow, Window *pParent) : - SfxFloatingWindow(pBindings, pChildWindow, pParent, SmResId(RID_TOOLBOXWINDOW)), - aToolBoxCat(this, SmResId(NUM_TBX_CATEGORIES + 1)), - aToolBoxCat_Delim(this, SmResId( FL_TOOLBOX_CAT_DELIM )) + SfxFloatingWindow(pTmpBindings, pChildWindow, pParent, SmResId(RID_TOOLBOXWINDOW)), + aToolBoxCat(this, ResId(NUM_TBX_CATEGORIES + 1)), + aToolBoxCat_Delim(this, ResId( FL_TOOLBOX_CAT_DELIM )) { RTL_LOGFILE_CONTEXT( aLog, "starmath: SmToolBoxWindow::SmToolBoxWindow" ); // allow for cursor travelling between toolbox and sub-categories SetStyle( GetStyle() | WB_DIALOGCONTROL ); - nActiveCategoryRID = -1; + nActiveCategoryRID = sal::static_int_cast< USHORT >(-1); aToolBoxCat.SetClickHdl(LINK(this, SmToolBoxWindow, CategoryClickHdl)); @@ -401,7 +405,7 @@ IMPL_LINK_INLINE_START( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox) { int nItemId = pToolBox->GetCurItemId(); if (nItemId != 0) - SetCategory( nItemId ); + SetCategory( sal::static_int_cast< USHORT >(nItemId) ); return 0; } IMPL_LINK_INLINE_END( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox) |