Kaydet (Commit) eb759974 authored tarafından Stefan Ring's avatar Stefan Ring Kaydeden (comit) Caolán McNamara

Remove germanisms in variables: sw/source/filter/ww1

Change-Id: Ieb61128a6497fc8f980b315a949ce74b2dc4adce
Reviewed-on: https://gerrit.libreoffice.org/8324Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst d722353b
...@@ -521,7 +521,7 @@ extern void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich, ...@@ -521,7 +521,7 @@ extern void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 nDepth) void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 nDepth)
{ {
OUString sType; // the type as string OUString sType; // the type as string
OUString sFormel; OUString sFormula;
OUString sFormat; OUString sFormat;
OUString sDTFormat; // date/time format OUString sDTFormat; // date/time format
W1_FLD* pData = GetData(); // data bound to plc W1_FLD* pData = GetData(); // data bound to plc
...@@ -547,7 +547,7 @@ void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 nDepth) ...@@ -547,7 +547,7 @@ void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 nDepth)
sType = aStr; sType = aStr;
aStr = ""; aStr = "";
} }
sFormel += aStr; sFormula += aStr;
sal_uInt8 rbType = pData->fltGet(); sal_uInt8 rbType = pData->fltGet();
do { do {
// Read the formula part until the entire field ends or // Read the formula part until the entire field ends or
...@@ -560,27 +560,27 @@ void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 nDepth) ...@@ -560,27 +560,27 @@ void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 nDepth)
Out(rOut, rMan, nDepth+1); Out(rOut, rMan, nDepth+1);
rMan.Fill(c); rMan.Fill(c);
OSL_ENSURE(c==21, "Ww1PlainText"); OSL_ENSURE(c==21, "Ww1PlainText");
sFormel += "Ww" + OUString::number(nPlcIndex); sFormula += "Ww" + OUString::number(nPlcIndex);
c = rMan.Fill(aStr, GetLength()); c = rMan.Fill(aStr, GetLength());
OSL_ENSURE(Ww1PlainText::IsChar(c), "Ww1PlainText"); OSL_ENSURE(Ww1PlainText::IsChar(c), "Ww1PlainText");
sFormel += aStr; sFormula += aStr;
} }
} }
while (pData->chGet()==19); while (pData->chGet()==19);
// get format out of text // get format out of text
pos = sFormel.indexOf("\\*"); pos = sFormula.indexOf("\\*");
if (pos != -1) if (pos != -1)
{ {
sFormat = sFormel.copy(pos); sFormat = sFormula.copy(pos);
sFormel = sFormel.copy(0, pos); sFormula = sFormula.copy(0, pos);
} }
pos = sFormel.indexOf( "\\@" ); pos = sFormula.indexOf( "\\@" );
if (pos != -1) if (pos != -1)
{ {
sDTFormat = sFormel.copy(pos); sDTFormat = sFormula.copy(pos);
sFormel = sFormel.copy(0, pos); sFormula = sFormula.copy(0, pos);
} }
// The formula part is done, does a result part follow? // The formula part is done, does a result part follow?
...@@ -607,10 +607,10 @@ oncemore: ...@@ -607,10 +607,10 @@ oncemore:
switch (rbType) switch (rbType)
{ {
case 3: // bookmark reference case 3: // bookmark reference
sFormel = rOut.ConvertUStr(sFormel); sFormula = rOut.ConvertUStr(sFormula);
pField = new SwGetRefField( (SwGetRefFieldType*) pField = new SwGetRefField( (SwGetRefFieldType*)
rOut.GetSysFldType( RES_GETREFFLD ), rOut.GetSysFldType( RES_GETREFFLD ),
sFormel, sFormula,
REF_BOOKMARK, REF_BOOKMARK,
0, 0,
REF_CONTENT ); REF_CONTENT );
...@@ -816,7 +816,7 @@ oncemore: ...@@ -816,7 +816,7 @@ oncemore:
(SwGetExpFieldType*)rOut.GetSysFldType(RES_GETEXPFLD); (SwGetExpFieldType*)rOut.GetSysFldType(RES_GETEXPFLD);
OSL_ENSURE(pFieldType!=0, "Ww1Fields"); OSL_ENSURE(pFieldType!=0, "Ww1Fields");
if (pFieldType != 0) if (pFieldType != 0)
pField = new SwGetExpField(pFieldType, sFormel, pField = new SwGetExpField(pFieldType, sFormula,
nsSwGetSetExpType::GSE_STRING, VVF_SYS); nsSwGetSetExpType::GSE_STRING, VVF_SYS);
} }
else // recursion: else // recursion:
...@@ -829,7 +829,7 @@ oncemore: ...@@ -829,7 +829,7 @@ oncemore:
SwSetExpFieldType aS(&rOut.GetDoc(), aName, nsSwGetSetExpType::GSE_FORMULA); SwSetExpFieldType aS(&rOut.GetDoc(), aName, nsSwGetSetExpType::GSE_FORMULA);
pFT = rOut.GetDoc().InsertFldType(aS); pFT = rOut.GetDoc().InsertFldType(aS);
} }
SwSetExpField aFld((SwSetExpFieldType*)pFT, sFormel); SwSetExpField aFld((SwSetExpFieldType*)pFT, sFormula);
aFld.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE); aFld.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE);
rOut << aFld; rOut << aFld;
} }
...@@ -869,7 +869,7 @@ oncemore: ...@@ -869,7 +869,7 @@ oncemore:
case 37: // page ref case 37: // page ref
pField = new SwGetRefField( pField = new SwGetRefField(
(SwGetRefFieldType*)rOut.GetSysFldType(RES_GETREFFLD), (SwGetRefFieldType*)rOut.GetSysFldType(RES_GETREFFLD),
sFormel, 0, 0, REF_PAGE); sFormula, 0, 0, REF_PAGE);
break; break;
case 38: // ask command case 38: // ask command
{ {
...@@ -898,7 +898,7 @@ oncemore: ...@@ -898,7 +898,7 @@ oncemore:
case 39: // filling command case 39: // filling command
pField = new SwInputField( pField = new SwInputField(
static_cast<SwInputFieldType*>(rOut.GetSysFldType( RES_INPUTFLD )), static_cast<SwInputFieldType*>(rOut.GetSysFldType( RES_INPUTFLD )),
OUString(), sFormel, OUString(), sFormula,
INP_TXT, 0, false ); INP_TXT, 0, false );
break; break;
case 51: // macro button case 51: // macro button
...@@ -926,24 +926,24 @@ oncemore: ...@@ -926,24 +926,24 @@ oncemore:
break; break;
case 55: // read tiff / or better: import anything case 55: // read tiff / or better: import anything
{ {
const sal_Unicode* pFormel = sFormel.getStr(); const sal_Unicode* pFormula = sFormula.getStr();
const sal_Unicode* pDot = 0; const sal_Unicode* pDot = 0;
OUString sName; OUString sName;
while (*pFormel != '\0' && *pFormel != ' ') while (*pFormula != '\0' && *pFormula != ' ')
{ {
// from here on an extension could appear // from here on an extension could appear
if (*pFormel == '.') if (*pFormula == '.')
pDot = pFormel; pDot = pFormula;
else else
// so far we were in directories // so far we were in directories
if (*pFormel == '\\') if (*pFormula == '\\')
{ {
pDot = 0; pDot = 0;
if (pFormel[1] == '\\') if (pFormula[1] == '\\')
pFormel++; pFormula++;
} }
if (*pFormel != '\0') if (*pFormula != '\0')
sName += OUString(*pFormel++); sName += OUString(*pFormula++);
} }
if( pDot ) if( pDot )
{ {
......
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