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

convert formula/source/ui/dlg/parawin.hxx from String to OUString

Change-Id: I301a1e7201f8ad21dfa18f749f0f92eae90c1c36
üst 85eb736b
......@@ -1165,25 +1165,24 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
{
if (nEd<nArgs)
{
sal_uInt16 i;
for(i=0;i<=nEd;i++)
for(sal_uInt16 i=0; i<=nEd; i++)
{
if ( m_aArguments[i].isEmpty() )
m_aArguments[i] = OUString(" ");
}
if(pParaWin->GetArgument(nEd).Len()!=0)
if(!pParaWin->GetArgument(nEd).isEmpty())
m_aArguments[nEd] = pParaWin->GetArgument(nEd);
sal_uInt16 nClearPos=nEd+1;
for(i=nEd+1;i<nArgs;i++)
for(sal_uInt16 i=nEd+1; i<nArgs; i++)
{
if(pParaWin->GetArgument(i).Len()!=0)
if( !pParaWin->GetArgument(i).isEmpty() )
{
nClearPos=i+1;
}
}
for(i=nClearPos;i<nArgs;i++)
for(sal_uInt16 i=nClearPos; i<nArgs; i++)
{
m_aArguments[i] = OUString();
}
......
......@@ -252,21 +252,21 @@ RefEdit* ParaWin::GetActiveEdit()
}
String ParaWin::GetArgument(sal_uInt16 no)
OUString ParaWin::GetArgument(sal_uInt16 no)
{
String aStr;
OUString aStr;
if(no<aParaArray.size())
{
aStr=aParaArray[no];
if(no==nActiveLine && aStr.Len()==0)
aStr+=' ';
if(no==nActiveLine && aStr.isEmpty())
aStr += " ";
}
return aStr;
}
String ParaWin::GetActiveArgName()
OUString ParaWin::GetActiveArgName()
{
String aStr;
OUString aStr;
if(nArgs>0 && nEdFocus!=NOT_FOUND)
{
aStr=aArgInput[nEdFocus].GetArgName();
......@@ -275,7 +275,7 @@ String ParaWin::GetActiveArgName()
}
void ParaWin::SetArgument(sal_uInt16 no, const String& aString)
void ParaWin::SetArgument(sal_uInt16 no, const OUString& aString)
{
if (no < aParaArray.size())
aParaArray[no] = comphelper::string::stripStart(aString, ' ');
......@@ -283,7 +283,7 @@ void ParaWin::SetArgument(sal_uInt16 no, const String& aString)
void ParaWin::DelParaArray()
{
::std::vector<String>().swap(aParaArray);
::std::vector<OUString>().swap(aParaArray);
}
void ParaWin::SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont)
......@@ -335,22 +335,22 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc)
}
void ParaWin::SetArgumentText(const String& aText)
void ParaWin::SetArgumentText(const OUString& aText)
{
aFtArgName.SetText(aText);
}
void ParaWin::SetArgumentDesc(const String& aText)
void ParaWin::SetArgumentDesc(const OUString& aText)
{
aFtArgDesc.SetText(aText);
}
void ParaWin::SetEditDesc(const String& aText)
void ParaWin::SetEditDesc(const OUString& aText)
{
aFtEditDesc.SetText(aText);
}
void ParaWin::SetArgName(sal_uInt16 no,const String& aText)
void ParaWin::SetArgName(sal_uInt16 no,const OUString& aText)
{
aArgInput[no].SetArgName(aText);
}
......@@ -360,7 +360,7 @@ void ParaWin::SetArgNameFont(sal_uInt16 no,const Font& aFont)
aArgInput[no].SetArgNameFont(aFont);
}
void ParaWin::SetArgVal(sal_uInt16 no,const String& aText)
void ParaWin::SetArgVal(sal_uInt16 no,const OUString& aText)
{
aArgInput[no].SetArgVal(aText);
}
......
......@@ -81,16 +81,16 @@ private:
RefButton aRefBtn4;
ScrollBar aSlider;
String m_sOptional;
String m_sRequired;
sal_Bool bRefMode;
OUString m_sOptional;
OUString m_sRequired;
sal_Bool bRefMode;
sal_uInt16 nEdFocus;
sal_uInt16 nActiveLine;
sal_uInt16 nEdFocus;
sal_uInt16 nActiveLine;
ArgInput aArgInput[4];
String aDefaultString;
::std::vector<String>
OUString aDefaultString;
::std::vector<OUString>
aParaArray;
DECL_LINK(ScrollHdl, void *);
......@@ -109,13 +109,13 @@ protected:
ArgEdit& rEdArg, RefButton& rRefBtn);
void DelParaArray();
void SetArgumentDesc(const String& aText);
void SetArgumentText(const String& aText);
void SetArgumentDesc(const OUString& aText);
void SetArgumentText(const OUString& aText);
void SetArgName (sal_uInt16 no,const String &aArg);
void SetArgName (sal_uInt16 no,const OUString &aArg);
void SetArgNameFont (sal_uInt16 no,const Font&);
void SetArgVal (sal_uInt16 no,const String &aArg);
void SetArgVal (sal_uInt16 no,const OUString &aArg);
void HideParaLine(sal_uInt16 no);
void ShowParaLine(sal_uInt16 no);
......@@ -128,7 +128,7 @@ public:
void SetFunctionDesc(const IFunctionDescription* pFDesc);
void SetArgumentOffset(sal_uInt16 nOffset);
void SetEditDesc(const String& aText);
void SetEditDesc(const OUString& aText);
void UpdateParas();
void ClearAll();
......@@ -138,10 +138,10 @@ public:
sal_uInt16 GetActiveLine();
void SetActiveLine(sal_uInt16 no);
RefEdit* GetActiveEdit();
String GetActiveArgName();
OUString GetActiveArgName();
String GetArgument(sal_uInt16 no);
void SetArgument(sal_uInt16 no, const String& aString);
OUString GetArgument(sal_uInt16 no);
void SetArgument(sal_uInt16 no, const OUString& aString);
void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont);
void SetEdFocus(sal_uInt16 nEditLine); //Sichtbare Editzeilen
......
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