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

CWS-TOOLING: integrate CWS mba32issues01

Browse source 
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
This commit is contained in:
Release Engineers 2009-05-06 10:59:57 +00:00
parent 4f78a3e4ed
commit cf1aa12f14
33 changed files with 284 additions and 275 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
starmath/inc/dialog.hxx
View file

@ -53,7 +53,7 @@
#include "format.hxx"
#include "symbol.hxx"
class SubsetMap;
#define CATEGORY_NONE 0xFFFF
/**************************************************************************/

1
sw/inc/pch/precompiled_sw.hxx
View file

@ -717,7 +717,6 @@
#include "svx/acorrcfg.hxx"
#include "svx/anchorid.hxx"
#include "svx/asiancfg.hxx"
#include "svx/charmap.hxx"
#include "svx/checklbx.hxx"
#include "svx/clipboardctl.hxx"
#include "svx/clipfmtitem.hxx"

13
sw/inc/swabstdlg.hxx
View file

@ -35,6 +35,7 @@
#include <tools/solar.h>
#include <tools/string.hxx>
#include <sfx2/sfxdlg.hxx>
#include <svx/svxdlg.hxx>
#include <vcl/syswin.hxx>
#ifndef _GLOBALS_HRC
#include <globals.hrc>
@ -346,9 +347,13 @@ class SwAbstractDialogFactory
public:
static SwAbstractDialogFactory* Create();
virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
const SfxItemSet& rAttr,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32 nResId
) = 0;
virtual AbstractSwWordCountDialog* CreateSwWordCountDialog( Window* pWindow ) = 0;
virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg ( Window* pParent, int nResId) = 0; // add for SwInsertAbstractDlg
virtual AbstractSfxSingleTabDialog* CreateSfxSingleTabDialog ( Window* pParent, SfxItemSet& rSet, int nResId ) = 0; // add for SwAddrDlg SwDropCapsDlg, SwBackgroundDlg,SwNumFmtDlg,
virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
SvStream* pStream, int nResId ) = 0;// add for SwAsciiFilterDlg
virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;// add for SwInsertBookmarkDlg
@ -394,15 +399,15 @@ public:
int nResId,
BOOL bSetAutoFmt = TRUE,
const SwTableAutoFmt* pSelFmt = 0 ) = 0;
virtual AbstractSfxSingleTabDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, USHORT nType,int nResId ) = 0;//add for SwBorderDlg
virtual AbstractSfxSingleTabDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ) = 0; //add for SwWrapDlg
virtual SfxAbstractDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, USHORT nType, int nResId ) = 0;//add for SwBorderDlg
virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ) = 0; //add for SwWrapDlg
virtual VclAbstractDialog * CreateSwTableWidthDlg ( Window *pParent, SwTableFUNC &rFnc , int nResId ) = 0; //add for SwTableWidthDlg
virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool,
const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ) = 0; //add for SwTableTabDlg
virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ) = 0; //add for SwFldDlg
virtual AbstractSfxSingleTabDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg
virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg
STAR_REFERENCE( container::XNamed ) & xNamed,
STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId ) = 0;

2
sw/sdi/_annotsh.sdi
View file

