[Libreoffice-commits] core.git: 14 commits - sd/source

Urs Fässler urs at bitzgi.ch
Thu Mar 7 06:19:14 PST 2013


 sd/source/ui/dlg/AnimationChildWindow.cxx |    9 -
 sd/source/ui/dlg/LayerTabBar.cxx          |   47 +++-------
 sd/source/ui/dlg/animobjs.cxx             |  139 ++++++++++++++----------------
 sd/source/ui/dlg/assclass.cxx             |   10 +-
 sd/source/ui/dlg/brkdlg.cxx               |   42 ++++-----
 sd/source/ui/dlg/copydlg.cxx              |   59 +++---------
 sd/source/ui/dlg/custsdlg.cxx             |  104 +++++++++-------------
 sd/source/ui/dlg/diactrl.cxx              |   10 --
 sd/source/ui/dlg/dlgass.cxx               |   53 +++++------
 sd/source/ui/dlg/dlgass.src               |   12 +-
 sd/source/ui/dlg/dlgassim.cxx             |    8 -
 sd/source/ui/dlg/dlgchar.cxx              |    9 -
 sd/source/ui/dlg/dlgfield.cxx             |   28 ++----
 sd/source/ui/dlg/dlgolbul.cxx             |   13 +-
 14 files changed, 229 insertions(+), 314 deletions(-)

New commits:
commit f72f891158979b58cf50fdd7889e8f0806a9a9b4
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:19:31 2013 +0100

    sd/source/ui/dlg/dlgolbul.cxx comment translation and cleanup
    
    Change-Id: Icf8efaf7fd77f0505f0ae6936316fbb155ce8a69

diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 0eb5e02..b637869 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -50,12 +50,9 @@
 
 namespace sd {
 
-/*************************************************************************
-|*
-|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu
-|*
-\************************************************************************/
-
+/**
+ * Constructor of tab dialog: append pages to the dialog
+ */
 OutlineBulletDlg::OutlineBulletDlg(
     ::Window* pParent,
     const SfxItemSet* pAttr,
@@ -75,7 +72,7 @@ OutlineBulletDlg::OutlineBulletDlg(
 
     sal_Bool bOutliner = sal_False;
 
-    // Sonderbehandlung wenn eine Title Objekt selektiert wurde
+    // special treatment if a title object is selected
     if( pView )
     {
         const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
@@ -115,7 +112,7 @@ OutlineBulletDlg::OutlineBulletDlg(
         if( pItem == NULL )
             pItem = (SvxNumBulletItem*) aInputSet.GetPool()->GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET);
 
-        DBG_ASSERT( pItem, "Kein EE_PARA_NUMBULLET im Pool! [CL]" );
+        DBG_ASSERT( pItem, "No EE_PARA_NUMBULLET in Pool! [CL]" );
 
         aInputSet.Put(*pItem, EE_PARA_NUMBULLET);
     }
commit c0c907000d006ea9711116533c3b688de546472a
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:18:31 2013 +0100

    sd/source/ui/dlg/dlgfield.cxx comment translation and cleanup
    
    Change-Id: I6aae5fd2d663d568afd4b2aebca237cdddba23de

diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 19f42f0..9126873 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -43,12 +43,9 @@
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
 
-/*************************************************************************
-|*
-|* Dialog zum Bearbeiten von Feldbefehlen
-|*
-\************************************************************************/
-
+/**
+ * dialog to edit field commands
+ */
 SdModifyFieldDlg::SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) :
     ModalDialog ( pWindow, SdResId( DLG_FIELD_MODIFY ) ),
     aGrpType    ( this, SdResId( GRP_TYPE ) ),
@@ -71,13 +68,10 @@ SdModifyFieldDlg::SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInFiel
     FillControls();
 }
 
-/*************************************************************************
-|*
-|* Gibt das neue Feld zurueck, gehoert dem Caller.
-|* Liefert NULL, wenn sich nichts geaendert hat.
-|*
-\************************************************************************/
-
+/**
+ * Returns the new field, owned by caller.
+ * Returns NULL if nothing has changed.
+ */
 SvxFieldData* SdModifyFieldDlg::GetField()
 {
     SvxFieldData* pNewField = NULL;
@@ -184,8 +178,8 @@ void SdModifyFieldDlg::FillFormatList()
         const SvxDateField* pDateField = (const SvxDateField*) pField;
         SvxDateField aDateField( *pDateField );
 
-        //SVXDATEFORMAT_APPDEFAULT,     // Wird nicht benutzt
-        //SVXDATEFORMAT_SYSTEM,         // Wird nicht benutzt
+        //SVXDATEFORMAT_APPDEFAULT,     // not used
+        //SVXDATEFORMAT_SYSTEM,         // not used
         aLbFormat.InsertEntry( String( SdResId( STR_STANDARD_SMALL ) ) );
         aLbFormat.InsertEntry( String( SdResId( STR_STANDARD_BIG ) ) );
 
@@ -210,8 +204,8 @@ void SdModifyFieldDlg::FillFormatList()
         const SvxExtTimeField* pTimeField = (const SvxExtTimeField*) pField;
         SvxExtTimeField aTimeField( *pTimeField );
 
-        //SVXTIMEFORMAT_APPDEFAULT,     // Wird nicht benutzt
-        //SVXTIMEFORMAT_SYSTEM,         // Wird nicht benutzt
+        //SVXTIMEFORMAT_APPDEFAULT,     // not used
+        //SVXTIMEFORMAT_SYSTEM,         // not used
         aLbFormat.InsertEntry( String( SdResId( STR_STANDARD_NORMAL ) ) );
 
         SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
commit 3785e0637d03404d32d3ef08ac21df99ff49c22c
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:17:33 2013 +0100

    sd/source/ui/dlg/dlgchar.cxx comment translation and cleanup
    
    Change-Id: If973c032aed859c086a76603fcf9a802444b20b0

diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index f33bfd1..f6b5d24 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -33,12 +33,9 @@
 #include <svx/svxids.hrc>
 #include <svl/intitem.hxx>
 
-/*************************************************************************
-|*
-|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu
-|*
-\************************************************************************/
-
+/**
+ * Constructor of tab dialog: append pages to dialog
+ */
 SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr,
                     const SfxObjectShell* pDocShell ) :
         SfxTabDialog        ( pParent, SdResId( TAB_CHAR ), pAttr ),
commit 5e41e5521687672e73532416768b787cbc6c24bc
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:16:47 2013 +0100

    sd/source/ui/dlg/dlgassim.cxx comment translation
    
    Change-Id: I96320e34ee6257ad11762b637a89fb0c0c8c3441

diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index af99541..0db0e78 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -39,7 +39,7 @@ SdPageListControl::SdPageListControl(
     const ResId& rResId )
     : SvTreeListBox(pParent, rResId)
 {
-    // Tree-ListBox mit Linien versehen
+    // add lines to tree listbox
     SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
                             WB_HASBUTTONS |  WB_HASLINESATROOT |
                             WB_HSCROLL |
@@ -86,7 +86,7 @@ SvTreeListEntry* SdPageListControl::InsertPage( const String& rPageName )
 
     pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox,
                                        0, m_pCheckButton));
-    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // Sonst Puff!
+    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // otherwise boom!
     pEntry->AddItem( new SvLBoxString( pEntry, 0, rPageName ) );
 
     GetModel()->Insert( pEntry );
@@ -98,7 +98,7 @@ void SdPageListControl::InsertTitle( SvTreeListEntry* pParent, const String& rTi
 {
     SvTreeListEntry* pEntry = new SvTreeListEntry;
     pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) );
-    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // Sonst Puff!
+    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // otherwise boom!
     pEntry->AddItem( new SvLBoxString( pEntry, 0, rTitle ) );
     GetModel()->Insert( pEntry,pParent );
 }
