summaryrefslogtreecommitdiff
path: root/sc/source/ui/optdlg
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/optdlg')
-rw-r--r--sc/source/ui/optdlg/calcoptionsdlg.cxx16
-rw-r--r--sc/source/ui/optdlg/calcoptionsdlg.hxx24
-rw-r--r--sc/source/ui/optdlg/tpdefaults.cxx1
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx5
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx2
5 files changed, 23 insertions, 25 deletions
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 250063cf2b5e..83b77e51f2a2 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -37,10 +37,10 @@ namespace {
class OptionString : public SvLBoxString
{
- rtl::OUString maDesc;
- rtl::OUString maValue;
+ OUString maDesc;
+ OUString maValue;
public:
- OptionString(const rtl::OUString& rDesc, const rtl::OUString& rValue) :
+ OptionString(const OUString& rDesc, const OUString& rValue) :
maDesc(rDesc), maValue(rValue) {}
virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
@@ -49,7 +49,7 @@ public:
void OptionString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
{
Point aPos = rPos;
- rtl::OUString aDesc = maDesc + rtl::OUString(": ");
+ OUString aDesc = maDesc + OUString(": ");
rDev.DrawText(aPos, aDesc);
aPos.X() += rDev.GetTextWidth(aDesc);
@@ -141,7 +141,7 @@ void ScCalcOptionsDialog::FillOptionsList()
{
// Syntax for INDIRECT function.
SvTreeListEntry* pEntry = new SvTreeListEntry;
- pEntry->AddItem(new SvLBoxString(pEntry, 0, rtl::OUString()));
+ pEntry->AddItem(new SvLBoxString(pEntry, 0, OUString()));
pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0));
OptionString* pItem = new OptionString(
maCaptionStringRefSyntax, toString(maConfig.meStringRefAddressSyntax));
@@ -152,7 +152,7 @@ void ScCalcOptionsDialog::FillOptionsList()
{
// Treat empty string as zero.
SvTreeListEntry* pEntry = new SvTreeListEntry;
- pEntry->AddItem(new SvLBoxString(pEntry, 0, rtl::OUString()));
+ pEntry->AddItem(new SvLBoxString(pEntry, 0, OUString()));
pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0));
OptionString* pItem = new OptionString(
maCaptionEmptyStringAsZero, toString(maConfig.mbEmptyStringAsZero));
@@ -281,7 +281,7 @@ void ScCalcOptionsDialog::RadioValueChanged()
}
}
-rtl::OUString ScCalcOptionsDialog::toString(formula::FormulaGrammar::AddressConvention eConv) const
+OUString ScCalcOptionsDialog::toString(formula::FormulaGrammar::AddressConvention eConv) const
{
switch (eConv)
{
@@ -298,7 +298,7 @@ rtl::OUString ScCalcOptionsDialog::toString(formula::FormulaGrammar::AddressConv
return maUseFormulaSyntax;
}
-rtl::OUString ScCalcOptionsDialog::toString(bool bVal) const
+OUString ScCalcOptionsDialog::toString(bool bVal) const
{
return bVal ? maTrue : maFalse;
}
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index a1a722200df2..39ddd600b1f5 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -53,8 +53,8 @@ private:
void ListOptionValueChanged();
void RadioValueChanged();
- rtl::OUString toString(formula::FormulaGrammar::AddressConvention eConv) const;
- rtl::OUString toString(bool bVal) const;
+ OUString toString(formula::FormulaGrammar::AddressConvention eConv) const;
+ OUString toString(bool bVal) const;
private:
SvxCheckListBox maLbSettings;
@@ -70,19 +70,19 @@ private:
OKButton maBtnOK;
CancelButton maBtnCancel;
- rtl::OUString maTrue;
- rtl::OUString maFalse;
+ OUString maTrue;
+ OUString maFalse;
- rtl::OUString maCalcA1;
- rtl::OUString maExcelA1;
- rtl::OUString maExcelR1C1;
+ OUString maCalcA1;
+ OUString maExcelA1;
+ OUString maExcelR1C1;
- rtl::OUString maCaptionStringRefSyntax;
- rtl::OUString maDescStringRefSyntax;
- rtl::OUString maUseFormulaSyntax;
+ OUString maCaptionStringRefSyntax;
+ OUString maDescStringRefSyntax;
+ OUString maUseFormulaSyntax;
- rtl::OUString maCaptionEmptyStringAsZero;
- rtl::OUString maDescEmptyStringAsZero;
+ OUString maCaptionEmptyStringAsZero;
+ OUString maDescEmptyStringAsZero;
ScCalcConfig maConfig;
};
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index 55963e2ffaff..7939ac2d71db 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -36,7 +36,6 @@
#include "defaultsoptions.hxx"
#include "document.hxx"
-using ::rtl::OUString;
ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet &rCoreSet) :
SfxTabPage(pParent, ScResId(RID_SCPAGE_DEFAULTS), rCoreSet),
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 37cd3d62d57b..4e30ebd7295d 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -37,7 +37,6 @@
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/i18n/LocaleDataItem.hpp>
-using ::rtl::OUString;
using ::com::sun::star::lang::Locale;
using ::com::sun::star::i18n::LocaleDataItem;
@@ -92,7 +91,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreA
maEdSepArrayRow.SetGetFocusHdl(aLink);
// Get the decimal separator for current locale.
- rtl::OUString aSep = ScGlobal::GetpLocaleData()->getNumDecimalSep();
+ OUString aSep = ScGlobal::GetpLocaleData()->getNumDecimalSep();
mnDecSep = aSep.isEmpty() ? sal_Unicode('.') : aSep[0];
}
@@ -102,7 +101,7 @@ ScTpFormulaOptions::~ScTpFormulaOptions()
void ScTpFormulaOptions::ResetSeparators()
{
- rtl::OUString aFuncArg, aArrayCol, aArrayRow;
+ OUString aFuncArg, aArrayCol, aArrayRow;
ScFormulaOptions::GetDefaultFormulaSeparators(aFuncArg, aArrayCol, aArrayRow);
maEdSepFuncArg.SetText(aFuncArg);
maEdSepArrayCol.SetText(aArrayCol);
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 5b4f7630ea5c..35675b5ad0e9 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -317,7 +317,7 @@ void ScTpUserLists::MakeListStr( String& rListStr )
for(xub_StrLen i=0;i<nToken;i++)
{
- rtl::OUString aString = comphelper::string::strip(rListStr.GetToken(i, LF), ' ');
+ OUString aString = comphelper::string::strip(rListStr.GetToken(i, LF), ' ');
aStr+=aString;
aStr+=cDelimiter;
}
generated by cgit (git 2.34.1) at 2024-08-08 00:36:26 +0000