sw/source/filter/ww8/wrtw8sty.cxx | 2 +- sw/source/filter/ww8/ww8atr.cxx | 8 ++++---- sw/source/filter/ww8/ww8par.hxx | 4 ++-- sw/source/filter/ww8/ww8par4.cxx | 2 +- sw/source/filter/ww8/ww8par6.cxx | 4 ++-- sw/source/filter/ww8/ww8scan.cxx | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit aabbde06e849c61b9abb696cd84133f11ebfbf34 Author: Julien Nabet <serval2...@yahoo.fr> Date: Sat Mar 29 17:20:35 2014 +0100 Typo: varient->variant Change-Id: I0b62f630573dc76d90e3c1f659b2ac359758b243 diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 271d118..d2dd257 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -481,7 +481,7 @@ void MSWordStyles::SetStyleDefaults( const SwFmt& rFmt, bool bPap ) { //If we are a character property then see if it is one of the //western/asian ones that must be collapsed together for export to - //word. If so default to the western varient. + //word. If so default to the western variant. if ( bPap || m_rExport.CollapseScriptsforWordOk( i18n::ScriptType::LATIN, n) ) { diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index e04820a..ea1592b 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1080,7 +1080,7 @@ void WW8AttributeOutput::CharFont( const SvxFontItem& rFont ) void WW8AttributeOutput::CharFontCTL( const SvxFontItem& rFont ) { - //Can only export in 8+, in 7- export as normal varient and expect that + //Can only export in 8+, in 7- export as normal variant and expect that //upperlevel code has blocked exporting clobbering attributes sal_uInt16 nFontID = m_rWW8Export.GetId( rFont ); if ( m_rWW8Export.bWrtWW8 ) @@ -1092,7 +1092,7 @@ void WW8AttributeOutput::CharFontCTL( const SvxFontItem& rFont ) void WW8AttributeOutput::CharFontCJK( const SvxFontItem& rFont ) { - //Can only export in 8+, in 7- export as normal varient and expect that + //Can only export in 8+, in 7- export as normal variant and expect that //upperlevel code has blocked exporting clobbering attributes sal_uInt16 nFontID = m_rWW8Export.GetId( rFont ); if ( m_rWW8Export.bWrtWW8 ) @@ -1104,7 +1104,7 @@ void WW8AttributeOutput::CharFontCJK( const SvxFontItem& rFont ) void WW8AttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight ) { - //Can only export in 8+, in 7- export as normal varient and expect that + //Can only export in 8+, in 7- export as normal variant and expect that //upperlevel code has blocked exporting clobbering attributes if (m_rWW8Export.bWrtWW8) { @@ -1118,7 +1118,7 @@ void WW8AttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight ) void WW8AttributeOutput::CharPostureCTL( const SvxPostureItem& rPosture ) { - // Can only export in 8+, in 7- export as normal varient and expect that + // Can only export in 8+, in 7- export as normal variant and expect that // upperlevel code has blocked exporting clobbering attributes if (m_rWW8Export.bWrtWW8) { diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index bc8ff13..bc41c27 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -959,8 +959,8 @@ struct ApoTestResults struct ANLDRuleMap { - SwNumRule* mpOutlineNumRule; // WinWord 6 numbering, varient 1 - SwNumRule* mpNumberingNumRule; // WinWord 6 numbering, varient 2 + SwNumRule* mpOutlineNumRule; // WinWord 6 numbering, variant 1 + SwNumRule* mpNumberingNumRule; // WinWord 6 numbering, variant 2 SwNumRule* GetNumRule(sal_uInt8 nNumType); void SetNumRule(SwNumRule*, sal_uInt8 nNumType); ANLDRuleMap() : mpOutlineNumRule(0), mpNumberingNumRule(0) {} diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 04e72c3..60a3c3f 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -484,7 +484,7 @@ void SwWW8ImplReader::Read_CRevisionMark(RedlineType_t eType, /* It is possible to have a number of date stamps for the created time of the change, (possibly a word bug) so we must use the "get a full - list" varient of HasCharSprm and take the last one as the true one. + list" variant of HasCharSprm and take the last one as the true one. */ std::vector<const sal_uInt8 *> aResult; bool bIns = (nsRedlineType_t::REDLINE_INSERT == eType); diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index a51526d..465f043 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3279,7 +3279,7 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData void SwWW8ImplReader::Read_TxtColor( sal_uInt16, const sal_uInt8* pData, short nLen ) { - //Has newer colour varient, ignore this old varient + //Has newer colour variant, ignore this old variant if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(NS_sprm::LN_CCv)) return; @@ -3762,7 +3762,7 @@ void SwWW8ImplReader::Read_FontKern( sal_uInt16, const sal_uInt8* , short nLen ) void SwWW8ImplReader::Read_CharShadow( sal_uInt16, const sal_uInt8* pData, short nLen ) { - //Has newer colour varient, ignore this old varient + //Has newer colour variant, ignore this old variant if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(0xCA71)) return; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 7354ab0..6c835ed 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -7297,7 +7297,7 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) nL = static_cast< sal_uInt16 >(SVBT16ToShort( &pSprm[1 + mnDelta] ) + aSprm.nLen - 1); break; default: - OSL_ENSURE(!this, "Unknown sprm varient"); + OSL_ENSURE(!this, "Unknown sprm variant"); break; } break; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits