From 43b0a48596b5ad25dfdb2020a28580a41b7a05f0 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 23 Jun 2014 13:36:37 +0100
Subject: can't have bare english strings in .cxx

Change-Id: I1a14e37f3362c082bc460895ffd0b949c636b8ea
---
 sd/source/ui/dlg/dlgass.cxx | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

(limited to 'sd/source')

diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 1f919c1fe0c6..0837eb514017 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();
-- 
cgit