from:"Phillip Sz"

[Libreoffice-commits] core.git: bin/find-german-comments

2016-05-30 Thread Phillip Sz

 bin/find-german-comments |   74 ---
 1 file changed, 38 insertions(+), 36 deletions(-)

New commits:
commit 88c03cd07a171e05c7fb4dcade8baa28e7c5a770
Author: Phillip Sz <phillip.sze...@gmail.com>
Date:   Sun May 29 13:49:39 2016 +0200

find-german-comments: clean up

Most of these syntax changes are found by pylint. Also:

 - Use argparse instead of optparse, which is deprecated
 - Fix a bug where we tried to multiply by float, which does not work

Change-Id: I7de5a29bd431755e6c28a8bc80b804c775a0c2cb
Reviewed-on: https://gerrit.libreoffice.org/25669
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>

diff --git a/bin/find-german-comments b/bin/find-german-comments
index 0a9c0f0..40b4c9b 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -27,7 +27,12 @@
 
 
 
-import sys, re, subprocess, os, optparse, string
+import sys
+import re
+import subprocess
+import os
+import argparse
+import string
 
 class Parser:
 """
@@ -37,34 +42,28 @@ class Parser:
 def __init__(self):
 self.strip = string.punctuation + " \n"
 self.text_cat = self.start_text_cat()
-op = optparse.OptionParser()
-op.set_usage("%prog [options] \n\n" +
-"Searches for german comments in cxx/hxx source files inside a 
given root\n" +
-"directory recursively.")
-op.add_option("-f", "--filenames-only", action="store_true", 
dest="filenames_only", default=False,
+parser = argparse.ArgumentParser(description='Searches for german 
comments in cxx/hxx source files inside a given root directory recursively.')
+parser.add_argument("-f", "--filenames-only", action="store_true",
 help="Only print the filenames of files containing German 
comments")
-op.add_option("-v", "--verbose", action="store_true", dest="verbose", 
default=False,
+parser.add_argument("-v", "--verbose", action="store_true",
 help="Turn on verbose mode (print only positives progress to 
stderr)")
-op.add_option("-l", "--line-numbers", action="store_true", 
dest="line_numbers", default=False,
+parser.add_argument("-l", "--line-numbers", action="store_true",
 help="Prints the filenames and line numbers only.")
-op.add_option("-L", "--line-numbers-pos", action="store_true", 
dest="line_numbers_pos", default=False,
+parser.add_argument("-L", "--line-numbers-pos", action="store_true",
 help="Prints the filenames and line numbers only (if positive).")
-op.add_option("-t", "--threshold", action="store", dest="THRESHOLD", 
default=0,
+parser.add_argument("-t", "--threshold", action="store", default=0, 
type=int,
 help="When used with '--line-numbers', only bothers outputting 
comment info if there are more than X number of flagged comments. Useful for 
weeding out false positives.")
-self.options, args = op.parse_args()
-try:
-dir = args[0]
-except IndexError:
-dir = "."
-self.check_source_files(dir)
+parser.add_argument("directory", nargs='?', default='.', type=str, 
help='Give a directory to search in')
+self.args = parser.parse_args()
+self.check_source_files(self.args.directory)
 
 def get_comments(self, filename):
 """
 Extracts the source code comments.
 """
 linenum = 0
-if self.options.verbose:
-sys.stderr.write("processing file '%s'...\n" % filename)
+if self.args.verbose:
+print("processing file '%s'...\n" % filename)
 sock = open(filename)
 # add an empty line to trigger the output of collected oneliner
 # comment group
@@ -146,39 +145,39 @@ class Parser:
 s = s.replace('\n', ' ')
 if len(s) < 32 or len(s.split()) < 4:
 return False
-return b"german" == self.get_lang(s)
+return self.get_lang(s) == b"german"
 
 def check_file(self, path):
 """
 checks each comment in a file
 """
-def tab_calc (string):
+def tab_calc(path):
 START = 40 #Default of 10 tabs
-if len(

[Libreoffice-commits] core.git: bin/find-german-comments

2016-05-27 Thread Phillip Sz

 bin/find-german-comments |   48 +--
 1 file changed, 34 insertions(+), 14 deletions(-)

New commits:
commit 02b666c4770b4a4c7a5bb5dba9c3738515921e00
Author: Phillip Sz <phillip.sze...@gmail.com>
Date:   Thu May 26 21:30:02 2016 +0200

find-german-comments: enable scanning subdirs

This makes it possible to scan sub directories, when you give them
as arguments to the script.

Also update the directory_whitelist.

Change-Id: I0a8468348fffe0814905d6f5602fad3f8d6b69e3
Reviewed-on: https://gerrit.libreoffice.org/25523
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/bin/find-german-comments b/bin/find-german-comments
index 86dfe547..0a9c0f0 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -224,12 +224,27 @@ class Parser:
 """
 checks each _tracked_ file in a directory recursively
 """
-sock = os.popen(r"git ls-files '%s' |egrep 
'\.(c|cc|cpp|cxx|h|hxx|mm)$'" % directory)
+globalscan = False
+if re.match(r'.*/core$', os.getcwd()) and directory == '.':
+globalscan = True
+
+# Change into the given dir, so "git ls-tree" does work.
+# If we want to scan the current dir, we must not do so as we are 
already there.
+if not globalscan and directory != '.':
+currentdir = os.getcwd()
+os.chdir(currentdir.split("core",1)[0] + "core/")
+os.chdir(directory)
+
+sock = os.popen(r"git ls-tree -r HEAD --name-only |egrep 
'\.(c|cc|cpp|cxx|h|hxx|mm)$'")
 lines = sock.readlines()
 sock.close()
 
 # Helps to speedup a global scan
 directory_whitelist = {
+"ure" : 1,
+"ios" : 1,
+"bean" : 1,
+"apple_remote" : 1,
 "UnoControls" : 1,
 "accessibility" : 1,
 "android" : 1,
@@ -351,26 +366,31 @@ class Parser:
 "xmlscript" : 1,
 }
 
-if directory is '.':
-sys.stderr.write("Overriding the white-list for the current 
directory - pass an absolute path to the top-level for faster global white-list 
searches.\n")
+if globalscan:
+print("Scanning all files globally:")
+elif directory == '.':
+print("Scanning all files in our current directory:")
+else:
+print("Scanning all files in", directory + ":")
 
 num_checked = 0
 
 for path in lines:
 baseDir = self.first_elem(path)
-
-# Support searching within sub directories
-if directory is '.':
-self.check_file(path.strip())
-elif not baseDir in directory_whitelist:
-sys.stderr.write ("\n - Error: Missing path %s -\n\n" % 
baseDir)
-sys.exit(1)
-elif directory_whitelist[baseDir] is 0:
+# If we have an globalscan use the whitelist.
+if globalscan:
+if not baseDir in directory_whitelist:
+sys.stderr.write ("\n - Error: Missing path %s -\n\n" % 
baseDir)
+sys.exit(1)
+elif directory_whitelist[baseDir] is 0:
+self.check_file(path.strip())
+num_checked = num_checked + 1
+elif directory_whitelist[baseDir] is 1:
+sys.stderr.write ("Skipping whitelisted directory %s\n" % 
baseDir)
+directory_whitelist[baseDir] = 2
+elif not globalscan:
 self.check_file(path.strip())
 num_checked = num_checked + 1
-elif directory_whitelist[baseDir] is 1:
-sys.stderr.write ("Skipping whitelisted directory %s\n" % 
baseDir)
-directory_whitelist[baseDir] = 2
 
 sys.stderr.write ("Scanned %s files\n" % num_checked)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/find-german-comments

2016-05-18 Thread Phillip Sz

 bin/find-german-comments |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1dec3cb29bd7ec028d6b2139d0199225b5cf5d67
Author: Phillip Sz <phillip.sze...@gmail.com>
Date:   Wed May 18 11:38:53 2016 +0200

find-german-comments: let's use python 3

Under python 3 we must use bytes.

Change-Id: I86d2a875f4e06a9cb9724d86348f420bb8ea19e9
Reviewed-on: https://gerrit.libreoffice.org/25084
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/bin/find-german-comments b/bin/find-german-comments
index 53dbd1d..86dfe547 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 #
 #  Copyright (c) 2010 Jonas Jensen, Miklos Vajna
@@ -131,8 +131,8 @@ class Parser:
 unsure, just don't warn, there are strings where you just can't
 teremine the results reliably, like '#110680#' """
 
-self.text_cat.stdin.write(s)
-self.text_cat.stdin.write("\n")
+self.text_cat.stdin.write(bytes(s, 'utf-8'))
+self.text_cat.stdin.write(bytes("\n", 'utf-8'))
 self.text_cat.stdin.flush()
 lang = self.text_cat.stdout.readline().strip()
 return lang
@@ -146,7 +146,7 @@ class Parser:
 s = s.replace('\n', ' ')
 if len(s) < 32 or len(s.split()) < 4:
 return False
-return "german" == self.get_lang(s)
+return b"german" == self.get_lang(s)
 
 def check_file(self, path):
 """
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/find-german-comments

2016-05-18 Thread Phillip Sz

 bin/find-german-comments |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 95fecb5f6df6e7be917cc7cd14fe705b4a08a21d
Author: Phillip Sz <phillip.sze...@gmail.com>
Date:   Tue May 17 16:44:50 2016 +0200

find-german-comments: make it work on arch

Make this script work on systems, where python3 is default.
Also give it a better coding style.

Change-Id: I09bf72298c2a736266f1bdfc8572cc3e65d7d3d9
Reviewed-on: https://gerrit.libreoffice.org/25068
Tested-by: jan iversen <j...@documentfoundation.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/bin/find-german-comments b/bin/find-german-comments
index b067d9d..53dbd1d 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 #
 #  Copyright (c) 2010 Jonas Jensen, Miklos Vajna
@@ -177,7 +177,7 @@ class Parser:
 sys.stderr.write("%s ... %s positives\n" % (path, 
str(len(path_linenums
 return
 if len(path) + (len(path_linenums)*4) > 75:
-print "%s:\n" % path
+print("%s:\n" % path)
 while(path_linenums):
 i = 0
 numline = []
@@ -189,16 +189,16 @@ class Parser:
 i = 10
 i += 1
 numline = [str(i) for i in numline]
-print "%s%s" % (TABS, ",".join(numline))
+print("%s%s" % (TABS, ",".join(numline)))
 else:
 if self.options.line_numbers:
 path_linenums = [str(i) for i in path_linenums]
-print "%s:%s%s" % (path, "\t"*tab_calc(path), 
",".join(path_linenums))
+print("%s:%s%s" % (path, "\t"*tab_calc(path), 
",".join(path_linenums)))
 
 elif not self.options.filenames_only:
 for linenum, s in self.get_comments(path):
 if self.is_german(s):
-print "%s:%s: %s" % (path, linenum, s)
+print("%s:%s: %s" % (path, linenum, s))
 else:
 fnames = set([])
 for linenum, s in self.get_comments(path):
@@ -207,7 +207,7 @@ class Parser:
 fnames.add(path)
 # Print the filenames
 for f in fnames:
-print f
+print(f)
 
 def first_elem(self, path):
 lastElem = os.path.dirname(path)
@@ -377,7 +377,7 @@ class Parser:
 try:
 Parser()
 except KeyboardInterrupt:
-print "Interrupted!"
+print("Interrupted!")
 sys.exit(0)
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2015-08-11 Thread Phillip Sz

 sc/source/core/data/formulacell.cxx |2 +-
 sc/source/core/data/table2.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6385c8e83758f14757ed73ffce703d8ba9d5c1e6
Author: Phillip Sz phillip.sze...@gmail.com
Date:   Thu Aug 6 17:56:17 2015 +0200

tdf#39468 Translate German Comments - sc/source/core/data/

With work from Christian M. Heller christian.helle...@gmail.com

rebased it to make it possible to merge

Change-Id: Ib018fe94513a3b987bb992d86e4597612b44894f
Reviewed-on: https://gerrit.libreoffice.org/14866
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index ec9b4ff..e02c3cc 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2273,7 +2273,7 @@ void ScFormulaCell::AddRecalcMode( ScRecalcMode nBits )
 if ( (nBits  RECALCMODE_EMASK) != ScRecalcMode::NORMAL )
 SetDirtyVar();
 if ( nBits  ScRecalcMode::ONLOAD_ONCE )
-{   // OnLoadOnce nur zum Dirty setzen nach Filter-Import
+{   // OnLoadOnce is used only to set Dirty after filter import.
 nBits = (nBits  ~RECALCMODE_EMASK) | ScRecalcMode::NORMAL;
 }
 pCode-AddRecalcMode( nBits );
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 2ba437d..1a580f1 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3093,7 +3093,7 @@ void ScTable::DBShowRow(SCROW nRow, bool bShow)
 {
 if (ValidRow(nRow)  pRowFlags)
 {
-//  Always set Filter-Flag, also unchanged when Hidden
+//  Always set filter flag; unchanged when Hidden
 bool bChanged = SetRowHidden(nRow, nRow, !bShow);
 SetRowFiltered(nRow, nRow, !bShow);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

2015-08-07 Thread Phillip Sz

 sw/source/filter/ww8/ww8scan.cxx |  348 +++
 1 file changed, 171 insertions(+), 177 deletions(-)

New commits:
commit 6d3b26829b5f30ea934249ef88eb10b2507969f1
Author: Phillip Sz phillip.sze...@gmail.com
Date:   Wed Aug 5 23:10:29 2015 +0200

tdf#39468 Translate German Comments - sw/source/filter/ww8/ww8scan.cxx

Change-Id: I843c26ad7594935d53b5cac90534a0ed3e55f40b
Reviewed-on: https://gerrit.libreoffice.org/17530
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 174f7f0..6c1c600 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1511,13 +1511,13 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* 
pStr, const WW8Fib* pWwF )
 if (!checkSeek(*pStr, nClxPos))
 return NULL;
 
-while( true ) // Zaehle Zahl der Grpprls
+while( true ) // count number of Grpprls
 {
 sal_uInt8 clxt(2);
 pStr-ReadUChar( clxt );
 nLeft--;
 if( 2 == clxt ) // PLCFfpcd ?
-break;  // PLCFfpcd gefunden
+break;  // PLCFfpcd found
 if( 1 == clxt ) // clxtGrpprl ?
 {
 if (nGrpprl == SHRT_MAX)
@@ -1529,7 +1529,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* 
pStr, const WW8Fib* pWwF )
 nLeft -= 2 + nLen;
 if( nLeft  0 )
 return NULL;// gone wrong
-pStr-SeekRel( nLen );  // ueberlies grpprl
+pStr-SeekRel( nLen );  // ignore grpprl
 }
 
 if (!checkSeek(*pStr, nClxPos))
@@ -1557,18 +1557,18 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* 
pStr, const WW8Fib* pWwF )
 if (nLen  pStr-remainingSize())
 return NULL;
 sal_uInt8* p = new sal_uInt8[nLen+2]; // allocate
-ShortToSVBT16(nLen, p); // trage Laenge ein
+ShortToSVBT16(nLen, p); // add length
 if (!checkRead(*pStr, p+2, nLen))   // read grpprl
 {
 delete[] p;
 return NULL;
 }
-pPieceGrpprls[nAktGrpprl++] = p;// trage in Array ein
+pPieceGrpprls[nAktGrpprl++] = p;// add to array
 }
 else
-pStr-SeekRel( nLen );  // ueberlies nicht-Grpprl
+pStr-SeekRel( nLen );  // non-Grpprl left
 }
-// lies Piece Table PLCF ein
+// read Piece Table PLCF
 sal_Int32 nPLCFfLen(0);
 if (pWwF-GetFIBVersion() = ww::eWW2)
 {
@@ -1761,7 +1761,6 @@ WW8ScannerBase::~WW8ScannerBase()
 delete pSepPLCF;
 delete pPapPLCF;
 delete pChpPLCF;
-// vergessene Schaeflein
 delete pMainFdoa;
 delete pHdFtFdoa;
 delete pMainTxbx;
@@ -4050,17 +4049,19 @@ long WW8PLCFx_Book::GetNoSprms( WW8_CP rStart, WW8_CP 
rEnd, sal_Int32 rLen )
 return pBook[nIsEnd]-GetIdx();
 }
 
-// Der Operator ++ hat eine Tuecke: Wenn 2 Bookmarks aneinandergrenzen, dann
-// sollte erst das Ende des ersten und dann der Anfang des 2. erreicht werden.
-// Liegen jedoch 2 Bookmarks der Laenge 0 aufeinander, *muss* von jedem 
Bookmark
-// erst der Anfang und dann das Ende gefunden werden.
-// Der Fall: ][
-//[...]
-//   ][
-// ist noch nicht geloest, dabei muesste ich in den Anfangs- und Endindices
-// vor- und zurueckspringen, wobei ein weiterer Index oder ein Bitfeld
-// oder etwas aehnliches zum Merken der bereits abgearbeiteten Bookmarks
-// noetig wird.
+// The operator ++ has a pitfall: If 2 bookmarks adjoin each other,
+// we should first go to the end of the first one
+// and then to the beginning of the second one.
+// But if 2 bookmarks with the length of 0 lie on top of each other,
+// we *must* first find the start and end of each bookmark.
+// The case of: ][
+//   [...]
+//  ][
+// is not solved yet.
+// Because I must jump back and forth in the start- and end-indices then.
+// This would require one more index or bitfield to remember
+// the already processed bookmarks.
+
 void WW8PLCFx_Book::advance()
 {
 if( pBook[0]  pBook[1]  nIMax )
@@ -4353,9 +4354,9 @@ bool WW8PLCFx_AtnBook::getIsEnd() const
 
 #ifndef DUMP
 
-// Am Ende eines Absatzes reichen bei WW6 die Attribute bis hinter das CR.
-// Das wird fuer die Verwendung mit dem SW um 1 Zeichen zurueckgesetzt, wenn
-// dadurch kein AErger zu erwarten ist.
+// In the end of an paragraph in WW6 the attribute extends behind the CR.
+// This will be reset by one character to be used with SW,
+// if we don't expect trouble thereby.
 void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc rDesc )
 {
 //Store old end position for supercool new property finder that uses
@@ -4377,20 +4378,20 @@ void

[Libreoffice-commits] core.git: sw/source

2015-07-16 Thread Phillip Sz

 sw/source/filter/xml/xmlexp.cxx  |2 +-
 sw/source/filter/xml/xmlfmte.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ea6261a9db25e8bf68ac5729ff04807f85536dca
Author: Phillip Sz phillip.sze...@gmail.com
Date:   Wed Jul 15 15:27:49 2015 +0200

tdf#39468 Translate German Comments - sw/source/filter/xml/

Change-Id: Ie637ef4258caf2519a77d596b76cc52570a182e8
Reviewed-on: https://gerrit.libreoffice.org/17077
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com

diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index f167e98..43125f9 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -233,7 +233,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass 
)
 
 if( getExportFlags()  
(SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT))
 {
-//Auf die Korrektheit der OrdNums sind wir schon angewiesen.
+//We depend on the correctness of OrdNums.
 SwDrawModel* pModel = 
pDoc-getIDocumentDrawModelAccess().GetDrawModel();
 if( pModel )
 pModel-GetPage( 0 )-RecalcObjOrdNums();
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index e9f72cf..e036570 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -69,7 +69,7 @@ void SwXMLExport::ExportFormat( const SwFormat rFormat, enum 
XMLTokenEnum eFami
 #if OSL_DEBUG_LEVEL  0
 // style:parent-style-name=... (if its not the default only)
 const SwFormat* pParent = rFormat.DerivedFrom();
-// Parent-Namen nur uebernehmen, wenn kein Default
+// Only adopt parent name, if it's not the default
 OSL_ENSURE( !pParent || pParent-IsDefault(), unexpected parent );
 
 OSL_ENSURE( USHRT_MAX == rFormat.GetPoolFormatId(), pool ids 
arent'supported );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

2015-07-03 Thread Phillip Sz

 filter/source/graphicfilter/eps/eps.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 918d3e30d7ff91387d9de55156a4c1364cc7b58c
Author: Phillip Sz phillip.sze...@gmail.com
Date:   Thu Jul 2 20:55:58 2015 +0200

tdf#39468 Translate German Comments - 
filter/source/graphicfilter/eps/eps.cxx

Change-Id: Id86b7082b17a4cd702d6ab92fbeaa9ec8288d14a
Reviewed-on: https://gerrit.libreoffice.org/16715
Reviewed-by: Daniel L. Robertson danlrobertso...@gmail.com
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/filter/source/graphicfilter/eps/eps.cxx 
b/filter/source/graphicfilter/eps/eps.cxx
index a3b4dc8..38460b9 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::uno;
 #define PS_RET  2
 #define PS_WRAP 4
 
-// -Feld-Typen---
+// -field-types--
 
 struct ChrSet
 {
@@ -240,7 +240,7 @@ public:
 ~PSWriter();
 };
 
-//== Methoden von PSWriter ==
+//== methods from PSWriter ==
 
 
 
@@ -2221,7 +2221,7 @@ void PSWriter::ImplSetAttrForText( const Point rPoint )
 mpPS-WriteCharPtr( sf  );
 }
 if ( eTextAlign != ALIGN_BASELINE )
-{   // PostScript 
kennt kein FontAlignment
+{   // PostScript does 
not know about FontAlignment
 if ( eTextAlign == ALIGN_TOP )  // - so I assume 
that
 aPoint.Y() += ( aSize.Height() * 4 / 5 );   // the area under 
the baseline
 else if ( eTextAlign == ALIGN_BOTTOM )  // is about 20% of 
the font size
@@ -2845,7 +2845,7 @@ bool PSWriter::ImplGetBoundingBox( double* nNumb, 
sal_uInt8* pSource, sal_uLong
 return bRetValue;
 }
 
-//== GraphicExport - die exportierte Funktion 
+//== GraphicExport - the exported function ===
 
 // this needs to be kept in sync with
 // ImpFilterLibCacheEntry::GetImportFunction() from
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scaddins/source

2015-06-29 Thread Phillip Sz

 scaddins/source/analysis/analysishelper.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 4ccb0fb9eb9fa8cebb187cc990a77bc85a826027
Author: Phillip Sz phillip.sze...@gmail.com
Date:   Fri Jun 26 20:25:05 2015 +0200

tdf#39468 Translate German Comments - scaddins/

Change-Id: I95ea40b1b349f03e8ce45906a50e18f7a95ca5e9
Reviewed-on: https://gerrit.libreoffice.org/16525
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index f5cd27c..8c1e891 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1001,7 +1001,7 @@ double GetAmordegrc( sal_Int32 nNullDate, double fCost, 
sal_Int32 nDate, sal_Int
 fRate *= fAmorCoeff;
 double  fNRate = ::rtl::math::round( GetYearFrac( nNullDate, nDate, 
nFirstPer, nBase ) * fRate * fCost, 0 );
 fCost -= fNRate;
-double  fRest = fCost - fRestVal;   // Anschaffungskosten - Restwert - 
Summe aller Abschreibungen
+double  fRest = fCost - fRestVal;   // aboriginal cost - residual 
value - sum of all write-downs
 
 for( sal_uInt32 n = 0 ; n  nPer ; n++ )
 {
@@ -2459,7 +2459,7 @@ ConvertDataList::ConvertDataList()
 
 // ENERGY: 1 Joule is...
 NEWDP( J, 1.E00,  CDC_Energy ); // Joule
-NEWDP( e, 1.E07,  CDC_Energy ); // Erg  - 
http://www.chemie.fu-berlin.de/chemistry/general/si.html
+NEWDP( e, 1.E07,  CDC_Energy ); // Erg  - 
https://en.wikipedia.org/wiki/Erg
 NEWDP( c, 2.3900624947346700E-01, CDC_Energy ); // Thermodynamical 
Calorie
 NEWDP( cal,   2.3884619064201700E-01, CDC_Energy ); // Calorie
 NEWDP( eV,6.24145700E18,  CDC_Energy ); // Electronvolt
@@ -2545,7 +2545,6 @@ ConvertDataList::ConvertDataList()
 NEWD( us_acre,2.4710439304662790E-04, CDC_Area ); // *** U.S. 
survey/statute acre
 NEWD( ly2,1.1172985860549147E-32, CDC_Area ); // *** Square 
Light-year
 NEWD( ha, 1.00E-04,   CDC_Area ); // *** Hectare
-NEWD( Quadratlatschen,5.6689342403628117914,CDC_Area ); // ***
 
 // SPEED: 1 Meter per Second is...
 NEWDP( m/s,   1.E00,  CDC_Speed ); // *** Meters per 
Second
@@ -2555,9 +2554,7 @@ ConvertDataList::ConvertDataList()
 NEWD( mph,2.2369362920544023E00,  CDC_Speed ); // *** Britsh Miles 
per Hour
 NEWD( kn, 1.9438444924406048E00,  CDC_Speed ); // *** Knot = 
Nautical Miles per Hour
 NEWD( admkn,  1.9438446603753486E00,  CDC_Speed ); // *** Admiralty Knot
-NEWD( wahnsinnige Geschwindigkeit, 2.0494886343432328E-14, CDC_Speed ); 
// ***
 NEWD( ludicrous speed, 2.0494886343432328E-14, CDC_Speed ); // ***
-NEWD( laecherliche Geschwindigkeit, 4.0156958471424288E-06, CDC_Speed); 
// ***
 NEWD( ridiculous speed, 4.0156958471424288E-06, CDC_Speed); // ***
 
 // INFORMATION: 1 Bit is...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportdesign/inc reportdesign/source

2015-06-29 Thread Phillip Sz

 reportdesign/inc/RptObject.hxx|2 +-
 reportdesign/source/core/sdr/RptObject.cxx|2 +-
 reportdesign/source/ui/dlg/Formula.cxx|2 +-
 reportdesign/source/ui/dlg/GroupsSorting.cxx  |4 ++--
 reportdesign/source/ui/dlg/Navigator.cxx  |   14 +++---
 reportdesign/source/ui/dlg/dlgpage.cxx|2 +-
 reportdesign/source/ui/report/ViewsWindow.cxx |2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit ef575c9c1bbc59c9c5f7097094433d1652d1547b
Author: Phillip Sz phillip.sze...@gmail.com
Date:   Fri Jun 26 21:50:32 2015 +0200

fdo#39468 Translate German Comments - reportdesign

fix after review

Change-Id: Ie6a665e6e473cb774cfbcc805aeb944de5723639
Reviewed-on: https://gerrit.libreoffice.org/16527
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 0c83c5e..4e270da 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -212,7 +212,7 @@ public:
 virtual ::com::sun::star::uno::Reference 
::com::sun::star::uno::XInterface  getUnoShape() SAL_OVERRIDE;
 virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE;
 virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE;
-// Clone() soll eine komplette Kopie des Objektes erzeugen.
+// Clone() should make a complete copy of the object.
 virtual OOle2Obj* Clone() const SAL_OVERRIDE;
 virtual void initializeOle() SAL_OVERRIDE;
 
diff --git a/reportdesign/source/core/sdr/RptObject.cxx 
b/reportdesign/source/core/sdr/RptObject.cxx
index 283d6dc..c83ab33 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -1133,7 +1133,7 @@ OOle2Obj OOle2Obj::operator=(const OOle2Obj rObj)
 }
 
 
-// Clone() soll eine komplette Kopie des Objektes erzeugen.
+// Clone() should make a complete copy of the object.
 OOle2Obj* OOle2Obj::Clone() const
 {
 return CloneHelper OOle2Obj ();
diff --git a/reportdesign/source/ui/dlg/Formula.cxx 
b/reportdesign/source/ui/dlg/Formula.cxx
index 819fabb..6e94536 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -40,7 +40,7 @@ namespace rptui
 using namespace ::com::sun::star;
 
 
-//  Initialisierung / gemeinsame Funktionen  fuer Dialog
+//  initialization / shared functions for the dialog
 
 
 FormulaDialog::FormulaDialog(vcl::Window* pParent
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx 
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 473cb45..c3e8c75 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -382,7 +382,7 @@ void OFieldExpressionControl::lateInit()
 aFont.SetWeight( WEIGHT_NORMAL );
 GetDataWindow().SetFont( aFont );
 
-// Font fuer die Ueberschriften auf Light setzen
+// Set font of the headline to light
 aFont = GetFont();
 aFont.SetWeight( WEIGHT_LIGHT );
 SetFont(aFont);
@@ -578,7 +578,7 @@ CellController* OFieldExpressionControl::GetController( 
long /*nRow*/, sal_uInt1
 
 bool OFieldExpressionControl::SeekRow( long _nRow )
 {
-// die Basisklasse braucht den Aufruf, da sie sich dort merkt, welche 
Zeile gepainted wird
+// the basis class needs the call, because that's how the class knows 
which line will be painted
 EditBrowseBox::SeekRow(_nRow);
 m_nCurrentPos = _nRow;
 return true;
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx 
b/reportdesign/source/ui/dlg/Navigator.cxx
index f65a642..431d92c 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -146,7 +146,7 @@ class NavigatorTree :   public ::cppu::BaseMutex
 AutoTimer  
 m_aDropActionTimer;
 Timer  
 m_aSynchronizeTimer;
 ImageList  
 m_aNavigatorImages;
-Point  
 m_aTimerTriggered;  // die Position, an der der DropTimer angeschaltet 
wurde
+Point  
 m_aTimerTriggered;  // position at which the DropTimer started
 DROP_ACTION
 m_aDropActionType;
 OReportController 
 m_rController;
 SvTreeListEntry*   
 m_pMasterReport;
@@ -279,7 +279,7 @@ void NavigatorTree::Command( const CommandEvent rEvt )
 {
 case CommandEventId::ContextMenu:
 {
-// die Stelle, an der geklickt wurde
+// the point

[Libreoffice-commits] core.git: shell/source

2015-03-25 Thread Phillip Sz

 shell/source/unix/misc/gnome-open-url.sh |2 --
 shell/source/unix/misc/kde-open-url.sh   |2 --
 shell/source/unix/misc/kde4-open-url.sh  |1 -
 shell/source/unix/misc/senddoc.sh|2 --
 shell/source/unix/misc/tde-open-url.sh   |2 --
 5 files changed, 9 deletions(-)

New commits:
commit 3f6bfb4c0d6814c38035e4e1d0c4d5321dd6a5a7
Author: Phillip Sz phillip.sze...@gmail.com
Date:   Mon Mar 16 20:49:05 2015 +0100

remove exit 0 at the end of a shell script

Change-Id: I6f9b6aa7abba6eadf4db93506bdd9a822afdf2fb
Reviewed-on: https://gerrit.libreoffice.org/14884
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Noel Grandin noelgran...@gmail.com

diff --git a/shell/source/unix/misc/gnome-open-url.sh 
b/shell/source/unix/misc/gnome-open-url.sh
index 0bcd7b63..bffe6f2 100755
--- a/shell/source/unix/misc/gnome-open-url.sh
+++ b/shell/source/unix/misc/gnome-open-url.sh
@@ -2,5 +2,3 @@
 
 # use xdg-open or gnome-open if available, falling back to our own open-url
 xdg-open $1 2/dev/null || gnome-open $1 2/dev/null || `dirname 
$0`/open-url $1 2/dev/null
-
-exit 0
diff --git a/shell/source/unix/misc/kde-open-url.sh 
b/shell/source/unix/misc/kde-open-url.sh
index 43ab738..b0eac27 100755
--- a/shell/source/unix/misc/kde-open-url.sh
+++ b/shell/source/unix/misc/kde-open-url.sh
@@ -23,5 +23,3 @@ if echo $1 | grep '^mailto:'  /dev/null; then
 else
   kfmclient openURL $1 
 fi
-
-exit 0
diff --git a/shell/source/unix/misc/kde4-open-url.sh 
b/shell/source/unix/misc/kde4-open-url.sh
index e5b8125..c6e8b17 100755
--- a/shell/source/unix/misc/kde4-open-url.sh
+++ b/shell/source/unix/misc/kde4-open-url.sh
@@ -19,4 +19,3 @@
 
 # use kde-open or xdg-open if available, falling back to our own open-url
 kde-open $1 2/dev/null || xdg-open $1 2/dev/null || `dirname 
$0`/open-url $1 2/dev/null
-exit 0
diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index cb287e6..a642546 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -438,5 +438,3 @@ case `basename $MAILER | sed 's/-.*$//'` in
 ${MAILER} ${MAILTO} 
 ;;
 esac
-
-exit 0
diff --git a/shell/source/unix/misc/tde-open-url.sh 
b/shell/source/unix/misc/tde-open-url.sh
index 43ab738..b0eac27 100755
--- a/shell/source/unix/misc/tde-open-url.sh
+++ b/shell/source/unix/misc/tde-open-url.sh
@@ -23,5 +23,3 @@ if echo $1 | grep '^mailto:'  /dev/null; then
 else
   kfmclient openURL $1 
 fi
-
-exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Phillip Sz license statement

2015-03-25 Thread Phillip Sz

All of my past  future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.

Phillip



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bin/find-german-comments

[Libreoffice-commits] core.git: bin/find-german-comments

[Libreoffice-commits] core.git: bin/find-german-comments

[Libreoffice-commits] core.git: bin/find-german-comments

[Libreoffice-commits] core.git: sc/source

[Libreoffice-commits] core.git: sw/source

[Libreoffice-commits] core.git: sw/source

[Libreoffice-commits] core.git: filter/source

[Libreoffice-commits] core.git: scaddins/source

[Libreoffice-commits] core.git: reportdesign/inc reportdesign/source

[Libreoffice-commits] core.git: shell/source

Phillip Sz license statement

12 matches

Site Navigation

Mail list logo

Footer information