summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/inc/app.hrc1
-rw-r--r--sd/inc/pch/precompiled_sd.hxx1
-rw-r--r--sd/inc/sdabstdlg.hxx2
-rw-r--r--sd/sdi/_drvwsh.sdi2
-rw-r--r--sd/sdi/outlnvsh.sdi2
-rw-r--r--sd/sdi/sdraw.sdi25
-rw-r--r--sd/source/ui/app/menuids_tmpl.src4
-rw-r--r--sd/source/ui/app/toolbox2_tmpl.src12
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx19
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx9
-rw-r--r--sd/source/ui/func/fubullet.cxx101
-rw-r--r--sd/source/ui/func/fuconnct.cxx2
-rw-r--r--sd/source/ui/func/fumeasur.cxx2
-rw-r--r--sd/source/ui/func/fuoaprms.cxx2
-rw-r--r--sd/source/ui/func/futext.cxx2
-rw-r--r--sd/source/ui/inc/fubullet.hxx2
-rw-r--r--sd/source/ui/view/drviews8.cxx2
-rw-r--r--sd/source/ui/view/drviewsj.cxx2
-rw-r--r--sd/source/ui/view/outlnvs2.cxx2
-rw-r--r--sd/uiconfig/sdraw/menubar/menubar.xml2
-rw-r--r--sd/uiconfig/sdraw/toolbar/textobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/menubar/menubar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/textobjectbar.xml2
23 files changed, 112 insertions, 90 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 4a2bf0e22a05..defab564e5ff 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 5ade98d5ad87..a9e5fbc29f82 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 fc579740b2f6..78d1cd42ec96 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 ea0936f269d5..f8d76d3d6006 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 440e77611357..6d30615dbd79 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 ca064d4daa11..3ad34d263fe4 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 95f162a5aead..54696e34d9e9 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 afaa071ffdf7..09ccd217c89e 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 63a487b69016..ba86987ebe13 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 a8ec164d916f..0e25a1b683c5 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 5d01f6e145f0..64fb3783d78d 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -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;
+ const SfxItemSet *pArgs = rReq.GetArgs();
+ const SfxPoolItem* pItem = 0;
+ if( pArgs )
+ pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem);
- if( !pDlg )
- return;
-
- 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 451c442cd2ce..7542aff67e7a 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 28e4957d4208..948117b22425 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 d96b65d00510..965b52b3a94b 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 265aedcd90dc..cb6b42dfc2fb 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 47c0fb1a7f23..0b41711995f2 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 df12d7982ccb..d2ea0daf06b7 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 d3485b8d6a0f..068fd64908c6 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 b6ee524d6555..9a47f15ff512 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 cccca6974eb4..74161968dffa 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 53dcf7eb3b19..d364ca42e771 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 6f3fa7703cff..f227cc960237 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 798b7ff38cc6..f91767c983ed 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
generated by cgit (git 2.34.1) at 2025-03-06 19:14:42 +0000