diff options
| -rw-r--r-- | dbaccess/source/ui/dlg/dlgattr.cxx | 28 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 4 |
2 files changed, 9 insertions, 23 deletions
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index 79d2c2416..2a92f2cad 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -41,21 +41,10 @@ #include <svx/numinf.hxx> #endif -//CHINA001 #ifndef _SVX_CHARDLG_HXX //autogen -//CHINA001 #include <svx/chardlg.hxx> -//CHINA001 #endif - -//CHINA001 #ifndef _SVX_NUMFMT_HXX //autogen -//CHINA001 #include <svx/numfmt.hxx> -//CHINA001 #endif #ifndef _SVX_NUMINF_HXX #include <svx/numinf.hxx> #endif -//CHINA001 #ifndef _SVX_ALIGN_HXX //autogen -//CHINA001 #include <svx/align.hxx> -//CHINA001 #endif - #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif @@ -69,11 +58,11 @@ #ifndef _ZFORLIST_HXX #include <svl/zforlist.hxx> #endif -#include <svx/svxids.hrc> //CHINA001 -#include <svx/flagsdef.hxx> //CHINA001 -#ifndef _SFXINTITEM_HXX //CHINA001 -#include <svl/intitem.hxx> //CHINA001 -#endif //CHINA001 +#include <svx/svxids.hrc> +#include <svx/flagsdef.hxx> +#ifndef _SFXINTITEM_HXX +#include <svl/intitem.hxx> +#endif #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" #endif @@ -97,9 +86,9 @@ SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, SvNumb DBG_ERROR( "found flag TP_ATTR_CHAR" ); } if( nFlags & TP_ATTR_NUMBER ) - AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ModuleRes(TP_ATTR_NUMBER)) ); //CHINA001 AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ModuleRes(TP_ATTR_NUMBER)),SvxNumberFormatTabPage::Create, 0 ); + AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ModuleRes(TP_ATTR_NUMBER)) ); if( nFlags & TP_ATTR_ALIGN ) - AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ModuleRes(TP_ATTR_ALIGN)) );//CHINA001 AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ModuleRes(TP_ATTR_ALIGN)),SvxAlignmentTabPage::Create, 0 ); + AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ModuleRes(TP_ATTR_ALIGN)) ); FreeResource(); } @@ -119,8 +108,6 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) { case RID_SVXPAGE_NUMBERFORMAT: { - //CHINA001 ((SvxNumberFormatTabPage&)rTabPage). - //CHINA001 SetNumberFormatList( *pNumberInfoItem ); aSet.Put (SvxNumberInfoItem( pNumberInfoItem->GetNumberFormatter(), (const USHORT)SID_ATTR_NUMBERFORMAT_INFO)); rTabPage.PageCreated(aSet); } @@ -134,7 +121,6 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) case RID_SVXPAGE_ALIGNMENT: { - //CHINA001 ((SvxAlignmentTabPage&)rTabPage).SetFlags(WBA_NO_ORIENTATION|WBA_NO_LINEBREAK|WBA_NO_GRIDLINES|WBA_NO_VERTICAL|WBA_NO_LEFTINDENT); // aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, WBA_NO_ORIENTATION|WBA_NO_LINEBREAK|WBA_NO_GRIDLINES|WBA_NO_VERTICAL|WBA_NO_LEFTINDENT)); // rTabPage.PageCreated(aSet); } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 051c5b39b..6761732f8 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -117,7 +117,7 @@ #include <svx/zoomitem.hxx> #include <svx/zoomslideritem.hxx> #include <editeng/brshitem.hxx> -#include <svx/flagsdef.hxx> //CHINA001 +#include <svx/flagsdef.hxx> #include <svx/svdpagv.hxx> #include <svx/svxdlg.hxx> #include <svx/zoom_def.hxx> @@ -137,7 +137,7 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> -#include <svl/aeitem.hxx> //CHINA001 +#include <svl/aeitem.hxx> #include <svtools/cliplistener.hxx> #include <unotools/syslocale.hxx> #include <unotools/viewoptions.hxx> |