CWS-TOOLING: integrate CWS mba32issues01

2009-05-05 18:23:27 +0200 mba  r271547 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-05-05 18:22:02 +0200 mba  r271545 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-05-05 18:16:42 +0200 mba  r271544 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-04-29 19:35:58 +0200 mba  r271392 : #i73672#: unify commands for inserting special characters
2009-04-29 18:01:27 +0200 mba  r271391 : #i101337#: missing string resources
2009-04-29 18:01:10 +0200 mba  r271390 : #i101337#: missing string resources
2009-04-29 15:42:47 +0200 mba  r271380 : concurrency problem in multithreaded dmake due to missing dependency
2009-04-28 17:36:03 +0200 tbo  r271336 : #i99432#
2009-04-28 13:57:52 +0200 mba  r271322 : #i101302#: ctor might be called with pSet=0
2009-04-22 19:32:39 +0200 tbo  r271138 : #i99432#
2009-04-09 14:46:03 +0200 mba  r270709 : make sendreportw32.cxx compile with pch
2009-04-06 16:05:07 +0200 mba  r270568 : #i99432#: some tweaks for build order
2009-04-06 15:38:52 +0200 mba  r270558 : typo
2009-04-06 13:36:19 +0200 mba  r270542 : #i99432#: split of localization also
2009-04-06 13:19:06 +0200 mba  r270539 : #i99432#: split up srs files also
2009-04-03 17:57:59 +0200 mba  r270513 : #i99432#: split dialog folder into two
2009-04-03 17:56:46 +0200 mba  r270512 : #i99432#: split dialog folder into two
2009-04-01 22:15:00 +0200 mba  r270364 : warnings on Linux
2009-04-01 22:10:44 +0200 mba  r270363 : warnings on Linux
2009-04-01 21:43:54 +0200 mba  r270362 : warning fixed
2009-04-01 21:41:27 +0200 mba  r270361 : warning on Linux fixed
2009-04-01 21:35:44 +0200 mba  r270360 : warning fixed
2009-04-01 20:19:59 +0200 mba  r270358 : warning found on Linux fixed
2009-04-01 19:23:38 +0200 mba  r270354 : warning due to missing eof
2009-04-01 18:56:25 +0200 mba  r270352 : linking problem fixed that appeared only on mac
2009-04-01 18:41:30 +0200 mba  r270350 : warnings discovered on Linux fixed
2009-04-01 18:34:28 +0200 mba  r270349 : some fixes for warnings and include problems discoverd after resync and build on mac
2009-04-01 14:08:22 +0200 mba  r270328 : CWS-TOOLING: rebase CWS mba32issues01 to trunk@270033 (milestone: DEV300:m45)
2009-03-04 18:13:35 +0100 mba  r268858 : #i99432#: more dialogs moved to cui
2009-03-04 17:47:41 +0100 mba  r268854 : #i99432#: more dialogs moved to cui
2009-03-04 17:32:39 +0100 mba  r268851 : warning fixed
2009-03-04 12:59:26 +0100 mba  r268814 : #i99432#: more dialogs moved to cui
2009-03-04 11:49:03 +0100 mba  r268802 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:46:00 +0100 mba  r268795 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:43:50 +0100 mba  r268794 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:00:29 +0100 mba  r268792 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:00:03 +0100 mba  r268791 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:59:43 +0100 mba  r268790 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:58:51 +0100 mba  r268789 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:58:16 +0100 mba  r268788 : #i99432#: CharmapDialog moved to cui
2009-03-03 16:33:14 +0100 mba  r268763 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:32:28 +0100 mba  r268762 : #i99432#: some tabpages moved to cui
2009-03-03 16:32:09 +0100 mba  r268761 : #i99432#: some tabpages moved to cui
2009-03-03 16:29:40 +0100 mba  r268760 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:29:08 +0100 mba  r268759 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:28:41 +0100 mba  r268758 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:28:18 +0100 mba  r268757 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:27:36 +0100 mba  r268756 : #i99465#: replace FN_SYMBOL by SID_CHARMAP
2009-03-03 16:27:02 +0100 mba  r268755 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:26:23 +0100 mba  r268754 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:25:30 +0100 mba  r268753 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:24:49 +0100 mba  r268752 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:24:35 +0100 mba  r268751 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:23:20 +0100 mba  r268750 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:23:04 +0100 mba  r268749 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:21:56 +0100 mba  r268748 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:18:39 +0100 mba  r268747 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:13:14 +0100 mba  r268745 : #i99465#: replace FN_SYMBOL by SID_CHARMAP
2009-03-03 16:02:54 +0100 mba  r268738 : #i99432#: moved MacroAssignment TabPage from sfx2
2009-03-03 14:57:58 +0100 mba  r268729 : #i99465#: transport return value via ItemSet
2009-03-03 00:08:10 +0100 mba  r268701 : #i99432#: move acccfg to cuilib
2009-03-03 00:07:32 +0100 mba  r268700 : #i99432#: move acccfg to cuilib
2009-03-03 00:02:01 +0100 mba  r268699 : #i99432#: move acccfg to cuilib
2009-03-03 00:01:38 +0100 mba  r268698 : #i99432#: move acccfg to cuilib
2009-03-03 00:01:11 +0100 mba  r268697 : #i99432#: move acccfg to cuilib
2009-03-03 00:00:40 +0100 mba  r268696 : #i99432#: move acccfg to cuilib
2009-03-03 00:00:06 +0100 mba  r268695 : #i99432#: replace SfxAbstractSingleTabDialog by SfxAbstractDialog
2009-03-02 23:59:22 +0100 mba  r268694 : #i99432#: move acccfg to cuilib
2009-03-02 23:57:19 +0100 mba  r268693 : #i99432#: move acccfg to svx
2009-03-02 23:56:14 +0100 mba  r268692 : #i99432#: replace SfxAbstractSingleTabDialog by SfxAbstractDialog
2009-03-02 23:49:37 +0100 mba  r268691 : #i99785#: consolidate dialogs library
2009-03-02 17:26:40 +0100 mba  r268683 : #i99785#: consolidate dialogs library
2009-03-02 17:24:28 +0100 mba  r268682 : i99465#: consolidate slot for InsertSymbol command
2009-03-02 17:22:29 +0100 mba  r268681 : #i99785#: consolidate dialogs library
2009-03-02 17:18:11 +0100 mba  r268680 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 17:08:30 +0100 mba  r268679 : #i99785#: consolidate dialogs library
2009-03-02 17:06:57 +0100 mba  r268678 : #i99785#: consolidate dialogs library
2009-03-02 17:06:30 +0100 mba  r268677 : #i99785#: consolidate dialogs library
2009-03-02 17:05:02 +0100 mba  r268676 : #i99785#: consolidate dialogs library
2009-03-02 17:04:35 +0100 mba  r268675 : #i99785#: consolidate dialogs library
2009-03-02 16:47:53 +0100 mba  r268673 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:45:17 +0100 mba  r268671 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:39:59 +0100 mba  r268670 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:38:59 +0100 mba  r268668 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:38:28 +0100 mba  r268667 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:36:06 +0100 mba  r268666 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:29:50 +0100 mba  r268663 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:24:00 +0100 mba  r268659 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:23:31 +0100 mba  r268658 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:22:41 +0100 mba  r268657 : i99432#: move accelconfig and macroassignment to cui
2009-02-25 16:57:26 +0100 mba  r268453 : obsolete
2009-02-17 10:50:51 +0100 mba  r267846 : obsolete
2009-02-12 16:33:54 +0100 mba  r267676 : #i96834#: warning fixed
2009-02-11 19:28:47 +0100 mba  r267626 : #i91978#: unused code
2009-02-11 18:37:47 +0100 mba  r267625 : metafile output, fixes for 3 layer office
2009-02-11 12:56:28 +0100 mba  r267593 : selective trees; incomplete build lists; metafile output

23 files changed, 113 insertions, 91 deletions

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 83cfa86e9..68357de28 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -52,7 +52,6 @@
 #define SID_INSERTSYMBOL                    (SID_SD_START+16)
 #define SID_ZOOM_PANNING                    (SID_SD_START+17)
 #define SID_PRESENTATION_END                (SID_SD_START+18)
-#define SID_BULLET                          (SID_SD_START+19)
 #define SID_TEXTFORMAT                      (SID_SD_START+20)
 #define SID_POSITION                        (SID_SD_START+22)
 #define SID_MIRROR                          (SID_SD_START+23)
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 2759ddef5..9d31e675b 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -576,7 +576,6 @@
 #include "svx/brshitem.hxx"
 #include "svx/bulitem.hxx"
 #include "svx/camera3d.hxx"
-#include "svx/charmap.hxx"
 #include "svx/charreliefitem.hxx"
 #include "svx/clipboardctl.hxx"
 #include "svx/clipfmtitem.hxx"
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 0bcbdcfdd..4128fab4f 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -213,7 +213,7 @@ public:
     virtual SfxAbstractTabDialog*		CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
     virtual AbstractSdPresLayoutDlg*	CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
     virtual SfxAbstractTabDialog*		CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0;
-    virtual AbstractSfxSingleTabDialog*	CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0;
+    virtual SfxAbstractDialog*			CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0;
     virtual AbstractSdVectorizeDlg*		CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0;
     virtual AbstractSdPublishingDlg*	CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) = 0;
 
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index c89f1778f..242fe3ee4 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -240,7 +240,7 @@ interface DrawView
         Cachable , HasDialog , Export ,
         MenuConfig , AccelConfig , ToolBoxConfig ;
     ]
-    SID_BULLET // ole : no, status : ?
+    SID_CHARMAP // ole : no, status : ?
     [
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index be3044cb7..c0e5b82b5 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -141,7 +141,7 @@ interface OutlineView
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
     ]
-    SID_BULLET // ole : no, status : ?
+    SID_CHARMAP // ole : no, status : ?
     [
         ExecMethod = FuTemporaryModify ;
         StateMethod = GetMenuState ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 06050f23f..40fbe2ffe 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -340,31 +340,6 @@ SfxVoidItem Break SID_BREAK
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem Bullet SID_BULLET
-()
-[
-    /* flags: */  
-    AutoUpdate = FALSE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = FALSE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
-    RecordPerSet;
-    Synchron;
-
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
-    GroupId = GID_INSERT;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem CapturePoint SID_CAPTUREPOINT
 ()
 [
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 50420adba..a202945d1 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -540,8 +540,8 @@
 #define MN_BULLET \
     MenuItem\
     {\
-        Identifier = SID_BULLET ; \
-        HelpID = SID_BULLET ; \
+        Identifier = SID_CHARMAP ; \
+        HelpID = SID_CHARMAP ; \
         Text [ en-US ] = "S~pecial Character..." ; \
     };
 
diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src
index a1c9b9162..3d856a28f 100644
--- a/sd/source/ui/app/toolbox2_tmpl.src
+++ b/sd/source/ui/app/toolbox2_tmpl.src
@@ -461,8 +461,8 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
 #endif
         ToolBoxItem
         {
-            Identifier = SID_BULLET;
-            HelpId = SID_BULLET;
+            Identifier = SID_CHARMAP;
+            HelpId = SID_CHARMAP;
             Hide = TRUE;
         };
     };
@@ -670,8 +670,8 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
 #endif
         ToolBoxItem
         {
-            Identifier = SID_BULLET;
-            HelpId = SID_BULLET;
+            Identifier = SID_CHARMAP;
+            HelpId = SID_CHARMAP;
             Hide = TRUE;
         };
     };
@@ -879,8 +879,8 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
 #endif
         ToolBoxItem
         {
-            Identifier = SID_BULLET;
-            HelpId = SID_BULLET;
+            Identifier = SID_CHARMAP;
+            HelpId = SID_CHARMAP;
             Hide = TRUE;
         };
     };
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index ef89ba25a..b2fc886a2 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -81,7 +81,7 @@ IMPL_ABSTDLG_BASE(AbstractMorphDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdPrintDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractSfxSingleTabDialog_Impl);
+IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdVectorizeDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl);
@@ -343,11 +343,20 @@ void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
 }
 // AbstractSdPresLayoutDlg_Impl end
 
