diff options
| author | mmeof <manik10044@iiitd.ac.in> | 2013-05-03 09:20:28 -0700 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-05-09 15:42:19 +0000 |
| commit | 39da7ee77e5c5add8aaef12bf1e80c66132782fa (patch) | |
| tree | 8bcf3d06e3d6ff3ec6f4dc49cb74306e48770d99 /sdext/source/presenter/PresenterScreen.hxx | |
| parent | abb720f4238e1df2c30c88eb1ed8fc9d803fa8eb (diff) | |
fdo#56995 Created global option to disable presenter console in Impress
Changes made are as Follows
/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
To add the new global checkbox to Libreoffice Impress>General>Start
A new xml block for EnablePresenterScreen was added
<prop oor:name="EnablePresenterScreen" oor:type="xs:boolean" >
/sd/source/ui/app/optsitem.cxx
To add the setter/getter for the new checkbox button, namely:
SetEnablePresenterScreen
IsEnablePresenterScreen
EnablePresenterScreen added to index number 26 of:
GetPropNameArray()
/sd/source/ui/dlg/tpoption.cxx
SdTpOptionsMisc() editted to attach EnablePresenterScreen to CBX_ENABLE_PRESENTER_SCREEN
aCbxEnablePresenterScreen ( this, SdResId( CBX_ENABLE_PRESENTER_SCREEN))
Also Added to FillItemSet() and Reset() functions
/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src
enableSdRemote size changed to
Size = MAP_APPFONT ( 116 , 10 ) ;
Pos = MAP_APPFONT ( 12 , 171 ) ;
158 was correct but 171 was added on request
To allow enableSdRemote(CBX_ENABLE_SDREMOTE) and enablePresenterScreen( CBX_ENABLE_PRESENTER_SCREEN) to be drawn adjacent.
enablePresenterScreen checkbox CBX_ENABLE_PRESENTER_SCREEN added
/sd/source/ui/inc/optsitem.hxx
Set default value for enablePresenterScreen as 1 or TRUE
sal_Bool bEnablePresenterScreen : 1;
Added getter/setter named same as above for interface definition
sd/source/ui/inc/tpoption.hrc
Defined CBX_ENABLE_PRESENTER_SCREEN as 42nd checkbox
#define CBX_ENABLE_PRESENTER_SCREEN 42
/sd/source/ui/inc/tpoption.hxx
Added interface declaration of aCbxEnablePresenterScreen which was attached to CBX_ENABLE_PRESENTER_SCREEN
/sdext/source/presenter/PresenterScreen.hxx
Added interface declaration of
bool isPresenterScreenEnabled()
to PresenterScreen class to allow presenterscreen to get if the option is checked
/sdext/source/presenter/PresenterScreen.cxx
Added definition of
isPresenterScreenEnabled(const css::uno::Reference<css::uno::XComponentContext>& rxContext)
Input : Current Process Context
Output : The 0/1 value of EnablePresenterScreen from presenterconfig
In PresenterScreenListener::notifyEvent( )
Added
if(mpPresenterScreen->isPresenterScreenEnabled(mxComponentContext)
mpPresenterScreen->InitializePresenterScreen()
To initialize PresenterScreen only when enabled
Change-Id: If8242e607323df57d8e78d08cf2129d03c0c9e4f
Reviewed-on: https://gerrit.libreoffice.org/3762
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sdext/source/presenter/PresenterScreen.hxx')
| -rw-r--r-- | sdext/source/presenter/PresenterScreen.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 1647f84b99d7..c97447db4315 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -109,6 +109,8 @@ public: virtual void SAL_CALL disposing (void); + bool isPresenterScreenEnabled( + const css::uno::Reference<css::uno::XComponentContext>& rxContext); /** Make the presenter screen visible. */ void InitializePresenterScreen (void); |