summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-30 17:01:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-02 13:18:57 +0200
commit34f7e618ddd3399d9e7f3998e25545256255d02d (patch)
treefd946f8f2ab8386db89f531d49fae1718a21e943 /sc/source
parentc881756fcfdc1fa63ff534bf4538d551b2139515 (diff)
untranslated strings are just strings
removes starmaths InsertCommand in favour of InsertCommandText Change-Id: I5659adcaa28e5b5861d1a1cc5d2afa84009490f6 Reviewed-on: https://gerrit.libreoffice.org/37113 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/ui/Accessibility/AccessibleCellBase.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx7
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx5
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewTable.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessibleTableBase.cxx3
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx3
-rw-r--r--sc/source/ui/dbgui/scuiimoptdlg.cxx7
-rw-r--r--sc/source/ui/src/scstring.src69
11 files changed, 27 insertions, 82 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index ef31889dbb29..27440b9dee71 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -27,6 +27,7 @@
#include "formulacell.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include "unonames.hxx"
#include "detfunc.hxx"
#include "chgtrack.hxx"
@@ -206,7 +207,7 @@ sal_Int32
OUString SAL_CALL
ScAccessibleCellBase::createAccessibleDescription()
{
- OUString sDescription = OUString(ScResId(STR_ACC_CELL_DESCR));
+ OUString sDescription = STR_ACC_CELL_DESCR;
return sDescription;
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index a7f379e87eed..45130ebed1c4 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -31,6 +31,7 @@
#include "userdat.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include "table.hxx"
#include "markdata.hxx"
@@ -2110,7 +2111,7 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA
OUString SAL_CALL
ScAccessibleDocument::createAccessibleDescription()
{
- OUString sDescription = OUString(ScResId(STR_ACC_DOC_DESCR));
+ OUString sDescription = STR_ACC_DOC_DESCR;
return sDescription;
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 65a702fc4902..ec81ed09dd42 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -29,6 +29,7 @@
#include "editsrc.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include "DrawModelBroadcaster.hxx"
#include "docsh.hxx"
#include "drawview.hxx"
@@ -1522,7 +1523,7 @@ uno::Sequence<sal_Int8> SAL_CALL
OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription()
{
- OUString sDescription = OUString(ScResId(STR_ACC_PREVIEWDOC_DESCR));
+ OUString sDescription = STR_ACC_PREVIEWDOC_DESCR;
return sDescription;
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 9eee1276c5ac..7bc640910bdf 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -29,6 +29,7 @@
#include "attrib.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -297,7 +298,7 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceName
OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription()
{
- OUString sDesc(SC_RESSTR(mbHeader ? STR_ACC_HEADER_DESCR : STR_ACC_FOOTER_DESCR));
+ OUString sDesc(mbHeader ? OUString(STR_ACC_HEADER_DESCR) : OUString(STR_ACC_FOOTER_DESCR));
return sDesc.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN));
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index cbfdc5a57f09..5f05a33da2cb 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -28,6 +28,7 @@
#include "prevloc.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -207,13 +208,13 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription()
switch (meAdjust)
{
case SvxAdjust::Left :
- sDesc = OUString(ScResId(STR_ACC_LEFTAREA_DESCR));
+ sDesc = STR_ACC_LEFTAREA_DESCR;
break;
case SvxAdjust::Right:
- sDesc = OUString(ScResId(STR_ACC_RIGHTAREA_DESCR));
+ sDesc = STR_ACC_RIGHTAREA_DESCR;
break;
case SvxAdjust::Center:
- sDesc = OUString(ScResId(STR_ACC_CENTERAREA_DESCR));
+ sDesc = STR_ACC_CENTERAREA_DESCR;
break;
default:
OSL_FAIL("wrong adjustment found");
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index e8f7a4e3e592..872593d6bb36 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -32,6 +32,7 @@
#include "prevloc.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -347,13 +348,13 @@ tools::Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const
OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription()
{
- OUString sDescription = OUString(ScResId(STR_ACC_HEADERCELL_DESCR));
+ OUString sDescription = STR_ACC_HEADERCELL_DESCR;
return sDescription;
}
OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName()
{
- OUString sName = OUString(ScResId(STR_ACC_HEADERCELL_NAME));
+ OUString sName = STR_ACC_HEADERCELL_NAME;
if ( mbColumnHeader )
{
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 19ea2bd621ee..e4b47a759da7 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -29,6 +29,7 @@
#include "document.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -579,7 +580,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId()
OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription()
{
- OUString sDesc(ScResId(STR_ACC_TABLE_DESCR));
+ OUString sDesc(STR_ACC_TABLE_DESCR);
return sDesc;
}
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index f63da3f62efb..e83a421e542c 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -22,6 +22,7 @@
#include "document.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include "table.hxx"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -342,7 +343,7 @@ uno::Reference< XAccessible > SAL_CALL
OUString SAL_CALL
ScAccessibleTableBase::createAccessibleDescription()
{
- OUString sDesc(ScResId(STR_ACC_TABLE_DESCR));
+ OUString sDesc(STR_ACC_TABLE_DESCR);
return sDesc;
}
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index feeed32efb77..a90af8136fb0 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -32,6 +32,7 @@
#include "impex.hxx"
#include "scuiasciiopt.hxx"
#include "asciiopt.hrc"
+#include "strings.hxx"
#include "csvtablebox.hxx"
#include <comphelper/string.hxx>
#include <osl/thread.h>
@@ -249,7 +250,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa
aCharSetUser( ScResId( SCSTR_CHARSET_USER ) ),
aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
- aTextSepList( ScResId( SCSTR_TEXTSEP ) ),
+ aTextSepList(SCSTR_TEXTSEP),
mcTextSep ( ScAsciiOptions::cDefaultTextSep ),
meCall(eCall)
{
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 0f9079e728f1..dbd9132c6a59 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -23,6 +23,7 @@
#include "tabvwsh.hxx"
#include "scresid.hxx"
#include "scres.hrc"
+#include "strings.hxx"
#include <comphelper/string.hxx>
#include <officecfg/Office/Calc.hxx>
#include <osl/thread.h>
@@ -133,13 +134,13 @@ ScImportOptionsDlg::ScImportOptionsDlg(
get(m_pCbFixed, "fixedwidth");
get(m_pBtnOk, "ok");
- OUString sFieldSep(SC_RESSTR(SCSTR_FIELDSEP));
+ OUString sFieldSep(SCSTR_FIELDSEP);
sFieldSep = sFieldSep.replaceFirst( "%TAB", SC_RESSTR(SCSTR_FIELDSEP_TAB) );
sFieldSep = sFieldSep.replaceFirst( "%SPACE", SC_RESSTR(SCSTR_FIELDSEP_SPACE) );
// not possible in the Ctor initializer (MSC cannot do that):
- pFieldSepTab = new ScDelimiterTable( sFieldSep );
- pTextSepTab = new ScDelimiterTable( OUString(ScResId(SCSTR_TEXTSEP)) );
+ pFieldSepTab = new ScDelimiterTable(sFieldSep);
+ pTextSepTab = new ScDelimiterTable(SCSTR_TEXTSEP);
OUString aStr = pFieldSepTab->FirstDel();
sal_Unicode nCode;
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 57c9f2cccdcd..c853dd7732a4 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -217,11 +217,6 @@ String SCSTR_COLUMN_USER
Text [ en-US ] = "Standard;Text;Date (DMY);Date (MDY);Date (YMD);US English;Hide" ;
};
-String SCSTR_FIELDSEP
-{
- Text = ",\t44\t;\t59\t:\t58\t{%TAB}\t9\t{%SPACE}\t32 " ;
-};
-
String SCSTR_FIELDSEP_TAB
{
Text [ en-US ] = "Tab" ;
@@ -232,11 +227,6 @@ String SCSTR_FIELDSEP_SPACE
Text [ en-US ] = "space" ;
};
-String SCSTR_TEXTSEP
-{
- Text = "\"\t34\t'\t39" ;
-};
-
String SCSTR_FORMULA_AUTOCORRECTION
{
Text [ en-US ] = "%PRODUCTNAME Calc found an error in the formula entered.\nDo you want to accept the correction proposed below?\n\n" ;
@@ -294,59 +284,24 @@ String STR_ACC_DOC_NAME
Text [ en-US ] = "Document view";
};
-String STR_ACC_DOC_DESCR
-{
- Text = "";
-};
-
String STR_ACC_TABLE_NAME
{
Text [ en-US ] = "Sheet %1";
};
-String STR_ACC_TABLE_DESCR
-{
- Text = "";
-};
-
String STR_ACC_CELL_NAME
{
Text [ en-US ] = "Cell %1";
};
-String STR_ACC_CELL_DESCR
-{
- Text = "";
-};
-
-String STR_ACC_PREVIEWDOC_NAME
-{
- Text [ en-US ] = "Page preview";
-};
-
-String STR_ACC_PREVIEWDOC_DESCR
-{
- Text = "";
-};
-
-String STR_ACC_HEADERCELL_NAME
-{
- Text = "";
-};
-
-String STR_ACC_HEADERCELL_DESCR
-{
- Text = "";
-};
-
String STR_ACC_LEFTAREA_NAME
{
Text [ en-US ] = "Left area";
};
-String STR_ACC_LEFTAREA_DESCR
+String STR_ACC_PREVIEWDOC_NAME
{
- Text = "";
+ Text [ en-US ] = "Page preview";
};
String STR_ACC_CENTERAREA_NAME
@@ -354,41 +309,21 @@ String STR_ACC_CENTERAREA_NAME
Text [ en-US ] = "Center area";
};
-String STR_ACC_CENTERAREA_DESCR
-{
- Text = "";
-};
-
String STR_ACC_RIGHTAREA_NAME
{
Text [ en-US ] = "Right area";
};
-String STR_ACC_RIGHTAREA_DESCR
-{
- Text = "";
-};
-
String STR_ACC_HEADER_NAME
{
Text [ en-US ] = "Header of page %1";
};
-String STR_ACC_HEADER_DESCR
-{
- Text = "";
-};
-
String STR_ACC_FOOTER_NAME
{
Text [ en-US ] = "Footer of page %1";
};
-String STR_ACC_FOOTER_DESCR
-{
- Text = "";
-};
-
String STR_ACC_EDITLINE_NAME
{
Text [ en-US ] = "Input line";