summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-02-24 00:04:21 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-02-24 23:17:19 +0000
commit9c43037ccb281df6c0b143b850b1f48e22660e4a (patch)
treeb05d2ee07c7c76996e02f01ac1ce85de7aef9c68 /sc
parentffea6fc98fe7137cafd88bc191c850caa9717862 (diff)
suck alternative title out of the .ui
Change-Id: I3983a61c5716679d8d64247d29c4909b16fc2c69
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/helpids.h1
-rw-r--r--sc/source/ui/dbgui/asciiopt.hrc1
-rw-r--r--sc/source/ui/dbgui/csvtablebox.cxx1
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx3
-rw-r--r--sc/source/ui/inc/scuiasciiopt.hxx1
5 files changed, 2 insertions, 5 deletions
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 984dea82096f..93e73d44ddeb 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -134,7 +134,6 @@
#define HID_SC_DROPMODE_COPY "SC_HID_SC_DROPMODE_COPY"
#define HID_SC_FAP_STRUCT "SC_HID_SC_FAP_STRUCT"
-#define HID_SC_ASCII_TABCTR "SC_HID_SC_ASCII_TABCTR"
#define HID_SC_SCENARIO_DELETE "SC_HID_SC_SCENARIO_DELETE"
#define HID_SC_SCENARIO_EDIT "SC_HID_SC_SCENARIO_EDIT"
diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc
index 814ccb968692..085b50c29188 100644
--- a/sc/source/ui/dbgui/asciiopt.hrc
+++ b/sc/source/ui/dbgui/asciiopt.hrc
@@ -50,4 +50,3 @@
#define FT_TYPE 27
#define LB_TYPE1 28
#define CTR_TABLEBOX 29
-#define STR_TEXTTOCOLUMNS 30
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index 261ecd42b45e..94c822281b00 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -18,6 +18,7 @@
*/
#include "csvtablebox.hxx"
+#include <vcl/builder.hxx>
#include <vcl/lstbox.hxx>
// ause
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index c84229a0d713..3c3a53a98e9a 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -249,7 +249,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
aTextSepList( ScResId( SCSTR_TEXTSEP ) ),
mcTextSep ( ScAsciiOptions::cDefaultTextSep ),
- maStrTextToColumns( ScResId( STR_TEXTTOCOLUMNS ) ),
meCall(eCall)
{
get(pFtCharSet, "textcharset");
@@ -279,7 +278,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
switch (meCall)
{
case SC_TEXTTOCOLUMNS:
- SetText( maStrTextToColumns );
+ SetText( get<FixedText>("textalttitle")->GetText() );
break;
case SC_IMPORTFILE:
aName.AppendAscii(RTL_CONSTASCII_STRINGPARAM(" - ["));
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index 60db01388051..b017a56fb151 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -75,7 +75,6 @@ class ScImportAsciiDlg : public ModalDialog
String aTextSepList;
String maFieldSeparators; // selected field separators
sal_Unicode mcTextSep;
- String maStrTextToColumns;
CharSet meCharSet; /// Selected char set.
bool mbCharSetSystem; /// Is System char set selected?