diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index b200bbf..b03cf04 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -106,7 +106,7 @@ namespace editeng static StringMap m_aRecentlyUsedList; // general - AbstractHangulHanjaConversionDialog* //CHINA001 HangulHanjaConversionDialog* + AbstractHangulHanjaConversionDialog* m_pConversionDialog; // the dialog to display for user interaction Window* m_pUIParent; // the parent window for any UI we raise Reference< XMultiServiceFactory > @@ -344,7 +344,7 @@ namespace editeng if(pFact) { m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent, m_ePrimaryConversionDirection ); - DBG_ASSERT(m_pConversionDialog, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(m_pConversionDialog, "Dialogdiet fail!"); m_pConversionDialog->EnableRubySupport( m_pAntiImpl->HasRubySupport() ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index b368af1..206f51e 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -448,12 +448,11 @@ const SfxPoolItem* SfxTabPage::GetExchangeItem( const SfxItemSet& rSet, return GetOldItem( rSet, nSlot ); } -// add CHINA001 begin + void SfxTabPage::PageCreated( SfxAllItemSet /*aSet*/ ) { DBG_ASSERT(0, "SfxTabPage::PageCreated should not be called"); -}//CHINA001 -// add CHINA001 end +} // ----------------------------------------------------------------------- diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 360f319..0af8f1a 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -47,7 +47,7 @@ #include #include -//CHINA001 #include "bbdlg.hxx" + #include "dlgutil.hxx" #include #include "htmlmode.hxx" @@ -59,8 +59,8 @@ #include #include -#include //CHINA001 -#include //CHINA001 +#include +#include // static ---------------------------------------------------------------- // --> OD 2004-06-18 #i19922# @@ -544,13 +544,11 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) pBBSet->Put( *pItem ); } - //CHINA001 SvxBorderBackgroundDlg* pDlg = -//CHINA001 new SvxBorderBackgroundDlg( this, *pBBSet, bEnableBackgroundSelector ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg( this, *pBBSet, bEnableBackgroundSelector ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() ) { SfxItemIter aIter( *pDlg->GetOutputItemSet() ); diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index 5342be0..0c31a55 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -32,7 +32,7 @@ #include #include #include "hyperdlg.hxx" -#include //CHINA001 +#include #include #include @@ -65,11 +65,10 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId, mpDlg( NULL ) { - //CHINA001 pWindow = new SvxHpLinkDlg( _pParent, pBindings ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG ); - DBG_ASSERT(mpDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(mpDlg, "Dialogdiet fail!"); pWindow = mpDlg->GetWindow(); ((MyStruct*)pImp)->bVisible = FALSE; diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index cdd1f90..3f51e4c 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -882,7 +882,7 @@ void IMapWindow::DoPropertyDialog() pModel->SetChanged( sal_True ); UpdateInfo( TRUE ); } - delete aDlg; //add by CHINA001 + delete aDlg; } } } diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index b62c2eb..3829f2f 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -72,7 +72,7 @@ #include "dlgutil.hxx" #include #include -#include //CHINA001 +#include #include @@ -1561,12 +1561,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) } else if ( pBtn == &aSimilarityBtn ) { -//CHINA001 SvxSearchSimilarityDialog* pDlg = -//CHINA001 new SvxSearchSimilarityDialog( this, -//CHINA001 pSearchItem->IsLEVRelaxed(), -//CHINA001 pSearchItem->GetLEVOther(), -//CHINA001 pSearchItem->GetLEVShorter(), -//CHINA001 pSearchItem->GetLEVLonger() ); + pSearchItem->GetLEVLonger() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { @@ -1575,7 +1570,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) pSearchItem->GetLEVOther(), pSearchItem->GetLEVShorter(), pSearchItem->GetLEVLonger() ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); if ( pDlg && pDlg->Execute() == RET_OK ) { pSearchItem->SetLEVRelaxed( pDlg->IsRelaxed() ); @@ -1596,15 +1591,15 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) { AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, pSearchItem->GetTransliterationFlags() ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute(); + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + int nRet = aDlg->Execute(); if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true { - INT32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 INT32 nFlags = aDlg.GetTransliterationFlags(); + INT32 nFlags = aDlg->GetTransliterationFlags(); pSearchItem->SetTransliterationFlags( nFlags ); ApplyTransliterationFlags_Impl( nFlags ); } - delete aDlg; //add for CHINA001 + delete aDlg; } } else if(pBtn == &aSearchComponent1PB || pBtn == &aSearchComponent2PB ) @@ -2207,12 +2202,12 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) aSet.DisableItem(rPool.GetWhich(SID_ATTR_PARA_PAGEBREAK)); aSet.DisableItem(rPool.GetWhich(SID_ATTR_PARA_KEEP)); - //CHINA001 SvxSearchFormatDialog* pDlg = new SvxSearchFormatDialog( this, aSet ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXDLG_SEARCHFORMAT ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); aTxt.Insert( pDlg->GetText(), 0 ); pDlg->SetText( aTxt ); @@ -2284,12 +2279,11 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG ) if ( !pSearchList || !pImpl->pRanges ) return 0; - //CHINA001 SvxSearchAttributeDialog* pDlg = new SvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); pDlg->Execute(); delete pDlg; } diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 8d0c1d2..4f528b7 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -893,7 +893,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe if(pFact) { AbstractFmShowColsDialog* pDlg = pFact->CreateFmShowColsDialog(NULL); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); pDlg->SetColumns(xCols); pDlg->Execute(); delete pDlg; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 4a6f8ad..1386945 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -88,28 +88,28 @@ #include "fmdocumentclassification.hxx" #include "formtoolbars.hxx" -#include //CHINA001 -#include //CHINA001 +#include +#include #include "svx/sdrobjectfilter.hxx" -#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \ - try \ - { \ - successflag = sal_False; \ - action; \ - successflag = sal_True; \ - } \ - catch(::com::sun::star::sdbc::SQLException& e) \ - { \ - ::com::sun::star::sdb::SQLContext eExtendedInfo = \ - GetImpl()->prependContextInfo(e, Reference< XInterface > (), context, ::rtl::OUString()); \ - displayException(eExtendedInfo); \ - } \ - catch(Exception&) \ - { \ - DBG_ERROR(message); \ - } \ +#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \ + try \ + { \ + successflag = sal_False; \ + action; \ + successflag = sal_True; \ + } \ + catch(::com::sun::star::sdbc::SQLException& e) \ + { \ + ::com::sun::star::sdb::SQLContext eExtendedInfo = \ + GetImpl()->prependContextInfo(e, Reference< XInterface > (), context, ::rtl::OUString()); \ + displayException(eExtendedInfo); \ + } \ + catch(Exception&) \ + { \ + DBG_ERROR(message); \ + } \ #define DO_SAFE_WITH_ERROR( action, message ) try { action; } catch(Exception&) { DBG_ERROR(message); } diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index b36ac9d..d819018 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -426,7 +426,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor sal_Bool bMovedAround(sal_False); do { - if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001 if (m_eMode == FmSearchDialog::SM_ALLOWSCHEDULE) + if (m_eMode == SM_ALLOWSCHEDULE) { Application::Reschedule(); Application::Reschedule(); @@ -493,7 +493,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri sal_Bool bMovedAround(sal_False); do { - if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001 if (m_eMode == FmSearchDialog::SM_ALLOWSCHEDULE) + if (m_eMode == SM_ALLOWSCHEDULE) { Application::Reschedule(); Application::Reschedule(); @@ -595,7 +595,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O sal_Bool bMovedAround(sal_False); do { - if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001 if (m_eMode == FmSearchDialog::SM_ALLOWSCHEDULE) + if (m_eMode == SM_ALLOWSCHEDULE) { Application::Reschedule(); Application::Reschedule(); @@ -684,7 +684,8 @@ DBG_NAME(FmSearchEngine); //------------------------------------------------------------------------ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB, const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, - const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode)//CHINA001 const Reference< XNumberFormatsSupplier > & xFormatSupplier, FmSearchDialog::SEARCH_MODE eMode) + const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode) + :m_xSearchCursor(xCursor) ,m_xFormatSupplier(xFormatSupplier) ,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() ) @@ -722,7 +723,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB, //------------------------------------------------------------------------ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB, const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, - const InterfaceArray& arrFields, FMSEARCH_MODE eMode)//CHINA001 const InterfaceArray& arrFields, FmSearchDialog::SEARCH_MODE eMode) + const InterfaceArray& arrFields, FMSEARCH_MODE eMode) :m_xSearchCursor(xCursor) ,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() ) ,m_aStringCompare( _rxORB ) @@ -1181,7 +1182,7 @@ void FmSearchEngine::ImplStartNextSearch() m_bCancelAsynchRequest = sal_False; m_bSearchingCurrently = sal_True; - if (m_eMode == SM_USETHREAD)//CHINA001 if (m_eMode == FmSearchDialog::SM_USETHREAD) + if (m_eMode == SM_USETHREAD) { FmSearchThread* pSearcher = new FmSearchThread(this); // der loescht sich nach Beendigung selber ... diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 2adf285..9a8ea4b 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -59,8 +59,8 @@ #include #include -#include //CHINA001 -#include //CHINA001 +#include +#include #include //............................................................................ namespace svxform diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index adc6675..85b7e01 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -42,8 +42,7 @@ #include "gallery.hrc" #include -#include //CHINA001 -//CHINA001 #include //CHINA001 +#include // -------------- // - Namespaces - @@ -407,17 +406,17 @@ void GalleryBrowser1::ImplExecute( USHORT nId ) case( MN_ACTUALIZE ): { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); - //CHINA001 ActualizeProgress aActualizeProgress( this, pTheme ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { VclAbstractRefreshableDialog* aActualizeProgress = pFact->CreateActualizeProgressDialog( this, pTheme ); - DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!"); - aActualizeProgress->Update(); //CHINA001 aActualizeProgress.Update(); - aActualizeProgress->Execute(); //CHINA001 aActualizeProgress.Execute(); + aActualizeProgress->Update(); + aActualizeProgress->Execute(); mpGallery->ReleaseTheme( pTheme, *this ); - delete aActualizeProgress; //add CHINA001 + delete aActualizeProgress; } } break; @@ -433,15 +432,15 @@ void GalleryBrowser1::ImplExecute( USHORT nId ) { GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); const String aOldName( pTheme->GetName() ); - //CHINA001 TitleDialog aDlg( this, aOldName ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldName ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(aDlg, "Dialogdiet fail!"); - if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) + if( aDlg->Execute() == RET_OK ) { - const String aNewName( aDlg->GetTitle() ); //CHINA001 aDlg.GetTitle() ); + const String aNewName( aDlg->GetTitle() ); if( aNewName.Len() && ( aNewName != aOldName ) ) { @@ -459,7 +458,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId ) } } mpGallery->ReleaseTheme( pTheme, *this ); - delete aDlg; //add CHINA001 + delete aDlg; } break; @@ -469,16 +468,16 @@ void GalleryBrowser1::ImplExecute( USHORT nId ) if( pTheme && !pTheme->IsReadOnly() && !pTheme->IsImported() ) { - //CHINA001 GalleryIdDialog aDlg( this, pTheme ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractGalleryIdDialog* aDlg = pFact->CreateGalleryIdDialog( this, pTheme ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(aDlg, "Dialogdiet fail!"); - if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) - pTheme->SetId( aDlg->GetId(), TRUE ); //CHINA001 pTheme->SetId( aDlg.GetId(), TRUE ); - delete aDlg; //add CHINA001 + if( aDlg->Execute() == RET_OK ) + pTheme->SetId( aDlg->GetId(), TRUE ); + delete aDlg; } } diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 20148bc..4080263 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -54,8 +54,7 @@ #include "gallery.hrc" #include #include -#include //CHINA001 -//CHINA001 #include //CHINA001 +#include // ----------- // - Defines - @@ -1010,15 +1009,15 @@ void GalleryBrowser2::ImplExecute( USHORT nId ) if( pObj ) { const String aOldTitle( GetItemText( *mpCurTheme, *pObj, GALLERY_ITEM_TITLE ) ); - //CHINA001 TitleDialog aDlg( this, aOldTitle ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldTitle ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - if( aDlg->Execute() == RET_OK )//CHINA001 if( aDlg.Execute() == RET_OK ) + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + if( aDlg->Execute() == RET_OK ) { - String aNewTitle( aDlg->GetTitle() );//CHINA001 String aNewTitle( aDlg.GetTitle() ); + String aNewTitle( aDlg->GetTitle() ); if( ( !aNewTitle.Len() && pObj->GetTitle().Len() ) || ( aNewTitle != aOldTitle ) ) { @@ -1031,7 +1030,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId ) } mpCurTheme->ReleaseObject( pObj ); - delete aDlg; //add CHINA001 + delete aDlg; } } } diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 479169d..a3e3e6f 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -36,7 +36,6 @@ #include #include "zoomctrl.hxx" -//CHINA001 #include "zoom.hxx" #include #include "stbctrls.h" #include diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 5b49ae9..0a2aa56 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -50,8 +50,8 @@ #include #include -#include //CHINA001 -#include //CHINA001 +#include +#include // #i37011# #include @@ -61,7 +61,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// -// +// // @@@@@ @@@@@ @@ @@@@@@ @@ @@ @@ @@@@@ @@ @@ // @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ // @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @ @@ @@ -809,12 +809,12 @@ void SdrEditView::DistributeMarkedObjects() if(nMark > 2) { SfxItemSet aNewAttr(pMod->GetItemPool()); - //CHINA001 SvxDistributeDialog* pDlg = new SvxDistributeDialog(NULL, aNewAttr); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); UINT16 nResult = pDlg->Execute(); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 91c2ea1..27e93d9 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -66,7 +66,7 @@ #include #include #include -#include //add CHINA001 +#include #include #include #include diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 998e0ad..5baa27b 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -52,7 +52,7 @@ #include #include #include -//CHINA001 #include "../dialog/grfpage.hxx" + #include #include #include @@ -71,7 +71,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -#include //CHINA001 +#include // ----------- // - Defines - // ----------- @@ -1007,13 +1007,13 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) SfxSingleTabDialog aCropDialog( SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL, aCropDlgAttr, 950 ); const String aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP ); - //CHINA001 SfxTabPage* pTabPage = SvxGrfCropPage::Create( &aCropDialog, aCropDlgAttr ); + SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet error!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet error!"); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_GRFCROP ); - DBG_ASSERT(fnCreatePage, "Dialogdiet error!");//CHINA001 + DBG_ASSERT(fnCreatePage, "Dialogdiet error!"); SfxTabPage* pTabPage = (*fnCreatePage)( &aCropDialog, aCropDlgAttr ); - //CHINA001 end + pTabPage->SetText( aCropStr ); aCropDialog.SetTabPage( pTabPage );