@@ -120,7 +120,7 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc )
             SdrTextObj* pTO = (SdrTextObj*)pPage->GetPresObj(PRESOBJ_TEXT);
             if(!pTO)
             {
-                // Ermittelt das SdrTextObject mit dem Layout Text dieser Seite
+                // determines the SdrTextObject with the layout text of this page
                 const sal_uLong nObjectCount = pPage->GetObjCount();
                 for (sal_uLong nObject = 0; nObject < nObjectCount; nObject++)
                 {
commit 2262ea830a6c432d6f74acf705d06551ceb67f97
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:15:54 2013 +0100

    sd/source/ui/dlg/dlgass.src comment translation
    
    Change-Id: I203a304ff6591b20d3ce70fd8df2a1ff2383e48f

diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src
index 7788be0..f686493 100644
--- a/sd/source/ui/dlg/dlgass.src
+++ b/sd/source/ui/dlg/dlgass.src
@@ -55,7 +55,7 @@ ModalDialog DLG_ASS
         Text [ en-US ] = "~Do not show this wizard again" ;
     };
 
-    // Seite 1
+    // page 1
 
     FixedBitmap FB_PAGE1
     {
@@ -137,7 +137,7 @@ ModalDialog DLG_ASS
         AutoHScroll = TRUE;
     };
 
-    // Seite 2
+    // page 2
     FixedBitmap FB_PAGE2
     {
         OutputSize = TRUE ;
@@ -240,7 +240,7 @@ ModalDialog DLG_ASS
         Text [ en-US ] = "W~idescreen" ;
     };
 
-    // Seite 3
+    // page 3
     FixedBitmap FB_PAGE3
     {
         OutputSize = TRUE ;
@@ -401,7 +401,7 @@ ModalDialog DLG_ASS
         Text [ en-US ] = "Sh~ow logo";
     };
 
-    // Seite 4
+    // page 4
     FixedBitmap FB_PAGE4
     {
         OutputSize = TRUE ;
@@ -472,7 +472,7 @@ ModalDialog DLG_ASS
         VSCROLL = TRUE ;
     };
 
-    // Seite 5
+    // page 5
     FixedBitmap FB_PAGE5
     {
         OutputSize = TRUE ;
@@ -510,7 +510,7 @@ ModalDialog DLG_ASS
         Text [ en-US ] = "C~reate summary";
     };
 
-    // generell
+    // general
     HelpButton BUT_HELP
     {
         OutputSize = TRUE ;
commit b817d574cd99bd7976bb38ba48fa1a3334f4a448
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:15:42 2013 +0100

    sd/source/ui/dlg/dlgass.cxx comment translation
    
    Change-Id: Ib8edd906d086b76108fb03b85c60c1bd2c2b1422

diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 1a4345f..c37a4ac 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -292,7 +292,7 @@ public:
     String              maCreateStr;
     String              maOpenStr;
 
-    // Seite 1
+    // page 1
     FixedBitmap*        mpPage1FB;
     FixedLine*          mpPage1ArtFL;
     RadioButton*        mpPage1EmptyRB;
@@ -303,7 +303,7 @@ public:
     ListBox*            mpPage1OpenLB;
     PushButton*         mpPage1OpenPB;
 
-    // Seite 2
+    // page 2
     FixedBitmap*        mpPage2FB;
     FixedLine*          mpPage2LayoutFL;
     ListBox*            mpPage2RegionLB;
@@ -316,7 +316,7 @@ public:
     RadioButton*        mpPage2Medium5RB;
     RadioButton*        mpPage2Medium6RB;
 
-    // Seite 3
+    // page 3
     FixedBitmap*        mpPage3FB;
     FixedLine*          mpPage3EffectFL;
     FixedText*          mpPage3EffectFT;
@@ -332,7 +332,7 @@ public:
     TimeField*          mpPage3BreakTMF;
     CheckBox*           mpPage3LogoCB;
 
-    // Seite 4
+    // page 4
     FixedBitmap*        mpPage4FB;
     FixedLine*          mpPage4PersonalFL;
     FixedText*          mpPage4AskNameFT;
@@ -342,7 +342,7 @@ public:
     FixedText*          mpPage4AskInfoFT;
     MultiLineEdit*      mpPage4AskInfoEDT;
 
-    // Seite 5
+    // page 5
     FixedBitmap*        mpPage5FB;
     FixedText*          mpPage5PageListFT;
     SdPageListControl*  mpPage5PageListCT;
@@ -387,8 +387,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     else
         maAssistentFunc.InsertControl(1, &maStartWithFlag );
 
-    //page1 wird initialisiert und an die Assistentenfunktionalitaet
-    //uebergeben
+    // initialize page1 and give it to the assistant functionality
     maAssistentFunc.InsertControl(1, &maPreview );
     maAssistentFunc.InsertControl(1, &maPreviewFlag );
     maAssistentFunc.InsertControl(1,
@@ -457,7 +456,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     mpPage1OpenLB->SetDoubleClickHdl(rFinishLink);
     mpPage1OpenPB->SetClickHdl(LINK(this,AssistentDlgImpl,OpenButtonHdl));
 
-    // Seite 2
+    // page 2
     maAssistentFunc.InsertControl(2, &maPreview );
     maAssistentFunc.InsertControl(2, &maPreviewFlag );
     maAssistentFunc.InsertControl(2,
@@ -491,7 +490,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     mpPage2LayoutLB->SetStyle(mpPage2LayoutLB->GetStyle() | WB_SORT);
     mpPage2LayoutLB->InsertEntry(String(SdResId(STR_ISLOADING)));
 
-    // Seite 3
+    // page 3
     maAssistentFunc.InsertControl(3, &maPreview );
     maAssistentFunc.InsertControl(3, &maPreviewFlag );
     maAssistentFunc.InsertControl(3,
@@ -551,7 +550,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     pEditPage3PresTimeTMF->SetSelection( aSel1 );
     pEditPage3BreakTMF->SetSelection( aSel2 );
 
-    // Seite 4
+    // page 4
     maAssistentFunc.InsertControl(4,
         mpPage4FB = new FixedBitmap(pWindow,SdResId(FB_PAGE4)));
     maAssistentFunc.InsertControl(4,
@@ -588,7 +587,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     mpPage5PageListCT->SetSelectHdl(LINK(this,AssistentDlgImpl, PageSelectHdl));
 
 
-    // generell
+    // general
     InterpolateFixedBitmap( mpPage1FB );
     InterpolateFixedBitmap( mpPage2FB );
     InterpolateFixedBitmap( mpPage3FB );
@@ -602,7 +601,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     maPreviewFlag.SetClickHdl(LINK(this, AssistentDlgImpl, PreviewFlagHdl ));
     maPreview.SetClickHdl(LINK(this,AssistentDlgImpl, EffectPreviewHdl ));
 
-    //setzt die Ausgangsseite
+    // sets the exit page
     maAssistentFunc.GotoPage(1);
     maLastPageButton.Disable();
 
@@ -683,7 +682,7 @@ AssistentDlgImpl::~AssistentDlgImpl()
         delete (*I);
     }
 
-    // Seite 1
+    // page 1
     delete mpPage1FB;
     delete mpPage1ArtFL;
     delete mpPage1EmptyRB;
@@ -694,7 +693,7 @@ AssistentDlgImpl::~AssistentDlgImpl()
     delete mpPage1OpenLB;
     delete mpPage1OpenPB;
 
-    // Seite 2
+    // page 2
     delete mpPage2FB;
     delete mpPage2LayoutFL;
     delete mpPage2RegionLB;
@@ -707,7 +706,7 @@ AssistentDlgImpl::~AssistentDlgImpl()
     delete mpPage2Medium5RB;
     delete mpPage2Medium6RB;
 
-    // Seite 3
+    // page 3
     delete mpPage3FB;
     delete mpPage3EffectFL;
     delete mpPage3EffectFT;
@@ -723,7 +722,7 @@ AssistentDlgImpl::~AssistentDlgImpl()
     delete mpPage3BreakTMF;
     delete mpPage3LogoCB;
 
-    // Seite 4
+    // page 4
     delete mpPage4FB;
     delete mpPage4PersonalFL;
     delete mpPage4AskNameFT;
@@ -733,7 +732,7 @@ AssistentDlgImpl::~AssistentDlgImpl()
     delete mpPage4AskInfoFT;
     delete mpPage4AskInfoEDT;
 
-    // Seite 5
+    // page 5
     delete mpPage5FB;
     delete mpPage5PageListFT;
     delete mpPage5PageListCT;
@@ -942,7 +941,7 @@ void AssistentDlgImpl::TemplateScanDone (
 
 
 // ********************************************************************
-// Status Methoden
+// state methods
 // ********************************************************************
 
 void AssistentDlgImpl::SetStartType( StartType eType )
@@ -1030,7 +1029,7 @@ String AssistentDlgImpl::GetLayoutFileName()
 
 SfxObjectShellLock AssistentDlgImpl::GetDocument()
 {
-    UpdatePreview(sal_False);   // aber komplett laden
+    UpdatePreview(sal_False);   // but load completely
     UpdatePageList();
 
     SfxObjectShell* pShell = xDocShell;
@@ -1069,9 +1068,9 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument()
             }
             else
             {
-                // diese Seite loeschen
-                pDoc->DeletePage( (nPgRelNum << 1) + 2 ); // Notizseite loeschen
-                pDoc->DeletePage( (nPgRelNum << 1) + 1 );   // Seite loeschen
+                // delete this page
+                pDoc->DeletePage( (nPgRelNum << 1) + 2 ); // delete not page
+                pDoc->DeletePage( (nPgRelNum << 1) + 1 ); // delete page
             }
 
             nPgAbsNum++;
@@ -1126,7 +1125,7 @@ void AssistentDlgImpl::UpdatePage()
     {
     case 1:
         {
-            // Elemente auf der ersten Seite abhaengig vom Starttype Zeigen
+            // Show elements on first page depending of start type
             SetStartType( GetStartType() );
             mpPage1TemplateRB->Enable(sal_True /*mbTemplatesReady*/);
             break;
@@ -1595,7 +1594,7 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview )
 
     if(bChangeMaster && (aLayoutFile != maDocFile))
     {
-        // Layoutvorlage laden
+        // load layout template
         SfxObjectShellLock xLayoutDocShell;
         SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,mpWindow);
         SfxItemSet* pSet = new SfxAllItemSet( pSfxApp->GetPool() );
@@ -1616,7 +1615,7 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview )
 
         Application::SetDefDialogParent( pParent );
 
-        // die Implementierung ermitteln
+        // determine the implementation
         SfxObjectShell* pShell = xDocShell;
         DrawDocShell* pDocShell = PTR_CAST(DrawDocShell,pShell);
         SdDrawDocument* pDoc = pDocShell?pDocShell->GetDoc():NULL;
@@ -1841,7 +1840,7 @@ AssistentDlg::AssistentDlg(Window* pParent, sal_Bool bAutoPilot) :
     Link aFinishLink = LINK(this,AssistentDlg, FinishHdl);
     mpImpl = new AssistentDlgImpl( this, aFinishLink, bAutoPilot );
 
-    //Buttonbelegung
+    // button assigmnent
     mpImpl->maFinishButton.SetClickHdl(LINK(this,AssistentDlg,FinishHdl));
 
     FreeResource();
@@ -1877,7 +1876,7 @@ IMPL_LINK_NOARG(AssistentDlg, FinishHdl)
         }
     }
 
-    //Ende
+    // end
     mpImpl->EndDialog(RET_OK);
     EndDialog(RET_OK);
     return 0;
commit de00229f78f0e94a3d3909186a2cb9f9f7e70023
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:14:55 2013 +0100

    sd/source/ui/dlg/diactrl.cxx comment translation and cleanup
    
    Change-Id: I09ca02248e9494ad34d8f6c5427ce3186d33e36f

diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index da90b97..0b2213c 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -52,14 +52,14 @@ SdPagesField::SdPagesField( Window* pParent,
     String aStr( SdResId( STR_SLIDE_PLURAL ) );
     SetCustomUnitText( aStr );
 
-    // Groesse setzen
+    // set size
     aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "XXX" ) );
     Size aSize( GetTextWidth( aStr )+20, GetTextHeight()+6 );
 
 
     SetSizePixel( aSize );
 
-    // Parameter des MetricFields setzen
+    // set parameter of MetricFields
     SetUnit( FUNIT_CUSTOM );
     SetMin( 1 );
     SetFirst( 1 );
@@ -109,12 +109,6 @@ void SdPagesField::Modify()
                                  aArgs );
 }
 
-/*************************************************************************
-|*
-|* SdTbxCtlDiaPages
-|*
-\************************************************************************/
-
 SdTbxCtlDiaPages::SdTbxCtlDiaPages( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
commit 419f278af31bb6c0965918097218b615af0ee28b
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:13:32 2013 +0100

    sd/source/ui/dlg/custsdlg.cxx comment translation and cleanup
    
    Change-Id: I004fc9d15a5621b206d6694fc8f3160612ee148c

diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index e6149ea..a2c6d0e 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -42,9 +42,6 @@
 /////////////////////
 
 
-/*************************************************************************
-|* Konstruktor
-\************************************************************************/
 SdCustomShowDlg::SdCustomShowDlg( Window* pWindow,
                             SdDrawDocument& rDrawDoc ) :
     ModalDialog     ( pWindow, SdResId( DLG_CUSTOMSHOW ) ),
@@ -74,14 +71,14 @@ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow,
     aCbxUseCustomShow.SetClickHdl( aLink );
     aLbCustomShows.SetSelectHdl( aLink );
 
-    aBtnStartShow.SetClickHdl( LINK( this, SdCustomShowDlg, StartShowHdl ) ); // Testweise
+    aBtnStartShow.SetClickHdl( LINK( this, SdCustomShowDlg, StartShowHdl ) ); // for test
 
-    // CustomShow-Liste des Docs abrufen
+    // get CustomShow list of docs
     pCustomShowList = rDoc.GetCustomShowList();
     if( pCustomShowList )
     {
         long nPosToSelect = pCustomShowList->GetCurPos();
-        // ListBox mit CustomShows fuellen
+        // fill ListBox with CustomShows
         for( pCustomShow = pCustomShowList->First();
              pCustomShow != NULL;
              pCustomShow = pCustomShowList->Next() )
@@ -97,16 +94,10 @@ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow,
     CheckState();
 }
 
-/*************************************************************************
-|* Dtor
-\************************************************************************/
 SdCustomShowDlg::~SdCustomShowDlg()
 {
 }
 
-/*************************************************************************
-|* CheckState
-\************************************************************************/
 void SdCustomShowDlg::CheckState()
 {
     sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos();
@@ -122,12 +113,12 @@ void SdCustomShowDlg::CheckState()
         pCustomShowList->Seek( nPos );
 }
 
-/*************************************************************************
-|* ButtonHdl()
-\************************************************************************/
+/**
+ * ButtonHdl()
+ */
 IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
 {
-    // Neue CustomShow
+    // new CustomShow
     if( p == &aBtnNew )
     {
         pCustomShow = NULL;
@@ -151,13 +142,13 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
         else if( pCustomShow )
             DELETEZ( pCustomShow );
     }
-    // CustomShow bearbeiten
+    // edit CustomShow
     else if( p == &aBtnEdit )
     {
         sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
         {
-            DBG_ASSERT( pCustomShowList, "pCustomShowList existiert nicht" );
+            DBG_ASSERT( pCustomShowList, "pCustomShowList does not exist" );
             pCustomShow = (*pCustomShowList)[ nPos ];
             SdDefineCustomShowDlg aDlg( this, rDoc, pCustomShow );
 
@@ -176,7 +167,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
             }
         }
     }
-    // CustomShow loeschen
+    // delete CustomShow
     else if( p == &aBtnRemove )
     {
         sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos();
@@ -188,7 +179,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
             bModified = sal_True;
         }
     }
-    // CustomShow kopieren
+    // copy CustomShow
     else if( p == &aBtnCopy )
     {
         sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos();
@@ -206,13 +197,13 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
                 nStrPos = aStr.indexOf( aStrCopy );
             }
             nStrPos = nStrPos + aStrCopy.getLength();
-            // Um nicht ins Nirvana zu greifen (--> Endlosschleife)
+            // that we do not access into the nirvana (--> endless loop)
             if( nStrPos >= aStr.getLength() )
             {
                 aStr = aStr + " " + OUString::valueOf( nNum );
             }
 
-            // Name ueberpruefen...
+            // check name...
             sal_Bool bDifferent = sal_False;
             //long nPosToSelect = pCustomShowList->GetCurPos();
             while( !bDifferent )
@@ -227,7 +218,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
                 }
                 if( !bDifferent )
                 {
-                    // Nummer entfernen und durch um 1 erhoehte ersetzen
+                    // replace number by a number increased by 1
 
                     const CharClass* pCharClass = rDoc.GetCharClass();
                     while( pCharClass->isDigit( aStr, nStrPos ) )
@@ -266,9 +257,9 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
     return( 0L );
 }
 
