strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dialogdiet01 (1.4.34); FILE MERGED

Browse source 
2004/04/22 02:01:31 mwu 1.4.34.1: dialogdiet01 m33 sd 20040422
This commit is contained in:
Jens-Heiner Rechtien 2004-05-10 14:46:31 +00:00
parent 3d42093e4e
commit 3ab81ed65f
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sd/source/ui/func/fuchar.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: fuchar.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: obo $ $Date: 2004-01-20 10:56:48 $
* last change: $Author: hr $ $Date: 2004-05-10 15:46:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -78,7 +78,7 @@
#include <sfx2/request.hxx>
#endif
#include "dlg_char.hxx"
//CHINA001 #include "dlg_char.hxx"
#ifndef SD_VIEW_HXX
#include "View.hxx"
#endif
@ -93,7 +93,8 @@
#include "ViewShell.hxx"
#endif
#include "DrawDocShell.hxx"
#include "sdabstdlg.hxx" //CHINA001
#include "dlg_char.hrc" //CHINA001
namespace sd {
TYPEINIT1( FuChar, FuPoor );
@ -123,8 +124,11 @@ FuChar::FuChar (
EE_ITEMS_START, EE_ITEMS_END );
aNewAttr.Put( aEditAttr, FALSE );
SdCharDlg* pDlg = new SdCharDlg( NULL, &aNewAttr, pDoc->GetDocSh() );
//CHINA001 SdCharDlg* pDlg = new SdCharDlg( NULL, &aNewAttr, pDoc->GetDocSh() );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();//CHINA001
DBG_ASSERT(pFact, "SdAbstractDialogFactory fail!");//CHINA001
SfxAbstractTabDialog* pDlg = pFact->CreateSdTabDialog(ResId( TAB_CHAR ), NULL, &aNewAttr, pDoc->GetDocSh() );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
USHORT nResult = pDlg->Execute();
switch( nResult )

19
sd/source/ui/func/fucopy.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: fucopy.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: obo $ $Date: 2004-01-20 11:00:18 $
* last change: $Author: hr $ $Date: 2004-05-10 15:46:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -77,9 +77,9 @@
#ifndef SD_VIEW_HXX
#include "View.hxx"
#endif
#ifndef SD_COPY_DLG_HXX
#include "copydlg.hxx"
#endif
//CHINA001 #ifndef SD_COPY_DLG_HXX
//CHINA001 #include "copydlg.hxx"
//CHINA001 #endif
#include "drawdoc.hxx"
#include "DrawDocShell.hxx"
@ -110,7 +110,8 @@
#ifndef _SFXREQUEST_HXX //autogen
#include <sfx2/request.hxx>
#endif
#include "sdabstdlg.hxx" //CHINA001
#include "copydlg.hrc" //CHINA001
namespace sd {
TYPEINIT1( FuCopy, FuPoor );
@ -164,7 +165,11 @@ FuCopy::FuCopy (
}
}
CopyDlg* pDlg = new CopyDlg( NULL, aSet, pDoc->GetColorTable(), pView );
//CHINA001 CopyDlg* pDlg = new CopyDlg( NULL, aSet, pDoc->GetColorTable(), pView );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();//CHINA001
DBG_ASSERT(pFact, "SdAbstractDialogFactory fail!");//CHINA001
AbstractCopyDlg* pDlg = pFact->CreateCopyDlg(ResId( DLG_COPY ), NULL, aSet, pDoc->GetColorTable(), pView );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
USHORT nResult = pDlg->Execute();
switch( nResult )