Kaydet (Commit) 75346b41 authored tarafından Gabor Kelemen's avatar Gabor Kelemen Kaydeden (comit) Samuel Mehrbrodt

Kill the AutoPilotPresentations UNO command

The presentation wizard was removed in
bb804059 but the
corresponding UNO command is still available.

Change-Id: I54e676672bb53d0283394a0ebffbe9f94f29d9c0
Reviewed-on: https://gerrit.libreoffice.org/30983Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 04f49d03
......@@ -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>
......
......@@ -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)
......
......@@ -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>
......
......@@ -32,12 +32,6 @@ interface StarImpress
StateMethod = GetState;
]
SID_SD_AUTOPILOT // ole : ?, status : ?
[
ExecMethod = Execute ;
StateMethod = GetState ;
]
SID_NEWSD // ole : ?, status : ?
[
ExecMethod = Execute ;
......
......@@ -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() );
......
......@@ -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;
......
......@@ -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 )
[
......
......@@ -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: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment