[Libreoffice-commits] core.git: filter/source sc/source sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Thu Dec 21 10:26:58 UTC 2017
filter/source/msfilter/msdffimp.cxx | 2 +-
sc/source/core/tool/interpr3.cxx | 2 +-
sw/source/core/txtnode/thints.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 648c8001783603d708af9e9552a51d2334fc6c2e
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Wed Dec 20 17:37:03 2017 +0100
Fix typo
Change-Id: I15b44b42d31eaebd2a8cea29fdaa843c9bd21b73
Reviewed-on: https://gerrit.libreoffice.org/46857
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 5342110a30f2..ac7de6b6034f 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3364,7 +3364,7 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nConte
sal_uInt8 nUpper = (sal_uInt8)( nColorCode >> 24 );
// sj: below change from 0x1b to 0x19 was done because of i84812 (0x02 -> rgb color),
- // now I have some problems to fix i104685 (there the color value is 0x02000000 whichs requires
+ // now I have some problems to fix i104685 (there the color value is 0x02000000 which requires
// a 0x2 scheme color to be displayed properly), the color docu seems to be incomplete
if( nUpper & 0x19 ) // if( nUpper & 0x1f )
{
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 7c9753cae3b7..bf989bb94baa 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -154,7 +154,7 @@ static double lcl_IterateInverse( const ScDistFunc& rFunction, double fAx, doubl
{
fAx = fRx; fAy = fRy;
}
- // if last interation brought to small advance, then do bisection next
+ // if last iteration brought to small advance, then do bisection next
// time, for safety
bHasToInterpolate = bHasToInterpolate && (fabs(fRy) * 2.0 <= fabs(fQy));
++nCount;
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index e77276f1fc35..19ec94e892cf 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -296,7 +296,7 @@ into a hyperlink.
Unfortunately the UNO API for Hyperlink and Ruby consists of the properties
Hyperlink* and Ruby* of the css.text.CharacterProperties service. In other
-words, they are treated as formatting attributes, not as content entites.
+words, they are treated as formatting attributes, not as content entities.
Furthermore, for API users it is not possible to easily test whether a certain
range would be overlapping with other nested attributes, and most importantly,
<em>which ones</em>, so we can hardly refuse to insert these in cases of
More information about the Libreoffice-commits
mailing list