-//AbstractSfxSingleTabDialog_Impl begin
-const SfxItemSet* AbstractSfxSingleTabDialog_Impl::GetOutputItemSet() const
+//SfxAbstractDialog_Impl begin
+const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const
 {
     return pDlg->GetOutputItemSet();
 }
+void AbstractSfxDialog_Impl::SetText( const XubString& rStr )
+{
+    pDlg->SetText( rStr );
+}
+String AbstractSfxDialog_Impl::GetText() const
+{
+    return pDlg->GetText();
+}
+
 //AbstractSfxSingleTabDialog_Impl end
 
 //AbstractSdVectorizeDlg_Impl begin
@@ -519,9 +528,9 @@ SfxAbstractTabDialog *  SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( ::
 }
 // add for SdTabTemplateDlg end 
 
-AbstractSfxSingleTabDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView )
+SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView )
 {
-    return new AbstractSfxSingleTabDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) );
+    return new AbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) );
 }
 
 // add for SdVectorizeDlg begin
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 8f3d8b261..cbcd723ee 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -32,6 +32,7 @@
 
 // include ---------------------------------------------------------------
 #include "sdabstdlg.hxx" 
+#include <sfx2/basedlgs.hxx>
 
 #define DECL_ABSTDLG_BASE(Class,DialogClass)		\
     DialogClass* 		pDlg;                   	\
@@ -229,10 +230,12 @@ class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg
 
 // add for SdActionDlg
 class SfxSingleTabDialog; 
-class AbstractSfxSingleTabDialog_Impl :public AbstractSfxSingleTabDialog 
+class AbstractSfxDialog_Impl : public SfxAbstractDialog 
 {
-    DECL_ABSTDLG_BASE(AbstractSfxSingleTabDialog_Impl,SfxSingleTabDialog)
+    DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog)
     virtual const SfxItemSet* 	GetOutputItemSet() const;
+    virtual void		SetText( const XubString& rStr );
+    virtual String   	GetText() const;
 };
 
 // add for SdVectorizeDlg
@@ -285,7 +288,7 @@ public:
     virtual SfxAbstractTabDialog*		CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool );
     virtual AbstractSdPresLayoutDlg*	CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs);
     virtual SfxAbstractTabDialog*		CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView );
-    virtual AbstractSfxSingleTabDialog*	CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView );
+    virtual SfxAbstractDialog*			CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView );
     virtual AbstractSdVectorizeDlg*		CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell );
     virtual AbstractSdPublishingDlg*	CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType);
 
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 7b42c256c..d9b35052d 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,9 +48,9 @@
 #include "sdresid.hxx"
 #include <svx/svdoutl.hxx>
 #include <vcl/msgbox.hxx>
-#include <svx/charmap.hxx>
 #include <sfx2/request.hxx>
 #include <svtools/ctloptions.hxx>
+#include <svtools/itempool.hxx>
 
 #ifdef IRIX
 #include <basic/sbx.hxx>
@@ -98,8 +98,8 @@ FunctionReference FuBullet::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd
 
 void FuBullet::DoExecute( SfxRequest& rReq )
 {
-    if( rReq.GetSlot() == SID_BULLET )
-        InsertSpecialCharacter();
+    if( rReq.GetSlot() == SID_CHARMAP )
+        InsertSpecialCharacter(rReq);
     else
     {
         sal_Unicode cMark = 0;
@@ -173,41 +173,78 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
     }
 }
 