@ -188,7 +188,7 @@ interface _Annotation
ExecMethod = Exec ;
]
FN_INSERT_SYMBOL // api:
SID_CHARMAP // api:
[
ExecMethod = Exec ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";

2
sw/sdi/_textsh.sdi
View file

@ -177,7 +177,7 @@ interface BaseText
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
FN_INSERT_SYMBOL // status(final|play|rec)
SID_CHARMAP // status(final|play|rec)
[
ExecMethod = Execute ;
StateMethod = GetState ;

2
sw/sdi/drwtxtsh.sdi
View file

@ -114,7 +114,7 @@ interface TextDrawText
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
FN_INSERT_SYMBOL // api:
SID_CHARMAP // api:
[
ExecMethod = ExecDraw ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";

25
sw/sdi/swriter.sdi
View file

@ -4749,31 +4749,6 @@ SfxVoidItem InsertScript FN_JAVAEDIT
GroupId = GID_INSERT;
]
//--------------------------------------------------------------------------
SfxVoidItem InsertSymbol FN_INSERT_SYMBOL
(SfxStringItem Symbols FN_INSERT_SYMBOL,SfxStringItem FontName FN_PARAM_1)
[
/* flags: */
AutoUpdate = FALSE,
Cachable = Cachable,
FastCall = FALSE,
HasCoreId = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Asynchron;
/* config: */
AccelConfig = TRUE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_INSERT;
]
//--------------------------------------------------------------------------
SfxVoidItem InsertTable FN_INSERT_TABLE
(SfxStringItem TableName FN_INSERT_TABLE,SfxUInt16Item Columns SID_ATTR_TABLE_COLUMN,SfxUInt16Item Rows SID_ATTR_TABLE_ROW,SfxInt32Item Flags FN_PARAM_1,SfxStringItem AutoFormat FN_PARAM_2)

2
sw/source/ui/chrdlg/tblnumfm.cxx
View file

@ -54,7 +54,7 @@
#include <svtools/itemset.hxx>
#include <sfx2/tabdlg.hxx>
SwNumFmtDlg::SwNumFmtDlg(Window* pParent, SfxItemSet& rSet)
SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet)
: SfxSingleTabDialog( pParent, rSet, 0 )
{
// TabPage erzeugen

2
sw/source/ui/dialog/addrdlg.cxx
View file

@ -44,7 +44,7 @@ Ctor
****************************************************************************/
SwAddrDlg::SwAddrDlg(Window* pParent, SfxItemSet& rSet ) :
SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet& rSet ) :
SfxSingleTabDialog(pParent, rSet, 0)

76
sw/source/ui/dialog/macassgn.cxx
View file

@ -54,32 +54,22 @@
#include "swevent.hxx"
#include "docsh.hxx"
#include "globals.hrc"
#include "view.hxx"
#include <sfx2/viewfrm.hxx>
#include <svx/svxdlg.hxx>
#include <doc.hxx>
using ::com::sun::star::uno::Reference;
using ::com::sun::star::frame::XFrame;
SvStringsDtor* __EXPORT _GetRangeHdl( _SfxMacroTabPage*, const String& );
// SvStringsDtor* __EXPORT _GetRangeHdl( _SfxMacroTabPage*, const String& );
SwMacroAssignDlg::SwMacroAssignDlg( Window* pParent, SfxItemSet& rSet, const SwWrtShell& rSh,
DlgEventType eType )
: SfxMacroAssignDlg( pParent, rSh.GetDoc() ? rSh.GetDoc()->GetDocShell() : NULL, rSet )
SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
{
// TabPage holen
SwMacroAssignDlg::AddEvents( *(SfxMacroTabPage*) GetTabPage(), eType );
}
SwMacroAssignDlg::~SwMacroAssignDlg()
{
}
void SwMacroAssignDlg::AddEvents( SfxMacroTabPage& rPg, DlgEventType eType )
{
const SfxItemSet& rSet = rPg.GetItemSet();
// const SfxItemSet& rSet = rPg.GetItemSet();
SfxEventNamesItem aItem(SID_EVENTCONFIG);
BOOL bHtmlMode = FALSE;
USHORT nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
@ -88,22 +78,22 @@ void SwMacroAssignDlg::AddEvents( SfxMacroTabPage& rPg, DlgEventType eType )
switch( eType )
{
case MACASSGN_TEXTBAUST: // Textbausteine
rPg.SetGetRangeLink( &_GetRangeHdl );
rPg.AddEvent( String( SW_RES(STR_EVENT_START_INS_GLOSSARY) ),
// rPg.SetGetRangeLink( &_GetRangeHdl );
aItem.AddEvent( String( SW_RES(STR_EVENT_START_INS_GLOSSARY) ), String(),
SW_EVENT_START_INS_GLOSSARY );
rPg.AddEvent( String( SW_RES(STR_EVENT_END_INS_GLOSSARY) ),
aItem.AddEvent( String( SW_RES(STR_EVENT_END_INS_GLOSSARY) ), String(),
SW_EVENT_END_INS_GLOSSARY);
// damit der neue Handler aktiv wird!
rPg.Reset( rSet );
// rPg.Reset( rSet );
break;
case MACASSGN_ALLFRM:
case MACASSGN_GRAPHIC: // Grafiken
{
rPg.AddEvent( String( SW_RES(STR_EVENT_IMAGE_ERROR) ),
aItem.AddEvent( String( SW_RES(STR_EVENT_IMAGE_ERROR) ), String(),
SVX_EVENT_IMAGE_ERROR);
rPg.AddEvent( String( SW_RES(STR_EVENT_IMAGE_ABORT) ),
aItem.AddEvent( String( SW_RES(STR_EVENT_IMAGE_ABORT) ), String(),
SVX_EVENT_IMAGE_ABORT);
rPg.AddEvent( String( SW_RES(STR_EVENT_IMAGE_LOAD) ),
aItem.AddEvent( String( SW_RES(STR_EVENT_IMAGE_LOAD) ), String(),
SVX_EVENT_IMAGE_LOAD);
}
// kein break;
@ -112,13 +102,13 @@ void SwMacroAssignDlg::AddEvents( SfxMacroTabPage& rPg, DlgEventType eType )
if( !bHtmlMode &&
(MACASSGN_FRMURL == eType || MACASSGN_ALLFRM == eType))
{
rPg.AddEvent( String( SW_RES( STR_EVENT_FRM_KEYINPUT_A ) ),
aItem.AddEvent( String( SW_RES( STR_EVENT_FRM_KEYINPUT_A ) ), String(),
SW_EVENT_FRM_KEYINPUT_ALPHA );
rPg.AddEvent( String( SW_RES( STR_EVENT_FRM_KEYINPUT_NOA ) ),
aItem.AddEvent( String( SW_RES( STR_EVENT_FRM_KEYINPUT_NOA ) ), String(),
SW_EVENT_FRM_KEYINPUT_NOALPHA );
rPg.AddEvent( String( SW_RES( STR_EVENT_FRM_RESIZE ) ),
aItem.AddEvent( String( SW_RES( STR_EVENT_FRM_RESIZE ) ), String(),
SW_EVENT_FRM_RESIZE );
rPg.AddEvent( String( SW_RES( STR_EVENT_FRM_MOVE ) ),
aItem.AddEvent( String( SW_RES( STR_EVENT_FRM_MOVE ) ), String(),
SW_EVENT_FRM_MOVE );
}
}
@ -126,21 +116,23 @@ void SwMacroAssignDlg::AddEvents( SfxMacroTabPage& rPg, DlgEventType eType )
case MACASSGN_OLE: // OLE
{
if( !bHtmlMode )
rPg.AddEvent( String( SW_RES(STR_EVENT_OBJECT_SELECT) ),
aItem.AddEvent( String( SW_RES(STR_EVENT_OBJECT_SELECT) ), String(),
SW_EVENT_OBJECT_SELECT );
}
// kein break;
case MACASSGN_INETFMT: // INetFmt-Attribute
{
rPg.AddEvent( String( SW_RES(STR_EVENT_MOUSEOVER_OBJECT) ),
aItem.AddEvent( String( SW_RES(STR_EVENT_MOUSEOVER_OBJECT) ), String(),
SFX_EVENT_MOUSEOVER_OBJECT );
rPg.AddEvent( String( SW_RES(STR_EVENT_MOUSECLICK_OBJECT) ),
aItem.AddEvent( String( SW_RES(STR_EVENT_MOUSECLICK_OBJECT) ), String(),
SFX_EVENT_MOUSECLICK_OBJECT);
rPg.AddEvent( String( SW_RES(STR_EVENT_MOUSEOUT_OBJECT) ),
aItem.AddEvent( String( SW_RES(STR_EVENT_MOUSEOUT_OBJECT) ), String(),
SFX_EVENT_MOUSEOUT_OBJECT);
}
break;
}
return aItem;
}
@ -148,7 +140,7 @@ BOOL SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh,
SvxMacroItem*& rpINetItem )
{
BOOL bRet = FALSE;
SfxItemSet aSet( rSh.GetAttrPool(), RES_FRMMACRO, RES_FRMMACRO );
SfxItemSet aSet( rSh.GetAttrPool(), RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 );
SvxMacroItem aItem( RES_FRMMACRO );
if( !rpINetItem )
rpINetItem = new SvxMacroItem( RES_FRMMACRO );
@ -156,11 +148,15 @@ BOOL SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh,
aItem.SetMacroTable( rpINetItem->GetMacroTable() );
aSet.Put( aItem );
aSet.Put( AddEvents( MACASSGN_INETFMT ) );
SwMacroAssignDlg aMacDlg( pParent, aSet, rSh, MACASSGN_INETFMT );
if( aMacDlg.Execute() == RET_OK )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractDialog* pMacroDlg = pFact->CreateSfxDialog( pParent, aSet,
rSh.GetView().GetViewFrame()->GetFrame()->GetFrameInterface(),
SID_EVENTCONFIG );
if ( pMacroDlg && pMacroDlg->Execute() == RET_OK )
{
const SfxItemSet* pOutSet = aMacDlg.GetOutputItemSet();
const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == pOutSet->GetItemState( RES_FRMMACRO, FALSE, &pItem ))
{
@ -171,8 +167,8 @@ BOOL SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh,
return bRet;
}
SvStringsDtor* __EXPORT _GetRangeHdl( _SfxMacroTabPage* /*pTbPg*/, const String& rLanguage )
/*
SvStringsDtor* __EXPORT _GetRangeHdl( _SfxMacroTabPage* , const String& rLanguage )
{
SvStringsDtor* pNew = new SvStringsDtor;
@ -197,7 +193,7 @@ SvStringsDtor* __EXPORT _GetRangeHdl( _SfxMacroTabPage* /*pTbPg*/, const String&
return pNew;
}
*/

45
sw/source/ui/dialog/swdlgfact.cxx
View file

@ -119,7 +119,7 @@ using namespace ::com::sun::star;
IMPL_ABSTDLG_BASE(AbstractSwWordCountDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractSfxSingleTabDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSwAsciiFilterDlg_Impl);
IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl);
@ -198,10 +198,20 @@ BYTE AbstractSwInsertAbstractDlg_Impl::GetPara() const
//add for SwInsertAbstractDlg end
//add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwBorderDlg SwWrapDlg SwFldEditDlg begin
const SfxItemSet* AbstractSfxSingleTabDialog_Impl::GetOutputItemSet() const
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();
}
//add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwBorderDlg SwWrapDlg SwFldEditDlg end
//add for SwAsciiFilterDlg begin
@ -664,12 +674,13 @@ AbstractSwInsertAbstractDlg * SwAbstractDialogFactory_Impl::CreateSwInsertAbstra
}
//add for SwInsertAbstractDlg end
AbstractSfxSingleTabDialog* SwAbstractDialogFactory_Impl::CreateSfxSingleTabDialog( Window* pParent,
SfxItemSet& rSet,
int nResId
)
SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
const SfxItemSet& rSet,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&,
sal_uInt32 nResId
)
{
SfxSingleTabDialog* pDlg=NULL;
SfxModalDialog* pDlg=NULL;
switch ( nResId )
{
case RC_DLG_ADDR :
@ -689,7 +700,7 @@ AbstractSfxSingleTabDialog* SwAbstractDialogFactory_Impl::CreateSfxSingleTabDial
}
if ( pDlg )
return new AbstractSfxSingleTabDialog_Impl( pDlg );
return new AbstractSfxDialog_Impl( pDlg );
return 0;
}
@ -1070,9 +1081,9 @@ AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg( W
//add for SwAutoFormatDlg end
//add for SwBorderDlg begin
AbstractSfxSingleTabDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, USHORT nType,int nResId )
SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, USHORT nType,int nResId )
{
SfxSingleTabDialog* pDlg=NULL;
SfxModalDialog* pDlg=NULL;
switch ( nResId )
{
case RC_DLG_SWBORDERDLG :
@ -1083,15 +1094,15 @@ AbstractSfxSingleTabDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Wi
}
if ( pDlg )
return new AbstractSfxSingleTabDialog_Impl( pDlg );
return new AbstractSfxDialog_Impl( pDlg );
return 0;
}
//add for SwBorderDlg end
//add for SwWrapDlg begin
AbstractSfxSingleTabDialog * SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId )
SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId )
{
SfxSingleTabDialog* pDlg=NULL;
SfxModalDialog* pDlg=NULL;
switch ( nResId )
{
case RC_DLG_SWWRAPDLG :
@ -1102,7 +1113,7 @@ AbstractSfxSingleTabDialog * SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Win
}
if ( pDlg )
return new AbstractSfxSingleTabDialog_Impl( pDlg );
return new AbstractSfxDialog_Impl( pDlg );
return 0;
}
//add for SwWrapDlg end
@ -1169,9 +1180,9 @@ AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg ( SfxBindings* p
//add for SwFldDlg end
//add for SwFldEditDlg begin
AbstractSfxSingleTabDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& rVw, int nResId )
SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& rVw, int nResId )
{
SfxSingleTabDialog* pDlg=NULL;
SfxModalDialog* pDlg=NULL;
switch ( nResId )
{
case RC_DLG_SWFLDEDITDLG :
@ -1182,7 +1193,7 @@ AbstractSfxSingleTabDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg (
}
if ( pDlg )
return new AbstractSfxSingleTabDialog_Impl( pDlg );
return new AbstractSfxDialog_Impl( pDlg );
return 0;
}
//add for SwFldEditDlg

19
sw/source/ui/dialog/swdlgfact.hxx
View file

@ -98,11 +98,12 @@ class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
// add for SwAddrDlg, SwDropCapsDlg, SwBackgroundDlg SwNumFmtDlg SwWrapDlg SwBorderDlg, SwFldEditDlg begin
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 SwAddrDlg,SwDropCapsDlg , SwBackgroundDlg SwNumFmtDlg SwWrapDlg SwBorderDlg, SwFldEditDlg end
@ -430,9 +431,13 @@ class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory
{
public:
virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
const SfxItemSet& rAttr,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32 nResId
);
virtual AbstractSwWordCountDialog* CreateSwWordCountDialog(Window* pParent);
virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg( Window* pParent,int nResId );
virtual AbstractSfxSingleTabDialog* CreateSfxSingleTabDialog ( Window* pParent, SfxItemSet& rSet,int nResId );//add for SwAddrDlg SwDropCapsDlg, SwBackgroundDlg,SwNumFmtDlg,
virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
SvStream* pStream, int nResId ); //add for SwAsciiFilterDlg
virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId );//add for SwInsertBookmarkDlg
@ -473,14 +478,14 @@ public:
int nResId,
BOOL bSetAutoFmt = TRUE,
const SwTableAutoFmt* pSelFmt = 0 );
virtual AbstractSfxSingleTabDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, USHORT nType,int nResId );//add for SwBorderDlg
virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, USHORT nType,int nResId );//add for SwBorderDlg
virtual AbstractSfxSingleTabDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ); //add for SwWrapDlg
virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ); //add for SwWrapDlg
virtual VclAbstractDialog * CreateSwTableWidthDlg ( Window *pParent, SwTableFUNC &rFnc , int nResId ); //add for SwTableWidthDlg
virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool,
const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ); //add for SwTableTabDlg
virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ); //add for SwFldDlg
virtual AbstractSfxSingleTabDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg
virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg
STAR_REFERENCE( container::XNamed ) & xNamed,
STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId );

4
sw/source/ui/fldui/fldedt.cxx
View file

@ -409,7 +409,9 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, EMPTYARG )
SwAbstractDialogFactory* pFact = swui::GetFactory();
DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
AbstractSfxSingleTabDialog* pDlg = pFact->CreateSfxSingleTabDialog( this, aSet, RC_DLG_ADDR );
SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aSet,
pSh->GetView().GetViewFrame()->GetFrame()->GetFrameInterface(),
RC_DLG_ADDR );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if(RET_OK == pDlg->Execute())
{

13
sw/source/ui/fmtui/tmpdlg.cxx
View file

@ -265,7 +265,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
AddTabPage(TP_COLUMN, SwColumnPage::Create,
SwColumnPage::GetRanges );
AddTabPage( TP_MACRO_ASSIGN, SfxMacroTabPage::Create, 0);
AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
// Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen)
/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase.
@ -566,11 +566,14 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
break;
case TP_MACRO_ASSIGN:
SwMacroAssignDlg::AddEvents( (SfxMacroTabPage&)rPage, MACASSGN_ALLFRM);
if ( pWrtShell && pWrtShell->GetView().GetDocShell()
&& pWrtShell->GetView().GetDocShell()->GetFrame() && pWrtShell->GetView().GetDocShell()->GetFrame()->GetFrame() )
rPage.SetFrame( pWrtShell->GetView().GetDocShell()->GetFrame()->GetFrame()->GetFrameInterface() );
{
SfxAllItemSet aNewSet(*aSet.GetPool());
aNewSet.Put( SwMacroAssignDlg::AddEvents(MACASSGN_ALLFRM) );
if ( pWrtShell )
rPage.SetFrame( pWrtShell->GetView().GetViewFrame()->GetFrame()->GetFrameInterface() );
rPage.PageCreated(aNewSet);
break;
}
case RID_SVXPAGE_PICK_NUM:
{

17
sw/source/ui/frmdlg/frmdlg.cxx
View file

@ -112,7 +112,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");
AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
AddTabPage( TP_MACRO_ASSIGN, SfxMacroTabPage::Create, 0);
AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 );
if(m_bHTMLMode)
@ -191,14 +191,15 @@ void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
break;
case TP_MACRO_ASSIGN:
SwMacroAssignDlg::AddEvents( (SfxMacroTabPage&)rPage,
DLG_FRM_GRF == m_nDlgType ? MACASSGN_GRAPHIC
: DLG_FRM_OLE == m_nDlgType ? MACASSGN_OLE
: MACASSGN_FRMURL );
if ( m_pWrtShell && m_pWrtShell->GetView().GetDocShell()
&& m_pWrtShell->GetView().GetDocShell()->GetFrame() && m_pWrtShell->GetView().GetDocShell()->GetFrame()->GetFrame() )
rPage.SetFrame( m_pWrtShell->GetView().GetDocShell()->GetFrame()->GetFrame()->GetFrameInterface() );
{
SfxAllItemSet aNewSet(*aSet.GetPool());
aNewSet.Put( SwMacroAssignDlg::AddEvents(
DLG_FRM_GRF == m_nDlgType ? MACASSGN_GRAPHIC : DLG_FRM_OLE == m_nDlgType ? MACASSGN_OLE : MACASSGN_FRMURL ) );
if ( m_pWrtShell )
rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame()->GetFrameInterface() );
rPage.PageCreated(aNewSet);
break;
}
case TP_BACKGROUND:
if( DLG_FRM_STD == m_nDlgType )

