summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRelease Engineers <releng@openoffice.org>2009-05-06 10:59:57 +0000
committerRelease Engineers <releng@openoffice.org>2009-05-06 10:59:57 +0000
commit44b515b9a328f92bec405a22151650393144c19a (patch)
treef26ac111c0674d5c7ea974c0021d52afe960e7b9
parent59cc4ba03370d45a14d0f706e6970cbe0c3ac26a (diff)
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
-rw-r--r--idl/source/objects/bastype.cxx4
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu489
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu8
-rw-r--r--sfx2/inc/sfx2/basedlgs.hxx43
-rw-r--r--sfx2/inc/sfx2/evntconf.hxx129
-rw-r--r--sfx2/inc/sfx2/sfx.hrc2
-rw-r--r--sfx2/inc/sfx2/sfxdlg.hxx15
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc5
-rw-r--r--sfx2/prj/d.lst2
-rw-r--r--sfx2/source/appl/appinit.cxx2
-rw-r--r--sfx2/source/appl/sfx.src5
-rw-r--r--sfx2/source/config/evntconf.cxx681
-rw-r--r--sfx2/source/config/makefile.mk4
-rw-r--r--sfx2/source/dialog/basedlgs.cxx68
-rw-r--r--sfx2/source/dialog/dialog.hrc61
-rw-r--r--sfx2/source/dialog/dialog.src47
-rw-r--r--sfx2/source/dialog/makefile.mk5
-rw-r--r--sfx2/source/dialog/sfxdlg.cxx7
-rw-r--r--sfx2/source/inc/acccfg.hxx110
-rw-r--r--sfx2/source/inc/cfg.hxx620
-rw-r--r--sfx2/source/inc/eventdlg.hxx68
-rw-r--r--sfx2/source/inc/headertablistbox.hxx71
-rw-r--r--sfx2/source/inc/helpid.hrc16
-rw-r--r--sfx2/source/inc/macropg_impl.hxx61
-rw-r--r--sfx2/util/hidother.src2
-rw-r--r--sfx2/util/makefile.mk4
-rw-r--r--svx/inc/databaseregistrationui.hxx4
-rw-r--r--svx/inc/helpid.hrc13
-rw-r--r--svx/inc/svx/brshitem.hxx3
-rw-r--r--svx/inc/svx/charmap.hxx96
-rw-r--r--svx/inc/svx/dialogs.hrc4
-rw-r--r--svx/inc/svx/svxdlg.hxx32
-rw-r--r--svx/inc/svx/xflbckit.hxx5
-rw-r--r--svx/inc/svx/xflbmpit.hxx3
-rw-r--r--svx/inc/svx/xflbmsli.hxx3
-rw-r--r--svx/inc/svx/xflbmsxy.hxx5
-rw-r--r--svx/inc/svx/xflboxy.hxx5
-rw-r--r--svx/inc/svx/xflbtoxy.hxx5
-rw-r--r--svx/prj/build.lst6
-rw-r--r--svx/sdi/svx.sdi2
-rw-r--r--svx/source/cui/ControlFocusHelper.hxx (renamed from svx/source/dialog/ControlFocusHelper.hxx)0
-rw-r--r--svx/source/cui/SpellAttrib.cxx (renamed from svx/source/dialog/SpellAttrib.cxx)0
-rw-r--r--svx/source/cui/SpellAttrib.hxx (renamed from svx/source/dialog/SpellAttrib.hxx)0
-rw-r--r--svx/source/cui/SpellDialog.cxx (renamed from svx/source/dialog/SpellDialog.cxx)0
-rw-r--r--svx/source/cui/SpellDialog.hrc (renamed from svx/source/dialog/SpellDialog.hrc)0
-rw-r--r--svx/source/cui/SpellDialog.src (renamed from svx/source/dialog/SpellDialog.src)0
-rw-r--r--svx/source/cui/acccfg.cxx (renamed from sfx2/source/dialog/acccfg.cxx)542
-rw-r--r--svx/source/cui/acccfg.hrc (renamed from sfx2/source/dialog/cfg.hrc)53
-rw-r--r--svx/source/cui/acccfg.hxx288
-rw-r--r--svx/source/cui/acccfg.src (renamed from sfx2/source/dialog/cfg.src)279
-rw-r--r--svx/source/cui/align.cxx (renamed from svx/source/dialog/align.cxx)0
-rw-r--r--svx/source/cui/align.hrc (renamed from svx/source/dialog/align.hrc)0
-rw-r--r--svx/source/cui/align.hxx (renamed from svx/source/dialog/align.hxx)0
-rw-r--r--svx/source/cui/align.src (renamed from svx/source/dialog/align.src)0
-rw-r--r--svx/source/cui/autocdlg.cxx (renamed from svx/source/dialog/autocdlg.cxx)4
-rw-r--r--svx/source/cui/autocdlg.hrc (renamed from svx/source/dialog/autocdlg.hrc)0
-rw-r--r--svx/source/cui/autocdlg.hxx (renamed from svx/source/dialog/autocdlg.hxx)0
-rw-r--r--svx/source/cui/autocdlg.src (renamed from svx/source/dialog/autocdlg.src)0
-rw-r--r--svx/source/cui/backgrnd.cxx (renamed from svx/source/dialog/backgrnd.cxx)0
-rw-r--r--svx/source/cui/backgrnd.hrc (renamed from svx/source/dialog/backgrnd.hrc)0
-rw-r--r--svx/source/cui/backgrnd.hxx (renamed from svx/source/dialog/backgrnd.hxx)4
-rw-r--r--svx/source/cui/backgrnd.src (renamed from svx/source/dialog/backgrnd.src)0
-rw-r--r--svx/source/cui/bbdlg.cxx (renamed from svx/source/dialog/bbdlg.cxx)0
-rw-r--r--svx/source/cui/bbdlg.hxx (renamed from svx/source/dialog/bbdlg.hxx)0
-rw-r--r--svx/source/cui/bbdlg.src (renamed from svx/source/dialog/bbdlg.src)0
-rw-r--r--svx/source/cui/border.cxx (renamed from svx/source/dialog/border.cxx)0
-rw-r--r--svx/source/cui/border.hrc (renamed from svx/source/dialog/border.hrc)0
-rw-r--r--svx/source/cui/border.hxx (renamed from svx/source/dialog/border.hxx)0
-rw-r--r--svx/source/cui/border.src (renamed from svx/source/dialog/border.src)0
-rw-r--r--svx/source/cui/borderconn.cxx (renamed from svx/source/dialog/borderconn.cxx)11
-rw-r--r--svx/source/cui/borderconn.hxx (renamed from svx/source/dialog/borderconn.hxx)9
-rw-r--r--svx/source/cui/cfg.cxx (renamed from svx/source/dialog/cfg.cxx)46
-rw-r--r--svx/source/cui/cfg.hrc (renamed from svx/source/dialog/cfg.hrc)0
-rw-r--r--svx/source/cui/cfg.hxx (renamed from svx/source/dialog/cfg.hxx)6
-rw-r--r--svx/source/cui/cfg.src (renamed from svx/source/dialog/cfg.src)0
-rw-r--r--svx/source/cui/cfgchart.cxx (renamed from svx/source/dialog/cfgchart.cxx)0
-rw-r--r--svx/source/cui/cfgchart.hxx (renamed from svx/source/dialog/cfgchart.hxx)0
-rw-r--r--svx/source/cui/cfgutil.cxx (renamed from sfx2/source/dialog/cfg.cxx)225
-rw-r--r--svx/source/cui/cfgutil.hxx220
-rw-r--r--svx/source/cui/chardlg.cxx (renamed from svx/source/dialog/chardlg.cxx)39
-rw-r--r--svx/source/cui/chardlg.h (renamed from svx/source/dialog/chardlg.h)0
-rw-r--r--svx/source/cui/chardlg.hrc (renamed from svx/source/dialog/chardlg.hrc)0
-rw-r--r--svx/source/cui/chardlg.hxx (renamed from svx/source/dialog/chardlg.hxx)0
-rw-r--r--svx/source/cui/chardlg.src (renamed from svx/source/dialog/chardlg.src)0
-rw-r--r--svx/source/cui/charmap.hrc (renamed from svx/source/dialog/charmap.hrc)4
-rw-r--r--svx/source/cui/charmap.src161
-rw-r--r--svx/source/cui/commonlingui.cxx (renamed from svx/source/dialog/commonlingui.cxx)0
-rw-r--r--svx/source/cui/commonlingui.hxx (renamed from svx/source/dialog/commonlingui.hxx)5
-rw-r--r--svx/source/cui/commonlingui.src (renamed from svx/source/dialog/commonlingui.src)0
-rw-r--r--svx/source/cui/connect.cxx (renamed from svx/source/dialog/connect.cxx)0
-rw-r--r--svx/source/cui/connect.hxx (renamed from svx/source/dialog/connect.hxx)0
-rw-r--r--svx/source/cui/connect.src (renamed from svx/source/dialog/connect.src)0
-rw-r--r--svx/source/cui/connpoolconfig.cxx (renamed from svx/source/dialog/connpoolconfig.cxx)0
-rw-r--r--svx/source/cui/connpoolconfig.hxx (renamed from svx/source/dialog/connpoolconfig.hxx)0
-rw-r--r--svx/source/cui/connpooloptions.cxx (renamed from svx/source/dialog/connpooloptions.cxx)0
-rw-r--r--svx/source/cui/connpooloptions.hrc (renamed from svx/source/dialog/connpooloptions.hrc)0
-rw-r--r--svx/source/cui/connpooloptions.hxx (renamed from svx/source/dialog/connpooloptions.hxx)8
-rw-r--r--svx/source/cui/connpooloptions.src (renamed from svx/source/dialog/connpooloptions.src)0
-rw-r--r--svx/source/cui/connpoolsettings.cxx (renamed from svx/source/dialog/connpoolsettings.cxx)0
-rw-r--r--svx/source/cui/connpoolsettings.hxx (renamed from svx/source/dialog/connpoolsettings.hxx)0
-rw-r--r--svx/source/cui/cuicharmap.cxx591
-rw-r--r--svx/source/cui/cuicharmap.hxx (renamed from svx/source/dialog/cuicharmap.hxx)79
-rw-r--r--svx/source/cui/cuiexp.cxx (renamed from svx/source/dialog/cuiexp.cxx)0
-rw-r--r--svx/source/cui/cuifmsearch.cxx (renamed from svx/source/dialog/cuifmsearch.cxx)0
-rw-r--r--svx/source/cui/cuifmsearch.hxx (renamed from svx/source/dialog/cuifmsearch.hxx)0
-rw-r--r--svx/source/cui/cuigaldlg.cxx (renamed from svx/source/dialog/cuigaldlg.cxx)0
-rw-r--r--svx/source/cui/cuigaldlg.hxx (renamed from svx/source/dialog/cuigaldlg.hxx)0
-rw-r--r--svx/source/cui/cuigrfflt.cxx (renamed from svx/source/dialog/cuigrfflt.cxx)2
-rw-r--r--svx/source/cui/cuigrfflt.hxx (renamed from svx/source/dialog/cuigrfflt.hxx)0
-rw-r--r--svx/source/cui/cuihyperdlg.cxx (renamed from svx/source/dialog/cuihyperdlg.cxx)0
-rw-r--r--svx/source/cui/cuihyperdlg.hxx (renamed from svx/source/dialog/cuihyperdlg.hxx)0
-rwxr-xr-xsvx/source/cui/cuiimapdlg.hrc50
-rwxr-xr-xsvx/source/cui/cuiimapdlg.src151
-rw-r--r--svx/source/cui/cuiimapwnd.cxx (renamed from svx/source/dialog/cuiimapwnd.cxx)8
-rw-r--r--svx/source/cui/cuiimapwnd.hxx (renamed from svx/source/dialog/cuiimapwnd.hxx)3
-rw-r--r--svx/source/cui/cuioptgenrl.hxx (renamed from svx/source/dialog/cuioptgenrl.hxx)0
-rw-r--r--svx/source/cui/cuisrchdlg.cxx (renamed from svx/source/dialog/cuisrchdlg.cxx)4
-rw-r--r--svx/source/cui/cuisrchdlg.hxx (renamed from svx/source/dialog/cuisrchdlg.hxx)0
-rw-r--r--svx/source/cui/cuitabarea.hxx (renamed from svx/source/dialog/cuitabarea.hxx)6
-rw-r--r--svx/source/cui/cuitabline.hxx (renamed from svx/source/dialog/cuitabline.hxx)0
-rw-r--r--svx/source/cui/cuitbxform.cxx (renamed from svx/source/dialog/cuitbxform.cxx)0
-rw-r--r--svx/source/cui/cuitbxform.hxx (renamed from svx/source/dialog/cuitbxform.hxx)0
-rw-r--r--svx/source/cui/dbregister.cxx (renamed from svx/source/dialog/dbregister.cxx)0
-rw-r--r--svx/source/cui/dbregister.hrc (renamed from svx/source/dialog/dbregister.hrc)0
-rw-r--r--svx/source/cui/dbregister.hxx (renamed from svx/source/dialog/dbregister.hxx)0
-rw-r--r--svx/source/cui/dbregister.src (renamed from svx/source/dialog/dbregister.src)0
-rw-r--r--svx/source/cui/dbregisterednamesconfig.cxx (renamed from svx/source/dialog/dbregisterednamesconfig.cxx)0
-rw-r--r--svx/source/cui/dbregisterednamesconfig.hxx (renamed from svx/source/dialog/dbregisterednamesconfig.hxx)0
-rw-r--r--svx/source/cui/dbregistersettings.cxx (renamed from svx/source/dialog/dbregistersettings.cxx)0
-rw-r--r--svx/source/cui/dbregistersettings.hxx (renamed from svx/source/dialog/dbregistersettings.hxx)0
-rw-r--r--svx/source/cui/dlgfact.cxx (renamed from svx/source/dialog/dlgfact.cxx)173
-rw-r--r--svx/source/cui/dlgfact.hxx (renamed from svx/source/dialog/dlgfact.hxx)65
-rw-r--r--svx/source/cui/dlgname.cxx (renamed from svx/source/dialog/dlgname.cxx)0
-rw-r--r--svx/source/cui/dlgname.hrc (renamed from svx/source/dialog/dlgname.hrc)0
-rw-r--r--svx/source/cui/dlgname.hxx (renamed from svx/source/dialog/dlgname.hxx)0
-rw-r--r--svx/source/cui/dlgname.src (renamed from svx/source/dialog/dlgname.src)0
-rw-r--r--svx/source/cui/doclinkdialog.cxx (renamed from svx/source/dialog/doclinkdialog.cxx)0
-rw-r--r--svx/source/cui/doclinkdialog.hrc (renamed from svx/source/dialog/doclinkdialog.hrc)0
-rw-r--r--svx/source/cui/doclinkdialog.hxx (renamed from svx/source/dialog/doclinkdialog.hxx)0
-rw-r--r--svx/source/cui/doclinkdialog.src (renamed from svx/source/dialog/doclinkdialog.src)0
-rw-r--r--svx/source/cui/dstribut.cxx (renamed from svx/source/dialog/dstribut.cxx)0
-rw-r--r--svx/source/cui/dstribut.hrc (renamed from svx/source/dialog/dstribut.hrc)0
-rw-r--r--svx/source/cui/dstribut.hxx (renamed from svx/source/dialog/dstribut.hxx)0
-rw-r--r--svx/source/cui/dstribut.src (renamed from svx/source/dialog/dstribut.src)0
-rw-r--r--svx/source/cui/eventdlg.cxx (renamed from svx/source/dialog/eventdlg.cxx)0
-rw-r--r--svx/source/cui/eventdlg.hrc (renamed from svx/source/dialog/eventdlg.hrc)0
-rw-r--r--svx/source/cui/eventdlg.src (renamed from svx/source/dialog/eventdlg.src)0
-rw-r--r--svx/source/cui/fontsubs.cxx (renamed from svx/source/dialog/fontsubs.cxx)4
-rw-r--r--svx/source/cui/fontsubs.hrc (renamed from svx/source/dialog/fontsubs.hrc)0
-rw-r--r--svx/source/cui/fontsubs.hxx (renamed from svx/source/dialog/fontsubs.hxx)3
-rw-r--r--svx/source/cui/fontsubs.src (renamed from svx/source/dialog/fontsubs.src)0
-rw-r--r--svx/source/cui/grfflt.hrc (renamed from svx/source/dialog/grfflt.hrc)0
-rw-r--r--svx/source/cui/grfflt.src (renamed from svx/source/dialog/grfflt.src)0
-rw-r--r--svx/source/cui/grfpage.cxx (renamed from svx/source/dialog/grfpage.cxx)0
-rw-r--r--svx/source/cui/grfpage.hrc (renamed from svx/source/dialog/grfpage.hrc)0
-rw-r--r--svx/source/cui/grfpage.hxx (renamed from svx/source/dialog/grfpage.hxx)0
-rw-r--r--svx/source/cui/grfpage.src (renamed from svx/source/dialog/grfpage.src)0
-rw-r--r--svx/source/cui/hangulhanjadlg.cxx (renamed from svx/source/dialog/hangulhanjadlg.cxx)0
-rw-r--r--svx/source/cui/hangulhanjadlg.hrc (renamed from svx/source/dialog/hangulhanjadlg.hrc)0
-rw-r--r--svx/source/cui/hangulhanjadlg.hxx (renamed from svx/source/dialog/hangulhanjadlg.hxx)0
-rw-r--r--svx/source/cui/hangulhanjadlg.src (renamed from svx/source/dialog/hangulhanjadlg.src)0
-rwxr-xr-x[-rw-r--r--]svx/source/cui/headertablistbox.hxx (renamed from svx/source/inc/headertablistbox.hxx)0
-rw-r--r--svx/source/cui/hldocntp.cxx (renamed from svx/source/dialog/hldocntp.cxx)0
-rw-r--r--svx/source/cui/hldocntp.hxx (renamed from svx/source/dialog/hldocntp.hxx)0
-rw-r--r--svx/source/cui/hldoctp.cxx (renamed from svx/source/dialog/hldoctp.cxx)0
-rw-r--r--svx/source/cui/hldoctp.hxx (renamed from svx/source/dialog/hldoctp.hxx)0
-rw-r--r--svx/source/cui/hlinettp.cxx (renamed from svx/source/dialog/hlinettp.cxx)0
-rw-r--r--svx/source/cui/hlinettp.hxx (renamed from svx/source/dialog/hlinettp.hxx)0
-rw-r--r--svx/source/cui/hlmailtp.cxx (renamed from svx/source/dialog/hlmailtp.cxx)0
-rw-r--r--svx/source/cui/hlmailtp.hxx (renamed from svx/source/dialog/hlmailtp.hxx)0
-rw-r--r--svx/source/cui/hlmarkwn.cxx (renamed from svx/source/dialog/hlmarkwn.cxx)0
-rw-r--r--svx/source/cui/hlmarkwn.src (renamed from svx/source/dialog/hlmarkwn.src)0
-rw-r--r--svx/source/cui/hltpbase.cxx (renamed from svx/source/dialog/hltpbase.cxx)1
-rw-r--r--svx/source/cui/hltpbase.hxx (renamed from svx/source/dialog/hltpbase.hxx)1
-rw-r--r--svx/source/cui/iconcdlg.cxx (renamed from svx/source/dialog/iconcdlg.cxx)0
-rw-r--r--svx/source/cui/iconcdlg.hxx (renamed from svx/source/dialog/iconcdlg.hxx)0
-rw-r--r--svx/source/cui/iconcdlg.src (renamed from svx/source/dialog/iconcdlg.src)0
-rw-r--r--svx/source/cui/init.cxx (renamed from svx/source/init/init.cxx)30
-rw-r--r--svx/source/cui/insdlg.cxx (renamed from svx/source/dialog/insdlg.cxx)0
-rw-r--r--svx/source/cui/insdlg.hxx (renamed from svx/source/dialog/insdlg.hxx)0
-rw-r--r--svx/source/cui/internationaloptions.cxx (renamed from svx/source/dialog/internationaloptions.cxx)0
-rw-r--r--svx/source/cui/internationaloptions.hrc (renamed from svx/source/dialog/internationaloptions.hrc)0
-rw-r--r--svx/source/cui/internationaloptions.hxx (renamed from svx/source/dialog/internationaloptions.hxx)0
-rw-r--r--svx/source/cui/internationaloptions.src (renamed from svx/source/dialog/internationaloptions.src)0
-rw-r--r--svx/source/cui/labdlg.cxx (renamed from svx/source/dialog/labdlg.cxx)0
-rw-r--r--svx/source/cui/labdlg.hrc (renamed from svx/source/dialog/labdlg.hrc)0
-rw-r--r--svx/source/cui/labdlg.hxx (renamed from svx/source/dialog/labdlg.hxx)0
-rw-r--r--svx/source/cui/labdlg.src (renamed from svx/source/dialog/labdlg.src)0
-rw-r--r--svx/source/cui/linkdlg.cxx (renamed from svx/source/dialog/linkdlg.cxx)0
-rw-r--r--svx/source/cui/linkdlg.hxx (renamed from svx/source/dialog/linkdlg.hxx)0
-rw-r--r--svx/source/cui/macroass.cxx (renamed from sfx2/source/dialog/macropg.cxx)221
-rw-r--r--svx/source/cui/macroass.hrc (renamed from sfx2/source/dialog/macropg.hrc)4
-rwxr-xr-xsvx/source/cui/macroass.hxx146
-rw-r--r--svx/source/cui/macroass.src (renamed from sfx2/source/dialog/macropg.src)7
-rw-r--r--svx/source/cui/macropg.cxx (renamed from svx/source/dialog/macropg.cxx)0
-rw-r--r--svx/source/cui/macropg.hrc (renamed from svx/source/dialog/macropg.hrc)0
-rw-r--r--svx/source/cui/macropg.hxx (renamed from svx/inc/macropg.hxx)7
-rw-r--r--svx/source/cui/macropg.src (renamed from svx/source/dialog/macropg.src)0
-rwxr-xr-xsvx/source/cui/makefile.mk232
-rw-r--r--svx/source/cui/measure.cxx (renamed from svx/source/dialog/measure.cxx)0
-rw-r--r--svx/source/cui/measure.hrc (renamed from svx/source/dialog/measure.hrc)0
-rw-r--r--svx/source/cui/measure.hxx (renamed from svx/source/dialog/measure.hxx)0
-rw-r--r--svx/source/cui/measure.src (renamed from svx/source/dialog/measure.src)0
-rw-r--r--svx/source/cui/multifil.cxx (renamed from svx/source/dialog/multifil.cxx)0
-rw-r--r--svx/source/cui/multifil.hxx (renamed from svx/source/dialog/multifil.hxx)0
-rw-r--r--svx/source/cui/multipat.cxx (renamed from svx/source/dialog/multipat.cxx)0
-rw-r--r--svx/source/cui/multipat.hxx (renamed from svx/source/dialog/multipat.hxx)0
-rw-r--r--svx/source/cui/newtabledlg.cxx (renamed from svx/source/dialog/newtabledlg.cxx)0
-rw-r--r--svx/source/cui/newtabledlg.hrc (renamed from svx/source/dialog/newtabledlg.hrc)0
-rw-r--r--svx/source/cui/newtabledlg.hxx (renamed from svx/source/dialog/newtabledlg.hxx)0
-rw-r--r--svx/source/cui/newtabledlg.src (renamed from svx/source/dialog/newtabledlg.src)0
-rw-r--r--svx/source/cui/numfmt.cxx (renamed from svx/source/dialog/numfmt.cxx)0
-rw-r--r--svx/source/cui/numfmt.hrc (renamed from svx/source/dialog/numfmt.hrc)0
-rw-r--r--svx/source/cui/numfmt.hxx (renamed from svx/source/dialog/numfmt.hxx)0
-rw-r--r--svx/source/cui/numfmt.src (renamed from svx/source/dialog/numfmt.src)0
-rw-r--r--svx/source/cui/numpages.cxx (renamed from svx/source/dialog/numpages.cxx)15
-rw-r--r--svx/source/cui/numpages.hrc (renamed from svx/source/dialog/numpages.hrc)0
-rw-r--r--svx/source/cui/numpages.hxx (renamed from svx/source/dialog/numpages.hxx)0
-rw-r--r--svx/source/cui/numpages.src (renamed from svx/source/dialog/numpages.src)0
-rw-r--r--svx/source/cui/optHeaderTabListbox.cxx (renamed from svx/source/dialog/optHeaderTabListbox.cxx)0
-rw-r--r--svx/source/cui/optHeaderTabListbox.hxx (renamed from svx/source/dialog/optHeaderTabListbox.hxx)0
-rw-r--r--svx/source/cui/optaccessibility.cxx (renamed from svx/source/dialog/optaccessibility.cxx)0
-rw-r--r--svx/source/cui/optaccessibility.hxx (renamed from svx/source/dialog/optaccessibility.hxx)0
-rw-r--r--svx/source/cui/optasian.cxx (renamed from svx/source/dialog/optasian.cxx)0
-rw-r--r--svx/source/cui/optasian.hxx (renamed from svx/source/dialog/optasian.hxx)0
-rw-r--r--svx/source/cui/optchart.cxx (renamed from svx/source/dialog/optchart.cxx)0
-rw-r--r--svx/source/cui/optchart.hxx (renamed from svx/source/dialog/optchart.hxx)0
-rw-r--r--svx/source/cui/optcolor.cxx (renamed from svx/source/dialog/optcolor.cxx)0
-rw-r--r--svx/source/cui/optcolor.hxx (renamed from svx/source/dialog/optcolor.hxx)0
-rw-r--r--svx/source/cui/optctl.cxx (renamed from svx/source/dialog/optctl.cxx)0
-rw-r--r--svx/source/cui/optctl.hxx (renamed from svx/source/dialog/optctl.hxx)0
-rw-r--r--svx/source/cui/optdict.cxx (renamed from svx/source/dialog/optdict.cxx)0
-rw-r--r--svx/source/cui/optdict.hxx (renamed from svx/source/dialog/optdict.hxx)0
-rw-r--r--svx/source/cui/optfltr.cxx (renamed from svx/source/dialog/optfltr.cxx)0
-rw-r--r--svx/source/cui/optfltr.hrc (renamed from svx/source/dialog/optfltr.hrc)0
-rw-r--r--svx/source/cui/optfltr.hxx (renamed from svx/source/dialog/optfltr.hxx)0
-rw-r--r--svx/source/cui/optfltr.src (renamed from svx/source/dialog/optfltr.src)0
-rw-r--r--svx/source/cui/optgdlg.cxx (renamed from svx/source/dialog/optgdlg.cxx)0
-rw-r--r--svx/source/cui/optgdlg.hrc (renamed from svx/source/dialog/optgdlg.hrc)0
-rw-r--r--svx/source/cui/optgdlg.hxx (renamed from svx/source/dialog/optgdlg.hxx)0
-rw-r--r--svx/source/cui/optgdlg.src (renamed from svx/source/dialog/optgdlg.src)0
-rw-r--r--svx/source/cui/optgenrl.cxx (renamed from svx/source/dialog/optgenrl.cxx)0
-rw-r--r--svx/source/cui/opthtml.cxx (renamed from svx/source/dialog/opthtml.cxx)0
-rw-r--r--svx/source/cui/opthtml.hrc (renamed from svx/source/dialog/opthtml.hrc)0
-rw-r--r--svx/source/cui/opthtml.hxx (renamed from svx/source/dialog/opthtml.hxx)0
-rw-r--r--svx/source/cui/opthtml.src (renamed from svx/source/dialog/opthtml.src)0
-rw-r--r--svx/source/cui/optimprove.cxx (renamed from svx/source/dialog/optimprove.cxx)0
-rw-r--r--svx/source/cui/optimprove2.cxx (renamed from svx/source/dialog/optimprove2.cxx)0
-rw-r--r--svx/source/cui/optinet2.cxx (renamed from svx/source/dialog/optinet2.cxx)0
-rw-r--r--svx/source/cui/optinet2.hxx (renamed from svx/source/dialog/optinet2.hxx)0
-rw-r--r--svx/source/cui/optjava.cxx (renamed from svx/source/dialog/optjava.cxx)0
-rw-r--r--svx/source/cui/optjava.hrc (renamed from svx/source/dialog/optjava.hrc)0
-rw-r--r--svx/source/cui/optjava.hxx (renamed from svx/source/dialog/optjava.hxx)0
-rw-r--r--svx/source/cui/optjava.src (renamed from svx/source/dialog/optjava.src)0
-rw-r--r--svx/source/cui/optjsearch.cxx (renamed from svx/source/dialog/optjsearch.cxx)0
-rw-r--r--svx/source/cui/optjsearch.hxx (renamed from svx/source/dialog/optjsearch.hxx)0
-rw-r--r--svx/source/cui/optmemory.cxx (renamed from svx/source/dialog/optmemory.cxx)0
-rw-r--r--svx/source/cui/optmemory.hrc (renamed from svx/source/dialog/optmemory.hrc)0
-rw-r--r--svx/source/cui/optmemory.hxx (renamed from svx/source/dialog/optmemory.hxx)0
-rw-r--r--svx/source/cui/optmemory.src (renamed from svx/source/dialog/optmemory.src)0
-rw-r--r--svx/source/cui/optpath.cxx (renamed from svx/source/dialog/optpath.cxx)0
-rw-r--r--svx/source/cui/optpath.hxx (renamed from svx/source/dialog/optpath.hxx)0
-rw-r--r--svx/source/cui/optsave.cxx (renamed from svx/source/dialog/optsave.cxx)0
-rw-r--r--svx/source/cui/optsave.hxx (renamed from svx/source/dialog/optsave.hxx)0
-rw-r--r--svx/source/cui/optupdt.cxx (renamed from svx/source/dialog/optupdt.cxx)0
-rw-r--r--svx/source/cui/optupdt.hrc (renamed from svx/source/dialog/optupdt.hrc)0
-rw-r--r--svx/source/cui/optupdt.hxx (renamed from svx/source/dialog/optupdt.hxx)0
-rw-r--r--svx/source/cui/optupdt.src (renamed from svx/source/dialog/optupdt.src)0
-rw-r--r--svx/source/cui/page.cxx (renamed from svx/source/dialog/page.cxx)0
-rw-r--r--svx/source/cui/page.h (renamed from svx/source/dialog/page.h)0
-rw-r--r--svx/source/cui/page.hrc (renamed from svx/source/dialog/page.hrc)0
-rw-r--r--svx/source/cui/page.hxx (renamed from svx/source/dialog/page.hxx)0
-rw-r--r--svx/source/cui/page.src (renamed from svx/source/dialog/page.src)0
-rw-r--r--svx/source/cui/paragrph.cxx (renamed from svx/source/dialog/paragrph.cxx)0
-rw-r--r--svx/source/cui/paragrph.hrc (renamed from svx/source/dialog/paragrph.hrc)0
-rw-r--r--svx/source/cui/paragrph.hxx (renamed from svx/source/dialog/paragrph.hxx)0
-rw-r--r--svx/source/cui/paragrph.src (renamed from svx/source/dialog/paragrph.src)0
-rw-r--r--svx/source/cui/pastedlg.cxx (renamed from svx/source/dialog/pastedlg.cxx)0
-rw-r--r--svx/source/cui/pastedlg.hxx (renamed from svx/source/dialog/pastedlg.hxx)0
-rw-r--r--svx/source/cui/plfilter.cxx (renamed from svx/source/dialog/plfilter.cxx)0
-rw-r--r--svx/source/cui/postdlg.cxx (renamed from svx/source/dialog/postdlg.cxx)0
-rw-r--r--svx/source/cui/postdlg.hrc (renamed from svx/source/dialog/postdlg.hrc)0
-rw-r--r--svx/source/cui/postdlg.hxx (renamed from svx/source/dialog/postdlg.hxx)0
-rw-r--r--svx/source/cui/postdlg.src (renamed from svx/source/dialog/postdlg.src)0
-rw-r--r--svx/source/cui/readonlyimage.cxx (renamed from svx/source/dialog/readonlyimage.cxx)0
-rw-r--r--svx/source/cui/readonlyimage.hxx (renamed from svx/source/dialog/readonlyimage.hxx)0
-rw-r--r--svx/source/cui/readonlyimage.src (renamed from svx/source/dialog/readonlyimage.src)0
-rw-r--r--svx/source/cui/scriptdlg.cxx (renamed from svx/source/dialog/scriptdlg.cxx)0
-rw-r--r--svx/source/cui/scriptdlg.hrc (renamed from svx/source/dialog/scriptdlg.hrc)0
-rw-r--r--svx/source/cui/scriptdlg.hxx (renamed from svx/source/dialog/scriptdlg.hxx)5
-rw-r--r--svx/source/cui/scriptdlg.src (renamed from svx/source/dialog/scriptdlg.src)0
-rw-r--r--svx/source/cui/sdbcdriverenum.cxx (renamed from svx/source/dialog/sdbcdriverenum.cxx)0
-rw-r--r--svx/source/cui/sdbcdriverenum.hxx (renamed from svx/source/dialog/sdbcdriverenum.hxx)0
-rw-r--r--svx/source/cui/sdrcelldlg.cxx (renamed from svx/source/dialog/sdrcelldlg.cxx)0
-rw-r--r--svx/source/cui/sdrcelldlg.hxx (renamed from svx/source/dialog/sdrcelldlg.hxx)0
-rw-r--r--svx/source/cui/sdrcelldlg.src (renamed from svx/source/dialog/sdrcelldlg.src)0
-rw-r--r--svx/source/cui/securityoptions.cxx (renamed from svx/source/dialog/securityoptions.cxx)0
-rw-r--r--svx/source/cui/securityoptions.hrc (renamed from svx/source/dialog/securityoptions.hrc)0
-rw-r--r--svx/source/cui/securityoptions.hxx (renamed from svx/source/dialog/securityoptions.hxx)0
-rw-r--r--svx/source/cui/securityoptions.src (renamed from svx/source/dialog/securityoptions.src)0
-rw-r--r--svx/source/cui/selector.cxx (renamed from svx/source/dialog/selector.cxx)0
-rw-r--r--svx/source/cui/selector.hrc (renamed from svx/source/dialog/selector.hrc)0
-rw-r--r--svx/source/cui/selector.hxx (renamed from svx/source/dialog/selector.hxx)4
-rw-r--r--svx/source/cui/selector.src (renamed from svx/source/dialog/selector.src)0
-rw-r--r--svx/source/cui/showcols.cxx (renamed from svx/source/dialog/showcols.cxx)0
-rw-r--r--svx/source/cui/showcols.hxx (renamed from svx/source/dialog/showcols.hxx)0
-rw-r--r--svx/source/cui/splitcelldlg.cxx (renamed from svx/source/dialog/splitcelldlg.cxx)0
-rw-r--r--svx/source/cui/splitcelldlg.hrc (renamed from svx/source/dialog/splitcelldlg.hrc)0
-rw-r--r--svx/source/cui/splitcelldlg.hxx (renamed from svx/source/dialog/splitcelldlg.hxx)0
-rw-r--r--svx/source/cui/splitcelldlg.src (renamed from svx/source/dialog/splitcelldlg.src)0
-rw-r--r--svx/source/cui/srchxtra.cxx (renamed from svx/source/dialog/srchxtra.cxx)0
-rw-r--r--svx/source/cui/srchxtra.hrc (renamed from svx/source/dialog/srchxtra.hrc)0
-rw-r--r--svx/source/cui/srchxtra.hxx (renamed from svx/source/dialog/srchxtra.hxx)0
-rw-r--r--svx/source/cui/srchxtra.src (renamed from svx/source/dialog/srchxtra.src)0
-rw-r--r--svx/source/cui/svuidlg.hrc (renamed from svx/source/dialog/svuidlg.hrc)0
-rw-r--r--svx/source/cui/svuidlg.src (renamed from svx/source/dialog/svuidlg.src)0
-rw-r--r--svx/source/cui/swpossizetabpage.cxx (renamed from svx/source/dialog/swpossizetabpage.cxx)0
-rw-r--r--svx/source/cui/swpossizetabpage.hrc (renamed from svx/source/dialog/swpossizetabpage.hrc)0
-rw-r--r--svx/source/cui/swpossizetabpage.hxx (renamed from svx/source/dialog/swpossizetabpage.hxx)0
-rw-r--r--svx/source/cui/swpossizetabpage.src (renamed from svx/source/dialog/swpossizetabpage.src)0
-rw-r--r--svx/source/cui/tabarea.cxx (renamed from svx/source/dialog/tabarea.cxx)0
-rw-r--r--svx/source/cui/tabarea.hrc (renamed from svx/source/dialog/tabarea.hrc)0
-rw-r--r--svx/source/cui/tabarea.src (renamed from svx/source/dialog/tabarea.src)0
-rw-r--r--svx/source/cui/tabline.cxx (renamed from svx/source/dialog/tabline.cxx)0
-rw-r--r--svx/source/cui/tabline.hrc (renamed from svx/source/dialog/tabline.hrc)0
-rw-r--r--svx/source/cui/tabline.src (renamed from svx/source/dialog/tabline.src)0
-rw-r--r--svx/source/cui/tabstpge.cxx (renamed from svx/source/dialog/tabstpge.cxx)0
-rw-r--r--svx/source/cui/tabstpge.hrc (renamed from svx/source/dialog/tabstpge.hrc)0
-rw-r--r--svx/source/cui/tabstpge.hxx (renamed from svx/source/dialog/tabstpge.hxx)0
-rw-r--r--svx/source/cui/tabstpge.src (renamed from svx/source/dialog/tabstpge.src)0
-rw-r--r--svx/source/cui/textanim.cxx (renamed from svx/source/dialog/textanim.cxx)0
-rw-r--r--svx/source/cui/textanim.hrc (renamed from svx/source/dialog/textanim.hrc)0
-rw-r--r--svx/source/cui/textanim.hxx (renamed from svx/source/dialog/textanim.hxx)0
-rw-r--r--svx/source/cui/textanim.src (renamed from svx/source/dialog/textanim.src)0
-rw-r--r--svx/source/cui/textattr.cxx (renamed from svx/source/dialog/textattr.cxx)0
-rw-r--r--svx/source/cui/textattr.hrc (renamed from svx/source/dialog/textattr.hrc)0
-rw-r--r--svx/source/cui/textattr.hxx (renamed from svx/source/dialog/textattr.hxx)0
-rw-r--r--svx/source/cui/textattr.src (renamed from svx/source/dialog/textattr.src)0
-rw-r--r--svx/source/cui/tparea.cxx (renamed from svx/source/dialog/tparea.cxx)12
-rw-r--r--svx/source/cui/tpbitmap.cxx (renamed from svx/source/dialog/tpbitmap.cxx)0
-rw-r--r--svx/source/cui/tpcolor.cxx (renamed from svx/source/dialog/tpcolor.cxx)0
-rw-r--r--svx/source/cui/tpgradnt.cxx (renamed from svx/source/dialog/tpgradnt.cxx)0
-rw-r--r--svx/source/cui/tphatch.cxx (renamed from svx/source/dialog/tphatch.cxx)0
-rw-r--r--svx/source/cui/tpline.cxx (renamed from svx/source/dialog/tpline.cxx)0
-rw-r--r--svx/source/cui/tplnedef.cxx (renamed from svx/source/dialog/tplnedef.cxx)0
-rw-r--r--svx/source/cui/tplneend.cxx (renamed from svx/source/dialog/tplneend.cxx)0
-rw-r--r--svx/source/cui/tpshadow.cxx (renamed from svx/source/dialog/tpshadow.cxx)0
-rw-r--r--svx/source/cui/transfrm.cxx (renamed from svx/source/dialog/transfrm.cxx)0
-rw-r--r--svx/source/cui/transfrm.hrc (renamed from svx/source/dialog/transfrm.hrc)0
-rw-r--r--svx/source/cui/transfrm.hxx (renamed from svx/source/dialog/transfrm.hxx)0
-rw-r--r--svx/source/cui/transfrm.src (renamed from svx/source/dialog/transfrm.src)0
-rw-r--r--svx/source/cui/treeopt.cxx (renamed from svx/source/dialog/treeopt.cxx)0
-rw-r--r--svx/source/cui/treeopt.hrc (renamed from svx/source/dialog/treeopt.hrc)0
-rw-r--r--svx/source/cui/treeopt.hxx (renamed from svx/source/dialog/treeopt.hxx)0
-rw-r--r--svx/source/cui/treeopt.src (renamed from svx/source/dialog/treeopt.src)0
-rw-r--r--svx/source/cui/webconninfo.cxx (renamed from svx/source/dialog/webconninfo.cxx)0
-rw-r--r--svx/source/cui/webconninfo.hrc (renamed from svx/source/dialog/webconninfo.hrc)0
-rw-r--r--svx/source/cui/webconninfo.hxx (renamed from svx/source/dialog/webconninfo.hxx)0
-rw-r--r--svx/source/cui/webconninfo.src (renamed from svx/source/dialog/webconninfo.src)0
-rw-r--r--svx/source/cui/winpluginlib.cpp (renamed from svx/source/dialog/winpluginlib.cpp)0
-rw-r--r--svx/source/cui/zoom.cxx (renamed from svx/source/dialog/zoom.cxx)0
-rw-r--r--svx/source/cui/zoom.hrc (renamed from svx/source/dialog/zoom.hrc)0
-rw-r--r--svx/source/cui/zoom.hxx (renamed from svx/source/dialog/zoom.hxx)0
-rw-r--r--svx/source/cui/zoom.src (renamed from svx/source/dialog/zoom.src)0
-rw-r--r--svx/source/dialog/charmap.cxx403
-rw-r--r--svx/source/dialog/cuicharmap.cxx136
-rw-r--r--svx/source/dialog/databaseregistrationui.cxx6
-rw-r--r--svx/source/dialog/grfflt.cxx2
-rw-r--r--svx/source/dialog/hyperdlg.cxx4
-rw-r--r--svx/source/dialog/imapdlg.hrc22
-rw-r--r--svx/source/dialog/imapdlg.src118
-rw-r--r--svx/source/dialog/imapwnd.cxx74
-rw-r--r--svx/source/dialog/makefile.mk427
-rw-r--r--svx/source/dialog/sendreportw32.cxx95
-rw-r--r--svx/source/dialog/srchdlg.cxx4
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx1
-rw-r--r--svx/source/dialog/test.src583
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/ucsubset.src (renamed from svx/source/dialog/charmap.src)115
-rw-r--r--svx/source/init/makefile.mk49
-rw-r--r--svx/util/cui.map1
-rw-r--r--svx/util/hidother.src4
-rw-r--r--svx/util/makefile.mk12
382 files changed, 3557 insertions, 4942 deletions
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 35059a939a..dfa60d043d 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -69,10 +69,10 @@ static BOOL ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
{
ULONG n = pTok->GetNumber();
if( nSign == -1 || n <= nMax )
- { // nich tueber dem Maximum
+ { // nicht ueber dem Maximum
if( (nSign == -1 && n < 0x8000000
&& -(long)n >= nMin)
- || (nSign == 1 && n >= 0x8000000 || (long)n > nMin) )
+ || ( (nSign == 1 && n >= 0x8000000) || (long)n > nMin) )
{
*pValue = (long)n;
}
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index ec90042526..232de945b4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -5,7 +5,7 @@
<node oor:name="Commands">
<node oor:name=".uno:Polygon" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Polygon, filled</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -14,7 +14,7 @@
</node>
<node oor:name=".uno:ColorView" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Black &amp; White View</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -23,19 +23,19 @@
</node>
<node oor:name=".uno:RenamePage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Rename Slide</value>
</prop>
</node>
<node oor:name=".uno:RenameLayer" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Rename</value>
</prop>
</node>
<node oor:name=".uno:Presentation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Slide Show</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -44,7 +44,7 @@
</node>
<node oor:name=".uno:RehearseTimings" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Rehearse Timings</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -53,7 +53,7 @@
</node>
<node oor:name=".uno:Dia" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">SlideTransition</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -62,7 +62,7 @@
</node>
<node oor:name=".uno:ShowSlide" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Sho~w Slide</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -71,7 +71,7 @@
</node>
<node oor:name=".uno:HideSlide" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Hide Slide</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -80,19 +80,19 @@
</node>
<node oor:name=".uno:TextAttributes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Te~xt...</value>
</prop>
</node>
<node oor:name=".uno:PagesPerRow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Slides Per Row</value>
</prop>
</node>
<node oor:name=".uno:TextFitToSizeTool" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Fit Text to Frame</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -101,7 +101,7 @@
</node>
<node oor:name=".uno:VerticalTextFitToSizeTool" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Fit Vertical Text to Frame</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -110,7 +110,7 @@
</node>
<node oor:name=".uno:Objects3DToolbox" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">3D Objects</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -119,7 +119,7 @@
</node>
<node oor:name=".uno:Cube" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Cube</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -128,7 +128,7 @@
</node>
<node oor:name=".uno:Sphere" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Sphere</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -137,7 +137,7 @@
</node>
<node oor:name=".uno:Cylinder" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Cylinder</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -146,7 +146,7 @@
</node>
<node oor:name=".uno:Cone" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Cone</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -155,7 +155,7 @@
</node>
<node oor:name=".uno:Cyramid" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Pyramid</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -164,7 +164,7 @@
</node>
<node oor:name=".uno:GlueEditMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Glue Points</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -173,7 +173,7 @@
</node>
<node oor:name=".uno:GlueInsertPoint" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Insert Glue Point</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -182,7 +182,7 @@
</node>
<node oor:name=".uno:GluePercent" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Glue Point Relative</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -191,13 +191,13 @@
</node>
<node oor:name=".uno:GlueEscapeDirection" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Exit Direction</value>
</prop>
</node>
<node oor:name=".uno:GlueHorzAlignCenter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Glue Point Horizontal Center</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -206,7 +206,7 @@
</node>
<node oor:name=".uno:GlueHorzAlignLeft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Glue Point Horizontal Left</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -215,7 +215,7 @@
</node>
<node oor:name=".uno:GlueHorzAlignRight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Glue Point Horizontal Right</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -224,7 +224,7 @@
</node>
<node oor:name=".uno:GlueVertAlignCenter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Glue Point Vertical Center</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -233,7 +233,7 @@
</node>
<node oor:name=".uno:GlueVertAlignTop" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Glue Point Vertical Top</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -242,7 +242,7 @@
</node>
<node oor:name=".uno:GlueVertAlignBottom" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Glue Point Vertical Bottom</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -251,7 +251,7 @@
</node>
<node oor:name=".uno:Shell3D" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Shell</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -260,7 +260,7 @@
</node>
<node oor:name=".uno:Torus" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Torus</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -269,7 +269,7 @@
</node>
<node oor:name=".uno:HalfSphere" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Half-Sphere</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -278,7 +278,7 @@
</node>
<node oor:name=".uno:GlueEscapeDirectionLeft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Exit Direction Left</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -287,7 +287,7 @@
</node>
<node oor:name=".uno:GlueEscapeDirectionRight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Exit Direction Right</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -296,7 +296,7 @@
</node>
<node oor:name=".uno:GlueEscapeDirectionTop" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Exit Direction Top</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -305,7 +305,7 @@
</node>
<node oor:name=".uno:GlueEscapeDirectionBottom" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Exit Direction Bottom</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -314,7 +314,7 @@
</node>
<node oor:name=".uno:InsertToolbox" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Insert</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -323,25 +323,25 @@
</node>
<node oor:name=".uno:Morphing" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Cross-fading...</value>
</prop>
</node>
<node oor:name=".uno:MeasureAttributes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Dimen~sions...</value>
</prop>
</node>
<node oor:name=".uno:GridFront" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Grid to ~Front</value>
</prop>
</node>
<node oor:name=".uno:HelplinesVisible" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Display Guides</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -350,13 +350,13 @@
</node>
<node oor:name=".uno:HelplinesFront" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Guides to ~Front</value>
</prop>
</node>
<node oor:name=".uno:BeforeObject" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">In Front of ~Object</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -365,13 +365,13 @@
</node>
<node oor:name=".uno:PreviewWindow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Pre~view</value>
</prop>
</node>
<node oor:name=".uno:CustomAnimation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Custom Animation...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -380,31 +380,31 @@
</node>
<node oor:name=".uno:CustomAnimationSchemes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Animation Schemes...</value>
</prop>
</node>
<node oor:name=".uno:SlideChangeWindow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Slide Transition...</value>
</prop>
</node>
<node oor:name=".uno:ConnectorAttributes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Connector...</value>
</prop>
</node>
<node oor:name=".uno:PresentationDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">S~lide Show Settings...</value>
</prop>
</node>
<node oor:name=".uno:Hyphenation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Hyphenation</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -413,13 +413,13 @@
</node>
<node oor:name=".uno:NewRouting" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Reset Routing</value>
</prop>
</node>
<node oor:name=".uno:DuplicatePage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">D~uplicate Slide</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -428,7 +428,7 @@
</node>
<node oor:name=".uno:ExpandPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">E~xpand Slide</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -437,13 +437,13 @@
</node>
<node oor:name=".uno:SummaryPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Su~mmary Slide</value>
</prop>
</node>
<node oor:name=".uno:LeaveAllGroups" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Exit All Groups</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -452,7 +452,7 @@
</node>
<node oor:name=".uno:ParaspaceIncrease" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Increase Spacing</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -461,7 +461,7 @@
</node>
<node oor:name=".uno:ParaspaceDecrease" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Decrease Spacing</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -470,79 +470,79 @@
</node>
<node oor:name=".uno:SlideMasterPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Slide Master</value>
</prop>
</node>
<node oor:name=".uno:HandoutMasterPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Handout Master</value>
</prop>
</node>
<node oor:name=".uno:NotesMasterPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Notes Master</value>
</prop>
</node>
<node oor:name=".uno:TitleMasterPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Title Slide Master</value>
</prop>
</node>
<node oor:name=".uno:InsertPageQuick" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Insert Slide Direct</value>
</prop>
</node>
<node oor:name=".uno:InsertDateFieldVar" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Dat~e (variable)</value>
</prop>
</node>
<node oor:name=".uno:InsertDateFieldFix" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Date (fixed)</value>
</prop>
</node>
<node oor:name=".uno:InsertTimeFieldVar" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">T~ime (variable)</value>
</prop>
</node>
<node oor:name=".uno:InsertTimeFieldFix" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Time (fixed)</value>
</prop>
</node>
<node oor:name=".uno:InsertPageField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Page Number</value>
</prop>
</node>
<node oor:name=".uno:ModifyField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">F~ields...</value>
</prop>
</node>
<node oor:name=".uno:InsertFileField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~File Name</value>
</prop>
</node>
<node oor:name=".uno:InsertAuthorField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Author</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -551,49 +551,49 @@
</node>
<node oor:name=".uno:CustomShowDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Custom Slide Show...</value>
</prop>
</node>
<node oor:name=".uno:OutputQualityColor" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Color</value>
</prop>
</node>
<node oor:name=".uno:OutputQualityGrayscale" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Grayscale</value>
</prop>
</node>
<node oor:name=".uno:OutputQualityBlackWhite" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Black and White</value>
</prop>
</node>
<node oor:name=".uno:PreviewQualityColor" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Color</value>
</prop>
</node>
<node oor:name=".uno:PreviewQualityGrayscale" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Grayscale</value>
</prop>
</node>
<node oor:name=".uno:PreviewQualityBlackWhite" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Black and White</value>
</prop>
</node>
<node oor:name=".uno:ConvertInto3D" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">To 3~D</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -602,7 +602,7 @@
</node>
<node oor:name=".uno:ConvertInto3DLatheFast" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">To 3D ~Rotation Object</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -611,61 +611,61 @@
</node>
<node oor:name=".uno:ConvertIntoBitmap" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">To ~Bitmap</value>
</prop>
</node>
<node oor:name=".uno:ConvertIntoMetaFile" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">To ~Metafile</value>
</prop>
</node>
<node oor:name=".uno:PackAndGo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Pack</value>
</prop>
</node>
<node oor:name=".uno:convert_to_contour" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">To C~ontour</value>
</prop>
</node>
<node oor:name=".uno:EditHyperlink" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">H~yperlink...</value>
</prop>
</node>
<node oor:name=".uno:PageSetup" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Page...</value>
</prop>
</node>
<node oor:name=".uno:PasteClipboard" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Paste ~Special...</value>
</prop>
</node>
<node oor:name=".uno:CopyObjects" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Duplicat~e...</value>
</prop>
</node>
<node oor:name=".uno:ManageLinks" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Lin~ks...</value>
</prop>
</node>
<node oor:name=".uno:ConvertInto3DLathe" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">In 3D Rotation Object</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -674,37 +674,37 @@
</node>
<node oor:name=".uno:DrawingMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Drawing View</value>
</prop>
</node>
<node oor:name=".uno:OutlineMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Outline</value>
</prop>
</node>
<node oor:name=".uno:OutputQualityContrast" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~High Contrast</value>
</prop>
</node>
<node oor:name=".uno:DiaMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Sli~de Sorter</value>
</prop>
</node>
<node oor:name=".uno:PreviewQualityContrast" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~High Contrast</value>
</prop>
</node>
<node oor:name=".uno:InsertPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Slid~e</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -713,7 +713,7 @@
</node>
<node oor:name=".uno:ImportFromFile" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~File...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -722,31 +722,22 @@
</node>
<node oor:name=".uno:ZoomPanning" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Shift</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:Bullet" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
-
- <value xml:lang="en-US">S~pecial Character...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:PixelMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Pixel Mode</value>
</prop>
</node>
<node oor:name=".uno:ObjectPosition" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Arrange</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -755,25 +746,25 @@
</node>
<node oor:name=".uno:Combine" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Comb~ine</value>
</prop>
</node>
<node oor:name=".uno:ObjectTitleDescription" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Description...</value>
</prop>
</node>
<node oor:name=".uno:NameGroup" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Name...</value>
</prop>
</node>
<node oor:name=".uno:ConnectorToolbox" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Connector</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -782,7 +773,7 @@
</node>
<node oor:name=".uno:Forward" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Bring ~Forward</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -791,7 +782,7 @@
</node>
<node oor:name=".uno:Backward" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Send Back~ward</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -800,19 +791,19 @@
</node>
<node oor:name=".uno:MirrorVert" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Vertically</value>
</prop>
</node>
<node oor:name=".uno:MirrorHorz" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Horizontally</value>
</prop>
</node>
<node oor:name=".uno:ChangeBezier" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">To ~Curve</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -821,7 +812,7 @@
</node>
<node oor:name=".uno:ChangePolygon" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">To ~Polygon</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -830,25 +821,25 @@
</node>
<node oor:name=".uno:CapturePoint" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Insert Snap Point/Line...</value>
</prop>
</node>
<node oor:name=".uno:ShowRuler" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Ruler</value>
</prop>
</node>
<node oor:name=".uno:InsertLayer" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Layer...</value>
</prop>
</node>
<node oor:name=".uno:ModifyPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Slide ~Layout...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -857,25 +848,25 @@
</node>
<node oor:name=".uno:ModifyLayer" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Layer...</value>
</prop>
</node>
<node oor:name=".uno:PageMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Normal</value>
</prop>
</node>
<node oor:name=".uno:LayerMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Layer</value>
</prop>
</node>
<node oor:name=".uno:MeasureLine" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Dimension Line</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -884,13 +875,13 @@
</node>
<node oor:name=".uno:MasterPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Master</value>
</prop>
</node>
<node oor:name=".uno:DiaEffect" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Slide Effects</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -899,7 +890,7 @@
</node>
<node oor:name=".uno:DiaSpeed" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Transition Speed</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -908,7 +899,7 @@
</node>
<node oor:name=".uno:DiaAuto" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">AutoTransition</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -917,7 +908,7 @@
</node>
<node oor:name=".uno:DiaTime" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Time</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -926,7 +917,7 @@
</node>
<node oor:name=".uno:Connector" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Connector</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -935,7 +926,7 @@
</node>
<node oor:name=".uno:ActionMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Allow Interaction</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -944,7 +935,7 @@
</node>
<node oor:name=".uno:AnimationObjects" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Animated Image...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -953,7 +944,7 @@
</node>
<node oor:name=".uno:AnimationEffects" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Interaction...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -962,7 +953,7 @@
</node>
<node oor:name=".uno:PresentationLayout" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Slide D~esign...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -971,49 +962,49 @@
</node>
<node oor:name=".uno:NotesMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Notes ~Page</value>
</prop>
</node>
<node oor:name=".uno:HandoutMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">H~andout Page</value>
</prop>
</node>
<node oor:name=".uno:DeletePage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">D~elete Slide</value>
</prop>
</node>
<node oor:name=".uno:DeleteLayer" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Delete</value>
</prop>
</node>
<node oor:name=".uno:Dismantle" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Split</value>
</prop>
</node>
<node oor:name=".uno:PageStatus" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Slide/Layer</value>
</prop>
</node>
<node oor:name=".uno:LayoutStatus" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Layout</value>
</prop>
</node>
<node oor:name=".uno:CrookRotate" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Set in Circle (perspective)</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1022,7 +1013,7 @@
</node>
<node oor:name=".uno:CrookSlant" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Set to circle (slant)</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1031,25 +1022,25 @@
</node>
<node oor:name=".uno:CrookStretch" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Set in Circle (distort)</value>
</prop>
</node>
<node oor:name=".uno:Connect" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">C~onnect</value>
</prop>
</node>
<node oor:name=".uno:Break" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Break</value>
</prop>
</node>
<node oor:name=".uno:AdvancedMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Effects</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1058,7 +1049,7 @@
</node>
<node oor:name=".uno:InteractiveTransparence" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Transparency</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1067,7 +1058,7 @@
</node>
<node oor:name=".uno:InteractiveGradient" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Gradient</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1076,7 +1067,7 @@
</node>
<node oor:name=".uno:Shear" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Distort</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1085,7 +1076,7 @@
</node>
<node oor:name=".uno:BehindObject" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Be~hind Object</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1094,7 +1085,7 @@
</node>
<node oor:name=".uno:ReverseOrder" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Reverse</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1103,7 +1094,7 @@
</node>
<node oor:name=".uno:ConnectorArrowStart" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Connector Starts with Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1112,7 +1103,7 @@
</node>
<node oor:name=".uno:ConnectorArrowEnd" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Connector Ends with Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1121,7 +1112,7 @@
</node>
<node oor:name=".uno:ConnectorArrows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Connector with Arrows</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1130,7 +1121,7 @@
</node>
<node oor:name=".uno:ConnectorCircleStart" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Connector Starts with Circle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1139,7 +1130,7 @@
</node>
<node oor:name=".uno:ConnectorCircleEnd" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Connector Ends with Circle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1148,7 +1139,7 @@
</node>
<node oor:name=".uno:ConnectorCircles" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Connector with Circles</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1157,7 +1148,7 @@
</node>
<node oor:name=".uno:TextToolbox" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Text</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1166,7 +1157,7 @@
</node>
<node oor:name=".uno:ConnectorLine" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Straight Connector</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1175,7 +1166,7 @@
</node>
<node oor:name=".uno:RectangleToolbox" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Rectangle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1184,7 +1175,7 @@
</node>
<node oor:name=".uno:ConnectorLineArrowStart" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Straight Connector starts with Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1193,7 +1184,7 @@
</node>
<node oor:name=".uno:EllipseToolbox" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Ellipse</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1202,7 +1193,7 @@
</node>
<node oor:name=".uno:ConnectorLineArrowEnd" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Straight Connector ends with Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1211,7 +1202,7 @@
</node>
<node oor:name=".uno:LineToolbox" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Curve</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1220,7 +1211,7 @@
</node>
<node oor:name=".uno:ConnectorLineArrows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Straight Connector with Arrows</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1229,7 +1220,7 @@
</node>
<node oor:name=".uno:ConnectorLineCircleStart" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Straight Connector starts with Circle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1238,7 +1229,7 @@
</node>
<node oor:name=".uno:ConnectorLineCircleEnd" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Straight Connector ends with Circle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1247,7 +1238,7 @@
</node>
<node oor:name=".uno:ConnectorLineCircles" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Straight Connector with Circles</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1256,7 +1247,7 @@
</node>
<node oor:name=".uno:ConnectorCurve" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Curved Connector</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1265,7 +1256,7 @@
</node>
<node oor:name=".uno:ConnectorCurveArrowStart" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Curved Connector Starts with Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1274,7 +1265,7 @@
</node>
<node oor:name=".uno:ConnectorCurveArrowEnd" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Curved Connector Ends with Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1283,7 +1274,7 @@
</node>
<node oor:name=".uno:ConnectorCurveArrows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Curved Connector with Arrows</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1292,7 +1283,7 @@
</node>
<node oor:name=".uno:ConnectorCurveCircleStart" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Curved Connector Starts with Circle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1301,7 +1292,7 @@
</node>
<node oor:name=".uno:ConnectorCurveCircleEnd" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Curved Connector Ends with Circle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1310,7 +1301,7 @@
</node>
<node oor:name=".uno:ConnectorCurveCircles" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Curved Connector with Circles</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1319,7 +1310,7 @@
</node>
<node oor:name=".uno:ConnectorLines" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line Connector</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1328,7 +1319,7 @@
</node>
<node oor:name=".uno:ConnectorLinesArrowStart" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line Connector Starts with Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1337,7 +1328,7 @@
</node>
<node oor:name=".uno:ConnectorLinesArrowEnd" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line Connector Ends with Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1346,7 +1337,7 @@
</node>
<node oor:name=".uno:ConnectorLinesArrows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line Connector with Arrows</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1355,7 +1346,7 @@
</node>
<node oor:name=".uno:ConnectorLinesCircleStart" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line Connector Starts with Circle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1364,7 +1355,7 @@
</node>
<node oor:name=".uno:ConnectorLinesCircleEnd" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line Connector Ends with Circle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1373,7 +1364,7 @@
</node>
<node oor:name=".uno:ConnectorLinesCircles" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line Connector with Circles</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1382,7 +1373,7 @@
</node>
<node oor:name=".uno:GraphicDraft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Picture Placeholders</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1391,7 +1382,7 @@
</node>
<node oor:name=".uno:FillDraft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Contour Mode</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1400,7 +1391,7 @@
</node>
<node oor:name=".uno:TextDraft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Text Placeholders</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1409,7 +1400,7 @@
</node>
<node oor:name=".uno:LineDraft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line Contour Only</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1418,7 +1409,7 @@
</node>
<node oor:name=".uno:HandlesDraft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Simple Handles</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1427,7 +1418,7 @@
</node>
<node oor:name=".uno:SolidCreate" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Modify Object with Attributes</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1436,7 +1427,7 @@
</node>
<node oor:name=".uno:HelplinesUse" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Snap to Guides</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1445,7 +1436,7 @@
</node>
<node oor:name=".uno:SnapBorder" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Snap to Page Margins</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1454,7 +1445,7 @@
</node>
<node oor:name=".uno:SnapFrame" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Snap to Object Border</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1463,7 +1454,7 @@
</node>
<node oor:name=".uno:SnapPoints" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Snap to Object Points</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1472,7 +1463,7 @@
</node>
<node oor:name=".uno:QuickEdit" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Allow Quick Editing</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1481,7 +1472,7 @@
</node>
<node oor:name=".uno:PickThrough" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Select Text Area Only</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1490,49 +1481,49 @@
</node>
<node oor:name=".uno:ConvertTo1BitThreshold" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">1 Bit Threshold</value>
</prop>
</node>
<node oor:name=".uno:ConvertTo1BitMatrix" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">1 Bit Dithered</value>
</prop>
</node>
<node oor:name=".uno:ConvertTo4BitGrays" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">4 Bit grayscales</value>
</prop>
</node>
<node oor:name=".uno:ConvertTo4BitColors" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">4 Bit color palette</value>
</prop>
</node>
<node oor:name=".uno:ConvertTo8BitGrays" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">8 Bit Grayscales</value>
</prop>
</node>
<node oor:name=".uno:ConvertTo8BitColors" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">8 Bit color palette</value>
</prop>
</node>
<node oor:name=".uno:ConvertToTrueColor" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">24 Bit True Color</value>
</prop>
</node>
<node oor:name=".uno:BigHandles" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Large Handles</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1541,7 +1532,7 @@
</node>
<node oor:name=".uno:DoubleClickTextEdit" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Double-click to edit Text</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1550,7 +1541,7 @@
</node>
<node oor:name=".uno:ClickChangeRotation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Rotation Mode after Clicking Object</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1559,7 +1550,7 @@
</node>
<node oor:name=".uno:ArrowsToolbox" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Lines and Arrows</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1568,7 +1559,7 @@
</node>
<node oor:name=".uno:LineArrowStart" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line Starts with Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1577,7 +1568,7 @@
</node>
<node oor:name=".uno:LineArrowEnd" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line Ends with Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1586,7 +1577,7 @@
</node>
<node oor:name=".uno:LineArrows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line with Arrows</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1595,7 +1586,7 @@
</node>
<node oor:name=".uno:LineArrowCircle" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line with Arrow/Circle</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1604,7 +1595,7 @@
</node>
<node oor:name=".uno:LineCircleArrow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line with Circle/Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1613,7 +1604,7 @@
</node>
<node oor:name=".uno:LineArrowSquare" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line with Arrow/Square</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1622,7 +1613,7 @@
</node>
<node oor:name=".uno:LineSquareArrow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Line with Square/Arrow</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1631,7 +1622,7 @@
</node>
<node oor:name=".uno:Mirror" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Flip</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1641,7 +1632,7 @@
<node oor:name=".uno:InsertMasterPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">New Master</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1650,7 +1641,7 @@
</node>
<node oor:name=".uno:DeleteMasterPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Delete Master</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1659,7 +1650,7 @@
</node>
<node oor:name=".uno:RenameMasterPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Rename Master</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -1668,19 +1659,19 @@
</node>
<node oor:name=".uno:CloseMasterView" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Close Master View</value>
</prop>
</node>
<node oor:name=".uno:SendMailDocAsMS" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">E-mail as ~Microsoft PowerPoint Presentation...</value>
</prop>
</node>
<node oor:name=".uno:SendMailDocAsOOo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">E-mail as ~OpenDocument Presentation...</value>
</prop>
</node>
@@ -1688,163 +1679,163 @@
<node oor:name="Popups">
<node oor:name=".uno:ModifyMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Modify</value>
</prop>
</node>
<node oor:name=".uno:WorkspaceMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Wor~kspace</value>
</prop>
</node>
<node oor:name=".uno:MirrorMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Flip</value>
</prop>
</node>
<node oor:name=".uno:PreviewDisplayQualityMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Pre~view Mode</value>
</prop>
</node>
<node oor:name=".uno:LayerMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">La~yer</value>
</prop>
</node>
<node oor:name=".uno:GridMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Gr~id</value>
</prop>
</node>
<node oor:name=".uno:ConvertMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Convert</value>
</prop>
</node>
<node oor:name=".uno:ArrangeMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Arrange</value>
</prop>
</node>
<node oor:name=".uno:DisplayQualityMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Color/Grayscale</value>
</prop>
</node>
<node oor:name=".uno:SlideShowMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Slide Show</value>
</prop>
</node>
<node oor:name=".uno:GroupMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Group</value>
</prop>
</node>
<node oor:name=".uno:SendMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Sen~d</value>
</prop>
</node>
<node oor:name=".uno:TemplatesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Styl~es</value>
</prop>
</node>
<node oor:name=".uno:SnapLinesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Guides</value>
</prop>
</node>
<node oor:name=".uno:MasterPageMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Master</value>
</prop>
</node>
<node oor:name=".uno:MasterLayoutsMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Master Lay~outs</value>
</prop>
</node>
<node oor:name=".uno:MasterLayouts" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Master ~Elements...</value>
</prop>
</node>
<node oor:name=".uno:MasterLayoutsNotes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Notes Master Layout...</value>
</prop>
</node>
<node oor:name=".uno:MasterLayoutsHandouts" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Handout Master Layout...</value>
</prop>
</node>
<node oor:name=".uno:HeaderAndFooter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Header and Footer...</value>
</prop>
</node>
<node oor:name=".uno:InsertPageNumber" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">P~age Number...</value>
</prop>
</node>
<node oor:name=".uno:InsertDateAndTime" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Date and ~Time...</value>
</prop>
</node>
<node oor:name=".uno:NormalMultiPaneGUI" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Normal</value>
</prop>
</node>
<node oor:name=".uno:SlideSorterMultiPaneGUI" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Sli~de Sorter</value>
</prop>
</node>
<node oor:name=".uno:LeftPaneImpress" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">S~lide Pane</value>
</prop>
</node>
<node oor:name=".uno:LeftPaneDraw" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">~Page Pane</value>
</prop>
</node>
<node oor:name=".uno:RightPane" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
-
+
<value xml:lang="en-US">Tas~k Pane</value>
</prop>
</node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 33397c0652..9fd1976adc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -328,14 +328,6 @@
<value xml:lang="en-US">Insert Manual Page Break</value>
</prop>
</node>
- <node oor:name=".uno:InsertSymbol" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">S~pecial Character...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:InsertAnnotation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Note</value>
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 596c1c717d..8b187a5416 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -70,29 +70,38 @@ public:
class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
{
- sal_uInt32 nUniqId;
- String aExtraData;
- Timer aTimer;
+ sal_uInt32 nUniqId;
+ String aExtraData;
+ Timer aTimer;
+ const SfxItemSet* pInputSet;
+ SfxItemSet* pOutputSet;
+private:
SAL_DLLPRIVATE SfxModalDialog(SfxModalDialog &); // not defined
SAL_DLLPRIVATE void operator =(SfxModalDialog &); // not defined
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( TimerHdl_Impl, Timer* );
-//#endif
SAL_DLLPRIVATE void SetDialogData_Impl();
SAL_DLLPRIVATE void GetDialogData_Impl();
SAL_DLLPRIVATE void init();
protected:
- SfxModalDialog(Window *pParent, const ResId &);
- SfxModalDialog(Window* pParent, sal_uInt32 nUniqueId,
- WinBits nWinStyle = WB_STDMODAL);
- ~SfxModalDialog();
+ SfxModalDialog(Window *pParent, const ResId& );
+ SfxModalDialog(Window* pParent, sal_uInt32 nUniqueId, WinBits nWinStyle = WB_STDMODAL );
+
+ String& GetExtraData() { return aExtraData; }
+ sal_uInt32 GetUniqId() const { return nUniqId; }
+ SfxItemSet* GetItemSet() { return pOutputSet; }
+ void CreateOutputItemSet( SfxItemPool& rPool );
+ void CreateOutputItemSet( const SfxItemSet& rInput );
+ void SetInputSet( const SfxItemSet* pInSet ) { pInputSet = pInSet; }
+ SfxItemSet* GetOutputSetImpl() { return pOutputSet; }
- String& GetExtraData() { return aExtraData; }
- sal_uInt32 GetUniqId() const { return nUniqId; }
+public:
+ ~SfxModalDialog();
+ const SfxItemSet* GetOutputItemSet() const { return pOutputSet; }
+ const SfxItemSet* GetInputItemSet() const { return pInputSet; }
};
// class SfxModelessDialog --------------------------------------------------
@@ -195,14 +204,12 @@ public:
virtual ~SfxSingleTabDialog();
void SetPage( TabPage* pNewPage );
- void SetTabPage( SfxTabPage* pTabPage,
- GetTabPageRanges pRangesFunc = 0 );
+ void SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0 );
SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; }
const USHORT* GetInputRanges( const SfxItemPool& rPool );
- void SetInputSet( const SfxItemSet* pInSet )
- { pOptions = pInSet; }
- const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
+// void SetInputSet( const SfxItemSet* pInSet ) { pOptions = pInSet; }
+// const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
OKButton* GetOKButton() const { return pOKBtn; }
CancelButton* GetCancelButton() const { return pCancelBtn; }
void SetInfoLink( const Link& rLink );
@@ -216,8 +223,8 @@ private:
HelpButton* pHelpBtn;
SingleTabDlgImpl* pImpl;
- const SfxItemSet* pOptions;
- SfxItemSet* pOutSet;
+// const SfxItemSet* pOptions;
+// SfxItemSet* pOutSet;
DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * );
};
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index 045c8dd2ba..ecfa7fbb1d 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -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
@@ -33,17 +33,9 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
#include "sal/types.h"
-
-//#if 0 // _SOLAR__PRIVATE
-
-#ifndef _FIXED_HXX //autogen
+#include <tools/rtti.hxx>
#include <vcl/fixed.hxx>
-#endif
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-
-//#endif
#define _SVSTDARR_USHORTS
#include <svtools/svstdarr.hxx> // SvUShorts
@@ -57,7 +49,6 @@
#include <svtools/macitem.hxx>
class SfxMacroInfo;
-class SfxMacroTabPage;
class SfxMacroInfoArr_Impl;
class SfxEventConfigItem_Impl;
class SfxEventInfoArr_Impl;
@@ -66,19 +57,56 @@ class SvxMacroTableDtor;
#define SFX_NO_EVENT USHRT_MAX
-//#if 0 // _SOLAR__PRIVATE
-struct SfxEvent_Impl
+struct SFX2_DLLPUBLIC SfxEventName
{
- String aEventName;
- USHORT nEventId;
+ USHORT mnId;
+ String maEventName;
+ String maUIName;
+
+ SfxEventName( USHORT nId,
+ const String& rEventName,
+ const String& rUIName )
+ : mnId( nId )
+ , maEventName( rEventName )
+ , maUIName( rUIName ) {}
+};
- SfxEvent_Impl(const String& rName, USHORT nId) :
- aEventName(rName),
- nEventId(nId)
- {}
+DECLARE_TABLE( _SfxEventNamesList, SfxEventName* )
+
+class SFX2_DLLPUBLIC SfxEventNamesList : public _SfxEventNamesList
+{
+public:
+ SfxEventNamesList( const USHORT nInitSz = 0, const USHORT nReSz = 1 ): _SfxEventNamesList( nInitSz, nReSz ) {}
+ SfxEventNamesList( const SfxEventNamesList &rCpy ) : _SfxEventNamesList() { *this = rCpy; }
+ ~SfxEventNamesList() { DelDtor(); }
+ SfxEventNamesList& operator=( const SfxEventNamesList &rCpy );
+ void DelDtor();
};
-SV_DECL_PTRARR(SfxEventArr_Impl, SfxEvent_Impl*, 5, 5)
+class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem
+{
+ SfxEventNamesList aEventsList;
+
+public:
+ TYPEINFO();
+
+ SfxEventNamesItem ( const USHORT nId ) : SfxPoolItem( nId ) {}
+
+ virtual int operator==( const SfxPoolItem& ) const;
+ virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+ SfxMapUnit eCoreMetric,
+ SfxMapUnit ePresMetric,
+ XubString &rText,
+ const IntlWrapper * = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Create(SvStream &, USHORT) const;
+ virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
+ virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
+
+ const SfxEventNamesList& GetEvents() const { return aEventsList;}
+ void SetEvents( const SfxEventNamesList& rList ) { aEventsList = rList; }
+ void AddEvent( const String&, const String&, USHORT );
+};
// -----------------------------------------------------------------------
@@ -88,17 +116,10 @@ SV_DECL_PTRARR(SfxEventArr_Impl, SfxEvent_Impl*, 5, 5)
#define PROP_MACRO_NAME "MacroName"
#define STAR_BASIC "StarBasic"
-// -----------------------------------------------------------------------
-//#else
-//typedef SvPtrarr SfxEventArr_Impl;
-//#endif
-
class SFX2_DLLPUBLIC SfxEventConfiguration
{
friend class SfxEventConfigItem_Impl;
- SfxMacroInfoArr_Impl* pArr;
- SfxEventArr_Impl* pEventArr;
SvxMacroTableDtor* pAppTable;
SvxMacroTableDtor* pDocTable;
sal_Bool bIgnoreConfigure;
@@ -107,35 +128,16 @@ public:
SfxEventConfiguration();
~SfxEventConfiguration();
- void RegisterEvent(USHORT nId, const String& rName);
- String GetEventName(USHORT nId) const;
- USHORT GetEventId(const String& rName) const;
- USHORT GetEventCount() const
- { return pEventArr->Count()-1; }
- // const SvxMacro* GetMacroForEventId( USHORT nEventId, SfxObjectShell *pObjSh );
void ConfigureEvent(USHORT nId, const SvxMacro&,
SfxObjectShell* pObjSh);
void ConfigureEvent(USHORT nId, const String& rMacro,
SfxObjectShell* pObjSh);
- //const SfxMacroInfo* GetMacroInfo(USHORT nEventId, SfxObjectShell* pObjSh) const;
-
- // void AddEvents( SfxMacroTabPage* ) const;
- //SvxMacroTableDtor* GetAppEventTable();
SvxMacroTableDtor* GetDocEventTable(SfxObjectShell*);
- //void SetAppEventTable( const SvxMacroTableDtor& );
- //void SetDocEventTable( SfxObjectShell*, const SvxMacroTableDtor& );
static void RegisterEvent( USHORT nId, const String& rName,
const String& rMacroName );
- //static BOOL Import( SvStream& rInStream, SvStream* pOutStream, SfxObjectShell* pDoc=NULL );
- //static BOOL Export( SvStream* pInStream, SvStream& rOutStream, SfxObjectShell* pDoc=NULL );
-
-//#if 0 // _SOLAR__PRIVATE
- SAL_DLLPRIVATE const SfxEvent_Impl* GetEvent_Impl(USHORT nPos) const
- { return (*pEventArr)[nPos+1]; }
-
SAL_DLLPRIVATE BOOL Warn_Impl( SfxObjectShell *pDoc, const SvxMacro* pMacro );
SAL_DLLPRIVATE void PropagateEvent_Impl( SfxObjectShell *pDoc,
USHORT nId,
@@ -146,41 +148,6 @@ public:
SAL_DLLPRIVATE static ULONG GetPos_Impl( USHORT nID, sal_Bool &rFound );
SAL_DLLPRIVATE static ULONG GetPos_Impl( const String& rName, sal_Bool &rFound );
-//#endif
-};
-/*
-//#if 0 // _SOLAR__PRIVATE
-class SfxEventConfigItem_Impl : public SfxConfigItem
-{
-friend class SfxEventConfiguration;
-
- SvxMacroTableDtor aMacroTable;
- SfxEventConfiguration *pEvConfig;
- SfxObjectShell *pObjShell;
- BOOL bWarning;
- BOOL bAlwaysWarning;
- BOOL bInitialized;
-
- void ConstructMacroTable();
- int Load(SvStream&);
- BOOL Store(SvStream&);
- BOOL LoadXML(SvStream&);
- BOOL StoreXML(SvStream&);
-
-public:
- SfxEventConfigItem_Impl( USHORT,
- SfxEventConfiguration*,
- SfxObjectShell* pObjSh = NULL );
- ~SfxEventConfigItem_Impl();
-
- void Init( SfxConfigManager* );
- virtual int Load(SotStorage&);
- virtual BOOL Store(SotStorage&);
- virtual String GetStreamName() const;
- virtual void UseDefault();
- void ConfigureEvent( USHORT nPos, SvxMacro* );
};
-//#endif
-*/
#endif
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 436189dbf6..b77545ac04 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -246,9 +246,7 @@
#define STR_READONLY (RID_SFX_START+105)
#define STR_SFX_FILTERNAME_ALL (RID_SFX_START+106)
-#define STR_FILTERNAME_CFG (RID_SFX_START+107)
#define STR_EDIT (RID_SFX_START+108)
-#define STR_HUMAN_APPNAME (RID_SFX_START+109)
#define STR_QUERY_SAVE_DOCUMENT (RID_SFX_START+110)
#define STR_BYTES (RID_SFX_START+111)
#define STR_KB (RID_SFX_START+112)
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index 05e1fa5830..5b76e6a9ec 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -68,22 +68,20 @@ namespace com { namespace sun { namespace star { namespace frame {
class XModel;
} } } }
-class SfxAbstractTabDialog : public VclAbstractDialog
+class SfxAbstractDialog : public VclAbstractDialog
{
public:
- virtual void SetCurPageId( USHORT nId ) = 0;
virtual const SfxItemSet* GetOutputItemSet() const = 0;
- virtual const USHORT* GetInputRanges( const SfxItemPool& ) = 0;
- virtual void SetInputSet( const SfxItemSet* pInSet ) = 0;
virtual void SetText( const XubString& rStr ) = 0;
virtual String GetText() const = 0;
};
-class AbstractSfxSingleTabDialog : public VclAbstractDialog //add for SvxMeasureDialog & SvxConnectionDialog
+class SfxAbstractTabDialog : public SfxAbstractDialog
{
public:
- virtual const SfxItemSet* GetOutputItemSet() const = 0;
-
+ virtual void SetCurPageId( USHORT nId ) = 0;
+ virtual const USHORT* GetInputRanges( const SfxItemPool& ) = 0;
+ virtual void SetInputSet( const SfxItemSet* pInSet ) = 0;
};
class SfxAbstractInsertObjectDialog : public VclAbstractDialog
@@ -156,9 +154,6 @@ public:
virtual VclAbstractDialog* CreateScriptErrorDialog(
Window* pParent, com::sun::star::uno::Any aException ) = 0;
- static SfxTabPage *CreateSfxAcceleratorConfigPage(
- Window *pParent, const SfxItemSet& rSet );
-
virtual VclAbstractDialog* CreateOptionsDialog(
Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext ) = 0;
};
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 729e277f51..3e95514dfb 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -570,8 +570,9 @@
#define SID_OPTIONS_PAGEURL (SID_SFX_START + 1713)
#define SID_MORE_DICTIONARIES (SID_SFX_START + 1714)
#define SID_ACTIVATE_STYLE_APPLY (SID_SFX_START + 1715)
-#define SID_DEFAULTFILENAME (SID_SFX_START + 1716)
-#define SID_SFX_free_START (SID_SFX_START + 1717)
+#define SID_FONT_NAME (SID_SFX_START + 1716)
+#define SID_DEFAULTFILENAME (SID_SFX_START + 1717)
+#define SID_SFX_free_START (SID_SFX_START + 1718)
#define SID_SFX_free_END (SID_SFX_START + 3999)
#define SID_OPEN_NEW_VIEW (SID_SFX_START + 520)
diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst
index 53ed0df0aa..03ae35e5c3 100644
--- a/sfx2/prj/d.lst
+++ b/sfx2/prj/d.lst
@@ -24,7 +24,6 @@ mkdir: %_DEST%\inc%_EXT%\sfx2
..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid
..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml
..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv
-..\%__SRC%\inc\macropg.hxx %_DEST%\inc%_EXT%\macropg.hxx
..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h
..\inc\sfx2\app.hxx %_DEST%\inc%_EXT%\sfx2\app.hxx
@@ -58,7 +57,6 @@ mkdir: %_DEST%\inc%_EXT%\sfx2
..\inc\sfx2\imgdef.hxx %_DEST%\inc%_EXT%\sfx2\imgdef.hxx
..\inc\sfx2\ipclient.hxx %_DEST%\inc%_EXT%\sfx2\ipclient.hxx
..\inc\sfx2\macrconf.hxx %_DEST%\inc%_EXT%\sfx2\macrconf.hxx
-..\inc\sfx2\macropg.hxx %_DEST%\inc%_EXT%\sfx2\macropg.hxx
..\inc\sfx2\topfrm.hxx %_DEST%\inc%_EXT%\sfx2\topfrm.hxx
..\inc\sfx2\mgetempl.hxx %_DEST%\inc%_EXT%\sfx2\mgetempl.hxx
..\inc\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index f7469710e1..13173dba77 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -220,7 +220,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
bDetermineFunction = true;
String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
- sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "svx" ) ) );
+ sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "cui" ) ) );
rtl::OUString aLibName( sLibName );
oslModule handleMod = osl_loadModuleRelative(
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index a7d469e649..1fabfa52fa 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -81,11 +81,6 @@ String STR_SFX_FILTERNAME_ALL
Text [ en-US ] = "All files (*.*)" ;
};
-String STR_HUMAN_APPNAME
-{
- TEXT = "%PRODUCTNAME" ;
-};
-
String STR_BYTES
{
Text [ en-US ] = "Bytes" ;
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 03d5c6f483..9606795df1 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.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
@@ -60,11 +60,8 @@
#include <sfx2/dispatch.hxx>
#include "config.hrc"
#include "sfxresid.hxx"
-#include <sfx2/macropg.hxx>
#include "eventsupplier.hxx"
-//#include <sfx2/sfxsids.hrc>
-//#include "sfxlocal.hrc"
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
@@ -90,43 +87,104 @@ static const USHORT nOldVersion = 4;
static const USHORT nVersion = 5;
TYPEINIT1(SfxEventHint, SfxHint);
+TYPEINIT1(SfxEventNamesItem, SfxPoolItem);
using namespace com::sun::star;
-// class SfxMacroQueryDlg_Impl -------------------------------------------
-/*
-class SfxMacroQueryDlg_Impl : public QueryBox
+SfxEventNamesList& SfxEventNamesList::operator=( const SfxEventNamesList& rTbl )
{
-public:
- SfxMacroQueryDlg_Impl( const String& rMacro, BOOL bDefault );
-};
+ DelDtor();
+ SfxEventName* pTmp = ((SfxEventNamesList&)rTbl).First();
+ while( pTmp )
+ {
+ SfxEventName *pNew = new SfxEventName( *pTmp );
+ Insert( rTbl.GetCurKey(), pNew );
+ pTmp = ((SfxEventNamesList&)rTbl).Next();
+ }
+ return *this;
+}
-// class SfxMacroQueryDlg_Impl -------------------------------------------
+void SfxEventNamesList::DelDtor()
+{
+ SfxEventName* pTmp = First();
+ while( pTmp )
+ {
+ delete pTmp;
+ pTmp = Next();
+ }
+ Clear();
+}
-SfxMacroQueryDlg_Impl::SfxMacroQueryDlg_Impl( const String& rMacName, BOOL bDefault ) :
- QueryBox( NULL, SfxResId( QUERYBOX_MACROQUERY ) )
+int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const
{
- SetButtonText( GetButtonId(0), String( SfxResId(BTN_OK) ) );
- SetButtonText( GetButtonId(1), String( SfxResId(BTN_CANCEL) ) );
+ DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
+
+ const SfxEventNamesList& rOwn = aEventsList;
+ const SfxEventNamesList& rOther = ( (SfxEventNamesItem&) rAttr ).aEventsList;
- String aText = GetMessText();
- aText.SearchAndReplace( String::CreateFromAscii("$(MACRO)"), rMacName );
+ // Anzahl unterschiedlich => auf jeden Fall ungleich
+ if ( rOwn.Count() != rOther.Count() )
+ return FALSE;
- if ( bDefault )
+ // einzeln verleichen; wegen Performance ist die Reihenfolge wichtig
+ for ( USHORT nNo = 0; nNo < rOwn.Count(); ++nNo )
{
- SetFocusButton(GetButtonId(0));
- aText.SearchAndReplace( String::CreateFromAscii("$(TEXT)"), String( SfxResId(FT_OK) ) );
+ const SfxEventName *pOwn = rOwn.GetObject(nNo);
+ const SfxEventName *pOther = rOther.GetObject(nNo);
+ if ( rOwn.GetKey(pOwn) != rOther.GetKey(pOther) ||
+ pOwn->maEventName != pOther->maEventName ||
+ pOwn->maUIName != pOther->maUIName )
+ return FALSE;
}
- else
+
+ return TRUE;
+
+}
+
+SfxItemPresentation SfxEventNamesItem::GetPresentation( SfxItemPresentation,
+ SfxMapUnit,
+ SfxMapUnit,
+ XubString &rText,
+ const IntlWrapper* ) const
+{
+ rText.Erase();
+ return SFX_ITEM_PRESENTATION_NONE;
+}
+
+SfxPoolItem* SfxEventNamesItem::Clone( SfxItemPool *) const
+{
+ return new SfxEventNamesItem(*this);
+}
+
+SfxPoolItem* SfxEventNamesItem::Create(SvStream &, USHORT) const
+{
+ DBG_ERROR("not streamable!");
+ return new SfxEventNamesItem(Which());
+}
+
+SvStream& SfxEventNamesItem::Store(SvStream &rStream, USHORT ) const
+{
+ DBG_ERROR("not streamable!");
+ return rStream;
+}
+
+USHORT SfxEventNamesItem::GetVersion( USHORT ) const
+{
+ DBG_ERROR("not streamable!");
+ return 0;
+}
+
+void SfxEventNamesItem::AddEvent( const String& rName, const String& rUIName, USHORT nID )
+{
+ SfxEventName* pName;
+ if ( 0 != (pName=aEventsList.Get(nID)) )
{
- SetFocusButton(GetButtonId(1));
- aText.SearchAndReplace( String::CreateFromAscii("$(TEXT)"), String( SfxResId(FT_CANCEL) ) );
+ DBG_WARNING("Event already added!");
}
-
- SetMessText( aText );
- FreeResource();
+ else
+ aEventsList.Insert( nID, new SfxEventName( nID, rName, rUIName.Len() ? rUIName : rName ) );
}
-*/
+
// class SfxAsyncEvent_Impl ----------------------------------------------
class SfxAsyncEvent_Impl : public SfxListener
@@ -196,26 +254,8 @@ IMPL_LINK(SfxAsyncEvent_Impl, TimerHdl, Timer*, pAsyncTimer)
return 0L;
}
-// class SfxEventList_Impl -----------------------------------------------
-
-struct EventNames_Impl
-{
- USHORT mnId;
- String maEventName;
- String maUIName;
-
- EventNames_Impl( USHORT nId,
- const String& rEventName,
- const String& rUIName )
- : mnId( nId )
- , maEventName( rEventName )
- , maUIName( rUIName ) {}
-};
-
-DECLARE_LIST( SfxEventList_Impl, EventNames_Impl* )
-
-SfxEventList_Impl *gp_Id_SortList = NULL;
-SfxEventList_Impl *gp_Name_SortList = NULL;
+SfxEventNamesList *gp_Id_SortList = NULL;
+SfxEventNamesList *gp_Name_SortList = NULL;
//==========================================================================
@@ -224,96 +264,23 @@ SfxEventConfiguration::SfxEventConfiguration()
, pDocTable( NULL )
{
bIgnoreConfigure = sal_False;
-
- // Array zum Ermitteln der Bindungen
- pEventArr = new SfxEventArr_Impl;
-
- // Einen default entry eingf"ugen
- const SfxEvent_Impl *pEvent = new SfxEvent_Impl(String(), 0);
- pEventArr->Insert(pEvent, 0);
}
-/*
-SfxEventConfigItem_Impl* SfxEventConfiguration::GetAppEventConfig_Impl()
-{
- if ( !pAppEventConfig )
- {
- pAppEventConfig = new SfxEventConfigItem_Impl( SFX_ITEMTYPE_APPEVENTCONFIG, this );
- pAppEventConfig->Initialize();
- }
- return pAppEventConfig;
-}
-*/
//==========================================================================
SfxEventConfiguration::~SfxEventConfiguration()
{
- for (USHORT n=0; n<pEventArr->Count(); n++)
- delete (*pEventArr)[n];
- delete pEventArr;
delete pDocTable;
if ( gp_Id_SortList )
{
- EventNames_Impl* pData = gp_Id_SortList->First();
- while ( pData )
- {
- delete pData;
- pData = gp_Id_SortList->Next();
- }
delete gp_Id_SortList;
delete gp_Name_SortList;
-
gp_Id_SortList = NULL;
gp_Name_SortList = NULL;
}
}
-//==========================================================================
-
-void SfxEventConfiguration::RegisterEvent(USHORT nId, const String& rName)
-{
- USHORT nCount = pEventArr->Count();
- const SfxEvent_Impl *pEvent = new SfxEvent_Impl(rName, nId);
- pEventArr->Insert(pEvent, nCount);
-}
-
-//==========================================================================
-
-String SfxEventConfiguration::GetEventName(USHORT nId) const
-{
- DBG_ASSERT(pEventArr,"Keine Events angemeldet!");
- USHORT nCount = pEventArr->Count();
- for (USHORT n=1; n<nCount; n++)
- {
- if ((*pEventArr)[n]->nEventId == nId)
- {
- return (*pEventArr)[n]->aEventName;
- }
- }
-
- DBG_ERROR("Event nicht gefunden!");
- return (*pEventArr)[0]->aEventName;
-}
-
-//==========================================================================
-
-USHORT SfxEventConfiguration::GetEventId(const String& rName) const
-{
- DBG_ASSERT(pEventArr,"Keine Events angemeldet!");
- USHORT nCount = pEventArr->Count();
- for (USHORT n=1; n<nCount; n++)
- {
- if ((*pEventArr)[n]->aEventName == rName)
- {
- return (*pEventArr)[n]->nEventId;
- }
- }
-
- DBG_ERROR("Event nicht gefunden!");
- return SFX_NO_EVENT;
-}
-
void SfxEventConfiguration::ConfigureEvent( USHORT nId, const SvxMacro& rMacro, SfxObjectShell *pDoc )
{
if ( bIgnoreConfigure )
@@ -333,315 +300,6 @@ void SfxEventConfiguration::ConfigureEvent( USHORT nId, const SvxMacro& rMacro,
}
//==========================================================================
-/*
-const SvxMacro* SfxEventConfiguration::GetMacroForEventId
-(
- USHORT nId,
- SfxObjectShell* pDoc
-)
-{
- pDocEventConfig = pDoc ? pDoc->GetEventConfig_Impl() : NULL;
- const SvxMacro* pMacro=NULL;
- if ( pDocEventConfig )
- pMacro = pDocEventConfig->aMacroTable.Seek( nId );
- if ( !pMacro )
- pMacro = GetAppEventConfig_Impl()->aMacroTable.Seek( nId );
- return pMacro;
-} */
-
-/*
-const SfxMacroInfo* SfxEventConfiguration::GetMacroInfo
-(
- USHORT nId,
- SfxObjectShell* pDoc
-) const
-{
- DBG_ASSERT(pEventArr,"Keine Events angemeldet!");
-
- SfxEventConfigItem_Impl *pDocEventConfig = pDoc ? pDoc->GetEventConfig_Impl() : NULL;
- const SvxMacro* pMacro=NULL;
- if ( pDocEventConfig )
- pMacro = pDocEventConfig->aMacroTable.Seek( nId );
- if ( !pMacro )
- pMacro = const_cast< SfxEventConfiguration* >(this)->GetAppEventConfig_Impl()->aMacroTable.Seek( nId );
-
- return SFX_APP()->GetMacroConfig()->GetMacroInfo_Impl( pMacro );
-} */
-
-//==========================================================================
-/*
-SfxEventConfigItem_Impl::SfxEventConfigItem_Impl( USHORT nConfigId,
- SfxEventConfiguration *pCfg,
- SfxObjectShell *pObjSh)
- : SfxConfigItem( nConfigId, pObjSh ? NULL : SFX_APP()->GetConfigManager_Impl() )
- , pEvConfig( pCfg )
- , pObjShell( pObjSh )
- , aMacroTable( 2, 2 )
- , bInitialized( FALSE )
-
-{
- bInitialized = TRUE;
-}
-
-//==========================================================================
-
-int SfxEventConfigItem_Impl::Load(SvStream& rStream)
-{
- USHORT nFileVersion;
- rStream >> nFileVersion;
- if ( nFileVersion < nCompatVersion || nFileVersion > nVersion )
- return SfxConfigItem::WARNING_VERSION;
-
- SvxMacroTableDtor aLocalMacroTable;
- if ( nFileVersion <= nOldVersion )
- {
- if ( nFileVersion > nCompatVersion )
- {
- USHORT nWarn;
- rStream >> nWarn;
- bWarning = ( nWarn & 0x01 ) != 0;
- bAlwaysWarning = ( nWarn & 0x02 ) != 0;
- }
- else
- bWarning = bAlwaysWarning = FALSE;
-
- USHORT nCount, nEventCount = pEvConfig->GetEventCount();
- rStream >> nCount;
-
- USHORT i;
- for (i=0; i<nCount; i++)
- {
- USHORT nId;
- SfxMacroInfo aInfo( pObjShell );
- rStream >> nId >> aInfo;
-
- for (USHORT n=0; n<nEventCount; n++)
- {
- USHORT nEventId = (*pEvConfig->pEventArr)[n+1]->nEventId;
- if ( nEventId == nId )
- {
- SvxMacro *pMacro = new SvxMacro( aInfo.GetQualifiedName(), aInfo.GetBasicName(), STARBASIC );
- aLocalMacroTable.Insert( nEventId, pMacro );
- break;
- }
- }
- }
- }
- else
- {
- USHORT nWarn;
- rStream >> nWarn;
- bWarning = ( nWarn & 0x01 ) != 0;
- bAlwaysWarning = ( nWarn & 0x02 ) != 0;
- aLocalMacroTable.Read( rStream );
- }
-
- if ( pObjShell && pEvConfig )
- pEvConfig->PropagateEvents_Impl( pObjShell, aLocalMacroTable );
-
- return SfxConfigItem::ERR_OK;
-}
-
-BOOL SfxEventConfigItem_Impl::LoadXML( SvStream& rInStream )
-{
- ::framework::EventsConfig aCfg;
-
- // #110897#
- // if ( ::framework::EventsConfiguration::LoadEventsConfig( rInStream, aCfg ) )
- if ( ::framework::EventsConfiguration::LoadEventsConfig( ::comphelper::getProcessServiceFactory(), rInStream, aCfg ) )
- {
- long nCount = aCfg.aEventNames.getLength();
- for ( long i=0; i<nCount; i++ )
- {
- SvxMacro* pMacro = SfxEvents_Impl::ConvertToMacro( aCfg.aEventsProperties[i], NULL, TRUE );
- USHORT nID = (USHORT) SfxEventConfiguration::GetEventId_Impl( aCfg.aEventNames[i] );
- if ( nID && pMacro )
- pEvConfig->PropagateEvent_Impl( pObjShell, nID, pMacro );
- else
- DBG_ERROR("Suspicious event binding!");
- }
-
- return TRUE;
- }
-
- return FALSE;
-}
-
-//==========================================================================
-
-BOOL SfxEventConfigItem_Impl::Store(SvStream& rStream)
-{
- USHORT nWarn=0;
- if ( bWarning )
- nWarn |= 0x01;
- if ( bAlwaysWarning )
- nWarn |= 0x02;
- rStream << nVersion << nWarn;
- aMacroTable.Write( rStream );
- return TRUE;
-}
-
-BOOL SfxEventConfigItem_Impl::StoreXML( SvStream& rOutStream )
-{
- // get the event names
- ResStringArray aEventNames( SfxResId( EVENT_NAMES_ARY ) );
- long nNamesCount = aEventNames.Count();
-
- // create two sequences for names and properties
- SEQUENCE < OUSTRING > aSequence( nNamesCount );
- SEQUENCE < ANY > aData( nNamesCount );
-
- // fill in the names
- OUSTRING* pNames = aSequence.getArray();
- long i;
- for ( i=0; i<nNamesCount; i++ )
- pNames[i] = aEventNames.GetString( (USHORT) i);
-
- REFERENCE< XEVENTSSUPPLIER > xSupplier;
- if ( pObjShell )
- {
- xSupplier = REFERENCE< XEVENTSSUPPLIER >( pObjShell->GetModel(), UNO_QUERY );
- }
- else
- {
- xSupplier = REFERENCE< XEVENTSSUPPLIER >
- ( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster" )), UNO_QUERY );
- }
-
- // fill in the bindings
- REFERENCE< XNAMEREPLACE > xEvents = xSupplier->getEvents();
- SvxMacroTableDtor& rTable = aMacroTable;
- long nCount = (long) rTable.Count();
- for ( i=0; i<nCount; i++ )
- {
- USHORT nID = (USHORT) rTable.GetObjectKey( i );
- OUSTRING aEventName = pEvConfig->GetEventName_Impl( nID );
- if ( aEventName.getLength() )
- {
- // search name
- long n;
- for ( n=0; n<(long)nNamesCount; n++ )
- {
- if ( aSequence[n] == aEventName )
- {
- aData[n] = xEvents->getByName( aEventName );
- break;
- }
- }
-
- DBG_ASSERT( n<nNamesCount, "Unknown event!" );
- }
- }
-
- ::framework::EventsConfig aCfg;
- aCfg.aEventNames = aSequence;
- aCfg.aEventsProperties = aData;
-
- // #110897#
- // return ::framework::EventsConfiguration::StoreEventsConfig( rOutStream, aCfg );
- return ::framework::EventsConfiguration::StoreEventsConfig( ::comphelper::getProcessServiceFactory(), rOutStream, aCfg );
-}
-
-//==========================================================================
-
-String SfxEventConfigItem_Impl::GetStreamName() const
-{
- return SfxConfigItem::GetStreamName( GetType() );
-}
-
-//==========================================================================
-
-void SfxEventConfigItem_Impl::UseDefault()
-{
- bWarning = TRUE;
- bAlwaysWarning = FALSE;
-
- aMacroTable.DelDtor();
- SetDefault( TRUE );
- pEvConfig->PropagateEvents_Impl( pObjShell, aMacroTable );
-}
-
-int SfxEventConfigItem_Impl::Load( SotStorage& rStorage )
-{
- SotStorageStreamRef xStream = rStorage.OpenSotStream( SfxEventConfigItem_Impl::GetStreamName(), STREAM_STD_READ );
- if ( xStream->GetError() )
- return SfxConfigItem::ERR_READ;
- else
- {
- if ( bInitialized )
- {
- aMacroTable.DelDtor();
- pEvConfig->PropagateEvents_Impl( pObjShell, aMacroTable );
- }
-
- if ( LoadXML( *xStream ) )
- return SfxConfigItem::ERR_OK;
- else
- return SfxConfigItem::ERR_READ;
- }
-}
-
-BOOL SfxEventConfigItem_Impl::Store( SotStorage& rStorage )
-{
- if ( pObjShell )
- // DocEventConfig is stored with the document
- return TRUE;
-
- SotStorageStreamRef xStream = rStorage.OpenSotStream( SfxEventConfigItem_Impl::GetStreamName(), STREAM_STD_READWRITE|STREAM_TRUNC );
- if ( xStream->GetError() )
- return FALSE;
- else
- return StoreXML( *xStream );
-}
-
-
-//==========================================================================
-
-SfxEventConfigItem_Impl::~SfxEventConfigItem_Impl()
-{
-}
-
-//==========================================================================
-
-void SfxEventConfigItem_Impl::ConfigureEvent( USHORT nId, SvxMacro *pMacro )
-{
- if ( aMacroTable.Seek( nId ) )
- {
- if ( pMacro )
- aMacroTable.Replace( nId, pMacro );
- else
- aMacroTable.Remove( nId );
- }
- else if ( pMacro )
- aMacroTable.Insert( nId, pMacro );
- SetDefault(FALSE);
-}
-
-
-void SfxEventConfiguration::AddEvents( SfxMacroTabPage* pPage ) const
-{
- DBG_ASSERT(pEventArr,"Keine Events angemeldet!");
- USHORT nCount = pEventArr->Count();
- for (USHORT n=1; n<nCount; n++)
- if ( (*pEventArr)[n]->aEventName.Len() )
- pPage->AddEvent( (*pEventArr)[n]->aEventName, (*pEventArr)[n]->nEventId );
-}
-
-
-SvxMacroTableDtor* SfxEventConfiguration::GetAppEventTable()
-{
- return &GetAppEventConfig_Impl()->aMacroTable;
-}
- *
-void SfxEventConfiguration::SetAppEventTable( const SvxMacroTableDtor& rTable )
-{
- //GetAppEventConfig_Impl()->aMacroTable = rTable;
- //pAppEventConfig->SetDefault(FALSE);
- PropagateEvents_Impl( NULL, rTable );
-}
-
-*/
SvxMacroTableDtor* SfxEventConfiguration::GetDocEventTable( SfxObjectShell*pDoc )
{
@@ -668,98 +326,6 @@ SvxMacroTableDtor* SfxEventConfiguration::GetDocEventTable( SfxObjectShell*pDoc
return pDocTable;
}
-/*
-void SfxEventConfiguration::SetDocEventTable( SfxObjectShell *pDoc,
- const SvxMacroTableDtor& rTable )
-{
- if ( pDoc )
- {
- pDoc->SetModified(TRUE);
- PropagateEvents_Impl( pDoc, rTable );
- }
- else
- DBG_ERROR( "No Document!" );
-}
-
-//--------------------------------------------------------------------------
-void SfxEventConfiguration::PropagateEvents_Impl( SfxObjectShell *pDoc,
- const SvxMacroTableDtor& rTable )
-{
- REFERENCE< XEVENTSSUPPLIER > xSupplier;
- if ( pDoc )
- {
- xSupplier = REFERENCE< XEVENTSSUPPLIER >( pDoc->GetModel(), UNO_QUERY );
- }
- else
- {
- xSupplier = REFERENCE< XEVENTSSUPPLIER >
- ( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster" )), UNO_QUERY );
- }
-
- if ( xSupplier.is() )
- {
- SvxMacro *pMacro;
- ULONG nCount;
- ULONG nID, i;
-
- REFERENCE< XNAMEREPLACE > xEvents = xSupplier->getEvents();
-
- bIgnoreConfigure = sal_True;
-
- // Erase old values first, because we don't know anything about the
- // changes here
-
- SEQUENCE < PROPERTYVALUE > aProperties;
- SEQUENCE < OUSTRING > aEventNames = xEvents->getElementNames();
- OUSTRING* pNames = aEventNames.getArray();
- ANY aEmpty;
-
- aEmpty <<= aProperties;
- nCount = aEventNames.getLength();
-
- for ( i=0; i<nCount; i++ )
- {
- try
- {
- xEvents->replaceByName( pNames[i], aEmpty );
- }
- catch( ::com::sun::star::lang::IllegalArgumentException )
- { DBG_ERRORFILE( "PropagateEvents_Impl: caught IllegalArgumentException" ) }
- catch( ::com::sun::star::container::NoSuchElementException )
- { DBG_ERRORFILE( "PropagateEvents_Impl: caught NoSuchElementException" ) }
- }
-
- // now set the new values
-
- nCount = rTable.Count();
-
- for ( i=0; i<nCount; i++ )
- {
- pMacro = rTable.GetObject( i );
- nID = rTable.GetObjectKey( i );
- OUSTRING aEventName = GetEventName_Impl( nID );
-
- if ( aEventName.getLength() )
- {
- ANY aEventData = CreateEventData_Impl( pMacro );
- try
- {
- xEvents->replaceByName( aEventName, aEventData );
- }
- catch( ::com::sun::star::lang::IllegalArgumentException )
- { DBG_ERRORFILE( "PropagateEvents_Impl: caught IllegalArgumentException" ) }
- catch( ::com::sun::star::container::NoSuchElementException )
- { DBG_ERRORFILE( "PropagateEvents_Impl: caught NoSuchElementException" ) }
- }
- else
- DBG_WARNING( "PropagateEvents_Impl: Got unkown event" );
- }
-
- bIgnoreConfigure = sal_False;
- }
-}
-*/
//--------------------------------------------------------------------------
void SfxEventConfiguration::PropagateEvent_Impl( SfxObjectShell *pDoc,
USHORT nId,
@@ -904,7 +470,7 @@ ULONG SfxEventConfiguration::GetPos_Impl( USHORT nId, sal_Bool &rFound )
long nEnd = gp_Id_SortList->Count() - 1;
long nMid = 0;
- EventNames_Impl* pMid;
+ SfxEventName* pMid;
rFound = sal_False;
@@ -950,7 +516,7 @@ ULONG SfxEventConfiguration::GetPos_Impl( const String& rName, sal_Bool &rFound
long nEnd = gp_Name_SortList->Count() - 1;
long nMid = 0;
- EventNames_Impl* pMid;
+ SfxEventName* pMid;
rFound = sal_False;
@@ -992,7 +558,7 @@ OUSTRING SfxEventConfiguration::GetEventName_Impl( ULONG nID )
if ( bFound )
{
- EventNames_Impl *pData = gp_Id_SortList->GetObject( nPos );
+ SfxEventName *pData = gp_Id_SortList->GetObject( nPos );
aRet = pData->maEventName;
}
}
@@ -1012,7 +578,7 @@ ULONG SfxEventConfiguration::GetEventId_Impl( const OUSTRING& rEventName )
if ( bFound )
{
- EventNames_Impl *pData = gp_Name_SortList->GetObject( nPos );
+ SfxEventName *pData = gp_Name_SortList->GetObject( nPos );
nRet = pData->mnId;
}
}
@@ -1027,8 +593,8 @@ void SfxEventConfiguration::RegisterEvent( USHORT nId,
{
if ( ! gp_Id_SortList )
{
- gp_Id_SortList = new SfxEventList_Impl;
- gp_Name_SortList = new SfxEventList_Impl;
+ gp_Id_SortList = new SfxEventNamesList;
+ gp_Name_SortList = new SfxEventNamesList;
}
sal_Bool bFound = sal_False;
@@ -1040,65 +606,12 @@ void SfxEventConfiguration::RegisterEvent( USHORT nId,
return;
}
- EventNames_Impl *pData;
-
- pData = new EventNames_Impl( nId, rMacroName, rUIName );
- gp_Id_SortList->Insert( pData, nPos );
-
+ gp_Id_SortList->Insert( nPos, new SfxEventName( nId, rMacroName, rUIName ) );
nPos = GetPos_Impl( rMacroName, bFound );
- DBG_ASSERT( !bFound, "RegisterEvent: Name in List, but ID not?" );
-
- gp_Name_SortList->Insert( pData, nPos );
-
- SFX_APP()->GetEventConfig()->RegisterEvent( nId, rUIName );
-}
-
-/*
-BOOL SfxEventConfiguration::Import( SvStream& rInStream, SvStream* pOutStream, SfxObjectShell* pDoc )
-{
- if ( pDoc )
- {
- // load events, they are automatically propagated to the document
- DBG_ASSERT( !pOutStream, "DocEventConfig must not be converted!" );
- SfxEventConfigItem_Impl* pCfg = pDoc->GetEventConfig_Impl( TRUE );
- if ( pCfg )
- return ( pCfg->Load( rInStream ) == SfxConfigItem::ERR_OK );
- DBG_ERROR("Couldn't create EventConfiguration!");
- return FALSE;
- }
- else if ( pOutStream )
- {
- SfxEventConfiguration aConfig;
- if ( aConfig.GetAppEventConfig_Impl()->Load( rInStream ) == SfxConfigItem::ERR_OK )
- return aConfig.pAppEventConfig->StoreXML( *pOutStream );
- return FALSE;
- }
- DBG_ERROR( "No OutStream!" );
- return FALSE;
-}
+ DBG_ASSERT( !bFound, "RegisterEvent: Name in List, but ID not?" );
-BOOL SfxEventConfiguration::Export( SvStream* pInStream, SvStream& rOutStream, SfxObjectShell* pDoc )
-{
- if ( pDoc )
- {
- DBG_ASSERT( !pInStream, "DocEventConfig can't be converted!" );
- SfxEventConfigItem_Impl* pCfg = pDoc->GetEventConfig_Impl();
- if ( pCfg )
- return pCfg->Store( rOutStream );
- DBG_ERROR("Couldn't create EventConfiguration!");
- return FALSE;
- }
- else if ( pInStream )
- {
- SfxEventConfiguration aConfig;
- if ( aConfig.GetAppEventConfig_Impl()->LoadXML( *pInStream ) )
- return aConfig.pAppEventConfig->Store( rOutStream );
- return FALSE;
- }
+ gp_Name_SortList->Insert( nPos, new SfxEventName( nId, rMacroName, rUIName ) );
- DBG_ERROR( "No InStream!" );
- return FALSE;
+ SFX_APP()->GetEventConfig();
}
-*/
-
diff --git a/sfx2/source/config/makefile.mk b/sfx2/source/config/makefile.mk
index 256489d7a0..cf2e07e0b5 100644
--- a/sfx2/source/config/makefile.mk
+++ b/sfx2/source/config/makefile.mk
@@ -42,10 +42,6 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- config.src
-
SLOFILES = \
$(SLO)$/evntconf.obj
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index affbd0d820..d93a4884c1 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -170,7 +170,7 @@ void SfxModalDialog::init()
// -----------------------------------------------------------------------
-SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId)
+SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId )
/* [Beschreibung]
@@ -179,8 +179,10 @@ SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId)
Die dort gespeicherte Position wird gesetzt.
*/
-: ModalDialog(pParent, rResId),
- nUniqId(rResId.GetId())
+: ModalDialog(pParent, rResId),
+ nUniqId(rResId.GetId()),
+ pInputSet(0),
+ pOutputSet(0)
{
init();
}
@@ -198,7 +200,9 @@ SfxModalDialog::SfxModalDialog(Window* pParent,
*/
ModalDialog(pParent, nWinStyle),
- nUniqId(nUniqueId)
+ nUniqId(nUniqueId),
+ pInputSet(0),
+ pOutputSet(0)
{
init();
}
@@ -220,6 +224,14 @@ SfxModalDialog::~SfxModalDialog()
*/
SetDialogData_Impl();
aTimer.Stop();
+ delete pOutputSet;
+}
+
+void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool )
+{
+ DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" );
+ if (!pOutputSet)
+ pOutputSet = new SfxAllItemSet( rPool );
}
// -----------------------------------------------------------------------
@@ -234,6 +246,16 @@ IMPL_LINK( SfxModalDialog, TimerHdl_Impl, Timer*, EMPTYARG )
return 0L;
}
+void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet )
+{
+ DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" );
+ if (!pOutputSet)
+ {
+ pOutputSet = new SfxItemSet( rSet );
+ pOutputSet->ClearItem();
+ }
+}
+
//-------------------------------------------------------------------------
void SfxModelessDialog::StateChanged( StateChangedType nStateChange )
{
@@ -721,31 +743,29 @@ IMPL_LINK( SfxSingleTabDialog, OKHdl_Impl, Button *, EMPTYARG )
*/
{
- if ( !pOptions )
+ if ( !GetInputItemSet() )
{
// TabPage without ItemSet
EndDialog( RET_OK );
return 1;
}
- if ( !pOutSet )
+ if ( !GetOutputItemSet() )
{
- pOutSet = new SfxItemSet( *pOptions );
- pOutSet->ClearItem();
+ CreateOutputItemSet( *GetInputItemSet() );
}
sal_Bool bModified = sal_False;
if ( pImpl->m_pSfxPage->HasExchangeSupport() )
{
- int nRet = pImpl->m_pSfxPage->DeactivatePage( pOutSet );
-
+ int nRet = pImpl->m_pSfxPage->DeactivatePage( GetOutputSetImpl() );
if ( nRet != SfxTabPage::LEAVE_PAGE )
return 0;
else
- bModified = ( pOutSet->Count() > 0 );
+ bModified = ( GetOutputItemSet()->Count() > 0 );
}
else
- bModified = pImpl->m_pSfxPage->FillItemSet( *pOutSet );
+ bModified = pImpl->m_pSfxPage->FillItemSet( *GetOutputSetImpl() );
if ( bModified )
{
@@ -781,12 +801,10 @@ SfxSingleTabDialog::SfxSingleTabDialog
pOKBtn ( 0 ),
pCancelBtn ( 0 ),
pHelpBtn ( 0 ),
- pImpl ( new SingleTabDlgImpl ),
- pOptions ( &rSet ),
- pOutSet ( 0 )
-
+ pImpl ( new SingleTabDlgImpl )
{
DBG_WARNING( "please use the ctor with ViewFrame" );
+ SetInputSet( &rSet );
}
// -----------------------------------------------------------------------
@@ -810,12 +828,10 @@ SfxSingleTabDialog::SfxSingleTabDialog
pOKBtn ( 0 ),
pCancelBtn ( 0 ),
pHelpBtn ( 0 ),
- pImpl ( new SingleTabDlgImpl ),
- pOptions ( pInSet ),
- pOutSet ( 0 )
-
+ pImpl ( new SingleTabDlgImpl )
{
DBG_WARNING( "bitte den Ctor mit ViewFrame verwenden" );
+ SetInputSet( pInSet );
}
// -----------------------------------------------------------------------
@@ -838,10 +854,7 @@ SfxSingleTabDialog::SfxSingleTabDialog
pOKBtn ( NULL ),
pCancelBtn ( NULL ),
pHelpBtn ( NULL ),
- pImpl ( new SingleTabDlgImpl ),
- pOptions ( NULL ),
- pOutSet ( NULL )
-
+ pImpl ( new SingleTabDlgImpl )
{
pImpl->m_sInfoURL = rInfoURL;
}
@@ -858,7 +871,6 @@ SfxSingleTabDialog::~SfxSingleTabDialog()
delete pImpl->m_pLine;
delete pImpl->m_pInfoImage;
delete pImpl;
- delete pOutSet;
}
// -----------------------------------------------------------------------
@@ -973,7 +985,7 @@ void SfxSingleTabDialog::SetTabPage( SfxTabPage* pTabPage,
if ( aUserItem >>= aTemp )
sUserData = String( aTemp );
pImpl->m_pSfxPage->SetUserData( sUserData );
- pImpl->m_pSfxPage->Reset( *pOptions );
+ pImpl->m_pSfxPage->Reset( *GetInputItemSet() );
pImpl->m_pSfxPage->Show();
// Gr"ossen und Positionen anpassen
@@ -1035,10 +1047,10 @@ extern "C" int BaseDlgsCmpUS_Impl( const void* p1, const void* p2 )
*/
const sal_uInt16* SfxSingleTabDialog::GetInputRanges( const SfxItemPool& rPool )
{
- if ( pOptions )
+ if ( GetInputItemSet() )
{
DBG_ERROR( "Set bereits vorhanden!" );
- return pOptions->GetRanges();
+ return GetInputItemSet()->GetRanges();
}
if ( pRanges )
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index aa9ccd9982..e41fbc0746 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -61,52 +61,12 @@
#define STR_DELETE_STYLE ( RC_DIALOG_BEGIN + 18)
#define STR_DELETE_STYLE_USED ( RC_DIALOG_BEGIN + 20)
-#define BMP_COLLAPSED ( RC_DIALOG_BEGIN + 18)
-#define BMP_EXPANDED ( RC_DIALOG_BEGIN + 19)
-#define TP_CONFIG_ACCEL ( RC_DIALOG_BEGIN + 20)
-//#define TP_CONFIG_MENU ( RC_DIALOG_BEGIN + 21)
-//#define TP_CONFIG_STATBAR ( RC_DIALOG_BEGIN + 22)
-//#define TP_CONFIG_OBJECTBAR ( RC_DIALOG_BEGIN + 31)
-//#define TP_CONFIG_EVENT ( RC_DIALOG_BEGIN + 32)
-//#define DLG_CONFIG ( RC_DIALOG_BEGIN + 23)
-
-#define IBX_MNUCFG_ALREADY_INCLUDED ( RC_DIALOG_BEGIN + 24)
-#define QBX_MNUCFG_UNDEFINED_FUNCTIONS ( RC_DIALOG_BEGIN + 25)
-#define QBX_MNUCFG_POPUP_FUNCTIONS ( RC_DIALOG_BEGIN + 26)
-
-#define STR_NEW ( RC_DIALOG_BEGIN + 27)
-#define STR_OPEN ( RC_DIALOG_BEGIN + 28)
-#define STR_SAVE ( RC_DIALOG_BEGIN + 29)
-#define STR_SAVEAS ( RC_DIALOG_BEGIN + 30)
-#define STR_PRINT ( RC_DIALOG_BEGIN + 32)
-#define STR_QUIT ( RC_DIALOG_BEGIN + 33)
-#define STR_CUT ( RC_DIALOG_BEGIN + 34)
-#define STR_COPY ( RC_DIALOG_BEGIN + 35)
-#define STR_PASTE ( RC_DIALOG_BEGIN + 36)
-#define STR_DELETE ( RC_DIALOG_BEGIN + 39)
-#define STR_FIND ( RC_DIALOG_BEGIN + 41)
-#define STR_FINDBACKWARD ( RC_DIALOG_BEGIN + 42)
-#define STR_PROPERTIES ( RC_DIALOG_BEGIN + 43)
-#define STR_FRONT ( RC_DIALOG_BEGIN + 44)
-#define STR_BASICMACROS ( RC_DIALOG_BEGIN + 45)
-#define STR_MENU ( RC_DIALOG_BEGIN + 46)
-#define STR_DLG_MACROS ( RC_DIALOG_BEGIN + 47)
-
#define LOGO_IMAGELIST ( RC_DIALOG_BEGIN + 45)
#define MN_CONTEXT_TEMPLDLG ( RC_DIALOG_BEGIN + 46)
#define MSG_LAYOUT_NOT_LOADING ( RC_DIALOG_BEGIN + 49)
#define ACC_LAYOUT_NOT_LOADING ( RC_DIALOG_BEGIN + 50)
-#define STR_LOADMENUCONFIG ( RC_DIALOG_BEGIN + 53)
-#define STR_SAVEMENUCONFIG ( RC_DIALOG_BEGIN + 54)
-
-#define STR_LOADACCELCONFIG ( RC_DIALOG_BEGIN + 55)
-#define STR_SAVEACCELCONFIG ( RC_DIALOG_BEGIN + 56)
-
-#define STR_LOADSTATBARCONFIG ( RC_DIALOG_BEGIN + 57)
-#define STR_SAVESTATBARCONFIG ( RC_DIALOG_BEGIN + 58)
-
#define MSG_ERR_CANT_EDIT_OLD_FORMAT ( RC_DIALOG_BEGIN + 60 )
#define MSG_ERR_CANT_EDIT_OPEN_DOCS ( RC_DIALOG_BEGIN + 61 )
@@ -121,8 +81,6 @@
#define STR_INTERNET ( RC_DIALOG_BEGIN + 65 )
#define RID_AUTOHIDE ( RC_DIALOG_BEGIN + 66 )
-#define RID_SFX_TP_MACROASSIGN ( RC_DIALOG_BEGIN + 67 )
-
#define DLG_ONLINE_REGISTER ( RC_DIALOG_BEGIN + 68 )
#define DLG_VERSIONS ( RC_DIALOG_BEGIN + 69 )
#define DLG_COMMENTS ( RC_DIALOG_BEGIN + 70 )
@@ -140,14 +98,6 @@
#define RID_ERRBOX_MAIL_CONFIG ( RC_DIALOG_BEGIN + 92 )
-#define STR_TOOLBAR_SEPARATOR ( RC_DIALOG_BEGIN + 93 )
-#define STR_TOOLBAR_SPACE ( RC_DIALOG_BEGIN + 94 )
-
-#define STR_BASICNAME ( RC_DIALOG_BEGIN + 96 )
-
-#define BMP_COLLAPSED_HC ( RC_DIALOG_BEGIN + 97 )
-#define BMP_EXPANDED_HC ( RC_DIALOG_BEGIN + 98 )
-
#define IMG_LST_STYLE_DESIGNER_HC ( RC_DIALOG_BEGIN + 99 )
// 100-106 in tbxcust.hrc
@@ -156,17 +106,6 @@
#define RID_DLG_SEARCH ( RC_DIALOG_BEGIN + 109 )
-#define IMG_HARDDISK ( RC_DIALOG_BEGIN + 110 )
-#define IMG_HARDDISK_HC ( RC_DIALOG_BEGIN + 111 )
-#define STR_PRODMACROS ( RC_DIALOG_BEGIN + 112 )
-#define STR_MYMACROS ( RC_DIALOG_BEGIN + 113 )
-#define IMG_LIB ( RC_DIALOG_BEGIN + 114 )
-#define IMG_LIB_HC ( RC_DIALOG_BEGIN + 115 )
-#define IMG_MACRO ( RC_DIALOG_BEGIN + 116 )
-#define IMG_MACRO_HC ( RC_DIALOG_BEGIN + 117 )
-#define IMG_DOC ( RC_DIALOG_BEGIN + 118 )
-#define IMG_DOC_HC ( RC_DIALOG_BEGIN + 119 )
-#define STR_GROUP_STYLES ( RC_DIALOG_BEGIN + 110 )
#define STR_PDF_EXPORT_SEND ( RC_DIALOG_BEGIN + 120 )
#define STR_RECHECK_DOCUMENT ( RC_DIALOG_BEGIN + 121 )
#define IMG_INFO ( RC_DIALOG_BEGIN + 122 )
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index 7a212b28bd..c50b17436c 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -148,36 +148,6 @@ String STR_DELETE_STYLE_USED
{
Text [ en-US ] = "You are deleting an applied Style!\n" ;
};
-Image BMP_COLLAPSED
-{
- ImageBitmap = Bitmap
- {
- File = "plus.bmp" ;
- };
- // MaskColor = Color { Predefine = COL_GREEN ; };
-};
-Image BMP_EXPANDED
-{
- ImageBitmap = Bitmap
- {
- File = "minus.bmp" ;
- };
- // MaskColor = Color { Predefine = COL_GREEN ; };
-};
-Image BMP_EXPANDED_HC
-{
- ImageBitmap = Bitmap
- {
- File = "minus_h.bmp" ;
- };
-};
-Image BMP_COLLAPSED_HC
-{
- ImageBitmap = Bitmap
- {
- File = "plus_h.bmp" ;
- };
-};
Menu MN_CONTEXT_TEMPLDLG
{
ItemList =
@@ -202,14 +172,6 @@ Menu MN_CONTEXT_TEMPLDLG
};
};
};
-String STR_BASICMACROS
-{
- Text [ en-US ] = "BASIC Macros" ;
-};
-String STR_DLG_MACROS
-{
- Text [ en-US ] = "%PRODUCTNAME Macros" ;
-};
InfoBox MSG_LAYOUT_NOT_LOADING
{
@@ -292,10 +254,6 @@ String SID_NAVIGATOR
{
Text [ en-US ] = "Navigator";
};
-String STR_BASICNAME
-{
- Text = "%PRODUCTNAME Basic" ;
-};
ErrorBox MSG_ERROR_WRONG_CONFIRM
{
@@ -304,11 +262,6 @@ ErrorBox MSG_ERROR_WRONG_CONFIRM
Message [ en-US ] = "Faulty password confirmation";
};
-String STR_GROUP_STYLES
-{
- Text [ en-US ] = "Styles" ;
-};
-
String STR_PDF_EXPORT_SEND
{
Text [ en-US ] = "Send" ;
diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk
index 58c74680cd..230bbe432a 100644
--- a/sfx2/source/dialog/makefile.mk
+++ b/sfx2/source/dialog/makefile.mk
@@ -41,8 +41,6 @@ TARGET=dialog
# --- Files --------------------------------------------------------------
EXCEPTIONSFILES=\
- $(SLO)$/acccfg.obj \
- $(SLO)$/cfg.obj \
$(SLO)$/filedlghelper.obj \
$(SLO)$/filtergrouping.obj \
$(SLO)$/itemconnect.obj \
@@ -60,7 +58,6 @@ SLOFILES =\
$(SLO)$/basedlgs.obj \
$(SLO)$/dinfedt.obj \
$(SLO)$/intro.obj \
- $(SLO)$/macropg.obj \
$(SLO)$/mgetempl.obj \
$(SLO)$/navigat.obj \
$(SLO)$/newstyle.obj \
@@ -81,12 +78,10 @@ SRS1NAME=$(TARGET)
SRC1FILES =\
recfloat.src \
alienwarn.src \
- cfg.src \
dialog.src \
dinfdlg.src \
dinfedt.src \
filedlghelper.src \
- macropg.src \
mailwindow.src \
mgetempl.src \
newstyle.src \
diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx
index 57e1770d83..91e7cc3394 100644
--- a/sfx2/source/dialog/sfxdlg.cxx
+++ b/sfx2/source/dialog/sfxdlg.cxx
@@ -36,15 +36,8 @@
#include <osl/module.hxx>
#include <tools/string.hxx>
-#include "cfg.hxx"
SfxAbstractDialogFactory* SfxAbstractDialogFactory::Create()
{
return (SfxAbstractDialogFactory*) VclAbstractDialogFactory::Create();
}
-
-SfxTabPage* SfxAbstractDialogFactory::CreateSfxAcceleratorConfigPage(
- Window *pParent, const SfxItemSet& rSet )
-{
- return new SfxAcceleratorConfigPage( pParent, rSet );
-}
diff --git a/sfx2/source/inc/acccfg.hxx b/sfx2/source/inc/acccfg.hxx
deleted file mode 100644
index 33ef6dbd31..0000000000
--- a/sfx2/source/inc/acccfg.hxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: acccfg.hxx,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _ACCCFG_HXX
-#define _ACCCFG_HXX
-
-// #include *****************************************************************
-
-#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
-#include <vcl/button.hxx>
-#endif
-#include <vcl/dialog.hxx>
-#include <vcl/lstbox.hxx>
-#include <sfx2/minarray.hxx>
-
-// forward ******************************************************************
-
-class SfxAcceleratorManager;
-
-// class SfxAcceleratorConfigListBox *************************************************
-
-class SfxAcceleratorConfigListBox : public ListBox
-{
- void KeyInput( const KeyEvent &rKEvt );
-
-public:
-
- SfxAcceleratorConfigListBox( Window *pParent, ResId &rResId ) :
- ListBox( pParent, rResId ) {}
-
- void ReplaceEntry( USHORT nPos, const String &rStr );
- void ExpandEntry ( USHORT nPos, const String &rStr );
-};
-
-// class USHORTArr **********************************************************
-
-#if !defined(_MNUCFG_HXX) && !defined(_TBXCFG_HXX)
-DECL_2BYTEARRAY(USHORTArr, USHORT, 10, 10)
-#endif
-
-// class SfxAcceleratorConfigDialog **************************************************
-
-class SfxAcceleratorConfigDialog : public ModalDialog
-{
- OKButton aOKButton;
- CancelButton aCancelButton;
- PushButton aChangeButton;
- PushButton aRemoveButton;
- SfxAcceleratorConfigListBox aEntriesBox;
- FixedText aDescriptionTextText;
- FixedText aDescriptionInfoText;
- FixedLine aKeyboardGroup;
- FixedText aGroupText;
- ListBox aGroupLBox;
- FixedText aFunctionText;
- ListBox aFunctionBox;
- FixedText aKeyText;
- ListBox aKeyBox;
- FixedLine aFunctionsGroup;
-
- SfxAcceleratorManager *pMgr;
-
- USHORTArr aAccelArr;
- USHORTArr aFunctionArr;
- USHORTArr aKeyArr;
-
- void OKHdl ( Button * );
- void ChangeHdl( Button * );
- void RemoveHdl( Button * );
- void SelectHdl( ListBox *pListBox );
-
- KeyCode PosToKeyCode ( USHORT nPos ) const;
- USHORT KeyCodeToPos ( const KeyCode &rCode ) const;
- String GetFunctionName( KeyFuncType eType ) const;
-
-public:
-
- SfxAcceleratorConfigDialog( Window *pParent );
-};
-
-#endif
-
diff --git a/sfx2/source/inc/cfg.hxx b/sfx2/source/inc/cfg.hxx
deleted file mode 100644
index 6147f8a255..0000000000
--- a/sfx2/source/inc/cfg.hxx
+++ /dev/null
@@ -1,620 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: cfg.hxx,v $
- * $Revision: 1.41 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SFXCFG_HXX
-#define _SFXCFG_HXX
-
-#include <vector>
-#include <algorithm>
-#include <vcl/lstbox.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/group.hxx>
-#include <svtools/svtabbx.hxx>
-#include <svtools/svtreebx.hxx>
-
-//
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
-#include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/script/browse/XBrowseNode.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-
-#define _SVSTDARR_USHORTS
-#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx> // SvUShorts
-#include <sfx2/minarray.hxx>
-#include <sfx2/tabdlg.hxx>
-
-class SfxMacroInfoArr_Impl;
-class SfxMacroInfoItem;
-class SfxMacroInfo;
-class BasicManager;
-
-#define SFX_CFGGROUP_FUNCTION 1
-#define SFX_CFGGROUP_BASICMGR 2
-#define SFX_CFGGROUP_DOCBASICMGR 3
-#define SFX_CFGGROUP_BASICLIB 4
-#define SFX_CFGGROUP_BASICMOD 5
-#define SFX_CFGFUNCTION_MACRO 6
-#define SFX_CFGFUNCTION_SLOT 7
-#define SFX_CFGGROUP_SCRIPTCONTAINER 8
-#define SFX_CFGFUNCTION_SCRIPT 9
-#define SFX_CFGGROUP_STYLES 10
-
-#define css ::com::sun::star
-
-struct SfxStyleInfo_Impl
-{
- public:
-
- ::rtl::OUString sFamily;
- ::rtl::OUString sStyle;
- ::rtl::OUString sCommand;
- ::rtl::OUString sLabel;
-
- SfxStyleInfo_Impl()
- {}
-
- SfxStyleInfo_Impl(const SfxStyleInfo_Impl& rCopy)
- {
- sFamily = rCopy.sFamily;
- sStyle = rCopy.sStyle;
- sCommand = rCopy.sCommand;
- sLabel = rCopy.sLabel;
- }
-};
-
-struct SfxStylesInfo_Impl
-{
- private:
-
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDoc;
-
- public:
-
- SfxStylesInfo_Impl();
- void setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel);
-
- sal_Bool parseStyleCommand(SfxStyleInfo_Impl& aStyle);
- void getLabel4Style(SfxStyleInfo_Impl& aStyle);
-
- ::std::vector< SfxStyleInfo_Impl > getStyleFamilies();
- ::std::vector< SfxStyleInfo_Impl > getStyles(const ::rtl::OUString& sFamily);
-
- static ::rtl::OUString generateCommand(const ::rtl::OUString& sFamily, const ::rtl::OUString& sStyle);
-};
-
-struct SfxGroupInfo_Impl
-{
- USHORT nKind;
- USHORT nOrd;
- void* pObject;
- BOOL bWasOpened;
- String sCommand;
- String sLabel;
-
- SfxGroupInfo_Impl( USHORT n, USHORT nr, void* pObj = 0 ) :
- nKind( n ), nOrd( nr ), pObject( pObj ), bWasOpened(FALSE) {}
-};
-
-typedef SfxGroupInfo_Impl* SfxGroupInfoPtr;
-SV_DECL_PTRARR_DEL(SfxGroupInfoArr_Impl, SfxGroupInfoPtr, 5, 5)
-
-class SfxConfigFunctionListBox_Impl : public SvTreeListBox
-{
- friend class SfxConfigGroupListBox_Impl;
- Timer aTimer;
- SvLBoxEntry* pCurEntry;
- SfxGroupInfoArr_Impl aArr;
- SfxStylesInfo_Impl* pStylesInfo;
-
- DECL_LINK( TimerHdl, Timer* );
- virtual void MouseMove( const MouseEvent& rMEvt );
-
-public:
- SfxConfigFunctionListBox_Impl( Window*, const ResId& );
- ~SfxConfigFunctionListBox_Impl();
-
- void ClearAll();
- SvLBoxEntry* GetEntry_Impl( USHORT nId );
- SvLBoxEntry* GetEntry_Impl( const String& );
- USHORT GetId( SvLBoxEntry *pEntry );
- using Window::GetHelpText;
- String GetHelpText( SvLBoxEntry *pEntry );
- USHORT GetCurId() { return GetId( FirstSelected() ); }
- String GetCurCommand();
- String GetCurLabel();
- SfxMacroInfo* GetMacroInfo();
- void FunctionSelected();
- void SetStylesInfo(SfxStylesInfo_Impl* pStyles);
-};
-
-class SfxSlotPool;
-class SfxConfigGroupListBox_Impl : public SvTreeListBox
-{
- SfxSlotPool* pSlotPool;
- SfxConfigFunctionListBox_Impl* pFunctionListBox;
- SfxGroupInfoArr_Impl aArr;
- ULONG nMode;
- String aScriptType;
- BOOL bShowSF; // show Scripting Framework scripts
- BOOL bShowBasic; // show Basic scripts
-
- Image m_hdImage;
- Image m_hdImage_hc;
- Image m_libImage;
- Image m_libImage_hc;
- Image m_macImage;
- Image m_macImage_hc;
- Image m_docImage;
- Image m_docImage_hc;
-
- ::rtl::OUString m_sMyMacros;
- ::rtl::OUString m_sProdMacros;
-
- ::rtl::OUString m_sModuleLongName;
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
- css::uno::Reference< css::frame::XFrame > m_xFrame;
- css::uno::Reference< css::container::XNameAccess > m_xGlobalCategoryInfo;
- css::uno::Reference< css::container::XNameAccess > m_xModuleCategoryInfo;
- css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
-
- Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast );
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
- ::rtl::OUString parseLocationName( const ::rtl::OUString& location );
-
- void InitModule();
- void InitBasic();
- void InitStyles();
-
- ::rtl::OUString MapCommand2UIName(const ::rtl::OUString& sCommand);
-
- SfxStylesInfo_Impl* pStylesInfo;
-
-protected:
- virtual void RequestingChilds( SvLBoxEntry *pEntry);
- using SvListView::Expand;
- virtual BOOL Expand( SvLBoxEntry* pParent );
-
-public:
- SfxConfigGroupListBox_Impl ( Window* pParent,
- const ResId&,
- ULONG nConfigMode = 0 );
- ~SfxConfigGroupListBox_Impl();
- void ClearAll();
-
- void Init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
- const css::uno::Reference< css::frame::XFrame >& xFrame ,
- const ::rtl::OUString& sModuleLongName);
- void SetFunctionListBox( SfxConfigFunctionListBox_Impl *pBox )
- { pFunctionListBox = pBox; }
- void Open( SvLBoxEntry*, BOOL );
- void GroupSelected();
- void SelectMacro( const SfxMacroInfoItem* );
- void SelectMacro( const String&, const String& );
- String GetGroup();
- BasicManager* GetBasicManager( const SvLBoxEntry& _rEntry );
- void SetScriptType( const String& rScriptType );
- void SetStylesInfo(SfxStylesInfo_Impl* pStyles);
-};
-/*
-class SfxMenuConfigEntry
-{
-private:
- USHORT nId;
- BOOL bPopUp;
- String aHelpText;
- String aStr;
- String aCommand;
- String aHelpURL;
- BOOL bConfigure;
- BOOL bStrEdited;
-
-public:
- SfxMenuConfigEntry( USHORT nInitId, const String& rInitStr,
- const String& rHelpText, BOOL bPopup = FALSE );
- SfxMenuConfigEntry() : nId( 0 ), bPopUp( FALSE ), bConfigure( TRUE ), bStrEdited( FALSE ) {}
- ~SfxMenuConfigEntry();
-
- USHORT GetId() const { return nId; }
- void SetId( USHORT nNew );
- void SetCommand( const String& rCmd ) { aCommand = rCmd; }
- const String& GetName() const { return aStr; }
- void SetName( const String& rStr ) { aStr = rStr; bStrEdited = TRUE; }
- const String& GetHelpText() const { return aHelpText; }
- void SetHelpText( const String& rStr ) { aHelpText = rStr; }
- const String& GetHelpURL() const { return aHelpURL; }
- void SetHelpURL( const String& rStr ) { aHelpURL = rStr; }
- void SetPopup( BOOL bOn = TRUE ) { bPopUp = bOn; }
- void SetConfigurable( BOOL bOn = TRUE ) { bConfigure = bOn; }
- BOOL IsBinding() const { return nId != 0 && !bPopUp; }
- BOOL IsSeparator() const { return nId == 0; }
- BOOL IsPopup() const { return bPopUp; }
- BOOL IsConfigurable() const { return bConfigure; }
- BOOL HasChangedName() const { return bStrEdited; }
- const String& GetCommand() const { return aCommand; }
-};
-
-// class SfxMenuConfigEntryArr *************************************************
-
-SV_DECL_PTRARR_DEL(SfxMenuConfigEntryArr, SfxMenuConfigEntry *, 16, 16)
-
-class SfxMenuConfigPage;
-class SfxMenuCfgTabListBox_Impl : public SvTabListBox
-{
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xComponentContext;
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aSeparatorSeq;
- SfxMenuConfigPage* pPage;
- SfxMenuConfigEntryArr aMenuArr;
- Timer aTimer;
- SfxMenuConfigEntry* pCurEntry;
- rtl::OUString m_aDescriptorCommandURL;
- rtl::OUString m_aDescriptorType;
- rtl::OUString m_aDescriptorLabel;
- rtl::OUString m_aDescriptorHelpURL;
- rtl::OUString m_aDescriptorContainer;
-
- DECL_LINK( TimerHdl, Timer* );
-
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetSeparator();
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > ConvertSfxMenuConfigEntry( SfxMenuConfigEntry* pEntry );
-
-public :
- SfxMenuCfgTabListBox_Impl( Window *pParent, const ResId& rResId );
- ~SfxMenuCfgTabListBox_Impl();
-
- virtual long PreNotify( NotifyEvent& );
- virtual void ModelIsRemoving( SvListEntry* pEntry );
- void EntryInserted( SvListEntry* pEntry );
- virtual void ModelHasCleared();
- virtual void EditingRequest( SvLBoxEntry* pEntry,
- SvLBoxItem* pItem, const Point& rMousePos );
- virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- virtual BOOL NotifyMoving(SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& );
- void Apply( com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rNewMenuBar, com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >& rFactory, SvLBoxEntry *pParent = NULL );
-};
-
-// class SfxMenuConfigPage -----------------------------------------------
-
-class SfxMenuConfigPage : public SfxTabPage
-{
-private:
- SfxMenuCfgTabListBox_Impl aEntriesBox;
- const SfxMacroInfoItem* m_pMacroInfoItem;
- FixedLine aMenuGroup;
- PushButton aNewButton;
- PushButton aNewPopupButton;
- PushButton aChangeButton;
- PushButton aRemoveButton;
- ImageButton aUpButton;
- ImageButton aDownButton;
- FixedText aGroupText;
- SfxConfigGroupListBox_Impl aGroupLBox;
- FixedText aFunctionText;
- SfxConfigFunctionListBox_Impl aFunctionBox;
- FixedLine aFunctionsGroup;
- PushButton aLoadButton;
- PushButton aSaveButton;
- PushButton aResetButton;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr;
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr;
- ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
- ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame;
- ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xMenuBarSettings;
- ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xCommandToLabelMap;
- String m_aMenuResourceURL;
- sal_Bool m_bDocConfig;
- sal_Bool m_bDocReadOnly;
-
-// SfxMenuManager* pMgr;
-
- BOOL m_bModified;
- BOOL m_bDefault;
-
- DECL_LINK( MoveHdl, Button * );
- DECL_LINK( NewHdl, Button * );
- DECL_LINK( NewPopupHdl, Button * );
- DECL_LINK( ChangeHdl, Button * );
- DECL_LINK( RemoveHdl, Button * );
- DECL_LINK( SelectHdl, Control* );
-
- void CheckEntry( Control* );
- USHORT GetCurId();
- String MakeEntry( const SfxMenuConfigEntry &rEntry ) const;
- String Trim( const String &rStr ) const;
-
- sal_Bool GetMenuItemData( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemContainer,
- sal_Int32 nIndex,
- rtl::OUString& rCommandURL,
- rtl::OUString& rHelpURL,
- rtl::OUString& rLabel,
- sal_uInt16& rType,
- ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xPopupMenu );
-
- void FillEntriesBox( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuBarSettings, SfxMenuCfgTabListBox_Impl& aEntriesBox, SvLBoxEntry *pParentEntry );
- void Init();
- void ResetConfig();
-
- BOOL TryMove_Impl( Button*, SvLBoxEntry** pEntry=NULL, ULONG* pPos=NULL );
-
- DECL_LINK( Default, PushButton * );
- DECL_LINK( Save, Button * );
- DECL_LINK( Load, Button * );
-
-public:
- SfxMenuConfigPage( Window *pParent, const SfxItemSet& rItemSet );
- virtual ~SfxMenuConfigPage();
-
- virtual BOOL FillItemSet( SfxItemSet& );
- virtual void Reset( const SfxItemSet& );
- void Apply( BOOL );
- void SetModified( BOOL bSet ) { m_bModified = bSet; }
- void SetDefault( BOOL bSet ) { m_bDefault = bSet; }
-
- void SelectMacro(const SfxMacroInfoItem*);
-
- ::com::sun::star::uno::Reference < com::sun::star::container::XNameAccess >
- GetCommandToLabelMap() { return m_xCommandToLabelMap; }
-};
-
-
-class SfxAcceleratorManager;
-*/
-// class SfxAcceleratorConfigListBox *************************************************
-
-class SfxAcceleratorConfigPage;
-class SfxAccCfgTabListBox_Impl : public SvTabListBox
-{
- SfxAcceleratorConfigPage* m_pAccelConfigPage;
-
- void KeyInput( const KeyEvent &rKEvt );
-
-protected:
- virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
-
-public:
- SfxAccCfgTabListBox_Impl(
- SfxAcceleratorConfigPage* pAccelConfigPage,
- Window *pParent,
- const ResId &rResId ) :
- SvTabListBox( pParent, rResId ),
- m_pAccelConfigPage( pAccelConfigPage )
- {}
-
- void ReplaceEntry( USHORT nPos, const String &rStr );
-};
-
-// class SfxAcceleratorConfigPage ----------------------------------------
-
-struct TAccInfo
-{
- public:
-
- TAccInfo( sal_Int32 nKeyPos ,
- sal_Int32 nListPos,
- const KeyCode& aKey )
- : m_nKeyPos (nKeyPos )
- , m_nListPos (nListPos )
- , m_bIsConfigurable(sal_True )
- , m_sCommand ( )
- , m_aKey (aKey )
- // its important to set TRUE as default -
- // because only fix entries will be disabled later ...
- {}
-
- sal_Bool isConfigured() const
- {
- return (m_nKeyPos>-1 && m_nListPos>-1 && m_sCommand.getLength());
- }
-
- sal_Int32 m_nKeyPos;
- sal_Int32 m_nListPos;
- sal_Bool m_bIsConfigurable;
- ::rtl::OUString m_sCommand;
- KeyCode m_aKey;
-};
-
-namespace sfx2
-{
- class FileDialogHelper;
-}
-
-class SfxAcceleratorConfigPage : public SfxTabPage
-{
- friend class SfxAccCfgTabListBox_Impl;
-private:
- const SfxMacroInfoItem* m_pMacroInfoItem;
- sfx2::FileDialogHelper* m_pFileDlg;
-
- SfxAccCfgTabListBox_Impl aEntriesBox;
- FixedLine aKeyboardGroup;
- RadioButton aOfficeButton;
- RadioButton aModuleButton;
- PushButton aChangeButton;
- PushButton aRemoveButton;
- FixedText aGroupText;
- SfxConfigGroupListBox_Impl aGroupLBox;
- FixedText aFunctionText;
- SfxConfigFunctionListBox_Impl aFunctionBox;
- FixedText aKeyText;
- SvTreeListBox aKeyBox;
- FixedLine aFunctionsGroup;
- PushButton aLoadButton;
- PushButton aSaveButton;
- PushButton aResetButton;
- SfxStylesInfo_Impl m_aStylesInfo;
- sal_Bool m_bStylesInfoInitialized;
-
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
- css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobal;
- css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModule;
- css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xAct;
- css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
- css::uno::Reference< css::frame::XFrame > m_xFrame;
-
- ::rtl::OUString m_sModuleLongName;
- ::rtl::OUString m_sModuleShortName;
- ::rtl::OUString m_sModuleUIName;
-
- DECL_LINK( ChangeHdl, Button * );
- DECL_LINK( RemoveHdl, Button * );
- DECL_LINK( SelectHdl, Control * );
- DECL_LINK( Save, Button * );
- DECL_LINK( Load, Button * );
- DECL_LINK( Default, PushButton * );
- DECL_LINK( RadioHdl, RadioButton* );
-
- DECL_LINK( LoadHdl, sfx2::FileDialogHelper* );
- DECL_LINK( SaveHdl, sfx2::FileDialogHelper* );
-
- String GetLabel4Command(const String& sCommand);
- void InitAccCfg();
- KeyCode MapPosToKeyCode( USHORT nPos ) const;
- USHORT MapKeyCodeToPos( const KeyCode &rCode ) const;
- String GetFunctionName( KeyFuncType eType ) const;
- css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName);
- void StartFileDialog( WinBits nBits, const String& rTitle );
-
- void Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
- void ResetConfig();
-
- void CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 );
-
-public:
- SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
- virtual ~SfxAcceleratorConfigPage();
-
- virtual BOOL FillItemSet( SfxItemSet& );
- virtual void Reset( const SfxItemSet& );
-
- void SelectMacro(const SfxMacroInfoItem*);
- void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
- void CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr,
- const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr);
-};
-/*
-class SfxConfigDialog : public SfxTabDialog
-{
- const SfxMacroInfoItem* pMacroInfo;
- SfxViewFrame* pViewFrame;
- USHORT nObjectBar;
-
-public:
- SfxConfigDialog( Window*, const SfxItemSet*, SfxViewFrame* pFrame );
- ~SfxConfigDialog();
-
- void ActivateToolBoxConfig( USHORT nId );
- void ActivateMacroConfig( const SfxMacroInfoItem* );
- void ActivateTabPage( USHORT );
-
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
- virtual short Ok();
-
- static String FileDialog_Impl( Window *pParent, WinBits nBits, const String& rTitle );
- static SfxConfigManager* MakeCfgMgr_Impl( const String& rName, BOOL bWriting, BOOL& bCreated );
-};
-
-class SfxStatusBarManager;
-class SfxStbInfoArr_Impl;
-
-class SfxStatusBarConfigListBox : public SvTreeListBox
-{
-friend class SfxStatusBarConfigPage;
- SvLBoxButtonData* pButton;
- BOOL bModified;
- BOOL bDefault;
- SvLBoxEntry* pCurEntry;
- Timer aTimer;
-
- DECL_LINK( TimerHdl, Timer* );
-
-public:
-
- SfxStatusBarConfigListBox( Window* pParent,
- const ResId& );
- ~SfxStatusBarConfigListBox();
-
- virtual BOOL NotifyAcceptDrop( SvLBoxEntry* pEntry );
- virtual BOOL NotifyMoving(SvLBoxEntry*,
- SvLBoxEntry*,SvLBoxEntry*&,ULONG&);
- virtual void CheckButtonHdl();
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void KeyInput( const KeyEvent& rKeyEvent );
-};
-
-// class SfxStatusBarConfigPage ------------------------------------------
-
-class SfxStatusBarConfigPage : public SfxTabPage
-{
-private:
- SfxStatusBarConfigListBox aEntriesBox;
- FixedLine aStatusBarGroup;
- PushButton aLoadButton;
- PushButton aSaveButton;
- PushButton aResetButton;
-
- SvUShorts aListOfIds;
- SfxStatusBarManager* pMgr;
- SfxStbInfoArr_Impl* pArr;
- BOOL bMgrCreated;
-
- DECL_LINK( SelectHdl, SvTreeListBox * );
- DECL_LINK( Save, Button * );
- DECL_LINK( Load, Button * );
- DECL_LINK( Default, PushButton * );
-
- void Init();
- void ResetConfig();
-
-public:
- SfxStatusBarConfigPage( Window *pParent, const SfxItemSet& rItemSet );
- virtual ~SfxStatusBarConfigPage();
-
- virtual BOOL FillItemSet( SfxItemSet& );
- virtual void Reset( const SfxItemSet& );
- void Apply( SfxStatusBarManager*, BOOL );
-};
-*/
-
-#undef css
-#undef css
-
-#endif
-
diff --git a/sfx2/source/inc/eventdlg.hxx b/sfx2/source/inc/eventdlg.hxx
deleted file mode 100644
index 5b43e3878b..0000000000
--- a/sfx2/source/inc/eventdlg.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: eventdlg.hxx,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _EVENTDLG_HXX
-#define _EVENTDLG_HXX
-
-#include <vcl/menubtn.hxx>
-
-#include <sfx2/evntconf.hxx>
-#include <sfx2/macropg.hxx>
-
-class Menu;
-class SfxMacroInfoItem;
-class SvxMacroItem;
-
-class SfxEventConfigPage : public _SfxMacroTabPage
-{
- RadioButton aStarOfficeRB;
- RadioButton aDocumentRB;
-
- SvxMacroItem* pAppItem;
- SvxMacroItem* pDocItem;
- BOOL bAppConfig;
-
- DECL_LINK( SelectHdl_Impl, RadioButton* );
-
-public:
- SfxEventConfigPage( Window *pParent, const SfxItemSet& rSet );
- ~SfxEventConfigPage();
-
- void Init();
- void SelectMacro( const SfxMacroInfoItem* );
- void SelectMacro( const SvxMacro* );
- void Apply();
-
- virtual BOOL FillItemSet( SfxItemSet& );
- virtual void Reset( const SfxItemSet& );
-};
-
-
-#endif
-
diff --git a/sfx2/source/inc/headertablistbox.hxx b/sfx2/source/inc/headertablistbox.hxx
deleted file mode 100644
index 4fff765a4a..0000000000
--- a/sfx2/source/inc/headertablistbox.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: headertablistbox.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _HEADERTABLISTBOX_HXX
-#define _HEADERTABLISTBOX_HXX
-
-#include <svtools/headbar.hxx>
-#include <svtools/svtabbx.hxx>
-
-
-class _HeaderTabListBox : public Control
-{
-private:
- SvHeaderTabListBox maListBox;
- HeaderBar maHeaderBar;
-protected:
- DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
- virtual long Notify( NotifyEvent& rNEvt );
-public:
- _HeaderTabListBox( Window* pParent, const ResId& rId );
- virtual ~_HeaderTabListBox();
-
- inline SvHeaderTabListBox& GetListBox( void );
- inline HeaderBar& GetHeaderBar( void );
-
- void ConnectElements( void );
- // should be called after all manipulations on elements are done
- // calcs real sizes depending on sizes of this
- void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); // same meaning as Windows::Show()
- void Enable( bool bEnable = true, bool bChild = true ); // same meaning as Windows::Enable()
-};
-
-inline SvHeaderTabListBox& _HeaderTabListBox::GetListBox( void )
-{
- return maListBox;
-}
-
-inline HeaderBar& _HeaderTabListBox::GetHeaderBar( void )
-{
- return maHeaderBar;
-}
-
-
-#endif
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 5965ec622a..8e7643975d 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -49,9 +49,6 @@
#define HID_DOCINFODESC (HID_SFX_START + 8)
#define HID_DOCINFODOC (HID_SFX_START + 9)
#define HID_DOCINFOUSER (HID_SFX_START + 10)
-#define HID_CONFIG_MENU (HID_SFX_START + 11)
-#define HID_CONFIG_ACCEL (HID_SFX_START + 12)
-#define HID_CONFIG_STATBAR (HID_SFX_START + 13)
#define HID_BOOKMARKPROPS (HID_SFX_START + 14)
#define HID_BOOKGROUPPROPS (HID_SFX_START + 15)
#define HID_BOOKFILEPROPS (HID_SFX_START + 16)
@@ -98,7 +95,6 @@
#define HID_TEMPLATE_FMT (HID_SFX_START + 61)
#define HID_TEMPLATE_FILTER (HID_SFX_START + 62)
#define HID_FTPSERVER_PAGE (HID_SFX_START + 63)
-#define HID_MACRO_LB_EVENT (HID_SFX_START + 64)
#define HID_DLG_SFX_EXP_SEARCH (HID_SFX_START + 65)
#define HID_TP_SFX_EXP_SEARCH_CRITERIA (HID_SFX_START + 66)
#define HID_TP_SFX_EXP_SEARCH_PLACE (HID_SFX_START + 67)
@@ -106,12 +102,6 @@
#define HID_TEMPLDLG_NEWBYEXAMPLE (HID_SFX_START + 69)
#define HID_TEMPLDLG_UPDATEBYEXAMPLE (HID_SFX_START + 70)
#define HID_TEMPLDLG_WATERCAN (HID_SFX_START + 71)
-#define HID_CONFIGFUNCTION_LISTBOX (HID_SFX_START + 72)
-#define HID_CONFIGGROUP_LISTBOX (HID_SFX_START + 73)
-#define HID_STATUSBARCONFIG_LISTBOX (HID_SFX_START + 74)
-#define HID_ACCELCONFIG_LISTBOX (HID_SFX_START + 75)
-#define HID_MENUCONFIG_LISTBOX (HID_SFX_START + 76)
-#define HID_TOOLBOXCONFIG_LISTBOX (HID_SFX_START + 77)
#define HID_DESKTOP (HID_SFX_START + 78)
#define HID_EXPLORERTOOLSTOOLBOX (HID_SFX_START + 79)
#define HID_EXPLOREROBJECTTOOLBOX (HID_SFX_START + 80)
@@ -121,8 +111,6 @@
#define HID_ENVTOOLBOX (HID_SFX_START + 84)
#define HID_FRAMESETEDIT_TOOLBOX (HID_SFX_START + 85)
#define HID_NAVIGATOR_WINDOW (HID_SFX_START + 86)
-#define HID_MACRO_GROUP (HID_SFX_START + 87)
-#define HID_MACRO_MACROS (HID_SFX_START + 88)
#define HID_TABDLG_RESET_BTN (HID_SFX_START + 89)
#define HID_TABDLG_STANDARD_BTN (HID_SFX_START + 90)
#define HID_HELPAGENT_TIP_BOX (HID_SFX_START + 91)
@@ -271,8 +259,6 @@
#define HID_FILEDLG_NEW_FAVORITE (HID_SFX_START + 235)
#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX (HID_SFX_START + 236)
#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR (HID_SFX_START + 237)
-#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_SFX_START + 238)
-#define HID_CONFIGGROUP_ACC_LISTBOX (HID_SFX_START + 239)
#define HID_CNT_CB_FORCE_BODY_EXPORT (HID_SFX_START + 240)
#define HID_CNT_PAGE_REPSTATE_CONTROL (HID_SFX_START + 241)
#define HID_TASKSTATUSBAR (HID_SFX_START + 242)
@@ -347,8 +333,6 @@
#define HID_CONFIG_SAVE (HID_SFX_START + 310)
#define HID_SEARCHDIALOG (HID_SFX_START + 311)
-#define HID_MACRO_HEADERTABLISTBOX (HID_SFX_START + 312)
-#define HID_MACROCHECKDIALOG (HID_SFX_START + 313)
#define HID_XMLSEC_WARNING_BROKENSIGNATURE (HID_SFX_START + 314)
#define HID_XMLSEC_QUERY_LOSINGSIGNATURE (HID_SFX_START + 315)
diff --git a/sfx2/source/inc/macropg_impl.hxx b/sfx2/source/inc/macropg_impl.hxx
deleted file mode 100644
index 764ce1246b..0000000000
--- a/sfx2/source/inc/macropg_impl.hxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: macropg_impl.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _MACROPG_IMPL_HXX
-#define _MACROPG_IMPL_HXX
-
-class _SfxMacroTabPage_Impl
-{
-public:
- _SfxMacroTabPage_Impl( void );
- ~_SfxMacroTabPage_Impl();
-
- String maStaticMacroLBLabel;
- PushButton* pAssignPB;
- PushButton* pDeletePB;
- String* pStrEvent;
- String* pAssignedMacro;
- ListBox* pScriptTypeLB;
- _HeaderTabListBox* pEventLB;
- SfxConfigGroupListBox_Impl* pGroupLB;
- FixedText* pFT_MacroLBLabel;
- SfxConfigFunctionListBox_Impl* pMacroLB;
-
- FixedText* pMacroFT;
- String* pMacroStr;
- FNGetRangeHdl fnGetRange;
- FNGetMacrosOfRangeHdl fnGetMacroOfRange;
-
- BOOL bReadOnly;
- Timer maFillGroupTimer;
-};
-
-#endif
-
diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src
index 41bf47b31c..004221203a 100644
--- a/sfx2/util/hidother.src
+++ b/sfx2/util/hidother.src
@@ -197,6 +197,4 @@ hidspecial HID_CLOSE_WARNING { HelpID = HID_CLOSE_WARNING; };
hidspecial HID_DID_SAVE_PACKED_XML { HelpID = HID_DID_SAVE_PACKED_XML; };
hidspecial HID_HELP_ONHELP { HelpID = HID_HELP_ONHELP; };
hidspecial HID_HELP_TEXT_SELECTION_MODE { HelpID = HID_HELP_TEXT_SELECTION_MODE; };
-hidspecial HID_MACROCHECKDIALOG { HelpID = HID_MACROCHECKDIALOG; };
-hidspecial HID_MACRO_HEADERTABLISTBOX { HelpID = HID_MACRO_HEADERTABLISTBOX; };
hidspecial HID_DLG_CHECKFORONLINEUPDATE { HelpID = HID_DLG_CHECKFORONLINEUPDATE; };
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
index 8b1b18c470..cfed0a838f 100644
--- a/sfx2/util/makefile.mk
+++ b/sfx2/util/makefile.mk
@@ -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
@@ -72,6 +72,7 @@ HELPIDFILES=\
.IF "$(GUI)"!="UNX"
LIB2TARGET= $(LB)$/$(TARGET).lib
LIB2FILES= $(LB)$/isfx.lib
+LIB2DEPN=$(SHL1TARGETN)
.ENDIF
SHL1TARGET= sfx$(DLLPOSTFIX)
@@ -132,7 +133,6 @@ SFXSRSLIST=\
$(SRS)$/sfx.srs \
$(SRS)$/doc.srs \
$(SRS)$/view.srs \
- $(SRS)$/config.srs \
$(SRS)$/menu.srs \
$(SRS)$/dialog.srs \
$(SRS)$/bastyp.srs
diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/databaseregistrationui.hxx
index 078d96fcdc..a28c0d6aa4 100644
--- a/svx/inc/databaseregistrationui.hxx
+++ b/svx/inc/databaseregistrationui.hxx
@@ -36,6 +36,10 @@
class Window;
+#define SID_SB_POOLING_ENABLED (RID_OFA_START + 247)
+#define SID_SB_DRIVER_TIMEOUTS (RID_OFA_START + 248)
+#define SID_SB_DB_REGISTER (RID_OFA_START + 249)
+
//........................................................................
namespace svx
{
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index b28d7c8c4d..22d3175fa1 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -809,6 +809,17 @@
#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_SVX_EXT0_START + 207)
#define HID_SPLDLG_BUTTON_IGNORERULE (HID_SVX_EXT0_START + 208)
+
+#define HID_CONFIG_ACCEL (HID_SVX_EXT0_START + 209)
+#define HID_ACCELCONFIG_LISTBOX (HID_SVX_EXT0_START + 210)
+#define HID_CONFIGGROUP_ACC_LISTBOX (HID_SVX_EXT0_START + 211)
+#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_SVX_EXT0_START + 212)
+#define HID_MACRO_LB_EVENT (HID_SVX_EXT0_START + 213)
+#define HID_MACRO_GROUP (HID_SVX_EXT0_START + 214)
+#define HID_MACRO_MACROS (HID_SVX_EXT0_START + 215)
+#define HID_MACROCHECKDIALOG (HID_SVX_EXT0_START + 216)
+#define HID_MACRO_HEADERTABLISTBOX (HID_SVX_EXT0_START + 217)
+
// please adjust ACT_SVX_HID_END2 below if you add entries here!
// -----------------------------------------------------------------------
@@ -820,7 +831,7 @@
#error Resource-Ueberlauf in #line, #file
#endif
-#define ACT_SVX_HID_END2 HID_SPLDLG_BUTTON_IGNORERULE
+#define ACT_SVX_HID_END2 (HID_SVX_EXT0_START + 215)
#if ACT_SVX_HID_END2 > HID_SVX_EXT0_END
#error resource overrun in #line, #file
#endif
diff --git a/svx/inc/svx/brshitem.hxx b/svx/inc/svx/brshitem.hxx
index f9fede6bbb..baf4b12ff5 100644
--- a/svx/inc/svx/brshitem.hxx
+++ b/svx/inc/svx/brshitem.hxx
@@ -62,6 +62,9 @@ enum SvxGraphicPosition
GPOS_AREA, GPOS_TILED
};
+#define PARA_DEST_PARA 0
+#define PARA_DEST_CHAR 1
+
class SvxBrushItem_Impl;
class SVX_DLLPUBLIC SvxBrushItem : public SfxPoolItem
{
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index 7c4bb5514b..290c14073f 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -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
@@ -35,27 +35,13 @@
#include <vcl/ctrl.hxx>
#include <vcl/metric.hxx>
#include <vcl/scrbar.hxx>
-#include <sfx2/basedlgs.hxx>
#include <map>
-#include <tools/shl.hxx> //add CHINA001
-#include <tools/debug.hxx> //add CHINA001
-#include <vcl/sound.hxx> //add CHINA001
-#include <vcl/svapp.hxx> //add CHINA001
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx> //add CHINA001
-#endif
-#include <vcl/fixed.hxx> //add CHINA001
-#include <vcl/lstbox.hxx> //add CHINA001
-#include <vcl/edit.hxx> //add CHINA001
-#include <vcl/metric.hxx>
+#include <tools/shl.hxx> //add CHINA001
+#include <tools/debug.hxx> //add CHINA001
#include "svx/svxdllapi.h"
-class SubsetMap;
-class SvxCharMapData;
-
// define ----------------------------------------------------------------
-#define CHARMAP_MAXLEN 32
#define COLUMN_COUNT 16
#define ROW_COUNT 8
@@ -86,6 +72,7 @@ public:
void SetHighlightHdl( const Link& rHdl ) { aHighHdl = rHdl; }
Link GetPreSelectHdl() const { return aHighHdl; }
void SetPreSelectHdl( const Link& rHdl ) { aPreSelectHdl = rHdl; }
+ static sal_uInt32& getSelectedChar();
#ifdef _SVX_CHARMAP_CXX_
::svx::SvxShowCharSetItem* ImplGetItem( int _nPos );
@@ -94,13 +81,13 @@ public:
int PixelToMapIndex( const Point&) const;
void SelectIndex( int index, BOOL bFocus = FALSE );
void DeSelect();
- inline sal_Bool IsSelected(USHORT _nPos) const { return _nPos == nSelectedIndex; }
+ inline sal_Bool IsSelected(USHORT _nPos) const { return _nPos == nSelectedIndex; }
inline USHORT GetSelectIndexId() const { return sal::static_int_cast<USHORT>(nSelectedIndex); }
USHORT GetRowPos(USHORT _nPos) const;
USHORT GetColumnPos(USHORT _nPos) const;
-
- void ImplFireAccessibleEvent( short nEventId,
- const ::com::sun::star::uno::Any& rOldValue,
+
+ void ImplFireAccessibleEvent( short nEventId,
+ const ::com::sun::star::uno::Any& rOldValue,
const ::com::sun::star::uno::Any& rNewValue );
ScrollBar* getScrollBar();
void ReleaseAccessible();
@@ -122,7 +109,7 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
-
+
private:
typedef ::std::map<sal_Int32, ::svx::SvxShowCharSetItem*> ItemsMap;
@@ -137,7 +124,7 @@ private:
long nY;
BOOL bDrag;
- sal_Int32 nSelectedIndex;
+ sal_Int32 nSelectedIndex;
FontCharMap maFontCharMap;
ScrollBar aVscrollSB;
@@ -149,71 +136,8 @@ private:
void InitSettings( BOOL bForeground, BOOL bBackground);
// abstraction layers are: Unicode<->MapIndex<->Pixel
Point MapIndexToPixel( int) const;
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( VscrollHdl, ScrollBar* );
-//#endif
};
-// class SvxShowText =====================================================
-
-class SVX_DLLPUBLIC SvxShowText : public Control
-{
-public:
- SvxShowText( Window* pParent,
- const ResId& rResId,
- BOOL bCenter = FALSE );
- ~SvxShowText();
-
- void SetFont( const Font& rFont );
- void SetText( const String& rText );
-
-protected:
- virtual void Paint( const Rectangle& );
-
-private:
- long mnY;
- BOOL mbCenter;
-
-};
-
-class SVX_DLLPUBLIC SvxCharMapData
-{
-public:
- SvxCharMapData( class SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pResContext );
-
- void SetCharFont( const Font& rFont );
-
-private:
-friend class SvxCharacterMap;
- SfxModalDialog* mpDialog;
-
- SvxShowCharSet aShowSet;
-// Edit aShowText;
- SvxShowText aShowText;
- OKButton aOKBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
- PushButton aDeleteBtn;
- FixedText aFontText;
- ListBox aFontLB;
- FixedText aSubsetText;
- ListBox aSubsetLB;
- FixedText aSymbolText;
- SvxShowText aShowChar;
- FixedText aCharCodeText;
-
- Font aFont;
- BOOL bOne;
- const SubsetMap* pSubsetMap;
-
- DECL_LINK( OKHdl, OKButton* );
- DECL_LINK( FontSelectHdl, ListBox* );
- DECL_LINK( SubsetSelectHdl, ListBox* );
- DECL_LINK( CharDoubleClickHdl, Control* pControl );
- DECL_LINK( CharSelectHdl, Control* pControl );
- DECL_LINK( CharHighlightHdl, Control* pControl );
- DECL_LINK( CharPreSelectHdl, Control* pControl );
- DECL_LINK( DeleteHdl, PushButton* pBtn );
-};
#endif
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 6fab14fc75..4b49ae1bbf 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -38,7 +38,7 @@
// Resource-Id's ------------------------------------------------------------
// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
-#define RID_SVX_FIRSTFREE 303
+#define RID_SVX_FIRSTFREE 305
// ResId fuer die Hintergrund-TabPage
#define RID_SVXPAGE_BACKGROUND (RID_SVX_START + 1)
@@ -436,6 +436,8 @@
#define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300)
#define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301)
#define RID_SVXPAGE_IMPROVEMENT (RID_SVX_START + 302)
+#define RID_SVXPAGE_EVENTASSIGN (RID_SVX_START + 303)
+#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304)
// !!! please update RID_SVX_FIRSTFREE !!! see line 46
// Strings ------------------------------------------------------------------
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index 85728dd654..0db2d86534 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -63,6 +63,8 @@ class Graphic;
class SdrObject;
namespace svx{ class SpellDialogChildWindow;}
+#define EMPTY_FRAME_REF com::sun::star::uno::Reference < com::sun::star::frame::XFrame >()
+
//#define SVX_DIALOGFACTORY_CLASSID 0xf8e5fd97, 0x49e2, 0x4ae5, 0xac, 0x31, 0x4, 0xcb, 0xf7, 0xf3, 0xcf, 0x69
class AbstractSvxDistributeDialog :public VclAbstractDialog //add for SvxDistributeDialog
{
@@ -177,22 +179,6 @@ public:
virtual void Invalidate( USHORT nFlags = 0 ) = 0;
};
-class AbstractSvxCharacterMap :public VclAbstractDialog //add for SvxCharacterMap
-{
-public:
- virtual void SetText( const XubString& rStr )=0; //From class Window
- virtual void DisableFontSelection()=0;
-
- virtual const Font& GetCharFont() const =0;
- virtual void SetCharFont( const Font& rFont )=0;
- virtual void SetFont( const Font& rFont ) =0;
-
- virtual void SetChar( sal_Unicode c )=0;
- virtual sal_Unicode GetChar() const=0;
-
- virtual String GetCharacters() const=0;
-};
-
class AbstractSvxSearchFormatDialog : public SfxAbstractTabDialog //for SvxSearchFormatDialog
{
public:
@@ -421,13 +407,9 @@ public:
virtual AbstractURLDlg * CreateURLDialog( Window* pParent,
const String& rURL, const String& rAltText, const String& rDescription,
const String& rTarget, const String& rName,
- TargetList& rTargetList,
- sal_uInt32 nResId) = 0;
+ TargetList& rTargetList ) = 0;
virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) =0; //add for SvxHlinkDlgMarkWnd
- virtual AbstractSvxCharacterMap * CreateSvxCharacterMap( Window* pParent, //add for SvxCharacterMap
- sal_uInt32 nResId,
- BOOL bOne = TRUE ) = 0;
virtual SfxAbstractTabDialog* CreateTabItemDialog( Window* pParent, //add for SvxSearchFormatDialog
const SfxItemSet& rSet,
sal_uInt32 nResId) = 0;
@@ -518,11 +500,17 @@ public:
sal_uInt32 nResId,
const SdrObject* pObj = NULL,
BOOL bHasObj = TRUE )=0;
- virtual AbstractSfxSingleTabDialog* CreateSfxSingleTabDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
+ virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0;
+ virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
const SfxItemSet& rAttr,
const SdrView* pView,
sal_uInt32 nResId
)=0;
+ 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 AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
const SfxItemSet& rCoreSet,
sal_uInt32 nResId,
diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx
index 1717522043..dbebc22532 100644
--- a/svx/inc/svx/xflbckit.hxx
+++ b/svx/inc/svx/xflbckit.hxx
@@ -31,9 +31,8 @@
#ifndef _SVX_XFLBCKIT_HXX
#define _SVX_XFLBCKIT_HXX
-#ifndef _SFXINTITEM_HXX //autogen
#include <svtools/eitem.hxx>
-#endif
+#include "svx/svxdllapi.h"
/*************************************************************************
|*
@@ -41,7 +40,7 @@
|*
\************************************************************************/
-class XFillBackgroundItem : public SfxBoolItem
+class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx
index b95edfe05b..43367a2238 100644
--- a/svx/inc/svx/xflbmpit.hxx
+++ b/svx/inc/svx/xflbmpit.hxx
@@ -32,6 +32,7 @@
#define _SVX_XFLBMPIT_HXX
#include <svtools/eitem.hxx>
+#include "svx/svxdllapi.h"
/*************************************************************************
|*
@@ -39,7 +40,7 @@
|*
\************************************************************************/
-class XFillBmpPosItem : public SfxEnumItem
+class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx
index d2af3f8ffa..c1cf2ad936 100644
--- a/svx/inc/svx/xflbmsli.hxx
+++ b/svx/inc/svx/xflbmsli.hxx
@@ -32,6 +32,7 @@
#define _SVX_XFLBMSLI_HXX
#include <svtools/eitem.hxx>
+#include "svx/svxdllapi.h"
/*************************************************************************
|*
@@ -39,7 +40,7 @@
|*
\************************************************************************/
-class XFillBmpSizeLogItem : public SfxBoolItem
+class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx
index 271727cfde..45eb9d32ba 100644
--- a/svx/inc/svx/xflbmsxy.hxx
+++ b/svx/inc/svx/xflbmsxy.hxx
@@ -32,6 +32,7 @@
#define _SVX_XFLBMSXY_HXX
#include <svtools/metitem.hxx>
+#include "svx/svxdllapi.h"
/*************************************************************************
|*
@@ -39,7 +40,7 @@
|*
\************************************************************************/
-class XFillBmpSizeXItem : public SfxMetricItem
+class SVX_DLLPUBLIC XFillBmpSizeXItem : public SfxMetricItem
{
public:
TYPEINFO();
@@ -66,7 +67,7 @@ public:
|*
\************************************************************************/
-class XFillBmpSizeYItem : public SfxMetricItem
+class SVX_DLLPUBLIC XFillBmpSizeYItem : public SfxMetricItem
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx
index 1cce60d22f..59dd441545 100644
--- a/svx/inc/svx/xflboxy.hxx
+++ b/svx/inc/svx/xflboxy.hxx
@@ -32,6 +32,7 @@
#define _SVX_XFLBOXY_HXX
#include <svtools/intitem.hxx>
+#include "svx/svxdllapi.h"
/*************************************************************************
|*
@@ -39,7 +40,7 @@
|*
\************************************************************************/
-class XFillBmpPosOffsetXItem : public SfxUInt16Item
+class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item
{
public:
TYPEINFO();
@@ -62,7 +63,7 @@ public:
|*
\************************************************************************/
-class XFillBmpPosOffsetYItem : public SfxUInt16Item
+class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item
{
public:
TYPEINFO();
diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx
index f5a5281ff2..dd7068e7e6 100644
--- a/svx/inc/svx/xflbtoxy.hxx
+++ b/svx/inc/svx/xflbtoxy.hxx
@@ -32,6 +32,7 @@
#define _SVX_XFLBTOXY_HXX
#include <svtools/intitem.hxx>
+#include "svx/svxdllapi.h"
/*************************************************************************
|*
@@ -39,7 +40,7 @@
|*
\************************************************************************/
-class XFillBmpTileOffsetXItem : public SfxUInt16Item
+class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item
{
public:
TYPEINFO();
@@ -62,7 +63,7 @@ public:
|*
\************************************************************************/
-class XFillBmpTileOffsetYItem : public SfxUInt16Item
+class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item
{
public:
TYPEINFO();
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 44dc3e1740..51d1217cea 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -14,7 +14,6 @@ sx svx\source\unodialogs\textconversiondlgs nmake - all sx_textconversiondlgs
sx svx\sdi nmake - all sx_sdi sx_inc NULL
sx svx\source\src nmake - all sx_src sx_inc sx_sdi NULL
sx svx\source\intro nmake - all sx_intro sx_inc NULL
-sx svx\source\init nmake - all sx_init sx_inc NULL
sx svx\source\items nmake - all sx_items sx_inc sx_sdi NULL
sx svx\source\xoutdev nmake - all sx_xout sx_items sx_inc NULL
sx svx\source\editeng nmake - all sx_eeng sx_inc NULL
@@ -38,7 +37,7 @@ sx svx\source\form nmake - all sx_form sx_sdi sx_inc NULL
sx svx\source\fmcomp nmake - all sx_fmcmp sx_sdi sx_inc NULL
sx svx\source\tbxctrls nmake - all sx_tbxc sx_inc NULL
sx svx\source\options nmake - all sx_opt sx_inc NULL
-sx svx\source\dialog nmake - all sx_dlg sx_inc NULL
+sx svx\source\dialog nmake - all sx_dlg sx_inc NULL
sx svx\source\svrtf nmake - all sx_rtf sx_inc NULL
sx svx\source\unodraw nmake - all sx_undrw sx_inc NULL
sx svx\source\unoedit nmake - all sx_unedt sx_inc NULL
@@ -49,5 +48,6 @@ sx svx\source\xml nmake - all sx_xml sx_inc NULL
sx svx\source\accessibility nmake - all sx_accessibility sx_inc NULL
sx svx\source\customshapes nmake - all sx_customshapes sx_inc NULL
sx svx\source\toolbars nmake - all sx_toolbars sx_inc NULL
-sx svx\util nmake - all sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_eeng sx_fmcmp sx_form sx_gall sx_items sx_link sx_mnuc sx_msfilt sx_opt sx_outl sx_rtf sx_sdi sx_stbc sx_tbxc sx_undrw sx_unedt sx_ungal sx_xml sx_xout sx_accessibility sx_intro sx_init sx_customshapes sx_toolbars sx_table sx_smarttags NULL
+sx svx\source\cui nmake - all sx_cui sx_inc NULL
+sx svx\util nmake - all sx_util sx_cui sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_eeng sx_fmcmp sx_form sx_gall sx_items sx_link sx_mnuc sx_msfilt sx_opt sx_outl sx_rtf sx_sdi sx_stbc sx_tbxc sx_undrw sx_unedt sx_ungal sx_xml sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL
sx svx\source\gengal nmake - all sx_gengal sx_util NULL
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 2eb7c21353..a69aae4cf9 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6268,7 +6268,7 @@ SfxVoidItem InsertSound SID_INSERT_SOUND
//--------------------------------------------------------------------------
SfxVoidItem InsertSymbol SID_CHARMAP
-(SvxFontItem Font SID_CHARMAP,SfxStringItem Symbols SID_ATTR_SPECIALCHAR)
+(SfxStringItem Symbols SID_CHARMAP, SfxStringItem FontName SID_ATTR_SPECIALCHAR)
[
/* flags: */
AutoUpdate = FALSE,
diff --git a/svx/source/dialog/ControlFocusHelper.hxx b/svx/source/cui/ControlFocusHelper.hxx
index addf0f8d1d..addf0f8d1d 100644
--- a/svx/source/dialog/ControlFocusHelper.hxx
+++ b/svx/source/cui/ControlFocusHelper.hxx
diff --git a/svx/source/dialog/SpellAttrib.cxx b/svx/source/cui/SpellAttrib.cxx
index 8d071f40c5..8d071f40c5 100644
--- a/svx/source/dialog/SpellAttrib.cxx
+++ b/svx/source/cui/SpellAttrib.cxx
diff --git a/svx/source/dialog/SpellAttrib.hxx b/svx/source/cui/SpellAttrib.hxx
index e7920d24d1..e7920d24d1 100644
--- a/svx/source/dialog/SpellAttrib.hxx
+++ b/svx/source/cui/SpellAttrib.hxx
diff --git a/svx/source/dialog/SpellDialog.cxx b/svx/source/cui/SpellDialog.cxx
index bead9b97bf..bead9b97bf 100644
--- a/svx/source/dialog/SpellDialog.cxx
+++ b/svx/source/cui/SpellDialog.cxx
diff --git a/svx/source/dialog/SpellDialog.hrc b/svx/source/cui/SpellDialog.hrc
index b4be954bf3..b4be954bf3 100644
--- a/svx/source/dialog/SpellDialog.hrc
+++ b/svx/source/cui/SpellDialog.hrc
diff --git a/svx/source/dialog/SpellDialog.src b/svx/source/cui/SpellDialog.src
index 9b899f77b1..9b899f77b1 100644
--- a/svx/source/dialog/SpellDialog.src
+++ b/svx/source/cui/SpellDialog.src
diff --git a/sfx2/source/dialog/acccfg.cxx b/svx/source/cui/acccfg.cxx
index a5aaac9d17..43e0bb5bae 100644
--- a/sfx2/source/dialog/acccfg.cxx
+++ b/svx/source/cui/acccfg.cxx
@@ -29,21 +29,24 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
+#include "precompiled_svx.hxx"
//-----------------------------------------------
// include own files
#include "acccfg.hxx"
-#include "cfg.hxx"
-#include "sfxresid.hxx"
+#include "cfgutil.hxx"
+#include <svx/dialmgr.hxx>
+
#include <sfx2/msg.hxx>
#include <sfx2/macrconf.hxx>
#include <sfx2/app.hxx>
#include <sfx2/filedlghelper.hxx>
+#include <sfx2/minfitem.hxx>
+#include <svtools/stritem.hxx>
-#include "dialog.hrc"
-#include "cfg.hrc"
+#include "svx/dialogs.hrc"
+#include "acccfg.hrc"
//-----------------------------------------------
// include interface declarations
@@ -54,6 +57,7 @@
#include <com/sun/star/form/XReset.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
@@ -85,6 +89,8 @@
namespace css = ::com::sun::star;
#endif
+using namespace com::sun::star;
+
//-----------------------------------------------
// definitions
@@ -304,12 +310,267 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
KEY_END | KEY_SHIFT | KEY_MOD1,
KEY_PAGEUP | KEY_SHIFT | KEY_MOD1,
KEY_PAGEDOWN | KEY_SHIFT | KEY_MOD1,
-
KEY_RETURN | KEY_SHIFT | KEY_MOD1,
KEY_SPACE | KEY_SHIFT | KEY_MOD1,
KEY_BACKSPACE | KEY_SHIFT | KEY_MOD1,
KEY_INSERT | KEY_SHIFT | KEY_MOD1,
KEY_DELETE | KEY_SHIFT | KEY_MOD1,
+
+ KEY_0 | KEY_MOD2 ,
+ KEY_1 | KEY_MOD2 ,
+ KEY_2 | KEY_MOD2 ,
+ KEY_3 | KEY_MOD2 ,
+ KEY_4 | KEY_MOD2 ,
+ KEY_5 | KEY_MOD2 ,
+ KEY_6 | KEY_MOD2 ,
+ KEY_7 | KEY_MOD2 ,
+ KEY_8 | KEY_MOD2 ,
+ KEY_9 | KEY_MOD2 ,
+ KEY_A | KEY_MOD2 ,
+ KEY_B | KEY_MOD2 ,
+ KEY_C | KEY_MOD2 ,
+ KEY_D | KEY_MOD2 ,
+ KEY_E | KEY_MOD2 ,
+ KEY_F | KEY_MOD2 ,
+ KEY_G | KEY_MOD2 ,
+ KEY_H | KEY_MOD2 ,
+ KEY_I | KEY_MOD2 ,
+ KEY_J | KEY_MOD2 ,
+ KEY_K | KEY_MOD2 ,
+ KEY_L | KEY_MOD2 ,
+ KEY_M | KEY_MOD2 ,
+ KEY_N | KEY_MOD2 ,
+ KEY_O | KEY_MOD2 ,
+ KEY_P | KEY_MOD2 ,
+ KEY_Q | KEY_MOD2 ,
+ KEY_R | KEY_MOD2 ,
+ KEY_S | KEY_MOD2 ,
+ KEY_T | KEY_MOD2 ,
+ KEY_U | KEY_MOD2 ,
+ KEY_V | KEY_MOD2 ,
+ KEY_W | KEY_MOD2 ,
+ KEY_X | KEY_MOD2 ,
+ KEY_Y | KEY_MOD2 ,
+ KEY_Z | KEY_MOD2 ,
+
+ KEY_F1 | KEY_MOD2 ,
+ KEY_F2 | KEY_MOD2 ,
+ KEY_F3 | KEY_MOD2 ,
+ KEY_F4 | KEY_MOD2 ,
+ KEY_F5 | KEY_MOD2 ,
+ KEY_F6 | KEY_MOD2 ,
+ KEY_F7 | KEY_MOD2 ,
+ KEY_F8 | KEY_MOD2 ,
+ KEY_F9 | KEY_MOD2 ,
+ KEY_F10 | KEY_MOD2 ,
+ KEY_F11 | KEY_MOD2 ,
+ KEY_F12 | KEY_MOD2 ,
+
+ KEY_DOWN | KEY_MOD2 ,
+ KEY_UP | KEY_MOD2 ,
+ KEY_LEFT | KEY_MOD2 ,
+ KEY_RIGHT | KEY_MOD2 ,
+ KEY_HOME | KEY_MOD2 ,
+ KEY_END | KEY_MOD2 ,
+ KEY_PAGEUP | KEY_MOD2 ,
+ KEY_PAGEDOWN | KEY_MOD2 ,
+ KEY_RETURN | KEY_MOD2 ,
+ KEY_SPACE | KEY_MOD2 ,
+ KEY_BACKSPACE | KEY_MOD2 ,
+ KEY_INSERT | KEY_MOD2 ,
+ KEY_DELETE | KEY_MOD2 ,
+
+ KEY_0 | KEY_SHIFT | KEY_MOD2,
+ KEY_1 | KEY_SHIFT | KEY_MOD2,
+ KEY_2 | KEY_SHIFT | KEY_MOD2,
+ KEY_3 | KEY_SHIFT | KEY_MOD2,
+ KEY_4 | KEY_SHIFT | KEY_MOD2,
+ KEY_5 | KEY_SHIFT | KEY_MOD2,
+ KEY_6 | KEY_SHIFT | KEY_MOD2,
+ KEY_7 | KEY_SHIFT | KEY_MOD2,
+ KEY_8 | KEY_SHIFT | KEY_MOD2,
+ KEY_9 | KEY_SHIFT | KEY_MOD2,
+ KEY_A | KEY_SHIFT | KEY_MOD2,
+ KEY_B | KEY_SHIFT | KEY_MOD2,
+ KEY_C | KEY_SHIFT | KEY_MOD2,
+ KEY_D | KEY_SHIFT | KEY_MOD2,
+ KEY_E | KEY_SHIFT | KEY_MOD2,
+ KEY_F | KEY_SHIFT | KEY_MOD2,
+ KEY_G | KEY_SHIFT | KEY_MOD2,
+ KEY_H | KEY_SHIFT | KEY_MOD2,
+ KEY_I | KEY_SHIFT | KEY_MOD2,
+ KEY_J | KEY_SHIFT | KEY_MOD2,
+ KEY_K | KEY_SHIFT | KEY_MOD2,
+ KEY_L | KEY_SHIFT | KEY_MOD2,
+ KEY_M | KEY_SHIFT | KEY_MOD2,
+ KEY_N | KEY_SHIFT | KEY_MOD2,
+ KEY_O | KEY_SHIFT | KEY_MOD2,
+ KEY_P | KEY_SHIFT | KEY_MOD2,
+ KEY_Q | KEY_SHIFT | KEY_MOD2,
+ KEY_R | KEY_SHIFT | KEY_MOD2,
+ KEY_S | KEY_SHIFT | KEY_MOD2,
+ KEY_T | KEY_SHIFT | KEY_MOD2,
+ KEY_U | KEY_SHIFT | KEY_MOD2,
+ KEY_V | KEY_SHIFT | KEY_MOD2,
+ KEY_W | KEY_SHIFT | KEY_MOD2,
+ KEY_X | KEY_SHIFT | KEY_MOD2,
+ KEY_Y | KEY_SHIFT | KEY_MOD2,
+ KEY_Z | KEY_SHIFT | KEY_MOD2,
+
+ KEY_F1 | KEY_SHIFT | KEY_MOD2,
+ KEY_F2 | KEY_SHIFT | KEY_MOD2,
+ KEY_F3 | KEY_SHIFT | KEY_MOD2,
+ KEY_F4 | KEY_SHIFT | KEY_MOD2,
+ KEY_F5 | KEY_SHIFT | KEY_MOD2,
+ KEY_F6 | KEY_SHIFT | KEY_MOD2,
+ KEY_F7 | KEY_SHIFT | KEY_MOD2,
+ KEY_F8 | KEY_SHIFT | KEY_MOD2,
+ KEY_F9 | KEY_SHIFT | KEY_MOD2,
+ KEY_F10 | KEY_SHIFT | KEY_MOD2,
+ KEY_F11 | KEY_SHIFT | KEY_MOD2,
+ KEY_F12 | KEY_SHIFT | KEY_MOD2,
+
+ KEY_DOWN | KEY_SHIFT | KEY_MOD2,
+ KEY_UP | KEY_SHIFT | KEY_MOD2,
+ KEY_LEFT | KEY_SHIFT | KEY_MOD2,
+ KEY_RIGHT | KEY_SHIFT | KEY_MOD2,
+ KEY_HOME | KEY_SHIFT | KEY_MOD2,
+ KEY_END | KEY_SHIFT | KEY_MOD2,
+ KEY_PAGEUP | KEY_SHIFT | KEY_MOD2,
+ KEY_PAGEDOWN | KEY_SHIFT | KEY_MOD2,
+ KEY_RETURN | KEY_SHIFT | KEY_MOD2,
+ KEY_SPACE | KEY_SHIFT | KEY_MOD2,
+ KEY_BACKSPACE | KEY_SHIFT | KEY_MOD2,
+ KEY_INSERT | KEY_SHIFT | KEY_MOD2,
+ KEY_DELETE | KEY_SHIFT | KEY_MOD2,
+
+ KEY_0 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_1 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_2 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_3 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_4 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_5 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_6 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_7 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_8 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_9 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_A | KEY_MOD1 | KEY_MOD2 ,
+ KEY_B | KEY_MOD1 | KEY_MOD2 ,
+ KEY_C | KEY_MOD1 | KEY_MOD2 ,
+ KEY_D | KEY_MOD1 | KEY_MOD2 ,
+ KEY_E | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F | KEY_MOD1 | KEY_MOD2 ,
+ KEY_G | KEY_MOD1 | KEY_MOD2 ,
+ KEY_H | KEY_MOD1 | KEY_MOD2 ,
+ KEY_I | KEY_MOD1 | KEY_MOD2 ,
+ KEY_J | KEY_MOD1 | KEY_MOD2 ,
+ KEY_K | KEY_MOD1 | KEY_MOD2 ,
+ KEY_L | KEY_MOD1 | KEY_MOD2 ,
+ KEY_M | KEY_MOD1 | KEY_MOD2 ,
+ KEY_N | KEY_MOD1 | KEY_MOD2 ,
+ KEY_O | KEY_MOD1 | KEY_MOD2 ,
+ KEY_P | KEY_MOD1 | KEY_MOD2 ,
+ KEY_Q | KEY_MOD1 | KEY_MOD2 ,
+ KEY_R | KEY_MOD1 | KEY_MOD2 ,
+ KEY_S | KEY_MOD1 | KEY_MOD2 ,
+ KEY_T | KEY_MOD1 | KEY_MOD2 ,
+ KEY_U | KEY_MOD1 | KEY_MOD2 ,
+ KEY_V | KEY_MOD1 | KEY_MOD2 ,
+ KEY_W | KEY_MOD1 | KEY_MOD2 ,
+ KEY_X | KEY_MOD1 | KEY_MOD2 ,
+ KEY_Y | KEY_MOD1 | KEY_MOD2 ,
+ KEY_Z | KEY_MOD1 | KEY_MOD2 ,
+
+ KEY_F1 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F2 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F3 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F4 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F5 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F6 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F7 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F8 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F9 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F10 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F11 | KEY_MOD1 | KEY_MOD2 ,
+ KEY_F12 | KEY_MOD1 | KEY_MOD2 ,
+
+ KEY_DOWN | KEY_MOD1 | KEY_MOD2 ,
+ KEY_UP | KEY_MOD1 | KEY_MOD2 ,
+ KEY_LEFT | KEY_MOD1 | KEY_MOD2 ,
+ KEY_RIGHT | KEY_MOD1 | KEY_MOD2 ,
+ KEY_HOME | KEY_MOD1 | KEY_MOD2 ,
+ KEY_END | KEY_MOD1 | KEY_MOD2 ,
+ KEY_PAGEUP | KEY_MOD1 | KEY_MOD2 ,
+ KEY_PAGEDOWN | KEY_MOD1 | KEY_MOD2 ,
+ KEY_RETURN | KEY_MOD1 | KEY_MOD2 ,
+ KEY_SPACE | KEY_MOD1 | KEY_MOD2 ,
+ KEY_BACKSPACE | KEY_MOD1 | KEY_MOD2 ,
+ KEY_INSERT | KEY_MOD1 | KEY_MOD2 ,
+ KEY_DELETE | KEY_MOD1 | KEY_MOD2 ,
+
+ KEY_0 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_1 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_2 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_3 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_4 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_5 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_6 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_7 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_8 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_9 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_A | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_B | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_C | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_D | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_E | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_G | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_H | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_I | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_J | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_K | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_L | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_M | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_N | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_O | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_P | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_Q | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_R | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_S | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_T | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_U | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_V | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_W | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_X | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_Y | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_Z | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+
+ KEY_F1 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F2 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F3 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F4 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F5 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F6 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F7 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F8 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F9 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F10 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F11 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_F12 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+
+ KEY_DOWN | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_UP | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_LEFT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_RIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_HOME | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_END | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_PAGEUP | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_PAGEDOWN | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_RETURN | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_SPACE | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_BACKSPACE | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_INSERT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
+ KEY_DELETE | KEY_SHIFT | KEY_MOD1 | KEY_MOD2
};
static USHORT KEYCODE_ARRAY_SIZE = (sizeof(KEYCODE_ARRAY) / sizeof(KEYCODE_ARRAY[0]));
@@ -438,25 +699,31 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
//-----------------------------------------------
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxItemSet& aSet )
- : SfxTabPage (pParent, SfxResId(TP_CONFIG_ACCEL), aSet)
+ : SfxTabPage (pParent, SVX_RES(RID_SVXPAGE_KEYBOARD), aSet)
, m_pMacroInfoItem ()
+ , m_pStringItem ()
+ , m_pFontItem ()
, m_pFileDlg (NULL)
- , aEntriesBox (this , this, SfxResId(BOX_ACC_ENTRIES ))
- , aKeyboardGroup (this , SfxResId(GRP_ACC_KEYBOARD ))
- , aOfficeButton (this , SfxResId(RB_OFFICE ))
- , aModuleButton (this , SfxResId(RB_MODULE ))
- , aChangeButton (this , SfxResId(BTN_ACC_CHANGE ))
- , aRemoveButton (this , SfxResId(BTN_ACC_REMOVE ))
- , aGroupText (this , SfxResId(TXT_ACC_GROUP ))
- , aGroupLBox (this , SfxResId(BOX_ACC_GROUP), SFX_SLOT_ACCELCONFIG)
- , aFunctionText (this , SfxResId(TXT_ACC_FUNCTION ))
- , aFunctionBox (this , SfxResId(BOX_ACC_FUNCTION ))
- , aKeyText (this , SfxResId(TXT_ACC_KEY ))
- , aKeyBox (this , SfxResId(BOX_ACC_KEY ))
- , aFunctionsGroup (this , SfxResId(GRP_ACC_FUNCTIONS ))
- , aLoadButton (this , SfxResId(BTN_LOAD ))
- , aSaveButton (this , SfxResId(BTN_SAVE ))
- , aResetButton (this , SfxResId(BTN_RESET ))
+ , aEntriesBox (this , this, SVX_RES(BOX_ACC_ENTRIES ))
+ , aKeyboardGroup (this , SVX_RES(GRP_ACC_KEYBOARD ))
+ , aOfficeButton (this , SVX_RES(RB_OFFICE ))
+ , aModuleButton (this , SVX_RES(RB_MODULE ))
+ , aChangeButton (this , SVX_RES(BTN_ACC_CHANGE ))
+ , aRemoveButton (this , SVX_RES(BTN_ACC_REMOVE ))
+ , aGroupText (this , SVX_RES(TXT_ACC_GROUP ))
+ , pGroupLBox(new SfxConfigGroupListBox_Impl( this, SVX_RES(BOX_ACC_GROUP), SFX_SLOT_ACCELCONFIG ))
+ , aFunctionText (this , SVX_RES(TXT_ACC_FUNCTION ))
+ , pFunctionBox(new SfxConfigFunctionListBox_Impl( this, SVX_RES( BOX_ACC_FUNCTION )))
+ , aKeyText (this , SVX_RES(TXT_ACC_KEY ))
+ , aKeyBox (this , SVX_RES(BOX_ACC_KEY ))
+ , aFunctionsGroup (this , SVX_RES(GRP_ACC_FUNCTIONS ))
+ , aLoadButton (this , SVX_RES(BTN_LOAD ))
+ , aSaveButton (this , SVX_RES(BTN_SAVE ))
+ , aResetButton (this , SVX_RES(BTN_RESET ))
+ , aLoadAccelConfigStr ( SVX_RES( STR_LOADACCELCONFIG ) )
+ , aSaveAccelConfigStr ( SVX_RES( STR_SAVEACCELCONFIG ) )
+ , aFilterAllStr ( SVX_RES( STR_SFX_FILTERNAME_ALL ) )
+ , aFilterCfgStr ( SVX_RES( STR_FILTERNAME_CFG ) )
, m_bStylesInfoInitialized(sal_False)
, m_xGlobal ()
, m_xModule ()
@@ -464,12 +731,12 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
{
FreeResource();
- // install handler functions
+// install handler functions
aChangeButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, ChangeHdl ));
aRemoveButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, RemoveHdl ));
aEntriesBox.SetSelectHdl ( LINK( this, SfxAcceleratorConfigPage, SelectHdl ));
- aGroupLBox.SetSelectHdl ( LINK( this, SfxAcceleratorConfigPage, SelectHdl ));
- aFunctionBox.SetSelectHdl( LINK( this, SfxAcceleratorConfigPage, SelectHdl ));
+ pGroupLBox->SetSelectHdl ( LINK( this, SfxAcceleratorConfigPage, SelectHdl ));
+ pFunctionBox->SetSelectHdl( LINK( this, SfxAcceleratorConfigPage, SelectHdl ));
aKeyBox.SetSelectHdl ( LINK( this, SfxAcceleratorConfigPage, SelectHdl ));
aLoadButton.SetClickHdl ( LINK( this, SfxAcceleratorConfigPage, Load ));
aSaveButton.SetClickHdl ( LINK( this, SfxAcceleratorConfigPage, Save ));
@@ -499,7 +766,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
aEntriesBox.SetTab( 1, nNewTab );
// initialize GroupBox
- aGroupLBox.SetFunctionListBox(&aFunctionBox);
+ pGroupLBox->SetFunctionListBox(pFunctionBox);
// initialize KeyBox
aKeyBox.SetWindowBits(WB_CLIPCHILDREN|WB_HSCROLL|WB_SORT);
@@ -531,6 +798,8 @@ SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage()
aKeyBox.Clear();
delete m_pFileDlg;
+ delete pGroupLBox;
+ delete pFunctionBox;
}
//-----------------------------------------------
@@ -610,8 +879,8 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
xModel = xController->getModel();
m_aStylesInfo.setModel(xModel);
- aFunctionBox.SetStylesInfo(&m_aStylesInfo);
- aGroupLBox.SetStylesInfo(&m_aStylesInfo);
+ pFunctionBox->SetStylesInfo(&m_aStylesInfo);
+ pGroupLBox->SetStylesInfo(&m_aStylesInfo);
m_bStylesInfoInitialized = sal_True;
}
@@ -727,16 +996,14 @@ void SfxAcceleratorConfigPage::ResetConfig()
IMPL_LINK( SfxAcceleratorConfigPage, Load, Button*, EMPTYARG )
{
// ask for filename, where we should load the new config data from
- StartFileDialog( WB_OPEN | WB_STDMODAL | WB_3DLOOK,
- String( SfxResId( STR_LOADACCELCONFIG ) ) );
+ StartFileDialog( WB_OPEN | WB_STDMODAL | WB_3DLOOK, aLoadAccelConfigStr );
return 0;
}
//-----------------------------------------------
IMPL_LINK( SfxAcceleratorConfigPage, Save, Button*, EMPTYARG )
{
- StartFileDialog( WB_SAVEAS | WB_STDMODAL | WB_3DLOOK,
- String( SfxResId( STR_SAVEACCELCONFIG ) ) );
+ StartFileDialog( WB_SAVEAS | WB_STDMODAL | WB_3DLOOK, aLoadAccelConfigStr );
return 0;
}
@@ -762,8 +1029,8 @@ IMPL_LINK( SfxAcceleratorConfigPage, ChangeHdl, Button*, EMPTYARG )
{
USHORT nPos = (USHORT) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
- String sNewCommand = aFunctionBox.GetCurCommand();
- String sLabel = aFunctionBox.GetCurLabel();
+ String sNewCommand = pFunctionBox->GetCurCommand();
+ String sLabel = pFunctionBox->GetCurLabel();
if (!sLabel.Len())
sLabel = GetLabel4Command(sNewCommand);
@@ -771,7 +1038,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, ChangeHdl, Button*, EMPTYARG )
USHORT nCol = aEntriesBox.TabCount() - 1;
aEntriesBox.SetEntryText(sLabel, nPos, nCol);
- ((Link &) aFunctionBox.GetSelectHdl()).Call( &aFunctionBox );
+ ((Link &) pFunctionBox->GetSelectHdl()).Call( pFunctionBox );
return 0;
}
@@ -787,7 +1054,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, RemoveHdl, Button *, EMPTYARG )
aEntriesBox.SetEntryText( String(), nPos, nCol );
pEntry->m_sCommand = ::rtl::OUString();
- ((Link &) aFunctionBox.GetSelectHdl()).Call( &aFunctionBox );
+ ((Link &) pFunctionBox->GetSelectHdl()).Call( pFunctionBox );
return 0;
}
@@ -800,7 +1067,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
{
USHORT nPos = (USHORT) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
- ::rtl::OUString sPossibleNewCommand = aFunctionBox.GetCurCommand();
+ ::rtl::OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
aRemoveButton.Enable( FALSE );
aChangeButton.Enable( FALSE );
@@ -812,13 +1079,13 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
aChangeButton.Enable( pEntry->m_sCommand != sPossibleNewCommand );
}
}
- else if ( pListBox == &aGroupLBox )
+ else if ( pListBox == pGroupLBox )
{
- aGroupLBox.GroupSelected();
- if ( !aFunctionBox.FirstSelected() )
+ pGroupLBox->GroupSelected();
+ if ( !pFunctionBox->FirstSelected() )
aChangeButton.Enable( FALSE );
}
- else if ( pListBox == &aFunctionBox )
+ else if ( pListBox == pFunctionBox )
{
aRemoveButton.Enable( FALSE );
aChangeButton.Enable( FALSE );
@@ -829,7 +1096,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
{
USHORT nPos = (USHORT) aEntriesBox.GetModel()->GetRelPos( pLBEntry );
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
- ::rtl::OUString sPossibleNewCommand = aFunctionBox.GetCurCommand();
+ ::rtl::OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
if (pEntry->m_bIsConfigurable)
{
@@ -900,17 +1167,17 @@ IMPL_LINK( SfxAcceleratorConfigPage, RadioHdl, RadioButton *, EMPTYARG )
aEntriesBox.SetUpdateMode( TRUE );
aEntriesBox.Invalidate();
- aGroupLBox.Init(m_xSMGR, m_xFrame, m_sModuleLongName);
+ pGroupLBox->Init(m_xSMGR, m_xFrame, m_sModuleLongName);
// pb: #133213# do not select NULL entries
SvLBoxEntry* pEntry = aEntriesBox.GetEntry( 0, 0 );
if ( pEntry )
aEntriesBox.Select( pEntry );
- pEntry = aGroupLBox.GetEntry( 0, 0 );
+ pEntry = pGroupLBox->GetEntry( 0, 0 );
if ( pEntry )
- aGroupLBox.Select( pEntry );
+ pGroupLBox->Select( pEntry );
- ((Link &) aFunctionBox.GetSelectHdl()).Call( &aFunctionBox );
+ ((Link &) pFunctionBox->GetSelectHdl()).Call( pFunctionBox );
return 1L;
}
@@ -1100,6 +1367,47 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG
return 0;
}
+::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL )
+{
+ ::rtl::OUString aLabel;
+ if ( aCmdURL.getLength() )
+ {
+ try
+ {
+ uno::Reference< container::XNameAccess > xNameAccess( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription") ), uno::UNO_QUERY );
+ if ( xNameAccess.is() )
+ {
+ uno::Reference< container::XNameAccess > xUICommandLabels;
+ const ::rtl::OUString aModule( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) );
+ uno::Any a = xNameAccess->getByName( aModule );
+ uno::Reference< container::XNameAccess > xUICommands;
+ a >>= xUICommandLabels;
+ rtl::OUString aStr;
+ uno::Sequence< beans::PropertyValue > aPropSeq;
+ a = xUICommandLabels->getByName( aCmdURL );
+ if ( a >>= aPropSeq )
+ {
+ for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
+ {
+ if ( aPropSeq[i].Name.equalsAscii( "Name" ))
+ {
+ aPropSeq[i].Value >>= aStr;
+ break;
+ }
+ }
+ }
+ aLabel = aStr;
+ }
+ }
+ catch ( uno::Exception& )
+ {
+ }
+ }
+
+ return aLabel;
+}
+
+
//-----------------------------------------------
String SfxAcceleratorConfigPage::GetFunctionName(KeyFuncType eType) const
{
@@ -1108,76 +1416,77 @@ String SfxAcceleratorConfigPage::GetFunctionName(KeyFuncType eType) const
switch(eType)
{
case KEYFUNC_NEW :
- sName.append( String( SfxResId( STR_NEW )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:NewDoc") ) );
+ break;
case KEYFUNC_OPEN :
- sName.append( String( SfxResId( STR_OPEN )));
- break;
-
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Open") ) );
+ break;
+
case KEYFUNC_SAVE :
- sName.append( String( SfxResId( STR_SAVE )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Save") ) );
+ break;
case KEYFUNC_SAVEAS :
- sName.append( String( SfxResId( STR_SAVEAS )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SaveAs") ) );
+ break;
case KEYFUNC_PRINT :
- sName.append( String( SfxResId( STR_PRINT )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Print") ) );
+ break;
case KEYFUNC_CLOSE :
- sName.append( String( SfxResId( STR_CLOSE)));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Close") ) );
+ break;
case KEYFUNC_QUIT :
- sName.append( String( SfxResId( STR_QUIT )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Quit") ) );
+ break;
case KEYFUNC_CUT :
- sName.append( String( SfxResId( STR_CUT )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Cut") ) );
+ break;
case KEYFUNC_COPY :
- sName.append( String( SfxResId( STR_COPY )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Copy") ) );
+ break;
case KEYFUNC_PASTE :
- sName.append( String( SfxResId( STR_PASTE )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Paste") ) );
+ break;
case KEYFUNC_UNDO :
- sName.append( String( SfxResId( STR_UNDO )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Undo") ) );
+ break;
case KEYFUNC_REDO :
- sName.append( String( SfxResId( STR_REDO )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Redo") ) );
+ break;
case KEYFUNC_DELETE :
- sName.append( String( SfxResId( STR_DELETE )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Delete") ) );
+ break;
case KEYFUNC_REPEAT :
- sName.append( String( SfxResId( STR_REPEAT )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Repeat") ) );
+ break;
case KEYFUNC_FIND :
- sName.append( String( SfxResId( STR_FIND )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Search") ) );
+ break;
case KEYFUNC_FINDBACKWARD :
- sName.append( String( SfxResId( STR_FINDBACKWARD )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SearchBackwards") ) );
+ break;
case KEYFUNC_PROPERTIES :
- sName.append( String( SfxResId( STR_PROPERTIES )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Options") ) );
+ break;
case KEYFUNC_FRONT :
- sName.append( String( SfxResId( STR_FRONT )));
- break;
+ sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:ToFront") ) );
+ break;
+
default:
break;
}
@@ -1197,10 +1506,8 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi
m_pFileDlg->SetTitle( rTitle );
// m_pFileDlg->SetDialogHelpId( bSave ? HID_CONFIG_SAVE : HID_CONFIG_LOAD );
- m_pFileDlg->AddFilter( String( SfxResId( STR_SFX_FILTERNAME_ALL ) ),
- DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) );
- m_pFileDlg->AddFilter( String( SfxResId( STR_FILTERNAME_CFG ) ),
- DEFINE_CONST_UNICODE( "*.cfg" ) );
+ m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) );
+ m_pFileDlg->AddFilter( aFilterCfgStr, DEFINE_CONST_UNICODE( "*.cfg" ) );
Link aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl )
: LINK( this, SfxAcceleratorConfigPage, LoadHdl );
@@ -1224,7 +1531,7 @@ BOOL SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& )
}
//-----------------------------------------------
-void SfxAcceleratorConfigPage::Reset( const SfxItemSet& )
+void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
{
// open accelerator configs
// Note: It initialize some other members too, which are needed here ...
@@ -1247,17 +1554,32 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& )
RadioHdl(0);
- /* TODO ???
- if ( m_pMacroInfoItem )
- aGroupLBox.SelectMacro( m_pMacroInfoItem );
- */
+ const SfxPoolItem* pMacroItem=0;
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, TRUE, &pMacroItem ) )
+ {
+ m_pMacroInfoItem = PTR_CAST( SfxMacroInfoItem, pMacroItem );
+ pGroupLBox->SelectMacro( m_pMacroInfoItem );
+ }
+ else
+ {
+ const SfxPoolItem* pStringItem=0;
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, TRUE, &pStringItem ) )
+ m_pStringItem = PTR_CAST( SfxStringItem, pStringItem );
+
+ const SfxPoolItem* pFontItem=0;
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, TRUE, &pFontItem ) )
+ m_pFontItem = PTR_CAST( SfxStringItem, pFontItem );
+
+ if ( m_pStringItem )
+ pGroupLBox->AddAndSelect( m_pStringItem, m_pFontItem );
+ }
}
//-----------------------------------------------
void SfxAcceleratorConfigPage::SelectMacro(const SfxMacroInfoItem *pItem)
{
m_pMacroInfoItem = pItem;
- aGroupLBox.SelectMacro( pItem );
+ pGroupLBox->SelectMacro( pItem );
}
//-----------------------------------------------
@@ -1280,7 +1602,7 @@ KeyCode SfxAcceleratorConfigPage::MapPosToKeyCode(USHORT nPos) const
{
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
KeyCode aCode(KEYCODE_ARRAY[pEntry->m_nKeyPos] & 0xFFF ,
- KEYCODE_ARRAY[pEntry->m_nKeyPos] & (KEY_SHIFT | KEY_MOD1));
+ KEYCODE_ARRAY[pEntry->m_nKeyPos] & (KEY_SHIFT | KEY_MOD2));
return aCode;
}
@@ -1336,13 +1658,43 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const String& sCommand)
m_aStylesInfo.getLabel4Style(aStyle);
return aStyle.sLabel;
}
+ else
+ {
+ String aRet( String::CreateFromAscii("Symbols: ") );
+ xub_StrLen nPos = sCommand.SearchAscii(".uno:InsertSymbol?Symbols:string=");
+ if ( nPos == 0 )
+ {
+ aRet += String( sCommand, 34, sCommand.Len()-34 );
+ return aRet;
+ }
+ }
return sCommand;
}
+SfxTabPage* SfxAcceleratorConfigPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+{
+ return new SfxAcceleratorConfigPage( pParent, rAttrSet );
+}
+
//-----------------------------------------------
css::uno::Reference< css::frame::XModel > SfxAcceleratorConfigPage::SearchForAlreadyLoadedDoc(const String& /*sName*/)
{
return css::uno::Reference< css::frame::XModel >();
}
+SvxShortcutAssignDlg::SvxShortcutAssignDlg( Window* pParent, const uno::Reference< frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
+ : SfxSingleTabDialog( pParent, rSet, 0 )
+{
+ SfxTabPage* pPage = SfxAcceleratorConfigPage::Create( this, rSet );
+ pPage->SetFrame( rxDocumentFrame );
+ SetTabPage( pPage );
+
+}
+
+SvxShortcutAssignDlg::~SvxShortcutAssignDlg()
+{
+}
+
+
+// .uno:InsertSymbol?Symbols:string=bla
diff --git a/sfx2/source/dialog/cfg.hrc b/svx/source/cui/acccfg.hrc
index 892e9cb0f3..4fecaf4cb1 100644
--- a/sfx2/source/dialog/cfg.hrc
+++ b/svx/source/cui/acccfg.hrc
@@ -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
@@ -28,24 +28,6 @@
*
************************************************************************/
-#include <sfx2/sfxsids.hrc>
-
-#define BTN_MN_OK 1
-#define BTN_MN_CANCEL 2
-#define BTN_MN_NEWPOPUP 6
-#define BTN_MN_NEW 7
-#define BTN_MN_CHANGE 8
-#define BTN_MN_REMOVE 9
-#define BOX_MN_ENTRIES 10
-#define TXT_MN_FUNCTIONTEXT 13
-#define TXT_MN_FUNCTIONINFO 14
-#define TXT_MN_DESCRIPTIONTEXT 15
-#define TXT_MN_DESCRIPTIONINFO 16
-#define GRP_MN_MENU 17
-#define TXT_MN_GROUP 18
-#define BOX_MN_GROUP 19
-#define TXT_MN_FUNCTION 20
-#define BOX_MN_FUNCTION 21
#define GRP_FUNCTIONS 22
#define BTN_ACC_OK 1
#define BTN_ACC_CANCEL 2
@@ -62,16 +44,35 @@
#define TXT_ACC_KEY 13
#define BOX_ACC_KEY 14
#define GRP_ACC_FUNCTIONS 15
-#define TAB_CONTROL 12
-#define BOX_STATBAR_ENTRIES 5
-#define TXT_STATBAR_DESCRIPTIONTEXT 6
-#define TXT_STATBAR_DESCRIPTIONINFO 7
-#define GRP_STATBAR 8
#define BTN_RESET 20
#define BTN_LOAD 40
#define BTN_SAVE 41
-#define BTN_MN_UP 42
-#define BTN_MN_DOWN 43
#define RB_OFFICE 44
#define RB_MODULE 45
+#define STR_LOADACCELCONFIG 46
+#define STR_SAVEACCELCONFIG 47
+
+#define IMG_HARDDISK 48
+#define IMG_HARDDISK_HC 49
+#define STR_PRODMACROS 50
+#define STR_MYMACROS 51
+#define IMG_LIB 52
+#define IMG_LIB_HC 53
+#define IMG_MACRO 54
+#define IMG_MACRO_HC 55
+#define IMG_DOC 56
+#define IMG_DOC_HC 57
+#define STR_GROUP_STYLES 58
+#define STR_PDF_EXPORT_SEND 59
+#define STR_RECHECK_DOCUMENT 60
+#define IMG_INFO 61
+#define STR_BASICNAME 62
+#define BMP_COLLAPSED 63
+#define BMP_EXPANDED 64
+#define BMP_COLLAPSED_HC 65
+#define BMP_EXPANDED_HC 66
+#define STR_BASICMACROS 67
+#define STR_DLG_MACROS 68
+#define STR_HUMAN_APPNAME 69
+#define STR_FILTERNAME_CFG 70
diff --git a/svx/source/cui/acccfg.hxx b/svx/source/cui/acccfg.hxx
new file mode 100644
index 0000000000..d115544cfb
--- /dev/null
+++ b/svx/source/cui/acccfg.hxx
@@ -0,0 +1,288 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: acccfg.hxx,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _ACCCFG_HXX
+#define _ACCCFG_HXX
+
+// #include *****************************************************************
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XStorable.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
+#include <com/sun/star/script/browse/XBrowseNode.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+
+#include <algorithm>
+
+#include <vcl/fixed.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/group.hxx>
+#include <svtools/svtabbx.hxx>
+#include <svtools/svtreebx.hxx>
+#include <sfx2/tabdlg.hxx>
+#include <sfx2/basedlgs.hxx>
+
+#define _SVSTDARR_STRINGSDTOR
+#include <svtools/svstdarr.hxx>
+
+#include <sfx2/minarray.hxx>
+
+#include "cfgutil.hxx"
+
+// class SfxAcceleratorConfigListBox *************************************************
+
+#define css ::com::sun::star
+
+class SfxMacroInfoItem;
+class SfxConfigGroupListBox_Impl;
+class SfxConfigFunctionListBox_Impl;
+class SfxAcceleratorConfigPage;
+
+class SfxAccCfgTabListBox_Impl : public SvTabListBox
+{
+ SfxAcceleratorConfigPage* m_pAccelConfigPage;
+
+ void KeyInput( const KeyEvent &rKEvt );
+
+protected:
+ virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
+
+public:
+ SfxAccCfgTabListBox_Impl(
+ SfxAcceleratorConfigPage* pAccelConfigPage,
+ Window *pParent,
+ const ResId &rResId ) :
+ SvTabListBox( pParent, rResId ),
+ m_pAccelConfigPage( pAccelConfigPage )
+ {}
+
+ void ReplaceEntry( USHORT nPos, const String &rStr );
+};
+
+// class SfxAcceleratorConfigPage ----------------------------------------
+
+struct TAccInfo
+{
+ public:
+
+ TAccInfo( sal_Int32 nKeyPos ,
+ sal_Int32 nListPos,
+ const KeyCode& aKey )
+ : m_nKeyPos (nKeyPos )
+ , m_nListPos (nListPos )
+ , m_bIsConfigurable(sal_True )
+ , m_sCommand ( )
+ , m_aKey (aKey )
+ // its important to set TRUE as default -
+ // because only fix entries will be disabled later ...
+ {}
+
+ sal_Bool isConfigured() const
+ {
+ return (m_nKeyPos>-1 && m_nListPos>-1 && m_sCommand.getLength());
+ }
+
+ sal_Int32 m_nKeyPos;
+ sal_Int32 m_nListPos;
+ sal_Bool m_bIsConfigurable;
+ ::rtl::OUString m_sCommand;
+ KeyCode m_aKey;
+};
+
+namespace sfx2
+{
+ class FileDialogHelper;
+}
+
+class SfxAcceleratorConfigPage : public SfxTabPage
+{
+ friend class SfxAccCfgTabListBox_Impl;
+private:
+ const SfxMacroInfoItem* m_pMacroInfoItem;
+ const SfxStringItem* m_pStringItem;
+ const SfxStringItem* m_pFontItem;
+ sfx2::FileDialogHelper* m_pFileDlg;
+
+ SfxAccCfgTabListBox_Impl aEntriesBox;
+ FixedLine aKeyboardGroup;
+ RadioButton aOfficeButton;
+ RadioButton aModuleButton;
+ PushButton aChangeButton;
+ PushButton aRemoveButton;
+ FixedText aGroupText;
+ SfxConfigGroupListBox_Impl* pGroupLBox;
+ FixedText aFunctionText;
+ SfxConfigFunctionListBox_Impl* pFunctionBox;
+ FixedText aKeyText;
+ SvTreeListBox aKeyBox;
+ FixedLine aFunctionsGroup;
+ PushButton aLoadButton;
+ PushButton aSaveButton;
+ PushButton aResetButton;
+ String aLoadAccelConfigStr;
+ String aSaveAccelConfigStr;
+ String aFilterAllStr;
+ String aFilterCfgStr;
+ SfxStylesInfo_Impl m_aStylesInfo;
+ sal_Bool m_bStylesInfoInitialized;
+
+ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+ css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobal;
+ css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModule;
+ css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xAct;
+ css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
+ css::uno::Reference< css::frame::XFrame > m_xFrame;
+
+ ::rtl::OUString m_sModuleLongName;
+ ::rtl::OUString m_sModuleShortName;
+ ::rtl::OUString m_sModuleUIName;
+
+ DECL_LINK( ChangeHdl, Button * );
+ DECL_LINK( RemoveHdl, Button * );
+ DECL_LINK( SelectHdl, Control * );
+ DECL_LINK( Save, Button * );
+ DECL_LINK( Load, Button * );
+ DECL_LINK( Default, PushButton * );
+ DECL_LINK( RadioHdl, RadioButton* );
+
+ DECL_LINK( LoadHdl, sfx2::FileDialogHelper* );
+ DECL_LINK( SaveHdl, sfx2::FileDialogHelper* );
+
+ String GetLabel4Command(const String& sCommand);
+ void InitAccCfg();
+ KeyCode MapPosToKeyCode( USHORT nPos ) const;
+ USHORT MapKeyCodeToPos( const KeyCode &rCode ) const;
+ String GetFunctionName( KeyFuncType eType ) const;
+ css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName);
+ void StartFileDialog( WinBits nBits, const String& rTitle );
+
+ void Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
+ void ResetConfig();
+
+ void CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 );
+
+public:
+ SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
+ virtual ~SfxAcceleratorConfigPage();
+
+ virtual BOOL FillItemSet( SfxItemSet& );
+ virtual void Reset( const SfxItemSet& );
+
+ void SelectMacro(const SfxMacroInfoItem*);
+ void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
+ void CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr,
+ const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr);
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+};
+
+
+class SfxAcceleratorConfigListBox : public ListBox
+{
+ void KeyInput( const KeyEvent &rKEvt );
+
+public:
+
+ SfxAcceleratorConfigListBox( Window *pParent, ResId &rResId ) :
+ ListBox( pParent, rResId ) {}
+
+ void ReplaceEntry( USHORT nPos, const String &rStr );
+ void ExpandEntry ( USHORT nPos, const String &rStr );
+};
+
+/*
+// class USHORTArr **********************************************************
+
+DECL_2BYTEARRAY(USHORTArr, USHORT, 10, 10)
+
+// class SfxAcceleratorConfigDialog **************************************************
+
+class SfxAcceleratorConfigDialog : public ModalDialog
+{
+ OKButton aOKButton;
+ CancelButton aCancelButton;
+ PushButton aChangeButton;
+ PushButton aRemoveButton;
+ SfxAcceleratorConfigListBox aEntriesBox;
+ FixedText aDescriptionTextText;
+ FixedText aDescriptionInfoText;
+ FixedLine aKeyboardGroup;
+ FixedText aGroupText;
+ ListBox aGroupLBox;
+ FixedText aFunctionText;
+ ListBox aFunctionBox;
+ FixedText aKeyText;
+ ListBox aKeyBox;
+ FixedLine aFunctionsGroup;
+
+ USHORTArr aAccelArr;
+ USHORTArr aFunctionArr;
+ USHORTArr aKeyArr;
+
+ void OKHdl ( Button * );
+ void ChangeHdl( Button * );
+ void RemoveHdl( Button * );
+ void SelectHdl( ListBox *pListBox );
+
+ KeyCode PosToKeyCode ( USHORT nPos ) const;
+ USHORT KeyCodeToPos ( const KeyCode &rCode ) const;
+ String GetFunctionName( KeyFuncType eType ) const;
+
+public:
+
+ SfxAcceleratorConfigDialog( Window *pParent );
+};
+*/
+
+class SvxShortcutAssignDlg : public SfxSingleTabDialog
+{
+public:
+ SvxShortcutAssignDlg(
+ Window* pParent,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
+ const SfxItemSet& rSet );
+ virtual ~SvxShortcutAssignDlg();
+};
+
+
+
+#undef css
+
+#endif
+
diff --git a/sfx2/source/dialog/cfg.src b/svx/source/cui/acccfg.src
index 3ef1ca9673..a8a5ca549b 100644
--- a/sfx2/source/dialog/cfg.src
+++ b/svx/source/cui/acccfg.src
@@ -29,9 +29,8 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include "dialog.hrc"
-#include "cfg.hrc"
- // pragma ----------------------------------------------------------------
+#include "svx/dialogs.hrc"
+#include "acccfg.hrc"
#define MASKCOLOR MaskColor = \
Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
@@ -63,57 +62,8 @@
#define GROUPBOX_TEXT_FUNCTIONS \
Text [ en-US ] = "Functions" ; \
-String STR_MYMACROS
-{
- Text [ en-US ] = "My Macros";
-};
-String STR_PRODMACROS
-{
- Text [ en-US ] = "%PRODUCTNAME Macros";
-};
-Image IMG_HARDDISK
-{
- ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
- MASKCOLOR
-};
-Image IMG_HARDDISK_HC
-{
- ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
- MASKCOLOR
-};
-Image IMG_LIB
-{
- ImageBitmap = Bitmap { File = "im30820.png"; };
- MASKCOLOR
-};
-Image IMG_LIB_HC
-{
- ImageBitmap = Bitmap { File = "imh30820.png"; };
- MASKCOLOR
-};
-Image IMG_MACRO
-{
- ImageBitmap = Bitmap { File = "im30821.png"; };
- MASKCOLOR
-};
-Image IMG_MACRO_HC
-{
- ImageBitmap = Bitmap { File = "imh30821.png"; };
- MASKCOLOR
-};
-Image IMG_DOC
-{
- ImageBitmap = Bitmap { File = "im30826.png"; };
- MASKCOLOR
-};
-Image IMG_DOC_HC
-{
- ImageBitmap = Bitmap { File = "imh30826.png"; };
- MASKCOLOR
-};
-
// TP_CONFIG_ACCEL -------------------------------------------------------
-TabPage TP_CONFIG_ACCEL
+TabPage RID_SVXPAGE_KEYBOARD
{
HelpId = HID_CONFIG_ACCEL ;
Hide = TRUE ;
@@ -237,117 +187,124 @@ TabPage TP_CONFIG_ACCEL
Group = TRUE ;
PUSHBUTTON_TEXT_RESET
};
-};
- // Strings ---------------------------------------------------------------
-String STR_NEW
-{
- Text [ en-US ] = "New" ;
-};
-String STR_OPEN
-{
- Text [ en-US ] = "Open" ;
-};
-String STR_SAVE
-{
- Text [ en-US ] = "Save" ;
-};
-String STR_SAVEAS
-{
- Text [ en-US ] = "Save As" ;
-};
-String STR_PRINT
-{
- Text [ en-US ] = "Print" ;
-};
-String STR_QUIT
-{
- Text [ en-US ] = "Exit" ;
-};
-String STR_CUT
-{
- Text [ en-US ] = "Cut" ;
-};
-String STR_COPY
-{
- Text [ en-US ] = "Copy" ;
-};
-String STR_PASTE
-{
- Text [ en-US ] = "Paste" ;
-};
-String STR_DELETE
-{
- Text [ en-US ] = "Delete" ;
-};
-String STR_FIND
-{
- Text [ en-US ] = "Search" ;
-};
-String STR_FINDBACKWARD
-{
- Text [ en-US ] = "Search backward" ;
-};
-String STR_PROPERTIES
-{
- Text [ en-US ] = "Properties" ;
-};
-String STR_FRONT
-{
- Text [ en-US ] = "To front" ;
-};
- // MessageBoxes ----------------------------------------------------------
-QueryBox QBX_MNUCFG_UNDEFINED_FUNCTIONS
-{
- Buttons = WB_YES_NO ;
- DefButton = WB_DEF_NO ;
- Message [ en-US ] = "There are still undefined functions (???).\n\nDo you want to accept the configuration anyway?" ;
-};
-QueryBox QBX_MNUCFG_POPUP_FUNCTIONS
-{
- Buttons = WB_YES_NO ;
- DefButton = WB_DEF_NO ;
- Message [ en-US ] = "There are still entries with functions that can only be assigned to pop-ups.\n\nContinue anyway?" ;
-};
-InfoBox IBX_MNUCFG_ALREADY_INCLUDED
-{
- Message [ en-US ] = "Function is already included in this popup." ;
-};
-String STR_LOADMENUCONFIG
-{
- Text [ en-US ] = "Load Menu Configuration" ;
-};
-String STR_SAVEMENUCONFIG
-{
- Text [ en-US ] = "Save Menu Configuration" ;
-};
-String STR_LOADACCELCONFIG
-{
- Text [ en-US ] = "Load Keyboard Configuration" ;
-};
-String STR_SAVEACCELCONFIG
-{
- Text [ en-US ] = "Save Keyboard Configuration" ;
-};
-String STR_LOADSTATBARCONFIG
-{
- Text [ en-US ] = "Load Status Bar Configuration" ;
-};
-String STR_SAVESTATBARCONFIG
-{
- Text [ en-US ] = "Save Status Bar Configuration" ;
-};
-String STR_MENU
-{
- Text [ en-US ] = "Menu" ;
-};
-String STR_TOOLBAR_SEPARATOR
-{
- Text [ en-US ] = "Separator";
+ String STR_LOADACCELCONFIG
+ {
+ Text [ en-US ] = "Load Keyboard Configuration" ;
+ };
+ String STR_SAVEACCELCONFIG
+ {
+ Text [ en-US ] = "Save Keyboard Configuration" ;
+ };
+ String STR_SFX_FILTERNAME_ALL
+ {
+ Text [ en-US ] = "All files (*.*)" ;
+ };
+ String STR_FILTERNAME_CFG
+ {
+ Text [ en-US ] = "Configuration" ;
+ };
};
-String STR_TOOLBAR_SPACE
+Resource RID_SVXPAGE_CONFIGGROUPBOX
{
- Text [ en-US ] = "Invisible separator";
+ String STR_MYMACROS
+ {
+ Text [ en-US ] = "My Macros";
+ };
+ String STR_PRODMACROS
+ {
+ Text [ en-US ] = "%PRODUCTNAME Macros";
+ };
+ String STR_BASICMACROS
+ {
+ Text [ en-US ] = "BASIC Macros" ;
+ };
+ String STR_DLG_MACROS
+ {
+ Text [ en-US ] = "%PRODUCTNAME Macros" ;
+ };
+ String STR_HUMAN_APPNAME
+ {
+ TEXT = "%PRODUCTNAME" ;
+ };
+ String STR_GROUP_STYLES
+ {
+ Text [ en-US ] = "Styles" ;
+ };
+ Image IMG_HARDDISK
+ {
+ ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
+ MASKCOLOR
+ };
+ Image IMG_HARDDISK_HC
+ {
+ ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
+ MASKCOLOR
+ };
+ Image IMG_LIB
+ {
+ ImageBitmap = Bitmap { File = "im30820.png"; };
+ MASKCOLOR
+ };
+ Image IMG_LIB_HC
+ {
+ ImageBitmap = Bitmap { File = "imh30820.png"; };
+ MASKCOLOR
+ };
+ Image IMG_MACRO
+ {
+ ImageBitmap = Bitmap { File = "im30821.png"; };
+ MASKCOLOR
+ };
+ Image IMG_MACRO_HC
+ {
+ ImageBitmap = Bitmap { File = "imh30821.png"; };
+ MASKCOLOR
+ };
+ Image IMG_DOC
+ {
+ ImageBitmap = Bitmap { File = "im30826.png"; };
+ MASKCOLOR
+ };
+ Image IMG_DOC_HC
+ {
+ ImageBitmap = Bitmap { File = "imh30826.png"; };
+ MASKCOLOR
+ };
+ String STR_BASICNAME
+ {
+ Text = "%PRODUCTNAME Basic" ;
+ };
+ Image BMP_COLLAPSED
+ {
+ ImageBitmap = Bitmap
+ {
+ File = "plus.bmp" ;
+ };
+ // MaskColor = Color { Predefine = COL_GREEN ; };
+ };
+ Image BMP_EXPANDED
+ {
+ ImageBitmap = Bitmap
+ {
+ File = "minus.bmp" ;
+ };
+ // MaskColor = Color { Predefine = COL_GREEN ; };
+ };
+ Image BMP_EXPANDED_HC
+ {
+ ImageBitmap = Bitmap
+ {
+ File = "minus_h.bmp" ;
+ };
+ };
+ Image BMP_COLLAPSED_HC
+ {
+ ImageBitmap = Bitmap
+ {
+ File = "plus_h.bmp" ;
+ };
+ };
};
// ********************************************************************** EOF
diff --git a/svx/source/dialog/align.cxx b/svx/source/cui/align.cxx
index 77538a9a66..77538a9a66 100644
--- a/svx/source/dialog/align.cxx
+++ b/svx/source/cui/align.cxx
diff --git a/svx/source/dialog/align.hrc b/svx/source/cui/align.hrc
index 0eb5bf29f1..0eb5bf29f1 100644
--- a/svx/source/dialog/align.hrc
+++ b/svx/source/cui/align.hrc
diff --git a/svx/source/dialog/align.hxx b/svx/source/cui/align.hxx
index 4d93e16872..4d93e16872 100644
--- a/svx/source/dialog/align.hxx
+++ b/svx/source/cui/align.hxx
diff --git a/svx/source/dialog/align.src b/svx/source/cui/align.src
index 9780555d95..9780555d95 100644
--- a/svx/source/dialog/align.src
+++ b/svx/source/cui/align.src
diff --git a/svx/source/dialog/autocdlg.cxx b/svx/source/cui/autocdlg.cxx
index e45e33def2..5fef343dfa 100644
--- a/svx/source/dialog/autocdlg.cxx
+++ b/svx/source/cui/autocdlg.cxx
@@ -68,10 +68,10 @@
#include "helpid.hrc"
#include "acorrcfg.hxx"
#include <svx/svxacorr.hxx>
-#include <svx/charmap.hxx>
+#include "cuicharmap.hxx"
#include "unolingu.hxx"
#include <svx/dialmgr.hxx>
-#include "cuicharmap.hxx" // add CHINA001
+
static LanguageType eLastDialogLanguage = LANGUAGE_SYSTEM;
using namespace ::com::sun::star::util;
diff --git a/svx/source/dialog/autocdlg.hrc b/svx/source/cui/autocdlg.hrc
index 08de5d0134..08de5d0134 100644
--- a/svx/source/dialog/autocdlg.hrc
+++ b/svx/source/cui/autocdlg.hrc
diff --git a/svx/source/dialog/autocdlg.hxx b/svx/source/cui/autocdlg.hxx
index fb5533b2f0..fb5533b2f0 100644
--- a/svx/source/dialog/autocdlg.hxx
+++ b/svx/source/cui/autocdlg.hxx
diff --git a/svx/source/dialog/autocdlg.src b/svx/source/cui/autocdlg.src
index 437708e72d..437708e72d 100644
--- a/svx/source/dialog/autocdlg.src
+++ b/svx/source/cui/autocdlg.src
diff --git a/svx/source/dialog/backgrnd.cxx b/svx/source/cui/backgrnd.cxx
index 8cad4292dd..8cad4292dd 100644
--- a/svx/source/dialog/backgrnd.cxx
+++ b/svx/source/cui/backgrnd.cxx
diff --git a/svx/source/dialog/backgrnd.hrc b/svx/source/cui/backgrnd.hrc
index 056aceb900..056aceb900 100644
--- a/svx/source/dialog/backgrnd.hrc
+++ b/svx/source/cui/backgrnd.hrc
diff --git a/svx/source/dialog/backgrnd.hxx b/svx/source/cui/backgrnd.hxx
index 89931f2702..7c8f3bfe25 100644
--- a/svx/source/dialog/backgrnd.hxx
+++ b/svx/source/cui/backgrnd.hxx
@@ -42,10 +42,6 @@
#include <svtools/valueset.hxx>
#include <svx/dlgctrl.hxx>
-// Absatzvorlage
-#define PARA_DEST_PARA 0
-#define PARA_DEST_CHAR 1
-
// class SvxBackgroundTabPage --------------------------------------------
/*
{k:\svx\prototyp\dialog\backgrnd.bmp}
diff --git a/svx/source/dialog/backgrnd.src b/svx/source/cui/backgrnd.src
index e9f847534c..e9f847534c 100644
--- a/svx/source/dialog/backgrnd.src
+++ b/svx/source/cui/backgrnd.src
diff --git a/svx/source/dialog/bbdlg.cxx b/svx/source/cui/bbdlg.cxx
index 0f5ea570f1..0f5ea570f1 100644
--- a/svx/source/dialog/bbdlg.cxx
+++ b/svx/source/cui/bbdlg.cxx
diff --git a/svx/source/dialog/bbdlg.hxx b/svx/source/cui/bbdlg.hxx
index 2cca611970..2cca611970 100644
--- a/svx/source/dialog/bbdlg.hxx
+++ b/svx/source/cui/bbdlg.hxx
diff --git a/svx/source/dialog/bbdlg.src b/svx/source/cui/bbdlg.src
index 3f9e6ba0f5..3f9e6ba0f5 100644
--- a/svx/source/dialog/bbdlg.src
+++ b/svx/source/cui/bbdlg.src
diff --git a/svx/source/dialog/border.cxx b/svx/source/cui/border.cxx
index 1ab5a45b9e..1ab5a45b9e 100644
--- a/svx/source/dialog/border.cxx
+++ b/svx/source/cui/border.cxx
diff --git a/svx/source/dialog/border.hrc b/svx/source/cui/border.hrc
index b0c7e8a4f5..b0c7e8a4f5 100644
--- a/svx/source/dialog/border.hrc
+++ b/svx/source/cui/border.hrc
diff --git a/svx/source/dialog/border.hxx b/svx/source/cui/border.hxx
index 3ac644685d..3ac644685d 100644
--- a/svx/source/dialog/border.hxx
+++ b/svx/source/cui/border.hxx
diff --git a/svx/source/dialog/border.src b/svx/source/cui/border.src
index dbbb81bc0f..dbbb81bc0f 100644
--- a/svx/source/dialog/border.src
+++ b/svx/source/cui/border.src
diff --git a/svx/source/dialog/borderconn.cxx b/svx/source/cui/borderconn.cxx
index 371d5bf9fe..82f51bf2b8 100644
--- a/svx/source/dialog/borderconn.cxx
+++ b/svx/source/cui/borderconn.cxx
@@ -30,14 +30,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#include "borderconn.hxx"
-#include <svx/frmsel.hxx>
-
-
-
-
+#ifdef SVX_DLLIMPLEMENTATION
+#undef SVX_DLLIMPLEMENTATION
+#endif
+#include "borderconn.hxx"
+#include <svx/frmsel.hxx>
#include "bolnitem.hxx"
#include <svx/boxitem.hxx>
#include <svx/algitem.hxx>
diff --git a/svx/source/dialog/borderconn.hxx b/svx/source/cui/borderconn.hxx
index 160e2435fb..740c9c79f2 100644
--- a/svx/source/dialog/borderconn.hxx
+++ b/svx/source/cui/borderconn.hxx
@@ -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
@@ -33,7 +33,6 @@
#include <sfx2/itemconnect.hxx>
#include <svx/framebordertype.hxx>
-#include "svx/svxdllapi.h"
class SfxItemSet;
class MetricField;
@@ -48,7 +47,7 @@ class FrameSelector;
/** Creates an item connection object that connects an SvxLineItem with an
svx::FrameSelector control. */
-SVX_DLLPUBLIC sfx::ItemConnectionBase* CreateFrameLineConnection( USHORT nSlot,
+sfx::ItemConnectionBase* CreateFrameLineConnection( USHORT nSlot,
FrameSelector& rFrameSel, FrameBorderType eBorder,
sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
@@ -61,14 +60,14 @@ sfx::ItemConnectionBase* CreateFrameBoxConnection(
/** Creates an item connection object that connects an SvxMarginItem with the
controls of the SvxBorderTabPage. */
-SVX_DLLPUBLIC sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet,
+sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet,
MetricField& rMfLeft, MetricField& rMfRight,
MetricField& rMfTop, MetricField& rMfBottom,
sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
/** Creates an item connection object that connects an SvxShadowItem with the
controls of the SvxBorderTabPage. */
-SVX_DLLPUBLIC sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet,
+sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet,
ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor,
sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
diff --git a/svx/source/dialog/cfg.cxx b/svx/source/cui/cfg.cxx
index d47faed6e4..2931be6c17 100644
--- a/svx/source/dialog/cfg.cxx
+++ b/svx/source/cui/cfg.cxx
@@ -73,10 +73,10 @@
#include "cfg.hrc"
#include "helpid.hrc"
+#include "acccfg.hxx"
#include "cfg.hxx"
#include "eventdlg.hxx"
#include <svx/dialmgr.hxx>
-#include <svx/svxdlg.hxx>
#include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx>
@@ -108,6 +108,8 @@
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
+#include "dlgname.hxx"
+
#define PRTSTR(x) rtl::OUStringToOString(x, RTL_TEXTENCODING_ASCII_US).pData->buffer
#define ENTRY_HEIGHT 16
@@ -802,7 +804,7 @@ SfxTabPage *CreateSvxMenuConfigPage( Window *pParent, const SfxItemSet& rSet )
SfxTabPage *CreateKeyboardConfigPage( Window *pParent, const SfxItemSet& rSet )
{
- return SfxAbstractDialogFactory::CreateSfxAcceleratorConfigPage( pParent, rSet );
+ return new SfxAcceleratorConfigPage( pParent, rSet );
}
SfxTabPage *CreateSvxToolbarConfigPage( Window *pParent, const SfxItemSet& rSet )
@@ -2629,13 +2631,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
String aNewName( stripHotKey( pMenuData->GetName() ) );
String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
- SvxAbstractDialogFactory* pFact =
- SvxAbstractDialogFactory::Create();
-
- AbstractSvxNameDialog* pNameDialog =
- pFact->CreateSvxNameDialog(
- 0, aNewName, aDesc, RID_SVXDLG_NAME );
-
+ SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU );
pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_MENU ) );
@@ -2693,13 +2689,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
String aNewName;
String aDesc = SVX_RESSSTR( RID_SVXSTR_SUBMENU_NAME );
- SvxAbstractDialogFactory* pFact =
- SvxAbstractDialogFactory::Create();
-
- AbstractSvxNameDialog* pNameDialog =
- pFact->CreateSvxNameDialog(
- 0, aNewName, aDesc, RID_SVXDLG_NAME );
-
+ SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU );
pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_ADD_SUBMENU ) );
@@ -2745,13 +2735,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
String aNewName( stripHotKey( pEntry->GetName() ) );
String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
- SvxAbstractDialogFactory* pFact =
- SvxAbstractDialogFactory::Create();
-
- AbstractSvxNameDialog* pNameDialog =
- pFact->CreateSvxNameDialog(
- 0, aNewName, aDesc, RID_SVXDLG_NAME );
-
+ SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM );
pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_MENU ) );
@@ -3589,13 +3573,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
String aNewName( stripHotKey( pToolbar->GetName() ) );
String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
- SvxAbstractDialogFactory* pFact =
- SvxAbstractDialogFactory::Create();
-
- AbstractSvxNameDialog* pNameDialog =
- pFact->CreateSvxNameDialog(
- 0, aNewName, aDesc, RID_SVXDLG_NAME );
-
+ SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR );
pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
@@ -3686,13 +3664,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
String aNewName( stripHotKey( pEntry->GetName() ) );
String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
- SvxAbstractDialogFactory* pFact =
- SvxAbstractDialogFactory::Create();
-
- AbstractSvxNameDialog* pNameDialog =
- pFact->CreateSvxNameDialog(
- 0, aNewName, aDesc, RID_SVXDLG_NAME );
-
+ SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM );
pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
diff --git a/svx/source/dialog/cfg.hrc b/svx/source/cui/cfg.hrc
index fa8ad15fb8..fa8ad15fb8 100644
--- a/svx/source/dialog/cfg.hrc
+++ b/svx/source/cui/cfg.hrc
diff --git a/svx/source/dialog/cfg.hxx b/svx/source/cui/cfg.hxx
index 383fa87317..4aee5295e2 100644
--- a/svx/source/dialog/cfg.hxx
+++ b/svx/source/cui/cfg.hxx
@@ -38,10 +38,7 @@
#include <vcl/toolbox.hxx>
#include <svtools/svtreebx.hxx>
#include <svtools/svmedit2.hxx>
-//add by shizhoubo
-#ifndef _SVTOOLS_SVMEDIT2_HXX
#include <svtools/svmedit.hxx>
-#endif
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -54,7 +51,6 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include "svx/svxdllapi.h"
#define _SVSTDARR_USHORTS
#define _SVSTDARR_STRINGSDTOR
@@ -73,7 +69,7 @@ class SvxToolbarConfigPage;
typedef std::vector< SvxConfigEntry* > SvxEntries;
-class SVX_DLLPUBLIC SvxConfigDialog : public SfxTabDialog
+class SvxConfigDialog : public SfxTabDialog
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
diff --git a/svx/source/dialog/cfg.src b/svx/source/cui/cfg.src
index 978ae6308b..978ae6308b 100644
--- a/svx/source/dialog/cfg.src
+++ b/svx/source/cui/cfg.src
diff --git a/svx/source/dialog/cfgchart.cxx b/svx/source/cui/cfgchart.cxx
index 2925fd9e7f..2925fd9e7f 100644
--- a/svx/source/dialog/cfgchart.cxx
+++ b/svx/source/cui/cfgchart.cxx
diff --git a/svx/source/dialog/cfgchart.hxx b/svx/source/cui/cfgchart.hxx
index b519823466..b519823466 100644
--- a/svx/source/dialog/cfgchart.hxx
+++ b/svx/source/cui/cfgchart.hxx
diff --git a/sfx2/source/dialog/cfg.cxx b/svx/source/cui/cfgutil.cxx
index 925b49a702..9df95d970d 100644
--- a/sfx2/source/dialog/cfg.cxx
+++ b/svx/source/cui/cfgutil.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
@@ -29,54 +29,10 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-#include <vcl/help.hxx>
-#include <basic/sbx.hxx>
-#include <basic/basicmanagerrepository.hxx>
-#include <basic/sbstar.hxx>
-#include <basic/sbxmeth.hxx>
-#include <basic/sbmod.hxx>
-#include <basic/basmgr.hxx>
-#include <vcl/wrkwin.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/diagnose_ex.h>
-#include <svtools/pathoptions.hxx>
-#include <sot/storage.hxx>
+#include "precompiled_svx.hxx"
-#ifndef GCC
-#endif
-
-#include "cfg.hxx"
-
-#include "dialog.hrc"
-#include "cfg.hrc"
-#ifndef _SFX_HELPID_HRC
-#include "helpid.hrc"
-#endif
-
-#include <sfx2/app.hxx>
-#include <sfx2/msg.hxx>
-#include <sfx2/msgpool.hxx>
-#include "sfxresid.hxx"
-#include <sfx2/macrconf.hxx>
-#include "minfitem.hxx"
-#include "sfxresid.hxx"
-#include <sfx2/objsh.hxx>
-#include <sfx2/dispatch.hxx>
-#include "sfxtypes.hxx"
-#include "eventdlg.hxx"
-#include "minfitem.hxx"
-#include <sfx2/viewfrm.hxx>
-#include "workwin.hxx"
-#include <sfx2/filedlghelper.hxx>
-#include <sfx2/request.hxx>
-
-#include <unotools/processfactory.hxx>
-#include <comphelper/documentinfo.hxx>
+#include "cfgutil.hxx"
-#ifndef _UNOTOOLS_CONFIGMGR_HXX_
-#include <unotools/configmgr.hxx>
-#endif
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XDispatchInformationProvider.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
@@ -85,12 +41,8 @@
#include <com/sun/star/script/browse/XBrowseNode.hpp>
#include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
-#ifndef _COM_SUN_STAR_SCRIPT_BROWSE_BROWSENODEFACTORY_HPP_
#include <com/sun/star/script/browse/XBrowseNodeFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SCRIPT_BROWSE_BROWSENODEFACTORYVIEWTYPE_HPP_
#include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp>
-#endif
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -99,6 +51,31 @@
#include <com/sun/star/document/XScriptInvocationContext.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+#include "acccfg.hrc"
+#include "helpid.hrc"
+#include <basic/sbx.hxx>
+#include <basic/basicmanagerrepository.hxx>
+#include <basic/sbstar.hxx>
+#include <basic/sbxmeth.hxx>
+#include <basic/sbmod.hxx>
+#include <basic/basmgr.hxx>
+#include <tools/urlobj.hxx>
+#include "svx/dialogs.hrc"
+#include <sfx2/app.hxx>
+#include <sfx2/macrconf.hxx>
+#include <sfx2/minfitem.hxx>
+#include <unotools/processfactory.hxx>
+#include <comphelper/documentinfo.hxx>
+#include <svtools/imagemgr.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <comphelper/sequenceashashmap.hxx>
+#include <unotools/configmgr.hxx>
+#include "svx/dialmgr.hxx"
+#include <svtools/stritem.hxx>
+
+#define _SVSTDARR_STRINGSDTOR
+#include <svtools/svstdarr.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::script;
@@ -106,14 +83,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::document;
namespace css = ::com::sun::star;
-#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
-#include <svtools/imagemgr.hxx>
-#include <tools/urlobj.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <comphelper/sequenceashashmap.hxx>
-#include <rtl/ustrbuf.hxx>
-
static ::rtl::OUString SERVICE_UICATEGORYDESCRIPTION = ::rtl::OUString::createFromAscii("com.sun.star.ui.UICategoryDescription" );
static ::rtl::OUString SERVICE_UICMDDESCRIPTION = ::rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription");
@@ -555,35 +524,70 @@ void SfxConfigFunctionListBox_Impl::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
pStylesInfo = pStyles;
}
+struct SvxConfigGroupBoxResource_Impl : public Resource
+{
+ Image m_hdImage;
+ Image m_hdImage_hc;
+ Image m_libImage;
+ Image m_libImage_hc;
+ Image m_macImage;
+ Image m_macImage_hc;
+ Image m_docImage;
+ Image m_docImage_hc;
+ ::rtl::OUString m_sMyMacros;
+ ::rtl::OUString m_sProdMacros;
+ String m_sMacros;
+ String m_sDlgMacros;
+ String m_aHumanAppName;
+ String m_aStrGroupStyles;
+ String m_aScriptType;
+ Image m_collapsedImage;
+ Image m_collapsedImage_hc;
+ Image m_expandedImage;
+ Image m_expandedImage_hc;
+
+ SvxConfigGroupBoxResource_Impl();
+};
+
+SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
+ Resource(SVX_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
+ m_hdImage(SVX_RES(IMG_HARDDISK)),
+ m_hdImage_hc(SVX_RES(IMG_HARDDISK_HC)),
+ m_libImage(SVX_RES(IMG_LIB)),
+ m_libImage_hc(SVX_RES(IMG_LIB_HC)),
+ m_macImage(SVX_RES(IMG_MACRO)),
+ m_macImage_hc(SVX_RES(IMG_MACRO_HC)),
+ m_docImage(SVX_RES(IMG_DOC)),
+ m_docImage_hc(SVX_RES(IMG_DOC_HC)),
+ m_sMyMacros(String(SVX_RES(STR_MYMACROS))),
+ m_sProdMacros(String(SVX_RES(STR_PRODMACROS))),
+ m_sMacros(String(SVX_RES(STR_BASICMACROS))),
+ m_sDlgMacros(String(SVX_RES(STR_DLG_MACROS))),
+ m_aHumanAppName(String(SVX_RES(STR_HUMAN_APPNAME))),
+ m_aStrGroupStyles(String(SVX_RES(STR_GROUP_STYLES))),
+ m_aScriptType(String(SVX_RES(STR_BASICNAME))),
+ m_collapsedImage(SVX_RES(BMP_COLLAPSED)),
+ m_collapsedImage_hc(SVX_RES(BMP_COLLAPSED_HC)),
+ m_expandedImage(SVX_RES(BMP_EXPANDED)),
+ m_expandedImage_hc(SVX_RES(BMP_EXPANDED_HC))
+{
+ FreeResource();
+}
+
SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
Window* pParent, const ResId& rResId, ULONG nConfigMode )
: SvTreeListBox( pParent, rResId )
- , nMode( nConfigMode ), bShowSF( FALSE ), bShowBasic( TRUE ),
- m_hdImage(ResId(IMG_HARDDISK,*rResId.GetResMgr())),
- m_hdImage_hc(ResId(IMG_HARDDISK_HC,*rResId.GetResMgr())),
- m_libImage(ResId(IMG_LIB,*rResId.GetResMgr())),
- m_libImage_hc(ResId(IMG_LIB_HC,*rResId.GetResMgr())),
- m_macImage(ResId(IMG_MACRO,*rResId.GetResMgr())),
- m_macImage_hc(ResId(IMG_MACRO_HC,*rResId.GetResMgr())),
- m_docImage(ResId(IMG_DOC,*rResId.GetResMgr())),
- m_docImage_hc(ResId(IMG_DOC_HC,*rResId.GetResMgr())),
- m_sMyMacros(String(ResId(STR_MYMACROS,*rResId.GetResMgr()))),
- m_sProdMacros(String(ResId(STR_PRODMACROS,*rResId.GetResMgr())))
-/* Beschreibung
- Diese Listbox zeigt alle Funktionsgruppen und Basics an, die zur Konfiguration
- zur Verf"ugung stehen. Basics werden noch in Bibliotheken und Module untergliedert.
-*/
+ , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), nMode( nConfigMode ), bShowSF( FALSE ), bShowBasic( TRUE ), pStylesInfo(0)
{
- aScriptType = String(SfxResId(STR_BASICNAME));
SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
- SetNodeBitmaps( Image( ResId(BMP_COLLAPSED,*rResId.GetResMgr()) ), Image( ResId(BMP_EXPANDED,*rResId.GetResMgr()) ) , BMP_COLOR_NORMAL );
- SetNodeBitmaps( Image( ResId(BMP_COLLAPSED_HC,*rResId.GetResMgr()) ), Image( ResId(BMP_EXPANDED_HC,*rResId.GetResMgr()) ), BMP_COLOR_HIGHCONTRAST );
+ SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage, BMP_COLOR_NORMAL );
+ SetNodeBitmaps( pImp->m_collapsedImage_hc, pImp->m_expandedImage_hc, BMP_COLOR_HIGHCONTRAST );
// Check configuration to see whether only Basic macros,
// only Scripting Framework scripts, or both should be listed
Any value;
sal_Bool tmp = false;
-
+
value = ::utl::ConfigManager::GetConfigManager()->GetLocalProperty(
::rtl::OUString::createFromAscii(
"Office.Scripting/ScriptDisplaySettings/ShowBasic" ) );
@@ -596,7 +600,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
else {
bShowBasic = FALSE;
}
-
+
value = ::utl::ConfigManager::GetConfigManager()->GetLocalProperty(
::rtl::OUString::createFromAscii(
"Office.Scripting/ScriptDisplaySettings/ShowSF" ) );
@@ -642,7 +646,7 @@ void SfxConfigGroupListBox_Impl::ClearAll()
void SfxConfigGroupListBox_Impl::SetScriptType( const String& rScriptType )
{
- aScriptType = rScriptType;
+ pImp->m_aScriptType = rScriptType;
ULONG nPos=0;
SvLBoxEntry *pEntry = (SvLBoxEntry*) GetModel()->GetEntryAtAbsPos( nPos++ );
while ( pEntry )
@@ -815,7 +819,7 @@ namespace
}
catch( const Exception& )
{
- DBG_UNHANDLED_EXCEPTION();
+ //DBG_UNHANDLED_EXCEPTION();
}
return xDocument;
@@ -891,7 +895,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
// Basics einsammeln
pSfxApp->EnterBasicCall();
String aMacroName(' ');
- aMacroName += String(SfxResId(STR_BASICMACROS));
+ aMacroName += pImp->m_sDlgMacros;
// Zuerst AppBasic
BasicManager *pAppBasicMgr = pSfxApp->GetBasicManager();
@@ -917,7 +921,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
if ( pAppBasicMgr->GetLibCount() )
{
// Nur einf"ugen, wenn Bibliotheken vorhanden
- String aAppBasTitle( SfxResId( STR_HUMAN_APPNAME ) );
+ String aAppBasTitle( pImp->m_aHumanAppName );
aAppBasTitle += aMacroName;
SvLBoxEntry *pEntry = InsertEntry( aAppBasTitle, 0 );
SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_BASICMGR, 0, pAppBasicMgr );
@@ -987,7 +991,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
new SfxGroupInfo_Impl( SFX_CFGGROUP_SCRIPTCONTAINER, 0,
static_cast<void *>(rootNode.get()));
- String aTitle( SfxResId( STR_DLG_MACROS ) );
+ String aTitle(pImp->m_sDlgMacros);
SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
pNewEntry->SetUserData( pInfo );
pNewEntry->EnableChildsOnDemand( TRUE );
@@ -1040,11 +1044,11 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
{
if ( uiName.equals( user ) )
{
- uiName = m_sMyMacros;
+ uiName = pImp->m_sMyMacros;
}
else if ( uiName.equals( share ) )
{
- uiName = m_sProdMacros;
+ uiName = pImp->m_sProdMacros;
}
}
}
@@ -1099,7 +1103,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
// add styles
if ( m_xSMGR.is() )
{
- String sStyle( SfxResId( STR_GROUP_STYLES ) );
+ String sStyle( pImp->m_aStrGroupStyles );
SvLBoxEntry *pEntry = InsertEntry( sStyle, 0 );
SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, 0 ); // TODO last parameter should contain user data
aArr.Insert( pInfo, aArr.Count() );
@@ -1107,6 +1111,14 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
pEntry->EnableChildsOnDemand( TRUE );
}
+/* {
+ String sSymbols( String::CreateFromAscii("Symbols") );
+ SvLBoxEntry *pEntry = InsertEntry( sSymbols, 0 );
+ SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_SPECIALCHARACTERS, 0, 0 ); // TODO last parameter should contain user data
+ aArr.Insert( pInfo, aArr.Count() );
+ pEntry->SetUserData( pInfo );
+ } */
+
MakeVisible( GetEntry( 0,0 ) );
SetUpdateMode( TRUE );
}
@@ -1120,9 +1132,9 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
if (node->getName().equals( user ) || node->getName().equals(share ) )
{
if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = m_hdImage;
+ aImage = pImp->m_hdImage;
else
- aImage = m_hdImage_hc;
+ aImage = pImp->m_hdImage_hc;
}
else
{
@@ -1179,9 +1191,9 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
else
{
if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = m_docImage;
+ aImage = pImp->m_docImage;
else
- aImage = m_docImage_hc;
+ aImage = pImp->m_docImage_hc;
}
}
}
@@ -1190,16 +1202,16 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
if( node->getType() == browse::BrowseNodeTypes::SCRIPT )
{
if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = m_macImage;
+ aImage = pImp->m_macImage;
else
- aImage = m_macImage_hc;
+ aImage = pImp->m_macImage_hc;
}
else
{
if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = m_libImage;
+ aImage = pImp->m_libImage;
else
- aImage = m_libImage_hc;
+ aImage = pImp->m_libImage_hc;
}
}
return aImage;
@@ -1567,7 +1579,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
SbModule* pMod = (SbModule*)pLib->GetModules()->Get( nMod );
BOOL bIsStarScript = FALSE; //pMod->ISA( SbJScriptModule );
- BOOL bWantsStarScript = aScriptType.EqualsAscii("StarScript");
+ BOOL bWantsStarScript = pImp->m_aScriptType.EqualsAscii("StarScript");
if ( bIsStarScript != bWantsStarScript )
continue;
pModEntry = InsertEntry( pMod->GetName(), pEntry );
@@ -1702,6 +1714,25 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
}
}
+void SfxConfigGroupListBox_Impl::AddAndSelect( const SfxStringItem* , const SfxStringItem* )
+{
+ /*
+ if ( pText )
+ {
+ Select( GetEntry( GetEntryCount()-1) );
+ SvLBoxEntry* pFuncEntry = pFunctionListBox->InsertEntry( pText->GetValue(), NULL );
+ SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_SPECIALCHARACTERS, 0, 0 );
+ String aCommand = String::CreateFromAscii(".uno:InsertSymbol?Symbols:string=");
+ aCommand += pText->GetValue();
+ pFunctionListBox->aArr.Insert( pGrpInfo, pFunctionListBox->aArr.Count() );
+ pGrpInfo->sCommand = aCommand;
+ pGrpInfo->sLabel = String::CreateFromAscii("Symbols: ");
+ pGrpInfo->sLabel += pText->GetValue();
+ pFuncEntry->SetUserData( pGrpInfo );
+ }
+ */
+}
+
void SfxConfigGroupListBox_Impl::SelectMacro( const SfxMacroInfoItem *pItem )
{
SelectMacro( pItem->GetBasicManager()->GetName(),
@@ -1713,7 +1744,7 @@ void SfxConfigGroupListBox_Impl::SelectMacro( const String& rBasic,
{
String aBasicName( rBasic );
aBasicName += ' ';
- aBasicName += String(SfxResId(STR_BASICMACROS));
+ aBasicName += pImp->m_sMacros;
String aLib, aModule, aMethod;
USHORT nCount = rMacro.GetTokenCount('.');
aMethod = rMacro.GetToken( nCount-1, '.' );
diff --git a/svx/source/cui/cfgutil.hxx b/svx/source/cui/cfgutil.hxx
new file mode 100644
index 0000000000..0f789ee0b8
--- /dev/null
+++ b/svx/source/cui/cfgutil.hxx
@@ -0,0 +1,220 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: cfg.hxx,v $
+ * $Revision: 1.41 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CFGUTIL_HXX
+#define _CFGUTIL_HXX
+
+#include <vector>
+#include <rtl/ustring.hxx>
+#include <tools/string.hxx>
+
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/script/browse/XBrowseNode.hpp>
+
+#define _SVSTDARR_STRINGSDTOR
+#include <svtools/svstdarr.hxx>
+
+#include <vcl/timer.hxx>
+#include <svtools/svtabbx.hxx>
+#include <svtools/svtreebx.hxx>
+#include <vcl/image.hxx>
+
+class BasicManager;
+class SfxSlotPool;
+class SfxStringItem;
+class SfxFontItem;
+class SfxMacroInfoItem;
+class SfxMacroInfo;
+struct SfxStyleInfo_Impl;
+struct SfxStylesInfo_Impl;
+
+#define css ::com::sun::star
+
+struct SfxStyleInfo_Impl
+{
+ ::rtl::OUString sFamily;
+ ::rtl::OUString sStyle;
+ ::rtl::OUString sCommand;
+ ::rtl::OUString sLabel;
+
+ SfxStyleInfo_Impl()
+ {}
+
+ SfxStyleInfo_Impl(const SfxStyleInfo_Impl& rCopy)
+ {
+ sFamily = rCopy.sFamily;
+ sStyle = rCopy.sStyle;
+ sCommand = rCopy.sCommand;
+ sLabel = rCopy.sLabel;
+ }
+};
+
+struct SfxStylesInfo_Impl
+{
+ private:
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDoc;
+
+ public:
+
+ SfxStylesInfo_Impl();
+ void setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel);
+
+ sal_Bool parseStyleCommand(SfxStyleInfo_Impl& aStyle);
+ void getLabel4Style(SfxStyleInfo_Impl& aStyle);
+
+ ::std::vector< SfxStyleInfo_Impl > getStyleFamilies();
+ ::std::vector< SfxStyleInfo_Impl > getStyles(const ::rtl::OUString& sFamily);
+
+ static ::rtl::OUString generateCommand(const ::rtl::OUString& sFamily, const ::rtl::OUString& sStyle);
+};
+
+#define SFX_CFGGROUP_FUNCTION 1
+#define SFX_CFGGROUP_BASICMGR 2
+#define SFX_CFGGROUP_DOCBASICMGR 3
+#define SFX_CFGGROUP_BASICLIB 4
+#define SFX_CFGGROUP_BASICMOD 5
+#define SFX_CFGFUNCTION_MACRO 6
+#define SFX_CFGFUNCTION_SLOT 7
+#define SFX_CFGGROUP_SCRIPTCONTAINER 8
+#define SFX_CFGFUNCTION_SCRIPT 9
+#define SFX_CFGGROUP_STYLES 10
+#define SFX_CFGGROUP_SPECIALCHARACTERS 11
+
+struct SfxGroupInfo_Impl
+{
+ USHORT nKind;
+ USHORT nOrd;
+ void* pObject;
+ BOOL bWasOpened;
+ String sCommand;
+ String sLabel;
+
+ SfxGroupInfo_Impl( USHORT n, USHORT nr, void* pObj = 0 ) :
+ nKind( n ), nOrd( nr ), pObject( pObj ), bWasOpened(FALSE) {}
+};
+
+typedef SfxGroupInfo_Impl* SfxGroupInfoPtr;
+SV_DECL_PTRARR_DEL(SfxGroupInfoArr_Impl, SfxGroupInfoPtr, 5, 5)
+
+class SfxConfigFunctionListBox_Impl : public SvTreeListBox
+{
+ friend class SfxConfigGroupListBox_Impl;
+ Timer aTimer;
+ SvLBoxEntry* pCurEntry;
+ SfxGroupInfoArr_Impl aArr;
+ SfxStylesInfo_Impl* pStylesInfo;
+
+ DECL_LINK( TimerHdl, Timer* );
+ virtual void MouseMove( const MouseEvent& rMEvt );
+
+public:
+ SfxConfigFunctionListBox_Impl( Window*, const ResId& );
+ ~SfxConfigFunctionListBox_Impl();
+
+ void ClearAll();
+ SvLBoxEntry* GetEntry_Impl( USHORT nId );
+ SvLBoxEntry* GetEntry_Impl( const String& );
+ USHORT GetId( SvLBoxEntry *pEntry );
+ using Window::GetHelpText;
+ String GetHelpText( SvLBoxEntry *pEntry );
+ USHORT GetCurId() { return GetId( FirstSelected() ); }
+ String GetCurCommand();
+ String GetCurLabel();
+ SfxMacroInfo* GetMacroInfo();
+ void FunctionSelected();
+ void SetStylesInfo(SfxStylesInfo_Impl* pStyles);
+};
+
+struct SvxConfigGroupBoxResource_Impl;
+class SfxConfigGroupListBox_Impl : public SvTreeListBox
+{
+ SvxConfigGroupBoxResource_Impl* pImp;
+ //SfxSlotPool* pSlotPool;
+ SfxConfigFunctionListBox_Impl* pFunctionListBox;
+ SfxGroupInfoArr_Impl aArr;
+ ULONG nMode;
+ BOOL bShowSF; // show Scripting Framework scripts
+ BOOL bShowBasic; // show Basic scripts
+
+ ::rtl::OUString m_sModuleLongName;
+ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+ css::uno::Reference< css::frame::XFrame > m_xFrame;
+ css::uno::Reference< css::container::XNameAccess > m_xGlobalCategoryInfo;
+ css::uno::Reference< css::container::XNameAccess > m_xModuleCategoryInfo;
+ css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
+
+ Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast );
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
+ ::rtl::OUString parseLocationName( const ::rtl::OUString& location );
+
+ void InitModule();
+ void InitBasic();
+ void InitStyles();
+
+ ::rtl::OUString MapCommand2UIName(const ::rtl::OUString& sCommand);
+
+ SfxStylesInfo_Impl* pStylesInfo;
+
+protected:
+ virtual void RequestingChilds( SvLBoxEntry *pEntry);
+ using SvListView::Expand;
+ virtual BOOL Expand( SvLBoxEntry* pParent );
+
+public:
+ SfxConfigGroupListBox_Impl ( Window* pParent,
+ const ResId&,
+ ULONG nConfigMode = 0 );
+ ~SfxConfigGroupListBox_Impl();
+ void ClearAll();
+
+ void Init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
+ const css::uno::Reference< css::frame::XFrame >& xFrame ,
+ const ::rtl::OUString& sModuleLongName);
+ void SetFunctionListBox( SfxConfigFunctionListBox_Impl *pBox )
+ { pFunctionListBox = pBox; }
+ void Open( SvLBoxEntry*, BOOL );
+ void GroupSelected();
+ void SelectMacro( const SfxMacroInfoItem* );
+ void AddAndSelect( const SfxStringItem*, const SfxStringItem* );
+ void SelectMacro( const String&, const String& );
+ String GetGroup();
+ BasicManager* GetBasicManager( const SvLBoxEntry& _rEntry );
+ void SetScriptType( const String& rScriptType );
+ void SetStylesInfo(SfxStylesInfo_Impl* pStyles);
+};
+
+#undef css
+
+#endif
+
diff --git a/svx/source/dialog/chardlg.cxx b/svx/source/cui/chardlg.cxx
index b8c8ba4db4..7a717188c2 100644
--- a/svx/source/dialog/chardlg.cxx
+++ b/svx/source/cui/chardlg.cxx
@@ -57,32 +57,6 @@
//Erstmal definieren, damit die Klassendeklarionen angezogen werden.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
#include <svx/xtable.hxx> // XColorTable
#include "chardlg.hxx"
#include "fontitem.hxx"
@@ -108,7 +82,7 @@
#include "dlgutil.hxx"
#include <svx/dialmgr.hxx>
#include "htmlmode.hxx"
-#include <svx/charmap.hxx>
+#include "cuicharmap.hxx"
#include "chardlg.h"
#include <svx/emphitem.hxx>
#include <svx/charreliefitem.hxx>
@@ -122,6 +96,7 @@
#include <svtools/intitem.hxx> //CHINA001
#include <sfx2/request.hxx> //CHINA001
#include "flagsdef.hxx" //CHINA001
+
using namespace ::com::sun::star;
// define ----------------------------------------------------------------
@@ -3886,16 +3861,16 @@ void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox )
{
//CHINA001 SvxCharacterMap aDlg( this );
bool bStart = pBox == &m_aStartBracketLB;
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- if(pFact)
+ //SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+ //if(pFact)
{
- AbstractSvxCharacterMap* aDlg = pFact->CreateSvxCharacterMap( this, RID_SVXDLG_CHARMAP );
- DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
+ //AbstractSvxCharacterMap* aDlg = pFact->CreateSvxCharacterMap( this, RID_SVXDLG_CHARMAP );
+ SvxCharacterMap* aDlg = new SvxCharacterMap( this );
aDlg->DisableFontSelection();//CHINA001 aDlg.DisableFontSelection();
if ( aDlg->Execute() == RET_OK )//CHINA001 ( aDlg.Execute() == RET_OK )
{
- sal_Unicode cChar = aDlg->GetChar();//CHINA001 aDlg.GetChar();
+ sal_Unicode cChar = (sal_Unicode) aDlg->GetChar();//CHINA001 aDlg.GetChar();
SetBracket( cChar, bStart );
}
else
diff --git a/svx/source/dialog/chardlg.h b/svx/source/cui/chardlg.h
index 960276cba3..960276cba3 100644
--- a/svx/source/dialog/chardlg.h
+++ b/svx/source/cui/chardlg.h
diff --git a/svx/source/dialog/chardlg.hrc b/svx/source/cui/chardlg.hrc
index 303d1b7887..303d1b7887 100644
--- a/svx/source/dialog/chardlg.hrc
+++ b/svx/source/cui/chardlg.hrc
diff --git a/svx/source/dialog/chardlg.hxx b/svx/source/cui/chardlg.hxx
index e89ac291e7..e89ac291e7 100644
--- a/svx/source/dialog/chardlg.hxx
+++ b/svx/source/cui/chardlg.hxx
diff --git a/svx/source/dialog/chardlg.src b/svx/source/cui/chardlg.src
index 19ad1e0904..19ad1e0904 100644
--- a/svx/source/dialog/chardlg.src
+++ b/svx/source/cui/chardlg.src
diff --git a/svx/source/dialog/charmap.hrc b/svx/source/cui/charmap.hrc
index a581af741f..5f018a9b51 100644
--- a/svx/source/dialog/charmap.hrc
+++ b/svx/source/cui/charmap.hrc
@@ -45,6 +45,10 @@
#define BTN_DELETE 20
#define FT_SUBSET 30
#define LB_SUBSET 31
+#define ED_SHORTCUT 32
+#define BT_ASSIGN 33
+#define FT_ASSIGN 34
+#define CT_ASSIGN 35
#endif
diff --git a/svx/source/cui/charmap.src b/svx/source/cui/charmap.src
new file mode 100644
index 0000000000..5fdecf8a0e
--- /dev/null
+++ b/svx/source/cui/charmap.src
@@ -0,0 +1,161 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: charmap.src,v $
+ * $Revision: 1.57 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+ // include ---------------------------------------------------------------
+#include <svx/svxids.hrc>
+#include <svx/dialogs.hrc>
+#include "charmap.hrc"
+#include "helpid.hrc"
+
+ // RID_SVXDLG_CHARMAP ----------------------------------------------------
+ModalDialog RID_SVXDLG_CHARMAP
+{
+ HelpId = SID_CHARMAP ;
+ SvLook = TRUE ;
+ Text [ en-US ] = "Special Characters";
+/* Size = MAP_APPFONT ( 297 , 169 ) ; */
+ Size = MAP_APPFONT ( 297 , 153 ) ;
+ OutputSize = TRUE ;
+ Moveable = TRUE ;
+ Control CT_SHOWSET
+ {
+ HelpId = HID_CHARMAP_CTL_SHOWSET ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 6 , 24 ) ;
+ Size = MAP_APPFONT ( 230 , 112 ) ;
+ TabStop = TRUE ;
+ Group = TRUE ;
+ };
+ FixedText FT_FONT
+ {
+ Pos = MAP_APPFONT ( 6 , 8 ) ;
+ Size = MAP_APPFONT ( 33 , 8 ) ;
+ Text [ en-US ] = "~Font" ;
+ Left = TRUE ;
+ Group = TRUE ;
+ };
+ ListBox LB_FONT
+ {
+ Pos = MAP_APPFONT ( 42 , 6 ) ;
+ Size = MAP_APPFONT ( 70 , 58 ) ;
+ Sort = TRUE ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
+ };
+ FixedText FT_SUBSET
+ {
+ Pos = MAP_APPFONT ( 118 , 8 ) ;
+ Size = MAP_APPFONT ( 42 , 8 ) ;
+ Text [ en-US ] = "~Subset";
+ };
+ ListBox LB_SUBSET
+ {
+ Pos = MAP_APPFONT ( 161 , 6 ) ;
+ Size = MAP_APPFONT ( 63 , 68 ) ;
+ Sort = FALSE ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
+ };
+ FixedText FT_SYMBOLE
+ {
+ Pos = MAP_APPFONT ( 6 , 140 ) ;
+ Size = MAP_APPFONT ( 38 , 8 ) ;
+ Left = TRUE ;
+ Text [ en-US ] = "Characters:";
+ };
+ Control CT_SHOWTEXT
+ {
+ HelpId = HID_CHARMAP_CTL_SHOWTEXT ;
+ Pos = MAP_APPFONT ( 46 , 137 ) ;
+/* Size = MAP_APPFONT ( 190 , 16 ) ; */
+ Size = MAP_APPFONT ( 244 , 16 ) ;
+ Group = TRUE ;
+ };
+ Control CT_SHOWCHAR
+ {
+ HelpId = HID_CHARMAP_CTL_SHOWCHAR ;
+ Pos = MAP_APPFONT ( 241 , 79 ) ;
+ Size = MAP_APPFONT ( 50 , 44 ) ;
+ Group = TRUE ;
+ };
+ FixedText FT_CHARCODE
+ {
+ Pos = MAP_APPFONT ( 241 , 126 ) ;
+ Size = MAP_APPFONT ( 50 , 8 ) ;
+ Center = TRUE ;
+ };
+ OKButton BTN_CHAR_OK
+ {
+ Pos = MAP_APPFONT ( 242 , 6 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ DefButton = TRUE ;
+ };
+ CancelButton BTN_CHAR_CANCEL
+ {
+ Pos = MAP_APPFONT ( 242 , 23 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ };
+ HelpButton BTN_CHAR_HELP
+ {
+ Pos = MAP_APPFONT ( 242 , 43 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ };
+ PushButton BTN_DELETE
+ {
+ Pos = MAP_APPFONT ( 242 , 63 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ Text [ en-US ] = "~Delete";
+ };
+/*
+ PushButton BT_ASSIGN
+ {
+ Pos = MAP_APPFONT ( 242 , 140 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ Text [ en-US ] = "~Assign shortcut...";
+ };
+ FixedText FT_ASSIGN
+ {
+ Pos = MAP_APPFONT ( 6 , 156 ) ;
+ Size = MAP_APPFONT ( 100 , 8 ) ;
+ Left = TRUE ;
+ Text [ en-US ] = "Shortcut key: ";
+ };
+ Control CT_ASSIGN
+ {
+ Pos = MAP_APPFONT ( 60 , 156 ) ;
+ Size = MAP_APPFONT ( 160 , 8 ) ;
+ };
+*/
+};
+
+// ********************************************************************** EOF
diff --git a/svx/source/dialog/commonlingui.cxx b/svx/source/cui/commonlingui.cxx
index d8108f93db..d8108f93db 100644
--- a/svx/source/dialog/commonlingui.cxx
+++ b/svx/source/cui/commonlingui.cxx
diff --git a/svx/source/dialog/commonlingui.hxx b/svx/source/cui/commonlingui.hxx
index 5c021db639..a6b8142789 100644
--- a/svx/source/dialog/commonlingui.hxx
+++ b/svx/source/cui/commonlingui.hxx
@@ -40,13 +40,12 @@
#endif
#include <vcl/group.hxx>
#include <vcl/dialog.hxx>
-#include "svx/svxdllapi.h"
//=============================================================================
// SvxClickInfoCtr
//=============================================================================
-class SVX_DLLPUBLIC SvxClickInfoCtr: public Control
+class SvxClickInfoCtr: public Control
{
private:
FixedInfo aFixedInfo;
@@ -71,7 +70,7 @@ protected:
//=============================================================================
// SvxCommonLinguisticControl
//=============================================================================
-class SVX_DLLPUBLIC SvxCommonLinguisticControl : public Window
+class SvxCommonLinguisticControl : public Window
{
public:
enum ButtonType
diff --git a/svx/source/dialog/commonlingui.src b/svx/source/cui/commonlingui.src
index 59fbb6b81f..59fbb6b81f 100644
--- a/svx/source/dialog/commonlingui.src
+++ b/svx/source/cui/commonlingui.src
diff --git a/svx/source/dialog/connect.cxx b/svx/source/cui/connect.cxx
index 486bb02403..486bb02403 100644
--- a/svx/source/dialog/connect.cxx
+++ b/svx/source/cui/connect.cxx
diff --git a/svx/source/dialog/connect.hxx b/svx/source/cui/connect.hxx
index 9da2afa42d..9da2afa42d 100644
--- a/svx/source/dialog/connect.hxx
+++ b/svx/source/cui/connect.hxx
diff --git a/svx/source/dialog/connect.src b/svx/source/cui/connect.src
index 21031303e7..21031303e7 100644
--- a/svx/source/dialog/connect.src
+++ b/svx/source/cui/connect.src
diff --git a/svx/source/dialog/connpoolconfig.cxx b/svx/source/cui/connpoolconfig.cxx
index 8965dc9105..8965dc9105 100644
--- a/svx/source/dialog/connpoolconfig.cxx
+++ b/svx/source/cui/connpoolconfig.cxx
diff --git a/svx/source/dialog/connpoolconfig.hxx b/svx/source/cui/connpoolconfig.hxx
index ebcdb70659..ebcdb70659 100644
--- a/svx/source/dialog/connpoolconfig.hxx
+++ b/svx/source/cui/connpoolconfig.hxx
diff --git a/svx/source/dialog/connpooloptions.cxx b/svx/source/cui/connpooloptions.cxx
index de9b1ec86c..de9b1ec86c 100644
--- a/svx/source/dialog/connpooloptions.cxx
+++ b/svx/source/cui/connpooloptions.cxx
diff --git a/svx/source/dialog/connpooloptions.hrc b/svx/source/cui/connpooloptions.hrc
index eae7028968..eae7028968 100644
--- a/svx/source/dialog/connpooloptions.hrc
+++ b/svx/source/cui/connpooloptions.hrc
diff --git a/svx/source/dialog/connpooloptions.hxx b/svx/source/cui/connpooloptions.hxx
index 453455b31a..9bba07f614 100644
--- a/svx/source/dialog/connpooloptions.hxx
+++ b/svx/source/cui/connpooloptions.hxx
@@ -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
@@ -32,15 +32,11 @@
#define _OFFAPP_CONNPOOLOPTIONS_HXX_
#include <svtools/solar.hrc>
-#define SID_SB_POOLING_ENABLED (RID_OFA_START + 247)
-#define SID_SB_DRIVER_TIMEOUTS (RID_OFA_START + 248)
-#define SID_SB_DB_REGISTER (RID_OFA_START + 249)
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/field.hxx>
+#include <databaseregistrationui.hxx>
//........................................................................
namespace offapp
diff --git a/svx/source/dialog/connpooloptions.src b/svx/source/cui/connpooloptions.src
index 7ca11257e6..7ca11257e6 100644
--- a/svx/source/dialog/connpooloptions.src
+++ b/svx/source/cui/connpooloptions.src
diff --git a/svx/source/dialog/connpoolsettings.cxx b/svx/source/cui/connpoolsettings.cxx
index af588f0b73..af588f0b73 100644
--- a/svx/source/dialog/connpoolsettings.cxx
+++ b/svx/source/cui/connpoolsettings.cxx
diff --git a/svx/source/dialog/connpoolsettings.hxx b/svx/source/cui/connpoolsettings.hxx
index 7788ea7e80..7788ea7e80 100644
--- a/svx/source/dialog/connpoolsettings.hxx
+++ b/svx/source/cui/connpoolsettings.hxx
diff --git a/svx/source/cui/cuicharmap.cxx b/svx/source/cui/cuicharmap.cxx
new file mode 100644
index 0000000000..fa962beafc
--- /dev/null
+++ b/svx/source/cui/cuicharmap.cxx
@@ -0,0 +1,591 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: cuicharmap.cxx,v $
+ * $Revision: 1.10 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svx.hxx"
+
+#ifdef SVX_DLLIMPLEMENTATION
+#undef SVX_DLLIMPLEMENTATION
+#endif
+
+// include ---------------------------------------------------------------
+
+#include <stdio.h>
+
+#define _CUI_CHARMAP_CXX_
+#include <tools/shl.hxx>
+#include <tools/debug.hxx>
+#include <vcl/sound.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/msgbox.hxx>
+#include <svtools/colorcfg.hxx>
+#include <svtools/eitem.hxx>
+#include <svtools/intitem.hxx>
+#include <svtools/stritem.hxx>
+#include <svtools/itempool.hxx>
+
+#include <rtl/textenc.h>
+#include <svx/ucsubset.hxx>
+
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
+#include "cuicharmap.hxx"
+#include <sfx2/request.hxx>
+#include <sfx2/sfxsids.hrc>
+#include <sfx2/app.hxx>
+#include <fontitem.hxx>
+#include "charmap.hrc"
+#include "macroass.hxx"
+
+// class SvxCharacterMap =================================================
+
+SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet* pSet ) :
+ SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_CHARMAP ) ),
+ mpCharMapData( 0 )
+{
+ SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, FALSE );
+ if ( pItem )
+ bOne = pItem->GetValue();
+
+ SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, FALSE );
+ if ( pCharItem )
+ SetChar( pItem->GetValue() );
+
+ mpCharMapData = new SvxCharMapData( this, bOne, &DIALOG_MGR() );
+
+ SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, FALSE );
+ if ( pDisableItem && pDisableItem->GetValue() )
+ DisableFontSelection();
+
+ SFX_ITEMSET_ARG( pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
+ SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, FALSE );
+ if ( pFontItem )
+ {
+ Font aFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), GetCharFont().GetSize() );
+ aFont.SetCharSet( pFontItem->GetCharSet() );
+ aFont.SetPitch( pFontItem->GetPitch() );
+ SetCharFont( aFont );
+ }
+ else if ( pFontNameItem )
+ {
+ Font aFont( GetCharFont() );
+ aFont.SetName( pFontNameItem->GetValue() );
+ SetCharFont( aFont );
+ }
+
+ FreeResource();
+ CreateOutputItemSet( pSet ? *pSet->GetPool() : SFX_APP()->GetPool() );
+}
+
+// -----------------------------------------------------------------------
+
+SvxCharacterMap::~SvxCharacterMap()
+{
+ delete mpCharMapData;
+}
+
+// -----------------------------------------------------------------------
+
+const Font& SvxCharacterMap::GetCharFont() const
+{
+ return mpCharMapData->aFont;
+}
+
+// -----------------------------------------------------------------------
+
+void SvxCharacterMap::SetChar( sal_UCS4 c )
+{
+ mpCharMapData->aShowSet.SelectCharacter( c );
+}
+
+// -----------------------------------------------------------------------
+
+sal_UCS4 SvxCharacterMap::GetChar() const
+{
+ return mpCharMapData->aShowSet.GetSelectCharacter();
+}
+
+// -----------------------------------------------------------------------
+
+String SvxCharacterMap::GetCharacters() const
+{
+ return mpCharMapData->aShowText.GetText();
+}
+
+
+// -----------------------------------------------------------------------
+
+void SvxCharacterMap::DisableFontSelection()
+{
+ mpCharMapData->aFontText.Disable();
+ mpCharMapData->aFontLB.Disable();
+}
+
+void SvxCharacterMap::SetCharFont( const Font& rFont )
+{
+ mpCharMapData->SetCharFont( rFont );
+}
+
+short SvxCharacterMap::Execute()
+{
+ short nResult = SfxModalDialog::Execute();
+ if ( nResult == RET_OK )
+ {
+ SfxItemSet* pSet = GetItemSet();
+ if ( pSet )
+ {
+ const SfxItemPool* pPool = pSet->GetPool();
+ const Font& rFont( GetCharFont() );
+ pSet->Put( SfxStringItem( pPool->GetWhich(SID_CHARMAP), GetCharacters() ) );
+ pSet->Put( SvxFontItem( rFont.GetFamily(), rFont.GetName(),
+ rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
+ pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), rFont.GetName() ) );
+ pSet->Put( SfxInt32Item( pPool->GetWhich(SID_ATTR_CHAR), GetChar() ) );
+ }
+ }
+
+ return nResult;
+}
+
+
+// class SvxShowText =====================================================
+
+SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, BOOL bCenter )
+: Control( pParent, rResId ),
+ mbCenter( bCenter)
+{}
+
+// -----------------------------------------------------------------------
+
+void SvxShowText::Paint( const Rectangle& )
+{
+ Color aTextCol = GetTextColor();
+
+ const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
+ const Color aWindowTextColor( rStyleSettings.GetDialogTextColor() );
+ SetTextColor( aWindowTextColor );
+
+ const String aText = GetText();
+ const Size aSize = GetOutputSizePixel();
+ Point aPoint( 2, mnY );
+
+ // adjust position using ink boundary if possible
+ Rectangle aBoundRect;
+ if( !GetTextBoundRect( aBoundRect, aText ) || aBoundRect.IsEmpty() )
+ aPoint.X() = (aSize.Width() - GetTextWidth( aText )) / 2;
+ else
+ {
+ // adjust position before it gets out of bounds
+ aBoundRect += aPoint;
+
+ // shift back vertically if needed
+ int nYLDelta = aBoundRect.Top();
+ int nYHDelta = aSize.Height() - aBoundRect.Bottom();
+ if( nYLDelta <= 0 )
+ aPoint.Y() -= nYLDelta - 1;
+ else if( nYHDelta <= 0 )
+ aPoint.Y() += nYHDelta - 1;
+
+ if( mbCenter )
+ {
+ // move glyph to middle of cell
+ aPoint.X() = -aBoundRect.Left()
+ + (aSize.Width() - aBoundRect.GetWidth()) / 2;
+ }
+ else
+ {
+ // shift back horizontally if needed
+ int nXLDelta = aBoundRect.Left();
+ int nXHDelta = aSize.Width() - aBoundRect.Right();
+ if( nXLDelta <= 0 )
+ aPoint.X() -= nXLDelta - 1;
+ else if( nXHDelta <= 0 )
+ aPoint.X() += nXHDelta - 1;
+ }
+ }
+
+ DrawText( aPoint, aText );
+ SetTextColor( aTextCol );
+}
+
+// -----------------------------------------------------------------------
+
+void SvxShowText::SetFont( const Font& rFont )
+{
+ long nWinHeight = GetOutputSizePixel().Height();
+ Font aFont = rFont;
+ aFont.SetWeight( WEIGHT_NORMAL );
+ aFont.SetAlign( ALIGN_TOP );
+ aFont.SetSize( PixelToLogic( Size( 0, nWinHeight/2 ) ) );
+ aFont.SetTransparent( TRUE );
+ Control::SetFont( aFont );
+ mnY = ( nWinHeight - GetTextHeight() ) / 2;
+
+ Invalidate();
+}
+
+// -----------------------------------------------------------------------
+
+void SvxShowText::SetText( const String& rText )
+{
+ Control::SetText( rText );
+ Invalidate();
+}
+
+// -----------------------------------------------------------------------
+
+SvxShowText::~SvxShowText()
+{}
+
+// class SvxCharacterMap =================================================
+
+SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pResContext )
+: mpDialog( pDialog ),
+ aShowSet ( pDialog, ResId( CT_SHOWSET, *pResContext ) ),
+ aShowText ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ),
+// aShowShortcut ( pDialog, ResId( CT_ASSIGN, *pResContext ) ),
+ aOKBtn ( pDialog, ResId( BTN_CHAR_OK, *pResContext ) ),
+ aCancelBtn ( pDialog, ResId( BTN_CHAR_CANCEL, *pResContext ) ),
+ aHelpBtn ( pDialog, ResId( BTN_CHAR_HELP, *pResContext ) ),
+ aDeleteBtn ( pDialog, ResId( BTN_DELETE, *pResContext ) ),
+// aAssignBtn ( pDialog, ResId( BT_ASSIGN, *pResContext ) ),
+ aFontText ( pDialog, ResId( FT_FONT, *pResContext ) ),
+ aFontLB ( pDialog, ResId( LB_FONT, *pResContext ) ),
+ aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ),
+ aSubsetLB ( pDialog, ResId( LB_SUBSET, *pResContext ) ),
+ aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ),
+ aShowChar ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), TRUE ),
+ aCharCodeText ( pDialog, ResId( FT_CHARCODE, *pResContext ) ),
+// aAssignText ( pDialog, ResId( FT_ASSIGN, *pResContext ) ),
+ bOne( bOne_ ),
+ pSubsetMap( NULL )
+{
+ aFont = pDialog->GetFont();
+ aFont.SetTransparent( TRUE );
+ aFont.SetFamily( FAMILY_DONTKNOW );
+ aFont.SetPitch( PITCH_DONTKNOW );
+ aFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
+
+ if ( bOne )
+ {
+ Size aDlgSize = pDialog->GetSizePixel();
+ pDialog->SetSizePixel( Size( aDlgSize.Width(),
+ aDlgSize.Height()-aShowText.GetSizePixel().Height() ) );
+ aSymbolText.Hide();
+ aShowText.Hide();
+ aDeleteBtn.Hide();
+ }
+
+ String aDefStr( aFont.GetName() );
+ String aLastName;
+ int nCount = mpDialog->GetDevFontCount();
+ for ( int i = 0; i < nCount; i++ )
+ {
+ String aFontName( mpDialog->GetDevFont( i ).GetName() );
+ if ( aFontName != aLastName )
+ {
+ aLastName = aFontName;
+ USHORT nPos = aFontLB.InsertEntry( aFontName );
+ aFontLB.SetEntryData( nPos, (void*)(ULONG)i );
+ }
+ }
+ // the font may not be in the list =>
+ // try to find a font name token in list and select found font,
+ // else select topmost entry
+ FASTBOOL bFound = (aFontLB.GetEntryPos( aDefStr ) == LISTBOX_ENTRY_NOTFOUND );
+ if( !bFound )
+ {
+ for ( xub_StrLen i = 0; i < aDefStr.GetTokenCount(); ++i )
+ {
+ String aToken = aDefStr.GetToken(i);
+ if ( aFontLB.GetEntryPos( aToken ) != LISTBOX_ENTRY_NOTFOUND )
+ {
+ aDefStr = aToken;
+ bFound = TRUE;
+ break;
+ }
+ }
+ }
+
+ if ( bFound )
+ aFontLB.SelectEntry( aDefStr );
+ else if ( aFontLB.GetEntryCount() )
+ aFontLB.SelectEntryPos(0);
+ FontSelectHdl( &aFontLB );
+
+ aOKBtn.SetClickHdl( LINK( this, SvxCharMapData, OKHdl ) );
+ aFontLB.SetSelectHdl( LINK( this, SvxCharMapData, FontSelectHdl ) );
+ aSubsetLB.SetSelectHdl( LINK( this, SvxCharMapData, SubsetSelectHdl ) );
+ aShowSet.SetDoubleClickHdl( LINK( this, SvxCharMapData, CharDoubleClickHdl ) );
+ aShowSet.SetSelectHdl( LINK( this, SvxCharMapData, CharSelectHdl ) );
+ aShowSet.SetHighlightHdl( LINK( this, SvxCharMapData, CharHighlightHdl ) );
+ aShowSet.SetPreSelectHdl( LINK( this, SvxCharMapData, CharPreSelectHdl ) );
+ aDeleteBtn.SetClickHdl( LINK( this, SvxCharMapData, DeleteHdl ) );
+// aAssignBtn.SetClickHdl( LINK( this, SvxCharMapData, AssignHdl ) );
+
+ if( SvxShowCharSet::getSelectedChar() == ' ')
+ aOKBtn.Disable();
+ else
+ aOKBtn.Enable();
+
+ // left align aShowText field
+ int nLeftEdge = aSymbolText.GetPosPixel().X();
+ nLeftEdge += aSymbolText.GetTextWidth( aSymbolText.GetText() );
+ Size aNewSize = aShowText.GetOutputSizePixel();
+ aShowText.SetPosPixel( Point( nLeftEdge+4, aShowText.GetPosPixel().Y() ) );
+}
+
+// -----------------------------------------------------------------------
+
+void SvxCharMapData::SetCharFont( const Font& rFont )
+{
+ // first get the underlying info in order to get font names
+ // like "Times New Roman;Times" resolved
+ Font aTmp( mpDialog->GetFontMetric( rFont ) );
+
+ if ( aFontLB.GetEntryPos( aTmp.GetName() ) == LISTBOX_ENTRY_NOTFOUND )
+ return;
+
+ aFontLB.SelectEntry( aTmp.GetName() );
+ aFont = aTmp;
+ FontSelectHdl( &aFontLB );
+
+ // for compatibility reasons
+ mpDialog->ModalDialog::SetFont( aFont );
+}
+
+// -----------------------------------------------------------------------
+
+IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG )
+{
+ String aStr = aShowText.GetText();
+
+ if ( !aStr.Len() )
+ {
+ sal_UCS4 cChar = aShowSet.GetSelectCharacter();
+ // using the new UCS4 constructor
+ rtl::OUString aOUStr( &cChar, 1 );
+ aShowText.SetText( aOUStr );
+ }
+ mpDialog->EndDialog( TRUE );
+ return 0;
+}
+
+// -----------------------------------------------------------------------
+
+IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
+{
+ USHORT nPos = aFontLB.GetSelectEntryPos(),
+ nFont = (USHORT)(ULONG)aFontLB.GetEntryData( nPos );
+ aFont = mpDialog->GetDevFont( nFont );
+
+ // notify children using this font
+ aShowSet.SetFont( aFont );
+ aShowChar.SetFont( aFont );
+ aShowText.SetFont( aFont );
+
+ // right align some fields to aShowSet
+ int nRightEdge = aShowSet.GetPosPixel().X() + aShowSet.GetOutputSizePixel().Width();
+ Size aNewSize = aSubsetLB.GetOutputSizePixel();
+ aNewSize.setWidth( nRightEdge - aSubsetLB.GetPosPixel().X() );
+ aSubsetLB.SetOutputSizePixel( aNewSize );
+
+ // setup unicode subset listbar with font specific subsets,
+ // hide unicode subset listbar for symbol fonts
+ // TODO: get info from the Font once it provides it
+ if( pSubsetMap)
+ delete pSubsetMap;
+ pSubsetMap = NULL;
+
+ BOOL bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL);
+ if( bNeedSubset )
+ {
+ FontCharMap aFontCharMap;
+ aShowSet.GetFontCharMap( aFontCharMap );
+ pSubsetMap = new SubsetMap( &aFontCharMap );
+
+ // update subset listbox for new font's unicode subsets
+ aSubsetLB.Clear();
+ // TODO: is it worth to improve the stupid linear search?
+ bool bFirst = true;
+ const Subset* s;
+ while( NULL != (s = pSubsetMap->GetNextSubset( bFirst )) )
+ {
+ USHORT nPos_ = aSubsetLB.InsertEntry( s->GetName() );
+ aSubsetLB.SetEntryData( nPos_, (void*)s );
+ // NOTE: subset must live at least as long as the selected font
+ if( bFirst )
+ aSubsetLB.SelectEntryPos( nPos_ );
+ bFirst = false;
+ }
+ if( aSubsetLB.GetEntryCount() <= 1 )
+ bNeedSubset = FALSE;
+ }
+
+ aSubsetText.Show( bNeedSubset);
+ aSubsetLB.Show( bNeedSubset);
+
+ return 0;
+}
+
+// -----------------------------------------------------------------------
+
+IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG )
+{
+ USHORT nPos = aSubsetLB.GetSelectEntryPos();
+ const Subset* pSubset = reinterpret_cast<const Subset*> (aSubsetLB.GetEntryData(nPos));
+ if( pSubset )
+ {
+ sal_UCS4 cFirst = pSubset->GetRangeMin();
+ aShowSet.SelectCharacter( cFirst );
+ }
+ aSubsetLB.SelectEntryPos( nPos );
+ return 0;
+}
+
+// -----------------------------------------------------------------------
+
+IMPL_LINK( SvxCharMapData, CharDoubleClickHdl, Control *, EMPTYARG )
+{
+ mpDialog->EndDialog( TRUE );
+ return 0;
+}
+
+// -----------------------------------------------------------------------
+
+IMPL_LINK( SvxCharMapData, CharSelectHdl, Control *, EMPTYARG )
+{
+ if ( !bOne )
+ {
+ String aText = aShowText.GetText();
+
+ if ( aText.Len() == CHARMAP_MAXLEN )
+ Sound::Beep( SOUND_WARNING );
+ else
+ {
+ sal_UCS4 cChar = aShowSet.GetSelectCharacter();
+ // using the new UCS4 constructor
+ rtl::OUString aOUStr( &cChar, 1 );
+ aShowText.SetText( aText + aOUStr );
+ }
+
+ }
+ aOKBtn.Enable();
+ return 0;
+}
+
+// -----------------------------------------------------------------------
+
+IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG )
+{
+ String aText;
+ sal_UCS4 cChar = aShowSet.GetSelectCharacter();
+ sal_Bool bSelect = (cChar > 0);
+
+ // show char sample
+ if ( bSelect )
+ {
+ // using the new UCS4 constructor
+ aText = rtl::OUString( &cChar, 1 );
+
+ const Subset* pSubset = NULL;
+ if( pSubsetMap )
+ pSubset = pSubsetMap->GetSubsetByUnicode( cChar );
+ if( pSubset )
+ aSubsetLB.SelectEntry( pSubset->GetName() );
+ else
+ aSubsetLB.SetNoSelection();
+ }
+ aShowChar.SetText( aText );
+ aShowChar.Update();
+
+ // show char code
+ if ( bSelect )
+ {
+ char aBuf[32];
+ snprintf( aBuf, sizeof(aBuf), "U+%04X", static_cast<unsigned>(cChar) );
+ if( cChar < 0x0100 )
+ snprintf( aBuf+6, sizeof(aBuf)-6, " (%u)", static_cast<unsigned>(cChar) );
+ aText = String::CreateFromAscii( aBuf );
+ }
+ aCharCodeText.SetText( aText );
+
+ return 0;
+}
+
+// -----------------------------------------------------------------------
+
+IMPL_LINK( SvxCharMapData, CharPreSelectHdl, Control *, EMPTYARG )
+{
+ // adjust subset selection
+ if( pSubsetMap )
+ {
+ sal_UCS4 cChar = aShowSet.GetSelectCharacter();
+ const Subset* pSubset = pSubsetMap->GetSubsetByUnicode( cChar );
+ if( pSubset )
+ aSubsetLB.SelectEntry( pSubset->GetName() );
+ }
+
+ aOKBtn.Enable();
+ return 0;
+}
+
+// -----------------------------------------------------------------------
+
+IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG )
+{
+ aShowText.SetText( String() );
+ aOKBtn.Disable();
+ return 0;
+}
+
+#include <sfx2/objsh.hxx>
+#include <vcl/msgbox.hxx>
+#include <svtools/stritem.hxx>
+
+IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG )
+{
+ SfxAllItemSet aSet( SfxObjectShell::Current()->GetPool() );
+ aSet.Put( SfxStringItem( SID_CHARMAP, String::CreateFromAscii("test") ) );
+ SfxModalDialog* pDlg = new SfxMacroAssignDlg( mpDialog, com::sun::star::uno::Reference < com::sun::star::frame::XFrame >(), aSet );
+ if ( pDlg && pDlg->Execute() == RET_OK )
+ {
+ const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
+ const SfxPoolItem* pItem;
+ if( SFX_ITEM_SET == pOutSet->GetItemState( SID_CHARMAP, FALSE, &pItem ) )
+ {
+ // show assigned shortcut
+ }
+ }
+
+ delete pDlg;
+
+ return 0;
+}
diff --git a/svx/source/dialog/cuicharmap.hxx b/svx/source/cui/cuicharmap.hxx
index c20dfb5507..7ab3974fb1 100644
--- a/svx/source/dialog/cuicharmap.hxx
+++ b/svx/source/cui/cuicharmap.hxx
@@ -34,9 +34,11 @@
#include <vcl/ctrl.hxx>
#include <vcl/metric.hxx>
-#include <vcl/scrbar.hxx>
+#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/lstbox.hxx>
#include <sfx2/basedlgs.hxx>
-#include <map>
+#include <svx/charmap.hxx>
class SubsetMap;
class SvxCharMapData;
@@ -44,8 +46,6 @@ class SvxCharMapData;
// define ----------------------------------------------------------------
#define CHARMAP_MAXLEN 32
-#define COLUMN_COUNT 16
-#define ROW_COUNT 8
namespace svx
{
@@ -56,25 +56,90 @@ namespace svx
// the main purpose of this dialog is to enable the use of characters
// that are not easily accesible from the keyboard
+// class SvxShowText =====================================================
+
+class SvxShowText : public Control
+{
+public:
+ SvxShowText( Window* pParent,
+ const ResId& rResId,
+ BOOL bCenter = FALSE );
+ ~SvxShowText();
+
+ void SetFont( const Font& rFont );
+ void SetText( const String& rText );
+
+protected:
+ virtual void Paint( const Rectangle& );
+
+private:
+ long mnY;
+ BOOL mbCenter;
+
+};
+
+class SvxCharMapData
+{
+public:
+ SvxCharMapData( class SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pResContext );
+
+ void SetCharFont( const Font& rFont );
+
+private:
+friend class SvxCharacterMap;
+ SfxModalDialog* mpDialog;
+
+ SvxShowCharSet aShowSet;
+ SvxShowText aShowText;
+// SvxShowText aShowShortcut;
+ OKButton aOKBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
+ PushButton aDeleteBtn;
+// PushButton aAssignBtn;
+ FixedText aFontText;
+ ListBox aFontLB;
+ FixedText aSubsetText;
+ ListBox aSubsetLB;
+ FixedText aSymbolText;
+ SvxShowText aShowChar;
+ FixedText aCharCodeText;
+// FixedText aAssignText;
+ Font aFont;
+ BOOL bOne;
+ const SubsetMap* pSubsetMap;
+
+ DECL_LINK( OKHdl, OKButton* );
+ DECL_LINK( FontSelectHdl, ListBox* );
+ DECL_LINK( SubsetSelectHdl, ListBox* );
+ DECL_LINK( CharDoubleClickHdl, Control* pControl );
+ DECL_LINK( CharSelectHdl, Control* pControl );
+ DECL_LINK( CharHighlightHdl, Control* pControl );
+ DECL_LINK( CharPreSelectHdl, Control* pControl );
+ DECL_LINK( DeleteHdl, PushButton* pBtn );
+ DECL_LINK( AssignHdl, PushButton* pBtn );
+};
+
class SvxCharacterMap : public SfxModalDialog
{
private:
- SvxCharMapData* const mpCharMapData;
+ SvxCharMapData* mpCharMapData;
public:
- SvxCharacterMap( Window* pParent, BOOL bOne = TRUE );
+ SvxCharacterMap( Window* pParent, BOOL bOne=TRUE, const SfxItemSet* pSet=0 );
~SvxCharacterMap();
void DisableFontSelection();
const Font& GetCharFont() const;
void SetCharFont( const Font& rFont );
- void SetFont( const Font& rFont ) { SetCharFont( rFont ); } //! irgendwann entfernen
void SetChar( sal_UCS4 );
sal_UCS4 GetChar() const;
String GetCharacters() const;
+
+ virtual short Execute();
};
#endif
diff --git a/svx/source/dialog/cuiexp.cxx b/svx/source/cui/cuiexp.cxx
index cb85d0704d..cb85d0704d 100644
--- a/svx/source/dialog/cuiexp.cxx
+++ b/svx/source/cui/cuiexp.cxx
diff --git a/svx/source/dialog/cuifmsearch.cxx b/svx/source/cui/cuifmsearch.cxx
index 4549d9c7b3..4549d9c7b3 100644
--- a/svx/source/dialog/cuifmsearch.cxx
+++ b/svx/source/cui/cuifmsearch.cxx
diff --git a/svx/source/dialog/cuifmsearch.hxx b/svx/source/cui/cuifmsearch.hxx
index 23b1ceeccf..23b1ceeccf 100644
--- a/svx/source/dialog/cuifmsearch.hxx
+++ b/svx/source/cui/cuifmsearch.hxx
diff --git a/svx/source/dialog/cuigaldlg.cxx b/svx/source/cui/cuigaldlg.cxx
index 3c3bb1364e..3c3bb1364e 100644
--- a/svx/source/dialog/cuigaldlg.cxx
+++ b/svx/source/cui/cuigaldlg.cxx
diff --git a/svx/source/dialog/cuigaldlg.hxx b/svx/source/cui/cuigaldlg.hxx
index 5290fd1cc2..5290fd1cc2 100644
--- a/svx/source/dialog/cuigaldlg.hxx
+++ b/svx/source/cui/cuigaldlg.hxx
diff --git a/svx/source/dialog/cuigrfflt.cxx b/svx/source/cui/cuigrfflt.cxx
index 329974639a..39c4e44e31 100644
--- a/svx/source/dialog/cuigrfflt.cxx
+++ b/svx/source/cui/cuigrfflt.cxx
@@ -38,9 +38,7 @@
#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
-#ifndef _SFXOBJSH_HXX
#include <sfx2/objsh.hxx>
-#endif
#include <sfx2/request.hxx>
#include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/cuigrfflt.hxx b/svx/source/cui/cuigrfflt.hxx
index adf9519993..adf9519993 100644
--- a/svx/source/dialog/cuigrfflt.hxx
+++ b/svx/source/cui/cuigrfflt.hxx
diff --git a/svx/source/dialog/cuihyperdlg.cxx b/svx/source/cui/cuihyperdlg.cxx
index 3eb69780d8..3eb69780d8 100644
--- a/svx/source/dialog/cuihyperdlg.cxx
+++ b/svx/source/cui/cuihyperdlg.cxx
diff --git a/svx/source/dialog/cuihyperdlg.hxx b/svx/source/cui/cuihyperdlg.hxx
index fcd733aca5..fcd733aca5 100644
--- a/svx/source/dialog/cuihyperdlg.hxx
+++ b/svx/source/cui/cuihyperdlg.hxx
diff --git a/svx/source/cui/cuiimapdlg.hrc b/svx/source/cui/cuiimapdlg.hrc
new file mode 100755
index 0000000000..7912b88523
--- /dev/null
+++ b/svx/source/cui/cuiimapdlg.hrc
@@ -0,0 +1,50 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: imapdlg.hrc,v $
+ * $Revision: 1.9 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include <svx/dialogs.hrc>
+
+// ImapDlg-Dialoge
+#define RID_SVX_IMAPDLG_START RID_SVX_IMAP_START
+
+#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2)
+
+#define FT_URLDESCRIPTION 1
+#define FT_URL1 2
+#define FT_TARGET 3
+#define FT_NAME 4
+#define FT_DESCRIPTION 5
+#define EDT_URLDESCRIPTION 1
+#define EDT_URL 2
+#define EDT_NAME 3
+#define EDT_DESCRIPTION 4
+#define BTN_HELP1 1
+#define BTN_OK1 2
+#define BTN_CANCEL1 3
+#define FL_URL 1
+#define CBB_TARGETS 1
diff --git a/svx/source/cui/cuiimapdlg.src b/svx/source/cui/cuiimapdlg.src
new file mode 100755
index 0000000000..c686fce380
--- /dev/null
+++ b/svx/source/cui/cuiimapdlg.src
@@ -0,0 +1,151 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: imapdlg.src,v $
+ * $Revision: 1.53 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ // include ---------------------------------------------------------------
+#include "helpid.hrc"
+#include "cuiimapdlg.hrc"
+ // pragma ----------------------------------------------------------------
+
+ModalDialog RID_SVXDLG_IMAPURL
+{
+ SVLook = TRUE ;
+ OutputSize = TRUE ;
+ Closeable = TRUE ;
+ Moveable = TRUE ;
+ Size = MAP_APPFONT ( 214 , 188 ) ;
+ Text [ en-US ] = "Properties" ;
+
+ FixedText FT_URL1
+ {
+ Pos = MAP_APPFONT ( 6 , 6 ) ;
+ Size = MAP_APPFONT ( 202 , 8 ) ;
+ Text [ en-US ] = "~URL" ;
+ };
+ Edit EDT_URL
+ {
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Left = TRUE ;
+ Pos = MAP_APPFONT ( 6 , 17 ) ;
+ Size = MAP_APPFONT ( 202 , 12 ) ;
+ };
+
+ FixedText FT_TARGET
+ {
+ Pos = MAP_APPFONT ( 6 , 32 ) ;
+ Size = MAP_APPFONT ( 202 , 8 ) ;
+ Text [ en-US ] = "F~rame" ;
+ };
+ ComboBox CBB_TARGETS
+ {
+ Border = TRUE ;
+ Sort = TRUE ;
+ Pos = MAP_APPFONT ( 6 , 43 ) ;
+ Size = MAP_APPFONT ( 101 , 50 ) ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
+ HScroll = TRUE ;
+ };
+
+ FixedText FT_NAME
+ {
+ Pos = MAP_APPFONT ( 6 , 59 ) ;
+ Size = MAP_APPFONT ( 202 , 8 ) ;
+ Text [ en-US ] = "~Name" ;
+ };
+ Edit EDT_NAME
+ {
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Left = TRUE ;
+ Pos = MAP_APPFONT ( 6 , 70 ) ;
+ Size = MAP_APPFONT ( 202 , 12 ) ;
+ };
+
+ FixedText FT_URLDESCRIPTION
+ {
+ Pos = MAP_APPFONT ( 6 , 85 ) ;
+ Size = MAP_APPFONT ( 202 , 8 ) ;
+ Text [ en-US ] = "Alternative ~text" ;
+ };
+
+ Edit EDT_URLDESCRIPTION
+ {
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Left = TRUE ;
+ Pos = MAP_APPFONT ( 6 , 96 ) ;
+ Size = MAP_APPFONT ( 202 , 12 ) ;
+ };
+ FixedText FT_DESCRIPTION
+ {
+ Pos = MAP_APPFONT ( 6 , 111 ) ;
+ Size = MAP_APPFONT ( 202 , 8 ) ;
+ Text [ en-US ] = "~Description" ;
+ };
+
+ MultiLineEdit EDT_DESCRIPTION
+ {
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 6 , 122 ) ;
+ Size = MAP_APPFONT ( 202 , 34 ) ;
+ TabStop = TRUE ;
+ IgnoreTab = TRUE;
+ VScroll = TRUE;
+ };
+
+ FixedLine FL_URL
+ {
+ Pos = MAP_APPFONT ( 0 , 160 ) ;
+ Size = MAP_APPFONT ( 214 , 4 ) ;
+ };
+
+ // Buttons
+ HelpButton BTN_HELP1
+ {
+ Pos = MAP_APPFONT ( 6, 168 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ };
+
+ OKButton BTN_OK1
+ {
+ TabStop = TRUE ;
+ DefButton = TRUE ;
+ Pos = MAP_APPFONT ( 107 , 168 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ };
+
+ CancelButton BTN_CANCEL1
+ {
+ TabStop = TRUE ;
+ Pos = MAP_APPFONT ( 160 , 168 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ };
+};
diff --git a/svx/source/dialog/cuiimapwnd.cxx b/svx/source/cui/cuiimapwnd.cxx
index ed4dd5383e..72147f49e6 100644
--- a/svx/source/dialog/cuiimapwnd.cxx
+++ b/svx/source/cui/cuiimapwnd.cxx
@@ -39,7 +39,7 @@
#include <vcl/help.hxx>
#include <sfx2/sfxsids.hrc> // SID_ATTR_MACROITEM
#define _ANIMATION
-#include <sfx2/macropg.hxx>
+#include "macroass.hxx"
#include <svtools/imaprect.hxx>
#include <svtools/imapcirc.hxx>
#include <svtools/imappoly.hxx>
@@ -49,8 +49,8 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
-#include <imapdlg.hrc>
-#include <imapwnd.hxx>
+#include <cuiimapdlg.hrc>
+#include <cuiimapwnd.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdorect.hxx>
#include <svx/svdocirc.hxx>
@@ -63,8 +63,6 @@
#include <sot/formats.hxx>
-#include "cuiimapwnd.hxx" //CHINA001
-
#define TRANSCOL Color( COL_WHITE )
/*************************************************************************
diff --git a/svx/source/dialog/cuiimapwnd.hxx b/svx/source/cui/cuiimapwnd.hxx
index 5bc559245c..ff3582ae3a 100644
--- a/svx/source/dialog/cuiimapwnd.hxx
+++ b/svx/source/cui/cuiimapwnd.hxx
@@ -3,9 +3,8 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
+#include <vcl/combobox.hxx>
#include <vcl/button.hxx>
-#endif
#include <vcl/menu.hxx>
#include <svtools/itempool.hxx>
#include <svtools/imapobj.hxx>
diff --git a/svx/source/dialog/cuioptgenrl.hxx b/svx/source/cui/cuioptgenrl.hxx
index bed2f38296..bed2f38296 100644
--- a/svx/source/dialog/cuioptgenrl.hxx
+++ b/svx/source/cui/cuioptgenrl.hxx
diff --git a/svx/source/dialog/cuisrchdlg.cxx b/svx/source/cui/cuisrchdlg.cxx
index 4bdc903410..6cbe6268d0 100644
--- a/svx/source/dialog/cuisrchdlg.cxx
+++ b/svx/source/cui/cuisrchdlg.cxx
@@ -56,14 +56,14 @@
#include <svx/dialogs.hrc>
#include <svx/svxitems.hrc>
-#include "srchdlg.hrc"
+//#include "srchdlg.hrc"
#define ITEMID_SETITEM 0
#include <sfx2/srchitem.hxx>
#include <svx/pageitem.hxx>
-#include "srchctrl.hxx"
+//#include "srchctrl.hxx"
//CHINA001 #include "srchxtra.hxx"
#include <svx/dialmgr.hxx>
#include "dlgutil.hxx"
diff --git a/svx/source/dialog/cuisrchdlg.hxx b/svx/source/cui/cuisrchdlg.hxx
index 7ed9b2a508..7ed9b2a508 100644
--- a/svx/source/dialog/cuisrchdlg.hxx
+++ b/svx/source/cui/cuisrchdlg.hxx
diff --git a/svx/source/dialog/cuitabarea.hxx b/svx/source/cui/cuitabarea.hxx
index e1cc7017d6..d21e105957 100644
--- a/svx/source/dialog/cuitabarea.hxx
+++ b/svx/source/cui/cuitabarea.hxx
@@ -32,8 +32,6 @@
// include ---------------------------------------------------------------
-#include "svx/svxdllapi.h"
-
#include <svx/tabarea.hxx>
/*************************************************************************
@@ -116,7 +114,7 @@ public:
|*
\************************************************************************/
-class SVX_DLLPUBLIC SvxTransparenceTabPage : public SvxTabPage
+class SvxTransparenceTabPage : public SvxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -205,7 +203,7 @@ public:
|*
\************************************************************************/
-class SVX_DLLPUBLIC SvxAreaTabPage : public SvxTabPage
+class SvxAreaTabPage : public SvxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
diff --git a/svx/source/dialog/cuitabline.hxx b/svx/source/cui/cuitabline.hxx
index 79ef6f5efe..79ef6f5efe 100644
--- a/svx/source/dialog/cuitabline.hxx
+++ b/svx/source/cui/cuitabline.hxx
diff --git a/svx/source/dialog/cuitbxform.cxx b/svx/source/cui/cuitbxform.cxx
index 9cbbaca680..9cbbaca680 100644
--- a/svx/source/dialog/cuitbxform.cxx
+++ b/svx/source/cui/cuitbxform.cxx
diff --git a/svx/source/dialog/cuitbxform.hxx b/svx/source/cui/cuitbxform.hxx
index afec3d404e..afec3d404e 100644
--- a/svx/source/dialog/cuitbxform.hxx
+++ b/svx/source/cui/cuitbxform.hxx
diff --git a/svx/source/dialog/dbregister.cxx b/svx/source/cui/dbregister.cxx
index 0a38f57481..0a38f57481 100644
--- a/svx/source/dialog/dbregister.cxx
+++ b/svx/source/cui/dbregister.cxx
diff --git a/svx/source/dialog/dbregister.hrc b/svx/source/cui/dbregister.hrc
index 9e52057467..9e52057467 100644
--- a/svx/source/dialog/dbregister.hrc
+++ b/svx/source/cui/dbregister.hrc
diff --git a/svx/source/dialog/dbregister.hxx b/svx/source/cui/dbregister.hxx
index 303687300e..303687300e 100644
--- a/svx/source/dialog/dbregister.hxx
+++ b/svx/source/cui/dbregister.hxx
diff --git a/svx/source/dialog/dbregister.src b/svx/source/cui/dbregister.src
index a1be562c03..a1be562c03 100644
--- a/svx/source/dialog/dbregister.src
+++ b/svx/source/cui/dbregister.src
diff --git a/svx/source/dialog/dbregisterednamesconfig.cxx b/svx/source/cui/dbregisterednamesconfig.cxx
index 3fdfa74f9d..3fdfa74f9d 100644
--- a/svx/source/dialog/dbregisterednamesconfig.cxx
+++ b/svx/source/cui/dbregisterednamesconfig.cxx
diff --git a/svx/source/dialog/dbregisterednamesconfig.hxx b/svx/source/cui/dbregisterednamesconfig.hxx
index 3dc1f36637..3dc1f36637 100644
--- a/svx/source/dialog/dbregisterednamesconfig.hxx
+++ b/svx/source/cui/dbregisterednamesconfig.hxx
diff --git a/svx/source/dialog/dbregistersettings.cxx b/svx/source/cui/dbregistersettings.cxx
index 77aad8c7d2..77aad8c7d2 100644
--- a/svx/source/dialog/dbregistersettings.cxx
+++ b/svx/source/cui/dbregistersettings.cxx
diff --git a/svx/source/dialog/dbregistersettings.hxx b/svx/source/cui/dbregistersettings.hxx
index c6639a66bb..c6639a66bb 100644
--- a/svx/source/dialog/dbregistersettings.hxx
+++ b/svx/source/cui/dbregistersettings.hxx
diff --git a/svx/source/dialog/dlgfact.cxx b/svx/source/cui/dlgfact.cxx
index e1460e102b..a894f52f6a 100644
--- a/svx/source/dialog/dlgfact.cxx
+++ b/svx/source/cui/dlgfact.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
@@ -49,7 +49,7 @@
#include <svx/dialogs.hrc>
#include "fmresids.hrc"
#include "gallery.hrc"
-#include "imapdlg.hrc"
+//#include "imapdlg.hrc"
// dialogs and tabpages
#include "dstribut.hxx"
#include "cuigaldlg.hxx"
@@ -110,6 +110,8 @@
#include "macropg.hxx" // for SvxMacroAssignDlg
#include "sdrcelldlg.hxx"
#include "newtabledlg.hxx"
+#include "macroass.hxx"
+#include "acccfg.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
@@ -119,6 +121,7 @@ using ::com::sun::star::uno::Reference;
using namespace svx;
// AbstractTabDialog implementations just forwards everything to the dialog
+IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl)
IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl)
IMPL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
@@ -127,12 +130,12 @@ IMPL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl);
AbstractSvxZoomDialog_Impl::~AbstractSvxZoomDialog_Impl() \
-{
- delete pDlg;
-}
-short AbstractSvxZoomDialog_Impl::Execute()
-{
- return pDlg->Execute();
+{
+ delete pDlg;
+}
+short AbstractSvxZoomDialog_Impl::Execute()
+{
+ return pDlg->Execute();
}
//IMPL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl);
@@ -143,7 +146,6 @@ IMPL_ABSTDLG_BASE(AbstractScriptSelectorDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractGalleryIdDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractURLDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl);
-IMPL_ABSTDLG_BASE(AbstractSvxCharacterMap_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxSearchSimilarityDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl);
@@ -163,7 +165,6 @@ IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl);
-IMPL_ABSTDLG_BASE(AbstractSfxSingleTabDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractPasteDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractLinksDialog_Impl);
@@ -240,6 +241,21 @@ String AbstractTabDialog_Impl::GetText() const
// AbstractTabDialog_Impl end
+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();
+}
+
//for SvxDistributeDialog begin
SvxDistributeHorizontal AbstractSvxDistributeDialog_Impl::GetDistributeHor()const
{
@@ -632,51 +648,6 @@ USHORT AbstractSvxHlinkDlgMarkWnd_Impl::SetError( USHORT nError)
// AbstractSvxHlinkDlgMarkWnd_Impl end
-// AbstractSvxCharacterMap_Impl begin
-void AbstractSvxCharacterMap_Impl::SetText( const XubString& rStr )
-{
- pDlg->SetText( rStr );
-}
-
-void AbstractSvxCharacterMap_Impl::DisableFontSelection()
-{
- pDlg->DisableFontSelection();
-}
-
-const Font& AbstractSvxCharacterMap_Impl::GetCharFont() const
-{
- return pDlg->GetCharFont();
-}
-
-void AbstractSvxCharacterMap_Impl::SetCharFont( const Font& rFont )
-{
- pDlg->SetCharFont( rFont );
-}
-
-void AbstractSvxCharacterMap_Impl::SetFont( const Font& rFont )
-{
- pDlg->SetFont( rFont );
-}
-
-void AbstractSvxCharacterMap_Impl::SetChar( sal_Unicode c )
-{
- pDlg->SetChar( c );
-}
-
-sal_Unicode AbstractSvxCharacterMap_Impl::GetChar() const
-{
- sal_UCS4 cUCS4 = pDlg->GetChar();
- // TODO: change return value to UCS4
- return static_cast<sal_Unicode>(cUCS4);
-}
-
-String AbstractSvxCharacterMap_Impl::GetCharacters() const
-{
- return pDlg->GetCharacters();
-}
-
-// AbstractSvxCharacterMap_Impl end
-
//for SvxSearchSimilarityDialog begin
USHORT AbstractSvxSearchSimilarityDialog_Impl::GetOther()
{
@@ -1016,13 +987,6 @@ void AbstractSvxAreaTabDialog_Impl::DontDeleteColorTable()
}
// AbstractSvxAreaTabDialog_Impl end
-// add SvxMeasureDialog & SvxConnectionDialog begin
-const SfxItemSet* AbstractSfxSingleTabDialog_Impl::GetOutputItemSet() const
-{
- return pDlg->GetOutputItemSet();
-}
-// SvxMeasureDialog & SvxConnectionDialog end
-
// add SvxPostItDialog begin
void AbstractSvxPostItDialog_Impl::SetText( const XubString& rStr )
{
@@ -1518,22 +1482,10 @@ VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDia
AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent, //add for URLDlg
const String& rURL, const String& rAltText, const String& rDescription,
const String& rTarget, const String& rName,
- TargetList& rTargetList,
- sal_uInt32 nResId)
+ TargetList& rTargetList )
{
- URLDlg* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_IMAPURL :
- pDlg = new URLDlg( pParent, rURL, rAltText, rDescription, rTarget, rName, rTargetList);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractURLDlg_Impl( pDlg );
- return 0;
+ URLDlg* pDlg = new URLDlg( pParent, rURL, rAltText, rDescription, rTarget, rName, rTargetList);
+ return new AbstractURLDlg_Impl( pDlg );
}
//CHINA001 URLDlg end
@@ -1556,23 +1508,23 @@ AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWnd
}
//CHINA001 SvxHlinkDlgMarkWnd end
-//CHINA001 SvxCharacterMap begin
-AbstractSvxCharacterMap * AbstractDialogFactory_Impl::CreateSvxCharacterMap( Window* pParent, //add for SvxCharacterMap
- sal_uInt32 nResId,
- BOOL bOne )
+SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32 nResId,
+ Window* pParent,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& ,
+ const SfxItemSet* pAttrSet )
{
- SvxCharacterMap* pDlg=NULL;
+ SfxModalDialog* pDlg=NULL;
switch ( nResId )
{
case RID_SVXDLG_CHARMAP :
- pDlg = new SvxCharacterMap( pParent,bOne );
+ pDlg = new SvxCharacterMap( pParent, TRUE, pAttrSet );
break;
default:
break;
}
if ( pDlg )
- return new AbstractSvxCharacterMap_Impl( pDlg );
+ return new AbstractSfxDialog_Impl( pDlg );
return 0;
}
//CHINA001 SvxCharacterMap end
@@ -2074,8 +2026,35 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window
}
//CHINA001 SvxLineTabDialog end
+SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
+ const SfxItemSet& rAttr,
+ const Reference< XFrame >& _rxDocumentFrame,
+ sal_uInt32 nResId
+ )
+{
+ SfxModalDialog* pDlg=NULL;
+ switch ( nResId )
+ {
+ case SID_EVENTCONFIG :
+ pDlg = new SfxMacroAssignDlg( pParent, _rxDocumentFrame, rAttr );
+ break;
+ case RID_SVXPAGE_MACROASSIGN :
+ pDlg = new SvxShortcutAssignDlg( pParent, _rxDocumentFrame, rAttr );
+ break;
+ case RID_SVXDLG_CHARMAP :
+ pDlg = new SvxCharacterMap( pParent, TRUE, &rAttr );
+ break;
+ default:
+ break;
+ }
+
+ if ( pDlg )
+ return new AbstractSfxDialog_Impl( pDlg );
+ return 0;
+}
+
//CHINA001 SvxMeasureDialog & SvxConnectionDialog begin
-AbstractSfxSingleTabDialog* AbstractDialogFactory_Impl::CreateSfxSingleTabDialog( Window* pParent,
+SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
const SfxItemSet& rAttr,
const SdrView* pView,
sal_uInt32 nResId
@@ -2106,7 +2085,7 @@ AbstractSfxSingleTabDialog* AbstractDialogFactory_Impl::CreateSfxSingleTabDialog
}
if ( pDlg )
- return new AbstractSfxSingleTabDialog_Impl( pDlg );
+ return new AbstractSfxDialog_Impl( pDlg );
return 0;
}
@@ -2143,20 +2122,23 @@ public:
m_pDialog.reset( new SvxMacroAssignDlg( _pParent, _rxDocumentFrame, m_aItems, _rxEvents, _nInitiallySelectedEvent ) );
}
- virtual short Execute()
- {
- return m_pDialog->Execute();
- }
-
- virtual ~SvxMacroAssignDialog()
- {
- }
+ virtual short Execute();
+ virtual ~SvxMacroAssignDialog();
private:
SfxItemSet m_aItems;
::std::auto_ptr< SvxMacroAssignDlg > m_pDialog;
};
+short SvxMacroAssignDialog::Execute()
+{
+ return m_pDialog->Execute();
+}
+
+SvxMacroAssignDialog::~SvxMacroAssignDialog()
+{
+}
+
VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxMacroAssignDlg(
Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode,
const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent )
@@ -2237,7 +2219,8 @@ CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
return SvxPageDescPage::Create;
case RID_SVXPAGE_GRFCROP :
return SvxGrfCropPage::Create;
-
+ case RID_SVXPAGE_MACROASSIGN :
+ return SfxMacroTabPage::Create;
default:
break;
}
diff --git a/svx/source/dialog/dlgfact.hxx b/svx/source/cui/dlgfact.hxx
index 46a9a03923..ce47d30163 100644
--- a/svx/source/dialog/dlgfact.hxx
+++ b/svx/source/cui/dlgfact.hxx
@@ -45,6 +45,7 @@
//#include "srchxtra.hxx"
class SfxTabDialog;
+class SfxModalDialog;
class Dialog;
class SfxItemPool;
class FmShowColsDialog;
@@ -127,6 +128,16 @@ class VclAbstractRefreshableDialog_Impl : public VclAbstractRefreshableDialog
};
//for ActualizeProgress end
+class AbstractSfxDialog_Impl : public SfxAbstractDialog
+{
+ DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog)
+ virtual const SfxItemSet* GetOutputItemSet() const;
+
+ //From class Window.
+ virtual void SetText( const XubString& rStr );
+ virtual String GetText() const ;
+};
+
class AbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE(AbstractTabDialog_Impl,SfxTabDialog)
@@ -326,26 +337,6 @@ class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd
};
//for SvxHlinkDlgMarkWnd end
-//for SvxCharacterMap begin
-class SvxCharacterMap;
-class AbstractSvxCharacterMap_Impl :public AbstractSvxCharacterMap
-{
- DECL_ABSTDLG_BASE(AbstractSvxCharacterMap_Impl,SvxCharacterMap)
- virtual void SetText( const XubString& rStr ); //From Class Window
- virtual void DisableFontSelection();
-
- virtual const Font& GetCharFont() const ;
- virtual void SetCharFont( const Font& rFont );
- virtual void SetFont( const Font& rFont ) ;
-
- // TODO: change to UCS4
- virtual void SetChar( sal_Unicode );
- virtual sal_Unicode GetChar() const;
-
- virtual String GetCharacters() const;
-};
-//for SvxCharacterMap end
-
//for SvxSearchSimilarityDialog begin
class SvxSearchSimilarityDialog;
class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog
@@ -539,16 +530,6 @@ class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog
};
//add for SvxAreaTabDialog end
-//add for SvxMeasureDialog & SvxConnectionDialog begin
-class SfxSingleTabDialog;
-class AbstractSfxSingleTabDialog_Impl :public AbstractSfxSingleTabDialog
-{
- DECL_ABSTDLG_BASE(AbstractSfxSingleTabDialog_Impl,SfxSingleTabDialog)
- virtual const SfxItemSet* GetOutputItemSet() const;
-
-};
-//add for SvxMeasureDialog & SvxConnectionDialog end
-
class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog
{
DECL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl, InsertObjectDialog_Impl)
@@ -609,6 +590,19 @@ class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory
public:
virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId );
virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId );
+ virtual SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId,
+ Window* pParent,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
+ const SfxItemSet* pAttrSet=0 );
+ virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent,
+ const SfxItemSet& rAttr,
+ const SdrView* pView,
+ sal_uInt32 nResId );
+ 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 VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const String& rParameter );
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
Window* pParent,
@@ -702,13 +696,9 @@ public:
virtual AbstractURLDlg * CreateURLDialog( Window* pParent, //add for URLDlg
const String& rURL, const String& rAltText, const String& rDescription,
const String& rTarget, const String& rName,
- TargetList& rTargetList,
- sal_uInt32 nResId);
+ TargetList& rTargetList );
virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ); //add for SvxHlinkDlgMarkWnd
- virtual AbstractSvxCharacterMap * CreateSvxCharacterMap( Window* pParent,
- sal_uInt32 nResId,
- BOOL bOne = TRUE ) ; //add for SvxCharacterMap
virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
const USHORT* pWhRanges,
@@ -780,11 +770,6 @@ public:
sal_uInt32 nResId,
const SdrObject* pObj = NULL,
BOOL bHasObj = TRUE );
- virtual AbstractSfxSingleTabDialog* CreateSfxSingleTabDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
- const SfxItemSet& rAttr,
- const SdrView* pView,
- sal_uInt32 nResId
- );
virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
const SfxItemSet& rCoreSet,
sal_uInt32 nResId,
diff --git a/svx/source/dialog/dlgname.cxx b/svx/source/cui/dlgname.cxx
index 7358247101..7358247101 100644
--- a/svx/source/dialog/dlgname.cxx
+++ b/svx/source/cui/dlgname.cxx
diff --git a/svx/source/dialog/dlgname.hrc b/svx/source/cui/dlgname.hrc
index 80ec21290f..80ec21290f 100644
--- a/svx/source/dialog/dlgname.hrc
+++ b/svx/source/cui/dlgname.hrc
diff --git a/svx/source/dialog/dlgname.hxx b/svx/source/cui/dlgname.hxx
index cd13055a40..cd13055a40 100644
--- a/svx/source/dialog/dlgname.hxx
+++ b/svx/source/cui/dlgname.hxx
diff --git a/svx/source/dialog/dlgname.src b/svx/source/cui/dlgname.src
index 2b99ce7e33..2b99ce7e33 100644
--- a/svx/source/dialog/dlgname.src
+++ b/svx/source/cui/dlgname.src
diff --git a/svx/source/dialog/doclinkdialog.cxx b/svx/source/cui/doclinkdialog.cxx
index d4dc239aaa..d4dc239aaa 100644
--- a/svx/source/dialog/doclinkdialog.cxx
+++ b/svx/source/cui/doclinkdialog.cxx
diff --git a/svx/source/dialog/doclinkdialog.hrc b/svx/source/cui/doclinkdialog.hrc
index b83b0dbf67..b83b0dbf67 100644
--- a/svx/source/dialog/doclinkdialog.hrc
+++ b/svx/source/cui/doclinkdialog.hrc
diff --git a/svx/source/dialog/doclinkdialog.hxx b/svx/source/cui/doclinkdialog.hxx
index 04e341c614..04e341c614 100644
--- a/svx/source/dialog/doclinkdialog.hxx
+++ b/svx/source/cui/doclinkdialog.hxx
diff --git a/svx/source/dialog/doclinkdialog.src b/svx/source/cui/doclinkdialog.src
index 29a72695d7..29a72695d7 100644
--- a/svx/source/dialog/doclinkdialog.src
+++ b/svx/source/cui/doclinkdialog.src
diff --git a/svx/source/dialog/dstribut.cxx b/svx/source/cui/dstribut.cxx
index 4d47be04c3..4d47be04c3 100644
--- a/svx/source/dialog/dstribut.cxx
+++ b/svx/source/cui/dstribut.cxx
diff --git a/svx/source/dialog/dstribut.hrc b/svx/source/cui/dstribut.hrc
index c6d891dc19..c6d891dc19 100644
--- a/svx/source/dialog/dstribut.hrc
+++ b/svx/source/cui/dstribut.hrc
diff --git a/svx/source/dialog/dstribut.hxx b/svx/source/cui/dstribut.hxx
index d4642555dd..d4642555dd 100644
--- a/svx/source/dialog/dstribut.hxx
+++ b/svx/source/cui/dstribut.hxx
diff --git a/svx/source/dialog/dstribut.src b/svx/source/cui/dstribut.src
index a3239c0d76..a3239c0d76 100644
--- a/svx/source/dialog/dstribut.src
+++ b/svx/source/cui/dstribut.src
diff --git a/svx/source/dialog/eventdlg.cxx b/svx/source/cui/eventdlg.cxx
index b1ddbe6398..b1ddbe6398 100644
--- a/svx/source/dialog/eventdlg.cxx
+++ b/svx/source/cui/eventdlg.cxx
diff --git a/svx/source/dialog/eventdlg.hrc b/svx/source/cui/eventdlg.hrc
index 1e5484cb22..1e5484cb22 100644
--- a/svx/source/dialog/eventdlg.hrc
+++ b/svx/source/cui/eventdlg.hrc
diff --git a/svx/source/dialog/eventdlg.src b/svx/source/cui/eventdlg.src
index b3fa250c51..b3fa250c51 100644
--- a/svx/source/dialog/eventdlg.src
+++ b/svx/source/cui/eventdlg.src
diff --git a/svx/source/dialog/fontsubs.cxx b/svx/source/cui/fontsubs.cxx
index 1c2fe6f9e7..9c35b1a833 100644
--- a/svx/source/dialog/fontsubs.cxx
+++ b/svx/source/cui/fontsubs.cxx
@@ -31,6 +31,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
+#ifdef SVX_DLLIMPLEMENTATION
+#undef SVX_DLLIMPLEMENTATION
+#endif
+
#ifdef PRECOMPILED
#include "svxpch.hxx"
#endif
diff --git a/svx/source/dialog/fontsubs.hrc b/svx/source/cui/fontsubs.hrc
index d60ec121d1..d60ec121d1 100644
--- a/svx/source/dialog/fontsubs.hrc
+++ b/svx/source/cui/fontsubs.hrc
diff --git a/svx/source/dialog/fontsubs.hxx b/svx/source/cui/fontsubs.hxx
index 4bba5bb92c..c4ea5416a0 100644
--- a/svx/source/dialog/fontsubs.hxx
+++ b/svx/source/cui/fontsubs.hxx
@@ -35,7 +35,6 @@
#include <svx/simptabl.hxx>
#include <vcl/toolbox.hxx>
#include <svtools/ctrlbox.hxx>
-#include "svx/svxdllapi.h"
// class SvxFontSubstCheckListBox ------------------------------------------
@@ -68,7 +67,7 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable
// class SvxFontSubstTabPage ----------------------------------------------------
class SvtFontSubstConfig;
namespace svt {class SourceViewConfig;}
-class SVX_DLLPUBLIC SvxFontSubstTabPage : public SfxTabPage
+class SvxFontSubstTabPage : public SfxTabPage
{
CheckBox aUseTableCB;
FixedText aFont1FT;
diff --git a/svx/source/dialog/fontsubs.src b/svx/source/cui/fontsubs.src
index 8d0a0ab7b0..8d0a0ab7b0 100644
--- a/svx/source/dialog/fontsubs.src
+++ b/svx/source/cui/fontsubs.src
diff --git a/svx/source/dialog/grfflt.hrc b/svx/source/cui/grfflt.hrc
index a119db4330..a119db4330 100644
--- a/svx/source/dialog/grfflt.hrc
+++ b/svx/source/cui/grfflt.hrc
diff --git a/svx/source/dialog/grfflt.src b/svx/source/cui/grfflt.src
index 24ade4cc67..24ade4cc67 100644
--- a/svx/source/dialog/grfflt.src
+++ b/svx/source/cui/grfflt.src
diff --git a/svx/source/dialog/grfpage.cxx b/svx/source/cui/grfpage.cxx
index aabc03766f..aabc03766f 100644
--- a/svx/source/dialog/grfpage.cxx
+++ b/svx/source/cui/grfpage.cxx
diff --git a/svx/source/dialog/grfpage.hrc b/svx/source/cui/grfpage.hrc
index b5e2022ff5..b5e2022ff5 100644
--- a/svx/source/dialog/grfpage.hrc
+++ b/svx/source/cui/grfpage.hrc
diff --git a/svx/source/dialog/grfpage.hxx b/svx/source/cui/grfpage.hxx
index 2f66c75bdd..2f66c75bdd 100644
--- a/svx/source/dialog/grfpage.hxx
+++ b/svx/source/cui/grfpage.hxx
diff --git a/svx/source/dialog/grfpage.src b/svx/source/cui/grfpage.src
index c8ebbf1348..c8ebbf1348 100644
--- a/svx/source/dialog/grfpage.src
+++ b/svx/source/cui/grfpage.src
diff --git a/svx/source/dialog/hangulhanjadlg.cxx b/svx/source/cui/hangulhanjadlg.cxx
index 1ee49881f0..1ee49881f0 100644
--- a/svx/source/dialog/hangulhanjadlg.cxx
+++ b/svx/source/cui/hangulhanjadlg.cxx
diff --git a/svx/source/dialog/hangulhanjadlg.hrc b/svx/source/cui/hangulhanjadlg.hrc
index 22e0e11aa7..22e0e11aa7 100644
--- a/svx/source/dialog/hangulhanjadlg.hrc
+++ b/svx/source/cui/hangulhanjadlg.hrc
diff --git a/svx/source/dialog/hangulhanjadlg.hxx b/svx/source/cui/hangulhanjadlg.hxx
index 9830de4cab..9830de4cab 100644
--- a/svx/source/dialog/hangulhanjadlg.hxx
+++ b/svx/source/cui/hangulhanjadlg.hxx
diff --git a/svx/source/dialog/hangulhanjadlg.src b/svx/source/cui/hangulhanjadlg.src
index 603a28e798..603a28e798 100644
--- a/svx/source/dialog/hangulhanjadlg.src
+++ b/svx/source/cui/hangulhanjadlg.src
diff --git a/svx/source/inc/headertablistbox.hxx b/svx/source/cui/headertablistbox.hxx
index 7c5500fd95..7c5500fd95 100644..100755
--- a/svx/source/inc/headertablistbox.hxx
+++ b/svx/source/cui/headertablistbox.hxx
diff --git a/svx/source/dialog/hldocntp.cxx b/svx/source/cui/hldocntp.cxx
index 3bd3bb6c8b..3bd3bb6c8b 100644
--- a/svx/source/dialog/hldocntp.cxx
+++ b/svx/source/cui/hldocntp.cxx
diff --git a/svx/source/dialog/hldocntp.hxx b/svx/source/cui/hldocntp.hxx
index e005e58192..e005e58192 100644
--- a/svx/source/dialog/hldocntp.hxx
+++ b/svx/source/cui/hldocntp.hxx
diff --git a/svx/source/dialog/hldoctp.cxx b/svx/source/cui/hldoctp.cxx
index 2abec10a01..2abec10a01 100644
--- a/svx/source/dialog/hldoctp.cxx
+++ b/svx/source/cui/hldoctp.cxx
diff --git a/svx/source/dialog/hldoctp.hxx b/svx/source/cui/hldoctp.hxx
index 9f2ee7171c..9f2ee7171c 100644
--- a/svx/source/dialog/hldoctp.hxx
+++ b/svx/source/cui/hldoctp.hxx
diff --git a/svx/source/dialog/hlinettp.cxx b/svx/source/cui/hlinettp.cxx
index 177affd720..177affd720 100644
--- a/svx/source/dialog/hlinettp.cxx
+++ b/svx/source/cui/hlinettp.cxx
diff --git a/svx/source/dialog/hlinettp.hxx b/svx/source/cui/hlinettp.hxx
index 565429ceda..565429ceda 100644
--- a/svx/source/dialog/hlinettp.hxx
+++ b/svx/source/cui/hlinettp.hxx
diff --git a/svx/source/dialog/hlmailtp.cxx b/svx/source/cui/hlmailtp.cxx
index 283d9d243a..283d9d243a 100644
--- a/svx/source/dialog/hlmailtp.cxx
+++ b/svx/source/cui/hlmailtp.cxx
diff --git a/svx/source/dialog/hlmailtp.hxx b/svx/source/cui/hlmailtp.hxx
index 39b2bc2670..39b2bc2670 100644
--- a/svx/source/dialog/hlmailtp.hxx
+++ b/svx/source/cui/hlmailtp.hxx
diff --git a/svx/source/dialog/hlmarkwn.cxx b/svx/source/cui/hlmarkwn.cxx
index e65fbb228d..e65fbb228d 100644
--- a/svx/source/dialog/hlmarkwn.cxx
+++ b/svx/source/cui/hlmarkwn.cxx
diff --git a/svx/source/dialog/hlmarkwn.src b/svx/source/cui/hlmarkwn.src
index e14ece64ae..e14ece64ae 100644
--- a/svx/source/dialog/hlmarkwn.src
+++ b/svx/source/cui/hlmarkwn.src
diff --git a/svx/source/dialog/hltpbase.cxx b/svx/source/cui/hltpbase.cxx
index 93b866d801..2e76c5be4a 100644
--- a/svx/source/dialog/hltpbase.cxx
+++ b/svx/source/cui/hltpbase.cxx
@@ -47,6 +47,7 @@
//CHINA001 #endif
#include "cuihyperdlg.hxx" //CHINA001
#include "hltpbase.hxx"
+#include "macroass.hxx"
#include <svx/svxdlg.hxx> //CHINA001
#include <svx/dialogs.hrc> //CHINA001
diff --git a/svx/source/dialog/hltpbase.hxx b/svx/source/cui/hltpbase.hxx
index 6702f9985d..6a8ed9a030 100644
--- a/svx/source/dialog/hltpbase.hxx
+++ b/svx/source/cui/hltpbase.hxx
@@ -47,7 +47,6 @@
#include <svtools/eitem.hxx>
#include <svtools/transfer.hxx>
#include <sfx2/dispatch.hxx>
-#include <sfx2/macropg.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/fcontnr.hxx>
#include <svtools/inettbc.hxx>
diff --git a/svx/source/dialog/iconcdlg.cxx b/svx/source/cui/iconcdlg.cxx
index 7bd9843fb2..7bd9843fb2 100644
--- a/svx/source/dialog/iconcdlg.cxx
+++ b/svx/source/cui/iconcdlg.cxx
diff --git a/svx/source/dialog/iconcdlg.hxx b/svx/source/cui/iconcdlg.hxx
index 4dce9737d2..4dce9737d2 100644
--- a/svx/source/dialog/iconcdlg.hxx
+++ b/svx/source/cui/iconcdlg.hxx
diff --git a/svx/source/dialog/iconcdlg.src b/svx/source/cui/iconcdlg.src
index fdfa000aa2..fdfa000aa2 100644
--- a/svx/source/dialog/iconcdlg.src
+++ b/svx/source/cui/iconcdlg.src
diff --git a/svx/source/init/init.cxx b/svx/source/cui/init.cxx
index 7f18e683cb..8b282f3c40 100644
--- a/svx/source/init/init.cxx
+++ b/svx/source/cui/init.cxx
@@ -31,36 +31,30 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#ifdef SVX_DLLIMPLEMENTATION
+#undef SVX_DLLIMPLEMENTATION
+#endif
-#include "vos/mutex.hxx"
-#include <vcl/edit.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/dialog.hxx>
#include <vcl/msgbox.hxx>
+#include "cuicharmap.hxx"
// ------------------------------------------------------------------------
// hook to call special character dialog for edits
// caution: needs C-Linkage since dynamically loaded via symbol name
extern "C"
{
-SVX_DLLPUBLIC bool GetSpecialCharsForEdit(Window* i_pParent, const Font& i_rFont, String& o_rResult)
+bool GetSpecialCharsForEdit(Window* i_pParent, const Font& i_rFont, String& o_rResult)
{
bool bRet = false;
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- if(pFact)
+ SvxCharacterMap* aDlg = new SvxCharacterMap( i_pParent );
+ aDlg->DisableFontSelection();
+ aDlg->SetCharFont(i_rFont);
+ if ( aDlg->Execute() == RET_OK )
{
- AbstractSvxCharacterMap* aDlg = pFact->CreateSvxCharacterMap( i_pParent, RID_SVXDLG_CHARMAP );
- aDlg->DisableFontSelection();
- aDlg->SetCharFont(i_rFont);
- if ( aDlg->Execute() == RET_OK )
- {
- o_rResult = aDlg->GetChar();
- bRet = true;
- }
- delete aDlg;
+ o_rResult = aDlg->GetCharacters();
+ bRet = true;
}
+ delete aDlg;
return bRet;
}
}
diff --git a/svx/source/dialog/insdlg.cxx b/svx/source/cui/insdlg.cxx
index 3d72463198..3d72463198 100644
--- a/svx/source/dialog/insdlg.cxx
+++ b/svx/source/cui/insdlg.cxx
diff --git a/svx/source/dialog/insdlg.hxx b/svx/source/cui/insdlg.hxx
index 8e4d170492..8e4d170492 100644
--- a/svx/source/dialog/insdlg.hxx
+++ b/svx/source/cui/insdlg.hxx
diff --git a/svx/source/dialog/internationaloptions.cxx b/svx/source/cui/internationaloptions.cxx
index 266c0a715c..266c0a715c 100644
--- a/svx/source/dialog/internationaloptions.cxx
+++ b/svx/source/cui/internationaloptions.cxx
diff --git a/svx/source/dialog/internationaloptions.hrc b/svx/source/cui/internationaloptions.hrc
index 84c8450274..84c8450274 100644
--- a/svx/source/dialog/internationaloptions.hrc
+++ b/svx/source/cui/internationaloptions.hrc
diff --git a/svx/source/dialog/internationaloptions.hxx b/svx/source/cui/internationaloptions.hxx
index 439dc2a272..439dc2a272 100644
--- a/svx/source/dialog/internationaloptions.hxx
+++ b/svx/source/cui/internationaloptions.hxx
diff --git a/svx/source/dialog/internationaloptions.src b/svx/source/cui/internationaloptions.src
index f98109c84e..f98109c84e 100644
--- a/svx/source/dialog/internationaloptions.src
+++ b/svx/source/cui/internationaloptions.src
diff --git a/svx/source/dialog/labdlg.cxx b/svx/source/cui/labdlg.cxx
index bbcbe9c408..bbcbe9c408 100644
--- a/svx/source/dialog/labdlg.cxx
+++ b/svx/source/cui/labdlg.cxx
diff --git a/svx/source/dialog/labdlg.hrc b/svx/source/cui/labdlg.hrc
index 4916dbbfd0..4916dbbfd0 100644
--- a/svx/source/dialog/labdlg.hrc
+++ b/svx/source/cui/labdlg.hrc
diff --git a/svx/source/dialog/labdlg.hxx b/svx/source/cui/labdlg.hxx
index c1ec3e261c..c1ec3e261c 100644
--- a/svx/source/dialog/labdlg.hxx
+++ b/svx/source/cui/labdlg.hxx
diff --git a/svx/source/dialog/labdlg.src b/svx/source/cui/labdlg.src
index baacc7af89..baacc7af89 100644
--- a/svx/source/dialog/labdlg.src
+++ b/svx/source/cui/labdlg.src
diff --git a/svx/source/dialog/linkdlg.cxx b/svx/source/cui/linkdlg.cxx
index cb4fe626f8..cb4fe626f8 100644
--- a/svx/source/dialog/linkdlg.cxx
+++ b/svx/source/cui/linkdlg.cxx
diff --git a/svx/source/dialog/linkdlg.hxx b/svx/source/cui/linkdlg.hxx
index 2b746d16b0..2b746d16b0 100644
--- a/svx/source/dialog/linkdlg.hxx
+++ b/svx/source/cui/linkdlg.hxx
diff --git a/sfx2/source/dialog/macropg.cxx b/svx/source/cui/macroass.cxx
index bf5c569c50..ed8f8a46f3 100644
--- a/sfx2/source/dialog/macropg.cxx
+++ b/svx/source/cui/macroass.cxx
@@ -29,37 +29,59 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-#include <basic/basmgr.hxx>
-#ifndef GCC
-#endif
+#include "precompiled_svx.hxx"
#define ITEMID_MACRO 0
-#include <sfx2/macropg.hxx>
+#include <svtools/macitem.hxx>
#undef ITEMID_MACRO
+#include "macroass.hxx"
+
+#include <basic/basmgr.hxx>
+#include <svx/dialmgr.hxx>
+
#define _SVSTDARR_STRINGSDTOR
#include <svtools/svstdarr.hxx>
-#ifndef _SV_MEDIT_HXX
-#include <svtools/svmedit.hxx>
-#endif
-#include "cfg.hxx"
+#include <svtools/svmedit.hxx>
+#include "cfgutil.hxx"
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
-#include "macropg.hrc"
-#include "sfxresid.hxx"
-#include "dialog.hrc"
+#include "macroass.hrc"
+#include "svx/dialogs.hrc"
#include <sfx2/macrconf.hxx>
-#include <sfx2/sfxdefs.hxx>
-#include <sfx2/viewfrm.hxx>
-#include "helpid.hrc"
#include "headertablistbox.hxx"
-#include "macropg_impl.hxx"
using ::com::sun::star::uno::Reference;
using ::com::sun::star::frame::XFrame;
+class _SfxMacroTabPage_Impl
+{
+public:
+ _SfxMacroTabPage_Impl( void );
+ ~_SfxMacroTabPage_Impl();
+
+ String maStaticMacroLBLabel;
+ PushButton* pAssignPB;
+ PushButton* pDeletePB;
+ String* pStrEvent;
+ String* pAssignedMacro;
+ ListBox* pScriptTypeLB;
+ _HeaderTabListBox* pEventLB;
+ SfxConfigGroupListBox_Impl* pGroupLB;
+ FixedText* pFT_MacroLBLabel;
+ SfxConfigFunctionListBox_Impl* pMacroLB;
+
+ FixedText* pMacroFT;
+ String* pMacroStr;
+ FNGetRangeHdl fnGetRange;
+ FNGetMacrosOfRangeHdl fnGetMacroOfRange;
+
+ BOOL bReadOnly;
+ Timer maFillGroupTimer;
+ BOOL bGotEvents;
+};
+
_SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl( void ) :
pAssignPB( NULL ),
pDeletePB( NULL ),
@@ -74,7 +96,8 @@ _SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl( void ) :
pMacroStr( NULL ),
fnGetRange( NULL ),
fnGetMacroOfRange( NULL ),
- bReadOnly( FALSE )
+ bReadOnly( FALSE ),
+ bGotEvents( FALSE )
{
}
@@ -119,97 +142,6 @@ static long nTabs[] =
#define LB_EVENTS_ITEMPOS 1
#define LB_MACROS_ITEMPOS 2
-
-IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
-{
- (void)pBar; // unused
- DBG_ASSERT( pBar == &maHeaderBar, "*_HeaderTabListBox::HeaderEndDrag_Impl: something is wrong here..." );
-
- if( !maHeaderBar.GetCurItemId() )
- return 0;
-
- if( !maHeaderBar.IsItemMode() )
- {
- Size aSz;
- USHORT nTabsCount = maHeaderBar.GetItemCount();
- long nTmpSz = 0;
- long nWidth = maHeaderBar.GetItemSize( ITEMID_EVENT );
- long nBarWidth = maHeaderBar.GetSizePixel().Width();
-
- if( nWidth < TAB_WIDTH_MIN )
- maHeaderBar.SetItemSize( ITEMID_EVENT, TAB_WIDTH_MIN );
- else if( ( nBarWidth - nWidth ) < TAB_WIDTH_MIN )
- maHeaderBar.SetItemSize( ITEMID_EVENT, nBarWidth - TAB_WIDTH_MIN );
-
- {
- for( USHORT i = 1 ; i < nTabsCount ; ++i )
- {
- long nItemWidth = maHeaderBar.GetItemSize( i );
- aSz.Width() = nItemWidth + nTmpSz;
- nTmpSz += nItemWidth;
- maListBox.SetTab( i, PixelToLogic( aSz, MapMode( MAP_APPFONT ) ).Width(), MAP_APPFONT );
- }
- }
- }
- return 1;
-}
-
-long _HeaderTabListBox::Notify( NotifyEvent& rNEvt )
-{
- long nRet = Control::Notify( rNEvt );
-
- if( rNEvt.GetWindow() != &maListBox && rNEvt.GetType() == EVENT_GETFOCUS )
- maListBox.GrabFocus();
-
- return nRet;
-}
-
-_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) :
- Control( pParent, rId ),
-
- maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN ),
- maHeaderBar( this, WB_BOTTOMBORDER )
-{
- maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
-}
-
-_HeaderTabListBox::~_HeaderTabListBox()
-{
-}
-
-void _HeaderTabListBox::ConnectElements( void )
-{
- // calc pos and size of header bar
- Point aPnt( 0, 0 );
- Size aSize( maHeaderBar.CalcWindowSizePixel() );
- Size aCtrlSize( GetOutputSizePixel() );
- aSize.Width() = aCtrlSize.Width();
- maHeaderBar.SetPosSizePixel( aPnt, aSize );
-
- // calc pos and size of ListBox
- aPnt.Y() += aSize.Height();
- aSize.Height() = aCtrlSize.Height() - aSize.Height();
- maListBox.SetPosSizePixel( aPnt, aSize );
-
- // set handler
- maHeaderBar.SetEndDragHdl( LINK( this, _HeaderTabListBox, HeaderEndDrag_Impl ) );
-
- maListBox.InitHeaderBar( &maHeaderBar );
-}
-
-void _HeaderTabListBox::Show( BOOL bVisible, USHORT nFlags )
-{
- maListBox.Show( bVisible, nFlags );
- maHeaderBar.Show( bVisible, nFlags );
-}
-
-void _HeaderTabListBox::Enable( bool bEnable, bool bChild )
-{
- maListBox.Enable( bEnable, bChild );
- maHeaderBar.Enable( bEnable, bChild );
-}
-
-
String ConvertToUIName_Impl( SvxMacro *pMacro, const String& /*rLanguage*/ )
{
String aName( pMacro->GetMacName() );
@@ -343,12 +275,39 @@ BOOL _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet )
return FALSE;
}
+void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet)
+{
+ const SfxPoolItem* pEventsItem;
+ if( !mpImpl->bGotEvents && SFX_ITEM_SET == aSet.GetItemState( SID_EVENTCONFIG, TRUE, &pEventsItem ) )
+ {
+ mpImpl->bGotEvents = TRUE;
+ const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents();
+ for ( USHORT nNo = 0; nNo < rList.Count(); ++nNo )
+ {
+ const SfxEventName *pOwn = rList.GetObject(nNo);
+ AddEvent( pOwn->maUIName, pOwn->mnId );
+ }
+ }
+}
+
void _SfxMacroTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == rSet.GetItemState( GetWhich( aPageRg[0] ), TRUE, &pItem ))
aTbl = ((SvxMacroItem*)pItem)->GetMacroTable();
+ const SfxPoolItem* pEventsItem;
+ if( !mpImpl->bGotEvents && SFX_ITEM_SET == rSet.GetItemState( SID_EVENTCONFIG, TRUE, &pEventsItem ) )
+ {
+ mpImpl->bGotEvents = TRUE;
+ const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents();
+ for ( USHORT nNo = 0; nNo < rList.Count(); ++nNo )
+ {
+ const SfxEventName *pOwn = rList.GetObject(nNo);
+ AddEvent( pOwn->maUIName, pOwn->mnId );
+ }
+ }
+
FillEvents();
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
@@ -485,7 +444,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
else
{
OSL_TRACE("ASSIGN_DELETE: Its a basic macro");
- String sBasicName(SfxResId(STR_BASICNAME));
+ String sBasicName/*(SfxResId(STR_BASICNAME))*/;
if ( aLanguage == sBasicName )
pThis->aTbl.Insert( nEvent, new SvxMacro( sMacro, sGroup, STARBASIC ) );
else
@@ -562,7 +521,7 @@ void _SfxMacroTabPage::InitAndSetHandler()
mpImpl->pMacroLB->Enable( TRUE );
mpImpl->pScriptTypeLB->SetDropDownLineCount( 3 );
- String sBasicName(SfxResId(STR_BASICNAME));
+ String sBasicName/*(SfxResId(STR_BASICNAME))*/;
mpImpl->pScriptTypeLB->InsertEntry( sBasicName );
mpImpl->pScriptTypeLB->SelectEntry( sBasicName );
@@ -579,7 +538,7 @@ void _SfxMacroTabPage::FillMacroList()
if( ! aLanguage.EqualsAscii("JavaScript") )
{
// 2 Listboxen
- SvStringsDtor* pArr = (*mpImpl->fnGetRange)( this, String(SfxResId(STR_BASICNAME)) );
+ SvStringsDtor* pArr = (*mpImpl->fnGetRange)( this, String(/*SfxResId(STR_BASICNAME)*/) );
if( pArr )
{
mpImpl->pGroupLB->Init(
@@ -717,19 +676,19 @@ SvStringsDtor* __EXPORT _ImpGetMacrosOfRangeHdl(
SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
: _SfxMacroTabPage( pParent, rResId, rSet )
{
- mpImpl->pStrEvent = new String( SfxResId( STR_EVENT ) );
- mpImpl->pAssignedMacro = new String( SfxResId( STR_ASSMACRO ) );
- mpImpl->pEventLB = new _HeaderTabListBox( this, SfxResId( LB_EVENT ) );
- mpImpl->pAssignPB = new PushButton( this, SfxResId( PB_ASSIGN ) );
- mpImpl->pDeletePB = new PushButton( this, SfxResId( PB_DELETE ) );
- mpImpl->pScriptTypeLB = new ListBox(this, SfxResId( LB_SCRIPTTYPE ) );
+ mpImpl->pStrEvent = new String( SVX_RES( STR_EVENT ) );
+ mpImpl->pAssignedMacro = new String( SVX_RES( STR_ASSMACRO ) );
+ mpImpl->pEventLB = new _HeaderTabListBox( this, SVX_RES( LB_EVENT ) );
+ mpImpl->pAssignPB = new PushButton( this, SVX_RES( PB_ASSIGN ) );
+ mpImpl->pDeletePB = new PushButton( this, SVX_RES( PB_DELETE ) );
+ mpImpl->pScriptTypeLB = new ListBox(this, SVX_RES( LB_SCRIPTTYPE ) );
mpImpl->pScriptTypeLB->Hide();
- mpImpl->pMacroFT = new FixedText( this, SfxResId( FT_MACRO ) );
- mpImpl->pGroupLB = new SfxConfigGroupListBox_Impl( this, SfxResId( LB_GROUP ) );
- mpImpl->pFT_MacroLBLabel = new FixedText( this, SfxResId( FT_LABEL4LB_MACROS ) );
+ mpImpl->pMacroFT = new FixedText( this, SVX_RES( FT_MACRO ) );
+ mpImpl->pGroupLB = new SfxConfigGroupListBox_Impl( this, SVX_RES( LB_GROUP ) );
+ mpImpl->pFT_MacroLBLabel = new FixedText( this, SVX_RES( FT_LABEL4LB_MACROS ) );
mpImpl->maStaticMacroLBLabel= mpImpl->pFT_MacroLBLabel->GetText();
- mpImpl->pMacroLB = new SfxConfigFunctionListBox_Impl( this, SfxResId( LB_MACROS ) );
- mpImpl->pMacroStr = new String( SfxResId( STR_MACROS ) );
+ mpImpl->pMacroLB = new SfxConfigFunctionListBox_Impl( this, SVX_RES( LB_MACROS ) );
+ mpImpl->pMacroStr = new String( SVX_RES( STR_MACROS ) );
FreeResource();
@@ -737,27 +696,15 @@ SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Re
InitAndSetHandler();
- ScriptChanged( String( SfxResId( STR_BASICNAME ) ) );
+ ScriptChanged( String( /*SfxResId(STR_BASICNAME)*/ ) );
}
SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
{
- return new SfxMacroTabPage( pParent, SfxResId( RID_SFX_TP_MACROASSIGN), NULL, rAttrSet );
-}
-
-
-SfxMacroAssignDlg::SfxMacroAssignDlg( Window* pParent, const SfxObjectShell* _pShell, SfxItemSet& rSet )
- : SfxSingleTabDialog( pParent, rSet, 0 )
-{
- SfxMacroTabPage* pPage = dynamic_cast< SfxMacroTabPage* >( SfxMacroTabPage::Create( this, rSet ) );
- if ( _pShell && _pShell->GetFrame() && _pShell->GetFrame()->GetFrame() )
- pPage->SetFrame( _pShell->GetFrame()->GetFrame()->GetFrameInterface() );
- else
- OSL_ENSURE( false, "SfxMacroAssignDlg::SfxMacroAssignDlg: no shell -> no frame -> no document macros!" );
- SetTabPage( pPage );
+ return new SfxMacroTabPage( pParent, SVX_RES( RID_SVXPAGE_EVENTASSIGN ), NULL, rAttrSet );
}
-SfxMacroAssignDlg::SfxMacroAssignDlg( Window* pParent, const Reference< XFrame >& rxDocumentFrame, SfxItemSet& rSet )
+SfxMacroAssignDlg::SfxMacroAssignDlg( Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
: SfxSingleTabDialog( pParent, rSet, 0 )
{
SfxTabPage* pPage = SfxMacroTabPage::Create( this, rSet );
diff --git a/sfx2/source/dialog/macropg.hrc b/svx/source/cui/macroass.hrc
index 43d1121a4f..b92135bd9e 100644
--- a/sfx2/source/dialog/macropg.hrc
+++ b/svx/source/cui/macroass.hrc
@@ -28,8 +28,8 @@
*
************************************************************************/
-#ifndef _MACROPG_HRC
-#define _MACROPG_HRC
+#ifndef _MACROASS_HRC
+#define _MACROASS_HRC
#ifndef _SVT_CONTROLDIMS_HRC_
#include <svtools/controldims.hrc>
diff --git a/svx/source/cui/macroass.hxx b/svx/source/cui/macroass.hxx
new file mode 100755
index 0000000000..55476b1120
--- /dev/null
+++ b/svx/source/cui/macroass.hxx
@@ -0,0 +1,146 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: macropg.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _MACROASS_HXX
+#define _MACROASS_HXX
+
+#include "sal/config.h"
+
+#include <sfx2/basedlgs.hxx>
+#include <sfx2/tabdlg.hxx>
+#include <svtools/macitem.hxx>
+#include <vcl/lstbox.hxx>
+#include <com/sun/star/frame/XFrame.hpp>
+
+class _SfxMacroTabPage;
+class SvStringsDtor;
+class SvTabListBox;
+class Edit;
+class String;
+
+typedef SvStringsDtor* (*FNGetRangeHdl)( _SfxMacroTabPage*, const String& rLanguage );
+typedef SvStringsDtor* (*FNGetMacrosOfRangeHdl)( _SfxMacroTabPage*, const String& rLanguage, const String& rRange );
+
+class SfxConfigGroupListBox_Impl;
+class SfxConfigFunctionListBox_Impl;
+class _HeaderTabListBox;
+class _SfxMacroTabPage_Impl;
+
+class _SfxMacroTabPage : public SfxTabPage
+{
+ SvxMacroTableDtor aTbl;
+ DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * );
+ DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * );
+ DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * );
+
+ DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, DoubleClickHdl_Impl, Control* );
+ DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * );
+
+ DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * );
+ DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* );
+ DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
+
+protected:
+ _SfxMacroTabPage_Impl* mpImpl;
+
+ _SfxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet );
+
+ void InitAndSetHandler();
+ void FillEvents();
+ void FillMacroList();
+ void EnableButtons( const String& rLanguage );
+
+public:
+
+ virtual ~_SfxMacroTabPage();
+
+ void AddEvent( const String & rEventName, USHORT nEventId );
+
+ const SvxMacroTableDtor& GetMacroTbl() const;
+ void SetMacroTbl( const SvxMacroTableDtor& rTbl );
+ void ClearMacroTbl();
+
+ virtual void ScriptChanged( const String& rLanguage );
+ virtual void PageCreated (SfxAllItemSet aSet);
+
+ // zum setzen / abfragen der Links
+ void SetGetRangeLink( FNGetRangeHdl pFn );
+ FNGetRangeHdl GetGetRangeLink() const;
+ void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn );
+ FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const;
+
+ // --------- Erben aus der Basis -------------
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
+
+ void SetReadOnly( BOOL bSet );
+ BOOL IsReadOnly() const;
+ void SelectEvent( const String& rEventName, USHORT nEventId );
+};
+
+inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
+{
+ return aTbl;
+}
+
+inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
+{
+ aTbl = rTbl;
+}
+
+inline void _SfxMacroTabPage::ClearMacroTbl()
+{
+ aTbl.DelDtor();
+}
+
+class SfxMacroTabPage : public _SfxMacroTabPage
+{
+public:
+ SfxMacroTabPage(
+ Window* pParent,
+ const ResId& rId,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
+ const SfxItemSet& rSet
+ );
+
+ // --------- Erben aus der Basis -------------
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+};
+
+class SfxMacroAssignDlg : public SfxSingleTabDialog
+{
+public:
+ SfxMacroAssignDlg(
+ Window* pParent,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
+ const SfxItemSet& rSet );
+ virtual ~SfxMacroAssignDlg();
+};
+
+#endif
diff --git a/sfx2/source/dialog/macropg.src b/svx/source/cui/macroass.src
index 73327eaf3d..84004470fb 100644
--- a/sfx2/source/dialog/macropg.src
+++ b/svx/source/cui/macroass.src
@@ -28,12 +28,11 @@
*
************************************************************************/
-#include "macropg.hrc"
-#include "dialog.hrc"
+#include "macroass.hrc"
+#include "svx/dialogs.hrc"
#include "helpid.hrc"
-TabPage RID_SFX_TP_MACROASSIGN
+TabPage RID_SVXPAGE_EVENTASSIGN
{
- // HelpID = HID_MACROASSIGN ;
Hide = TRUE ;
SVLook = TRUE ;
DialogControl = TRUE ;
diff --git a/svx/source/dialog/macropg.cxx b/svx/source/cui/macropg.cxx
index 91ed9830f5..91ed9830f5 100644
--- a/svx/source/dialog/macropg.cxx
+++ b/svx/source/cui/macropg.cxx
diff --git a/svx/source/dialog/macropg.hrc b/svx/source/cui/macropg.hrc
index 661d6b71e0..661d6b71e0 100644
--- a/svx/source/dialog/macropg.hrc
+++ b/svx/source/cui/macropg.hrc
diff --git a/svx/inc/macropg.hxx b/svx/source/cui/macropg.hxx
index 510781cbc3..31f1de9cbe 100644
--- a/svx/inc/macropg.hxx
+++ b/svx/source/cui/macropg.hxx
@@ -42,14 +42,13 @@
#include <vcl/lstbox.hxx>
#endif
#include <rtl/ustring.hxx>
-#include "svx/svxdllapi.h"
#include <hash_map>
#include <vector>
typedef ::std::hash_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventsHash;
-struct SVX_DLLPRIVATE EventDisplayName
+struct EventDisplayName
{
const sal_Char* pAsciiEventName;
USHORT nEventResourceID;
@@ -131,7 +130,7 @@ public:
typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte
-class SVX_DLLPUBLIC SvxMacroAssignSingleTabDialog : public SfxModalDialog
+class SvxMacroAssignSingleTabDialog : public SfxModalDialog
{
public:
SvxMacroAssignSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, USHORT nUniqueId );
@@ -163,7 +162,7 @@ private:
};
-class SVX_DLLPUBLIC SvxMacroAssignDlg : public SvxMacroAssignSingleTabDialog
+class SvxMacroAssignDlg : public SvxMacroAssignSingleTabDialog
{
public:
SvxMacroAssignDlg(
diff --git a/svx/source/dialog/macropg.src b/svx/source/cui/macropg.src
index c8d3bcd760..c8d3bcd760 100644
--- a/svx/source/dialog/macropg.src
+++ b/svx/source/cui/macropg.src
diff --git a/svx/source/cui/makefile.mk b/svx/source/cui/makefile.mk
new file mode 100755
index 0000000000..7db32bb15f
--- /dev/null
+++ b/svx/source/cui/makefile.mk
@@ -0,0 +1,232 @@
+#*************************************************************************
+#
+# 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
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.65 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+PRJNAME=svx
+TARGET=cui
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=cui
+SRC1FILES = \
+ acccfg.src \
+ align.src \
+ autocdlg.src \
+ backgrnd.src \
+ bbdlg.src \
+ border.src \
+ cfg.src \
+ chardlg.src \
+ charmap.src \
+ commonlingui.src \
+ connect.src \
+ connpooloptions.src \
+ cuiimapdlg.src \
+ dbregister.src \
+ doclinkdialog.src \
+ dstribut.src \
+ eventdlg.src \
+ fontsubs.src \
+ grfflt.src \
+ grfpage.src \
+ hangulhanjadlg.src \
+ hlmarkwn.src\
+ iconcdlg.src \
+ internationaloptions.src \
+ macroass.src \
+ macropg.src \
+ measure.src \
+ newtabledlg.src \
+ numfmt.src \
+ numpages.src \
+ optfltr.src \
+ optgdlg.src \
+ opthtml.src \
+ optjava.src \
+ optmemory.src \
+ optupdt.src \
+ page.src \
+ paragrph.src \
+ postdlg.src \
+ readonlyimage.src \
+ scriptdlg.src \
+ sdrcelldlg.src \
+ securityoptions.src \
+ selector.src \
+ SpellDialog.src \
+ splitcelldlg.src\
+ srchxtra.src \
+ svuidlg.src \
+ swpossizetabpage.src \
+ tabstpge.src \
+ textanim.src \
+ textattr.src \
+ treeopt.src \
+ webconninfo.src \
+ zoom.src
+
+SRS2NAME=cuidrawdlgs
+SRC2FILES = \
+ dlgname.src \
+ labdlg.src \
+ tabarea.src \
+ tabline.src \
+ transfrm.src
+
+SLOFILES+=\
+ $(SLO)$/tparea.obj \
+ $(SLO)$/borderconn.obj \
+ $(SLO)$/cuiexp.obj \
+ $(SLO)$/dlgfact.obj \
+ $(SLO)$/init.obj \
+ $(SLO)$/scriptdlg.obj \
+ $(SLO)$/commonlingui.obj \
+ $(SLO)$/selector.obj \
+ $(SLO)$/fontsubs.obj \
+ $(SLO)$/linkdlg.obj \
+ $(SLO)$/pastedlg.obj \
+ $(SLO)$/plfilter.obj \
+ $(SLO)$/insdlg.obj \
+ $(SLO)$/optHeaderTabListbox.obj \
+ $(SLO)$/sdbcdriverenum.obj \
+ $(SLO)$/connpoolsettings.obj \
+ $(SLO)$/dbregisterednamesconfig.obj \
+ $(SLO)$/dbregistersettings.obj \
+ $(SLO)$/dbregister.obj \
+ $(SLO)$/doclinkdialog.obj \
+ $(SLO)$/connpoolconfig.obj \
+ $(SLO)$/internationaloptions.obj \
+ $(SLO)$/connpooloptions.obj \
+ $(SLO)$/optgdlg.obj \
+ $(SLO)$/optmemory.obj \
+ $(SLO)$/opthtml.obj \
+ $(SLO)$/optfltr.obj \
+ $(SLO)$/treeopt.obj \
+ $(SLO)$/autocdlg.obj \
+ $(SLO)$/textanim.obj \
+ $(SLO)$/labdlg.obj \
+ $(SLO)$/dstribut.obj \
+ $(SLO)$/hangulhanjadlg.obj \
+ $(SLO)$/showcols.obj \
+ $(SLO)$/zoom.obj \
+ $(SLO)$/cuigaldlg.obj \
+ $(SLO)$/cuiimapwnd.obj \
+ $(SLO)$/hlmarkwn.obj \
+ $(SLO)$/cuicharmap.obj \
+ $(SLO)$/srchxtra.obj \
+ $(SLO)$/bbdlg.obj \
+ $(SLO)$/swpossizetabpage.obj \
+ $(SLO)$/transfrm.obj \
+ $(SLO)$/cuisrchdlg.obj \
+ $(SLO)$/cuitbxform.obj \
+ $(SLO)$/optdict.obj \
+ $(SLO)$/dlgname.obj \
+ $(SLO)$/multipat.obj \
+ $(SLO)$/multifil.obj \
+ $(SLO)$/iconcdlg.obj \
+ $(SLO)$/hltpbase.obj \
+ $(SLO)$/hldocntp.obj \
+ $(SLO)$/hldoctp.obj \
+ $(SLO)$/hlinettp.obj \
+ $(SLO)$/hlmailtp.obj \
+ $(SLO)$/cuihyperdlg.obj \
+ $(SLO)$/cuifmsearch.obj \
+ $(SLO)$/cuigrfflt.obj \
+ $(SLO)$/readonlyimage.obj \
+ $(SLO)$/optaccessibility.obj \
+ $(SLO)$/optsave.obj \
+ $(SLO)$/optasian.obj \
+ $(SLO)$/optpath.obj \
+ $(SLO)$/optcolor.obj \
+ $(SLO)$/optjsearch.obj \
+ $(SLO)$/optinet2.obj \
+ $(SLO)$/securityoptions.obj \
+ $(SLO)$/webconninfo.obj \
+ $(SLO)$/optctl.obj \
+ $(SLO)$/optjava.obj \
+ $(SLO)$/optupdt.obj \
+ $(SLO)$/optimprove.obj \
+ $(SLO)$/optimprove2.obj \
+ $(SLO)$/optgenrl.obj \
+ $(SLO)$/connect.obj \
+ $(SLO)$/tabarea.obj \
+ $(SLO)$/tabline.obj \
+ $(SLO)$/measure.obj \
+ $(SLO)$/tpshadow.obj \
+ $(SLO)$/tpline.obj \
+ $(SLO)$/tpgradnt.obj \
+ $(SLO)$/tpcolor.obj \
+ $(SLO)$/tpbitmap.obj \
+ $(SLO)$/tphatch.obj \
+ $(SLO)$/tplneend.obj \
+ $(SLO)$/tplnedef.obj \
+ $(SLO)$/SpellAttrib.obj \
+ $(SLO)$/SpellDialog.obj \
+ $(SLO)$/numpages.obj \
+ $(SLO)$/paragrph.obj \
+ $(SLO)$/tabstpge.obj \
+ $(SLO)$/textattr.obj \
+ $(SLO)$/align.obj \
+ $(SLO)$/backgrnd.obj \
+ $(SLO)$/border.obj \
+ $(SLO)$/chardlg.obj \
+ $(SLO)$/numfmt.obj \
+ $(SLO)$/page.obj \
+ $(SLO)$/postdlg.obj \
+ $(SLO)$/sdrcelldlg.obj \
+ $(SLO)$/splitcelldlg.obj \
+ $(SLO)$/newtabledlg.obj \
+ $(SLO)$/grfpage.obj \
+ $(SLO)$/cfgchart.obj \
+ $(SLO)$/eventdlg.obj \
+ $(SLO)$/macropg.obj \
+ $(SLO)$/acccfg.obj\
+ $(SLO)$/macroass.obj \
+ $(SLO)$/cfg.obj \
+ $(SLO)$/cfgutil.obj \
+ $(SLO)$/optchart.obj
+
+.IF "$(GUI)"=="WNT"
+SLOFILES+=$(SLO)$/winpluginlib.obj
+.ENDIF
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/svx/source/dialog/measure.cxx b/svx/source/cui/measure.cxx
index 4093e8c2c7..4093e8c2c7 100644
--- a/svx/source/dialog/measure.cxx
+++ b/svx/source/cui/measure.cxx
diff --git a/svx/source/dialog/measure.hrc b/svx/source/cui/measure.hrc
index 2989139da9..2989139da9 100644
--- a/svx/source/dialog/measure.hrc
+++ b/svx/source/cui/measure.hrc
diff --git a/svx/source/dialog/measure.hxx b/svx/source/cui/measure.hxx
index 8b1394ea8b..8b1394ea8b 100644
--- a/svx/source/dialog/measure.hxx
+++ b/svx/source/cui/measure.hxx
diff --git a/svx/source/dialog/measure.src b/svx/source/cui/measure.src
index 83c66b2904..83c66b2904 100644
--- a/svx/source/dialog/measure.src
+++ b/svx/source/cui/measure.src
diff --git a/svx/source/dialog/multifil.cxx b/svx/source/cui/multifil.cxx
index 4ea8d0d7f9..4ea8d0d7f9 100644
--- a/svx/source/dialog/multifil.cxx
+++ b/svx/source/cui/multifil.cxx
diff --git a/svx/source/dialog/multifil.hxx b/svx/source/cui/multifil.hxx
index 33c844ddc7..33c844ddc7 100644
--- a/svx/source/dialog/multifil.hxx
+++ b/svx/source/cui/multifil.hxx
diff --git a/svx/source/dialog/multipat.cxx b/svx/source/cui/multipat.cxx
index ce074bcb87..ce074bcb87 100644
--- a/svx/source/dialog/multipat.cxx
+++ b/svx/source/cui/multipat.cxx
diff --git a/svx/source/dialog/multipat.hxx b/svx/source/cui/multipat.hxx
index 2b0d446eda..2b0d446eda 100644
--- a/svx/source/dialog/multipat.hxx
+++ b/svx/source/cui/multipat.hxx
diff --git a/svx/source/dialog/newtabledlg.cxx b/svx/source/cui/newtabledlg.cxx
index 6e8b7a59f7..6e8b7a59f7 100644
--- a/svx/source/dialog/newtabledlg.cxx
+++ b/svx/source/cui/newtabledlg.cxx
diff --git a/svx/source/dialog/newtabledlg.hrc b/svx/source/cui/newtabledlg.hrc
index 8eba4acee2..8eba4acee2 100644
--- a/svx/source/dialog/newtabledlg.hrc
+++ b/svx/source/cui/newtabledlg.hrc
diff --git a/svx/source/dialog/newtabledlg.hxx b/svx/source/cui/newtabledlg.hxx
index a9426c0c07..a9426c0c07 100644
--- a/svx/source/dialog/newtabledlg.hxx
+++ b/svx/source/cui/newtabledlg.hxx
diff --git a/svx/source/dialog/newtabledlg.src b/svx/source/cui/newtabledlg.src
index 8b2bb5bacc..8b2bb5bacc 100644
--- a/svx/source/dialog/newtabledlg.src
+++ b/svx/source/cui/newtabledlg.src
diff --git a/svx/source/dialog/numfmt.cxx b/svx/source/cui/numfmt.cxx
index 3646f4bebb..3646f4bebb 100644
--- a/svx/source/dialog/numfmt.cxx
+++ b/svx/source/cui/numfmt.cxx
diff --git a/svx/source/dialog/numfmt.hrc b/svx/source/cui/numfmt.hrc
index ee373e8ae9..ee373e8ae9 100644
--- a/svx/source/dialog/numfmt.hrc
+++ b/svx/source/cui/numfmt.hrc
diff --git a/svx/source/dialog/numfmt.hxx b/svx/source/cui/numfmt.hxx
index c41ef12f92..c41ef12f92 100644
--- a/svx/source/dialog/numfmt.hxx
+++ b/svx/source/cui/numfmt.hxx
diff --git a/svx/source/dialog/numfmt.src b/svx/source/cui/numfmt.src
index 92930fdc67..92930fdc67 100644
--- a/svx/source/dialog/numfmt.src
+++ b/svx/source/cui/numfmt.src
diff --git a/svx/source/dialog/numpages.cxx b/svx/source/cui/numpages.cxx
index 68318b5fa3..a9ba8c61cb 100644
--- a/svx/source/dialog/numpages.cxx
+++ b/svx/source/cui/numpages.cxx
@@ -61,13 +61,10 @@
#include <sfx2/objsh.hxx>
#include <vcl/graph.hxx>
#include <vcl/msgbox.hxx>
-#include <svx/charmap.hxx>
+#include "cuicharmap.hxx"
#include <flstitem.hxx>
#include <dlgutil.hxx>
-#ifndef _XTABLE_HXX //autogen
-
#include <svx/xtable.hxx>
-#endif
#include <drawitem.hxx>
#include <numvset.hxx>
#include <htmlmode.hxx>
@@ -87,8 +84,6 @@
#include <vector>
#include "opengrf.hxx"
-
-#include <svx/svxdlg.hxx> //CHINA001
#include <svx/dialogs.hrc> //CHINA001
#include <sfx2/request.hxx> //CHINA001
#include <svtools/aeitem.hxx> //add CHINA001
@@ -2377,11 +2372,7 @@ IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, EMPTYARG )
--------------------------------------------------*/
IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG )
{
- //CHINA001 SvxCharacterMap* pMap = new SvxCharacterMap(this, TRUE);
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxCharacterMap* pMap = pFact->CreateSvxCharacterMap( this, RID_SVXDLG_CHARMAP, TRUE );
- DBG_ASSERT(pMap, "Dialogdiet fail!");//CHINA001
+ SvxCharacterMap* pMap = new SvxCharacterMap( this, TRUE );
USHORT nMask = 1;
const Font* pFmtFont = 0;
@@ -2428,7 +2419,7 @@ IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG )
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
aNumFmt.SetBulletFont(&aActBulletFont); ;
- aNumFmt.SetBulletChar( pMap->GetChar() );
+ aNumFmt.SetBulletChar( (sal_Unicode) pMap->GetChar() );
pActNum->SetLevel(i, aNumFmt);
}
_nMask <<= 1;
diff --git a/svx/source/dialog/numpages.hrc b/svx/source/cui/numpages.hrc
index 76cc93c919..76cc93c919 100644
--- a/svx/source/dialog/numpages.hrc
+++ b/svx/source/cui/numpages.hrc
diff --git a/svx/source/dialog/numpages.hxx b/svx/source/cui/numpages.hxx
index d0c00b121f..d0c00b121f 100644
--- a/svx/source/dialog/numpages.hxx
+++ b/svx/source/cui/numpages.hxx
diff --git a/svx/source/dialog/numpages.src b/svx/source/cui/numpages.src
index 9c6206045d..9c6206045d 100644
--- a/svx/source/dialog/numpages.src
+++ b/svx/source/cui/numpages.src
diff --git a/svx/source/dialog/optHeaderTabListbox.cxx b/svx/source/cui/optHeaderTabListbox.cxx
index e7cc607a61..e7cc607a61 100644
--- a/svx/source/dialog/optHeaderTabListbox.cxx
+++ b/svx/source/cui/optHeaderTabListbox.cxx
diff --git a/svx/source/dialog/optHeaderTabListbox.hxx b/svx/source/cui/optHeaderTabListbox.hxx
index 98288257ca..98288257ca 100644
--- a/svx/source/dialog/optHeaderTabListbox.hxx
+++ b/svx/source/cui/optHeaderTabListbox.hxx
diff --git a/svx/source/dialog/optaccessibility.cxx b/svx/source/cui/optaccessibility.cxx
index a7ad756b2b..a7ad756b2b 100644
--- a/svx/source/dialog/optaccessibility.cxx
+++ b/svx/source/cui/optaccessibility.cxx
diff --git a/svx/source/dialog/optaccessibility.hxx b/svx/source/cui/optaccessibility.hxx
index 037bbaacd9..037bbaacd9 100644
--- a/svx/source/dialog/optaccessibility.hxx
+++ b/svx/source/cui/optaccessibility.hxx
diff --git a/svx/source/dialog/optasian.cxx b/svx/source/cui/optasian.cxx
index 82ada7f5a4..82ada7f5a4 100644
--- a/svx/source/dialog/optasian.cxx
+++ b/svx/source/cui/optasian.cxx
diff --git a/svx/source/dialog/optasian.hxx b/svx/source/cui/optasian.hxx
index d3fc760ea0..d3fc760ea0 100644
--- a/svx/source/dialog/optasian.hxx
+++ b/svx/source/cui/optasian.hxx
diff --git a/svx/source/dialog/optchart.cxx b/svx/source/cui/optchart.cxx
index 9e6322155a..9e6322155a 100644
--- a/svx/source/dialog/optchart.cxx
+++ b/svx/source/cui/optchart.cxx
diff --git a/svx/source/dialog/optchart.hxx b/svx/source/cui/optchart.hxx
index 16496cdb02..16496cdb02 100644
--- a/svx/source/dialog/optchart.hxx
+++ b/svx/source/cui/optchart.hxx
diff --git a/svx/source/dialog/optcolor.cxx b/svx/source/cui/optcolor.cxx
index 887be321ab..887be321ab 100644
--- a/svx/source/dialog/optcolor.cxx
+++ b/svx/source/cui/optcolor.cxx
diff --git a/svx/source/dialog/optcolor.hxx b/svx/source/cui/optcolor.hxx
index f30a163533..f30a163533 100644
--- a/svx/source/dialog/optcolor.hxx
+++ b/svx/source/cui/optcolor.hxx
diff --git a/svx/source/dialog/optctl.cxx b/svx/source/cui/optctl.cxx
index 26d775cab7..26d775cab7 100644
--- a/svx/source/dialog/optctl.cxx
+++ b/svx/source/cui/optctl.cxx
diff --git a/svx/source/dialog/optctl.hxx b/svx/source/cui/optctl.hxx
index 4e18b7b8f1..4e18b7b8f1 100644
--- a/svx/source/dialog/optctl.hxx
+++ b/svx/source/cui/optctl.hxx
diff --git a/svx/source/dialog/optdict.cxx b/svx/source/cui/optdict.cxx
index 166d17fb18..166d17fb18 100644
--- a/svx/source/dialog/optdict.cxx
+++ b/svx/source/cui/optdict.cxx
diff --git a/svx/source/dialog/optdict.hxx b/svx/source/cui/optdict.hxx
index 3846a7cf24..3846a7cf24 100644
--- a/svx/source/dialog/optdict.hxx
+++ b/svx/source/cui/optdict.hxx
diff --git a/svx/source/dialog/optfltr.cxx b/svx/source/cui/optfltr.cxx
index f8d185f107..f8d185f107 100644
--- a/svx/source/dialog/optfltr.cxx
+++ b/svx/source/cui/optfltr.cxx
diff --git a/svx/source/dialog/optfltr.hrc b/svx/source/cui/optfltr.hrc
index e53179ebca..e53179ebca 100644
--- a/svx/source/dialog/optfltr.hrc
+++ b/svx/source/cui/optfltr.hrc
diff --git a/svx/source/dialog/optfltr.hxx b/svx/source/cui/optfltr.hxx
index e8acba8e74..e8acba8e74 100644
--- a/svx/source/dialog/optfltr.hxx
+++ b/svx/source/cui/optfltr.hxx
diff --git a/svx/source/dialog/optfltr.src b/svx/source/cui/optfltr.src
index 9dd3dd2cdf..9dd3dd2cdf 100644
--- a/svx/source/dialog/optfltr.src
+++ b/svx/source/cui/optfltr.src
diff --git a/svx/source/dialog/optgdlg.cxx b/svx/source/cui/optgdlg.cxx
index 7b4bb2843e..7b4bb2843e 100644
--- a/svx/source/dialog/optgdlg.cxx
+++ b/svx/source/cui/optgdlg.cxx
diff --git a/svx/source/dialog/optgdlg.hrc b/svx/source/cui/optgdlg.hrc
index 79c0c24df0..79c0c24df0 100644
--- a/svx/source/dialog/optgdlg.hrc
+++ b/svx/source/cui/optgdlg.hrc
diff --git a/svx/source/dialog/optgdlg.hxx b/svx/source/cui/optgdlg.hxx
index 5023f33644..5023f33644 100644
--- a/svx/source/dialog/optgdlg.hxx
+++ b/svx/source/cui/optgdlg.hxx
diff --git a/svx/source/dialog/optgdlg.src b/svx/source/cui/optgdlg.src
index 7f3ad69680..7f3ad69680 100644
--- a/svx/source/dialog/optgdlg.src
+++ b/svx/source/cui/optgdlg.src
diff --git a/svx/source/dialog/optgenrl.cxx b/svx/source/cui/optgenrl.cxx
index ae977c7fcc..ae977c7fcc 100644
--- a/svx/source/dialog/optgenrl.cxx
+++ b/svx/source/cui/optgenrl.cxx
diff --git a/svx/source/dialog/opthtml.cxx b/svx/source/cui/opthtml.cxx
index b7ba5a3f3c..b7ba5a3f3c 100644
--- a/svx/source/dialog/opthtml.cxx
+++ b/svx/source/cui/opthtml.cxx
diff --git a/svx/source/dialog/opthtml.hrc b/svx/source/cui/opthtml.hrc
index d017a099fa..d017a099fa 100644
--- a/svx/source/dialog/opthtml.hrc
+++ b/svx/source/cui/opthtml.hrc
diff --git a/svx/source/dialog/opthtml.hxx b/svx/source/cui/opthtml.hxx
index a6e131cef8..a6e131cef8 100644
--- a/svx/source/dialog/opthtml.hxx
+++ b/svx/source/cui/opthtml.hxx
diff --git a/svx/source/dialog/opthtml.src b/svx/source/cui/opthtml.src
index f5b872fd51..f5b872fd51 100644
--- a/svx/source/dialog/opthtml.src
+++ b/svx/source/cui/opthtml.src
diff --git a/svx/source/dialog/optimprove.cxx b/svx/source/cui/optimprove.cxx
index e644cc58d7..e644cc58d7 100644
--- a/svx/source/dialog/optimprove.cxx
+++ b/svx/source/cui/optimprove.cxx
diff --git a/svx/source/dialog/optimprove2.cxx b/svx/source/cui/optimprove2.cxx
index 28989080ca..28989080ca 100644
--- a/svx/source/dialog/optimprove2.cxx
+++ b/svx/source/cui/optimprove2.cxx
diff --git a/svx/source/dialog/optinet2.cxx b/svx/source/cui/optinet2.cxx
index 2a74cc6761..2a74cc6761 100644
--- a/svx/source/dialog/optinet2.cxx
+++ b/svx/source/cui/optinet2.cxx
diff --git a/svx/source/dialog/optinet2.hxx b/svx/source/cui/optinet2.hxx
index 53f9cc695c..53f9cc695c 100644
--- a/svx/source/dialog/optinet2.hxx
+++ b/svx/source/cui/optinet2.hxx
diff --git a/svx/source/dialog/optjava.cxx b/svx/source/cui/optjava.cxx
index d9b2acc3f0..d9b2acc3f0 100644
--- a/svx/source/dialog/optjava.cxx
+++ b/svx/source/cui/optjava.cxx
diff --git a/svx/source/dialog/optjava.hrc b/svx/source/cui/optjava.hrc
index c51016c695..c51016c695 100644
--- a/svx/source/dialog/optjava.hrc
+++ b/svx/source/cui/optjava.hrc
diff --git a/svx/source/dialog/optjava.hxx b/svx/source/cui/optjava.hxx
index ea8a8c6251..ea8a8c6251 100644
--- a/svx/source/dialog/optjava.hxx
+++ b/svx/source/cui/optjava.hxx
diff --git a/svx/source/dialog/optjava.src b/svx/source/cui/optjava.src
index a5c69644dc..a5c69644dc 100644
--- a/svx/source/dialog/optjava.src
+++ b/svx/source/cui/optjava.src
diff --git a/svx/source/dialog/optjsearch.cxx b/svx/source/cui/optjsearch.cxx
index 720fa6eec5..720fa6eec5 100644
--- a/svx/source/dialog/optjsearch.cxx
+++ b/svx/source/cui/optjsearch.cxx
diff --git a/svx/source/dialog/optjsearch.hxx b/svx/source/cui/optjsearch.hxx
index f7b628692d..f7b628692d 100644
--- a/svx/source/dialog/optjsearch.hxx
+++ b/svx/source/cui/optjsearch.hxx
diff --git a/svx/source/dialog/optmemory.cxx b/svx/source/cui/optmemory.cxx
index e3befab80e..e3befab80e 100644
--- a/svx/source/dialog/optmemory.cxx
+++ b/svx/source/cui/optmemory.cxx
diff --git a/svx/source/dialog/optmemory.hrc b/svx/source/cui/optmemory.hrc
index b5527a3396..b5527a3396 100644
--- a/svx/source/dialog/optmemory.hrc
+++ b/svx/source/cui/optmemory.hrc
diff --git a/svx/source/dialog/optmemory.hxx b/svx/source/cui/optmemory.hxx
index 75ca43f25a..75ca43f25a 100644
--- a/svx/source/dialog/optmemory.hxx
+++ b/svx/source/cui/optmemory.hxx
diff --git a/svx/source/dialog/optmemory.src b/svx/source/cui/optmemory.src
index 01d23d42be..01d23d42be 100644
--- a/svx/source/dialog/optmemory.src
+++ b/svx/source/cui/optmemory.src
diff --git a/svx/source/dialog/optpath.cxx b/svx/source/cui/optpath.cxx
index 54695490fa..54695490fa 100644
--- a/svx/source/dialog/optpath.cxx
+++ b/svx/source/cui/optpath.cxx
diff --git a/svx/source/dialog/optpath.hxx b/svx/source/cui/optpath.hxx
index 5c51e2f214..5c51e2f214 100644
--- a/svx/source/dialog/optpath.hxx
+++ b/svx/source/cui/optpath.hxx
diff --git a/svx/source/dialog/optsave.cxx b/svx/source/cui/optsave.cxx
index 2ef0d21407..2ef0d21407 100644
--- a/svx/source/dialog/optsave.cxx
+++ b/svx/source/cui/optsave.cxx
diff --git a/svx/source/dialog/optsave.hxx b/svx/source/cui/optsave.hxx
index 4971ccc68a..4971ccc68a 100644
--- a/svx/source/dialog/optsave.hxx
+++ b/svx/source/cui/optsave.hxx
diff --git a/svx/source/dialog/optupdt.cxx b/svx/source/cui/optupdt.cxx
index 25668f4149..25668f4149 100644
--- a/svx/source/dialog/optupdt.cxx
+++ b/svx/source/cui/optupdt.cxx
diff --git a/svx/source/dialog/optupdt.hrc b/svx/source/cui/optupdt.hrc
index 11c956e8c3..11c956e8c3 100644
--- a/svx/source/dialog/optupdt.hrc
+++ b/svx/source/cui/optupdt.hrc
diff --git a/svx/source/dialog/optupdt.hxx b/svx/source/cui/optupdt.hxx
index eeb8203bcf..eeb8203bcf 100644
--- a/svx/source/dialog/optupdt.hxx
+++ b/svx/source/cui/optupdt.hxx
diff --git a/svx/source/dialog/optupdt.src b/svx/source/cui/optupdt.src
index b6512a83a0..b6512a83a0 100644
--- a/svx/source/dialog/optupdt.src
+++ b/svx/source/cui/optupdt.src
diff --git a/svx/source/dialog/page.cxx b/svx/source/cui/page.cxx
index 06199f6752..06199f6752 100644
--- a/svx/source/dialog/page.cxx
+++ b/svx/source/cui/page.cxx
diff --git a/svx/source/dialog/page.h b/svx/source/cui/page.h
index 91c6f1659b..91c6f1659b 100644
--- a/svx/source/dialog/page.h
+++ b/svx/source/cui/page.h
diff --git a/svx/source/dialog/page.hrc b/svx/source/cui/page.hrc
index bee5c13345..bee5c13345 100644
--- a/svx/source/dialog/page.hrc
+++ b/svx/source/cui/page.hrc
diff --git a/svx/source/dialog/page.hxx b/svx/source/cui/page.hxx
index d624bd6f43..d624bd6f43 100644
--- a/svx/source/dialog/page.hxx
+++ b/svx/source/cui/page.hxx
diff --git a/svx/source/dialog/page.src b/svx/source/cui/page.src
index b7c16e9124..b7c16e9124 100644
--- a/svx/source/dialog/page.src
+++ b/svx/source/cui/page.src
diff --git a/svx/source/dialog/paragrph.cxx b/svx/source/cui/paragrph.cxx
index 97e4406d69..97e4406d69 100644
--- a/svx/source/dialog/paragrph.cxx
+++ b/svx/source/cui/paragrph.cxx
diff --git a/svx/source/dialog/paragrph.hrc b/svx/source/cui/paragrph.hrc
index 7314cea6ce..7314cea6ce 100644
--- a/svx/source/dialog/paragrph.hrc
+++ b/svx/source/cui/paragrph.hrc
diff --git a/svx/source/dialog/paragrph.hxx b/svx/source/cui/paragrph.hxx
index 438a741100..438a741100 100644
--- a/svx/source/dialog/paragrph.hxx
+++ b/svx/source/cui/paragrph.hxx
diff --git a/svx/source/dialog/paragrph.src b/svx/source/cui/paragrph.src
index 51320cb820..51320cb820 100644
--- a/svx/source/dialog/paragrph.src
+++ b/svx/source/cui/paragrph.src
diff --git a/svx/source/dialog/pastedlg.cxx b/svx/source/cui/pastedlg.cxx
index f664f2024f..f664f2024f 100644
--- a/svx/source/dialog/pastedlg.cxx
+++ b/svx/source/cui/pastedlg.cxx
diff --git a/svx/source/dialog/pastedlg.hxx b/svx/source/cui/pastedlg.hxx
index 443807d86e..443807d86e 100644
--- a/svx/source/dialog/pastedlg.hxx
+++ b/svx/source/cui/pastedlg.hxx
diff --git a/svx/source/dialog/plfilter.cxx b/svx/source/cui/plfilter.cxx
index 2c8b4c86bf..2c8b4c86bf 100644
--- a/svx/source/dialog/plfilter.cxx
+++ b/svx/source/cui/plfilter.cxx
diff --git a/svx/source/dialog/postdlg.cxx b/svx/source/cui/postdlg.cxx
index 24545df391..24545df391 100644
--- a/svx/source/dialog/postdlg.cxx
+++ b/svx/source/cui/postdlg.cxx
diff --git a/svx/source/dialog/postdlg.hrc b/svx/source/cui/postdlg.hrc
index 3036fe1870..3036fe1870 100644
--- a/svx/source/dialog/postdlg.hrc
+++ b/svx/source/cui/postdlg.hrc
diff --git a/svx/source/dialog/postdlg.hxx b/svx/source/cui/postdlg.hxx
index 85e71d255c..85e71d255c 100644
--- a/svx/source/dialog/postdlg.hxx
+++ b/svx/source/cui/postdlg.hxx
diff --git a/svx/source/dialog/postdlg.src b/svx/source/cui/postdlg.src
index 50536b34ec..50536b34ec 100644
--- a/svx/source/dialog/postdlg.src
+++ b/svx/source/cui/postdlg.src
diff --git a/svx/source/dialog/readonlyimage.cxx b/svx/source/cui/readonlyimage.cxx
index 77e842cac7..77e842cac7 100644
--- a/svx/source/dialog/readonlyimage.cxx
+++ b/svx/source/cui/readonlyimage.cxx
diff --git a/svx/source/dialog/readonlyimage.hxx b/svx/source/cui/readonlyimage.hxx
index ec509b5f00..ec509b5f00 100644
--- a/svx/source/dialog/readonlyimage.hxx
+++ b/svx/source/cui/readonlyimage.hxx
diff --git a/svx/source/dialog/readonlyimage.src b/svx/source/cui/readonlyimage.src
index 306e4f6ed9..306e4f6ed9 100644
--- a/svx/source/dialog/readonlyimage.src
+++ b/svx/source/cui/readonlyimage.src
diff --git a/svx/source/dialog/scriptdlg.cxx b/svx/source/cui/scriptdlg.cxx
index 09b00a1cb8..09b00a1cb8 100644
--- a/svx/source/dialog/scriptdlg.cxx
+++ b/svx/source/cui/scriptdlg.cxx
diff --git a/svx/source/dialog/scriptdlg.hrc b/svx/source/cui/scriptdlg.hrc
index af327d5705..af327d5705 100644
--- a/svx/source/dialog/scriptdlg.hrc
+++ b/svx/source/cui/scriptdlg.hrc
diff --git a/svx/source/dialog/scriptdlg.hxx b/svx/source/cui/scriptdlg.hxx
index b7004d7ee1..a3dde1787b 100644
--- a/svx/source/dialog/scriptdlg.hxx
+++ b/svx/source/cui/scriptdlg.hxx
@@ -45,7 +45,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp>
#include <com/sun/star/frame/XModel.hpp>
-#include "svx/svxdllapi.h"
#include <hash_map>
@@ -172,7 +171,7 @@ public:
void setLoaded() { loaded=true; }
};
-class SVX_DLLPUBLIC SvxScriptOrgDialog : public SfxModalDialog
+class SvxScriptOrgDialog : public SfxModalDialog
{
protected:
FixedText aScriptsTxt;
@@ -231,7 +230,7 @@ public:
//DECL_LINK( ActivatePageHdl, TabControl * );
};
-class SVX_DLLPUBLIC SvxScriptErrorDialog : public VclAbstractDialog
+class SvxScriptErrorDialog : public VclAbstractDialog
{
private:
diff --git a/svx/source/dialog/scriptdlg.src b/svx/source/cui/scriptdlg.src
index 112d5861c3..112d5861c3 100644
--- a/svx/source/dialog/scriptdlg.src
+++ b/svx/source/cui/scriptdlg.src
diff --git a/svx/source/dialog/sdbcdriverenum.cxx b/svx/source/cui/sdbcdriverenum.cxx
index 1fc0335ed3..1fc0335ed3 100644
--- a/svx/source/dialog/sdbcdriverenum.cxx
+++ b/svx/source/cui/sdbcdriverenum.cxx
diff --git a/svx/source/dialog/sdbcdriverenum.hxx b/svx/source/cui/sdbcdriverenum.hxx
index 447fa70051..447fa70051 100644
--- a/svx/source/dialog/sdbcdriverenum.hxx
+++ b/svx/source/cui/sdbcdriverenum.hxx
diff --git a/svx/source/dialog/sdrcelldlg.cxx b/svx/source/cui/sdrcelldlg.cxx
index f5e9f719ce..f5e9f719ce 100644
--- a/svx/source/dialog/sdrcelldlg.cxx
+++ b/svx/source/cui/sdrcelldlg.cxx
diff --git a/svx/source/dialog/sdrcelldlg.hxx b/svx/source/cui/sdrcelldlg.hxx
index 6633066585..6633066585 100644
--- a/svx/source/dialog/sdrcelldlg.hxx
+++ b/svx/source/cui/sdrcelldlg.hxx
diff --git a/svx/source/dialog/sdrcelldlg.src b/svx/source/cui/sdrcelldlg.src
index f657697bd4..f657697bd4 100644
--- a/svx/source/dialog/sdrcelldlg.src
+++ b/svx/source/cui/sdrcelldlg.src
diff --git a/svx/source/dialog/securityoptions.cxx b/svx/source/cui/securityoptions.cxx
index 8689d911ec..8689d911ec 100644
--- a/svx/source/dialog/securityoptions.cxx
+++ b/svx/source/cui/securityoptions.cxx
diff --git a/svx/source/dialog/securityoptions.hrc b/svx/source/cui/securityoptions.hrc
index 50133cc9b9..50133cc9b9 100644
--- a/svx/source/dialog/securityoptions.hrc
+++ b/svx/source/cui/securityoptions.hrc
diff --git a/svx/source/dialog/securityoptions.hxx b/svx/source/cui/securityoptions.hxx
index d93bf33352..d93bf33352 100644
--- a/svx/source/dialog/securityoptions.hxx
+++ b/svx/source/cui/securityoptions.hxx
diff --git a/svx/source/dialog/securityoptions.src b/svx/source/cui/securityoptions.src
index bb74567f2f..bb74567f2f 100644
--- a/svx/source/dialog/securityoptions.src
+++ b/svx/source/cui/securityoptions.src
diff --git a/svx/source/dialog/selector.cxx b/svx/source/cui/selector.cxx
index bf67cd2378..bf67cd2378 100644
--- a/svx/source/dialog/selector.cxx
+++ b/svx/source/cui/selector.cxx
diff --git a/svx/source/dialog/selector.hrc b/svx/source/cui/selector.hrc
index 4a15588796..4a15588796 100644
--- a/svx/source/dialog/selector.hrc
+++ b/svx/source/cui/selector.hrc
diff --git a/svx/source/dialog/selector.hxx b/svx/source/cui/selector.hxx
index 32d33d8c03..f06c26e03f 100644
--- a/svx/source/dialog/selector.hxx
+++ b/svx/source/cui/selector.hxx
@@ -40,7 +40,6 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp>
-#include "svx/svxdllapi.h"
#define _SVSTDARR_USHORTS
#define _SVSTDARR_STRINGSDTOR
@@ -95,7 +94,6 @@ struct SvxGroupInfo_Impl
typedef SvxGroupInfo_Impl* SvxGroupInfoPtr;
SV_DECL_PTRARR_DEL(SvxGroupInfoArr_Impl, SvxGroupInfoPtr, 5, 5)
-DECL_2BYTEARRAY(USHORTArr, USHORT, 10, 10)
class ImageProvider
{
@@ -200,7 +198,7 @@ public:
{ m_pImageProvider = provider; }
};
-class SVX_DLLPUBLIC SvxScriptSelectorDialog : public ModelessDialog
+class SvxScriptSelectorDialog : public ModelessDialog
{
FixedText aDialogDescription;
FixedText aGroupText;
diff --git a/svx/source/dialog/selector.src b/svx/source/cui/selector.src
index 1a08f8cb3e..1a08f8cb3e 100644
--- a/svx/source/dialog/selector.src
+++ b/svx/source/cui/selector.src
diff --git a/svx/source/dialog/showcols.cxx b/svx/source/cui/showcols.cxx
index d226ecade4..d226ecade4 100644
--- a/svx/source/dialog/showcols.cxx
+++ b/svx/source/cui/showcols.cxx
diff --git a/svx/source/dialog/showcols.hxx b/svx/source/cui/showcols.hxx
index 0d21863cba..0d21863cba 100644
--- a/svx/source/dialog/showcols.hxx
+++ b/svx/source/cui/showcols.hxx
diff --git a/svx/source/dialog/splitcelldlg.cxx b/svx/source/cui/splitcelldlg.cxx
index b746b7d650..b746b7d650 100644
--- a/svx/source/dialog/splitcelldlg.cxx
+++ b/svx/source/cui/splitcelldlg.cxx
diff --git a/svx/source/dialog/splitcelldlg.hrc b/svx/source/cui/splitcelldlg.hrc
index 7a0c7929b7..7a0c7929b7 100644
--- a/svx/source/dialog/splitcelldlg.hrc
+++ b/svx/source/cui/splitcelldlg.hrc
diff --git a/svx/source/dialog/splitcelldlg.hxx b/svx/source/cui/splitcelldlg.hxx
index d5b9e64ab3..d5b9e64ab3 100644
--- a/svx/source/dialog/splitcelldlg.hxx
+++ b/svx/source/cui/splitcelldlg.hxx
diff --git a/svx/source/dialog/splitcelldlg.src b/svx/source/cui/splitcelldlg.src
index 6d6660564b..6d6660564b 100644
--- a/svx/source/dialog/splitcelldlg.src
+++ b/svx/source/cui/splitcelldlg.src
diff --git a/svx/source/dialog/srchxtra.cxx b/svx/source/cui/srchxtra.cxx
index ae5f2d7365..ae5f2d7365 100644
--- a/svx/source/dialog/srchxtra.cxx
+++ b/svx/source/cui/srchxtra.cxx
diff --git a/svx/source/dialog/srchxtra.hrc b/svx/source/cui/srchxtra.hrc
index c3e7ad5b58..c3e7ad5b58 100644
--- a/svx/source/dialog/srchxtra.hrc
+++ b/svx/source/cui/srchxtra.hrc
diff --git a/svx/source/dialog/srchxtra.hxx b/svx/source/cui/srchxtra.hxx
index ce6a500d68..ce6a500d68 100644
--- a/svx/source/dialog/srchxtra.hxx
+++ b/svx/source/cui/srchxtra.hxx
diff --git a/svx/source/dialog/srchxtra.src b/svx/source/cui/srchxtra.src
index 2faf01b302..2faf01b302 100644
--- a/svx/source/dialog/srchxtra.src
+++ b/svx/source/cui/srchxtra.src
diff --git a/svx/source/dialog/svuidlg.hrc b/svx/source/cui/svuidlg.hrc
index b4f40e15ab..b4f40e15ab 100644
--- a/svx/source/dialog/svuidlg.hrc
+++ b/svx/source/cui/svuidlg.hrc
diff --git a/svx/source/dialog/svuidlg.src b/svx/source/cui/svuidlg.src
index 11a0fd9ac8..11a0fd9ac8 100644
--- a/svx/source/dialog/svuidlg.src
+++ b/svx/source/cui/svuidlg.src
diff --git a/svx/source/dialog/swpossizetabpage.cxx b/svx/source/cui/swpossizetabpage.cxx
index b3aecc4405..b3aecc4405 100644
--- a/svx/source/dialog/swpossizetabpage.cxx
+++ b/svx/source/cui/swpossizetabpage.cxx
diff --git a/svx/source/dialog/swpossizetabpage.hrc b/svx/source/cui/swpossizetabpage.hrc
index 1d82fd778c..1d82fd778c 100644
--- a/svx/source/dialog/swpossizetabpage.hrc
+++ b/svx/source/cui/swpossizetabpage.hrc
diff --git a/svx/source/dialog/swpossizetabpage.hxx b/svx/source/cui/swpossizetabpage.hxx
index 34aff3b988..34aff3b988 100644
--- a/svx/source/dialog/swpossizetabpage.hxx
+++ b/svx/source/cui/swpossizetabpage.hxx
diff --git a/svx/source/dialog/swpossizetabpage.src b/svx/source/cui/swpossizetabpage.src
index fad98467ce..fad98467ce 100644
--- a/svx/source/dialog/swpossizetabpage.src
+++ b/svx/source/cui/swpossizetabpage.src
diff --git a/svx/source/dialog/tabarea.cxx b/svx/source/cui/tabarea.cxx
index 721154a9a9..721154a9a9 100644
--- a/svx/source/dialog/tabarea.cxx
+++ b/svx/source/cui/tabarea.cxx
diff --git a/svx/source/dialog/tabarea.hrc b/svx/source/cui/tabarea.hrc
index a5afbd8b29..a5afbd8b29 100644
--- a/svx/source/dialog/tabarea.hrc
+++ b/svx/source/cui/tabarea.hrc
diff --git a/svx/source/dialog/tabarea.src b/svx/source/cui/tabarea.src
index 16d46fd896..16d46fd896 100644
--- a/svx/source/dialog/tabarea.src
+++ b/svx/source/cui/tabarea.src
diff --git a/svx/source/dialog/tabline.cxx b/svx/source/cui/tabline.cxx
index 2479a22956..2479a22956 100644
--- a/svx/source/dialog/tabline.cxx
+++ b/svx/source/cui/tabline.cxx
diff --git a/svx/source/dialog/tabline.hrc b/svx/source/cui/tabline.hrc
index 1d35fc6f26..1d35fc6f26 100644
--- a/svx/source/dialog/tabline.hrc
+++ b/svx/source/cui/tabline.hrc
diff --git a/svx/source/dialog/tabline.src b/svx/source/cui/tabline.src
index 18275630c9..18275630c9 100644
--- a/svx/source/dialog/tabline.src
+++ b/svx/source/cui/tabline.src
diff --git a/svx/source/dialog/tabstpge.cxx b/svx/source/cui/tabstpge.cxx
index 24a4a1ba90..24a4a1ba90 100644
--- a/svx/source/dialog/tabstpge.cxx
+++ b/svx/source/cui/tabstpge.cxx
diff --git a/svx/source/dialog/tabstpge.hrc b/svx/source/cui/tabstpge.hrc
index eb75e2cc41..eb75e2cc41 100644
--- a/svx/source/dialog/tabstpge.hrc
+++ b/svx/source/cui/tabstpge.hrc
diff --git a/svx/source/dialog/tabstpge.hxx b/svx/source/cui/tabstpge.hxx
index 0ab6265c67..0ab6265c67 100644
--- a/svx/source/dialog/tabstpge.hxx
+++ b/svx/source/cui/tabstpge.hxx
diff --git a/svx/source/dialog/tabstpge.src b/svx/source/cui/tabstpge.src
index 4cb09d5bf1..4cb09d5bf1 100644
--- a/svx/source/dialog/tabstpge.src
+++ b/svx/source/cui/tabstpge.src
diff --git a/svx/source/dialog/textanim.cxx b/svx/source/cui/textanim.cxx
index 89157236b4..89157236b4 100644
--- a/svx/source/dialog/textanim.cxx
+++ b/svx/source/cui/textanim.cxx
diff --git a/svx/source/dialog/textanim.hrc b/svx/source/cui/textanim.hrc
index bcbecf8e03..bcbecf8e03 100644
--- a/svx/source/dialog/textanim.hrc
+++ b/svx/source/cui/textanim.hrc
diff --git a/svx/source/dialog/textanim.hxx b/svx/source/cui/textanim.hxx
index f72d474c76..f72d474c76 100644
--- a/svx/source/dialog/textanim.hxx
+++ b/svx/source/cui/textanim.hxx
diff --git a/svx/source/dialog/textanim.src b/svx/source/cui/textanim.src
index fb29d9c60d..fb29d9c60d 100644
--- a/svx/source/dialog/textanim.src
+++ b/svx/source/cui/textanim.src
diff --git a/svx/source/dialog/textattr.cxx b/svx/source/cui/textattr.cxx
index a0e9d2b585..a0e9d2b585 100644
--- a/svx/source/dialog/textattr.cxx
+++ b/svx/source/cui/textattr.cxx
diff --git a/svx/source/dialog/textattr.hrc b/svx/source/cui/textattr.hrc
index a288f2befd..a288f2befd 100644
--- a/svx/source/dialog/textattr.hrc
+++ b/svx/source/cui/textattr.hrc
diff --git a/svx/source/dialog/textattr.hxx b/svx/source/cui/textattr.hxx
index 63ef963b81..63ef963b81 100644
--- a/svx/source/dialog/textattr.hxx
+++ b/svx/source/cui/textattr.hxx
diff --git a/svx/source/dialog/textattr.src b/svx/source/cui/textattr.src
index 293dad2462..293dad2462 100644
--- a/svx/source/dialog/textattr.src
+++ b/svx/source/cui/textattr.src
diff --git a/svx/source/dialog/tparea.cxx b/svx/source/cui/tparea.cxx
index ff48ec08bc..961c878df2 100644
--- a/svx/source/dialog/tparea.cxx
+++ b/svx/source/cui/tparea.cxx
@@ -31,6 +31,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
+#ifdef SVX_DLLIMPLEMENTATION
+#undef SVX_DLLIMPLEMENTATION
+#endif
+
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
@@ -48,18 +52,10 @@
#include <svx/dialogs.hrc>
#include "tabarea.hrc"
#include "dlgname.hrc"
-
-
-
-
-
-
#include <svx/xflbckit.hxx>
-
#include <svx/svdattr.hxx>
#include <svx/xtable.hxx>
#include <svx/xlineit0.hxx>
-
#include "drawitem.hxx"
#include "cuitabarea.hxx"
#include "dlgname.hxx"
diff --git a/svx/source/dialog/tpbitmap.cxx b/svx/source/cui/tpbitmap.cxx
index febfa18e90..febfa18e90 100644
--- a/svx/source/dialog/tpbitmap.cxx
+++ b/svx/source/cui/tpbitmap.cxx
diff --git a/svx/source/dialog/tpcolor.cxx b/svx/source/cui/tpcolor.cxx
index a373c985f3..a373c985f3 100644
--- a/svx/source/dialog/tpcolor.cxx
+++ b/svx/source/cui/tpcolor.cxx
diff --git a/svx/source/dialog/tpgradnt.cxx b/svx/source/cui/tpgradnt.cxx
index 99f8b357b8..99f8b357b8 100644
--- a/svx/source/dialog/tpgradnt.cxx
+++ b/svx/source/cui/tpgradnt.cxx
diff --git a/svx/source/dialog/tphatch.cxx b/svx/source/cui/tphatch.cxx
index 42f576836b..42f576836b 100644
--- a/svx/source/dialog/tphatch.cxx
+++ b/svx/source/cui/tphatch.cxx
diff --git a/svx/source/dialog/tpline.cxx b/svx/source/cui/tpline.cxx
index 497d628fa3..497d628fa3 100644
--- a/svx/source/dialog/tpline.cxx
+++ b/svx/source/cui/tpline.cxx
diff --git a/svx/source/dialog/tplnedef.cxx b/svx/source/cui/tplnedef.cxx
index e370b4a8c8..e370b4a8c8 100644
--- a/svx/source/dialog/tplnedef.cxx
+++ b/svx/source/cui/tplnedef.cxx
diff --git a/svx/source/dialog/tplneend.cxx b/svx/source/cui/tplneend.cxx
index e30e5b9e8d..e30e5b9e8d 100644
--- a/svx/source/dialog/tplneend.cxx
+++ b/svx/source/cui/tplneend.cxx
diff --git a/svx/source/dialog/tpshadow.cxx b/svx/source/cui/tpshadow.cxx
index 2ff6d10fb3..2ff6d10fb3 100644
--- a/svx/source/dialog/tpshadow.cxx
+++ b/svx/source/cui/tpshadow.cxx
diff --git a/svx/source/dialog/transfrm.cxx b/svx/source/cui/transfrm.cxx
index 538e8eb523..538e8eb523 100644
--- a/svx/source/dialog/transfrm.cxx
+++ b/svx/source/cui/transfrm.cxx
diff --git a/svx/source/dialog/transfrm.hrc b/svx/source/cui/transfrm.hrc
index a76cdb9cba..a76cdb9cba 100644
--- a/svx/source/dialog/transfrm.hrc
+++ b/svx/source/cui/transfrm.hrc
diff --git a/svx/source/dialog/transfrm.hxx b/svx/source/cui/transfrm.hxx
index 8b25e2cee0..8b25e2cee0 100644
--- a/svx/source/dialog/transfrm.hxx
+++ b/svx/source/cui/transfrm.hxx
diff --git a/svx/source/dialog/transfrm.src b/svx/source/cui/transfrm.src
index 4fd301d219..4fd301d219 100644
--- a/svx/source/dialog/transfrm.src
+++ b/svx/source/cui/transfrm.src
diff --git a/svx/source/dialog/treeopt.cxx b/svx/source/cui/treeopt.cxx
index 8510f03f0d..8510f03f0d 100644
--- a/svx/source/dialog/treeopt.cxx
+++ b/svx/source/cui/treeopt.cxx
diff --git a/svx/source/dialog/treeopt.hrc b/svx/source/cui/treeopt.hrc
index 8fe50334ba..8fe50334ba 100644
--- a/svx/source/dialog/treeopt.hrc
+++ b/svx/source/cui/treeopt.hrc
diff --git a/svx/source/dialog/treeopt.hxx b/svx/source/cui/treeopt.hxx
index 014cb6e22b..014cb6e22b 100644
--- a/svx/source/dialog/treeopt.hxx
+++ b/svx/source/cui/treeopt.hxx
diff --git a/svx/source/dialog/treeopt.src b/svx/source/cui/treeopt.src
index be5398f5f5..be5398f5f5 100644
--- a/svx/source/dialog/treeopt.src
+++ b/svx/source/cui/treeopt.src
diff --git a/svx/source/dialog/webconninfo.cxx b/svx/source/cui/webconninfo.cxx
index c370c38f28..c370c38f28 100644
--- a/svx/source/dialog/webconninfo.cxx
+++ b/svx/source/cui/webconninfo.cxx
diff --git a/svx/source/dialog/webconninfo.hrc b/svx/source/cui/webconninfo.hrc
index d4be1e151b..d4be1e151b 100644
--- a/svx/source/dialog/webconninfo.hrc
+++ b/svx/source/cui/webconninfo.hrc
diff --git a/svx/source/dialog/webconninfo.hxx b/svx/source/cui/webconninfo.hxx
index 25661e1ab1..25661e1ab1 100644
--- a/svx/source/dialog/webconninfo.hxx
+++ b/svx/source/cui/webconninfo.hxx
diff --git a/svx/source/dialog/webconninfo.src b/svx/source/cui/webconninfo.src
index e5411d4542..e5411d4542 100644
--- a/svx/source/dialog/webconninfo.src
+++ b/svx/source/cui/webconninfo.src
diff --git a/svx/source/dialog/winpluginlib.cpp b/svx/source/cui/winpluginlib.cpp
index 17928c161b..17928c161b 100644
--- a/svx/source/dialog/winpluginlib.cpp
+++ b/svx/source/cui/winpluginlib.cpp
diff --git a/svx/source/dialog/zoom.cxx b/svx/source/cui/zoom.cxx
index 78fc77a336..78fc77a336 100644
--- a/svx/source/dialog/zoom.cxx
+++ b/svx/source/cui/zoom.cxx
diff --git a/svx/source/dialog/zoom.hrc b/svx/source/cui/zoom.hrc
index 6e3cf49d7c..6e3cf49d7c 100644
--- a/svx/source/dialog/zoom.hrc
+++ b/svx/source/cui/zoom.hrc
diff --git a/svx/source/dialog/zoom.hxx b/svx/source/cui/zoom.hxx
index 6565214e54..6565214e54 100644
--- a/svx/source/dialog/zoom.hxx
+++ b/svx/source/cui/zoom.hxx
diff --git a/svx/source/dialog/zoom.src b/svx/source/cui/zoom.src
index dca32260ab..dca32260ab 100644
--- a/svx/source/dialog/zoom.src
+++ b/svx/source/cui/zoom.src
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index c814977bb5..7258c2ca4a 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -36,40 +36,33 @@
#include <stdio.h>
#define _SVX_CHARMAP_CXX_
-#include <tools/shl.hxx>
-#include <tools/debug.hxx>
-#include <vcl/sound.hxx>
#include <vcl/svapp.hxx>
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/edit.hxx>
#include <svtools/colorcfg.hxx>
#include <rtl/textenc.h>
#include <svx/ucsubset.hxx>
#include <svx/dialogs.hrc>
-#include "charmap.hrc"
#include <svx/charmap.hxx>
#include <svx/dialmgr.hxx>
+#include <svx/svxdlg.hxx>
#include "charmapacc.hxx"
#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <comphelper/types.hxx>
+#include <svtools/itemset.hxx>
#include "rtl/ustrbuf.hxx"
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-sal_uInt32& getSelectedChar()
+sal_uInt32& SvxShowCharSet::getSelectedChar()
{
static sal_uInt32 cSelectedChar = ' '; // keeps selected character over app livetime
return cSelectedChar;
@@ -715,393 +708,6 @@ sal_Int32 SvxShowCharSet::getMaxCharCount() const
return maFontCharMap.GetCharCount();
}
-// class SvxShowText =====================================================
-
-SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, BOOL bCenter )
-: Control( pParent, rResId ),
- mbCenter( bCenter)
-{}
-
-// -----------------------------------------------------------------------
-
-void SvxShowText::Paint( const Rectangle& )
-{
- Color aTextCol = GetTextColor();
-
- const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- const Color aWindowTextColor( rStyleSettings.GetDialogTextColor() );
- SetTextColor( aWindowTextColor );
-
- const String aText = GetText();
- const Size aSize = GetOutputSizePixel();
- Point aPoint( 2, mnY );
-
- // adjust position using ink boundary if possible
- Rectangle aBoundRect;
- if( !GetTextBoundRect( aBoundRect, aText ) || aBoundRect.IsEmpty() )
- aPoint.X() = (aSize.Width() - GetTextWidth( aText )) / 2;
- else
- {
- // adjust position before it gets out of bounds
- aBoundRect += aPoint;
-
- // shift back vertically if needed
- int nYLDelta = aBoundRect.Top();
- int nYHDelta = aSize.Height() - aBoundRect.Bottom();
- if( nYLDelta <= 0 )
- aPoint.Y() -= nYLDelta - 1;
- else if( nYHDelta <= 0 )
- aPoint.Y() += nYHDelta - 1;
-
- if( mbCenter )
- {
- // move glyph to middle of cell
- aPoint.X() = -aBoundRect.Left()
- + (aSize.Width() - aBoundRect.GetWidth()) / 2;
- }
- else
- {
- // shift back horizontally if needed
- int nXLDelta = aBoundRect.Left();
- int nXHDelta = aSize.Width() - aBoundRect.Right();
- if( nXLDelta <= 0 )
- aPoint.X() -= nXLDelta - 1;
- else if( nXHDelta <= 0 )
- aPoint.X() += nXHDelta - 1;
- }
- }
-
- DrawText( aPoint, aText );
- SetTextColor( aTextCol );
-}
-
-// -----------------------------------------------------------------------
-
-void SvxShowText::SetFont( const Font& rFont )
-{
- long nWinHeight = GetOutputSizePixel().Height();
- Font aFont = rFont;
- aFont.SetWeight( WEIGHT_NORMAL );
- aFont.SetAlign( ALIGN_TOP );
- aFont.SetSize( PixelToLogic( Size( 0, nWinHeight/2 ) ) );
- aFont.SetTransparent( TRUE );
- Control::SetFont( aFont );
- mnY = ( nWinHeight - GetTextHeight() ) / 2;
-
- Invalidate();
-}
-
-// -----------------------------------------------------------------------
-
-void SvxShowText::SetText( const String& rText )
-{
- Control::SetText( rText );
- Invalidate();
-}
-
-// -----------------------------------------------------------------------
-
-SvxShowText::~SvxShowText()
-{}
-
-// class SvxCharacterMap =================================================
-
-SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pResContext )
-: mpDialog( pDialog ),
- aShowSet ( pDialog, ResId( CT_SHOWSET, *pResContext ) ),
- aShowText ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ),
- aOKBtn ( pDialog, ResId( BTN_CHAR_OK, *pResContext ) ),
- aCancelBtn ( pDialog, ResId( BTN_CHAR_CANCEL, *pResContext ) ),
- aHelpBtn ( pDialog, ResId( BTN_CHAR_HELP, *pResContext ) ),
- aDeleteBtn ( pDialog, ResId( BTN_DELETE, *pResContext ) ),
- aFontText ( pDialog, ResId( FT_FONT, *pResContext ) ),
- aFontLB ( pDialog, ResId( LB_FONT, *pResContext ) ),
- aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ),
- aSubsetLB ( pDialog, ResId( LB_SUBSET, *pResContext ) ),
- aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ),
- aShowChar ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), TRUE ),
- aCharCodeText ( pDialog, ResId( FT_CHARCODE, *pResContext ) ),
- bOne( bOne_ ),
- pSubsetMap( NULL )
-{
- aFont = pDialog->GetFont();
- aFont.SetTransparent( TRUE );
- aFont.SetFamily( FAMILY_DONTKNOW );
- aFont.SetPitch( PITCH_DONTKNOW );
- aFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
-
- if ( bOne )
- {
- Size aDlgSize = pDialog->GetSizePixel();
- pDialog->SetSizePixel( Size( aDlgSize.Width(),
- aDlgSize.Height()-aShowText.GetSizePixel().Height() ) );
- aSymbolText.Hide();
- aShowText.Hide();
- aDeleteBtn.Hide();
- }
-
- String aDefStr( aFont.GetName() );
- String aLastName;
- int nCount = mpDialog->GetDevFontCount();
- for ( int i = 0; i < nCount; i++ )
- {
- String aFontName( mpDialog->GetDevFont( i ).GetName() );
- if ( aFontName != aLastName )
- {
- aLastName = aFontName;
- USHORT nPos = aFontLB.InsertEntry( aFontName );
- aFontLB.SetEntryData( nPos, (void*)(ULONG)i );
- }
- }
- // the font may not be in the list =>
- // try to find a font name token in list and select found font,
- // else select topmost entry
- FASTBOOL bFound = (aFontLB.GetEntryPos( aDefStr ) == LISTBOX_ENTRY_NOTFOUND );
- if( !bFound )
- {
- for ( xub_StrLen i = 0; i < aDefStr.GetTokenCount(); ++i )
- {
- String aToken = aDefStr.GetToken(i);
- if ( aFontLB.GetEntryPos( aToken ) != LISTBOX_ENTRY_NOTFOUND )
- {
- aDefStr = aToken;
- bFound = TRUE;
- break;
- }
- }
- }
-
- if ( bFound )
- aFontLB.SelectEntry( aDefStr );
- else if ( aFontLB.GetEntryCount() )
- aFontLB.SelectEntryPos(0);
- FontSelectHdl( &aFontLB );
-
- aOKBtn.SetClickHdl( LINK( this, SvxCharMapData, OKHdl ) );
- aFontLB.SetSelectHdl( LINK( this, SvxCharMapData, FontSelectHdl ) );
- aSubsetLB.SetSelectHdl( LINK( this, SvxCharMapData, SubsetSelectHdl ) );
- aShowSet.SetDoubleClickHdl( LINK( this, SvxCharMapData, CharDoubleClickHdl ) );
- aShowSet.SetSelectHdl( LINK( this, SvxCharMapData, CharSelectHdl ) );
- aShowSet.SetHighlightHdl( LINK( this, SvxCharMapData, CharHighlightHdl ) );
- aShowSet.SetPreSelectHdl( LINK( this, SvxCharMapData, CharPreSelectHdl ) );
- aDeleteBtn.SetClickHdl( LINK( this, SvxCharMapData, DeleteHdl ) );
-
-
- if(getSelectedChar() == ' ')
- aOKBtn.Disable();
- else
- aOKBtn.Enable();
-
- // left align aShowText field
- int nLeftEdge = aSymbolText.GetPosPixel().X();
- nLeftEdge += aSymbolText.GetTextWidth( aSymbolText.GetText() );
- Size aNewSize = aShowText.GetOutputSizePixel();
- aShowText.SetPosPixel( Point( nLeftEdge+4, aShowText.GetPosPixel().Y() ) );
-}
-
-// -----------------------------------------------------------------------
-
-void SvxCharMapData::SetCharFont( const Font& rFont )
-{
- // first get the underlying info in order to get font names
- // like "Times New Roman;Times" resolved
- Font aTmp( mpDialog->GetFontMetric( rFont ) );
-
- if ( aFontLB.GetEntryPos( aTmp.GetName() ) == LISTBOX_ENTRY_NOTFOUND )
- return;
-
- aFontLB.SelectEntry( aTmp.GetName() );
- aFont = aTmp;
- FontSelectHdl( &aFontLB );
-
- // for compatibility reasons
- mpDialog->ModalDialog::SetFont( aFont );
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG )
-{
- String aStr = aShowText.GetText();
-
- if ( !aStr.Len() )
- {
- sal_UCS4 cChar = aShowSet.GetSelectCharacter();
- // using the new UCS4 constructor
- rtl::OUString aOUStr( &cChar, 1 );
- aShowText.SetText( aOUStr );
- }
- mpDialog->EndDialog( TRUE );
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
-{
- USHORT nPos = aFontLB.GetSelectEntryPos(),
- nFont = (USHORT)(ULONG)aFontLB.GetEntryData( nPos );
- aFont = mpDialog->GetDevFont( nFont );
-
- // notify children using this font
- aShowSet.SetFont( aFont );
- aShowChar.SetFont( aFont );
- aShowText.SetFont( aFont );
-
- // right align some fields to aShowSet
- int nRightEdge = aShowSet.GetPosPixel().X() + aShowSet.GetOutputSizePixel().Width();
- Size aNewSize = aSubsetLB.GetOutputSizePixel();
- aNewSize.setWidth( nRightEdge - aSubsetLB.GetPosPixel().X() );
- aSubsetLB.SetOutputSizePixel( aNewSize );
-
- // setup unicode subset listbar with font specific subsets,
- // hide unicode subset listbar for symbol fonts
- // TODO: get info from the Font once it provides it
- if( pSubsetMap)
- delete pSubsetMap;
- pSubsetMap = NULL;
-
- BOOL bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL);
- if( bNeedSubset )
- {
- FontCharMap aFontCharMap;
- aShowSet.GetFontCharMap( aFontCharMap );
- pSubsetMap = new SubsetMap( &aFontCharMap );
-
- // update subset listbox for new font's unicode subsets
- aSubsetLB.Clear();
- // TODO: is it worth to improve the stupid linear search?
- bool bFirst = true;
- const Subset* s;
- while( NULL != (s = pSubsetMap->GetNextSubset( bFirst )) )
- {
- USHORT nPos_ = aSubsetLB.InsertEntry( s->GetName() );
- aSubsetLB.SetEntryData( nPos_, (void*)s );
- // NOTE: subset must live at least as long as the selected font
- if( bFirst )
- aSubsetLB.SelectEntryPos( nPos_ );
- bFirst = false;
- }
- if( aSubsetLB.GetEntryCount() <= 1 )
- bNeedSubset = FALSE;
- }
-
- aSubsetText.Show( bNeedSubset);
- aSubsetLB.Show( bNeedSubset);
-
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG )
-{
- USHORT nPos = aSubsetLB.GetSelectEntryPos();
- const Subset* pSubset = reinterpret_cast<const Subset*> (aSubsetLB.GetEntryData(nPos));
- if( pSubset )
- {
- sal_UCS4 cFirst = pSubset->GetRangeMin();
- aShowSet.SelectCharacter( cFirst );
- }
- aSubsetLB.SelectEntryPos( nPos );
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxCharMapData, CharDoubleClickHdl, Control *, EMPTYARG )
-{
- mpDialog->EndDialog( TRUE );
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxCharMapData, CharSelectHdl, Control *, EMPTYARG )
-{
- if ( !bOne )
- {
- String aText = aShowText.GetText();
-
- if ( aText.Len() == CHARMAP_MAXLEN )
- Sound::Beep( SOUND_WARNING );
- else
- {
- sal_UCS4 cChar = aShowSet.GetSelectCharacter();
- // using the new UCS4 constructor
- rtl::OUString aOUStr( &cChar, 1 );
- aShowText.SetText( aText + aOUStr );
- }
-
- }
- aOKBtn.Enable();
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG )
-{
- String aText;
- sal_UCS4 cChar = aShowSet.GetSelectCharacter();
- sal_Bool bSelect = (cChar > 0);
-
- // show char sample
- if ( bSelect )
- {
- // using the new UCS4 constructor
- aText = rtl::OUString( &cChar, 1 );
-
- const Subset* pSubset = NULL;
- if( pSubsetMap )
- pSubset = pSubsetMap->GetSubsetByUnicode( cChar );
- if( pSubset )
- aSubsetLB.SelectEntry( pSubset->GetName() );
- else
- aSubsetLB.SetNoSelection();
- }
- aShowChar.SetText( aText );
- aShowChar.Update();
-
- // show char code
- if ( bSelect )
- {
- char aBuf[32];
- snprintf( aBuf, sizeof(aBuf), "U+%04X", static_cast<unsigned>(cChar) );
- if( cChar < 0x0100 )
- snprintf( aBuf+6, sizeof(aBuf)-6, " (%u)", static_cast<unsigned>(cChar) );
- aText = String::CreateFromAscii( aBuf );
- }
- aCharCodeText.SetText( aText );
-
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxCharMapData, CharPreSelectHdl, Control *, EMPTYARG )
-{
- // adjust subset selection
- if( pSubsetMap )
- {
- sal_UCS4 cChar = aShowSet.GetSelectCharacter();
- const Subset* pSubset = pSubsetMap->GetSubsetByUnicode( cChar );
- if( pSubset )
- aSubsetLB.SelectEntry( pSubset->GetName() );
- }
-
- aOKBtn.Enable();
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG )
-{
- aShowText.SetText( String() );
- aOKBtn.Disable();
- return 0;
-}
// class SubsetMap =======================================================
// TODO: should be moved into Font Attributes stuff
@@ -1288,4 +894,3 @@ void SubsetMap::ApplyCharMap( const FontCharMap* pFontCharMap )
maSubsets.erase( it );
}
}
-
diff --git a/svx/source/dialog/cuicharmap.cxx b/svx/source/dialog/cuicharmap.cxx
deleted file mode 100644
index a96924f6a8..0000000000
--- a/svx/source/dialog/cuicharmap.cxx
+++ /dev/null
@@ -1,136 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: cuicharmap.cxx,v $
- * $Revision: 1.10 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
-// include ---------------------------------------------------------------
-
-#include <stdio.h>
-
-#define _CUI_CHARMAP_CXX_
-#include <tools/shl.hxx>
-#include <tools/debug.hxx>
-#include <vcl/sound.hxx>
-#include <vcl/svapp.hxx>
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/edit.hxx>
-#include <svtools/colorcfg.hxx>
-
-#include <rtl/textenc.h>
-#include <svx/ucsubset.hxx>
-
-#include <svx/dialogs.hrc>
-#include "charmap.hrc"
-#include <svx/charmap.hxx> //add CHINA001
-#include <svx/dialmgr.hxx>
-#include "cuicharmap.hxx"
-//CHINA001 #include "charmapacc.hxx"
-//CHINA001 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTOBJECT_HPP_
-//CHINA001 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
-//CHINA001 #endif
-//CHINA001 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_
-//CHINA001 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-//CHINA001 #endif
-//CHINA001 #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_
-//CHINA001 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-//CHINA001 #endif
-//CHINA001 #ifndef _COMPHELPER_TYPES_HXX_
-//CHINA001 #include <comphelper/types.hxx>
-//CHINA001 #endif
-//CHINA001
-//CHINA001 using namespace ::com::sun::star::accessibility;
-//CHINA001 using namespace ::com::sun::star::uno;
-
-// class SvxCharacterMap =================================================
-
-SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne ) :
- SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_CHARMAP ) ),
- mpCharMapData( new SvxCharMapData( this, bOne, &DIALOG_MGR() ) )
-{
- FreeResource();
-}
-
-// -----------------------------------------------------------------------
-
-SvxCharacterMap::~SvxCharacterMap()
-{
- delete mpCharMapData;
-}
-
-// -----------------------------------------------------------------------
-
-const Font& SvxCharacterMap::GetCharFont() const
-{
- return mpCharMapData->aFont;
-}
-
-// -----------------------------------------------------------------------
-
-void SvxCharacterMap::SetChar( sal_UCS4 c )
-{
- mpCharMapData->aShowSet.SelectCharacter( c );
-}
-
-// -----------------------------------------------------------------------
-
-sal_UCS4 SvxCharacterMap::GetChar() const
-{
- return mpCharMapData->aShowSet.GetSelectCharacter();
-}
-
-// -----------------------------------------------------------------------
-
-String SvxCharacterMap::GetCharacters() const
-{
- return mpCharMapData->aShowText.GetText();
-}
-
-
-// -----------------------------------------------------------------------
-
-void SvxCharacterMap::DisableFontSelection()
-{
- mpCharMapData->aFontText.Disable();
- mpCharMapData->aFontLB.Disable();
-}
-void SvxCharacterMap::SetCharFont( const Font& rFont )
-{
- mpCharMapData->SetCharFont( rFont );
-}
-
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 56215c1003..84f5debf8c 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -42,7 +42,7 @@
#ifndef _SVX_DIALOGS_HRC
#include <svx/dialogs.hrc>
#endif
-#include "connpooloptions.hxx"
+//#include "connpooloptions.hxx"
// === /includes (project) ===============================================
// === includes (global) =================================================
@@ -60,9 +60,9 @@ namespace svx
SfxItemSet aRegistrationItems( SFX_APP()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 );
SvxAbstractDialogFactory* pDialogFactory = SvxAbstractDialogFactory::Create();
- ::std::auto_ptr< AbstractSfxSingleTabDialog > pDialog;
+ ::std::auto_ptr< SfxAbstractDialog > pDialog;
if ( pDialogFactory )
- pDialog.reset( pDialogFactory->CreateSfxSingleTabDialog( _parentWindow, aRegistrationItems, NULL, RID_SFXPAGE_DBREGISTER ) );
+ pDialog.reset( pDialogFactory->CreateSfxDialog( _parentWindow, aRegistrationItems, NULL, RID_SFXPAGE_DBREGISTER ) );
if ( pDialog.get() )
nResult = pDialog->Execute();
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 2d31d2a257..583de9a93e 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -41,7 +41,7 @@
#include <svx/dialmgr.hxx>
#include <svx/grfflt.hxx>
-#include "grfflt.hrc"
+//#include "grfflt.hrc"
#include <svx/dialogs.hrc>
#include <svx/svxdlg.hxx> //CHINA001
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 7b700ba5a5..3bb5f0b6b1 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -34,12 +34,10 @@
// include ---------------------------------------------------------------
#include <vcl/settings.hxx>
#include <svtools/viewoptions.hxx>
-#include "cuihyperdlg.hxx" //CHINA001
#include "hyperdlg.hxx"
#include <svx/svxdlg.hxx> //CHINA001
-
#include <sfx2/app.hxx>
-
+#include <sfx2/sfxsids.hrc>
#include "hyperdlg.hrc"
diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc
index fffddbecc7..80eee9e319 100644
--- a/svx/source/dialog/imapdlg.hrc
+++ b/svx/source/dialog/imapdlg.hrc
@@ -92,28 +92,6 @@
#define MN_ACTIVATE 9
#define MN_MACRO 10
-
-/******************************************************************************/
-
-
-#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2)
-
-#define FT_URLDESCRIPTION 1
-#define FT_URL1 2
-#define FT_TARGET 3
-#define FT_NAME 4
-#define FT_DESCRIPTION 5
-#define EDT_URLDESCRIPTION 1
-#define EDT_URL 2
-#define EDT_NAME 3
-#define EDT_DESCRIPTION 4
-#define BTN_HELP1 1
-#define BTN_OK1 2
-#define BTN_CANCEL1 3
-#define FL_URL 1
-#define CBB_TARGETS 1
-
-
/******************************************************************************/
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index bcc26deceb..cc40d30b51 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -354,124 +354,8 @@ Menu RID_SVXMN_IMAP
};
};
};
-/******************************************************************************/
-ModalDialog RID_SVXDLG_IMAPURL
-{
- SVLook = TRUE ;
- OutputSize = TRUE ;
- Closeable = TRUE ;
- Moveable = TRUE ;
- Size = MAP_APPFONT ( 214 , 188 ) ;
- Text [ en-US ] = "Properties" ;
-
- FixedText FT_URL1
- {
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 202 , 8 ) ;
- Text [ en-US ] = "~URL" ;
- };
- Edit EDT_URL
- {
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Pos = MAP_APPFONT ( 6 , 17 ) ;
- Size = MAP_APPFONT ( 202 , 12 ) ;
- };
-
- FixedText FT_TARGET
- {
- Pos = MAP_APPFONT ( 6 , 32 ) ;
- Size = MAP_APPFONT ( 202 , 8 ) ;
- Text [ en-US ] = "F~rame" ;
- };
- ComboBox CBB_TARGETS
- {
- Border = TRUE ;
- Sort = TRUE ;
- Pos = MAP_APPFONT ( 6 , 43 ) ;
- Size = MAP_APPFONT ( 101 , 50 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- HScroll = TRUE ;
- };
-
- FixedText FT_NAME
- {
- Pos = MAP_APPFONT ( 6 , 59 ) ;
- Size = MAP_APPFONT ( 202 , 8 ) ;
- Text [ en-US ] = "~Name" ;
- };
- Edit EDT_NAME
- {
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Pos = MAP_APPFONT ( 6 , 70 ) ;
- Size = MAP_APPFONT ( 202 , 12 ) ;
- };
-
- FixedText FT_URLDESCRIPTION
- {
- Pos = MAP_APPFONT ( 6 , 85 ) ;
- Size = MAP_APPFONT ( 202 , 8 ) ;
- Text [ en-US ] = "Alternative ~text" ;
- };
-
- Edit EDT_URLDESCRIPTION
- {
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Pos = MAP_APPFONT ( 6 , 96 ) ;
- Size = MAP_APPFONT ( 202 , 12 ) ;
- };
- FixedText FT_DESCRIPTION
- {
- Pos = MAP_APPFONT ( 6 , 111 ) ;
- Size = MAP_APPFONT ( 202 , 8 ) ;
- Text [ en-US ] = "~Description" ;
- };
-
- MultiLineEdit EDT_DESCRIPTION
- {
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 122 ) ;
- Size = MAP_APPFONT ( 202 , 34 ) ;
- TabStop = TRUE ;
- IgnoreTab = TRUE;
- VScroll = TRUE;
- };
-
- FixedLine FL_URL
- {
- Pos = MAP_APPFONT ( 0 , 160 ) ;
- Size = MAP_APPFONT ( 214 , 4 ) ;
- };
-
- // Buttons
- HelpButton BTN_HELP1
- {
- Pos = MAP_APPFONT ( 6, 168 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
-
- OKButton BTN_OK1
- {
- TabStop = TRUE ;
- DefButton = TRUE ;
- Pos = MAP_APPFONT ( 107 , 168 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- CancelButton BTN_CANCEL1
- {
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 160 , 168 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
-};
+/******************************************************************************/
String STR_IMAPDLG_SAVE
{
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index b805287785..364087b6e4 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -35,7 +35,6 @@
#include <vcl/help.hxx>
#include <sfx2/sfxsids.hrc> // SID_ATTR_MACROITEM
#define _ANIMATION
-#include <sfx2/macropg.hxx>
#include <svtools/imaprect.hxx>
#include <svtools/imapcirc.hxx>
#include <svtools/imappoly.hxx>
@@ -56,6 +55,7 @@
#include <svtools/urihelper.hxx>
#include <svx/xfillit.hxx>
#include <svx/xlineit.hxx>
+#include <sfx2/evntconf.hxx>
#include <sot/formats.hxx>
@@ -71,46 +71,6 @@ using ::com::sun::star::uno::Reference;
/*************************************************************************
|*
-|* URLDlg
-|*
-\************************************************************************/
-/* move to cui //CHINA001
-URLDlg::URLDlg( Window* pWindow, const String& rURL,
- const String& rDescription, const String& rTarget,
- const String& rName, TargetList& rTargetList ) :
-
- ModalDialog ( pWindow, SVX_RES( RID_SVXDLG_IMAPURL ) ),
-
- aFlURL ( this, ResId( FL_URL ) ),
- aBtnOk ( this, ResId( BTN_OK ) ),
- aBtnCancel ( this, ResId( BTN_CANCEL1 ) ),
- aFtURL1 ( this, ResId( FT_URL1 ) ),
- aEdtURL ( this, ResId( EDT_URL ) ),
- aFtURLDescription ( this, ResId( FT_URLDESCRIPTION ) ),
- aEdtURLDescription ( this, ResId( EDT_URLDESCRIPTION ) ),
- aFtTarget ( this, ResId( FT_TARGET ) ),
- aCbbTargets ( this, ResId( CBB_TARGETS ) ),
- aFtName ( this, ResId( FT_NAME ) ),
- aEdtName ( this, ResId( EDT_NAME ) )
-
-{
- FreeResource();
-
- aEdtURL.SetText( rURL );
- aEdtURLDescription.SetText( rDescription );
- aEdtName.SetText( rName );
-
- for( String* pStr = rTargetList.First(); pStr; pStr = rTargetList.Next() )
- aCbbTargets.InsertEntry( *pStr );
-
- if( !rTarget.Len() )
- aCbbTargets.SetText( String::CreateFromAscii( "_self" ) );
- else
- aCbbTargets.SetText( rTarget );
-}
-*/
-/*************************************************************************
-|*
|*
|*
\************************************************************************/
@@ -859,29 +819,29 @@ void IMapWindow::DoMacroAssign()
if ( pSdrObj )
{
- SfxItemSet aSet( *pIMapPool, SID_ATTR_MACROITEM, SID_ATTR_MACROITEM );
+ SfxItemSet aSet( *pIMapPool, SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG );
+
+ SfxEventNamesItem aNamesItem(SID_EVENTCONFIG);
+ aNamesItem.AddEvent( String::CreateFromAscii( "MouseOver" ), String(), SFX_EVENT_MOUSEOVER_OBJECT );
+ aNamesItem.AddEvent( String::CreateFromAscii( "MouseOut" ), String(), SFX_EVENT_MOUSEOUT_OBJECT );
+
SvxMacroItem aMacroItem(SID_ATTR_MACROITEM);
IMapObject* pIMapObj = GetIMapObj( pSdrObj );
-
aMacroItem.SetMacroTable( pIMapObj->GetMacroTable() );
aSet.Put( aMacroItem, SID_ATTR_MACROITEM );
- SfxMacroAssignDlg aMacroDlg( this, mxDocumentFrame, aSet );
- SfxMacroTabPage* pMacroTabPage = (SfxMacroTabPage*) aMacroDlg.GetTabPage();
+ SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+ SfxAbstractDialog* pMacroDlg = pFact->CreateSfxDialog( this, aSet, mxDocumentFrame, SID_EVENTCONFIG );
- if ( pMacroTabPage )
+ if ( pMacroDlg && pMacroDlg->Execute() == RET_OK )
{
- pMacroTabPage->AddEvent( String::CreateFromAscii( "MouseOver" ), SFX_EVENT_MOUSEOVER_OBJECT );
- pMacroTabPage->AddEvent( String::CreateFromAscii( "MouseOut" ), SFX_EVENT_MOUSEOUT_OBJECT );
-
- if ( aMacroDlg.Execute() == RET_OK )
- {
- const SfxItemSet* pOutSet = aMacroDlg.GetOutputItemSet();
- pIMapObj->SetMacroTable( ((const SvxMacroItem& )pOutSet->Get( SID_ATTR_MACROITEM )).GetMacroTable() );
- pModel->SetChanged( sal_True );
- UpdateInfo( FALSE );
- }
+ const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
+ pIMapObj->SetMacroTable( ((const SvxMacroItem& )pOutSet->Get( SID_ATTR_MACROITEM )).GetMacroTable() );
+ pModel->SetChanged( sal_True );
+ UpdateInfo( FALSE );
}
+
+ delete pMacroDlg;
}
}
@@ -902,7 +862,7 @@ void IMapWindow::DoPropertyDialog()
if(pFact)
{
AbstractURLDlg* aDlg = pFact->CreateURLDialog( this, pIMapObj->GetURL(), pIMapObj->GetAltText(), pIMapObj->GetDesc(),
- pIMapObj->GetTarget(), pIMapObj->GetName(), aTargetList, RID_SVXDLG_IMAPURL );
+ pIMapObj->GetTarget(), pIMapObj->GetName(), aTargetList );
DBG_ASSERT(aDlg, "Dialogdiet fail!");
if ( aDlg->Execute() == RET_OK )
{
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index 8731702211..04865246a9 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
@@ -31,7 +31,6 @@
PRJ=..$/..
PRJNAME=svx
TARGET=dialogs
-LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
@@ -39,447 +38,121 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/util$/makefile.pmk
+#
+.IF "$(GUI)"=="WNT"
+CFLAGS+= -DUNICODE -D_UNICODE
+.ENDIF
+
# --- Files --------------------------------------------------------
SRS1NAME=dialogs
SRC1FILES = \
- svuidlg.src \
- autocdlg.src \
- connect.src \
+ bmpmask.src \
contdlg.src \
ctredlin.src \
- measure.src \
- dstribut.src \
- passwd.src \
- align.src \
- backgrnd.src \
- bbdlg.src \
- bmpmask.src \
- border.src \
- chardlg.src \
- charmap.src \
+ dlgctrl.src \
+ docrecovery.src \
fontwork.src \
+ frmdirlbox.src \
frmsel.src \
- grfpage.src \
hdft.src \
hyperdlg.src \
- hyprlink.src \
- hlmarkwn.src\
hyphen.src \
- iconcdlg.src \
+ hyprlink.src \
imapdlg.src \
impgrf.src \
+ langbox.src \
language.src \
lingu.src \
- numfmt.src \
- numpages.src \
- page.src \
- paragrph.src \
- postdlg.src \
+ passwd.src \
prtqry.src \
- ruler.src \
rubydialog.src\
- SpellDialog.src \
- swframeposstrings.src \
- swpossizetabpage.src \
- scriptdlg.src \
- selector.src \
+ ruler.src \
srchdlg.src \
- srchxtra.src \
- tabstpge.src \
- textanim.src \
- textattr.src \
+ swframeposstrings.src \
thesdlg.src \
txenctab.src \
- zoom.src \
- dlgctrl.src \
- grfflt.src \
- langbox.src \
- frmdirlbox.src \
- hangulhanjadlg.src \
- commonlingui.src \
- fontsubs.src \
- readonlyimage.src \
- opthtml.src \
- optgdlg.src \
- optmemory.src \
- treeopt.src \
- optfltr.src \
- connpooloptions.src \
- dbregister.src \
- doclinkdialog.src \
- internationaloptions.src \
- macropg.src \
- eventdlg.src \
- cfg.src \
- optjava.src \
- optupdt.src \
- splitcelldlg.src\
- sdrcelldlg.src \
- docrecovery.src \
- securityoptions.src \
- webconninfo.src \
- newtabledlg.src
+ ucsubset.src
SRS2NAME=drawdlgs
SRC2FILES = \
- dlgname.src \
sdstring.src \
- tabarea.src \
- tabline.src \
- labdlg.src \
- transfrm.src
-
-.IF "$(GUI)"=="UNX"
-SLOFILES=\
- $(SLO)$/sendreportunx.obj
-.ELSE
-.IF "$(GUI)"=="WNT"
-SLOFILES=\
- $(SLO)$/sendreportw32.obj
-NOOPTFILES=\
- $(SLO)$/sendreportw32.obj
-.ELSE
-SLOFILES=\
- $(SLO)$/sendreportgen.obj
-.ENDIF
-.ENDIF
-SLOFILES+=\
- $(SLO)$/SpellDialogChildWindow.obj \
- $(SLO)$/thesdlg.obj \
- $(SLO)$/rubydialog.obj \
- $(SLO)$/hyphen.obj \
- $(SLO)$/opengrf.obj \
- $(SLO)$/internationaloptions.obj \
- $(SLO)$/optHeaderTabListbox.obj \
+SLOFILES= \
$(SLO)$/charmap.obj \
- $(SLO)$/connpooloptions.obj \
- $(SLO)$/dbregistersettings.obj \
- $(SLO)$/fontsubs.obj \
- $(SLO)$/_bmpmask.obj \
- $(SLO)$/optmemory.obj \
- $(SLO)$/opthtml.obj \
- $(SLO)$/optfltr.obj \
- $(SLO)$/autocdlg.obj \
- $(SLO)$/cuiexp.obj \
- $(SLO)$/dlgfact.obj \
- $(SLO)$/svxdlg.obj \
- $(SLO)$/_contdlg.obj \
- $(SLO)$/iconcdlg.obj \
- $(SLO)$/connect.obj \
+ $(SLO)$/checklbx.obj \
$(SLO)$/connctrl.obj \
$(SLO)$/contwnd.obj \
- $(SLO)$/fontlb.obj \
- $(SLO)$/graphctl.obj \
- $(SLO)$/hyperdlg.obj \
- $(SLO)$/hyprlink.obj \
- $(SLO)$/hlinettp.obj \
- $(SLO)$/hlmailtp.obj \
- $(SLO)$/hldoctp.obj \
- $(SLO)$/imapdlg.obj \
- $(SLO)$/imapwnd.obj \
- $(SLO)$/measure.obj \
- $(SLO)$/dstribut.obj \
- $(SLO)$/measctrl.obj \
- $(SLO)$/passwd.obj \
- $(SLO)$/strarray.obj \
- $(SLO)$/align.obj \
- $(SLO)$/backgrnd.obj \
- $(SLO)$/bbdlg.obj \
- $(SLO)$/border.obj \
- $(SLO)$/borderconn.obj \
- $(SLO)$/chardlg.obj \
- $(SLO)$/checklbx.obj \
- $(SLO)$/dialcontrol.obj \
$(SLO)$/ctredlin.obj \
- $(SLO)$/dlgctrl.obj \
+ $(SLO)$/databaseregistrationui.obj \
+ $(SLO)$/dialcontrol.obj \
+ $(SLO)$/dialmgr.obj\
$(SLO)$/dlgctl3d.obj \
- $(SLO)$/dlgname.obj \
+ $(SLO)$/dlgctrl.obj \
$(SLO)$/dlgutil.obj \
+ $(SLO)$/docrecovery.obj \
$(SLO)$/fntctrl.obj \
+ $(SLO)$/fontlb.obj \
$(SLO)$/fontwork.obj \
- $(SLO)$/grfpage.obj \
- $(SLO)$/hdft.obj \
- $(SLO)$/impgrf.obj \
- $(SLO)$/labdlg.obj \
- $(SLO)$/langbox.obj \
- $(SLO)$/wrapfield.obj \
- $(SLO)$/numfmt.obj \
- $(SLO)$/page.obj \
- $(SLO)$/pagectrl.obj \
- $(SLO)$/paragrph.obj \
- $(SLO)$/paraprev.obj \
- $(SLO)$/pfiledlg.obj \
- $(SLO)$/postdlg.obj \
- $(SLO)$/prtqry.obj \
- $(SLO)$/relfld.obj \
- $(SLO)$/rlrcitem.obj \
- $(SLO)$/rulritem.obj \
- $(SLO)$/simptabl.obj \
- $(SLO)$/srchxtra.obj \
- $(SLO)$/srchctrl.obj \
- $(SLO)$/srchdlg.obj \
- $(SLO)$/stddlg.obj \
- $(SLO)$/svxbox.obj \
- $(SLO)$/svxruler.obj \
- $(SLO)$/swpossizetabpage.obj \
- $(SLO)$/tabarea.obj \
- $(SLO)$/tabline.obj \
- $(SLO)$/tabstpge.obj \
- $(SLO)$/textattr.obj \
- $(SLO)$/textanim.obj \
- $(SLO)$/tparea.obj \
- $(SLO)$/tpbitmap.obj \
- $(SLO)$/tpcolor.obj \
- $(SLO)$/tpgradnt.obj \
- $(SLO)$/tphatch.obj \
- $(SLO)$/tpline.obj \
- $(SLO)$/tplneend.obj \
- $(SLO)$/tplnedef.obj \
- $(SLO)$/tpshadow.obj \
- $(SLO)$/transfrm.obj \
- $(SLO)$/orienthelper.obj \
- $(SLO)$/txenctab.obj \
- $(SLO)$/txencbox.obj \
- $(SLO)$/zoom.obj \
- $(SLO)$/grfflt.obj \
- $(SLO)$/frmdirlbox.obj \
- $(SLO)$/commonlingui.obj \
- $(SLO)$/dialmgr.obj \
- $(SLO)$/cuiimapwnd.obj \
- $(SLO)$/cuisrchdlg.obj \
- $(SLO)$/cuitbxform.obj \
- $(SLO)$/cuicharmap.obj \
- $(SLO)$/cuihyperdlg.obj \
- $(SLO)$/cuifmsearch.obj \
- $(SLO)$/cuigrfflt.obj \
- $(SLO)$/multipat.obj \
- $(SLO)$/optcolor.obj \
- $(SLO)$/optjsearch.obj \
- $(SLO)$/optgenrl.obj \
- $(SLO)$/optctl.obj \
- $(SLO)$/svxgrahicitem.obj \
- $(SLO)$/SpellAttrib.obj \
- $(SLO)$/SpellDialog.obj \
- $(SLO)$/swframeposstrings.obj \
- $(SLO)$/swframeexample.obj \
- $(SLO)$/svxbmpnumvalueset.obj \
- $(SLO)$/svxgrahicitem.obj \
- $(SLO)$/frmsel.obj \
- $(SLO)$/framelink.obj \
+ $(SLO)$/framelink.obj\
$(SLO)$/framelinkarray.obj \
- $(SLO)$/databaseregistrationui.obj \
- $(SLO)$/radiobtnbox.obj \
- $(SLO)$/cfgchart.obj \
- $(SLO)$/optupdt.obj \
- $(SLO)$/optchart.obj \
- $(SLO)$/optinet2.obj \
- $(SLO)$/securityoptions.obj \
- $(SLO)$/webconninfo.obj \
- $(SLO)$/optgdlg.obj \
- $(SLO)$/optdict.obj \
- $(SLO)$/optaccessibility.obj \
- $(SLO)$/optsave.obj \
- $(SLO)$/optasian.obj \
- $(SLO)$/optpath.obj \
- $(SLO)$/optjava.obj \
- $(SLO)$/optimprove.obj \
- $(SLO)$/optimprove2.obj
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES= \
- $(SLO)$/fontsubs.obj \
- $(SLO)$/svxdlg.obj \
- $(SLO)$/charmap.obj \
- $(SLO)$/_bmpmask.obj \
+ $(SLO)$/frmdirlbox.obj \
$(SLO)$/frmsel.obj \
- $(SLO)$/opengrf.obj \
- $(SLO)$/hyphen.obj \
- $(SLO)$/rubydialog.obj \
- $(SLO)$/thesdlg.obj \
- $(SLO)$/splwrap.obj \
- $(SLO)$/hangulhanja.obj \
- $(SLO)$/_contdlg.obj \
- $(SLO)$/connctrl.obj \
- $(SLO)$/contwnd.obj \
- $(SLO)$/fontlb.obj \
$(SLO)$/graphctl.obj \
+ $(SLO)$/grfflt.obj \
+ $(SLO)$/hangulhanja.obj \
+ $(SLO)$/hdft.obj \
$(SLO)$/hyperdlg.obj \
+ $(SLO)$/hyphen.obj \
$(SLO)$/hyprlink.obj \
$(SLO)$/imapdlg.obj \
$(SLO)$/imapwnd.obj \
- $(SLO)$/measctrl.obj \
- $(SLO)$/passwd.obj \
- $(SLO)$/strarray.obj \
- $(SLO)$/borderconn.obj \
- $(SLO)$/checklbx.obj \
- $(SLO)$/dialcontrol.obj \
- $(SLO)$/ctredlin.obj \
- $(SLO)$/dlgctrl.obj \
- $(SLO)$/dlgctl3d.obj \
- $(SLO)$/dlgutil.obj \
- $(SLO)$/docrecovery.obj \
- $(SLO)$/fntctrl.obj \
- $(SLO)$/fontwork.obj \
- $(SLO)$/hdft.obj \
$(SLO)$/impgrf.obj \
$(SLO)$/langbox.obj \
- $(SLO)$/wrapfield.obj \
+ $(SLO)$/measctrl.obj \