-void FuBullet::InsertSpecialCharacter()
+void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
 {
-    SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-    AbstractSvxCharacterMap* pDlg = pFact ? pFact->CreateSvxCharacterMap( NULL,  RID_SVXDLG_CHARMAP, FALSE ) : 0;
-
-    if( !pDlg )
-        return;
+    const SfxItemSet *pArgs = rReq.GetArgs();
+    const SfxPoolItem* pItem = 0;
+    if( pArgs )
+        pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem);
 
-    SfxItemSet aFontAttr( mpDoc->GetPool() );
-    mpView->GetAttributes( aFontAttr );
-    const SvxFontItem* pFontItem = (const SvxFontItem*)aFontAttr.GetItem( SID_ATTR_CHAR_FONT );
-    if( pFontItem )
+    String aChars, aFontName;
+    Font aFont;
+    if ( pItem )
     {
-        Font aCurrentFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), Size( 1, 1 ) );
-        pDlg->SetFont( aCurrentFont );
+        aChars = ((const SfxStringItem*)pItem)->GetValue();
+        const SfxPoolItem* pFtItem = NULL;
+        pArgs->GetItemState( mpDoc->GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem);
+        const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
+        if ( pFontItem )
+        {
+            aFontName = pFontItem->GetValue();
+            aFont = Font( aFontName, Size(1,1) );
+        }
+        else
+        {
+            SfxItemSet aFontAttr( mpDoc->GetPool() );
+            mpView->GetAttributes( aFontAttr );
+            const SvxFontItem* pFItem = (const SvxFontItem*)aFontAttr.GetItem( SID_ATTR_CHAR_FONT );
+            if( pFItem )
+                aFont = Font( pFItem->GetFamilyName(), pFItem->GetStyleName(), Size( 1, 1 ) );
+        }
     }
 
-    // Wenn Zeichen selektiert ist kann es angezeigt werden
-    // pDLg->SetFont( );
-    // pDlg->SetChar( );
-    USHORT nResult = pDlg->Execute();
-
-    //char c;
-    String aString;
+    if (!aChars.Len() )
+    {
+        SfxAllItemSet aSet( mpDoc->GetPool() );
+        aSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
+
+        SfxItemSet aFontAttr( mpDoc->GetPool() );
+        mpView->GetAttributes( aFontAttr );
+        const SvxFontItem* pFontItem = (const SvxFontItem*)aFontAttr.GetItem( SID_ATTR_CHAR_FONT );
+        if( pFontItem )
+            aSet.Put( *pFontItem );
+
+        SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+        SfxAbstractDialog* pDlg = pFact ? pFact->CreateSfxDialog( &mpView->GetViewShell()->GetViewFrame()->GetWindow(), aSet,
+            mpView->GetViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(),
+            RID_SVXDLG_CHARMAP ) : 0;
+        if( !pDlg )
+            return;
+
+        // Wenn Zeichen selektiert ist kann es angezeigt werden
+        // pDLg->SetFont( );
+        // pDlg->SetChar( );
+        USHORT nResult = pDlg->Execute();
+        if( nResult == RET_OK )
+        {
+            SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, FALSE );
+            SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
+            if ( pFItem )
+            {
+                aFont.SetName( pFItem->GetFamilyName() );
+                aFont.SetStyleName( pFItem->GetStyleName() );
+                aFont.SetCharSet( pFItem->GetCharSet() );
+                aFont.SetPitch( pFItem->GetPitch() );
+            }
 
-    Font aFont;
+            if ( pCItem )
+                aChars  = pCItem->GetValue();
+        }
 
-    if( nResult == RET_OK )
-    {
-        aFont = pDlg->GetCharFont();
-        aString = pDlg->GetCharacters();
+        delete( pDlg );
     }
-    delete( pDlg );
 
