sfx2/source/appl/workwin.cxx | 18 +++++++++++++++--- sfx2/source/view/viewfrm.cxx | 3 ++- 2 files changed, 17 insertions(+), 4 deletions(-)
New commits: commit e72558346dda04be6a0878d90e3155616c0a1e7d Author: Tor Lillqvist <[email protected]> Date: Tue Apr 2 00:51:15 2013 +0300 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 diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index c4cfce5..526c45a 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); commit 532dee5f3d0e9836559d296c93182343dbaf3ab8 Author: Tor Lillqvist <[email protected]> Date: Tue Apr 2 00:45:34 2013 +0300 Add comment about the ugly hardcoded resource ids Change-Id: I54d04f97fe720d6a262a86b63126f328a7812018 diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 99da99d..cce1d39 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -65,9 +65,21 @@ struct ResIdToResName static const ResIdToResName pToolBarResToName[] = { - { 558, "fullscreenbar" }, - { 560, "standardbar", }, - { 18001, "formsnavigationbar" }, + // OMG! hardcoded numbers that have nice (?) symbolic names + // elsewhere. + { 558, "fullscreenbar" }, // This 558 for instance equals RID_FULLSCREENTOOLBOX (in + // value, and presumably also in semantics) from app.hrc in + // this very same directory, so why RID_FULLSCREENTOOLBOX + // can't be used I have no idea. + + { 560, "standardbar", }, // 560 is called RID_ENVTOOLBOX in app.hrc, still the same? + + { 18001, "formsnavigationbar" }, // Probably the rest are defined in .hrc files that are higher + // up in the dependency chain and/or later in the build order, + // and that is the (bad) reason why their symbolic names are + // not available? Would it really be so owful to move the .hrc + // files in question out from the modules where they now are? + { 18002, "formsfilterbar" }, { 18003, "formtextobjectbar" }, { 18004, "formcontrols" }, _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
