[Libreoffice-commits] core.git: cui/source

Maxim Monastirsky momonasmon at gmail.com
Sun Dec 13 01:09:35 PST 2015


 cui/source/customize/cfg.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 9e820dc8e6e8ebc65e3afad813755422bef33c63
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Dec 13 11:07:45 2015 +0200

    Get rid of this env. variable
    
    Change-Id: I70222eaef9ab77f74bd7e200a3c4e849dcc4542f

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 4d50289..2b1cd622 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -815,10 +815,7 @@ SvxConfigDialog::SvxConfigDialog(vcl::Window * pParent, const SfxItemSet* pInSet
     InitImageType();
 
     m_nMenusPageId = AddTabPage("menus", CreateSvxMenuConfigPage, nullptr);
-    if ( getenv("LO_USE_NEWCONTEXTMENU") )
-        m_nContextMenusPageId = AddTabPage("contextmenus", CreateSvxContextMenuConfigPage, nullptr);
-    else
-        RemoveTabPage("contextmenus");
+    m_nContextMenusPageId = AddTabPage("contextmenus", CreateSvxContextMenuConfigPage, nullptr);
     m_nKeyboardPageId = AddTabPage("keyboard", CreateKeyboardConfigPage, nullptr);
     m_nToolbarsPageId = AddTabPage("toolbars", CreateSvxToolbarConfigPage, nullptr);
     m_nEventsPageId = AddTabPage("events", CreateSvxEventConfigPage, nullptr);


More information about the Libreoffice-commits mailing list