svtools/source/dialogs/insdlg.cxx | 5 -
svtools/source/dialogs/prnsetup.cxx | 4 -
svtools/source/filter/exportdialog.cxx | 2
svtools/source/filter/exportdialog.hxx | 2
svtools/source/hatchwindow/ipwin.cxx | 84 ++++++++++++++++-----------------
svtools/source/hatchwindow/ipwin.hxx | 7 +-
svtools/source/inc/svimpbox.hxx | 2
7 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit afcfe477034024639013f2360cf6b254b4460c05
Author: Luc Castermans <luc.casterm...@gmail.com>
Date: Tue Jan 7 20:58:21 2014 +0100
translated German comments
Change-Id: I450e1e179edbc0332e2bcf4edee17664083c4786
Reviewed-on: https://gerrit.libreoffice.org/7296
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/svtools/source/dialogs/insdlg.cxx
b/svtools/source/dialogs/insdlg.cxx
index a9e441a..e312e6a 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -93,10 +93,9 @@ void SvObjectServerList::Remove( const SvGlobalName & rName )
//---------------------------------------------------------------------
void SvObjectServerList::FillInsertObjects()
-/* [Beschreibung]
+/* [Description]
- Die Liste wird mit allen Typen gef"ullt, die im Insert-Dialog
- ausgew"ahlt werden k"onnen.
+ The list is filled with all types which can be selected in the
insert-dialog.
*/
{
try{
diff --git a/svtools/source/dialogs/prnsetup.cxx
b/svtools/source/dialogs/prnsetup.cxx
index 87e14c6..90f2e53 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -354,10 +354,10 @@ short PrinterSetupDialog::Execute()
ImplSetInfo();
maStatusTimer.Start();
- // Dialog starten
+ // start dialog
short nRet = ModalDialog::Execute();
- // Wenn Dialog mit OK beendet wurde, dann die Daten updaten
+ // update data if the dialog was terminated with OK
if ( nRet == sal_True )
{
if ( mpTempPrinter )
diff --git a/svtools/source/filter/exportdialog.cxx
b/svtools/source/filter/exportdialog.cxx
index d8f6f9f..f880b12 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -991,7 +991,7 @@ ExportDialog::~ExportDialog()
/*************************************************************************
|*
-|* Speichert eingestellte Werte in ini-Datei
+|* stores values set in the ini-file
|*
\************************************************************************/
IMPL_LINK_NOARG(ExportDialog, UpdateHdl)
diff --git a/svtools/source/filter/exportdialog.hxx
b/svtools/source/filter/exportdialog.hxx
index 67b6d71..f589418 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -37,7 +37,7 @@
/*************************************************************************
|*
-|* Dialog zum Einstellen von Filteroptionen bei Pixelformaten
+|* dialog to set filter options for pixel formats
|*
\************************************************************************/
diff --git a/svtools/source/hatchwindow/ipwin.cxx
b/svtools/source/hatchwindow/ipwin.cxx
index 6b67502..b9551ec 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -28,7 +28,7 @@
/*************************************************************************
|* SvResizeHelper::SvResizeHelper()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
SvResizeHelper::SvResizeHelper()
: aBorder( 5, 5 )
@@ -40,40 +40,40 @@ SvResizeHelper::SvResizeHelper()
/*************************************************************************
|* SvResizeHelper::FillHandleRects()
|*
-|* Beschreibung: Die acht Handles zum vergroessern
+|* Description: the eight handles to magnify
*************************************************************************/
void SvResizeHelper::FillHandleRectsPixel( Rectangle aRects[ 8 ] ) const
{
- // nur wegen EMPTY_RECT
+ // only because of EMPTY_RECT
Point aBottomRight = aOuter.BottomRight();
- // Links Oben
+ // upper left
aRects[ 0 ] = Rectangle( aOuter.TopLeft(), aBorder );
- // Oben Mitte
+ // upper middle
aRects[ 1 ] = Rectangle( Point( aOuter.Center().X() - aBorder.Width() / 2,
aOuter.Top() ),
aBorder );
- // Oben Rechts
+ // upper right
aRects[ 2 ] = Rectangle( Point( aBottomRight.X() - aBorder.Width() +1,
aOuter.Top() ),
aBorder );
- // Mitte Rechts
+ // middle right
aRects[ 3 ] = Rectangle( Point( aBottomRight.X() - aBorder.Width() +1,
aOuter.Center().Y() - aBorder.Height() / 2
),
aBorder );
- // Unten Rechts
+ // lower right
aRects[ 4 ] = Rectangle( Point( aBottomRight.X() - aBorder.Width() +1,
aBottomRight.Y() - aBorder.Height() +1 ),
aBorder );
- // Mitte Unten
+ // lower middle
aRects[ 5 ] = Rectangle( Point( aOuter.Center().X() - aBorder.Width() / 2,
aBottomRight.Y() - aBorder.Height() +1),
aBorder );
- // Links Unten
+ // lower left
aRects[ 6 ] = Rectangle( Point( aOuter.Left(),
aBottomRight.Y() - aBorder.Height() +1),
aBorder );
- // Mitte Links
+ // middle left
aRects[ 7 ] = Rectangle( Point( aOuter.Left(),
aOuter.Center().Y() - aBorder.Height() / 2
),
aBorder );
@@ -82,20 +82,20 @@ void SvResizeHelper::FillHandleRectsPixel( Rectangle
aRects[ 8 ] ) const
/*************************************************************************
|* SvResizeHelper::FillMoveRectsPixel()
|*
-|* Beschreibung: Die vier Kanten werden berechnet
+|* Description: the four edges are calculated
*************************************************************************/
void SvResizeHelper::FillMoveRectsPixel( Rectangle aRects[ 4 ] ) const
{
- // Oben
+ // upper
aRects[ 0 ] = aOuter;
aRects[ 0 ].Bottom() = aRects[ 0 ].Top() + aBorder.Height() -1;
- // Rechts
+ // right
aRects[ 1 ] = aOuter;
aRects[ 1 ].Left() = aRects[ 1 ].Right() - aBorder.Width() -1;
- //Unten
+ // lower
aRects[ 2 ] = aOuter;
aRects[ 2 ].Top() = aRects[ 2 ].Bottom() - aBorder.Height() -1;
- //Links
+ // left
aRects[ 3 ] = aOuter;
aRects[ 3 ].Right() = aRects[ 3 ].Left() + aBorder.Width() -1;
}
@@ -103,7 +103,7 @@ void SvResizeHelper::FillMoveRectsPixel( Rectangle aRects[
4 ] ) const
/*************************************************************************
|* SvResizeHelper::Draw()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeHelper::Draw( OutputDevice * pDev )
{
@@ -122,7 +122,7 @@ void SvResizeHelper::Draw( OutputDevice * pDev )
pDev->DrawRect( aMoveRects[ i ] );
if( bResizeable )
{
- // Handles malen
+ // draw handles
pDev->SetFillColor( aColBlack );
Rectangle aRects[ 8 ];
FillHandleRectsPixel( aRects );
@@ -135,7 +135,7 @@ void SvResizeHelper::Draw( OutputDevice * pDev )
/*************************************************************************
|* SvResizeHelper::InvalidateBorder()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeHelper::InvalidateBorder( Window * pWin )
{
@@ -148,7 +148,7 @@ void SvResizeHelper::InvalidateBorder( Window * pWin )
/*************************************************************************
|* SvResizeHelper::SelectBegin()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
sal_Bool SvResizeHelper::SelectBegin( Window * pWin, const Point & rPos )
{
@@ -157,7 +157,7 @@ sal_Bool SvResizeHelper::SelectBegin( Window * pWin, const
Point & rPos )
nGrab = SelectMove( pWin, rPos );
if( -1 != nGrab )
{
- aSelPos = rPos; // Start-Position merken
+ aSelPos = rPos; // store start position
pWin->CaptureMouse();
return sal_True;
}
@@ -168,7 +168,7 @@ sal_Bool SvResizeHelper::SelectBegin( Window * pWin, const
Point & rPos )
/*************************************************************************
|* SvResizeHelper::SelectMove()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
short SvResizeHelper::SelectMove( Window * pWin, const Point & rPos )
{
@@ -182,7 +182,7 @@ short SvResizeHelper::SelectMove( Window * pWin, const
Point & rPos )
if( aRects[ i ].IsInside( rPos ) )
return i;
}
- // Move-Rect ueberlappen Handles
+ // Move-Rect overlaps Handles
Rectangle aMoveRects[ 4 ];
FillMoveRectsPixel( aMoveRects );
for( sal_uInt16 i = 0; i < 4; i++ )
@@ -201,12 +201,12 @@ short SvResizeHelper::SelectMove( Window * pWin, const
Point & rPos )
Point SvResizeHelper::GetTrackPosPixel( const Rectangle & rRect ) const
{
- // wie das Rechteck zurueckkommt ist egal, es zaehlt welches Handle
- // initial angefasst wurde
+ // not important how the rectangle is returned, it is important
+ // which handle has been touched
Point aPos;
Rectangle aRect( rRect );
aRect.Justify();
- // nur wegen EMPTY_RECT
+ // only because of EMPTY_RECT
Point aBR = aOuter.BottomRight();
Point aTR = aOuter.TopRight();
Point aBL = aOuter.BottomLeft();
@@ -265,7 +265,7 @@ Point SvResizeHelper::GetTrackPosPixel( const Rectangle &
rRect ) const
/*************************************************************************
|* SvResizeHelper::GetTrackRectPixel()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
Rectangle SvResizeHelper::GetTrackRectPixel( const Point & rTrackPos ) const
{
@@ -418,7 +418,7 @@ void SvResizeHelper::ValidateRect( Rectangle & rValidate )
const
/*************************************************************************
|* SvResizeHelper::SelectRelease()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
sal_Bool SvResizeHelper::SelectRelease( Window * pWin, const Point & rPos,
Rectangle & rOutPosSize )
@@ -438,7 +438,7 @@ sal_Bool SvResizeHelper::SelectRelease( Window * pWin,
const Point & rPos,
/*************************************************************************
|* SvResizeHelper::Release()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeHelper::Release( Window * pWin )
{
@@ -453,7 +453,7 @@ void SvResizeHelper::Release( Window * pWin )
/*************************************************************************
|* SvResizeWindow::SvResizeWindow()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
SvResizeWindow::SvResizeWindow
(
@@ -474,7 +474,7 @@ SvResizeWindow::SvResizeWindow
/*************************************************************************
|* SvResizeWindow::SetHatchBorderPixel()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeWindow::SetHatchBorderPixel( const Size & rSize )
{
@@ -484,7 +484,7 @@ void SvResizeWindow::SetHatchBorderPixel( const Size &
rSize )
/*************************************************************************
|* SvResizeWindow::SelectMouse()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeWindow::SelectMouse( const Point & rPos )
{
@@ -492,7 +492,7 @@ void SvResizeWindow::SelectMouse( const Point & rPos )
if( nGrab >= 4 )
nGrab -= 4;
if( m_nMoveGrab != nGrab )
- { // Pointer hat sich geaendert
+ { // Pointer did change
if( -1 == nGrab )
SetPointer( m_aOldPointer );
else
@@ -506,7 +506,7 @@ void SvResizeWindow::SelectMouse( const Point & rPos )
aStyle = POINTER_SSIZE;
else if( nGrab == 0 )
aStyle = POINTER_SESIZE;
- if( m_nMoveGrab == -1 ) // das erste mal
+ if( m_nMoveGrab == -1 ) // the first time
{
m_aOldPointer = GetPointer();
SetPointer( Pointer( aStyle ) );
@@ -521,7 +521,7 @@ void SvResizeWindow::SelectMouse( const Point & rPos )
/*************************************************************************
|* SvResizeWindow::MouseButtonDown()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeWindow::MouseButtonDown( const MouseEvent & rEvt )
{
@@ -532,7 +532,7 @@ void SvResizeWindow::MouseButtonDown( const MouseEvent &
rEvt )
/*************************************************************************
|* SvResizeWindow::MouseMove()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeWindow::MouseMove( const MouseEvent & rEvt )
{
@@ -556,7 +556,7 @@ void SvResizeWindow::MouseMove( const MouseEvent & rEvt )
/*************************************************************************
|* SvResizeWindow::MouseButtonUp()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeWindow::MouseButtonUp( const MouseEvent & rEvt )
{
@@ -583,7 +583,7 @@ void SvResizeWindow::MouseButtonUp( const MouseEvent & rEvt
)
/*************************************************************************
|* SvResizeWindow::KeyEvent()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeWindow::KeyInput( const KeyEvent & rEvt )
{
@@ -597,19 +597,19 @@ void SvResizeWindow::KeyInput( const KeyEvent & rEvt )
/*************************************************************************
|* SvResizeWindow::Resize()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeWindow::Resize()
{
- m_aResizer.InvalidateBorder( this ); // alten Bereich
+ m_aResizer.InvalidateBorder( this ); // old area
m_aResizer.SetOuterRectPixel( Rectangle( Point(), GetOutputSizePixel() ) );
- m_aResizer.InvalidateBorder( this ); // neuen Bereich
+ m_aResizer.InvalidateBorder( this ); // new area
}
/*************************************************************************
|* SvResizeWindow::Paint()
|*
-|* Beschreibung
+|* Description
*************************************************************************/
void SvResizeWindow::Paint( const Rectangle & /*rRect*/ )
{
diff --git a/svtools/source/hatchwindow/ipwin.hxx
b/svtools/source/hatchwindow/ipwin.hxx
index f8c804b..a2703b0 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/svtools/source/hatchwindow/ipwin.hxx
@@ -29,7 +29,7 @@ class SvResizeHelper
{
Size aBorder;
Rectangle aOuter;
- short nGrab; // -1 kein Grab, 0 - 7, 8 = Move, siehe FillHandle...
+ short nGrab; // -1 no Grab, 0 - 7, 8 = Move, see FillHandle...
Point aSelPos;
sal_Bool bResizeable;
public:
@@ -53,7 +53,8 @@ public:
aRect.Right() -= aBorder.Width();
return aRect;
}
- // Im Uhrzeigersinn, beginnend bei Linksoben
+ // Clockwise, start at upper left
+ //
void FillHandleRectsPixel( Rectangle aRects[ 8 ] ) const;
void FillMoveRectsPixel( Rectangle aRects[ 4 ] ) const;
void Draw( OutputDevice * );
@@ -73,7 +74,7 @@ class VCLXHatchWindow;
class SvResizeWindow : public Window
{
Pointer m_aOldPointer;
- short m_nMoveGrab; // Letzer Pointertyp
+ short m_nMoveGrab; // last pointer type
SvResizeHelper m_aResizer;
sal_Bool m_bActive;
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index b821873..c0c00a9 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -285,7 +285,7 @@ public:
SvTreeListEntry* GetCurrentEntry() const { return pCursor; }
bool IsEntryInView( SvTreeListEntry* pEntry ) const;
SvTreeListEntry* GetEntry( const Point& rPos ) const;
- // gibt letzten Eintrag zurueck, falls Pos unter letztem Eintrag
+ // returns last entry, if Pos below last entry
SvTreeListEntry* GetClickedEntry( const Point& ) const;
SvTreeListEntry* GetCurEntry() const { return pCursor; }
void SetCurEntry( SvTreeListEntry* );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
