diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-10 18:38:52 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-10 18:38:52 +0200 |
| commit | b67c26021c55f2086bae60a2d7adedf2c731d85d (patch) | |
| tree | 4647402b3f396f69f2e736e179c77023fc2a8a97 | |
| parent | 02bdaee3115c6f67afa625c8ee6a4c4b11873fc2 (diff) | |
| parent | 1bb058876f8aa32653750f7e14496106ea4d9c3e (diff) | |
CWS-TOOLING: integrate CWS dr73
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 2 | ||||
| -rwxr-xr-x | vcl/source/gdi/sallayout.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 5b7821aa457e..32c65b06d2f1 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -675,7 +675,7 @@ SvNumberformat::SvNumberformat(String& rString, xub_StrLen nAnzChars = ImpGetNumber(rString, nPos, sStr); if (nAnzChars > 0) { - short F_Type; + short F_Type = NUMBERFORMAT_UNDEFINED; if (!pISc->IsNumberFormat(sStr,F_Type,fNumber) || ( F_Type != NUMBERFORMAT_NUMBER && F_Type != NUMBERFORMAT_SCIENTIFIC) ) diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index bf462d1d8add..80ae3a3a8c7f 100755 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -1800,8 +1800,8 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) int nRunStart, nRunEnd; while (rArgs.GetNextRun(&nRunStart, &nRunEnd, &bRtl)) { - if (bRtl) std::fill(vRtl.begin() + nRunStart - rArgs.mnMinCharPos, - vRtl.begin() + nRunEnd - rArgs.mnMinCharPos, true); + if (bRtl) std::fill(vRtl.begin() + ( nRunStart - rArgs.mnMinCharPos ), + vRtl.begin() + ( nRunEnd - rArgs.mnMinCharPos ), true); } rArgs.ResetPos(); |