mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 58505 - Tweak F5 for slide display, and add Shift-F5

Browse Source 
Added menu entry to start the presentation from current slide.
Changed "Start Presentation" menu entry behavior so it starts
from the first slide.

Change-Id: Iebba85d2d1dcacad7da6b050e2152be5c0d47261
This commit is contained in:
Jakub Golebiewski
2013-04-09 23:45:52 +02:00
committed by Thorsten Behrens
parent f4ebb99de6
commit baffab9a4f
12 changed files with 147 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
View File

@@ -2233,6 +2233,11 @@
</prop>
</node>
<node oor:name="F5_SHIFT" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:PresentationThisSlide</value>
</prop>
</node>
<node oor:name="F5_SHIFT_MOD2" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:RestoreEditingView</value>
</prop>

8
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
View File

@@ -37,6 +37,14 @@
<value>1</value>
</prop>
</node>
<node oor:name=".uno:PresentationThisSlide" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Sl~ide Show From This Slide</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
<node oor:name=".uno:Remote" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Impress R~emote</value>

1
sd/inc/sdcommands.h
View File

@@ -94,6 +94,7 @@
#define CMD_SID_OUTLINE_TEXT_AUTOFIT ".uno.OutlineTextAutofit"
#define CMD_SID_PAGESETUP ".uno:PageSetup"
#define CMD_SID_PRESENTATION ".uno:Presentation"
#define CMD_SID_PRESENTATION_THIS_SLIDE ".uno:PresentationThisSlide"
#define CMD_SID_REMOTE_DLG ".uno:Remote"
#define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout"
#define CMD_SID_RENAMELAYER ".uno:RenameLayer"

5
sd/sdi/SlideSorterController.sdi
View File

@@ -136,6 +136,11 @@ interface SlideSorterView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
SID_PRESENTATION_THIS_SLIDE // ole : no, status : ?
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
SID_HIDE_SLIDE // ole : no, status : ?
[
ExecMethod = FuTemporary ;

25
sd/sdi/sdraw.sdi
View File

@@ -5195,6 +5195,31 @@ SfxVoidItem Presentation SID_PRESENTATION
GroupId = GID_VIEW;
]
//--------------------------------------------------------------------------
SfxVoidItem PresentationThisSlide SID_PRESENTATION_THIS_SLIDE
()
[
/* flags: */
AutoUpdate = FALSE,
Cachable = Cachable,
FastCall = FALSE,
HasCoreId = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Asynchron;
/* config: */
AccelConfig = TRUE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
//--------------------------------------------------------------------------
SfxVoidItem PresentationDialog SID_PRESENTATION_DLG
()

1
sd/source/ui/inc/DrawViewShell.hxx
View File

@@ -403,6 +403,7 @@ protected:
void GetMenuStateSel(SfxItemSet& rSet);
private:
void ShowSlideShow(SfxRequest& rReq);
/** This flag controls whether the layer mode is active, i.e. the layer
dialog is visible.
*/

1
sd/source/ui/inc/OutlineViewShell.hxx
View File

@@ -151,6 +151,7 @@ public:
bool UpdateOutlineObject( SdPage* pPage, Paragraph* pPara );
private:
void ShowSlideShow(SfxRequest& rReq);
OutlineView* pOlView;
SdPage* pLastPage; // Zur performanten Aufbereitung der Preview
TransferableClipboardListener* pClipEvtLstnr;

26
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
View File

@@ -19,6 +19,8 @@
#include <com/sun/star/presentation/XPresentation2.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <editeng/outlobj.hxx>
@@ -91,6 +93,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::beans;
namespace sd { namespace slidesorter { namespace controller {
@@ -138,6 +141,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
switch (rRequest.GetSlot())
{
case SID_PRESENTATION:
case SID_PRESENTATION_THIS_SLIDE:
case SID_REHEARSE_TIMINGS:
ShowSlideShow (rRequest);
pShell->Cancel();
@@ -882,10 +886,30 @@ void SlotManager::ShowSlideShow( SfxRequest& rReq)
if( xPresentation.is() )
{
if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) )
xPresentation->start();
{
if( (SID_PRESENTATION == rReq.GetSlot() ) )
{
Sequence< PropertyValue > aArguments(1);
PropertyValue aPage;
OUString sValue("0");
aPage.Name = "FirstPage";
aPage.Value <<= sValue;
aArguments[0] = aPage;
xPresentation->startWithArguments( aArguments );
}
else
{
xPresentation->start();
}
}
else
{
xPresentation->rehearseTimings();
}
}
}
void SlotManager::RenameSlide (void)

45
sd/source/ui/view/drviewse.cxx
View File

@@ -23,6 +23,8 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <comphelper/processfactory.hxx>
@@ -97,6 +99,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::beans;
namespace sd {
@@ -681,16 +684,10 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
break;
case SID_PRESENTATION:
case SID_PRESENTATION_THIS_SLIDE:
case SID_REHEARSE_TIMINGS:
{
Reference< XPresentation2 > xPresentation( GetDoc()->getPresentation() );
if( xPresentation.is() )
{
if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) )
xPresentation->start();
else
xPresentation->rehearseTimings();
}
ShowSlideShow(rReq);
rReq.Ignore ();
}
break;
@@ -1649,6 +1646,38 @@ void DrawViewShell::ShowUIControls (bool bVisible)
maTabControl.Show (bVisible);
}
void DrawViewShell::ShowSlideShow(SfxRequest& rReq)
{
Reference< XPresentation2 > xPresentation( GetDoc()->getPresentation() );
if( xPresentation.is() )
{
if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) )
{
if( (SID_PRESENTATION == rReq.GetSlot() ) )
{
Sequence< PropertyValue > aArguments(1);
PropertyValue aPage;
OUString sValue("0");
aPage.Name = "FirstPage";
aPage.Value <<= sValue;
aArguments[0] = aPage;
xPresentation->startWithArguments( aArguments );
}
else
{
xPresentation->start();
}
}
else
{
xPresentation->rehearseTimings();
}
}
}
void DrawViewShell::StopSlideShow (bool /*bCloseFrame*/)
{
Reference< XPresentation2 > xPresentation( GetDoc()->getPresentation() );

46
sd/source/ui/view/outlnvs2.cxx
View File

@@ -21,6 +21,8 @@
#include "OutlineViewShell.hxx"
#include <com/sun/star/presentation/XPresentation2.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Any.hxx>
#include "app.hrc"
#include <svx/hlnkitem.hxx>
@@ -64,6 +66,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::beans;
namespace sd {
@@ -229,18 +232,11 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
break;
case SID_PRESENTATION:
case SID_PRESENTATION_THIS_SLIDE:
case SID_REHEARSE_TIMINGS:
{
pOlView->PrepareClose();
Reference< XPresentation2 > xPresentation( GetDoc()->getPresentation() );
if( xPresentation.is() )
{
if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) )
xPresentation->start();
else
xPresentation->rehearseTimings();
}
ShowSlideShow(rReq);
Cancel();
rReq.Done();
}
@@ -335,6 +331,38 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
Invalidate(SID_PASTE);
}
void OutlineViewShell::ShowSlideShow(SfxRequest& rReq)
{
Reference< XPresentation2 > xPresentation( GetDoc()->getPresentation() );
if( xPresentation.is() )
{
if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) )
{
if( (SID_PRESENTATION == rReq.GetSlot() ) )
{
Sequence< PropertyValue > aArguments(1);
PropertyValue aPage;
OUString sValue("0");
aPage.Name = "FirstPage";
aPage.Value <<= sValue;
aArguments[0] = aPage;
xPresentation->startWithArguments( aArguments );
}
else
{
xPresentation->start();
}
}
else
{
xPresentation->rehearseTimings();
}
}
}
void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
{
OutlineViewModelChangeGuard aGuard( *pOlView );

1
sd/uiconfig/simpress/menubar/menubar.xml
View File

@@ -300,6 +300,7 @@
<menu:menu menu:id=".uno:SlideShowMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:Presentation"/>
<menu:menuitem menu:id=".uno:PresentationThisSlide"/>
<menu:menuitem menu:id=".uno:PresentationDialog"/>
<menu:menuitem menu:id=".uno:RehearseTimings"/>
<menu:menuitem menu:id=".uno:Remote"/>

1
svx/inc/svx/svxids.hrc
View File

@@ -351,6 +351,7 @@
#define SID_OUTLINE_COLLAPSE_ALL ( SID_SVX_START + 155 )
#define SID_OUTLINE_BULLET ( SID_SVX_START + 156 )
#define SID_PRESENTATION ( SID_SVX_START + 157 )
#define SID_PRESENTATION_THIS_SLIDE ( SID_SVX_START + 158 )
#define SID_REHEARSE_TIMINGS ( SID_SVX_START + 159 )
#define SID_HIDE_SLIDE ( SID_SVX_START + 161 )
#define SID_CHOOSE_POLYGON ( SID_SVX_START + 162 )