-/*************************************************************************
-|* StartShow-Hdl
-\************************************************************************/
+/**
+ * StartShow-Hdl
+ */
 IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl)
 {
     EndDialog( RET_YES );
@@ -276,9 +267,9 @@ IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl)
     return 0;
 }
 
-/*************************************************************************
-|* CheckState
-\************************************************************************/
+/**
+ * CheckState
+ */
 sal_Bool SdCustomShowDlg::IsCustomShow() const
 {
     return( aCbxUseCustomShow.IsEnabled() && aCbxUseCustomShow.IsChecked() );
@@ -291,11 +282,6 @@ sal_Bool SdCustomShowDlg::IsCustomShow() const
 ///////////////////////////
 
 
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
 SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow,
                         SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ) :
     ModalDialog     ( pWindow, SdResId( DLG_DEFINE_CUSTOMSHOW ) ),
@@ -322,13 +308,13 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow,
     aBtnAdd.SetClickHdl( aLink );
     aBtnRemove.SetClickHdl( aLink );
     aEdtName.SetModifyHdl( aLink );
-    aLbPages.SetSelectHdl( aLink ); // wegen Status
-    aLbCustomPages.SetSelectHdl( aLink ); // wegen Status
+    aLbPages.SetSelectHdl( aLink ); // because of status
+    aLbCustomPages.SetSelectHdl( aLink ); // because of status
 
     aBtnOK.SetClickHdl( LINK( this, SdDefineCustomShowDlg, OKHdl ) );
 
     SdPage* pPage;
-    // Listbox mit Seitennamen des Docs fuellen
+    // fill Listbox with page names of Docs
     for( long nPage = 0L;
          nPage < rDoc.GetSdPageCount( PK_STANDARD );
          nPage++ )
@@ -344,7 +330,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow,
         aOldName = rpCustomShow->GetName();
         aEdtName.SetText( aOldName );
 
-        // ListBox mit CustomShow-Seiten fuellen
+        // fill ListBox with CustomShow pages
         for( SdCustomShow::PageVec::iterator it = rpCustomShow->PagesVector().begin();
              it != rpCustomShow->PagesVector().end(); ++it )
         {
@@ -367,18 +353,13 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow,
     CheckState();
 }
 
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
 SdDefineCustomShowDlg::~SdDefineCustomShowDlg()
 {
 }
 
-/*************************************************************************
-|* CheckState
-\************************************************************************/
+/**
+ * CheckState
+ */
 void SdDefineCustomShowDlg::CheckState()
 {
     sal_Bool bPages = aLbPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND;
@@ -391,9 +372,9 @@ void SdDefineCustomShowDlg::CheckState()
     aBtnRemove.Enable( bCSPages );
 }
 
-/*************************************************************************
-|* ButtonHdl()
-\************************************************************************/
+/**
+ * ButtonHdl()
+ */
 IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p )
 {
     if( p == &aBtnAdd )
@@ -449,24 +430,23 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p )
     return( 0L );
 }
 
-/*************************************************************************
-|* CheckCustomShow():
-|* Ueberprueft die Page-Pointer der Show, da die Eintraege ueber die
-|* TreeLB verschoben und kopiert werden k”nnen
-\************************************************************************/
+/**
+ * Checks the page pointer of the Show since entries can be moved and copied
+ * by TreeLB.
+ */
 void SdDefineCustomShowDlg::CheckCustomShow()
 {
     sal_Bool bDifferent = sal_False;
     SvTreeListEntry* pEntry = NULL;
 
-    // Anzahl vergleichen
+    // compare count
     if( rpCustomShow->PagesVector().size() != aLbCustomPages.GetEntryCount() )
     {
         rpCustomShow->PagesVector().clear();
         bDifferent = sal_True;
     }
 
-    // Seiten-Pointer vergleichen
+    // compare page pointer
     if( !bDifferent )
     {
         SdCustomShow::PageVec::iterator it1 = rpCustomShow->PagesVector().begin();
@@ -482,7 +462,7 @@ void SdDefineCustomShowDlg::CheckCustomShow()
         }
     }
 
-    // Seiten-Pointer neu setzen
+    // set new page pointer
     if( bDifferent )
     {
         SdPage* pPage = NULL;
@@ -496,7 +476,7 @@ void SdDefineCustomShowDlg::CheckCustomShow()
         bModified = sal_True;
     }
 
-    // Name vergleichen und ggfs. setzen
+    // compare name and set name if necessary
     String aStr( aEdtName.GetText() );
     if( rpCustomShow->GetName() != aStr )
     {
@@ -505,12 +485,12 @@ void SdDefineCustomShowDlg::CheckCustomShow()
     }
 }
 
-/*************************************************************************
-|* OK-Hdl
-\************************************************************************/
+/**
+ * OK-Hdl
+ */
 IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl)
 {
-    // Name ueberpruefen...
+    // check name...
     sal_Bool bDifferent = sal_True;
     SdCustomShowList* pCustomShowList = rDoc.GetCustomShowList();
     if( pCustomShowList )
commit d3c3dc449b25702584a1f28436e63c98be89bef7
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:11:04 2013 +0100

    sd/source/ui/dlg/copydlg.cxx comment translation and cleanup
    
    Change-Id: I22aad661decc8af23fa321d1a7288634992d810a

diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 5edfc96..f8e0064 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -48,12 +48,6 @@ namespace sd {
 
 #define TOKEN (sal_Unicode(';'))
 
-/*************************************************************************
-|*
-|* Dialog zum Kopieren von Objekten
-|*
-\************************************************************************/
-
 CopyDlg::CopyDlg(
     ::Window* pWindow,
     const SfxItemSet& rInAttrs,
@@ -94,7 +88,7 @@ CopyDlg::CopyDlg(
     // Set up the view data button (image and accessible name).
     maBtnSetViewData.SetAccessibleName (maBtnSetViewData.GetQuickHelpText());
 
-    // Farbtabellen
+    // color tables
     DBG_ASSERT( mpColorList.is(), "No colortable available !" );
     maLbStartColor.Fill( mpColorList );
     maLbEndColor.CopyEntries( maLbStartColor );
@@ -114,12 +108,6 @@ CopyDlg::CopyDlg(
     Reset();
 }
 
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
-
 CopyDlg::~CopyDlg()
 {
     String& rStr = GetExtraData();
@@ -148,12 +136,9 @@ CopyDlg::~CopyDlg()
     rStr += OUString::valueOf( (long)maLbEndColor.GetSelectEntryColor().GetColor() );
 }
 
-/*************************************************************************
-|*
-|* Liest uebergebenen Item-Set oder wertet den INI-String aus
-|*
-\************************************************************************/
-
+/**
+ * reads provided item set or evaluate ini string
+ */
 void CopyDlg::Reset()
 {
     const SfxPoolItem* pPoolItem = NULL;
@@ -235,12 +220,9 @@ void CopyDlg::Reset()
 
 }
 
-/*************************************************************************
-|*
-|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen
-|*
-\************************************************************************/
-
+/**
+ * fills provided item set with dialog box attributes
+ */
 void CopyDlg::GetAttr( SfxItemSet& rOutAttrs )
 {
     long nMoveX = Fraction( GetCoreValue( maMtrFldMoveX, SFX_MAPUNIT_100TH_MM) ) * maUIScale;
@@ -269,12 +251,9 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs )
     }
 }
 
-/*************************************************************************
-|*
-|* Enabled und selektiert Endfarben-LB
-|*
-\************************************************************************/
-
+/**
+ * enables and selects end color LB
+ */
 IMPL_LINK_NOARG(CopyDlg, SelectColorHdl)
 {
     sal_uInt16 nPos = maLbStartColor.GetSelectEntryPos();
@@ -289,10 +268,9 @@ IMPL_LINK_NOARG(CopyDlg, SelectColorHdl)
     return 0;
 }
 
-/*************************************************************************
-|* Setzt Werte der Selektion
-\************************************************************************/
-
+/**
+ * sets values of selection
+ */
 IMPL_LINK_NOARG(CopyDlg, SetViewData)
 {
     Rectangle aRect = mpView->GetAllMarkedRect();
@@ -302,7 +280,7 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData)
     SetMetricValue( maMtrFldMoveY, Fraction( aRect.GetHeight() ) /
                                     maUIScale, SFX_MAPUNIT_100TH_MM);
 
-    // Farb-Attribut setzen
+    // sets color attribute
     const SfxPoolItem*  pPoolItem = NULL;
     if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) )
     {
@@ -313,10 +291,9 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData)
     return 0;
 }
 
