From 7f793166719ce0b3917fa9751d3529c9ec5df854 Mon Sep 17 00:00:00 2001 From: Johnny_M Date: Sun, 4 Jun 2017 17:18:28 +0200 Subject: tdf#39674 Translate some German variable/function names No functional change is intended. Change-Id: Ib693d5f15bb279e8fe6771e3a64a976b53c6d13d Reviewed-on: https://gerrit.libreoffice.org/38391 Tested-by: Jenkins Reviewed-by: Eike Rathke --- .../defaultnumberingprovider.cxx | 10 +++---- idl/source/prj/svidl.cxx | 4 +-- include/svx/svdoedge.hxx | 6 ++-- include/svx/svdograf.hxx | 4 +-- include/svx/svdotext.hxx | 4 +-- svx/source/svdraw/svdoedge.cxx | 34 +++++++++++----------- svx/source/svdraw/svdograf.cxx | 20 ++++++------- svx/source/svdraw/svdotext.cxx | 10 +++---- svx/source/svdraw/svdotxln.cxx | 8 ++--- 9 files changed, 50 insertions(+), 50 deletions(-) diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index b5f4917e8781..102b54b8df77 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -304,18 +304,18 @@ OUString toRoman( sal_Int32 n ) while( nMask ) { - sal_uInt8 nZahl = sal_uInt8( n / nMask ); + sal_uInt8 nNumber = sal_uInt8( n / nMask ); sal_uInt8 nDiff = 1; n %= nMask; - if( 5 < nZahl ) + if( 5 < nNumber ) { - if( nZahl < 9 ) + if( nNumber < 9 ) sTmp.append(*(cRomanStr-1)); ++nDiff; - nZahl -= 5; + nNumber -= 5; } - switch( nZahl ) + switch( nNumber ) { case 3: sTmp.append(*cRomanStr); SAL_FALLTHROUGH; case 2: sTmp.append(*cRomanStr); SAL_FALLTHROUGH; diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx index afec793b1d2f..4ad781e6c079 100644 --- a/idl/source/prj/svidl.cxx +++ b/idl/source/prj/svidl.cxx @@ -28,12 +28,12 @@ #include #define BR 0x8000 -bool FileMove_Impl( const OUString & rFile1, const OUString & rFile2, bool bImmerVerschieben ) +bool FileMove_Impl( const OUString & rFile1, const OUString & rFile2, bool bMoveAlways ) { //printf( "Move from %s to %s\n", rFile2.GetStr(), rFile1.GetStr() ); sal_uLong nC1 = 0; sal_uLong nC2 = 1; - if( !bImmerVerschieben ) + if( !bMoveAlways ) { SvFileStream aOutStm1( rFile1, StreamMode::STD_READ ); SvFileStream aOutStm2( rFile2, StreamMode::STD_READ ); diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 0356b470ae5c..c4d390ea0f04 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -103,11 +103,11 @@ public: cOrthoForm(0) {} - Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode); + Point& ImpGetLineOffsetPoint(SdrEdgeLineCode eLineCode); sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; bool ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; - void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal); - long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; + void ImpSetLineOffset(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal); + long ImpGetLineOffset(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; }; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index a8bc11bb2f94..c748e3ad0ec1 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -107,8 +107,8 @@ private: private: - void ImpLinkAnmeldung(); - void ImpLinkAbmeldung(); + void ImpRegisterLink(); + void ImpDeregisterLink(); bool ImpUpdateGraphicLink( bool bAsynchron = true ) const; void ImpSetLinkedGraphic( const Graphic& rGraphic ); DECL_LINK( ImpSwapHdl, const GraphicObject*, SvStream* ); diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 478002b4806d..93294cf12ba3 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -273,8 +273,8 @@ private: void ImpAutoFitText( SdrOutliner& rOutliner ) const; static void ImpAutoFitText( SdrOutliner& rOutliner, const Size& rShapeSize, bool bIsVerticalWriting ); SVX_DLLPRIVATE SdrObject* ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const; - SVX_DLLPRIVATE void ImpLinkAnmeldung(); - SVX_DLLPRIVATE void ImpLinkAbmeldung(); + SVX_DLLPRIVATE void ImpRegisterLink(); + SVX_DLLPRIVATE void ImpDeregisterLink(); SVX_DLLPRIVATE ImpSdrObjTextLinkUserData* GetLinkUserData() const; // void ImpCheckItemSetChanges(const SfxItemSet& rAttr); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index a6d443c456ae..0d629da52ccf 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -92,7 +92,7 @@ bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP) const return bRet; } -Point& SdrEdgeInfoRec::ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) +Point& SdrEdgeInfoRec::ImpGetLineOffsetPoint(SdrEdgeLineCode eLineCode) { switch (eLineCode) { case SdrEdgeLineCode::Obj1Line2 : return aObj1Line2; @@ -128,16 +128,16 @@ bool SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rX return bHorz; } -void SdrEdgeInfoRec::ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal) +void SdrEdgeInfoRec::ImpSetLineOffset(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal) { - Point& rPt=ImpGetLineVersatzPoint(eLineCode); + Point& rPt=ImpGetLineOffsetPoint(eLineCode); if (ImpIsHorzLine(eLineCode,rXP)) rPt.Y()=nVal; else rPt.X()=nVal; } -long SdrEdgeInfoRec::ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const +long SdrEdgeInfoRec::ImpGetLineOffset(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const { - const Point& rPt = const_cast(this)->ImpGetLineVersatzPoint(eLineCode); + const Point& rPt = const_cast(this)->ImpGetLineOffsetPoint(eLineCode); if (ImpIsHorzLine(eLineCode,rXP)) return rPt.Y(); else @@ -199,31 +199,31 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo() if(aEdgeInfo.nObj1Lines >= 2 && n < 3) { - aEdgeInfo.ImpSetLineVersatz(SdrEdgeLineCode::Obj1Line2, *pEdgeTrack, nVals[n]); + aEdgeInfo.ImpSetLineOffset(SdrEdgeLineCode::Obj1Line2, *pEdgeTrack, nVals[n]); n++; } if(aEdgeInfo.nObj1Lines >= 3 && n < 3) { - aEdgeInfo.ImpSetLineVersatz(SdrEdgeLineCode::Obj1Line3, *pEdgeTrack, nVals[n]); + aEdgeInfo.ImpSetLineOffset(SdrEdgeLineCode::Obj1Line3, *pEdgeTrack, nVals[n]); n++; } if(aEdgeInfo.nMiddleLine != 0xFFFF && n < 3) { - aEdgeInfo.ImpSetLineVersatz(SdrEdgeLineCode::MiddleLine, *pEdgeTrack, nVals[n]); + aEdgeInfo.ImpSetLineOffset(SdrEdgeLineCode::MiddleLine, *pEdgeTrack, nVals[n]); n++; } if(aEdgeInfo.nObj2Lines >= 3 && n < 3) { - aEdgeInfo.ImpSetLineVersatz(SdrEdgeLineCode::Obj2Line3, *pEdgeTrack, nVals[n]); + aEdgeInfo.ImpSetLineOffset(SdrEdgeLineCode::Obj2Line3, *pEdgeTrack, nVals[n]); n++; } if(aEdgeInfo.nObj2Lines >= 2 && n < 3) { - aEdgeInfo.ImpSetLineVersatz(SdrEdgeLineCode::Obj2Line2, *pEdgeTrack, nVals[n]); + aEdgeInfo.ImpSetLineOffset(SdrEdgeLineCode::Obj2Line2, *pEdgeTrack, nVals[n]); n++; } } @@ -269,31 +269,31 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr() { if(aEdgeInfo.nObj1Lines >= 2 && n < 3) { - nVals[n] = aEdgeInfo.ImpGetLineVersatz(SdrEdgeLineCode::Obj1Line2, *pEdgeTrack); + nVals[n] = aEdgeInfo.ImpGetLineOffset(SdrEdgeLineCode::Obj1Line2, *pEdgeTrack); n++; } if(aEdgeInfo.nObj1Lines >= 3 && n < 3) { - nVals[n] = aEdgeInfo.ImpGetLineVersatz(SdrEdgeLineCode::Obj1Line3, *pEdgeTrack); + nVals[n] = aEdgeInfo.ImpGetLineOffset(SdrEdgeLineCode::Obj1Line3, *pEdgeTrack); n++; } if(aEdgeInfo.nMiddleLine != 0xFFFF && n < 3) { - nVals[n] = aEdgeInfo.ImpGetLineVersatz(SdrEdgeLineCode::MiddleLine, *pEdgeTrack); + nVals[n] = aEdgeInfo.ImpGetLineOffset(SdrEdgeLineCode::MiddleLine, *pEdgeTrack); n++; } if(aEdgeInfo.nObj2Lines >= 3 && n < 3) { - nVals[n] = aEdgeInfo.ImpGetLineVersatz(SdrEdgeLineCode::Obj2Line3, *pEdgeTrack); + nVals[n] = aEdgeInfo.ImpGetLineOffset(SdrEdgeLineCode::Obj2Line3, *pEdgeTrack); n++; } if(aEdgeInfo.nObj2Lines >= 2 && n < 3) { - nVals[n] = aEdgeInfo.ImpGetLineVersatz(SdrEdgeLineCode::Obj2Line2, *pEdgeTrack); + nVals[n] = aEdgeInfo.ImpGetLineOffset(SdrEdgeLineCode::Obj2Line2, *pEdgeTrack); n++; } } @@ -1912,8 +1912,8 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat) const Point aDist(rDragStat.GetNow() - rDragStat.GetStart()); sal_Int32 nDist(pEdgeHdl->IsHorzDrag() ? aDist.X() : aDist.Y()); - nDist += aEdgeInfo.ImpGetLineVersatz(eLineCode, *pEdgeTrack); - aEdgeInfo.ImpSetLineVersatz(eLineCode, *pEdgeTrack, nDist); + nDist += aEdgeInfo.ImpGetLineOffset(eLineCode, *pEdgeTrack); + aEdgeInfo.ImpSetLineOffset(eLineCode, *pEdgeTrack, nDist); } // force recalculation of EdgeTrack diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 5076d00b95c9..4e943e82a4a9 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -402,7 +402,7 @@ SdrGrafObj::~SdrGrafObj() { delete pGraphic; delete mpReplacementGraphic; - ImpLinkAbmeldung(); + ImpDeregisterLink(); } void SdrGrafObj::SetGraphicObject( const GraphicObject& rGrfObj ) @@ -610,7 +610,7 @@ void SdrGrafObj::ForceSwapIn() const } } -void SdrGrafObj::ImpLinkAnmeldung() +void SdrGrafObj::ImpRegisterLink() { sfx2::LinkManager* pLinkManager = pModel != nullptr ? pModel->GetLinkManager() : nullptr; @@ -626,7 +626,7 @@ void SdrGrafObj::ImpLinkAnmeldung() } } -void SdrGrafObj::ImpLinkAbmeldung() +void SdrGrafObj::ImpDeregisterLink() { sfx2::LinkManager* pLinkManager = pModel != nullptr ? pModel->GetLinkManager() : nullptr; @@ -640,18 +640,18 @@ void SdrGrafObj::ImpLinkAbmeldung() void SdrGrafObj::SetGraphicLink(const OUString& rFileName, const OUString& rReferer, const OUString& rFilterName) { - ImpLinkAbmeldung(); + ImpDeregisterLink(); aFileName = rFileName; aReferer = rReferer; aFilterName = rFilterName; - ImpLinkAnmeldung(); + ImpRegisterLink(); pGraphic->SetUserData(); pGraphic->SetSwapState(); } void SdrGrafObj::ReleaseGraphicLink() { - ImpLinkAbmeldung(); + ImpDeregisterLink(); aFileName.clear(); aReferer.clear(); aFilterName.clear(); @@ -954,7 +954,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage ) pGraphic->StopAnimation(); if( pGraphicLink != nullptr ) - ImpLinkAbmeldung(); + ImpDeregisterLink(); } if(!pModel && !GetStyleSheet() && pNewPage && pNewPage->GetModel()) @@ -980,7 +980,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage ) SdrRectObj::SetPage( pNewPage ); if (!aFileName.isEmpty() && bInsert) - ImpLinkAnmeldung(); + ImpRegisterLink(); } void SdrGrafObj::SetModel( SdrModel* pNewModel ) @@ -995,14 +995,14 @@ void SdrGrafObj::SetModel( SdrModel* pNewModel ) } if( pGraphicLink != nullptr ) - ImpLinkAbmeldung(); + ImpDeregisterLink(); } // realize model SdrRectObj::SetModel(pNewModel); if (bChg && !aFileName.isEmpty()) - ImpLinkAnmeldung(); + ImpRegisterLink(); } void SdrGrafObj::StartAnimation() diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index cf43784347e7..52f8bf1e616e 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -184,7 +184,7 @@ SdrTextObj::~SdrTextObj() delete mpText; - ImpLinkAbmeldung(); + ImpDeregisterLink(); } void SdrTextObj::FitFrameToTextSize() @@ -475,13 +475,13 @@ void SdrTextObj::SetPage(SdrPage* pNewPage) bool bLinked=IsLinkedText(); if (bLinked && bRemove) { - ImpLinkAbmeldung(); + ImpDeregisterLink(); } SdrAttrObj::SetPage(pNewPage); if (bLinked && bInsert) { - ImpLinkAnmeldung(); + ImpRegisterLink(); } } @@ -493,7 +493,7 @@ void SdrTextObj::SetModel(SdrModel* pNewModel) if (bLinked && bChg) { - ImpLinkAbmeldung(); + ImpDeregisterLink(); } SdrAttrObj::SetModel(pNewModel); @@ -514,7 +514,7 @@ void SdrTextObj::SetModel(SdrModel* pNewModel) if (bLinked && bChg) { - ImpLinkAnmeldung(); + ImpRegisterLink(); } } diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 8fcf70594a88..eeb2d1409ea7 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -132,12 +132,12 @@ void SdrTextObj::SetTextLink(const OUString& rFileName, const OUString& rFilterN pData->aFilterName=rFilterName; pData->eCharSet=eCharSet; AppendUserData(pData); - ImpLinkAnmeldung(); + ImpRegisterLink(); } void SdrTextObj::ReleaseTextLink() { - ImpLinkAbmeldung(); + ImpDeregisterLink(); sal_uInt16 nCount=GetUserDataCount(); for (sal_uInt16 nNum=nCount; nNum>0;) { nNum--; @@ -251,7 +251,7 @@ ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const return nullptr; } -void SdrTextObj::ImpLinkAnmeldung() +void SdrTextObj::ImpRegisterLink() { ImpSdrObjTextLinkUserData* pData=GetLinkUserData(); sfx2::LinkManager* pLinkManager=pModel!=nullptr ? pModel->GetLinkManager() : nullptr; @@ -263,7 +263,7 @@ void SdrTextObj::ImpLinkAnmeldung() } } -void SdrTextObj::ImpLinkAbmeldung() +void SdrTextObj::ImpDeregisterLink() { ImpSdrObjTextLinkUserData* pData=GetLinkUserData(); sfx2::LinkManager* pLinkManager=pModel!=nullptr ? pModel->GetLinkManager() : nullptr; -- cgit v1.2.3