drop unused resources and toggle label to activate replacement widget

Change-Id: I4a608c3b8163b9e171cd73dc7921d16e7dbfa3a1

7 files changed, 9 insertions, 160 deletions

diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index 7af5dc19a751..a62306574c69 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
     sfx2/source/dialog/filedlghelper.src \
     sfx2/source/dialog/inputdlg.src \
     sfx2/source/dialog/mailwindow.src \
-    sfx2/source/dialog/mgetempl.src \
     sfx2/source/dialog/newstyle.src \
     sfx2/source/dialog/recfloat.src \
     sfx2/source/dialog/srchdlg.src \
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 5df5ece1a799..06b0fe9c26c3 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -131,7 +131,7 @@
 #define RID_APPTITLE                        (RID_SFX_START+4)
 
 #define DLG_DOCINFO_EDT                     (RID_SFX_START+6)
-#define TP_MANAGE_STYLES                    (RID_SFX_START+7)
+
 #define DLG_STYLE_DESIGNER                  (RID_SFX_START+8)
 
 #define RID_SFX_INCORRECT_PASSWORD          (RID_SFX_START+216)
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 8477c0c99139..0d6755d970af 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -35,7 +35,6 @@
 
 #include <sfx2/sfx.hrc>
 #include "dialog.hrc"
-#include "mgetempl.hrc"
 
 #include <svl/style.hrc>
 
@@ -58,10 +57,13 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemS
     get(m_pAutoCB, "autoupdate");
     get(m_pFollowFt, "nextstyleft");
     get(m_pFollowLb, "nextstyle");
+    m_pFollowLb->SetStyle(m_pFollowLb->GetStyle() | WB_SORT);
     get(m_pBaseFt, "linkedwithft");
     get(m_pBaseLb, "linkedwith");
+    m_pBaseLb->SetStyle(m_pBaseLb->GetStyle() | WB_SORT);
     get(m_pFilterFt, "categoryft");
     get(m_pFilterLb, "category");
+    m_pFilterLb->SetStyle(m_pFilterLb->GetStyle() | WB_SORT);
     get(m_pDescFt, "desc");
 
     // this Page needs ExchangeSupport
@@ -109,8 +111,10 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemS
     if (!pStyle->IsUserDefined())
     {
         m_pNameRo->SetText(m_pNameRw->GetText());
-        m_pNameRo->Show();
         m_pNameRw->Hide();
+        m_pNameRo->Show();
+        FixedText *pLabel = get<FixedText>("nameft");
+        pLabel->set_mnemonic_widget(m_pNameRo);
     }
 
     if ( pStyle->HasFollowSupport() && pPool )
diff --git a/sfx2/source/dialog/mgetempl.hrc b/sfx2/source/dialog/mgetempl.hrc
deleted file mode 100644
index 1da5ee0cce32..000000000000
--- a/sfx2/source/dialog/mgetempl.hrc
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define ED_NAME 2
-#define MLE_NAME 13
-#define LB_NEXT 4
-#define FT_BASE 5
-#define LB_BASE 6
-#define LB_REGION 8
-#define FT_DESC 9
-#define GB_DESC 10
-#define FT_REGION 7
-#define FT_NEXT 3
-#define FT_NAME 1
-#define ED_DESC 11
-#define CB_AUTO 12
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
deleted file mode 100644
index 80199dd4cdb1..000000000000
--- a/sfx2/source/dialog/mgetempl.src
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/sfx.hrc>
-#include <sfx2/tabpage.hrc>
-#include "helpid.hrc"
-#include "mgetempl.hrc"
-
- // TP_MANAGE_STYLES ------------------------------------------------------
-TabPage TP_MANAGE_STYLES
-{
-    HelpId = HID_MANAGE_STYLES ;
-    Hide = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    FixedText FT_NAME
-    {
-        Pos = MAP_APPFONT ( 6 , 8 ) ;
-        Size = MAP_APPFONT ( 61 , 10 ) ;
-        Text [ en-US ] = "~Name" ;
-    };
-    Edit ED_NAME
-    {
-        HelpID = "sfx2:Edit:TP_MANAGE_STYLES:ED_NAME";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 6  ) ;
-        Size = MAP_APPFONT ( 184 , 12 ) ;
-    };
-    MultiLineEdit MLE_NAME
-    {
-        Pos = MAP_APPFONT ( 70 , 8  ) ;
-        Size = MAP_APPFONT ( 184 , 12 ) ;
-        Border = FALSE;
-        ReadOnly = TRUE;
-        Hide = TRUE;
-    };
-    CheckBox CB_AUTO
-    {
-        HelpID = "sfx2:CheckBox:TP_MANAGE_STYLES:CB_AUTO";
-        Pos = MAP_APPFONT ( 164 , 8 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "~AutoUpdate" ;
-    };
-    FixedText FT_NEXT
-    {
-        Pos = MAP_APPFONT ( 6 , 26 ) ;
-        Size = MAP_APPFONT ( 61 , 10 ) ;
-        Text [ en-US ] = "Ne~xt Style" ;
-    };
-    ListBox LB_NEXT
-    {
-        HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_NEXT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 24 ) ;
-        Size = MAP_APPFONT ( 184 , 65 ) ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    FixedText FT_BASE
-    {
-        Pos = MAP_APPFONT ( 6 , 44 ) ;
-        Size = MAP_APPFONT ( 61 , 10 ) ;
-        Text [ en-US ] = "Linked with" ;
-    };
-    ListBox LB_BASE
-    {
-        HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_BASE";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 42 ) ;
-        Size = MAP_APPFONT ( 184 , 65 ) ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    FixedText FT_REGION
-    {
-        Pos = MAP_APPFONT ( 6 , 62 ) ;
-        Size = MAP_APPFONT ( 61 , 10 ) ;
-        Text [ en-US ] = "~Category" ;
-    };
-    ListBox LB_REGION
-    {
-        HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_REGION";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 60 ) ;
-        Size = MAP_APPFONT ( 184 , 64 ) ;
-        DropDown = TRUE ;
-    };
-    FixedText FT_DESC
-    {
-        HelpID = "sfx2:MultiLineEdit:TP_MANAGE_STYLES:ED_DESC";
-        Pos = MAP_APPFONT ( 12 , 88  ) ;
-        Size = MAP_APPFONT ( 236 , 85 ) ;
-        WordBreak = TRUE ;
-        Hide = TRUE ;
-    };
-    FixedLine GB_DESC
-    {
-        Pos = MAP_APPFONT ( 6 , 77  ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Contains" ;
-    };
-};
- // ********************************************************************** EOF
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index dadb41f0a25d..5232dd8eaced 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -25,7 +25,6 @@
 
 #define HID_DOCINFO_EDT                                       "SFX2_HID_DOCINFO_EDT"
 #define HID_PRINTMONITOR                                      "SFX2_HID_PRINTMONITOR"
-#define HID_MANAGE_STYLES                                     "SFX2_HID_MANAGE_STYLES"
 #define HID_CONFIG_EVENT                                      "SFX2_HID_CONFIG_EVENT"
 #define HID_BROWSERCONTROL                                    "SFX2_HID_BROWSERCONTROL"
 #define HID_PRINT_OPTIONS                                     "SFX2_HID_PRINT_OPTIONS"
diff --git a/sfx2/uiconfig/ui/managestylepage.ui b/sfx2/uiconfig/ui/managestylepage.ui
index b166db6be83a..beeeed7c0067 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -31,12 +31,13 @@
                 <property name="column_spacing">12</property>
                 <property name="row_homogeneous">True</property>
                 <child>
-                  <object class="GtkLabel" id="label3">
+                  <object class="GtkLabel" id="nameft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Name</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">namerw</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>