sw/source/filter/ww8/ww8graf.cxx | 12 ++++++------
sw/source/filter/ww8/ww8par.hxx | 2 +-
sw/source/filter/ww8/ww8struc.hxx | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit f150876698b5cea4857abcc5bd2e37fd4b038a17
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Fri Jan 10 23:15:01 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jan 18 12:32:57 2020 +0100
Fix typo in code
Change-Id: Ic464f818204af4d5e0d6d1a0b1c29cac620f6250
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86588
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index df78fd4f6a76..e4c84d297b8b 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -363,11 +363,11 @@ SdrObject* SwWW8ImplReader::ReadRect(WW8_DPHEAD const *
pHd, SfxAllItemSet &rSet
return pObj;
}
-SdrObject* SwWW8ImplReader::ReadElipse(WW8_DPHEAD const * pHd, SfxAllItemSet
&rSet)
+SdrObject* SwWW8ImplReader::ReadEllipse(WW8_DPHEAD const * pHd, SfxAllItemSet
&rSet)
{
- WW8_DP_ELIPSE aElipse;
+ WW8_DP_ELLIPSE aEllipse;
- if( !ReadGrafStart( static_cast<void*>(&aElipse), sizeof( aElipse ), pHd,
rSet ) )
+ if( !ReadGrafStart( static_cast<void*>(&aEllipse), sizeof( aEllipse ),
pHd, rSet ) )
return nullptr;
Point aP0( static_cast<sal_Int16>(SVBT16ToUInt16( pHd->xa )) +
m_nDrawXOfs2,
@@ -381,8 +381,8 @@ SdrObject* SwWW8ImplReader::ReadElipse(WW8_DPHEAD const *
pHd, SfxAllItemSet &rS
SdrCircKind::Full,
tools::Rectangle(aP0, aP1));
- SetStdAttr( rSet, aElipse.aLnt, aElipse.aShd );
- SetFill( rSet, aElipse.aFill );
+ SetStdAttr( rSet, aEllipse.aLnt, aEllipse.aShd );
+ SetFill( rSet, aEllipse.aFill );
return pObj;
}
@@ -1397,7 +1397,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive(short&
rLeft, SfxAllItemSet &rSet)
pRet = ReadRect(&aHd, rSet);
break;
case 4:
- pRet = ReadElipse(&aHd, rSet);
+ pRet = ReadEllipse(&aHd, rSet);
break;
case 5:
pRet = ReadArc(&aHd, rSet);
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 61e30e6618ed..4a0b06c553a6 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1581,7 +1581,7 @@ private:
SfxAllItemSet &rSet);
SdrObject *ReadLine(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
SdrObject *ReadRect(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
- SdrObject *ReadElipse(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
+ SdrObject *ReadEllipse(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
SdrObject *ReadArc(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
SdrObject *ReadPolyLine(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
void InsertTxbxStyAttrs( SfxItemSet& rS, sal_uInt16 nColl );
diff --git a/sw/source/filter/ww8/ww8struc.hxx
b/sw/source/filter/ww8/ww8struc.hxx
index 70b683ce3352..7e448e1c30d6 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -698,7 +698,7 @@ struct WW8_DPHEAD
{
SVBT16 dpk; // 0 Drawn Primitive Kind REVIEW davebu
// 0=start of grouping, 1=line, 2=textbox, 3=rectangle,
- // 4=arc, 5=elipse, 6=polyline, 7=callout textbox,
+ // 4=arc, 5=ellipse, 6=polyline, 7=callout textbox,
// 8=end of grouping, 9=sample primitive holding default values
SVBT16 cb; // 2 size (count of bytes) of this DP
SVBT16 xa; // 4 These 2 points describe the rectangle
@@ -788,7 +788,7 @@ struct WW8_DP_ARC
// sal_uInt16 fUp : 8; // 0x24 ff00 REVIEW davebu
};
-struct WW8_DP_ELIPSE
+struct WW8_DP_ELLIPSE
{
WW8_DP_LINETYPE aLnt;
WW8_DP_FILL aFill;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
