From 81ccbef65d7375811cda30ec015b72eff1b73638 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 3 Feb 2004 19:39:51 +0000
Subject: INTEGRATION: CWS dialogdiet (1.6.322); FILE MERGED 2004/01/13
 02:56:46 mwu 1.6.322.1: DialogDiet 2004_01_13

---
 sc/source/ui/view/viewutil.cxx | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'sc/source/ui')

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;
 }
 
-- 
cgit v1.2.3