You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/08/01 08:20:43 UTC
[openoffice] branch AOO42X updated (87fe75f -> d3b9d49)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from 87fe75f Deal with a test that expects strikeout style (X, /, bold, etc.) to be preserved when saving to .doc, even though neither the fileformat, nor apparently MS Office itself, support that.
new 65fb7fc translated German comments and remove whitespaces in main/svx/source/dialog/dlgctrl.cxx
new 8d9937f translated German comments and remove whitespaces in main/svx/source/xoutdev/xtable.cxx
new ee96439 translated German comments and remove whitespaces in main/svx/inc/svx/xtable.hxx
new d3b9d49 translated German comments and remove whitespaces in main/svx/inc/svx/dlgctrl.hxx
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/svx/inc/svx/dlgctrl.hxx | 36 +++++-----
main/svx/inc/svx/xtable.hxx | 44 ++++++------
main/svx/source/dialog/dlgctrl.cxx | 144 ++++++++++++++++++-------------------
main/svx/source/xoutdev/xtable.cxx | 58 +++++++--------
4 files changed, 141 insertions(+), 141 deletions(-)
[openoffice] 02/04: translated German comments and remove
whitespaces in main/svx/source/xoutdev/xtable.cxx
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 8d9937f72a65b2ec56019ca92a8169a9070113dc
Author: Mechtilde <oo...@mechtilde.de>
AuthorDate: Fri Jul 31 21:19:40 2020 +0200
translated German comments and remove whitespaces in
main/svx/source/xoutdev/xtable.cxx
(cherry picked from commit c11146798b7ddbc8f4bfc1a5a84aa34f394d424c)
---
main/svx/source/xoutdev/xtable.cxx | 58 +++++++++++++++++++-------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/main/svx/source/xoutdev/xtable.cxx b/main/svx/source/xoutdev/xtable.cxx
index 709d592..9a4042e 100644
--- a/main/svx/source/xoutdev/xtable.cxx
+++ b/main/svx/source/xoutdev/xtable.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
@@ -28,11 +28,11 @@
#define GLOBALOVERFLOW
-// Vergleichsstrings
+// reference strings
sal_Unicode __FAR_DATA pszStandard[] = { 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', 0 };
-// Konvertiert in echte RGB-Farben, damit in den Listboxen
-// endlich mal richtig selektiert werden kann.
+// Convert to real RGB colors, so that you can
+// at last select correctly in the listboxes.
Color RGB_Color( ColorData nColorName )
{
Color aColor( nColorName );
@@ -44,14 +44,14 @@ Color RGB_Color( ColorData nColorName )
// class XColorEntry
XColorEntry::XColorEntry(const Color& rColor, const String& rName)
-: XPropertyEntry(rName),
- aColor(rColor)
+: XPropertyEntry(rName),
+ aColor(rColor)
{
}
XColorEntry::XColorEntry(const XColorEntry& rOther)
-: XPropertyEntry(rOther),
-aColor(rOther.aColor)
+: XPropertyEntry(rOther),
+aColor(rOther.aColor)
{
}
@@ -65,7 +65,7 @@ XLineEndEntry::XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, con
}
XLineEndEntry::XLineEndEntry(const XLineEndEntry& rOther)
-: XPropertyEntry(rOther),
+: XPropertyEntry(rOther),
aB2DPolyPolygon(rOther.aB2DPolyPolygon)
{
}
@@ -74,14 +74,14 @@ XLineEndEntry::XLineEndEntry(const XLineEndEntry& rOther)
// class XDashEntry
XDashEntry::XDashEntry(const XDash& rDash, const String& rName)
-: XPropertyEntry(rName),
- aDash(rDash)
+: XPropertyEntry(rName),
+ aDash(rDash)
{
}
XDashEntry::XDashEntry(const XDashEntry& rOther)
-: XPropertyEntry(rOther),
-aDash(rOther.aDash)
+: XPropertyEntry(rOther),
+aDash(rOther.aDash)
{
}
@@ -89,14 +89,14 @@ aDash(rOther.aDash)
// class XHatchEntry
XHatchEntry::XHatchEntry(const XHatch& rHatch, const String& rName)
-: XPropertyEntry(rName),
- aHatch(rHatch)
+: XPropertyEntry(rName),
+ aHatch(rHatch)
{
}
XHatchEntry::XHatchEntry(const XHatchEntry& rOther)
-: XPropertyEntry(rOther),
- aHatch(rOther.aHatch)
+: XPropertyEntry(rOther),
+ aHatch(rOther.aHatch)
{
}
@@ -104,14 +104,14 @@ XHatchEntry::XHatchEntry(const XHatchEntry& rOther)
// class XGradientEntry
XGradientEntry::XGradientEntry(const XGradient& rGradient, const String& rName)
-: XPropertyEntry(rName),
- aGradient(rGradient)
+: XPropertyEntry(rName),
+ aGradient(rGradient)
{
}
XGradientEntry::XGradientEntry(const XGradientEntry& rOther)
-: XPropertyEntry(rOther),
- aGradient(rOther.aGradient)
+: XPropertyEntry(rOther),
+ aGradient(rOther.aGradient)
{
}
@@ -119,14 +119,14 @@ XGradientEntry::XGradientEntry(const XGradientEntry& rOther)
// class XBitmapEntry
XBitmapEntry::XBitmapEntry(const GraphicObject& rGraphicObject, const String& rName)
-: XPropertyEntry(rName),
- maGraphicObject(rGraphicObject)
+: XPropertyEntry(rName),
+ maGraphicObject(rGraphicObject)
{
}
-XBitmapEntry::XBitmapEntry(const XBitmapEntry& rOther)
-: XPropertyEntry(rOther),
- maGraphicObject(rOther.maGraphicObject)
+XBitmapEntry::XBitmapEntry(const XBitmapEntry& rOther)
+: XPropertyEntry(rOther),
+ maGraphicObject(rOther.maGraphicObject)
{
}
[openoffice] 04/04: translated German comments and remove
whitespaces in main/svx/inc/svx/dlgctrl.hxx
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit d3b9d49c42686185947ac647be50b50df7ebcd61
Author: Mechtilde <oo...@mechtilde.de>
AuthorDate: Fri Jul 31 21:39:52 2020 +0200
translated German comments and remove whitespaces in
main/svx/inc/svx/dlgctrl.hxx
(cherry picked from commit 8295cad0c2d744a048c8ffed435eef58f11be305)
---
main/svx/inc/svx/dlgctrl.hxx | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/main/svx/inc/svx/dlgctrl.hxx b/main/svx/inc/svx/dlgctrl.hxx
index 9fd3677..815ce8d 100644
--- a/main/svx/inc/svx/dlgctrl.hxx
+++ b/main/svx/inc/svx/dlgctrl.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -53,8 +53,8 @@ namespace com { namespace sun { namespace star { namespace awt {
/*************************************************************************
|*
-|* Von SfxTabPage abgeleitet, um vom Control ueber virtuelle Methode
-|* benachrichtigt werden zu koennen.
+|* Derived from SfxTabPage to be able to be notified by the control
+|* via virtual method.
|*
\************************************************************************/
class SvxTabPage : public SfxTabPage
@@ -69,8 +69,8 @@ public:
/*************************************************************************
|*
-|* Control zur Darstellung und Auswahl der Eckpunkte (und Mittelpunkt)
-|* eines Objekts
+|* Control for displaying and selecting the corner points
+|* (and center point) of an object
|*
\************************************************************************/
typedef sal_uInt16 CTL_STATE;
@@ -147,8 +147,8 @@ public:
/*************************************************************************
|*
-|* Control zur Darstellung und Auswahl des Winkels der Eckpunkte
-|* eines Objekts
+|* Control to display and select the angle of the corner points
+|* of an object
|*
\************************************************************************/
class SvxAngleCtl : public SvxRectCtl
@@ -172,7 +172,7 @@ public:
/*************************************************************************
|*
-|* Preview-Control zur Darstellung von Bitmaps
+|* Preview-Control to display bitmaps
|*
\************************************************************************/
@@ -198,7 +198,7 @@ public:
/*************************************************************************
|*
-|* Control zum Editieren von Bitmaps
+|* Control to edit bitmaps
|*
\************************************************************************/
class SVX_DLLPUBLIC SvxPixelCtl : public Control
@@ -263,7 +263,7 @@ public:
/*************************************************************************
|*
-|* ColorLB kann mit Farben und Namen gefuellt werden
+|* ColorLB can be filled with colors and names
|*
\************************************************************************/
@@ -356,7 +356,7 @@ private:
/*************************************************************************
|*
-|* FillAttrLB vereint alle Fuellattribute in einer ListBox
+|* FillAttrLB combines all fill attributes in one list bBox
|*
\************************************************************************/
class FillAttrLB : public ColorListBox
@@ -438,7 +438,7 @@ public:
LineEndLB( Window* pParent, ResId Id );
LineEndLB( Window* pParent, WinBits aWB );
virtual ~LineEndLB (void);
-
+
virtual void Fill( const XLineEndListSharedPtr aList, bool bStart = true );
void Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap, bool bStart = true );
@@ -490,8 +490,8 @@ private:
SdrObject* mpLineObjA;
SdrObject* mpLineObjB;
SdrObject* mpLineObjC;
-
- //#58425# Symbole auf einer Linie (z.B. StarChart)
+
+ //#58425# Symbols at on line (e.g. StarChart)
Graphic* mpGraphic;
sal_Bool mbWithSymbol;
Size maSymbolSize;
@@ -548,7 +548,7 @@ public:
void SetRectangleAttributes(const SfxItemSet& rItemSet);
void SetShadowAttributes(const SfxItemSet& rItemSet);
void SetShadowPosition(const Point& rPos);
-
+
virtual void Paint( const Rectangle& rRect );
};
[openoffice] 01/04: translated German comments and remove
whitespaces in main/svx/source/dialog/dlgctrl.cxx
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 65fb7fc15c01114bf6a0bbb4935cb21997e5a453
Author: Mechtilde <oo...@mechtilde.de>
AuthorDate: Fri Jul 31 21:08:23 2020 +0200
translated German comments and remove whitespaces in
main/svx/source/dialog/dlgctrl.cxx
(cherry picked from commit a787b805043d95280c3b3377e0e01bf79684ba88)
---
main/svx/source/dialog/dlgctrl.cxx | 144 ++++++++++++++++++-------------------
1 file changed, 72 insertions(+), 72 deletions(-)
diff --git a/main/svx/source/dialog/dlgctrl.cxx b/main/svx/source/dialog/dlgctrl.cxx
index 5b96a27..b284562 100644
--- a/main/svx/source/dialog/dlgctrl.cxx
+++ b/main/svx/source/dialog/dlgctrl.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -70,8 +70,8 @@ using namespace ::com::sun::star::accessibility;
/*************************************************************************
|*
-|* Control zur Darstellung und Auswahl der Eckpunkte (und Mittelpunkt)
-|* eines Objekts
+|* Control to display select the corner points (and center point)
+|* of an object
|*
\************************************************************************/
@@ -241,8 +241,8 @@ void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
/*************************************************************************
|*
-|* Das angeklickte Rechteck (3 x 3) wird ermittelt und der Parent (Dialog)
-|* wird benachrichtigt, dass der Punkt geaendert wurde
+|* The selected rectangle (3 x 3) is identified and the parent (dialog)
+|* is notified that the point has been changed
|*
\************************************************************************/
@@ -387,7 +387,7 @@ void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt )
/*************************************************************************
|*
-|* Zeichnet das Control (Rechteck mit 9 Kreisen)
+|* Draw the control (rectangle with 9 circles)
|*
\************************************************************************/
@@ -492,7 +492,7 @@ void SvxRectCtl::Paint( const Rectangle& )
DrawBitmap( aPtLM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
- // Mittelpunkt bei Rechteck und Linie
+ // Center point for rectangle and line
if( eCS == CS_RECT || eCS == CS_LINE )
DrawBitmap( aPtMM - aToCenter, aDstBtnSize, aBtnPnt1, aBtnSize, rBitmap );
@@ -519,7 +519,7 @@ void SvxRectCtl::Paint( const Rectangle& )
/*************************************************************************
|*
-|* Konvertiert RECT_POINT in Point
+|* Converted RECT_POINT in Point
|*
\************************************************************************/
@@ -578,7 +578,7 @@ void SvxRectCtl::GetFocus()
// Send accessibility event.
if(pAccContext)
{
- pAccContext->FireChildFocus(GetActualRP());
+ pAccContext->FireChildFocus(GetActualRP());
}
}
@@ -625,7 +625,7 @@ Point SvxRectCtl::GetApproxLogPtFromPixPt( const Point& rPt ) const
/*************************************************************************
|*
-|* Konvertiert Point in RECT_POINT
+|* Converted Point in RECT_POINT
|*
\************************************************************************/
@@ -646,7 +646,7 @@ RECT_POINT SvxRectCtl::GetRPFromPoint( Point aPt ) const
/*************************************************************************
|*
-|* Bewirkt den Ursprungszustand des Controls
+|* Reset the original state of the controls
|*
\************************************************************************/
@@ -659,7 +659,7 @@ void SvxRectCtl::Reset()
/*************************************************************************
|*
-|* Gibt den aktuell ausgewaehlten RECT_POINT zur�ck
+|* Returns the currently selected RECT_POINT
|*
\************************************************************************/
@@ -670,7 +670,7 @@ RECT_POINT SvxRectCtl::GetActualRP() const
/*************************************************************************
|*
-|* Gibt den aktuell ausgewaehlten RECT_POINT zur�ck
+|* Returns the currently selected RECT_POINT
|*
\************************************************************************/
void SvxRectCtl::SetActualRP( RECT_POINT eNewRP /* MT: , sal_Bool bFireFocus */ )
@@ -762,15 +762,15 @@ RECT_POINT SvxRectCtl::GetApproxRPFromPixPt( const ::com::sun::star::awt::Point&
}
// #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl
-void SvxRectCtl::DoCompletelyDisable(sal_Bool bNew)
-{
- mbCompleteDisable = bNew;
+void SvxRectCtl::DoCompletelyDisable(sal_Bool bNew)
+{
+ mbCompleteDisable = bNew;
Invalidate();
}
/*************************************************************************
|*
-|* Konstruktor ohne Size-Parameter
+|* Constructor without size parameter
|*
\************************************************************************/
@@ -786,7 +786,7 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId ) :
/*************************************************************************
|*
-|* Konstruktor mit Size-Parameter
+|* Constructor with size parameter
|*
\************************************************************************/
@@ -802,7 +802,7 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) :
/*************************************************************************
|*
-|* Initialisierung
+|* Initialisation
|*
\************************************************************************/
@@ -820,7 +820,7 @@ void SvxAngleCtl::Initialize()
/*************************************************************************
|*
-|* Zeichnet das (Mini-)Koordinatensystem
+|* Draw the (mini) coordinate system
|*
\************************************************************************/
@@ -876,7 +876,7 @@ void SvxAngleCtl::Paint( const Rectangle& )
/*************************************************************************
|*
-|* Control zum Editieren von Bitmaps
+|* Control to edit bitmaps
|*
\************************************************************************/
@@ -884,13 +884,13 @@ void SvxAngleCtl::Paint( const Rectangle& )
{
if(!m_xAccess.is())
{
- m_xAccess = m_pAccess = new SvxPixelCtlAccessible(*this);
- }
+ m_xAccess = m_pAccess = new SvxPixelCtlAccessible(*this);
+ }
return m_xAccess;
}
//Logic Pixel
-long SvxPixelCtl::PointToIndex(const Point &aPt) const
+long SvxPixelCtl::PointToIndex(const Point &aPt) const
{
sal_uInt16 nX, nY;
@@ -899,13 +899,13 @@ long SvxPixelCtl::PointToIndex(const Point &aPt) const
return nX + nY * nLines ;
}
-Point SvxPixelCtl::IndexToPoint(long nIndex) const
+Point SvxPixelCtl::IndexToPoint(long nIndex) const
{
DBG_ASSERT(nIndex >= 0 && nIndex < nSquares ," Check Index");
sal_uInt16 nXIndex = nIndex % nLines ;
sal_uInt16 nYIndex = sal_uInt16(nIndex / nLines) ;
-
+
Point aPtTl;
aPtTl.Y() = aRectSize.Height() * nYIndex / nLines + 1;
aPtTl.X() = aRectSize.Width() * nXIndex / nLines + 1;
@@ -919,7 +919,7 @@ long SvxPixelCtl::GetFoucsPosIndex() const
long SvxPixelCtl::ShowPosition( const Point &pt)
{
Point aPt = PixelToLogic( pt );
-
+
sal_uInt16 nX, nY;
nX = (sal_uInt16) ( aPt.X() * nLines / aRectSize.Width() );
nY = (sal_uInt16) ( aPt.Y() * nLines / aRectSize.Height() );
@@ -971,21 +971,21 @@ SvxPixelCtl::~SvxPixelCtl( )
/*************************************************************************
|*
-|* Wechselt die Vordergrund- ,bzw. Hintergrundfarbe
+|* Change the foreground or background color
|*
\************************************************************************/
void SvxPixelCtl::ChangePixel( sal_uInt16 nPixel )
{
if( *( pPixel + nPixel) == 0 )
- *( pPixel + nPixel) = 1; // koennte erweitert werden auf mehrere Farben
+ *( pPixel + nPixel) = 1; // could be expand for more colors
else
*( pPixel + nPixel) = 0;
}
/*************************************************************************
|*
-|* Das angeklickte Rechteck wird ermittelt um die Farbe zu wechseln
+|* The selected rectangle is identified to change the color
|*
\************************************************************************/
@@ -1011,7 +1011,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
// ( (SvxTabPage*) GetParent() )->PointChanged( this, RP_MM ); // RectPoint ist dummy
//Solution:Grab focus when click in window
if( !HasFocus() )
- {
+ {
GrabFocus();
}
long nIndex = ShowPosition(rMEvt.GetPosPixel());
@@ -1024,7 +1024,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
/*************************************************************************
|*
-|* Zeichnet das Control (Rechteck mit 9 Kreisen)
+|* Draw the control (rectangle with 9 circles)
|*
\************************************************************************/
@@ -1035,19 +1035,19 @@ void SvxPixelCtl::Paint( const Rectangle& )
if( bPaintable )
{
- // Linien Zeichnen
+ // Draw lines
Control::SetLineColor( aLineColor );
for( i = 1; i < nLines; i++)
{
// horizontal
nTmp = (sal_uInt16) ( aRectSize.Height() * i / nLines );
DrawLine( Point( 0, nTmp ), Point( aRectSize.Width(), nTmp ) );
- // vertikal
+ // vertical
nTmp = (sal_uInt16) ( aRectSize.Width() * i / nLines );
DrawLine( Point( nTmp, 0 ), Point( nTmp, aRectSize.Height() ) );
}
- // Rechtecke (Quadrate) zeichnen
+ // Draw rectangles (squares)
Control::SetLineColor();
sal_uInt16 nLastPixel = *pPixel ? 0 : 1;
@@ -1064,7 +1064,7 @@ void SvxPixelCtl::Paint( const Rectangle& )
if ( *( pPixel + i * nLines + j ) != nLastPixel )
{
nLastPixel = *( pPixel + i * nLines + j );
- // Farbe wechseln: 0 -> Hintergrundfarbe
+ // Change color: 0 -> background color
SetFillColor( nLastPixel ? aPixelColor : aBackgroundColor );
}
DrawRect( Rectangle( aPtTl, aPtBr ) );
@@ -1073,7 +1073,7 @@ void SvxPixelCtl::Paint( const Rectangle& )
//Solution:Draw visual focus when has focus
if( HasFocus() )
{
- ShowFocus(implCalFocusRect(aFocusPosition));
+ ShowFocus(implCalFocusRect(aFocusPosition));
}
} // bPaintable
else
@@ -1104,14 +1104,14 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
KeyCode aKeyCode = rKEvt.GetKeyCode();
sal_uInt16 nCode = aKeyCode.GetCode();
sal_Bool bIsMod = aKeyCode.IsShift() || aKeyCode.IsMod1() || aKeyCode.IsMod2();
-
+
if( !bIsMod )
{
Point pRepaintPoint( aRectSize.Width() *( aFocusPosition.getX() - 1)/ nLines - 1,
aRectSize.Height() *( aFocusPosition.getY() - 1)/ nLines -1
);
Size mRepaintSize( aRectSize.Width() *3/ nLines + 2,aRectSize.Height() *3/ nLines + 2);
- Rectangle mRepaintRect( pRepaintPoint, mRepaintSize );
+ Rectangle mRepaintRect( pRepaintPoint, mRepaintSize );
sal_Bool bFocusPosChanged=sal_False;
switch(nCode)
{
@@ -1130,7 +1130,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
Invalidate(mRepaintRect);
bFocusPosChanged=sal_True;
}
- break;
+ break;
case KEY_UP:
if((aFocusPosition.getY() >= 1))
{
@@ -1152,7 +1152,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
Invalidate( implCalFocusRect(aFocusPosition) );
break;
default:
- Control::KeyInput( rKEvt );
+ Control::KeyInput( rKEvt );
return;
}
if(m_xAccess.is())
@@ -1167,7 +1167,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
if (bFocusPosChanged)
{
m_pAccess->NotifyChild(nIndex,sal_False,sal_False);
- }
+ }
break;
case KEY_SPACE:
m_pAccess->NotifyChild(nIndex,sal_False,sal_True);
@@ -1187,7 +1187,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
void SvxPixelCtl::GetFocus()
{
Invalidate(implCalFocusRect(aFocusPosition));
-
+
if(m_pAccess)
{
m_pAccess->NotifyChild(GetFoucsPosIndex(),sal_True,sal_False);
@@ -1246,7 +1246,7 @@ void SvxPixelCtl::SetXBitmap( const BitmapEx& rBitmapEx )
/*************************************************************************
|*
-|* Gibt ein bestimmtes Pixel zurueck
+|* Return a selected pixel
|*
\************************************************************************/
@@ -1257,7 +1257,7 @@ sal_uInt16 SvxPixelCtl::GetBitmapPixel( const sal_uInt16 nPixel )
/*************************************************************************
|*
-|* Bewirkt den Ursprungszustand des Controls
+|* Reset the original state of the control
|*
\************************************************************************/
@@ -1270,7 +1270,7 @@ void SvxPixelCtl::Reset()
/*************************************************************************
|*
-|* Ctor: BitmapCtl fuer SvxPixelCtl
+|* Ctor: BitmapCtl for SvxPixelCtl
|*
\************************************************************************/
@@ -1292,7 +1292,7 @@ SvxBitmapCtl::~SvxBitmapCtl()
/*************************************************************************
|*
-|* BitmapCtl: Gibt die Bitmap zurueck
+|* BitmapCtl: Return the bitmap
|*
\************************************************************************/
@@ -1305,7 +1305,7 @@ BitmapEx SvxBitmapCtl::GetBitmapEx()
/*************************************************************************
|*
-|* Fuellt die Listbox mit Farben und Strings
+|* Fill the list box with colors and strings
|*
\************************************************************************/
@@ -1343,7 +1343,7 @@ void ColorLB::Modify( const XColorEntry& rEntry, sal_uInt16 nPos )
/*************************************************************************
|*
-|* Fuellt die Listbox mit Farben und Strings
+|* Fill the list box with colors and strings
|*
\************************************************************************/
@@ -1365,7 +1365,7 @@ void FillAttrLB::Fill( const XColorListSharedPtr aColorTab )
/*************************************************************************
|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
+|* Fill the list box (temporarily) with strings
|*
\************************************************************************/
@@ -1459,7 +1459,7 @@ void HatchingLB::SelectEntryByList( const XHatchListSharedPtr aList, const Strin
/*************************************************************************
|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
+|* Fill the list box (temporarily) with strings
|*
\************************************************************************/
@@ -1485,7 +1485,7 @@ void FillAttrLB::Fill( const XHatchListSharedPtr aList )
/*************************************************************************
|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
+|* Fill the list box (temporarily) with strings
|*
\************************************************************************/
@@ -1579,7 +1579,7 @@ void GradientLB::SelectEntryByList( const XGradientListSharedPtr aList, const St
/*************************************************************************
|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
+|* Fill the list box (temporarily) with strings
|*
\************************************************************************/
@@ -1605,7 +1605,7 @@ void FillAttrLB::Fill( const XGradientListSharedPtr aList )
/*************************************************************************
|*
-|* Konstruktor von BitmapLB
+|* Constructor of BitmapLB
|*
\************************************************************************/
@@ -1762,7 +1762,7 @@ void BitmapLB::SelectEntryByList(const XBitmapListSharedPtr aList, const String&
/*************************************************************************
|*
-|* Konstruktor von FillAttrLB
+|* Constructor of FillAttrLB
|*
\************************************************************************/
@@ -1787,7 +1787,7 @@ void FillAttrLB::Fill(const XBitmapListSharedPtr aList)
XBitmapEntry* pEntry;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
const Size aSize(rStyleSettings.GetListBoxPreviewDefaultPixelSize());
-
+
ListBox::SetUpdateMode(false);
for(long i(0); i < nCount; i++)
@@ -1830,7 +1830,7 @@ void FillAttrLB::SelectEntryByList( const XBitmapListSharedPtr aList, const Stri
/*************************************************************************
|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
+|* Fill the list box (temporarily) with strings
|*
\************************************************************************/
@@ -1850,10 +1850,10 @@ void FillTypeLB::Fill()
/*************************************************************************
|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
+|* Fill the list box (temporarily) with strings
|*
\************************************************************************/
-LineLB::LineLB(Window* pParent, ResId Id)
+LineLB::LineLB(Window* pParent, ResId Id)
: ListBox(pParent, Id),
mbAddStandardFields(true)
{
@@ -1973,7 +1973,7 @@ void LineLB::SelectEntryByList( const XDashListSharedPtr aList, const String& rS
/*************************************************************************
|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
+|* Fill the list box (temporarily) with strings
|*
\************************************************************************/
LineEndLB::LineEndLB( Window* pParent, ResId Id )
@@ -2058,9 +2058,9 @@ void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_uInt16 nPos, const Bitm
aVD.SetOutputSizePixel(aBmpSize, false);
aVD.DrawBitmap(Point(), rBitmap);
- InsertEntry(
+ InsertEntry(
rEntry.GetName(),
- aVD.GetBitmap(bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ), Size( aBmpSize.Width() / 2, aBmpSize.Height())),
+ aVD.GetBitmap(bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ), Size( aBmpSize.Width() / 2, aBmpSize.Height())),
nPos);
}
else
@@ -2165,15 +2165,15 @@ void SvxPreviewBase::LocalPostPaint()
const bool bWasEnabledSrc(mpBufferDevice->IsMapModeEnabled());
const bool bWasEnabledDst(IsMapModeEnabled());
const Point aEmptyPoint;
-
+
mpBufferDevice->EnableMapMode(false);
EnableMapMode(false);
-
+
DrawOutDev(
- aEmptyPoint, GetOutputSizePixel(),
- aEmptyPoint, GetOutputSizePixel(),
+ aEmptyPoint, GetOutputSizePixel(),
+ aEmptyPoint, GetOutputSizePixel(),
*mpBufferDevice);
-
+
mpBufferDevice->EnableMapMode(bWasEnabledSrc);
EnableMapMode(bWasEnabledDst);
}
@@ -2248,7 +2248,7 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId )
aPolygonB.append(aPointB3);
mpLineObjB = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonB));
mpLineObjB->SetModel(&getModel());
-
+
// create DrawObectC
const basegfx::B2DPoint aPointC1( aPointB3.getX() + nDistance, aYPosB1);
const basegfx::B2DPoint aPointC2( aPointC1.getX() + ((nAvailableLength * 1) / 20), aYPosB2 );
@@ -2426,7 +2426,7 @@ void SvxXShadowPreview::SetShadowAttributes(const SfxItemSet& rItemSet)
}
void SvxXShadowPreview::SetShadowPosition(const Point& rPos)
-{
+{
Rectangle aObjectPosition(mpRectangleObject->GetSnapRect());
aObjectPosition.Move(rPos.X(), rPos.Y());
mpRectangleShadow->SetSnapRect(aObjectPosition);
[openoffice] 03/04: translated German comments and remove
whitespaces in main/svx/inc/svx/xtable.hxx
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ee96439ffdae215896fa5b3663b3401734d02679
Author: Mechtilde <oo...@mechtilde.de>
AuthorDate: Fri Jul 31 21:27:00 2020 +0200
translated German comments and remove whitespaces in
main/svx/inc/svx/xtable.hxx
(cherry picked from commit ddf5f72c0ac99b07d4735c5bab803f8e166964d8)
---
main/svx/inc/svx/xtable.hxx | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/main/svx/inc/svx/xtable.hxx b/main/svx/inc/svx/xtable.hxx
index de24eba..eae44a4 100644
--- a/main/svx/inc/svx/xtable.hxx
+++ b/main/svx/inc/svx/xtable.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
#ifndef _XTABLE_HXX
@@ -31,11 +31,11 @@
#include <svx/XPropertyEntry.hxx>
#include <vcl/bitmap.hxx>
-// Standard-Vergleichsstring
+// Standard compare string
extern sal_Unicode __FAR_DATA pszStandard[]; // "standard"
-// Funktion zum Konvertieren in echte RGB-Farben, da mit
-// enum COL_NAME nicht verglichen werden kann.
+// Function to convert into real RGB colors because you can't
+// compare with enum COL_NAME
SVX_DLLPUBLIC Color RGB_Color( ColorData nColorName );
//////////////////////////////////////////////////////////////////////////////
@@ -50,9 +50,9 @@ public:
XColorEntry(const Color& rColor, const String& rName);
XColorEntry(const XColorEntry& rOther);
- const Color& GetColor() const
- {
- return aColor;
+ const Color& GetColor() const
+ {
+ return aColor;
}
};
@@ -69,8 +69,8 @@ public:
XLineEndEntry(const XLineEndEntry& rOther);
const basegfx::B2DPolyPolygon& GetLineEnd() const
- {
- return aB2DPolyPolygon;
+ {
+ return aB2DPolyPolygon;
}
};
@@ -86,9 +86,9 @@ public:
XDashEntry(const XDash& rDash, const String& rName);
XDashEntry(const XDashEntry& rOther);
- const XDash& GetDash() const
- {
- return aDash;
+ const XDash& GetDash() const
+ {
+ return aDash;
}
};
@@ -104,9 +104,9 @@ public:
XHatchEntry(const XHatch& rHatch, const String& rName);
XHatchEntry(const XHatchEntry& rOther);
- const XHatch& GetHatch() const
- {
- return aHatch;
+ const XHatch& GetHatch() const
+ {
+ return aHatch;
}
};
@@ -122,9 +122,9 @@ public:
XGradientEntry(const XGradient& rGradient, const String& rName);
XGradientEntry(const XGradientEntry& rOther);
- const XGradient& GetGradient() const
- {
- return aGradient;
+ const XGradient& GetGradient() const
+ {
+ return aGradient;
}
};
@@ -192,7 +192,7 @@ public:
};
//////////////////////////////////////////////////////////////////////////////
-// predefines for XList classes and the SharedPtr typedefs for these to have
+// predefines for XList classes and the SharedPtr typedefs for these to have
// them in a central place for better overview
class XColorList;