cui/source/tabpages/connect.cxx | 4 ++-- include/svx/strings.hrc | 2 +- include/svx/svddef.hxx | 2 +- include/svx/sxelditm.hxx | 2 +- svx/source/dialog/connctrl.cxx | 4 ++-- svx/source/svdraw/svdattr.cxx | 4 ++-- svx/source/svdraw/svdedtv.cxx | 4 ++-- svx/source/svdraw/svdibrow.cxx | 4 ++-- svx/source/svdraw/svdmrkv.cxx | 14 +++++++------- svx/source/svdraw/svdoedge.cxx | 2 +- svx/source/svdraw/svdxcgv.cxx | 4 ++-- sw/source/filter/ww8/ww8par2.cxx | 10 +++++----- sw/source/uibase/docvw/srcedtw.cxx | 2 +- 13 files changed, 29 insertions(+), 29 deletions(-)
New commits: commit 33b150bbd636ab23ebf50a5301034f3a551f3793 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Thu Aug 3 14:42:37 2017 +0200 rename nPgAnz->nPgCount Change-Id: I4cbc74ed4488c06feaa8b8ab62496fac77ab3aa6 Reviewed-on: https://gerrit.libreoffice.org/40739 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 55d7d31fa64f..7e41af8cf798 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -207,9 +207,9 @@ void SdrEditView::DeleteLayer(const OUString& rName) for(sal_uInt16 nPageKind(0); nPageKind < 2; nPageKind++) { // MasterPages and DrawPages - sal_uInt16 nPgAnz(bMaPg ? mpModel->GetMasterPageCount() : mpModel->GetPageCount()); + sal_uInt16 nPgCount(bMaPg ? mpModel->GetMasterPageCount() : mpModel->GetPageCount()); - for(sal_uInt16 nPgNum(0); nPgNum < nPgAnz; nPgNum++) + for(sal_uInt16 nPgNum(0); nPgNum < nPgCount; nPgNum++) { // over all pages SdrPage* pPage = (bMaPg) ? mpModel->GetMasterPage(nPgNum) : mpModel->GetPage(nPgNum); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 938ce9e60370..5f47639ba74d 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1816,26 +1816,26 @@ SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpP if(pPV) { SdrPage* pPage=pPV->GetPage(); - sal_uInt16 nPgAnz=1; + sal_uInt16 nPgCount=1; if(bMasters && pPage->TRG_HasMasterPage()) { - nPgAnz++; + nPgCount++; } bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList(); - if (bExtraPassForWholePage) nPgAnz++; // First search in AktObjList, then on the entire page - sal_uInt16 nPgNum=bBack ? 0 : nPgAnz; - while (pHitObj==nullptr && (bBack ? nPgNum<nPgAnz : nPgNum>0)) { + if (bExtraPassForWholePage) nPgCount++; // First search in AktObjList, then on the entire page + sal_uInt16 nPgNum=bBack ? 0 : nPgCount; + while (pHitObj==nullptr && (bBack ? nPgNum<nPgCount : nPgNum>0)) { SdrSearchOptions nTmpOptions=nOptions; if (!bBack) nPgNum--; const SdrLayerIDSet* pMVisLay=nullptr; SdrObjList* pObjList=nullptr; if (pbHitPassDirect!=nullptr) *pbHitPassDirect = true; - if (nPgNum>=nPgAnz-1 || (bExtraPassForWholePage && nPgNum>=nPgAnz-2)) + if (nPgNum>=nPgCount-1 || (bExtraPassForWholePage && nPgNum>=nPgCount-2)) { pObjList=pPV->GetObjList(); - if (bExtraPassForWholePage && nPgNum==nPgAnz-2) { + if (bExtraPassForWholePage && nPgNum==nPgCount-2) { pObjList=pPage; if (pbHitPassDirect!=nullptr) *pbHitPassDirect = false; } diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index f81933b05a95..0d954f6e799c 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -275,8 +275,8 @@ bool SdrExchangeView::Paste( aYResize=aResize.Y(); } SdrObjList* pDstLst=pLst; - sal_uInt16 nPg,nPgAnz=pSrcMod->GetPageCount(); - for (nPg=0; nPg<nPgAnz; nPg++) + sal_uInt16 nPg,nPgCount=pSrcMod->GetPageCount(); + for (nPg=0; nPg<nPgCount; nPg++) { const SdrPage* pSrcPg=pSrcMod->GetPage(nPg); commit e0c64cbeaf458cabcf8f4ac7c8aac4cd1896273c Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Thu Aug 3 14:35:20 2017 +0200 rename SIP_SA_EDGELINEDELTAANZ->SIP_SA_EDGELINEDELTACOUNT and SIP_SA_EDGELINEDELTAANZ->SIP_SA_EDGELINEDELTACOUNT Change-Id: Ib6c370025a56586df1cdf7abcab2f0dfe599a64a Reviewed-on: https://gerrit.libreoffice.org/40738 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index aedcdeec4946..118bb62de742 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -261,9 +261,9 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs ) m_pMtrFldLine3->SaveValue(); // SdrEdgeLineDeltaAnzItem - pItem = GetItem( *rAttrs, SDRATTR_EDGELINEDELTAANZ ); + pItem = GetItem( *rAttrs, SDRATTR_EDGELINEDELTACOUNT ); if( !pItem ) - pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINEDELTAANZ ); + pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINEDELTACOUNT ); if( pItem ) { sal_uInt16 nValue = static_cast<const SdrEdgeLineDeltaCountItem*>( pItem )->GetValue(); diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 6416454d1160..a706fa6d0c61 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -416,7 +416,7 @@ #define SIP_SA_EDGENODE2VERTDIST NC_("SIP_SA_EDGENODE2VERTDIST", "Vert. spacing object 2") #define SIP_SA_EDGENODE1GLUEDIST NC_("SIP_SA_EDGENODE1GLUEDIST", "Glue spacing object 1") #define SIP_SA_EDGENODE2GLUEDIST NC_("SIP_SA_EDGENODE2GLUEDIST", "Glue spacing object 2") -#define SIP_SA_EDGELINEDELTAANZ NC_("SIP_SA_EDGELINEDELTAANZ", "Number of movable lines") +#define SIP_SA_EDGELINEDELTACOUNT NC_("SIP_SA_EDGELINEDELTACOUNT", "Number of movable lines") #define SIP_SA_EDGELINE1DELTA NC_("SIP_SA_EDGELINE1DELTA", "Offset line 1") #define SIP_SA_EDGELINE2DELTA NC_("SIP_SA_EDGELINE2DELTA", "Offset line 2") #define SIP_SA_EDGELINE3DELTA NC_("SIP_SA_EDGELINE3DELTA", "Offset line 3") diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index 334a1c37ce5f..deca8bcf2310 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -122,7 +122,7 @@ #define SDRATTR_EDGENODE2VERTDIST (SDRATTR_EDGE_FIRST + 4) /* 1131 */ /* Pool V4 */ #define SDRATTR_EDGENODE1GLUEDIST (SDRATTR_EDGE_FIRST + 5) /* 1132 */ /* Pool V4 */ #define SDRATTR_EDGENODE2GLUEDIST (SDRATTR_EDGE_FIRST + 6) /* 1133 */ /* Pool V4 */ -#define SDRATTR_EDGELINEDELTAANZ (SDRATTR_EDGE_FIRST + 7) /* 1134 */ /* Pool V4 */ +#define SDRATTR_EDGELINEDELTACOUNT (SDRATTR_EDGE_FIRST + 7) /* 1134 */ /* Pool V4 */ #define SDRATTR_EDGELINE1DELTA (SDRATTR_EDGE_FIRST + 8) /* 1135 */ /* Pool V4 */ #define SDRATTR_EDGELINE2DELTA (SDRATTR_EDGE_FIRST + 9) /* 1136 */ /* Pool V4 */ #define SDRATTR_EDGELINE3DELTA (SDRATTR_EDGE_FIRST +10) /* 1137 */ /* Pool V4 */ diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx index 16ff9b22f01f..c2ecfa5d8248 100644 --- a/include/svx/sxelditm.hxx +++ b/include/svx/sxelditm.hxx @@ -25,7 +25,7 @@ class SdrEdgeLineDeltaCountItem: public SfxUInt16Item { public: - SdrEdgeLineDeltaCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {} + SdrEdgeLineDeltaCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTACOUNT,nVal) {} virtual SfxPoolItem* Clone(SfxItemPool*) const override { return new SdrEdgeLineDeltaCountItem(*this); diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index d622a7d52e6d..3b3c57eb1c17 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -244,8 +244,8 @@ sal_uInt16 SvxXConnectionPreview::GetLineDeltaCount() const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet(); sal_uInt16 nCount(0); - if(SfxItemState::DONTCARE != rSet.GetItemState(SDRATTR_EDGELINEDELTAANZ)) - nCount = static_cast<const SdrEdgeLineDeltaCountItem&>(rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue(); + if(SfxItemState::DONTCARE != rSet.GetItemState(SDRATTR_EDGELINEDELTACOUNT)) + nCount = static_cast<const SdrEdgeLineDeltaCountItem&>(rSet.Get(SDRATTR_EDGELINEDELTACOUNT)).GetValue(); return nCount; } diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 34400847bd6d..9b034d60144a 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -174,7 +174,7 @@ SdrItemPool::SdrItemPool( rPoolDefaults[SDRATTR_EDGENODE2VERTDIST-SDRATTR_START]=new SdrEdgeNode2VertDistItem(nDefEdgeDist); rPoolDefaults[SDRATTR_EDGENODE1GLUEDIST-SDRATTR_START]=new SdrEdgeNode1GlueDistItem; rPoolDefaults[SDRATTR_EDGENODE2GLUEDIST-SDRATTR_START]=new SdrEdgeNode2GlueDistItem; - rPoolDefaults[SDRATTR_EDGELINEDELTAANZ -SDRATTR_START]=new SdrEdgeLineDeltaCountItem; + rPoolDefaults[SDRATTR_EDGELINEDELTACOUNT-SDRATTR_START]=new SdrEdgeLineDeltaCountItem; rPoolDefaults[SDRATTR_EDGELINE1DELTA -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE1DELTA, 0); rPoolDefaults[SDRATTR_EDGELINE2DELTA -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE2DELTA, 0); rPoolDefaults[SDRATTR_EDGELINE3DELTA -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE3DELTA, 0); @@ -493,7 +493,7 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) case SDRATTR_EDGENODE2VERTDIST : pResId = SIP_SA_EDGENODE2VERTDIST;break; case SDRATTR_EDGENODE1GLUEDIST : pResId = SIP_SA_EDGENODE1GLUEDIST;break; case SDRATTR_EDGENODE2GLUEDIST : pResId = SIP_SA_EDGENODE2GLUEDIST;break; - case SDRATTR_EDGELINEDELTAANZ : pResId = SIP_SA_EDGELINEDELTAANZ;break; + case SDRATTR_EDGELINEDELTACOUNT : pResId = SIP_SA_EDGELINEDELTACOUNT;break; case SDRATTR_EDGELINE1DELTA : pResId = SIP_SA_EDGELINE1DELTA;break; case SDRATTR_EDGELINE2DELTA : pResId = SIP_SA_EDGELINE2DELTA;break; case SDRATTR_EDGELINE3DELTA : pResId = SIP_SA_EDGELINE3DELTA;break; diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index b7bd3b4388de..81792c7ab586 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -804,7 +804,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI } } break; - case SDRATTR_EDGELINEDELTAANZ: return true; + case SDRATTR_EDGELINEDELTACOUNT: return true; case SDRATTR_EDGELINE1DELTA: case SDRATTR_EDGELINE2DELTA: case SDRATTR_EDGELINE3DELTA: { @@ -815,7 +815,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI } if (eKind!=SdrEdgeKind::OrthoLines && eKind!=SdrEdgeKind::Bezier) return true; } - if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTAANZ,pItem)) { + if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTACOUNT,pItem)) { sal_uInt16 nCount=static_cast<const SdrEdgeLineDeltaCountItem*>(pItem)->GetValue(); if (nCount==0) return true; if (nCount==1 && nWhich>SDRATTR_EDGELINE1DELTA) return true; diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index c2081a03df84..658e476e6e5f 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -258,7 +258,7 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr() { const SfxItemSet& rSet = GetObjectItemSet(); SdrEdgeKind eKind = static_cast<const SdrEdgeKindItem&>(rSet.Get(SDRATTR_EDGEKIND)).GetValue(); - sal_Int32 nValAnz = static_cast<const SdrEdgeLineDeltaCountItem&>(rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue(); + sal_Int32 nValAnz = static_cast<const SdrEdgeLineDeltaCountItem&>(rSet.Get(SDRATTR_EDGELINEDELTACOUNT)).GetValue(); sal_Int32 nVal1 = static_cast<const SdrMetricItem&>(rSet.Get(SDRATTR_EDGELINE1DELTA)).GetValue(); sal_Int32 nVal2 = static_cast<const SdrMetricItem&>(rSet.Get(SDRATTR_EDGELINE2DELTA)).GetValue(); sal_Int32 nVal3 = static_cast<const SdrMetricItem&>(rSet.Get(SDRATTR_EDGELINE3DELTA)).GetValue(); commit ac8fc5a6a5a1adef7aaa8aa901439e268283d113 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Thu Aug 3 14:32:12 2017 +0200 rename nToleranz->nTolerance Change-Id: I4a61f1cf9b94f7df98a8e9560c1384c948abf2c1 Reviewed-on: https://gerrit.libreoffice.org/40737 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 424d06b862ff..ace6e8f776d5 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2887,7 +2887,7 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact) if (!m_MergeGroups.empty()) { // still valid area near the boundery - const short nToleranz = 4; + const short nTolerance = 4; // box boundery short nX2 = nX1 + nWidth; // approximate group boundery @@ -2902,9 +2902,9 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact) if (!rActGroup.bGroupLocked) { // approximate group boundery with room (tolerance) to the *outside* - nGrX1 = rActGroup.nGroupXStart - nToleranz; + nGrX1 = rActGroup.nGroupXStart - nTolerance; nGrX2 = rActGroup.nGroupXStart - +rActGroup.nGroupWidth + nToleranz; + + rActGroup.nGroupWidth + nTolerance; // If box fits report success @@ -2919,8 +2919,8 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact) { // successful if nX1 *or* nX2 are inside the group if( ( ( nX1 > nGrX1 ) - && ( nX1 < nGrX2 - 2*nToleranz ) ) - || ( ( nX2 > nGrX1 + 2*nToleranz ) + && ( nX1 < nGrX2 - 2*nTolerance ) ) + || ( ( nX2 > nGrX1 + 2*nTolerance ) && ( nX2 < nGrX2 ) ) // or nX1 and nX2 surround the group || ( ( nX1 <=nGrX1 ) diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 88367f6d7db4..abbc045031ae 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -639,7 +639,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer*, pIdle, void ) // SyntaxTimerHdl is called when text changed // => good opportunity to determine text width! long nPrevTextWidth = m_nCurTextWidth; - m_nCurTextWidth = m_pTextEngine->CalcTextWidth() + 25; // kleine Toleranz + m_nCurTextWidth = m_pTextEngine->CalcTextWidth() + 25; // small tolerance if ( m_nCurTextWidth != nPrevTextWidth ) SetScrollBarRanges(); m_bHighlighting = false; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits