Translation of german comments in sd/inc and sd/sdi
Regards
Urs
From 5866c66c784417cd236f47379f109217d282fc25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= <urs@bitzgi.ch>
Date: Fri, 1 Mar 2013 10:11:20 +0100
Subject: [PATCH 01/24] translation of German comments of the files in sd/inc/
Change-Id: Icb9bcb36fe17874167a2beb9b8c6dfc39b8507f4
---
sd/inc/app.hrc | 8 ++++----
sd/inc/diadef.h | 2 +-
sd/inc/fadedef.h | 4 ++--
sd/inc/glob.hxx | 10 +++++-----
sd/inc/helpids.h | 2 +-
sd/inc/prlayout.hxx | 6 +++---
sd/inc/sdattr.hrc | 18 +++++++++---------
sd/inc/sdattr.hxx | 2 +-
sd/inc/sdiocmpt.hxx | 4 ++--
sd/inc/sdmod.hxx | 2 +-
sd/inc/stlpool.hxx | 2 +-
11 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 950a930..744f081 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -21,7 +21,7 @@
#include <sfx2/sfx.hrc>
-// HelpIDs fuer Vorlagen
+// Helper IDs for templates
#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70)
#define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71)
#define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72)
@@ -184,7 +184,7 @@
#define SID_CONNECTOR_LINES_CIRCLE_END (SID_SD_START+144)
#define SID_CONNECTOR_LINES_CIRCLES (SID_SD_START+145)
-// Options-Leisten Slot-IDs
+// Option pane slot IDs
#define SID_SOLID_CREATE (SID_SD_START+151)
#define SID_HELPLINES_USE (SID_SD_START+152)
#define SID_HELPLINES_MOVE (SID_SD_START+153)
@@ -212,7 +212,7 @@
#define SID_LINE_CIRCLE_ARROW (SID_SD_START+176)
#define SID_LINE_ARROW_SQUARE (SID_SD_START+177)
#define SID_LINE_SQUARE_ARROW (SID_SD_START+178)
-// und noch weitere...
+// and even more...
#define ID_VAL_ENDINTENS (SID_SD_START+197)
#define ID_VAL_STARTINTENS (SID_SD_START+198)
@@ -266,7 +266,7 @@
#define ID_VAL_WIDTH (SID_SD_START+247)
#define ID_VAL_PANEL_INDEX (SID_SD_START+249)
-// nur zum austesten, um nicht jedesmal APP:HRC ff. durchbuilden zu muessen
+// just for tests, namely that APP:HRC ff. has not to be build every time
#define ID_VAL_DUMMY0 (SID_SD_START+230)
#define ID_VAL_DUMMY1 (SID_SD_START+231)
#define ID_VAL_DUMMY2 (SID_SD_START+232)
diff --git a/sd/inc/diadef.h b/sd/inc/diadef.h
index 0575517..8d8fd52 100644
--- a/sd/inc/diadef.h
+++ b/sd/inc/diadef.h
@@ -27,7 +27,7 @@ enum PresChange
PRESCHANGE_SEMIAUTO = 2
};
-// muss angepasst werden!
+// has to be adjusted
#define PRESCHANGE_COUNT 3
#endif // _SD_DIADEF_H
diff --git a/sd/inc/fadedef.h b/sd/inc/fadedef.h
index addcbf7..6552775 100644
--- a/sd/inc/fadedef.h
+++ b/sd/inc/fadedef.h
@@ -20,7 +20,7 @@
#ifndef _SD_FADEDEF_H
#define _SD_FADEDEF_H
-// muss angepasst werden!
+// has to be adjusted!
#define FADE_EFFECT_COUNT 57
enum FadeSpeed
@@ -29,7 +29,7 @@ enum FadeSpeed
FADE_SPEED_MEDIUM,
FADE_SPEED_FAST
};
-// muss angepasst werden!
+// has to be adjusted!
#define FADE_SPEED_COUNT 3
#endif // _SD_FADEDEF_H
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index e009712..a88c280 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -57,26 +57,26 @@
#define SD_IF_SDTOOLPANELPANESHELL SFX_INTERFACE_SD_START + 29
#define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30
-// Inventor-Id fuer StarDraw UserData
+// Inventor-Id for StarDraw UserData
const sal_uInt32 SdUDInventor=sal_uInt32('S')*0x00000001+
sal_uInt32('D')*0x00000100+
sal_uInt32('U')*0x00010000+
sal_uInt32('D')*0x01000000;
-// Object-Ids fuer StarDraw UserData
+// Object-Ids for StarDraw UserData
#define SD_ANIMATIONINFO_ID 1
#define SD_IMAPINFO_ID 2
-// FamilyId der Praesentationsvorlagen
+// FamilyId of presentation templates
#define SD_STYLE_FAMILY_GRAPHICS SFX_STYLE_FAMILY_PARA
#define SD_STYLE_FAMILY_PSEUDO SFX_STYLE_FAMILY_PSEUDO
#define SD_STYLE_FAMILY_CELL SFX_STYLE_FAMILY_FRAME
#define SD_STYLE_FAMILY_MASTERPAGE SFX_STYLE_FAMILY_PAGE // ex LT_FAMILY
-// Trennzeichen zwischen Layoutname und Vorlagenname der Praesentationsvorlagen
+// Separator between layout name and template name of presentation templates
#define SD_LT_SEPARATOR "~LT~"
-// Optionsstream-Identifier
+// option-stream identifier
#define SD_OPTION_MORPHING "Morph"
#define SD_OPTION_VECTORIZE "Vectorize"
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index f2b7497..54e80b5 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -63,7 +63,7 @@
#define HID_SD_NAVIGATOR_TBI_DRAGTYPE "SD_HID_SD_NAVIGATOR_TBI_DRAGTYPE"
#define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER
"SD_HID_SD_NAVIGATOR_TBI_SHAPE_FILTER"
-// Toolboxen
+// tool boxes
#define HID_SD_DRAW_TOOLBOX "SD_HID_SD_DRAW_TOOLBOX"
#define HID_SD_DRAW_OBJ_TOOLBOX "SD_HID_SD_DRAW_OBJ_TOOLBOX"
#define HID_SD_DRAW_OPTIONS_TOOLBOX "SD_HID_SD_DRAW_OPTIONS_TOOLBOX"
diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx
index 5791359..e8e208e 100644
--- a/sd/inc/prlayout.hxx
+++ b/sd/inc/prlayout.hxx
@@ -18,9 +18,9 @@
*/
/*************************************************************************
-|* Enthielt frueher auch die Klasse SdPresentationLayoutDlg (wird jetzt nicht
-|* mehr benoetigt). Dieses File ist auf ungeklaerte Weise aus dem PVCS
-|* verschwunden und wird jetzt neu eingecheckt und enthaelt nur noch den enum.
+|* Contained once the class SdPresentationLayoutDlg (not needed anymore).
+|* This file disappeared in a mysterious way from the PVCS. It is newly
+|* checked in and does only contain the enumerator.
\************************************************************************/
#ifndef _SD_PRLAYOUT_HXX_
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 7874e0c..7e40754 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -21,13 +21,13 @@
#include <sfx2/sfx.hrc>
-// Anfang Page-Attribute
+// Begin page attributes
#define ATTR_PAGE_START SID_SD_START + 1234
#define ATTR_PAGE_OBJECTS ATTR_PAGE_START + 2
#define ATTR_PAGE_LAYOUT ATTR_PAGE_START + 3
#define ATTR_PAGE_END ATTR_PAGE_LAYOUT
-// Layer-Attribute
+// Layer attributes
#define ATTR_LAYER_START ATTR_PAGE_END + 1
#define ATTR_LAYER_NAME ATTR_LAYER_START
#define ATTR_LAYER_VISIBLE ATTR_LAYER_START + 1
@@ -38,7 +38,7 @@
#define ATTR_LAYER_DESC ATTR_LAYER_START + 6
#define ATTR_LAYER_END ATTR_LAYER_DESC
-// Anfang Dia-Attribute
+// Begin Dia attribute
#define ATTR_DIA_START ATTR_LAYER_END + 1
#define ATTR_DIA_EFFECT ATTR_DIA_START
#define ATTR_DIA_SPEED ATTR_DIA_START + 1
@@ -47,7 +47,7 @@
#define ATTR_DIA_SOUNDFILE ATTR_DIA_START + 5
#define ATTR_DIA_END ATTR_DIA_SOUNDFILE
-// Praesentations-Attribute
+// presentation attributes
#define ATTR_PRESENT_START ATTR_DIA_END + 1
#define ATTR_PRESENT_ALL ATTR_PRESENT_START
#define ATTR_PRESENT_CUSTOMSHOW ATTR_PRESENT_START + 1
@@ -67,24 +67,24 @@
#define ATTR_PRESENT_DISPLAY ATTR_PRESENT_START + 15
#define ATTR_PRESENT_END ATTR_PRESENT_DISPLAY
-// Transformations-Attribute
+// transformation attributes
#define ATTR_TRANSF_START ATTR_PRESENT_END + 1
#define ATTR_TRANSF_ANGLE ATTR_TRANSF_START + 7
#define ATTR_TRANSF_END ATTR_TRANSF_ANGLE
-// Raster-Attribute
+// grid attributes
#define ATTR_GRID_START ATTR_TRANSF_END + 1
#define ATTR_GRID_ORIGIN_Y ATTR_GRID_START + 8
#define ATTR_GRID_END ATTR_GRID_ORIGIN_Y
-// Bildschirm-Attribute
+// display attributes
#define ATTR_DISPLAY_START ATTR_GRID_END + 1
#define ATTR_DISPLAY_ADJUSTLINES ATTR_DISPLAY_START + 8
#define ATTR_DISPLAY_END ATTR_DISPLAY_ADJUSTLINES
#define ATTR_TBX_DUMMY ATTR_DISPLAY_END + 1
-// Animations-Attribute
+// animation attributes
#define ATTR_ANIMATION_START ATTR_TBX_DUMMY + 1
#define ATTR_ANIMATION_ACTIVE ATTR_ANIMATION_START
#define ATTR_ANIMATION_EFFECT ATTR_ANIMATION_START + 1
@@ -154,7 +154,7 @@
#define ATTR_PRESLAYOUT_CHECK_MASTERS ATTR_PRESLAYOUT_START + 3
#define ATTR_PRESLAYOUT_END ATTR_PRESLAYOUT_CHECK_MASTERS
-// Pack & Go Attribute
+// Pack & go attributes
#define ATTR_PACKNGO_START ATTR_PRESLAYOUT_END + 1
#define ATTR_PACKNGO_MEDIUMSIZE ATTR_PACKNGO_START + 3
// ATTR_PACKNGO_END ATTR_PACKNGO_MEDIUMSIZE
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 0baaca8..73886ba 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -35,7 +35,7 @@
//==================================================================
-// Layer-Attribute
+// layer attributes
//==================================================================
class SdAttrLayerName : public SfxStringItem
diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx
index 8731abc..d8cbb67 100644
--- a/sd/inc/sdiocmpt.hxx
+++ b/sd/inc/sdiocmpt.hxx
@@ -55,8 +55,8 @@ private:
sal_uInt16 nVersion;
public:
- // nNewMode: STREAM_READ oder STREAM_WRITE
- // nVer: nur beim Schreiben angeben
+ // nNewMode: STREAM_READ or STREAM_WRITE
+ // nVer: specify only when writing
SdIOCompat(SvStream& rNewStream, sal_uInt16 nNewMode,
sal_uInt16 nVer = SDIOCOMPAT_VERSIONDONTKNOW);
~SdIOCompat();
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 2341435..1eb11fe 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -118,7 +118,7 @@ public:
SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter();
- //virtuelle Methoden fuer den Optionendialog
+ // virtual methods for the option dialog
virtual SfxItemSet* CreateItemSet( sal_uInt16 nId );
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet );
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 4833dd8..294dec2 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -62,7 +62,7 @@ public:
SfxStyleSheetBase* GetTitleSheet(const String& rLayoutName);
- // Caller muss Liste loeschen
+ // Caller has to delete the list
void CreateOutlineSheetList(const String& rLayoutName,
std::vector<SfxStyleSheetBase*> &rOutlineStyles);
/** creates all layout style sheets for the givin layout name if they
--
1.7.10.4
From 6c019cda7ae1f315da4e4f1ea80f6acea6ea5efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= <urs@bitzgi.ch>
Date: Fri, 1 Mar 2013 10:14:00 +0100
Subject: [PATCH 02/24] translation of German comments of the files in sd/sdi/
Change-Id: Ifc7de73dfeb4e12cbe76237558904f4f1f4b130e
---
sd/sdi/_drvwsh.sdi | 26 +++++++++++++-------------
sd/sdi/grdocsh.sdi | 2 +-
sd/sdi/outlnvsh.sdi | 20 ++++++++++----------
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 98f1539..a67acf1 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -111,7 +111,7 @@ interface DrawView
ExecMethod = FuSupport ;
StateMethod = GetMenuState ;
]
- // Menue-Messages fuer temporaere Funktionen mit Dialog
+ // Menu messages for temporary functions with dialog
SID_ATTR_ZOOM // ole : no, status : no
[
ExecMethod = FuTemporary ;
@@ -1228,7 +1228,7 @@ interface DrawView
Export = FALSE ;
]
//////////////////////////////////////////////////////////////////////
- // Beginn FormSlots
+ // Begin FormSlots
SID_FM_CREATE_CONTROL
[
ExecMethod = FuPermanent ;
@@ -1243,7 +1243,7 @@ interface DrawView
ExecMethod = ExecCtrl ;
StateMethod = GetCtrlState ;
]
- // Ende FormSlots
+ // End FormSlots
//////////////////////////////////////////////////////////////////////
SID_ATTR_FILL_STYLE // ole : no, status : ?
[
@@ -1681,9 +1681,9 @@ interface DrawView
ExecMethod = FuSupport ;
StateMethod = GetMenuState ;
]
- // Problem mit SID_ATTR_FILL_STYLE:
- // frueher XFillStyle, jetzt Property FillStyle (Get/Set)
- // deswegen Export = FALSE !
+ // problem with SID_ATTR_FILL_STYLE:
+ // former XFillStyle, now property FillStyle (Get/Set)
+ // therefore Export = FALSE !
SID_SETFILLSTYLE // ole : no, status : play rec
[
ExecMethod = AttrExec ;
@@ -1705,9 +1705,9 @@ interface DrawView
ExecMethod = AttrExec ;
StateMethod = AttrState ;
]
- // Problem mit SID_ATTR_LINE_WIDTH:
- // frueher XLineWidth, jetzt Property LineWidth (Get/Set)
- // deswegen Export = FALSE !
+ // problem with SID_ATTR_LINE_WIDTH:
+ // former XLineWidth, now property LineWidth (Get/Set)
+ // therefore Export = FALSE !
SID_SETLINEWIDTH // ole : no, status : play rec
[
ExecMethod = AttrExec ;
@@ -1720,9 +1720,9 @@ interface DrawView
StateMethod = AttrState ;
]
//DB: FillColor -> SetFillColor
- // Problem mit SID_ATTR_FILL_COLOR:
- // frueher XFillColor, jetzt Property FillColor (Get/Set)
- // deswegen Export = FALSE !
+ // problem with SID_ATTR_FILL_COLOR:
+ // former XFillColor, now property FillColor (Get/Set)
+ // therefore Export = FALSE !
SID_SETFILLCOLOR // ole : no, status : play rec
[
ExecMethod = AttrExec ;
@@ -1939,7 +1939,7 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
- // Slots in der Optionsleiste
+ // slots in the option pane
SID_BEZIER_EDIT // ole : no, status : ?
[
ExecMethod = FuSupport ;
diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi
index ed508a6..6f17114 100644
--- a/sd/sdi/grdocsh.sdi
+++ b/sd/sdi/grdocsh.sdi
@@ -18,7 +18,7 @@
interface GraphicDocument : DrawDocument
[
- uuid ( "D7474100-ACDF-11D0-89CB-008029E4B0B1" ) ; // erzeug am 04.04.97
+ uuid ( "D7474100-ACDF-11D0-89CB-008029E4B0B1" ) ; // created at 04.04.97
]
{
}
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index dbe34ed..68c3b52 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -250,8 +250,8 @@ interface OutlineView
ExecMethod = FuTemporaryModify ;
StateMethod = GetMenuState ;
]
- // Vorlagen
- // kein Menueeintrag
+ // Templates
+ // no menu entry
SID_STYLE_FAMILY2 // ole : no, status : ?
[
ExecMethod = FuTemporary ;
@@ -266,14 +266,14 @@ interface OutlineView
GroupId = GID_DOCUMENT ;
Cachable ;
]
- // Vorlagen
- // kein Menueeintrag
+ // Templates
+ // no menu entry
SID_STYLE_FAMILY5 // ole : no, status : ?
[
ExecMethod = FuTemporary ;
StateMethod = GetAttrState ;
]
- // kein Menueeintrag
+ // no menu entry
SID_STYLE_EDIT // ole : no, status : ?
[
ExecMethod = FuTemporary ;
@@ -281,7 +281,7 @@ interface OutlineView
GroupId = GID_DOCUMENT ;
Cachable ;
]
- // kein Menueeintrag
+ // no menu entry
SID_STYLE_UPDATE_BY_EXAMPLE // ole : no, status : ?
[
ExecMethod = FuTemporary ;
@@ -289,7 +289,7 @@ interface OutlineView
GroupId = GID_DOCUMENT ;
Cachable ;
]
- // kein Menueeintrag
+ // no menu entry
SID_STYLE_WATERCAN // ole : no, status : ?
[
ExecMethod = FuTemporary ;
@@ -297,7 +297,7 @@ interface OutlineView
GroupId = GID_DOCUMENT ;
Cachable ;
]
- // kein Menueeintrag
+ // no menu entry
SID_STYLE_NEW_BY_EXAMPLE // ole : no, status : ?
[
ExecMethod = FuTemporary ;
@@ -305,7 +305,7 @@ interface OutlineView
GroupId = GID_DOCUMENT ;
Cachable ;
]
- // kein Menueeintrag
+ // no menu entry
SID_STYLE_NEW // ole : no, status : ?
[
ExecMethod = FuTemporary ;
@@ -313,7 +313,7 @@ interface OutlineView
GroupId = GID_DOCUMENT ;
Cachable ;
]
- // kein Menueeintrag
+ // no menu entry
SID_STYLE_DELETE // ole : no, status : ?
[
ExecMethod = FuTemporary ;
--
1.7.10.4
From 68b98d65262bb51ddad5148d61a12caf533f29b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= <urs@bitzgi.ch>
Date: Fri, 1 Mar 2013 10:21:23 +0100
Subject: [PATCH 03/24] translation of German comments in the file in
sd/source/core/drawdoc.cxx
Change-Id: Ie7d772b766f9562b9ec21afef879789b2b69dd02
---
sd/source/core/drawdoc.cxx | 156 +++++++++++++++++++++-----------------------
1 file changed, 76 insertions(+), 80 deletions(-)
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 5b7d3e4..debf512 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -170,14 +170,14 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
mpMasterPageListWatcher = ::std::auto_ptr<ImpMasterPageListWatcher>(
new ImpMasterPageListWatcher(*this));
- SetObjectShell(pDrDocSh); // fuer das VCDrawModel
+ SetObjectShell(pDrDocSh); // for the VCDrawModel
if (mpDocSh)
{
SetSwapGraphics(sal_True);
}
- // Masseinheit (von App) und Massstab (von SdMod) setzen
+ // set measurement unit (from App) and scale (from SdMod)
sal_Int32 nX, nY;
SdOptions* pOptions = SD_MOD()->GetSdOptions(meDocType);
pOptions->GetScale( nX, nY );
@@ -196,13 +196,12 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
pItemPool->FreezeIdRanges();
SetTextDefaults();
- // die DrawingEngine muss auch wissen, wo er ist
+ // the DrawingEngine needs to know where it is too
FmFormModel::SetStyleSheetPool( new SdStyleSheetPool( GetPool(), this ) );
- // Dem DrawOutliner den StyleSheetPool setzen, damit Textobjekte richtig
- // eingelesen werden koennen. Der Link zum StyleRequest-Handler des
- // Dokuments wird erst in NewOrLoadCompleted gesetzt, da erst dann alle
- // Vorlagen existieren.
+ // Set the StyleSheetPool for the DrawOutliner, this ensures that we read
+ // text objects correctly. We set the link to the StyleRequest handler of
+ // the document in NewOrLoadCompleted since only then all templates exist.
SdrOutliner& rOutliner = GetDrawOutliner();
rOutliner.SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
SetCalcFieldValueHdl( &rOutliner );
@@ -242,8 +241,8 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
GetPool().GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( sal_False,
EE_PARA_ASIANCJKSPACING ) );
}
- // DefTab und SpellOptions setzen
- // Jetzt am Modul (SD)
+ // set DefTab and SpellOptions
+ // now at the module (SD)
sal_uInt16 nDefTab = pOptions->GetDefTab();
SetDefaultTabulator( nDefTab );
@@ -294,10 +293,9 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
// Initialize the printer independent layout mode.
SetPrinterIndependentLayout (pOptions->GetPrinterIndependentLayout());
- // Dem HitTestOutliner den StyleSheetPool setzen.
- // Der Link zum StyleRequest-Handler des
- // Dokuments wird erst in NewOrLoadCompleted gesetzt, da erst dann alle
- // Vorlagen existieren.
+ // Set the StyleSheetPool for the HitTestOutliner. We set the link to the
+ // StyleRequest handler of the document in NewOrLoadCompleted since only
+ // then all templates exist.
SfxItemSet aSet2( pHitTestOutliner->GetEmptyItemSet() );
pHitTestOutliner->SetStyleSheetPool( (SfxStyleSheetPool*)GetStyleSheetPool() );
@@ -332,19 +330,19 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
pHitTestOutliner->SetControlWord( nCntrl2 );
/**************************************************************************
- * Layer anlegen
+ * create layer
*
- * Es werden auf Pages und MasterPages folgende Default-Layer angelegt:
+ * We create the following default layers on pages and master pages:
*
- * Layer STR_LAYOUT : Standardlayer f�r alle Zeichenobjekte
+ * Layer STR_LAYOUT : standard layer for all drawing objects
*
- * Layer STR_BCKGRND : Hintergrund der MasterPage
- * (auf normalen Pages z.Z. keine Verwendung)
+ * Layer STR_BCKGRND : background of the master page
+ * (no use of normal pages at the moment)
*
- * Layer STR_BCKGRNDOBJ: Objekte auf dem Hintergrund der MasterPage
- * (auf normalen Pages z.Z. keine Verwendung)
+ * Layer STR_BCKGRNDOBJ: objects on the background of the master page
+ * (no use of normal pages at the moment)
*
- * Layer STR_CONTROLS : Standardlayer f�r Controls
+ * Layer STR_CONTROLS : standard layer for controls
*
**************************************************************************/
{
@@ -365,7 +363,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
/*************************************************************************
|*
-|* Destruktor
+|* Destructor
|*
\************************************************************************/
@@ -393,7 +391,7 @@ SdDrawDocument::~SdDrawDocument()
if (pLinkManager)
{
- // BaseLinks freigeben
+ // free base links
if ( !pLinkManager->GetLinks().empty() )
{
pLinkManager->Remove( 0, pLinkManager->GetLinks().size() );
@@ -411,7 +409,7 @@ SdDrawDocument::~SdDrawDocument()
{
for (sal_uLong j = 0; j < mpCustomShowList->size(); j++)
{
- // Ggf. CustomShows loeschen
+ // free CustomShows if neccessary
SdCustomShow* pCustomShow = (*mpCustomShowList)[j];
delete pCustomShow;
}
@@ -435,9 +433,9 @@ SdDrawDocument::~SdDrawDocument()
/*************************************************************************
|*
-|* Diese Methode erzeugt ein neues Dokument (SdDrawDocument) und gibt einen
-|* Zeiger darauf zurueck. Die Drawing Engine benutzt diese Methode um das
-|* Dokument oder Teile davon ins Clipboard/DragServer stellen zu koennen.
+|* This methods creates and returns a pointer to a new document
+|* (SdDrawDocument). The drawing engine uses this method to move parts or
+|* the whole document into the Clipboard/DragServer.
|*
\************************************************************************/
@@ -447,7 +445,7 @@ SdrModel* SdDrawDocument::AllocModel() const
if( mpCreatingTransferable )
{
- // Dokument wird fuer Drag&Drop/Clipboard erzeugt, dafuer muss dem Dokument eine DocShell
(SvPersist) bekannt sein
+ // we create the document for Drag&Drop/Clipboard, therefore the document needs to know a
DocShell (SvPersist)
SfxObjectShell* pObj = NULL;
::sd::DrawDocShell* pNewDocSh = NULL;
@@ -462,8 +460,8 @@ SdrModel* SdDrawDocument::AllocModel() const
pNewDocSh->DoInitNew( NULL );
pNewModel = pNewDocSh->GetDoc();
- // Nur fuer Clipboard notwendig,
- // fuer Drag&Drop erfolgt dieses im DragServer
+ // Only necessary for Clipboard
+ // It happens in the DragServer for Drag&Drop
SdStyleSheetPool* pOldStylePool = (SdStyleSheetPool*) GetStyleSheetPool();
SdStyleSheetPool* pNewStylePool = (SdStyleSheetPool*) pNewModel->GetStyleSheetPool();
@@ -474,7 +472,7 @@ SdrModel* SdDrawDocument::AllocModel() const
for (sal_uInt16 i = 0; i < GetMasterSdPageCount(PK_STANDARD); i++)
{
- // Alle Layouts der MasterPage mitnehmen
+ // take along all layouts of the master page
String aOldLayoutName(((SdDrawDocument*) this)->GetMasterSdPage(i,
PK_STANDARD)->GetLayoutName());
aOldLayoutName.Erase( aOldLayoutName.SearchAscii( SD_LT_SEPARATOR ) );
SdStyleSheetVector aCreatedSheets;
@@ -485,7 +483,7 @@ SdrModel* SdDrawDocument::AllocModel() const
}
else if( mbAllocDocSh )
{
- // Es wird eine DocShell erzeugt, welche mit GetAllocedDocSh() zurueckgegeben wird
+ // we create a DocShell which is returned by GetAllocedDocSh()
SdDrawDocument* pDoc = (SdDrawDocument*) this;
pDoc->SetAllocDocSh(sal_False);
pDoc->mxAllocedDocShRef = new ::sd::DrawDocShell(
@@ -503,10 +501,9 @@ SdrModel* SdDrawDocument::AllocModel() const
/*************************************************************************
|*
-|* Diese Methode erzeugt eine neue Seite (SdPage) und gibt einen Zeiger
-|* darauf zurueck. Die Drawing Engine benutzt diese Methode beim Laden
-|* zur Erzeugung von Seiten (deren Typ sie ja nicht kennt, da es ABLEITUNGEN
-|* der SdrPage sind).
+|* This methods creates and returns a pointer to a new page (SdPage). The
+|* drawing engine uses this method to create pages (with unknown type since
+|* they are derivatives of SdrPage) when loading.
|*
\************************************************************************/
@@ -517,7 +514,7 @@ SdrPage* SdDrawDocument::AllocPage(bool bMasterPage)
/*************************************************************************
|*
-|* SetChanged(), das Model wurde geaendert
+|* SetChanged() the model was changed
|*
\************************************************************************/
@@ -527,16 +524,16 @@ void SdDrawDocument::SetChanged(sal_Bool bFlag)
{
if (mbNewOrLoadCompleted && mpDocSh->IsEnableSetModified())
{
- // weitergeben an Basisklasse
+ // forward to base class
FmFormModel::SetChanged(bFlag);
- // an ObjectShell weiterleiten
+ // forward to ObjectShell
mpDocSh->SetModified(bFlag);
}
}
else
{
- // weitergeben an Basisklasse
+ // forward to base class
FmFormModel::SetChanged(bFlag);
}
}
@@ -557,8 +554,8 @@ void SdDrawDocument::NbcSetChanged(sal_Bool bFlag)
|*
|* NewOrLoadCompleted
|*
-|* Wird gerufen, wenn das Dokument geladen wurde bzw. feststeht, dass es
-|* nicht mehr geladen wird.
+|* Is called when the document is loaded or when it is known, that the document
+|* will not be loaded anymore.
|*
\************************************************************************/
@@ -566,9 +563,9 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
{
if (eMode == NEW_DOC)
{
- // Neues Dokument:
- // Praesentations- und Standardvorlagen erzeugen,
- // Pool fuer virtuelle Controls erzeugen
+ // new document:
+ // create presentation and standard templates
+ // create pool for virtual controls
CreateLayoutTemplates();
CreateDefaultCellStyles();
@@ -576,7 +573,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
}
else if (eMode == DOC_LOADED)
{
- // Dokument wurde geladen:
+ // document is loaded:
CheckMasterPages();
@@ -611,23 +608,23 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
pPage->SetName( aName );
}
- // Sprachabhaengige Namen der StandardLayer erzeugen
+ // create language dependent names for the standard layers
RestoreLayerNames();
- // Sprachabhaengige Namen der Vorlagen setzen
+ // create language dependent names for the templates
static_cast<SdStyleSheetPool*>(mxStyleSheetPool.get())->UpdateStdNames();
- // Ggf. fehlende Vorlagen erzeugen (es gab z.B. frueher keinen Subtitle)
+ // create missing templates if necessary (for example, there were no subtitles earlier)
static_cast<SdStyleSheetPool*>(mxStyleSheetPool.get())->CreatePseudosIfNecessary();
}
- // Standardvorlage an der Drawing Engine setzen
+ // set standard template for drawing engine
String aName( SdResId(STR_STANDARD_STYLESHEET_NAME));
SetDefaultStyleSheet(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(aName,
SD_STYLE_FAMILY_GRAPHICS)));
- // Draw-Outliner und Dokument Outliner initialisieren,
- // aber nicht den globalen Outliner, den der ist ja nicht
- // dokumentspezifisch wie StyleSheetPool und StyleRequestHandler
+ // Initialize draw outliner and document outliner, but not the global
+ // outliner. It is not specific for the document unlike StyleSheetPool or
+ // StyleRequestHandler.
::Outliner& rDrawOutliner = GetDrawOutliner();
rDrawOutliner.SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
sal_uLong nCntrl = rDrawOutliner.GetControlWord();
@@ -637,9 +634,9 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
nCntrl &= ~EE_CNTRL_ONLINESPELLING;
rDrawOutliner.SetControlWord(nCntrl);
- // HitTest-Outliner und Dokument Outliner initialisieren,
- // aber nicht den globalen Outliner, den der ist ja nicht
- // dokumentspezifisch wie StyleSheetPool und StyleRequestHandler
+ // Initialize HitTest outliner and document outliner, but not the global
+ // outliner. It is not specific for the document unlike StyleSheetPool or
+ // StyleRequestHandler.
pHitTestOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
if(mpOutliner)
@@ -653,8 +650,8 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
if ( eMode == DOC_LOADED )
{
- // Praesentationsobjekte muessen wieder Listener der entsprechenden
- // Vorlagen werden
+ // presentation objects have to be listener of the corresponding
+ // templates
SdStyleSheetPool* pSPool = (SdStyleSheetPool*) GetStyleSheetPool();
sal_uInt16 nPage, nPageCount;
@@ -667,7 +664,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
pSPool->CreateLayoutStyleSheets( pPage->GetName(), sal_True );
}
- // Standard- und Notizseiten:
+ // standard and note pages
for (nPage = 0; nPage < GetPageCount(); nPage++)
{
SdPage* pPage = (SdPage*)GetPage(nPage);
@@ -686,7 +683,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
mbNewOrLoadCompleted = sal_True;
/**************************************************************************
- * Alle gelinkten Pages aktualisieren
+ * actualize all linked pages
**************************************************************************/
SdPage* pPage = NULL;
sal_uInt16 nMaxSdPages = GetSdPageCount(PK_STANDARD);
@@ -728,7 +725,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
const sd::ShapeList& rPresentationShapes( pPage->GetPresentationShapeList() );
if(!rPresentationShapes.isEmpty())
{
- // Listen mit Titel- und Gliederungsvorlagen erstellen
+ // create lists with title and outline templates
String aName = pPage->GetLayoutName();
aName.Erase( aName.SearchAscii( SD_LT_SEPARATOR ));
@@ -739,8 +736,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
SdrObject* pObj = rPresentationShapes.getNextShape(0);
- // jetzt nach Titel- und Gliederungstextobjekten suchen und
- // Objekte zu Listenern machen
+ // now we search title and outline text objects and make listeners out
+ // of them
while(pObj)
{
if (pObj->GetObjInventor() == SdrInventor)
@@ -753,7 +750,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
if( pOPO && pOPO->GetOutlinerMode() == OUTLINERMODE_DONTKNOW )
pOPO->SetOutlinerMode( OUTLINERMODE_TITLEOBJECT );
- // sal_True: harte Attribute dabei nicht loeschen
+ // sal_True: don't delete hard attributes
if (pTitleSheet)
pObj->SetStyleSheet(pTitleSheet, sal_True);
}
@@ -772,7 +769,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
pObj->StartListening(*pSheet);
if( iter == aOutlineList.begin())
- // Textrahmen hoert auf StyleSheet der Ebene1
+ // text frame listens to StyleSheet of layer1
pObj->NbcSetStyleSheet(pSheet, sal_True);
}
}
@@ -800,8 +797,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
/*************************************************************************
|*
-|* Lokaler Outliner, welcher fuer den Gliederungsmodus verwendet wird
-|* In diesen Outliner werden ggf. OutlinerViews inserted!
+|* local outliner which is used for outline mode
+|* if necessary, OutlinerViews are inserted into this outliner
|*
\************************************************************************/
@@ -824,9 +821,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
/*************************************************************************
|*
-|* Interner Outliner, welcher fuer die Erzeugung von Textobjekten
-|* verwendet wird.
-|* In diesen Outliner werden keine OutlinerViews inserted!
+|* internal outliner which is used for the creation of text objects
+|* no OutlinerViews are inserted into this outliner
|*
\************************************************************************/
@@ -836,9 +832,9 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
{
mpInternalOutliner = new ::sd::Outliner( this, OUTLINERMODE_TEXTOBJECT );
// MT:
- // Dieser Outliner wird nur fuer das Erzeugen spezieller Textobjekte
- // verwendet. Da in diesen Textobjekten keine Portion-Informationen
- // gespeichert werden muessen, kann/soll der Update-Mode immer sal_False bleiben.
+ // This outliner is only used for the creation of special text objects.
+ // Since this text object does not contain Portion information, update
+ // mode should always be sal_False
mpInternalOutliner->SetUpdateMode( sal_False );
mpInternalOutliner->EnableUndo( sal_False );
@@ -852,18 +848,18 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool*
pSPool
DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->GetUpdateMode() == sal_False ) ,
"InternalOutliner: UpdateMode = sal_True !" );
DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->IsUndoEnabled() == sal_False ),
"InternalOutliner: Undo = sal_True !" );
- // MT: Wer ihn vollmuellt, macht ihn auch gleich wieder leer:
- // Vorteile:
- // a) Keine unnoetigen Clear-Aufrufe
- // b) Kein Muell im Speicher.
- DBG_ASSERT( !mpInternalOutliner || ( ( mpInternalOutliner->GetParagraphCount() == 1 ) && (
mpInternalOutliner->GetText( mpInternalOutliner->GetParagraph( 0 ) ).Len() == 0 ) ),
"InternalOutliner: Nicht leer!" );
+ // MT: If one produces garbage, he has to remove it itself
+ // Advantages:
+ // a) no invalid clear calls
+ // b) no garbage in memory.
+ DBG_ASSERT( !mpInternalOutliner || ( ( mpInternalOutliner->GetParagraphCount() == 1 ) && (
mpInternalOutliner->GetText( mpInternalOutliner->GetParagraph( 0 ) ).Len() == 0 ) ),
"InternalOutliner: not empty!" );
return mpInternalOutliner;
}
/*************************************************************************
|*
-|* OnlineSpelling ein/aus
+|* enable/disable OnlineSpelling
|*
\************************************************************************/
@@ -920,7 +916,7 @@ void SdDrawDocument::SetOnlineSpell(sal_Bool bIn)
/*************************************************************************
|*
-|* OnlineSpelling: Markierung ein/aus
+|* OnlineSpelling: enable/disable marking
|*
\************************************************************************/
--
1.7.10.4
From 735eb832a8811b6fcbc55b80ce6b600df1509026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= <urs@bitzgi.ch>
Date: Fri, 1 Mar 2013 10:24:52 +0100
Subject: [PATCH 04/24] translation of German comments in the file in
sd/source/core/drawdoc2.cxx
Change-Id: I7653631e83fa6f9be2715b964211172bc0178bba
---
sd/source/core/drawdoc2.cxx | 142 +++++++++++++++++++++----------------------
1 file changed, 69 insertions(+), 73 deletions(-)
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index e612831..718944c 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -69,13 +69,13 @@
using namespace ::sd;
-const long PRINT_OFFSET = 30; // siehe \svx\source\dialog\page.cxx (PB)
+const long PRINT_OFFSET = 30; // see \svx\source\dialog\page.cxx (PB)
using namespace com::sun::star;
/*************************************************************************
|*
-|* Sucht ein Objekt per Name
+|* search a object by name
|*
\************************************************************************/
@@ -86,7 +86,7 @@ SdrObject* SdDrawDocument::GetObj(const String& rObjName) const
SdPage* pPage = NULL;
/**************************************************************************
- * Zuerst alle Pages durchsuchen
+ * first, search in all pages
**************************************************************************/
sal_uInt16 nPage = 0;
const sal_uInt16 nMaxPages = GetPageCount();
@@ -113,7 +113,7 @@ SdrObject* SdDrawDocument::GetObj(const String& rObjName) const
}
/**************************************************************************
- * Wenn nicht gefunden, dann alle MasterPages durchsuchen
+ * if not found, search in all master pages
**************************************************************************/
nPage = 0;
const sal_uInt16 nMaxMasterPages = GetMasterPageCount();
@@ -145,7 +145,7 @@ SdrObject* SdDrawDocument::GetObj(const String& rObjName) const
/*************************************************************************
|*
-|* Sucht die SdPage per Name
+|* search SdPage by name
|*
\************************************************************************/
@@ -218,8 +218,8 @@ sal_uInt16 SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const
/*************************************************************************
|*
-|* die in den Seitenobjekten der Notizseiten eingetragenen
-|* Seitennummern anpassen
+|* update the page numbers of the page objects which are embedded in the
+|* note pages.
|*
\************************************************************************/
@@ -232,8 +232,7 @@ void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 nStartPos)
{
pPage = (SdPage*)GetPage(nPage);
- // wenn es eine Notizseite ist, Seitenobjekt suchen
- // und Nummer korrigieren
+ // if it is a note page, search page object and update number
if (pPage && pPage->GetPageKind() == PK_NOTES)
{
sal_uLong nObjCount = pPage->GetObjCount();
@@ -244,9 +243,9 @@ void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 nStartPos)
if (pObj->GetObjIdentifier() == OBJ_PAGE &&
pObj->GetObjInventor() == SdrInventor)
{
- // das Seitenobjekt stellt die vorhergende Seite (also
- // die Zeichenseite) dar
DBG_ASSERTWARNING(nStartPos, "Notizseitenpos. darf nicht 0 sein");
+ // the page object represents the previous page (i.e. the
+ // drawing page)
DBG_ASSERTWARNING(nPage > 1, "Seitenobjekt darf nicht Handzettel darstellen");
@@ -368,13 +367,13 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos,
sal_
/*************************************************************************
|*
-|* Seite verschieben
+|* move page
|*
\************************************************************************/
void SdDrawDocument::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
{
- // Seite verschieben
+ // move page
FmFormModel::MovePage(nPgNum, nNewPos);
sal_uInt16 nMin = Min(nPgNum, nNewPos);
@@ -384,7 +383,7 @@ void SdDrawDocument::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
/*************************************************************************
|*
-|* Seite einfuegen
+|* insert page
|*
\************************************************************************/
@@ -405,7 +404,7 @@ void SdDrawDocument::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
/*************************************************************************
|*
-|* Seite loeschen
+|* delete page
|*
\************************************************************************/
@@ -418,7 +417,7 @@ void SdDrawDocument::DeletePage(sal_uInt16 nPgNum)
/*************************************************************************
|*
-|* Seite entfernen
+|* remove page
|*
\************************************************************************/
@@ -468,7 +467,7 @@ SdrPage* SdDrawDocument::RemoveMasterPage(sal_uInt16 nPgNum)
/*************************************************************************
|*
-|* Seiten selektieren
+|* select pages
|*
\************************************************************************/
@@ -505,15 +504,14 @@ void SdDrawDocument::SetSelected(SdPage* pPage, sal_Bool bSelect)
/*************************************************************************
|*
-|* Sofern noch keine Seiten vorhanden sind, werden nun Seiten erzeugt
+|* we create pages if no pages exist yet
|*
\************************************************************************/
void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
{
/**************************************************************************
- * Wenn noch keine Seite im Model vorhanden ist (Datei-Neu), wird
- * eine neue Seite eingefuegt
+ * If no page exists in the model (new file), we insert a new page
**************************************************************************/
sal_uInt16 nPageCount = GetPageCount();
@@ -523,7 +521,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
Size aDefSize = SvxPaperInfo::GetDefaultPaperSize( MAP_100TH_MM );
/**********************************************************************
- * Handzettel-Seite einfuegen
+ * insert a handout page
**********************************************************************/
SdPage* pHandoutPage = dynamic_cast< SdPage* >( AllocPage(sal_False) );
@@ -548,7 +546,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
InsertPage(pHandoutPage, 0);
/**********************************************************************
- * MasterPage einfuegen und an der Handzettel-Seite vermerken
+ * insert master page and link with handout
**********************************************************************/
SdPage* pHandoutMPage = (SdPage*) AllocPage(sal_True);
pHandoutMPage->SetSize( pHandoutPage->GetSize() );
@@ -561,9 +559,9 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
pHandoutPage->TRG_SetMasterPage( *pHandoutMPage );
/**********************************************************************
- * Seite einfuegen
- * Sofern nPageCount==1 ist, wurde das Model fuers Clipboad erzeugt.
- * Eine Standard-Seite ist daher schon vorhanden.
+ * insert page
+ * If nPageCount==1, then the model was created for the clipboard.
+ * Therefore, a standard page exists already.
**********************************************************************/
SdPage* pPage;
sal_Bool bClipboard = sal_False;
@@ -582,7 +580,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
}
else if (meDocType == DOCUMENT_TYPE_DRAW)
{
- // Draw: stets Default-Groesse mit Raendern
+ // Draw: always default sizes with margins
pPage->SetSize(aDefSize);
SfxPrinter* pPrinter = mpDocSh->GetPrinter(sal_False);
@@ -612,7 +610,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
}
else
{
- // Impress: stets Bildschirmformat, quer
+ // Impress: screen format is always landscape
Size aSz( SvxPaperInfo::GetPaperSize(PAPER_SCREEN_4_3, MAP_100TH_MM) );
pPage->SetSize( Size( aSz.Height(), aSz.Width() ) );
pPage->SetBorder(0, 0, 0, 0);
@@ -627,7 +625,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
}
/**********************************************************************
- * MasterPage einfuegen und an der Seite vermerken
+ * insert master page and link with page
**********************************************************************/
SdPage* pMPage = (SdPage*) AllocPage(sal_True);
pMPage->SetSize( pPage->GetSize() );
@@ -641,7 +639,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
pMPage->SetLayoutName( pPage->GetLayoutName() );
/**********************************************************************
- * Notizen-Seite einfuegen
+ * insert note page
**********************************************************************/
SdPage* pNotesPage = (SdPage*) AllocPage(sal_False);
@@ -655,7 +653,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
}
else
{
- // Stets Hochformat
+ // always portrait
if (aDefSize.Height() >= aDefSize.Width())
{
pNotesPage->SetSize(aDefSize);
@@ -673,7 +671,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
pNotesPage->SetLayoutName( pPage->GetLayoutName() );
/**********************************************************************
- * MasterPage einfuegen und an der Notizen-Seite vermerken
+ * insert master page and link with note page
**********************************************************************/
SdPage* pNotesMPage = (SdPage*) AllocPage(sal_True);
pNotesMPage->SetSize( pNotesPage->GetSize() );
@@ -702,9 +700,9 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
/*************************************************************************
|*
-|* Erzeugt fehlende Notiz und Handzettelseiten (nach PowerPoint-Import)
-|* Es wird davon ausgegangen, dass mindestens eine Standard-Seite und
-|* eine Standard-MasterPage vorhanden sind.
+|* Creates missing note and handout pages (after importing PowerPoint).
+|* We assume that there exists at least one standard page and one standard
+|* master page.
|*
\************************************************************************/
@@ -716,7 +714,7 @@ sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
if (nPageCount != 0)
{
/**********************************************************************
- * PageKind setzen
+ * set PageKind
**********************************************************************/
SdPage* pHandoutMPage = (SdPage*) GetMasterPage(0);
pHandoutMPage->SetPageKind(PK_HANDOUT);
@@ -731,15 +729,15 @@ sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
if(!pPage->TRG_HasMasterPage())
{
- // Keine MasterPage gesetzt -> erste Standard-MasterPage nehmen
- // (Wenn bei PPT keine Standard-Seite vorhanden war)
+ // no master page is set -> use first standard master page
+ // (if PPT had no standard page)
pPage->TRG_SetMasterPage(*GetMasterPage(1));
}
SdPage* pNotesPage = (SdPage*) GetPage(i+1);
pNotesPage->SetPageKind(PK_NOTES);
- // Notiz-MasterPages setzen
+ // set note master page
sal_uInt16 nMasterPageAfterPagesMasterPage = (pPage->TRG_GetMasterPage()).GetPageNum()
+ 1;
pNotesPage->TRG_SetMasterPage(*GetMasterPage(nMasterPageAfterPagesMasterPage));
}
@@ -754,9 +752,9 @@ sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
/*************************************************************************
|*
-|* - selektierte Seiten hinter genannte Seite schieben
-|* (nTargetPage = (sal_uInt16)-1 --> vor erste Seite schieben)
-|* - ergibt sal_True, wenn Seiten verschoben wurden
+|* - move selected page after named page
+|* (nTargetPage = (sal_uInt16)-1 --> move before first page)
+|* - returns sal_True if pages were moved
|*
\************************************************************************/
@@ -772,7 +770,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
if( bUndo )
BegUndo(String(SdResId(STR_UNDO_MOVEPAGES)));
- // Liste mit selektierten Seiten
+ // list with selected pages
std::vector<SdPage*> aPageList;
for (nPage = 0; nPage < nNoOfPages; nPage++)
{
@@ -782,7 +780,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
aPageList.push_back(pPage);
}
- // falls noetig, nach vorne hangeln, bis nicht selektierte Seite gefunden
+ // if necessary jump forwards until a not selected page is found
nPage = nTargetPage;
if (nPage != (sal_uInt16)-1)
{
@@ -799,7 +797,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
}
}
- // vor der ersten Seite einfuegen
+ // insert before the first page
if (nPage == (sal_uInt16)-1)
{
std::vector<SdPage*>::reverse_iterator iter;
@@ -820,11 +818,11 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
}
}
}
- // hinter <nPage> einfuegen
+ // insert after <nPage>
else
{
nTargetPage = nPage;
- nTargetPage = 2 * nTargetPage + 1; // PK_STANDARD --> absolut
+ nTargetPage = 2 * nTargetPage + 1; // PK_STANDARD --> absolute
std::vector<SdPage*>::iterator iter;
for (iter = aPageList.begin(); iter != aPageList.end(); ++iter)
@@ -833,7 +831,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
nPage = pPage->GetPageNum();
if (nPage > nTargetPage)
{
- nTargetPage += 2; // hinter (!) der Seite einfuegen
+ nTargetPage += 2; // insert after (!) the page
if (nPage != nTargetPage)
{
@@ -876,7 +874,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
/*************************************************************************
|*
-|* Anzahl der Links im sfx2::LinkManager zurueckgeben
+|* Return the number of links in sfx2::LinkManager
|*
\************************************************************************/
@@ -887,7 +885,7 @@ sal_uLong SdDrawDocument::GetLinkCount()
/*************************************************************************
|*
-|* Language setzen
+|* set language
|*
\************************************************************************/
@@ -942,7 +940,7 @@ LanguageType SdDrawDocument::GetLanguage( const sal_uInt16 nId ) const
/*************************************************************************
|*
-|* WorkStartup einleiten
+|* start WorkStartup
|*
\************************************************************************/
@@ -951,14 +949,14 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
if( mpDocSh )
mpDocSh->SetWaitCursor( sal_True );
- sal_Bool bChanged = IsChanged(); // merken
+ sal_Bool bChanged = IsChanged(); // save
- // Autolayouts initialisieren
+ // initialize Autolayouts
SdPage* pHandoutMPage = GetMasterSdPage(0, PK_HANDOUT);
if (pHandoutMPage->GetAutoLayout() == AUTOLAYOUT_NONE)
{
- // AutoLayout wurde noch nicht umgesetzt -> Initialisieren
+ // AutoLayout is not yet applied -> initialize
pHandoutMPage->SetAutoLayout(AUTOLAYOUT_HANDOUT6, sal_True, sal_True);
}
@@ -966,7 +964,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
if (pPage->GetAutoLayout() == AUTOLAYOUT_NONE)
{
- // AutoLayout wurde noch nicht umgesetzt -> Initialisieren
+ // AutoLayout is not yet applied -> initialize
pPage->SetAutoLayout(AUTOLAYOUT_NONE, sal_True, sal_True);
}
@@ -974,7 +972,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
if (pNotesPage->GetAutoLayout() == AUTOLAYOUT_NONE)
{
- // AutoLayout wurde noch nicht umgesetzt -> Initialisieren
+ // AutoLayout is not yet applied -> initialize
pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True);
}
@@ -988,9 +986,8 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
/*************************************************************************
|*
-|* Wenn der WorkStartupTimer erzeugt worden ist (das erfolgt ausschliesslich
-|* in SdDrawViewShell::Consruct() ), so wird der Timer ggf. gestoppt und
-|* das WorkStartup eingeleitet
+|* If the WorkStartupTimer was created (only possible in SdDrawViewShell::
+|* Consruct()), then we stop the timer if necessary and start the WorkStartup.
|*
\************************************************************************/
@@ -1000,7 +997,7 @@ void SdDrawDocument::StopWorkStartupDelay()
{
if ( mpWorkStartupTimer->IsActive() )
{
- // Timer war noch nicht abgelaufen -> WorkStartup wird eingeleitet
+ // timer not yet expired -> start WorkStartup
mpWorkStartupTimer->Stop();
WorkStartupHdl(NULL);
}
@@ -1012,9 +1009,8 @@ void SdDrawDocument::StopWorkStartupDelay()
/*************************************************************************
|*
-|* Wenn der WorkStartupTimer erzeugt worden ist (das erfolgt ausschliesslich
-|* in SdDrawViewShell::Consruct() ), so wird der Timer ggf. gestoppt und
-|* das WorkStartup eingeleitet
+|* If the WorkStartupTimer was created (only possible in SdDrawViewShell::
+|* Consruct()), then we stop the timer if necessary and start the WorkStartup.
|*
\************************************************************************/
@@ -1034,7 +1030,7 @@ SdAnimationInfo* SdDrawDocument::GetShapeUserData(SdrObject& rObject, bool
bCrea
SdrObjUserData* pUD = 0;
SdAnimationInfo* pRet = 0;
- // gibt es in den User-Daten eine Animationsinformation?
+ // is there a information about animation in the user data?
for (nUD = 0; nUD < nUDCount; nUD++)
{
pUD = rObject.GetUserData(nUD);
@@ -1056,13 +1052,13 @@ SdAnimationInfo* SdDrawDocument::GetShapeUserData(SdrObject& rObject, bool
bCrea
SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const
{
- DBG_ASSERT(pObject, "ohne Objekt keine IMapInfo");
+ DBG_ASSERT(pObject, "no IMapInfo without object");
SdrObjUserData* pUserData = NULL;
SdIMapInfo* pIMapInfo = NULL;
sal_uInt16 nCount = pObject->GetUserDataCount();
- // gibt es in den User-Daten eine IMap-Information?
+ // is there a information about IMap in the user data?
for ( sal_uInt16 i = 0; i < nCount; i++ )
{
pUserData = pObject->GetUserData( i );
@@ -1090,22 +1086,22 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
const Rectangle& rRect = pObj->GetLogicRect();
sal_Bool bObjSupported = sal_False;
- // HitTest ausfuehren
- if ( pObj->ISA( SdrGrafObj ) ) // einfaches Grafik-Objekt
+ // execute HitTest
+ if ( pObj->ISA( SdrGrafObj ) ) // simple graphic object
{
const SdrGrafObj* pGrafObj = (const SdrGrafObj*) pObj;
const GeoStat& rGeo = pGrafObj->GetGeoStat();
SdrGrafObjGeoData* pGeoData = (SdrGrafObjGeoData*) pGrafObj->GetGeoData();
- // Drehung rueckgaengig
+ // undo rotation
if ( rGeo.nDrehWink )
RotatePoint( aRelPoint, rRect.TopLeft(), -rGeo.nSin, rGeo.nCos );
- // Spiegelung rueckgaengig
+ // undo mirroring
if ( pGeoData->bMirrored )
aRelPoint.X() = rRect.Right() + rRect.Left() - aRelPoint.X();
- // ggf. Unshear:
+ // undo shearing if necessary
if ( rGeo.nShearWink )
ShearPoint( aRelPoint, rRect.TopLeft(), -rGeo.nTan );
@@ -1118,20 +1114,20 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
delete pGeoData;
bObjSupported = sal_True;
}
- else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
+ else if ( pObj->ISA( SdrOle2Obj ) ) // OLE object
{
aGraphSize = ( (SdrOle2Obj*) pObj )->GetOrigObjSize();
bObjSupported = sal_True;
}
- // hat alles geklappt, dann HitTest ausfuehren
+ // execute HitTest if everything succeeded
if ( bObjSupported )
{
// relativen Mauspunkt berechnen
aRelPoint -= rRect.TopLeft();
pIMapObj = rImageMap.GetHitIMapObject( aGraphSize, rRect.GetSize(), aRelPoint );
- // Deaktivierte Objekte wollen wir nicht
+ // we don't want deactivated objects
if ( pIMapObj && !pIMapObj->IsActive() )
pIMapObj = NULL;
}
--
1.7.10.4
From c23b5320b04193a0742431e173e144e09da47cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= <urs@bitzgi.ch>
Date: Fri, 1 Mar 2013 10:26:15 +0100
Subject: [PATCH 05/24] translation of German debug messages in file
sd/source/core/drawdoc2.cxx
Change-Id: Icbe66334dca185d8764dc50428a994eca1c2bcbe
---
sd/source/core/drawdoc2.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 718944c..831f8f1 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -243,11 +243,11 @@ void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 nStartPos)
if (pObj->GetObjIdentifier() == OBJ_PAGE &&
pObj->GetObjInventor() == SdrInventor)
{
- DBG_ASSERTWARNING(nStartPos, "Notizseitenpos. darf nicht 0 sein");
// the page object represents the previous page (i.e. the
// drawing page)
+ DBG_ASSERTWARNING(nStartPos, "position of the note page is not allowed to be
0");
- DBG_ASSERTWARNING(nPage > 1, "Seitenobjekt darf nicht Handzettel darstellen");
+ DBG_ASSERTWARNING(nPage > 1, "it is not allowed for the page object to
represent note pages");
if (nStartPos > 0 && nPage > 1)
((SdrPageObj*)pObj)->SetReferencedPage(GetPage(nPage - 1));
--
1.7.10.4
Context
- Translation of german comments in sd/inc and sd/sdi · Urs Fässler
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.