diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 19:39:51 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 19:39:51 +0000 |
| commit | 81ccbef65d7375811cda30ec015b72eff1b73638 (patch) | |
| tree | 52f9fefd48a1a71ae8ce486221c216db4d9fa114 /sc/source/ui/view/viewutil.cxx | |
| parent | 1fd1fc6d36b087cd3cc9fd6fb65876d0ed1411e7 (diff) | |
INTEGRATION: CWS dialogdiet (1.6.322); FILE MERGED
2004/01/13 02:56:46 mwu 1.6.322.1: DialogDiet 2004_01_13
Diffstat (limited to 'sc/source/ui/view/viewutil.cxx')
| -rw-r--r-- | sc/source/ui/view/viewutil.cxx | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index 5253f03d6..dfa5ec7c3 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewutil.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: nn $ $Date: 2001-08-08 10:21:28 $ + * last change: $Author: hr $ $Date: 2004-02-03 20:39:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,8 @@ #include "global.hxx" #include "chgtrack.hxx" #include "chgviset.hxx" - +#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/dialogs.hrc> //CHINA001 // STATIC DATA ----------------------------------------------------------- //================================================================== @@ -265,21 +266,27 @@ BOOL ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, aFont.SetCharSet ( rOldFont.GetCharSet() ); aFont.SetPitch ( rOldFont.GetPitch() ); - SvxCharacterMap* pDlg = new SvxCharacterMap( NULL, FALSE ); - pDlg->SetCharFont( aFont ); - - if ( pDlg->Execute() == RET_OK ) + //CHINA001 SvxCharacterMap* pDlg = new SvxCharacterMap( NULL, FALSE ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + if(pFact) { - rString = pDlg->GetCharacters(); - aFont = pDlg->GetCharFont(); - rNewFont = SvxFontItem( aFont.GetFamily(), aFont.GetName(), - aFont.GetStyleName(), aFont.GetPitch(), - aFont.GetCharSet() ); // nId egal + AbstractSvxCharacterMap* pDlg = pFact->CreateSvxCharacterMap( NULL, ResId(RID_SVXDLG_CHARMAP), FALSE ); + DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 - bRet = TRUE; - } - delete pDlg; + pDlg->SetCharFont( aFont ); + if ( pDlg->Execute() == RET_OK ) + { + rString = pDlg->GetCharacters(); + aFont = pDlg->GetCharFont(); + rNewFont = SvxFontItem( aFont.GetFamily(), aFont.GetName(), + aFont.GetStyleName(), aFont.GetPitch(), + aFont.GetCharSet() ); // nId egal + + bRet = TRUE; + } + delete pDlg; + } return bRet; } |