[Libreoffice-commits] .: svx/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Feb 21 14:32:30 PST 2011
svx/source/dialog/_bmpmask.cxx | 40 -
svx/source/dialog/_contdlg.cxx | 229 -----------
svx/source/dialog/charmap.cxx | 2
svx/source/dialog/connctrl.cxx | 97 ----
svx/source/dialog/contdlg.hrc | 2
svx/source/dialog/contimp.hxx | 6
svx/source/dialog/contwnd.cxx | 80 ---
svx/source/dialog/contwnd.hxx | 6
svx/source/dialog/ctredlin.cxx | 91 ----
svx/source/dialog/ctredlin.hrc | 1
svx/source/dialog/dialcontrol.cxx | 4
svx/source/dialog/dlgctl3d.cxx | 5
svx/source/dialog/dlgctrl.cxx | 260 ++----------
svx/source/dialog/dlgutil.cxx | 2
svx/source/dialog/docrecovery.cxx | 26 -
svx/source/dialog/fontlb.cxx | 6
svx/source/dialog/fontwork.cxx | 153 +------
svx/source/dialog/graphctl.cxx | 188 ---------
svx/source/dialog/hdft.cxx | 86 +---
svx/source/dialog/imapdlg.cxx | 200 ---------
svx/source/dialog/imapdlg.hrc | 2
svx/source/dialog/imapwnd.cxx | 170 --------
svx/source/dialog/imapwnd.hxx | 20
svx/source/dialog/langbox.cxx | 4
svx/source/dialog/measctrl.cxx | 37 -
svx/source/dialog/optgrid.cxx | 32 -
svx/source/dialog/pagectrl.cxx | 25 -
svx/source/dialog/paraprev.cxx | 4
svx/source/dialog/pfiledlg.cxx | 14
svx/source/dialog/rlrcitem.cxx | 28 -
svx/source/dialog/rubydialog.cxx | 2
svx/source/dialog/ruler.hrc | 2
svx/source/dialog/ruler.src | 3
svx/source/dialog/rulritem.cxx | 4
svx/source/dialog/sdstring.src | 219 +++++-----
svx/source/dialog/srchctrl.cxx | 2
svx/source/dialog/srchdlg.cxx | 87 +---
svx/source/dialog/svxbmpnumvalueset.cxx | 24 -
svx/source/dialog/svxruler.cxx | 655 ++++++++++++--------------------
svx/source/dialog/swframeexample.cxx | 60 +-
svx/source/dialog/swframeposstrings.src | 2
svx/source/engine3d/camera3d.cxx | 56 --
42 files changed, 676 insertions(+), 2260 deletions(-)
New commits:
commit 6405ff909fb06eeac8a66a6baf4867bd0321e610
Author: Albert Thuswaldner <albert.thuswaldner at gmail.com>
Date: Mon Feb 21 23:29:31 2011 +0100
Remove dead code and translate German comments
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index f27de94..ad0b1b0 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -241,7 +241,7 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx )
else
pMask->aBtnExec.Disable();
- // Wenn eine Checkbox gecheckt wurde, wird die Pipette enabled
+ // When a checkbox is checked, the pipette is enabled
if ( pCbx->IsChecked() )
{
MaskSet* pSet = NULL;
@@ -479,28 +479,24 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
pQSet1->SetStyle( pQSet1->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER );
pQSet1->SetColCount( 1 );
pQSet1->SetLineCount( 1 );
-// pQSet1->SetExtraSpacing( 1 );
pQSet1->InsertItem( 1, aPipetteColor );
pQSet1->SelectItem( 1 );
pQSet2->SetStyle( pQSet2->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER );
pQSet2->SetColCount( 1 );
pQSet2->SetLineCount( 1 );
-// pQSet2->SetExtraSpacing( 1 );
pQSet2->InsertItem( 1, aPipetteColor );
pQSet2->SelectItem( 0 );
pQSet3->SetStyle( pQSet3->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER );
pQSet3->SetColCount( 1 );
pQSet3->SetLineCount( 1 );
-// pQSet3->SetExtraSpacing( 1 );
pQSet3->InsertItem( 1, aPipetteColor );
pQSet3->SelectItem( 0 );
pQSet4->SetStyle( pQSet4->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER );
pQSet4->SetColCount( 1 );
pQSet4->SetLineCount( 1 );
-// pQSet4->SetExtraSpacing( 1 );
pQSet4->InsertItem( 1, aPipetteColor );
pQSet4->SelectItem( 0 );
@@ -527,18 +523,6 @@ SvxBmpMask::~SvxBmpMask()
/** is called by a MaskSet when it is selected */
void SvxBmpMask::onSelect( MaskSet* pSet )
{
- // automaticaly set focus to the corresponding listbox
-/*
- if( pSet == pQSet1 )
- aLbColor1.GrabFocus();
- else if( pSet == pQSet2 )
- aLbColor2.GrabFocus();
- else if( pSet == pQSet2 )
- aLbColor3.GrabFocus();
- else if( pSet == pQSet2 )
- aLbColor4.GrabFocus();
-*/
-
// now deselect all other value sets
if( pSet != pQSet1 )
pQSet1->SelectItem( 0 );
@@ -765,7 +749,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
USHORT nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
BOOL pTrans[4];
- // Falls keine Farben ausgewaehlt, kopieren wir nur das Mtf
+ // If no color is selected, we copy only the Mtf
if( !nCount )
aMtf = rMtf;
else
@@ -788,7 +772,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
aMtf.SetPrefSize( rMtf.GetPrefSize() );
aMtf.SetPrefMapMode( rMtf.GetPrefMapMode() );
- // Farbvergleichsarrays vorbereiten
+ // Prepare Color comparison array
for( i = 0; i < nCount; i++ )
{
nTol = ( pTols[i] * 255L ) / 100L;
@@ -808,7 +792,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
pTrans[ i ] = ( pDstCols[ i ] == TRANSP_COL );
}
- // Actions untersuchen und Farben ggf. ersetzen
+ // Investigate actions and if necessary replace colors
for( ULONG nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ )
{
MetaAction* pAction = rMtf.GetAction( nAct );
@@ -1069,8 +1053,8 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C
aVDev.SetLineColor( rColor );
aVDev.SetFillColor( rColor );
- // Actions nacheinander abspielen; zuerst
- // den gesamten Bereich auf die Ersatzfarbe setzen
+ // retrieve one action at the time; first
+ // set the whole area to the replacement color.
aVDev.DrawRect( Rectangle( rPrefMap.GetOrigin(), rPrefSize ) );
for ( ULONG i = 0; i < nActionCount; i++ )
{
@@ -1099,7 +1083,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
{
if( rGraphic.IsAnimated() )
{
- // Transparenz ersetzen?
+ // Replace transparency?
if ( aCbxTrans.IsChecked() )
aGraphic = ImpReplaceTransparency( rGraphic.GetAnimation(), aReplColor );
else
@@ -1107,7 +1091,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
}
else
{
- // Transparenz ersetzen?
+ // Replace transparency?
if( aCbxTrans.IsChecked() )
{
if( aGraphic.IsTransparent() )
@@ -1128,10 +1112,10 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
if( nCount )
{
- // erstmal alle Transparent-Farben setzen
+ // first set all transparent colors
for( USHORT i = 0; i < nCount; i++ )
{
- // Haben wir eine Transparenzfarbe?
+ // Do we have a transparent color?
if( pDstCols[i] == TRANSP_COL )
{
BitmapEx aBmpEx( ImpMaskTransparent( aGraphic.GetBitmapEx(),
@@ -1143,7 +1127,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
}
}
- // jetzt noch einmal mit den normalen Farben ersetzen
+ // now replace it again with the normal colors
Bitmap aBitmap( ImpMask( aGraphic.GetBitmap() ) );
Size aSize( aBitmap.GetSizePixel() );
@@ -1164,7 +1148,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
{
GDIMetaFile aMtf( aGraphic.GetGDIMetaFile() );
- // Transparenz ersetzen?
+ // Replace transparency?
if( aCbxTrans.IsChecked() )
aMtf = ImpReplaceTransparency( aMtf, aReplColor );
else
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index dbf9eeb..20487c1 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -88,33 +88,19 @@ SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
/******************************************************************************/
-
-/*************************************************************************
-|*
-|* ControllerItem
-|*
-\************************************************************************/
-
SvxContourDlgItem::SvxContourDlgItem( USHORT _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) :
SfxControllerItem ( _nId, rBindings ),
rDlg ( rContourDlg )
{
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem )
{
if ( pItem && ( SID_CONTOUR_EXEC == nSID ) )
{
const SfxBoolItem* pStateItem = PTR_CAST( SfxBoolItem, pItem );
- DBG_ASSERT( pStateItem || pItem == 0, "SfxBoolItem erwartet");
+ DBG_ASSERT( pStateItem || pItem == 0, "SfxBoolItem expected ");
rDlg.SetExecState( !pStateItem->GetValue() );
}
@@ -123,13 +109,6 @@ void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, cons
/******************************************************************************/
-
-/*************************************************************************
-|*
-|* Contour-Float
-|*
-\************************************************************************/
-
SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
@@ -145,12 +124,6 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId
pDlg->Initialize( pInfo );
}
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked,
const PolyPolygon* pPolyPoly, void* pEditingObj )
{
@@ -159,12 +132,6 @@ void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, BOOL b
SVXCONTOURDLG()->Update( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj );
}
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
SvxContourDlg::SvxContourDlg( SfxBindings* _pBindings, SfxChildWindow* pCW,
Window* _pParent, const ResId& rResId ) :
@@ -173,22 +140,10 @@ SvxContourDlg::SvxContourDlg( SfxBindings* _pBindings, SfxChildWindow* pCW,
{
}
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
SvxContourDlg::~SvxContourDlg()
{
}
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
const Rectangle* pRect,
const ULONG nFlags )
@@ -216,9 +171,8 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
{
const AnimationBitmap& rStepBmp = aAnim.Get( i );
- // Polygonausgabe an die richtige Stelle schieben;
- // dies ist der Offset des Teilbildes innerhalb
- // der Gesamtanimation
+ // Push Polygon output to the right place; this is the
+ // offset of the sub-image within the total animation
aTransMap.SetOrigin( Point( rStepBmp.aPosPix.X(), rStepBmp.aPosPix.Y() ) );
aVDev.SetMapMode( aTransMap );
aVDev.DrawPolyPolygon( CreateAutoContour( rStepBmp.aBmpEx, pRect, nFlags ) );
@@ -270,13 +224,6 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
return PolyPolygon( XOutBitmap::GetCountour( aBmp, nContourFlags, 128, pRect ) );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic,
const MapUnit eUnit, const Size& rDisplaySize )
{
@@ -317,13 +264,8 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic
}
}
-
-/*************************************************************************
-|*
-|* Durchschleifen an SuperClass; keine virt. Methoden, um
-|* bei IF-Aenderungen nicht inkompatibel zu werden
-|*
-\************************************************************************/
+// Loop through to super class, no virtual Methods to not become incompatible
+// due to IF changes
void SvxContourDlg::SetExecState( BOOL bEnable )
{
@@ -376,13 +318,6 @@ void SvxContourDlg::Update( const Graphic& rGraphic, BOOL bGraphicLinked,
pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
Window* _pParent, const ResId& rResId ) :
SvxContourDlg ( _pBindings, pCW, _pParent, rResId ),
@@ -440,23 +375,11 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow
aCreateTimer.SetTimeoutHdl( LINK( this, SvxSuperContourDlg, CreateHdl ) );
}
-
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
-
SvxSuperContourDlg::~SvxSuperContourDlg()
{
}
-
-/*************************************************************************
-|*
-|* Resize-Methode
-|*
-\************************************************************************/
+// Resize methods
void SvxSuperContourDlg::Resize()
{
@@ -470,11 +393,11 @@ void SvxSuperContourDlg::Resize()
Size _aSize( aStbStatus.GetSizePixel() );
Point aPoint( 0, aNewSize.Height() - _aSize.Height() );
- // StatusBar positionieren
+ // Position the StatusBar
aStbStatus.SetPosSizePixel( aPoint, Size( aNewSize.Width(), _aSize.Height() ) );
aStbStatus.Show();
- // EditWindow positionieren
+ // Position the EditWindow
_aSize.Width() = aNewSize.Width() - 18;
_aSize.Height() = aPoint.Y() - aContourWnd.GetPosPixel().Y() - 6;
aContourWnd.SetSizePixel( _aSize );
@@ -483,12 +406,7 @@ void SvxSuperContourDlg::Resize()
}
}
-
-/*************************************************************************
-|*
-|* Close-Methode
-|*
-\************************************************************************/
+// Close methods
BOOL SvxSuperContourDlg::Close()
{
@@ -513,25 +431,13 @@ BOOL SvxSuperContourDlg::Close()
return( bRet ? SfxFloatingWindow::Close() : FALSE );
}
-
-/*************************************************************************
-|*
-|* Enabled oder disabled alle Controls
-|*
-\************************************************************************/
+// Enabled or disabled all Controls
void SvxSuperContourDlg::SetExecState( BOOL bEnable )
{
bExecState = bEnable;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void SvxSuperContourDlg::SetGraphic( const Graphic& rGraphic )
{
aUndoGraphic = aRedoGraphic = Graphic();
@@ -540,13 +446,6 @@ void SvxSuperContourDlg::SetGraphic( const Graphic& rGraphic )
aContourWnd.SetGraphic( aGraphic );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
{
DBG_ASSERT( aContourWnd.GetGraphic().GetType() != GRAPHIC_NONE, "Graphic must've been set first!" );
@@ -576,13 +475,6 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
aContourWnd.GetSdrModel()->SetChanged( sal_True );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
{
PolyPolygon aRetPolyPoly( aContourWnd.GetPolyPolygon() );
@@ -613,13 +505,6 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
return aRetPolyPoly;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicLinked,
const PolyPolygon* pPolyPoly, void* pEditingObj )
{
@@ -635,49 +520,21 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicL
aUpdateTimer.Start();
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
BOOL SvxSuperContourDlg::IsUndoPossible() const
{
return aUndoGraphic.GetType() != GRAPHIC_NONE;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
BOOL SvxSuperContourDlg::IsRedoPossible() const
{
return aRedoGraphic.GetType() != GRAPHIC_NONE;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void SvxSuperContourDlg::DoAutoCreate()
{
aCreateTimer.Start();
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void SvxSuperContourDlg::ReducePoints( const long nTol )
{
PolyPolygon aPolyPoly( GetPolyPolygon( FALSE ) );
@@ -717,11 +574,7 @@ void SvxSuperContourDlg::ReducePoints( const long nTol )
}
-/*************************************************************************
-|*
-|* Click-Hdl fuer ToolBox
-|*
-\************************************************************************/
+// Click handler for ToolBox
IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
{
@@ -857,13 +710,6 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
return 0L;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd )
{
String aStr;
@@ -881,12 +727,6 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd )
return 0L;
}
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
{
String aStr;
@@ -904,12 +744,6 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
return 0L;
}
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG )
{
aUpdateTimer.Stop();
@@ -936,13 +770,6 @@ IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG )
return 0L;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG )
{
aCreateTimer.Stop();
@@ -958,13 +785,6 @@ IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG )
return 0L;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
{
const SdrObject* pObj = pWnd->GetSelectedSdrObject();
@@ -1023,13 +843,6 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
return 0L;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
IMPL_LINK( SvxSuperContourDlg, PipetteHdl, ContourWindow*, pWnd )
{
const Color& rOldLineColor = aStbStatus.GetLineColor();
@@ -1054,13 +867,6 @@ IMPL_LINK( SvxSuperContourDlg, PipetteHdl, ContourWindow*, pWnd )
return 0L;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
{
if ( pWnd->IsClickValid() )
@@ -1108,13 +914,6 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
return 0L;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd )
{
aTbx1.CheckItem( TBI_WORKPLACE, FALSE );
@@ -1139,12 +938,6 @@ void SvxSuperContourDlg::DataChanged( const DataChangedEvent& rDCEvt )
ApplyImageList();
}
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG )
{
SvtMiscOptions aMiscOptions;
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 6937000..df7d2af 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -760,11 +760,9 @@ void SubsetMap::InitList()
aAllSubsets.push_back( Subset( 0x02B0, 0x02FF, RID_SUBSETSTR_SPACING_MODIFIERS ) );
aAllSubsets.push_back( Subset( 0x0300, 0x036F, RID_SUBSETSTR_COMB_DIACRITICAL ) );
aAllSubsets.push_back( Subset( 0x0370, 0x03FF, RID_SUBSETSTR_BASIC_GREEK ) );
- // aAllSubsets.push_back( Subset( 0x03D0, 0x03F3, RID_SUBSETSTR_GREEK_SYMS_COPTIC ) );
aAllSubsets.push_back( Subset( 0x0400, 0x04FF, RID_SUBSETSTR_CYRILLIC ) );
aAllSubsets.push_back( Subset( 0x0530, 0x058F, RID_SUBSETSTR_ARMENIAN ) );
aAllSubsets.push_back( Subset( 0x0590, 0x05FF, RID_SUBSETSTR_BASIC_HEBREW ) );
- // aAllSubsets.push_back( Subset( 0x0591, 0x05C4, RID_SUBSETSTR_HEBREW_EXTENDED ) );
aAllSubsets.push_back( Subset( 0x0600, 0x065F, RID_SUBSETSTR_BASIC_ARABIC ) );
aAllSubsets.push_back( Subset( 0x0660, 0x06FF, RID_SUBSETSTR_ARABIC_EXTENDED ) );
aAllSubsets.push_back( Subset( 0x0700, 0x074F, RID_SUBSETSTR_SYRIAC ) );
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 986e73a..6f410b3 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -42,19 +42,11 @@
#include <svx/dialmgr.hxx>
#include "dlgutil.hxx"
-// #110094#
#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
-// #110094#
#include <svx/sdr/contact/displayinfo.hxx>
#include <vcl/svapp.hxx>
-/*************************************************************************
-|*
-|* Ctor SvxXConnectionPreview
-|*
-*************************************************************************/
-
SvxXConnectionPreview::SvxXConnectionPreview( Window* pParent, const ResId& rResId,
const SfxItemSet& rInAttrs ) :
Control ( pParent, rResId ),
@@ -67,26 +59,14 @@ SvxXConnectionPreview::SvxXConnectionPreview( Window* pParent, const ResId& rRes
SetStyles();
}
-/*************************************************************************
-|*
-|* Dtor SvxXConnectionPreview
-|*
-*************************************************************************/
-
SvxXConnectionPreview::~SvxXConnectionPreview()
{
delete pObjList;
}
-/*************************************************************************
-|*
-|* Dtor SvxXConnectionPreview
-|*
-*************************************************************************/
-
void SvxXConnectionPreview::Construct()
{
- DBG_ASSERT( pView, "Keine gueltige View Uebergeben!" );
+ DBG_ASSERT( pView, "No valid view is passed on! ");
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
ULONG nMarkCount = rMarkList.GetMarkCount();
@@ -117,7 +97,6 @@ void SvxXConnectionPreview::Construct()
SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( TRUE );
SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( FALSE );
- // #110094#
// potential memory leak here (!). Create SdrObjList only when there is
// not yet one.
if(!pObjList)
@@ -145,7 +124,7 @@ void SvxXConnectionPreview::Construct()
if( !pEdgeObj )
pEdgeObj = new SdrEdgeObj();
- // Groesse anpassen
+ // Adapt size
if( pObjList )
{
OutputDevice* pOD = pView->GetFirstOutputDevice(); // GetWin( 0 );
@@ -164,7 +143,7 @@ void SvxXConnectionPreview::Construct()
double fRectWH = (double) aRect.GetWidth() / aRect.GetHeight();
double fWinWH = (double) nWidth / nHeight;
- // Bitmap an Thumbgroesse anpassen (hier nicht!)
+ // Adapt bitmap to Thumb size (not here!)
if ( fRectWH < fWinWH)
{
aNewSize.Width() = (long) ( (double) nHeight * fRectWH );
@@ -180,18 +159,18 @@ void SvxXConnectionPreview::Construct()
Fraction aFrac2( aWinSize.Height(), aRect.GetHeight() );
Fraction aMinFrac( aFrac1 <= aFrac2 ? aFrac1 : aFrac2 );
- // MapMode umsetzen
+ // Implement MapMode
aDisplayMap.SetScaleX( aMinFrac );
aDisplayMap.SetScaleY( aMinFrac );
- // Zentrierung
+ // Centering
aNewPos.X() = ( nWidth - aNewSize.Width() ) >> 1;
aNewPos.Y() = ( nHeight - aNewSize.Height() ) >> 1;
aDisplayMap.SetOrigin( LogicToLogic( aNewPos, aMapMode, aDisplayMap ) );
SetMapMode( aDisplayMap );
- // Ursprung
+ // Origin
aNewPos = aDisplayMap.GetOrigin();
aNewPos -= Point( aRect.TopLeft().X(), aRect.TopLeft().Y() );
aDisplayMap.SetOrigin( aNewPos );
@@ -201,53 +180,9 @@ void SvxXConnectionPreview::Construct()
Point aPos;
MouseEvent aMEvt( aPos, 1, 0, MOUSE_RIGHT );
MouseButtonDown( aMEvt );
- /*
- Point aPt( -aRect.TopLeft().X(), -aRect.TopLeft().Y() );
- aMapMode.SetOrigin( aPt );
-
- // Skalierung
- Size aSize = GetOutputSize();
- Fraction aFrac1( aSize.Width(), aRect.GetWidth() );
- Fraction aFrac2( aSize.Height(), aRect.GetHeight() );
- Fraction aMaxFrac( aFrac1 > aFrac2 ? aFrac1 : aFrac2 );
- Fraction aMinFrac( aFrac1 <= aFrac2 ? aFrac1 : aFrac2 );
- BOOL bChange = (BOOL) ( (double)aMinFrac > 1.0 );
- aMapMode.SetScaleX( aMinFrac );
- aMapMode.SetScaleY( aMinFrac );
-
- // zentrieren
- long nXXL = aSize.Width() > aRect.GetWidth() ? aSize.Width() : aRect.GetWidth();
- long nXS = aSize.Width() <= aRect.GetWidth() ? aSize.Width() : aRect.GetWidth();
- if( bChange )
- {
- long nTmp = nXXL; nXXL = nXS; nXS = nTmp;
- }
- long nX = (long) ( (double)aMinFrac * (double)nXXL );
- nX = (long) ( (double)labs( nXS - nX ) / (double)aMinFrac / 2.0 );
-
- long nYXL = aSize.Height() > aRect.GetHeight() ? aSize.Height() : aRect.GetHeight();
- long nYS = aSize.Height() <= aRect.GetHeight() ? aSize.Height() : aRect.GetHeight();
- if( bChange )
- {
- long nTmp = nXXL; nXXL = nXS; nXS = nTmp;
- }
- long nY = (long) ( (double)aMinFrac * (double)nYXL );
- nY = (long) ( (double)labs( nYS - nY ) / (double)aMinFrac / 2.0 );
-
- aPt += Point( nX, nY );
- aMapMode.SetOrigin( aPt );
-
- SetMapMode( aMapMode );
- */
}
}
-/*************************************************************************
-|*
-|* SvxXConnectionPreview: Paint()
-|*
-*************************************************************************/
-
void SvxXConnectionPreview::Paint( const Rectangle& )
{
if( pObjList )
@@ -278,25 +213,15 @@ void SvxXConnectionPreview::Paint( const Rectangle& )
}
}
-/*************************************************************************
-|*
-|* SvxXConnectionPreview: SetAttributes()
-|*
-*************************************************************************/
-
void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs )
{
- //pEdgeObj->SetItemSetAndBroadcast(rInAttrs);
pEdgeObj->SetMergedItemSetAndBroadcast(rInAttrs);
Invalidate();
}
-/*************************************************************************
-|*
-|* Ermittelt die Anzahl der Linienversaetze anhand des Preview-Objektes
-|*
-*************************************************************************/
+
+// Get number of lines which are offset based on the preview object
USHORT SvxXConnectionPreview::GetLineDeltaAnz()
{
@@ -309,12 +234,6 @@ USHORT SvxXConnectionPreview::GetLineDeltaAnz()
return nCount;
}
-/*************************************************************************
-|*
-|* SvxXConnectionPreview: MouseButtonDown()
-|*
-*************************************************************************/
-
void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
{
BOOL bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc
index b4eae2d..1cbe9ba 100644
--- a/svx/source/dialog/contdlg.hrc
+++ b/svx/source/dialog/contdlg.hrc
@@ -27,7 +27,7 @@
#include <svx/dialogs.hrc>
-// ImapDlg-Dialoge
+// ImapDlg dialog
#define RID_SVX_CONTOURDLG_START RID_SVX_CONTOUR_START
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 314fef7..74b8183 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -35,12 +35,6 @@
#define CONT_RESID(nId) ResId( nId, DIALOG_MGR() )
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class SvxSuperContourDlg : public SvxContourDlg
{
using SvxContourDlg::GetPolyPolygon;
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index ed05b16..b42dda0 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -45,12 +45,6 @@
#define TRANSCOL Color( COL_WHITE )
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) :
GraphCtrl ( pParent, rResId ),
aWorkRect ( 0, 0, 0, 0 ),
@@ -61,33 +55,18 @@ ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) :
SetWinStyle( WB_SDRMODE );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
ContourWindow::~ContourWindow()
{
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
{
SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
const USHORT nPolyCount = rPolyPoly.Count();
- // zuerst alle Zeichenobjekte loeschen
+ // First delete all drawing objects
aPolyPoly = rPolyPoly;
- // #117412#
// To avoid to have destroyed objects which are still selected, it is necessary to deselect
// them first (!)
pView->UnmarkAllObj();
@@ -108,7 +87,6 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
aSet.Put( XFillColorItem( String(), TRANSCOL ) );
aSet.Put( XFillTransparenceItem( 50 ) );
- //pPathObj->SetItemSetAndBroadcast(aSet);
pPathObj->SetMergedItemSetAndBroadcast(aSet);
pPage->InsertObject( pPathObj );
@@ -124,13 +102,6 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
pModel->SetChanged( sal_False );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
const PolyPolygon& ContourWindow::GetPolyPolygon()
{
if ( pModel->IsChanged() )
@@ -154,13 +125,6 @@ const PolyPolygon& ContourWindow::GetPolyPolygon()
return aPolyPoly;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void ContourWindow::InitSdrModel()
{
GraphCtrl::InitSdrModel();
@@ -173,26 +137,12 @@ void ContourWindow::InitSdrModel()
pView->SetFrameDragSingles( TRUE );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void ContourWindow::SdrObjCreated( const SdrObject& )
{
pView->MarkAll();
pView->CombineMarkedObjects( sal_False );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
BOOL ContourWindow::IsContourChanged() const
{
SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
@@ -204,13 +154,6 @@ BOOL ContourWindow::IsContourChanged() const
return bRet;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
if ( bWorkplaceMode )
@@ -227,13 +170,6 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt )
GraphCtrl::MouseButtonDown( rMEvt );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void ContourWindow::MouseMove( const MouseEvent& rMEvt )
{
bClickValid = FALSE;
@@ -255,13 +191,6 @@ void ContourWindow::MouseMove( const MouseEvent& rMEvt )
GraphCtrl::MouseMove( rMEvt );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt)
{
Point aTmpPoint;
@@ -307,13 +236,6 @@ void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt)
GraphCtrl::MouseButtonUp( rMEvt );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void ContourWindow::Paint( const Rectangle& rRect )
{
// #i75482#
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 51dbd51..fb6b963 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -32,12 +32,6 @@
#include <tools/poly.hxx>
#include <svx/graphctl.hxx>
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class ContourWindow : public GraphCtrl
{
PolyPolygon aPolyPoly;
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index d66c2c9..68580c6 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -76,7 +76,7 @@ RedlinData::~RedlinData()
}
//============================================================================
-// class SvxRedlinEntry (Eintraege fuer Liste)
+// class SvxRedlinEntry (Entries for list)
//----------------------------------------------------------------------------
SvxRedlinEntry::SvxRedlinEntry()
@@ -93,26 +93,10 @@ SvxRedlinEntry::~SvxRedlinEntry()
}
}
-/*************************************************************************
-#* Funktionen der in den SvxRedlinTable eingefuegten Items
-#************************************************************************/
+// Functions in the inserts Items of SvxRedlinTable
DBG_NAME(SvLBoxColorString);
-/*************************************************************************
-#* Member: SvLBoxColorString Datum:23.10.97
-#*------------------------------------------------------------------------
-#*
-#* Klasse: SvLBoxColorString
-#*
-#* Funktion: Konstruktor der Klasse SvLBoxColorString
-#*
-#* Input: Box- Entry,Flags, Text fuer Anzeige, Schrift
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,USHORT nFlags,const XubString& rStr,
const Color& rCol)
@@ -123,87 +107,31 @@ SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,USHORT nFlags,const Xub
SetText( pEntry, rStr );
}
-/*************************************************************************
-#* Member: SvLBoxColorString Datum:23.10.97
-#*------------------------------------------------------------------------
-#*
-#* Klasse: SvLBoxColorString
-#*
-#* Funktion: Default Konstruktor der Klasse SvLBoxColorString
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
SvLBoxColorString::SvLBoxColorString()
: SvLBoxString()
{
DBG_CTOR(SvLBoxColorString,0);
}
-/*************************************************************************
-#* Member: ~SvLBoxColorString Datum:23.10.97
-#*------------------------------------------------------------------------
-#*
-#* Klasse: SvLBoxColorString
-#*
-#* Funktion: Destruktor der Klasse SvLBoxColorString
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
SvLBoxColorString::~SvLBoxColorString()
{
DBG_DTOR(SvLBoxColorString,0);
}
-
-/*************************************************************************
-#* Member: SvLBoxColorString Datum:23.10.97
-#*------------------------------------------------------------------------
-#*
-#* Klasse: SvLBoxColorString
-#*
-#* Funktion: Erzeugt einen neuen SvLBoxColorString
-#*
-#* Input: ---
-#*
-#* Output: SvLBoxColorString
-#*
-#************************************************************************/
-
SvLBoxItem* SvLBoxColorString::Create() const
{
DBG_CHKTHIS(SvLBoxColorString,0);
return new SvLBoxColorString;
}
-
-
-/*************************************************************************
-#* Member: SvLBoxColorString Datum:23.10.97
-#*------------------------------------------------------------------------
-#*
-#* Klasse: SvLBoxColorString
-#*
-#* Funktion: Zeichenroutine des SvLBoxColorString. Gezeichnet wird
-#* der entsprechende Text mit der eingestellten Farbe
-#* im Ausgabe- Device.
-#*
-#* Input: Position, Ausgabe- Device, Flag fuer Selection,
-#* Zeiger auf den Eintrag
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev,
USHORT nFlags, SvLBoxEntry* pEntry )
+/* [Description]
+
+ Paint function of the SvLBoxColorString class. The relevant text with the
+ selected color is drawn in the output device.
+*/
+
{
Color aColor=rDev.GetTextColor();
Color a2Color=aColor;
@@ -597,7 +525,6 @@ void SvxRedlinTable::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr,
for( USHORT nToken = 0; nToken < nCount; nToken++ )
{
if( pCurToken && nCurTokenLen )
- // aToken.Assign( pCurToken, nCurTokenLen );
aToken = XubString( pCurToken, nCurTokenLen );
else
aToken.Erase();
@@ -628,7 +555,7 @@ SvxTPView::SvxTPView( Window * pParent)
PbAcceptAll ( this, SVX_RES(PB_ACCEPTALL ) ),
PbRejectAll ( this, SVX_RES(PB_REJECTALL ) ),
PbUndo ( this, SVX_RES(PB_UNDO ) ),
- aTitle1 ( SVX_RES( STR_TITLE1 ) ), // lokale Resource
+ aTitle1 ( SVX_RES( STR_TITLE1 ) ), // local resource
aTitle2 ( SVX_RES( STR_TITLE2 ) ),
aTitle3 ( SVX_RES( STR_TITLE3 ) ),
aTitle4 ( SVX_RES( STR_TITLE4 ) ),
diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc
index af7f8d0..aa8fb0c 100644
--- a/svx/source/dialog/ctredlin.hrc
+++ b/svx/source/dialog/ctredlin.hrc
@@ -65,4 +65,3 @@
#define STR_TITLE3 3
#define STR_TITLE4 4
#define STR_TITLE5 5
-//
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 5c23584..39c6758 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -186,7 +186,7 @@ void DialControlBmp::DrawBackground()
SetFillColor();
Erase();
- EnableRTL( TRUE ); // #107807# draw 3D effect in correct direction
+ EnableRTL( TRUE ); // draw 3D effect in correct direction
sal_uInt8 nDiff = mbEnabled ? 0x18 : 0x10;
Color aColor;
@@ -456,7 +456,7 @@ const Link& DialControl::GetModifyHdl() const
void DialControl::Init( const Size& rWinSize, const Font& rWinFont )
{
mpImpl->Init( rWinSize, rWinFont );
- EnableRTL( FALSE ); // #107807# don't mirror mouse handling
+ EnableRTL( FALSE ); // don't mirror mouse handling
SetOutputSizePixel( mpImpl->maWinSize );
SetBackground();
}
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index a23c311..67a2c1c 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -412,7 +412,7 @@ void Svx3DLightControl::ConstructLightObjects()
{
for(sal_uInt32 a(0); a < MAX_NUMBER_LIGHTS; a++)
{
- // get rid of evtl. existing light object
+ // get rid of possible existing light object
if(maLightObjects[a])
{
mpScene->Remove3DObj(maLightObjects[a]);
@@ -587,8 +587,7 @@ void Svx3DLightControl::MouseButtonDown( const MouseEvent& rMEvt )
}
else
{
- // Einfacher Click ohne viel Bewegen, versuche eine
- // Selektion
+ // Single click without moving much trying to do a selection
TrySelection(rMEvt.GetPosPixel());
bCallParent = false;
}
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 6efc91d..56322b6 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -65,13 +65,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
-
-/*************************************************************************
-|*
-|* Control zur Darstellung und Auswahl der Eckpunkte (und Mittelpunkt)
-|* eines Objekts
-|*
-\************************************************************************/
+// Control fo display and selection of the corner points and mid point of an
+// object
Bitmap& SvxRectCtl::GetRectBitmap( void )
{
@@ -237,16 +232,11 @@ void SvxRectCtl::InitSettings( BOOL bForeground, BOOL bBackground )
Invalidate();
}
-/*************************************************************************
-|*
-|* Das angeklickte Rechteck (3 x 3) wird ermittelt und der Parent (Dialog)
-|* wird benachrichtigt, dass der Punkt geaendert wurde
-|*
-\************************************************************************/
-
+// The clicked rectangle (3 x 3) is determined and the parent (dialog)
+// is notified that the item was changed
void SvxRectCtl::MouseButtonDown( const MouseEvent& rMEvt )
{
- // #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl
+ // CompletelyDisabled() added to have a disabled state for SvxRectCtl
if(!IsCompletelyDisabled())
{
Point aPtLast = aPtNew;
@@ -277,7 +267,7 @@ void SvxRectCtl::MouseButtonDown( const MouseEvent& rMEvt )
void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
{
- // #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl
+ // CompletelyDisabled() added to have a disabled state for SvxRectCtl
if(!IsCompletelyDisabled())
{
RECT_POINT eNewRP = eRP;
@@ -383,11 +373,7 @@ void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt )
Window::DataChanged( rDCEvt );
}
-/*************************************************************************
-|*
-|* Zeichnet das Control (Rechteck mit 9 Kreisen)
-|*
-\************************************************************************/
+// the control (rectangle with 9 circles)
void SvxRectCtl::Paint( const Rectangle& )
{
@@ -468,7 +454,7 @@ void SvxRectCtl::Paint( const Rectangle& )
Bitmap& rBitmap = GetRectBitmap();
- // #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl
+ // CompletelyDisabled() added to have a disabled state for SvxRectCtl
if(IsCompletelyDisabled())
{
DrawBitmap( aPtLT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap );
@@ -490,7 +476,7 @@ void SvxRectCtl::Paint( const Rectangle& )
DrawBitmap( aPtLM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
- // Mittelpunkt bei Rechteck und Linie
+ // Center for rectangle and line
if( eCS == CS_RECT || eCS == CS_LINE )
DrawBitmap( aPtMM - aToCenter, aDstBtnSize, aBtnPnt1, aBtnSize, rBitmap );
@@ -502,7 +488,7 @@ void SvxRectCtl::Paint( const Rectangle& )
}
// draw active button, avoid center pos for angle
- // #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl
+ // CompletelyDisabled() added to have a disabled state for SvxRectCtl
if(!IsCompletelyDisabled())
{
if( IsEnabled() && (eCS != CS_ANGLE || aPtNew != aPtMM) )
@@ -515,9 +501,7 @@ void SvxRectCtl::Paint( const Rectangle& )
}
}
-/*************************************************************************
-|*
-|* Konvertiert RECT_POINT in Point
+// Convert RECT_POINT Point
|*
\************************************************************************/
@@ -614,11 +598,7 @@ Point SvxRectCtl::GetApproxLogPtFromPixPt( const Point& rPt ) const
}
-/*************************************************************************
-|*
-|* Konvertiert Point in RECT_POINT
-|*
-\************************************************************************/
+// Converts Point in RECT_POINT
RECT_POINT SvxRectCtl::GetRPFromPoint( Point aPt ) const
{
@@ -635,11 +615,7 @@ RECT_POINT SvxRectCtl::GetRPFromPoint( Point aPt ) const
return RP_MM; // default
}
-/*************************************************************************
-|*
-|* Bewirkt den Ursprungszustand des Controls
-|*
-\************************************************************************/
+// Resets to the original state of the control
void SvxRectCtl::Reset()
{
@@ -648,23 +624,13 @@ void SvxRectCtl::Reset()
Invalidate();
}
-/*************************************************************************
-|*
-|* Gibt den aktuell ausgewaehlten RECT_POINT zur�ck
-|*
-\************************************************************************/
+// Returns the currently selected RECT_POINT
RECT_POINT SvxRectCtl::GetActualRP() const
{
return( eRP );
}
-/*************************************************************************
-|*
-|* Gibt den aktuell ausgewaehlten RECT_POINT zur�ck
-|*
-\************************************************************************/
-
void SvxRectCtl::SetActualRP( RECT_POINT eNewRP )
{
Point aPtLast( SetActualRPWithoutInvalidate( eNewRP ) );
@@ -753,18 +719,14 @@ RECT_POINT SvxRectCtl::GetApproxRPFromPixPt( const ::com::sun::star::awt::Point&
return GetRPFromPoint( GetApproxLogPtFromPixPt( Point( r.X, r.Y ) ) );
}
-// #103516# CompletelyDisabled() added to have a disabled state for SvxRectCtl
+// CompletelyDisabled() added to have a disabled state for SvxRectCtl
void SvxRectCtl::DoCompletelyDisable(sal_Bool bNew)
{
mbCompleteDisable = bNew;
Invalidate();
}
-/*************************************************************************
-|*
-|* Konstruktor ohne Size-Parameter
-|*
-\************************************************************************/
+// Constructor without the size parameter
SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId ) :
@@ -776,11 +738,7 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId ) :
Initialize();
}
-/*************************************************************************
-|*
-|* Konstruktor mit Size-Parameter
-|*
-\************************************************************************/
+// Constructor with the size parameter
SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) :
@@ -792,17 +750,10 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) :
Initialize();
}
-/*************************************************************************
-|*
-|* Initialisierung
-|*
-\************************************************************************/
-
void SvxAngleCtl::Initialize()
{
bPositive = TRUE;
- // aFont.SetName( "Helvetica" );
aFont.SetSize( aFontSize );
aFont.SetWeight( WEIGHT_NORMAL );
aFont.SetTransparent( FALSE );
@@ -810,11 +761,7 @@ void SvxAngleCtl::Initialize()
SetFont( aFont );
}
-/*************************************************************************
-|*
-|* Zeichnet das (Mini-)Koordinatensystem
-|*
-\************************************************************************/
+// Draws the (mini) coordinate system
void SvxAngleCtl::Paint( const Rectangle& )
{
@@ -866,18 +813,13 @@ void SvxAngleCtl::Paint( const Rectangle& )
RTL_CONSTASCII_STRINGPARAM( "-45" ) ) );
}
-/*************************************************************************
-|*
-|* Control zum Editieren von Bitmaps
-|*
-\************************************************************************/
+// Control for editing bitmaps
SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber ) :
Control ( pParent, rResId ),
nLines ( nNumber ),
bPaintable ( TRUE )
{
- // SetMapMode( MAP_100TH_MM );
aRectSize = GetOutputSize();
SetPixelColor( Color( COL_BLACK ) );
@@ -889,36 +831,24 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber )
rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT));
}
-/*************************************************************************
-|*
-|* Destruktor dealociert dyn. Array
-|*
-\************************************************************************/
+// Destructor dealocating the dynamic array
SvxPixelCtl::~SvxPixelCtl( )
{
delete []pPixel;
}
-/*************************************************************************
-|*
-|* Wechselt die Vordergrund- ,bzw. Hintergrundfarbe
-|*
-\************************************************************************/
+// Changes the foreground or Background color
void SvxPixelCtl::ChangePixel( USHORT nPixel )
{
if( *( pPixel + nPixel) == 0 )
- *( pPixel + nPixel) = 1; // koennte erweitert werden auf mehrere Farben
+ *( pPixel + nPixel) = 1; // could be extended to more colors
else
*( pPixel + nPixel) = 0;
}
-/*************************************************************************
-|*
-|* Das angeklickte Rechteck wird ermittelt um die Farbe zu wechseln
-|*
-\************************************************************************/
+// The clicked rectangle is identified, to change its color
void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
{
@@ -939,14 +869,10 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
Invalidate( Rectangle( aPtTl, aPtBr ) );
if( WINDOW_TABPAGE == GetParent()->GetType() )
- ( (SvxTabPage*) GetParent() )->PointChanged( this, RP_MM ); // RectPoint ist dummy
+ ( (SvxTabPage*) GetParent() )->PointChanged( this, RP_MM ); // RectPoint is a dummy
}
-/*************************************************************************
-|*
-|* Zeichnet das Control (Rechteck mit 9 Kreisen)
-|*
-\************************************************************************/
+// Draws the Control (Rectangle with nine circles)
void SvxPixelCtl::Paint( const Rectangle& )
{
@@ -955,19 +881,19 @@ void SvxPixelCtl::Paint( const Rectangle& )
if( bPaintable )
{
- // Linien Zeichnen
+ // Draw lines
Control::SetLineColor( aLineColor );
for( i = 1; i < nLines; i++)
{
// horizontal
nTmp = (USHORT) ( aRectSize.Height() * i / nLines );
DrawLine( Point( 0, nTmp ), Point( aRectSize.Width(), nTmp ) );
- // vertikal
+ // vertically
nTmp = (USHORT) ( aRectSize.Width() * i / nLines );
DrawLine( Point( nTmp, 0 ), Point( nTmp, aRectSize.Height() ) );
}
- // Rechtecke (Quadrate) zeichnen
+ //Draw Rectangles (squares)
Control::SetLineColor();
USHORT nLastPixel = *pPixel ? 0 : 1;
@@ -984,7 +910,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 ) );
@@ -1000,12 +926,6 @@ void SvxPixelCtl::Paint( const Rectangle& )
}
}
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp )
{
if( rXBmp.GetBitmapType() == XBITMAP_8X8 )
@@ -1020,22 +940,14 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp )
}
}
-/*************************************************************************
-|*
-|* Gibt ein bestimmtes Pixel zurueck
-|*
-\************************************************************************/
+// Returns a specific pixel
USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel )
{
return( *( pPixel + nPixel ) );
}
-/*************************************************************************
-|*
-|* Bewirkt den Ursprungszustand des Controls
-|*
-\************************************************************************/
+// Resets to the original state of the control
void SvxPixelCtl::Reset()
{
@@ -1044,33 +956,18 @@ void SvxPixelCtl::Reset()
Invalidate();
}
-/*************************************************************************
-|*
-|* Ctor: BitmapCtl fuer SvxPixelCtl
-|*
-\************************************************************************/
+// Constructor: BitmapCtl for SvxPixelCtl
SvxBitmapCtl::SvxBitmapCtl( Window* /*pParent*/, const Size& rSize )
{
aSize = rSize;
- // aVD.SetOutputSizePixel( aSize );
}
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
-
SvxBitmapCtl::~SvxBitmapCtl()
{
}
-/*************************************************************************
-|*
-|* BitmapCtl: Gibt die Bitmap zurueck
-|*
-\************************************************************************/
+// BitmapCtl: Returns the Bitmap
XOBitmap SvxBitmapCtl::GetXBitmap()
{
@@ -1079,11 +976,7 @@ XOBitmap SvxBitmapCtl::GetXBitmap()
return( aXOBitmap );
}
-/*************************************************************************
-|*
-|* Fuellt die Listbox mit Farben und Strings
-|*
-\************************************************************************/
+// Fills the Listbox with color and strings
void ColorLB::Fill( const XColorTable* pColorTab )
{
@@ -1114,11 +1007,7 @@ void ColorLB::Modify( XColorEntry* pEntry, USHORT nPos, Bitmap* )
InsertEntry( pEntry->GetColor(), pEntry->GetName(), nPos );
}
-/*************************************************************************
-|*
-|* Fuellt die Listbox mit Farben und Strings
-|*
-\************************************************************************/
+// Fills the Listbox with color and strings
void FillAttrLB::Fill( const XColorTable* pColorTab )
{
@@ -1134,11 +1023,7 @@ void FillAttrLB::Fill( const XColorTable* pColorTab )
SetUpdateMode( TRUE );
}
-/*************************************************************************
-|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
-|*
-\************************************************************************/
+// Fills the listbox (provisional) with strings
HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
: ListBox( pParent, Id ),
@@ -1269,11 +1154,7 @@ void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr,
SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
}
-/*************************************************************************
-|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
-|*
-\************************************************************************/
+// Fills the listbox (provisional) with strings
void FillAttrLB::Fill( const XHatchList* pList )
{
@@ -1293,11 +1174,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
ListBox::SetUpdateMode( TRUE );
}
-/*************************************************************************
-|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
-|*
-\************************************************************************/
+// Fills the listbox (provisional) with strings
GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
: ListBox( pParent, Id ),
@@ -1441,11 +1318,7 @@ void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rS
SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
}
-/*************************************************************************
-|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
-|*
-\************************************************************************/
+// Fills the listbox (provisional) with strings
void FillAttrLB::Fill( const XGradientList* pList )
{
@@ -1465,11 +1338,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
ListBox::SetUpdateMode( TRUE );
}
-/*************************************************************************
-|*
-|* Konstruktor von BitmapLB
-|*
-\************************************************************************/
+// BitmapLB Constructor
BitmapLB::BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
: ListBox( pParent, Id ),
@@ -1625,7 +1494,6 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
pEntry = pList->GetBitmap( i );
String aStr = pEntry->GetName();
- // Bitmap aBmp = pEntry->GetBitmap();
if( rStr == aStr )
{
@@ -1636,11 +1504,7 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
SelectEntryPos( (USHORT) ( i - 1 ) );
}
-/*************************************************************************
-|*
-|* Konstruktor von FillAttrLB
-|*
-\************************************************************************/
+// FillAttrLB Constructor
FillAttrLB::FillAttrLB( Window* pParent, ResId Id ) :
ColorListBox( pParent, Id )
@@ -1713,25 +1577,17 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
pEntry = pList->GetBitmap( i );
String aStr = pEntry->GetName();
- // Bitmap aBmp = pEntry->GetBitmap();
if( rStr == aStr )
{
bFound = TRUE;
}
- /*
- if( rStr == aStr && rBmp == aBmp )
- bFound = TRUE; */
}
if( bFound )
SelectEntryPos( (USHORT) ( i - 1 ) );
}
-/*************************************************************************
-|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
-|*
-\************************************************************************/
+// Fills the listbox (provisional) with strings
void FillTypeLB::Fill()
{
@@ -1744,11 +1600,7 @@ void FillTypeLB::Fill()
SetUpdateMode( TRUE );
}
-/*************************************************************************
-|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
-|*
-\************************************************************************/
+// Fills the listbox (provisional) with strings
void LineLB::Fill( const XDashList* pList )
{
@@ -1775,7 +1627,7 @@ void LineLB::FillStyles()
{
ResMgr& rMgr = DIALOG_MGR();
- // Linienstile
+ // Line Styles
Clear();
InsertEntry( String( ResId( RID_SVXSTR_INVISIBLE, rMgr ) ) );
@@ -1843,11 +1695,7 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
}
-/*************************************************************************
-|*
-|* Fuellt die Listbox (vorlaeufig) mit Strings
-|*
-\************************************************************************/
+// Fills the listbox (provisional) with strings
void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
{
@@ -2039,12 +1887,6 @@ void SvxPreviewBase::DataChanged(const DataChangedEvent& rDCEvt)
}
}
-/*************************************************************************
-|*
-|* SvxXLinePreview::SvxXLinePreview()
-|*
-*************************************************************************/
-
SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId )
: SvxPreviewBase( pParent, rResId ),
mpLineObjA( 0L ),
@@ -2166,12 +2008,6 @@ void SvxXLinePreview::Paint( const Rectangle& )
LocalPostPaint();
}
-/*************************************************************************
-|*
-|* SvxXRectPreview::SvxXRectPreview()
-|*
-*************************************************************************/
-
SvxXRectPreview::SvxXRectPreview( Window* pParent, const ResId& rResId )
: SvxPreviewBase( pParent, rResId ),
mpRectangleObject(0)
@@ -2211,12 +2047,6 @@ void SvxXRectPreview::Paint( const Rectangle& )
LocalPostPaint();
}
-/*************************************************************************
-|*
-|* SvxXShadowPreview::SvxXShadowPreview()
-|*
-*************************************************************************/
-
SvxXShadowPreview::SvxXShadowPreview( Window* pParent, const ResId& rResId )
: SvxPreviewBase( pParent, rResId ),
mpRectangleObject(0),
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index 02f1829..8079009 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -70,7 +70,7 @@ BOOL GetApplyCharUnit( const SfxItemSet& rSet )
SfxObjectShell* pSh = NULL;
if ( pFrame )
pSh = pFrame->GetObjectShell();
- if ( pSh ) // #93209# the object shell is not always available during reload
+ if ( pSh ) // the object shell is not always available during reload
{
SfxModule* pModule = pSh->GetModule();
if ( pModule )
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 876b4d6..adbb64c 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -1737,12 +1737,6 @@ void BrokenRecoveryDialog::impl_askForSavePath()
ReadParams();
- /*
- maDocTypeED.SetText( maParams.maSubject );
- maUsingML.SetText( maParams.maBody );
- maContactCB.Check( maParams.mbAllowContact );
- maEMailAddrED.SetText( maParams.maReturnAddress );
- */
ContactCBHdl( 0 );
}
@@ -2044,26 +2038,6 @@ void BrokenRecoveryDialog::impl_askForSavePath()
#define PRVFILE ".crash_report_preview"
#endif
-// static ::rtl::OUString GetChecksumURL()
-// {
-// ::rtl::OUString aURL = GetCrashConfigDir();
-
-// aURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-// aURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CHKFILE ) );
-
-// return aURL;
-// }
-
-// static ::rtl::OUString GetStackURL()
-// {
-// ::rtl::OUString aURL = GetCrashConfigDir();
-
-// aURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-// aURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STKFILE ) );
-
-// return aURL;
-// }
-
static ::rtl::OUString GetPreviewURL()
{
::rtl::OUString aURL = GetCrashConfigDir();
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index d2223ba..98c815a 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -72,7 +72,6 @@ void SvLBoxFontString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags
Font aOldFont( rDev.GetFont() );
Font aNewFont( maFont );
bool bSel = (nFlags & SVLISTENTRYFLAG_SELECTED) != 0;
-// if( !mbUseColor ) // selection gets font color, if available
if( !mbUseColor || bSel ) // selection always gets highlight color
{
const StyleSettings& rSett = Application::GetSettings().GetStyleSettings();
@@ -177,11 +176,6 @@ SvxFontListBox::SvxFontListBox( Context* pParent, const char* pFile)
{
}
-/*IMPL_IMPL (SvxFontListBox, ListBox);
-IMPL_CONSTRUCTORS (SvxFontListBox, ListBox, "svxfontlistbox");
-IMPL_GET_IMPL (SvxFontListBox);
-IMPL_GET_WINDOW (SvxFontListBox);*/
-
};
#endif
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index b9a4060..4533b25 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -53,11 +53,7 @@
SFX_IMPL_DOCKINGWINDOW( SvxFontWorkChildWindow, SID_FONTWORK );
-/*************************************************************************
-|*
-|* ControllerItem fuer Fontwork
-|*
-\************************************************************************/
+// ControllerItem for Fontwork
SvxFontWorkControllerItem::SvxFontWorkControllerItem
(
@@ -72,11 +68,7 @@ SvxFontWorkControllerItem::SvxFontWorkControllerItem
{
}
-/*************************************************************************
-|*
-|* StateChanged-Methode fuer FontWork-Items
-|*
-\************************************************************************/
+// StateChanged method for FontWork items
void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/,
const SfxPoolItem* pItem )
@@ -87,7 +79,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextStyleItem* pStateItem =
PTR_CAST(XFormTextStyleItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStyleItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStyleItem expected");
rFontWorkDlg.SetStyle_Impl(pStateItem);
break;
}
@@ -95,7 +87,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextAdjustItem* pStateItem =
PTR_CAST(XFormTextAdjustItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextAdjustItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextAdjustItem expected");
rFontWorkDlg.SetAdjust_Impl(pStateItem);
break;
}
@@ -111,7 +103,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextStartItem* pStateItem =
PTR_CAST(XFormTextStartItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStartItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStartItem expected");
rFontWorkDlg.SetStart_Impl(pStateItem);
break;
}
@@ -119,7 +111,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextMirrorItem* pStateItem =
PTR_CAST(XFormTextMirrorItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextMirrorItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextMirrorItem expected");
rFontWorkDlg.SetMirror_Impl(pStateItem);
break;
}
@@ -127,7 +119,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextStdFormItem* pStateItem =
PTR_CAST(XFormTextStdFormItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStdFormItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStdFormItem expected");
rFontWorkDlg.SetStdForm_Impl(pStateItem);
break;
}
@@ -135,7 +127,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextHideFormItem* pStateItem =
PTR_CAST(XFormTextHideFormItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextHideFormItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextHideFormItem expected");
rFontWorkDlg.SetShowForm_Impl(pStateItem);
break;
}
@@ -143,7 +135,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextOutlineItem* pStateItem =
PTR_CAST(XFormTextOutlineItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextOutlineItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextOutlineItem expected");
rFontWorkDlg.SetOutline_Impl(pStateItem);
break;
}
@@ -151,7 +143,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextShadowItem* pStateItem =
PTR_CAST(XFormTextShadowItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowItem expected");
rFontWorkDlg.SetShadow_Impl(pStateItem);
break;
}
@@ -159,7 +151,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextShadowColorItem* pStateItem =
PTR_CAST(XFormTextShadowColorItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowColorItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowColorItem expected");
rFontWorkDlg.SetShadowColor_Impl(pStateItem);
break;
}
@@ -167,7 +159,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextShadowXValItem* pStateItem =
PTR_CAST(XFormTextShadowXValItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowXValItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowXValItem expected");
rFontWorkDlg.SetShadowXVal_Impl(pStateItem);
break;
}
@@ -175,18 +167,14 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
{
const XFormTextShadowYValItem* pStateItem =
PTR_CAST(XFormTextShadowYValItem, pItem);
- DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowYValItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowYValItem expected");
rFontWorkDlg.SetShadowYVal_Impl(pStateItem);
break;
}
}
}
-/*************************************************************************
-|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Fontwork-Dialog
-|*
-\************************************************************************/
+// Derivation from SfxChildWindow as "containers" for Fontwork dialog
SvxFontWorkChildWindow::SvxFontWorkChildWindow
(
@@ -208,11 +196,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow
pDlg->Initialize( pInfo );
}
-/*************************************************************************
-|*
-|* Floating Window zur Attributierung von Texteffekten
-|*
-\************************************************************************/
+// Floating Window to the attribution of text effects
SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
SfxChildWindow *pCW,
@@ -288,7 +272,7 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
aMtrFldShadowX.SetModifyHdl( aLink );
aMtrFldShadowY.SetModifyHdl( aLink );
- // System-Metrik setzen
+ // Set System metric
const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE );
SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE );
@@ -323,12 +307,6 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
aFormSet.SetSizePixel(aSize);
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
SvxFontWorkDialog::~SvxFontWorkDialog()
{
for (USHORT i = 0; i < CONTROLLER_COUNT; i++)
@@ -379,12 +357,7 @@ SfxChildAlignment SvxFontWorkDialog::CheckAlignment( SfxChildAlignment eActAlign
return eAlignment;
}
-
-/*************************************************************************
-|*
-|* Style-Buttons setzen
-|*
-\************************************************************************/
+// Set style buttons
void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
{
@@ -424,11 +397,7 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
aTbxStyle.Disable();
}
-/*************************************************************************
-|*
-|* Adjust-Buttons setzen
-|*
-\************************************************************************/
+// Set adjust buttons
void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem)
{
@@ -466,41 +435,29 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem)
}
}
-/*************************************************************************
-|*
-|* Abstand-Wert in Editfeld eintragen
-|*
-\************************************************************************/
+// Enter Distance value in the edit field
void SvxFontWorkDialog::SetDistance_Impl(const XFormTextDistanceItem* pItem)
{
- // #104596# Use HasChildPathFocus() instead of HasFocus() at SpinFields
+ // Use HasChildPathFocus() instead of HasFocus() at SpinFields
if ( pItem && !aMtrFldDistance.HasChildPathFocus() )
{
SetMetricValue( aMtrFldDistance, pItem->GetValue(), SFX_MAPUNIT_100TH_MM );
}
}
-/*************************************************************************
-|*
-|* Einzug-Wert in Editfeld eintragen
-|*
-\************************************************************************/
+// Enter indent value in the edit field
void SvxFontWorkDialog::SetStart_Impl(const XFormTextStartItem* pItem)
{
- // #104596# Use HasChildPathFocus() instead of HasFocus() at SpinFields
+ // Use HasChildPathFocus() instead of HasFocus() at SpinFields
if ( pItem && !aMtrFldTextStart.HasChildPathFocus() )
{
SetMetricValue( aMtrFldTextStart, pItem->GetValue(), SFX_MAPUNIT_100TH_MM );
}
}
-/*************************************************************************
-|*
-|* Button fuer Umkehrung der Textrichtung setzen
-|*
-\************************************************************************/
+// Set button for reversing the direction of text
void SvxFontWorkDialog::SetMirror_Impl(const XFormTextMirrorItem* pItem)
{
@@ -508,11 +465,7 @@ void SvxFontWorkDialog::SetMirror_Impl(const XFormTextMirrorItem* pItem)
aTbxAdjust.CheckItem(TBI_ADJUST_MIRROR, pItem->GetValue());
}
-/*************************************************************************
-|*
-|* Standardform im ValueSet anzeigen
-|*
-\************************************************************************/
+// Standard form in ValueSet View
void SvxFontWorkDialog::SetStdForm_Impl(const XFormTextStdFormItem* pItem)
{
@@ -529,11 +482,7 @@ void SvxFontWorkDialog::SetStdForm_Impl(const XFormTextStdFormItem* pItem)
aFormSet.Disable();
}
-/*************************************************************************
-|*
-|* Button fuer Konturanzeige setzen
-|*
-\************************************************************************/
+// Set button for contour display
void SvxFontWorkDialog::SetShowForm_Impl(const XFormTextHideFormItem* pItem)
{
@@ -541,11 +490,7 @@ void SvxFontWorkDialog::SetShowForm_Impl(const XFormTextHideFormItem* pItem)
aTbxShadow.CheckItem(TBI_SHOWFORM, !pItem->GetValue());
}
-/*************************************************************************
-|*
-|* Button fuer Zeichenumrandung setzen
-|*
-\************************************************************************/
+// Set button for text border
void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem)
{
@@ -553,11 +498,7 @@ void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem)
aTbxShadow.CheckItem(TBI_OUTLINE, pItem->GetValue());
}
-/*************************************************************************
-|*
-|* Shadow-Buttons setzen
-|*
-\************************************************************************/
+// Set shadow buttons
void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
BOOL bRestoreValues)
@@ -665,11 +606,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
}
}
-/*************************************************************************
-|*
-|* Schattenfarbe in Listbox eintragen
-|*
-\************************************************************************/
+// Insert shadow color in listbox
void SvxFontWorkDialog::SetShadowColor_Impl(const XFormTextShadowColorItem* pItem)
{
@@ -677,15 +614,11 @@ void SvxFontWorkDialog::SetShadowColor_Impl(const XFormTextShadowColorItem* pIte
aShadowColorLB.SelectEntry(pItem->GetColorValue());
}
-/*************************************************************************
-|*
-|* X-Wert fuer Schatten in Editfeld eintragen
-|*
-\************************************************************************/
+// Enter X-value for shadow in edit field
void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
{
- // #104596# Use HasChildPathFocus() instead of HasFocus() at SpinFields
+ // Use HasChildPathFocus() instead of HasFocus() at SpinFields
if ( pItem && !aMtrFldShadowX.HasChildPathFocus() )
{
// #i19251#
@@ -712,15 +645,11 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
}
}
-/*************************************************************************
-|*
-|* Y-Wert fuer Schatten in Editfeld eintragen
-|*
-\************************************************************************/
+// Enter Y-value for shadow in edit field
void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem)
{
- // #104596# Use HasChildPathFocus() instead of HasFocus() at SpinFields
+ // Use HasChildPathFocus() instead of HasFocus() at SpinFields
if ( pItem && !aMtrFldShadowY.HasChildPathFocus() )
{
// #i19251#
@@ -842,9 +771,9 @@ IMPL_LINK_INLINE_END( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG )
{
- // System-Metrik evtl. neu setzen
- // Dieses sollte mal als Listener passieren, ist aber aus
- // inkompatibilitaetsgruenden z.Z. nicht moeglich
+ // Possibly set the Metric system again. This should be done with a
+ // listen, this is however not possible at the moment due to compabillity
+ // issues.
const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
if( eDlgUnit != aMtrFldDistance.GetUnit() )
{
@@ -888,7 +817,7 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG )
XFormTextShadowXValItem aShadowXItem( nValueX );
XFormTextShadowYValItem aShadowYItem( nValueY );
- // Slot-ID ist egal, die Exec-Methode wertet das gesamte ItemSet aus
+ // Slot-ID does not matter, the Exec method evaluates the entire item set
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_DISTANCE, SFX_CALLMODE_RECORD, &aDistItem,
&aStartItem, &aShadowXItem, &aShadowYItem, 0L );
return 0;
@@ -929,11 +858,7 @@ void SvxFontWorkDialog::SetActive(BOOL /*bActivate*/)
{
}
-/*************************************************************************
-|*
-|* Standard-FontWork-Objekt erzeugen
-|*
-\************************************************************************/
+// Create standard fontWork Object
void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
const SfxItemSet& rAttr,
@@ -1031,7 +956,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, FALSE).getB2DPolygon());
basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, FALSE).getB2DPolygon());
- // Polygone schliessen
+ // Close Polygon
aTopArc.setClosed(true);
aBottomArc.setClosed(true);
aPolyPolygon.append(aTopArc);
@@ -1102,7 +1027,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
}
if ( pNewObj )
{
- // #78478# due to DLs changes in Outliner the object needs
+ // due to DLs changes in Outliner the object needs
// a model to get an outliner for later calls to
// pNewObj->SetOutlinerParaObject(pPara) (see below).
pNewObj->SetModel(rOldObj.GetModel());
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index c970269..8f2a0cb 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -47,12 +47,6 @@
// #i72889#
#include "sdrpaintwindow.hxx"
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& /*rOldBoundRect*/ )
{
switch( eType )
@@ -71,13 +65,6 @@ void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, c
}
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) :
Control ( pParent, nWinBits ),
aMap100 ( MAP_100TH_MM ),
@@ -99,13 +86,6 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) :
EnableRTL( FALSE );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) :
Control ( pParent, rResId ),
aMap100 ( MAP_100TH_MM ),
@@ -126,13 +106,6 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) :
EnableRTL( FALSE );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
GraphCtrl::~GraphCtrl()
{
if( mpAccContext )
@@ -145,13 +118,6 @@ GraphCtrl::~GraphCtrl()
delete pUserCall;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::SetWinStyle( WinBits nWinBits )
{
nWinStyle = nWinBits;
@@ -172,24 +138,17 @@ void GraphCtrl::SetWinStyle( WinBits nWinBits )
InitSdrModel();
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::InitSdrModel()
{
SolarMutexGuard aGuard;
SdrPage* pPage;
- // alten Kram zerstoeren
+ // destroy old junk
delete pView;
delete pModel;
- // Model anlegen
+ // Creating a Model
pModel = new SdrModel;
pModel->GetItemPool().FreezeIdRanges();
pModel->SetScaleUnit( aMap100.GetMapUnit() );
@@ -203,12 +162,11 @@ void GraphCtrl::InitSdrModel()
pModel->InsertPage( pPage );
pModel->SetChanged( sal_False );
- // View anlegen
+ // Creating a View
pView = new GraphCtrlView( pModel, this );
pView->SetWorkArea( Rectangle( Point(), aGraphSize ) );
pView->EnableExtendedMouseEventDispatcher( TRUE );
pView->ShowSdrPage(pView->GetModel()->GetPage(0));
-// pView->ShowSdrPage(pView->GetModel()->GetPage(0));
pView->SetFrameDragSingles( TRUE );
pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC );
pView->SetEditMode( TRUE );
@@ -223,16 +181,9 @@ void GraphCtrl::InitSdrModel()
mpAccContext->setModelAndView (pModel, pView);
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::SetGraphic( const Graphic& rGraphic, BOOL bNewModel )
{
- // Bitmaps dithern wir ggf. fuer die Anzeige
+ // If possible we dither bitmaps for the display
if ( !bAnim && ( rGraphic.GetType() == GRAPHIC_BITMAP ) )
{
if ( rGraphic.IsTransparent() )
@@ -267,13 +218,6 @@ void GraphCtrl::SetGraphic( const Graphic& rGraphic, BOOL bNewModel )
Invalidate();
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::Resize()
{
Control::Resize();
@@ -289,7 +233,7 @@ void GraphCtrl::Resize()
double fGrfWH = (double) aGraphSize.Width() / aGraphSize.Height();
double fWinWH = (double) nWidth / nHeight;
- // Bitmap an Thumbgroesse anpassen
+ // Adapt Bitmap to Thumb size
if ( fGrfWH < fWinWH)
{
aNewSize.Width() = (long) ( (double) nHeight * fGrfWH );
@@ -304,7 +248,7 @@ void GraphCtrl::Resize()
aNewPos.X() = ( nWidth - aNewSize.Width() ) >> 1;
aNewPos.Y() = ( nHeight - aNewSize.Height() ) >> 1;
- // MapMode fuer Engine umsetzen
+ // Implementing MapMode for Engine
aDisplayMap.SetScaleX( Fraction( aNewSize.Width(), aGraphSize.Width() ) );
aDisplayMap.SetScaleY( Fraction( aNewSize.Height(), aGraphSize.Height() ) );
@@ -315,13 +259,6 @@ void GraphCtrl::Resize()
Invalidate();
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::Paint( const Rectangle& rRect )
{
// #i72889# used splitted repaint to be able to paint an own background
@@ -356,48 +293,20 @@ void GraphCtrl::Paint( const Rectangle& rRect )
}
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::SdrObjChanged( const SdrObject& )
{
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::SdrObjCreated( const SdrObject& )
{
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::MarkListHasChanged()
{
if ( aMarkObjLink.IsSet() )
aMarkObjLink.Call( this );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
KeyCode aCode( rKEvt.GetKeyCode() );
@@ -486,7 +395,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
if ( aCode.IsMod1() )
{
- // #97016# mark last object
+ // mark last object
pView->UnmarkAllObj();
pView->MarkNextObj(FALSE);
@@ -517,25 +426,25 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
if (aCode.GetCode() == KEY_UP)
{
- // Scroll nach oben
+ // Scroll up
nX = 0;
nY =-1;
}
else if (aCode.GetCode() == KEY_DOWN)
{
- // Scroll nach unten
+ // Scroll down
nX = 0;
nY = 1;
}
else if (aCode.GetCode() == KEY_LEFT)
{
- // Scroll nach links
+ // Scroll left
nX =-1;
nY = 0;
}
else if (aCode.GetCode() == KEY_RIGHT)
{
- // Scroll nach rechts
+ // Scroll right
nX = 1;
nY = 0;
}
@@ -544,7 +453,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
if(aCode.IsMod2())
{
- // #97016# move in 1 pixel distance
+ // move in 1 pixel distance
Size aLogicSizeOnePixel = PixelToLogic(Size(1,1));
nX *= aLogicSizeOnePixel.Width();
nY *= aLogicSizeOnePixel.Height();
@@ -556,13 +465,13 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
nY *= 100;
}
- // #97016# II
+ // II
const SdrHdlList& rHdlList = pView->GetHdlList();
SdrHdl* pHdl = rHdlList.GetFocusHdl();
if(0L == pHdl)
{
- // #90129# restrict movement to WorkArea
+ // restrict movement to WorkArea
const Rectangle& rWorkArea = pView->GetWorkArea();
if(!rWorkArea.IsEmpty())
@@ -711,13 +620,6 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
ReleaseMouse();
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt )
{
if ( bSdrMode && ( rMEvt.GetClicks() < 2 ) )
@@ -728,7 +630,7 @@ void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt )
Control::MouseButtonDown( rMEvt );
else
{
- // Focus anziehen fuer Key-Inputs
+ // Get Focus for key inputs
GrabFocus();
if ( nPolyEdit )
@@ -747,7 +649,7 @@ void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt )
SdrObject* pCreateObj = pView->GetCreateObj();
- // Wir wollen das Inserten mitbekommen
+ // We want to realize the insert
if ( pCreateObj && !pCreateObj->GetUserCall() )
pCreateObj->SetUserCall( pUserCall );
@@ -757,13 +659,6 @@ void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt )
Control::MouseButtonDown( rMEvt );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::MouseMove(const MouseEvent& rMEvt)
{
const Point aLogPos( PixelToLogic( rMEvt.GetPosPixel() ) );
@@ -795,13 +690,6 @@ void GraphCtrl::MouseMove(const MouseEvent& rMEvt)
}
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::MouseButtonUp(const MouseEvent& rMEvt)
{
if ( bSdrMode )
@@ -818,13 +706,6 @@ void GraphCtrl::MouseButtonUp(const MouseEvent& rMEvt)
Control::MouseButtonUp( rMEvt );
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
SdrObject* GraphCtrl::GetSelectedSdrObject() const
{
SdrObject* pSdrObj = NULL;
@@ -840,13 +721,6 @@ SdrObject* GraphCtrl::GetSelectedSdrObject() const
return pSdrObj;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::SetEditMode( const BOOL _bEditMode )
{
if ( bSdrMode )
@@ -860,13 +734,6 @@ void GraphCtrl::SetEditMode( const BOOL _bEditMode )
bEditMode = FALSE;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::SetPolyEditMode( const USHORT _nPolyEdit )
{
if ( bSdrMode && ( _nPolyEdit != nPolyEdit ) )
@@ -878,13 +745,6 @@ void GraphCtrl::SetPolyEditMode( const USHORT _nPolyEdit )
nPolyEdit = 0;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind )
{
if ( bSdrMode )
@@ -898,13 +758,6 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind )
eObjKind = OBJ_NONE;
}
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
String GraphCtrl::GetStringFromDouble( const double& rDouble )
{
sal_Unicode cSep =
@@ -914,13 +767,6 @@ String GraphCtrl::GetStringFromDouble( const double& rDouble )
return aStr;
}
-
-/*************************************************************************
-www|*
-|*
-|*
-\************************************************************************/
-
IMPL_LINK( GraphCtrl, UpdateHdl, Timer*, pTimer )
{
if ( aUpdateLink.IsSet() )
@@ -944,7 +790,7 @@ IMPL_LINK( GraphCtrl, UpdateHdl, Timer*, pTimer )
{
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccParent( pParent->GetAccessible() );
- // #103856# Disable accessibility if no model/view data available
+ // Disable accessibility if no model/view data available
if( pView &&
pModel &&
xAccParent.is() )
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 089bb4d..ee074a3 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -65,12 +65,11 @@
// static ----------------------------------------------------------------
// Word 97 incompatibility (#i19922#)
-//static const long MINBODY = 284; // 0,5cm in twips aufgerundet
static const long MINBODY = 56; // 1mm in twips rounded
// default distance to Header or footer
static const long DEF_DIST_WRITER = 500; // 5mm (Writer)
-static const long DEF_DIST_CALC = 250; // 2,5mm (Calc)
+static const long DEF_DIST_CALC = 250; // 2.5mm (Calc)
static USHORT pRanges[] =
{
@@ -90,7 +89,7 @@ static USHORT pRanges[] =
0
};
-// gibt den Bereich der Which-Werte zurueck
+// returns the Which values to the range
USHORT* SvxHeaderPage::GetRanges()
@@ -168,12 +167,12 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U
InitHandler();
aBspWin.EnableRTL( FALSE );
- // diese Page braucht ExchangeSupport
+ // This Page needs ExchangeSupport
SetExchangeSupport();
FreeResource();
- // Metrik einstellen
+ // Set metrics
FieldUnit eFUnit = GetModuleFieldUnit( rAttr );
SetFieldUnit( aDistEdit, eFUnit );
SetFieldUnit( aHeightEdit, eFUnit );
@@ -234,20 +233,18 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
delete pBoolItem;
}
- // Groesse
+ // Size
SvxSizeItem aSizeItem( (const SvxSizeItem&)rOldSet.Get( nWSize ) );
Size aSize( aSizeItem.GetSize() );
long nDist = GetCoreValue( aDistEdit, eUnit );
long nH = GetCoreValue( aHeightEdit, eUnit );
- // fixe Hoehe?
-// if ( !aHeightDynBtn.IsChecked() )
- nH += nDist; // dann Abstand dazu addieren
+ nH += nDist; // add distance
aSize.Height() = nH;
aSizeItem.SetSize( aSize );
aSet.Put( aSizeItem );
- // Raender
+ // Margins
SvxLRSpaceItem aLR( nWLRSpace );
aLR.SetLeft( (USHORT)GetCoreValue( aLMEdit, eUnit ) );
aLR.SetRight( (USHORT)GetCoreValue( aRMEdit, eUnit ) );
@@ -260,7 +257,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
aUL.SetUpper( (USHORT)nDist );
aSet.Put( aUL );
- // Hintergrund und Umrandung?
+ // Background and border?
if ( pBBSet )
aSet.Put( *pBBSet );
else
@@ -284,7 +281,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
}
}
- // Das SetItem wegschreiben
+ // Flush the SetItem
SvxSetItem aSetItem( GetWhich( nId ), aSet );
rSet.Put( aSetItem );
@@ -298,11 +295,10 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
ResetBackground_Impl( rSet );
SfxItemPool* pPool = GetItemSet().GetPool();
- DBG_ASSERT( pPool, "Wo ist der Pool" );
+ DBG_ASSERT( pPool, "Where is the pool" );
SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_PAGE_SIZE ) );
- // Kopf-/Fusszeilen-Attribute auswerten
- //
+ // Evaluate header-/footer- attributes
const SvxSetItem* pSetItem = 0;
if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), FALSE,
@@ -335,12 +331,12 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
if ( nId == SID_ATTR_PAGE_HEADERSET )
- { // Kopfzeile
+ { // Header
SetMetricValue( aDistEdit, rUL.GetLower(), eUnit );
SetMetricValue( aHeightEdit, rSize.GetSize().Height() - rUL.GetLower(), eUnit );
}
else
- { // Fusszeile
+ { // Footer
SetMetricValue( aDistEdit, rUL.GetUpper(), eUnit );
SetMetricValue( aHeightEdit, rSize.GetSize().Height() - rUL.GetUpper(), eUnit );
}
@@ -402,10 +398,6 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
}
-/*--------------------------------------------------------------------
- Beschreibung: Handler initialisieren
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list