[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig

[Caolán McNamara]

 sd/inc/helpids.h                           |   11 -----------
 sd/source/ui/dlg/dlgass.cxx                |   28 +++++++---------------------
 sd/uiconfig/simpress/ui/assistentdialog.ui |   18 +++++++++++++++++-
 3 files changed, 24 insertions(+), 33 deletions(-)

New commits:
commit 43b0a48596b5ad25dfdb2020a28580a41b7a05f0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 23 13:36:37 2014 +0100

    can't have bare english strings in .cxx
    
    Change-Id: I1a14e37f3362c082bc460895ffd0b949c636b8ea

diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 2641b1a..51421d0 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -24,12 +24,6 @@
 #define HID_SDGRAPHICVIEWSHELL                                  "SD_HID_SDGRAPHICVIEWSHELL"
 #define HID_SDOUTLINEVIEWSHELL                                  "SD_HID_SDOUTLINEVIEWSHELL"
 #define HID_SD_OPTIONS_SNAP                                     "SD_HID_SD_OPTIONS_SNAP"
-#define HID_SD_AUTOPILOT_PAGE1                                  "SD_HID_SD_AUTOPILOT_PAGE1"
-#define HID_SD_AUTOPILOT_PAGE2                                  "SD_HID_SD_AUTOPILOT_PAGE2"
-#define HID_SD_AUTOPILOT_PAGE3                                  "SD_HID_SD_AUTOPILOT_PAGE3"
-#define HID_SD_AUTOPILOT_PAGE4                                  "SD_HID_SD_AUTOPILOT_PAGE4"
-#define HID_SD_AUTOPILOT_PAGE5                                  "SD_HID_SD_AUTOPILOT_PAGE5"
-#define HID_SD_AUTOPILOT_PAGE6                                  "SD_HID_SD_AUTOPILOT_PAGE6"
 #define HID_SD_CBX_ONLYSELECTED                                 "SD_HID_SD_CBX_ONLYSELECTED"
 #define HID_SD_BTN_FILTERDIALOG                                 "SD_HID_SD_BTN_FILTERDIALOG"
 #define HID_SD_BTN_PAGE                                         "SD_HID_SD_BTN_PAGE"
@@ -87,11 +81,6 @@
 
 #define HID_FM_CTL_SELECTION                                    "SD_HID_FM_CTL_SELECTION"
 
-#define HID_SD_AUTOPILOT_REGION                                 "SD_HID_SD_AUTOPILOT_REGION"
-#define HID_SD_AUTOPILOT_TEMPLATES                              "SD_HID_SD_AUTOPILOT_TEMPLATES"
-#define HID_SD_AUTOPILOT_OPEN                                   "SD_HID_SD_AUTOPILOT_OPEN"
-#define HID_SD_AUTOPILOT_PAGETEMPLATES                          "SD_HID_SD_AUTOPILOT_PAGETEMPLATES"
-
 #define HID_SD_TABBAR_PAGES                                     "SD_HID_SD_TABBAR_PAGES"
 #define HID_SD_TABBAR_LAYERS                                    "SD_HID_SD_TABBAR_LAYERS"
 
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 1f919c1..0837eb5 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -77,17 +77,6 @@ using namespace ::sd;
 using ::std::vector;
 
 
-const char* PageHelpIds[] =
-{
-    HID_SD_AUTOPILOT_PAGE1,
-    HID_SD_AUTOPILOT_PAGE2,
-    HID_SD_AUTOPILOT_PAGE3,
-    HID_SD_AUTOPILOT_PAGE4,
-    HID_SD_AUTOPILOT_PAGE5
-};
-
-
-
 class PasswordEntry
 {
 public:
@@ -260,6 +249,9 @@ public:
     DECL_LINK( SelectEffectHdl, void* );
     DECL_LINK( OpenButtonHdl, Button * );
 
+    OUString            maCreateStr;
+    OUString            maOpenStr;
+
     // Common
     Assistent           maAssistentFunc;
     CheckBox*           mpPreviewFlag;
@@ -353,6 +345,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     assDlg->get(mpStartWithFlag, "startWithCheckbutton");
     assDlg->get(mpLastPageButton, "lastPageButton");
     assDlg->get(mpFinishButton, "finishButton");
+    maCreateStr = mpFinishButton->GetText();
+    maOpenStr = assDlg->get<PushButton>("open")->GetText();
     assDlg->get(mpPreview, "previewControl");
     assDlg->get(mpPage1235, "page1235Box");
     mpNextPageButton = new NextButton( pWindow );
@@ -894,9 +888,9 @@ void AssistentDlgImpl::SetStartType( StartType eType )
     mpPage1OpenPB->Show(eType == ST_OPEN);
 
     if (eType == ST_OPEN)
-        mpFinishButton->SetText("~Open");
+        mpFinishButton->SetText(maOpenStr);
     else
-        mpFinishButton->SetText("~Create");
+        mpFinishButton->SetText(maCreateStr);
 }
 
 StartType AssistentDlgImpl::GetStartType()
@@ -1036,13 +1030,6 @@ void AssistentDlgImpl::ChangePage()
     mpNextPageButton->Enable(!maAssistentFunc.IsLastPage());
     mpLastPageButton->Enable(!maAssistentFunc.IsFirstPage());
 
-    sal_uInt16 nPage = (sal_uInt16)maAssistentFunc.GetCurrentPage();
-
-    if( mpWindow )
-    {
-        mpWindow->SetHelpId( PageHelpIds[nPage-1]);
-    }
-
     UpdatePage();
 
     if( mpNextPageButton->IsEnabled() )
@@ -1819,7 +1806,6 @@ AssistentDlg::~AssistentDlg()
     delete mpImpl;
 }
 
-
 SfxObjectShellLock AssistentDlg::GetDocument()
 {
     return mpImpl->GetDocument();
diff --git a/sd/uiconfig/simpress/ui/assistentdialog.ui b/sd/uiconfig/simpress/ui/assistentdialog.ui
index 8ba229d..5c1dc0b 100644
--- a/sd/uiconfig/simpress/ui/assistentdialog.ui
+++ b/sd/uiconfig/simpress/ui/assistentdialog.ui
@@ -113,6 +113,22 @@
                 <property name="position">5</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="open">
+                <property name="label">gtk-open</property>
+                <property name="use_action_appearance">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="no_show_all">True</property>
+                <property name="use_underline">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">6</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -1227,6 +1243,7 @@
       <action-widget response="0">nextPage1Button</action-widget>
       <action-widget response="0">nextPage2Button</action-widget>
       <action-widget response="0">finishButton</action-widget>
+      <action-widget response="0">open</action-widget>
     </action-widgets>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
@@ -1249,5 +1266,4 @@
       <widget name="page4Frame"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup1"/>
 </interface>