[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/source vcl/unx vcl/win
vcl/headless/svpprn.cxx |2 +- vcl/inc/win/salgdi.h |2 +- vcl/inc/win/wincomp.hxx |2 +- vcl/source/app/help.cxx |2 +- vcl/source/control/button.cxx|4 ++-- vcl/source/edit/textdoc.cxx | 18 +- vcl/source/filter/sgf.ini|2 +- vcl/source/filter/sgvmain.hxx|4 ++-- vcl/source/filter/sgvtext.cxx|2 +- vcl/source/gdi/bitmap.cxx|2 +- vcl/source/window/menufloatingwindow.cxx |2 +- vcl/source/window/tabdlg.cxx |2 +- vcl/source/window/winproc.cxx|6 +++--- vcl/unx/generic/print/genprnpsp.cxx |2 +- vcl/win/window/salobj.cxx|4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) New commits: commit 59010ca14ba07f0a1d6f662bb1f8fbad33f3c654 Author: Johnny_M Date: Sun Sep 10 21:40:52 2017 +0200 Translate German comments/debug strings (leftovers in dirs vbahelper and vcl) Translates leftovers found using a custom regex. Additionally: - Translated the "SGV Fonts for StarView" INI file parameter group in vcl/source/filter/sgf.ini and .../sgvtext.cxx Change-Id: I1360aac1a2f3fa825f86d77ac1b05e2de9ffb007 Reviewed-on: https://gerrit.libreoffice.org/42145 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index 92a11e99d03a..488f17bb4084 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -217,7 +217,7 @@ void SvpSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) for( ::std::vector< OUString >::iterator it = aPrinters.begin(); it != aPrinters.end(); ++it ) { const PrinterInfo& rInfo( rManager.getPrinterInfo( *it ) ); -// Neuen Eintrag anlegen +// create new entry SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo; pInfo->maPrinterName= *it; pInfo->maDriver = rInfo.m_aDriverName; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index acc64e0ac17c..38edc94d0d37 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -174,7 +174,7 @@ private: COLORREFmnTextColor;// TextColor RGNDATA*mpClipRgnData; // ClipRegion-Data RGNDATA*mpStdClipRgnData; // Cache Standard-ClipRegion-Data -int mnPenWidth; // Linienbreite +int mnPenWidth; // line width LogicalFontInstance* GetWinFontEntry(int nFallbackLevel); diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx index c2182c4ff255..8fd774fc6eb1 100644 --- a/vcl/inc/win/wincomp.hxx +++ b/vcl/inc/win/wincomp.hxx @@ -196,7 +196,7 @@ inline HINSTANCE GetWindowInstance( HWND hWnd ) #endif -// - 5.0-Erweiterungen - +// - 5.0 extensions - #ifndef COLOR_GRADIENTACTIVECAPTION #define COLOR_GRADIENTACTIVECAPTION 27 diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 1d8faa415222..e2410e596b62 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -630,7 +630,7 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( rHelpArea.TopLeft() ), pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( rHelpArea.BottomRight() ) ); -// Welche Position vom Rechteck? +// which position of the rectangle? aPos = devHelpArea.Center(); if ( nStyle & QuickHelpFlags::Left ) diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 705d8d5f0154..4d6d26b318f5 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2599,7 +2599,7 @@ bool RadioButton::SetModeRadioImage( const Image& rImage ) void RadioButton::SetState( bool bCheck ) { -// TabStop-Flag richtig mitfuehren +// carry the TabStop flag along correctly if ( bCheck ) mpWindowImpl->mnStyle |= WB_TABSTOP; else @@ -3691,7 +3691,7 @@ Size CheckBox::CalcMinimumSize( long nMaxWidth ) const { // is this still correct ? since the checkbox now // shows a focus rect it should be 2 pixels wider and longer -/* da ansonsten im Writer die Control zu weit oben haengen +/* since otherwise the controls in the Writer hang too far up aSize.Width() += 2; aSize.Height() += 2; */ diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index 70976cb35530..3daf97e2761b 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -193,9 +193,9 @@ void TextNode::ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNew ) } } -SAL_WARN_IF( rAttrib.GetStart()
[Libreoffice-commits] core.git: wizards/com wizards/source writerfilter/source xmloff/source
wizards/com/sun/star/wizards/db/CommandName.java |2 +- wizards/com/sun/star/wizards/db/DBMetaData.java |2 +- wizards/com/sun/star/wizards/db/FieldColumn.java |4 ++-- wizards/com/sun/star/wizards/db/RecordParser.java|2 +- wizards/com/sun/star/wizards/table/FieldDescription.java |2 +- wizards/source/formwizard/Layouter.xba |2 +- wizards/source/gimmicks/GetTexts.xba |2 +- wizards/source/tools/Misc.xba|8 wizards/source/tutorials/Functions.xba |2 +- writerfilter/source/dmapper/PropertyMap.cxx |2 +- xmloff/source/text/txtexppr.cxx |4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) New commits: commit 510b9557c37c666016c55e6ed2be7a50dbd1b67f Author: Johnny_M Date: Sun Sep 17 14:23:46 2017 +0200 Translate German comments and debug strings (leftovers in dirs w... and x...) Translates leftovers found using a custom regex in directories beginning with "w" and "x". Additionally: - A few corrections of previous translations Change-Id: Ic30cf6792748a6bea8782a9a3711fa468b80bdaf Reviewed-on: https://gerrit.libreoffice.org/42378 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java index 91e54ed3ba25..4768018ef3b5 100644 --- a/wizards/com/sun/star/wizards/db/CommandName.java +++ b/wizards/com/sun/star/wizards/db/CommandName.java @@ -87,7 +87,7 @@ public class CommandName this.DisplayName = _DisplayName; int iIndex; if (oCommandMetaData.xDBMetaData.supportsCatalogsInDataManipulation()) -{ // ...dann Catalog mit in TableName +{ // ...then Catalog also in TableName iIndex = _DisplayName.indexOf(sCatalogSep); if (iIndex >= 0) { diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 8d90126d3e5e..1a720b0ac3a5 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -351,7 +351,7 @@ public class DBMetaData WidthList[4][0] = DataType.LONGVARCHAR; // == -1; WidthList[5][0] = DataType.CHAR; // == 1; WidthList[6][0] = DataType.NUMERIC; // == 2; -WidthList[7][0] = DataType.DECIMAL; // == 3; [mit Nachkommastellen] +WidthList[7][0] = DataType.DECIMAL; // == 3; [with fractional part] WidthList[8][0] = DataType.INTEGER; // == 4; WidthList[9][0] = DataType.SMALLINT; // == 5; WidthList[10][0] = DataType.FLOAT; // == 6; diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java index 29e4b3939194..dd8b85a9207e 100644 --- a/wizards/com/sun/star/wizards/db/FieldColumn.java +++ b/wizards/com/sun/star/wizards/db/FieldColumn.java @@ -266,7 +266,7 @@ public class FieldColumn bIsNumberFormat = true; break; -case DataType.DECIMAL: // == 3; [mit Nachkommastellen] +case DataType.DECIMAL: // == 3; [with fractional part] case DataType.FLOAT: // == 6; case DataType.REAL: // == 7; case DataType.DOUBLE: // == 8; @@ -369,7 +369,7 @@ public class FieldColumn break; case DataType.NUMERIC: // == 2; -case DataType.DECIMAL: // == 3; [mit Nachkommastellen] +case DataType.DECIMAL: // == 3; [with fractional part] case DataType.FLOAT: // == 6; case DataType.REAL: // == 7; case DataType.DOUBLE: // == 8; diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index c06566874cef..bb35b041fe97 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -127,7 +127,7 @@ public class RecordParser extends QueryMetaData case DataType.NUMERIC: // == 2; case DataType.INTEGER: // == 4; case DataType.SMALLINT: // == 5; -case DataType.DECIMAL: // == 3; [mit Nachkommastellen] +case DataType.DECIMAL: // == 3; [with fractional part] case DataType.FLOAT: // == 6; case DataType.REAL: // == 7; case DataType.DOUBLE: // == 8; diff --git a/wizards/com/sun/star/wizards/table/FieldDescription.java b/wizards/com/sun/star/wizards/table/FieldDescription.java index 2128a760eabe..95a847136360 100644 --- a/wizards/com/sun/star/wizards/table/FieldDescription.java +++ b/wizards/com/sun/star/wizards/table/FieldDescription.java @@
[Libreoffice-commits] core.git: reportdesign/source starmath/source stoc/source stoc/test svtools/source sw/inc sw/sdi sw/source
reportdesign/source/ui/report/StartMarker.cxx |2 - starmath/source/dialog.cxx|2 - stoc/source/javavm/javavm.cxx |2 - stoc/test/testiadapter.cxx| 14 ++-- stoc/test/testintrosp.cxx |2 - stoc/test/testintrosp.idl |4 +-- stoc/test/testregistry.cxx| 30 +- svtools/source/contnr/treelist.cxx|2 - svtools/source/control/ctrlbox.cxx|4 +-- svtools/source/control/ruler.cxx |4 +-- svtools/source/dialogs/prnsetup.cxx |2 - svtools/source/misc/unitconv.cxx |2 - svtools/source/svhtml/htmlout.cxx |4 +-- svtools/source/svhtml/parhtml.cxx |4 +-- svtools/source/svrtf/rtfout.cxx |2 - sw/inc/IDocumentLinksAdministration.hxx |2 - sw/inc/IDocumentTimerAccess.hxx |2 - sw/inc/cmdid.h|2 - sw/inc/doc.hxx|2 - sw/inc/htmltbl.hxx|2 - sw/inc/swtable.hxx|1 sw/inc/swtypes.hxx|2 - sw/sdi/_basesh.sdi| 10 sw/sdi/_frmsh.sdi |6 ++--- sw/sdi/_textsh.sdi|2 - sw/sdi/wbasesh.sdi|3 -- sw/source/core/crsr/crsrsh.cxx|2 - sw/source/core/crsr/crstrvl.cxx |4 +-- sw/source/core/crsr/pam.cxx |2 - sw/source/core/doc/docredln.cxx |2 - sw/source/core/docnode/nodes.cxx |6 ++--- sw/source/core/edit/editsh.cxx|2 - sw/source/core/fields/docufld.cxx |2 - sw/source/core/frmedt/fefly1.cxx |2 - sw/source/core/frmedt/feshview.cxx|8 +++--- sw/source/core/frmedt/tblsel.cxx |2 - sw/source/core/inc/swblocks.hxx |2 - sw/source/core/inc/tblrwcl.hxx|2 - sw/source/core/layout/pagechg.cxx |4 +-- sw/source/core/layout/paintfrm.cxx|2 - sw/source/core/layout/tabfrm.cxx |2 - sw/source/core/table/swtable.cxx |2 - sw/source/core/text/itrtxt.cxx|2 - sw/source/core/text/portxt.cxx|2 - sw/source/core/text/txtdrop.cxx |2 - sw/source/core/text/txtfly.cxx|2 - sw/source/core/txtnode/txtedt.cxx |2 - sw/source/core/unocore/unosect.cxx|2 - sw/source/core/unocore/unotext.cxx|2 - sw/source/core/view/viewsh.cxx|2 - sw/source/core/view/vprint.cxx|2 - sw/source/filter/basflt/fltshell.cxx |2 - sw/source/filter/html/htmlcss1.cxx|2 - sw/source/filter/html/htmlctxt.cxx|2 - sw/source/filter/html/htmlgrin.cxx|4 +-- sw/source/filter/html/htmlsect.cxx|2 - sw/source/filter/html/htmltab.cxx |2 - sw/source/filter/html/swhtml.cxx |2 - sw/source/filter/ww8/wrtw8sty.cxx |6 ++--- sw/source/filter/ww8/wrtww8.cxx |4 +-- sw/source/filter/ww8/ww8atr.cxx |2 - sw/source/filter/ww8/ww8par.cxx |2 - sw/source/filter/ww8/ww8par.hxx |2 - sw/source/filter/ww8/ww8par3.cxx |2 - sw/source/filter/ww8/ww8par5.cxx |4 +-- sw/source/filter/ww8/ww8par6.cxx |2 - sw/source/filter/ww8/ww8scan.cxx |6 ++--- sw/source/filter/ww8/ww8struc.hxx |2 - sw/source/filter/xml/xmlimp.cxx |2 - sw/source/filter/xml/xmltbli.cxx |6 ++--- sw/source/ui/frmdlg/column.cxx|2 - sw/source/uibase/config/viewopt.cxx |4 +-- sw/source/uibase/dochdl/swdtflvr.cxx |2 - sw/source/uibase/docvw/edtwin2.cxx|2 - sw/source/uibase/frmdlg/colmgr.cxx|8 +++--- sw/source/uibase/frmdlg/frmmgr.cxx|4 +-- sw/source/uibase/ribbar/inputwin.cxx |4 +-- sw/source/uibase/uiview/scroll.cxx|2 - 78 files changed, 130 insertions(+), 132 deletions(-) New commits: commit 06c07c0dc15348c23fe432e7f1c0243486d1e6bf Author: Johnny_M Date: Sat Aug 26 01:03:43 2017 +0200 Translate German comments/debug strings (leftovers in dirs starmath to sysui) Translates leftovers found using a custom regex. Additionally translated: - One randomly found comment in /reportdesign - Test strings in /stoc/test (let's see if it works) Change-Id: I5f893c194c4b56b5365700928a3b8b63936d03e2 Rev
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/UnitConversion.java |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit dfaceb70ec2f6feda6a73b8be00a7f168dfe075b Author: Johnny_M Date: Sat Sep 2 13:40:47 2017 +0200 Translate one German variable name No functional change is intended. Change-Id: I47312070bea07b0c4994da4f99aa99684cfd850e Reviewed-on: https://gerrit.libreoffice.org/41832 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/toolkit/qa/complex/toolkit/UnitConversion.java b/toolkit/qa/complex/toolkit/UnitConversion.java index 15b67fc61b21..72fcef7cba29 100644 --- a/toolkit/qa/complex/toolkit/UnitConversion.java +++ b/toolkit/qa/complex/toolkit/UnitConversion.java @@ -70,14 +70,14 @@ public class UnitConversion * only a simple test call to convertSizeToLogic(...) with different parameters * @param _aSize * @param _aMeasureUnit - * @param _sEinheit + * @param _sUnit */ -private void checkSize(com.sun.star.awt.Size _aSize, short _aMeasureUnit, String _sEinheit) +private void checkSize(com.sun.star.awt.Size _aSize, short _aMeasureUnit, String _sUnit) { com.sun.star.awt.Size aSizeIn = m_xConversion.convertSizeToLogic(_aSize, _aMeasureUnit); System.out.println("Window size:"); -System.out.println("Width:" + aSizeIn.Width + " " + _sEinheit); -System.out.println("Height:" + aSizeIn.Height + " " + _sEinheit); +System.out.println("Width:" + aSizeIn.Width + " " + _sUnit); +System.out.println("Height:" + aSizeIn.Height + " " + _sUnit); System.out.println(""); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - extras/source
extras/source/autocorr/lang/de/DocumentList.xml |3 --- 1 file changed, 3 deletions(-) New commits: commit 4b62ad397c1ed137cbe69aa0882d290a92052e9a Author: Johnny_M Date: Sat Sep 3 01:10:11 2016 +0200 tdf#101863 Remove superfluous apostrophe auto-corrections in DE Following auto-corrections in the DE locale are are being removed: gehts -> geht´s gibts -> gibt´s wirds -> wird´s Change-Id: Ide648de5800881c829a2ad807e2a585244ccd4a7 Reviewed-on: https://gerrit.libreoffice.org/28635 Tested-by: jan iversen Reviewed-by: jan iversen diff --git a/extras/source/autocorr/lang/de/DocumentList.xml b/extras/source/autocorr/lang/de/DocumentList.xml index 0ee0004..2b8cf95 100644 --- a/extras/source/autocorr/lang/de/DocumentList.xml +++ b/extras/source/autocorr/lang/de/DocumentList.xml @@ -110,13 +110,11 @@ - - @@ -241,7 +239,6 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/de/DocumentList.xml |3 --- 1 file changed, 3 deletions(-) New commits: commit 980756ce042eede8ba617f1c54a387a7ecbaf5db Author: Johnny_M Date: Fri Sep 2 20:04:47 2016 +0200 tdf#101863 Remove superfluous apostrophe auto-corrections in DE Following auto-corrections in the DE locale are are being removed: gehts -> geht´s gibts -> gibt´s wirds -> wird´s Change-Id: I511ad10b065e3ebe65bc06b9304b0822adbb4e6d Reviewed-on: https://gerrit.libreoffice.org/28628 Tested-by: Jenkins Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/extras/source/autocorr/lang/de/DocumentList.xml b/extras/source/autocorr/lang/de/DocumentList.xml index 0ee0004..2b8cf95 100644 --- a/extras/source/autocorr/lang/de/DocumentList.xml +++ b/extras/source/autocorr/lang/de/DocumentList.xml @@ -110,13 +110,11 @@ - - @@ -241,7 +239,6 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/op_financial.cxx | 294 - 1 file changed, 147 insertions(+), 147 deletions(-) New commits: commit d943d9e7f738d539a9715c8ba376d2c64833117d Author: Johnny_M Date: Sat Oct 28 13:29:40 2017 +0200 Translate German variable names in Calc (financial) These names of variables correspond to German function names in Calc and were translated to their English equivalents. For used translations, see, e.g., https://translations.documentfoundation.org/de/libo54_help/translate/#search=RMZ&sfields=target&soptions=exact,case Notes: - The translation here is equal to the translation of variables done on https://gerrit.libreoffice.org/43078 , etc, with following exception: the arguments of financial functions stick closer to their English equivalents in the function descriptions in LO and MS Excel help (i.e., "Cost, Salvage, Life" instead of "Interest, Rest, TimeLenght", etc. on some earlier translations). - Code function names (e.g., "GetRmz_new") will be translated on a separate, later Gerrit change Change-Id: I91615464521480ebde3034f6d383f601e83b9b06 Reviewed-on: https://gerrit.libreoffice.org/43987 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx index c47457f87d1d..3c9a6d775c35 100644 --- a/sc/source/core/opencl/op_financial.cxx +++ b/sc/source/core/opencl/op_financial.cxx @@ -890,8 +890,8 @@ vSubArguments) } ss <<"nPayType = (int)"<GenSlidingWindowDeclRef(); ss <<";\n"; -ss <<"double fRmz;\n"; -ss <<"fRmz = GetRmz_new( fRate, nNumPeriods, fVal, 0.0, nPayType );\n"; +ss <<"double fPmt;\n"; +ss <<"fPmt = GetRmz_new( fRate, nNumPeriods, fVal, 0.0, nPayType );\n"; ss <<"double tmp = 0.0;\n"; ss <<"if( nStartPer == 1 )\n"; ss <<"{\n"; @@ -903,10 +903,10 @@ vSubArguments) ss <<"{\n"; ss <<"if( nPayType > 0 )\n"; ss <<"tmp += GetZw_new( fRate, nStartPer - 2 , "; -ss <<"fRmz, fVal, 1 ) - fRmz;\n"; +ss <<"fPmt, fVal, 1 ) - fPmt;\n"; ss <<"else\n"; ss <<"tmp += GetZw_new( fRate, nStartPer - 1 , "; -ss <<"fRmz, fVal, 0 );\n"; +ss <<"fPmt, fVal, 0 );\n"; ss <<"}\n"; ss <<"tmp *= fRate;\n"; ss <<"return tmp;\n"; @@ -932,7 +932,7 @@ void IRR::GenSlidingWindowFunction(std::stringstream &ss, ss << "double fEstimated = "; ss << vSubArguments[1]->GenSlidingWindowDeclRef() << ";\n"; ss << "double fEps = 1.0;\n"; -ss << "double x = 0.0, xNeu = 0.0, fZaehler = 0.0, fNenner = 0.0;\n"; +ss << "double x = 0.0, xNew = 0.0, fNumerator = 0.0, fDenominator = 0.0;\n"; ss << "double nCount = 0.0;\n"; if (pSur->GetType() == formula::svSingleVectorRef) { @@ -953,7 +953,7 @@ void IRR::GenSlidingWindowFunction(std::stringstream &ss, ss << "x = fEstimated;\n"; ss << "unsigned short nItCount = 0;\n"; ss << "while (fEps > Epsilon && nItCount < 20){\n"; -ss << "nCount = 0.0; fZaehler = 0.0; fNenner = 0.0;\n"; +ss << "nCount = 0.0; fNumerator = 0.0; fDenominator = 0.0;\n"; ss << "double arg0, arg1;\n"; ss << "int i = 0;\n"; FormulaToken* pCur = vSubArguments[0]->GetFormulaToken(); @@ -971,13 +971,13 @@ void IRR::GenSlidingWindowFunction(std::stringstream &ss, ss << "arg1 = "; ss << vSubArguments[0]->GenSlidingWindowDeclRef() << ";\n"; ss << "if (!isnan(arg0)){\n"; -ss << "fZaehler += arg0 / pow(1.0 + x, nCount);\n"; -ss << "fNenner+=-1*nCount*arg0/pow(1.0+x,nCount+1.0);\n"; +ss << "fNumerator += arg0 / pow(1.0 + x, nCount);\n"; +ss << " fDenominator+=-1*nCount*arg0/pow(1.0+x,nCount+1.0);\n"; ss << "nCount += 1;\n"; ss << "}\n"; ss << "if (!isnan(arg1)){\n"; -ss << "
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr2.cxx | 264 +++ 1 file changed, 132 insertions(+), 132 deletions(-) New commits: commit cc9b39393bfeca69020b28e9a38335c5f39a4c72 Author: Johnny_M Date: Sat Oct 28 14:37:12 2017 +0200 Fix prefixes of "double" variables in Calc (financial) Fixes "n" -> "f", as discussed on https://gerrit.libreoffice.org/43078 Change-Id: I3c7df185de77ba48cbcd61ab6385705375704f37 Reviewed-on: https://gerrit.libreoffice.org/43992 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 44a4c02344ac..955a9ae29366 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -116,11 +116,11 @@ void ScInterpreter::ScGetActTime() Date aActDate( Date::SYSTEM ); long nDiff = aActDate - pFormatter->GetNullDate(); tools::Time aActTime( tools::Time::SYSTEM ); -double nTime = aActTime.GetHour()/ static_cast(::tools::Time::hourPerDay) + +double fTime = aActTime.GetHour()/ static_cast(::tools::Time::hourPerDay) + aActTime.GetMin() / static_cast(::tools::Time::minutePerDay) + aActTime.GetSec() / static_cast(::tools::Time::secondPerDay) + aActTime.GetNanoSec() / static_cast(::tools::Time::nanoSecPerDay); -PushDouble( (double) nDiff + nTime ); +PushDouble( (double) nDiff + fTime ); } void ScInterpreter::ScGetYear() @@ -662,10 +662,10 @@ void ScInterpreter::ScGetTime() nFuncFmtType = css::util::NumberFormat::TIME; if ( MustHaveParamCount( GetByte(), 3 ) ) { -double nSec = GetDouble(); -double nMin = GetDouble(); -double nHour = GetDouble(); -double fTime = fmod( (nHour * ::tools::Time::secondPerHour) + (nMin * ::tools::Time::secondPerMinute) + nSec, DATE_TIME_FACTOR) / DATE_TIME_FACTOR; +double fSec = GetDouble(); +double fMin = GetDouble(); +double fHour = GetDouble(); +double fTime = fmod( (fHour * ::tools::Time::secondPerHour) + (fMin * ::tools::Time::secondPerMinute) + fSec, DATE_TIME_FACTOR) / DATE_TIME_FACTOR; if (fTime < 0) PushIllegalArgument(); else @@ -677,9 +677,9 @@ void ScInterpreter::ScGetDiffDate() { if ( MustHaveParamCount( GetByte(), 2 ) ) { -double nDate2 = GetDouble(); -double nDate1 = GetDouble(); -PushDouble(nDate1 - nDate2); +double fDate2 = GetDouble(); +double fDate1 = GetDouble(); +PushDouble(fDate1 - fDate2); } } @@ -919,8 +919,8 @@ void ScInterpreter::ScGetDateDif() // produces incorrect results in other cases and different from // Excel 2010. Apparently they fixed some calculations. aDate1.Normalize(); -double nd = aDate2 - aDate1; -PushDouble( nd ); +double fd = aDate2 - aDate1; +PushDouble( fd ); } else PushIllegalArgument(); // unsupported format @@ -951,11 +951,11 @@ void ScInterpreter::ScGetTimeValue() void ScInterpreter::ScPlusMinus() { -double nVal = GetDouble(); +double fVal = GetDouble(); short n = 0; -if (nVal < 0.0) +if (fVal < 0.0) n = -1; -else if (nVal > 0.0) +else if (fVal > 0.0) n = 1; PushInt( n ); } @@ -1244,9 +1244,9 @@ void ScInterpreter::ScArcTan2() { if ( MustHaveParamCount( GetByte(), 2 ) ) { -double nVal2 = GetDouble(); -double nVal1 = GetDouble(); -PushDouble(atan2(nVal2, nVal1)); +double fVal2 = GetDouble(); +double fVal1 = GetDouble(); +PushDouble(atan2(fVal2, fVal1)); } } @@ -1255,14 +1255,14 @@ void ScInterpreter::ScLog() sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { -double nBase; +double fBase; if (nParamCount == 2) -nBase = GetDouble(); +fBase = GetDouble(); else -nBase = 10.0; -double nVal = GetDouble(); -if (nVal > 0.0 && nBase > 0.0 && nBase != 1.0) -PushDouble(log(nVal) / log(nBase)); +fBase = 10.0; +double fVal = GetDouble(); +if (fVal > 0.0 && fBase > 0.0 && fBase != 1.0) +PushDouble(log(fVal) / log(fBase)); else PushIllegalArgument(); } @@ -1292,13 +1292,13 @@ void ScInterpreter::ScNPV() short nParamCount = GetByte(); if ( MustHaveParamCountMin( nParamCount, 2) ) { -double nVal = 0.0; +double fVal = 0.0; // We turn the stack upside down! ReverseStack( nParamCount); if (nGlobalError == FormulaError::NONE) { -double nCount = 1.0; -
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysishelper.cxx | 20 ++-- scaddins/source/analysis/analysishelper.hxx |4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 3133f128038fbc6e9964ebd637c05401c13d77ac Author: Johnny_M Date: Sun Oct 29 09:58:21 2017 +0100 Correct German variable names translation in Calc (financial) This aligns the translation of the "Zins" argument of the financial functions to "Rate", as used in the function documentation in English. The original translation was done by the same author recently in the commit 8ba9dfe27382626e97fb4ab705b7ad056725a800. Compare (as in MS Excel): German: https://help.libreoffice.org/Calc/Financial_Functions_Part_Two/de#RMZ English: https://help.libreoffice.org/Calc/Financial_Functions_Part_Two#PMT Change-Id: Ifa125d94a639c91c454d7b540f86feeecea250ff Reviewed-on: https://gerrit.libreoffice.org/44021 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 0d950c314629..9594f8e6d6e6 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -1231,36 +1231,36 @@ double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal } -double GetRmz( double fInterest, double fNper, double fPv, double fFv, sal_Int32 nPayType ) +double GetRmz( double fRate, double fNper, double fPv, double fFv, sal_Int32 nPayType ) { double fPmt; -if( fInterest == 0.0 ) +if( fRate == 0.0 ) fPmt = ( fPv + fFv ) / fNper; else { -double fTerm = pow( 1.0 + fInterest, fNper ); +double fTerm = pow( 1.0 + fRate, fNper ); if( nPayType > 0 ) -fPmt = ( fFv * fInterest / ( fTerm - 1.0 ) + fPv * fInterest / ( 1.0 - 1.0 / fTerm ) ) / ( 1.0 + fInterest ); +fPmt = ( fFv * fRate / ( fTerm - 1.0 ) + fPv * fRate / ( 1.0 - 1.0 / fTerm ) ) / ( 1.0 + fRate ); else -fPmt = fFv * fInterest / ( fTerm - 1.0 ) + fPv * fInterest / ( 1.0 - 1.0 / fTerm ); +fPmt = fFv * fRate / ( fTerm - 1.0 ) + fPv * fRate / ( 1.0 - 1.0 / fTerm ); } return -fPmt; } -double GetZw( double fInterest, double fNper, double fPmt, double fPv, sal_Int32 nPayType ) +double GetZw( double fRate, double fNper, double fPmt, double fPv, sal_Int32 nPayType ) { double fFv; -if( fInterest == 0.0 ) +if( fRate == 0.0 ) fFv = fPv + fPmt * fNper; else { -double fTerm = pow( 1.0 + fInterest, fNper ); +double fTerm = pow( 1.0 + fRate, fNper ); if( nPayType > 0 ) -fFv = fPv * fTerm + fPmt * ( 1.0 + fInterest ) * ( fTerm - 1.0 ) / fInterest; +fFv = fPv * fTerm + fPmt * ( 1.0 + fRate ) * ( fTerm - 1.0 ) / fRate; else -fFv = fPv * fTerm + fPmt * ( fTerm - 1.0 ) / fInterest; +fFv = fPv * fTerm + fPmt * ( fTerm - 1.0 ) / fRate; } return -fFv; diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 6acccd5f4000..2b77d2e6a89c 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -155,8 +155,8 @@ double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_In /// @throws css::lang::IllegalArgumentException double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ); -double GetRmz( double fInterest, double fNper, double fPv, double fFv, sal_Int32 nPayType ); -double GetZw( double fInterest, double fNper, double fPmt, double fPv, sal_Int32 nPayType ); +double GetRmz( double fRate, double fNper, double fPv, double fFv, sal_Int32 nPayType ); +double GetZw( double fRate, double fNper, double fPmt, double fPv, sal_Int32 nPayType ); /// @throws css::uno::RuntimeException /// @throws css::lang::IllegalArgumentException ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysishelper.cxx |4 ++-- scaddins/source/analysis/analysishelper.hxx |4 ++-- scaddins/source/analysis/financial.cxx | 12 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) New commits: commit 8f416c19c100061e57ec76cc0dc9a1be3dd05c1a Author: Johnny_M Date: Fri Nov 3 22:14:23 2017 +0100 Translate German function names in Calc (financial) This follows up with translation of function names, similarly to how it was earlier done for variable names. Change-Id: Icf784ad96db41d341ae39d2854c7df2844b66a91 Reviewed-on: https://gerrit.libreoffice.org/44286 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 9594f8e6d6e6..c66eb30afe9b 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -1231,7 +1231,7 @@ double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal } -double GetRmz( double fRate, double fNper, double fPv, double fFv, sal_Int32 nPayType ) +double GetPmt( double fRate, double fNper, double fPv, double fFv, sal_Int32 nPayType ) { double fPmt; if( fRate == 0.0 ) @@ -1249,7 +1249,7 @@ double GetRmz( double fRate, double fNper, double fPv, double fFv, sal_Int32 nPa } -double GetZw( double fRate, double fNper, double fPmt, double fPv, sal_Int32 nPayType ) +double GetFv( double fRate, double fNper, double fPmt, double fPv, sal_Int32 nPayType ) { double fFv; if( fRate == 0.0 ) diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 2b77d2e6a89c..fa68eee35f0d 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -155,8 +155,8 @@ double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_In /// @throws css::lang::IllegalArgumentException double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ); -double GetRmz( double fRate, double fNper, double fPv, double fFv, sal_Int32 nPayType ); -double GetZw( double fRate, double fNper, double fPmt, double fPv, sal_Int32 nPayType ); +double GetPmt( double fRate, double fNper, double fPv, double fFv, sal_Int32 nPayType ); +double GetFv( double fRate, double fNper, double fPmt, double fPv, sal_Int32 nPayType ); /// @throws css::uno::RuntimeException /// @throws css::lang::IllegalArgumentException diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx index eed81955..ccbf0cd02b69 100644 --- a/scaddins/source/analysis/financial.cxx +++ b/scaddins/source/analysis/financial.cxx @@ -129,7 +129,7 @@ double SAL_CALL AnalysisAddIn::getCumprinc( double fRate, sal_Int32 nNumPeriods, fVal <= 0.0 || ( nPayType != 0 && nPayType != 1 ) ) throw css::lang::IllegalArgumentException(); -fPmt = GetRmz( fRate, nNumPeriods, fVal, 0.0, nPayType ); +fPmt = GetPmt( fRate, nNumPeriods, fVal, 0.0, nPayType ); fPpmt = 0.0; @@ -149,9 +149,9 @@ double SAL_CALL AnalysisAddIn::getCumprinc( double fRate, sal_Int32 nNumPeriods, for( sal_uInt32 i = nStart ; i <= nEnd ; i++ ) { if( nPayType > 0 ) -fPpmt += fPmt - ( GetZw( fRate, double( i - 2 ), fPmt, fVal, 1 ) - fPmt ) * fRate; +fPpmt += fPmt - ( GetFv( fRate, double( i - 2 ), fPmt, fVal, 1 ) - fPmt ) * fRate; else -fPpmt += fPmt - GetZw( fRate, double( i - 1 ), fPmt, fVal, 0 ) * fRate; +fPpmt += fPmt - GetFv( fRate, double( i - 1 ), fPmt, fVal, 0 ) * fRate; } RETURN_FINITE( fPpmt ); @@ -167,7 +167,7 @@ double SAL_CALL AnalysisAddIn::getCumipmt( double fRate, sal_Int32 nNumPeriods, fVal <= 0.0 || ( nPayType != 0 && nPayType != 1 ) ) throw css::lang::IllegalArgumentException(); -fPmt = GetRmz( fRate, nNumPeriods, fVal, 0.0, nPayType ); +fPmt = GetPmt( fRate, nNumPeriods, fVal, 0.0, nPayType ); fIpmt = 0.0; @@ -185,9 +185,9 @@ double SAL_CALL AnalysisAddIn::getCumipmt( double fRate, sal_Int32 nNumPeriods, for( sal_uInt32 i = nStart ; i <= nEnd ; i++ ) { if( nPayType > 0 ) -fIpmt += GetZw( fRate, double( i - 2 ), fPmt, fVal, 1 ) - fPmt; +fIpmt += GetFv( fRate, double( i - 2 ), fPmt, fVal, 1 ) - fPmt; else -fIpmt += GetZw( fRate, double( i - 1 ), fPmt, fVal, 0 ); +fIpmt += GetFv( fRate, double( i - 1 ), fPmt, fVal, 0 ); } fIpmt *= fRate; ___ Libreoffice-commits mailing list libreoffice-c
[Libreoffice-commits] core.git: sc/source
sc/source/core/inc/interpre.hxx | 14 +- sc/source/core/tool/interpr2.cxx | 266 +++ 2 files changed, 140 insertions(+), 140 deletions(-) New commits: commit df7bfbb7e401998a9ba247eb939af1fb3245626b Author: Johnny_M Date: Fri Nov 3 21:47:37 2017 +0100 Correct German variables/functions names translation in Calc (financial) This does the following: 1) Translates the variable fDia -> fSyd (see https://translations.documentfoundation.org/de/libo54_help/translate/#search=DIA&sfields=target&soptions=exact,case ) This was missed on previous translations. 2) Corrects earlier variables translation, where appropriate (the earlier translation was literal; now the translation corresponds to the specific terms used for these variables in Calc in English): fInterest -> fRate fValue -> fCost fRest -> fSalvage fTimeLength -> fLife As example, compare the arguments of the following function: German: https://help.libreoffice.org/Calc/Financial_Functions_Part_Two/de#RMZ English: https://help.libreoffice.org/Calc/Financial_Functions_Part_Two#PMT And: German: https://help.libreoffice.org/Calc/Financial_Functions_Part_One/de#GDA English: https://help.libreoffice.org/Calc/Financial_Functions_Part_One#DDB 3) Corrects earlier function and variable translation (the earlier translation was literal; now the translation corresponds to the specific term used for this in Calc in English): ScGetCompoundInterest() -> ScGetIpmt() fCompoundInterest -> fIpmt See for needed translation: https://translations.documentfoundation.org/de/libo54_help/translate/#search=ZINSZ&sfields=target&soptions=exact,case See for earlier translation: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=e96d2593138d9e8eb197e21fa3087b45eae676c0;ds=sidebyside 4) Correct earlier variable renaming: bFlag -> bPayInAdvance That variable corresponds to the "Type" parameter in, e.g.: https://help.libreoffice.org/Calc/Financial_Functions_Part_Three#FV See for earlier renaming: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=8340f6dcfb2f391feeddb1bc24931cd6f145669a;ds=sidebyside Note: The bFlag means something different for the VDB function (see https://help.libreoffice.org/Calc/Financial_Functions_Part_Three#VDB ). Therefore, the change for the VDB is: bFlag -> bType Change-Id: Id258d953be6ba3de113d762ee944786389702b55 Reviewed-on: https://gerrit.libreoffice.org/44285 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 9917e943fe59..c21f3d2fdd21 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -771,31 +771,31 @@ private: void ScMIRR(); void ScISPMT(); -static double ScGetPV(double fInterest, double fNper, double fPmt, +static double ScGetPV(double fRate, double fNper, double fPmt, double fFv, bool bPayInAdvance); void ScPV(); void ScSYD(); -static double ScGetDDB(double fValue, double fRest, double fTimeLength, +static double ScGetDDB(double fCost, double fSalvage, double fLife, double fPeriod, double fFactor); void ScDDB(); void ScDB(); -static double ScInterVDB(double fValue, double fRest, double fTimeLength, double fTimeLength1, +static double ScInterVDB(double fCost, double fSalvage, double fLife, double fLife1, double fPeriod, double fFactor); void ScVDB(); void ScPDuration(); void ScSLN(); -static double ScGetPMT(double fInterest, double fNper, double fPv, +static double ScGetPMT(double fRate, double fNper, double fPv, double fFv, bool bPayInAdvance); void ScPMT(); void ScRRI(); -static double ScGetFV(double fInterest, double fNper, double fPmt, - double fPv, bool bFlag); +static double ScGetFV(double fRate, double fNper, double fPmt, + double fPv, bool bPayInAdvance); void ScFV(); void ScNper(); static bool RateIteration(double fNper, double fPayment, double fPv, double fFv, bool bPayType, double& fGuess); void ScRate(); -double ScGetCompoundInterest(double fInterest, double fPer, double fNper, double fPv, +double ScGetIpmt(double fRate, double fPer, double fNper, double fPv, double fFv, bool bPayInAdvance, double& fPmt); void ScIpmt(); void ScPpmt(); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 955a9ae29366..d4c27a4d0fd5 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/opinlinefun_finacial.cxx | 216 - 1 file changed, 108 insertions(+), 108 deletions(-) New commits: commit 872055b5dee06b996635b263dfde748546fb00ee Author: Johnny_M Date: Sat Nov 4 12:58:39 2017 +0100 Translate German variable names in Calc (financial) As in https://gerrit.libreoffice.org/43987 This is for string literals only. Variables and functions like "nKorrValDecl" and "GetRmz" will be translated on a separate, later Gerrit change. Change-Id: I86c163f40bc13c800315f426f5815d141853644b Reviewed-on: https://gerrit.libreoffice.org/44295 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx b/sc/source/core/opencl/opinlinefun_finacial.cxx index e57da04f50f3..38eb41db02db 100644 --- a/sc/source/core/opencl/opinlinefun_finacial.cxx +++ b/sc/source/core/opencl/opinlinefun_finacial.cxx @@ -10,7 +10,7 @@ #ifndef SC_OPENCL_OPINLINFUN_finacial #define SC_OPENCL_OPINLINFUN_finacial -std::string nKorrValDecl ="double constant nKorrVal[]" +std::string nKorrValDecl ="double constant nCorrVal[]" "= {0, 9e-1, 9e-2, 9e-3, 9e-4, 9e-5, 9e-6, 9e-7, " "9e-8,9e-9, 9e-10, 9e-11, 9e-12, 9e-13, 9e-14, 9e-15};\n"; @@ -36,88 +36,88 @@ std::string Round = "nIndex = 15;\n" "else if ( nIndex <= 1 )\n" "nIndex = 0;\n" -"fValue = floor( fValue + 0.5 + nKorrVal[nIndex] );\n" +"fValue = floor( fValue + 0.5 + nCorrVal[nIndex] );\n" "return fValue;\n" "}\n"; std::string GetRmzDecl = -"double GetRmz( double fZins, double fZzr, double fBw, double fZw,int nF );\n"; +"double GetRmz( double fRate, double fNper, double fPv, double fFv, int nPayType );\n"; std::string GetRmz= -"double GetRmz( double fZins, double fZzr, double fBw, double fZw, int nF )\n" +"double GetRmz( double fRate, double fNper, double fPv, double fFv, int nPayType )\n" "{\n" -"double fRmz;\n" -"if( fZins == 0.0 )\n" -"fRmz = ( fBw + fZw ) / fZzr;\n" +"double fPmt;\n" +"if( fRate == 0.0 )\n" +"fPmt = ( fPv + fFv ) / fNper;\n" "else\n" "{\n" -"double fTerm = pow( 1.0 + fZins, fZzr );\n" -"if( nF > 0 )\n" -"fRmz = ( fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins / ( 1.0 - 1." -"0 / fTerm ) ) / ( 1.0 + fZins );\n" +"double fTerm = pow( 1.0 + fRate, fNper );\n" +"if( nPayType > 0 )\n" +"fPmt = ( fFv * fRate / ( fTerm - 1.0 ) + fPv * fRate / ( 1.0 - 1." +"0 / fTerm ) ) / ( 1.0 + fRate );\n" "else\n" -"fRmz = fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins /( 1.0 - 1.0 " +"fPmt = fFv * fRate / ( fTerm - 1.0 ) + fPv * fRate /( 1.0 - 1.0 " "/ fTerm );\n" "}\n" -"return -fRmz;\n" +"return -fPmt;\n" "}\n"; std::string GetRmz_newDecl = -"double GetRmz_new( double fZins, double fZzr, double fBw, double fZw," -"int nF );\n"; +"double GetRmz_new( double fRate, double fNper, double fPv, double fFv," +"int nPayType );\n"; std::string GetRmz_new= -"double GetRmz_new( double fZins, double fZzr, double fBw, double fZw," -"int nF)\n" +"double GetRmz_new( double fRate, double fNper, double fPv, double fFv," +"int nPayType)\n" "{\n" -"double fRmz;\n" -"double fTerm = pow( 1.0 + fZins, fZzr );\n" -"if( nF > 0 )\n" -"fRmz = ( fZw * fZins *pow ( fTerm - 1.0,-1 ) + fBw * fZins *pow( " -"( 1.0 - pow( fTerm,-1) ),-1) )* pow ( 1.0 + fZins,-1 );\n" +"double fPmt;\n" +"double fTerm = pow( 1.0 + fRate, fNper );\n" +"if( nPayType > 0 )\n" +"fPmt = ( fFv * fRate *pow ( fTerm - 1.0,-1 ) + fPv * fRate *pow( " +"( 1.0 - pow( fTerm,-1) ),-1) )* pow ( 1.0 + fRate,-1 );\n" "else\n" -"fRmz = fZw * fZins *pow ( fTerm - 1.0 ,-1) + fBw * fZins *pow( " +"fPmt = fFv * fRate *pow ( fTerm - 1.0 ,-1) + fPv * fRate *pow( " "1.0 - pow( fTerm,-1),-1 );\n" -"return -fRmz;\n" +"return -fPmt;\n" "}\n"; std::string GetZwDecl = -"double GetZw( double fZins, double fZzr, double fRmz," -"double fBw, int nF );\n"; +"double GetZw( double fRate, double fNper, double fPmt," +"double fPv, int nPayType );\n"; std::string GetZw = -"dou
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/op_financial.cxx | 52 - sc/source/core/opencl/opinlinefun_finacial.cxx | 46 +++--- 2 files changed, 49 insertions(+), 49 deletions(-) New commits: commit 971b81b1c0922ab749eaf620cbf56d9780a15cfb Author: Johnny_M Date: Sat Nov 11 16:00:33 2017 +0100 Translate German variable and function names in Calc (financial) This follows up on https://gerrit.libreoffice.org/44295 Change-Id: Iac8351161a5e0d79a61fbb06d96985f92db68e3c Reviewed-on: https://gerrit.libreoffice.org/44626 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx index 3c9a6d775c35..cec37d9a5dd0 100644 --- a/sc/source/core/opencl/op_financial.cxx +++ b/sc/source/core/opencl/op_financial.cxx @@ -396,8 +396,8 @@ void OpINTRATE::GenSlidingWindowFunction(std::stringstream& ss, void OpFV::BinInlineFun(std::set& decls, std::set& funs) { -decls.insert(GetZwDecl); -funs.insert(GetZw); +decls.insert(GetFVDecl); +funs.insert(GetFV); } void OpFV::GenSlidingWindowFunction(std::stringstream& ss, @@ -438,7 +438,7 @@ void OpFV::GenSlidingWindowFunction(std::stringstream& ss, ss << ";\n"; } } -ss << "tmp = GetZw(arg0, arg1, arg2, arg3, arg4);\n"; +ss << "tmp = GetFV(arg0, arg1, arg2, arg3, arg4);\n"; ss << "return tmp;\n"; ss << "}"; } @@ -446,8 +446,8 @@ void OpFV::GenSlidingWindowFunction(std::stringstream& ss, void OpIPMT::BinInlineFun(std::set& decls, std::set& funs) { -decls.insert(GetZwDecl); -funs.insert(GetZw); +decls.insert(GetFVDecl); +funs.insert(GetFV); } void OpIPMT::GenSlidingWindowFunction(std::stringstream& ss, @@ -509,10 +509,10 @@ void OpIPMT::GenSlidingWindowFunction(std::stringstream& ss, ss << "else\n"; ss << "{\n"; ss << "if(arg5 > 0.0)\n"; -ss << "tmp = GetZw(arg0, arg1 - 2.0, pmt, arg3, 1.0)"; +ss << "tmp = GetFV(arg0, arg1 - 2.0, pmt, arg3, 1.0)"; ss << " - pmt;\n"; ss << "else\n"; -ss << "tmp = GetZw(arg0, arg1 - 1.0, pmt, arg3, 0.0);\n"; +ss << "tmp = GetFV(arg0, arg1 - 1.0, pmt, arg3, 0.0);\n"; ss << "}\n"; ss << "tmp = tmp * arg0;\n"; ss << "return tmp;\n"; @@ -795,8 +795,8 @@ void Fvschedule::GenSlidingWindowFunction( void Cumipmt::BinInlineFun(std::set& decls, std::set& funs) { -decls.insert(GetRmz_newDecl); decls.insert(GetZw_newDecl); -funs.insert(GetRmz_new);funs.insert(GetZw_new); +decls.insert(GetPMT_newDecl); decls.insert(GetFV_newDecl); +funs.insert(GetPMT_new);funs.insert(GetFV_new); } void Cumipmt::GenSlidingWindowFunction( std::stringstream &ss, const std::string &sSymName, SubArguments & @@ -891,7 +891,7 @@ vSubArguments) ss <<"nPayType = (int)"<GenSlidingWindowDeclRef(); ss <<";\n"; ss <<"double fPmt;\n"; -ss <<"fPmt = GetRmz_new( fRate, nNumPeriods, fVal, 0.0, nPayType );\n"; +ss <<"fPmt = GetPMT_new( fRate, nNumPeriods, fVal, 0.0, nPayType );\n"; ss <<"double tmp = 0.0;\n"; ss <<"if( nStartPer == 1 )\n"; ss <<"{\n"; @@ -902,10 +902,10 @@ vSubArguments) ss <<"for( ; nStartPer<= nEndPer ; nStartPer++ )\n"; ss <<"{\n"; ss <<"if( nPayType > 0 )\n"; -ss <<"tmp += GetZw_new( fRate, nStartPer - 2 , "; +ss <<"tmp += GetFV_new( fRate, nStartPer - 2 , "; ss <<"fPmt, fVal, 1 ) - fPmt;\n"; ss <<"else\n"; -ss <<"tmp += GetZw_new( fRate, nStartPer - 1 , "; +ss <<"tmp += GetFV_new( fRate, nStartPer - 1 , "; ss <<"fPmt, fVal, 0 );\n"; ss <<"}\n"; ss <<"tmp *= fRate;\n"; @@ -1592,8 +1592,8 @@ void OpTbilleq::GenSlidingWindowFunction( void OpCumprinc::BinInlineFun(std::set& decls, std::set& funs) { -decls.insert(GetRmz_newDecl); decls.insert(GetZw_newDecl); -funs.insert(GetRmz_new);funs.insert(GetZw_new); +decls.insert(GetPMT_newDecl); decls.insert(GetFV_newDecl); +funs.insert(GetPMT_new);funs.insert(GetFV_new); } void OpCumprinc::GenSlidingWindowFunction(std::
[Libreoffice-commits] core.git: basctl/source connectivity/source
basctl/source/basicide/baside2b.cxx |2 +- connectivity/source/drivers/dbase/DTable.cxx |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 97b5b99d715733dde6c0e8ed59b3f16236a7fff1 Author: Johnny_M Date: Sat Nov 11 15:10:18 2017 +0100 Translate German debug strings Change-Id: If4da1df3f7889d2b579fcde4fec5ac3c82026555 Reviewed-on: https://gerrit.libreoffice.org/44627 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 34b3c62126af..a48c70a43446 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1015,7 +1015,7 @@ void EditorWindow::CreateEditEngine() pBindings->Invalidate(SID_BASICIDE_STAT_TITLE); } -DBG_ASSERT(rModulWindow.GetBreakPointWindow().GetCurYOffset() == 0, "CreateEditEngine: Brechpunkte verschoben?"); +DBG_ASSERT(rModulWindow.GetBreakPointWindow().GetCurYOffset() == 0, "CreateEditEngine: breakpoints moved?"); // set readonly mode for readonly libraries ScriptDocument aDocument(rModulWindow.GetDocument()); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 10372b44a13c..116c47b56d60 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2586,7 +2586,7 @@ bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 { std::size_t nEntryLen = m_aHeader.recordLength; -OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position"); +OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: invalid record position"); std::size_t nPos = m_aHeader.headerLength + (std::size_t)(m_nFilePos-1) * nEntryLen; m_pFileStream->Seek(nPos); @@ -2728,7 +2728,7 @@ bool ODbaseTable::AllocBuffer() bool ODbaseTable::WriteBuffer() { -OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position"); +OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: invalid record position"); // position on desired record: std::size_t nPos = m_aHeader.headerLength + (long)(m_nFilePos-1) * m_aHeader.recordLength; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforfind.cxx | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 5c1cadfd964c35bd29308304f75ff90d22e13700 Author: Johnny_M Date: Sat Nov 11 16:37:43 2017 +0100 Translate German variable names Change-Id: I980d9e36c2175b1010a7d020e71d59a79e11dc36 Reviewed-on: https://gerrit.libreoffice.org/44631 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 5f717108f263..7e4f3f69e128 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -3880,11 +3880,11 @@ bool ImpSvNumberInputScan::IsNumberFormat( const OUString& rString, // s } else { -double fZaehler = StringToDouble(sStrArray[nNums[0]]); -double fNenner = StringToDouble(sStrArray[nNums[1]]); -if (fNenner != 0.0) +double fNumerator = StringToDouble(sStrArray[nNums[0]]); +double fDenominator = StringToDouble(sStrArray[nNums[1]]); +if (fDenominator != 0.0) { -fOutNumber = fZaehler/fNenner; +fOutNumber = fNumerator/fDenominator; } else { @@ -3907,11 +3907,11 @@ bool ImpSvNumberInputScan::IsNumberFormat( const OUString& rString, // s if (k == nNumericsCnt-2) { -double fZaehler = StringToDouble(sStrArray[nNums[k]]); -double fNenner = StringToDouble(sStrArray[nNums[k + 1]]); -if (fNenner != 0.0) +double fNumerator = StringToDouble(sStrArray[nNums[k]]); +double fDenominator = StringToDouble(sStrArray[nNums[k + 1]]); +if (fDenominator != 0.0) { -fOutNumber += fZaehler/fNenner; +fOutNumber += fNumerator/fDenominator; } else { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source include/svx sc/source sd/source sfx2/source svx/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx |6 +++--- include/svx/obj3d.hxx |2 +- sc/source/core/tool/interpr4.cxx |8 sd/source/filter/ppt/pptin.hxx |2 +- sfx2/source/appl/appinit.cxx |4 ++-- sfx2/source/doc/objxtor.cxx|2 +- svx/source/fmcomp/gridcell.cxx |2 +- 7 files changed, 13 insertions(+), 13 deletions(-) New commits: commit 425c64fa274ab62ad2f2b0f2ea4f922d35aa747d Author: Johnny_M Date: Sat Nov 11 18:31:05 2017 +0100 Translate German comments and debug strings Change-Id: I12c92ecc270e65cb99e38e9179cf354a8c0708aa Reviewed-on: https://gerrit.libreoffice.org/44633 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index b3e71892e671..482133b88553 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -1609,7 +1609,7 @@ namespace if (pCondition->getChild(i)->getNodeType() == SQLNodeType::Equal) i++; -// Bedingung parsen +// parse the condition aCondition = ParseCondition(rController ,pCondition ,_pView->getDecimalSeparator() @@ -2789,7 +2789,7 @@ OUString OQueryDesignView::getStatement() if( aFieldListStr.isEmpty() ) return OUString(); -// Exceptionhandling, if no fields have been passed we should not +// Exception handling, if no fields have been passed we should not // change the tab page // TabBarSelectHdl will query the SQL-OUString for STATEMENT_NOFIELDS // and trigger a error message @@ -2804,7 +2804,7 @@ OUString OQueryDesignView::getStatement() // exist but no tables exist (and aFieldListStr has its length, I secure this above) OUStringBuffer aHavingStr,aCriteriaListStr; -// - Kriterien aufbauen -- +// - build the criteria -- if (!GenerateCriterias(this,aCriteriaListStr,aHavingStr,rFieldList, nTabcount > 1)) return OUString(); diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 34a9dab81010..008482a1dba6 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -64,7 +64,7 @@ class E3DObjGeoData : public SdrObjGeoData { public: basegfx::B3DRange maLocalBoundVol;// surrounding volume of the object -basegfx::B3DHomMatrix maTransformation; // lokal transformations +basegfx::B3DHomMatrix maTransformation; // local transformations E3DObjGeoData() {} }; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 50350fac8e85..6a05c5c22795 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -502,7 +502,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, if (!aCell.isEmpty()) { FormulaError nErr = FormulaError::NONE; -sal_uInt16 nType = 0; // 0 = Zahl; 1 = String +sal_uInt16 nType = 0; // 0 = number; 1 = string double nVal = 0.0; OUString aStr; boolbOk = true; @@ -3244,13 +3244,13 @@ void ScInterpreter::ScMacro() OUString aBasicStr; if (pObject->GetParent()) { -aBasicStr = pObject->GetParent()->GetName();// Dokumentenbasic +aBasicStr = pObject->GetParent()->GetName();// document BASIC } else { -aBasicStr = SfxGetpApp()->GetName(); // Applikationsbasic +aBasicStr = SfxGetpApp()->GetName();// application BASIC } -// Parameter-Array zusammenbauen +// assemble a parameter array SbxArrayRef refPar = new SbxArray; bool bOk = true; diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 468aae6c53dc..f4b6de81d752 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -31,7 +31,7 @@ class SfxMedium; /* |* -|* lokaler Import +|* local import |* \/ diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 80e14989ec48..a026765176b4 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -234,7 +234,7 @@ void SfxApplication::Initialize_Impl() Registrations_Impl(); -// Subklasse initialisieren +// initialize the subclass pImpl->bDowning =
[Libreoffice-commits] core.git: sfx2/source smoketest/data soltools/cpp
sfx2/source/appl/appserv.cxx |2 +- sfx2/source/dialog/tabdlg.cxx|2 +- sfx2/source/doc/objembed.cxx |2 +- smoketest/data/Basic/Standard/Global.xml |2 +- soltools/cpp/_nlist.c|9 - 5 files changed, 8 insertions(+), 9 deletions(-) New commits: commit 47b8034efc33a1c022d4a1f8385e3739aca86442 Author: Johnny_M Date: Wed Jul 5 20:09:03 2017 +0200 Translate German comments/debug strings (leftovers in dirs sdext to soltools) Translates leftovers found using a custom regex and manually checking the rest of the affected file. Additionally: - Translation of someone's attempts at Spanish in the .java file Change-Id: Ie3a761bc1a8e302247d5dd6e93a6bc4cb3e85a9f Reviewed-on: https://gerrit.libreoffice.org/39609 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index d9910d314a70..363ab7f60ef8 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -361,7 +361,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) return; } -// aus verschachtelten Requests nach 100ms nochmal probieren +// try from nested requests again after 100ms if( Application::GetDispatchLevel() > 1 ) { /* Don't save the request for closing the application and try it later diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 592f59509829..ae36f224a6a6 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1045,7 +1045,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) DBG_ASSERT( m_pImpl->aData.size(), "no Pages registered" ); -// Tab Page schon da? +// Tab Page already there? VclPtr pTabPage = dynamic_cast (pTabCtrl->GetTabPage( nId )); Data_Impl* pDataObject = Find( m_pImpl->aData, nId ); diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index 7428a5e39ed7..422e3ea62842 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -189,7 +189,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev, sal_uInt16 nAspect ) { tools::Rectangle aVisArea = GetVisArea( nAspect ); -// MapUnit des Ziels +// MapUnit of the target MapMode aMapMode( GetMapUnit() ); aMapMode.SetScaleX( rScaleX ); aMapMode.SetScaleY( rScaleY ); diff --git a/smoketest/data/Basic/Standard/Global.xml b/smoketest/data/Basic/Standard/Global.xml index 220fb83b7f98..fa28297fe695 100644 --- a/smoketest/data/Basic/Standard/Global.xml +++ b/smoketest/data/Basic/Standard/Global.xml @@ -528,7 +528,7 @@ Sub ShowOptionsDlg REM show the dialog gOptionsDialog.execute() - ' jetzt läuft der Dialog, bis ein Button gedrückt wird + ' now the dialog will run until a button is pressed Select Case (gDlgState) case cDlgOk diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c index 3dbb54c7d1a7..20118f363b83 100644 --- a/soltools/cpp/_nlist.c +++ b/soltools/cpp/_nlist.c @@ -27,11 +27,10 @@ Nlist *kwdefined; char wd[128]; /* -ER: Tabelle extra gross gemacht, da es anscheinend ein Problem mit der -der Verkettung gibt, irgendwann irgendwo wird mal ein nlist->next -ueberschrieben, was in eineme SIGSEGV resultiert. -Den GDB mit watchpoint hab ich aber nach 2 Tagen abgebrochen.. -so loeppt's jedenfalls erstmal.. +ER: Table was made extra large, because there seems to be a problem with the +chaining. An nlist->next is sometimes overwritten somewhere, which +results in a SIGSEGV. I canceled the GDB with watchpoint after 2 days, though.. +It works this way for now.. */ #define NLSIZE 15000 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sot/source
sot/source/base/exchange.cxx | 33 +--- sot/source/base/filelist.cxx |4 +- sot/source/base/formats.cxx | 64 ++- sot/source/base/object.cxx | 11 +++--- sot/source/sdstor/stgavl.cxx |2 - sot/source/sdstor/stgcache.cxx |2 - sot/source/sdstor/stgdir.cxx |4 +- sot/source/sdstor/stgio.cxx | 10 +++--- sot/source/sdstor/stgstrms.cxx | 14 sot/source/sdstor/storinfo.cxx |2 - sot/source/sdstor/ucbstorage.cxx |2 - 11 files changed, 71 insertions(+), 77 deletions(-) New commits: commit 0018fd1b81b3c4ec5ee1de092760479aeae7cd96 Author: Johnny_M Date: Wed Jul 12 22:41:14 2017 +0200 Translate German comments/debug strings (leftovers in the sot dir) Translates leftovers found using a custom regex and manually checking the rest of the affected file. Change-Id: I0e44957d58e089b82738c65a8774d1a45ea7068d Reviewed-on: https://gerrit.libreoffice.org/39879 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 286f4c7e49e2..f4a51bff5121 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -37,12 +37,11 @@ using namespace::com::sun::star::uno; using namespace::com::sun::star::datatransfer; /* -In diesen Tabellen stehen alle im Office verwendeten MimeTypes, -Format-Bezeichner und Types. -Die Tabelle ist nach den Formatstring-Ids sortiert und jede Id -ist um genau 1 groesser als ihre Vorgaenger-Id, damit die Id als -Tabellenindex benutzt werden kann. -*/ + * These tables contain all MimeTypes, format identifiers, and types used in + * the Office. The table is sorted by the format string ID, and each ID is + * exactly 1 greater than its predecessor ID, so that the ID can be used as a + * table index. + */ struct DataFlavorRepresentation { const char*pMimeType; @@ -251,12 +250,12 @@ static tDataFlavorList& InitFormats_Impl() |* |*SotExchange::RegisterFormatName() |* -|*Beschreibung CLIP.SDW +|*Description CLIP.SDW */ SotClipboardFormatId SotExchange::RegisterFormatName( const OUString& rName ) { const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get(); -// teste zuerst die Standard - Name +// test the default first - name for( SotClipboardFormatId i = SotClipboardFormatId::STRING; i <= SotClipboardFormatId::FILE_LIST; ++i ) if( rName.equalsAscii( pFormatArray_Impl[ static_cast(i) ].pName ) ) return i; @@ -270,7 +269,7 @@ SotClipboardFormatId SotExchange::RegisterFormatName( const OUString& rName ) ? SotClipboardFormatId::STARCHART_50 : i ); -// dann in der dynamischen Liste +// then in the dynamic list tDataFlavorList& rL = InitFormats_Impl(); for( tDataFlavorList::size_type i = 0; i < rL.size(); i++ ) { @@ -292,7 +291,7 @@ SotClipboardFormatId SotExchange::RegisterFormatName( const OUString& rName ) SotClipboardFormatId SotExchange::RegisterFormatMimeType( const OUString& rMimeType ) { const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get(); -// teste zuerst die Standard - Name +// test the default first - name for( SotClipboardFormatId i = SotClipboardFormatId::STRING; i <= SotClipboardFormatId::FILE_LIST; ++i ) if( rMimeType.equalsAscii( pFormatArray_Impl[ static_cast(i) ].pMimeType ) ) return i; @@ -301,7 +300,7 @@ SotClipboardFormatId SotExchange::RegisterFormatMimeType( const OUString& rMimeT if( rMimeType.equalsAscii( pFormatArray_Impl[ static_cast(i) ].pMimeType ) ) return i; -// dann in der dynamischen Liste +// then in the dynamic list tDataFlavorList& rL = InitFormats_Impl(); for( tDataFlavorList::size_type i = 0; i < rL.size(); i++ ) { @@ -324,7 +323,7 @@ SotClipboardFormatId SotExchange::RegisterFormatMimeType( const OUString& rMimeT |* |*SotExchange::RegisterFormatName() |* -|*Beschreibung CLIP.SDW +|*Description CLIP.SDW */ SotClipboardFormatId SotExchange::RegisterFormat( const DataFlavor& rFlavor ) { @@ -430,7 +429,7 @@ SotClipboardFormatId SotExchange::GetFormatIdFromMimeType( const OUString& rMime ? SotClipboardFormatId::STARCHART_50 : i ); -// dann in der dynamischen Liste +// then in the dynamic list tDataFlavorList& rL = InitFormats_Impl(); for( tDataFlavorList::size_type i = 0; i < rL.size(); i++ ) @@ -447,11 +446,11 @@ SotClipboardFormatId SotExchange::GetFormatIdFromMimeType( const OUString& rM
[Libreoffice-commits] core.git: include/svx include/vcl sc/source sw/source
include/svx/sxcecitm.hxx|8 include/vcl/event.hxx |2 +- sc/source/filter/inc/eeparser.hxx |2 +- sc/source/ui/navipi/navipi.cxx |2 +- sw/source/core/table/swnewtable.cxx |4 ++-- sw/source/filter/html/htmlftn.cxx | 16 6 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 2b530e4f3fa516ef1d1d3699174e6f15ffda5305 Author: Johnny_M Date: Fri Jul 14 22:09:26 2017 +0200 Translate randomly found German comments Change-Id: I7db515e04d3845c3ec51c7f88fe51bcafddd5268 Reviewed-on: https://gerrit.libreoffice.org/39987 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index babac04aff48..a1b8ab41675b 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -45,8 +45,8 @@ public: // class SdrCaptionEscIsRelItem -// sal_True=Linienaustrittsposition relativ -// sal_False=Linienaustrittsposition absolut +// sal_True = line escape position is relative +// sal_False = line escape position is absolute class SVX_DLLPUBLIC SdrCaptionEscIsRelItem: public SdrYesNoItem { public: @@ -57,7 +57,7 @@ public: // class SdrCaptionEscRelItem -// Relativer Linienaustritt +// relative line escape // 0 = 0.00% = up resp. left, // 1 = 100.00% = right resp. down // only when SdrCaptionEscIsRelItem=TRUE @@ -71,7 +71,7 @@ public: // class SdrCaptionEscAbsItem -// Absoluter Linienaustritt +// absolute line escape // 0 = up resp. left, // >0 = in direction right resp. down // only when SdrCaptionEscIsRelItem=FALSE diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 26ce846ed9f4..2c21dd52d8ab 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -104,7 +104,7 @@ namespace o3tl template<> struct typed_flags : is_typed_flags {}; } -// Maus-Buttons +// Mouse buttons #define MOUSE_LEFT ((sal_uInt16)0x0001) #define MOUSE_MIDDLE((sal_uInt16)0x0002) #define MOUSE_RIGHT ((sal_uInt16)0x0004) diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index 9ecf023f59f9..4927817f817b 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -40,7 +40,7 @@ struct ScHTMLImage OUStringaFilterName; std::unique_ptr pGraphic; // is taken over by WriteToDocument -sal_CharnDir; // 1==hori, 2==verti, 3==beides +sal_CharnDir; // 1==hori, 2==verti, 3==both ScHTMLImage() : aSize( 0, 0 ), aSpace( 0, 0 ), nDir( nHorizontal ) diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 650854ec8c2f..af2b0c5778fc 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -397,7 +397,7 @@ void ScNavigatorDlg::UpdateButtons() aTbxCmd->CheckItem(nScenarioId, eMode == NAV_LMODE_SCENARIOS); aTbxCmd->CheckItem(nZoomId, eMode != NAV_LMODE_NONE); -// Umschalten-Button: +// the toggle button: if (eMode == NAV_LMODE_SCENARIOS || eMode == NAV_LMODE_NONE) { aTbxCmd->EnableItem(nChangeRootId, false); diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index f484a65c200c..391e1b1081f3 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -1487,7 +1487,7 @@ bool SwTable::NewSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn lcl_UnMerge( *this, *rBoxes[*pCurrBox++], nCnt, bSameHeight ); CHECK_TABLE( *this ) -//Layout updaten +// update the layout aFndBox.MakeFrames( *this ); return true; @@ -1545,7 +1545,7 @@ bool SwTable::InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, ++nRowIdx; if( nRowIdx ) lcl_ChangeRowSpan( *this, nCnt, --nRowIdx, true ); -//Layout update +// update the layout aFndBox.MakeFrames( *this ); } CHECK_TABLE( *this ) diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 9f2fea2a1743..a4e18ab4d753 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -37,7 +37,7 @@ struct SwHTMLFootEndNote_Impl std::vector aNames; OUString sName; -OUString sContent;// Infos fuer die letzte Fussnote +OUString sContent;// information for the last footnote bool bEndNote; bool bFixed; }; @@ -321,7 +321,7 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt ) void SwHTMLWriter::OutFootEndNotes() { OSL_ENSURE( m_pFootEndNotes, -"SwHTMLWriter::OutFootEndNotes(): unnoetiger Aufruf" ); +"SwHTMLWriter::OutFootEndNotes(): unnecessary call" ); if( !m_pFootEndNo
[Libreoffice-commits] core.git: i18npool/source idl/source include/svx svx/source
i18npool/source/defaultnumberingprovider/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(-) New commits: commit 7f793166719ce0b3917fa9751d3529c9ec5df854 Author: Johnny_M Date: Sun Jun 4 17:18:28 2017 +0200 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 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: -voidImpLinkAnmeldung(); -voidImpLinkAbmeldung(); +voidImpRegisterLink(); +voidImpDeregisterLink(); boolImpUpdateGraphicLink( bool bAsynchron = true ) const; voidImpSetLinkedGraphic( 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* ImpConvertCont
[Libreoffice-commits] core.git: idl/source include/comphelper include/connectivity include/drawinglayer include/editeng include/filter include/formula include/rsc include/sfx2 include/sot include/svl
idl/source/objects/object.cxx|2 +- include/comphelper/classids.hxx | 16 include/connectivity/dbtools.hxx |2 +- include/drawinglayer/primitive2d/cropprimitive2d.hxx |2 +- include/editeng/editrids.hrc |2 +- include/editeng/lrspitem.hxx |2 +- include/filter/msfilter/escherex.hxx |4 ++-- include/formula/formdata.hxx |2 +- include/rsc/rsc-vcl-shared-types.hxx |4 ++-- include/sfx2/basedlgs.hxx|2 +- include/sot/filelist.hxx |6 +++--- include/svl/filerec.hxx |2 +- include/svtools/brwbox.hxx |2 +- include/svtools/ctrltool.hxx |2 +- include/svtools/imappoly.hxx |4 ++-- include/svtools/inetimg.hxx |2 +- include/svtools/parrtf.hxx |4 ++-- include/svx/gridctrl.hxx |2 +- include/svx/svdtypes.hxx |2 +- include/svx/svdview.hxx |2 +- include/svx/svxitems.hrc |6 +++--- include/vcl/keycodes.hxx |4 ++-- include/vcl/seleng.hxx |2 +- include/vcl/textview.hxx |4 ++-- include/vcl/window.hxx |2 +- 25 files changed, 42 insertions(+), 42 deletions(-) New commits: commit c6f4fd1942ddecab8485f19fa53faf1eda3a5667 Author: Johnny_M Date: Sun Jun 4 16:44:43 2017 +0200 tdf#39468 Translate German comments and dbg strings (leftovers in h.. to i..) Translates all (leftovers) found using a custom regex, in directories not shown by /bin/find-german-comments and beginning with "h" to "i". Additionally: - Fixed a few spellings Change-Id: I54ea06f8e0cf1bd4bd6c84b171bec1bd342a8df8 Reviewed-on: https://gerrit.libreoffice.org/38390 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 8beb1071b84b..1efd70bb35a5 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -102,7 +102,7 @@ bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm, { if ( !rAttr.GetRef() && dynamic_cast(&rAttr) ) { -SAL_WARN( "idl", "Neuer Slot : " << rAttr.GetSlotId().getString() ); +SAL_WARN( "idl", "new slot : " << rAttr.GetSlotId().getString() ); } for( sal_uLong n = 0; n < aAttrList.size(); n++ ) diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx index 4634cf72667a..4c345b84bf93 100644 --- a/include/comphelper/classids.hxx +++ b/include/comphelper/classids.hxx @@ -59,7 +59,7 @@ 0xf616b81f, 0x7bb8, 0x4f22, 0xb8, 0xa5, 0x47, \ 0x42, 0x8d, 0x59, 0xf8, 0xad -/* aktuell */ +/* current */ #define SO3_SW_CLASSID SO3_SW_CLASSID_60 @@ -73,7 +73,7 @@ 0xA8BBA60C, 0x7C60, 0x4550, 0x91, 0xCE, 0x39, \ 0xC3, 0x90, 0x3F, 0xAC, 0x5E -/* aktuell */ +/* current */ #define SO3_SWWEB_CLASSID SO3_SWWEB_CLASSID_60 @@ -87,7 +87,7 @@ 0xB21A0A7C, 0xE403, 0x41FE, 0x95, 0x62, 0xBD, \ 0x13, 0xEA, 0x6F, 0x15, 0xA0 -/* aktuell */ +/* current */ #define SO3_SWGLOB_CLASSID SO3_SWGLOB_CLASSID_60 @@ -132,7 +132,7 @@ 0x7fa8ae11, 0xb3e3, 0x4d88, 0xaa, 0xbf, 0x25, \ 0x55, 0x26, 0xcd, 0x1c, 0xe8 -/* aktuell */ +/* current */ #define SO3_SC_CLASSID SO3_SC_CLASSID_60 @@ -176,7 +176,7 @@ 0xee5d1ea4, 0xd445, 0x4289, 0xb2, 0xfc, 0x55, \ 0xfc, 0x93, 0x69, 0x39, 0x17 -/* aktuell */ +/* current */ #define SO3_SIMPRESS_CLASSID SO3_SIMPRESS_CLASSID_60 @@ -207,7 +207,7 @@ 0x448bb771, 0xcfe2, 0x47c4, 0xbc, 0xdf, 0x1f, \ 0xbf, 0x37, 0x8e, 0x20, 0x2c -/* aktuell */ +/* current */ #define SO3_SDRAW_CLASSID SO3_SDRAW_CLASSID_60 @@ -251,7 +251,7 @@ 0xdd0a57f, 0xcf3b, 0x4fd2, 0xbd, 0xa4, 0x94, \ 0x42, 0x71, 0x9b, 0x2a, 0x73 -/* aktuell */ +/* current */ #define SO3_SCH_CLASSID SO3_SCH_CLASSID_60 @@ -301,7 +301,7 @@ 0xd2d59cd1, 0xa6a, 0x4d36, 0xae, 0x20, 0x47, \ 0x81, 0x70, 0x77, 0xd5, 0x7c -/* aktuell */ +/* current */ #define SO3_SM_CLASSID SO3_SM_CLASSID_60 diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index 93fad78229a6..7f4719bd41c8 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -113,7 +113,7 @@ namespace dbtools The function tries to obtain a connection for the row set with the following steps (in this order)
[Libreoffice-commits] core.git: dbaccess/source forms/source sw/source
dbaccess/source/ui/uno/ColumnModel.hxx |2 +- forms/source/component/ImageControl.hxx |4 ++-- sw/source/filter/html/htmlform.cxx |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 567fe6d351a27441d74784b4d354fd93b14300d2 Author: Johnny_M Date: Wed Jun 7 21:37:16 2017 +0200 Translate and fix the from-German translation of "UNO binding" This is a follow-up on commit 905c0892a584a81e6e5d4b7a6f97ec9e66cfac22 ( https://gerrit.libreoffice.org/37917 ), for the same reason. Change-Id: I0bdaeb1cf6d87f730558d15adb820cfbcaeed172 Reviewed-on: https://gerrit.libreoffice.org/38542 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index e85b153cf7bf..3d5abff3e8ca 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -69,7 +69,7 @@ protected: public: explicit OColumnControlModel(const css::uno::Reference< css::lang::XMultiServiceFactory>& _rxFactory); -// UNO connection +// UNO binding DECLARE_XINTERFACE( ) // css::lang::XServiceInfo diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index e7e297f50473..e3d70288e81f 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -56,7 +56,7 @@ class OImageControlModel OUString m_sDocumentURL; protected: -// UNO Anbindung +// UNO binding virtual css::uno::Sequence< css::uno::Type> _getTypes() override; ImageProducer* GetImageProducer() { return m_xImageProducer.get(); } @@ -69,7 +69,7 @@ public: virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override; -// UNO Anbindung +// UNO binding DECLARE_UNO3_AGG_DEFAULTS(OImageControlModel, OBoundControlModel) virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 70a5dc93e1f3..b60dde8388de 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -377,7 +377,7 @@ public: // destruct itself, hence a seperate method. void start() { xSrc->getImageProducer()->startProduction(); } -// UNO connection +// UNO binding // XImageConsumer virtual void SAL_CALL init( sal_Int32 Width, sal_Int32 Height) override; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com odk/examples offapi/com qadevOOo/tests
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java |2 +- odk/examples/DevelopersGuide/GUI/UnoDialogSample.java |3 +-- offapi/com/sun/star/chart2/DataSeries.idl |2 +- qadevOOo/tests/java/ifc/lang/_XServiceInfo.java|2 +- qadevOOo/tests/java/ifc/sheet/_SheetCellRange.java |2 +- qadevOOo/tests/java/ifc/sheet/_XSpreadsheet.java |2 +- qadevOOo/tests/java/ifc/style/_CharacterProperties.java|2 +- qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java |2 +- 8 files changed, 8 insertions(+), 9 deletions(-) New commits: commit 5312da481ea8e25f06a7a0b725001b40069af081 Author: Johnny_M Date: Fri Jun 9 21:12:37 2017 +0200 Translate German comments and debug strings (leftovers in dirs j... to q...) Translates all (leftovers) found using a custom regex, in directories not shown by /bin/find-german-comments and beginning with "j" to "q". Additionally: - A few spelling fixes Change-Id: I5abf71dde3efc0dbaad162c705c6dc17af50f6c1 Reviewed-on: https://gerrit.libreoffice.org/38613 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java index dcc58d2669b6..cd751c5af7ef 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java @@ -703,7 +703,7 @@ public class InterfaceContainer implements Cloneable synchronized (this) { aIt= iterator(); -// Container freigeben, falls im disposing neue Eintraege kommen +// Release containers if new entries occur in disposing; // set the member to null, the iterator delete the values clear(); elementData= null; diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java index b50e874b88d9..f8363ab54576 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java +++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java @@ -95,8 +95,7 @@ import com.sun.star.util.Time; import com.sun.star.util.thePathSettings; -// Anregung von DV: -// Position und Weite als Parameter uebergeben +// hand the position and width over as parameters public class UnoDialogSample implements XTextListener, XSpinListener, XActionListener, XFocusListener, XMouseListener, XItemListener, XAdjustmentListener, XKeyListener { protected XComponentContext m_xContext = null; diff --git a/offapi/com/sun/star/chart2/DataSeries.idl b/offapi/com/sun/star/chart2/DataSeries.idl index 922ba446b027..0d43ee6adf56 100644 --- a/offapi/com/sun/star/chart2/DataSeries.idl +++ b/offapi/com/sun/star/chart2/DataSeries.idl @@ -40,7 +40,7 @@ module chart2 // NOTES -// kombinierbarkeit - data series combiner (andere Komponente?) +// ability to be combined - data series combiner (another component?) // coordinatesystem-supplier // chart-type ? property string rendererServiceName diff --git a/qadevOOo/tests/java/ifc/lang/_XServiceInfo.java b/qadevOOo/tests/java/ifc/lang/_XServiceInfo.java index 220475c3166f..d08ff31a6dc3 100644 --- a/qadevOOo/tests/java/ifc/lang/_XServiceInfo.java +++ b/qadevOOo/tests/java/ifc/lang/_XServiceInfo.java @@ -45,7 +45,7 @@ public class _XServiceInfo extends MultiMethodTest { boolean result = true; log.println("testing getImplementationName() ... "); -log.println("The ImplementationName ist "+oObj.getImplementationName()); +log.println("The ImplementationName is "+oObj.getImplementationName()); result=true; tRes.tested("getImplementationName()", result); diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetCellRange.java b/qadevOOo/tests/java/ifc/sheet/_SheetCellRange.java index bd6111dc2bff..84f4b9d44664 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetCellRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetCellRange.java @@ -31,5 +31,5 @@ import lib.MultiPropertyTest; * @see com.sun.star.sheet.SheetCellRange */ public class _SheetCellRange extends MultiPropertyTest { -} // finisch class _SheetCellRange +} // finish class _SheetCellRange diff --git a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheet.java b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheet.java index 1ee921879062..bbee1ec6432a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheet.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheet.java @@ -75,6 +75,6 @@ public class _XSpreadsheet extends MultiMethodTest { tRes.tested("createCursorByRange()", oCursor != null); } -} // finisch class _XSpreadsheet +} // finish class _XSpreadsheet diff --git a/qadevOOo/tes
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 57bdeafc092ae75b8b4c0fb0e5ec4660d96e3de8 Author: Johnny_M Date: Sat Apr 1 12:04:20 2017 +0200 Updated core Project: help 958daee8ba1a708cfb5eaa3811078500e653f88e Fix measurement unit conversion reference 1. Following pages were incorrectly referring to https://help.libreoffice.org/Common/Frequently-Used_Buttons#metrik instead of https://help.libreoffice.org/Common/Conversion_of_measurement_units#metrik : - https://help.libreoffice.org/Common/Page (in "Related Topics" at the bottom) - https://help.libreoffice.org/Math/Font_Sizes (in "Base size") Note: Following pages already use the correct reference: - https://help.libreoffice.org/Calc/Optimal_Row_Heights (at the top; http://opengrok.libreoffice.org/xref/help/source/text/scalc/01/05030200.xhp#41 ) - https://help.libreoffice.org/Calc/Optimal_Column_Width (at the top; http://opengrok.libreoffice.org/xref/help/source/text/scalc/01/05040200.xhp#42 ) - And other - see http://opengrok.libreoffice.org/search?q=%23metrik&project=help&defs=&refs=&path=&hist= 2. While at it, also added the same reference to the place which was incorrectly meant as reference before: - https://help.libreoffice.org/Common/Frequently-Used_Buttons#Metrics Change-Id: I827ff047bfb2426ff1192e90a5361ab05198a7f8 Reviewed-on: https://gerrit.libreoffice.org/35997 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index dafaa1c1e89f..958daee8ba1a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit dafaa1c1e89f912513e87c613db7ff23961d3030 +Subproject commit 958daee8ba1a708cfb5eaa3811078500e653f88e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0001.xhp |2 +- source/text/shared/01/05040200.xhp |2 +- source/text/smath/01/0502.xhp |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 958daee8ba1a708cfb5eaa3811078500e653f88e Author: Johnny_M Date: Sat Apr 1 12:04:20 2017 +0200 Fix measurement unit conversion reference 1. Following pages were incorrectly referring to https://help.libreoffice.org/Common/Frequently-Used_Buttons#metrik instead of https://help.libreoffice.org/Common/Conversion_of_measurement_units#metrik : - https://help.libreoffice.org/Common/Page (in "Related Topics" at the bottom) - https://help.libreoffice.org/Math/Font_Sizes (in "Base size") Note: Following pages already use the correct reference: - https://help.libreoffice.org/Calc/Optimal_Row_Heights (at the top; http://opengrok.libreoffice.org/xref/help/source/text/scalc/01/05030200.xhp#41 ) - https://help.libreoffice.org/Calc/Optimal_Column_Width (at the top; http://opengrok.libreoffice.org/xref/help/source/text/scalc/01/05040200.xhp#42 ) - And other - see http://opengrok.libreoffice.org/search?q=%23metrik&project=help&defs=&refs=&path=&hist= 2. While at it, also added the same reference to the place which was incorrectly meant as reference before: - https://help.libreoffice.org/Common/Frequently-Used_Buttons#Metrics Change-Id: I827ff047bfb2426ff1192e90a5361ab05198a7f8 Reviewed-on: https://gerrit.libreoffice.org/35997 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/shared/00/0001.xhp b/source/text/shared/00/0001.xhp index 98e6def00..526895f03 100644 --- a/source/text/shared/00/0001.xhp +++ b/source/text/shared/00/0001.xhp @@ -120,7 +120,7 @@ Metrics - You can enter values in the input fields in different units of measurement. The default unit is inches. However, if you want a space of exactly 1cm, then type "1cm". Additional units are available according to the context, for example, 12 pt for a 12 point spacing. If the value of the new unit is unrealistic, the program uses a predefined maximum or minimum value. + You can enter values in the input fields in different units of measurement. The default unit is inches. However, if you want a space of exactly 1cm, then type "1cm". Additional units are available according to the context, for example, 12 pt for a 12 point spacing. If the value of the new unit is unrealistic, the program uses a predefined maximum or minimum value. Close diff --git a/source/text/shared/01/05040200.xhp b/source/text/shared/01/05040200.xhp index 4bde24027..b91e3a8b7 100644 --- a/source/text/shared/01/05040200.xhp +++ b/source/text/shared/01/05040200.xhp @@ -177,7 +177,7 @@ width="8.6457in" height="5.9063in"> Resizes the drawing objects so that they fit on the paper format that you select. The arrangement of the drawing objects is preserved. -Changing measurement units +Changing measurement units Writing Register-true diff --git a/source/text/smath/01/0502.xhp b/source/text/smath/01/0502.xhp index 6b24578af..0ff20fdb7 100644 --- a/source/text/smath/01/0502.xhp +++ b/source/text/smath/01/0502.xhp @@ -40,7 +40,7 @@ Base size -All elements of a formula are proportionally scaled to the base size. To change the base size, select or type in the desired point (pt) size. You can also use other units of measure or other metrics, which are then automatically converted to points. +All elements of a formula are proportionally scaled to the base size. To change the base size, select or type in the desired point (pt) size. You can also use other units of measure or other metrics, which are then automatically converted to points. To permanently change the default size (12 pt) used in $[officename] Math, you must first set the size (for example, 11 pt) and then click the Default button. Relative Sizes In this section, you can determine the relative sizes for each type of element with reference to the base size. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/form/formcontroller.cxx | 72 ++--- 1 file changed, 36 insertions(+), 36 deletions(-) New commits: commit ea8f69e4a8ca8c3912aacb9838d7c5bb20b47f46 Author: Johnny_M Date: Mon Apr 17 13:12:10 2017 +0200 Translate German comments in svx/source/form/formcontroller.cxx Change-Id: I5cfa09c08bad574269cf56ec7a57a57cd465c2d9 Reviewed-on: https://gerrit.libreoffice.org/36616 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 55aeb92c3117..294556981ef8 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -603,7 +603,7 @@ FormController::~FormController() m_xFormOperations->dispose(); m_xFormOperations.clear(); -// Freigeben der Aggregation +// release of aggregation if ( m_xAggregate.is() ) { m_xAggregate->setDelegator( nullptr ); @@ -1098,7 +1098,7 @@ Any SAL_CALL FormController::getByIndex(sal_Int32 Index) void SAL_CALL FormController::disposing(const EventObject& e) { -// Ist der Container disposed worden +// has the container been disposed ::osl::MutexGuard aGuard( m_aMutex ); Reference< XControlContainer > xContainer(e.Source, UNO_QUERY); if (xContainer.is()) @@ -1107,7 +1107,7 @@ void SAL_CALL FormController::disposing(const EventObject& e) } else { -// ist ein Control disposed worden +// has a control been disposed Reference< XControl > xControl(e.Source, UNO_QUERY); if (xControl.is()) { @@ -1649,11 +1649,11 @@ void FormController::focusGained(const FocusEvent& e) Reference< XBoundControl > xLockingTest(m_xCurrentControl, UNO_QUERY); bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock(); assert(!bControlIsLocked && "FormController::Gained: I'm modified and the current control is locked ? How this ?"); -// normalerweise sollte ein gelocktes Control nicht modified sein, also muss wohl mein bModified aus einem anderen Kontext -// gesetzt worden sein, was ich nicht verstehen wuerde ... +// normally, a locked control should not be modified, so probably my bModified must +// have been set from a different context, which I would not understand ... #endif DBG_ASSERT(m_xCurrentControl.is(), "kein CurrentControl gesetzt"); -// zunaechst das Control fragen ob es das IFace unterstuetzt +// first the control ask if it supports the IFace Reference< XBoundComponent > xBound(m_xCurrentControl, UNO_QUERY); if (!xBound.is() && m_xCurrentControl.is()) xBound.set(m_xCurrentControl->getModel(), UNO_QUERY); @@ -1661,7 +1661,7 @@ void FormController::focusGained(const FocusEvent& e) // lock if we lose the focus during commit m_bCommitLock = true; -// Commit nicht erfolgreich, Focus zuruecksetzen +// commit unsuccessful, reset focus if (xBound.is() && !xBound->commit()) { // the commit failed and we don't commit again until the current control @@ -1704,7 +1704,7 @@ void FormController::focusGained(const FocusEvent& e) } } -// Immer noch ein und dasselbe Control +// still one and the same control if ( ( m_xActiveControl == xControl ) && ( xControl == m_xCurrentControl ) ) @@ -1737,7 +1737,7 @@ void FormController::focusGained(const FocusEvent& e) if ( !m_xCurrentControl.is() ) return; -// Control erhaelt Focus, dann eventuell in den sichtbaren Bereich +// control gets focus, then possibly in the visible range Reference< XFormControllerContext > xContext( m_xFormControllerContext ); Reference< XControl > xCurrentControl( m_xCurrentControl ); aGuard.clear(); @@ -1949,11 +1949,11 @@ void FormController::addToEventAttacher(const Reference< XControl > & xControl) if ( !xControl.is() ) return; /* throw IllegalArgumentException(); */ -// anmelden beim Eventattacher +// register at the event attacher Reference< XFormComponent > xComp(xControl->getModel(), UNO_QUERY); if (xComp.is() && m_xModelAsIndex.is()) { -// Und die Position des ControlModel darin suchen +// and look for the position of the ControlModel in it sal_uInt32 nPos = m_xModelAsIndex->getCount(); Reference< XFormComponent > xTemp; for( ; nPos; ) @@ -1976,11 +1976,11 @@ void FormController::removeFromEventAttacher(const Reference< XControl > & xCont if ( !xContro
[Libreoffice-commits] core.git: svx/source
svx/source/inc/fmexch.hxx | 12 +++ svx/source/inc/fmexpl.hxx | 58 +- svx/source/inc/fmobj.hxx |4 +- svx/source/inc/fmpgeimp.hxx |6 +-- svx/source/inc/fmshimp.hxx| 64 +++--- svx/source/inc/fmundo.hxx |6 +-- svx/source/inc/fmvwimp.hxx|4 +- svx/source/inc/formcontroller.hxx | 10 ++--- svx/source/inc/gridcell.hxx | 42 +++- 9 files changed, 102 insertions(+), 104 deletions(-) New commits: commit 324adfcc2c3aa5d3590a38fadca2af7cd9125b47 Author: Johnny_M Date: Mon Apr 17 14:05:42 2017 +0200 Translate German comments in svx/source/inc/ Change-Id: I7eef0061245460fa0b570eea36d4e415c4c6d716 diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 1215c3c307e4..0b09eadf0839 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -169,17 +169,17 @@ namespace svxform ) { m_xFormsRoot = _rxFormsRoot; } void buildPathFormat(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot); -// baut aus m_aSelectedEntries m_aControlPaths auf -// (es wird davon ausgegangen, dass die Eintraege in m_aSelectedEntries sortiert sind in Bezug auf die Nachbar-Beziehung) +// assembles m_aControlPaths from m_aSelectedEntries +// (it is assumed that the entries are sorted in m_aSelectedEntries with respect to the neighbor relationship) void buildListFromPath(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot); -// der umgekehrte Weg : wirft alles aus m_aSelectedEntries weg und baut es mittels m_aControlPaths neu auf +// The reverse way: throws everything out of m_aSelectedEntries and rebuilds it using m_aControlPaths void addHiddenControlsFormat(const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& seqInterfaces); -// fuegt ein SVX_FML_HIDDEN_CONTROLS-Format hinzu und merk sich dafuer die uebergebenen Interfaces -// (es erfolgt KEINE Ueberpruefung, ob dadurch auch tatsaechlich nur hidden Controls bezeichnet werden, dass muss der -// Aufrufer sicherstellen) +// adds an SVX_FML_HIDDEN_CONTROLS format and remembers the passed interfaces for it +// (it is NOT checked whether actually only hidden controls are denominated +// by this - the caller must ensure that) const ListBoxEntrySet& selected() const { return m_aSelectedEntries; } const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index bf4c601eea86..c7a8fee7cfff 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -78,7 +78,7 @@ public: class FmNavModelReplacedHint : public SfxHint { -FmEntryData* pEntryData;// die Daten des Eintrages, der ein neues Model bekommen hat +FmEntryData* pEntryData;// the data of the entry that has got a new model public: FmNavModelReplacedHint( FmEntryData* pAffectedEntryData ); @@ -208,7 +208,7 @@ public: }; -// FmNavRequestSelectHint - jemand teilt dem NavigatorTree mit, dass er bestimmte Eintraege selektieren soll +// FmNavRequestSelectHint - someone tells the NavigatorTree to select certain entries typedef std::set FmEntryDataArray; @@ -336,10 +336,10 @@ namespace svxform void ReplaceFormComponent(const css::uno::Reference< css::form::XFormComponent >& xOld, const css::uno::Reference< css::form::XFormComponent >& xNew); void BroadcastMarkedObjects(const SdrMarkList& mlMarked); -// einen RequestSelectHint mit den aktuell markierten Objekten broadcasten +// send a RequestSelectHint with the currently selected objects bool InsertFormComponent(FmNavRequestSelectHint& rHint, SdrObject* pObject); -// ist ein Helper fuer vorherige, managet das Abteigen in SdrObjGroups -// Rueckgabe sal_True, wenn das Objekt eine FormComponent ist (oder rekursiv nur aus solchen besteht) +// is a helper for previous, manages the ... in SdrObjGroups; +// returns sal_True if the object is a FormComponent (or recursively consists only of such) public: NavigatorTreeModel(); @@ -378,10 +378,10 @@ namespace svxform enum DROP_ACTION{ DA_SCROLLUP, DA_SCROLLDOWN, DA_EXPANDNODE }; enum SELDATA_ITEMS { SDI_DIRTY, SDI_ALL, SDI_NORMALIZED, SDI_NORMALIZED_FORMARK }; -// beim Droppen will ich scrollen und Folder aufklappen koennen, dafuer : +// when dropping I want to be able to scroll and to exand folders, for this: AutoTimer m_aDropActionTimer; Timer m_aSynchronizeTimer; -// die Meta-Daten ueber mei
[Libreoffice-commits] core.git: svx/source
svx/source/form/formcontroller.cxx |4 ++-- svx/source/inc/clonelist.hxx |2 +- svx/source/inc/fmprop.hrc |4 ++-- svx/source/inc/fmshimp.hxx |4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 091a92cedd02dd486076a76f1cddde026f359d0c Author: Johnny_M Date: Tue Apr 18 21:15:21 2017 +0200 Translate German comments (leftovers in svx/source/inc/, etc.) Translated leftovers in: - svx/source/inc/ which slipped through on the commit 324adfcc2c3aa5d3590a38fadca2af7cd9125b47 (and a correction of "ist" to "list" in an unrelated comment) - svx/source/form/formcontroller.cxx which slipped through on the commit ea8f69e4a8ca8c3912aacb9838d7c5bb20b47f46 Change-Id: Ida5b3d0e685558bc2d8facba02fa80ae9e92eab3 Reviewed-on: https://gerrit.libreoffice.org/36648 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 294556981ef8..c4fe9e40a723 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -1456,7 +1456,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) if ( m_aFilterRows.empty() ) appendEmptyDisjunctiveTerm(); -// Suchen der aktuellen Row +// find the current row if ( ( (size_t)m_nCurrentFilterPosition >= m_aFilterRows.size() ) || ( m_nCurrentFilterPosition < 0 ) ) { OSL_ENSURE( false, "FormController::textChanged: m_nCurrentFilterPosition is wrong!" ); @@ -2872,7 +2872,7 @@ void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) if (xModel.is() && m_xModelAsIndex == xModel->getParent()) { removeControl(xControl); -// TabOrder nicht neu berechnen, da das intern schon funktionieren muss! +// Do not recalculate TabOrder, because it must already work internally! } // are we in filtermode and a XModeSelector has inserted an element else if (m_bFiltering && Reference< XModeSelector > (evt.Source, UNO_QUERY).is()) diff --git a/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx index 5d2efc9023dc..18e9bb54c801 100644 --- a/svx/source/inc/clonelist.hxx +++ b/svx/source/inc/clonelist.hxx @@ -26,7 +26,7 @@ class SdrObject; // #i13033# -// New mechanism to hold a ist of all original and cloned objects for later +// New mechanism to hold a list of all original and cloned objects for later // re-creating the connections for contained connectors class CloneList { diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc index 42b6e0aa0b64..2c5733cbab92 100644 --- a/svx/source/inc/fmprop.hrc +++ b/svx/source/inc/fmprop.hrc @@ -19,8 +19,8 @@ #ifndef INCLUDED_SVX_SOURCE_INC_FMPROP_HRC #define INCLUDED_SVX_SOURCE_INC_FMPROP_HRC -// PropertyId's, welche eine Zuordnung zu einen PropertyName haben, das koennten -// auch in Zukunft WhichIds sein -> Itemset +// PropertyIds, which have an assignment to a PropertyName, could continue +// to be WhichIds in the future -> Itemset #define FM_ATTR_START 0 #define FM_ATTR_FILTER ( FM_ATTR_START + 1 ) diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index da68ae054257..f548561badcd 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -182,7 +182,7 @@ class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE ::osl::Mutexm_aInvalidationSafety; // secure the access to all our slot invalidation related members -css::form::NavigationBarMode m_eNavigate;// Art der Navigation +css::form::NavigationBarMode m_eNavigate;// kind of navigation // since I want to mark an SdrObject when searching for the treatment of the "found", // I get all relevant objects before yanking up of the search dialog @@ -348,7 +348,7 @@ protected: SAL_DLLPRIVATE boolimpl_checkDisposed() const; public: -// methode fuer nicht designmode (alive mode) +// method for non design mode (alive mode) SAL_DLLPRIVATE void setActiveController( const css::uno::Reference< css::form::runtime::XFormController>& _xController, bool _bNoSaveOldContent = false ); SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getActiveController() const {return m_xActiveController;} SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getActiveInternalController() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx officecfg/registry sd/source soltools/cpp sw/source vcl/inc vcl/source
include/svx/viewlayoutitem.hxx | 4 ++-- officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs | 2 +- sd/source/filter/eppt/pptx-text.cxx | 2 +- soltools/cpp/_unix.c | 4 ++-- sw/source/ui/fldui/flddb.cxx | 2 +- vcl/inc/win/salprn.h | 6 +++--- vcl/source/edit/textdata.cxx | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) New commits: commit b165910330285bc0a52eebdf98911e04305dfc5b Author: Johnny_M Date: Sat Sep 23 15:55:23 2017 +0200 Translate German comments and debug strings (leftovers) Additionally: - A few grammatical fixes Change-Id: I15ba3809f6b4746be5a691ec2adc0ea17730fa4a Reviewed-on: https://gerrit.libreoffice.org/42690 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index 4191a8b870f7..259ffbc4d489 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -41,8 +41,8 @@ public: // "purely virtual methods" from the SfxPoolItem virtual booloperator==( const SfxPoolItem& ) const override; virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const override; -virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; // leer -virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; // leer +virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; // empty +virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; // empty }; diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs index 6c9734f74685..fbca7581021e 100644 --- a/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs +++ b/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs @@ -33,7 +33,7 @@ - A shortname, which describe the grafik format. + A shortname which describes the graphics format. diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index bd898407e880..ef33e80f6092 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -768,7 +768,7 @@ void ParagraphObj::CalculateGraphicBulletSize( sal_uInt16 nFontHeight ) { if ( ( nNumberingType == SVX_NUM_BITMAP ) && ( nBulletId != 0x ) ) { -// calculate the bulletrealsize for this grafik +// calculate the bullet real size for this graphic if ( aBuGraSize.Width() && aBuGraSize.Height() ) { double fCharHeight = nFontHeight; diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c index 274ee5acaf3a..c42d22b4b586 100644 --- a/soltools/cpp/_unix.c +++ b/soltools/cpp/_unix.c @@ -172,8 +172,8 @@ void Cplusplus++; break; -case 'u': /* -undef fuer GCC (dummy) */ -case 'l': /* -lang-c++ fuer GCC (dummy) */ +case 'u': /* -undef for GCC (dummy) */ +case 'l': /* -lang-c++ for GCC (dummy) */ break; default: diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index b1d22c730d59..0c74aaa581df 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -96,7 +96,7 @@ void SwFieldDBPage::dispose() // initialise TabPage void SwFieldDBPage::Reset(const SfxItemSet*) { -Init(); // Allgemeine initialisierung +Init(); // general initialization m_pTypeLB->SetUpdateMode(false); const sal_Int32 nOldPos = m_pTypeLB->GetSelectedEntryPos(); diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index ed6005283661..65c1097ebf1c 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -77,9 +77,9 @@ public: WinSalInfoPrinter* mpInfoPrinter; // pointer to the compatible InfoPrinter WinSalPrinter* mpNextPrinter; // next printing printer HDC mhDC; // printer hdc -sal_uIntPtr mnError;// Error Code -sal_uIntPtr mnCopies; // Kopien -boolmbCollate; // Sortierte Kopien +sal_uIntPtr mnError;// error code +sal_
[Libreoffice-commits] core.git: extensions/test filter/source sc/source sd/source svl/source svtools/source sw/inc vcl/source
extensions/test/ole/EventListenerSample/EventListener/EventListener.rc |4 +- filter/source/msfilter/svdfppt.cxx |4 +- sc/source/core/data/fillinfo.cxx |2 - sd/source/filter/eppt/epptso.cxx |2 - svl/source/numbers/zforlist.cxx|2 - svtools/source/control/headbar.cxx |2 - sw/inc/modcfg.hxx |2 - vcl/source/control/edit.cxx| 14 +- 8 files changed, 16 insertions(+), 16 deletions(-) New commits: commit 79c28873d6e1175c4b33352dd5c1dbba81d2c3ee Author: Johnny_M Date: Sat Sep 30 14:57:34 2017 +0200 Translate German comments and debug strings (leftovers) Change-Id: I4ab8fbae47037f6e21c51713d1c51aaa5dc61f40 Reviewed-on: https://gerrit.libreoffice.org/42967 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc b/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc index 418ce2686961..532ff23f2666 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc +++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc @@ -123,7 +123,7 @@ END -// Englisch (USA) resources +// English (USA) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 @@ -137,7 +137,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDR_EVTLISTENER REGISTRY DISCARDABLE"EvtListener.rgs" -#endif// Englisch (USA) resources +#endif// English (USA) resources diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index eef6e62f9ed1..48e2a98ea1e5 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3821,7 +3821,7 @@ PPTCharSheet::PPTCharSheet( const PPTCharSheet& rAttr ) void PPTCharSheet::Read( SvStream& rIn, sal_uInt32 nLevel) { -// Zeichenattribute +// character attributes sal_uInt32 nCMask; sal_uInt16 nVal16; rIn.ReadUInt32( nCMask ); @@ -3923,7 +3923,7 @@ void PPTParaSheet::Read( SdrPowerPointImport const & , SvStream& rIn , sal_uInt32 nLevel, bool bFirst ) { -// Absatzattribute +// paragraph attributes sal_uInt16 nVal16, i, nMask16; sal_uInt32 nVal32, nPMask; rIn.ReadUInt32( nPMask ); diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 0d3a6bc36967..35b2a0fd1a05 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -656,7 +656,7 @@ void ScDocument::FillInfo( if (pCondFormList) pCondFormList->endRendering(); -// bedingte Formatierung auswerten +// evaluate conditional formatting std::vector< std::unique_ptr > aAltPatterns; // favour preview over condition if (bAnyCondition || bAnyPreview) diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index a025423adddc..4af42241a0cb 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1587,7 +1587,7 @@ bool PPTWriter::ImplCreatePresentationPlaceholder( const bool bMasterPage, aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); -mpStrm->WriteInt16( maRect.Top() ).WriteInt16( maRect.Left() ).WriteInt16( maRect.Right() ).WriteInt16( maRect.Bottom() ); // oben, links, rechts, unten +mpStrm->WriteInt16( maRect.Top() ).WriteInt16( maRect.Left() ).WriteInt16( maRect.Right() ).WriteInt16( maRect.Bottom() ); // top, left, right, bottom mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); mpStrm->WriteUInt32( 0 )// PlacementID diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index a8abeca2e01a..c573a02ba377 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -4333,7 +4333,7 @@ sal_uInt16 NfCurrencyEntry::GetEffectivePositiveFormat( sal_uInt16 nIntlFormat, //! Call this only if nCurrFormat is really with parentheses! static sal_uInt16 lcl_MergeNegativeParenthesisFormat( sal_uInt16 nIntlFormat, sal_uInt16 nCurrFormat ) { -short nSign = 0;// -1:=Klammer 0:=links, 1:=mitte, 2:=rechts +short nSign = 0;// -1:=bracket 0:=left, 1:=middle, 2:=right switch ( nIntlFormat ) { case 0: // ($1) diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 5518f58ec2cc..a5d0263270ed 100644 -
[Libreoffice-commits] core.git: extensions/source svx/source sw/source vcl/win
extensions/source/bibliography/toolbar.cxx |4 ++-- svx/source/dialog/srchdlg.cxx |2 +- sw/source/uibase/uiview/view.cxx |2 +- vcl/win/window/salobj.cxx |2 +- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit ebeff35a0305683574373b75c7b0e5797749fe3e Author: Johnny_M Date: Sun Oct 1 11:49:11 2017 +0200 tdf#39468 Translate German comments (leftovers) Change-Id: I9952c560547b0668d8216edba1486638fa41e553 Reviewed-on: https://gerrit.libreoffice.org/42990 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 023ab3ef77e3..1c10eafaba48 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// Konstanten - +// Constants -- BibToolBarListener::BibToolBarListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId): @@ -343,7 +343,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r uno::Reference< util::XURLTransformer > xTrans( util::URLTransformer::create(comphelper::getProcessComponentContext()) ); if( xTrans.is() ) { -// Datei laden +// load the file util::URL aURL; aURL.Complete = aCommand; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 30ec52ebce46..20f588cf9949 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -546,7 +546,7 @@ void SvxSearchDialog::Construct_Impl() bool SvxSearchDialog::Close() { -// remember strings speichern +// remember strings if (!aSearchStrings.empty()) StrArrToList_Impl( SID_SEARCHDLG_SEARCHSTRINGS, aSearchStrings ); diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 419720809e98..d4595c28ab24 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1128,7 +1128,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse ) sal_Int32 nPos = 0; -// No it is *no* good idea to call GetToken within Point-Konstr. immediately, +// No it is *not* a good idea to call GetToken within Point constr. immediately, // because which parameter is evaluated first? long nX = rUserData.getToken( 0, ';', nPos ).toInt32(), nY = rUserData.getToken( 0, ';', nPos ).toInt32(); diff --git a/vcl/win/window/salobj.cxx b/vcl/win/window/salobj.cxx index 744d260c0d48..172f61e923d3 100644 --- a/vcl/win/window/salobj.cxx +++ b/vcl/win/window/salobj.cxx @@ -355,7 +355,7 @@ LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l case WM_CREATE: { -// Window-Instanz am Windowhandle speichern +// Save the window instance at the window handle. // Can also be used for the A-Version, because the struct // to access lpCreateParams is the same structure CREATESTRUCTW* pStruct = reinterpret_cast(lParam); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/financial.cxx | 32 1 file changed, 16 insertions(+), 16 deletions(-) New commits: commit 17d0dc46471083a02d943272dafba14158641de5 Author: Johnny_M Date: Sun Oct 1 12:53:57 2017 +0200 Translate German variable names in Calc (financial) These names of variables correspond to German function names in Calc and were translated to their English equivalents. For used translations, see, e.g., https://translations.documentfoundation.org/de/libo54_help/translate/#search=kapz&sfields=target Change-Id: Ifffa1ae8394cafde6dd7a78626b957e07919d5c9 Reviewed-on: https://gerrit.libreoffice.org/42991 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx index d5ad25e6dbb4..eed81955 100644 --- a/scaddins/source/analysis/financial.cxx +++ b/scaddins/source/analysis/financial.cxx @@ -123,15 +123,15 @@ double SAL_CALL AnalysisAddIn::getEffect( double fNominal, sal_Int32 nPeriods ) double SAL_CALL AnalysisAddIn::getCumprinc( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) { -double fRmz, fKapZ; +double fPmt, fPpmt; if( nStartPer < 1 || nEndPer < nStartPer || fRate <= 0.0 || nEndPer > nNumPeriods || nNumPeriods <= 0 || fVal <= 0.0 || ( nPayType != 0 && nPayType != 1 ) ) throw css::lang::IllegalArgumentException(); -fRmz = GetRmz( fRate, nNumPeriods, fVal, 0.0, nPayType ); +fPmt = GetRmz( fRate, nNumPeriods, fVal, 0.0, nPayType ); -fKapZ = 0.0; +fPpmt = 0.0; sal_uInt32 nStart = sal_uInt32( nStartPer ); sal_uInt32 nEnd = sal_uInt32( nEndPer ); @@ -139,9 +139,9 @@ double SAL_CALL AnalysisAddIn::getCumprinc( double fRate, sal_Int32 nNumPeriods, if( nStart == 1 ) { if( nPayType <= 0 ) -fKapZ = fRmz + fVal * fRate; +fPpmt = fPmt + fVal * fRate; else -fKapZ = fRmz; +fPpmt = fPmt; nStart++; } @@ -149,27 +149,27 @@ double SAL_CALL AnalysisAddIn::getCumprinc( double fRate, sal_Int32 nNumPeriods, for( sal_uInt32 i = nStart ; i <= nEnd ; i++ ) { if( nPayType > 0 ) -fKapZ += fRmz - ( GetZw( fRate, double( i - 2 ), fRmz, fVal, 1 ) - fRmz ) * fRate; +fPpmt += fPmt - ( GetZw( fRate, double( i - 2 ), fPmt, fVal, 1 ) - fPmt ) * fRate; else -fKapZ += fRmz - GetZw( fRate, double( i - 1 ), fRmz, fVal, 0 ) * fRate; +fPpmt += fPmt - GetZw( fRate, double( i - 1 ), fPmt, fVal, 0 ) * fRate; } -RETURN_FINITE( fKapZ ); +RETURN_FINITE( fPpmt ); } double SAL_CALL AnalysisAddIn::getCumipmt( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) { -double fRmz, fZinsZ; +double fPmt, fIpmt; if( nStartPer < 1 || nEndPer < nStartPer || fRate <= 0.0 || nEndPer > nNumPeriods || nNumPeriods <= 0 || fVal <= 0.0 || ( nPayType != 0 && nPayType != 1 ) ) throw css::lang::IllegalArgumentException(); -fRmz = GetRmz( fRate, nNumPeriods, fVal, 0.0, nPayType ); +fPmt = GetRmz( fRate, nNumPeriods, fVal, 0.0, nPayType ); -fZinsZ = 0.0; +fIpmt = 0.0; sal_uInt32 nStart = sal_uInt32( nStartPer ); sal_uInt32 nEnd = sal_uInt32( nEndPer ); @@ -177,7 +177,7 @@ double SAL_CALL AnalysisAddIn::getCumipmt( double fRate, sal_Int32 nNumPeriods, if( nStart == 1 ) { if( nPayType <= 0 ) -fZinsZ = -fVal; +fIpmt = -fVal; nStart++; } @@ -185,14 +185,14 @@ double SAL_CALL AnalysisAddIn::getCumipmt( double fRate, sal_Int32 nNumPeriods, for( sal_uInt32 i = nStart ; i <= nEnd ; i++ ) { if( nPayType > 0 ) -fZinsZ += GetZw( fRate, double( i - 2 ), fRmz, fVal, 1 ) - fRmz; +fIpmt += GetZw( fRate, double( i - 2 ), fPmt, fVal, 1 ) - fPmt; else -fZinsZ += GetZw( fRate, double( i - 1 ), fRmz, fVal, 0 ); +fIpmt += GetZw( fRate, double( i - 1 ), fPmt, fVal, 0 ); } -fZinsZ *= fRate; +fIpmt *= fRate; -RETURN_FINITE( fZinsZ ); +RETURN_FINITE( fIpmt ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr2.cxx | 156 +++ 1 file changed, 78 insertions(+), 78 deletions(-) New commits: commit f8b9b8ec5686c1453e335d895aa78faba5fdf268 Author: Johnny_M Date: Sun Oct 1 13:51:55 2017 +0200 Translate German variable names in Calc (financial) These names of variables correspond to German function names in Calc and were translated to their English equivalents. For used translations, see, e.g., https://translations.documentfoundation.org/de/libo54_help/translate/#search=kapz&sfields=target Change-Id: I5c0e4232b2e7b3039a42aff96a44a8f55c818d2e Reviewed-on: https://gerrit.libreoffice.org/42993 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 588932de9162..5706baf73769 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1592,29 +1592,29 @@ void ScInterpreter::ScISPMT() } // financial functions -double ScInterpreter::ScGetBw(double fInterest, double fZzr, double fRmz, - double fZw, bool bPayInAdvance) +double ScInterpreter::ScGetBw(double fInterest, double fNper, double fPmt, + double fFv, bool bPayInAdvance) { -double fBw; +double fPv; if (fInterest == 0.0) -fBw = fZw + fRmz * fZzr; +fPv = fFv + fPmt * fNper; else { if (bPayInAdvance) -fBw = (fZw * pow(1.0 + fInterest, -fZzr)) -+ (fRmz * (1.0 - pow(1.0 + fInterest, -fZzr + 1.0)) / fInterest) -+ fRmz; +fPv = (fFv * pow(1.0 + fInterest, -fNper)) ++ (fPmt * (1.0 - pow(1.0 + fInterest, -fNper + 1.0)) / fInterest) ++ fPmt; else -fBw = (fZw * pow(1.0 + fInterest, -fZzr)) -+ (fRmz * (1.0 - pow(1.0 + fInterest, -fZzr)) / fInterest); +fPv = (fFv * pow(1.0 + fInterest, -fNper)) ++ (fPmt * (1.0 - pow(1.0 + fInterest, -fNper)) / fInterest); } -return -fBw; +return -fPv; } void ScInterpreter::ScPV() { nFuncFmtType = css::util::NumberFormat::CURRENCY; -double nRmz, nZzr, nInterest, nZw = 0; +double nPmt, nNper, nInterest, nFv = 0; bool bPayInAdvance = false; sal_uInt8 nParamCount = GetByte(); if ( !MustHaveParamCount( nParamCount, 3, 5 ) ) @@ -1622,11 +1622,11 @@ void ScInterpreter::ScPV() if (nParamCount == 5) bPayInAdvance = GetBool(); if (nParamCount >= 4) -nZw = GetDouble(); -nRmz = GetDouble(); -nZzr = GetDouble(); +nFv = GetDouble(); +nPmt = GetDouble(); +nNper = GetDouble(); nInterest = GetDouble(); -PushDouble(ScGetBw(nInterest, nZzr, nRmz, nZw, bPayInAdvance)); +PushDouble(ScGetBw(nInterest, nNper, nPmt, nFv, bPayInAdvance)); } void ScInterpreter::ScSYD() @@ -1634,11 +1634,11 @@ void ScInterpreter::ScSYD() nFuncFmtType = css::util::NumberFormat::CURRENCY; if ( MustHaveParamCount( GetByte(), 4 ) ) { -double nZr = GetDouble(); +double nPer = GetDouble(); double nTimeLength = GetDouble(); double nRest = GetDouble(); double nValue = GetDouble(); -double nDia = ((nValue - nRest) * (nTimeLength - nZr + 1.0)) / +double nDia = ((nValue - nRest) * (nTimeLength - nPer + 1.0)) / ((nTimeLength * (nTimeLength + 1.0)) / 2.0); PushDouble(nDia); } @@ -1920,7 +1920,7 @@ double ScInterpreter::ScGetRmz(double fRate, double fNper, double fPv, void ScInterpreter::ScPMT() { -double nInterest, nZzr, nBw, nZw = 0; +double nInterest, nNper, nPv, nFv = 0; bool bFlag = false; nFuncFmtType = css::util::NumberFormat::CURRENCY; sal_uInt8 nParamCount = GetByte(); @@ -1929,11 +1929,11 @@ void ScInterpreter::ScPMT() if (nParamCount == 5) bFlag = GetBool(); if (nParamCount >= 4) -nZw = GetDouble(); -nBw = GetDouble(); -nZzr = GetDouble(); +nFv = GetDouble(); +nPv= GetDouble(); +nNper = GetDouble(); nInterest = GetDouble(); -PushDouble(ScGetRmz(nInterest, nZzr, nBw, nZw, bFlag)); +PushDouble(ScGetRmz(nInterest, nNper, nPv, nFv, bFlag)); } void ScInterpreter::ScRRI() @@ -1951,26 +1951,26 @@ void ScInterpreter::ScRRI() } } -double ScInterpreter::ScGetZw(double fInterest, double fZzr, double fRmz, - double fBw, bool bFlag) +double ScInterpreter::ScGetZw(double fInterest, double fNper, double fPmt, + double fPv, bool bFlag) { -double fZw; +double fFv; if (fInterest == 0.0) -fZw = fBw + fRmz * fZzr; +fFv = fPv + fPmt * fNper; else { -double fTerm = pow(1.0 + fInterest, fZzr); +double fTerm = pow(1.0 + fInterest, fNper);
[Libreoffice-commits] core.git: sc/source
sc/source/core/inc/interpre.hxx | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) New commits: commit 0c1ccab0d559b01a69ba5b1b598bc2c885ffa8d1 Author: Johnny_M Date: Tue Oct 3 11:52:49 2017 +0200 Translate German variable names in Calc (financial) These names of variables correspond to German function names in Calc and were translated to their English equivalents. For used translations, see, e.g., https://translations.documentfoundation.org/de/libo54_help/translate/#search=RMZ&sfields=target&soptions=exact,case Note: This is an alignment of the function declaration to the definitions in /core/sc/source/core/tool/interpr2.cxx, some of which were translated on f8b9b8ec5686c1453e335d895aa78faba5fdf268, while others were already in English. Change-Id: Ifb01992e42af707a08a02139ffb8313d3b92701c Reviewed-on: https://gerrit.libreoffice.org/43077 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index fa257e8c6f04..bd9008d47bde 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -771,32 +771,32 @@ private: void ScMIRR(); void ScISPMT(); -static double ScGetBw(double fInterest, double fZzr, double fRmz, - double fZw, bool bPayInAdvance); +static double ScGetBw(double fInterest, double fNper, double fPmt, + double fFv, bool bPayInAdvance); void ScPV(); void ScSYD(); -static double ScGetGDA(double fWert, double fRest, double fDauer, - double fPeriode, double fFactor); +static double ScGetGDA(double fValue, double fRest, double fTimeLength, + double fPeriod, double fFactor); void ScDDB(); void ScDB(); -static double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1, -double fPeriode,double fFactor); +static double ScInterVDB(double fValue, double fRest, double fTimeLength, double fTimeLength1, + double fPeriod, double fFactor); void ScVDB(); void ScPDuration(); void ScSLN(); -static double ScGetRmz(double fInterest, double fZzr, double fBw, - double fZw, bool bPayInAdvance); +static double ScGetRmz(double fInterest, double fNper, double fPv, + double fFv, bool bPayInAdvance); void ScPMT(); void ScRRI(); -static double ScGetZw(double fInterest, double fZzr, double fRmz, - double fBw, bool bFlag); +static double ScGetZw(double fInterest, double fNper, double fPmt, + double fPv, bool bFlag); void ScFV(); void ScNper(); static bool RateIteration(double fNper, double fPayment, double fPv, -double fFv, bool bPayType, double& fGuess); + double fFv, bool bPayType, double& fGuess); void ScRate(); -double ScGetCompoundInterest(double fInterest, double fZr, double fZzr, double fBw, - double fZw, bool bPayInAdvance, double& fRmz); +double ScGetCompoundInterest(double fInterest, double fPer, double fNper, double fPv, + double fFv, bool bPayInAdvance, double& fPmt); void ScIpmt(); void ScPpmt(); void ScCumIpmt(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source dbaccess/source editeng/source filter/source include/svx sc/inc sc/source sd/source svl/source svtools/source svx/source sw/inc sw/sdi sw/source toolkit/so
basic/source/inc/opcodes.hxx |6 +++--- dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx |4 ++-- editeng/source/editeng/impedit4.cxx |2 +- editeng/source/editeng/impedit5.cxx |4 ++-- filter/source/msfilter/svdfppt.cxx|8 include/svx/camera3d.hxx |2 +- include/svx/svdedxv.hxx |2 +- include/svx/svdpage.hxx | 12 ++-- include/svx/svdpntv.hxx |2 +- sc/inc/afmtuno.hxx|2 +- sc/source/ui/docshell/autostyl.cxx|4 ++-- sc/source/ui/docshell/docsh.cxx |4 ++-- sc/source/ui/docshell/docsh3.cxx |2 +- sc/source/ui/drawfunc/fuconstr.cxx|2 +- sc/source/ui/drawfunc/fusel.cxx |2 +- sc/source/ui/unoobj/chartuno.cxx |6 +++--- sc/source/ui/view/tabview4.cxx|2 +- sd/source/core/sdpage.cxx |2 +- svl/source/numbers/zformat.cxx|2 +- svtools/source/contnr/svimpbox.cxx|2 +- svtools/source/control/tabbar.cxx |2 +- svtools/source/dialogs/wizdlg.cxx |4 ++-- svx/source/dialog/_bmpmask.cxx|2 +- svx/source/dialog/fontwork.cxx|2 +- svx/source/fmcomp/fmgridcl.cxx| 10 +- sw/inc/fesh.hxx |4 ++-- sw/sdi/_textsh.sdi|2 +- sw/source/core/fields/ddefld.cxx |2 +- sw/source/core/layout/sectfrm.cxx |2 +- sw/source/core/table/swtable.cxx |2 +- sw/source/uibase/uiview/viewtab.cxx |2 +- toolkit/source/awt/vclxwindows.cxx|2 +- vcl/source/control/field2.cxx |2 +- vcl/source/window/seleng.cxx |2 +- vcl/source/window/toolbox.cxx |2 +- vcl/source/window/window.cxx |2 +- 36 files changed, 58 insertions(+), 58 deletions(-) New commits: commit abe5a1a55fa56e4db60421861a50671c9f9c4de9 Author: Johnny_M Date: Sun May 27 18:37:03 2018 +0200 Translate German comments and debug strings And correct a few comments (translation and grammar) Change-Id: Ifafa521c683e9ca65aeba8031cd4cbfc1fadc137 Reviewed-on: https://gerrit.libreoffice.org/54888 Tested-by: Jenkins Reviewed-by: Thorsten Behrens Reviewed-by: Armin Le Grand diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx index 1f10d2d84943..859ad388aed2 100644 --- a/basic/source/inc/opcodes.hxx +++ b/basic/source/inc/opcodes.hxx @@ -91,11 +91,11 @@ enum class SbiOpcode { SbOP1_START = NUMBER_, -SCONST_,// loading a stringconstant (+ID) +SCONST_,// loading a string constant (+ID) CONST_, // Immediate Load (+ value) ARGN_, // saving a named Arg in Argv (+StringID) PAD_, // bring string to a firm length (+length) -// Verzweigungen +// branch JUMP_, // jump (+target) JUMPT_, // evaluate TOS, conditional jump (+target) JUMPF_, // evaluate TOS, conditional jump (+target) @@ -109,7 +109,7 @@ enum class SbiOpcode { // E/A CLOSE_, // (+channel/0) PRCHAR_,// (+char) -// Verwaltung +// management SETCLASS_, // test set + class names (+StringId) TESTCLASS_, // Check TOS class (+StringId) LIB_, // set lib name for declare-procs (+StringId) diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 97ce07c9ccad..08585d56e11b 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -55,10 +55,10 @@ void OTableDesignHelpBar::SetHelpText( const OUString& rText ) void OTableDesignHelpBar::Resize() { -// Abmessungen parent window +// parent window dimensions Size aOutputSize( GetOutputSizePixel() ); -// TextWin anpassen +// adapt the TextWin if(m_pTextWin) m_pTextWin->SetPosSizePixel( Point(STANDARD_MARGIN+1, STANDARD_MARGIN+1), Size(aOutputSize.Width()-(2*STANDARD_MARGIN)-2, diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index e2f7e2412dd0..8fcf39508d33 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -221,7
[Libreoffice-commits] core.git: editeng/source
editeng/source/items/numitem.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 0220520609b7e67fdbe22e641d9dd5c027ee3d75 Author: Johnny_M Date: Sat Nov 18 22:51:54 2017 +0100 Translate German variable name Change-Id: I70f9355bc7f219e8d6aaf9fb8ecc356e1a86d9da Reviewed-on: https://gerrit.libreoffice.org/44921 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index cf26cb20231e..fbf89dceaef0 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -507,18 +507,18 @@ OUString SvxNumberFormat::CreateRomanString( sal_uLong nNo, bool bUpper ) sal_uInt16 nMask = 1000; while( nMask ) { -sal_uInt8 nZahl = sal_uInt8(nNo / nMask); +sal_uInt8 nNumber = sal_uInt8(nNo / nMask); sal_uInt8 nDiff = 1; nNo %= nMask; -if( 5 < nZahl ) +if( 5 < nNumber ) { -if( nZahl < 9 ) +if( nNumber < 9 ) sRet += OUString(*(cRomanArr-1)); ++nDiff; -nZahl -= 5; +nNumber -= 5; } -switch( nZahl ) +switch( nNumber ) { case 3: { sRet += OUString(*cRomanArr); SAL_FALLTHROUGH; } case 2: { sRet += OUString(*cRomanArr); SAL_FALLTHROUGH; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - vcl/headless vcl/inc vcl/source vcl/unx vcl/win
vcl/headless/svpprn.cxx |2 +- vcl/inc/win/salgdi.h |4 ++-- vcl/inc/win/wincomp.hxx |2 +- vcl/source/app/help.cxx |2 +- vcl/source/control/button.cxx|4 ++-- vcl/source/edit/textdoc.cxx | 18 +- vcl/source/filter/sgf.ini|2 +- vcl/source/filter/sgvmain.hxx|4 ++-- vcl/source/filter/sgvtext.cxx|2 +- vcl/source/gdi/bitmap.cxx|2 +- vcl/source/window/menufloatingwindow.cxx |2 +- vcl/source/window/tabdlg.cxx |2 +- vcl/source/window/winproc.cxx|6 +++--- vcl/unx/generic/print/genprnpsp.cxx |2 +- vcl/win/window/salobj.cxx|4 ++-- 15 files changed, 29 insertions(+), 29 deletions(-) New commits: commit 7bd77b9306f0fc6908b715683b2e3b90cc4b75d6 Author: Johnny_M Date: Sun Sep 10 21:40:52 2017 +0200 Translate German comments/debug strings (leftovers in dirs vbahelper and vcl) Translates leftovers found using a custom regex. Additionally: - Translated the "SGV Fonts for StarView" INI file parameter group in vcl/source/filter/sgf.ini and .../sgvtext.cxx Reviewed-on: https://gerrit.libreoffice.org/42145 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 59010ca14ba07f0a1d6f662bb1f8fbad33f3c654) Change-Id: I1360aac1a2f3fa825f86d77ac1b05e2de9ffb007 Reviewed-on: https://gerrit.libreoffice.org/45453 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index ac6cfdd26cab..f707254efa92 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -216,7 +216,7 @@ void SvpSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) for( ::std::list< OUString >::iterator it = aPrinters.begin(); it != aPrinters.end(); ++it ) { const PrinterInfo& rInfo( rManager.getPrinterInfo( *it ) ); -// Neuen Eintrag anlegen +// create new entry SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo; pInfo->maPrinterName= *it; pInfo->maDriver = rInfo.m_aDriverName; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 14310f90411e..4204a0954d53 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -232,7 +232,7 @@ private: boolmbFontKernInit; // FALSE: FontKerns must be queried KERNINGPAIR*mpFontKernPairs;// Kerning Pairs of the current Font sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs of the current Font -int mnPenWidth; // Linienbreite +int mnPenWidth; // line width LogicalFontInstance* GetWinFontEntry(int nFallbackLevel); @@ -412,7 +412,7 @@ public: // pFont: describes from which font to create a subset // pGlyphIDs: the glyph ids to be extracted // pEncoding: the character code corresponding to each glyph -// pWidths: the advance widths of the correspoding glyphs (in PS font units) +// pWidths: the advance widths of the corresponding glyphs (in PS font units) // nGlyphs: the number of glyphs // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx index 87aae83e9cfc..b404aa532365 100644 --- a/vcl/inc/win/wincomp.hxx +++ b/vcl/inc/win/wincomp.hxx @@ -196,7 +196,7 @@ inline HINSTANCE GetWindowInstance( HWND hWnd ) #endif -// - 5.0-Erweiterungen - +// - 5.0 extensions - #ifndef COLOR_GRADIENTACTIVECAPTION #define COLOR_GRADIENTACTIVECAPTION 27 diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 153abc29e371..a531c11bfde0 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -631,7 +631,7 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( rHelpArea.TopLeft() ), pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( rHelpArea.BottomRight() ) ); -// Welche Position vom Rechteck? +// which position of the rectangle? aPos = devHelpArea.Center(); if ( nStyle & QuickHelpFlags::Left ) diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index f9622dee011b..378cd072f320 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2632,7 +2632,7 @@ bool RadioButton::SetModeRadioImage( const Image& rImage ) void RadioButton::SetState( bool bCheck ) { -// TabStop-Flag ric
[Libreoffice-commits] core.git: extensions/test sc/source svx/source
extensions/test/ole/EventListenerSample/EventListener/EventListener.rc |4 ++-- sc/source/ui/docshell/docsh8.cxx |2 +- svx/source/form/fmmodel.cxx|4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit b8a51074ae8dd40549947b7239a80ee6b9731e2f Author: Johnny_M Date: Thu May 10 13:46:13 2018 +0200 Translate German comments Change-Id: I6a03e921b28da5ac26235f32f547f36e00a47e46 Reviewed-on: https://gerrit.libreoffice.org/54079 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc b/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc index 532ff23f2666..2de599591d67 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc +++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc @@ -31,7 +31,7 @@ #undef APSTUDIO_READONLY_SYMBOLS -// Deutsch (Deutschland) resources +// German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) #ifdef _WIN32 @@ -118,7 +118,7 @@ BEGIN IDS_PROJNAME"EventListener" END -#endif// Deutsch (Deutschland) resources +#endif// German (Germany) resources diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index d9781310ebdd..d9631c8443e2 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -912,7 +912,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding if (!aCell.isEmpty()) { if (aCell.meType == CELLTYPE_EDIT) -{ // Paragraphs erhalten +{ // preserve paragraphs lcl_getLongVarCharEditString(aString, aCell, aEditEngine); } else diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index 1fc2b4844f59..ef5f56e09c41 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -100,7 +100,7 @@ SdrPage* FmFormModel::AllocPage(bool bMasterPage) void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos) { -// hack solange method intern +// hack for as long as the method is internal if (m_pObjShell && !m_pImpl->mxUndoEnv->IsListening( *m_pObjShell )) SetObjectShell(m_pObjShell); @@ -126,7 +126,7 @@ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum) void FmFormModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos) { -// hack solange method intern +// hack for as long as the method is internal if (m_pObjShell && !m_pImpl->mxUndoEnv->IsListening( *m_pObjShell )) SetObjectShell(m_pObjShell); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060100.xhp |9 +++-- source/text/scalc/01/04060108.xhp |8 +--- source/text/scalc/01/04060110.xhp |2 +- source/text/scalc/01/04060111.xhp |2 +- source/text/scalc/01/04060115.xhp | 14 ++ source/text/scalc/01/04060116.xhp | 16 +++- 6 files changed, 23 insertions(+), 28 deletions(-) New commits: commit 10fd59fe53de18975ae62bed7df510ea0432f728 Author: Johnny_M Date: Tue Sep 27 00:54:28 2016 +0200 Improved topic relations for a selected set of pages Following pages are affected by this update: 1. "Functions by Category" (https://help.libreoffice.org/Calc/Functions_by_Category): - Added a variable to its heading, so that it can be referenced from other places - Removed self-referece in its "Related Topics" (it was turned into the above heading reference instead, thereby also correcting the remote HTTP page reference to local help file referece). Note: Pages already using the reference will auto-ajust (e.g. "Related Topics" of https://help.libreoffice.org/Calc/Statistical_Functions_Part_One) - Corrected "Operators" reference location by moving it into "Related Topics" 2. "Statistics Functions" (https://help.libreoffice.org/Calc/Statistics_Functions): - Added a variable to its heading, so that it can be referenced from other places (point 6 below) - Cleaned up references by adding a "Related Topics" section - Using links to heading variables in "Related Topics", for improved heading string consistency 3. "Text Functions" (https://help.libreoffice.org/Calc/Text_Functions): - Added a variable to its heading, so that it can be referenced from other places (point 5 below) 4. "Add-in Functions" (https://help.libreoffice.org/Calc/Add-in_Functions): - Added a variable to its heading, so that it can be referenced from other places (points 5 and 6 below) 5. "Add-in Functions, List of Analysis Functions Part One": - Added a variable to its heading, so that it can be referenced from other places (point 6 below) - Moved "Related Topics" chapter to the bottom of the page - Using links to heading variables in "Related Topics", for improved heading string consistency 6. "Add-in Functions, List of Analysis Functions Part Two": - Added a variable to its heading, so that it can be referenced from other places (points 2 and 5 above) - Moved "Related Topics" chapter to the bottom of the page - Using links to heading variables in "Related Topics", for improved heading string consistency The updated pages were tested as described in https://wiki.documentfoundation.org/HelpContent#Without_the_LibreOffice_Core_Repo on 32-bit Debian Linux with: Version: 5.3.0.0.alpha0+ Build ID: d15082cac2306fb9562ff126eb5827b7b9eee1e1 CPU Threads: 2; OS Version: Linux 4.6; UI Render: default; TinderBox: Linux-rpm_deb-x86@71-TDF, Branch:master, Time: 2016-09-19_05:41:30 Locale: en-US (en_US.UTF-8); Calc: group Change-Id: Icbb3725fd16d3ff76e5e4244c2284349332cffb7 Reviewed-on: https://gerrit.libreoffice.org/29306 Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/source/text/scalc/01/04060100.xhp b/source/text/scalc/01/04060100.xhp index ce49610..a594539 100644 --- a/source/text/scalc/01/04060100.xhp +++ b/source/text/scalc/01/04060100.xhp @@ -32,9 +32,8 @@ list of functions MW deleted "Calc functions" Functions by Category + oldref="16">Functions by Category This section describes the functions of $[officename] Calc. The various functions are divided into categories in the Function Wizard. - You can find detailed explanations, illustrations, and examples of Calc functions http://help.libreoffice.org/Calc/Functions_by_Category";>in the LibreOffice WikiHelp. Database Date & Time @@ -62,10 +61,8 @@ Add-in - Operators are also available. - http://help.libreoffice.org/Calc/Functions_by_Category";>Calc Functions By Category in the LibreOffice WikiHelp - + Operators - \ No newline at end of file + diff --git a/source/text/scalc/01/04060108.xhp b/source/text/scalc/01/04060108.xhp index f9e09b1..4394377 100644 --- a/source/text/scalc/01/04060108.xhp +++ b/source/text/scalc/01/04060108.xhp @@ -31,7 +31,7 @@ Function Wizard; statistics functions; statistics functions -Statistics Functions +Statistics Functions This category contains the Statistics functions. @@ -145,7 +145,9 @@ -Statistical Functions in the Analysis-AddIn - + + + + diff
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit edb9901980842872e8a41eb7c7dad907346a3caa Author: Johnny_M Date: Tue Sep 27 00:54:28 2016 +0200 Updated core Project: help 10fd59fe53de18975ae62bed7df510ea0432f728 Improved topic relations for a selected set of pages Following pages are affected by this update: 1. "Functions by Category" (https://help.libreoffice.org/Calc/Functions_by_Category): - Added a variable to its heading, so that it can be referenced from other places - Removed self-referece in its "Related Topics" (it was turned into the above heading reference instead, thereby also correcting the remote HTTP page reference to local help file referece). Note: Pages already using the reference will auto-ajust (e.g. "Related Topics" of https://help.libreoffice.org/Calc/Statistical_Functions_Part_One) - Corrected "Operators" reference location by moving it into "Related Topics" 2. "Statistics Functions" (https://help.libreoffice.org/Calc/Statistics_Functions): - Added a variable to its heading, so that it can be referenced from other places (point 6 below) - Cleaned up references by adding a "Related Topics" section - Using links to heading variables in "Related Topics", for improved heading string consistency 3. "Text Functions" (https://help.libreoffice.org/Calc/Text_Functions): - Added a variable to its heading, so that it can be referenced from other places (point 5 below) 4. "Add-in Functions" (https://help.libreoffice.org/Calc/Add-in_Functions): - Added a variable to its heading, so that it can be referenced from other places (points 5 and 6 below) 5. "Add-in Functions, List of Analysis Functions Part One": - Added a variable to its heading, so that it can be referenced from other places (point 6 below) - Moved "Related Topics" chapter to the bottom of the page - Using links to heading variables in "Related Topics", for improved heading string consistency 6. "Add-in Functions, List of Analysis Functions Part Two": - Added a variable to its heading, so that it can be referenced from other places (points 2 and 5 above) - Moved "Related Topics" chapter to the bottom of the page - Using links to heading variables in "Related Topics", for improved heading string consistency The updated pages were tested as described in https://wiki.documentfoundation.org/HelpContent#Without_the_LibreOffice_Core_Repo on 32-bit Debian Linux with: Version: 5.3.0.0.alpha0+ Build ID: d15082cac2306fb9562ff126eb5827b7b9eee1e1 CPU Threads: 2; OS Version: Linux 4.6; UI Render: default; TinderBox: Linux-rpm_deb-x86@71-TDF, Branch:master, Time: 2016-09-19_05:41:30 Locale: en-US (en_US.UTF-8); Calc: group Change-Id: Icbb3725fd16d3ff76e5e4244c2284349332cffb7 Reviewed-on: https://gerrit.libreoffice.org/29306 Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/helpcontent2 b/helpcontent2 index 229282b..10fd59f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 229282b80660a023077e5330afbbae51398b9690 +Subproject commit 10fd59fe53de18975ae62bed7df510ea0432f728 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source include/svx sw/sdi sw/source
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |2 +- dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |7 +++ include/svx/rulritem.hxx |2 +- sw/sdi/_textsh.sdi|2 +- sw/source/filter/ww8/ww8par.hxx |2 +- sw/source/filter/ww8/ww8par2.cxx |2 +- 6 files changed, 8 insertions(+), 9 deletions(-) New commits: commit 76b4820076eb24a4f3e5c8583c117cbf09fb8a8a Author: Johnny_M Date: Sun Jul 8 14:58:53 2018 +0200 Translate German comments Including correction of earlier translations in case of and around "packen" Change-Id: Icaeaebb46a15edcc4abdcfee55d07b43e1767e06 Reviewed-on: https://gerrit.libreoffice.org/57156 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 455adc02121d..fe306eb14b6f 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1625,7 +1625,7 @@ void OSelectionBrowseBox::CheckFreeColumns(sal_uInt16& _rColumnPosition) { if (FindFirstFreeCol(_rColumnPosition) == nullptr) { -// it is full, append a Packen column +// it is full, so append a pack of columns AppendNewCol(DEFAULT_QUERY_COLS); OSL_VERIFY(FindFirstFreeCol(_rColumnPosition).is()); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index c7bc3715c057..dca0b97052c1 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -210,12 +210,11 @@ namespace dbaui OTableFieldDescRef FindFirstFreeCol(sal_uInt16& _rColumnPosition); -// rCol contains the Nummer (in pOTableFieldDescList) of the first column, which itself tells it is empty +// rCol contains the number (in pOTableFieldDescList) of the first column, which itself tells it is empty // if there are none, rCol is undefined and the returnvalue NULL voidCheckFreeColumns(sal_uInt16& _rColumnPosition); - -// check if empty columns are available, if not, a new Packen is appended -// rCol contains the Nummer of the first empty column (in pOTableFieldDescList) +// checks if empty columns are available, if not, a new pack is appended +// rCol contains the number of the first empty column (in pOTableFieldDescList) voidRemoveField( sal_uInt16 nId ); tools::Rectangle GetInvalidRect( sal_uInt16 nColId ); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 0dc39a552f6e..048ac3365dd9 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -203,7 +203,7 @@ private: long nStartX; /* Start in x direction */ long nEndX; /* End in x direction */ long nStartY; /* Start in y direction */ -long nEndY; /* Ende in y direction */ +long nEndY; /* End in y direction */ bool bLimits; /* boundary limit control by the application */ protected: diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index 28bc1c89f653..fbd946ca8494 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -1676,5 +1676,5 @@ interface BaseText DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; // e.g. disable for read-only documents ] -} //ende interface text +} // end of interface text diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index f43797213631..8bf8db6195ea 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1277,7 +1277,7 @@ private: rtl_TextEncoding m_eHardCharSet;// Hard rtl_TextEncoding-Attribute sal_uInt16 m_nProgress; // percentage for Progressbar sal_uInt16 m_nCurrentColl; // per WW-count -sal_uInt16 m_nFieldNum; // serial nummer for that +sal_uInt16 m_nFieldNum; // serial number for that sal_uInt16 m_nLFOPosition; short m_nCharFormat; // per WW-count, <0 for none diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 89e3950c6717..3fcb7ad116b9 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -723,7 +723,7 @@ SwNumRule* SwWW8ImplReader::GetStyRule() sal_uInt16 nRul = m_rDoc.MakeNumRule( aName, nullptr, false, SvxNumberFormat::LABEL_ALIGNMENT ); m_xStyles->mpStyRule = m_rDoc.GetNumRuleTable()[nRul]; -// Auto == false-> Nummerierungsvorlage +// Auto == false-> numbering style m_xStyles->mpStyRule->SetA
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr2.cxx | 50 +++ 1 file changed, 25 insertions(+), 25 deletions(-) New commits: commit 5a31258d120c7220d918c0835a03928b1451c7a9 Author: Johnny_M Date: Tue Oct 3 12:20:36 2017 +0200 Translate German variable names in Calc (financial) These names of variables correspond to German function names in Calc and were translated to their English equivalents. For used translations, see, e.g., https://translations.documentfoundation.org/de/libo54_help/translate/#search=GDA&sfields=target&soptions=exact,case Change-Id: I58be84b37e045ac15bcdf15032def7591be53de7 Reviewed-on: https://gerrit.libreoffice.org/43078 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 5706baf73769..1a29ed2ddbc3 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1647,7 +1647,7 @@ void ScInterpreter::ScSYD() double ScInterpreter::ScGetGDA(double fValue, double fRest, double fTimeLength, double fPeriod, double fFactor) { -double fGda, fInterest, fOldValue, fNewValue; +double fDdb, fInterest, fOldValue, fNewValue; fInterest = fFactor / fTimeLength; if (fInterest >= 1.0) { @@ -1662,12 +1662,12 @@ double ScInterpreter::ScGetGDA(double fValue, double fRest, double fTimeLength, fNewValue = fValue * pow(1.0 - fInterest, fPeriod); if (fNewValue < fRest) -fGda = fOldValue - fRest; +fDdb = fOldValue - fRest; else -fGda = fOldValue - fNewValue; -if (fGda < 0.0) -fGda = 0.0; -return fGda; +fDdb = fOldValue - fNewValue; +if (fDdb < 0.0) +fDdb = 0.0; +return fDdb; } void ScInterpreter::ScDDB() @@ -1718,9 +1718,9 @@ void ScInterpreter::ScDB() double nOffRate = 1.0 - pow(nRest / nValue, 1.0 / nTimeLength); nOffRate = ::rtl::math::approxFloor((nOffRate * 1000.0) + 0.5) / 1000.0; double nFirstOffRate = nValue * nOffRate * nMonths / 12.0; -double nGda2 = 0.0; +double nDb = 0.0; if (::rtl::math::approxFloor(nPeriod) == 1) -nGda2 = nFirstOffRate; +nDb = nFirstOffRate; else { double nSumOffRate = nFirstOffRate; @@ -1729,13 +1729,13 @@ void ScInterpreter::ScDB() sal_uInt16 iMax = (sal_uInt16)::rtl::math::approxFloor(nMin); for (sal_uInt16 i = 2; i <= iMax; i++) { -nGda2 = (nValue - nSumOffRate) * nOffRate; -nSumOffRate += nGda2; +nDb = (nValue - nSumOffRate) * nOffRate; +nSumOffRate += nDb; } if (nPeriod > nTimeLength) -nGda2 = ((nValue - nSumOffRate) * nOffRate * (12.0 - nMonths)) / 12.0; +nDb = ((nValue - nSumOffRate) * nOffRate * (12.0 - nMonths)) / 12.0; } -PushDouble(nGda2); +PushDouble(nDb); } double ScInterpreter::ScInterVDB(double fValue,double fRest,double fTimeLength, @@ -1745,34 +1745,34 @@ double ScInterpreter::ScInterVDB(double fValue,double fRest,double fTimeLength, double fIntEnd = ::rtl::math::approxCeil(fPeriod); sal_uLong nLoopEnd = (sal_uLong) fIntEnd; -double fTerm, fLia; +double fTerm, fSln; // SLN: Straight-Line Depreciation double fSalvageValue = fValue - fRest; -bool bNowLia = false; +bool bNowSln = false; -double fGda; +double fDdb; sal_uLong i; -fLia=0; +fSln=0; for ( i = 1; i <= nLoopEnd; i++) { -if(!bNowLia) +if(!bNowSln) { -fGda = ScGetGDA(fValue, fRest, fTimeLength, (double) i, fFactor); -fLia = fSalvageValue/ (fTimeLength1 - (double) (i-1)); +fDdb = ScGetGDA(fValue, fRest, fTimeLength, (double) i, fFactor); +fSln = fSalvageValue/ (fTimeLength1 - (double) (i-1)); -if (fLia > fGda) +if (fSln > fDdb) { -fTerm = fLia; -bNowLia = true; +fTerm = fSln; +bNowSln = true; } else { -fTerm = fGda; -fSalvageValue -= fGda; +fTerm = fDdb; +fSalvageValue -= fDdb; } } else { -fTerm = fLia; +fTerm = fSln; } if ( i == nLoopEnd) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/inc/interpre.hxx |8 sc/source/core/tool/interpr2.cxx | 38 +++--- 2 files changed, 23 insertions(+), 23 deletions(-) New commits: commit a67d2aa67401e31bea3b3ad82cb19bbecf071e50 Author: Johnny_M Date: Sun Oct 22 15:28:53 2017 +0200 Translate German function names in Calc (financial) The affected parts of names of functions correspond to German function names in Calc and were translated to their English equivalents. For used translations, see, e.g., https://translations.documentfoundation.org/de/libo54_help/translate/#search=GDA&sfields=target&soptions=exact,case Note: The translation here is equal to the translation of variables done on https://gerrit.libreoffice.org/43078 , etc. Change-Id: If3043a9a10366dbf11269d72708404e350d58166 Reviewed-on: https://gerrit.libreoffice.org/43691 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index bd9008d47bde..c50f65078e81 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -771,11 +771,11 @@ private: void ScMIRR(); void ScISPMT(); -static double ScGetBw(double fInterest, double fNper, double fPmt, +static double ScGetPV(double fInterest, double fNper, double fPmt, double fFv, bool bPayInAdvance); void ScPV(); void ScSYD(); -static double ScGetGDA(double fValue, double fRest, double fTimeLength, +static double ScGetDDB(double fValue, double fRest, double fTimeLength, double fPeriod, double fFactor); void ScDDB(); void ScDB(); @@ -784,11 +784,11 @@ private: void ScVDB(); void ScPDuration(); void ScSLN(); -static double ScGetRmz(double fInterest, double fNper, double fPv, +static double ScGetPMT(double fInterest, double fNper, double fPv, double fFv, bool bPayInAdvance); void ScPMT(); void ScRRI(); -static double ScGetZw(double fInterest, double fNper, double fPmt, +static double ScGetFV(double fInterest, double fNper, double fPmt, double fPv, bool bFlag); void ScFV(); void ScNper(); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 1a29ed2ddbc3..24e1ca148f7e 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1592,7 +1592,7 @@ void ScInterpreter::ScISPMT() } // financial functions -double ScInterpreter::ScGetBw(double fInterest, double fNper, double fPmt, +double ScInterpreter::ScGetPV(double fInterest, double fNper, double fPmt, double fFv, bool bPayInAdvance) { double fPv; @@ -1626,7 +1626,7 @@ void ScInterpreter::ScPV() nPmt = GetDouble(); nNper = GetDouble(); nInterest = GetDouble(); -PushDouble(ScGetBw(nInterest, nNper, nPmt, nFv, bPayInAdvance)); +PushDouble(ScGetPV(nInterest, nNper, nPmt, nFv, bPayInAdvance)); } void ScInterpreter::ScSYD() @@ -1644,7 +1644,7 @@ void ScInterpreter::ScSYD() } } -double ScInterpreter::ScGetGDA(double fValue, double fRest, double fTimeLength, +double ScInterpreter::ScGetDDB(double fValue, double fRest, double fTimeLength, double fPeriod, double fFactor) { double fDdb, fInterest, fOldValue, fNewValue; @@ -1689,7 +1689,7 @@ void ScInterpreter::ScDDB() || nPeriod < 1.0 || nPeriod > nTimeLength) PushIllegalArgument(); else -PushDouble(ScGetGDA(nValue, nRest, nTimeLength, nPeriod, nFactor)); +PushDouble(ScGetDDB(nValue, nRest, nTimeLength, nPeriod, nFactor)); } } @@ -1756,7 +1756,7 @@ double ScInterpreter::ScInterVDB(double fValue,double fRest,double fTimeLength, { if(!bNowSln) { -fDdb = ScGetGDA(fValue, fRest, fTimeLength, (double) i, fFactor); +fDdb = ScGetDDB(fValue, fRest, fTimeLength, (double) i, fFactor); fSln = fSalvageValue/ (fTimeLength1 - (double) (i-1)); if (fSln > fDdb) @@ -1824,7 +1824,7 @@ void ScInterpreter::ScVDB() { for (sal_uLong i = nLoopStart + 1; i <= nLoopEnd; i++) { -double fTerm = ScGetGDA(fValue, fRest, fTimeLength, (double) i, fFactor); +double fTerm = ScGetDDB(fValue, fRest, fTimeLength, (double) i, fFactor); //respect partial period in the Beginning/ End: if ( i == nLoopStart+1 ) @@ -1900,7 +1900,7 @@ void ScInterpreter::ScSLN() } } -double ScInterpreter::ScGetRmz(double fRate, double fNper, double fPv, +double ScInterpreter::ScGetPMT(double fRate, double fNper, double fPv, double fFv, bool bPayInAdvance) { double fPayment; @@ -1933,7 +1933,7 @@ void
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysishelper.cxx | 36 ++-- scaddins/source/analysis/analysishelper.hxx |4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) New commits: commit 8ba9dfe27382626e97fb4ab705b7ad056725a800 Author: Johnny_M Date: Sun Oct 22 16:10:06 2017 +0200 Translate German variable names in Calc (financial) These names of variables correspond to German function names in Calc and were translated to their English equivalents. For used translations, see, e.g., https://translations.documentfoundation.org/de/libo54_help/translate/#search=RMZ&sfields=target&soptions=exact,case Note: The translation here is equal to the translation of variables done on https://gerrit.libreoffice.org/43078 , etc. Change-Id: I1010a3ddf58a0d32e97bfb55090dc7aacc0b91b7 Reviewed-on: https://gerrit.libreoffice.org/43692 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 22328b2d2373..8331565dd0ca 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -1231,39 +1231,39 @@ double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal } -double GetRmz( double fZins, double fZzr, double fBw, double fZw, sal_Int32 nF ) +double GetRmz( double fInterest, double fNper, double fPv, double fFv, sal_Int32 nPayType ) { -double fRmz; -if( fZins == 0.0 ) -fRmz = ( fBw + fZw ) / fZzr; +double fPmt; +if( fInterest == 0.0 ) +fPmt = ( fPv + fFv ) / fNper; else { -double fTerm = pow( 1.0 + fZins, fZzr ); -if( nF > 0 ) -fRmz = ( fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins / ( 1.0 - 1.0 / fTerm ) ) / ( 1.0 + fZins ); +double fTerm = pow( 1.0 + fInterest, fNper ); +if( nPayType > 0 ) +fPmt = ( fFv * fInterest / ( fTerm - 1.0 ) + fPv * fInterest / ( 1.0 - 1.0 / fTerm ) ) / ( 1.0 + fInterest ); else -fRmz = fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins / ( 1.0 - 1.0 / fTerm ); +fPmt = fFv * fInterest / ( fTerm - 1.0 ) + fPv * fInterest / ( 1.0 - 1.0 / fTerm ); } -return -fRmz; +return -fPmt; } -double GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF ) +double GetZw( double fInterest, double fNper, double fPmt, double fPv, sal_Int32 nPayType ) { -double fZw; -if( fZins == 0.0 ) -fZw = fBw + fRmz * fZzr; +double fFv; +if( fInterest == 0.0 ) +fFv = fPv + fPmt * fNper; else { -double fTerm = pow( 1.0 + fZins, fZzr ); -if( nF > 0 ) -fZw = fBw * fTerm + fRmz * ( 1.0 + fZins ) * ( fTerm - 1.0 ) / fZins; +double fTerm = pow( 1.0 + fInterest, fNper ); +if( nPayType > 0 ) +fFv = fPv * fTerm + fPmt * ( 1.0 + fInterest ) * ( fTerm - 1.0 ) / fInterest; else -fZw = fBw * fTerm + fRmz * ( fTerm - 1.0 ) / fZins; +fFv = fPv * fTerm + fPmt * ( fTerm - 1.0 ) / fInterest; } -return -fZw; +return -fFv; } // financial functions COUP*** diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 280c4a396861..e644d4fa3e72 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -155,8 +155,8 @@ double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_In /// @throws css::lang::IllegalArgumentException double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ); -double GetRmz( double fZins, double fZzr, double fBw, double fZw, sal_Int32 nF ); -double GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF ); +double GetRmz( double fInterest, double fNper, double fPv, double fFv, sal_Int32 nPayType ); +double GetZw( double fInterest, double fNper, double fPmt, double fPv, sal_Int32 nPayType ); /// @throws css::uno::RuntimeException /// @throws css::lang::IllegalArgumentException ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/nodes.cxx | 182 +++ 1 file changed, 91 insertions(+), 91 deletions(-) New commits: commit 7945d19d11e4064e91633ec0cff669b8412b95c4 Author: Johnny_M Date: Sat Mar 31 13:10:43 2018 +0200 Translate German variable names Akt -> Current in nodes Change-Id: I62b46ccf44fdbd9c5373447f1aa624ba469f Reviewed-on: https://gerrit.libreoffice.org/52188 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 19e42cc5488d..0d1fba03e848 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -405,27 +405,27 @@ void SwNodes::ChgNode( SwNodeIndex const & rDelPos, sal_uLong nSz, bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, const SwNodeIndex& aIndex, bool bNewFrames ) { -SwNode * pAktNode; +SwNode * pCurrentNode; if( aIndex == 0 || -( (pAktNode = &aIndex.GetNode())->GetStartNode() && - !pAktNode->StartOfSectionIndex() )) +( (pCurrentNode = &aIndex.GetNode())->GetStartNode() && + !pCurrentNode->StartOfSectionIndex() )) return false; SwNodeRange aRg( aRange ); // skip "simple" start or end nodes -while( SwNodeType::Start == (pAktNode = &aRg.aStart.GetNode())->GetNodeType() -|| ( pAktNode->IsEndNode() && -!pAktNode->m_pStartOfSection->IsSectionNode() ) ) +while( SwNodeType::Start == (pCurrentNode = &aRg.aStart.GetNode())->GetNodeType() +|| ( pCurrentNode->IsEndNode() && +!pCurrentNode->m_pStartOfSection->IsSectionNode() ) ) ++aRg.aStart; --aRg.aStart; // if aEnd-1 points to no ContentNode, search previous one --aRg.aEnd; -while( ( (( pAktNode = &aRg.aEnd.GetNode())->GetStartNode() && -!pAktNode->IsSectionNode() ) || -( pAktNode->IsEndNode() && -SwNodeType::Start == pAktNode->m_pStartOfSection->GetNodeType()) ) && +while( ( (( pCurrentNode = &aRg.aEnd.GetNode())->GetStartNode() && +!pCurrentNode->IsSectionNode() ) || +( pCurrentNode->IsEndNode() && +SwNodeType::Start == pCurrentNode->m_pStartOfSection->GetNodeType()) ) && aRg.aEnd > aRg.aStart ) --aRg.aEnd; @@ -461,7 +461,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, // continue until everything has been moved while( aRg.aStart < aRg.aEnd ) -switch( (pAktNode = &aRg.aEnd.GetNode())->GetNodeType() ) +switch( (pCurrentNode = &aRg.aEnd.GetNode())->GetNodeType() ) { case SwNodeType::End: { @@ -475,7 +475,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, nInsPos = 0; } -SwStartNode* pSttNd = pAktNode->m_pStartOfSection; +SwStartNode* pSttNd = pCurrentNode->m_pStartOfSection; if( pSttNd->IsTableNode() ) { SwTableNode* pTableNd = static_cast(pSttNd); @@ -658,9 +658,9 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, pSttNd->m_pStartOfSection = aIdx.GetNode().m_pStartOfSection; rNodes.InsertNode( pSttNd, aIdx ); -rNodes.InsertNode( pAktNode, aIdx ); +rNodes.InsertNode( pCurrentNode, aIdx ); --aIdx; -pSttNd->m_pEndOfSection = static_cast(pAktNode); +pSttNd->m_pEndOfSection = static_cast(pCurrentNode); --aRg.aEnd; @@ -715,7 +715,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, SwNodeIndex aTmpSIdx( aOrigInsPos.aStart, 1 ); SwStartNode* pTmpStt = new SwStartNode( aTmpSIdx, SwNodeType::Start, - static_cast(pAktNode)->GetStartNodeType() ); + static_cast(pCurrentNode)->GetStartNodeType() ); --aTmpSIdx; @@ -734,11 +734,11 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, // also set correct StartNode for all decreased nodes while( aTmpSIdx < aTmpEIdx ) -if( nullptr != (( pAktNode = &aTmpEIdx.GetNode())->GetEndNode()) ) -aTmpEIdx = pAktNode->StartOfSectionIndex(); +if( nullptr != (( pCurrentNode = &aTmpEIdx.
[Libreoffice-commits] core.git: svx/inc svx/source
svx/inc/svdibrow.hxx |2 +- svx/source/svdraw/svdibrow.cxx | 22 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) New commits: commit e819c33d248f0c03305fcd3fa3a1a9f5aef9c109 Author: Johnny_M Date: Sat Mar 31 14:33:40 2018 +0200 Translate German variable names aNeuNam -> aNewName aWNamMerk -> aWNameMemorized Change-Id: Iace4b6f84b40c3f989619331636ae059347e167f Reviewed-on: https://gerrit.libreoffice.org/52192 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index c62289e83751..21104c99829d 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -36,7 +36,7 @@ friend class ImpItemEdit; std::vector> aList; long nCurrentPaintRow; VclPtr pEditControl; -OUString aWNamMerk; +OUString aWNameMemorized; Link aEntryChangedHdl; Link aSetDirtyHdl; ImpItemListRow* pCurrentChangeEntry; diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index fc7c0c560658..0128792cfc4e 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -489,18 +489,18 @@ bool SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos) pEditControl->GrabFocus(); pEditControl->SetSelection(Selection(SELECTION_MIN,SELECTION_MAX)); vcl::Window* pParent=GetParent(); -aWNamMerk=pParent->GetText(); -OUString aNeuNam(aWNamMerk); -aNeuNam += " "; -aNeuNam += pEntry->GetItemTypeStr(); +aWNameMemorized=pParent->GetText(); +OUString aNewName(aWNameMemorized); +aNewName += " "; +aNewName += pEntry->GetItemTypeStr(); if (pEntry->bCanNum) { -aNeuNam += ": "; -aNeuNam += OUString::number(pEntry->nMin); -aNeuNam += ".."; -aNeuNam += OUString::number(pEntry->nMax); +aNewName += ": "; +aNewName += OUString::number(pEntry->nMin); +aNewName += ".."; +aNewName += OUString::number(pEntry->nMax); } -aNeuNam += " - Type 'del' to reset to default."; -pParent->SetText(aNeuNam); +aNewName += " - Type 'del' to reset to default."; +pParent->SetText(aNewName); pCurrentChangeEntry=new ImpItemListRow(*pEntry); bRet = true; } @@ -523,7 +523,7 @@ void SdrItemBrowserControl::BreakChangeEntry() delete pCurrentChangeEntry; pCurrentChangeEntry=nullptr; vcl::Window* pParent=GetParent(); -pParent->SetText(aWNamMerk); +pParent->SetText(aWNameMemorized); SetMode(MYBROWSEMODE); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source sw/source
include/svx/svdpagv.hxx| 14 +-- svx/source/svdraw/svdcrtv.cxx |2 - svx/source/svdraw/svdedtv.cxx |4 +-- svx/source/svdraw/svdpagv.cxx | 46 ++--- sw/source/core/frmedt/feshview.cxx |2 - 5 files changed, 34 insertions(+), 34 deletions(-) New commits: commit 667722ab8a366bf5275acb7cddbe1a9b03776821 Author: Johnny_M Date: Sat Mar 31 13:51:07 2018 +0200 Translate German variable and function names Akt -> Current in svdraw Change-Id: I8df687a5e78ad3e5e5e89b7013f782aa665529cf Reviewed-on: https://gerrit.libreoffice.org/52190 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 5b108ac2e2fb..8362ffb04695 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -74,8 +74,8 @@ private: SdrLayerIDSetaLayerLock; // Set of non-editable Layers SdrLayerIDSetaLayerPrn;// Set of printable Layers -SdrObjList* pAktList; // Current List, usually the Page -SdrObject* pAktGroup;// Current Group; nullptr means none +SdrObjList* pCurrentList; // Current List, usually the Page +SdrObject* pCurrentGroup;// Current Group; nullptr means none SdrHelpLineList aHelpLines; // Helper lines and points @@ -114,8 +114,8 @@ private: void SetLayer(const OUString& rName, SdrLayerIDSet& rBS, bool bJa); bool IsLayer(const OUString& rName, const SdrLayerIDSet& rBS) const; -/// Let's see if the current Group (pAktGroup) is still inserted -void CheckAktGroup(); +/// Let's see if the current Group (pCurrentGroup) is still inserted +void CheckCurrentGroup(); void AdjHdl(); @@ -171,13 +171,13 @@ public: SdrPage* GetPage() const { return mpPage; } /// Return current List -SdrObjList* GetObjList() const { return pAktList; } +SdrObjList* GetObjList() const { return pCurrentList; } /// Return current Group -SdrObject* GetAktGroup() const { return pAktGroup; } +SdrObject* GetCurrentGroup() const { return pCurrentGroup; } /// Set current Group and List -void SetAktGroupAndList(SdrObject* pNewGroup, SdrObjList* pNewList); +void SetCurrentGroupAndList(SdrObject* pNewGroup, SdrObjList* pNewList); bool HasMarkedObjPageView() const { return mbHasMarked; } void SetHasMarkedObj(bool bOn) { mbHasMarked = bOn; } diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index f2d739e76612..673c03ec72b3 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -635,7 +635,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) bool bSceneIntoScene(false); E3dScene* pObjScene = dynamic_cast(pObjMerk); -E3dScene* pCurrentScene = pObjScene ? dynamic_cast(pCreatePV->GetAktGroup()) : nullptr; +E3dScene* pCurrentScene = pObjScene ? dynamic_cast(pCreatePV->GetCurrentGroup()) : nullptr; if (pCurrentScene) { bool bDidInsert = static_cast(this)->ImpCloneAll3DObjectsToDestScene( diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index ce620ae67e41..f90894df9902 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -853,8 +853,8 @@ void SdrEditView::DeleteMarkedObj() { // we detected an empty parent, a candidate to leave group/3DScene // if entered -if(GetSdrPageView()->GetAktGroup() -&& GetSdrPageView()->GetAktGroup() == pParent) +if(GetSdrPageView()->GetCurrentGroup() +&& GetSdrPageView()->GetCurrentGroup() == pParent) { GetSdrPageView()->LeaveOneGroup(); } diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index ff6349894259..fb1eee822d25 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -149,9 +149,9 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) aLayerPrn.SetAll(); mbVisible = false; -pAktList = nullptr; -pAktGroup = nullptr; -SetAktGroupAndList(nullptr, mpPage); +pCurrentList = nullptr; +pCurrentGroup = nullptr; +SetCurrentGroupAndList(nullptr, mpPage); for(sal_uInt32 a(0); a < rNewView.PaintWindowCount(); a++) { @@ -198,7 +198,7 @@ css::uno::Reference< css::awt::XControlContainer > SdrPageView::GetControlContai void SdrPageView::ModelHasChanged() { -if (GetAktGroup()!=nullptr) CheckAktGroup(); +if (GetCurrentGroup()!=nullptr) CheckCurrentGroup(); } bool SdrPageView::IsReadOnly() const @@ -750,15 +750,15 @@ void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL) } // set current group and
[Libreoffice-commits] core.git: sw/source
sw/source/core/edit/autofmt.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 4cc3f90303a3da5141598b95e6158d98d647cbcf Author: Johnny_M Date: Sat Mar 31 13:35:36 2018 +0200 Translate German variable names Akt -> Current in autofmt Change-Id: I6c1a8c20bc1c98644a7667527269b52aabc6cf50 Reviewed-on: https://gerrit.libreoffice.org/52186 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 4a07168b8d0d..09ccd39c604a 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -165,7 +165,7 @@ class SwAutoFormat bool IsEnumericChar( const SwTextNode&) const; static bool IsBlanksInString( const SwTextNode&); sal_uInt16 CalcLevel( const SwTextNode&, sal_uInt16 *pDigitLvl = nullptr ) const; -sal_Int32 GetBigIndent( sal_Int32& rAktSpacePos ) const; +sal_Int32 GetBigIndent( sal_Int32& rCurrentSpacePos ) const; static OUString DelLeadingBlanks(const OUString& rStr); static OUString DelTrailingBlanks( const OUString& rStr ); @@ -478,7 +478,7 @@ sal_uInt16 SwAutoFormat::CalcLevel( const SwTextNode& rNd, sal_uInt16 *pDigitLvl return nLvl; } -sal_Int32 SwAutoFormat::GetBigIndent( sal_Int32& rAktSpacePos ) const +sal_Int32 SwAutoFormat::GetBigIndent( sal_Int32& rCurrentSpacePos ) const { SwTextFrameInfo aFInfo( GetFrame( *m_pCurTextNd ) ); const SwTextFrame* pNxtFrame = nullptr; @@ -492,7 +492,7 @@ sal_Int32 SwAutoFormat::GetBigIndent( sal_Int32& rAktSpacePos ) const pNxtFrame = GetFrame( *pNxtNd ); } -return aFInfo.GetBigIndent( rAktSpacePos, pNxtFrame ); +return aFInfo.GetBigIndent( rCurrentSpacePos, pNxtFrame ); } bool SwAutoFormat::IsNoAlphaLine( const SwTextNode& rNd ) const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdmodel.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 43bb99841254d668f1eb8f9791fb2aa5e821dbee Author: Johnny_M Date: Sat Mar 31 12:57:18 2018 +0200 Translate German variable names Akt -> Current Anf -> Start in svdmodel Change-Id: I67b255bfcf67769d4baa11986acbcc3a7e919a8f Reviewed-on: https://gerrit.libreoffice.org/52189 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index bb237ba756cf..a4fa78c362ec 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1550,9 +1550,9 @@ void SdrModel::Merge(SdrModel& rSourceModel, memset(pMasterNeed.get(), true, nSrcMasterPageCnt * sizeof(bool)); } else { memset(pMasterNeed.get(), false, nSrcMasterPageCnt * sizeof(bool)); -sal_uInt16 nAnf= bReverse ? nLastPageNum : nFirstPageNum; +sal_uInt16 nStart= bReverse ? nLastPageNum : nFirstPageNum; sal_uInt16 nEnd= bReverse ? nFirstPageNum : nLastPageNum; -for (sal_uInt16 i=nAnf; i<=nEnd; i++) { +for (sal_uInt16 i=nStart; i<=nEnd; i++) { const SdrPage* pPg=rSourceModel.GetPage(i); if(pPg->TRG_HasMasterPage()) { @@ -1567,11 +1567,11 @@ void SdrModel::Merge(SdrModel& rSourceModel, } } // now determine the Mapping of the MasterPages -sal_uInt16 nAktMaPagNum=nDstMasterPageCnt; +sal_uInt16 nCurrentMaPagNum=nDstMasterPageCnt; for (sal_uInt16 i=0; ihttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxexport.cxx | 32 sw/source/filter/ww8/docxexport.hxx |4 - sw/source/filter/ww8/rtfexport.cxx | 17 ++-- sw/source/filter/ww8/rtfexport.hxx |5 - sw/source/filter/ww8/wrtw8nds.cxx | 132 ++-- sw/source/filter/ww8/wrtww8.cxx | 24 +++--- sw/source/filter/ww8/wrtww8.hxx | 22 +++--- 7 files changed, 119 insertions(+), 117 deletions(-) New commits: commit 5d0f349b976073ab3b3e083adb87dd724f899697 Author: Johnny_M Date: Sat Mar 24 12:49:21 2018 +0100 Translate German variable names Akt -> Current in ww8 Change-Id: Ib25eb6b796f88441a39bdb71d72542c600f659e1 Reviewed-on: https://gerrit.libreoffice.org/51801 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 5fac320981de..549193949962 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -144,13 +144,13 @@ bool DocxExport::CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich return true; } -void DocxExport::AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) +void DocxExport::AppendBookmarks( const SwTextNode& rNode, sal_Int32 nCurrentPos, sal_Int32 nLen ) { std::vector< OUString > aStarts; std::vector< OUString > aEnds; IMarkVector aMarks; -if ( GetBookmarks( rNode, nAktPos, nAktPos + nLen, aMarks ) ) +if ( GetBookmarks( rNode, nCurrentPos, nCurrentPos + nLen, aMarks ) ) { for ( IMarkVector::const_iterator it = aMarks.begin(), end = aMarks.end(); it != end; ++it ) @@ -160,10 +160,10 @@ void DocxExport::AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sa const sal_Int32 nStart = pMark->GetMarkStart().nContent.GetIndex(); const sal_Int32 nEnd = pMark->GetMarkEnd().nContent.GetIndex(); -if ( nStart == nAktPos ) +if ( nStart == nCurrentPos ) aStarts.push_back( pMark->GetName() ); -if ( nEnd == nAktPos ) +if ( nEnd == nCurrentPos ) aEnds.push_back( pMark->GetName() ); } } @@ -171,7 +171,7 @@ void DocxExport::AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sa const OUString& aStr( rNode.GetText() ); const sal_Int32 nEnd = aStr.getLength(); -if ( nAktPos == nEnd ) +if ( nCurrentPos == nEnd ) m_pAttrOutput->WriteFinalBookmarks_Impl( aStarts, aEnds ); else m_pAttrOutput->WriteBookmarks_Impl( aStarts, aEnds ); @@ -188,13 +188,13 @@ void DocxExport::AppendBookmark( const OUString& rName ) m_pAttrOutput->WriteBookmarks_Impl( aStarts, aEnds ); } -void DocxExport::AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) +void DocxExport::AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nCurrentPos, sal_Int32 nLen ) { std::vector< OUString > aStarts; std::vector< OUString > aEnds; IMarkVector aMarks; -if ( GetAnnotationMarks( rNode, nAktPos, nAktPos + nLen, aMarks ) ) +if ( GetAnnotationMarks( rNode, nCurrentPos, nCurrentPos + nLen, aMarks ) ) { for ( IMarkVector::const_iterator it = aMarks.begin(), end = aMarks.end(); it != end; ++it ) @@ -204,10 +204,10 @@ void DocxExport::AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nAktP const sal_Int32 nStart = pMark->GetMarkStart().nContent.GetIndex(); const sal_Int32 nEnd = pMark->GetMarkEnd().nContent.GetIndex(); -if ( nStart == nAktPos ) +if ( nStart == nCurrentPos ) aStarts.push_back( pMark->GetName() ); -if ( nEnd == nAktPos ) +if ( nEnd == nCurrentPos ) aEnds.push_back( pMark->GetName() ); } } @@ -1504,35 +1504,35 @@ void DocxExport::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTy AttrOutput().StartParagraph( ww8::WW8TableNodeInfo::Pointer_t()); rtl_TextEncoding eChrSet = aAttrIter.GetNodeCharSet(); OUString aStr( rEditObj.GetText( n )); -sal_Int32 nAktPos = 0; +sal_Int32 nCurrentPos = 0; const sal_Int32 nEnd = aStr.getLength(); do { AttrOutput().StartRun( nullptr, 0 ); const sal_Int32 nNextAttr = std::min(aAttrIter.WhereNext(), nEnd); rtl_TextEncoding eNextChrSet = aAttrIter.GetNextCharSet(); -bool bTextAtr = aAttrIter.IsTextAttr( nAktPos ); +bool bTextAtr = aAttrIter.IsTextAttr( nCurrentPos ); if( !bTextAtr ) { -if( nAktPos == 0 && nNextAttr - nAktPos == aStr.getLength()) +if( nCurrentPos == 0 && nNextAttr -
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/doctxm.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 112dbca9882ef98a4ff294445939d1c358486691 Author: Johnny_M Date: Sat Mar 31 13:15:35 2018 +0200 Translate German variable names Akt -> Current in doctxm Change-Id: I04ce4a6ea9668b972f0243898c58db4b1a20911a Reviewed-on: https://gerrit.libreoffice.org/52187 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 64310da59d4c..34cdce1fee6c 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1535,7 +1535,7 @@ void SwTOXBaseSection::UpdatePageNum() return ; // Insert the current PageNumber into the TOC -SwPageFrame* pAktPage= nullptr; +SwPageFrame* pCurrentPage= nullptr; sal_uInt16 nPage = 0; SwDoc* pDoc = GetFormat()->GetDoc(); @@ -1595,10 +1595,10 @@ void SwTOXBaseSection::UpdatePageNum() } SwPageFrame* pTmpPage = pFrame->FindPageFrame(); -if( pTmpPage != pAktPage ) +if( pTmpPage != pCurrentPage ) { nPage = pTmpPage->GetVirtPageNum(); -pAktPage= pTmpPage; +pCurrentPage= pTmpPage; } // Insert as sorted @@ -1609,7 +1609,7 @@ void SwTOXBaseSection::UpdatePageNum() if( i >= aNums.size() || aNums[ i ] != nPage ) { aNums.insert(aNums.begin() + i, nPage); -aDescs.insert(aDescs.begin() + i, pAktPage->GetPageDesc() ); +aDescs.insert(aDescs.begin() + i, pCurrentPage->GetPageDesc() ); } // is it a main entry? if(TOX_SORT_INDEX == pSortBase->GetType() && ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/lotus/op.cxx | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 5289441ffa227f5f358ca4dc28df416be922aa66 Author: Johnny_M Date: Sat Apr 21 12:53:08 2018 +0200 Translate German variable names Puffer -> Buffer in Lotus filter Change-Id: If6d5190c7bc2f884083a2a47b6bd665b3f95b3b0 Reviewed-on: https://gerrit.libreoffice.org/53250 Tested-by: Jenkins Reviewed-by: Khaled Hosny diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index e78419726141..7dec5cfbd0d1 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -196,9 +196,9 @@ void OP_NamedRange(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/) // POST: don't save for invalid coordinates sal_uInt16 nColSt, nRowSt, nColEnd, nRowEnd; -sal_Char cPuffer[ 16+1 ]; -r.ReadBytes(cPuffer, 16); -cPuffer[ 16 ] = 0; +sal_Char cBuffer[ 16+1 ]; +r.ReadBytes(cBuffer, 16); +cBuffer[ 16 ] = 0; r.ReadUInt16( nColSt ).ReadUInt16( nRowSt ).ReadUInt16( nColEnd ).ReadUInt16( nRowEnd ); @@ -212,14 +212,14 @@ void OP_NamedRange(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/) pRange = new LotusRange( static_cast (nColSt), static_cast (nRowSt), static_cast (nColEnd), static_cast (nRowEnd) ); -sal_Char cBuf[sizeof(cPuffer)+1]; -if( rtl::isAsciiDigit( static_cast(*cPuffer) ) ) +sal_Char cBuf[sizeof(cBuffer)+1]; +if( rtl::isAsciiDigit( static_cast(*cBuffer) ) ) { // first char in name is a number -> prepend 'A' cBuf[0] = 'A'; -strcpy( cBuf + 1, cPuffer ); // #100211# - checked +strcpy( cBuf + 1, cBuffer ); // #100211# - checked } else -strcpy( cBuf, cPuffer ); // #100211# - checked +strcpy( cBuf, cBuffer ); // #100211# - checked OUString aTmp( cBuf, strlen(cBuf), rContext.pLotusRoot->eCharsetQ ); @@ -235,9 +235,9 @@ void OP_SymphNamedRange(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/) sal_uInt16 nColSt, nRowSt, nColEnd, nRowEnd; sal_uInt8 nType; -sal_Char cPuffer[ 16+1 ]; -r.ReadBytes(cPuffer, 16); -cPuffer[ 16 ] = 0; +sal_Char cBuffer[ 16+1 ]; +r.ReadBytes(cBuffer, 16); +cBuffer[ 16 ] = 0; r.ReadUInt16( nColSt ).ReadUInt16( nRowSt ).ReadUInt16( nColEnd ).ReadUInt16( nRowEnd ).ReadUChar( nType ); @@ -251,14 +251,14 @@ void OP_SymphNamedRange(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/) pRange = new LotusRange( static_cast (nColSt), static_cast (nRowSt), static_cast (nColEnd), static_cast (nRowEnd) ); -sal_Char cBuf[sizeof(cPuffer)+1]; -if( rtl::isAsciiDigit( static_cast(*cPuffer) ) ) +sal_Char cBuf[sizeof(cBuffer)+1]; +if( rtl::isAsciiDigit( static_cast(*cBuffer) ) ) { // first char in name is a number -> prepend 'A' cBuf[0] = 'A'; -strcpy( cBuf + 1, cPuffer ); // #100211# - checked +strcpy( cBuf + 1, cBuffer ); // #100211# - checked } else -strcpy( cBuf, cPuffer ); // #100211# - checked +strcpy( cBuf, cBuffer ); // #100211# - checked OUString aTmp( cBuf, strlen(cBuf), rContext.pLotusRoot->eCharsetQ ); aTmp = ScfTools::ConvertToScDefinedName( aTmp ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/svdsnpv.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6a068a90bb8b7625aca73e2c7c0a9e14a95b82be Author: Johnny_M Date: Sat Apr 21 13:04:40 2018 +0200 Translate German comment Change-Id: I490cd001c60b28a4f04eba6195e887f4e1061d5c Reviewed-on: https://gerrit.libreoffice.org/53251 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 0a40c9ac59ac..559ea220bc4b 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -242,7 +242,7 @@ public: // - circle object angle: nothing // - line keeps while Dragging the angle and is only stretched/ contracted // Default value for Ortho is off. persistent. -void SetOrtho(bool bOn) { bOrtho=bOn; } // unvollstaendig +void SetOrtho(bool bOn) { bOrtho=bOn; } // incomplete bool IsOrtho() const { return bOrtho; } // BigOrtho is only relevant if Ortho is switched on. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools sc/inc sc/source
include/svtools/rtftoken.h | 18 +- sc/inc/autoform.hxx| 10 + sc/source/core/tool/ddelink.cxx| 52 ++--- sc/source/core/tool/editutil.cxx | 28 +++ sc/source/core/tool/rangelst.cxx | 66 ++--- sc/source/core/tool/refupdat.cxx | 36 ++-- sc/source/core/tool/stringutil.cxx |2 - sc/source/core/tool/viewopti.cxx |6 +-- 8 files changed, 106 insertions(+), 112 deletions(-) New commits: commit c0089c104de4758dae6e3d732d4f5ff2c6fd5074 Author: Johnny_M Date: Fri Feb 3 17:44:50 2017 + Translate German comments Change-Id: Ia30dc2f96b34e0edecade84a020092b0a24cbb18 Reviewed-on: https://gerrit.libreoffice.org/33895 Tested-by: Jenkins Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/include/svtools/rtftoken.h b/include/svtools/rtftoken.h index cb23f30..550a36f 100644 --- a/include/svtools/rtftoken.h +++ b/include/svtools/rtftoken.h @@ -24,7 +24,7 @@ namespace rtl { class OUString; }; -// suche die TokenID zu dem Token +// search the TokenID for the token int GetRTFToken( const rtl::OUString& rSearch ); enum RTF_TOKEN_RANGES { @@ -43,10 +43,10 @@ enum RTF_TOKEN_RANGES { RTF_OBJECTS = 0x0D00, RTF_NUMBULLETS = 0x0E00, -// !!! kann hinein verodert werden (Border/Background) +// !!! can be mixed in using the "or" operator (border/background) RTF_TABLEDEF= 0x1000, -// !!! kann hinein verodert werden (Border/Tab) +// !!! can be mixed in using the "or" operator (border/tab) RTF_SWGDEFS = 0x4000 }; @@ -179,7 +179,7 @@ enum RTF_TOKEN_IDS { RTF_BLIPUID, RTF_BLIPUPI, -RTF_FIELD, // Felder +RTF_FIELD, // Fields RTF_FLDDIRTY, RTF_FLDEDIT, RTF_FLDLOCK, @@ -520,7 +520,7 @@ enum RTF_TOKEN_IDS { RTF_SECTSPECIFYCL, RTF_SECTSPECIFYL, -// Swg-Header/Footer-Tokens +// Swg header/footer tokens RTF_HEADER_YB = (RTF_SECTFMT|RTF_SWGDEFS), RTF_HEADER_XL, RTF_HEADER_XR, @@ -629,7 +629,7 @@ enum RTF_TOKEN_IDS { RTF_TLTH, RTF_TLEQ, -// Swg-TabStop-Tokens +// Swg TabStop tokens RTF_TLSWG = (RTF_TABSTOPDEF|RTF_SWGDEFS), /* */ @@ -655,7 +655,7 @@ enum RTF_TOKEN_IDS { RTF_BRDROUTSET, RTF_BRDRFRAME, -// Swg-Border-Tokens +// Swg border tokens RTF_BRDBOX = (RTF_BRDRDEF|RTF_SWGDEFS), RTF_BRDLINE_COL, RTF_BRDLINE_IN, @@ -793,7 +793,7 @@ enum RTF_TOKEN_IDS { RTF_TWOINONE, RTF_HORZVERT, -// Swg-Border-Tokens +// Swg border tokens RTF_SWG_ESCPROP = (RTF_CHRFMT|RTF_SWGDEFS), RTF_HYPHEN, RTF_HYPHLEAD, @@ -882,7 +882,7 @@ enum RTF_TOKEN_IDS { RTF_FRMTXLRTBV, RTF_FRMTXTBRLV, -// Swg-Frame-Tokens +// Swg frame tokens RTF_FLYPRINT = (RTF_APOCTL|RTF_SWGDEFS), RTF_FLYOPAQUE, RTF_FLYPRTCTD, diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index 69dd61f..66ff572 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -23,14 +23,8 @@ /* !! -Die akt. Struktur der Autoformatierung darf nicht mehr veraendert werden. -Diese wird durch unterschiedlichen Code vom StartWriter und vom StarCalc -eingelesen/geschrieben. -Sollte sich doch mal eine Aenderung nicht vermeiden lassen, dann auf -jedenfall in beiden Applikationen aendern. - -The structure of table auto formatting should not changed. It is used -by different code of Writer and Calc. If a change is necessary, the +The structure of auto formatting should not be changed. It is used +by various code of Writer and Calc. If a change is necessary, the source code of both applications must be changed! !! diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index 5390726..f46b0fa 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -54,7 +54,7 @@ ScDdeLink::ScDdeLink( ScDocument* pD, const OUString& rA, const OUString& rT, co ScDdeLink::~ScDdeLink() { -// Verbindung aufheben +// cancel connection // pResult is refcounted } @@ -91,7 +91,7 @@ ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& r if ( bHasValue ) pResult = new ScFullMatrix(0, 0); -if (rHdr.BytesLeft()) // neu in 388b und der 364w (RealTime-Client) Version +if (rHdr.BytesLeft()) // new in 388b and the 364w (RealTime Client) version rStream.ReadUChar( nMode ); else nMode = SC
[Libreoffice-commits] core.git: include/svx
include/svx/svdhlpln.hxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 6efb8713d46fe59e623445a1a8c8a82e23012a82 Author: Johnny_M Date: Wed Feb 15 18:43:24 2017 + Translate German comments (left over from the include/ dir) This is to translate German comments yet left in the include/ directory after https://gerrit.libreoffice.org/33895 Change-Id: I677713aa1fd0bc07ea71e16d8503ce5cd4838de9 Reviewed-on: https://gerrit.libreoffice.org/34316 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index 9bb995f..fafab5a 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -32,10 +32,10 @@ class OutputDevice; enum class SdrHelpLineKind { Point, Vertical, Horizontal }; -#define SDRHELPLINE_POINT_PIXELSIZE 15 /* Tatsaechliche Groesse= PIXELSIZE*2+1 */ +#define SDRHELPLINE_POINT_PIXELSIZE 15 /* actual size = PIXELSIZE*2+1 */ class SdrHelpLine { -PointaPos; // je nach Wert von eKind ist X oder Y evtl. belanglos +PointaPos; // X or Y may be unimportant, depending on the value of eKind SdrHelpLineKind eKind; public: @@ -51,7 +51,7 @@ public: Pointer GetPointer() const; boolIsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; -// OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben +// OutputDevice is required because capture points have a fixed pixel size Rectangle GetBoundRect(const OutputDevice& rOut) const; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdmodel.hxx |4 - svx/source/svdraw/svdmodel.cxx | 88 - 2 files changed, 46 insertions(+), 46 deletions(-) New commits: commit 54f53f79f077aa42275d097aed24cca1220c0f16 Author: Johnny_M Date: Sun Feb 19 15:24:47 2017 + Translate German variable names This is to follow up on the commit 9bbc168c29d3f48839d40173f5467228ce9a7268 by: - Changing "Comma" to "DecimalMark" - Changing "VorComma" (literally "before comma") to "BeforeDecimalMark" Change-Id: I3eff7024df56c701ac721a1e74645c8be764bff4 Reviewed-on: https://gerrit.libreoffice.org/34429 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index e53a422..3e8f77a 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -154,7 +154,7 @@ protected: Fraction aUIScale; // see above OUString aUIUnitStr; // see above Fraction aUIUnitFact; // see above -intnUIUnitComma; // see above +intnUIUnitDecimalMark; // see above SdrLayerAdmin* pLayerAdmin; SfxItemPool*pItemPool; @@ -174,7 +174,7 @@ protected: SdrUndoGroup* pAktUndoGroup; // for deeper sal_uInt16 nUndoLevel; // undo nesting boolbMyPool:1;// to clean up pMyPool from 303a -boolbUIOnlyComma:1; // see eUIUnit +boolbUIOnlyDecimalMark:1; // see eUIUnit boolmbUndoEnabled:1; // If false no undo is recorded or we are during the execution of an undo action boolbExtColorTable:1; // ne separate ColorTable boolmbChanged:1; diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index c95c018..8aeb6b0 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -123,8 +123,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe eObjUnit=SdrEngineDefaults::GetMapUnit(); eUIUnit=FUNIT_MM; aUIScale=Fraction(1,1); -nUIUnitComma=0; -bUIOnlyComma=false; +nUIUnitDecimalMark=0; +bUIOnlyDecimalMark=false; pLayerAdmin=nullptr; pItemPool=pPool; bMyPool=false; @@ -931,23 +931,23 @@ void SdrModel::ImpSetUIUnit() } // set start values -nUIUnitComma = 0; +nUIUnitDecimalMark = 0; sal_Int64 nMul(1); sal_Int64 nDiv(1); // normalize on meters resp. inch switch (eObjUnit) { -case MapUnit::Map100thMM : nUIUnitComma+=5; break; -case MapUnit::Map10thMM: nUIUnitComma+=4; break; -case MapUnit::MapMM : nUIUnitComma+=3; break; -case MapUnit::MapCM : nUIUnitComma+=2; break; -case MapUnit::Map1000thInch: nUIUnitComma+=3; break; -case MapUnit::Map100thInch : nUIUnitComma+=2; break; -case MapUnit::Map10thInch : nUIUnitComma+=1; break; -case MapUnit::MapInch : nUIUnitComma+=0; break; +case MapUnit::Map100thMM : nUIUnitDecimalMark+=5; break; +case MapUnit::Map10thMM: nUIUnitDecimalMark+=4; break; +case MapUnit::MapMM : nUIUnitDecimalMark+=3; break; +case MapUnit::MapCM : nUIUnitDecimalMark+=2; break; +case MapUnit::Map1000thInch: nUIUnitDecimalMark+=3; break; +case MapUnit::Map100thInch : nUIUnitDecimalMark+=2; break; +case MapUnit::Map10thInch : nUIUnitDecimalMark+=1; break; +case MapUnit::MapInch : nUIUnitDecimalMark+=0; break; case MapUnit::MapPoint : nDiv=72; break; // 1Pt = 1/72" -case MapUnit::MapTwip : nDiv=144; nUIUnitComma++; break; // 1Twip = 1/1440" +case MapUnit::MapTwip : nDiv=144; nUIUnitDecimalMark++; break; // 1Twip = 1/1440" case MapUnit::MapPixel : break; case MapUnit::MapSysFont: break; case MapUnit::MapAppFont: break; @@ -965,21 +965,21 @@ void SdrModel::ImpSetUIUnit() { case FUNIT_NONE : break; // metric -case FUNIT_100TH_MM: nUIUnitComma-=5; break; -case FUNIT_MM : nUIUnitComma-=3; break; -case FUNIT_CM : nUIUnitComma-=2; break; -case FUNIT_M : nUIUnitComma+=0; break; -case FUNIT_KM : nUIUnitComma+=3; break; +case FUNIT_100TH_MM: nUIUnitDecimalMark-=5; break; +case FUNIT_MM : nUIUnitDecimalMark-=3; break; +case FUNIT_CM : nUIUnitDecimalMark-=2; break; +case FUNIT_M : nUIUnitDecimalMark+=0; break; +case FUNIT_KM : nUIUnitDecimalMark+=3; break; // Inch -case FUNIT_TWIP : nMul=144; nUIUnitComma--; break; // 1Twip = 1/1440" +case FUNIT_TWIP : nMul=144; nUIUnitDecimalMark--; break; // 1Twip = 1/1440"
[Libreoffice-commits] core.git: sw/source
sw/source/filter/inc/fltini.hxx | 18 - sw/source/filter/inc/fltshell.hxx | 16 sw/source/filter/inc/wrt_fn.hxx |6 +-- sw/source/filter/inc/wrtswtbl.hxx | 70 +++--- 4 files changed, 55 insertions(+), 55 deletions(-) New commits: commit 9787e68c27b94ccfa25bd9246e24fb42c900aff3 Author: Johnny_M Date: Sun Feb 19 13:31:50 2017 + Translate German comments in sw/source/filter/inc/ Change-Id: Ibd1fd21f1d36591d28979e733da4a812133912ef Reviewed-on: https://gerrit.libreoffice.org/34428 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx index 5cb162f..7b5fa11 100644 --- a/sw/source/filter/inc/fltini.hxx +++ b/sw/source/filter/inc/fltini.hxx @@ -27,11 +27,11 @@ class SwTextNode; class SwNumRule; class SwNodeIndex; -// die speziellen Reader +// the special readers class HTMLReader: public Reader { -// wir wollen die Streams / Storages nicht geoeffnet haben +// we don't want to have the streams/storages open virtual bool SetStrmStgPtr() override; virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override; virtual OUString GetTemplateName() const override; @@ -53,18 +53,18 @@ public: std::vector& rStrings ) const override; }; -// die speziellen Writer +// the special writers void GetWW8Writer( const OUString&, const OUString&, WriterRef& ); -// Umsetzen der LRSpaces im aktuell importierten Doc. Die Fremd-Filter -// liefern immer absolute Werte fuer die Ebenen einer NumRule. Wir -// verarbeiten jetzt aber relative Werte bezogen auf das LR-Space-Item. -// Das hat zur Folge, das bei allen Absaetzen die EInzuege der NumRule vom -// Absatz-Einzug abgezogen werden muss. +// Mapping of the LRSpaces in the currently imported document. +// The foreign filters always provide absolute values for the levels of +// a NumRule. We are now processing relative values related to the LR-Space-Item +// though. The consequence of this is that, for all paragraphs, the indentations +// of the NumRule must be subtracted from the paragraph indentation. class SW_DLLPUBLIC SwRelNumRuleSpaces { -SwNumRuleTable* pNumRuleTable; // Liste aller benannten NumRules +SwNumRuleTable* pNumRuleTable; // list of all named NumRules public: SwRelNumRuleSpaces( SwDoc& rDoc, bool bNewDoc ); diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 4ba7b72..8c132ef 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -86,7 +86,7 @@ public: } }; -// Stack-Eintrag fuer die Attribute Es werden immer Pointer auf neue Attribute uebergeben. +// Stack entry for the attributes. It is always pointers to new attributes that are passed. class SwFltStackEntry { private: @@ -200,7 +200,7 @@ public: SwFltAnchor(const SwFltAnchor&); virtual ~SwFltAnchor() override; -// "pure virtual Methoden" vom SfxPoolItem +// "purely virtual methods" of SfxPoolItem virtual bool operator==(const SfxPoolItem&) const override; virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; void SetFrameFormat(SwFrameFormat * _pFrameFormat); @@ -249,7 +249,7 @@ public: nAutorNo( rCpy.nAutorNo ), nAutorNoPrev( rCpy.nAutorNoPrev ) {} -// "pure virtual Methoden" vom SfxPoolItem +// "purely virtual methods" of SfxPoolItem virtual bool operator==(const SfxPoolItem& rItem) const override; virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; }; @@ -270,7 +270,7 @@ public: const bool bIsTOCBookmark = false ); SwFltBookmark( const SwFltBookmark& ); -// "pure virtual Methoden" vom SfxPoolItem +// "purely virtual methods" of SfxPoolItem virtual bool operator==(const SfxPoolItem&) const override; virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; @@ -310,7 +310,7 @@ class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem public: SwFltTOX(SwTOXBase* pBase); SwFltTOX(const SwFltTOX&); -// "pure virtual Methoden" vom SfxPoolItem +// "purely virtual methods" of SfxPoolItem virtual bool operator==(const SfxPoolItem&) const override; virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; SwTOXBase* GetBase(){ return pTOXBase; } @@ -320,9 +320,9 @@ public: bool HadPageDescItem() const { return bHadPageDescItem; } }; -// Der WWEndStack verhaelt sich wie der WWControlStck, nur dass die Attribute -// auf ihm bis ans Ende des Dokuments gehortet werden, falls auf sie noch -// zugegriffen werden muss (z.B. Book/RefMarks, Index u.s.w.) +// The WWEndSt
[Libreoffice-commits] core.git: filter/source include/filter sd/source
filter/source/msfilter/svdfppt.cxx | 10 +- include/filter/msfilter/svdfppt.hxx |4 ++-- sd/source/filter/ppt/pptin.cxx |6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) New commits: commit cc39342305af736e8b127af49df4af8998767ba0 Author: Johnny_M Date: Sat Mar 24 13:38:25 2018 +0100 Translate German function names Akt -> Current in ppt filter Change-Id: Id32efb885e5e1b04c7fd8f3ce0f21537b2e7576c Reviewed-on: https://gerrit.libreoffice.org/51800 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 19f5863a4036..cbd63e3eb6dc 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2417,7 +2417,7 @@ bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStream& return bRetValue; } -sal_uInt32 SdrPowerPointImport::GetAktPageId() +sal_uInt32 SdrPowerPointImport::GetCurrentPageId() { PptSlidePersistList* pList = GetPageList( eCurrentPageKind ); if ( pList && nCurrentPageNum < pList->size() ) @@ -2425,7 +2425,7 @@ sal_uInt32 SdrPowerPointImport::GetAktPageId() return 0; } -bool SdrPowerPointImport::SeekToAktPage( DffRecordHeader* pRecHd ) const +bool SdrPowerPointImport::SeekToCurrentPage( DffRecordHeader* pRecHd ) const { bool bRet = false; PptSlidePersistList* pList = GetPageList( eCurrentPageKind ); @@ -2742,7 +2742,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* return; DffRecordHeader aPageHd; -if ( SeekToAktPage( &aPageHd ) ) +if ( SeekToCurrentPage( &aPageHd ) ) { rSlidePersist.xHeaderFooterEntry.reset(new HeaderFooterEntry(pMasterPersist)); ProcessData aProcessData( rSlidePersist, SdPageCapsule(pRet) ); @@ -3022,7 +3022,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage std::unique_ptr pSet; sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it later DffRecordHeader aPageHd; -if ( SeekToAktPage( &aPageHd ) ) +if ( SeekToCurrentPage( &aPageHd ) ) { // and now search for the background attributes of the Page sal_uLong nPageRecEnd = aPageHd.GetRecEndFilePos(); DffRecordHeader aPPDrawHd; @@ -6554,7 +6554,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport } if ( bStatus ) { -sal_uInt32 nSlideId = rSdrPowerPointImport.GetAktPageId(); +sal_uInt32 nSlideId = rSdrPowerPointImport.GetCurrentPageId(); if ( !nSlideId ) bStatus = false; else diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index d06c1a4c4e42..0c25f15ad63e 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -578,7 +578,7 @@ protected: protected: using SdrEscherImport::ReadObjText; -boolSeekToAktPage(DffRecordHeader* pRecHd) const; +boolSeekToCurrentPage(DffRecordHeader* pRecHd) const; boolSeekToDocument(DffRecordHeader* pRecHd) const; static bool SeekToContentOfProgTag( sal_Int32 nVersion, @@ -607,7 +607,7 @@ protected: SdrPage*MakeBlancPage(bool bMaster) const; boolReadFontCollection(); PptSlidePersistList*GetPageList(PptPageKind ePageKind) const; -sal_uInt32 GetAktPageId(); +sal_uInt32 GetCurrentPageId(); sal_uInt32 GetMasterPageId(sal_uInt16 nPageNum, PptPageKind ePageKind) const; sal_uInt32 GetNotesPageId(sal_uInt16 nPageNum ) const; static SdrOutliner* GetDrawOutliner( SdrTextObj const * pSdrText ); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 6bf664f8a797..d93fa3dd8280 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -769,7 +769,7 @@ bool ImplSdPPTImport::Import() ProcessData aProcessData( (*pList)[ nCurrentPageNum ], SdPageCapsule(pMPage) ); sal_uInt32 nFPosMerk = rStCtrl.Tell(); DffRecordHeader aPageHd; -if ( SeekToAktPage( &aPageHd ) ) +if ( SeekToCurrentPage( &aPageHd ) ) { auto nEndRecPos = SanitizeEndPos(rStCtrl, aPageHd.GetRecEndFilePos()); while( ( rStCtrl.GetError() == ERRCODE_NONE ) && ( rStCtrl.Tell() < nEndRecPos ) ) @@ -932,7 +932,7 @@ bool ImplSdPPTImport::Import() // CWS preseng01: pPage->SetPageKind( PageKind::Standard );
[Libreoffice-commits] core.git: sd/source
sd/source/core/sdiocmpt.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 4475ccdc3d8f7089ad44f4b01c2d589a607e8e48 Author: Johnny_M Date: Sat Mar 24 21:11:26 2018 +0100 Translate German variable names Akt -> Current in sdiocmpt Change-Id: I39f05bcf7168fe9fbe6cf90b2499037ec5680cc5 Reviewed-on: https://gerrit.libreoffice.org/51806 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx index ae352d5a2491..7cdd36a05139 100644 --- a/sd/source/core/sdiocmpt.cxx +++ b/sd/source/core/sdiocmpt.cxx @@ -66,11 +66,11 @@ void old_SdrDownCompat::CloseSubRecord() if(rStream.GetError()) return; -sal_uInt32 nAktPos(rStream.Tell()); +sal_uInt32 nCurrentPos(rStream.Tell()); if(nMode == StreamMode::READ) { -sal_uInt32 nReadCnt(nAktPos - nSubRecPos); +sal_uInt32 nReadCnt(nCurrentPos - nSubRecPos); if(nReadCnt != nSubRecSiz) { rStream.Seek(nSubRecPos + nSubRecSiz); @@ -78,10 +78,10 @@ void old_SdrDownCompat::CloseSubRecord() } else if(nMode == StreamMode::WRITE) { -nSubRecSiz = nAktPos - nSubRecPos; +nSubRecSiz = nCurrentPos - nSubRecPos; rStream.Seek(nSubRecPos); Write(); -rStream.Seek(nAktPos); +rStream.Seek(nCurrentPos); } bOpen = false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdcrtv.hxx | 12 +- svx/source/svdraw/svdcrtv.cxx | 46 +- svx/source/svdraw/svdview.cxx |6 ++--- 3 files changed, 32 insertions(+), 32 deletions(-) New commits: commit bb3366b8e7207ad77f430d9a15410af82511 Author: Johnny_M Date: Sat Mar 24 12:53:15 2018 +0100 Translate German variable names Akt -> Current in svdraw (Other occurrences will be done separately.) Change-Id: I5dc6b52678b4ce4e875f8c1aaf68e7367bf6e922 Reviewed-on: https://gerrit.libreoffice.org/51799 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index fdfe5206b71f..3b71a5088510 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -44,12 +44,12 @@ protected: // compile the apps all the time std::unique_ptr mpCreateViewExtraData; -Pointer aAktCreatePointer; +Pointer aCurrentCreatePointer; sal_Int32 nAutoCloseDistPix; sal_Int32 nFreeHandMinDistPix; -SdrInventor nAktInvent; // set the current ones -sal_uInt16 nAktIdent; // Obj for re-creating +SdrInventor nCurrentInvent; // set the current ones +sal_uInt16 nCurrentIdent; // Obj for re-creating boolb1stPointAsCenter : 1; boolbUseIncompatiblePathCreateInterface : 1; @@ -100,9 +100,9 @@ public: bool IsMeasureTool() const; void SetCurrentObj(sal_uInt16 nIdent, SdrInventor nInvent=SdrInventor::Default); -void TakeCurrentObj(sal_uInt16& nIdent, SdrInventor& nInvent) const { nInvent=nAktInvent; nIdent=nAktIdent; } -SdrInventor GetCurrentObjInventor() const { return nAktInvent; } -sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; } +void TakeCurrentObj(sal_uInt16& nIdent, SdrInventor& nInvent) const { nInvent=nCurrentInvent; nIdent=nCurrentIdent; } +SdrInventor GetCurrentObjInventor() const { return nCurrentInvent; } +sal_uInt16 GetCurrentObjIdentifier() const { return nCurrentIdent; } // Beginning the regular Create bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=nullptr, short nMinMov=-3); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 8ec3eb68637c..33cf4eb9b3c2 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -184,12 +184,12 @@ void SdrCreateView::ImpClearConnectMarker() void SdrCreateView::ImpClearVars() { -nAktInvent=SdrInventor::Default; -nAktIdent=OBJ_NONE; +nCurrentInvent=SdrInventor::Default; +nCurrentIdent=OBJ_NONE; pCurrentCreate=nullptr; pCreatePV=nullptr; b1stPointAsCenter=false; -aAktCreatePointer=Pointer(PointerStyle::Cross); +aCurrentCreatePointer=Pointer(PointerStyle::Cross); bUseIncompatiblePathCreateInterface=false; nAutoCloseDistPix=5; nFreeHandMinDistPix=10; @@ -264,10 +264,10 @@ bool SdrCreateView::CheckEdgeMode() if (pCurrentCreate!=nullptr) { // is managed by EdgeObj -if (nAktInvent==SdrInventor::Default && nAktIdent==OBJ_EDGE) return false; +if (nCurrentInvent==SdrInventor::Default && nCurrentIdent==OBJ_EDGE) return false; } -if (!IsCreateMode() || nAktInvent!=SdrInventor::Default || nAktIdent!=OBJ_EDGE) +if (!IsCreateMode() || nCurrentInvent!=SdrInventor::Default || nCurrentIdent!=OBJ_EDGE) { ImpClearConnectMarker(); return false; @@ -328,25 +328,25 @@ bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) bool SdrCreateView::IsTextTool() const { -return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor::Default && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT); +return meEditMode==SdrViewEditMode::Create && nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_TEXT || nCurrentIdent==OBJ_TEXTEXT || nCurrentIdent==OBJ_TITLETEXT || nCurrentIdent==OBJ_OUTLINETEXT); } bool SdrCreateView::IsEdgeTool() const { -return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor::Default && (nAktIdent==OBJ_EDGE); +return meEditMode==SdrViewEditMode::Create && nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_EDGE); } bool SdrCreateView::IsMeasureTool() const { -return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor::Default && (nAktIdent==OBJ_MEASURE); +return meEditMode==SdrViewEditMode::Create && nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_MEASURE); } void SdrCreateView::SetCurrentObj(sal_uInt16 n
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtww8.hxx |2 +- sw/source/filter/ww8/ww8atr.cxx |6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 0562808a7ef1fe3ee6ae094bb120e0be84e67856 Author: Johnny_M Date: Sat Mar 24 12:57:54 2018 +0100 Translate German function names Akt -> Current in ww8 Change-Id: I3beb046cbce7727c7ff485de9ff956ee087c443c Reviewed-on: https://gerrit.libreoffice.org/51802 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index f56c81ce3d8d..63f047ce8e44 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -816,7 +816,7 @@ protected: void AddLinkTarget( const OUString& rURL ); void CollectOutlineBookmarks( const SwDoc &rDoc ); -bool SetAktPageDescFromNode(const SwNode &rNd); +bool SetCurrentPageDescFromNode(const SwNode &rNd); bool ContentContainsChapterField(const SwFormatContent &rContent) const; bool FormatHdFtContainsChapterField(const SwFrameFormat &rFormat) const; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 285716d280cc..1cbbeebf27f6 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -371,7 +371,7 @@ bool MSWordExportBase::FormatHdFtContainsChapterField(const SwFrameFormat &rForm return pFormat && ContentContainsChapterField( pFormat->GetContent() ); } -bool MSWordExportBase::SetAktPageDescFromNode(const SwNode &rNd) +bool MSWordExportBase::SetCurrentPageDescFromNode(const SwNode &rNd) { bool bNewPageDesc = false; const SwPageDesc* pCurrent = SwPageDesc::GetPageDescOfNode(rNd); @@ -513,7 +513,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode if ( pBreak && pBreak->GetBreak() == SvxBreak::PageBefore ) { -bNewPageDesc |= SetAktPageDescFromNode( rNd ); +bNewPageDesc |= SetCurrentPageDescFromNode( rNd ); } if( isTextNodeEmpty ) bNewPageDesc = false; @@ -555,7 +555,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode { OSL_ENSURE( m_pCurrentPageDesc, "should not be possible" ); if ( m_pCurrentPageDesc ) -bNewPageDesc = SetAktPageDescFromNode( rNd ); +bNewPageDesc = SetCurrentPageDescFromNode( rNd ); } if ( bNewPageDesc && m_pCurrentPageDesc ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/table/tabledlg.cxx| 28 ++-- sw/source/uibase/table/tablepg.hxx |2 +- 2 files changed, 15 insertions(+), 15 deletions(-) New commits: commit 89c4a6a385d489e08345135ac3ec81220e0ce9bd Author: Johnny_M Date: Sat Mar 24 21:07:13 2018 +0100 Translate German variable names Akt -> Current in table Change-Id: I108136bd79dcc603649c996ecd58c74d67d7dab9 Reviewed-on: https://gerrit.libreoffice.org/51805 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 3c99d5bfc0f8..52da54c14c00 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -982,7 +982,7 @@ void SwTableColumnPage::ModifyHdl( MetricField const * pField ) UpdateCols( aValueTable[i] ); } -void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos ) +void SwTableColumnPage::UpdateCols( sal_uInt16 nCurrentPos ) { SwTwips nSum = 0; @@ -1001,9 +1001,9 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos ) sal_uInt16 nLoopCount = 0; while( nDiff ) { -if( ++nAktPos == nNoOfVisibleCols) +if( ++nCurrentPos == nNoOfVisibleCols) { -nAktPos = 0; +nCurrentPos = 0; ++nLoopCount; //#i101353# in small tables it might not be possible to balance column width if( nLoopCount > 1 ) @@ -1011,25 +1011,25 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos ) } if( nDiff < 0 ) { -SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) -nDiff); +SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) -nDiff); nDiff = 0; } -else if( GetVisibleWidth(nAktPos) >= nDiff + nMinWidth ) +else if( GetVisibleWidth(nCurrentPos) >= nDiff + nMinWidth ) { -SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) -nDiff); +SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) -nDiff); nDiff = 0; } -if( nDiff > 0 && GetVisibleWidth(nAktPos) > nMinWidth ) +if( nDiff > 0 && GetVisibleWidth(nCurrentPos) > nMinWidth ) { -if( nDiff >= (GetVisibleWidth(nAktPos) - nMinWidth) ) +if( nDiff >= (GetVisibleWidth(nCurrentPos) - nMinWidth) ) { -nDiff -= (GetVisibleWidth(nAktPos) - nMinWidth); -SetVisibleWidth(nAktPos, nMinWidth); +nDiff -= (GetVisibleWidth(nCurrentPos) - nMinWidth); +SetVisibleWidth(nCurrentPos, nMinWidth); } else { nDiff = 0; -SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) -nDiff); +SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) -nDiff); } OSL_ENSURE(nDiff >= 0, "nDiff < 0 cannot be here!"); } @@ -1044,7 +1044,7 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos ) if(nDiff > nActSpace) { nTableWidth = pTableData->GetSpace(); -SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) - nDiff + nActSpace ); +SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) - nDiff + nActSpace ); } else { @@ -1060,13 +1060,13 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos ) if(nDiff * nNoOfVisibleCols > pTableData->GetSpace() - nTableWidth) { nAdd = (pTableData->GetSpace() - nTableWidth) / nNoOfVisibleCols; -SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) - nDiff + nAdd ); +SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) - nDiff + nAdd ); nDiff = nAdd; } if(nAdd) for( sal_uInt16 i = 0; i < nNoOfVisibleCols; i++ ) { -if(i == nAktPos) +if(i == nCurrentPos) continue; SwTwips nVisWidth; if((nVisWidth = GetVisibleWidth(i)) + nDiff < MINLAY) diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 337fa3951ccb..8ee2fba972f6 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -124,7 +124,7 @@ class SwTableColumnPage : public SfxTabPage DECL_LINK( DownHdl, SpinField&, void ); DECL_LINK( LoseFocusHdl, Control&, void ); DECL_LINK( ModeHdl, Button *, void ); -voidUpdateCols( sal_uInt16 nAktPos ); +voidUpdateCols( sal_uInt16 nCurrentPos ); SwTwips GetVisi
[Libreoffice-commits] core.git: include/svl svl/source
include/svl/style.hxx |4 ++-- svl/source/items/style.cxx | 32 2 files changed, 18 insertions(+), 18 deletions(-) New commits: commit f584f2515b744699a3b3a7e3f9e9927e86df4a5d Author: Johnny_M Date: Sat Mar 24 12:11:58 2018 +0100 Translate German variable names Akt -> Current in svl/style Change-Id: Id6f8f7b09a8ae1768708d9fd5d11003fef1e2e42 Reviewed-on: https://gerrit.libreoffice.org/51798 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek diff --git a/include/svl/style.hxx b/include/svl/style.hxx index d8b6e9aeb75f..48f0e1cba7ae 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -190,8 +190,8 @@ protected: private: SVL_DLLPRIVATE bool IsTrivialSearch() const; -SfxStyleSheetBase* pAktStyle; -sal_uInt16 nAktPosition; +SfxStyleSheetBase* pCurrentStyle; +sal_uInt16 nCurrentPosition; boolbSearchUsed; friend class SfxStyleSheetBasePool; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 2e43e1f8a3a7..f42a11407375 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -395,8 +395,8 @@ struct DoesStyleMatchStyleSheetPredicate final : public svl::StyleSheetPredicate SfxStyleSheetIterator::SfxStyleSheetIterator(SfxStyleSheetBasePool *pBase, SfxStyleFamily eFam, sal_uInt16 n) -: pAktStyle(nullptr) -, nAktPosition(0) +: pCurrentStyle(nullptr) +, nCurrentPosition(0) { pBasePool=pBase; nSearchFamily=eFam; @@ -439,7 +439,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::operator[](sal_uInt16 nIdx) if( IsTrivialSearch()) { retval = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetByPosition(nIdx).get(); -nAktPosition = nIdx; +nCurrentPosition = nIdx; } else if(nMask == SFXSTYLEBIT_ALL) { @@ -448,7 +448,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::operator[](sal_uInt16 nIdx) pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetPositionsByFamily(nSearchFamily).at(nIdx)) ; retval = ref.get(); -nAktPosition = nIdx; +nCurrentPosition = nIdx; } else { @@ -457,7 +457,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::operator[](sal_uInt16 nIdx) pBasePool->pImpl->mxIndexedStyleSheets->GetNthStyleSheetThatMatchesPredicate(nIdx, predicate); if (ref.get() != nullptr) { -nAktPosition = pBasePool->pImpl->mxIndexedStyleSheets->FindStyleSheetPosition(*ref); +nCurrentPosition = pBasePool->pImpl->mxIndexedStyleSheets->FindStyleSheetPosition(*ref); retval = ref.get(); } } @@ -488,21 +488,21 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next() if ( IsTrivialSearch() ) { unsigned nStyleSheets = pBasePool->pImpl->mxIndexedStyleSheets->GetNumberOfStyleSheets(); -unsigned newPosition = nAktPosition +1; +unsigned newPosition = nCurrentPosition +1; if (nStyleSheets > newPosition) { -nAktPosition = newPosition; -retval = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetByPosition(nAktPosition).get(); +nCurrentPosition = newPosition; +retval = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetByPosition(nCurrentPosition).get(); } } else if(nMask == SFXSTYLEBIT_ALL) { -unsigned newPosition = nAktPosition +1; +unsigned newPosition = nCurrentPosition +1; const std::vector& familyVector = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetPositionsByFamily(nSearchFamily); if (familyVector.size() > newPosition) { -nAktPosition = newPosition; +nCurrentPosition = newPosition; unsigned stylePosition = familyVector.at(newPosition); retval = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetByPosition(stylePosition).get(); } @@ -512,13 +512,13 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next() DoesStyleMatchStyleSheetPredicate predicate(this); rtl::Reference< SfxStyleSheetBase > ref = pBasePool->pImpl->mxIndexedStyleSheets->GetNthStyleSheetThatMatchesPredicate( -0, predicate, nAktPosition+1); +0, predicate, nCurrentPosition+1); retval = ref.get(); if (retval != nullptr) { -nAktPosition = pBasePool->pImpl->mxIndexedStyleSheets->FindStyleSheetPosition(*ref); +nCurrentPosition = pBasePool->pImpl->mxIndexedStyleSheets->FindStyleSheetPosition(*ref); } } -pAktStyle = retval; +pCurrentStyle = retval
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/arealink.cxx | 65 +++ sc/source/ui/docshell/autostyl.cxx | 18 ++-- sc/source/ui/docshell/dbdocfun.cxx | 158 ++--- sc/source/ui/docshell/docfunc.cxx | 18 ++-- sc/source/ui/docshell/docsh.cxx|4 sc/source/ui/docshell/docsh3.cxx | 116 +-- sc/source/ui/docshell/docsh4.cxx | 141 - sc/source/ui/docshell/docsh5.cxx | 92 ++--- sc/source/ui/docshell/docsh6.cxx | 38 sc/source/ui/docshell/docsh8.cxx |2 sc/source/ui/docshell/impex.cxx| 10 +- sc/source/ui/docshell/olinefun.cxx | 12 +- sc/source/ui/docshell/servobj.cxx |2 sc/source/ui/docshell/tablink.cxx | 44 +- 14 files changed, 357 insertions(+), 363 deletions(-) New commits: commit 5ddef1648005756cfb811f9e6261851d4df712c2 Author: Johnny_M Date: Fri Mar 17 15:51:32 2017 + Translate German comments in sc/source/ui/docshell/ Change-Id: Ic1a312677fac1b729538dd4463febac63e7204e5 Reviewed-on: https://gerrit.libreoffice.org/35343 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 10127c6e4888..428a8a3412a8 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -98,8 +98,8 @@ void ScAreaLink::Edit(vcl::Window* pParent, const Link& /* rEn ::sfx2::SvBaseLink::UpdateResult ScAreaLink::DataChanged( const OUString&, const css::uno::Any& ) { -// bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im -// LinkManager zu setzen, ohne die Daten im Dokument zu aendern +// Do not do anything at bInCreate so that update can be called to set +// the status in the LinkManager without changing the data in the document if (bInCreate) return SUCCESS; @@ -136,7 +136,7 @@ void ScAreaLink::Edit(vcl::Window* pParent, const Link& /* rEn void ScAreaLink::Closed() { -// Verknuepfung loeschen: Undo +// delete link: Undo ScDocument& rDoc = pImpl->m_pDocSh->GetDocument(); bool bUndo (rDoc.IsUndoEnabled()); @@ -146,7 +146,7 @@ void ScAreaLink::Closed() aFileName, aFilterName, aOptions, aSourceArea, aDestArea, GetRefreshDelay() ) ); -bAddUndo = false; // nur einmal +bAddUndo = false; // only once } SCTAB nDestTab = aDestArea.aStart.Tab(); @@ -158,7 +158,7 @@ void ScAreaLink::Closed() void ScAreaLink::SetDestArea(const ScRange& rNew) { -aDestArea = rNew; // fuer Undo +aDestArea = rNew; // for Undo } void ScAreaLink::SetSource(const OUString& rDoc, const OUString& rFlt, const OUString& rOpt, @@ -188,13 +188,13 @@ bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUStr bool bFound = false; OUString aUpperName = ScGlobal::pCharClass->uppercase(rAreaName); ScRangeName* pNames = pSrcDoc->GetRangeName(); -if (pNames) // benannte Bereiche +if (pNames) // named ranges { const ScRangeData* p = pNames->findByUpperName(aUpperName); if (p && p->IsValidReference(rRange)) bFound = true; } -if (!bFound)// Datenbankbereiche +if (!bFound)// database ranges { ScDBCollection* pDBColl = pSrcDoc->GetDBCollection(); if (pDBColl) @@ -220,12 +220,12 @@ bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUStr return bFound; } -// ausfuehren: +// execute: bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, const OUString& rNewArea, sal_uLong nNewRefresh ) { -// Dokument laden - wie TabLink +// load document - like TabLink if (rNewFile.isEmpty() || rNewFilter.isEmpty()) return false; @@ -242,7 +242,7 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, bool bUndo (rDoc.IsUndoEnabled()); rDoc.SetInLinkUpdate( true ); -// wenn neuer Filter ausgewaehlt wurde, Optionen vergessen +// if new filter was selected, forget options if ( rNewFilter != aFilterName ) aOptions.clear(); @@ -255,7 +255,7 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, ScDocument& rSrcDoc = pSrcShell->GetDocument(); -// Optionen koennten gesetzt worden sein +// options could have been set OUString aNewOpt = ScDocumentLoader::GetOptions(*pMed); if (aNewOpt.isEmpty()) aNewOpt = aOptions; @@ -291,12 +291,12 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/callform.cxx |4 ++-- sc/source/core/tool/chartlis.cxx |2 +- sc/source/core/tool/interpr2.cxx |4 ++-- sc/source/core/tool/interpr3.cxx |8 sc/source/core/tool/prnsave.cxx |4 ++-- sc/source/filter/inc/ftools.hxx |8 sc/source/filter/inc/lotattr.hxx |4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 56923c7b6452b734d554a95f47b7e3703326f032 Author: Johnny_M Date: Wed Mar 29 18:26:13 2017 + Translate German comments (leftovers) Translated leftovers in sc/source/core/tool/ and sc/source/filter/inc/ Change-Id: I4dff3d58a4ff5fb93d1fd3b6ab6695c868998e23 Reviewed-on: https://gerrit.libreoffice.org/35879 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx index 1dc5e59dd9c3..65f1d0c21265 100644 --- a/sc/source/core/tool/callform.cxx +++ b/sc/source/core/tool/callform.cxx @@ -192,11 +192,11 @@ bool InitExternalFunc(const OUString& rModuleName) (*reinterpret_cast(fpSetLanguage))( nLanguage ); } -// Module in die Collection aufnehmen +// include module into the collection ModuleData* pModuleData = new ModuleData(rModuleName, pLib.release()); aModuleCollection.insert(pModuleData); -// Schnittstelle initialisieren +// initialize interface AdvData pfCallBack = &ScAddInAsyncCallBack; LegacyFuncCollection* pLegacyFuncCol = ScGlobal::GetLegacyFuncCollection(); sal_uInt16 nCount; diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 98a501319662..f482c39389ef 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -716,7 +716,7 @@ void ScChartListenerCollection::UpdateChartsContainingTab( SCTAB nTab ) bool ScChartListenerCollection::operator==( const ScChartListenerCollection& r ) const { -// Do not use ScStrCollection::operator==() here that uses IsEqual und Compare. +// Do not use ScStrCollection::operator==() here that uses IsEqual and Compare. // Use ScChartListener::operator==() instead. if (pDoc != r.pDoc || m_Listeners.size() != r.m_Listeners.size()) return false; diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 9f6894868e8f..381bb07e9395 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2759,7 +2759,7 @@ void ScInterpreter::ScDde() if ( rArr.IsRecalcModeNormal() ) rArr.SetExclusiveRecalcModeOnLoad(); -// while the link ist not evaluated idle must be disabled (to avoid circular references) +// while the link is not evaluated, idle must be disabled (to avoid circular references) bool bOldEnabled = pDok->IsIdleEnabled(); pDok->EnableIdle(false); @@ -2905,7 +2905,7 @@ void ScInterpreter::ScBase() // fDebug1 := 1,3848924157003e+275 <- RoundOff-Error // fVal != fMult, aber: ::rtl::math::approxEqual( fVal, fMult ) == TRUE double fDebug2 = ::rtl::math::approxSub( fVal, fMult ); -// und ::rtl::math::approxSub( fVal, fMult ) == 0 +// and ::rtl::math::approxSub( fVal, fMult ) == 0 double fDebug3 = ( fInt ? fVal / fInt : 0.0 ); // Actual after strange fDebug1 and fVal < fMult is fDebug2 == fBase, but diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index e2d9d2f8c1ff..f0f1d843fd54 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -161,7 +161,7 @@ static double lcl_IterateInverse( const ScDistFunc& rFunction, double fAx, doubl return fRx; } -// Allgemeine Funktionen +// General functions void ScInterpreter::ScNoName() { @@ -2241,9 +2241,9 @@ void ScInterpreter::ScBetaInv() PushDouble(fA + fVal*(fB-fA)); // scale to (A,B) } -// Achtung: T, F und Chi -// sind monoton fallend, -// deshalb 1-Dist als Funktion +// Note: T, F, and Chi are +// monotonically decreasing, +// therefore 1-Dist as function class ScTDistFunction : public ScDistFunc { diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx index 7cc5359713bc..adb5aff85afa 100644 --- a/sc/source/core/tool/prnsave.cxx +++ b/sc/source/core/tool/prnsave.cxx @@ -23,7 +23,7 @@ #include -// Daten pro Tabelle +// Data per table ScPrintSaverTab::ScPrintSaverTab() : mp
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/docsh8.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6a59352290a5d05c4236522b56124ac06cd591ad Author: Johnny_M Date: Thu Mar 30 19:45:39 2017 + Fix German comment translation This is a minor fix to the German comment translation made on the commit 5ddef1648005756cfb811f9e6261851d4df712c2 (https://gerrit.libreoffice.org/35343). Specifically, it is a fix according to the comment in https://gerrit.libreoffice.org/#/c/35343/6/sc/source/ui/docshell/docsh8.cxx Change-Id: I7462de4589856a58fda58d52583a0702ddec0a0d Reviewed-on: https://gerrit.libreoffice.org/35928 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index e3f672d32edb..dd72ce19d7ef 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -958,7 +958,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi case sdbc::DataType::DATE: { aDocument.GetValue( nDocCol, nDocRow, nTab, fVal ); -// no value differentiation between 0 with value and 0 no-value +// differentiate between 0 with value and 0 no-value bool bIsNull = (fVal == 0.0); if ( bIsNull ) bIsNull = !aDocument.HasValueData( nDocCol, nDocRow, nTab ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: registry/test reportdesign/inc reportdesign/source rsc/inc rsc/source
registry/test/testregcpp.cxx | 54 ++--- reportdesign/inc/reportformula.hxx |2 reportdesign/source/ui/inc/dlgpage.hxx |2 reportdesign/source/ui/inspection/metadata.cxx |6 +- reportdesign/source/ui/report/ReportController.cxx |2 rsc/inc/rsctools.hxx |4 - rsc/source/parser/rscibas.cxx |2 rsc/source/prj/gui.cxx |2 rsc/source/res/rscarray.cxx|2 rsc/source/rscpp/cpp.h |2 rsc/source/rscpp/cppdef.h |6 +- 11 files changed, 43 insertions(+), 41 deletions(-) New commits: commit d416a5ff59b31dd7250d392278c43f66cdb81e35 Author: Johnny_M Date: Sat Jun 24 15:12:12 2017 +0200 Translate German comments and debug strings (leftovers in r... dirs) Translates all (leftovers) found using a custom regex, in directories not shown by /bin/find-german-comments and beginning with "r". Additionally: - Translates test strings in /registry/test/testregcpp.cxx Change-Id: I9fda72a3d1830268c4eb83d67ee7a95e38c31c0d Reviewed-on: https://gerrit.libreoffice.org/39210 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx index d222b45c6c94..837e91cf3ddb 100644 --- a/registry/test/testregcpp.cxx +++ b/registry/test/testregcpp.cxx @@ -120,7 +120,7 @@ void test_coreReflection() OUString("I am a double"), OUString("DummyFile"), RTFieldAccess::CONST, aConst); aConst.m_type = RT_TYPE_STRING; -OUString tmpStr("dies ist ein unicode string"); +OUString tmpStr("this is a unicode string"); aConst.m_value.aString = tmpStr.getStr(); writer.setFieldData(10, OUString("aConstString"), @@ -162,7 +162,7 @@ void test_coreReflection() OUString("ModuleA/StructA"), OUString(), 3, 0, 0); -writer.setDoku(OUString("Hallo ich bin eine Struktur")); +writer.setDoku(OUString("Hello I am a structure")); writer.setFileName(OUString("DummyFile")); writer.setFieldData(0, OUString("asal_uInt32"), @@ -191,11 +191,11 @@ void test_coreReflection() aConst.m_type = RT_TYPE_UINT32; aConst.m_value.aULong = 10; -writer.setDoku(OUString("Hallo ich bin ein Enum")); +writer.setDoku(OUString("Hello I am an enum")); writer.setFileName(OUString("DummyFile")); writer.setFieldData(0, OUString("ENUM_VAL_1"), -OUString(), OUString("ich bin ein enum value"), +OUString(), OUString("I am an enum value"), OUString(), RTFieldAccess::CONST, aConst); aConst.m_value.aULong = 10; @@ -218,7 +218,7 @@ void test_coreReflection() RTUik aUik = {1,2,3,4,5}; writer.setUik(aUik); -writer.setDoku(OUString("Hallo ich bin ein Interface")); +writer.setDoku(OUString("Hello I am an interface")); writer.setFileName(OUString("DummyFile")); writer.setFieldData(0, OUString("aString"), @@ -236,7 +236,7 @@ void test_coreReflection() writer.setMethodData(0, OUString("methodA"), OUString("double"), RTMethodMode::TWOWAY, 2, 1, - OUString("Hallo ich bin die methodA")); + OUString("Hello I am the methodA")); writer.setParamData(0, 0, OUString("ModuleA/StructA"), OUString("aStruct"), RT_PARAM_IN); writer.setParamData(0, 1, OUString("unsigned short"), @@ -273,11 +273,11 @@ void test_coreReflection() OUString("ModuleA/ExceptionA"), OUString(), 1, 0, 0); -writer.setDoku(OUString("Hallo ich bin eine Exception")); +writer.setDoku(OUString("Hello I am an exception")); writer.setFieldData(0, OUString("aSource"), OUString("stardiv/uno/XInterface"), -OUString("ich bin ein interface member"), +OUString("I am an interface member"), OUString(), RTFieldAccess::READWRITE); const sal_uInt8* pBlop = writer.getBlop(); @@ -291,23 +291,23 @@ void test_coreRefl
[Libreoffice-commits] core.git: include/svx reportdesign/source sc/source svx/source
include/svx/svdundo.hxx|8 +-- reportdesign/source/core/inc/ReportUndoFactory.hxx |2 reportdesign/source/core/sdr/ReportUndoFactory.cxx |4 - reportdesign/source/ui/report/ReportSection.cxx| 20 - sc/source/ui/view/viewfun7.cxx | 22 +- svx/source/svdraw/svdmark.cxx | 10 ++-- svx/source/svdraw/svdmodel.cxx | 10 ++-- svx/source/svdraw/svdpoev.cxx | 10 ++-- svx/source/svdraw/svdundo.cxx |8 +-- svx/source/svdraw/svdxcgv.cxx | 46 ++--- 10 files changed, 70 insertions(+), 70 deletions(-) New commits: commit 3b9d2501b390dfaec7d0a189742fb3305f3742d9 Author: Johnny_M Date: Sat Jun 24 15:36:32 2017 +0200 tdf#39674 Translate some German variable names This translates "Neu..." to "New..." in names of some variables. No functional change is intended. Change-Id: I29859ecdd44e15820414746cd2b39f62cdfc0ae3 Reviewed-on: https://gerrit.libreoffice.org/39213 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 3e434f8e64bd..ec7b4a61e625 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -523,11 +523,11 @@ public: class SdrUndoMoveLayer : public SdrUndoLayer { -sal_uInt16 nNeuPos; +sal_uInt16 nNewPos; public: -SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) -: SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {} +SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1) +: SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNewPos(nNewPos1) {} virtual void Undo() override; virtual void Redo() override; @@ -761,7 +761,7 @@ public: // Layer virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); virtual SdrUndoAction* CreateUndoDeleteLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); -virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1); +virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1); // Page virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage); diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx index add7c8939429..0f247e4aad36 100644 --- a/reportdesign/source/core/inc/ReportUndoFactory.hxx +++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx @@ -56,7 +56,7 @@ namespace rptui // layer virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) override; virtual SdrUndoAction* CreateUndoDeleteLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) override; -virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) override; +virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1) override; // page virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage) override; diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index d1f2bb548bdf..984da1343982 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -127,9 +127,9 @@ SdrUndoAction* OReportUndoFactory::CreateUndoDeleteLayer(sal_uInt16 nLayerNum, S return m_pUndoFactory->CreateUndoDeleteLayer( nLayerNum, rNewLayerAdmin, rNewModel ); } -SdrUndoAction* OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) +SdrUndoAction* OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1) { -return m_pUndoFactory->CreateUndoMoveLayer( nLayerNum, rNewLayerAdmin, rNewModel, nNeuPos1 ); +return m_pUndoFactory->CreateUndoMoveLayer( nLayerNum, rNewLayerAdmin, rNewModel, nNewPos1 ); } // page diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 5f5bbca803d1..846601146e0f 100644 --- a/reportdesign/source/ui/report/ReportSection.c
[Libreoffice-commits] core.git: sd/source
sd/source/core/drawdoc3.cxx|2 +- sd/source/core/sdpage2.cxx |2 +- sd/source/ui/docshell/docshell.cxx |2 +- sd/source/ui/func/fudraw.cxx |4 ++-- sd/source/ui/func/fuediglu.cxx |8 sd/source/ui/func/fuinsfil.cxx |2 +- sd/source/ui/func/fusel.cxx|8 sd/source/ui/inc/DrawViewShell.hxx |2 +- sd/source/ui/inc/OutlineView.hxx |2 +- sd/source/ui/inc/Window.hxx|2 +- sd/source/ui/inc/cfgids.hxx|2 +- sd/source/ui/inc/fupoor.hxx| 10 +- sd/source/ui/view/viewshe2.cxx |2 +- 13 files changed, 24 insertions(+), 24 deletions(-) New commits: commit e8c7a49c49cfde6e22cb5fea0d07e68409de61af Author: Johnny_M Date: Sun Jul 2 14:24:27 2017 +0200 Translate German comments and debug strings (leftovers in dirs scaddins to sd) Translates leftovers found using a custom regex and manually checking the rest of the affected file. Additionally: - A few spelling fixes Change-Id: If54a0ecc58a429ee1c63abd43411c50304dab176 Reviewed-on: https://gerrit.libreoffice.org/39450 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index a20f3b4c83e8..16a33155df95 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1436,7 +1436,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, if (pSourceDoc) { std::vector aReplList; // List of replaced stylesheets -bool bLayoutReloaded = false; // Wurde ex. Layout wieder geladen? +bool bLayoutReloaded = false; // Was ex. layout reloaded? // LayoutName, Page and Notes page if (rLayoutName.isEmpty()) diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index ca65178faad5..f9eefaad0c5e 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -83,7 +83,7 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName, /* |* Name of the layout of the page \/ -OUString aOldLayoutName(maLayoutName);// merken +OUString aOldLayoutName(maLayoutName);// memorize OUStringBuffer aBuf(rLayoutName); aBuf.append(SD_LT_SEPARATOR).append(STR_LAYOUT_OUTLINE); maLayoutName = aBuf.makeStringAndClear(); diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 1ae312469225..e0e7791da206 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -100,7 +100,7 @@ SFX_IMPL_OBJECTFACTORY( void DrawDocShell::Construct( bool bClipboard ) { mbInDestruction = false; -SetSlotFilter(); // setzt Filter zurueck +SetSlotFilter(); // resets the filter mbOwnDocument = mpDoc == nullptr; if( mbOwnDocument ) diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 068a3e03cb91..d1e023eed8c6 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -515,8 +515,8 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if ((eDragMode == SdrDragMode::Rotate) && (eHit == SdrHitKind::MarkedObject)) { -// The goal of this request is show always the rotation-arrow for 3D-objects at rotation-modus -// Independent of the settings at Extras->Optionen->Grafik "Objekte immer verschieben" +// The goal of this request is show always the rotation arrow for 3D-objects at rotation mode +// Independent of the settings at Tools->Options->Draw "Objects always moveable" // 2D-objects acquit in an other way. Otherwise, the rotation of 3d-objects around any axes // wouldn't be possible per default. const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index bdb72cc6..53c6a8450b66 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -279,25 +279,25 @@ bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); if (nCode == KEY_UP) { -// Scroll nach oben +// scroll up nX = 0; nY =-1; } else if (nCode == KEY_DOWN) { -// Scroll nach unten +// scroll down nX = 0; nY = 1; } else if (nCode == KEY_LEFT) { -// Scroll nach links +// scro
[Libreoffice-commits] core.git: sal/osl sal/textenc sax/test sc/inc sc/qa sc/source
sal/osl/w32/secimpl.hxx |2 sal/textenc/tcvtarb1.tab|2 sal/textenc/tcvtest1.tab| 74 ++-- sal/textenc/tcvtlat1.tab| 32 +++ sax/test/sax/testwriter.cxx | 16 +++ sc/inc/document.hxx |2 sc/inc/helpids.h|4 - sc/inc/linkuno.hxx |2 sc/inc/userdat.hxx |2 sc/qa/perf/scperfobj.cxx|2 sc/qa/unit/ucalc_formula.cxx|2 sc/source/core/data/table1.cxx |2 sc/source/core/data/table2.cxx |4 - sc/source/core/data/validat.cxx |2 sc/source/core/tool/cellform.cxx|2 sc/source/core/tool/docoptio.cxx|4 - sc/source/core/tool/interpr2.cxx| 10 ++-- sc/source/core/tool/rangelst.cxx| 16 +++ sc/source/core/tool/rangeutl.cxx|4 - sc/source/core/tool/token.cxx |2 sc/source/filter/dif/difimp.cxx |2 sc/source/filter/excel/excform.cxx |2 sc/source/filter/inc/eeparser.hxx | 16 +++ sc/source/filter/inc/excrecds.hxx |4 - sc/source/filter/inc/htmlexp.hxx|2 sc/source/filter/inc/htmlpars.hxx | 20 - sc/source/filter/inc/lotimpop.hxx | 14 +++--- sc/source/filter/inc/root.hxx |8 +-- sc/source/filter/inc/xcl97rec.hxx |4 - sc/source/filter/starcalc/scflt.cxx |2 sc/source/ui/docshell/arealink.cxx |2 sc/source/ui/docshell/docfunc.cxx |4 - sc/source/ui/docshell/docsh3.cxx|4 - sc/source/ui/docshell/docsh4.cxx|6 +- sc/source/ui/formdlg/dwfunctr.cxx |4 - sc/source/ui/formdlg/formula.cxx|2 sc/source/ui/inc/gridwin.hxx|4 - sc/source/ui/inc/tabview.hxx|4 - sc/source/ui/inc/undobase.hxx |2 sc/source/ui/navipi/content.cxx |6 +- sc/source/ui/navipi/navipi.cxx |6 +- sc/source/ui/src/scstring.src |4 - sc/source/ui/unoobj/chart2uno.cxx |2 sc/source/ui/unoobj/cursuno.cxx |6 +- sc/source/ui/unoobj/datauno.cxx | 42 ++-- sc/source/ui/unoobj/fielduno.cxx|2 sc/source/ui/unoobj/fmtuno.cxx |6 +- sc/source/ui/unoobj/linkuno.cxx |2 sc/source/ui/unoobj/styleuno.cxx|4 - sc/source/ui/unoobj/textuno.cxx |2 sc/source/ui/view/tabview5.cxx |2 sc/source/ui/view/viewdata.cxx |2 52 files changed, 189 insertions(+), 189 deletions(-) New commits: commit 5034e8217c9844293dc94e5dff0bdc865ad7a91a Author: Johnny_M Date: Fri Jun 30 22:49:10 2017 +0200 Translate German comments and debug strings (leftovers in dirs sal to sc) Translates leftovers found using a custom regex and manually checking the rest of the affected file. Additionally: - A few spelling fixes Change-Id: I2b83bd11adf520b90bb29c8ea624990759dad3c6 Reviewed-on: https://gerrit.libreoffice.org/39427 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/sal/osl/w32/secimpl.hxx b/sal/osl/w32/secimpl.hxx index 43af57d61cef..ff4121091ac1 100644 --- a/sal/osl/w32/secimpl.hxx +++ b/sal/osl/w32/secimpl.hxx @@ -30,7 +30,7 @@ typedef struct { HANDLE m_hProfile; HANDLE m_hToken; sal_Unicode m_User[USER_BUFFER_SIZE]; -/* ts: Erweiterung um Fileserver-login */ +/* ts: extension by fileserver login */ NETRESOURCEW *m_pNetResource; } oslSecurityImpl; diff --git a/sal/textenc/tcvtarb1.tab b/sal/textenc/tcvtarb1.tab index e346a7deff91..ee06e05606ba 100644 --- a/sal/textenc/tcvtarb1.tab +++ b/sal/textenc/tcvtarb1.tab @@ -717,7 +717,7 @@ static ImplTextEncodingData const aImplMS1256TextEncodingData /* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */ /* Convert-Tables: mappings/iso8859/8859-6.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */ /* Last-Changes from us: */ -/* !!! 0x30-0x39 sind Arabische Zahlen und muessten eigentlich nach 0x0660-0x0669 gemappt werden !!! */ +/* !!! 0x30-0x39 are Arabic numbers and should normally be mapped to 0x0660-0x0669 !!! */ #define ISO88596UNI_START 0xA0 #define ISO88596UNI_END 0xF2 diff --git a/sal/textenc/tcvtest1.tab b/sal/textenc/tcvtest1.tab index 22a145d110f3..8c045de2d006 100644 --- a/sal/textenc/tcvtest1.tab +++ b/sal/textenc/tcvtest1.tab @@ -30,7 +30,7 @@ /* IBM-737 */ /* Dos Standard CharSet for Greek */ -/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */ +/* 1-byte, 0x00-0x7F ASCII without exception */ /* Convert-Tables: mappings/vendors/micsft/pc/cp737.txt from 04/24/96 Version 2.00 */ /* Last-Changes from us: */ @@ -189,7 +189,7 @@ static ImplTextEncodingData const aImplIBM737TextEncodingData /* IBM-775 */ /* Dos Standard CharSet for BalticRim */ -/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */ +/* 1-byte, 0x00-0x7F ASCII without exception */ /* Convert-Tables: mappings/vendors/micsft
[Libreoffice-commits] core.git: winaccessibility/source
winaccessibility/source/service/AccObjectWinManager.cxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit fd8b5d26edb687fcbf96e74c4b07dcc2b1374035 Author: Johnny_M Date: Wed Dec 27 20:38:56 2017 +0100 Fix spelling in comments Change-Id: I93b3e2dde7be65d2077e386b8f80ae7c3576c788 Reviewed-on: https://gerrit.libreoffice.org/47102 Tested-by: Jenkins Reviewed-by: Tamás Zolnai diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx index 618eb15651c3..4298dff3d4d1 100644 --- a/winaccessibility/source/service/AccObjectWinManager.cxx +++ b/winaccessibility/source/service/AccObjectWinManager.cxx @@ -913,7 +913,7 @@ void AccObjectWinManager::UpdateState( css::accessibility::XAccessible* pXAcc ) } /** - * Set corresponding com object's accessible name via XAccessilbe interface and new + * Set corresponding com object's accessible name via XAccessible interface and new * name * @param pXAcc XAccessible interface. * @return @@ -940,7 +940,7 @@ void AccObjectWinManager::UpdateDescription( XAccessible* pXAcc ) } /** - * Set corresponding com object's accessible location via XAccessilbe interface and new + * Set corresponding com object's accessible location via XAccessible interface and new * location. * @param pXAcc XAccessible interface. * @return @@ -955,7 +955,7 @@ void AccObjectWinManager::SetLocation( XAccessible* pXAcc, long /*top*/, long / } /** - * Set corresponding com object's value via XAccessilbe interface and new value. + * Set corresponding com object's value via XAccessible interface and new value. * @param pXAcc XAccessible interface. * @param pAny new value. * @return @@ -968,7 +968,7 @@ void AccObjectWinManager::SetValue( XAccessible* pXAcc, Any pAny ) } /** - * Set corresponding com object's value via XAccessilbe interface. + * Set corresponding com object's value via XAccessible interface. * @param pXAcc XAccessible interface. * @return */ @@ -980,7 +980,7 @@ void AccObjectWinManager::UpdateValue( XAccessible* pXAcc ) } /** - * Set corresponding com object's name via XAccessilbe interface and new name. + * Set corresponding com object's name via XAccessible interface and new name. * @param pXAcc XAccessible interface. * @param newName new name * @return @@ -993,7 +993,7 @@ void AccObjectWinManager::SetAccName( XAccessible* pXAcc, Any newName) } /** - * Set corresponding com object's description via XAccessilbe interface and new description. + * Set corresponding com object's description via XAccessible interface and new description. * @param pXAcc XAccessible interface. * @param newDesc new description * @return @@ -1006,7 +1006,7 @@ void AccObjectWinManager::SetDescription( XAccessible* pXAcc, Any newDesc ) } /** - * Set corresponding com object's role via XAccessilbe interface and new role. + * Set corresponding com object's role via XAccessible interface and new role. * @param pXAcc XAccessible interface. * @param Role new role * @return ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/baside2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca58ddb012b27da4b11fc509c3cbc2e9cb2c0ec2 Author: Johnny_M Date: Thu Dec 28 11:59:47 2017 +0100 Translate German comment Change-Id: Id65ccfe3b2394c8c30d3531316b70b511e34e366 Reviewed-on: https://gerrit.libreoffice.org/47131 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 08c27f819639..1c438a908e19 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -591,7 +591,7 @@ bool ModulWindow::BasicErrorHdl( StarBASIC const * pBasic ) { GetShell()->GetViewFrame()->ToTop(); -// ReturnWert: BOOL +// Return value: BOOL // FALSE: cancel // TRUE: go on sal_uInt16 nErrorLine = StarBASIC::GetLine() - 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdibrow.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 27f005c0f90b1fd9bcdb4cab03921663d86c82e0 Author: Johnny_M Date: Thu Dec 28 12:06:37 2017 +0100 Translate German variable name Change-Id: Iad2185f13c9171dd7d2627a1d93b49e8c9199bb4 Reviewed-on: https://gerrit.libreoffice.org/47132 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 71fc3f5c29f7..02df784f9f34 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -386,11 +386,11 @@ void SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&) void SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt) { sal_uInt16 nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier(); -bool bAusgewertet = false; +bool bEvaluated = false; const std::size_t nPos=GetCurrentPos(); if (nPos!=ITEM_NOT_FOUND) { if (nKeyCode==KEY_RETURN) { -if (BeginChangeEntry(nPos)) bAusgewertet = true; +if (BeginChangeEntry(nPos)) bEvaluated = true; } else if (nKeyCode==KEY_ESCAPE) { } else if (rKEvt.GetKeyCode().GetModifier()==KEY_SHIFT+KEY_MOD1+KEY_MOD2) { // Ctrl @@ -408,7 +408,7 @@ void SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt) } } } -if (!bAusgewertet) BrowseBox::KeyInput(rKEvt); +if (!bEvaluated) BrowseBox::KeyInput(rKEvt); } void SdrItemBrowserControl::SetDirty() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source sw/source
svtools/source/svrtf/parrtf.cxx |4 ++-- sw/source/uibase/dochdl/gloshdl.cxx |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit fa73b3fba95d0939cefe7e8987fbcd438a3b725f Author: Johnny_M Date: Wed Dec 27 20:29:06 2017 +0100 Translate German comments and debug strings Additionally, improve an equal earlier translation made on commit ee536e482b5ad01ea4a8cae79a1fcd9e12db444f ( https://gerrit.libreoffice.org/#/c/7303/2/svtools/source/svrtf/parrtf.cxx@199 ) Change-Id: Idf1a95361a1bc54473a24c152902568574e21e69 Reviewed-on: https://gerrit.libreoffice.org/47099 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 52e350f52442..04c59e1b0c52 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -200,7 +200,7 @@ int SvRTFParser::GetNextToken_() if( '\\' == cAnsi && '\'' == ( cAnsi = GetNextChar() )) -// read on HexValue +// skip HexValue GetHexValue(); nNextCh = GetNextChar(); } @@ -437,7 +437,7 @@ void SvRTFParser::ScanText() if( '\\' == cAnsi && '\'' == ( cAnsi = GetNextChar() )) -// HexValue ueberlesen +// skip HexValue GetHexValue(); nNextCh = GetNextChar(); } diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 85964f4c1f0c..2fa820fea16f 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -258,13 +258,13 @@ sal_uInt16 SwGlossaryHdl::GetGlossaryCnt() OUString SwGlossaryHdl::GetGlossaryName( sal_uInt16 nId ) { -OSL_ENSURE(nId < GetGlossaryCnt(), "Textbausteinarray ueberindiziert."); +OSL_ENSURE(nId < GetGlossaryCnt(), "Text building block array over-indexed."); return pCurGrp->GetLongName( nId ); } OUString SwGlossaryHdl::GetGlossaryShortName(sal_uInt16 nId) { -OSL_ENSURE(nId < GetGlossaryCnt(), "Textbausteinarray ueberindiziert."); +OSL_ENSURE(nId < GetGlossaryCnt(), "Text building block array over-indexed."); return pCurGrp->GetShortName( nId ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdotext.hxx |4 ++-- svx/source/svdraw/svdotext.cxx | 20 ++-- svx/source/svdraw/svdotxed.cxx |4 ++-- svx/source/svdraw/svdpoev.cxx |8 4 files changed, 18 insertions(+), 18 deletions(-) New commits: commit 479c13df08f15f3fdcdd1f86eef40d48eb0fdbdd Author: Johnny_M Date: Sun Jan 28 13:21:31 2018 +0100 Translate German variable names Korr -> Corr in SVX Change-Id: I51311013024557aca1b4b3f660e6c5cef31f3f1b Reviewed-on: https://gerrit.libreoffice.org/48783 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 25b1e9095c6d..ad18a2512e0b 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -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; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index b1159c51e348..c1c710080897 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -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,
[Libreoffice-commits] core.git: sw/source
sw/source/ui/config/optpage.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 22776301906459a2cf1f826f90243be2a76d Author: Johnny_M Date: Sun Jan 28 13:35:03 2018 +0100 Translate German variable name Korr -> Corr in SW Change-Id: I95836bf9c6211bdf6a215ce9f213d3105b86c8f0 Reviewed-on: https://gerrit.libreoffice.org/48784 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index e929ebf10901..221beafb949c 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1625,8 +1625,8 @@ void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Recta aLeftPagePrtArea = tools::Rectangle(Point(nLBorder, nTBorder), Point((nOutWPix - 1) - nRBorder, (nOutHPix - 1) - nBBorder)); const long nWidth = aLeftPagePrtArea.GetWidth(); -const long nKorr = (nWidth & 1) != 0 ? 0 : 1; -aLeftPagePrtArea.SetSize(Size(nWidth / 2 - (nLBorder + nRBorder) / 2 + nKorr, aLeftPagePrtArea.GetHeight())); +const long nCorr = (nWidth & 1) != 0 ? 0 : 1; +aLeftPagePrtArea.SetSize(Size(nWidth / 2 - (nLBorder + nRBorder) / 2 + nCorr, aLeftPagePrtArea.GetHeight())); aRightPagePrtArea = aLeftPagePrtArea; aRightPagePrtArea.Move(aLeftPagePrtArea.GetWidth() + nLBorder + nRBorder + 1, 0); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/math.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit d58105e4512fc8a44e68379215d0c79f55b871bc Author: Johnny_M Date: Sun Jan 28 13:29:21 2018 +0100 Translate German variable name Korr -> Corr in math Change-Id: I33c3d0fa62aa0c4b6fd418ba2e49b90b019b8714 Reviewed-on: https://gerrit.libreoffice.org/48782 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index 9f25d653f3f1..8435715a1afc 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -75,7 +75,7 @@ static double getN10Exp(int nExp) namespace { -double const nKorrVal[] = { +double const nCorrVal[] = { 0, 9e-1, 9e-2, 9e-3, 9e-4, 9e-5, 9e-6, 9e-7, 9e-8, 9e-9, 9e-10, 9e-11, 9e-12, 9e-13, 9e-14, 9e-15 }; @@ -539,7 +539,7 @@ inline void doubleToString(typename T::String ** pResult, { int nDigit; if (nDigits-1 == 0 && i > 0 && i < 14) -nDigit = static_cast< int >(floor( fValue + nKorrVal[15-i])); +nDigit = static_cast< int >(floor( fValue + nCorrVal[15-i])); else nDigit = static_cast< int >(fValue + 1E-15); @@ -1116,7 +1116,7 @@ double SAL_CALL rtl_math_round(double fValue, int nDecPlaces, else nIndex = 15 - nExp; -fValue = floor(fValue + 0.5 + nKorrVal[nIndex]); +fValue = floor(fValue + 0.5 + nCorrVal[nIndex]); } break; case rtl_math_RoundingMode_Down: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/namebuff.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit ac3757b8becabc56081f9a454275ccc10bca2cda Author: Johnny_M Date: Sun Feb 4 00:48:57 2018 +0100 Translate German variable names Akt -> Current in Excel filter (namebuff) Change-Id: Idf36f8e19bb96b1d71edb49138c0ab36856c73ce Reviewed-on: https://gerrit.libreoffice.org/49192 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index e08a46653666..b25edaa010dd 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -33,15 +33,15 @@ sal_uInt32 StringHashEntry::MakeHashCode( const OUString& r ) { sal_uInt32 n = 0; -const sal_Unicode* pAkt = r.getStr(); -sal_UnicodecAkt = *pAkt; +const sal_Unicode* pCurrent = r.getStr(); +sal_UnicodecCurrent = *pCurrent; -while( cAkt ) +while( cCurrent ) { n *= 70; -n += static_cast(cAkt); -pAkt++; -cAkt = *pAkt; +n += static_cast(cCurrent); +pCurrent++; +cCurrent = *pCurrent; } return n; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/read.cxx | 130 1 file changed, 65 insertions(+), 65 deletions(-) New commits: commit d757c695f9736c064735017c02380eb6257a7875 Author: Johnny_M Date: Sun Feb 4 00:39:25 2018 +0100 Translate German variable names Akt -> Current Zustand -> STATE Ende -> End in Excel filter (read) Change-Id: I4bbb59fb8de1b59ecb4c8fd1ce0765e654acd10f Reviewed-on: https://gerrit.libreoffice.org/49193 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index b9d77a0b2b51..54fd40dea65a 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -74,7 +74,7 @@ ErrCode ImportExcel::Read() XclImpNameManager& rNameMgr= GetNameManager(); // call to GetCurrSheetDrawing() cannot be cached (changes in new sheets) -enum Zustand { +enum STATE { Z_BiffNull, // not a valid Biff-Format Z_Biff2,// Biff2: only one table @@ -91,9 +91,9 @@ ErrCode ImportExcel::Read() Z_Biff5T, // Biff5: a table itself Z_Biff5E, // Biff5: between tables Z_Biffn0, // all Biffs: skip table till next EOF -Z_Ende }; +Z_End }; -Zustand eAkt = Z_BiffNull, ePrev = Z_BiffNull; +STATE eCurrent = Z_BiffNull, ePrev = Z_BiffNull; ErrCode eLastErr = ERRCODE_NONE; sal_uInt16 nOpcode; @@ -107,9 +107,9 @@ ErrCode ImportExcel::Read() std::size_t nProgressBasePos = 0; std::size_t nProgressBaseSize = 0; -for (; eAkt != Z_Ende; mnLastRecId = nOpcode) +for (; eCurrent != Z_End; mnLastRecId = nOpcode) { -if( eAkt == Z_Biff5E ) +if( eCurrent == Z_Biff5E ) { sal_uInt16 nScTab = GetCurrScTab(); if( nScTab < maSheetOffsets.size() ) @@ -121,11 +121,11 @@ ErrCode ImportExcel::Read() if (!bValid) { // Safeguard ourselves from potential infinite loop. -eAkt = Z_Ende; +eCurrent = Z_End; } } else -eAkt = Z_Ende; +eCurrent = Z_End; } else aIn.StartNextRecord(); @@ -135,7 +135,7 @@ ErrCode ImportExcel::Read() if( !aIn.IsValid() ) { // finalize table if EOF is missing -switch( eAkt ) +switch( eCurrent ) { case Z_Biff2: case Z_Biff3: @@ -151,13 +151,13 @@ ErrCode ImportExcel::Read() break; } -if( eAkt == Z_Ende ) +if( eCurrent == Z_End ) break; -if( eAkt != Z_Biff5TPre && eAkt != Z_Biff5WPre ) +if( eCurrent != Z_Biff5TPre && eCurrent != Z_Biff5WPre ) pProgress->ProgressAbs( nProgressBaseSize + aIn.GetSvStreamPos() - nProgressBasePos ); -switch( eAkt ) +switch( eCurrent ) { case Z_BiffNull:// --- Z_BiffNull - @@ -176,7 +176,7 @@ ErrCode ImportExcel::Read() Bof2(); if( pExcRoot->eDateiTyp == Biff2 ) { -eAkt = Z_Biff2; +eCurrent = Z_Biff2; NewTable(); } break; @@ -184,7 +184,7 @@ ErrCode ImportExcel::Read() Bof3(); if( pExcRoot->eDateiTyp == Biff3 ) { -eAkt = Z_Biff3; +eCurrent = Z_Biff3; NewTable(); } break; @@ -192,17 +192,17 @@ ErrCode ImportExcel::Read() Bof4(); if( pExcRoot->eDateiTyp == Biff4 ) { -eAkt = Z_Biff4; +eCurrent = Z_Biff4; NewTable(); } else if( pExcRoot->eDateiTyp == Biff4W ) -eAkt = Z_Biff4W; +eCurrent = Z_Biff4W; break; case EXC_BIFF5: Bof5(); if( pExcRoot->eDateiTyp == Biff5W ) { -eAkt = Z_Biff5WPre; +eCurrent = Z_Biff5WPre;
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/tokstack.cxx | 198 ++-- sc/source/filter/inc/tokstack.hxx | 28 ++--- 2 files changed, 113 insertions(+), 113 deletions(-) New commits: commit f7fb78135c8747a8bca861b736960899dad295d4 Author: Johnny_M Date: Sun Feb 4 01:11:18 2018 +0100 Translate German variable names Akt -> Current in Excel filter (tokstack) Change-Id: I1d7fe8e0116fa9db0df806f50f805e34f0955f56 Reviewed-on: https://gerrit.libreoffice.org/49197 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 01cf12452ec0..1296f319bd6a 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -110,14 +110,14 @@ bool TokenPool::GrowId() bool TokenPool::CheckElementOrGrow() { -// Last possible ID to be assigned somewhere is nElementAkt+1 -if (nElementAkt + 1 == nScTokenOff - 1) +// Last possible ID to be assigned somewhere is nElementCurrent+1 +if (nElementCurrent + 1 == nScTokenOff - 1) { -SAL_WARN("sc.filter","TokenPool::CheckElementOrGrow - last possible ID " << nElementAkt+1); +SAL_WARN("sc.filter","TokenPool::CheckElementOrGrow - last possible ID " << nElementCurrent+1); return false; } -if (nElementAkt >= nElement) +if (nElementCurrent >= nElement) return GrowElement(); return true; @@ -176,9 +176,9 @@ bool TokenPool::GrowMatrix() bool TokenPool::GetElement( const sal_uInt16 nId ) { -if (nId >= nElementAkt) +if (nId >= nElementCurrent) { -SAL_WARN("sc.filter","TokenPool::GetElement - Id too large, " << nId << " >= " << nElementAkt); +SAL_WARN("sc.filter","TokenPool::GetElement - Id too large, " << nId << " >= " << nElementCurrent); return false; } @@ -343,11 +343,11 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId ) OSL_ENSURE(m_nRek <= nP_Id, "*TokenPool::GetElement(): recursion loops!?"); #endif -OSL_ENSURE( nId < nElementAkt, "*TokenPool::GetElementRek(): nId >= nElementAkt" ); +OSL_ENSURE( nId < nElementCurrent, "*TokenPool::GetElementRek(): nId >= nElementCurrent" ); -if (nId >= nElementAkt) +if (nId >= nElementCurrent) { -SAL_WARN("sc.filter", "*TokenPool::GetElementRek(): nId >= nElementAkt"); +SAL_WARN("sc.filter", "*TokenPool::GetElementRek(): nId >= nElementCurrent"); #ifdef DBG_UTIL m_nRek--; #endif @@ -372,33 +372,33 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId ) nCnt = 0; bRet = false; } -sal_uInt16* pAkt = nCnt ? &pP_Id[ nFirstId ] : nullptr; +sal_uInt16* pCurrent = nCnt ? &pP_Id[ nFirstId ] : nullptr; if (nCnt > nP_Id - nFirstId) { SAL_WARN("sc.filter", "TokenPool::GetElementRek: nCnt > nP_Id - nFirstId"); nCnt = nP_Id - nFirstId; bRet = false; } -for( ; nCnt > 0 ; nCnt--, pAkt++ ) +for( ; nCnt > 0 ; nCnt--, pCurrent++ ) { -assert(pAkt); -if( *pAkt < nScTokenOff ) +assert(pCurrent); +if( *pCurrent < nScTokenOff ) {// recursion or not? -if (*pAkt >= nElementAkt) +if (*pCurrent >= nElementCurrent) { -SAL_WARN("sc.filter", "TokenPool::GetElementRek: *pAkt >= nElementAkt"); +SAL_WARN("sc.filter", "TokenPool::GetElementRek: *pCurrent >= nElementCurrent"); bRet = false; } else { -if (pType[ *pAkt ] == T_Id) -bRet = GetElementRek( *pAkt ); +if (pType[ *pCurrent ] == T_Id) +bRet = GetElementRek( *pCurrent ); else -bRet = GetElement( *pAkt ); +bRet = GetElement( *pCurrent ); } } else// elementary SC_Token -pScToken->AddOpCode( static_cast( *pAkt - nScTokenOff ) ); +pScToken->AddOpCode( static_cast( *pCurrent - nScTokenOff ) ); } #ifdef DBG_UTIL @@ -409,40 +409,40 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId ) void TokenPool::operator >>( TokenId& rId ) { -rId = static_cast( nElementAkt + 1 ); +rId = static_cast( nElementCurrent + 1 ); if (!CheckElementOrGrow()) return; -pElement[ nElementAkt ] = nP_IdLast;// Start of Token-sequence -pType[ nElementAkt ] = T_Id;// set Typeinfo -pSize[ nElementAkt ] = nP_IdAkt
[Libreoffice-commits] core.git: sc/source
sc/source/filter/lotus/lotread.cxx | 24 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit f8d7e734ec21f7e4a91289299bdd4d31b1bf4621 Author: Johnny_M Date: Sat Feb 3 23:19:35 2018 +0100 Translate German variable names Akt -> Current in Lotus filter Change-Id: Icb13ea51c715df96223fd5b49f33d9321ef41d05 Reviewed-on: https://gerrit.libreoffice.org/49196 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 165071c03931..23f9823629e1 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -47,7 +47,7 @@ ErrCode ImportLotus::Read() ErrCodeeRet = ERRCODE_NONE; // ScFormulaCell *pLastFormCell; -STATE eAkt = S_START; +STATE eCurrent = S_START; nTab = 0; nExtTab = -2; @@ -57,28 +57,28 @@ ErrCode ImportLotus::Read() // start progressbar ScfStreamProgressBar aPrgrsBar( *pIn, pD->GetDocumentShell() ); LotusContext &rContext = aConv.getContext(); -while( eAkt != S_END ) +while( eCurrent != S_END ) { pIn->ReadUInt16( nOp ).ReadUInt16( nRecLen ); if (!pIn->good() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4) { eRet = SCERR_IMPORT_FORMAT; -eAkt = S_END; +eCurrent = S_END; if (!pIn->good()) break; // while } nNextRec += nRecLen + 4; -switch( eAkt ) +switch( eCurrent ) { case S_START: // S_START if( nOp ) { eRet = SCERR_IMPORT_UNKNOWN_WK; -eAkt = S_END; +eCurrent = S_END; } else { @@ -87,16 +87,16 @@ ErrCode ImportLotus::Read() Bof(); switch (rContext.pLotusRoot->eFirstType) { -case Lotus123Typ::WK3: eAkt = S_WK3; break; -case Lotus123Typ::WK4: eAkt = S_WK4; break; +case Lotus123Typ::WK3: eCurrent = S_WK3; break; +case Lotus123Typ::WK4: eCurrent = S_WK4; break; default: eRet = SCERR_IMPORT_UNKNOWN_WK; -eAkt = S_END; +eCurrent = S_END; } } else { -eAkt = S_END; // TODO: add here something for <= WK1! +eCurrent = S_END; // TODO: add here something for <= WK1! eRet = ErrCode(0x); } } @@ -110,13 +110,13 @@ ErrCode ImportLotus::Read() switch( nOp ) { case 0x0001:// EOF -eAkt = S_FM3; +eCurrent = S_FM3; nTab++; break; case 0x0002:// PASSWORD eRet = SCERR_IMPORT_FILEPASSWD; -eAkt = S_END; +eCurrent = S_END; break; case 0x0007:// COLUMNWIDTH @@ -177,7 +177,7 @@ ErrCode ImportLotus::Read() else { eRet = SCERR_IMPORT_FORMAT; -eAkt = S_END; +eCurrent = S_END; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/dif/difimp.cxx | 78 sc/source/filter/inc/dif.hxx|2 - 2 files changed, 40 insertions(+), 40 deletions(-) New commits: commit 2488768e402bcabd40c73e7c693ee2c1c9be2d69 Author: Johnny_M Date: Sat Feb 3 22:56:56 2018 +0100 Translate German variable names Akt -> Current in dif filter Change-Id: Ibae58744a1d0b685b9df4d63b2977ec9b09745d0 Reviewed-on: https://gerrit.libreoffice.org/49189 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index c523b072ba02..349f8e4864d7 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -127,19 +127,19 @@ ErrCode ScFormatFilterPluginImpl::ScImportDif(SvStream& rIn, ScDocument* pDoc, c SCROW nRowCnt = rInsPos.Row(); DifAttrCacheaAttrCache; -DATASET eAkt = D_UNKNOWN; +DATASET eCurrent = D_UNKNOWN; ScSetStringParam aStrParam; // used to set string value without number detection. aStrParam.setTextInput(); -while( eAkt != D_EOD ) +while( eCurrent != D_EOD ) { -eAkt = aDifParser.GetNextDataset(); +eCurrent = aDifParser.GetNextDataset(); aPrgrsBar.Progress(); ScAddress aPos(nColCnt, nRowCnt, nBaseTab); -switch( eAkt ) +switch( eCurrent ) { case D_BOT: if( nColCnt < SCCOL_MAX ) @@ -434,30 +434,30 @@ bool DifParser::ReadNextLine( OUString& rStr ) // a valid data record structure bool DifParser::LookAhead() { -const sal_Unicode* pAktBuffer; +const sal_Unicode* pCurrentBuffer; bool bValidStructure = false; OSL_ENSURE( aLookAheadLine.isEmpty(), "*DifParser::LookAhead(): LookAhead called twice in a row" ); rIn.ReadUniOrByteStringLine( aLookAheadLine, rIn.GetStreamCharSet() ); -pAktBuffer = aLookAheadLine.getStr(); +pCurrentBuffer = aLookAheadLine.getStr(); -switch( *pAktBuffer ) +switch( *pCurrentBuffer ) { case '-': // Special Datatype -pAktBuffer++; +pCurrentBuffer++; -if( Is1_0( pAktBuffer ) ) +if( Is1_0( pCurrentBuffer ) ) { bValidStructure = true; } break; case '0': // Numeric Data -pAktBuffer++; -if( *pAktBuffer == ',' ) +pCurrentBuffer++; +if( *pCurrentBuffer == ',' ) { -pAktBuffer++; -bValidStructure = ( GetNumberDataset(pAktBuffer) != D_SYNT_ERROR ); +pCurrentBuffer++; +bValidStructure = ( GetNumberDataset(pCurrentBuffer) != D_SYNT_ERROR ); } break; case '1': // String Data @@ -474,18 +474,18 @@ DATASET DifParser::GetNextDataset() { DATASET eRet = D_UNKNOWN; OUString aLine; -const sal_Unicode* pAktBuffer; +const sal_Unicode* pCurrentBuffer; ReadNextLine( aLine ); -pAktBuffer = aLine.getStr(); +pCurrentBuffer = aLine.getStr(); -switch( *pAktBuffer ) +switch( *pCurrentBuffer ) { case '-': // Special Datatype -pAktBuffer++; +pCurrentBuffer++; -if( Is1_0( pAktBuffer ) ) +if( Is1_0( pCurrentBuffer ) ) { ReadNextLine( aLine ); if( IsBOT( aLine.getStr() ) ) @@ -495,17 +495,17 @@ DATASET DifParser::GetNextDataset() } break; case '0': // Numeric Data -pAktBuffer++; // value in fVal, 2. line in aData -if( *pAktBuffer == ',' ) +pCurrentBuffer++; // value in fVal, 2. line in aData +if( *pCurrentBuffer == ',' ) { -pAktBuffer++; -eRet = GetNumberDataset(pAktBuffer); +pCurrentBuffer++; +eRet = GetNumberDataset(pCurrentBuffer); OUString aTmpLine; ReadNextLine( aTmpLine ); if ( eRet == D_SYNT_ERROR ) { // for broken records write "#ERR: data" to cell OUStringBuffer aTmp("#ERR: "); -aTmp.append(pAktBuffer).append(" ("); +aTmp.append(pCurrentBuffer).append(" ("); aTmp.append(aTmpLine).append(')'); aData = aTmp.makeStringAndClear(); eRet = D_STRING; @@ -588,30 +588,30 @@ const sal_Unicode* DifParser::ScanIntVal( const sal
[Libreoffice-commits] core.git: sc/source
sc/source/filter/ftools/ftools.cxx | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 3af813241cc8007bcc2077944e12af1a7dfac3b0 Author: Johnny_M Date: Sun Feb 4 00:05:58 2018 +0100 Translate German variable names Fakt -> Factor in ftools Change-Id: I86f8d68015625c8ec7b3d260dbb3f734d2d7008e Reviewed-on: https://gerrit.libreoffice.org/49195 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 525b2eacebb2..f7d085a28b6c 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -67,25 +67,25 @@ SEEE IMMM */ long double lfDouble; -long double lfFakt = 256.0; +long double lfFactor = 256.0; sal_uInt8 pDouble10[ 10 ]; rStrm.ReadBytes(pDouble10, 10);// Intel-10 in pDouble10 lfDouble = static_cast< long double >( pDouble10[ 7 ] ); // Byte 7 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 6 ] ); // Byte 6 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 5 ] ); // Byte 5 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 4 ] ); // Byte 4 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 3 ] ); // Byte 3 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 2 ] ); // Byte 2 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 1 ] ); // Byte 1 -lfDouble *= lfFakt; +lfDouble *= lfFactor; lfDouble += static_cast< long double >( pDouble10[ 0 ] ); // Byte 0 // For value 0.0 all bits are zero; pow(2.0,-16446) does not work with CSet compilers ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/fontbuff.cxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit b4571ca497063448805bd707c12fcd584d576620 Author: Johnny_M Date: Sun Feb 4 00:57:58 2018 +0100 Translate German variable names Akt -> Current in Excel filter (fontbuff) Change-Id: I7c969fc17e08efff7a446bf6e11ec0ce4c82 Reviewed-on: https://gerrit.libreoffice.org/49194 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx index 2a0a6c07d4f5..52461ffde7f6 100644 --- a/sc/source/filter/excel/fontbuff.cxx +++ b/sc/source/filter/excel/fontbuff.cxx @@ -42,16 +42,16 @@ void LotusFontBuffer::Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet ) { sal_uInt8 nIntIndex = nIndex & 0x07; -ENTRY* pAkt = pData + nIntIndex; +ENTRY* pCurrent = pData + nIntIndex; -if( pAkt->pFont ) -rItemSet.Put( *pAkt->pFont ); +if( pCurrent->pFont ) +rItemSet.Put( *pCurrent->pFont ); -if( pAkt->pHeight ) -rItemSet.Put( *pAkt->pHeight ); +if( pCurrent->pHeight ) +rItemSet.Put( *pCurrent->pHeight ); -if( pAkt->pColor ) -rItemSet.Put( *pAkt->pColor ); +if( pCurrent->pColor ) +rItemSet.Put( *pCurrent->pColor ); if( nIndex & 0x08 ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/findtxt.cxx | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit f51ce842a6ac994f68bff453cf97d64dbc29b1ec Author: Johnny_M Date: Sun Feb 4 00:12:30 2018 +0100 Translate German variable names Akt -> Current in crsr Change-Id: Icdcba2c34c6b76e6a5232a526caeb77a294404ff Reviewed-on: https://gerrit.libreoffice.org/49190 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 5ea33060dae6..cf98da007ba4 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -115,7 +115,7 @@ lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd, else break; -const sal_Int32 nAkt = nStt - rArr.size(); +const sal_Int32 nCurrent = nStt - rArr.size(); if ( bNewHint ) { @@ -141,17 +141,17 @@ lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd, // end (might be normal 0x7f). const bool bEmpty = pHt->Which() != RES_TXTATR_FIELD || (static_txtattr_cast(pHt)->GetFormatField().GetField()->ExpandField(true).isEmpty()); -if ( bEmpty && nStart == nAkt ) +if ( bEmpty && nStart == nCurrent ) { -rArr.push_back( nAkt ); +rArr.push_back( nCurrent ); --rEnd; -buf.remove(nAkt, 1); +buf.remove(nCurrent, 1); } else { if ( bEmpty ) -aReplaced.push_back( nAkt ); -buf[nAkt] = '\x7f'; +aReplaced.push_back( nCurrent ); +buf[nCurrent] = '\x7f'; } } break; @@ -159,9 +159,9 @@ lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd, { if( bRemoveCommentAnchors ) { -rArr.push_back( nAkt ); +rArr.push_back( nCurrent ); --rEnd; -buf.remove( nAkt, 1 ); +buf.remove( nCurrent, 1 ); } } break; @@ -175,9 +175,9 @@ lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd, if ( bNewSoftHyphen ) { -rArr.push_back( nAkt ); +rArr.push_back( nCurrent ); --rEnd; -buf.remove(nAkt, 1); +buf.remove(nCurrent, 1); ++nSoftHyphen; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dbui/dbmgr.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 2c6712b5fe7c0118d67887fa5d18affca8636c1b Author: Johnny_M Date: Sat Feb 3 23:25:09 2018 +0100 Translate German variable names Akt -> Current in dbmgr Change-Id: Ia44fc1bb424703b417b46ad68f64aa6ffc3d6ccf Reviewed-on: https://gerrit.libreoffice.org/49191 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 43f6451fa1ef..225dbc2c50b0 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -611,8 +611,8 @@ static OUString lcl_FindColumn(const OUString& sFormatStr,sal_uInt16 &nUsedPos nSeparator = 0xff; while(nUsedPos < nLen && nSeparator == 0xff) { -sal_Unicode cAkt = sFormatStr[nUsedPos]; -switch(cAkt) +sal_Unicode cCurrent = sFormatStr[nUsedPos]; +switch(cCurrent) { case ',': nSeparator = DB_SEP_SPACE; @@ -627,7 +627,7 @@ static OUString lcl_FindColumn(const OUString& sFormatStr,sal_uInt16 &nUsedPos nSeparator = DB_SEP_NEWLINE; break; default: -sReturn += OUStringLiteral1(cAkt); +sReturn += OUStringLiteral1(cCurrent); } nUsedPos++; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdmark.cxx | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) New commits: commit 1b35e6de3ca5161f9da633675312456bba9ab5c7 Author: Johnny_M Date: Sat Feb 10 14:35:53 2018 +0100 Translate German variable names Akt -> Current Neu -> New Kopie -> Copy in svdraw Change-Id: Ia96b30a7a6da2b790bb6c3d05bd571103a2edce9 Reviewed-on: https://gerrit.libreoffice.org/49536 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index fbc060923ef6..25ee096abe2d 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -163,11 +163,11 @@ void SdrMarkList::ImpForceSort() { for(std::vector::iterator it = maList.begin(); it != maList.end(); ) { -SdrMark* pAkt = *it; -if(pAkt->GetMarkedSdrObj() == nullptr) +SdrMark* pCurrent = *it; +if(pCurrent->GetMarkedSdrObj() == nullptr) { it = maList.erase( it ); -delete pAkt; +delete pCurrent; } else ++it; @@ -182,20 +182,20 @@ void SdrMarkList::ImpForceSort() // remove duplicates if(maList.size() > 1) { -SdrMark* pAkt = maList.back(); +SdrMark* pCurrent = maList.back(); for (size_t count = maList.size() - 1; count; --count) { size_t i = count - 1; SdrMark* pCmp = maList[i]; -assert(pAkt->GetMarkedSdrObj()); -if(pAkt->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj()) +assert(pCurrent->GetMarkedSdrObj()); +if(pCurrent->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj()) { // Con1/Con2 Merging if(pCmp->IsCon1()) -pAkt->SetCon1(true); +pCurrent->SetCon1(true); if(pCmp->IsCon2()) -pAkt->SetCon2(true); +pCurrent->SetCon2(true); // delete pCmp maList.erase(maList.begin() + i); @@ -204,7 +204,7 @@ void SdrMarkList::ImpForceSort() } else { -pAkt = pCmp; +pCurrent = pCmp; } } } @@ -230,8 +230,8 @@ SdrMarkList& SdrMarkList::operator=(const SdrMarkList& rLst) for(size_t i = 0; i < rLst.GetMarkCount(); ++i) { SdrMark* pMark = rLst.GetMark(i); -SdrMark* pNeuMark = new SdrMark(*pMark); -maList.push_back(pNeuMark); +SdrMark* pNewMark = new SdrMark(*pMark); +maList.push_back(pNewMark); } maMarkName = rLst.maMarkName; @@ -303,14 +303,14 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort) } else { -SdrMark* pKopie = new SdrMark(rMark); -maList.push_back(pKopie); +SdrMark* pCopy = new SdrMark(rMark); +maList.push_back(pCopy); // now check if the sort is ok const SdrObjList* pLastOL = pLastObj!=nullptr ? pLastObj->GetObjList() : nullptr; -const SdrObjList* pNeuOL = pNewObj !=nullptr ? pNewObj ->GetObjList() : nullptr; +const SdrObjList* pNewOL = pNewObj !=nullptr ? pNewObj ->GetObjList() : nullptr; -if(pLastOL == pNeuOL) +if(pLastOL == pNewOL) { const sal_uLong nLastNum(pLastObj!=nullptr ? pLastObj->GetOrdNum() : 0); const sal_uLong nNewNum(pNewObj !=nullptr ? pNewObj ->GetOrdNum() : 0); @@ -354,8 +354,8 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, size_t nNum) { delete pMark; SetNameDirty(); -SdrMark* pKopie = new SdrMark(rNewMark); -maList[nNum] = pKopie; +SdrMark* pCopy = new SdrMark(rNewMark); +maList[nNum] = pCopy; mbSorted = false; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.cxx |4 +- sw/source/filter/ww8/ww8scan.cxx | 66 +++ sw/source/filter/ww8/ww8scan.hxx | 18 +- 3 files changed, 44 insertions(+), 44 deletions(-) New commits: commit dcbe5eda8f3f698e4717e1458b2c1efb589b8ed6 Author: Johnny_M Date: Sat Feb 10 14:24:46 2018 +0100 Translate German variable names Akt -> Current in ww8 Note: Similar translation of function name parts will be done later, to prevent a Git conflict Change-Id: I0db585749bb8f83a31c2c02deb33e097bb212a9e Reviewed-on: https://gerrit.libreoffice.org/49539 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index e6aca96267fd..5b5c9a91042f 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3728,7 +3728,7 @@ void SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes, { bool bReSync; // Frame/Table/Autonumbering List Level -bTabRowEnd = ProcessSpecial(bReSync, rRes.nAktCp + m_xPlcxMan->GetCpOfs()); +bTabRowEnd = ProcessSpecial(bReSync, rRes.nCurrentCp + m_xPlcxMan->GetCpOfs()); if( bReSync ) *pStartAttr = m_xPlcxMan->Get( &rRes ); // Get Attribut-Pos again } @@ -3749,7 +3749,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, long nTextEnd, bool& rbStar OSL_ENSURE(m_pPaM->GetNode().GetTextNode(), "Missing txtnode"); bool bStartAttr = m_xPlcxMan->Get(&aRes); // Get Attribute position again -aRes.nAktCp = rTextPos; // Current Cp position +aRes.nCurrentCp = rTextPos; // Current Cp position bool bNewSection = (aRes.nFlags & MAN_MASK_NEW_SEP) && !m_bIgnoreText; if ( bNewSection ) // New Section diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 9b9949f484aa..ef25e6353e46 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -886,7 +886,7 @@ void WW8SprmIter::advance() { if (nRemLen > 0 ) { -sal_uInt16 nSize = nAktSize; +sal_uInt16 nSize = nCurrentSize; if (nSize > nRemLen) nSize = nRemLen; pSprms += nSize; @@ -901,18 +901,18 @@ void WW8SprmIter::UpdateMyMembers() if (bValid) { -nAktId = mrSprmParser.GetSprmId(pSprms); -nAktSize = mrSprmParser.GetSprmSize(nAktId, pSprms, nRemLen); -pAktParams = pSprms + mrSprmParser.DistanceToData(nAktId); -bValid = nAktSize <= nRemLen; +nCurrentId = mrSprmParser.GetSprmId(pSprms); +nCurrentSize = mrSprmParser.GetSprmSize(nCurrentId, pSprms, nRemLen); +pCurrentParams = pSprms + mrSprmParser.DistanceToData(nCurrentId); +bValid = nCurrentSize <= nRemLen; SAL_WARN_IF(!bValid, "sw.ww8", "sprm longer than remaining bytes, doc or parser is wrong"); } if (!bValid) { -nAktId = 0; -pAktParams = nullptr; -nAktSize = 0; +nCurrentId = 0; +pCurrentParams = nullptr; +nCurrentSize = 0; nRemLen = 0; } } @@ -2031,21 +2031,21 @@ OUString read_uInt16_BeltAndBracesString(SvStream& rStrm) } sal_Int32 WW8ScannerBase::WW8ReadString( SvStream& rStrm, OUString& rStr, -WW8_CP nAktStartCp, long nTotalLen, rtl_TextEncoding eEnc ) const +WW8_CP nCurrentStartCp, long nTotalLen, rtl_TextEncoding eEnc ) const { // Read in plain text, which can extend over several pieces rStr.clear(); -if (nAktStartCp < 0 || nTotalLen < 0) +if (nCurrentStartCp < 0 || nTotalLen < 0) return 0; -WW8_CP nBehindTextCp = nAktStartCp + nTotalLen; +WW8_CP nBehindTextCp = nCurrentStartCp + nTotalLen; WW8_CP nNextPieceCp = nBehindTextCp; // Initialization, important for Ver6 long nTotalRead = 0; do { bool bIsUnicode(false), bPosOk(false); -WW8_FC fcAct = WW8Cp2Fc(nAktStartCp,&bIsUnicode,&nNextPieceCp,&bPosOk); +WW8_FC fcAct = WW8Cp2Fc(nCurrentStartCp,&bIsUnicode,&nNextPieceCp,&bPosOk); // Probably aimed beyond file end, doesn't matter! if( !bPosOk ) @@ -2058,7 +2058,7 @@ sal_Int32 WW8ScannerBase::WW8ReadString( SvStream& rStrm, OUString& rStr, WW8_CP nEnd = (nNextPieceCp < nBehindTextCp) ? nNextPieceCp : nBehindTextCp; WW8_CP nLen; -const bool bFail = o3tl::checked_sub(nEnd, nAktStartCp, nLen); +const bool bFail = o3tl::checked_sub(nEnd, nCurrentStartCp, nLen); if (bFail) break; @@ -2070,7 +2070,7 @@ sal_Int32 WW8ScannerBase::WW8ReadString( SvStream& rStrm, OUString& rStr, : read_uInt8s_ToOUString(rStrm, nLen, eEnc); nTotalRead +
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excform8.cxx | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit ee47b7b4c805fc781dab48c65c4ff5fc701b3709 Author: Johnny_M Date: Sat Feb 10 13:46:33 2018 +0100 Translate German variable names Fakt -> Factor in Excel filter (excform8) Change-Id: Ic63dc819d6b3b5fb5f8c362a72b6d5844dce2c11 Reviewed-on: https://gerrit.libreoffice.org/49530 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index db501e8c87a4..ccd2211a275e 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -375,18 +375,18 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x19: // Special Attribute [327 279] { -sal_uInt16 nData(0), nFakt(0); +sal_uInt16 nData(0), nFactor(0); sal_uInt8 nOpt(0); nOpt = aIn.ReaduInt8(); nData = aIn.ReaduInt16(); -nFakt = 2; +nFactor = 2; if( nOpt & 0x04 ) { -// nFakt -> skip bytes or wordsAttrChoose +// nFactor -> skip bytes or wordsAttrChoose nData++; -aIn.Ignore(static_cast(nData) * nFakt); +aIn.Ignore(static_cast(nData) * nFactor); } else if( nOpt & 0x10 ) // AttrSum DoMulArgs( ocSum, 1 ); @@ -1023,18 +1023,18 @@ ConvErr ExcelToSc8::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, std break; case 0x19: // Special Attribute [327 279] { -sal_uInt16 nData(0), nFakt(0); +sal_uInt16 nData(0), nFactor(0); sal_uInt8 nOpt(0); nOpt = aIn.ReaduInt8(); nData = aIn.ReaduInt16(); -nFakt = 2; +nFactor = 2; if( nOpt & 0x04 ) { -// nFakt -> skip bytes or wordsAttrChoose +// nFactor -> skip bytes or wordsAttrChoose ++nData; -aIn.Ignore(static_cast(nData) * nFakt); +aIn.Ignore(static_cast(nData) * nFactor); } } break; @@ -1668,7 +1668,7 @@ void ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, std::size_t nLen nOpt = aIn.ReaduInt8(); nData = aIn.ReaduInt16(); if( nOpt & 0x04 ) -{// nFakt -> skip bytes or wordsAttrChoose +{// nFactor -> skip bytes or wordsAttrChoose nData++; nSeek = nData * 2; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/lotus/lotattr.cxx | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) New commits: commit eb3bd34dfb55cf3afc088330e73fc03385da20ec Author: Johnny_M Date: Sat Feb 10 14:41:14 2018 +0100 Translate German variable names Akt -> Current in Lotus filter (lotattr) Change-Id: Ibafa9f70f5bcec65dadc1dc118368bd45849a6c0 Reviewed-on: https://gerrit.libreoffice.org/49533 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index 66f0d75997eb..e303b435abbe 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.cxx @@ -96,9 +96,9 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) ScPatternAttr* pNewPatt = new ScPatternAttr(pDocPool); SfxItemSet& rItemSet = pNewPatt->GetItemSet(); -ENTRY *pAkt = new ENTRY( pNewPatt ); +ENTRY *pCurrent = new ENTRY( pNewPatt ); -pAkt->nHash0 = nRefHash; +pCurrent->nHash0 = nRefHash; mpLotusRoot->maFontBuff.Fill( rAttr.nFont, rItemSet ); @@ -144,7 +144,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) rItemSet.Put( aHorJustify ); } -aEntries.push_back(std::unique_ptr(pAkt)); +aEntries.push_back(std::unique_ptr(pCurrent)); return *pNewPatt; } @@ -198,21 +198,21 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr ) (*iterLast)->nLastRow = nRow; else { -ENTRY *pAkt = new ENTRY; +ENTRY *pCurrent = new ENTRY; -pAkt->pPattAttr = &rAttr; -pAkt->nFirstRow = pAkt->nLastRow = nRow; +pCurrent->pPattAttr = &rAttr; +pCurrent->nFirstRow = pCurrent->nLastRow = nRow; -aEntries.push_back(std::unique_ptr(pAkt)); +aEntries.push_back(std::unique_ptr(pCurrent)); } } else { // first entry -ENTRY *pAkt = new ENTRY; -pAkt->pPattAttr = &rAttr; -pAkt->nFirstRow = pAkt->nLastRow = nRow; +ENTRY *pCurrent = new ENTRY; +pCurrent->pPattAttr = &rAttr; +pCurrent->nFirstRow = pCurrent->nLastRow = nRow; -aEntries.push_back(std::unique_ptr(pAkt)); +aEntries.push_back(std::unique_ptr(pCurrent)); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8graf.cxx |4 +- sw/source/filter/ww8/ww8par.cxx | 58 +++ sw/source/filter/ww8/ww8par.hxx | 16 +- sw/source/filter/ww8/ww8par2.cxx | 12 sw/source/filter/ww8/ww8par3.cxx | 50 - sw/source/filter/ww8/ww8par6.cxx | 54 ++-- 6 files changed, 97 insertions(+), 97 deletions(-) New commits: commit bf183a4ef2368e38ee5fc94518815c34850d828e Author: Johnny_M Date: Sun Feb 11 11:37:15 2018 +0100 Translate German variable names Akt -> Current Act -> Current (in same context, including comments correction, under assumption of a "false friend" wording by a non-English speaker) in ww8par Note: Similar translation of other occurrences in affected files will be done separately Change-Id: I267aa37020662eb5a267f2355fe04fc0f87a2dda Reviewed-on: https://gerrit.libreoffice.org/49558 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 767381499e96..da262f684feb 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -606,7 +606,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, // get position of next SPRM bool bStartAttr = m_xPlcxMan->Get(&aRes); -m_nAktColl = m_xPlcxMan->GetColl(); +m_nCurrentColl = m_xPlcxMan->GetColl(); if (aRes.nSprmId) { if( bONLYnPicLocFc ) @@ -717,7 +717,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, } } // Fill in the remainder from the style -InsertTxbxStyAttrs(*pS, m_nAktColl); +InsertTxbxStyAttrs(*pS, m_nCurrentColl); if( pS->Count() ) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 5b5c9a91042f..a3a90efed173 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1441,8 +1441,8 @@ const SfxPoolItem* SwWW8FltControlStack::GetFormatAttr(const SwPosition& rPos, SfxItemState eState = SfxItemState::DEFAULT; if (const SfxItemSet *pSet = pNd->GetpSwAttrSet()) eState = pSet->GetItemState(RES_LR_SPACE, false); -if (eState != SfxItemState::SET && rReader.m_nAktColl < rReader.m_vColl.size()) -pItem = &(rReader.m_vColl[rReader.m_nAktColl].maWordLR); +if (eState != SfxItemState::SET && rReader.m_nCurrentColl < rReader.m_vColl.size()) +pItem = &(rReader.m_vColl[rReader.m_nCurrentColl].maWordLR); } /* @@ -1619,17 +1619,17 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen) const SwFormat * pSty = nullptr; sal_uInt16 nTabBase; -if (m_pAktColl && m_nAktColl < m_vColl.size()) // StyleDef +if (m_pAktColl && m_nCurrentColl < m_vColl.size()) // StyleDef { -nTabBase = m_vColl[m_nAktColl].m_nBase; +nTabBase = m_vColl[m_nCurrentColl].m_nBase; if (nTabBase < m_vColl.size()) // Based On pSty = m_vColl[nTabBase].m_pFormat; } else { // Text -nTabBase = m_nAktColl; -if (m_nAktColl < m_vColl.size()) -pSty = m_vColl[m_nAktColl].m_pFormat; +nTabBase = m_nCurrentColl; +if (m_nCurrentColl < m_vColl.size()) +pSty = m_vColl[m_nCurrentColl].m_pFormat; //TODO: figure out else here } @@ -1941,7 +1941,7 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) : mpPrevNumRule(pRdr->m_pPrevNumRule), mpTableDesc(pRdr->m_pTableDesc), mnInTable(pRdr->m_nInTable), -mnAktColl(pRdr->m_nAktColl), +mnCurrentColl(pRdr->m_nCurrentColl), mcSymbol(pRdr->m_cSymbol), mbIgnoreText(pRdr->m_bIgnoreText), mbSymbol(pRdr->m_bSymbol), @@ -1963,7 +1963,7 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) : pRdr->m_pPreviousNumPaM = nullptr; pRdr->m_pPrevNumRule = nullptr; pRdr->m_pTableDesc = nullptr; -pRdr->m_nAktColl = 0; +pRdr->m_nCurrentColl = 0; pRdr->m_xCtrlStck.reset(new SwWW8FltControlStack(&pRdr->m_rDoc, pRdr->m_nFieldFlags, *pRdr)); @@ -2005,7 +2005,7 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr ) pRdr->m_bInHyperlink = mbInHyperlink; pRdr->m_bWasParaEnd = mbWasParaEnd; pRdr->m_bPgSecBreak = mbPgSecBreak; -pRdr->m_nAktColl = mnAktColl; +pRdr->m_nCurrentColl = mnCurrentColl; pRdr->m_bHasBorder = mbHasBorder; pRdr->m_bFirstPara = mbFirstPara; @@ -277
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/tool.h |4 ++-- sc/source/filter/lotus/op.cxx | 32 2 files changed, 18 insertions(+), 18 deletions(-) New commits: commit 85851cf46364e1fc1772bef23cdc7fb7cb6fa5a5 Author: Johnny_M Date: Sat Feb 10 13:39:44 2018 +0100 Translate German variable names Akt -> Current Erg -> Result Decimal (places) -> Fractinal (part), with related comment translation corrections in Lotus filter Change-Id: I1ea6917fb8e9da2f0f9c48fd1fe55347f8098cac Reviewed-on: https://gerrit.libreoffice.org/49532 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index b7c99a6f54a4..1f9ff7295858 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -25,8 +25,8 @@ #include // Default values -const sal_uInt8 nDezStd = 0;// Decimal points for standard cells -const sal_uInt8 nDezFloat = 2; //" " float cells +const sal_uInt8 nFractionalStd = 0;// Number of digits in fractional part for standard cells +const sal_uInt8 nFractionalFloat = 2; //" " " " float cells struct LotusContext; diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index 3998a08ca088..dceb1594b294 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -82,7 +82,7 @@ void OP_Integer(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/) rContext.pDoc->EnsureTable(0); rContext.pDoc->SetValue(ScAddress(nCol, nRow, 0), static_cast(nValue)); -// 0 decimal places! +// 0 digits in fractional part! SetFormat(rContext, nCol, nRow, 0, nFormat, 0); } } @@ -102,7 +102,7 @@ void OP_Number(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/) rContext.pDoc->EnsureTable(0); rContext.pDoc->SetValue(ScAddress(nCol, nRow, 0), fValue); -SetFormat(rContext, nCol, nRow, 0, nFormat, nDezFloat); +SetFormat(rContext, nCol, nRow, 0, nFormat, nFractionalFloat); } } @@ -127,7 +127,7 @@ void OP_Label(LotusContext& rContext, SvStream& r, sal_uInt16 n) PutFormString(rContext, nCol, nRow, 0, pText.get()); -SetFormat(rContext, nCol, nRow, 0, nFormat, nDezStd); +SetFormat(rContext, nCol, nRow, 0, nFormat, nFractionalStd); } } @@ -143,26 +143,26 @@ void OP_Formula(LotusContext &rContext, SvStream& r, sal_uInt16 /*n*/) SCCOL nCol(static_cast(nTmpCol)); SCROW nRow(static_cast(nTmpRow)); -const ScTokenArray* pErg; +const ScTokenArray* pResult; sal_Int32 nBytesLeft = nFormulaSize; ScAddress aAddress(nCol, nRow, 0); svl::SharedStringPool& rSPool = rContext.pLotusRoot->pDoc->GetSharedStringPool(); LotusToSc aConv(rContext, r, rSPool, rContext.pLotusRoot->eCharsetQ, false); aConv.Reset( aAddress ); -aConv.Convert( pErg, nBytesLeft ); +aConv.Convert( pResult, nBytesLeft ); if (!aConv.good()) return; if (ValidColRow(nCol, nRow)) { -ScFormulaCell* pCell = new ScFormulaCell(rContext.pLotusRoot->pDoc, aAddress, *pErg); +ScFormulaCell* pCell = new ScFormulaCell(rContext.pLotusRoot->pDoc, aAddress, *pResult); pCell->AddRecalcMode( ScRecalcMode::ONLOAD_ONCE ); rContext.pDoc->EnsureTable(0); rContext.pDoc->SetFormulaCell(ScAddress(nCol, nRow, 0), pCell); -// nFormat = Default -> decimal places like Float -SetFormat(rContext, nCol, nRow, 0, nFormat, nDezFloat); +// nFormat = Default -> number of digits in fractional part like Float +SetFormat(rContext, nCol, nRow, 0, nFormat, nFractionalFloat); } } @@ -286,22 +286,22 @@ void OP_HiddenCols(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/) { sal_uInt16 nByte, nBit; SCCOL nCount; -sal_uInt8 nAkt; +sal_uInt8 nCurrent; nCount = 0; for( nByte = 0 ; nByte < 32 ; nByte++ ) // 32 Bytes with ... { -r.ReadUChar( nAkt ); +r.ReadUChar( nCurrent ); for( nBit = 0 ; nBit < 8 ; nBit++ ) // ...each 8 Bits = 256 Bits { -if( nAkt & 0x01 ) // is lowest Bit set? +if( nCurrent & 0x01 ) // is lowest Bit set? { // -> Hidden Col rContext.pDoc->SetColHidden(nCount, nCount, 0, true); } nCount++; -nAkt = nAkt / 2;// the next please... +nCurrent = nCurrent / 2;// the next please... } } } @@ -334,7 +334,7 @@ void OP_Blank(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/) SCCOL nCol(static_cast(nTmpCol)); SCROW nRow(static_cast(nTmpRow)); -SetF
[Libreoffice-commits] core.git: sw/source
sw/source/ui/vba/vbapagesetup.cxx | 32 1 file changed, 16 insertions(+), 16 deletions(-) New commits: commit 040c13b4b5195b801b38a96638abb87a73cae2ae Author: Johnny_M Date: Sat Feb 10 15:18:45 2018 +0100 Translate German variable names akt -> current in vba Change-Id: Ifdd49b5370fdbdf29699ce602bd38275788db911 Reviewed-on: https://gerrit.libreoffice.org/49538 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index dec1c8b47652..e8f7bbbd8e70 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -79,20 +79,20 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) { sal_Int32 newHeaderDistance = Millimeter::getInHundredthsOfOneMillimeter( _headerdistance ); bool isHeaderOn = false; -sal_Int32 aktTopMargin = 0; -sal_Int32 aktSpacing = 0; -sal_Int32 aktHeaderHeight = 0; +sal_Int32 currentTopMargin = 0; +sal_Int32 currentSpacing = 0; +sal_Int32 currentHeaderHeight = 0; mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn; if( !isHeaderOn ) mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( true ) ); -mxPageProps->getPropertyValue("TopMargin") >>= aktTopMargin; -mxPageProps->getPropertyValue("HeaderBodyDistance") >>= aktSpacing; -mxPageProps->getPropertyValue("HeaderHeight") >>= aktHeaderHeight; +mxPageProps->getPropertyValue("TopMargin") >>= currentTopMargin; +mxPageProps->getPropertyValue("HeaderBodyDistance") >>= currentSpacing; +mxPageProps->getPropertyValue("HeaderHeight") >>= currentHeaderHeight; -sal_Int32 newSpacing = aktSpacing - ( newHeaderDistance - aktTopMargin ); -sal_Int32 height = aktHeaderHeight - aktSpacing; +sal_Int32 newSpacing = currentSpacing - ( newHeaderDistance - currentTopMargin ); +sal_Int32 height = currentHeaderHeight - currentSpacing; sal_Int32 newHeaderHeight = newSpacing + height; mxPageProps->setPropertyValue("TopMargin", uno::makeAny( newHeaderDistance ) ); @@ -113,20 +113,20 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) { sal_Int32 newFooterDistance = Millimeter::getInHundredthsOfOneMillimeter( _footerdistance ); bool isFooterOn = false; -sal_Int32 aktBottomMargin = 0; -sal_Int32 aktSpacing = 0; -sal_Int32 aktFooterHeight = 0; +sal_Int32 currentBottomMargin = 0; +sal_Int32 currentSpacing = 0; +sal_Int32 currentFooterHeight = 0; mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn; if( !isFooterOn ) mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( true ) ); -mxPageProps->getPropertyValue("BottomMargin") >>= aktBottomMargin; -mxPageProps->getPropertyValue("FooterBodyDistance") >>= aktSpacing; -mxPageProps->getPropertyValue("FooterHeight") >>= aktFooterHeight; +mxPageProps->getPropertyValue("BottomMargin") >>= currentBottomMargin; +mxPageProps->getPropertyValue("FooterBodyDistance") >>= currentSpacing; +mxPageProps->getPropertyValue("FooterHeight") >>= currentFooterHeight; -sal_Int32 newSpacing = aktSpacing - ( newFooterDistance - aktBottomMargin ); -sal_Int32 height = aktFooterHeight - aktSpacing; +sal_Int32 newSpacing = currentSpacing - ( newFooterDistance - currentBottomMargin ); +sal_Int32 height = currentFooterHeight - currentSpacing; sal_Int32 newFooterHeight = newSpacing + height; mxPageProps->setPropertyValue("BottomMargin", uno::makeAny( newFooterDistance ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/doc.hxx |4 +-- sw/inc/swtable.hxx |4 +-- sw/source/core/doc/tblrwcl.cxx | 42 +++ sw/source/core/docnode/ndtbl.cxx |8 +++ 4 files changed, 29 insertions(+), 29 deletions(-) New commits: commit 499bff1f06b3a4660ff408a2bd54c64ad8fb5f05 Author: Johnny_M Date: Sat Feb 10 15:12:26 2018 +0100 Translate German variable names Akt -> Current in SwDoc and SwTable Change-Id: Ie8c5194b81e8dc5078616603215726a0a51b1617 Reviewed-on: https://gerrit.libreoffice.org/49537 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 7eb5bf067c5a..331132911936 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1254,7 +1254,7 @@ public: void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable ); -bool SetColRowWidthHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType, +bool SetColRowWidthHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eType, SwTwips nAbsDiff, SwTwips nRelDiff ); SwTableBoxFormat* MakeTableBoxFormat(); SwTableLineFormat* MakeTableLineFormat(); @@ -1262,7 +1262,7 @@ public: // helper function: cleanup before checking number value bool IsNumberFormat( const OUString& rString, sal_uInt32& F_Index, double& fOutNumber); // Check if box has numerical value. Change format of box if required. -void ChkBoxNumFormat( SwTableBox& rAktBox, bool bCallUpdate ); +void ChkBoxNumFormat( SwTableBox& rCurrentBox, bool bCallUpdate ); void SetTableBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet ); void ClearBoxNumAttrs( const SwNodeIndex& rNode ); void ClearLineNumAttrs( SwPosition const & rPos ); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index b41e9990f502..619d37dd432e 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -332,9 +332,9 @@ public: TableChgMode GetTableChgMode() const{ return m_eTableChgMode; } void SetTableChgMode( TableChgMode eMode ) { m_eTableChgMode = eMode; } -bool SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, +bool SetColWidth( SwTableBox& rCurrentBox, TableChgWidthHeightType eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); -bool SetRowHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType, +bool SetRowHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); void RegisterToFormat( SwFormat& rFormat ); #ifdef DBG_UTIL diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index e15078e58628..22df3ed0b8dc 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -84,8 +84,8 @@ struct CpyTabFrame } Value; SwTableBoxFormat *pNewFrameFormat; -explicit CpyTabFrame(SwFrameFormat* pAktFrameFormat) : pNewFrameFormat( nullptr ) -{ Value.pFrameFormat = pAktFrameFormat; } +explicit CpyTabFrame(SwFrameFormat* pCurrentFrameFormat) : pNewFrameFormat( nullptr ) +{ Value.pFrameFormat = pCurrentFrameFormat; } bool operator==( const CpyTabFrame& rCpyTabFrame ) const { return static_cast(Value.nSize) == static_cast(rCpyTabFrame.Value.nSize); } @@ -3302,19 +3302,19 @@ void CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ) { const SwTableBoxes& rBoxes = rLine.GetTabBoxes(); -SwTwips nAktSize = 0; +SwTwips nCurrentSize = 0; // See if the tables have a correct width for (SwTableBoxes::const_iterator i(rBoxes.begin()); i != rBoxes.end(); ++i) { const SwTableBox* pBox = *i; const SwTwips nBoxW = pBox->GetFrameFormat()->GetFrameSize().GetWidth(); -nAktSize += nBoxW; +nCurrentSize += nBoxW; for( auto pLn : pBox->GetTabLines() ) CheckBoxWidth( *pLn, nBoxW ); } -if (sal::static_int_cast< unsigned long >(std::abs(nAktSize - nSize)) > +if (sal::static_int_cast< unsigned long >(std::abs(nCurrentSize - nSize)) > (COLFUZZY * rBoxes.size())) { OSL_FAIL( "Line's Boxes are too small or too large" ); @@ -3370,7 +3370,7 @@ static FndBox_* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo, return pFndBox; } -bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, +bool SwTable::SetColWidth( SwTableBox& rCurrentBox, TableChgWidthHeightType eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ) { SetHTMLTableLayout(std::shared_ptr());// Delete HTML Layout @@ -3385,15 +3385,15 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, bLeft =
[Libreoffice-commits] core.git: editeng/source
editeng/source/rtf/svxrtf.cxx | 42 +- 1 file changed, 21 insertions(+), 21 deletions(-) New commits: commit c0a23843907c2b5dc6652e2bb337b12be6028356 Author: Johnny_M Date: Sat Feb 10 14:52:23 2018 +0100 Translate German variable names Akt -> Current in rtf (svxrtf) Change-Id: I5205654ec3b3d5dd1a7a611dc8f2e356a6290fc6 Reviewed-on: https://gerrit.libreoffice.org/49535 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 297320a5658e..67bc1ce7bfe5 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -613,10 +613,10 @@ const vcl::Font& SvxRTFParser::GetFont( sal_uInt16 nId ) SvxRTFItemStackType* SvxRTFParser::GetAttrSet_() { -SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back(); +SvxRTFItemStackType* pCurrent = aAttrStack.empty() ? nullptr : aAttrStack.back(); SvxRTFItemStackType* pNew; -if( pAkt ) -pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, false/*bCopyAttr*/ ); +if( pCurrent ) +pNew = new SvxRTFItemStackType( *pCurrent, *pInsPos, false/*bCopyAttr*/ ); else pNew = new SvxRTFItemStackType( *pAttrPool, &aWhichMap[0], *pInsPos ); @@ -678,7 +678,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack { SvxRTFItemStackType *pOld = aAttrStack.empty() ? nullptr : aAttrStack.back(); aAttrStack.pop_back(); -SvxRTFItemStackType *pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back(); +SvxRTFItemStackType *pCurrent = aAttrStack.empty() ? nullptr : aAttrStack.back(); do {// middle check loop sal_Int32 nOldSttNdIdx = pOld->pSttNd->GetIdx(); @@ -689,13 +689,13 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack break; // no attributes or Area // set only the attributes that are different from the parent -if( pAkt && pOld->aAttrSet.Count() ) +if( pCurrent && pOld->aAttrSet.Count() ) { SfxItemIter aIter( pOld->aAttrSet ); const SfxPoolItem* pItem = aIter.GetCurItem(), *pGet; while( true ) { -if( SfxItemState::SET == pAkt->aAttrSet.GetItemState( +if( SfxItemState::SET == pCurrent->aAttrSet.GetItemState( pItem->Which(), false, &pGet ) && *pItem == *pGet ) pOld->aAttrSet.ClearItem( pItem->Which() ); @@ -768,10 +768,10 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack ClearStyleAttr_( *pNew ); //#i10381#, methinks. } -if( pAkt ) +if( pCurrent ) { - pAkt->Add(std::unique_ptr(pOld)); -pAkt->Add(std::move(pNew)); + pCurrent->Add(std::unique_ptr(pOld)); +pCurrent->Add(std::move(pNew)); } else { @@ -792,23 +792,23 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack /* #i21422# -If the parent (pAkt) sets something e.g. , and the child (pOld) +If the parent (pCurrent) sets something e.g. , and the child (pOld) unsets it and the style both are based on has it unset then clearing the pOld by looking at the style is clearly a disaster -as the text ends up with pAkts bold and not pOlds no bold, this +as the text ends up with pCurrents bold and not pOlds no bold, this should be rethought out. For the moment its safest to just do the clean if we have no parent, all we suffer is too many redundant properties. */ -if (IsChkStyleAttr() && !pAkt) +if (IsChkStyleAttr() && !pCurrent) ClearStyleAttr_( *pOld ); -if( pAkt ) +if( pCurrent ) { -pAkt->Add(std::unique_ptr(pOld)); +pCurrent->Add(std::unique_ptr(pOld)); // split up and create new entry, because it make no sense // to create a "so long" depend list. Bug 95010 -if (bCrsrBack && 50 < pAkt->m_pChildList->size()) +if (bC
[Libreoffice-commits] core.git: editeng/source
editeng/source/rtf/rtfitem.cxx | 68 - 1 file changed, 34 insertions(+), 34 deletions(-) New commits: commit 8f05a01befe393a40fe828bbab90c6d8eaf6c959 Author: Johnny_M Date: Sat Feb 10 13:58:06 2018 +0100 Translate German variable names Akt -> Current in rtf (rtfitem) Change-Id: I5925295c45d436c07e75b82cc0effea962bc1816 Reviewed-on: https://gerrit.libreoffice.org/49534 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 7d6cbc6fa8f9..be516bbcd4ef 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -214,36 +214,36 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) if( !bChkStkPos ) break; -SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back(); -if( !pAkt || (pAkt->pSttNd->GetIdx() == pInsPos->GetNodeIdx() && -pAkt->nSttCnt == pInsPos->GetCntIdx() )) +SvxRTFItemStackType* pCurrent = aAttrStack.empty() ? nullptr : aAttrStack.back(); +if( !pCurrent || (pCurrent->pSttNd->GetIdx() == pInsPos->GetNodeIdx() && +pCurrent->nSttCnt == pInsPos->GetCntIdx() )) break; int nLastToken = GetStackPtr(-1)->nTokenId; if( RTF_PARD == nLastToken || RTF_PLAIN == nLastToken ) break; -if (pAkt->aAttrSet.Count() || pAkt->m_pChildList || -pAkt->nStyleNo ) +if (pCurrent->aAttrSet.Count() || pCurrent->m_pChildList || +pCurrent->nStyleNo ) { // Open a new Group SvxRTFItemStackType* pNew = new SvxRTFItemStackType( -*pAkt, *pInsPos, true ); +*pCurrent, *pInsPos, true ); pNew->SetRTFDefaults( GetRTFDefaults() ); // "Set" all valid attributes up until this point AttrGroupEnd(); -pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back(); // can be changed after AttrGroupEnd! -pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : nullptr ); +pCurrent = aAttrStack.empty() ? nullptr : aAttrStack.back(); // can be changed after AttrGroupEnd! +pNew->aAttrSet.SetParent( pCurrent ? &pCurrent->aAttrSet : nullptr ); aAttrStack.push_back( pNew ); -pAkt = pNew; +pCurrent = pNew; } else // continue to use this entry as a new one -pAkt->SetStartPos( *pInsPos ); +pCurrent->SetStartPos( *pInsPos ); -pSet = &pAkt->aAttrSet; +pSet = &pCurrent->aAttrSet; } while( false ); switch( nToken ) @@ -268,11 +268,11 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) { sal_uInt16 nStyleNo = -1 == nTokenValue ? 0 : sal_uInt16(nTokenValue); // set StyleNo to the current style on the AttrStack -SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back(); -if( !pAkt ) +SvxRTFItemStackType* pCurrent = aAttrStack.empty() ? nullptr : aAttrStack.back(); +if( !pCurrent ) break; -pAkt->nStyleNo = nStyleNo; +pCurrent->nStyleNo = nStyleNo; } break; @@ -1689,7 +1689,7 @@ void SvxRTFParser::RTFPardPlain( bool const bPard, SfxItemSet** ppSet ) { if( !bNewGroup && !aAttrStack.empty() ) // not at the beginning of a new group { -SvxRTFItemStackType* pAkt = aAttrStack.back(); +SvxRTFItemStackType* pCurrent = aAttrStack.back(); int nLastToken = GetStackPtr(-1)->nTokenId; bool bNewStkEntry = true; @@ -1697,30 +1697,30 @@ void SvxRTFParser::RTFPardPlain( bool const bPard, SfxItemSet** ppSet ) RTF_PLAIN != nLastToken && BRACELEFT != nLastToken ) { -if (pAkt->aAttrSet.Count() || pAkt->m_pChildList || pAkt->nStyleNo) +if (pCurrent->aAttrSet.Count() || pCurrent->m_pChildList || pCurrent->nStyleNo) { // open a new group -SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, true ); +SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pCurrent
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excform.cxx | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 980de246715c95b6961367baf409c270dab58bc0 Author: Johnny_M Date: Sat Feb 10 13:49:55 2018 +0100 Translate German variable names Fakt -> Factor in Excel filter (excform) Change-Id: Id93e2722e4f40cf2916d2abb3684d3570b88fce3 Reviewed-on: https://gerrit.libreoffice.org/49531 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index aa1b71f2f546..499c315baf26 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -378,7 +378,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pResult, XclImpStream& aIn, std } case 0x19: // Special Attribute [327 279] { -sal_uInt16 nData(0), nFakt(0); +sal_uInt16 nData(0), nFactor(0); sal_uInt8 nOpt(0); nOpt = aIn.ReaduInt8(); @@ -386,19 +386,19 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pResult, XclImpStream& aIn, std if( meBiff == EXC_BIFF2 ) { nData = aIn.ReaduInt8(); -nFakt = 1; +nFactor = 1; } else { nData = aIn.ReaduInt16(); -nFakt = 2; +nFactor = 2; } if( nOpt & 0x04 ) { -// nFakt -> skip bytes or wordsAttrChoose +// nFactor -> skip bytes or wordsAttrChoose ++nData; -aIn.Ignore(static_cast(nData) * nFakt); +aIn.Ignore(static_cast(nData) * nFactor); } else if( nOpt & 0x10 ) // AttrSum DoMulArgs( ocSum, 1 ); @@ -970,7 +970,7 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, std: break; case 0x19: // Special Attribute [327 279] { -sal_uInt16 nData(0), nFakt(0); +sal_uInt16 nData(0), nFactor(0); sal_uInt8 nOpt(0); nOpt = aIn.ReaduInt8(); @@ -978,19 +978,19 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, std: if( meBiff == EXC_BIFF2 ) { nData = aIn.ReaduInt8(); -nFakt = 1; +nFactor = 1; } else { nData = aIn.ReaduInt16(); -nFakt = 2; +nFactor = 2; } if( nOpt & 0x04 ) { -// nFakt -> skip bytes or wordsAttrChoose +// nFactor -> skip bytes or wordsAttrChoose ++nData; -aIn.Ignore(static_cast(nData) * nFakt); +aIn.Ignore(static_cast(nData) * nFactor); } } break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/ndtxt.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 965527d76bc233b65795a5203029a65e28773e3b Author: Johnny_M Date: Sat Feb 17 14:48:49 2018 +0100 Translate German variable names Akt -> Current in txtnode Change-Id: I5f8c615c0caf96d51077aba5b27ee68bbe6f3b72 Reviewed-on: https://gerrit.libreoffice.org/49902 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 67c8a8975485..a442be331735 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -2034,10 +2034,10 @@ OUString SwTextNode::InsertText( const OUString & rStr, const SwIndex & rIdx, && (*pEndIdx == pHt->GetStart()) ) { pHt->GetStart() = pHt->GetStart() - nLen; -const size_t nAktLen = m_pSwpHints->Count(); +const size_t nCurrentLen = m_pSwpHints->Count(); m_pSwpHints->DeleteAtPos(i); InsertHint( pHt/* AUTOSTYLES:, SetAttrMode::NOHINTADJUST*/ ); -if ( nAktLen > m_pSwpHints->Count() && i ) +if ( nCurrentLen > m_pSwpHints->Count() && i ) { --i; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ascii/ascatr.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 70eedc8d664433d4f101f59bd4782e542836d3f7 Author: Johnny_M Date: Sat Feb 17 14:45:50 2018 +0100 Translate German variable names Akt -> Current in ascii filter Change-Id: I05637a65632b15b1ec0e0860bff15651dc25a8c4 Reviewed-on: https://gerrit.libreoffice.org/49899 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx index 175572133d79..f0b2c1e7dac6 100644 --- a/sw/source/filter/ascii/ascatr.cxx +++ b/sw/source/filter/ascii/ascatr.cxx @@ -47,7 +47,7 @@ class SwASC_AttrIter { SwASCWriter& rWrt; const SwTextNode& rNd; -sal_Int32 nAktSwPos; +sal_Int32 nCurrentSwPos; sal_Int32 SearchNext( sal_Int32 nStartPos ); @@ -56,12 +56,12 @@ public: void NextPos() { -nAktSwPos = SearchNext( nAktSwPos + 1 ); +nCurrentSwPos = SearchNext( nCurrentSwPos + 1 ); } sal_Int32 WhereNext() const { -return nAktSwPos; +return nCurrentSwPos; } bool OutAttr( sal_Int32 nSwPos ); @@ -73,9 +73,9 @@ SwASC_AttrIter::SwASC_AttrIter( sal_Int32 nStt ) : rWrt( rWr ) , rNd( rTextNd ) -, nAktSwPos( 0 ) +, nCurrentSwPos( 0 ) { -nAktSwPos = SearchNext( nStt + 1 ); +nCurrentSwPos = SearchNext( nStt + 1 ); } sal_Int32 SwASC_AttrIter::SearchNext( sal_Int32 nStartPos ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/svrtf/svparser.cxx | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 4c3fc27ee68d9e4581f8131ba8eaa7d0c640cbda Author: Johnny_M Date: Sat Feb 17 14:21:31 2018 +0100 Translate German variable names Akt -> Current in svparser Change-Id: I6c883a7690ca518ea773a08ab093d5db323122f5 Reviewed-on: https://gerrit.libreoffice.org/49901 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index c6d59c08eb04..4ba540ce96d9 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -517,28 +517,28 @@ T SvParser::SkipToken( short nCnt ) // "skip" n Tokens backward template typename SvParser::TokenStackType* SvParser::GetStackPtr( short nCnt ) { -sal_uInt8 nAktPos = sal_uInt8(pTokenStackPos - pTokenStack ); +sal_uInt8 nCurrentPos = sal_uInt8(pTokenStackPos - pTokenStack ); if( nCnt > 0 ) { if( nCnt >= nTokenStackSize ) nCnt = (nTokenStackSize-1); -if( nAktPos + nCnt < nTokenStackSize ) -nAktPos = sal::static_int_cast< sal_uInt8 >(nAktPos + nCnt); +if( nCurrentPos + nCnt < nTokenStackSize ) +nCurrentPos = sal::static_int_cast< sal_uInt8 >(nCurrentPos + nCnt); else -nAktPos = sal::static_int_cast< sal_uInt8 >( -nAktPos + (nCnt - nTokenStackSize)); +nCurrentPos = sal::static_int_cast< sal_uInt8 >( +nCurrentPos + (nCnt - nTokenStackSize)); } else if( nCnt < 0 ) { if( -nCnt >= nTokenStackSize ) nCnt = -nTokenStackSize+1; -if( -nCnt <= nAktPos ) -nAktPos = sal::static_int_cast< sal_uInt8 >(nAktPos + nCnt); +if( -nCnt <= nCurrentPos ) +nCurrentPos = sal::static_int_cast< sal_uInt8 >(nCurrentPos + nCnt); else -nAktPos = sal::static_int_cast< sal_uInt8 >( -nAktPos + (nCnt + nTokenStackSize)); +nCurrentPos = sal::static_int_cast< sal_uInt8 >( +nCurrentPos + (nCnt + nTokenStackSize)); } -return pTokenStack + nAktPos; +return pTokenStack + nCurrentPos; } // to read asynchronous from SvStream ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits