[Libreoffice-commits] core.git: include/svx officecfg/registry sd/source soltools/cpp sw/source vcl/inc vcl/source
Johnny_M
klasse at partyheld.de
Mon Sep 25 12:13:52 UTC 2017
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 <klasse at partyheld.de>
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 <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
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 bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
- virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; // leer
- virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; // leer
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; // empty
+ virtual bool PutValue( 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 @@
</prop>
<prop oor:name="FormatName" oor:type="xs:string">
<info>
- <desc>A shortname, which describe the grafik format.</desc>
+ <desc>A shortname which describes the graphics format.</desc>
</info>
</prop>
<prop oor:name="RealFilterName" oor:type="xs:string">
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 != 0xffff ) )
{
- // 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
- bool mbCollate; // Sortierte Kopien
+ sal_uIntPtr mnError; // error code
+ sal_uIntPtr mnCopies; // copies
+ bool mbCollate; // collated copies
bool mbAbort; // Job Aborted
bool mbValid;
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index 964f340bc49e..77aab9a1fa2f 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -233,7 +233,7 @@ std::vector<TextLine>::size_type TEParaPortion::GetLineNumber( sal_Int32 nChar,
void TEParaPortion::CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine )
{
sal_uInt16 nLines = maLines.size();
- SAL_WARN_IF( !nLines, "vcl", "CorrectPortionNumbersFromLine: Leere Portion?" );
+ SAL_WARN_IF( !nLines, "vcl", "CorrectPortionNumbersFromLine: Empty portion?" );
if ( nLastFormattedLine < ( nLines - 1 ) )
{
const TextLine& rLastFormatted = maLines[ nLastFormattedLine ];
More information about the Libreoffice-commits
mailing list