summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkerem <hallackerem@gmail.com>2017-01-02 00:35:58 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2017-01-03 14:55:11 +0000
commit909164e474e113b948195822ebf7c14dd21385db (patch)
treee56a07ca1810d20185ba8e048fff37594b61abc1
parenta0f6374670f67646e802aef45d927a8746b2ae12 (diff)
tdf#39674: translated German to English in svdtrans.cxx
Change-Id: Ic46e747a9dbec99e6037c6b35e175ce5b1efdd82 Reviewed-on: https://gerrit.libreoffice.org/32594 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
-rw-r--r--include/svx/svdtrans.hxx4
-rw-r--r--svx/source/svdraw/svdtrans.cxx44
2 files changed, 24 insertions, 24 deletions
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 026f930dfe2f..6570a6bee099 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -281,7 +281,7 @@ inline bool IsInch(FieldUnit eU) {
class SVX_DLLPUBLIC SdrFormatter {
long nMul_;
long nDiv_;
- short nKomma_;
+ short nComma_;
bool bDirty;
MapUnit eSrcMU;
MapUnit eDstMU;
@@ -291,7 +291,7 @@ public:
SdrFormatter(MapUnit eSrc, MapUnit eDst)
: nMul_(0)
, nDiv_(0)
- , nKomma_(0)
+ , nComma_(0)
, bDirty(true)
, eSrcMU(eSrc)
, eDstMU(eDst)
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index a47439f1f656..f79beadd465e 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -660,32 +660,32 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD)
// 1 yd = 3 ft = 36" = 914,4mm
// 1 ft = 12 " = 1" = 304,8mm
-void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, bool& rbMetr, bool& rbInch)
+void GetMeterOrInch(MapUnit eMU, short& rnComma, long& rnMul, long& rnDiv, bool& rbMetr, bool& rbInch)
{
rnMul=1; rnDiv=1;
- short nKomma=0;
+ short nComma=0;
bool bMetr = false, bInch = false;
switch (eMU) {
- // Metrisch
- case MapUnit::Map100thMM : bMetr = true; nKomma=5; break;
- case MapUnit::Map10thMM : bMetr = true; nKomma=4; break;
- case MapUnit::MapMM : bMetr = true; nKomma=3; break;
- case MapUnit::MapCM : bMetr = true; nKomma=2; break;
+ // Metrically
+ case MapUnit::Map100thMM : bMetr = true; nComma=5; break;
+ case MapUnit::Map10thMM : bMetr = true; nComma=4; break;
+ case MapUnit::MapMM : bMetr = true; nComma=3; break;
+ case MapUnit::MapCM : bMetr = true; nComma=2; break;
// Inch
- case MapUnit::Map1000thInch: bInch = true; nKomma=3; break;
- case MapUnit::Map100thInch : bInch = true; nKomma=2; break;
- case MapUnit::Map10thInch : bInch = true; nKomma=1; break;
- case MapUnit::MapInch : bInch = true; nKomma=0; break;
+ case MapUnit::Map1000thInch: bInch = true; nComma=3; break;
+ case MapUnit::Map100thInch : bInch = true; nComma=2; break;
+ case MapUnit::Map10thInch : bInch = true; nComma=1; break;
+ case MapUnit::MapInch : bInch = true; nComma=0; break;
case MapUnit::MapPoint : bInch = true; rnDiv=72; break; // 1Pt = 1/72"
- case MapUnit::MapTwip : bInch = true; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440"
- // Sonstiges
+ case MapUnit::MapTwip : bInch = true; rnDiv=144; nComma=1; break; // 1Twip = 1/1440"
+ // Others
case MapUnit::MapPixel : break;
case MapUnit::MapSysFont : break;
case MapUnit::MapAppFont : break;
case MapUnit::MapRelative : break;
default: break;
} // switch
- rnKomma=nKomma;
+ rnComma=nComma;
rbMetr=bMetr;
rbInch=bInch;
}
@@ -695,20 +695,20 @@ void SdrFormatter::Undirty()
{
bool bSrcMetr,bSrcInch,bDstMetr,bDstInch;
long nMul1,nDiv1,nMul2,nDiv2;
- short nKomma1,nKomma2;
+ short nComma1,nComma2;
// first: normalize to m or in
- GetMeterOrInch(eSrcMU,nKomma1,nMul1,nDiv1,bSrcMetr,bSrcInch);
- GetMeterOrInch(eDstMU,nKomma2,nMul2,nDiv2,bDstMetr,bDstInch);
+ GetMeterOrInch(eSrcMU,nComma1,nMul1,nDiv1,bSrcMetr,bSrcInch);
+ GetMeterOrInch(eDstMU,nComma2,nMul2,nDiv2,bDstMetr,bDstInch);
nMul1*=nDiv2;
nDiv1*=nMul2;
- nKomma1=nKomma1-nKomma2;
+ nComma1=nComma1-nComma2;
if (bSrcInch && bDstMetr) {
- nKomma1+=4;
+ nComma1+=4;
nMul1*=254;
}
if (bSrcMetr && bDstInch) {
- nKomma1-=4;
+ nComma1-=4;
nDiv1*=254;
}
@@ -719,7 +719,7 @@ void SdrFormatter::Undirty()
nMul_=nMul1;
nDiv_=nDiv1;
- nKomma_=nKomma1;
+ nComma_=nComma1;
bDirty=false;
}
@@ -742,7 +742,7 @@ void SdrFormatter::TakeStr(long nVal, OUString& rStr) const
if (bDirty)
const_cast<SdrFormatter*>(this)->Undirty();
- sal_Int16 nC(nKomma_);
+ sal_Int16 nC(nComma_);
if(bNeg)
nVal = -nVal;