2
sw/source/ui/inc/addrdlg.hxx
View file

@ -36,7 +36,7 @@ class SwAddrDlg : public SfxSingleTabDialog
{
public:
SwAddrDlg( Window* pParent, SfxItemSet& rSet );
SwAddrDlg( Window* pParent, const SfxItemSet& rSet );
~SwAddrDlg();
};

17
sw/source/ui/inc/macassgn.hxx
View file

@ -30,7 +30,7 @@
#ifndef _MACASSGN_HXX
#define _MACASSGN_HXX
#include <sfx2/macropg.hxx>
#include <sfx2/evntconf.hxx>
class SwWrtShell;
class SvxMacroItem;
@ -45,24 +45,13 @@ enum DlgEventType
MACASSGN_ALLFRM
};
class SwMacroAssignDlg : public SfxMacroAssignDlg
class SwMacroAssignDlg
{
public:
SwMacroAssignDlg(
Window* pParent,
SfxItemSet& rSet,
const SwWrtShell& rSh,
DlgEventType eType
);
virtual ~SwMacroAssignDlg();
static void AddEvents( SfxMacroTabPage& rPg, DlgEventType eType );
static SfxEventNamesItem AddEvents( DlgEventType eType );
static BOOL INetFmtDlg( Window* pParent, SwWrtShell& rSh,
SvxMacroItem*& rpINetItem );
};
#endif

2
sw/source/ui/inc/tblnumfm.hxx
View file

@ -39,7 +39,7 @@ class SwNumFmtDlg : public SfxSingleTabDialog
{
public:
SwNumFmtDlg(Window* pParent, SfxItemSet& rSet);
SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet);
~SwNumFmtDlg();
};

15
sw/source/ui/misc/glossary.cxx
View file

@ -643,7 +643,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
break;
case FN_GL_MACRO:
{
SfxItemSet aSet( pSh->GetAttrPool(), RES_FRMMACRO, RES_FRMMACRO );
SfxItemSet aSet( pSh->GetAttrPool(), RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 );
SvxMacro aStart(aEmptyStr, aEmptyStr, STARBASIC);
SvxMacro aEnd(aEmptyStr, aEmptyStr, STARBASIC);
@ -656,19 +656,22 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
aItem.SetMacro( SW_EVENT_END_INS_GLOSSARY, aEnd );
aSet.Put( aItem );
aSet.Put( SwMacroAssignDlg::AddEvents( MACASSGN_TEXTBAUST ) );
const SfxPoolItem* pItem;
SwMacroAssignDlg aMacDlg( this, aSet, *pSh, MACASSGN_TEXTBAUST );
if( RET_OK == aMacDlg.Execute() &&
SFX_ITEM_SET == aMacDlg.GetOutputItemSet()->GetItemState(
RES_FRMMACRO, sal_False, &pItem ))
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractDialog* pMacroDlg = pFact->CreateSfxDialog( this, aSet,
pSh->GetView().GetViewFrame()->GetFrame()->GetFrameInterface(), SID_EVENTCONFIG );
if ( pMacroDlg && pMacroDlg->Execute() == RET_OK &&
SFX_ITEM_SET == pMacroDlg->GetOutputItemSet()->GetItemState( RES_FRMMACRO, sal_False, &pItem ) )
{
const SvxMacroTableDtor& rTbl = ((SvxMacroItem*)pItem)->GetMacroTable();
pGlossaryHdl->SetMacros( aShortNameEdit.GetText(),
rTbl.Get( SW_EVENT_START_INS_GLOSSARY ),
rTbl.Get( SW_EVENT_END_INS_GLOSSARY ) );
}
delete pMacroDlg;
}
break;

59
sw/source/ui/misc/insfnote.cxx
View file

@ -35,39 +35,25 @@
#undef SW_DLLIMPLEMENTATION
#endif
#include <hintids.hxx>
#include <svtools/eitem.hxx>
#include <svtools/stritem.hxx>
#include <sfx2/request.hxx>
#include <svx/charmap.hxx>
#include <svx/fontitem.hxx>
#include <vcl/msgbox.hxx>
#include <fmtftn.hxx>
#include <swundo.hxx>
#ifndef _CMDID_H
#include <cmdid.h>
#endif
#include <wrtsh.hxx>
#ifndef _VIEW_HXX
#include <view.hxx>
#endif
#ifndef _BASESH_HXX
#include <basesh.hxx>
#endif
#include <insfnote.hxx>
#include <crsskip.hxx>
#ifndef _MISC_HRC
#include <misc.hrc>
#endif
#ifndef _INSFNOTE_HRC
#include <insfnote.hrc>
#endif
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <sfx2/viewfrm.hxx>
static BOOL bFootnote = TRUE;
@ -184,26 +170,35 @@ IMPL_LINK( SwInsFootNoteDlg, NumberExtCharHdl, Button *, EMPTYARG )
rSh.GetCurAttr( aSet );
const SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
SfxAllItemSet aAllSet( rSh.GetAttrPool() );
aAllSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
aAllSet.Put( rFont );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxCharacterMap* pDlg = pFact->CreateSvxCharacterMap( this, RID_SVXDLG_CHARMAP, FALSE );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
Font aDlgFont( pDlg->GetCharFont() );
aDlgFont.SetName( rFont.GetFamilyName() );
aDlgFont.SetCharSet( rFont.GetCharSet() );
pDlg->SetCharFont( aDlgFont );
SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aAllSet,
rSh.GetView().GetViewFrame()->GetFrame()->GetFrameInterface(), RID_SVXDLG_CHARMAP );
if (RET_OK == pDlg->Execute())
{
String sExtChars(pDlg->GetCharacters());
SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, FALSE );
SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
if ( pItem )
{
String sExtChars(pItem->GetValue());
aNumberCharEdit.SetText( sExtChars );
aFontName = pDlg->GetCharFont().GetName();
eCharSet = pDlg->GetCharFont().GetCharSet();
aNumberCharEdit.SetText( sExtChars );
aNumberCharEdit.SetFont( pDlg->GetCharFont() );
bExtCharAvailable = TRUE;
aOkBtn.Enable(0 != aNumberCharEdit.GetText().Len());
if ( pFontItem )
{
aFontName = pFontItem->GetFamilyName();
eCharSet = pFontItem->GetCharSet();
Font aFont( aFontName, pFontItem->GetStyleName(), aNumberCharEdit.GetFont().GetSize() );
aFont.SetCharSet( pFontItem->GetCharSet() );
aFont.SetPitch( pFontItem->GetPitch() );
aNumberCharEdit.SetFont( aFont );
}
bExtCharAvailable = TRUE;
aOkBtn.Enable(0 != aNumberCharEdit.GetText().Len());
}
}
delete pDlg;

1
sw/source/ui/misc/num.cxx
View file

@ -50,7 +50,6 @@
#include <svx/brshitem.hxx>
#include <svx/lrspitem.hxx>
#include <svx/impgrf.hxx>
#include <svx/charmap.hxx>
#include <svx/numitem.hxx>
#include <swvset.hxx>
#include <swmodule.hxx>

28
sw/source/ui/misc/srtdlg.cxx
View file

@ -42,34 +42,22 @@
#include <svtools/intitem.hxx>
#include <svtools/eitem.hxx>
#include <sfx2/dispatch.hxx>
#ifndef _SVX_SVXIDS_HRC //autogen
#include <svx/svxids.hrc>
#endif
#include <svx/unolingu.hxx>
#include <svx/charmap.hxx>
#include <svx/svxdlg.hxx>
#ifndef _SVX_DIALOGS_HRC
#include <svx/dialogs.hrc>
#endif
#include <unotools/collatorwrapper.hxx>
#include <svtools/collatorres.hxx>
#include <swwait.hxx>
#ifndef _VIEW_HXX
#include <view.hxx>
#endif
#ifndef _CMDID_H
#include <cmdid.h>
#endif
#include <wrtsh.hxx>
#ifndef _MISC_HRC
#include <misc.hrc>
#endif
#ifndef _SRTDLG_HRC
#include <srtdlg.hrc>
#endif
#include <swtable.hxx>
#include <node.hxx>
#include <tblsel.hxx>
#include <sfx2/request.hxx>
// sw/inc/tblsel.hxx
SV_IMPL_PTRARR( _FndBoxes, _FndBox* )
@ -405,11 +393,17 @@ IMPL_LINK( SwSortDlg, DelimCharHdl, PushButton*, EMPTYARG )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
AbstractSvxCharacterMap* pMap = pFact->CreateSvxCharacterMap( &aDelimPB, RID_SVXDLG_CHARMAP);
DBG_ASSERT(pMap, "Dialogdiet fail!");
pMap->SetChar( GetDelimChar() );
SfxAllItemSet aSet( rSh.GetAttrPool() );
aSet.Put( SfxInt32Item( SID_ATTR_CHAR, GetDelimChar() ) );
SfxAbstractDialog* pMap = pFact->CreateSfxDialog( &aDelimPB, aSet,
rSh.GetView().GetViewFrame()->GetFrame()->GetFrameInterface(), RID_SVXDLG_CHARMAP );
if( RET_OK == pMap->Execute() )
aDelimEdt.SetText( pMap->GetChar() );
{
SFX_ITEMSET_ARG( pMap->GetOutputItemSet(), pItem, SfxInt32Item, SID_ATTR_CHAR, FALSE );
if ( pItem )
aDelimEdt.SetText( sal_Unicode ( pItem->GetValue() ) );
}
delete pMap;
}
return 0;

