[Libreoffice-commits] core.git: configmgr/qa include/sfx2 officecfg/registry sd/sdi sd/source sfx2/sdi sfx2/source
Gabor Kelemen
kelemeng at ubuntu.com
Mon Nov 21 08:48:36 UTC 2016
configmgr/qa/unit/data.xcd | 5 --
include/sfx2/sfxsids.hrc | 1
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5 --
sd/sdi/app.sdi | 6 --
sd/source/ui/app/sdmod1.cxx | 25 ----------
sfx2/sdi/appslots.sdi | 5 --
sfx2/sdi/sfx.sdi | 18 -------
sfx2/source/appl/appserv.cxx | 3 -
8 files changed, 68 deletions(-)
New commits:
commit 75346b4144b47d16d28f4c944199e366e97363ad
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date: Sat Nov 19 19:44:10 2016 +0100
Kill the AutoPilotPresentations UNO command
The presentation wizard was removed in
bb8040595c9b6f0ccde39e6833f27a50abb891d8 but the
corresponding UNO command is still available.
Change-Id: I54e676672bb53d0283394a0ebffbe9f94f29d9c0
Reviewed-on: https://gerrit.libreoffice.org/30983
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index e3a3387..97da9e6 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -3737,11 +3737,6 @@
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">~AutoCorrect...</value>
</prop>
</node>
- <node oor:name=".uno:AutoPilotPresentations" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">AutoPilot: Presentation</value>
- </prop>
- </node>
<node oor:name=".uno:AutoPilotAgenda" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">AutoPilot: Agenda</value>
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 0685df6..aaa1988 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -555,7 +555,6 @@
#define SID_ZOOM_PREV (SID_SVX_START + 403)
#define SID_INET_DLG (SID_SVX_START + 416)
#define SID_AUTO_CORRECT_DLG (SID_SVX_START + 424)
-#define SID_SD_AUTOPILOT (SID_SVX_START + 425)
#define SID_ATTR_CHAR_COLOR_EXT (SID_SVX_START + 488)
#define SID_ATTR_CHAR_COLOR_BACKGROUND (SID_SVX_START + 489)
#define SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (SID_SVX_START + 490)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c4f28d8..dd01901 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4448,11 +4448,6 @@
<value xml:lang="en-US">~AutoCorrect Options...</value>
</prop>
</node>
- <node oor:name=".uno:AutoPilotPresentations" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">AutoPilot: Presentation</value>
- </prop>
- </node>
<node oor:name=".uno:AutoPilotAgenda" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">AutoPilot: Agenda</value>
diff --git a/sd/sdi/app.sdi b/sd/sdi/app.sdi
index b2f6e16..e616b6e 100644
--- a/sd/sdi/app.sdi
+++ b/sd/sdi/app.sdi
@@ -32,12 +32,6 @@ interface StarImpress
StateMethod = GetState;
]
- SID_SD_AUTOPILOT // ole : ?, status : ?
- [
- ExecMethod = Execute ;
- StateMethod = GetState ;
- ]
-
SID_NEWSD // ole : ?, status : ?
[
ExecMethod = Execute ;
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 0fb7a27..7dc6dad 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -193,7 +193,6 @@ void SdModule::Execute(SfxRequest& rReq)
}
break;
- case SID_SD_AUTOPILOT:
case SID_NEWSD:
{
SfxFrame* pFrame = ExecuteNewDocument( rReq );
@@ -314,30 +313,6 @@ bool SdModule::OutlineToImpress(SfxRequest& rRequest)
void SdModule::GetState(SfxItemSet& rItemSet)
{
- // disable Autopilot during presentation
- if (rItemSet.GetItemState(SID_SD_AUTOPILOT) != SfxItemState::UNKNOWN)
- {
- if (!SvtModuleOptions().IsImpress())
- {
- rItemSet.DisableItem(SID_SD_AUTOPILOT);
- }
- else
- {
- ::sd::DrawDocShell* pDocShell = dynamic_cast< ::sd::DrawDocShell *>( SfxObjectShell::Current() );
- if (pDocShell)
- {
- ::sd::ViewShell* pViewShell = pDocShell->GetViewShell();
- if (pViewShell)
- {
- if( sd::SlideShow::IsRunning( pViewShell->GetViewShellBase() ) )
- {
- rItemSet.DisableItem(SID_SD_AUTOPILOT);
- }
- }
- }
- }
- }
-
if( SfxItemState::DEFAULT == rItemSet.GetItemState( SID_ATTR_METRIC ) )
{
::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell *>( SfxObjectShell::Current() );
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index bd03c12..6da1955 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -283,11 +283,6 @@ shell SfxApplication
[
ExecMethod = OfaExec_Impl;
]
- SID_SD_AUTOPILOT // status(final|play)
- [
- ExecMethod = OfaExec_Impl;
- StateMethod = OfaState_Impl;
- ]
SID_NEWSD // status(final|play)
[
ExecMethod = OfaExec_Impl;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index dda5c78..0347532 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -5311,24 +5311,6 @@ SfxVoidItem NewXForms FN_XFORMS_INIT
]
-SfxVoidItem AutoPilotPresentations SID_SD_AUTOPILOT
-( SfxUnoFrameItem Frame SID_FILLFRAME, SfxBoolItem Hidden SID_HIDDEN )
-[
- AutoUpdate = FALSE,
- FastCall = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
-
- AccelConfig = FALSE,
- MenuConfig = TRUE,
- ToolBoxConfig = FALSE,
- GroupId = GID_APPLICATION;
-]
-
-
SfxVoidItem NewPresentation SID_NEWSD
( SfxUnoFrameItem Frame SID_FILLFRAME, SfxBoolItem Hidden SID_HIDDEN )
[
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index e804007..de9b8af 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1615,7 +1615,6 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
break;
}
- case SID_SD_AUTOPILOT :
case SID_NEWSD :
{
SvtModuleOptions aModuleOpt;
@@ -1694,8 +1693,6 @@ void SfxApplication::OfaState_Impl(SfxItemSet &rSet)
rSet.DisableItem( FN_XFORMS_INIT );
}
- if ( !aModuleOpt.IsImpress() )
- rSet.DisableItem( SID_SD_AUTOPILOT );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list