mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Translate German variable names

Browse Source 
Korr -> Corr in SVX

Change-Id: I51311013024557aca1b4b3f660e6c5cef31f3f1b
Reviewed-on: https://gerrit.libreoffice.org/48783
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Johnny_M
2018-01-28 13:21:31 +01:00
committed by Michael Stahl
parent eb1bae576b
commit 479c13df08
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/svx/svdotext.hxx
View File

@@ -263,7 +263,7 @@ private:
tools::Rectangle& rTextRect,
tools::Rectangle& rAnchorRect,
tools::Rectangle& rPaintRect,
Fraction& aFitXKorreg ) const;
Fraction& aFitXCorrection ) const;
void ImpAutoFitText( SdrOutliner& rOutliner ) const;
static void ImpAutoFitText( SdrOutliner& rOutliner, const Size& rShapeSize, bool bIsVerticalWriting );
SVX_DLLPRIVATE SdrObject* ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const;
@@ -283,7 +283,7 @@ protected:
SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier) const;
SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const;
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);
void ImpCheckShear();
tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;

20
svx/source/svdraw/svdotext.cxx
View File

@@ -854,7 +854,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const
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();
bool bNoStretching(false);
@@ -909,7 +909,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
long nXTolPl=nWantWdt/100; // tolerance: +1%
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 nY=(nWantHgt*100) /nIsHgt; // calculate Y stretching
@@ -946,14 +946,14 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
nLoopCount++;
Size aSiz(rOutliner.CalcTextSize());
long nXDiff=aSiz.Width()-nWantWdt;
rFitXKorreg=Fraction(nWantWdt,aSiz.Width());
rFitXCorrection=Fraction(nWantWdt,aSiz.Width());
if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0) {
bNoMoreLoop = true;
} else {
// correct stretching factors
long nMul=nWantWdt;
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,
else nMul+=(nDiv-nMul)/2; // because the EditEngine calculates wrongly later on
}
@@ -1228,7 +1228,7 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame,
tools::Rectangle& rTextRect,
tools::Rectangle& rAnchorRect,
tools::Rectangle& rPaintRect,
Fraction& rFitXKorreg ) const
Fraction& rFitXCorrection ) const
{
if (!bContourFrame)
{
@@ -1249,7 +1249,7 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame,
// FitToSize can't be used together with ContourFrame for now
if (IsFitToSize())
{
ImpSetCharStretching(rOutliner,rTextRect.GetSize(),rAnchorRect.GetSize(),rFitXKorreg);
ImpSetCharStretching(rOutliner,rTextRect.GetSize(),rAnchorRect.GetSize(),rFitXCorrection);
rPaintRect=rAnchorRect;
}
else if (IsAutoFit())
@@ -1339,7 +1339,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, tools::Rectangle&
{
tools::Rectangle aTextRect;
tools::Rectangle aAnchorRect;
Fraction aFitXKorreg(1,1);
Fraction aFitXCorrection(1,1);
bool bContourFrame=IsContourTextFrame();
@@ -1351,7 +1351,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, tools::Rectangle&
rOutl.SetRefMapMode(aMapMode);
}
ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg );
ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXCorrection );
}
@@ -1850,14 +1850,14 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle(
tools::Rectangle aTextRect;
tools::Rectangle aAnchorRect;
tools::Rectangle aPaintRect;
Fraction aFitXKorreg(1,1);
Fraction aFitXCorrection(1,1);
bool bContourFrame(IsContourTextFrame());
// get outliner set up. To avoid getting a somehow rotated MetaFile,
// temporarily disable object rotation.
sal_Int32 nAngle(aGeo.nRotationAngle);
aGeo.nRotationAngle = 0;
ImpSetupDrawOutlinerForPaint( bContourFrame, rOutliner, aTextRect, aAnchorRect, aPaintRect, aFitXKorreg );
ImpSetupDrawOutlinerForPaint( bContourFrame, rOutliner, aTextRect, aAnchorRect, aPaintRect, aFitXCorrection );
aGeo.nRotationAngle = nAngle;
tools::Rectangle aScrollFrameRect(aPaintRect);

4
svx/source/svdraw/svdotxed.cxx
View File

@@ -106,8 +106,8 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
tools::Rectangle aTextRect;
TakeTextRect(rOutl, aTextRect, false,
&aAnchorRect);
Fraction aFitXKorreg(1,1);
ImpSetCharStretching(rOutl,aTextRect.GetSize(),aAnchorRect.GetSize(),aFitXKorreg);
Fraction aFitXCorrection(1,1);
ImpSetCharStretching(rOutl,aTextRect.GetSize(),aAnchorRect.GetSize(),aFitXCorrection);
}
else if (IsAutoFit())
{

8
svx/source/svdraw/svdpoev.cxx
View File

@@ -360,7 +360,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
bool bKorregFlag(false);
bool bCorrectionFlag(false);
sal_uInt32 nMax(pObj->GetHdlCount());
for(SdrUShortCont::const_reverse_iterator it = rPts.rbegin(); it != rPts.rend(); ++it)
@@ -379,10 +379,10 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if(nNewPt0Idx)
{
// correction necessary?
DBG_ASSERT(!bKorregFlag,"Multiple index corrections at SdrPolyEditView::RipUp().");
if(!bKorregFlag)
DBG_ASSERT(!bCorrectionFlag,"Multiple index corrections at SdrPolyEditView::RipUp().");
if(!bCorrectionFlag)
{
bKorregFlag = true;
bCorrectionFlag = true;
SdrUShortCont aReplaceSet;
for(SdrUShortCont::const_iterator it2 = rPts.begin(); it2 != rPts.end(); ++it2)