-    if( nResult == RET_OK )
+    if( aChars.Len() )
     {
         OutlinerView* pOV = NULL;
         ::Outliner*	  pOL = NULL;
@@ -248,7 +285,7 @@ void FuBullet::InsertSpecialCharacter()
             SfxUndoManager& rUndoMgr =  pOL->GetUndoManager();
             rUndoMgr.EnterListAction(String(SdResId(STR_UNDO_INSERT_SPECCHAR)),
                                      aEmptyStr );
-            pOV->InsertText(aString, TRUE);
+            pOV->InsertText(aChars, TRUE);
 
             // attributieren (Font setzen)
             SfxItemSet aSet(pOL->GetEmptyItemSet());
@@ -280,7 +317,7 @@ void FuBullet::InsertSpecialCharacter()
 
 void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell, SfxViewFrame* pViewFrame )
 {
-    if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BULLET ) ||
+    if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CHARMAP ) ||
         SFX_ITEM_AVAILABLE == rSet.GetItemState( FN_INSERT_SOFT_HYPHEN ) ||
         SFX_ITEM_AVAILABLE == rSet.GetItemState( FN_INSERT_HARDHYPHEN ) ||
         SFX_ITEM_AVAILABLE == rSet.GetItemState( FN_INSERT_HARD_SPACE ) ||
@@ -305,7 +342,7 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell, SfxViewFra
         }
 
         if( !bTextEdit && (dynamic_cast<OutlineViewShell*>( pViewShell ) == 0) )
-            rSet.DisableItem(SID_BULLET);
+            rSet.DisableItem(SID_CHARMAP);
 
         if(!bTextEdit || !bCtlEnabled )
         {
diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx
index cbbad7281..05248fbb2 100644
--- a/sd/source/ui/func/fuconnct.cxx
+++ b/sd/source/ui/func/fuconnct.cxx
@@ -79,7 +79,7 @@ void FuConnectionDlg::DoExecute( SfxRequest& rReq )
     if( !pArgs )
     {
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        ::std::auto_ptr<AbstractSfxSingleTabDialog> pDlg( pFact ? pFact->CreateSfxSingleTabDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_CONNECTION) : 0);
+        ::std::auto_ptr<SfxAbstractDialog> pDlg( pFact ? pFact->CreateSfxDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_CONNECTION) : 0);
 
         if( pDlg.get() && (pDlg->Execute() == RET_OK) )
         {
diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx
index d8ecb1766..bef4d5978 100644
--- a/sd/source/ui/func/fumeasur.cxx
+++ b/sd/source/ui/func/fumeasur.cxx
@@ -78,7 +78,7 @@ void FuMeasureDlg::DoExecute( SfxRequest& rReq )
     if( !pArgs )
     {
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        ::std::auto_ptr<AbstractSfxSingleTabDialog> pDlg( pFact ? pFact->CreateSfxSingleTabDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_MEASURE) : 0 );
+        ::std::auto_ptr<SfxAbstractDialog> pDlg( pFact ? pFact->CreateSfxDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_MEASURE) : 0 );
 
         if( pDlg.get() && (pDlg->Execute() == RET_OK) )
         {
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index a30e46f53..a80938b90 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -474,7 +474,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
             aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, FALSE));
 
         SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-        AbstractSfxSingleTabDialog* pDlg = pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0;
+        SfxAbstractDialog* pDlg = pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0;
 
         USHORT nResult = pDlg ? pDlg->Execute() : RET_CANCEL;
 
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index a9adc2cba..cacb1208e 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -120,12 +120,12 @@ static USHORT SidArray[] = {
     SID_SET_SUPER_SCRIPT,             //   10294
     SID_SET_SUB_SCRIPT,               //   10295
     SID_HYPERLINK_GETLINK,            //   10361
+    SID_CHARMAP,					  //   10503
     SID_TEXTDIRECTION_LEFT_TO_RIGHT,  //   10907
     SID_TEXTDIRECTION_TOP_TO_BOTTOM,  //   10908
     SID_ATTR_PARA_LEFT_TO_RIGHT,      //   10950
     SID_ATTR_PARA_RIGHT_TO_LEFT,      //   10951
     FN_NUM_BULLET_ON,                 //   20138
-    SID_BULLET,                       //   27019
     SID_PARASPACE_INCREASE,           //   27346
     SID_PARASPACE_DECREASE,           //   27347
                             0 };
diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx
index 448a6298b..e2913da7c 100644
--- a/sd/source/ui/inc/fubullet.hxx
+++ b/sd/source/ui/inc/fubullet.hxx
@@ -58,7 +58,7 @@ private:
         SdDrawDocument* pDoc,
         SfxRequest& rReq);
 
-    void InsertSpecialCharacter();
+    void InsertSpecialCharacter( SfxRequest& rReq );
     void InsertFormattingMark( sal_Unicode cMark );
 };
 
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index e0e3ac0ea..68a84b494 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -153,7 +153,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
         case SID_INSERT_LRM :
         case SID_INSERT_ZWNBSP :
         case SID_INSERT_ZWSP:
-        case SID_BULLET:
+        case SID_CHARMAP:
         {
             SetCurrentFunction( FuBullet::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
             Cancel();
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 9ede78881..d859f2e29 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -415,7 +415,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
             {
                 rSet.DisableItem( SID_CHAR_DLG );
                 rSet.DisableItem( SID_PARA_DLG );
-                rSet.DisableItem( SID_BULLET );
+                rSet.DisableItem( SID_CHARMAP );
             }
             */
             if( bLine && !bText && !bDrawObj &&!b3dObj)
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 81fc89030..007d1604f 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -378,7 +378,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
         case SID_INSERT_LRM :
         case SID_INSERT_ZWNBSP :
         case SID_INSERT_ZWSP:
-        case SID_BULLET:
+        case SID_CHARMAP:
         {
             SetCurrentFunction( FuBullet::Create( this, GetActiveWindow(), pOlView, GetDoc(), rReq ) );
             Cancel();
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index cccca6974..74161968d 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -129,7 +129,7 @@
                     <menu:menuitem menu:id=".uno:InsertFileField"/>
                 </menu:menupopup>
             </menu:menu>
-            <menu:menuitem menu:id=".uno:Bullet"/>
+                        <menu:menuitem menu:id=".uno:InsertSymbol"/>
             <menu:menu menu:id=".uno:FormattingMarkMenu">
                 <menu:menupopup>
                     <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
diff --git a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml
index 53dcf7eb3..d364ca42e 100644
--- a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml
@@ -36,5 +36,5 @@
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="10297"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/>
- <toolbar:toolbaritem xlink:href=".uno:Bullet" toolbar:visible="false" toolbar:helpid="27019"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false" toolbar:helpid="27019"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 6f3fa7703..f227cc960 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -146,7 +146,7 @@
                     <menu:menuitem menu:id=".uno:InsertFileField"/>
                 </menu:menupopup>
             </menu:menu>
-            <menu:menuitem menu:id=".uno:Bullet"/>
+                        <menu:menuitem menu:id=".uno:InsertSymbol"/>
             <menu:menu menu:id=".uno:FormattingMarkMenu">
                 <menu:menupopup>
                     <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
diff --git a/sd/uiconfig/simpress/toolbar/textobjectbar.xml b/sd/uiconfig/simpress/toolbar/textobjectbar.xml
index 798b7ff38..f91767c98 100644
--- a/sd/uiconfig/simpress/toolbar/textobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/textobjectbar.xml
@@ -39,7 +39,7 @@
  <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="10296"/>
  <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="10297"/>
  <toolbar:toolbaritem xlink:href=".uno:OutlineBullet" toolbar:helpid="10156"/>
- <toolbar:toolbaritem xlink:href=".uno:Bullet" toolbar:visible="false" toolbar:helpid="27019"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false" toolbar:helpid="27019"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/>
 </toolbar:toolbar>
\ No newline at end of file