-/*************************************************************************
-|* Setzt Werte auf Standard
-\************************************************************************/
-
+/**
+ * resets values to default
+ */
 IMPL_LINK_NOARG(CopyDlg, SetDefault)
 {
     maNumFldCopies.SetValue( 1L );
@@ -330,7 +307,7 @@ IMPL_LINK_NOARG(CopyDlg, SetDefault)
     SetMetricValue( maMtrFldWidth, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM);
     SetMetricValue( maMtrFldHeight, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM);
 
-    // Farb-Attribut setzen
+    // set color attribute
     const SfxPoolItem*  pPoolItem = NULL;
     if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) )
     {
commit ce6d55c76691923640976c5e9906ecb0ba51e63f
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:09:05 2013 +0100

    sd/source/ui/dlg/brkdlg.cxx comment translation and cleanup
    
    Change-Id: I0eee9fe1d19ebcfe85283b35089cf48f90de8623

diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index fd5aa1e..d81074c 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -40,11 +40,9 @@
 
 namespace sd {
 
-/*************************************************************************
-|*
-|* Dialog zum aufbrechen von Metafiles
-|*
-\************************************************************************/
+/**
+ * dialog to split metafiles
+ */
 
 BreakDlg::BreakDlg(
     ::Window* pWindow,
@@ -68,7 +66,7 @@ BreakDlg::BreakDlg(
     mpProgress = new SfxProgress( pShell, String(SdResId(STR_BREAK_METAFILE)), nSumActionCount*3 );
 
     pProgrInfo = new SvdProgressInfo( &aLink );
-    // jede Action wird in DoImport() 3mal bearbeitet
+    // every action is editedt 3 times in DoImport()
     pProgrInfo->Init( nSumActionCount*3, nObjCount );
 
     pDrView = _pDrView;
@@ -86,7 +84,7 @@ BreakDlg::~BreakDlg()
         delete pProgrInfo;
 }
 
-// Control-Handler fuer den Abbruch Button
+// Control-Handler for cancel button
 IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl)
 {
   bCancel = sal_True;
@@ -94,12 +92,12 @@ IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl)
   return( 0L );
 }
 
-// Die UpDate Methode muss regelmaessig von der Arbeitsfunktion
-// ausgeuehrt werden.
-// Beim ersten aufruf wird die gesamtanzahl der actions uebergeben.
-// Jeder weitere sollte die bearbeiteten actions seit dem letzten aufruf von
-// UpDate erhalten.
-
+/**
+ * The working function has to call the UpDate method periodically.
+ * With the first call, the overall number of actions is provided.
+ * Every following call should contain the finished actions since the
+ * last call of UpDate.
+ */
 IMPL_LINK( BreakDlg, UpDate, void*, nInit )
 {
     String aEmptyStr;
@@ -107,7 +105,7 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     if(pProgrInfo == NULL)
       return 1L;
 
-    // Statuszeile updaten oder Fehlermeldung?
+    // update status bar or show a error message?
     if(nInit == (void*)1L)
     {
         ErrorBox aErrBox( this, WB_OK, String( SdResId( STR_BREAK_FAIL ) ) );
@@ -119,13 +117,13 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
             mpProgress->SetState( pProgrInfo->GetSumCurAction() );
     }
 
-    // Welches Oject wird gerade angezeigt?
+    // which object is shown at the moment?
     OUString info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurObj() ) )
             + "/"
             + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetObjCount() ) );
     aFiObjInfo.SetText(info);
 
-    // Wieviele Actions sind schon aufgebrochen?
+    // how many actions are started?
     if(pProgrInfo->GetActionCount() == 0)
     {
         aFiActInfo.SetText( aEmptyStr );
@@ -138,7 +136,7 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
         aFiActInfo.SetText(info);
     }
 
-    // Und erst eingefuegt????
+    // and inserted????
     if(pProgrInfo->GetInsertCount() == 0)
     {
         aFiInsInfo.SetText( aEmptyStr );
@@ -155,8 +153,10 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     return( bCancel?0L:1L );
 }
 
-// Oeffnet den Modalen Dialog und startet einen Timer der die Arbeitsfunktion
-// nach oeffnen des Dialogs ausfuehrt
+/**
+ * open a modal dialog and start a timer which calls the working function after
+ * the opening of the dialog
+ */
 short BreakDlg::Execute()
 {
   aTimer.SetTimeout( 10 );
@@ -166,7 +166,9 @@ short BreakDlg::Execute()
   return SfxModalDialog::Execute();
 }
 
-// Linkmethode welche die Arbeitsfunktion startet
+/**
+ * link-method which starts the working function
+ */
 IMPL_LINK_NOARG(BreakDlg, InitialUpdate)
 {
     pDrView->DoImportMarkedMtf(pProgrInfo);
commit 15b09cce64d00a42cbc83d17af9cd24582a7c90e
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:07:23 2013 +0100

    sd/source/ui/dlg/assclass.cxx debug message translation
    
    Change-Id: I47111c53603bcd46249511f694d8322f4250523e

diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx
index e1443f8..c23004a 100644
--- a/sd/source/ui/dlg/assclass.cxx
+++ b/sd/source/ui/dlg/assclass.cxx
@@ -37,7 +37,7 @@ Assistent::Assistent(int nNoOfPages)
 
 bool Assistent::InsertControl(int nDestPage,Control* pUsedControl)
 {
-    DBG_ASSERT( (nDestPage > 0) && (nDestPage <= mnPages), "Seite nicht vorhanden!");
+    DBG_ASSERT( (nDestPage > 0) && (nDestPage <= mnPages), "Page not aviable!");
 
     if((nDestPage>0)&&(nDestPage<=mnPages))
     {
@@ -83,7 +83,7 @@ bool Assistent::PreviousPage()
 
 bool Assistent::GotoPage(const int nPageToGo)
 {
-    DBG_ASSERT( (nPageToGo > 0) && (nPageToGo <= mnPages), "Seite nicht vorhanden!");
+    DBG_ASSERT( (nPageToGo > 0) && (nPageToGo <= mnPages), "Page not aviable!");
 
     if((nPageToGo>0)&&(nPageToGo<=mnPages)&&mpPageStatus[nPageToGo-1])
     {
@@ -149,14 +149,14 @@ int Assistent::GetCurrentPage() const
 
 bool Assistent::IsEnabled( int nPage ) const
 {
-    DBG_ASSERT( (nPage>0) && (nPage <= mnPages), "Seite nicht vorhanden!" );
+    DBG_ASSERT( (nPage>0) && (nPage <= mnPages), "Page not aviable!" );
 
     return (nPage>0) && (nPage <= mnPages && mpPageStatus[nPage-1]);
 }
 
 void Assistent::EnablePage( int nPage )
 {
-    DBG_ASSERT( (nPage>0) && (nPage <= mnPages), "Seite nicht vorhanden!" );
+    DBG_ASSERT( (nPage>0) && (nPage <= mnPages), "Page not aviable!" );
 
     if((nPage>0) && (nPage < mnPages && !mpPageStatus[nPage-1]))
     {
@@ -166,7 +166,7 @@ void Assistent::EnablePage( int nPage )
 
 void Assistent::DisablePage( int nPage )
 {
-    DBG_ASSERT( (nPage>0) && (nPage <= mnPages), "Seite nicht vorhanden!" );
+    DBG_ASSERT( (nPage>0) && (nPage <= mnPages), "Page not aviable!" );
 
     if((nPage>0) && (nPage <= mnPages && mpPageStatus[nPage-1]))
     {
commit 493b893e6cafb90b9aabf316c0a8ba11aeb4f6fc
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 15:06:51 2013 +0100

    sd/source/ui/dlg/animobjs.cxx comment translation and cleanup
    
    Change-Id: Icb7344b9e8f2eaf2cdfdfc9ef85f76813c352e8a

diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index c54dcc5..85c14e8 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -49,10 +49,9 @@ using namespace ::com::sun::star;
 
 namespace sd {
 
-/*************************************************************************
-|*  SdDisplay - Control
-\************************************************************************/
-
+/**
+ *  SdDisplay - Control
+ */
 SdDisplay::SdDisplay( Window* pWin, SdResId Id ) :
         Control( pWin, Id ),
         aScale( 1, 1 )
@@ -123,10 +122,9 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-/*************************************************************************
-|*  AnimationWindow - FloatingWindow
-\************************************************************************/
-
+/**
+ *  AnimationWindow - FloatingWindow
+ */
 AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
                 SfxChildWindow *pCW, Window* pParent, const SdResId& rSdResId ) :
         SfxDockingWindow    ( pInBindings, pCW, pParent, rSdResId ),
@@ -168,14 +166,14 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
     //undo SfxDockingWindow HelpId clear hack
     reverseUniqueHelpIdHack(*this);
 
-    // neues Dokument mit Seite erzeugen
+    // create new document with page
     pMyDoc = new SdDrawDocument(DOCUMENT_TYPE_IMPRESS, NULL);
     SdPage* pPage = (SdPage*) pMyDoc->AllocPage(sal_False);
     pMyDoc->InsertPage(pPage);
 
     pControllerItem = new AnimationControllerItem( SID_ANIMATOR_STATE, this, pBindings );
 
-    // Solange noch nicht in der Resource
+    // as long as not in the resource
     aTimeField.SetFormat( TIMEF_SEC_CS );
 
     aBtnFirst.SetClickHdl( LINK( this, AnimationWindow, ClickFirstHdl ) );
@@ -204,7 +202,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
 
     ResetAttrs();
 
-    // der Animator ist leer; es kann keine Animationsgruppe erstellt werden
+    // the animator is empty; no animation group can be created
     aBtnCreateGroup.Disable();
 
     aBtnGetOneObject.SetAccessibleRelationMemberOf( &aGrpBitmap );
@@ -227,7 +225,7 @@ AnimationWindow::~AnimationWindow()
     m_FrameList.clear();
     m_nCurrentFrame = EMPTY_FRAMELIST;
 
-    // die Clones loeschen
+    // delete the clones
     delete pMyDoc;
 }
 
@@ -260,12 +258,12 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
     size_t const nCount = m_FrameList.size();
     sal_Bool bReverse = p == &aBtnReverse;
 
-    // Kann spaeter schwer ermittelt werden
+    // it is difficult to find it later on
     sal_Bool bRbtGroupEnabled = aRbtGroup.IsEnabled();
     sal_Bool bBtnGetAllObjectsEnabled = aBtnGetAllObjects.IsEnabled();
     sal_Bool bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled();
 
-    // Gesamtzeit ermitteln
+    // calculate overall time
     Time aTime( 0 );
     long nFullTime;
     if( aRbtBitmap.IsChecked() )
@@ -282,14 +280,14 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
         aTime.MakeTimeFromMS( nFullTime );
     }
 
-    // StatusBarManager ab 1 Sekunde
+    // StatusBarManager from 1 second
     SfxProgress* pProgress = NULL;
     if( nFullTime >= 1000 )
     {
         bDisableCtrls = sal_True;
         aBtnStop.Enable();
         aBtnStop.Update();
-        rtl::OUString aStr("Animator:"); // Hier sollte man sich noch etwas gescheites ausdenken!
+        rtl::OUString aStr("Animator:"); // here we should think about something smart
         pProgress = new SfxProgress( NULL, aStr, nFullTime );
     }
 
@@ -349,7 +347,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
         }
     }
 
-    // Um die Controls wieder zu enablen
+    // to re-enable the controls
     bMovie = sal_False;
     if (nCount > 0)
     {
@@ -413,7 +411,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn )
 {
     bAllObjects = pBtn == &aBtnGetAllObjects;
 
-    // Code jetzt in AddObj()
+    // Code now in AddObj()
     SfxBoolItem aItem( SID_ANIMATOR_ADD, sal_True );
 
     GetBindings().GetDispatcher()->Execute(
@@ -435,12 +433,12 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
         m_FrameList.erase(m_FrameList.begin() + m_nCurrentFrame);
 
         pObject = pPage->GetObj(m_nCurrentFrame);
-        // Durch Uebernahme der AnimatedGIFs muessen nicht unbedingt
-        // Objekte vorhanden sein.
+        // Through acquisition of the AnimatedGIFs, objects does not need to
+        // exist.
         if( pObject )
         {
             pObject = pPage->RemoveObject(m_nCurrentFrame);
-            DBG_ASSERT(pObject, "Clone beim Loeschen nicht gefunden");
+            DBG_ASSERT(pObject, "Clone not found during deletion");
             SdrObject::Free( pObject );
             pPage->RecalcObjOrdNums();
         }
@@ -451,7 +449,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
             m_nCurrentFrame = EMPTY_FRAMELIST;
         }
     }
-    else // Alles loeschen
+    else // delete everything
     {
         WarningBox aWarnBox( this, WB_YES_NO, String( SdResId( STR_ASK_DELETE_ALL_PICTURES ) ) );
         short nReturn = aWarnBox.Execute();
@@ -468,7 +466,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
                 if( pObject )
                 {
                     pObject = pPage->RemoveObject( i );
-                    DBG_ASSERT(pObject, "Clone beim Loeschen nicht gefunden");
+                    DBG_ASSERT(pObject, "Clone not found during deletion");
                     SdrObject::Free( pObject );
                     //pPage->RecalcObjOrdNums();
                 }
@@ -480,16 +478,16 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
         }
     }
 
-    // kann noch eine Animationsgruppe erstellt werden?
+    // can we create a animation group
     if (m_FrameList.empty())
     {
         aBtnCreateGroup.Disable();
-        // Falls vorher durch Uebernahme von AnimatedGIFs disabled:
+        // if previous disabled by acquisition of AnimatedGIFs:
         //aRbtBitmap.Enable();
         aRbtGroup.Enable();
     }
 
-    // Zoom fuer DisplayWin berechnen und setzen
+    // calculate and set zoom for DisplayWin
     Fraction aFrac( GetScale() );
     aCtlDisplay.SetScale( aFrac );
 
@@ -502,7 +500,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
 
 IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl)
 {
-    // Code jetzt in CreatePresObj()
+    // Code now in CreatePresObj()
     SfxBoolItem aItem( SID_ANIMATOR_CREATE, sal_True );
 
     GetBindings().GetDispatcher()->Execute(
@@ -590,7 +588,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
     {
         aNumFldBitmap.SetValue(m_nCurrentFrame + 1);
 
-        // Wenn mind. 1 Objekt in der Liste ist
+        // if there is at least 1 object in the list
         aBtnFirst.Enable();
         aBtnReverse.Enable();
         aBtnPlay.Enable();
@@ -603,7 +601,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
     }
     else
     {
-        // Wenn kein Objekt in der Liste ist
+        // if no object is in the list
         aBtnFirst.Enable( sal_False );
         aBtnReverse.Enable( sal_False );
         aBtnPlay.Enable( sal_False );
@@ -630,7 +628,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
     }
     else
     {
-        // 'Gruppenobjekt' nur dann enablen, wenn es kein Animated GIF ist
+        // enable 'group object' only if it is not a Animated GIF
         if (m_FrameList.empty())
         {
             aRbtGroup.Enable();
@@ -712,13 +710,13 @@ void AnimationWindow::Resize()
     if ( !IsFloatingMode() ||
          !GetFloatingWindow()->IsRollUp() )
     {
-        Size aWinSize( GetOutputSizePixel() ); // vorher rSize im Resizing()
+        Size aWinSize( GetOutputSizePixel() ); // former rSize in Resizing()
 
         Size aDiffSize;
         aDiffSize.Width() = aWinSize.Width() - aSize.Width();
         aDiffSize.Height() = aWinSize.Height() - aSize.Height();
 
-        // Umgroessern des Display-Controls
+        // resize display controls
         aDisplaySize.Width() += aDiffSize.Width();
         aDisplaySize.Height() += aDiffSize.Height();
         aCtlDisplay.SetOutputSizePixel( aDisplaySize );
@@ -726,7 +724,7 @@ void AnimationWindow::Resize()
         Point aPt;
         aPt.Y() = aDiffSize.Height();
 
-        // Verschieben der anderen Controls
+        // move other controls
         aBtnFirst.Hide();
         aBtnReverse.Hide();
         aBtnStop.Hide();
@@ -772,7 +770,7 @@ void AnimationWindow::Resize()
         aGrpBitmap.SetPosPixel( aGrpBitmap.GetPosPixel() + aPt );
         aGrpAnimation.SetPosPixel( aGrpAnimation.GetPosPixel() + aPt );
 
-        // Zoom fuer DisplayWin berechnen und setzen
+        // calculate and set zoom for DisplayWin
         Fraction aFrac( GetScale() );
         aCtlDisplay.SetScale( aFrac );
 
@@ -837,12 +835,11 @@ void AnimationWindow::FillInfo( SfxChildWinInfo& rInfo ) const
 
 void AnimationWindow::AddObj (::sd::View& rView )
 {
-    // Texteingabemodus beenden, damit Bitmap mit
-    // Objekt identisch ist.
+    // finish text entry mode to ensure that bitmap is identical with object
     if( rView.IsTextEdit() )
         rView.SdrEndTextEdit();
 
-    // Objekt(e) clonen und den/die Clone(s) in die Liste stellen
+    // clone object(s) and insert the clone(s) into the list
     const SdrMarkList& rMarkList   = rView.GetMarkedObjectList();
     sal_uLong              nMarkCount  = rMarkList.GetMarkCount();
     SdPage*            pPage       = pMyDoc->GetSdPage(0, PK_STANDARD);
@@ -850,9 +847,8 @@ void AnimationWindow::AddObj (::sd::View& rView )
 
     if (nMarkCount > 0)
     {
-        // Wenn es sich um EIN Animationsobjekt oder ein Gruppenobjekt
-        // handelt, das 'einzeln uebernommen' wurde,
-        // werden die einzelnen Objekte eingefuegt
+        // If it is ONE animation object or one group object, which was
+        // 'individually taken', we insert the objects separately
         sal_Bool bAnimObj = sal_False;
         if( nMarkCount == 1 )
         {
@@ -888,7 +884,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
                         {
                             long nLoopCount = aAnimation.GetLoopCount();
 
-                            if( !nLoopCount ) // unendlich
+                            if( !nLoopCount ) // endless
                                 aLbLoopCount.SelectEntryPos( aLbLoopCount.GetEntryCount() - 1);
                             else
                                 aLbLoopCount.SelectEntry(rtl::OUString::valueOf( nLoopCount ) );
@@ -903,7 +899,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
                         // increment => next one inserted after this one
                         ++m_nCurrentFrame;
                     }
-                    // Nachdem ein animated GIF uebernommen wurde, kann auch nur ein solches erstellt werden
+                    // if a animated GIF is taken, only such one can be created
                     aRbtBitmap.Check();
                     aRbtGroup.Enable( sal_False );
                     bAnimObj = sal_True;
@@ -911,7 +907,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
             }
             else if( bAllObjects || ( pAnimInfo && pAnimInfo->mbIsMovie ) )
             {
-                // Mehrere Objekte
+                // several objects
                 SdrObjList* pObjList = ((SdrObjGroup*)pObject)->GetSubList();
 
                 for( sal_uInt16 nObject = 0; nObject < pObjList->GetObjCount(); nObject++ )
@@ -937,7 +933,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
                 bAnimObj = sal_True;
             }
         }
-        // Auch ein einzelnes animiertes Objekt
+        // also one single animated object
         if( !bAnimObj && !( bAllObjects && nMarkCount > 1 ) )
         {
             BitmapEx *const pBitmapEx =
@@ -950,7 +946,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
                     ::std::make_pair(pBitmapEx, pTime));
         }
 
-        // ein einzelnes Objekt
+        // one single object
         if( nMarkCount == 1 && !bAnimObj )
         {
             SdrMark*    pMark   = rMarkList.GetMark(0);
@@ -958,10 +954,10 @@ void AnimationWindow::AddObj (::sd::View& rView )
             SdrObject*  pClone  = pObject->Clone();
             pPage->InsertObject(pClone, m_nCurrentFrame + 1);
         }
-        // mehrere Objekte: die Clones zu einer Gruppe zusammenfassen
+        // several objects: group the clones
         else if (nMarkCount > 1)
         {
-            // Objekte einzeln uebernehmen
+            // take objects seperately
             if( bAllObjects )
             {
                 for( sal_uLong nObject= 0; nObject < nMarkCount; nObject++ )
@@ -984,7 +980,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
 
                     pPage->InsertObject(pObject->Clone(), m_nCurrentFrame);
                 }
-                bAnimObj = sal_True; // damit nicht nochmal weitergeschaltet wird
+                bAnimObj = sal_True; // that we don't change again
             }
             else
             {
@@ -1003,14 +999,14 @@ void AnimationWindow::AddObj (::sd::View& rView )
             ++m_nCurrentFrame;
         }
 
-        // wenn vorher nichts im Animator war und jetzt was da ist, kann eine
-        // Animationsgruppe erstellt werden
+        // if there was nothing in the animator before but now is something
+        // there, we can create a animation group
         if (nCloneCount == 0 && !m_FrameList.empty())
         {
             aBtnCreateGroup.Enable();
         }
 
-        // Zoom fuer DisplayWin berechnen und setzen
+        // calculate and set zoom for DisplayWin
         Fraction aFrac( GetScale() );
         aCtlDisplay.SetScale( aFrac );
 
@@ -1023,9 +1019,9 @@ void AnimationWindow::AddObj (::sd::View& rView )
 void AnimationWindow::CreateAnimObj (::sd::View& rView )
 {
     ::Window* pOutWin = static_cast< ::Window*>(rView.GetFirstOutputDevice()); // GetWin( 0 );
-    DBG_ASSERT( pOutWin, "Window ist nicht vorhanden!" );
+    DBG_ASSERT( pOutWin, "Window does not exist!" );
 
-    // die Fentermitte ermitteln
+    // find window center
     const MapMode       aMap100( MAP_100TH_MM );
     Size                aMaxSizeLog;
     Size                aMaxSizePix;
@@ -1035,7 +1031,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
     const size_t nCount = m_FrameList.size();
     BitmapAdjustment    eBA = (BitmapAdjustment) aLbAdjustment.GetSelectEntryPos();
 
-    // Groesste Bitmap ermitteln
+    // find biggest bitmap
     for (size_t i = 0; i < nCount; ++i)
     {
         const BitmapEx& rBmpEx = *m_FrameList[i].first;
@@ -1059,7 +1055,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
 
     if( aRbtBitmap.IsChecked() )
     {
-        // Bitmapgruppe erzeugen (Animated GIF)
+        // create bitmap group (Animated GIF)
         Animation   aAnimation;
         Point       aPt;
 
@@ -1071,7 +1067,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
 
             BitmapEx const*const pBitmapEx = m_FrameList[i].first;
 
-            // Offset fuer die gewuenschte Ausrichtung bestimmen
+            // calculate offset for the specified direction
             const Size aBitmapSize( pBitmapEx->GetSizePixel() );
 
             switch( eBA )
@@ -1117,12 +1113,12 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
 
             }
 
-            // LoopCount (Anzahl der Durchlaeufe) ermitteln
+            // find LoopCount (number of passes)
             AnimationBitmap aAnimBmp;
             long            nLoopCount = 0L;
             sal_uInt16          nPos = aLbLoopCount.GetSelectEntryPos();
 
-            if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLoopCount.GetEntryCount() - 1 ) // unendlich
+            if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLoopCount.GetEntryCount() - 1 ) // endless
                 nLoopCount = (long) aLbLoopCount.GetSelectEntry().ToInt32();
 
             aAnimBmp.aBmpEx = *pBitmapEx;
@@ -1145,7 +1141,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
     }
     else
     {
-        // Offset fuer die gewuenschte Ausrichtung bestimmen
+        // calculate offset for the specified direction
         Size aOffset;
         SdrObject * pClone = NULL;
         SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD);
@@ -1197,34 +1193,34 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
                 break;
 
             }
-            // SetSnapRect ist fuer Ellipsen leider nicht implementiert !!!
+            // Unfortunately, SetSnapRect is not implemented for ellipses !!!
             Point aMovePt( aWindowCenter + Point( aOffset.Width(), aOffset.Height() ) - aRect.TopLeft() );
             Size aMoveSize( aMovePt.X(), aMovePt.Y() );
             pClone->NbcMove( aMoveSize );
         }
 
-        // Animationsgruppe erzeugen
+        // create animation group
         SdrObjGroup* pGroup   = new SdrObjGroup;
         SdrObjList*  pObjList = pGroup->GetSubList();
 
         for (size_t i = 0; i < nCount; i++)
         {
-            // der Clone verbleibt im Animator; in die Gruppe kommt ein Clone
-            // des Clones
+            // the clone remains in the animatior; we insert a clone of the
+            // clone into the group
             pClone = pPage->GetObj(i);
             SdrObject* pCloneOfClone = pClone->Clone();
             //SdrObject* pCloneOfClone = pPage->GetObj(i)->Clone();
             pObjList->InsertObject(pCloneOfClone, LIST_APPEND);
         }
 
-        // bis jetzt liegt die linke obere Ecke der Gruppe in der Fenstermitte;
-        // jetzt noch um die Haelfte der Groesse nach oben und links korrigieren
+        // until now the top left corner of the group is in the window center;
+        // correct the position by half of the size of the group
         aTemp = aMaxSizeLog;
         aTemp.Height() = - aTemp.Height() / 2;
         aTemp.Width()  = - aTemp.Width() / 2;
         pGroup->NbcMove(aTemp);
 
-        // Animationsinformation erzeugen
+        // create animation information
         SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pGroup,true);
         pInfo->meEffect = presentation::AnimationEffect_NONE;
         pInfo->meSpeed = presentation::AnimationSpeed_MEDIUM;
@@ -1248,12 +1244,9 @@ void AnimationWindow::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-/*************************************************************************
-|*
-|* ControllerItem fuer Animator
-|*
-\************************************************************************/
-
+/**
+ * ControllerItem for Animator
+ */
 AnimationControllerItem::AnimationControllerItem(
     sal_uInt16 _nId,
     AnimationWindow* pAnimWin,
@@ -1271,7 +1264,7 @@ void AnimationControllerItem::StateChanged( sal_uInt16 nSId,
     if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_ANIMATOR_STATE )
     {
         const SfxUInt16Item* pStateItem = PTR_CAST( SfxUInt16Item, pItem );
-        DBG_ASSERT( pStateItem, "SfxUInt16Item erwartet");
+        DBG_ASSERT( pStateItem, "SfxUInt16Item expected");
         sal_uInt16 nState = pStateItem->GetValue();
 
         pAnimationWin->aBtnGetOneObject.Enable( nState & 1 );
commit 903172995e2312a0ecf06ecc83a223e2f1bd8e82
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 14:58:31 2013 +0100

    sd/source/ui/dlg/LayerTabBar.cxx comment translation and cleanup
    
    Change-Id: If82454a40fbcdfbdf5b050ad6f2dbc3bc5325b23

diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index b431246..98eebef 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -47,12 +47,9 @@ namespace sd {
 #define SWITCH_TIMEOUT  20
 
 
-/*************************************************************************
-|*
-|* Standard-Konstruktor
-|*
-\************************************************************************/
-
+/**
+ * default constructor
+ */
 LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent)
     : TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_SIZEABLE ) ),
     DropTargetHelper( this ),
@@ -76,12 +73,6 @@ LayerTabBar::LayerTabBar (
     EnableEditMode();
 }
 
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
 LayerTabBar::~LayerTabBar()
 {
 }
@@ -110,7 +101,7 @@ void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt)
         }
         else if (rMEvt.IsShift())
         {
-            // Toggle zw. Layer sichtbar / unsichtbar
+            // Toggle between layer visible / hidden
             String aName(GetPageText(aLayerId));
             SdrPageView* pPV = pDrViewSh->GetView()->GetSdrPageView();
             sal_Bool bVisible = pPV->IsLayerVisible(aName);
@@ -135,11 +126,9 @@ void LayerTabBar::DoubleClick()
 }
 
 
-/*************************************************************************
-|*
-|* AcceptDrop-Event
-|*
-\************************************************************************/
+/**
+ * AcceptDrop-Event
+ */
 
 sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt )
 {
@@ -163,12 +152,9 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt )
     return nRet;
 }
 
-/*************************************************************************
-|*
-|* ExecuteDrop-Event
-|*
-\************************************************************************/
-
+/**
+ * ExecuteDrop-Event
+ */
 sal_Int8 LayerTabBar::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
     sal_uInt16          nPageId = SDRPAGE_NOTFOUND;
@@ -205,7 +191,7 @@ long LayerTabBar::StartRenaming()
          aLayerName == aMeasureLinesLayer ||
          aLayerName == aBackgroundLayer   || aLayerName == aBackgroundObjLayer )
     {
-        // Diese Namen duerfen nicht veraendert werden
+        // It is not allowed to change this names
         bOK = sal_False;
     }
     else
@@ -225,7 +211,7 @@ long LayerTabBar::AllowRenaming()
 {
     sal_Bool bOK = sal_True;
 
-    // Ueberpruefung auf schon vorhandene Namen
+    // Check if names already exists
     ::sd::View* pView = pDrViewSh->GetView();
     SdDrawDocument& rDoc = pView->GetDoc();
     String aLayerName = pView->GetActiveLayer();
@@ -235,7 +221,7 @@ long LayerTabBar::AllowRenaming()
     if ( aNewName.Len() == 0 ||
         (rLayerAdmin.GetLayer( aNewName, sal_False ) && aLayerName != aNewName) )
     {
-        // Name ist schon vorhanden
+        // Name already exists
         WarningBox aWarningBox( &pDrViewSh->GetViewFrame()->GetWindow(), WinBits( WB_OK ),
                                 String(SdResId( STR_WARN_NAME_DUPLICATE ) ) );
         aWarningBox.Execute();
@@ -254,7 +240,7 @@ long LayerTabBar::AllowRenaming()
              aNewName == aMeasureLinesLayer ||
              aNewName == aBackgroundLayer   || aNewName == aBackgroundObjLayer )
         {
-            // Diese Namen duerfen nicht vergeben werden
+            // It is not allowed to use his names
             bOK = sal_False;
         }
     }
@@ -301,9 +287,8 @@ void LayerTabBar::EndRenaming()
                 pManager->AddUndoAction( pAction );
             }
 
-            // Zuerst View benachrichtigen, da innerhalb von SetName() schon
-            // ResetActualLayer() gerufen wird und an der View der Layer dann
-            // schon bekannt sein muss.
+            // First notify View since SetName() calls ResetActualLayer() and
+            // the View then already has to know the Layer
             pView->SetActiveLayer(aNewName);
             pLayer->SetName(aNewName);
             rDoc.SetChanged(sal_True);
commit 6dfc8218ab5c92484250125d088a0979f0fd9a39
Author: Urs Fässler <urs at bitzgi.ch>
Date:   Thu Mar 7 14:56:41 2013 +0100

    sd/source/ui/dlg/AnimationChildWindow.cxx comment translation and cleanup
    
    Change-Id: I660645edb4d0955c5456b4ad61843f703d9ff45f

diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx
index d4d048b..be24dea 100644
--- a/sd/source/ui/dlg/AnimationChildWindow.cxx
+++ b/sd/source/ui/dlg/AnimationChildWindow.cxx
@@ -31,12 +31,9 @@ namespace sd {
 
 SFX_IMPL_DOCKINGWINDOW_WITHID(AnimationChildWindow, SID_ANIMATION_OBJECTS)
 
-/*************************************************************************
-|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Animator
-|*
-\************************************************************************/
-
+/**
+ * Derivative from SfxChildWindow as "container" for animator
+ */
 AnimationChildWindow::AnimationChildWindow(
     ::Window* _pParent,
     sal_uInt16 nId,


More information about the Libreoffice-commits mailing list