include/svx/xoutbmp.hxx | 2 +- svx/source/dialog/_contdlg.cxx | 2 +- svx/source/svdraw/svdobj.cxx | 2 +- svx/source/xoutdev/_xoutbmp.cxx | 2 +- sw/inc/cmdid.h | 2 +- sw/source/core/unocore/unoframe.cxx | 10 +++++----- sw/source/core/unocore/unomap1.cxx | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 1d432c0e7701ea61d81364f9fdf0118f947e365a Author: Noel Grandin <[email protected]> Date: Fri Jun 2 10:36:18 2017 +0200 fix spelling Countour->Contour Change-Id: I2dd8c0dcca439d1d435bdd339f7e76d139faa98b Reviewed-on: https://gerrit.libreoffice.org/38345 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 25164e273254..cad11de73161 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -69,7 +69,7 @@ public: static Bitmap DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ); - static tools::Polygon GetCountour( const Bitmap& rBmp, const XOutFlags nContourFlags, + static tools::Polygon GetContour( const Bitmap& rBmp, const XOutFlags nContourFlags, const sal_uInt8 cEdgeDetectThreshold, const tools::Rectangle* pWorkRect ); }; diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 98dc5efd828d..729252a46e6d 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -178,7 +178,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, aBmp.SetPrefSize( rGraphic.GetPrefSize() ); aBmp.SetPrefMapMode( rGraphic.GetPrefMapMode() ); - return tools::PolyPolygon( XOutBitmap::GetCountour( aBmp, nContourFlags, 128, pRect ) ); + return tools::PolyPolygon( XOutBitmap::GetContour( aBmp, nContourFlags, 128, pRect ) ); } // Loop through to super class, no virtual Methods to not become incompatible diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 590262905d05..d48f8de48a4b 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1135,7 +1135,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const const sal_uInt32 nSize(rResult.size()); // when count is one, it is implied that the object has only its normal - // contour anyways and TakeCountour() is to return an empty PolyPolygon + // contour anyways and TakeContour() is to return an empty PolyPolygon // (see old implementation for historical reasons) if(nSize > 1) { diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 6205b6533b6a..8713164a2750 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -519,7 +519,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ) return aRetBmp; } -tools::Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const XOutFlags nFlags, +tools::Polygon XOutBitmap::GetContour( const Bitmap& rBmp, const XOutFlags nFlags, const sal_uInt8 cEdgeDetectThreshold, const tools::Rectangle* pWorkRectPixel ) { diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index e626bbb93458..0c5726536511 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -762,7 +762,7 @@ #define FN_PARAM_TOX_TYPE (FN_PARAM2+14) /* TOX type in tox dialog*/ #define FN_PARAM_LINK_DISPLAY_NAME (FN_PARAM2+15) /* LinkDisplayName property*/ #define FN_PARAM_NUM_LEVEL (FN_PARAM2+16) /* rtf filter*/ -#define FN_PARAM_COUNTOUR_PP (FN_PARAM2+17) /* contour PolyPolygon*/ +#define FN_PARAM_CONTOUR_PP (FN_PARAM2+17) /* contour PolyPolygon*/ #define FN_ANCHOR_POSITION (FN_PARAM2+18) /* AnchorPosition property */ #define FN_DROP_TEXT (FN_PARAM2+18) /* text set in drop caps tab page - for recording */ diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 35641d6762cd..740f645701e9 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1450,7 +1450,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& SwDoc* pDoc = pFormat->GetDoc(); if ( ((eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID)) || - (FN_PARAM_COUNTOUR_PP == pEntry->nWID) || + (FN_PARAM_CONTOUR_PP == pEntry->nWID) || (FN_UNO_IS_AUTOMATIC_CONTOUR == pEntry->nWID) || (FN_UNO_IS_PIXEL_CONTOUR == pEntry->nWID) ) { @@ -1459,7 +1459,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& { SwNodeIndex aIdx(*pIdx, 1); SwNoTextNode* pNoText = aIdx.GetNode().GetNoTextNode(); - if(pEntry->nWID == FN_PARAM_COUNTOUR_PP) + if(pEntry->nWID == FN_PARAM_CONTOUR_PP) { drawing::PointSequenceSequence aParam; if(!aValue.hasValue()) @@ -2017,7 +2017,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) { if( ((eType == FLYCNTTYPE_GRF) || (eType == FLYCNTTYPE_OLE)) && (isGRFATR(pEntry->nWID) || - pEntry->nWID == FN_PARAM_COUNTOUR_PP || + pEntry->nWID == FN_PARAM_CONTOUR_PP || pEntry->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR || pEntry->nWID == FN_UNO_IS_PIXEL_CONTOUR )) { @@ -2026,7 +2026,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) { SwNodeIndex aIdx(*pIdx, 1); SwNoTextNode* pNoText = aIdx.GetNode().GetNoTextNode(); - if(pEntry->nWID == FN_PARAM_COUNTOUR_PP) + if(pEntry->nWID == FN_PARAM_CONTOUR_PP) { tools::PolyPolygon aContour; if( pNoText->GetContourAPI( aContour ) ) @@ -2869,7 +2869,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan if(pProps->GetProperty(RES_SURROUND, MID_SURROUND_CONTOUROUTSIDE, pContourOutside)) setPropertyValue(UNO_NAME_CONTOUR_OUTSIDE, *pContourOutside); const ::uno::Any* pContourPoly; - if(pProps->GetProperty(FN_PARAM_COUNTOUR_PP, 0, pContourPoly)) + if(pProps->GetProperty(FN_PARAM_CONTOUR_PP, 0, pContourPoly)) setPropertyValue(UNO_NAME_CONTOUR_POLY_POLYGON, *pContourPoly); const ::uno::Any* pPixelContour; if(pProps->GetProperty(FN_UNO_IS_PIXEL_CONTOUR, 0, pPixelContour)) diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index 5385f8986b66..3d277d3b97c2 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -818,7 +818,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetGraphicPropertyMap( { OUString(UNO_NAME_GRAPHIC_FILTER), FN_UNO_GRAPHIC_FILTER, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(UNO_NAME_GRAPHIC), FN_UNO_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, { OUString(UNO_NAME_ACTUAL_SIZE), FN_UNO_ACTUAL_SIZE, cppu::UnoType<css::awt::Size>::get(), PropertyAttribute::READONLY, CONVERT_TWIPS}, - { OUString(UNO_NAME_CONTOUR_POLY_POLYGON), FN_PARAM_COUNTOUR_PP, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), PropertyAttribute::MAYBEVOID, 0 }, + { OUString(UNO_NAME_CONTOUR_POLY_POLYGON), FN_PARAM_CONTOUR_PP, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), PropertyAttribute::MAYBEVOID, 0 }, { OUString(UNO_NAME_IS_PIXEL_CONTOUR), FN_UNO_IS_PIXEL_CONTOUR, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, { OUString(UNO_NAME_IS_AUTOMATIC_CONTOUR), FN_UNO_IS_AUTOMATIC_CONTOUR , cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, { OUString(UNO_NAME_GRAPHIC_ROTATION), RES_GRFATR_ROTATION, cppu::UnoType<sal_Int16>::get(), 0, 0}, @@ -854,7 +854,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetEmbeddedPropertyMap COMMON_FRAME_PROPERTIES { OUString(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_SURROUND_CONTOUR }, { OUString(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE}, - { OUString(UNO_NAME_CONTOUR_POLY_POLYGON), FN_PARAM_COUNTOUR_PP, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), PropertyAttribute::MAYBEVOID, 0 }, + { OUString(UNO_NAME_CONTOUR_POLY_POLYGON), FN_PARAM_CONTOUR_PP, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), PropertyAttribute::MAYBEVOID, 0 }, { OUString(UNO_NAME_IS_PIXEL_CONTOUR), FN_UNO_IS_PIXEL_CONTOUR, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, { OUString(UNO_NAME_IS_AUTOMATIC_CONTOUR), FN_UNO_IS_AUTOMATIC_CONTOUR , cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, { OUString(UNO_NAME_CLSID), FN_UNO_CLSID, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 }, _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
