[Libreoffice-commits] core.git: vcl/source
Jens Carl
j.carl43 at gmx.de
Wed Apr 26 08:30:55 UTC 2017
vcl/source/filter/sgvtext.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 84a409981a3ad481841c812d66721f89da7aeac6
Author: Jens Carl <j.carl43 at gmx.de>
Date: Wed Apr 26 05:45:29 2017 +0000
tdf#39674: Rename Fehler to Error
Change-Id: Ib8288db4ddde159f274a0ca251230c7d721e0079
Reviewed-on: https://gerrit.libreoffice.org/36972
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 0366ae7728f5..14478398fd11 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -891,7 +891,7 @@ void TextType::Draw(OutputDevice& rOut)
sal_uInt16 FitXDiv;
sal_uInt16 FitYMul;
sal_uInt16 FitYDiv;
- bool Fehler;
+ bool Error;
UCHAR* Buf=Buffer; // pointer to the letters
pSgfFonts->ReadList();
@@ -931,8 +931,8 @@ void TextType::Draw(OutputDevice& rOut)
do {
T2=T1; Index2=Index1;
FormatLine(Buf,Index2,T,T2,xSize,xSAdj,xLine.get(),l,cLine.get(),LineFit);
- Fehler=(Index2==Index1);
- if (!Fehler) {
+ Error=(Index2==Index1);
+ if (!Error) {
lc=GetLineFeed(Buf,Index1,T,T1,l,LF,MaxGrad);
if (TextFit) {
if (LineFit) FitXDiv=xLine[lc+1];
@@ -974,8 +974,8 @@ void TextType::Draw(OutputDevice& rOut)
yPos=yPos0+LF;
T1=T2; Index1=Index2; // for next line
} // if ObjMin.y+yPos<=Obj_Max.y
- } // if !Fehler
- } while (c!=TextEnd && !Ende && !Fehler);
+ } // if !Error
+ } while (c!=TextEnd && !Ende && !Error);
}
// End of DrawText.Pas
More information about the Libreoffice-commits
mailing list