dbaccess/source/filter/xml/xmlEnums.hxx | 4 ++-- vcl/source/filter/sgvspln.cxx | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit d1d84fcaa750a70f423ee53c7f2a98e24914cb0e Author: Michael Stahl <[email protected]> Date: Tue Nov 4 16:28:00 2014 +0100 covertiy#705369: dbaccess: move XML_TOK_ENCODING to enum XMLDataSourceInfo Looks like Commit 94e8385d56098b6a51c539b5374dbf03151d2559 added this to the wrong enum. Change-Id: I46dd82313aaa659e84c719ba9215682becf8ec6c diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx index ce548ae..99beaf8 100644 --- a/dbaccess/source/filter/xml/xmlEnums.hxx +++ b/dbaccess/source/filter/xml/xmlEnums.hxx @@ -65,7 +65,6 @@ namespace dbaxml XML_TOK_DELIMITER, XML_TOK_DATA_SOURCE_SETTINGS, XML_TOK_FONT_CHARSET, - XML_TOK_ENCODING, XML_TOK_DATABASE_DESCRIPTION, XML_TOK_COMPOUND_DATABASE, XML_TOK_DB_HREF, @@ -105,7 +104,8 @@ namespace dbaxml XML_TOK_DATA_SOURCE_SETTING_VALUE, XML_TOK_DATA_SOURCE_SETTING_IS_LIST, XML_TOK_DATA_SOURCE_SETTING_TYPE, - XML_TOK_DATA_SOURCE_SETTING_NAME + XML_TOK_DATA_SOURCE_SETTING_NAME, + XML_TOK_ENCODING, }; enum XMLDocuments { commit 2a6d81ac4031b5331a38371c5f8b934d720b0153 Author: Michael Stahl <[email protected]> Date: Tue Nov 4 13:58:51 2014 +0100 translate "bEnde" variable Change-Id: Ic29b569df25f8966326101d5179506b24483cb43 diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index 2a710b5..94f2a82 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -693,7 +693,7 @@ bool Spline2Poly(Polygon& rSpln, bool Periodic, Polygon& rPoly) double Step; // stepsize for t double dt1,dt2,dt3; // delta t, y, ^3 double t; - bool bEnde; // partial polynom ended? + bool bEnd; // partial polynom ended? sal_uInt16 n; // number of partial polynoms to draw sal_uInt16 i; // actual partial polynom bool bOk; // all still ok? @@ -709,10 +709,10 @@ bool Spline2Poly(Polygon& rSpln, bool Periodic, Polygon& rPoly) i=0; while (i<n) { // draw n partial polynoms t=tv[i]+Step; - bEnde=false; - while (!bEnde) { // extrapolate one partial polynom - bEnde=t>=tv[i+1]; - if (bEnde) t=tv[i+1]; + bEnd=false; + while (!bEnd) { // extrapolate one partial polynom + bEnd=t>=tv[i+1]; + if (bEnd) t=tv[i+1]; dt1=t-tv[i]; dt2=dt1*dt1; dt3=dt2*dt1; x=long(ax[i]+bx[i]*dt1+cx[i]*dt2+dx[i]*dt3); y=long(ay[i]+by[i]*dt1+cy[i]*dt2+dy[i]*dt3); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