54
sw/source/ui/shells/annotsh.cxx
View file

@ -351,7 +351,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
rReq.Done();
break;
}
case FN_INSERT_SYMBOL:
case SID_CHARMAP:
{
if (pPostItMgr->GetActivePostIt()->GetStatus()!=SwPostItHelper::DELETED)
InsertSymbol(rReq);
@ -1505,7 +1505,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = 0;
if( pArgs )
pArgs->GetItemState(GetPool().GetWhich(FN_INSERT_SYMBOL), FALSE, &pItem);
pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem);
String sSym;
String sFontName;
@ -1513,7 +1513,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
{
sSym = ((const SfxStringItem*)pItem)->GetValue();
const SfxPoolItem* pFtItem = NULL;
pArgs->GetItemState( GetPool().GetWhich(FN_PARAM_1), FALSE, &pFtItem);
pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem);
const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
if ( pFontItem )
sFontName = pFontItem->GetValue();
@ -1532,36 +1532,50 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
aSetDlgFont = (SvxFontItem&)aSet.Get( GetWhichOfScript(
SID_ATTR_CHAR_FONT,
GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage() ) ));
if (!sFontName.Len())
sFontName = aSetDlgFont.GetFamilyName();
}
Font aFont(sFontName, Size(1,1));
if(!sSym.Len())
if( !sSym.Len() )
{
//CHINA001 SvxCharacterMap* pDlg = new SvxCharacterMap( NULL, FALSE );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
AbstractSvxCharacterMap* pDlg = pFact->CreateSvxCharacterMap( NULL, RID_SVXDLG_CHARMAP, FALSE );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
Font aDlgFont( pDlg->GetCharFont() );
SfxAllItemSet aAllSet( GetPool() );
aAllSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
SwViewOption aOpt(*rView.GetWrtShell().GetViewOptions());
String sSymbolFont = aOpt.GetSymbolFont();
if(sSymbolFont.Len())
aDlgFont.SetName(sSymbolFont);
if( sSymbolFont.Len() )
aAllSet.Put( SfxStringItem( SID_FONT_NAME, sSymbolFont ) );
else
aDlgFont.SetName( aSetDlgFont.GetFamilyName() );
aAllSet.Put( SfxStringItem( SID_FONT_NAME, aSetDlgFont.GetFamilyName() ) );
// Wenn Zeichen selektiert ist kann es angezeigt werden
pDlg->SetFont( aDlgFont );
SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( rView.GetWindow(), aAllSet,
rView.GetViewFrame()->GetFrame()->GetFrameInterface(), RID_SVXDLG_CHARMAP );
USHORT nResult = pDlg->Execute();
if( nResult == RET_OK )
{
aFont = pDlg->GetCharFont();
sSym = pDlg->GetCharacters();
aOpt.SetSymbolFont(aFont.GetName());
SW_MOD()->ApplyUsrPref(aOpt, &rView);
SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, FALSE );
SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
if ( pFontItem )
{
aFont.SetName( pFontItem->GetFamilyName() );
aFont.SetStyleName( pFontItem->GetStyleName() );
aFont.SetCharSet( pFontItem->GetCharSet() );
aFont.SetPitch( pFontItem->GetPitch() );
}
if ( pCItem )
{
sSym = pCItem->GetValue();
aOpt.SetSymbolFont(aFont.GetName());
SW_MOD()->ApplyUsrPref(aOpt, &rView);
}
}
delete( pDlg );
}
@ -1611,9 +1625,9 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
pOutliner->SetUpdateMode(TRUE);
pOLV->ShowCursor();
rReq.AppendItem( SfxStringItem( GetPool().GetWhich(FN_INSERT_SYMBOL), sSym ) );
rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), sSym ) );
if(aFont.GetName().Len())
rReq.AppendItem( SfxStringItem( FN_PARAM_1, aFont.GetName() ) );
rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aFont.GetName() ) );
rReq.Done();
}
}

16
sw/source/ui/shells/basesh.cxx
View file

