Tag: cws_src680_oj14 User: oj Date: 2007-06-04 18:23:37+0000 Log: RESYNC: (1.9-1.11); FILE MERGED
File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dlgattr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dlgattr.cxx?r1=1.7.4.4&r2=1.7.4.5 Delta lines: +5 -13 -------------------- --- dlgattr.cxx 2006-11-07 09:22:14+0000 1.7.4.4 +++ dlgattr.cxx 2007-06-04 18:23:34+0000 1.7.4.5 @@ -37,14 +37,6 @@ #include "precompiled_dbaccess.hxx" -#ifdef MAC -#ifdef ITEMID_NUMBERINFO -#undef ITEMID_NUMBERINFO -#endif -#endif - -#define ITEMID_NUMBERINFO 0 - #ifndef DBAUI_SBATTRDLG_HXX #include "dlgattr.hxx" #endif @@ -99,23 +91,23 @@ //================================================================== SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, SvNumberFormatter* pFormatter, USHORT nFlags, BOOL bRow) : SfxTabDialog(pParent, ModuleRes( DLG_ATTR ), pCellAttrs ) - ,aTitle(ResId(ST_ROW)) + ,aTitle(ModuleRes(ST_ROW)) { DBG_CTOR(SbaSbAttrDlg,NULL); - pNumberInfoItem = new SvxNumberInfoItem( pFormatter ); + pNumberInfoItem = new SvxNumberInfoItem( pFormatter, 0 ); if (bRow) SetText(aTitle); if( nFlags & TP_ATTR_CHAR ) { -// AddTabPage( RID_SVXPAGE_CHAR_STD,String(ResId(TP_ATTR_CHAR)),SvxCharStdPage::Create, 0 ); +// AddTabPage( RID_SVXPAGE_CHAR_STD,String(ModuleRes(TP_ATTR_CHAR)),SvxCharStdPage::Create, 0 ); DBG_ERROR( "found flag TP_ATTR_CHAR" ); } if( nFlags & TP_ATTR_NUMBER ) - AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ResId(TP_ATTR_NUMBER)) ); //CHINA001 AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ResId(TP_ATTR_NUMBER)),SvxNumberFormatTabPage::Create, 0 ); + AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ModuleRes(TP_ATTR_NUMBER)) ); //CHINA001 AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ModuleRes(TP_ATTR_NUMBER)),SvxNumberFormatTabPage::Create, 0 ); if( nFlags & TP_ATTR_ALIGN ) - AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ResId(TP_ATTR_ALIGN)) );//CHINA001 AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ResId(TP_ATTR_ALIGN)),SvxAlignmentTabPage::Create, 0 ); + AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ModuleRes(TP_ATTR_ALIGN)) );//CHINA001 AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ModuleRes(TP_ATTR_ALIGN)),SvxAlignmentTabPage::Create, 0 ); FreeResource(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
