[Libreoffice-commits] core.git: sd/source
Urs Fässler
urs at bitzgi.ch
Wed Mar 13 09:54:47 PDT 2013
sd/source/ui/inc/BreakDlg.hxx | 8 +----
sd/source/ui/inc/Client.hxx | 5 ---
sd/source/ui/inc/ClientView.hxx | 14 +++------
sd/source/ui/inc/FrameView.hxx | 46 ++++++++++++++----------------
sd/source/ui/inc/GraphicDocShell.hxx | 9 +----
sd/source/ui/inc/LayerTabBar.hxx | 9 +----
sd/source/ui/inc/NavigatorChildWindow.hxx | 9 +----
sd/source/ui/inc/OutlineBulletDlg.hxx | 8 +----
sd/source/ui/inc/OutlineView.hxx | 7 +---
sd/source/ui/inc/TabControl.hxx | 8 +----
sd/source/ui/inc/View.hxx | 16 +++-------
sd/source/ui/inc/ViewShell.hxx | 10 +++---
sd/source/ui/inc/animobjs.hxx | 9 +----
sd/source/ui/inc/assclass.hxx | 15 ++-------
sd/source/ui/inc/copydlg.hxx | 8 +----
sd/source/ui/inc/dlg_char.hxx | 8 +----
sd/source/ui/inc/dlgctrls.hxx | 9 +----
sd/source/ui/inc/dlgfield.hxx | 9 +----
sd/source/ui/inc/dlgpage.hxx | 8 +----
sd/source/ui/inc/dlgsnap.hxx | 9 +----
sd/source/ui/inc/drawview.hxx | 11 ++-----
sd/source/ui/inc/fucon3d.hxx | 4 +-
sd/source/ui/inc/fuconarc.hxx | 4 +-
sd/source/ui/inc/fuconbez.hxx | 4 +-
sd/source/ui/inc/fuconcs.hxx | 8 -----
sd/source/ui/inc/fuconrec.hxx | 13 +++-----
sd/source/ui/inc/fuconstr.hxx | 10 +-----
sd/source/ui/inc/fuconuno.hxx | 13 +++-----
sd/source/ui/inc/fudraw.hxx | 9 +----
sd/source/ui/inc/fudspord.hxx | 10 +-----
sd/source/ui/inc/fuediglu.hxx | 10 +-----
sd/source/ui/inc/fuinsfil.hxx | 6 +--
sd/source/ui/inc/fuolbull.hxx | 9 +----
sd/source/ui/inc/fuoltext.hxx | 8 +----
sd/source/ui/inc/fuoutl.hxx | 9 +----
sd/source/ui/inc/fupage.hxx | 4 +-
sd/source/ui/inc/fupoor.hxx | 32 ++++++++------------
sd/source/ui/inc/fusel.hxx | 4 +-
sd/source/ui/inc/futext.hxx | 13 +++-----
sd/source/ui/inc/fuzoom.hxx | 4 +-
sd/source/ui/inc/gluectrl.hxx | 17 +++--------
sd/source/ui/inc/inspagob.hxx | 10 +-----
sd/source/ui/inc/navigatr.hxx | 18 +++--------
sd/source/ui/inc/paragr.hxx | 8 +----
sd/source/ui/inc/present.hxx | 6 +--
sd/source/ui/inc/prltempl.hxx | 12 +++----
sd/source/ui/inc/res_bmp.hrc | 14 +++------
sd/source/ui/inc/sdpopup.hxx | 9 +----
sd/source/ui/inc/sdpreslt.hxx | 4 +-
sd/source/ui/inc/sdtreelb.hxx | 29 +++++++-----------
sd/source/ui/inc/strings.hrc | 2 -
sd/source/ui/inc/tabtempl.hxx | 8 +----
sd/source/ui/inc/tpaction.hxx | 17 +++--------
sd/source/ui/inc/tpoption.hxx | 25 ++++++----------
sd/source/ui/inc/unprlout.hxx | 2 -
55 files changed, 219 insertions(+), 371 deletions(-)
New commits:
commit c1ba64c2d90dfe73eece410a86f630a0032d0ffe
Author: Urs Fässler <urs at bitzgi.ch>
Date: Wed Mar 13 17:55:26 2013 +0100
translation and cleanup of comments in sd/source/ui/inc/
Change-Id: Ib1d1be4364c56e5164afc631c614183f15e20644
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index cc10478..be74b62 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -38,11 +38,9 @@ namespace sd {
class DrawDocShell;
class DrawView;
-/*************************************************************************
-|*
-|* Dialog zum aufbrechen von Metafiles
-|*
-\************************************************************************/
+/**
+ * dialog to break meta files
+ */
class BreakDlg
: public SfxModalDialog
{
diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx
index d01c075..a029f5a 100644
--- a/sd/source/ui/inc/Client.hxx
+++ b/sd/source/ui/inc/Client.hxx
@@ -30,11 +30,6 @@ namespace sd {
class ViewShell;
-/*************************************************************************
-|*
-|* Client
-|*
-\************************************************************************/
class Client : public SfxInPlaceClient
{
diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx
index d25ae2b..c3753c0 100644
--- a/sd/source/ui/inc/ClientView.hxx
+++ b/sd/source/ui/inc/ClientView.hxx
@@ -26,12 +26,9 @@ namespace sd {
class DrawViewShell;
-/************************************************************************
-|*
-|* Die SdClientView wird fuer DrawDocShell::Draw() verwendet
-|*
-\************************************************************************/
-
+/**
+ * The SdClientView is used for DrawDocShell::Draw()
+ */
class ClientView
: public DrawView
{
@@ -44,9 +41,8 @@ public:
virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L);
- // Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss
- // man diese beiden folgenden Methoden ueberladen und entsprechend anders
- // reagieren.
+ /* if the view should not do a Invalidate() on the windows, you have to
+ overload the following two methods and do something different */
virtual void InvalidateOneWin(::Window& rWin);
virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect);
};
diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx
index 1e7e15c..bdbc292 100644
--- a/sd/source/ui/inc/FrameView.hxx
+++ b/sd/source/ui/inc/FrameView.hxx
@@ -29,11 +29,9 @@ class SdOptions;
namespace sd {
-/*************************************************************************
-|*
-|* View fuer den MDIFrame
-|*
-\************************************************************************/
+/**
+ * View for MDIFrame
+ */
class SD_DLLPUBLIC FrameView
: public SdrView
{
@@ -184,26 +182,26 @@ private:
SdrHelpLineList maStandardHelpLines;
SdrHelpLineList maNotesHelpLines;
SdrHelpLineList maHandoutHelpLines;
- sal_Bool mbNoColors; // Gliederungsmodus
- sal_Bool mbNoAttribs; // Gliederungsmodus
- Rectangle maVisArea; // Sichtbarer Bereich
- PageKind mePageKind; // Seitentyp (Standard, Notizen, Handzettel)
- sal_uInt16 mnSelectedPage; // Selektierte Seite
- PageKind mePageKindOnLoad;
+ sal_Bool mbNoColors; ///< structuring mode
+ sal_Bool mbNoAttribs; ///< structuring mode
+ Rectangle maVisArea; ///< visible area
+ PageKind mePageKind; ///< kind of page (standard, notes, handout)
+ sal_uInt16 mnSelectedPage;
+ PageKind mePageKindOnLoad;
sal_uInt16 mnSelectedPageOnLoad;
- EditMode meStandardEditMode; // Editmode im Zeichenmodus (Page/MasterPage)
- EditMode meNotesEditMode; // Editmode im Notizen-Modus (Page/MasterPage)
- EditMode meHandoutEditMode; // Editmode im Handzettel-Modus (Page/MasterPage)
- EditMode meEditModeOnLoad;
- sal_Bool mbLayerMode; // Layer an/aus
- sal_Bool mbQuickEdit; // QuickEdit an/aus
- sal_Bool mbDoubleClickTextEdit; // Textmodus nach Doppelklick
- sal_Bool mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus
- sal_uInt16 mnPresViewShellId; // ViewShell aus der die Pres. gestartet wurde
- sal_uInt16 mnSlotId; // SlotId, welche initial ausgefuehrt wird
- sal_uInt16 mnSlidesPerRow; // Dias pro Reihe auf dem Diatisch
- sal_uLong mnDrawMode; // Drawmode fuer das normale Fenster
- double mnTabCtrlPercent;
+ EditMode meStandardEditMode; ///< edit mode in drawing mode (Page/MasterPage)
+ EditMode meNotesEditMode; ///< edit mode in notes mode (Page/MasterPage)
+ EditMode meHandoutEditMode; ///< edit mode in handout mode (Page/MasterPage)
+ EditMode meEditModeOnLoad;
+ sal_Bool mbLayerMode; ///< layer on/off
+ sal_Bool mbQuickEdit; ///< QuickEdit on/off
+ sal_Bool mbDoubleClickTextEdit; ///< text mode after double click
+ sal_Bool mbClickChangeRotation; ///< single click switches between selection/rotation mode
+ sal_uInt16 mnPresViewShellId; ///< ViewShell from which the presentation was started
+ sal_uInt16 mnSlotId; ///< SlotId, which was initial mentioned
+ sal_uInt16 mnSlidesPerRow; ///< slides per row on the slide-desk
+ sal_uLong mnDrawMode; ///< draw mode for the normal window
+ double mnTabCtrlPercent;
/** Remember whether the navigator shows all shapes (<TRUE/>) or only
the names ones (<FALSE/>). Not persistent.
*/
diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx
index aed9f10..e59fb42 100644
--- a/sd/source/ui/inc/GraphicDocShell.hxx
+++ b/sd/source/ui/inc/GraphicDocShell.hxx
@@ -29,12 +29,9 @@
namespace sd {
-/*************************************************************************
-|*
-|* Document-Shell fuer Draw-Dokumente
-|*
-\************************************************************************/
-
+/**
+ * document shell for draw documents
+ */
class GraphicDocShell
: public DrawDocShell
{
diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx
index 5a90347..c7e5283 100644
--- a/sd/source/ui/inc/LayerTabBar.hxx
+++ b/sd/source/ui/inc/LayerTabBar.hxx
@@ -25,12 +25,9 @@
namespace sd {
-/*************************************************************************
-|*
-|* TabBar fuer die Layerverwaltung
-|*
-\************************************************************************/
-
+/**
+ * TabBar for layer administration
+ */
class DrawViewShell;
class LayerTabBar
diff --git a/sd/source/ui/inc/NavigatorChildWindow.hxx b/sd/source/ui/inc/NavigatorChildWindow.hxx
index d29095d..6833c1e 100644
--- a/sd/source/ui/inc/NavigatorChildWindow.hxx
+++ b/sd/source/ui/inc/NavigatorChildWindow.hxx
@@ -27,12 +27,9 @@ class SfxBindings;
namespace sd {
-/*************************************************************************
-|*
-|* Ableitung vom SfxChildWindowContext als "Behaelter" fuer Navigator
-|*
-\************************************************************************/
-
+/**
+ * Derivative of SfxChildWindowContext as "container" for navigator
+ */
class NavigatorChildWindow
: public SfxChildWindowContext
{
diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx
index f2cd002..f0a07be 100644
--- a/sd/source/ui/inc/OutlineBulletDlg.hxx
+++ b/sd/source/ui/inc/OutlineBulletDlg.hxx
@@ -28,11 +28,9 @@ namespace sd {
class View;
-/*************************************************************************
-|*
-|* Bullet-Tab-Dialog
-|*
-\************************************************************************/
+/**
+ * Bullet-Tab-Dialog
+ */
class OutlineBulletDlg
: public SfxTabDialog
{
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index a948d99..7b7c2aa 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -46,9 +46,8 @@ class DrawDocShell;
static const int MAX_OUTLINERVIEWS = 4;
-/*************************************************************************
-|*
-|* Ableitung von ::sd::View fuer den Outline-Modus
+/**
+ * Derivative of ::sd::View for the outline mode
|*
\************************************************************************/
@@ -184,7 +183,7 @@ private:
std::vector<Paragraph*> maOldParaOrder;
std::vector<Paragraph*> maSelectedParas;
- sal_uInt16 mnPagesToProcess; // fuer die Fortschrittsanzeige
+ sal_uInt16 mnPagesToProcess; // for the progress bar
sal_uInt16 mnPagesProcessed;
sal_Bool mbFirstPaint;
diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx
index 22080e6..a6cc7d9 100644
--- a/sd/source/ui/inc/TabControl.hxx
+++ b/sd/source/ui/inc/TabControl.hxx
@@ -25,11 +25,9 @@
namespace sd {
-/*************************************************************************
-|*
-|* TabControl-Klasse fuer Seitenumschaltung
-|*
-\************************************************************************/
+/**
+ * TabControl-Class for page switch
+ */
class DrawViewShell;
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 4755613..ae0bb51 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -157,16 +157,12 @@ public:
virtual SfxStyleSheet* GetStyleSheet() const;
- /*************************************************************************
- |*
- |* Rueckgabeparameter:
- |* pExchangeList == NULL -> Namen sind alle eindeutig
- |* bNameOK == sal_False -> Benutzer hat abgebrochen
- |* nType == 0 -> Seiten
- |* nType == 1 -> Objekte
- |* nType == 2 -> Seiten + Objekte
- |*
- \************************************************************************/
+ /** return parameter:
+ pExchangeList == NULL -> all names are unique
+ bNameOK == sal_False -> cancel by user
+ nType == 0 -> pages
+ nType == 1 -> objects
+ nType == 2 -> pages and objects */
bool GetExchangeList( std::vector<rtl::OUString> &rExchangeList,
std::vector<rtl::OUString> &rBookmarkList,
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 7d7c58e..60ccfca 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -39,7 +39,7 @@
class SdPage;
class SvxRuler;
-class SdrOle2Obj; // fuer die, die Teile von SVDRAW rausdefiniert haben
+class SdrOle2Obj; // for the ones, who have undefined parts of SVDRAW
class ScrollBarBox;
class SdDrawDocument;
class ScrollBar;
@@ -491,9 +491,9 @@ protected:
Size maViewSize;
Size maScrBarWH;
- sal_Bool mbCenterAllowed; // wird an Fenster weitergegeben
+ sal_Bool mbCenterAllowed; // will be forwarded to window
- sal_Bool mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet
+ sal_Bool mbStartShowWithDialog; // presentation is started by dialog
sal_uInt16 mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed.
sal_uInt16 mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed.
@@ -527,11 +527,11 @@ protected:
DECL_LINK( HScrollHdl, ScrollBar * );
DECL_LINK( VScrollHdl, ScrollBar * );
- // virt. Scroll-Handler, hier koennen sich abgeleitete Klassen einklinken
+ // virtual scroll handler, here, derivative classes can add themselves here
virtual long VirtHScrollHdl(ScrollBar* pHScroll);
virtual long VirtVScrollHdl(ScrollBar* pVScroll);
- // virtuelle Funktionen fuer Lineal-Handling
+ // virtual functions ruler handling
virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst);
virtual SvxRuler* CreateVRuler(::sd::Window* pWin);
virtual void UpdateHRuler();
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 0d5271c..e46cf30 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -167,12 +167,9 @@ private:
Fraction GetScale();
};
-/*************************************************************************
-|*
-|* ControllerItem fuer Animator
-|*
-\************************************************************************/
-
+/**
+ * ControllerItem for Animator
+ */
class AnimationControllerItem : public SfxControllerItem
{
diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx
index 30135ca..b8adf2e 100644
--- a/sd/source/ui/inc/assclass.hxx
+++ b/sd/source/ui/inc/assclass.hxx
@@ -32,15 +32,14 @@ class Control;
class SD_DLLPUBLIC Assistent
{
+ /** contains for every page the controls, which have to be
+ connected? correctly */
std::vector<Control*> maPages[MAX_PAGES];
- //enthaelt fuer jede Seite die Controls die
- //korrekt geschaltet werden muessen
+ /// number of pages
int mnPages;
- //gibt die Anzahl der Seiten an
int mnCurrentPage;
- //gibt die aktuelle Seite an
boost::scoped_array<bool> mpPageStatus;
@@ -52,26 +51,20 @@ public:
void EnablePage( int nPage );
void DisablePage( int nPage );
+ /// adds a control to the specified page
bool InsertControl(int nDestPage,Control* pUsedControl);
- //fuegt einer spezifizierten Seite ein Control hinzu
bool NextPage();
- //springt zur naechsten Seite
bool PreviousPage();
- //springt zur vorherigen Seite
bool GotoPage(const int nPageToGo);
- //springt zu einer angegebenen Seite
bool IsLastPage() const;
- //gibt an ob die aktuelle Seite die letzte ist
bool IsFirstPage() const;
- //gibt an ob die aktuelle Seite die erste ist
int GetCurrentPage() const;
- //gibt die aktuelle Seite zurueck
};
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index a212c21..49b85a8 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -31,11 +31,9 @@ namespace sd {
class View;
-/*************************************************************************
-|*
-|* Dialog zum Einstellen des Bildschirms
-|*
-\************************************************************************/
+/**
+ * dialog to adjust screen
+ */
class CopyDlg
: public SfxModalDialog
{
diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx
index 67175f7..45e93e0 100644
--- a/sd/source/ui/inc/dlg_char.hxx
+++ b/sd/source/ui/inc/dlg_char.hxx
@@ -29,11 +29,9 @@ class SfxItemSet;
class SfxObjectShell;
-/*************************************************************************
-|*
-|* Zeichen-Tab-Dialog
-|*
-\************************************************************************/
+/**
+ * Character-Tab-Dialog
+ */
class SdCharDlg : public SfxTabDialog
{
private:
diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx
index 0e61e74..bd37435 100644
--- a/sd/source/ui/inc/dlgctrls.hxx
+++ b/sd/source/ui/inc/dlgctrls.hxx
@@ -28,12 +28,9 @@
#include "fadedef.h"
#include "sddllapi.h"
-/*************************************************************************
-|*
-|* FadeEffectLB
-|*
-\************************************************************************/
-
+/**
+ * FadeEffectLB
+ */
struct FadeEffectLBImpl;
class SD_DLLPUBLIC FadeEffectLB : public ListBox
diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx
index 17fd89d..6b2394f 100644
--- a/sd/source/ui/inc/dlgfield.hxx
+++ b/sd/source/ui/inc/dlgfield.hxx
@@ -30,12 +30,9 @@
#include <svx/langbox.hxx>
class SvxFieldData;
-/*************************************************************************
-|*
-|* Dialog zum Bearbeiten von Feldbefehlen
-|*
-\************************************************************************/
-
+/**
+ * dialog to adjust field-commands
+ */
class SdModifyFieldDlg : public ModalDialog
{
private:
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index ab17e2c..952a610 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -28,11 +28,9 @@ class SfxObjectShell;
typedef sal_uInt16 ChangeType;
-/*************************************************************************
-|*
-|* Seite einrichten-Tab-Dialog
-|*
-\************************************************************************/
+/**
+ * Page configuration-tab-dialog
+ */
class SdPageDlg : public SfxTabDialog
{
private:
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index c34e44b..3cf5c80 100644
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -36,12 +36,9 @@ namespace sd {
class View;
}
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Fanglinien und -punkten
-|*
-\************************************************************************/
-
+/**
+ * dialog to adjust snap- lines and points
+ */
class SdSnapLineDlg : public ModalDialog
{
private:
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index 101c9b7..06f00f9 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -28,12 +28,9 @@ namespace sd {
class DrawDocShell;
class DrawViewShell;
-/*************************************************************************
-|*
-|* Ableitung von ::sd::View; enthaelt auch einen Zeiger auf das Dokument
-|*
-\************************************************************************/
-
+/**
+ * Derivative of ::sd::View; contains also a pointer to the document
+ */
class DrawView : public ::sd::View
{
public:
@@ -71,7 +68,7 @@ private:
DrawViewShell* mpDrawViewShell;
VirtualDevice* mpVDev;
- sal_uInt16 mnPOCHSmph; // zum blockieren des PageOrderChangedHint
+ sal_uInt16 mnPOCHSmph; ///< for blocking PageOrderChangedHint
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx
index 2b98272..65dae23 100644
--- a/sd/source/ui/inc/fucon3d.hxx
+++ b/sd/source/ui/inc/fucon3d.hxx
@@ -44,8 +44,8 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate();
+ virtual void Deactivate();
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx
index 54b381d..2dd50ca 100644
--- a/sd/source/ui/inc/fuconarc.hxx
+++ b/sd/source/ui/inc/fuconarc.hxx
@@ -40,8 +40,8 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate();
+ virtual void Deactivate();
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index 0e7df08..e032b62 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -45,8 +45,8 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate();
+ virtual void Deactivate();
virtual void SelectionHasChanged();
diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx
index 0ac5993..4637041 100644
--- a/sd/source/ui/inc/fuconcs.hxx
+++ b/sd/source/ui/inc/fuconcs.hxx
@@ -28,12 +28,6 @@ class SdrObject;
namespace sd {
-/*************************************************************************
-|*
-|* Rechteck zeichnen
-|*
-\************************************************************************/
-
class FuConstructCustomShape
: public FuConstruct
{
@@ -49,7 +43,7 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
+ virtual void Activate();
void SetAttributes( SdrObject* pObj );
diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx
index 9a6dcde..989909b 100644
--- a/sd/source/ui/inc/fuconrec.hxx
+++ b/sd/source/ui/inc/fuconrec.hxx
@@ -29,12 +29,9 @@ class SfxItemSet;
namespace sd {
-/*************************************************************************
-|*
-|* Rechteck zeichnen
-|*
-\************************************************************************/
-
+/**
+ * draw rectangle
+ */
class FuConstructRectangle
: public FuConstruct
{
@@ -50,8 +47,8 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate();
+ virtual void Deactivate();
void SetAttributes(SfxItemSet& rAttr, SdrObject* pObj);
void SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj);
diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx
index 8af7262..bd66f6a 100644
--- a/sd/source/ui/inc/fuconstr.hxx
+++ b/sd/source/ui/inc/fuconstr.hxx
@@ -28,12 +28,6 @@ class SfxItemSet;
namespace sd {
-/*************************************************************************
-|*
-|* Rechteck zeichnen
-|*
-\************************************************************************/
-
class FuConstruct
: public FuDraw
{
@@ -48,8 +42,8 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate();
+ virtual void Deactivate();
virtual void SelectionHasChanged() { bSelectionChanged = sal_True; }
diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx
index 2cf2717..193d4c0 100644
--- a/sd/source/ui/inc/fuconuno.hxx
+++ b/sd/source/ui/inc/fuconuno.hxx
@@ -25,12 +25,9 @@
namespace sd {
-/*************************************************************************
-|*
-|* Control zeichnen
-|*
-\************************************************************************/
-
+/**
+ * draw control
+ */
class FuConstructUnoControl
: public FuConstruct
{
@@ -46,8 +43,8 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate();
+ virtual void Deactivate();
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx
index acc9aff..da26e4f 100644
--- a/sd/source/ui/inc/fudraw.hxx
+++ b/sd/source/ui/inc/fudraw.hxx
@@ -28,12 +28,9 @@ class SdrObject;
namespace sd {
-/*************************************************************************
-|*
-|* Basisklasse fuer alle Drawmodul-spezifischen Funktionen
-|*
-\************************************************************************/
-
+/**
+ * Base class for all Draw specific functions
+ */
class FuDraw
: public FuPoor
{
diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx
index 077d064..01cb18d 100644
--- a/sd/source/ui/inc/fudspord.hxx
+++ b/sd/source/ui/inc/fudspord.hxx
@@ -29,12 +29,6 @@ class SdrObject;
namespace sd {
-/*************************************************************************
-|*
-|* Funktion DisplayOrder
-|*
-\************************************************************************/
-
class FuDisplayOrder
: public FuPoor
{
@@ -48,8 +42,8 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate();
+ virtual void Deactivate();
protected:
virtual ~FuDisplayOrder (void);
diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx
index 1e59fc9..13f0baa 100644
--- a/sd/source/ui/inc/fuediglu.hxx
+++ b/sd/source/ui/inc/fuediglu.hxx
@@ -24,12 +24,6 @@
namespace sd {
-/*************************************************************************
-|*
-|* FuEditGluePoints
-|*
-\************************************************************************/
-
class FuEditGluePoints
: public FuDraw
{
@@ -47,8 +41,8 @@ public:
virtual sal_Bool Command(const CommandEvent& rCEvt);
virtual void ReceiveRequest(SfxRequest& rReq);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate();
+ virtual void Deactivate();
protected:
FuEditGluePoints (
diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx
index 8dbf0a9..1dcec9f 100644
--- a/sd/source/ui/inc/fuinsfil.hxx
+++ b/sd/source/ui/inc/fuinsfil.hxx
@@ -47,9 +47,9 @@ private:
SdDrawDocument* pDoc,
SfxRequest& rReq);
- String aLayoutName; // Layoutname der aktuell eingefuegten Seite
- String aFilterName; // gewaehlter Dateifilter
- String aFile; // gewaehlter Dateiname
+ String aLayoutName; ///< layout name of the currently inserted page
+ String aFilterName; ///< chosen file filter
+ String aFile; ///< chosen file name
void InsTextOrRTFinOlMode(SfxMedium* pMedium);
sal_Bool InsSDDinOlMode(SfxMedium* pMedium);
diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx
index 8d99447..797c4da 100644
--- a/sd/source/ui/inc/fuolbull.hxx
+++ b/sd/source/ui/inc/fuolbull.hxx
@@ -31,12 +31,9 @@ class View;
class ViewShell;
class Window;
-/*************************************************************************
-|*
-|* Bulletfunktionen im Outlinermodus
-|*
-\************************************************************************/
-
+/**
+ * bullet functions in outline mode
+ */
class FuOutlineBullet
: public FuPoor
{
diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx
index ca3b2d6..ef12030 100644
--- a/sd/source/ui/inc/fuoltext.hxx
+++ b/sd/source/ui/inc/fuoltext.hxx
@@ -31,11 +31,9 @@ class View;
class ViewShell;
class Window;
-/*************************************************************************
-|*
-|* Textfunktionen im Outlinermodus
-|*
-\************************************************************************/
+/**
+ * text functions in outline mode
+ */
class FuOutlineText
: public FuOutline
{
diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx
index 47c67a5..c27567b 100644
--- a/sd/source/ui/inc/fuoutl.hxx
+++ b/sd/source/ui/inc/fuoutl.hxx
@@ -34,12 +34,9 @@ class View;
class ViewShell;
class Window;
-/*************************************************************************
-|*
-|* Basisklasse der Funktionen des Outlinemodus
-|*
-\************************************************************************/
-
+/**
+ * Base class of functions of outline mode
+ */
class FuOutline
: public FuPoor
{
diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx
index d1d8fa1..a1a06ab 100644
--- a/sd/source/ui/inc/fupage.hxx
+++ b/sd/source/ui/inc/fupage.hxx
@@ -38,8 +38,8 @@ class FuPage
static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq );
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate();
+ virtual void Deactivate();
const SfxItemSet* ExecuteDialog( Window* pParent );
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index c54e57d..3e8edab 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -41,12 +41,9 @@ class View;
class ViewShell;
class Window;
-/*************************************************************************
-|*
-|* Basisklasse fuer alle Funktionen
-|*
-\************************************************************************/
-
+/**
+ * Base class for all functions
+ */
class FuPoor : public SimpleReferenceComponent
{
public:
@@ -80,8 +77,8 @@ public:
virtual void Paint(const Rectangle&, ::sd::Window* );
virtual void ReceiveRequest(SfxRequest& rReq);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); ///< activates the function
+ virtual void Deactivate(); ///< deactivates the function
void SetWindow(::sd::Window* pWin) { mpWindow = pWin; }
@@ -158,30 +155,27 @@ protected:
sal_uInt16 nSlotId;
sal_uInt16 nSlotValue;
- Dialog* pDialog;
+ Dialog* pDialog;
- Timer aScrollTimer; // fuer Autoscrolling
+ Timer aScrollTimer; ///< for auto-scrolling
DECL_LINK( ScrollHdl, void * );
void ForceScroll(const Point& aPixPos);
- Timer aDragTimer; // fuer Drag&Drop
+ Timer aDragTimer; ///< for Drag&Drop
DECL_LINK(DragHdl, void *);
sal_Bool bIsInDragMode;
- Point aMDPos; // Position von MouseButtonDown
+ Point aMDPos; ///< position of MouseButtonDown
- // Flag, um AutoScrolling zu verhindern, bis von ausserhalb in das
- // Fenster hinein gedragt wurde
+ /// Flag to prevent auto-scrolling until one drags from outside into the window
sal_Bool bNoScrollUntilInside;
- // Timer um das scrolling zu verzoegern, wenn aus dem fenster
- // herausgedraggt wird (ca. 1 sec.)
- Timer aDelayToScrollTimer; // fuer Verzoegerung bis scroll
+ /// timer to delay scrolling (~ 1 sec) when dragging out of the window
+ Timer aDelayToScrollTimer;
sal_Bool bScrollable;
sal_Bool bDelayActive;
sal_Bool bFirstMouseMove;
- // member to hold state of the mouse buttons for creation
- // of own MouseEvents (like in ScrollHdl)
+ /// member to hold state of the mouse buttons for creation of own MouseEvents (like in ScrollHdl)
private:
sal_uInt16 mnCode;
diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx
index 536ab86..d26dedb 100644
--- a/sd/source/ui/inc/fusel.hxx
+++ b/sd/source/ui/inc/fusel.hxx
@@ -45,8 +45,8 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Activate function
- virtual void Deactivate(); // Deactivate function
+ virtual void Activate();
+ virtual void Deactivate();
virtual void SelectionHasChanged();
diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx
index bce6ee2..2a8ac94 100644
--- a/sd/source/ui/inc/futext.hxx
+++ b/sd/source/ui/inc/futext.hxx
@@ -31,12 +31,9 @@ class OutlinerView;
namespace sd {
-/*************************************************************************
-|*
-|* Basisklasse fuer Textfunktionen
-|*
-\************************************************************************/
-
+/**
+ * Base class for text functions
+ */
class FuText
: public FuConstruct
{
@@ -55,8 +52,8 @@ public:
virtual void ReceiveRequest(SfxRequest& rReq);
virtual void DoubleClick(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); ///< activates the function
+ virtual void Deactivate(); ///< deactivates the function
void SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag);
sal_Bool DeleteDefaultText();
diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx
index 1f618b5..db35409 100644
--- a/sd/source/ui/inc/fuzoom.hxx
+++ b/sd/source/ui/inc/fuzoom.hxx
@@ -40,8 +40,8 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); ///< activates the function
+ virtual void Deactivate(); ///< deactivates the function
protected:
virtual ~FuZoom (void);
diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx
index f2aa3be..ddf46ca 100644
--- a/sd/source/ui/inc/gluectrl.hxx
+++ b/sd/source/ui/inc/gluectrl.hxx
@@ -23,11 +23,9 @@
#include <vcl/lstbox.hxx>
#include <sfx2/tbxctrl.hxx>
-/*************************************************************************
-|*
-|* GluePointEscDirLB
-|*
-\************************************************************************/
+/**
+ * GluePointEscDirLB
+ */
class GlueEscDirLB : public ListBox
{
private:
@@ -42,12 +40,9 @@ public:
void Fill();
};
-/*************************************************************************
-|*
-|* Toolbox-Controller fuer Klebepunkte-Austrittsrichtung
-|*
-\************************************************************************/
-
+/**
+ * Toolbox controller for glue-point escape direction
+ */
class SdTbxCtlGlueEscDir: public SfxToolBoxControl
{
private:
diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx
index c15fda2..4041108 100644
--- a/sd/source/ui/inc/inspagob.hxx
+++ b/sd/source/ui/inc/inspagob.hxx
@@ -52,13 +52,9 @@ public:
const String& rFileName );
~SdInsertPagesObjsDlg();
- /*************************************************************************
- |*
- |* Liefert die Liste zurueck
- |* nType == 0 -> Seiten
- |* nType == 1 -> Objekte
- |*
- \************************************************************************/
+ /** returns the list
+ nType == 0 -> pages
+ nType == 1 -> objects */
std::vector<rtl::OUString> GetList ( const sal_uInt16 nType ) ;
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 6a9b80f..ca6bdf4 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -151,12 +151,9 @@ private:
-/*************************************************************************
-|*
-|* ControllerItem fuer Navigator
-|*
-\************************************************************************/
-
+/**
+ * ControllerItem for Navigator
+ */
class SdNavigatorControllerItem : public SfxControllerItem
{
public:
@@ -172,12 +169,9 @@ private:
-/*************************************************************************
-|*
-|* ControllerItem fuer Navigator zum Anzeigen der Seite in der TreeLB
-|*
-\************************************************************************/
-
+/**
+ * ControllerItem for Navigator to show the page in the TreeLB
+ */
class SdPageNameControllerItem : public SfxControllerItem
{
public:
diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx
index f900504..1f927b5 100644
--- a/sd/source/ui/inc/paragr.hxx
+++ b/sd/source/ui/inc/paragr.hxx
@@ -25,11 +25,9 @@
#include "paragr.hrc"
-/*************************************************************************
-|*
-|* Absatz-Tab-Dialog
-|*
-\************************************************************************/
+/**
+ * Paragraph-Tab-Dialog
+ */
class SdParagraphDlg : public SfxTabDialog
{
private:
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index f0b6582..8b9ff52 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -31,9 +31,9 @@ class SfxItemSet;
class List;
class SdCustomShowList;
-/*************************************************************************
-|* Dialog zum Festlegen von Optionen und Starten der Praesentation
-\************************************************************************/
+/**
+ * Dialog to define options and to start the presentation
+ */
class SdStartPresentationDlg : public ModalDialog
{
private:
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index e62abee..2f9a13c 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -25,18 +25,16 @@
#include <sfx2/tabdlg.hxx>
#include <svx/tabarea.hxx>
-#include "prlayout.hxx" // fuer enum PresentationObjects
+#include "prlayout.hxx" // for enum PresentationObjects
class SfxObjectShell;
class SfxStyleSheetBase;
class SfxStyleSheetBasePool;
-/*************************************************************************
-|*
-|* Vorlagen-Tab-Dialog
-|*
-\************************************************************************/
+/**
+ * Template-Tab-Dialog
+ */
class SdPresLayoutTemplateDlg : public SfxTabDialog
{
private:
@@ -62,7 +60,7 @@ private:
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
- // fuers Maping mit dem neuen SvxNumBulletItem
+ // for mapping with the new SvxNumBulletItem
SfxItemSet aInputSet;
SfxItemSet* pOutSet;
const SfxItemSet* pOrgSet;
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 35174dc..8b2e77e4 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -25,7 +25,7 @@
#define IMAGE_MASK_STDCOLOR Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-// Bitmaps fuer Tree-ListBox im Effekte-TabDialog
+// Bitmaps for Tree-ListBox in Effects-TabDialog
#define BMP_PAGE RID_APP_START+42
#define BMP_PAGEOBJS RID_APP_START+43
#define BMP_OBJECTS RID_APP_START+44
@@ -39,7 +39,7 @@
#define BMP_COLLAPSE RID_APP_START+52
#define BMP_GRAPHIC RID_APP_START+53
-// Bimaps fuer ValueSet im EffekteWindow
+// Bitmaps for ValueSet in EffectWindow
// -----------------------------------------------------------------------------
@@ -194,9 +194,7 @@
// -----------------------------------------------------------------------------
-/*
- * ResourceIDs fuer Popup-Menues brauchen keinen Dummy-String !!!
- */
+// ResourceIDs for Popup-Menus do not need a dummy string!!!
#define RID_DRAW_TEXTOBJ_POPUP RID_APP_START+43
#define RID_DRAW_GEOMOBJ_POPUP RID_APP_START+44
@@ -262,9 +260,9 @@
/*
- * ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in
- * strings.hrc auf die selben IDs zu setzen (eine Toolbox und sein
- * Konfigurationsstring muessen dieselbe ResourceID haben!).
+ * Do not change ResourceIDs for toolboxes without also changing the strings in
+ * strings.hrc to the same IDs. A toolbox and its configuration string have to
+ * have the same ResourceID!
*/
#define RID_DRAW_SNAPOBJECT_POPUP RID_APP_START+390
diff --git a/sd/source/ui/inc/sdpopup.hxx b/sd/source/ui/inc/sdpopup.hxx
index f08bd6d..2b52130 100644
--- a/sd/source/ui/inc/sdpopup.hxx
+++ b/sd/source/ui/inc/sdpopup.hxx
@@ -26,12 +26,9 @@
class SvxFieldData;
-/*************************************************************************
-|*
-|* PopupMenu zum Bearbeiten von Feldbefehlen
-|*
-\************************************************************************/
-
+/**
+ * PopupMenu for editing field-commands
+ */
class SdFieldPopup : public PopupMenu
{
private:
diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx
index 3d83c78..8e04d1e 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -66,8 +66,8 @@ private:
boost::ptr_vector<String> maLayoutNames;
- String maName; // Layoutname oder Dateiname
- long mnLayoutCount; // Anzahl, der im Dokument vorhandenen MasterPages
+ String maName; ///< layout name or file name
+ long mnLayoutCount; ///< number of master pages in the document
const String maStrNone;
void FillValueSet();
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 160e87b..99dec07 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -52,17 +52,14 @@ SV_DECL_REF(DrawDocShell)
#endif
}
-/*************************************************************************
-|*
-|* Effekte-Tab-Dialog
-|*
-\************************************************************************/
-
+/**
+ * Effect-Tab-Dialog
+ */
class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox
{
private:
- static sal_Bool SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird
+ static sal_Bool SD_DLLPRIVATE bIsInDrag; ///< static, in the case the navigator is deleted in ExecuteDrag
public:
@@ -129,11 +126,11 @@ protected:
SfxMedium* mpOwnMedium;
Image maImgOle;
Image maImgGraphic;
- sal_Bool mbLinkableSelected;
- sal_Bool mbDragEnabled;
+ sal_Bool mbLinkableSelected;
+ sal_Bool mbDragEnabled;
String maDocName;
- ::sd::DrawDocShellRef mxBookmarkDocShRef; // Zum Laden von Bookmarks
- ::sd::DrawDocShell* mpDropDocSh;
+ ::sd::DrawDocShellRef mxBookmarkDocShRef; ///< for the loading of bookmarks
+ ::sd::DrawDocShell* mpDropDocSh;
SdNavigatorWin* mpDropNavWin;
SfxViewFrame* mpFrame;
@@ -201,13 +198,9 @@ public:
sal_Bool SelectEntry( const String& rName );
String GetSelectEntry();
- /*************************************************************************
- |*
- |* Selektierte Eintrage zurueckgeben
- |* nDepth == 0 -> Seiten
- |* nDepth == 1 -> Objekte
- |*
- \************************************************************************/
+ /** return selected entries
+ nDepth == 0 -> pages
+ nDepth == 1 -> objects */
std::vector<rtl::OUString> GetSelectEntryList (const sal_uInt16 nDepth) const;
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 286aa11..98250a9 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -133,7 +133,7 @@
#define STR_DRAW_GRAF_TOOLBOX RID_DRAW_GRAF_TOOLBOX
-// IDs fuer Praesentationsfolien
+// IDs for presentation slides
#define STR_AUTOLAYOUT_NONE (RID_APP_START+210)
#define STR_AUTOLAYOUT_ONLY_TITLE (RID_APP_START+211)
#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+212)
diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx
index 0ff13ef..b118282 100644
--- a/sd/source/ui/inc/tabtempl.hxx
+++ b/sd/source/ui/inc/tabtempl.hxx
@@ -28,11 +28,9 @@ class SfxObjectShell;
class SdrView;
-/*************************************************************************
-|*
-|* Vorlagen-Tab-Dialog
-|*
-\************************************************************************/
+/**
+ * Template-Tab-Dialog
+ */
class SdTabTemplateDlg : public SfxStyleDialog
{
private:
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index bcf23fa..cc16796 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -37,11 +37,9 @@ namespace sd {
}
class SdDrawDocument;
-/*************************************************************************
-|*
-|* Effekte-SingleTab-Dialog
-|*
-\************************************************************************/
+/**
+ * Effect-SingleTab-Dialog
+ */
class SdActionDlg : public SfxNoLayoutSingleTabDialog
{
private:
@@ -53,12 +51,9 @@ public:
~SdActionDlg() {};
};
-/*************************************************************************
-|*
-|* Interaktions-Tab-Page
-|*
-\************************************************************************/
-
+/**
+ * Interaction-Tab-Page
+ */
class SdTPAction : public SfxTabPage
{
private:
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 94919a4..9d04085 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -30,11 +30,9 @@
#include <sfx2/tabdlg.hxx>
#include <svx/optgrid.hxx>
-/*************************************************************************
-|*
-|* Optionen-Tab-Page: Snap
-|*
-\************************************************************************/
+/**
+ * Option-Tab-Page: Snap
+ */
class SdTpOptionsSnap : public SvxGridTabPage
{
public:
@@ -46,11 +44,10 @@ public:
virtual void Reset( const SfxItemSet & );
};
-/*************************************************************************
-|*
-|* Optionen-Tab-Page: Contents (Inhalte)
-|*
-\************************************************************************/
+
+/**
+ * Option-Tab-Page: Contents
+ */
class SdTpOptionsContents : public SfxTabPage
{
private:
@@ -70,11 +67,9 @@ public:
virtual void Reset( const SfxItemSet & );
};
-/*************************************************************************
-|*
-|* Optionen-Tab-Page: View
-|*
-\************************************************************************/
+/**
+ * Option-Tab-Page: View
+ */
class SdModule;
class SdTpOptionsMisc : public SfxTabPage
{
diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx
index c487684..dd02d7c 100644
--- a/sd/source/ui/inc/unprlout.hxx
+++ b/sd/source/ui/inc/unprlout.hxx
@@ -32,7 +32,7 @@ class SdPresentationLayoutUndoAction : public SdUndoAction
String aNewLayoutName;
AutoLayout eOldAutoLayout;
AutoLayout eNewAutoLayout;
- sal_Bool bSetAutoLayout; // sal_True: AutoLayout aendern
+ sal_Bool bSetAutoLayout; // sal_True: change AutoLayout
SdPage* pPage;
String aComment;
More information about the Libreoffice-commits
mailing list