@ -2438,7 +2438,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
RES_BOX , RES_SHADOW,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
0 );
AbstractSfxSingleTabDialog * pDlg = 0;
SfxAbstractDialog * pDlg = 0;
// Tabellenzelle(n) selektiert?
if ( rSh.IsTableMode() )
{
@ -2504,7 +2504,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
SfxItemSet aSet( rSh.GetAttrPool(),
RES_BACKGROUND, RES_BACKGROUND );
AbstractSfxSingleTabDialog * pDlg = 0;
SfxAbstractDialog * pDlg = 0;
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
@ -2515,7 +2515,9 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
//Hintergrundattribute der Tabelle holen und in den Set packen
SvxBrushItem aBrush(RES_BACKGROUND);
rSh.GetBoxBackground( aBrush );
pDlg = pFact->CreateSfxSingleTabDialog( pMDI, aSet, RC_SWDLG_BACKGROUND );
pDlg = pFact->CreateSfxDialog( pMDI, aSet,
rView.GetViewFrame()->GetFrame()->GetFrameInterface(),
RC_SWDLG_BACKGROUND );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
aSet.Put( aBrush );
if ( pDlg->Execute() == RET_OK )
@ -2532,7 +2534,9 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
rSh.GetFlyFrmAttr( aSet );
pDlg = pFact->CreateSfxSingleTabDialog( pMDI, aSet, RC_SWDLG_BACKGROUND );
pDlg = pFact->CreateSfxDialog( pMDI, aSet,
rView.GetViewFrame()->GetFrame()->GetFrameInterface(),
RC_SWDLG_BACKGROUND );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if ( pDlg->Execute() == RET_OK )
{
@ -2545,7 +2549,9 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
// Umrandungsattribute ganz normal ueber Shell setzen
rSh.GetCurAttr( aSet );
pDlg = pFact->CreateSfxSingleTabDialog( pMDI, aSet, RC_SWDLG_BACKGROUND );
pDlg = pFact->CreateSfxDialog( pMDI, aSet,
rView.GetViewFrame()->GetFrame()->GetFrameInterface(),
RC_SWDLG_BACKGROUND );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if ( pDlg->Execute() == RET_OK )
{

2
sw/source/ui/shells/drwbassh.cxx
View file

@ -193,7 +193,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
AbstractSfxSingleTabDialog* pDlg = pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, TRUE, RC_DLG_SWWRAPDLG );
SfxAbstractDialog* pDlg = pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, TRUE, RC_DLG_SWWRAPDLG );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if (pDlg->Execute() == RET_OK)

54
sw/source/ui/shells/drwtxtsh.cxx
View file

@ -38,7 +38,6 @@
#include <svx/langitem.hxx>
#include <svx/svdview.hxx>
#include <vcl/msgbox.hxx>
#include <svx/charmap.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
#include <svx/svdotext.hxx>
@ -526,7 +525,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
rReq.Done();
}
break;
case FN_INSERT_SYMBOL:
case SID_CHARMAP:
{ // Sonderzeichen einfuegen
InsertSymbol(rReq);
break;
@ -776,7 +775,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = 0;
if( pArgs )
pArgs->GetItemState(GetPool().GetWhich(FN_INSERT_SYMBOL), FALSE, &pItem);
pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem);
String sSym;
String sFontName;
@ -784,7 +783,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
{
sSym = ((const SfxStringItem*)pItem)->GetValue();
const SfxPoolItem* pFtItem = NULL;
pArgs->GetItemState( GetPool().GetWhich(FN_PARAM_1), FALSE, &pFtItem);
pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem);
const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
if ( pFontItem )
sFontName = pFontItem->GetValue();
@ -803,35 +802,48 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
aSetDlgFont = (SvxFontItem&)aSet.Get( GetWhichOfScript(
SID_ATTR_CHAR_FONT,
GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage() ) ));
if (!sFontName.Len())
sFontName = aSetDlgFont.GetFamilyName();
}
Font aFont(sFontName, Size(1,1));
if(!sSym.Len())
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxCharacterMap* pDlg = pFact->CreateSvxCharacterMap( NULL, RID_SVXDLG_CHARMAP, FALSE );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
SfxAllItemSet aAllSet( GetPool() );
aAllSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
Font aDlgFont( pDlg->GetCharFont() );
SwViewOption aOpt(*GetShell().GetViewOptions());
SwViewOption aOpt(*rView.GetWrtShell().GetViewOptions());
String sSymbolFont = aOpt.GetSymbolFont();
if(sSymbolFont.Len())
aDlgFont.SetName(sSymbolFont);
if( sSymbolFont.Len() )
aAllSet.Put( SfxStringItem( SID_FONT_NAME, sSymbolFont ) );
else
aDlgFont.SetName( aSetDlgFont.GetFamilyName() );
aAllSet.Put( SfxStringItem( SID_FONT_NAME, aSetDlgFont.GetFamilyName() ) );
// Wenn Zeichen selektiert ist kann es angezeigt werden
pDlg->SetFont( aDlgFont );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( rView.GetWindow(), aAllSet,
rView.GetViewFrame()->GetFrame()->GetFrameInterface(), RID_SVXDLG_CHARMAP );
USHORT nResult = pDlg->Execute();
if( nResult == RET_OK )
{
aFont = pDlg->GetCharFont();
sSym = pDlg->GetCharacters();
aOpt.SetSymbolFont(aFont.GetName());
SW_MOD()->ApplyUsrPref(aOpt, &GetView());
SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, FALSE );
SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
if ( pFontItem )
{
aFont.SetName( pFontItem->GetFamilyName() );
aFont.SetStyleName( pFontItem->GetStyleName() );
aFont.SetCharSet( pFontItem->GetCharSet() );
aFont.SetPitch( pFontItem->GetPitch() );
}
if ( pCItem )
{
sSym = pCItem->GetValue();
aOpt.SetSymbolFont(aFont.GetName());
SW_MOD()->ApplyUsrPref(aOpt, &rView);
}
}
delete( pDlg );
}
@ -881,9 +893,9 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
pOutliner->SetUpdateMode(TRUE);
pOLV->ShowCursor();
rReq.AppendItem( SfxStringItem( GetPool().GetWhich(FN_INSERT_SYMBOL), sSym ) );
rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), sSym ) );
if(aFont.GetName().Len())
rReq.AppendItem( SfxStringItem( FN_PARAM_1, aFont.GetName() ) );
rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aFont.GetName() ) );
rReq.Done();
}
}

4
sw/source/ui/shells/tabsh.cxx
View file

@ -749,7 +749,9 @@ void SwTableShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
AbstractSfxSingleTabDialog* pDlg = pFact->CreateSfxSingleTabDialog( GetView().GetWindow(),aCoreSet, RC_DLG_SWNUMFMTDLG );
SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( GetView().GetWindow(),aCoreSet,
pView->GetViewFrame()->GetFrame()->GetFrameInterface(),
RC_DLG_SWNUMFMTDLG );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if (RET_OK == pDlg->Execute())

2
sw/source/ui/shells/textfld.cxx
View file

@ -156,7 +156,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
AbstractSfxSingleTabDialog* pDlg = pFact->CreateSwFldEditDlg( GetView(),RC_DLG_SWFLDEDITDLG );
SfxAbstractDialog* pDlg = pFact->CreateSwFldEditDlg( GetView(),RC_DLG_SWFLDEDITDLG );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
pDlg->Execute();
delete pDlg;

47
sw/source/ui/shells/textsh.cxx
View file

@ -52,7 +52,6 @@
#include <sfx2/fcontnr.hxx>
#include <svx/hlnkitem.hxx>
#include <svx/srchitem.hxx>
#include <svx/charmap.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
#include <svtools/urihelper.hxx>
@ -1107,14 +1106,14 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = 0;
if( pArgs )
pArgs->GetItemState(GetPool().GetWhich(FN_INSERT_SYMBOL), FALSE, &pItem);
pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem);
String aChars, aFontName;
if ( pItem )
{
aChars = ((const SfxStringItem*)pItem)->GetValue();
const SfxPoolItem* pFtItem = NULL;
pArgs->GetItemState( GetPool().GetWhich(FN_PARAM_1), FALSE, &pFtItem);
pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem);
const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
if ( pFontItem )
aFontName = pFontItem->GetValue();
@ -1139,33 +1138,45 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
aFont = (SvxFontItem&)aSet.Get( GetWhichOfScript(
RES_CHRATR_FONT,
GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage() ) ));
if (!aFontName.Len())
aFontName = aFont.GetFamilyName();
}
Font aNewFont(aFontName, Size(1,1)); // Size nur wg. CTOR
if( !aChars.Len() )
{
// Eingestellten Font als Default
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxCharacterMap* pDlg = pFact->CreateSvxCharacterMap( &GetView().GetViewFrame()->GetWindow(), RID_SVXDLG_CHARMAP, FALSE );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
SfxAllItemSet aAllSet( rSh.GetAttrPool() );
aAllSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
Font aDlgFont( pDlg->GetCharFont() );
SwViewOption aOpt(*GetShell().GetViewOptions());
String sSymbolFont = aOpt.GetSymbolFont();
if( !aFontName.Len() && sSymbolFont.Len() )
aDlgFont.SetName(sSymbolFont);
aAllSet.Put( SfxStringItem( SID_FONT_NAME, sSymbolFont ) );
else
aDlgFont.SetName( aFont.GetFamilyName() );
pDlg->SetCharFont( aDlgFont );
aAllSet.Put( SfxStringItem( SID_FONT_NAME, aFont.GetFamilyName() ) );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( GetView().GetWindow(), aAllSet,
GetView().GetViewFrame()->GetFrame()->GetFrameInterface(), RID_SVXDLG_CHARMAP );
if( RET_OK == pDlg->Execute() )
{
aChars = pDlg->GetCharacters();
aNewFont = pDlg->GetCharFont();
aOpt.SetSymbolFont(aNewFont.GetName());
SW_MOD()->ApplyUsrPref(aOpt, &GetView());
SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, FALSE );
SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
if ( pFontItem )
{
aNewFont.SetName( pFontItem->GetFamilyName() );
aNewFont.SetStyleName( pFontItem->GetStyleName() );
aNewFont.SetCharSet( pFontItem->GetCharSet() );
aNewFont.SetPitch( pFontItem->GetPitch() );
}
if ( pCItem )
{
aChars = pCItem->GetValue();
aOpt.SetSymbolFont(aNewFont.GetName());
SW_MOD()->ApplyUsrPref(aOpt, &GetView());
}
}
delete pDlg;
@ -1257,8 +1268,8 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
if ( aChars.Len() )
{
rReq.AppendItem( SfxStringItem( GetPool().GetWhich(FN_INSERT_SYMBOL), aChars ) );
rReq.AppendItem( SfxStringItem( FN_PARAM_1, aNewFont.GetName() ) );
rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), aChars ) );
rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aNewFont.GetName() ) );
rReq.Done();
}
}

4
sw/source/ui/shells/textsh1.cxx
View file

@ -399,7 +399,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
break;
}
case FN_INSERT_SYMBOL:
case SID_CHARMAP:
{
InsertSymbol( rReq );
}
@ -1378,7 +1378,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
rSh.IsNumRuleStart()));
break;
case FN_EDIT_FORMULA:
case FN_INSERT_SYMBOL:
case SID_CHARMAP:
{
const int nType = rSh.GetSelectionType();
if (!(nType & nsSelectionType::SEL_TXT) &&

4
sw/source/ui/shells/txtattr.cxx
View file

@ -54,7 +54,6 @@
#include <svx/frmdiritem.hxx>
#include "paratr.hxx"
#include <fmtinfmt.hxx>
#ifndef _DOCSH_HXX
#include <docsh.hxx>
@ -564,7 +563,8 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
AbstractSfxSingleTabDialog* pDlg = pFact->CreateSfxSingleTabDialog( GetView().GetWindow(), aSet,DLG_SWDROPCAPS );
SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( GetView().GetWindow(), aSet,
rSh.GetView().GetViewFrame()->GetFrame()->GetFrameInterface(), DLG_SWDROPCAPS );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if (pDlg->Execute() == RET_OK)
{

2
sw/source/ui/uiview/view.cxx
View file

@ -674,7 +674,7 @@ void SwView::_CheckReadonlyState()
SID_REDO, SID_REPEAT, SID_PASTE,
FN_PASTESPECIAL, SID_SBA_BRW_INSERT,
SID_BACKGROUND_COLOR, FN_INSERT_BOOKMARK,
FN_INSERT_SYMBOL, FN_INSERT_SOFT_HYPHEN,
SID_CHARMAP, FN_INSERT_SOFT_HYPHEN,
FN_INSERT_HARDHYPHEN, FN_INSERT_HARD_SPACE, FN_INSERT_BREAK,
FN_INSERT_LINEBREAK, FN_INSERT_COLUMN_BREAK, FN_INSERT_BREAK_DLG,
FN_DELETE_SENT, FN_DELETE_BACK_SENT, FN_DELETE_WORD,

21
sw/source/ui/utlui/numfmtlb.cxx
View file

@ -43,37 +43,22 @@
#include <svtools/zformat.hxx>
#endif
#include <svtools/eitem.hxx>
#ifndef _SVX_SVXIDS_HRC //autogen
#include <svx/svxids.hrc>
#endif
#ifndef _SVX_NUMINF_HXX //autogen
#include <svx/numinf.hxx>
#endif
#include <vcl/msgbox.hxx>
#include <svx/flagsdef.hxx>
#include <svtools/itemset.hxx>
#ifndef _DOCSH_HXX
#include <docsh.hxx>
#endif
#include <swtypes.hxx>
#include <swmodule.hxx>
#ifndef _VIEW_HXX
#include <view.hxx>
#endif
#include <wrtsh.hxx>
#ifndef _NUMFMTLB_HXX
#include <numfmtlb.hxx>
#endif
#ifndef _UTLUI_HRC
#include <utlui.hrc>
#endif
#include "swabstdlg.hxx"
#include "dialog.hrc"
#include <unomid.h>
#include <sfx2/viewfrm.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@ -452,7 +437,9 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
AbstractSfxSingleTabDialog* pDlg = pFact->CreateSfxSingleTabDialog( this, aCoreSet, RC_DLG_SWNUMFMTDLG );
SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aCoreSet,
GetView()->GetViewFrame()->GetFrame()->GetFrameInterface(),
RC_DLG_SWNUMFMTDLG );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if (RET_OK == pDlg->Execute())