From c2191ab9e0ce7be031b59f97ca84370e21fd132d Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 8 Apr 2010 11:58:20 +0200 Subject: [PATCH 1/3] slidecopy: add SID_TASKPANE support to Calc, Writer/Web, Writer/Global, Math, Writer/Form, Writer/Report, XMLForm --- sc/source/ui/view/tabvwsh.cxx | 1 + sc/uiconfig/scalc/menubar/menubar.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index 4c73d14d51be..fa9856e66020 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -72,6 +72,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) SFX_CHILDWINDOW_REGISTRATION(FID_INPUTLINE_STATUS); SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId()); SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR); + SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE); SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScSolverDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScOptSolverDlgWrapper::GetChildWindowId()); diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index ab3f121809fa..27406a350617 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -122,7 +122,8 @@ - + + From 7830fbba62711a547f6e21dfc616e67086214fbb Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 16 Apr 2010 15:14:15 +0200 Subject: [PATCH 2/3] slidecopy: now using SID_TASK_PANE in all applications, also in Impress. Implies registering the respective child window in the apps, not in SFX. Also implies getting rid of SID_RIGHT_PANE in Impress. Also, renamed SID_TASK_PANE in Impress to SID_SHOW_TOOL_PANEL, which better fits its purpose, and avoids confusion with SID_TASKPANE. --- sc/source/ui/app/scdll.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 11e33a8892e8..1d4d610b679f 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -40,6 +40,7 @@ #include #include +#include #include #include #include @@ -263,6 +264,9 @@ void ScDLL::Init() //Media Controller ::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod ); + // common SFX controller + ::sfx2::TaskPaneWrapper::RegisterChildWindow( FALSE, pMod ); + // Svx-StatusBar-Controller SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod); SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod); From bd2e9bfe7f5b4beb227e09f8a1f1d0e49c34bf1f Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 22 Apr 2010 16:16:37 +0200 Subject: [PATCH 3/3] slidecopy: removed accelerator/*/default.xml - they're not used for a long time now ... (accelerator config is now in Accelerators.xcu in officecfg. No need to confuse people with those dead files) --- chart2/prj/d.lst | 3 - sc/prj/d.lst | 9 -- sc/uiconfig/scalc/accelerator/de/default.xml | 101 ----------------- .../scalc/accelerator/en-GB/default.xml | 101 ----------------- .../scalc/accelerator/en-US/default.xml | 102 ------------------ sc/uiconfig/scalc/accelerator/es/default.xml | 101 ----------------- sc/uiconfig/scalc/accelerator/fr/default.xml | 101 ----------------- 7 files changed, 518 deletions(-) delete mode 100644 sc/uiconfig/scalc/accelerator/de/default.xml delete mode 100644 sc/uiconfig/scalc/accelerator/en-GB/default.xml delete mode 100644 sc/uiconfig/scalc/accelerator/en-US/default.xml delete mode 100644 sc/uiconfig/scalc/accelerator/es/default.xml delete mode 100644 sc/uiconfig/scalc/accelerator/fr/default.xml diff --git a/chart2/prj/d.lst b/chart2/prj/d.lst index 3acff468e141..440e2efbe8c5 100644 --- a/chart2/prj/d.lst +++ b/chart2/prj/d.lst @@ -4,8 +4,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\menubar mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\accelerator\en-US mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\statusbar ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid @@ -20,7 +18,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\statusbar ..\uiconfig\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\menubar\*.xml ..\uiconfig\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\toolbar\*.xml -..\uiconfig\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\accelerator\en-US\*.xml ..\uiconfig\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\statusbar\*.xml mkdir: %_DEST%\inc%_EXT%\chart2 diff --git a/sc/prj/d.lst b/sc/prj/d.lst index b1e0dfde7a3d..6f4e95203bed 100644 --- a/sc/prj/d.lst +++ b/sc/prj/d.lst @@ -4,11 +4,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc\menubar mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator\de -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator\es -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator\fr mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc\statusbar ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid @@ -34,10 +29,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\scalc\statusbar ..\uiconfig\scalc\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\scalc\menubar\*.xml ..\uiconfig\scalc\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\scalc\toolbar\*.xml -..\uiconfig\scalc\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator\en-US\*.xml -..\uiconfig\scalc\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator\de\*.xml -..\uiconfig\scalc\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator\es\*.xml -..\uiconfig\scalc\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\scalc\accelerator\fr\*.xml ..\uiconfig\scalc\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\scalc\statusbar\*.xml ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* diff --git a/sc/uiconfig/scalc/accelerator/de/default.xml b/sc/uiconfig/scalc/accelerator/de/default.xml deleted file mode 100644 index d14c7294b071..000000000000 --- a/sc/uiconfig/scalc/accelerator/de/default.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/uiconfig/scalc/accelerator/en-GB/default.xml b/sc/uiconfig/scalc/accelerator/en-GB/default.xml deleted file mode 100644 index c08df67839d8..000000000000 --- a/sc/uiconfig/scalc/accelerator/en-GB/default.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/uiconfig/scalc/accelerator/en-US/default.xml b/sc/uiconfig/scalc/accelerator/en-US/default.xml deleted file mode 100644 index 1c4dbbd6877e..000000000000 --- a/sc/uiconfig/scalc/accelerator/en-US/default.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/uiconfig/scalc/accelerator/es/default.xml b/sc/uiconfig/scalc/accelerator/es/default.xml deleted file mode 100644 index 359be420a6d1..000000000000 --- a/sc/uiconfig/scalc/accelerator/es/default.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/uiconfig/scalc/accelerator/fr/default.xml b/sc/uiconfig/scalc/accelerator/fr/default.xml deleted file mode 100644 index 58b35dd80243..000000000000 --- a/sc/uiconfig/scalc/accelerator/fr/default.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -