[Libreoffice-commits] core.git: sd/source
Urs Fässler
urs at bitzgi.ch
Thu Mar 7 07:10:54 PST 2013
sd/source/ui/dlg/dlgpage.cxx | 15 --
sd/source/ui/dlg/dlgsnap.cxx | 52 +++------
sd/source/ui/dlg/gluectrl.cxx | 62 +++--------
sd/source/ui/dlg/headerfooterdlg.cxx | 2
sd/source/ui/dlg/inspagob.cxx | 62 +++--------
sd/source/ui/dlg/navigatr.cxx | 138 ++++++++++--------------
sd/source/ui/dlg/present.cxx | 32 ++---
sd/source/ui/dlg/prltempl.cxx | 26 +---
sd/source/ui/dlg/prntopts.cxx | 9 -
sd/source/ui/dlg/sdpreslt.cxx | 81 ++++----------
sd/source/ui/dlg/sdtreelb.cxx | 194 +++++++++++------------------------
sd/source/ui/dlg/tabtempl.cxx | 11 -
sd/source/ui/dlg/tabtempl.src | 2
sd/source/ui/dlg/tpaction.cxx | 48 +++-----
sd/source/ui/dlg/tpaction.src | 4
sd/source/ui/dlg/tpoption.cxx | 44 +++----
sd/source/ui/dlg/tpoption.src | 4
sd/source/ui/dlg/unchss.cxx | 38 ------
18 files changed, 290 insertions(+), 534 deletions(-)
New commits:
commit cb5fa11b6366db32805f4b252f72c29d90d5845c
Author: Urs Fässler <urs at bitzgi.ch>
Date: Thu Mar 7 16:10:51 2013 +0100
comment translation and cleanup of files in sd/source/ui/dlg/
Change-Id: Ief58723557fa0840b3a10258ca347cf219593264
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index 14f6434..9b3a6aa 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -34,12 +34,9 @@
#include <svx/flagsdef.hxx>
#include <editeng/svxenum.hxx>
-/*************************************************************************
-|*
-|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu
-|*
-\************************************************************************/
-
+/**
+ * Constructor of tab dialog: appends pages to the dialog
+ */
SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage ) :
SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ),
mpDocShell ( pDocSh )
@@ -68,12 +65,6 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet*
}
-/*************************************************************************
-|*
-|* Seite wird erzeugt
-|*
-\************************************************************************/
-
void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 9f00eca..b45a160 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -36,12 +36,9 @@
#include "dlgsnap.hxx"
-/*************************************************************************
-|*
-|* Dialog zum Einstellen des Rasters (wohl kaum ESO!)
-|*
-\************************************************************************/
-
+/**
+ * dialog to adjust grid (scarcely ESO!)
+ */
SdSnapLineDlg::SdSnapLineDlg(
::Window* pWindow,
const SfxItemSet& rInAttrs,
@@ -74,10 +71,10 @@ SdSnapLineDlg::SdSnapLineDlg(
SetFieldUnit( aMtrFldX, eUIUnit, sal_True );
SetFieldUnit( aMtrFldY, eUIUnit, sal_True );
- // WorkArea holen
+ // get WorkArea
Rectangle aWorkArea = pView->GetWorkArea();
- // PoolUnit ermitteln
+ // determine PoolUnit
SfxItemPool* pPool = rInAttrs.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool?" );
SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH );
@@ -89,8 +86,8 @@ SdSnapLineDlg::SdSnapLineDlg(
Point aRightBottom(aWorkArea.Right()-2, aWorkArea.Bottom()-2);
pPV->LogicToPagePos(aRightBottom);
- // Hier werden die Max- und MinWerte in Abhaengigkeit von der
- // WorkArea, PoolUnit und der FieldUnit:
+ // determine max and min values depending on
+ // WorkArea, PoolUnit and FieldUnit:
SetMetricValue( aMtrFldX, aLeftTop.X(), ePoolUnit );
long nValue = static_cast<long>(aMtrFldX.GetValue());
@@ -116,7 +113,7 @@ SdSnapLineDlg::SdSnapLineDlg(
aMtrFldY.SetMax( nValue );
aMtrFldY.SetLast( nValue );
- // Setzen der Werte
+ // set values
nXValue = ((const SfxUInt32Item&) rInAttrs.Get(ATTR_SNAPLINE_X)).GetValue();
nYValue = ((const SfxUInt32Item&) rInAttrs.Get(ATTR_SNAPLINE_Y)).GetValue();
nXValue = Fraction(nXValue) / aUIScale;
@@ -127,12 +124,9 @@ SdSnapLineDlg::SdSnapLineDlg(
aRbPoint.Check();
}
-/*************************************************************************
-|*
-|* Fuellt uebergebenes Item-Set mit Dialogbox-Attributen
-|*
-\************************************************************************/
-
+/**
+ * fills provided item sets with dialog box attributes
+ */
IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn )
{
if ( pBtn == &aRbPoint ) SetInputFields(sal_True, sal_True);
@@ -143,12 +137,9 @@ IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn )
return 0;
}
-/*************************************************************************
-|*
-|* Fuellt uebergebenes Item-Set mit Dialogbox-Attributen
-|*
-\************************************************************************/
-
+/**
+ * fills provided item sets with dialog box attributes
+ */
void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs)
{
SnapKind eKind;
@@ -165,12 +156,6 @@ void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs)
rOutAttrs.Put(SfxUInt32Item(ATTR_SNAPLINE_Y, nYValue));
}
-/*************************************************************************
-|*
-|* Gruppe mit Radiobutton verstecken
-|*
-\************************************************************************/
-
void SdSnapLineDlg::HideRadioGroup()
{
aFlDir.Hide();
@@ -179,12 +164,9 @@ void SdSnapLineDlg::HideRadioGroup()
aRbPoint.Hide();
}
-/*************************************************************************
-|*
-|* X- bzw. Y-Inputfeld disablen
-|*
-\************************************************************************/
-
+/**
+ * disable X or Y input fields
+ */
void SdSnapLineDlg::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY)
{
if ( bEnableX )
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index a989003..04584e9 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
-// z.Z. werden von Joe nur die u.a. Moeglichkeiten unterstuetzt
+// at the moment, Joe only supports the methods specified below
#define ESCDIR_COUNT 5
static sal_uInt16 aEscDirArray[] =
{
@@ -58,12 +58,9 @@ static sal_uInt16 aEscDirArray[] =
SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlGlueEscDir, SfxUInt16Item )
-/*************************************************************************
-|*
-|* Konstruktor fuer Klebepunkt-Autrittsrichtungs-Listbox
-|*
-\************************************************************************/
-
+/**
+ * Constructor for clue point escape direction Listbox
+ */
GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame ) :
ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) ),
m_xFrame( rFrame )
@@ -75,22 +72,13 @@ GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame )
Show();
}
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
-
GlueEscDirLB::~GlueEscDirLB()
{
}
-/*************************************************************************
-|*
-|* Ermittelt die Austrittsrichtung und verschickt den entspr. Slot
-|*
-\************************************************************************/
-
+/**
+ * Determines the escape direction and sends the corresponding slot
+ */
void GlueEscDirLB::Select()
{
sal_uInt16 nPos = GetSelectEntryPos();
@@ -109,12 +97,9 @@ void GlueEscDirLB::Select()
}
}
-/*************************************************************************
-|*
-|* Fuellen der Listbox mit Strings
-|*
-\************************************************************************/
-
+/**
+ * Fills the Listbox with strings
+ */
void GlueEscDirLB::Fill()
{
InsertEntry( String( SdResId( STR_GLUE_ESCDIR_SMART ) ) );
@@ -133,24 +118,18 @@ void GlueEscDirLB::Fill()
*/
}
-/*************************************************************************
-|*
-|* Konstruktor fuer Klebepunkt-Autrittsrichtungs-Toolbox-Control
-|*
-\************************************************************************/
-
+/**
+ * Constructor for glue point escape direction toolbox control
+ */
SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir(
sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
}
-/*************************************************************************
-|*
-|* Stellt Status in der Listbox des Controllers dar
-|*
-\************************************************************************/
-
+/**
+ * Represents state in the listbox of the controller
+ */
void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pState )
{
@@ -195,12 +174,9 @@ Window* SdTbxCtlGlueEscDir::CreateItemWindow( Window *pParent )
}
-/*************************************************************************
-|*
-|* Liefert Position im Array fuer EscDir zurueck (Mapping fuer Listbox)
-|*
-\************************************************************************/
-
+/**
+ * Returns position in the array for EscDir (Mapping for Listbox)
+ */
sal_uInt16 SdTbxCtlGlueEscDir::GetEscDirPos( sal_uInt16 nEscDir )
{
for( sal_uInt16 i = 0; i < ESCDIR_COUNT; i++ )
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index b0dd5a2..24b2189 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -399,7 +399,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
change( pUndoGroup, mpDoc->GetMasterSdPage( 0, PK_HANDOUT ), aNewSettings );
}
- // Undo Gruppe dem Undo Manager uebergeben
+ // give the undo group to the undo manager
mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager()->AddUndoAction(pUndoGroup);
}
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index e476f7f..9632ac6 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -34,12 +34,6 @@
#include "inspagob.hrc"
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
SdInsertPagesObjsDlg::SdInsertPagesObjsDlg(
::Window* pWindow,
const SdDrawDocument* pInDoc,
@@ -62,30 +56,22 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg(
aLbTree.SetSelectHdl( LINK( this, SdInsertPagesObjsDlg, SelectObjectHdl ) );
- // Text wird eingefuegt
+ // insert text
if( !pMedium )
SetText( String( SdResId( STR_INSERT_TEXT ) ) );
Reset();
}
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
SdInsertPagesObjsDlg::~SdInsertPagesObjsDlg()
{
}
-/*************************************************************************
-|*
-|* Fuellt die TreeLB in Abhaengigkeit des Mediums. Ist kein Medium
-|* vorhanden, handelt es sich um ein Text- und kein Drawdokument
-|*
-\************************************************************************/
-
+/**
+ * Fills the TreeLB dependent on the medium. Is not medium available, then
+ * it is a text and not a draw document.
+ */
void SdInsertPagesObjsDlg::Reset()
{
if( pMedium )
@@ -108,16 +94,15 @@ void SdInsertPagesObjsDlg::Reset()
std::vector<rtl::OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType )
{
- // Bei Draw-Dokumenten muss bei der Selektion des Dokumentes NULL
- // zurueckgegeben werden
+ // With Draw documents, we have to return NULL on selection of the document
if( pMedium )
{
- // Um zu gewaehrleisten, dass die Bookmarks geoeffnet sind
- // (Wenn gesamtes Dokument ausgewaehlt wurde)
+ // to ensure that bookmarks are opened
+ // (when the whole document is selected)
aLbTree.GetBookmarkDoc();
- // Wenn das Dokument (mit-)selektiert oder nichst selektiert ist,
- // wird das gesamte Dokument (und nicht mehr!) eingefuegt.
+ // If the document is selected (too) or nothing is selected,
+ // the whole document is inserted (but not more!)
if( aLbTree.GetSelectionCount() == 0 ||
( aLbTree.IsSelected( aLbTree.First() ) ) )
return std::vector<rtl::OUString>();
@@ -126,34 +111,25 @@ std::vector<rtl::OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType
return aLbTree.GetSelectEntryList( nType );
}
-/*************************************************************************
-|*
-|* Ist Verknuepfung gechecked
-|*
-\************************************************************************/
-
+/**
+ * is link checked
+ */
sal_Bool SdInsertPagesObjsDlg::IsLink()
{
return( aCbxLink.IsChecked() );
}
-/*************************************************************************
-|*
-|* Ist Verknuepfung gechecked
-|*
-\************************************************************************/
-
+/**
+ * is link checked
+ */
sal_Bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const
{
return( aCbxMasters.IsChecked() );
}
-/*************************************************************************
-|*
-|* Enabled und selektiert Endfarben-LB
-|*
-\************************************************************************/
-
+/**
+ * Enabled and selects end-color-LB
+ */
IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl)
{
if( aLbTree.IsLinkableSelected() )
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 877d672..df0bc91 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -56,10 +56,9 @@ static const sal_uInt16 nShowNamedShapesFilter=1;
static const sal_uInt16 nShowAllShapesFilter=2;
}
-/*************************************************************************
-|* SdNavigatorWin - FloatingWindow
-\************************************************************************/
-
+/**
+ * SdNavigatorWin - FloatingWindow
+ */
SdNavigatorWin::SdNavigatorWin(
::Window* pParent,
::sd::NavigatorChildWindow* pChWinCtxt,
@@ -71,7 +70,7 @@ SdNavigatorWin::SdNavigatorWin(
, maLbDocs ( this, SdResId( LB_DOCS ) )
, mpChildWinContext( pChWinCtxt )
, mbDocImported ( sal_False )
- // Bei Aenderung des DragTypes: SelectionMode der TLB anpassen!
+ // On changes of the DragType: adjust SelectionMode of TLB!
, meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED )
, mpBindings ( pInBindings )
, maImageList ( SdResId( IL_NAVIGATR ) )
@@ -129,7 +128,7 @@ SdNavigatorWin::SdNavigatorWin(
maMinSize.Height() -= 40;
((SfxDockingWindow*)GetParent())->SetMinOutputSizePixel( maMinSize );
- // InitTlb; Wird ueber Slot initiiert
+ // InitTlb; is initiated over Slot
SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True );
mpBindings->GetDispatcher()->Execute(
SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
@@ -173,7 +172,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
{
String aDocName = pDocShell->GetMedium()->GetName();
maTlbObjects.Clear();
- maTlbObjects.Fill( pDoc, (sal_Bool) sal_False, aDocName ); // Nur normale Seiten
+ maTlbObjects.Fill( pDoc, (sal_Bool) sal_False, aDocName ); // only normal pages
RefreshDocumentLB();
maLbDocs.SelectEntry( aDocShName );
@@ -183,7 +182,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
maLbDocs.SetNoSelection();
maLbDocs.SelectEntry( aDocShName );
-// auskommentiert um 30246 zu fixen
+// commented in order to fix 30246
// if( maLbDocs.GetSelectEntryCount() == 0 )
{
RefreshDocumentLB();
@@ -196,14 +195,10 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
pViewFrame->GetBindings().Invalidate(SID_NAVIGATOR_PAGENAME, sal_True, sal_True);
}
-/*************************************************************************
-|*
-|* DragType wird in Abhaengigkeit davon gesetzt, ob ein Drag ueberhaupt
-|* moeglich ist. Graphiken duerfen beispielsweise unter gewissen Umstaenden
-|* nicht gedragt werden (#31038#).
-|*
-\************************************************************************/
-
+/**
+ * DragType is set on dependance if a Drag is even possible. For example,
+ * under certain circumstances, it is not allowed to drag graphics (#31038#).
+ */
NavigatorDragType SdNavigatorWin::GetNavigatorDragType()
{
NavigatorDragType eDT = meDragType;
@@ -286,8 +281,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
{
case TBI_DRAGTYPE:
{
- // Popup-Menu wird in Abhaengigkeit davon erzeugt, ob Dokument
- // gespeichert ist oder nicht
+ // Popup menu is created depending if the document is saved or not
PopupMenu *pMenu = new PopupMenu;
static const char* aHIDs[] =
@@ -363,8 +357,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl)
{
NavDocInfo* pInfo = GetDocInfo();
- // Nur wenn es sich um das aktive Fenster handelt, wird
- // auf die Seite gesprungen
+ // if it is the active window, we jump to the page
if( pInfo && pInfo->IsActive() )
{
String aStr( maTlbObjects.GetSelectEntry() );
@@ -402,10 +395,10 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl)
::sd::DrawDocShell* pDocShell = NULL;
NavDocInfo* pInfo = GetDocInfo();
- // Handelt es sich um ein gedragtes Objekt?
+ // is it a dragged object?
if( mbDocImported && nPos == 0 )
{
- // Dokument in TLB aufbauen
+ // construct document in TLB
InsertFile( aStrLb );
}
else if (pInfo)
@@ -424,11 +417,11 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl)
::sd::DrawDocShell* pNCDocShell = pNonConstDoc->GetDocSh();
String aDocName = pNCDocShell->GetMedium()->GetName();
maTlbObjects.Clear();
- maTlbObjects.Fill( pDoc, (sal_Bool) sal_False, aDocName ); // Nur normale Seiten
+ maTlbObjects.Fill( pDoc, (sal_Bool) sal_False, aDocName ); // only normal pages
}
}
- // Pruefen, ob Link oder URL moeglich ist
+ // check if link or url is possible
if( ( pInfo && !pInfo->HasName() ) || !maTlbObjects.IsLinkableSelected() || ( meDragType != NAVIGATOR_DRAGTYPE_EMBEDDED ) )
{
meDragType = NAVIGATOR_DRAGTYPE_EMBEDDED;
@@ -438,13 +431,10 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl)
return( 0L );
}
-/*************************************************************************
-|*
-|* DrageType wird gesetzt und Image wird entspr. gesetzt.
-|* Sollte Handler mit NULL gerufen werden, so wird der Default (URL) gesetzt.
-|*
-\************************************************************************/
-
+/**
+ * Set DrageType and set image accordingly to it.
+ * If the handler is called with NULL, the default (URL) is set.
+ */
IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu )
{
sal_uInt16 nMenuId;
@@ -453,7 +443,7 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu )
else
nMenuId = NAVIGATOR_DRAGTYPE_URL;
- if( nMenuId != USHRT_MAX ) // Notwendig ?
+ if( nMenuId != USHRT_MAX ) // Necessary ?
{
NavigatorDragType eDT = (NavigatorDragType) nMenuId;
if( meDragType != eDT )
@@ -463,7 +453,7 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu )
if( meDragType == NAVIGATOR_DRAGTYPE_URL )
{
- // Fix, um Endlosschleife zu unterbinden
+ // patch, prevents endless loop
if( maTlbObjects.GetSelectionCount() > 1 )
maTlbObjects.SelectAll( sal_False );
@@ -538,12 +528,12 @@ void SdNavigatorWin::Resize()
aDiffSize.Width() = aWinSize.Width() - maSize.Width();
aDiffSize.Height() = aWinSize.Height() - maSize.Height();
- // Umgroessern der Toolbox
+ // change size of Toolbox
Size aObjSize( maToolbox.GetOutputSizePixel() );
aObjSize.Width() += aDiffSize.Width();
maToolbox.SetOutputSizePixel( aObjSize );
- // Umgroessern der TreeLB
+ // change size of TreeLB
aObjSize = maTlbObjects.GetSizePixel();
aObjSize.Width() += aDiffSize.Width();
aObjSize.Height() = maLbDocs.GetPosPixel().Y() + aDiffSize.Height() -
@@ -552,7 +542,7 @@ void SdNavigatorWin::Resize()
Point aPt( 0, aDiffSize.Height() );
- // Verschieben der anderen Controls (DocumentLB)
+ // move other controls (DocumentLB)
maLbDocs.Hide();
aObjSize = maLbDocs.GetOutputSizePixel();
aObjSize.Width() += aDiffSize.Width();
@@ -584,16 +574,12 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName)
if (!aFileName.Len())
{
- /**********************************************************************
- * Wieder aktuelles Dokument anzeigen
- **********************************************************************/
+ // show actual document again
maDropFileName = aFileName;
}
else
{
- /**********************************************************************
- * Hineingedraggtes Dokument anzeigen
- **********************************************************************/
+ // show dragged-in document
const SfxFilter* pFilter = NULL;
ErrCode nErr = 0;
@@ -607,16 +593,16 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName)
if ((pFilter && !nErr) || aFileName == maDropFileName)
{
- // Das Medium muss ggf. mit READ/WRITE geoeffnet werden, daher wird
- // ersteinmal nachgeschaut, ob es einen Storage enthaelt
+ // The medium may be opened with READ/WRITE. Therefore, we first
+ // check if it contains a Storage.
SfxMedium* pMedium = new SfxMedium( aFileName,
STREAM_READ | STREAM_NOCREATE);
if (pMedium->IsStorage())
{
- // Jetzt modusabhaengig:
+ // Now depending on mode:
// maTlbObjects.SetSelectionMode(MULTIPLE_SELECTION);
- // Eigentuemeruebergabe von pMedium;
+ // handover of ownership of pMedium;
SdDrawDocument* pDropDoc = maTlbObjects.GetBookmarkDoc(pMedium);
if (pDropDoc)
@@ -626,7 +612,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName)
if( !maTlbObjects.IsEqualToDoc( pDropDoc ) )
{
- // Nur normale Seiten
+ // only normal pages
maTlbObjects.Fill(pDropDoc, (sal_Bool) sal_False, maDropFileName);
RefreshDocumentLB( &maDropFileName );
}
@@ -673,7 +659,7 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName )
maLbDocs.Clear();
- // Liste der DocInfos loeschen
+ // delete list of DocInfos
maDocList.clear();
if( mbDocImported )
@@ -696,9 +682,9 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName )
aInfo.SetName();
else
aInfo.SetName( sal_False );
- // z.Z. wird wieder der Name der Shell genommen (also ohne Pfad)
- // da Koose es als Fehler ansieht, wenn er Pfad in URL-Notation
- // angezeigt wird!
+ // at the moment, we use the name of the shell again (i.e.
+ // without path) since Koose thinks it is an error if the path
+ // is shown in url notation!
aStr = pDocShell->GetName();
maLbDocs.InsertEntry( aStr, LISTBOX_APPEND );
@@ -753,12 +739,9 @@ NavDocInfo* SdNavigatorWin::GetDocInfo()
return nPos < maDocList.size() ? &(maDocList[ nPos ]) : NULL;
}
-/*************************************************************************
-|*
-|* PreNotify
-|*
-\************************************************************************/
-
+/**
+ * PreNotify
+ */
long SdNavigatorWin::Notify(NotifyEvent& rNEvt)
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
@@ -796,12 +779,9 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt)
}
-/*************************************************************************
-|*
-|* KeyInput: ESCAPE abfangen, um Show zu beenden
-|*
-\************************************************************************/
-
+/**
+ * catch ESCAPE in order to end show
+ */
void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt )
{
long nOK = sal_False;
@@ -853,12 +833,9 @@ void SdNavigatorWin::ApplyImageList()
-/*************************************************************************
-|*
-|* ControllerItem fuer Navigator
-|*
-\************************************************************************/
-
+/**
+ * ControllerItem for Navigator
+ */
SdNavigatorControllerItem::SdNavigatorControllerItem( sal_uInt16 _nId,
SdNavigatorWin* pNavWin,
SfxBindings* _pBindings) :
@@ -875,10 +852,10 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_NAVIGATOR_STATE )
{
const SfxUInt32Item* pStateItem = PTR_CAST( SfxUInt32Item, pItem );
- DBG_ASSERT( pStateItem, "SfxUInt16Item erwartet");
+ DBG_ASSERT( pStateItem, "SfxUInt16Item expected");
sal_uInt32 nState = pStateItem->GetValue();
- // Stift
+ // pen
if( nState & NAVBTN_PEN_ENABLED &&
!pNavigatorWin->maToolbox.IsItemEnabled( TBI_PEN ) )
pNavigatorWin->maToolbox.EnableItem( TBI_PEN );
@@ -892,7 +869,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
pNavigatorWin->maToolbox.IsItemChecked( TBI_PEN ) )
pNavigatorWin->maToolbox.CheckItem( TBI_PEN, sal_False );
- // Nur wenn Doc in LB das Aktive ist
+ // only if doc in LB is the active
NavDocInfo* pInfo = pNavigatorWin->GetDocInfo();
if( pInfo && pInfo->IsActive() )
{
@@ -930,7 +907,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
if( nState & NAVTLB_UPDATE )
{
- // InitTlb; Wird ueber Slot initiiert
+ // InitTlb; is initiated by Slot
SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True );
GetBindings().GetDispatcher()->Execute(
SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
@@ -939,12 +916,9 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
}
}
-/*************************************************************************
-|*
-|* ControllerItem fuer Navigator, um die Seite in der TreeLB anzuzeigen
-|*
-\************************************************************************/
-
+/**
+ * ControllerItem for Navigator to show page in TreeLB
+ */
SdPageNameControllerItem::SdPageNameControllerItem( sal_uInt16 _nId,
SdNavigatorWin* pNavWin,
SfxBindings* _pBindings) :
@@ -960,19 +934,19 @@ void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
{
if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_NAVIGATOR_PAGENAME )
{
- // Nur wenn Doc in LB das Aktive ist
+ // only if doc in LB is the active
NavDocInfo* pInfo = pNavigatorWin->GetDocInfo();
if( pInfo && pInfo->IsActive() )
{
const SfxStringItem* pStateItem = PTR_CAST( SfxStringItem, pItem );
- DBG_ASSERT( pStateItem, "SfxStringItem erwartet");
+ DBG_ASSERT( pStateItem, "SfxStringItem expected");
String aPageName = pStateItem->GetValue();
if( !pNavigatorWin->maTlbObjects.HasSelectedChildren( aPageName ) )
{
if( pNavigatorWin->maTlbObjects.GetSelectionMode() == MULTIPLE_SELECTION )
{
- // Weil sonst immer dazuselektiert wird
+ // because otherwise it is always additional select
pNavigatorWin->maTlbObjects.SelectAll( sal_False );
}
pNavigatorWin->maTlbObjects.SelectEntry( aPageName );
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 8f91e38..0d7d02e 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -41,9 +41,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans;
-/*************************************************************************
-|* Ctor
-\************************************************************************/
+
SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
const SfxItemSet& rInAttrs,
const std::vector<String> &rPageNames, SdCustomShowList* pCSList ) :
@@ -109,7 +107,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
aTmfPause.SetAccessibleRelationLabeledBy( &aRbtAuto );
aTmfPause.SetAccessibleName(aRbtAuto.GetText());
- // Listbox mit Seitennamen fuellen
+ // fill Listbox with page names
for (std::vector<String>::const_iterator pIter = rPageNames.begin(); pIter != rPageNames.end(); ++pIter)
aLbDias.InsertEntry(*pIter);
@@ -117,7 +115,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
{
sal_uInt16 nPosToSelect = (sal_uInt16) pCustomShowList->GetCurPos();
SdCustomShow* pCustomShow;
- // Listbox mit CustomShows fuellen
+ // fill Listbox with CustomShows
for( pCustomShow = (SdCustomShow*) pCustomShowList->First();
pCustomShow != NULL;
pCustomShow = (SdCustomShow*) pCustomShowList->Next() )
@@ -243,9 +241,9 @@ void SdStartPresentationDlg::InitMonitorSettings()
}
}
-/*************************************************************************
-|* Setzt die ausgewaehlten Attribute des Dialogs
-\************************************************************************/
+/**
+ * sets the selected attributes of the dialog
+ */
void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
{
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALL, aRbtAll.IsChecked() ) );
@@ -272,9 +270,9 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
pCustomShowList->Seek( nPos );
}
-/*************************************************************************
-|* Handler: Enabled/Disabled Listbox "Dias"
-\************************************************************************/
+/**
+ * Handler: Enabled/Disabled Listbox "Dias"
+ */
IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl)
{
aLbDias.Enable( aRbtAtDia.IsChecked() );
@@ -283,9 +281,9 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl)
return( 0L );
}
-/*************************************************************************
-|* Handler: Enabled/Disabled Checkbox "AlwaysOnTop"
-\************************************************************************/
+/**
+ * Handler: Enabled/Disabled Checkbox "AlwaysOnTop"
+ */
IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl)
{
const bool bAuto = aRbtAuto.IsChecked();
@@ -310,9 +308,9 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl)
return( 0L );
}
-/*************************************************************************
-|* Handler: Enabled/Disabled Checkbox "AlwaysOnTop"
-\************************************************************************/
+/**
+ * Handler: Enabled/Disabled Checkbox "AlwaysOnTop"
+ */
IMPL_LINK_NOARG(SdStartPresentationDlg, ChangePauseHdl)
{
aCbxAutoLogo.Enable( aRbtAuto.IsChecked() && ( aTmfPause.GetTime().GetMSFromTime() > 0 ) );
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 7b2b16a..7f913d6 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -50,12 +50,9 @@
#include "drawdoc.hxx"
#define IS_OUTLINE(x) (x >= PO_OUTLINE_1 && x <= PO_OUTLINE_9)
-/*************************************************************************
-|*
-|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu
-|*
-\************************************************************************/
-
+/**
+ * Constructor of Tab dialog: appends pages to the dialog
+ */
SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
Window* pParent,
SdResId DlgId,
@@ -71,7 +68,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
{
if( IS_OUTLINE(ePO))
{
- // Leider sind die Itemsets unserer Stylesheets nicht discret..
+ // Unfortunately, the Itemsets of our style sheets are not discreet..
const sal_uInt16* pPtr = pOrgSet->GetRanges();
sal_uInt16 p1, p2;
while( *pPtr )
@@ -79,7 +76,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
p1 = pPtr[0];
p2 = pPtr[1];
- // erstmal das ganze discret machen
+ // first, we make it discreet
while(pPtr[2] && (pPtr[2] - p2 == 1))
{
p2 = pPtr[3];
@@ -101,8 +98,8 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
const SfxPoolItem *pItem = NULL;
- // Fals in diesem Stylesheet kein Bullet Item ist, holen wir uns
- // das aus dem 'Outline 1' Stylesheet.
+ // If there is no bullet item in this stylesheet, we get it
+ // from 'Outline 1' style sheet.
if( SFX_ITEM_SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem ))
{
String aStyleName((SdResId(STR_PSEUDOSHEET_OUTLINE)));
@@ -114,7 +111,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
aInputSet.Put( *pItem );
}
- // gewaehlte Ebene im Dialog vorselektieren
+ // preselect selected layer in dialog
aInputSet.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL, 1<<GetOutlineLevel()));
SetInputSet( &aInputSet );
@@ -182,8 +179,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH );
}
- // Titel setzen und
- // entsprechende Seiten zum Dialog hinzufuegen
+ // set title and add corresponding pages to dialog
OUString aTitle;
switch( ePO )
@@ -223,7 +219,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
}
SetText( aTitle );
- nDlgType = 1; // Vorlagen-Dialog
+ nDlgType = 1; // template dialog
nPageType = 0;
nPos = 0;
@@ -335,7 +331,7 @@ sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const
case PO_OUTLINE_8: return 7;
case PO_OUTLINE_9: return 8;
default:
- DBG_ASSERT( sal_False, "Falscher Po! [CL]");
+ DBG_ASSERT( sal_False, "Wrong Po! [CL]");
}
return 0;
}
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 78f5d47..ed93a75 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -32,12 +32,9 @@
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
-/*************************************************************************
-|*
-|* Dialog zum Aendern der Print-Optionen
-|*
-\************************************************************************/
-
+/**
+ * dialog to adjust print options
+ */
SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) :
SfxTabPage ( pParent, SdResId( TP_PRINT_OPTIONS ), rInAttrs ),
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index c5f1362..a354c1b 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -39,12 +39,6 @@
#define DOCUMENT_TOKEN (sal_Unicode('#'))
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
-
SdPresLayoutDlg::SdPresLayoutDlg(
::sd::DrawDocShell* pDocShell,
::Window* pWindow,
@@ -70,28 +64,19 @@ SdPresLayoutDlg::SdPresLayoutDlg(
Reset();
}
-/*************************************************************************
-|*
-|* Dtor
-|*
-*************************************************************************/
-
SdPresLayoutDlg::~SdPresLayoutDlg()
{
}
-/*************************************************************************
-|*
-|* Initialisierung
-|*
-*************************************************************************/
-
+/**
+ * Initialize
+ */
void SdPresLayoutDlg::Reset()
{
const SfxPoolItem *pPoolItem = NULL;
long nName;
- // MasterPage austauschen
+ // replace master page
if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, sal_False, &pPoolItem ) == SFX_ITEM_SET )
{
sal_Bool bMasterPage = ( (const SfxBoolItem*) pPoolItem)->GetValue();
@@ -99,7 +84,7 @@ void SdPresLayoutDlg::Reset()
maCbxMasterPage.Check( bMasterPage );
}
- // Nicht verwendete MasterPages entfernen
+ // remove not used master pages
maCbxCheckMasters.Check(sal_False);
if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, sal_True, &pPoolItem) == SFX_ITEM_SET)
@@ -115,18 +100,15 @@ void SdPresLayoutDlg::Reset()
if (maLayoutNames[nName] == maName)
break;
}
- DBG_ASSERT(nName < mnLayoutCount, "Layout nicht gefunden");
+ DBG_ASSERT(nName < mnLayoutCount, "Layout not found");
- maVS.SelectItem((sal_uInt16)nName + 1); // Inizes des ValueSets beginnen bei 1
+ maVS.SelectItem((sal_uInt16)nName + 1); // Indices of the ValueSets start at 1
}
-/*************************************************************************
-|*
-|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen
-|*
-*************************************************************************/
-
+/**
+ * Fills the provided Item-Set with dialog box attributes
+ */
void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
{
short nId = maVS.GetSelectItemId();
@@ -145,7 +127,7 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
{
aLayoutName = maLayoutNames[ nId - 1 ];
if( aLayoutName == maStrNone )
- aLayoutName.Erase(); // so wird "- keine -" codiert (s.u.)
+ aLayoutName.Erase(); // that way we encode "- nothing -" (see below)
}
rOutAttrs.Put( SfxStringItem( ATTR_PRESLAYOUT_NAME, aLayoutName ) );
@@ -154,12 +136,9 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
}
-/*************************************************************************
-|*
-|* Fuellt das ValueSet mit Bitmaps
-|*
-\************************************************************************/
-
+/**
+ * Fills ValueSet with bitmaps
+ */
void SdPresLayoutDlg::FillValueSet()
{
maVS.SetStyle(maVS.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER
@@ -191,24 +170,18 @@ void SdPresLayoutDlg::FillValueSet()
}
-/*************************************************************************
-|*
-|* Doppelklick-Handler
-|*
-\************************************************************************/
-
+/**
+ * DoubleClick handler
+ */
IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl)
{
EndDialog(RET_OK);
return 0;
}
-/*************************************************************************
-|*
-|* Klick-Handler fuer Laden-Button
-|*
-\************************************************************************/
-
+/**
+ * Click handler for load button
+ */
IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
{
SfxNewFileDialog* pDlg = new SfxNewFileDialog(this, SFXWB_PREVIEW);
@@ -236,7 +209,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
}
else
{
- // so wird "- keine -" codiert
+ // that way we encode "- nothing -"
maName.Erase();
}
}
@@ -249,7 +222,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
if( !bCancel )
{
- // Pruefen, ob Vorlage schon vorhanden
+ // check if template already ecists
sal_Bool bExists = sal_False;
String aCompareStr( maName );
if( maName.Len() == 0 )
@@ -262,17 +235,17 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
if( aCompareStr == *it )
{
bExists = sal_True;
- // Vorlage selektieren
+ // select template
maVS.SelectItem( aPos + 1 );
}
}
if( !bExists )
{
- // Dokument laden um Preview-Bitmap zu ermitteln (wenn Vorlage ausgewaehlt)
+ // load document in order to determine preview bitmap (if template is selected)
if( maName.Len() )
{
- // Dokument ermitteln, um OpenBookmarkDoc rufen zu koennen
+ // determine document in order to call OpenBookmarkDoc
SdDrawDocument* pDoc = mpDocSh->GetDoc();
SdDrawDocument* pTemplDoc = pDoc->OpenBookmarkDoc( maName );
@@ -305,7 +278,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
}
else
{
- // leeres Layout
+ // empty layout
maLayoutNames.push_back( new String( maStrNone ) );
maVS.InsertItem( (sal_uInt16) maLayoutNames.size(),
Bitmap( SdResId( BMP_FOIL_NONE ) ), maStrNone );
@@ -313,7 +286,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
if (!bCancel)
{
- // Vorlage selektieren
+ // select template
maVS.SelectItem( (sal_uInt16) maLayoutNames.size() );
}
}
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index c902561..a90bd9c 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -214,14 +214,6 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void)
}
-
-
-/*************************************************************************
-|*
-|* Ctor1 SdPageObjsTLB
-|*
-\************************************************************************/
-
SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
: SvTreeListBox ( pParentWin, rSdResId )
, mpParent ( pParentWin )
@@ -237,7 +229,7 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
, mbShowAllPages ( false )
{
- // Tree-ListBox mit Linien versehen
+ // add lines to Tree-ListBox
SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
WB_HASBUTTONS | // WB_HASLINESATROOT |
WB_HSCROLL |
@@ -251,11 +243,6 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
SV_DRAGDROP_APP_MOVE | SV_DRAGDROP_APP_COPY | SV_DRAGDROP_APP_DROP );
}
-/*************************************************************************
-|*
-|* Dtor SdPageObjsTLB
-|*
-\************************************************************************/
SdPageObjsTLB::~SdPageObjsTLB()
{
@@ -266,12 +253,6 @@ SdPageObjsTLB::~SdPageObjsTLB()
delete mpMedium;
}
-/*************************************************************************
-|*
-|* return name of object
-|*
-\************************************************************************/
-
String SdPageObjsTLB::GetObjectName(
const SdrObject* pObject,
const bool bCreate) const
@@ -298,12 +279,9 @@ String SdPageObjsTLB::GetObjectName(
return aRet;
}
-/*************************************************************************
-|*
-|* In TreeLB Eintrag selektieren
-|*
-\************************************************************************/
-
+/**
+ * select a entry in TreeLB
+ */
sal_Bool SdPageObjsTLB::SelectEntry( const String& rName )
{
sal_Bool bFound = sal_False;
@@ -326,12 +304,9 @@ sal_Bool SdPageObjsTLB::SelectEntry( const String& rName )
return( bFound );
}
-/*************************************************************************
-|*
-|* Gibt zurueck, ob Children des uebergebenen Strings selektiert sind
-|*
-\************************************************************************/
-
+/**
+ * @return true if children of the specified string are selected
+ */
sal_Bool SdPageObjsTLB::HasSelectedChildren( const String& rName )
{
sal_Bool bFound = sal_False;
@@ -359,12 +334,9 @@ sal_Bool SdPageObjsTLB::HasSelectedChildren( const String& rName )
}
-/*************************************************************************
-|*
-|* TreeLB mit Seiten und Objekten fuellen
-|*
-\************************************************************************/
-
+/**
+ * Fill TreeLB with pages and objects
+ */
void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages,
const String& rDocName)
{
@@ -404,7 +376,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages,
nPage++;
}
- // dann alle MasterPages incl. Objekte einfuegen
+ // then insert all master pages including objects
if( mbShowAllPages )
{
nPage = 0;
@@ -421,12 +393,9 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages,
SelectEntry( aSelection );
}
-/*************************************************************************
-|*
-|* Es wird nur der erste Eintrag eingefuegt. Children werden OnDemand erzeugt
-|*
-\************************************************************************/
-
+/**
+ * We insert only the first entry. Children are created on demand.
+ */
void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium,
const String& rDocName )
{
@@ -439,7 +408,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium,
Image aImgDocOpen=Image( BitmapEx( SdResId( BMP_DOC_OPEN ) ) );
Image aImgDocClosed=Image( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) );
- // Dokumentnamen einfuegen
+ // insert document name
InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, sal_True, LIST_APPEND,
reinterpret_cast< void* >( 1 )
);
@@ -580,15 +549,12 @@ bool SdPageObjsTLB::GetShowAllShapes (void) const
-/*************************************************************************
-|*
-|* Prueft, ob die Seiten (PK_STANDARD) und die darauf befindlichen Objekte
-|* des Docs und der TreeLB identisch sind.
-|* Wird ein Doc uebergeben, wird dieses zum aktuellem Doc (Wichtig bei
-|* mehreren Documenten).
-|*
-\************************************************************************/
-
+/**
+ * Checks if the pages (PK_STANDARD) of a doc and the objects on the pages
+ * are identical to the TreeLB.
+ * If a doc is provided, this will be the used doc (important by more than
+ * one document).
+ */
sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
{
if( pInDoc )
@@ -602,7 +568,7 @@ sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
SvTreeListEntry* pEntry = First();
String aName;
- // Alle Pages incl. Objekte vergleichen
+ // compare all pages including the objects
sal_uInt16 nPage = 0;
const sal_uInt16 nMaxPages = mpDoc->GetPageCount();
@@ -647,17 +613,14 @@ sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
}
nPage++;
}
- // Wenn noch Eintraege in der Listbox vorhanden sind, wurden
- // Objekte (mit Namen) oder Seiten geloescht
+ // If there are still entries in the listbox,
+ // then objects (with names) or pages were deleted
return( !pEntry );
}
-/*************************************************************************
-|*
-|* Selectierten String zurueckgeben
-|*
-\************************************************************************/
-
+/**
+ * @return selected string
+ */
String SdPageObjsTLB::GetSelectEntry()
{
return( GetEntryText( GetCurEntry() ) );
@@ -681,12 +644,9 @@ std::vector<rtl::OUString> SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 n
return aEntries;
}
-/*************************************************************************
-|*
-|* Eintraege werden erst auf Anforderung (Doppelklick) eingefuegt
-|*
-\************************************************************************/
-
+/**
+ * Entries are inserted only by request (double click)
+ */
void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry )
{
if( !pFileEntry->HasChildren() )
@@ -756,13 +716,10 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry )
SvTreeListBox::RequestingChildren( pFileEntry );
}
-/*************************************************************************
-|*
-|* Prueft, ob es sich um eine Draw-Datei handelt und oeffnet anhand des
-|* uebergebenen Docs das BookmarkDoc
-|*
-\************************************************************************/
-
+/**
+ * Checks if it is a draw file and opens the BookmarkDoc depending of
+ * the provided Docs
+ */
SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
{
if (
@@ -815,12 +772,9 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
return( mpBookmarkDoc );
}
-/*************************************************************************
-|*
-|* Bookmark-Dokument schlie�en und loeschen
-|*
-\************************************************************************/
-
+/**
+ * Close and delete bookmark document
+ */
void SdPageObjsTLB::CloseBookmarkDoc()
{
if (mxBookmarkDocShRef.Is())
@@ -868,17 +822,14 @@ void SdPageObjsTLB::SelectHdl()
SvTreeListBox::SelectHdl();
}
-/*************************************************************************
-|*
-|* Ueberlaedt RETURN mit der Funktionsweise von DoubleClick
-|*
-\************************************************************************/
-
+/**
+ * Overloads RETURN with the functionality of DoubleClick
+ */
void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt )
{
if( rKEvt.GetKeyCode().GetCode() == KEY_RETURN )
{
- // Auskommentierter Code aus svtools/source/contnr/svimpbox.cxx
+ // commented code from svtools/source/contnr/svimpbox.cxx
SvTreeListEntry* pCursor = GetCurEntry();
if( pCursor->HasChildren() || pCursor->HasChildrenOnDemand() )
{
@@ -894,12 +845,9 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt )
SvTreeListBox::KeyInput( rKEvt );
}
-/*************************************************************************
-|*
-|* StartDrag-Request
-|*
-\************************************************************************/
-
+/**
+ * StartDrag-Request
+ */
void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
{
(void)nAction;
@@ -942,20 +890,17 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
SetSelectionMode(SINGLE_SELECTION);
Select(pEntry, sal_True);
- // Aus dem ExecuteDrag heraus kann der Navigator geloescht werden
- // (beim Umschalten auf einen anderen Dokument-Typ), das wuerde aber
- // den StarView MouseMove-Handler, der Command() aufruft, umbringen.
- // Deshalb Drag&Drop asynchron:
+ // We can delete the Navigator from ExecuteDrag (when switching to
+ // another document type), but that would kill the StarView MouseMove
+ // Handler which is calling Command().
+ // For this reason, Drag&Drop is asynchronous.
Application::PostUserEvent( STATIC_LINK( this, SdPageObjsTLB, ExecDragHdl ) );
}
}
-/*************************************************************************
-|*
-|* Begin drag
-|*
-\************************************************************************/
-
+/**
+ * Begin drag
+ */
void SdPageObjsTLB::DoDrag()
{
mpDropNavWin = ( mpFrame->HasChildWindow( SID_NAVIGATOR ) ) ?
@@ -1047,12 +992,6 @@ void SdPageObjsTLB::DoDrag()
}
}
-/*************************************************************************
-|*
-|* Drag finished
-|*
-\************************************************************************/
-
void SdPageObjsTLB::OnDragFinished( sal_uInt8 )
{
if( mpFrame->HasChildWindow( SID_NAVIGATOR ) )
@@ -1070,12 +1009,9 @@ void SdPageObjsTLB::OnDragFinished( sal_uInt8 )
bIsInDrag = sal_False;
}
-/*************************************************************************
-|*
-|* AcceptDrop-Event
-|*
-\************************************************************************/
-
+/**
+ * AcceptDrop-Event
+ */
sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
{
sal_Int8 nResult (DND_ACTION_NONE);
@@ -1116,12 +1052,9 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
return nResult;
}
-/*************************************************************************
-|*
-|* ExecuteDrop-Event
-|*
-\************************************************************************/
-
+/**
+ * ExecuteDrop-Event
+ */
sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
sal_Int8 nRet = DND_ACTION_NONE;
@@ -1161,16 +1094,13 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
return nRet;
}
-/*************************************************************************
-|*
-|* Handler fuers Dragging
-|*
-\************************************************************************/
-
+/**
+ * Handler for Dragging
+ */
IMPL_STATIC_LINK(SdPageObjsTLB, ExecDragHdl, void*, EMPTYARG)
{
- // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der
- // Navigator geloescht werden darf
+ // as link, then it is allowed to asynchronous, without ImpMouseMoveMsg on
+ // the stack, delete the Navigator
pThis->DoDrag();
return 0;
}
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index aa33b99..58ffed6 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -49,12 +49,9 @@
#include "paragr.hxx"
#include <svx/flagsdef.hxx>
-/*************************************************************************
-|*
-|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu
-|*
-\************************************************************************/
-
+/**
+ * Constructor of the Tab dialog: appends pages to the dialog
+ */
SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent,
const SfxObjectShell* pDocShell,
SfxStyleSheetBase& rStyleBase,
@@ -72,7 +69,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent,
{
FreeResource();
- // Listbox fuellen und Select-Handler ueberladen
+ // fill Listbox and overload Select-Handler
AddTabPage( RID_SVXPAGE_LINE);
AddTabPage( RID_SVXPAGE_AREA);
diff --git a/sd/source/ui/dlg/tabtempl.src b/sd/source/ui/dlg/tabtempl.src
index 12158b0..ac8d8f6 100644
--- a/sd/source/ui/dlg/tabtempl.src
+++ b/sd/source/ui/dlg/tabtempl.src
@@ -25,7 +25,7 @@ TabDialog TAB_TEMPLATE
Size = MAP_APPFONT ( 289 , 176 ) ;
Text [ en-US ] = "Graphics Styles" ;
Moveable = TRUE ;
- // Closeable = TRUE; // Dieser Dialog hat OK und/oder Cancel Button ! (KH)
+ // Closeable = TRUE; // This dialog has an OK and/or a Cancel button! (KH)
TabControl 1
{
OutputSize = TRUE ;
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index b423110..5787b48 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -78,12 +78,9 @@ using namespace com::sun::star::lang;
#define DOCUMENT_TOKEN (sal_Unicode('#'))
-/*************************************************************************
-|*
-|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu
-|*
-\************************************************************************/
-
+/**
+ * Constructor of the Tab dialog: appends the pages to the dialog
+ */
SdActionDlg::SdActionDlg (
::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) :
SfxNoLayoutSingleTabDialog ( pParent, *pAttr, TP_ANIMATION_ACTION ),
@@ -91,9 +88,9 @@ SdActionDlg::SdActionDlg (
{
// FreeResource();
SfxTabPage* pNewPage = SdTPAction::Create( this, rOutAttrs );
- DBG_ASSERT( pNewPage, "Seite konnte nicht erzeugt werden");
+ DBG_ASSERT( pNewPage, "Unable to create page");
- // Ehemals in PageCreated
+ // formerly in PageCreated
( (SdTPAction*) pNewPage )->SetView( pView );
( (SdTPAction*) pNewPage )->Construct();
@@ -105,12 +102,9 @@ SdActionDlg::SdActionDlg (
}
-/*************************************************************************
-|*
-|* Action-TabPage
-|*
-\************************************************************************/
-
+/**
+ * Action-TabPage
+ */
SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) :
SfxTabPage ( pWindow, SdResId( TP_ANIMATION ), rInAttrs ),
@@ -142,7 +136,7 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) :
aBtnSearch.SetClickHdl( LINK( this, SdTPAction, ClickSearchHdl ) );
aBtnSeek.SetClickHdl( LINK( this, SdTPAction, ClickSearchHdl ) );
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
aLbAction.SetSelectHdl( LINK( this, SdTPAction, ClickActionHdl ) );
@@ -150,7 +144,7 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) :
aEdtDocument.SetLoseFocusHdl( LINK( this, SdTPAction, CheckFileHdl ) );
aEdtMacro.SetLoseFocusHdl( LINK( this, SdTPAction, CheckFileHdl ) );
- // Controls enablen
+ // enable controls
aFtAction.Show();
aLbAction.Show();
@@ -169,7 +163,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
{
mpView = pSdView;
- // Holen der ColorTable und Fuellen der ListBox
+ // get ColorTable and fill ListBox
::sd::DrawDocShell* pDocSh = static_cast<const ::sd::View*>(mpView)->GetDocSh();
if( pDocSh && pDocSh->GetViewShell() )
{
@@ -180,7 +174,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
SvxColorListItem aItem( *(const SvxColorListItem*)( pDocSh->GetItem( SID_COLOR_TABLE ) ) );
pColList = aItem.GetColorList();
- DBG_ASSERT( pColList.is(), "Keine Farbtabelle vorhanden!" );
+ DBG_ASSERT( pColList.is(), "No color table available!" );
}
else
{
@@ -192,7 +186,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
void SdTPAction::Construct()
{
- // OLE-Actionlistbox auffuellen
+ // fill OLE-Actionlistbox
SdrOle2Obj* pOleObj = NULL;
SdrGrafObj* pGrafObj = NULL;
sal_Bool bOLEAction = sal_False;
@@ -271,7 +265,7 @@ void SdTPAction::Construct()
maCurrentActions.push_back( presentation::ClickAction_MACRO );
maCurrentActions.push_back( presentation::ClickAction_STOPPRESENTATION );
- // Action-Listbox fuellen
+ // fill Action-Listbox
for (size_t nAction = 0, n = maCurrentActions.size(); nAction < n; nAction++)
{
sal_uInt16 nRId = GetClickActionSdResId( maCurrentActions[ nAction ] );
@@ -414,7 +408,7 @@ void SdTPAction::UpdateTree()
void SdTPAction::OpenFileDialog()
{
- // Soundpreview nur fuer Interaktionen mit Sound
+ // Soundpreview only for interaction with sound
presentation::ClickAction eCA = GetActualClickAction();
sal_Bool bSound = ( eCA == presentation::ClickAction_SOUND );
sal_Bool bPage = ( eCA == presentation::ClickAction_BOOKMARK );
@@ -424,7 +418,7 @@ void SdTPAction::OpenFileDialog()
if( bPage )
{
- // Es wird in der TreeLB nach dem eingegebenen Objekt gesucht
+ // search in the TreeLB for the specified object
aLbTree.SelectEntry( GetEditText() );
}
else
@@ -693,7 +687,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
if( aFile != aLastFile )
{
- // Ueberpruefen, ob es eine gueltige Draw-Datei ist
+ // check if it is a valid draw file
SfxMedium aMedium( aFile,
STREAM_READ | STREAM_NOCREATE );
@@ -701,10 +695,10 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
{
WaitObject aWait( GetParentDialog() );
- // ist es eine Draw-Datei?
- // mit READ oeffnen, sonst schreiben die Storages evtl. in die Datei!
+ // is it a draw file?
+ // open with READ, otherwise the Storages might write into the file!
uno::Reference < embed::XStorage > xStorage = aMedium.GetStorage();
- DBG_ASSERT( xStorage.is(), "Kein Storage!" );
+ DBG_ASSERT( xStorage.is(), "No storage!" );
uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY );
if( xAccess.is() &&
@@ -906,7 +900,7 @@ sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA )
case presentation::ClickAction_SOUND: return STR_CLICK_ACTION_SOUND;
case presentation::ClickAction_VERB: return STR_CLICK_ACTION_VERB;
case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION;
- default: OSL_FAIL( "Keine StringResource fuer ClickAction vorhanden!" );
+ default: OSL_FAIL( "No StringResource for ClickAction available!" );
}
return( 0 );
}
diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src
index 2e3bde0..cd7d284 100644
--- a/sd/source/ui/dlg/tpaction.src
+++ b/sd/source/ui/dlg/tpaction.src
@@ -66,8 +66,8 @@ TabPage TP_ANIMATION
Hide = TRUE ;
};
- // Es ist schon wichtig, daß Durchsuchen (search) und Suchen (seek/find) unter-
- // schiedlich heissen, da sie eben auch eine unterschiedliche Bedeutung haben
+ // It is important that "search" and "seek/find" are clearly
+ // distinguishable since they have different meanings
PushButton BTN_SEARCH
{
HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEARCH";
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 7fce3e8..4f23bb5 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -99,8 +99,8 @@ sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs )
if( pOptsItem == NULL || !(aOptsItem == *pOptsItem) )
rAttrs.Put( aOptsItem );
- // Evtl. vorhandenes GridItem wird geholt, um nicht versehentlich
- // irgendwelche Standardwerte einzustellen
+ // we get a possible existing GridItem, this ensures that we do net set
+ // some default values by accident
return( sal_True );
}
@@ -137,7 +137,7 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow,
/*************************************************************************
|*
-|* TabPage zum Einstellen der Inhalte-Optionen
+|* TabPage to adjust the content options
|*
\************************************************************************/
@@ -213,7 +213,7 @@ SfxTabPage* SdTpOptionsContents::Create( Window* pWindow,
/*************************************************************************
|*
-|* TabPage zum Einstellen der Sonstige-Optionen
+|* TabPage to adjust the misc options
|*
\************************************************************************/
#define TABLE_COUNT 12
@@ -225,7 +225,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
aCbxQuickEdit ( this, SdResId( CBX_QUICKEDIT ) ),
aCbxPickThrough ( this, SdResId( CBX_PICKTHROUGH ) ),
- // Template & Layout laufen z.Z. synchron!
+ // At the moment, template & layout are not running synchronized
aGrpProgramStart ( this, SdResId( GRP_PROGRAMSTART ) ),
aCbxStartWithTemplate ( this, SdResId( CBX_START_WITH_TEMPLATE ) ),
@@ -263,7 +263,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
FreeResource();
SetExchangeSupport();
- // Metrik einstellen
+ // set metric
FieldUnit eFUnit;
sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
@@ -277,7 +277,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
SetFieldUnit( aMtrFldTabstop, eFUnit );
- // ListBox mit Metriken f"ullen
+ // fill ListBox with metrics
SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE );
sal_uInt16 i;
@@ -297,7 +297,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
aMtrFldOriginalHeight.SetLast( 999999999 );
aMtrFldOriginalHeight.SetMax( 999999999 );
- // Temporaere Fields fuer Info-Texte (fuer Formatierung/Berechnung)
+ // temporary fields for info texts (for formatting/calculation)
aMtrFldInfo1.SetUnit( eFUnit );
aMtrFldInfo1.SetMax( 999999999 );
aMtrFldInfo1.SetDecimalDigits( 2 );
@@ -305,9 +305,9 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
aMtrFldInfo2.SetMax( 999999999 );
aMtrFldInfo2.SetDecimalDigits( 2 );
- // PoolUnit ermitteln
+ // determine PoolUnit
SfxItemPool* pPool = rInAttrs.GetPool();
- DBG_ASSERT( pPool, "Wo ist der Pool?" );
+ DBG_ASSERT( pPool, "Where is the Pool?" );
ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH );
// Fuellen der CB
@@ -328,11 +328,11 @@ SdTpOptionsMisc::~SdTpOptionsMisc()
// -----------------------------------------------------------------------
void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
{
- // Hier muss noch einmal SaveValue gerufen werden, da sonst u.U.
- // der Wert in anderen TabPages keine Wirkung hat
+ // We have to call SaveValue again since it can happen that the value
+ // has no effect on other TabPages
aLbMetric.SaveValue();
- // Metrik ggfs. aendern (da TabPage im Dialog liegt,
- // wo die Metrik eingestellt werden kann
+ // change metric if necessary (since TabPage is in the Dialog where
+ // the metric is set)
const SfxPoolItem* pAttr = NULL;
if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False,
(const SfxPoolItem**)&pAttr ))
@@ -343,7 +343,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
if( eFUnit != aMtrFldOriginalWidth.GetUnit() )
{
- // Metriken einstellen
+ // set metrics
sal_Int64 nVal = aMtrFldOriginalWidth.Denormalize( aMtrFldOriginalWidth.GetValue( FUNIT_TWIP ) );
SetFieldUnit( aMtrFldOriginalWidth, eFUnit, sal_True );
aMtrFldOriginalWidth.SetValue( aMtrFldOriginalWidth.Normalize( nVal ), FUNIT_TWIP );
@@ -374,7 +374,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet )
{
- // Parsercheck
+ // check parser
sal_Int32 nX, nY;
if( SetScale( aCbScale.GetText(), nX, nY ) )
{
@@ -433,7 +433,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
bModified = sal_True;
}
- // Metrik
+ // metric
const sal_uInt16 nMPos = aLbMetric.GetSelectEntryPos();
if ( nMPos != aLbMetric.GetSavedValue() )
{
@@ -443,7 +443,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
bModified |= sal_True;
}
- // Tabulatorabstand
+ // tabulator space
if( aMtrFldTabstop.GetText() != aMtrFldTabstop.GetSavedValue() )
{
sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP );
@@ -495,7 +495,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
aCbxCompatibility.SaveValue();
aCbxUsePrinterMetrics.SaveValue();
- // Metrik
+ // metric
sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
aLbMetric.SetNoSelection();
@@ -514,7 +514,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
}
}
- // Tabulatorabstand
+ // tabulator space
nWhich = GetWhich( SID_ATTR_DEFTABSTOP );
if( rAttrs.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE )
{
@@ -539,9 +539,9 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
aFtOriginal.Hide();
aFtEquivalent.Hide();
aMtrFldOriginalWidth.Hide();
- aMtrFldOriginalWidth.SetText( aInfo1 ); // leer
+ aMtrFldOriginalWidth.SetText( aInfo1 ); // empty
aMtrFldOriginalHeight.Hide();
- aMtrFldOriginalHeight.SetText( aInfo2 ); //leer
+ aMtrFldOriginalHeight.SetText( aInfo2 ); //empty
aFtPageWidth.Hide();
aFtPageHeight.Hide();
aFiInfo1.Hide();
diff --git a/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src
index c7d3746..263877c 100644
--- a/sd/source/ui/dlg/tpoption.src
+++ b/sd/source/ui/dlg/tpoption.src
@@ -24,7 +24,7 @@
#define SCALE_TEXT \
Text [ en-US ] = "Scale" ; \
- // Contents (Inhalte)
+ // Contents
TabPage TP_OPTIONS_CONTENTS
{
HelpID = HID_SD_OPTIONS_CONTENTS ;
@@ -70,7 +70,7 @@ TabPage TP_OPTIONS_CONTENTS
Text [ en-US ] = "~Contour of each individual object" ;
};
};
- // MISC (Sonstiges)
+ // MISC
TabPage TP_OPTIONS_MISC
{
HelpID = HID_SD_OPTIONS_MISC ;
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 97f3afc..35e7062 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -35,23 +35,16 @@
TYPEINIT1(StyleSheetUndoAction, SdUndoAction);
-
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
-
StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
SfxStyleSheet* pTheStyleSheet,
const SfxItemSet* pTheNewItemSet) :
SdUndoAction(pTheDoc)
{
- DBG_ASSERT(pTheStyleSheet, "Undo ohne StyleSheet ???");
+ DBG_ASSERT(pTheStyleSheet, "Undo without StyleSheet ???");
pStyleSheet = pTheStyleSheet;
- // ItemSets anlegen; Vorsicht, das neue koennte aus einem anderen Pool
- // stammen, also mitsamt seinen Items clonen
+ // Create ItemSets; Attention, it is possible that the new one is from a,
+ // different pool. Therefore we clone it with its items.
pNewSet = new SfxItemSet((SfxItemPool&)SdrObject::GetGlobalDrawObjectItemPool(), pTheNewItemSet->GetRanges());
pTheDoc->MigrateItemSet( pTheNewItemSet, pNewSet, pTheDoc );
@@ -61,7 +54,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
aComment = String(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
String aName(pStyleSheet->GetName());
- // Layoutnamen und Separator loeschen
+ // delete layout name and separator
String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ) );
sal_uInt16 nPos = aName.Search(aSep);
if( nPos != STRING_NOTFOUND )
@@ -99,19 +92,13 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
}
}
- // Platzhalter durch Vorlagennamen ersetzen
+ // replace placeholder with template name
nPos = aComment.Search(sal_Unicode('$'));
aComment.Erase(nPos, 1);
aComment.Insert(aName, nPos);
}
-/*************************************************************************
-|*
-|* Undo()
-|*
-\************************************************************************/
-
void StyleSheetUndoAction::Undo()
{
SfxItemSet aNewSet( mpDoc->GetItemPool(), pOldSet->GetRanges() );
@@ -124,11 +111,6 @@ void StyleSheetUndoAction::Undo()
pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
}
-/*************************************************************************
-|*
-|* Redo()
-|*
-\************************************************************************/
void StyleSheetUndoAction::Redo()
{
@@ -142,11 +124,6 @@ void StyleSheetUndoAction::Redo()
pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
StyleSheetUndoAction::~StyleSheetUndoAction()
{
@@ -154,11 +131,6 @@ StyleSheetUndoAction::~StyleSheetUndoAction()
delete pOldSet;
}
-/*************************************************************************
-|*
-|* Kommentar liefern
-|*
-\************************************************************************/
rtl::OUString StyleSheetUndoAction::GetComment() const
{
More information about the Libreoffice-commits
mailing list