Kaydet (Commit) 9ed124ca authored tarafından Noel Grandin's avatar Noel Grandin

convert sc/source/ui/inc/r*.hxx from String to OUString

Change-Id: I5456c0b79cf7b9c4e548911c21004ab29eb00ff3
üst 50977e5a
......@@ -29,7 +29,7 @@ static const ColorData aColNames[SC_RANGECOLORS] =
//==================================================================
ScRangeFindList::ScRangeFindList(const String& rName) :
ScRangeFindList::ScRangeFindList(const OUString& rName) :
aDocName( rName ),
bHidden( false )
{
......
......@@ -98,11 +98,11 @@ private:
ScrollBar maScrollBar;
String maTextNotProtected;
String maTextNotPassProtected;
String maTextHashBad;
String maTextHashGood;
String maTextHashRegen;
OUString maTextNotProtected;
OUString maTextNotPassProtected;
OUString maTextHashBad;
OUString maTextHashGood;
OUString maTextHashRegen;
DECL_LINK( OKHdl, void* );
DECL_LINK( RetypeBtnHdl, PushButton* );
......@@ -131,7 +131,7 @@ public:
virtual short Execute();
bool IsRemovePassword() const;
String GetNewPassword() const;
OUString GetNewPassword() const;
private:
ScRetypePassInputDlg(); // disabled
......
......@@ -40,11 +40,11 @@ struct ScRangeFindData
class ScRangeFindList
{
std::vector<ScRangeFindData> maEntries;
String aDocName;
OUString aDocName;
bool bHidden;
public:
ScRangeFindList(const String& rName);
ScRangeFindList(const OUString& rName);
sal_uLong Count() const { return maEntries.size(); }
void Insert( const ScRangeFindData &rNew ) { maEntries.push_back(rNew); }
......@@ -53,7 +53,7 @@ public:
void SetHidden( sal_Bool bSet ) { bHidden = bSet; }
const String& GetDocName() const { return aDocName; }
const OUString& GetDocName() const { return aDocName; }
bool IsHidden() const { return bHidden; }
static ColorData GetColorName( size_t nIndex );
......
......@@ -429,7 +429,7 @@ bool ScRetypePassInputDlg::IsRemovePassword() const
return maBtnRemovePassword.IsChecked();
}
String ScRetypePassInputDlg::GetNewPassword() const
OUString ScRetypePassInputDlg::GetNewPassword() const
{
return maPassword1Edit.GetText();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment