User: kz Date: 06/01/05 10:02:09 Modified: /dba/dbaccess/source/ui/inc/ ToolBoxHelper.hxx
Log: INTEGRATION: CWS iconswitching1 (1.5.264); FILE MERGED 2005/11/01 15:47:41 kendy 1.5.264.2: RESYNC: (1.5-1.6); FILE MERGED 2005/07/20 13:48:34 kendy 1.5.264.1: #i36518# Cleanup after cutnpaste in CWS oooicons File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: ToolBoxHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/ToolBoxHelper.hxx?r1=1.6&r2=1.7 Delta lines: +3 -4 ------------------- --- ToolBoxHelper.hxx 8 Sep 2005 15:40:11 -0000 1.6 +++ ToolBoxHelper.hxx 5 Jan 2006 18:02:07 -0000 1.7 @@ -55,7 +55,7 @@ class OToolBoxHelper { sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode - sal_Int16 m_nBitmapSet; // shows the toolbox large or small bitmaps + sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps ToolBox* m_pToolBox; // our toolbox (may be NULL) public: OToolBoxHelper(); @@ -68,12 +68,12 @@ virtual void resizeControls(const Size& _rDiff) = 0; /** will be called whenthe id of the image list is needed. - @param _eBitmapSet + @param _eSymbolsSize <svtools/imgdef.hxx> @param _bHiContast <TRUE/> when in high contrast mode. */ - virtual sal_Int16 getImageListId(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const = 0; + virtual sal_Int16 getImageListId(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const = 0; /** only the member will be set, derived classes can overload this function and do what need to be done. @param _pTB @@ -91,7 +91,6 @@ /** retrieve the current symbol set from misc options and system settings */ - sal_Int16 getCurrentSymbolSet(); inline sal_Bool isToolBoxHiContrast() const { return m_bIsHiContrast; } protected: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
