[Libreoffice-commits] core.git: sd/source
Urs Fässler
urs at bitzgi.ch
Tue Mar 19 14:24:27 PDT 2013
sd/source/ui/view/DocumentRenderer.cxx | 9
sd/source/ui/view/Outliner.cxx | 24 --
sd/source/ui/view/drbezob.cxx | 2
sd/source/ui/view/drtxtob1.cxx | 2
sd/source/ui/view/drviews1.cxx | 2
sd/source/ui/view/drviews3.cxx | 54 +----
sd/source/ui/view/drviews4.cxx | 86 ++------
sd/source/ui/view/drviews5.cxx | 76 ++-----
sd/source/ui/view/drviews6.cxx | 94 +++------
sd/source/ui/view/drviews7.cxx | 88 ++++----
sd/source/ui/view/drviews8.cxx | 28 --
sd/source/ui/view/drviews9.cxx | 81 ++------
sd/source/ui/view/drviewsa.cxx | 107 +++-------
sd/source/ui/view/drviewsb.cxx | 31 +--
sd/source/ui/view/drviewsc.cxx | 77 ++-----
sd/source/ui/view/drviewsd.cxx | 26 --
sd/source/ui/view/drviewse.cxx | 61 ++----
sd/source/ui/view/drviewsf.cxx | 43 +---
sd/source/ui/view/drviewsg.cxx | 22 --
sd/source/ui/view/drviewsh.cxx | 16 -
sd/source/ui/view/drviewsi.cxx | 30 +-
sd/source/ui/view/drviewsj.cxx | 28 +-
sd/source/ui/view/drvwshrg.cxx | 8
sd/source/ui/view/frmview.cxx | 59 +----
sd/source/ui/view/grviewsh.cxx | 5
sd/source/ui/view/outlnvs2.cxx | 8
sd/source/ui/view/outlnvsh.cxx | 255 +++++++------------------
sd/source/ui/view/outlview.cxx | 220 ++++++---------------
sd/source/ui/view/sdruler.cxx | 49 ----
sd/source/ui/view/sdview.cxx | 126 +++---------
sd/source/ui/view/sdview2.cxx | 23 +-
sd/source/ui/view/sdview3.cxx | 12 -
sd/source/ui/view/sdview4.cxx | 52 +----
sd/source/ui/view/sdwindow.cxx | 334 ++++++++++-----------------------
sd/source/ui/view/tabcontr.cxx | 32 ---
sd/source/ui/view/unmodpg.cxx | 29 --
sd/source/ui/view/viewshe2.cxx | 219 +++++----------------
sd/source/ui/view/viewshe3.cxx | 13 -
sd/source/ui/view/viewshel.cxx | 81 +-------
39 files changed, 756 insertions(+), 1756 deletions(-)
New commits:
commit 6e7ec40523fa4822ff5f66ad112ffcea6e823b3a
Author: Urs Fässler <urs at bitzgi.ch>
Date: Tue Mar 19 22:24:19 2013 +0100
translation and cleanup of comments in sd/source/ui/view/
Change-Id: I988c0545600185c6b09131d27fb8480efddd947f
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 83fda37..b250e8a 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1984,7 +1984,7 @@ private:
continue;
MapMode aMap (rInfo.maMap);
- // Kann sich die Seitengroesse geaendert haben?
+ // is it possible that the page size changed?
const Size aPageSize = pPage->GetSize();
if (mpOptions->IsPageSize())
@@ -2014,9 +2014,10 @@ private:
long aPageWidth = aPageSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder();
long aPageHeight = aPageSize.Height() - pPage->GetUppBorder() - pPage->GetLwrBorder();
- // Bugfix zu 44530:
- // Falls implizit umgestellt wurde (Landscape/Portrait)
- // wird dies beim Kacheln, bzw. aufteilen (Poster) beruecksichtigt
+ // Bugfix for 44530:
+ // if it was implicitly changed (Landscape/Portrait),
+ // this is considered for tiling, respectively for the splitting up
+ // (Poster)
if( ( rInfo.maPrintSize.Width() > rInfo.maPrintSize.Height()
&& aPageWidth < aPageHeight )
|| ( rInfo.maPrintSize.Width() < rInfo.maPrintSize.Height()
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index b2ab27d..508a1b6 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -126,12 +126,6 @@ private:
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
: SdrOutliner( &pDoc->GetItemPool(), nMode ),
mpImpl(new Implementation()),
@@ -410,12 +404,9 @@ sal_Bool Outliner::SpellNextDocument (void)
}
-/*************************************************************************
-|*
-|* Spelling: naechstes TextObjekt pruefen
-|*
-\************************************************************************/
-
+/**
+ * check next text object
+ */
::svx::SpellPortions Outliner::GetNextSpellSentence (void)
{
::svx::SpellPortions aResult;
@@ -1385,12 +1376,9 @@ void Outliner::EnterEditMode (sal_Bool bGrabFocus)
-/*************************************************************************
-|*
-|* SpellChecker: Error-LinkHdl
-|*
-\************************************************************************/
-
+/**
+ * SpellChecker: Error link handler
+ */
IMPL_LINK_INLINE_START( Outliner, SpellError, void *, nLang )
{
mbError = true;
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index 6aa095b..4abd08f 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -155,7 +155,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet)
switch (eSegm)
{
case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break;
- case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button reingedrueckt = Kurve
+ case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button down = curve
case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_True)); break;
default: break;
}
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 4163ff1..2d6b18a 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -148,7 +148,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
SfxItemSet aAttr( pStyleSheet->GetItemSet() );
SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( (sal_uInt16) nPara ) );
- aAttr.Put( aTmpSet, sal_False ); // sal_False= InvalidItems nicht als Default, sondern als "Loecher" betrachten
+ aAttr.Put( aTmpSet, sal_False ); // sal_False= InvalidItems is not default, handle it as "holes"
const SvxULSpaceItem& rItem = (const SvxULSpaceItem&) aAttr.Get( EE_PARA_ULSPACE );
SvxULSpaceItem* pNewItem = (SvxULSpaceItem*) rItem.Clone();
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 10c5c62..e74f82c 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1009,7 +1009,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
SdPage* pMaster = GetDoc()->GetMasterSdPage(nSelectedPage, mePageKind);
- if( !pMaster ) // Falls es diese Page nicht geben sollte
+ if( !pMaster ) // if this page should not exist
pMaster = GetDoc()->GetMasterSdPage(0, mePageKind);
sal_uInt16 nNum = pMaster->GetPageNum();
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 2a73662..77a1c2a 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -90,16 +90,13 @@ using ::com::sun::star::frame::XController;
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer Controller bearbeiten
-|*
-\************************************************************************/
-
+/**
+ * handle SfxRequests for controller
+ */
void DrawViewShell::ExecCtrl(SfxRequest& rReq)
{
- // waehrend einer Diashow wird nichts ausser dem Seitenwechsel und dem
- // Sprung zur Bookmark ausgefuehrt!
+ // except a page switch and jumps to bookmarks, nothing is executed during
+ // a slide show
if( HasCurrentFunction(SID_PRESENTATION) &&
rReq.GetSlot() != SID_SWITCHPAGE &&
rReq.GetSlot() != SID_JUMPTOMARK)
@@ -236,7 +233,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
}
}
- // Default-Layer der Page einschalten
+ // turn on default layer of page
mpDrawView->SetActiveLayer( String( SdResId(STR_LAYER_LAYOUT) ) );
ChangeEditMode(EM_PAGE, mbIsLayerModeActive);
@@ -313,9 +310,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
}
case SID_OBJECTRESIZE:
{
- /******************************************************************
- * Der Server moechte die Clientgrosse verandern
- ******************************************************************/
+ // The server likes to change the client size
OSL_ASSERT (GetViewShell()!=NULL);
SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient();
@@ -374,7 +369,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
p3DWin->DocumentReload();
}
- // Normale Weiterleitung an ViewFrame zur Ausfuehrung
+ // normal forwarding to ViewFrame for execution
GetViewFrame()->ExecuteSlot(rReq);
// From here on we must cope with this object and the frame already being
@@ -466,15 +461,10 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
}
}
-/*************************************************************************
-|*
-|* SfxRequests fuer Lineale bearbeiten
-|*
-\************************************************************************/
void DrawViewShell::ExecRuler(SfxRequest& rReq)
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -750,16 +740,12 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
}
}
if ( pUndoGroup )
- // Undo Gruppe dem Undo Manager uebergeben
+ // give the undo group to the undo manager
GetViewFrame()->GetObjectShell()->GetUndoManager()->
AddUndoAction(pUndoGroup);
}
-/*************************************************************************
-|*
-|* Statuswerte der Lineale bestimmen
-|*
-\************************************************************************/
+
void DrawViewShell::GetRulerState(SfxItemSet& rSet)
{
Point aOrigin;
@@ -868,7 +854,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
rSet.DisableItem( SID_RULER_OBJECT );
- // Seitenraender werden gelocked
+ // lock page margins
aProtect.SetSizeProtect( sal_True );
aProtect.SetPosProtect( sal_True );
}
@@ -914,15 +900,10 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
rSet.Put( aProtect );
}
-/*************************************************************************
-|*
-|* SfxRequests fuer StatusBar bearbeiten
-|*
-\************************************************************************/
void DrawViewShell::ExecStatusBar(SfxRequest& rReq)
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -944,12 +925,9 @@ void DrawViewShell::ExecStatusBar(SfxRequest& rReq)
}
}
-/*************************************************************************
-|*
-|* Status der Snap-Objekt-Eintraege im Popup setzen
-|*
-\************************************************************************/
-
+/**
+ * set state of snap object entries in popup
+ */
void DrawViewShell::GetSnapItemState( SfxItemSet &rSet )
{
SdrPageView* pPV;
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index c3511c9..e360345 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -71,11 +71,6 @@ namespace sd {
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing;
-/*************************************************************************
-|*
-|* aktuelle Seite loeschen
-|*
-\************************************************************************/
void DrawViewShell::DeleteActualPage()
{
@@ -96,11 +91,6 @@ void DrawViewShell::DeleteActualPage()
}
}
-/*************************************************************************
-|*
-|* aktuelle Ebene loeschen
-|*
-\************************************************************************/
void DrawViewShell::DeleteActualLayer()
{
@@ -108,7 +98,7 @@ void DrawViewShell::DeleteActualLayer()
const String& rName = GetLayerTabControl()->GetPageText(GetLayerTabControl()->GetCurPageId());
String aString(SdResId(STR_ASK_DELETE_LAYER));
- // Platzhalter ersetzen
+ // replace placeholder
sal_uInt16 nPos = aString.Search(sal_Unicode('$'));
aString.Erase(nPos, 1);
aString.Insert(rName, nPos);
@@ -118,22 +108,16 @@ void DrawViewShell::DeleteActualLayer()
const SdrLayer* pLayer = rAdmin.GetLayer(rName, sal_False);
mpDrawView->DeleteLayer( pLayer->GetName() );
- // damit TabBar und Window neu gezeichnet werden;
- // sollte spaeter wie beim Aendern der Layerfolge durch einen
- // Hint von Joe angestossen werden
+ /* in order to redraw TabBar and Window; should be initiated later on by
+ a hint from Joe (as by a change if the layer order). */
// ( View::Notify() --> ViewShell::ResetActualLayer() )
- mbIsLayerModeActive = false; // damit ChangeEditMode() ueberhaupt was tut
+ mbIsLayerModeActive = false; // so that ChangeEditMode() does something
ChangeEditMode(GetEditMode(), true);
}
}
-/*************************************************************************
-|*
-|* Keyboard event
-|*
-\************************************************************************/
sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
{
@@ -213,12 +197,9 @@ sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
return bRet;
}
-/*************************************************************************
-|*
-|* Vom Lineal ausgehenden Drag (Hilflinien, Ursprung) beginnen
-|*
-\************************************************************************/
-
+/**
+ * Start with Drag from ruler (helper lines, origin)
+ */
void DrawViewShell::StartRulerDrag (
const Ruler& rRuler,
const MouseEvent& rMEvt)
@@ -252,11 +233,6 @@ void DrawViewShell::StartRulerDrag (
}
}
-/*************************************************************************
-|*
-|* MouseButtonDown event
-|*
-\************************************************************************/
void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt,
::sd::Window* pWin)
@@ -282,11 +258,6 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt,
}
}
-/*************************************************************************
-|*
-|* MouseMove event
-|*
-\************************************************************************/
void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
@@ -397,11 +368,6 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
}
-/*************************************************************************
-|*
-|* MouseButtonUp event
-|*
-\************************************************************************/
void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
{
@@ -441,11 +407,6 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
}
}
-/*************************************************************************
-|*
-|* Command event
-|*
-\************************************************************************/
void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
{
@@ -501,38 +462,38 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
else if( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && !bNativeShow &&
pWin != NULL && !mpDrawView->IsAction() && !SD_MOD()->GetWaterCan() )
{
- sal_uInt16 nSdResId = 0; // ResourceID fuer Popup-Menue
+ sal_uInt16 nSdResId = 0; // ResourceID for popup menu
sal_Bool bGraphicShell = this->ISA(GraphicViewShell);
- // Ist ein Fangobjekt unter dem Mauszeiger?
+ // is there a snap object under the cursor?
SdrPageView* pPV;
Point aMPos = pWin->PixelToLogic( maMousePos );
sal_uInt16 nHitLog = (sal_uInt16) GetActiveWindow()->PixelToLogic(
Size(FuPoor::HITPIX, 0 ) ).Width();
sal_uInt16 nHelpLine;
- // fuer Klebepunkt
+ // for glue points
SdrObject* pObj = NULL;
sal_uInt16 nPickId = 0;
- // fuer Feldbefehl
+ // for field command
OutlinerView* pOLV = mpDrawView->GetTextEditOutlinerView();
const SvxFieldItem* pFldItem = NULL;
if( pOLV )
pFldItem = pOLV->GetFieldAtSelection();
- // Hilfslinie
+ // helper line
if ( mpDrawView->PickHelpLine( aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) )
{
nSdResId = RID_DRAW_SNAPOBJECT_POPUP;
ShowSnapLineContextMenu(*pPV, nHelpLine, rCEvt.GetMousePosPixel());
return;
}
- // Klebepunkt unter dem Mauszeiger markiert?
+ // is glue point under cursor marked?
else if( mpDrawView->PickGluePoint( aMPos, pObj, nPickId, pPV ) &&
mpDrawView->IsGluePointMarked( pObj, nPickId ) )
{
nSdResId = RID_DRAW_GLUEPOINT_POPUP;
}
- // Feldbefehl ?
+ // field command?
else if( pFldItem && (pFldItem->GetField()->ISA( SvxDateField ) ||
pFldItem->GetField()->ISA( SvxExtTimeField ) ||
pFldItem->GetField()->ISA( SvxExtFileField ) ||
@@ -559,7 +520,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
if( pField )
{
SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD );
- // Feld selektieren, so dass es beim Insert geloescht wird
+ // select field, so that it will be deleted on insert
ESelection aSel = pOLV->GetSelection();
sal_Bool bSel = sal_True;
if( aSel.nStartPos == aSel.nEndPos )
@@ -571,7 +532,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
pOLV->InsertField( aFieldItem );
- // Selektion wird wieder in den Ursprungszustand gebracht
+ // reset selection back to original state
if( !bSel )
aSel.nEndPos--;
pOLV->SetSelection( aSel );
@@ -581,7 +542,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
}
else
{
- // ist etwas selektiert?
+ // is something selected?
if (mpDrawView->AreObjectsMarked() &&
mpDrawView->GetMarkedObjectList().GetMarkCount() == 1 )
{
@@ -740,7 +701,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
}
}
- // Mehrfachselektion
+ // multiple selection
else if (mpDrawView->AreObjectsMarked() &&
mpDrawView->GetMarkedObjectList().GetMarkCount() > 1 )
{
@@ -748,7 +709,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
RID_DRAW_MULTISELECTION_POPUP;
}
- // nichts selektiert
+ // nothing selected
else
{
nSdResId = bGraphicShell ? RID_GRAPHIC_NOSEL_POPUP :
@@ -801,11 +762,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
}
}
-/*************************************************************************
-|*
-|* Linealmarkierungen anzeigen
-|*
-\************************************************************************/
void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect,
::sd::Window* pWin)
@@ -857,7 +813,7 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect,
mpVerticalRuler->SetLines(nCnt, pVLines);
}
- // StatusBar Koordinatenanzeige
+ // display with coordinates in StatusBar
OSL_ASSERT (GetViewShell()!=NULL);
if ( !GetViewShell()->GetUIActiveClient() )
{
@@ -866,7 +822,7 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect,
SID_ATTR_SIZE, SID_ATTR_SIZE,
0L);
-// GetStatusBarState(aSet); nicht performant bei gedrueckter Modifiertaste!!
+// GetStatusBarState(aSet); not fast by pressed modify key!!
aSet.Put( SfxStringItem( SID_CONTEXT, mpDrawView->GetStatusText() ) );
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index c87d25b..3648561 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -69,24 +69,18 @@ static const int TABCONTROL_INITIAL_SIZE = 350;
static const int PAPER_SHADOW_EXT_PIXEL = 2;
-/*************************************************************************
-|*
-|* Wird gerufen, wenn sich das Model aendert
-|*
-\************************************************************************/
void DrawViewShell::ModelHasChanged()
{
Invalidate();
- // Damit der Navigator auch einen aktuellen Status bekommt
+ // that the navigator also gets an up to date state
GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False );
SfxBoolItem aItem( SID_3D_STATE, sal_True );
GetViewFrame()->GetDispatcher()->Execute(
SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
- // jetzt den von der Drawing Engine neu erzeugten TextEditOutliner
- // initialisieren
+ // now initialize the TextEditOutliner which was newly created by the draw engine
::Outliner* pOutliner = mpDrawView->GetTextEditOutliner();
if (pOutliner)
{
@@ -144,28 +138,25 @@ void DrawViewShell::ArrangeGUIElements (void)
if ( mbZoomOnPage && !bInPlaceActive && !bClientActive )
{
- // bei Split immer erstes Fenster resizen
+ // with split, always resize first window
//af pWindow = mpContentWindow.get();
SfxRequest aReq(SID_SIZE_PAGE, 0, GetDoc()->GetItemPool());
ExecuteSlot( aReq );
}
}
-/*************************************************************************
-|*
-|* Daten der FrameView auf die aktuelle View uebertragen
-|*
-\************************************************************************/
-
+/**
+ * Apply data of the FrameView on the current view
+ */
void DrawViewShell::ReadFrameViewData(FrameView* pView)
{
ModifyGuard aGuard( GetDoc() );
- // Diese Option wird am Model eingestellt
+ // this option has to be adjust at the model
GetDoc()->SetPickThroughTransparentTextFrames(
SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType())->IsPickThrough());
- // Initialisierungen der Zeichen-(Bildschirm-)Attribute
+ // initialization of the Character-(Screen-) attribute
if (HasRuler() != pView->HasRuler())
SetRuler( pView->HasRuler() );
@@ -304,7 +295,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
ChangeEditMode(eNewEditMode, bNewLayerMode);
SwitchPage(nSelectedPage);
- // DrawMode fuer 'Normales' Fenster wiederherstellen
+ // restore DrawMode for 'normal' window
if(GetActiveWindow()->GetDrawMode() != pView->GetDrawMode())
GetActiveWindow()->SetDrawMode(pView->GetDrawMode());
@@ -314,20 +305,18 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
GetViewFrame()->GetDispatcher()->Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aDesignModeItem, 0L );
}
- // Muss am Ende gerufen werden, da ein WriteFrameViewData() ausgeloest wird
+ // has to be called in the end, because it executes a WriteFrameViewData()
if (mpDrawView->IsFrameDragSingles() != pView->IsFrameDragSingles() )
mpDrawView->SetFrameDragSingles( pView->IsFrameDragSingles() );
}
-/*************************************************************************
-|*
-|* Daten der aktuellen View auf die FrameView uebertragen
-|*
-\************************************************************************/
+/**
+ * Apply data of the current view on the FrameView
+ */
void DrawViewShell::WriteFrameViewData()
{
- // Zeichen-(Bildschirm-)Attribute an FrameView merken
+ // store character-(screen-) attribute of FrameView
mpFrameView->SetRuler( HasRuler() );
mpFrameView->SetGridCoarse( mpDrawView->GetGridCoarse() );
mpFrameView->SetGridFine( mpDrawView->GetGridFine() );
@@ -402,33 +391,24 @@ void DrawViewShell::WriteFrameViewData()
if ( mpFrameView->GetActiveLayer() != mpDrawView->GetActiveLayer() )
mpFrameView->SetActiveLayer( mpDrawView->GetActiveLayer() );
- // DrawMode fuer 'Normales' Fenster merken
+ // store DrawMode for 'normal' window
if(mpFrameView->GetDrawMode() != GetActiveWindow()->GetDrawMode())
mpFrameView->SetDrawMode(GetActiveWindow()->GetDrawMode());
}
-/*************************************************************************
-|*
-|* PrePaint-Method
-|*
-\************************************************************************/
-
void DrawViewShell::PrePaint()
{
mpDrawView->PrePaint();
}
-/*************************************************************************
-|*
-|* Paint-Methode: das Ereignis wird vom Fenster pWin an
-|* die Viewshell und die aktuelle Funktion weitergeleitet
-|*
-|* Anmerkung: pWin==NULL, wenn Paint() vom ShowWindow gerufen wird!
-|*
-\************************************************************************/
-
+/**
+ * The event is forwarded to the Viewshell and the current function by the
+ * window pWin.
+ *
+ * Remark: pWin==NULL, if Paint() is called from ShowWindow!
+ */
void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin)
{
// Fill var FillColor here to have it available on later call
@@ -462,12 +442,9 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin)
}
}
-/*************************************************************************
-|*
-|* Zoom-Faktor fuer InPlace einstellen
-|*
-\************************************************************************/
-
+/**
+ * adjust zoom factor for InPlace
+ */
void DrawViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY)
{
ViewShell::SetZoomFactor(rZoomX, rZoomY);
@@ -476,11 +453,6 @@ void DrawViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY
GetActiveWindow()->SetWinViewPos(aOrigin);
}
-/*************************************************************************
-|*
-|* Seite wird gehided
-|*
-\************************************************************************/
void DrawViewShell::HidePage()
{
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 0ab058b..5116d1b 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -63,15 +63,12 @@
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer FontWork bearbeiten
-|*
-\************************************************************************/
-
+/**
+ * handle SfxRequests for FontWork
+ */
void DrawViewShell::ExecFormText(SfxRequest& rReq)
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -104,7 +101,7 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq)
GetValue());
if(HasCurrentFunction(SID_BEZIER_EDIT))
- { // ggf. die richtige Editfunktion aktivieren
+ { // activate the right edit function if necessary
GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT,
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
}
@@ -114,12 +111,9 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq)
}
}
-/*************************************************************************
-|*
-|* Statuswerte fuer FontWork zurueckgeben
-|*
-\************************************************************************/
-
+/**
+ * Return state values for FontWork
+ */
void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
{
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
@@ -137,7 +131,7 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
if ( pObj == NULL || !pObj->ISA(SdrTextObj) ||
!((SdrTextObj*) pObj)->HasText() )
{
-// automatisches Auf/Zuklappen des FontWork-Dialog; erstmal deaktiviert
+// automatic open/close the FontWork-Dialog; first deactivate it
rSet.DisableItem(XATTR_FORMTXTSTYLE);
rSet.DisableItem(XATTR_FORMTXTADJUST);
@@ -163,15 +157,10 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
}
}
-/*************************************************************************
-|*
-|* SfxRequests fuer Animator bearbeiten
-|*
-\************************************************************************/
void DrawViewShell::ExecAnimationWin( SfxRequest& rReq )
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if (HasCurrentFunction(SID_PRESENTATION))
return;
@@ -206,20 +195,17 @@ void DrawViewShell::ExecAnimationWin( SfxRequest& rReq )
}
}
-/*************************************************************************
-|*
-|* Statuswerte fuer Animator zurueckgeben
-|*
-|* nValue == 0 -> Kein Button
-|* nValue == 1 -> Button 'uebernehmen'
-|* nValue == 2 -> Button 'einzeln uebernehmen'
-|* nValue == 3 -> Buttons 'uebernehmen' und 'einzeln uebernehmen'
-|*
-\************************************************************************/
-
+/**
+ * Return status values for animator
+ *
+ * nValue == 0 -> No button
+ * nValue == 1 -> Button 'accept'
+ * nValue == 2 -> Button 'accept individually'
+ * nValue == 3 -> Buttons 'accept' and 'accept individually'
+ */
void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet )
{
- // Hier koennten Buttons etc. disabled werden
+ // here we could disable buttons etc.
sal_uInt16 nValue;
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
@@ -229,15 +215,15 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet )
nValue = 0;
else if( nMarkCount > 1 )
nValue = 3;
- else // 1 Objekt
+ else // 1 Object
{
const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
sal_uInt32 nInv = pObj->GetObjInventor();
sal_uInt16 nId = pObj->GetObjIdentifier();
- // 1 selektiertes Gruppenobjekt
+ // 1 selected group object
if( nInv == SdrInventor && nId == OBJ_GRUP )
nValue = 3;
- else if( nInv == SdrInventor && nId == OBJ_GRAF ) // Anim. GIF ?
+ else if( nInv == SdrInventor && nId == OBJ_GRAF ) // Animated GIF ?
{
sal_uInt16 nCount = 0;
@@ -254,15 +240,10 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet )
rSet.Put( SfxUInt16Item( SID_ANIMATOR_STATE, nValue ) );
}
-/*************************************************************************
-|*
-|* Statuswerte fuer SfxChildWindows setzen
-|*
-\************************************************************************/
void DrawViewShell::SetChildWindowState( SfxItemSet& rSet )
{
- // Stati der SfxChild-Windows (Animator, Fontwork etc.)
+ // State of SfxChild-Windows (Animator, Fontwork etc.)
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_FONTWORK ) )
{
sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
@@ -316,15 +297,12 @@ void DrawViewShell::SetChildWindowState( SfxItemSet& rSet )
}
-/*************************************************************************
-|*
-|* SfxRequests fuer Pipette bearbeiten
-|*
-\************************************************************************/
-
+/**
+ * Handle SfxRequests for pipette
+ */
void DrawViewShell::ExecBmpMask( SfxRequest& rReq )
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if (HasCurrentFunction(SID_PRESENTATION))
return;
@@ -425,12 +403,9 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet )
rSet.Put( SfxBoolItem( SID_BMPMASK_EXEC, bEnable ) );
}
-/*************************************************************************
-|*
-|* SfxRequests fuer temporaere Funktionen
-|*
-\************************************************************************/
-
+/**
+ * SfxRequests for temporary functions
+ */
void DrawViewShell::FuTemp04(SfxRequest& rReq)
{
sal_uInt16 nSId = rReq.GetSlot();
@@ -600,10 +575,11 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq)
case SID_CONVERT_TO_3D_LATHE_FAST:
{
- // Der Aufruf ist ausreichend. Die Initialisierung per Start3DCreation und CreateMirrorPolygons
- // ist nicht mehr noetig, falls der Parameter sal_True uebergeben wird. Dann wird sofort und
- // ohne Benutzereingriff ein gekippter Rotationskoerper mit einer Achse links neben dem
- // Umschliessenden Rechteck der slektierten Objekte gezeichnet.
+ /* The call is enough. The initialization via Start3DCreation and
+ CreateMirrorPolygons is no longer needed if the parameter
+ sal_True is provided. Then a tilted rotary body with an axis left
+ besides the bounding rectangle of the selected objects is drawn
+ immediately and without user interaction. */
mpDrawView->SdrEndTextEdit();
if(GetActiveWindow())
GetActiveWindow()->EnterWait();
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index b7ef100..6410050 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -204,11 +204,6 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper
return 0;
}
-/*************************************************************************
-|*
-|* Status (Enabled/Disabled) von Menue-SfxSlots setzen
-|*
-\************************************************************************/
void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
@@ -238,10 +233,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
//format paintbrush
FuFormatPaintBrush::GetMenuState( *this, rSet );
- // Stati der SfxChild-Windows (Animator, Fontwork etc.)
+ // State of SfxChild-Windows (Animator, Fontwork etc.)
SetChildWindowState( rSet );
- // Images der Toolboxen mappen (nur Zoom)
+ // map images of toolboxes (only zoom)
UpdateToolboxImages( rSet, sal_False );
if(HasCurrentFunction())
@@ -250,10 +245,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put( SfxBoolItem( nSId, sal_True ) );
- // Bewirkt ein uncheck eines simulierten Slots
+ // will cause a uncheck of a simulated slot
sal_uInt16 nId = GetIdBySubId( nSId );
- // Images der Toolboxen mappen
+ // map images of the toolboxes
UpdateToolboxImages( rSet );
if( nId != SID_ZOOM_TOOLBOX &&
@@ -389,7 +384,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // Starten der Praesentation moeglich?
+ // is it possible to start the presentation?
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) )
{
@@ -411,7 +406,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // Klebepunkte
+ // glue points
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_EDITMODE ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_INSERT_POINT ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_PERCENT ) ||
@@ -427,14 +422,14 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_VERTALIGN_TOP ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_VERTALIGN_BOTTOM ) )
{
- // Prozent
+ // percent
TRISTATE eState = mpDrawView->IsMarkedGluePointsPercent();
if( eState == STATE_DONTKNOW )
rSet.InvalidateItem( SID_GLUE_PERCENT );
else
rSet.Put( SfxBoolItem( SID_GLUE_PERCENT, eState == STATE_CHECK ) );
- // Bei Prozent hat Alignment keinen Effekt
+ // alignment has no effect by percent
if( eState == STATE_CHECK )
{
rSet.DisableItem( SID_GLUE_HORZALIGN_CENTER );
@@ -446,41 +441,41 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
else
{
- // Horizontale Ausrichtung
+ // horizontal alignment
sal_uInt16 nHorz = mpDrawView->GetMarkedGluePointsAlign( sal_False );
rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_CENTER, nHorz == SDRHORZALIGN_CENTER ) );
rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_LEFT, nHorz == SDRHORZALIGN_LEFT ) );
rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_RIGHT, nHorz == SDRHORZALIGN_RIGHT ) );
- // Vertikale Ausrichtung
+ // vertical alignment
sal_uInt16 nVert = mpDrawView->GetMarkedGluePointsAlign( sal_True );
rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_CENTER, nVert == SDRVERTALIGN_CENTER ) );
rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_TOP, nVert == SDRVERTALIGN_TOP ) );
rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_BOTTOM, nVert == SDRVERTALIGN_BOTTOM ) );
}
- // Punkt einfuegen
+ // insert point
rSet.Put( SfxBoolItem( SID_GLUE_INSERT_POINT, mpDrawView->IsInsGluePointMode() ) );
- // Autrittsrichtung
- // Links
+ // Escape direction
+ // left
eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_LEFT );
if( eState == STATE_DONTKNOW )
rSet.InvalidateItem( SID_GLUE_ESCDIR_LEFT );
else
rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_LEFT, eState == STATE_CHECK ) );
- // Rechts
+ // right
eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_RIGHT );
if( eState == STATE_DONTKNOW )
rSet.InvalidateItem( SID_GLUE_ESCDIR_RIGHT );
else
rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_RIGHT, eState == STATE_CHECK ) );
- // Oben
+ // top
eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_TOP );
if( eState == STATE_DONTKNOW )
rSet.InvalidateItem( SID_GLUE_ESCDIR_TOP );
else
rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_TOP, eState == STATE_CHECK ) );
- // Unten
+ // bottom
eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_BOTTOM );
if( eState == STATE_DONTKNOW )
rSet.InvalidateItem( SID_GLUE_ESCDIR_BOTTOM );
@@ -530,11 +525,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_OBJECT_GRADIENT );
}
- // Morphen ggf. disablen
+ // disable morphing if necessary
if ( !mpDrawView->IsMorphingAllowed() )
rSet.DisableItem( SID_POLYGON_MORPHING );
- // Vectorize ggf. disablen
+ // disable vectorizing if necessary
if ( !mpDrawView->IsVectorizeAllowed() )
rSet.DisableItem( SID_VECTORIZE );
@@ -546,7 +541,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if ( !bConvertToPathPossible &&
!mpDrawView->IsCrookAllowed( mpDrawView->IsCrookNoContortion() ) )
{
- // Implizite Wandlung in Kurve nicht moeglich
+ // implicit transformation into curve not possible
rSet.DisableItem(SID_OBJECT_CROOK_ROTATE);
rSet.DisableItem(SID_OBJECT_CROOK_SLANT);
rSet.DisableItem(SID_OBJECT_CROOK_STRETCH);
@@ -588,7 +583,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
if( pPageView && pPageView->GetObjList()->GetObjCount() == 0 )
{
- // Sollte disabled sein, wenn kein Objekt auf der Zeichenflaeche ist:
+ // should be disabled if there is no object on the draw area:
rSet.DisableItem( SID_SELECTALL );
rSet.DisableItem( SID_SIZE_ALL );
}
@@ -738,7 +733,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if (meEditMode == EM_PAGE)
{
/**********************************************************************
- * Seiten-Modus
+ * page mode
**********************************************************************/
rSet.Put(SfxBoolItem(SID_PAGEMODE, sal_True));
rSet.Put(SfxBoolItem(SID_MASTERPAGE, sal_False));
@@ -749,7 +744,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if (mePageKind == PK_STANDARD &&
rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE)
{
- // Gibt es eine Seite mit dem AutoLayout "Titel"?
+ // Is there a page with the AutoLayout "Title"?
sal_Bool bDisable = sal_True;
sal_uInt16 i = 0;
sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD);
@@ -791,7 +786,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put(SfxBoolItem(SID_MASTERPAGE, sal_True));
/**********************************************************************
- * Hintergrundseiten-Modus
+ * Background page mode
**********************************************************************/
if (mePageKind == PK_STANDARD)
{
@@ -810,24 +805,24 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
sal_uInt16 i = 0;
sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD);
- // Referenziert eine Seite mit dem AutoLayout "Titel" die
- // aktuelle MasterPage?
+ // Is there a reference to the current master page from a page
+ // with the AutoLayout "Title"?
while (i < nCount && !bCheck && bDisable)
{
SdPage* pPage = GetDoc()->GetSdPage(i, PK_STANDARD);
- // Seite referenziert aktuelle MasterPage
+ // page does reference the current master page
if (pPage->GetAutoLayout() == AUTOLAYOUT_TITLE)
{
- // Eine Seite hat das AutoLayout "Titel"
+ // a page does have a AutoLayout "Title"
bDisable = sal_False;
SdPage& rRefMPage = (SdPage&)(pPage->TRG_GetMasterPage());
if(&rRefMPage == pMPage)
{
- // Eine Seite mit dem AutoLayout "Titel"
- // referenziert die aktuelle MasterPage
+ // a page with the AutoLayout "Title" does reference
+ // the current master page
bCheck = sal_True;
}
}
@@ -866,11 +861,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // Status der Lineale setzen
+ // set state of the ruler
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_RULER ) )
rSet.Put( SfxBoolItem( SID_RULER, HasRuler() ) );
- // nicht die letzte Seite oder eine Masterpage loeschen
+ // do not delete the last page or a master page
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_PAGE )
|| SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_MASTER_PAGE ) )
{
@@ -887,7 +882,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // darf der aktuelle Layer geloescht werden?
+ // is it allowed to delete the current layer?
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_LAYER ) )
{
sal_uInt16 nCurrentLayer = GetLayerTabControl()->GetCurPageId();
@@ -913,9 +908,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
OutlinerView* pOlView = mpDrawView->GetTextEditOutlinerView();
- // Sonderbehandlung f�r SID_OUTLINE_BULLET wenn Objekte
- // mit unterschiedlichen arten von NumBullet Items markiert
- // sind
+ // special treatment of for SID_OUTLINE_BULLET if objects with different
+ // kinds of NumBullets are marked
sal_Bool bHasOutliner = sal_False;
sal_Bool bHasOther = sal_False;
for(sal_uLong nNum = 0; nNum < nMarkCount; nNum++)
@@ -973,7 +967,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_ZOOM_TOOLBOX );
}
- // Zoom-Stati
+ // Zoom-State
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_IN ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_OUT )||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_PANNING ) )
@@ -1017,7 +1011,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // EditText aktiv
+ // EditText active
if (GetViewShellBase().GetViewShellManager()->GetShell(RID_DRAW_TEXT_TOOLBOX) != NULL)
{
sal_uInt16 nCurrentSId = SID_ATTR_CHAR;
@@ -1033,7 +1027,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put( SfxBoolItem( nCurrentSId, sal_True ) );
- // Kurzform von UpdateToolboxImages()
+ // Short version of UpdateToolboxImages()
rSet.Put( TbxImageItem( SID_DRAWTBX_TEXT, nCurrentSId ) );
}
@@ -1105,7 +1099,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_OBJECT_CROOK_SLANT );
rSet.DisableItem( SID_OBJECT_CROOK_STRETCH );
- // Alle objekterzeugenden Werkzeuge disablen
+ // Disable all object-creating tools
rSet.ClearItem( SID_ATTR_CHAR );
rSet.DisableItem( SID_ATTR_CHAR );
rSet.ClearItem( SID_ATTR_CHAR_VERTICAL );
@@ -1277,7 +1271,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem(SID_3D_PYRAMID);
}
- // Sind die Module verfuegbar?
+ // are the modules available?
if (!SvtModuleOptions().IsCalc())
{
@@ -1296,7 +1290,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) );
if( (xSlideshow.is() && xSlideshow->isRunning() && (xSlideshow->getAnimationMode() != ANIMATIONMODE_PREVIEW) ) || GetDocSh()->IsPreview() )
{
- // Eigene Slots
+ // Own Slots
rSet.DisableItem( SID_PRESENTATION );
rSet.DisableItem( SID_ZOOM_IN );
rSet.DisableItem( SID_ZOOM_OUT );
@@ -1642,7 +1636,7 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet)
if (GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED)
{
- // Outplace-Edit: Kein Umschalten erlauben
+ // Outplace-Edit: do not allow switch
rSet.ClearItem( SID_OUTLINEMODE );
rSet.DisableItem( SID_OUTLINEMODE );
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index ab297b7..f4dfc30 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -71,12 +71,9 @@
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer temporaere Funktionen
-|*
-\************************************************************************/
-
+/**
+ * SfxRequests for temporary functions
+ */
void DrawViewShell::FuTemp01(SfxRequest& rReq)
{
switch(rReq.GetSlot())
@@ -230,7 +227,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
{
SetCurrentFunction( FuPage::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
Cancel();
- rReq.Ignore (); // es werden eigenstaendige macros generiert !!
+ rReq.Ignore (); // we generate independent macros !!
}
break;
@@ -239,7 +236,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
{
mbZoomOnPage = sal_False;
SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq) );
- // Beendet sich selbst, kein Cancel() notwendig!
+ // finishes itself, no Cancel() needed!
Invalidate( SID_ZOOM_TOOLBOX );
rReq.Ignore ();
}
@@ -251,7 +248,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
SetCurrentFunction( FuDisplayOrder::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq) );
Invalidate( SID_POSITION );
rReq.Ignore ();
- // Beendet sich selbst, kein Cancel() notwendig!
+ // finishes itself, no Cancel() needed!
}
break;
@@ -279,7 +276,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
break;
case SID_CAPTUREPOINT:
- // negative Werte um Aufruf aus Menue zu signalisieren
+ // negative value to signal call from menu
maMousePos = Point(-1,-1);
case SID_SET_SNAPITEM:
{
@@ -423,20 +420,15 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
default:
{
- // switch Anweisung wegen CLOOKS aufgeteilt. Alle case-Anweisungen die
- // eine Fu???? -Funktion aufrufen, sind in die Methode FuTemp01 (drviews8),
- // FuTemp02 (drviewsb) gewandert.
+ // Switch statement splitted because of CLOOKS. All case-statements
+ // which call a Fu???? - function, are gone into FuTemp01
+ // (drviews8), FuTemp02 (drviewsb).
FuTemp02(rReq);
}
break;
}
}
-/*************************************************************************
-|*
-|* Scanner-Event
-|*
-\************************************************************************/
void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& )
{
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 493a3df..243b201 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -59,15 +59,10 @@
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer Gallery bearbeiten
-|*
-\************************************************************************/
void DrawViewShell::ExecGallery(SfxRequest& rReq)
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -82,27 +77,26 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
{
GetDocSh()->SetWaitCursor( sal_True );
- // Graphik einfuegen
+ // insert graphic
if (nFormats & SGA_FORMAT_GRAPHIC)
{
Graphic aGraphic = pGal->GetGraphic();
- // Ggf. Groesse reduzieren
+ // reduce size if necessary
Window aWindow (GetActiveWindow());
aWindow.SetMapMode(aGraphic.GetPrefMapMode());
Size aSizePix = aWindow.LogicToPixel(aGraphic.GetPrefSize());
aWindow.SetMapMode( MapMode(MAP_100TH_MM) );
Size aSize = aWindow.PixelToLogic(aSizePix);
- // Groesse ggf. auf Seitengroesse begrenzen
+ // constrain size to page size if necessary
SdrPage* pPage = mpDrawView->GetSdrPageView()->GetPage();
Size aPageSize = pPage->GetSize();
aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder();
aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder();
- // Falls Grafik zu gross, wird die Grafik
- // in die Seite eingepasst
+ // if the graphic is to big, we fit it into the page
if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) &&
aSize.Height() && aPageSize.Height() )
{
@@ -111,7 +105,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
float fWinWH = (float)aPageSize.Width() /
(float)aPageSize.Height();
- // Grafik an Pagesize anpassen (skaliert)
+ // adjust graphic to page size (scales)
if ((fGrfWH != 0.F) && (fGrfWH < fWinWH))
{
aSize.Width() = (long)(aPageSize.Height() * fGrfWH);
@@ -125,7 +119,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
}
- // Ausgaberechteck fuer Grafik setzen
+ // set output rectangle for graphic
Point aPnt ((aPageSize.Width() - aSize.Width()) / 2,
(aPageSize.Height() - aSize.Height()) / 2);
aPnt += Point(pPage->GetLftBorder(), pPage->GetUppBorder());
@@ -137,9 +131,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
if ( mpDrawView->AreObjectsMarked() )
{
- /******************************************************
- * Ist ein leeres Graphik-Objekt vorhanden?
- ******************************************************/
+ // is there a empty graphic object?
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
if (rMarkList.GetMarkCount() == 1)
@@ -153,10 +145,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
if( pGrafObj->IsEmptyPresObj() )
{
- /******************************************
- * Das leere Graphik-Objekt bekommt eine neue
- * Graphik
- ******************************************/
+ // the empty graphic object gets a new graphic
bInsertNewObject = sal_False;
SdrGrafObj* pNewGrafObj = (SdrGrafObj*) pGrafObj->Clone();
@@ -184,7 +173,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
mpDrawView->InsertObjectAtView(pGrafObj, *pPV, SDRINSERT_SETDEFLAYER);
}
- // Soll nur ein Link benutzt werden?
+ // should we just use a link?
if( pGrafObj && pGal->IsLinkage() )
pGrafObj->SetGraphicLink( pGal->GetURL().GetMainURL( INetURLObject::NO_DECODE ), pGal->GetFilterName() );
}
@@ -201,33 +190,24 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
}
-/*************************************************************************
-|*
-|* Statuswerte fuer Gallery zurueckgeben
-|*
-\************************************************************************/
void DrawViewShell::GetGalleryState(SfxItemSet& )
{
}
-/*************************************************************************
-|*
-|* Makros fuer die Attributeinstellungen bearbeiten
-|*
-\************************************************************************/
-
-//
-// die vorgehensweise fuer die attributaenderung ist praktisch ueberall identisch
-// 1. bisherige attribute auslesen
-// 2. parameter aus dem basic-set auslesen
-// 3. gewaehltes item aus dem attribut-set loeschen
-// 4. neues attribut-item erzeugen
-// 5. item in den set eintragen
-//
+/**
+ * Edit macros for attribute configuration
+ */
+
+/* the work flow to adjust the attributes is nearly everywhere the same
+ 1. read existing attributes
+ 2. read parameter from the basic-set
+ 3. delete selected item from the attribute-set
+ 4. create new attribute-item
+ 5. insert item into set */
void DrawViewShell::AttrExec (SfxRequest &rReq)
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -241,7 +221,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
switch (rReq.GetSlot ())
{
- // neuen fuellstil setzen
+ // set new fill-style
case SID_SETFILLSTYLE :
if (pArgs)
if (pArgs->Count () == 1)
@@ -263,7 +243,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
#endif
break;
- // linienstil neu bestimmen
+ // determine new line style
case SID_SETLINESTYLE :
if (pArgs)
if (pArgs->Count () == 1)
@@ -285,7 +265,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
#endif
break;
- // linienbreite setzen
+ // set line width
case SID_SETLINEWIDTH :
if (pArgs)
if (pArgs->Count () == 1)
@@ -512,7 +492,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
#endif
break;
- // einstellungen fuer farbverlauf
+ // configuration for gradients
case SID_GRADIENT :
if (pArgs)
if (pArgs->Count () == 8)
@@ -589,7 +569,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
#endif
break;
- // einstellungen fuer schraffur
+ // configuration for hatch
case SID_HATCH :
if (pArgs)
if (pArgs->Count () == 4)
@@ -764,12 +744,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
delete pAttr;
}
-/*************************************************************************
-|*
-|* Makros fuer die Attributeinstellungen bearbeiten
-|*
-\************************************************************************/
-
+/**
+ * Edit macros for attribute configuration
+ */
void DrawViewShell::AttrState (SfxItemSet& rSet)
{
SfxWhichIter aIter (rSet);
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 135b198..5ecde16 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -112,11 +112,6 @@ void SAL_CALL ScannerEventListener::disposing( const ::com::sun::star::lang::Eve
mpParent->ScannerEvent( rEventObject );
}
-/*************************************************************************
-|*
-|* Standard-Konstruktor
-|*
-\************************************************************************/
DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument )
: ViewShell (pFrame, pParentWindow, rViewShellBase)
@@ -132,11 +127,6 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
doShow();
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
DrawViewShell::~DrawViewShell()
{
@@ -200,12 +190,9 @@ DrawViewShell::~DrawViewShell()
delete [] mpSlotArray;
}
-/*************************************************************************
-|*
-|* gemeinsamer Initialisierungsanteil der beiden Konstruktoren
-|*
-\************************************************************************/
-
+/**
+ * common part of both constructors
+ */
void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
{
mpActualPage = 0;
@@ -220,11 +207,11 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
OSL_ASSERT (GetViewShell()!=NULL);
- // Array fuer Slot-/ImageMapping:
- // Gerader Eintrag: Haupt-/ToolboxSlot
- // Ungerader Eintrag: gemappter Slot
- // Achtung: Anpassen von GetIdBySubId() !!!
- // Reihenfolge (insbesondere Zoom) darf nicht geaendert werden !!!
+ /* array for slot-/image mapping:
+ even entry: main-/toolbox slot
+ odd entry: mapped slot
+ Attention: adjust GetIdBySubId() !!!
+ Do not change order (especial zoom) !!! */
mpSlotArray = new sal_uInt16[ SLOTARRAY_COUNT ];
mpSlotArray[ 0 ] = SID_OBJECT_CHOOSE_MODE;
mpSlotArray[ 1 ] = SID_OBJECT_ROTATE;
@@ -256,15 +243,15 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
GetDoc()->CreateFirstPages();
mpDrawView = new DrawView(pDocSh, GetActiveWindow(), this);
- mpView = mpDrawView; // Pointer der Basisklasse ViewShell
- mpDrawView->SetSwapAsynchron(sal_True); // Asynchrones Laden von Graphiken
+ mpView = mpDrawView; // Pointer of base class ViewShell
+ mpDrawView->SetSwapAsynchron(sal_True); // Asynchronous load of graphics
// We do not read the page kind from the frame view anymore so we have
// to set it in order to resync frame view and this view.
mpFrameView->SetPageKind(eInitialPageKind);
mePageKind = eInitialPageKind;
meEditMode = EM_PAGE;
- DocumentType eDocType = GetDoc()->GetDocumentType(); // RTTI fasst hier noch nicht
+ DocumentType eDocType = GetDoc()->GetDocumentType(); // RTTI does not work here
switch (mePageKind)
{
case PK_STANDARD:
@@ -294,14 +281,14 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
mpDrawView->SetWorkArea(Rectangle(Point() - aVisAreaPos - aPageOrg, aSize));
- // Objekte koennen max. so gross wie die ViewSize werden
+ // objects can not grow bigger than ViewSize
GetDoc()->SetMaxObjSize(aSize);
- // Split-Handler fuer TabControls
+ // Split-Handler for TabControls
maTabControl.SetSplitHdl( LINK( this, DrawViewShell, TabSplitHdl ) );
- // Damit der richtige EditMode von der FrameView komplett eingestellt
- // werden kann, wird hier ein aktuell anderer gewaehlt (kleiner Trick)
+ /* In order to set the correct EditMode of the FrameView, we select another
+ one (small trick). */
if (mpFrameView->GetViewShEditMode(mePageKind) == EM_PAGE)
{
meEditMode = EM_MASTERPAGE;
@@ -311,7 +298,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
meEditMode = EM_PAGE;
}
- // Einstellungen der FrameView uebernehmen
+ // Use configuration of FrameView
ReadFrameViewData(mpFrameView);
if( eDocType == DOCUMENT_TYPE_DRAW )
@@ -328,7 +315,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE );
GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE );
- // AutoLayouts muessen erzeugt sein
+ // AutoLayouts have to be created
GetDoc()->StopWorkStartupDelay();
}
else if (mePageKind == PK_HANDOUT)
@@ -337,7 +324,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE );
GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE );
- // AutoLayouts muessen erzeugt sein
+ // AutoLayouts have to be created
GetDoc()->StopWorkStartupDelay();
}
else
@@ -348,7 +335,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
}
}
- // Selektionsfunktion starten
+ // start selection function
SfxRequest aReq(SID_OBJECT_SELECT, 0, GetDoc()->GetItemPool());
FuPermanent(aReq);
mpDrawView->SetFrameDragSingles(sal_True);
@@ -446,24 +433,20 @@ bool DrawViewShell::RelocateToParentWindow (::Window* pParentWindow)
-/*************************************************************************
-|*
-|* pruefe ob linienzuege gezeichnet werden muessen
-|*
-\************************************************************************/
+/**
+ * check if we have to draw a polyline
+ */
/*
- linienzuege werden ueber makros als folge von
+ Polylines are represented by makros as a sequence of:
MoveTo (x, y)
- LineTo (x, y) [oder BezierTo (x, y)]
+ LineTo (x, y) [or BezierTo (x, y)]
LineTo (x, y)
:
- dargestellt. einen endbefehl fuer die linienzuege
- gibt es nicht, also muessen alle befehle in den
- requests nach LineTo (BezierTo) abgetestet und die
- punktparameter gesammelt werden.
- der erste nicht-LineTo fuehrt dann dazu, dass aus
- den gesammelten punkten der linienzug erzeugt wird
+ There is no end command for polylines. Therefore, we have to test all
+ commands in the requests for LineTo (BezierTo) and we have to gather
+ the point-parameter. The first not-LineTo leads to the creation of the
+ polyline from the gathered points.
*/
void DrawViewShell::CheckLineTo(SfxRequest& rReq)
@@ -482,12 +465,9 @@ void DrawViewShell::CheckLineTo(SfxRequest& rReq)
rReq.Ignore ();
}
-/*************************************************************************
-|*
-|* veraendere die seitemparameter, wenn SID_PAGESIZE oder SID_PAGEMARGIN
-|*
-\************************************************************************/
-
+/**
+ * Change page parameter if SID_PAGESIZE or SID_PAGEMARGIN
+ */
void DrawViewShell::SetupPage (Size &rSize,
long nLeft,
long nRight,
@@ -502,9 +482,7 @@ void DrawViewShell::SetupPage (Size &rSize,
for (i = 0; i < nPageCnt; i++)
{
- /**********************************************************************
- * Erst alle MasterPages bearbeiten
- **********************************************************************/
+ // first, handle all master pages
SdPage *pPage = GetDoc()->GetMasterSdPage(i, mePageKind);
if( pPage )
@@ -537,9 +515,7 @@ void DrawViewShell::SetupPage (Size &rSize,
for (i = 0; i < nPageCnt; i++)
{
- /**********************************************************************
- * Danach alle Pages bearbeiten
- **********************************************************************/
+ // then, handle all pages
SdPage *pPage = GetDoc()->GetSdPage(i, mePageKind);
if( pPage )
@@ -598,22 +574,17 @@ void DrawViewShell::SetupPage (Size &rSize,
GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET);
- // auf (neue) Seitengroesse zoomen
+ // zoom onto (new) page size
GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE,
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
}
-/*************************************************************************
-|*
-|* Statuswerte der Statusbar zurueckgeben
-|*
-\************************************************************************/
void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
{
- // Zoom-Item
- // Hier sollte der entsprechende Wert (Optimal ?, Seitenbreite oder
- // Seite) mit Hilfe des ZoomItems weitergegeben werden !!!
+ /* Zoom-Item
+ Here we should propagate the corresponding value (Optimal ?, page width
+ or page) with the help of the ZoomItems !!! */
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOM ) )
{
if (GetDocSh()->IsUIActive() || (SlideShow::IsRunning(GetViewShellBase())) )
@@ -630,7 +601,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
else
pZoomItem = new SvxZoomItem( SVX_ZOOM_PERCENT, nZoom );
- // Bereich einschraenken
+ // constrain area
sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL;
SdrPageView* pPageView = mpDrawView->GetSdrPageView();
@@ -686,7 +657,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
aPos.X() = Fraction(aPos.X()) / aUIScale;
aPos.Y() = Fraction(aPos.Y()) / aUIScale;
- // Position- und Groesse-Items
+ // position- and size items
if ( mpDrawView->IsAction() )
{
Rectangle aRect;
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index a2f524a..850c443 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -64,12 +64,9 @@
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer temporaere Funktionen
-|*
-\************************************************************************/
-
+/**
+ * SfxRequests for temporary functions
+ */
void DrawViewShell::FuTemp02(SfxRequest& rReq)
{
sal_uInt16 nSId = rReq.GetSlot();
@@ -111,7 +108,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
- // Ueberpruefung auf schon vorhandene Namen
+ // test for already existing names
sal_Bool bLoop = sal_True;
while( bLoop && pDlg->Execute() == RET_OK )
{
@@ -121,7 +118,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
if( rLayerAdmin.GetLayer( aLayerName, sal_False )
|| aLayerName.Len()==0 )
{
- // Name ist schon vorhanden
+ // name already exists
WarningBox aWarningBox (
GetParentWindow(),
WinBits( WB_OK ),
@@ -131,7 +128,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
else
bLoop = sal_False;
}
- if( bLoop ) // wurde abgebrochen
+ if( bLoop ) // was canceled
{
delete pDlg;
@@ -242,7 +239,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
const SfxItemSet* pArgs = rReq.GetArgs();
- // darf der Layer geloescht werden ?
+ // is it allowed to delete the layer?
bool bDelete = true;
String aLayoutLayer ( SdResId(STR_LAYER_LAYOUT) );
@@ -276,7 +273,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() );
- // Ueberpruefung auf schon vorhandene Namen
+ // test for already existing names
sal_Bool bLoop = sal_True;
sal_uInt16 nRet = 0;
while( bLoop && ( (nRet = pDlg->Execute()) == RET_OK ) )
@@ -287,7 +284,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
if( (rLayerAdmin.GetLayer( aLayerName, sal_False ) &&
aLayerName != aOldLayerName) || aLayerName.Len()==0 )
{
- // Name ist schon vorhanden
+ // name already exists
WarningBox aWarningBox (
GetParentWindow(),
WinBits( WB_OK ),
@@ -555,7 +552,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
pOldFldItem->GetField()->ISA( SvxAuthorField ) ||
pOldFldItem->GetField()->ISA( SvxPageField ) ) )
{
- // Feld selektieren, so dass es beim Insert geloescht wird
+ // select field, then it will be deleted when inserting
ESelection aSel = pOLV->GetSelection();
if( aSel.nStartPos == aSel.nEndPos )
aSel.nEndPos++;
@@ -698,9 +695,9 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
default:
{
- // switch Anweisung wegen CLOOKS aufgeteilt. Alle case-Anweisungen die
- // eine Fu???? -Funktion aufrufen, sind in die Methode FuTemp03 (drviewsb)
- // gewandert.
+ /* switch construct was split because of CLOOKS. All cases which
+ call a Fu??? function were moved to the method FuTemp03
+ (drviewsb). */
FuTemp03(rReq);
}
break;
@@ -838,7 +835,7 @@ void DrawViewShell::ModifyLayer (
if (!bIsVisible)
{
- // Unsichtbare Layer werden anders dargestellt
+ // invisible layers are presented differnt
nBits = TPB_SPECIAL;
}
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 6ccbb96..6694393 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -54,15 +54,12 @@
#include "brkdlg.hrc"
namespace sd {
-#define MIN_ACTIONS_FOR_DIALOG 5000 // bei mehr als 1600 Metaobjekten
- // wird beim Aufbrechen ein Dialog
- // angezeigt.
-/*************************************************************************
-|*
-|* SfxRequests fuer temporaere Funktionen
-|*
-\************************************************************************/
+#define MIN_ACTIONS_FOR_DIALOG 5000 ///< if there are more meta objects, we show a dialog during the break up
+
+/**
+ * SfxRequests for temporary functions
+ */
void DrawViewShell::FuTemp03(SfxRequest& rReq)
{
sal_uInt16 nSId = rReq.GetSlot();
@@ -339,7 +336,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
sal_uLong nAnz=rMarkList.GetMarkCount();
- // Summe der Metaobjekte aller sel. Metafiles erm.
+ // determine the sum of meta objects of all selected meta files
sal_uLong nCount = 0;
for(sal_uLong nm=0; nm<nAnz; nm++)
{
@@ -366,11 +363,10 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
}
}
- // anhand der erm. Summe entscheiden ob mit
- // oder ohne Dialog aufgebrochen wird.
+ // decide with the sum of all meta objects if we should show a dialog
if(nCount < MIN_ACTIONS_FOR_DIALOG)
{
- // ohne Dialog aufbrechen
+ // nope, no dialog
mpDrawView->DoImportMarkedMtf();
}
else
@@ -634,13 +630,9 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
};
};
-/*************************************************************************
-|*
-|* Liefert die globale/Haupt-ID zurueck, also die ID, ueber die die
-|* Toolbox ausgeloest wird
-|*
-\************************************************************************/
-
+/**
+ * Returns the global/main ID, i.e. the ID, which is used to execute the toolbox
+ */
sal_uInt16 DrawViewShell::GetIdBySubId( sal_uInt16 nSId )
{
sal_uInt16 nMappedSId = 0;
@@ -834,13 +826,9 @@ sal_uInt16 DrawViewShell::GetIdBySubId( sal_uInt16 nSId )
return( nMappedSId );
}
-/*************************************************************************
-|*
-|* Fuellt das SlotArray, um das aktuelle Mapping des ToolboxSlots zu
-|* bekommen
-|*
-\************************************************************************/
-
+/**
+ * Fills the SlotArray in order to get the current mapping of the ToolboxSlots
+ */
void DrawViewShell::MapSlot( sal_uInt16 nSId )
{
sal_uInt16 nMappedSId = GetIdBySubId( nSId );
@@ -852,12 +840,9 @@ void DrawViewShell::MapSlot( sal_uInt16 nSId )
}
}
-/*************************************************************************
-|*
-|* Ermoeglicht ueber das SlotArray ein ImageMapping
-|*
-\************************************************************************/
-
+/**
+ * Allows a ImageMapping via SlotArray
+ */
void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, sal_Bool bPermanent )
{
if( !bPermanent )
@@ -883,11 +868,6 @@ void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, sal_Bool bPermanent )
}
}
-/*************************************************************************
-|*
-|* Gibt den gemappten Slot zurueck
-|*
-\************************************************************************/
sal_uInt16 DrawViewShell::GetMappedSlot( sal_uInt16 nSId )
{
@@ -896,22 +876,18 @@ sal_uInt16 DrawViewShell::GetMappedSlot( sal_uInt16 nSId )
if( nId != USHRT_MAX )
nSlot = mpSlotArray[ nId+1 ];
- // Wenn der Slot noch auf sich selbst gemapped ist, muss 0 zurueck-
- // gegeben werden, da sonst der Slot immer wieder selbst executet
- // wird. Im Array ist der Slot selbst initial vorhanden, damit das
- // Image richtig angezeigt wird.
+ /* If the slot is mapped to itself, we have to return 0. Otherwise the slot
+ would be executed over and over again. The slot is initial available in
+ the array in order to show the image correct. */
if( nSId == nSlot )
return( 0 );
return( nSlot );
}
-/*************************************************************************
-|*
-|* Gibt die Nummer des HauptSlots im SlotArray zurueck
-|*
-\************************************************************************/
-
+/**
+ * @returns number of the main slot in the slot array
+ */
sal_uInt16 DrawViewShell::GetArrayId( sal_uInt16 nSId )
{
for( sal_uInt16 i = 0; i < SLOTARRAY_COUNT; i += 2 )
@@ -924,11 +900,6 @@ sal_uInt16 DrawViewShell::GetArrayId( sal_uInt16 nSId )
}
-/*************************************************************************
-|*
-|* IMap-Dlg updaten
-|*
-\************************************************************************/
void DrawViewShell::UpdateIMapDlg( SdrObject* pObj )
{
@@ -954,7 +925,7 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj )
SvxIMapDlgChildWindow::UpdateIMapDlg( aGraphic, pIMap, pTargetList, pObj );
- // TargetListe kann von uns wieder geloescht werden
+ // We can delete the target list
if ( pTargetList )
{
for ( size_t i = 0, n = pTargetList->size(); i < n; ++i )
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index fdaf55f..a3c52e3 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -45,12 +45,9 @@
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer Navigator bearbeiten
-|*
-\************************************************************************/
-
+/**
+ * handle SfxRequests for navigator
+ */
void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
{
CheckLineTo (rReq);
@@ -94,21 +91,21 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
{
case PAGE_FIRST:
{
- // Sprung zu erster Seite
+ // jump to first page
SwitchPage(0);
}
break;
case PAGE_LAST:
{
- // Sprung zu letzter Seite
+ // jumpt to last page
SwitchPage(GetDoc()->GetSdPageCount(mpActualPage->GetPageKind()) - 1);
}
break;
case PAGE_NEXT:
{
- // Sprung zu naechster Seite
+ // jump to next page
sal_uInt16 nSdPage = (mpActualPage->GetPageNum() - 1) / 2;
if (nSdPage < GetDoc()->GetSdPageCount(mpActualPage->GetPageKind()) - 1)
@@ -120,7 +117,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
case PAGE_PREVIOUS:
{
- // Sprung zu vorheriger Seite
+ // jump to previous page
sal_uInt16 nSdPage = (mpActualPage->GetPageNum() - 1) / 2;
if (nSdPage > 0)
@@ -163,11 +160,6 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
}
}
-/*************************************************************************
-|*
-|* Statuswerte fuer Navigator zurueckgeben
-|*
-\************************************************************************/
void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet )
{
@@ -209,7 +201,7 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet )
nLastPage = GetDoc()->GetSdPageCount( mePageKind ) - 1;
}
- // erste Seite / vorherige Seite
+ // first page / previous page
if( nCurrentPage == nFirstPage )
{
nState |= NAVBTN_FIRST_DISABLED;
@@ -223,7 +215,7 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet )
nState |= NAVBTN_FIRST_ENABLED | NAVBTN_PREV_ENABLED;
}
- // letzte Seite / naechste Seite
+ // last page / next page
if( nCurrentPage == nLastPage )
{
nState |= NAVBTN_LAST_DISABLED;
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index e17192c..969ac97 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -101,11 +101,7 @@ using namespace ::com::sun::star::presentation;
namespace sd {
-/*************************************************************************
-|*
-|* Permanente Funktionen
-|*
-\************************************************************************/
+// Permanent Functions
void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView)
{
@@ -141,7 +137,7 @@ void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView)
void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
- // Waehrend einer Native-Diashow wird nichts ausgefuehrt!
+ // We do not execute a thing during a native slide show
if (SlideShow::IsRunning(GetViewShellBase()))
return;
@@ -229,7 +225,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
rBind.Update(nOldSId);
}
- // Slot wird gemapped (ToolboxImages/-Slots)
+ // map Slot (ToolboxImages/-Slots)
MapSlot( nSId );
switch ( nSId )
@@ -315,7 +311,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
if( nSlotId == SID_OBJECT_ROTATE )
{
- // togle rotation
+ // toggle rotation
if( nOldSId == nSlotId )
{
nSlotId = SID_OBJECT_SELECT;
@@ -339,7 +335,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
String(SdResId(STR_ASK_FOR_CONVERT_TO_BEZIER) )
).Execute() == RET_YES )
{
- // Implizite Wandlung in Bezier
+ // implicit transformation into bezier
WaitObject aWait( (Window*)GetActiveWindow() );
mpDrawView->ConvertMarkedToPathObj(sal_False);
}
@@ -376,7 +372,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
String(SdResId(STR_ASK_FOR_CONVERT_TO_BEZIER) )
).Execute() == RET_YES )
{
- // Implizite Wandlung in Bezier
+ // implicit transformation into bezier
WaitObject aWait( (Window*)GetActiveWindow() );
mpDrawView->ConvertMarkedToPathObj(sal_False);
}
@@ -560,8 +556,8 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
SetHelpId( GetCurrentFunction()->GetSlotID() );
}
- // Shell wird invalidiert, schneller als einzeln (laut MI)
- // Jetzt explizit der letzte Slot incl. Update()
+ // invalidate shell, is faster than every individually (says MI)
+ // now explicit the last slot incl. Update()
Invalidate();
// CTRL-SID_OBJECT_SELECT -> select first draw object if none is selected yet
@@ -631,18 +627,13 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
// service routine for Undo/Redo implementation
extern SfxUndoManager* ImpGetUndoManagerFromViewShell(DrawViewShell& rDViewShell);
-/*************************************************************************
-|*
-|* SfxRequests fuer Support-Funktionen
-|*
-\************************************************************************/
void DrawViewShell::FuSupport(SfxRequest& rReq)
{
if( rReq.GetSlot() == SID_STYLE_FAMILY && rReq.GetArgs())
GetDocSh()->SetStyleFamily(((SfxUInt16Item&)rReq.GetArgs()->Get( SID_STYLE_FAMILY )).GetValue());
- // Waehrend einer Native-Diashow wird nichts ausgefuehrt!
+ // We do not execute a thing during a native slide show
if(SlideShow::IsRunning(GetViewShellBase()) &&
(rReq.GetSlot() != SID_PRESENTATION_END &&
rReq.GetSlot() != SID_SIZE_PAGE))
@@ -655,7 +646,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
sal_uInt16 nSId = rReq.GetSlot();
- // Slot wird evtl. gemapped (ToolboxImages/-Slots)
+ // maybe we map the slot (ToolboxImages/-Slots)
MapSlot( nSId );
switch ( nSId )
@@ -667,7 +658,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
break;
- // Slots der ToolboxController gemapped ausfuehren
+ // execute slots of ToolboxController mapped
case SID_OBJECT_CHOOSE_MODE:
case SID_POSITION:
case SID_OBJECT_ALIGN:
@@ -718,7 +709,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
mpDrawView->SetFrameDragSingles(!mpDrawView->IsFrameDragSingles());
/******************************************************************
- * ObjectBar einschalten
+ * turn ObjectBar on
******************************************************************/
if( dynamic_cast< FuSelection* >( GetCurrentFunction().get() ) || dynamic_cast< FuConstructBezierPolygon* >( GetCurrentFunction().get() ) )
{
@@ -911,7 +902,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_NOTES_MASTERPAGE: // BASIC
case SID_HANDOUT_MASTERPAGE: // BASIC
{
- // AutoLayouts muessen fertig sein
+ // AutoLayouts needs to be finished
GetDoc()->StopWorkStartupDelay();
const SfxItemSet* pReqArgs = rReq.GetArgs();
@@ -934,7 +925,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if (nSId == SID_TITLE_MASTERPAGE ||
nSId == SID_SLIDE_MASTERPAGE)
{
- // Gibt es eine Seite mit dem AutoLayout "Titel"?
+ // Is there a page with the AutoLayout "Title"?
sal_Bool bFound = sal_False;
sal_uInt16 i = 0;
sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD);
@@ -958,7 +949,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
}
- // Default-Layer der MasterPage einschalten
+ // turn on default layer of MasterPage
mpDrawView->SetActiveLayer( String( SdResId(STR_LAYER_BCKGRNDOBJ) ) );
ChangeEditMode(EM_MASTERPAGE, mbIsLayerModeActive);
@@ -1159,8 +1150,8 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
break;
- // Namensverwirrung: SID_SIZE_OPTIMAL -> Zoom auf selektierte Objekte
- // --> Wird als Objektzoom im Programm angeboten
+ // name confusion: SID_SIZE_OPTIMAL -> Zoom onto selected objects
+ // --> Is offered as object zoom in program
case SID_SIZE_OPTIMAL: // BASIC
{
mbZoomOnPage = sal_False;
@@ -1189,8 +1180,8 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
break;
- // Namensverwirrung: SID_SIZE_ALL -> Zoom auf alle Objekte
- // --> Wird als Optimal im Programm angeboten
+ // name confusion: SID_SIZE_ALL -> Zoom onto all objects
+ // --> Is offered as optimal in program
case SID_SIZE_ALL: // BASIC
{
mbZoomOnPage = sal_False;
@@ -1232,7 +1223,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if (mpZoomList->IsPreviousPossible())
{
- // Vorheriges ZoomRect einstellen
+ // set previous ZoomRect
SetZoomRect(mpZoomList->GetPreviousZoomRect());
}
rReq.Done ();
@@ -1249,7 +1240,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if (mpZoomList->IsNextPossible())
{
- // Naechstes ZoomRect einstellen
+ // set next ZoomRect
SetZoomRect(mpZoomList->GetNextZoomRect());
}
rReq.Done ();
@@ -1487,11 +1478,6 @@ void DrawViewShell::FuSupportRotate(SfxRequest &rReq)
}
}
-/*************************************************************************
-|*
-|* URL-Feld einfuegen
-|*
-\************************************************************************/
void DrawViewShell::InsertURLField(const String& rURL, const String& rText,
const String& rTarget, const Point* pPos)
@@ -1551,11 +1537,6 @@ void DrawViewShell::InsertURLField(const String& rURL, const String& rText,
}
}
-/*************************************************************************
-|*
-|* URL-Button einfuegen
-|*
-\************************************************************************/
void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
const String& rTarget, const Point* pPos)
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 2bd3b4e..aa5ced7 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -63,17 +63,14 @@ using namespace ::com::sun::star;
namespace sd {
-/*************************************************************************
-|*
-|* Status von Controller-SfxSlots setzen
-|*
-\************************************************************************/
-
+/**
+ * Set state of controller SfxSlots
+ */
void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
{
if (rSet.GetItemState(SID_RELOAD) != SFX_ITEM_UNKNOWN)
{
- // "Letzte Version" vom SFx en/disablen lassen
+ // let "last version" of SFx en/disable
GetViewFrame()->GetSlotState (SID_RELOAD, NULL, &rSet);
}
@@ -181,7 +178,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
}
rSet.Put( SfxBoolItem( SID_READONLY_MODE, mbReadOnly ) );
- // Ausgabequalitaet
+ // output quality
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTPUT_QUALITY_COLOR ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTPUT_QUALITY_GRAYSCALE ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTPUT_QUALITY_BLACKWHITE ) ||
@@ -265,11 +262,6 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
}
-/*************************************************************************
-|*
-|* Status der Attribut-Items
-|*
-\************************************************************************/
void DrawViewShell::GetAttrState( SfxItemSet& rSet )
{
@@ -398,8 +390,8 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
case SID_STYLE_NEW_BY_EXAMPLE:
{
- // PseudoStyleSheets koennen nicht 'by Example' erzeugt werden;
- // normale StyleSheets brauchen dafuer ein selektiertes Objekt
+ // It is not possible to create PseudoStyleSheets 'by Example';
+ // normal style sheets need a selected object for that
ISfxTemplateCommon* pTemplCommon = SFX_APP()->GetCurrentTemplateCommon(GetViewFrame()->GetBindings());
if (pTemplCommon)
{
@@ -415,9 +407,8 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
}
}
}
- // falls (noch) kein Gestalter da ist, muessen wir uns auf den
- // View-Zustand zurueckziehen; eine aktuell eingestellte Familie
- // kann nicht beruecksichtigt werden
+ // if there is no (yet) a designer, we have to go back into the
+ // view state; an actual set family can not be considered
else
{
if (!mpDrawView->AreObjectsMarked())
@@ -452,11 +443,11 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
rSet.Put( aAllSet, sal_False );
- // Flaechen und/oder Linienattribute wurden geaendert
+ // there were changes at area and/or line attributes
if( bAttr && pSet )
{
- // Wenn die View selektierte Objekte besitzt, muessen entspr. Items
- // von SFX_ITEM_DEFAULT (_ON) auf SFX_ITEM_DISABLED geaendert werden
+ // if the view owns selected objects, corresponding items have to be
+ // changed from SFX_ITEM_DEFAULT (_ON) to SFX_ITEM_DISABLED
if( mpDrawView->AreObjectsMarked() )
{
SfxWhichIter aNewIter( *pSet, XATTR_LINE_FIRST, XATTR_FILL_LAST );
@@ -477,11 +468,6 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
}
-/*************************************************************************
-|*
-|* Text der Selektion zurueckgeben
-|*
-\************************************************************************/
String DrawViewShell::GetSelectionText(sal_Bool bCompleteWords)
{
@@ -509,11 +495,6 @@ String DrawViewShell::GetSelectionText(sal_Bool bCompleteWords)
return (aStrSelection);
}
-/*************************************************************************
-|*
-|* Ist etwas selektiert?
-|*
-\************************************************************************/
sal_Bool DrawViewShell::HasSelection(sal_Bool bText) const
{
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index eee39f0..3de6c84 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -48,7 +48,7 @@ namespace sd {
void DrawViewShell::ExecIMap( SfxRequest& rReq )
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // during a slide show, nothing is executed!
if(HasCurrentFunction(SID_PRESENTATION) )
return;
@@ -103,15 +103,10 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet )
rSet.Put( SfxBoolItem( SID_IMAP_EXEC, bDisable ) );
}
-/*************************************************************************
-|*
-|* Execute-Methode der Optionsleiste
-|*
-\************************************************************************/
void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // during a slide show, nothing is executed!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -127,8 +122,8 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
break;
- // Raster- / Hilfslinien-Optionen
- case SID_GRID_VISIBLE: // noch nicht hier !
+ // Grid- / Help lines option
+ case SID_GRID_VISIBLE: // not here yet!
{
pOptions->SetGridVisible( !mpDrawView->IsGridVisible() );
}
@@ -140,7 +135,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
}
break;
- case SID_HELPLINES_VISIBLE: // noch nicht hier !
+ case SID_HELPLINES_VISIBLE: // not here yet!
{
pOptions->SetHelplines( !mpDrawView->IsHlplVisible() );
}
@@ -212,7 +207,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
{
pOptions->StoreConfig();
- // Speichert die Konfiguration SOFORT
+ // Saves the configuration IMMEDIATELY
// SFX_APP()->SaveConfiguration();
WriteFrameViewData();
@@ -226,11 +221,6 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
}
-/*************************************************************************
-|*
-|* State-Methode der Optionsleiste
-|*
-\************************************************************************/
void DrawViewShell::GetOptionsBarState( SfxItemSet& rSet )
{
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index fc2f47b..f7fcb2a 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -47,11 +47,6 @@ namespace sd {
#define TABCONTROL_INITIAL_SIZE 500
-/*************************************************************************
-|*
-|* Sprung zu Bookmark
-|*
-\************************************************************************/
sal_Bool DrawViewShell::GotoBookmark(const String& rBookmark)
{
@@ -66,9 +61,8 @@ sal_Bool DrawViewShell::GotoBookmark(const String& rBookmark)
return bRet;
}
-/*************************************************************************
-|*
-|* Bereich sichtbar machen (Bildausschnitt scrollen)
+/**
+ * Make area visible (scroll part of picture)
|*
\************************************************************************/
@@ -88,20 +82,20 @@ void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin)
sal_Bool bZoomAllowed(sal_False);
Size aLogicSize(rRect.GetSize());
- // Sichtbarer Bereich
+ // visible area
Size aVisSizePixel(rWin.GetOutputSizePixel());
Rectangle aVisArea(rWin.PixelToLogic(Rectangle(Point(0,0), aVisSizePixel)));
Size aVisAreaSize(aVisArea.GetSize());
if(!aVisArea.IsInside(rRect) && !SlideShow::IsRunning( GetViewShellBase() ) )
{
- // Objekt liegt nicht komplett im sichtbaren Bereich
+ // object is not entirely in visible area
sal_Int32 nFreeSpaceX(aVisAreaSize.Width() - aLogicSize.Width());
sal_Int32 nFreeSpaceY(aVisAreaSize.Height() - aLogicSize.Height());
if(bZoomAllowed && (nFreeSpaceX < 0 || nFreeSpaceY < 0))
{
- // Objekt passt nicht in sichtbaren Bereich -> auf Objektgroesse zoomen
+ // object does not fit into visible area -> zoom to object size
SetZoomRect(rRect);
}
else
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index ab9cc79..c64484f 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -59,12 +59,9 @@ namespace sd {
#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue()
-/*************************************************************************
-|*
-|* SfxRequests fuer EffekteWindow bearbeiten
-|*
-\************************************************************************/
-
+/**
+ * Handle SfxRequests for EffekteWindow
+ */
void DrawViewShell::ExecEffectWin( SfxRequest& rReq )
{
CheckLineTo (rReq);
@@ -101,11 +98,6 @@ void DrawViewShell::ExecEffectWin( SfxRequest& rReq )
}
}
-/*************************************************************************
-|*
-|* 3D - Assign / Update
-|*
-\************************************************************************/
void DrawViewShell::Update3DWindow()
{
sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId();
@@ -139,25 +131,25 @@ void DrawViewShell::AssignFrom3DWindow()
0, 0);
p3DWin->GetAttr( aSet );
- // Eigene UNDO-Klammerung auch um die Wandlung in 3D
+ // own UNDO-compounding also around transformation in 3D
GetView()->BegUndo(String(SdResId(STR_UNDO_APPLY_3D_FAVOURITE)));
if(GetView()->IsConvertTo3DObjPossible())
{
- // Nur TextAttribute zuweisen
+ // assign only text-attribute
SfxItemSet aTextSet( GetDoc()->GetPool(),
EE_ITEMS_START, EE_ITEMS_END, 0 );
aTextSet.Put( aSet, sal_False );
GetView()->SetAttributes( aTextSet );
- // Text in 3D umwandeln
+ // transform text into 3D
sal_uInt16 nSId = SID_CONVERT_TO_3D;
SfxBoolItem aItem( nSId, sal_True );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list