diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-02 00:51:15 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-02 00:55:57 +0300 |
| commit | e72558346dda04be6a0878d90e3155616c0a1e7d (patch) | |
| tree | f65f904bc44df898f4233f2825568147dc304207 /sfx2 | |
| parent | 532dee5f3d0e9836559d296c93182343dbaf3ab8 (diff) | |
Don't call SFX_OBJECTBAR_REGISTRATION in non-DESKTOP environments
Gets rid of the SFX_OBJECTBAR_FULLSCREEN, i.e. the thingie with just
the button to exit full screen mode. We don't want to exit full screen
mode on non-DESKTOP.
I also bypass the SFX_OBJECTBAR_REGISTRATION call that registers
SFX_OBJECTBAR_APPLICATION, whatever that is, but presumably something
we don't want either.
Change-Id: I8ef958976fcde3321a5651cf4372a313ceff2c60
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index c4cfce55e076..526c45aac83f 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -155,9 +155,10 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0)) { SFX_CHILDWINDOW_REGISTRATION( SID_BROWSER ); SFX_CHILDWINDOW_REGISTRATION( SID_RECORDING_FLOATWINDOW ); - +#if HAVE_FEATURE_DESKTOP SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_FULLSCREEN | SFX_VISIBILITY_FULLSCREEN, SfxResId(RID_FULLSCREENTOOLBOX) ); SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_STANDARD, SfxResId(RID_ENVTOOLBOX) ); +#endif } TYPEINIT2(SfxViewFrame,SfxShell,SfxListener); |