Kaydet (Commit) 479c13df authored tarafından Johnny_M's avatar Johnny_M Kaydeden (comit) Michael Stahl

Translate German variable names

Korr -> Corr in SVX

Change-Id: I51311013024557aca1b4b3f660e6c5cef31f3f1b
Reviewed-on: https://gerrit.libreoffice.org/48783Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst eb1bae57
...@@ -263,7 +263,7 @@ private: ...@@ -263,7 +263,7 @@ private:
tools::Rectangle& rTextRect, tools::Rectangle& rTextRect,
tools::Rectangle& rAnchorRect, tools::Rectangle& rAnchorRect,
tools::Rectangle& rPaintRect, tools::Rectangle& rPaintRect,
Fraction& aFitXKorreg ) const; Fraction& aFitXCorrection ) const;
void ImpAutoFitText( SdrOutliner& rOutliner ) const; void ImpAutoFitText( SdrOutliner& rOutliner ) const;
static void ImpAutoFitText( SdrOutliner& rOutliner, const Size& rShapeSize, bool bIsVerticalWriting ); static void ImpAutoFitText( SdrOutliner& rOutliner, const Size& rShapeSize, bool bIsVerticalWriting );
SVX_DLLPRIVATE SdrObject* ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const; SVX_DLLPRIVATE SdrObject* ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const;
...@@ -283,7 +283,7 @@ protected: ...@@ -283,7 +283,7 @@ protected:
SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier) const; SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier) const;
SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const; SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const;
void ImpSetTextStyleSheetListeners(); void ImpSetTextStyleSheetListeners();
static void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg); static void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXCorrection);
static void ImpJustifyRect(tools::Rectangle& rRect); static void ImpJustifyRect(tools::Rectangle& rRect);
void ImpCheckShear(); void ImpCheckShear();
tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
......
...@@ -854,7 +854,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const ...@@ -854,7 +854,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const
return pPara; return pPara;
} }
void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXCorrection)
{ {
OutputDevice* pOut = rOutliner.GetRefDevice(); OutputDevice* pOut = rOutliner.GetRefDevice();
bool bNoStretching(false); bool bNoStretching(false);
...@@ -909,7 +909,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS ...@@ -909,7 +909,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
long nXTolPl=nWantWdt/100; // tolerance: +1% long nXTolPl=nWantWdt/100; // tolerance: +1%
long nXTolMi=nWantWdt/25; // tolerance: -4% long nXTolMi=nWantWdt/25; // tolerance: -4%
long nXKorr =nWantWdt/20; // correction scale: 5% long nXCorr =nWantWdt/20; // correction scale: 5%
long nX=(nWantWdt*100) /nIsWdt; // calculate X stretching long nX=(nWantWdt*100) /nIsWdt; // calculate X stretching
long nY=(nWantHgt*100) /nIsHgt; // calculate Y stretching long nY=(nWantHgt*100) /nIsHgt; // calculate Y stretching
...@@ -946,14 +946,14 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS ...@@ -946,14 +946,14 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
nLoopCount++; nLoopCount++;
Size aSiz(rOutliner.CalcTextSize()); Size aSiz(rOutliner.CalcTextSize());
long nXDiff=aSiz.Width()-nWantWdt; long nXDiff=aSiz.Width()-nWantWdt;
rFitXKorreg=Fraction(nWantWdt,aSiz.Width()); rFitXCorrection=Fraction(nWantWdt,aSiz.Width());
if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0) { if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0) {
bNoMoreLoop = true; bNoMoreLoop = true;
} else { } else {
// correct stretching factors // correct stretching factors
long nMul=nWantWdt; long nMul=nWantWdt;
long nDiv=aSiz.Width(); long nDiv=aSiz.Width();
if (std::abs(nXDiff)<=2*nXKorr) { if (std::abs(nXDiff)<=2*nXCorr) {
if (nMul>nDiv) nDiv+=(nMul-nDiv)/2; // but only add half of what we calculated, if (nMul>nDiv) nDiv+=(nMul-nDiv)/2; // but only add half of what we calculated,
else nMul+=(nDiv-nMul)/2; // because the EditEngine calculates wrongly later on else nMul+=(nDiv-nMul)/2; // because the EditEngine calculates wrongly later on
} }
...@@ -1228,7 +1228,7 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame, ...@@ -1228,7 +1228,7 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame,
tools::Rectangle& rTextRect, tools::Rectangle& rTextRect,
tools::Rectangle& rAnchorRect, tools::Rectangle& rAnchorRect,
tools::Rectangle& rPaintRect, tools::Rectangle& rPaintRect,
Fraction& rFitXKorreg ) const Fraction& rFitXCorrection ) const
{ {
if (!bContourFrame) if (!bContourFrame)
{ {
...@@ -1249,7 +1249,7 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame, ...@@ -1249,7 +1249,7 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame,
// FitToSize can't be used together with ContourFrame for now // FitToSize can't be used together with ContourFrame for now
if (IsFitToSize()) if (IsFitToSize())
{ {
ImpSetCharStretching(rOutliner,rTextRect.GetSize(),rAnchorRect.GetSize(),rFitXKorreg); ImpSetCharStretching(rOutliner,rTextRect.GetSize(),rAnchorRect.GetSize(),rFitXCorrection);
rPaintRect=rAnchorRect; rPaintRect=rAnchorRect;
} }
else if (IsAutoFit()) else if (IsAutoFit())
...@@ -1339,7 +1339,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, tools::Rectangle& ...@@ -1339,7 +1339,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, tools::Rectangle&
{ {
tools::Rectangle aTextRect; tools::Rectangle aTextRect;
tools::Rectangle aAnchorRect; tools::Rectangle aAnchorRect;
Fraction aFitXKorreg(1,1); Fraction aFitXCorrection(1,1);
bool bContourFrame=IsContourTextFrame(); bool bContourFrame=IsContourTextFrame();
...@@ -1351,7 +1351,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, tools::Rectangle& ...@@ -1351,7 +1351,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, tools::Rectangle&
rOutl.SetRefMapMode(aMapMode); rOutl.SetRefMapMode(aMapMode);
} }
ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg ); ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXCorrection );
} }
...@@ -1850,14 +1850,14 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle( ...@@ -1850,14 +1850,14 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle(
tools::Rectangle aTextRect; tools::Rectangle aTextRect;
tools::Rectangle aAnchorRect; tools::Rectangle aAnchorRect;
tools::Rectangle aPaintRect; tools::Rectangle aPaintRect;
Fraction aFitXKorreg(1,1); Fraction aFitXCorrection(1,1);
bool bContourFrame(IsContourTextFrame()); bool bContourFrame(IsContourTextFrame());
// get outliner set up. To avoid getting a somehow rotated MetaFile, // get outliner set up. To avoid getting a somehow rotated MetaFile,
// temporarily disable object rotation. // temporarily disable object rotation.
sal_Int32 nAngle(aGeo.nRotationAngle); sal_Int32 nAngle(aGeo.nRotationAngle);
aGeo.nRotationAngle = 0; aGeo.nRotationAngle = 0;
ImpSetupDrawOutlinerForPaint( bContourFrame, rOutliner, aTextRect, aAnchorRect, aPaintRect, aFitXKorreg ); ImpSetupDrawOutlinerForPaint( bContourFrame, rOutliner, aTextRect, aAnchorRect, aPaintRect, aFitXCorrection );
aGeo.nRotationAngle = nAngle; aGeo.nRotationAngle = nAngle;
tools::Rectangle aScrollFrameRect(aPaintRect); tools::Rectangle aScrollFrameRect(aPaintRect);
......
...@@ -106,8 +106,8 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) ...@@ -106,8 +106,8 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
tools::Rectangle aTextRect; tools::Rectangle aTextRect;
TakeTextRect(rOutl, aTextRect, false, TakeTextRect(rOutl, aTextRect, false,
&aAnchorRect); &aAnchorRect);
Fraction aFitXKorreg(1,1); Fraction aFitXCorrection(1,1);
ImpSetCharStretching(rOutl,aTextRect.GetSize(),aAnchorRect.GetSize(),aFitXKorreg); ImpSetCharStretching(rOutl,aTextRect.GetSize(),aAnchorRect.GetSize(),aFitXCorrection);
} }
else if (IsAutoFit()) else if (IsAutoFit())
{ {
......
...@@ -360,7 +360,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints() ...@@ -360,7 +360,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if( bUndo ) if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
bool bKorregFlag(false); bool bCorrectionFlag(false);
sal_uInt32 nMax(pObj->GetHdlCount()); sal_uInt32 nMax(pObj->GetHdlCount());
for(SdrUShortCont::const_reverse_iterator it = rPts.rbegin(); it != rPts.rend(); ++it) for(SdrUShortCont::const_reverse_iterator it = rPts.rbegin(); it != rPts.rend(); ++it)
...@@ -379,10 +379,10 @@ void SdrPolyEditView::RipUpAtMarkedPoints() ...@@ -379,10 +379,10 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if(nNewPt0Idx) if(nNewPt0Idx)
{ {
// correction necessary? // correction necessary?
DBG_ASSERT(!bKorregFlag,"Multiple index corrections at SdrPolyEditView::RipUp()."); DBG_ASSERT(!bCorrectionFlag,"Multiple index corrections at SdrPolyEditView::RipUp().");
if(!bKorregFlag) if(!bCorrectionFlag)
{ {
bKorregFlag = true; bCorrectionFlag = true;
SdrUShortCont aReplaceSet; SdrUShortCont aReplaceSet;
for(SdrUShortCont::const_iterator it2 = rPts.begin(); it2 != rPts.end(); ++it2) for(SdrUShortCont::const_iterator it2 = rPts.begin(); it2 != rPts.end(); ++it2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment