Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3512

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/3512/1

fdo#39468 Comment translation GER-ENG in sw/source/ui/shells/ (Part 1)

basesh.cxx line 112: Needs to be revised
As german native speaker I don't know what the sentence means.
It looks like an automatic translation into german.
Unfortunely I don't know what the code really do.
I need a hint to translate this line.

Thank you.

Change-Id: I98af528c011a7d63b07b3aa71271d6816c11f7ab
---
M sw/source/ui/shells/annotsh.cxx
M sw/source/ui/shells/basesh.cxx
2 files changed, 103 insertions(+), 117 deletions(-)



diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 8dd405e..dde82ba 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -311,7 +311,7 @@
 
                 if (pFieldItem && pFieldItem->GetField()->ISA(SvxURLField))
                 {
-                    // Feld selektieren, so dass es beim Insert geloescht wird
+                    // Select the field so that it will be deleted during insert
                     ESelection aSel = pOLV->GetSelection();
                     aSel.nEndPos++;
                     pOLV->SetSelection(aSel);
@@ -425,7 +425,7 @@
                 */
                 SfxItemSet aDlgAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
 
-                // util::Language gibts an der EditEngine nicht! Daher nicht im Set.
+                // util::Language does not exist in the EditEngine! Therefore not included in the 
set.
 
                 aDlgAttr.Put( aEditAttr );
                 aDlgAttr.Put( SvxKerningItem(0, RES_CHRATR_KERNING) );
@@ -1580,7 +1580,7 @@
         else
             aAllSet.Put( SfxStringItem( SID_FONT_NAME, aSetDlgFont.GetFamilyName() ) );
 
-        // Wenn Zeichen selektiert ist kann es angezeigt werden
+        // If character is selected then it can be shown.
         SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( rView.GetWindow(), aAllSet,
             rView.GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP );
 
@@ -1610,7 +1610,7 @@
 
     if( sSym.Len() )
     {
-        // nicht flackern
+        // do not flicker
         pOLV->HideCursor();
         Outliner * pOutliner = pOLV->GetOutliner();
         pOutliner->SetUpdateMode(sal_False);
@@ -1623,10 +1623,10 @@
                             0 );
         aFontSet.Set( aOldSet );
 
-        // String einfuegen
+        // Insert string
         pOLV->InsertText( sSym);
 
-        // attributieren (Font setzen)
+        // Attributing (set font)
         SfxItemSet aSetFont( *aFontSet.GetPool(), aFontSet.GetRanges() );
         SvxFontItem aFontItem (aFont.GetFamily(),    aFont.GetName(),
                                 aFont.GetStyleName(), aFont.GetPitch(),
@@ -1641,16 +1641,16 @@
             aSetFont.Put( aFontItem, EE_CHAR_FONTINFO_CTL );
         pOLV->SetAttribs(aSetFont);
 
-        // Selektion loeschen
+        // Erase selection
         ESelection aSel(pOLV->GetSelection());
         aSel.nStartPara = aSel.nEndPara;
         aSel.nStartPos = aSel.nEndPos;
         pOLV->SetSelection(aSel);
 
-        // Alten Font restaurieren
+        // Restore old font
         pOLV->SetAttribs( aFontSet );
 
-        // ab jetzt wieder anzeigen
+        // From now on show it again
         pOutliner->SetUpdateMode(sal_True);
         pOLV->ShowCursor();
 
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 2f200e0..328996c 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -109,8 +109,14 @@
 
 FlyMode SwBaseShell::eFrameMode = FLY_DRAG_END;
 
-//Fuer die Erkennung der Id, die variable von Gallery mit SID_GALLERY_BG_BRUSH
-//ankommt.
+// For the detection of the Id, the variable of gallery with SID_GALLERY_BG_BRUSH arrives.
+//
+// Original german text: "Fuer die Erkennung der Id, die variable von Gallery mit
+// SID_GALLERY_BG_BRUSH ankommt. "
+//
+// I'm a native german translator, but I don't know what this mean. It looks like a
+// machine translation.
+
 static sal_uInt8 nParagraphPos;
 static sal_uInt8 nGraphicPos;
 static sal_uInt8 nOlePos;
@@ -148,9 +154,8 @@
 
 TYPEINIT1(SwBaseShell,SfxShell)
 
-/*--------------------------------------------------------------------
-    Beschreibung:   statics
- --------------------------------------------------------------------*/
+// statics
+
 static void lcl_UpdateIMapDlg( SwWrtShell& rSh )
 {
     Graphic aGrf( rSh.GetIMapGraphic() );
@@ -189,9 +194,8 @@
     return bRet;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:   loeschen
- --------------------------------------------------------------------*/
+// Delete
+
 void SwBaseShell::ExecDelete(SfxRequest &rReq)
 {
     SwWrtShell &rSh = GetShell();
@@ -213,16 +217,16 @@
                     rSh.DelLeft();
                 }
                 else
-                    // JP 15.07.96: wenns nicht mehr nach vorne geht, die
-                    //              Numerierung aufheben. Z.B. am Doc-/
-                    //              Rahmen-/Tabellen-/Bereichs-Anfang
+                    // JP 15.07.96: If it no longer goes forward, cancel
+                    //              the numbering. For example at the beginning
+                    //              of a doc, frame, table or an area.
                     rSh.DelNumRules();
 
                 rSh.EndCrsrMove();
                 break;
             }
 
-            // ansonsten DelLeft rufen
+            // otherwise call DelLeft
         case FN_SHIFT_BACKSPACE:
             rSh.DelLeft();
             break;
@@ -238,9 +242,8 @@
 
 void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
 {
-    //Achtung: Suizid gefaehrdet! Nach Paste, Paste special kann der die
-    //Shell zerstoert sein.
-
+    // Attention: At risk of suicide!
+    // After paste, paste special the shell can be destroy.
 
     SwWrtShell &rSh = GetShell();
     sal_uInt16 nId = rReq.GetSlot();
@@ -277,8 +280,8 @@
                 if( aDataHelper.GetXTransferable().is() &&
                     SwTransferable::IsPaste( rSh, aDataHelper ))
                 {
-                    // temp. Variablen, da die Shell nach dem Paste schon
-                    // zerstoert sein kann
+                    // Temporary variables, because the shell could already be
+                    // destroyed after the paste.
                     SwView* pView = &rView;
                     SwTransferable::Paste( rSh, aDataHelper );
                     if( rSh.IsFrmSelected() || rSh.IsObjSelected() )
@@ -302,8 +305,8 @@
                     if( aDataHelper.GetXTransferable().is()
                         /*&& SwTransferable::IsPaste( rSh, aDataHelper )*/ )
                     {
-                        // temp. Variablen, da die Shell nach dem Paste schon
-                        // zerstoert sein kann
+                        // Temporary variables, because the shell could already be
+                        // destroyed after the paste.
                         SwView* pView = &rView;
 
                         SwTransferable::PasteFormat( rSh, aDataHelper,
@@ -328,8 +331,8 @@
                 if( aDataHelper.GetXTransferable().is() &&
                     SwTransferable::IsPaste( rSh, aDataHelper ))
                 {
-                    // temp. Variablen, da die Shell nach dem Paste schon
-                    // zerstoert sein kann
+                    // Temporary variables, because the shell could already be
+                    // destroyed after the paste.
                     SwView* pView = &rView;
                     rReq.Ignore();
                     bIgnore = true;
@@ -363,8 +366,8 @@
                 if( aDataHelper.GetXTransferable().is() &&
                     SwTransferable::IsPaste( rSh, aDataHelper ))
                 {
-                    // temp. Variablen, da die Shell nach dem Paste schon
-                    // zerstoert sein kann
+                    // Temporary variables, because the shell could already be
+                    // destroyed after the paste.
                     SwView* pView = &rView;
                     sal_uLong nFormatId = 0;
                     rReq.Ignore();
@@ -398,9 +401,8 @@
         rReq.Done();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:   ClipBoard-Status
- --------------------------------------------------------------------*/
+// ClipBoard-Status
+
 void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
 {
     SwWrtShell &rSh = GetShell();
@@ -454,9 +456,8 @@
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:   Undo ausfuehren
- --------------------------------------------------------------------*/
+// Perform undo
+
 void SwBaseShell::ExecUndo(SfxRequest &rReq)
 {
     SwWrtShell &rSh = GetShell();
@@ -494,9 +495,8 @@
     if (pViewFrame) { pViewFrame->GetBindings().InvalidateAll(sal_False); }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:   Zustand Undo
- --------------------------------------------------------------------*/
+// State of undo
+
 void SwBaseShell::StateUndo(SfxItemSet &rSet)
 {
     SwWrtShell &rSh = GetShell();
@@ -529,7 +529,7 @@
                 break;
             }
             case SID_REPEAT:
-            {   // Repeat nur moeglich wenn kein REDO moeglich - UI-Restriktion
+            {   // Repeat is only possible if no REDO is possible - UI-Restriction
                 if ((!rSh.GetFirstRedoInfo(0)) &&
                     !rSh.IsSelFrmMode() &&
                     (UNDO_EMPTY != rSh.GetRepeatInfo(0)))
@@ -567,9 +567,8 @@
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:   Slot-Id auswerten bzw. Dispatchen
- --------------------------------------------------------------------*/
+// Evaluate respectively dispatching the slot Id
+
 void SwBaseShell::Execute(SfxRequest &rReq)
 {
     const SfxPoolItem *pItem;
@@ -715,7 +714,7 @@
 
                     if( pGal->IsLinkage() )
                     {
-                        // Verknuepft
+                        // Linked
                         aGrfName = pGal->GetURL().GetMainURL(INetURLObject::NO_DECODE);
                         aFltName = pGal->GetFilterName();
                     }
@@ -739,7 +738,7 @@
         {
             if (pArgs)
             {
-                // aktuellen PageDescriptor ermitteln und damit den Set fuellen
+                // Determine the current PageDescriptor and fill the set with that.
                 const sal_uInt16 nCurIdx = rSh.GetCurPageDesc();
                 SwPageDesc aPageDesc(rSh.GetPageDesc(nCurIdx));
 
@@ -782,11 +781,11 @@
             if(pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_1, sal_True, &pItem))
             {
                 aInsTblOpts.mnInsMode = 0;
-                //Delimiter
+                // Delimiter
                 String sDelim = static_cast< const SfxStringItem* >(pItem)->GetValue();
                 if(sDelim.Len())
                     cDelim = sDelim.GetChar(0);
-                //AutoFormat
+                // AutoFormat
                 if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_2, sal_True, &pItem))
                 {
                     String sAutoFmt = static_cast< const SfxStringItem* >(pItem)->GetValue();
@@ -839,11 +838,10 @@
 
             if( cDelim )
             {
-                //Shellwechsel!
+                //Shell change!
                 SwView& rSaveView = rView;
                 sal_Bool bInserted = sal_False;
                 //recording:
-
                 SfxViewFrame* pViewFrame = GetView().GetViewFrame();
                 if( SfxRequest::HasMacroRecorder(pViewFrame) )
                 {
@@ -900,7 +898,7 @@
                     rSh.LockView( bLockedView );
                 }
                 else
-                // wird von der DocShell aufgezeichnet
+                // Will be recorded from the DocShell
                     GetView().GetDocShell()->ExecStyleSheet(rReq);
             }
         }
@@ -924,7 +922,7 @@
         {
             SvxIMapDlg* pDlg = SWIMAPDLG(GetView());
 
-            // Kontrolle, ob Zuweisung ueberhaupt sinnvoll/erlaubt
+            // Check, if the allocation is useful or allowed at all.
             if ( rSh.IsFrmSelected() &&
                  pDlg->GetEditingObject() == rSh.GetIMapInventor() )
             {
@@ -956,8 +954,7 @@
         case SID_CONTOUR_EXEC:
         {
             SvxContourDlg *pDlg = SWCONTOURDLG(GetView());
-
-            // Kontrolle, ob Zuweisung ueberhaupt sinnvoll/erlaubt
+            // Check, if the allocation is useful or allowed at all.
             int nSel = rSh.GetSelectionType();
             if ( nSel & (nsSelectionType::SEL_GRF|nsSelectionType::SEL_OLE) )
             {
@@ -1013,15 +1010,14 @@
                 rSh.ChgAnchor( eSet );
             else if( rSh.IsFrmSelected() )
             {
-                // Der Set beinhaltet auch VERT/HORI_ORIENT, da in FEShell::
-                // SetFlyFrmAttr/SetFlyFrmAnchor ggf. als Folge des Umankerns
-                // die Ausrichtungen veraendert werden sollen.
+                // The set also includes VERT/HORI_ORIENT, because the align
+                // shall be changed in FEShell::SetFlyFrmAttr/SetFlyFrmAnchor,
+                // possibly as a result of the anchor change.
                 SfxItemSet aSet( GetPool(), RES_VERT_ORIENT, RES_ANCHOR );
                 SwFmtAnchor aAnc( eSet, rSh.GetPhyPageNum() );
                 aSet.Put( aAnc );
                 rSh.SetFlyFrmAttr(aSet);
             }
-
             // if new anchor is 'as char' and it is a Math object and the usual
             // pre-conditions are met then align the formula to the baseline of the text
             const uno::Reference < embed::XEmbeddedObject > xObj( rSh.GetOleRef() );
@@ -1047,8 +1043,7 @@
                 {
                 case FLY_AT_FLY:
                 case FLY_AT_PAGE:
-
-                    //Durchlauf, links oder von links, oben, von oben
+                    //Wrap through, left or from left, top, from top
                     if(eSurround != SURROUND_THROUGHT)
                         aSet.Put(SwFmtSurround(SURROUND_THROUGHT));
 
@@ -1060,7 +1055,7 @@
                     break;
 
                 case FLY_AT_PARA:
-                    //links, von links, rechts, oben, kein Uml, li+re Umlauf,
+                    // left, from left, right, top, no wrap, wrap left and right
                     if(eSurround != SURROUND_LEFT || eSurround != SURROUND_RIGHT)
                         aSet.Put(SwFmtSurround(SURROUND_LEFT));
 
@@ -1072,7 +1067,7 @@
                     break;
 
                 case FLY_AT_CHAR:
-                    //links, von links, rechts, oben,  Durchlauf
+                    // left, from left, right, top, wrap through
                     if(eSurround != SURROUND_THROUGHT)
                         aSet.Put(SwFmtSurround(SURROUND_THROUGHT));
 
@@ -1163,7 +1158,7 @@
                                 RES_BACKGROUND, RES_BACKGROUND, 0 );
 
             aSet.Put(*pItem);
-            // Tabellenzelle(n) selektiert?
+            // Tabele cell(s) selected?
             if ( rSh.IsTableMode() )
             {
                 SwFrmFmt *pFmt = rSh.GetTableFmt();
@@ -1171,7 +1166,7 @@
             }
             else if ( rSh.IsFrmSelected() )
             {
-                // Umrandungsattribute ueber Frame-Manager setzen
+                // Set border attributes via Frame-Manager.
                 SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
                 aMgr.SetAttrSet( *pArgs );
                 aMgr.UpdateFlyFrm();
@@ -1195,22 +1190,22 @@
 
         case SID_ATTR_BORDER_OUTER:
         {
-            // Tabellenzelle(n) selektiert?
+            // Tabele cell(s) selected?
             if ( rSh.IsTableMode() )
             {
-                // Umrandungattribute Get/SetTabBorders() setzen
+                // Set border attributes Get/SetTabBorders()
                 rSh.SetTabBorders(*pArgs);
             }
             else if ( rSh.IsFrmSelected() )
             {
-                // Umrandungsattribute ueber Frame-Manager setzen
+                // Set border attributes via Frame-Manager.
                 SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
                 aMgr.SetAttrSet(*pArgs);
                 aMgr.UpdateFlyFrm();
             }
             else
             {
-                // Umrandungsattribute ganz normal ueber Shell setzen
+                // Set border attributes via shell quite normally.
                 rSh.SetAttr( *pItem );
             }
         }
@@ -1222,10 +1217,9 @@
     }
 }
 
-/* --------------------------------------------------
- * Hier wird der State fuer SID_IMAP / SID_CONTOUR behandelt,
- * wenn die Grafik ausgeswappt ist
- * --------------------------------------------------*/
+// Here the state fpr SID_IMAP / SID_CONTOUR will be handled
+// until the swapping of the graphic is finished.
+
 IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl)
 {
     sal_uInt16 nGrfType;
@@ -1379,7 +1373,7 @@
                 SfxItemSet   aSet( rSh.GetAttrPool(),
                                     RES_SHADOW, RES_SHADOW );
 
-                // Tabellenzelle(n) selektiert?
+                // Table cell(s) selected?
                 if ( rSh.IsTableMode() )
                 {
                     SwFrmFmt *pFmt = rSh.GetTableFmt();
@@ -1400,7 +1394,7 @@
             case SID_IMAP:
             {
                 // #i59688#
-                // improve efficiency:
+                // Improve efficiency:
                 // If selected object is protected, item has to disabled.
                 const bool bProtect = 0 != 
rSh.IsSelObjProtected(FLYPROTECT_CONTENT|FLYPROTECT_PARENT);
                 if ( bProtect )
@@ -1416,11 +1410,11 @@
                                 rSh.GetSelectionType() == nsSelectionType::SEL_GRF;
 
                     // #i59688#
-                    // avoid unnecessary loading of selected graphic.
+                    // Avoid unnecessary loading of selected graphic.
                     // The graphic is only needed, if the dialog is open.
-                    //wenn die Grafik ausgeswappt ist, dann muss der
-                    //Status asynchron ermittelt werden
-                    //bis dahin wird der Slot disabled
+                    // If the swapping of the graphic is finished, the status
+                    // must be determined asynchronously, until this the slot
+                    // will be disabled.
                     if ( bHas && bIsGraphicSelection && rSh.IsGrfSwapOut( sal_True ) )
                     {
                         if( AddGrfUpdateSlot( nWhich ))
@@ -1493,11 +1487,11 @@
                     if( !bHas && !bOk )
                         bDisable = true;
                     // #i59688#
-                    // avoid unnecessary loading of selected graphic.
+                    // Avoid unnecessary loading of selected graphic.
                     // The graphic is only needed, if the dialog is open.
-                    // wenn die Grafik ausgeswappt ist, dann muss der Status
-                    // asynchron ermittelt werden bis dahin wird der Slot
-                    // disabled
+                    // If the swapping of the graphic is finished, the status
+                    // must be determined asynchronously, until this the slot
+                    // will be disabled.
                     else if ( bHas && (nSel & nsSelectionType::SEL_GRF) &&
                               rSh.IsGrfSwapOut(sal_True) )
                     {
@@ -1754,9 +1748,8 @@
     pGetStateSet = 0;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:   Slots mit dieser Statusmethode disablen
- --------------------------------------------------------------------*/
+// Disable the slots with this status methode
+
 void SwBaseShell::StateDisableItems( SfxItemSet &rSet )
 {
     SfxWhichIter aIter(rSet);
@@ -1769,9 +1762,8 @@
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:   Slots mit dieser Statusmethode disablen
- --------------------------------------------------------------------*/
+// Disable the slots with this status methode
+
 void SwBaseShell::StateStyle( SfxItemSet &rSet )
 {
     bool bParentCntProt = GetShell().IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 
0;
@@ -1840,7 +1832,7 @@
             case FN_FRAME_WRAPTHRU_TRANSP:
                 if (aWrap.IsContour())
                     aWrap.SetContour(sal_False);
-                // kein break!!!
+                // No break!!!
             case FN_FRAME_WRAPTHRU:
                 nSurround = SURROUND_THROUGHT;
                 break;
@@ -1860,7 +1852,7 @@
 
         if (nSlot != FN_FRAME_WRAP_CONTOUR)
         {
-            // Konturumfluss bei Draw-Objekten defaulten
+            // Defaulting the contour wrap on draw objects.
             if (bObj && nOldSurround != nSurround &&
                 (nOldSurround == SURROUND_NONE || nOldSurround == SURROUND_THROUGHT))
             {
@@ -1883,9 +1875,8 @@
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:   Update der Statuszeile erzwingen
- --------------------------------------------------------------------*/
+//Force update of the status line
+
 void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh )
 {
     eFrameMode = eMode;
@@ -1908,10 +1899,6 @@
         rBnd.Invalidate(aInval);
     }
 }
-
-/*--------------------------------------------------------------------
-    Beschreibung:   Ctor
- --------------------------------------------------------------------*/
 
 SwBaseShell::SwBaseShell(SwView& rVw) :
     SfxShell( &rVw ),
@@ -2112,7 +2099,7 @@
                     rSet.Put( *pI, nWhich );
                 else
                     rSet.InvalidateItem( nWhich );
-                //set input context of the SwEditWin according to the selected font and script type
+                // Set input context of the SwEditWin according to the selected font and script 
type
                 if(RES_CHRATR_FONT == nWhich)
                 {
                     Font aFont;
@@ -2234,8 +2221,7 @@
 
     switch (nSlot)
     {
-        // RES_BACKGROUND (=SID_ATTR_BRUSH) muss ueber zwei IDs
-        // gesetzt werden:
+        // RES_BACKGROUND (=SID_ATTR_BRUSH) must be set with two IDs:
         case SID_BACKGROUND_COLOR:
             {
                 aBrushItem.SetGraphicPos(GPOS_NONE);
@@ -2279,7 +2265,7 @@
     {
         SfxItemSet aCoreSet(GetPool(), RES_BACKGROUND, RES_BACKGROUND);
         aCoreSet.Put( aBrushItem );
-        // Vorlagen-AutoUpdate
+        // Template autoupdate
         SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
         if(pFmt && pFmt->IsAutoUpdateFmt())
             rSh.AutoUpdateFrame( pFmt, aCoreSet);
@@ -2305,7 +2291,7 @@
 void SwBaseShell::GetBorderState(SfxItemSet &rSet)
 {
     SwWrtShell &rSh = GetShell();
-    // Tabellenzelle(n) selektiert?
+    // Tabele cell(s) selected?
     bool bPrepare = true;
     sal_Bool bTableMode = rSh.IsTableMode();
     if ( bTableMode )
@@ -2325,11 +2311,11 @@
         bPrepare = false;
     }
     else
-        // Umrandungsattribute ganz normal ueber Shell holen
+        // Get border attributes via shell quite normal
         rSh.GetCurAttr( rSet );
     if ( bPrepare )
         ::PrepareBoxInfo( rSet, rSh );
-    // switch the border toolbox controller mode
+    // Switch the border toolbox controller mode
     rSet.Put( SfxBoolItem( SID_BORDER_REDUCED_MODE, !bTableMode ));
 }
 
@@ -2337,7 +2323,7 @@
 {
     SwWrtShell &rSh = GetShell();
     Window *pMDI = &GetView().GetViewFrame()->GetWindow();
-    //Damit aus dem Basic keine Dialoge fuer Hintergrund-Views aufgerufen werden:
+    // So that from the basic no dialogues for the background views are called:
     bool bBackground = (&GetView() != GetActiveView());
     const SfxPoolItem* pItem = 0;
     const SfxItemSet* pArgs = rReq.GetArgs();
@@ -2365,8 +2351,8 @@
             {
                 const sal_uInt16 nCurIdx = rSh.GetCurPageDesc();
                 const SwPageDesc& rPageDesc = rSh.GetPageDesc( nCurIdx );
-                //temp. View, weil die Shell nach dem Dialog nicht mehr gueltig sein muss
-                //z.B. Kopfzeile ausschalten
+                // Temporary view, because the shell does not need to be valid after the dialogue
+                // for example disable header
                 SwView& rTempView = GetView();
                 sal_uInt16 nPageId = 0;
                 if ( nSlot == FN_FORMAT_PAGE_COLUMN_DLG )
@@ -2384,10 +2370,10 @@
                                SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
                                0 );
             SfxAbstractDialog * pDlg = 0;
-            // Tabellenzelle(n) selektiert?
+            // Table cell(s) selected?
             if ( rSh.IsTableMode() )
             {
-                // Umrandungattribute Get/SetTabBorders() setzen
+                // Set border attributes Get/SetTabBorders()
                 ::PrepareBoxInfo( aSet, rSh );
                 rSh.GetTabBorders( aSet );
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -2403,7 +2389,7 @@
             }
             else if ( rSh.IsFrmSelected() )
             {
-                // Umrandungsattribute ueber Frame-Manager setzen
+                // Set border attributes via Frame-Manager
                 SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
                 aSet.Put( aMgr.GetAttrSet() );
 
@@ -2421,7 +2407,7 @@
             }
             else
             {
-                // Umrandungsattribute ganz normal ueber Shell setzen
+                // Set border attributes via Shell quite normal
                 rSh.GetCurAttr( aSet );
                 ::PrepareBoxInfo( aSet, rSh );
 
@@ -2454,10 +2440,10 @@
             OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
 
-            // Tabellenzelle(n) selektiert?
+            // Table cell(s) selected?
             if ( rSh.IsTableMode() )
             {
-                //Hintergrundattribute der Tabelle holen und in den Set packen
+                // Get background attributes of the table and put it in the set
                 SvxBrushItem aBrush(RES_BACKGROUND);
                 rSh.GetBoxBackground( aBrush );
                 pDlg = pFact->CreateSfxDialog( pMDI, aSet,
@@ -2490,7 +2476,7 @@
             }
             else
             {
-                // Umrandungsattribute ganz normal ueber Shell setzen
+                // Set border attributes Umrandungsattribute with the shell quite normal.
                 rSh.GetCurAttr( aSet );
 
                 pDlg = pFact->CreateSfxDialog( pMDI, aSet,
@@ -2535,7 +2521,7 @@
 
     if ( !( rSh.GetFrmType( 0, sal_True ) & FRMTYPE_FOOTNOTE ) )
     {
-        SwView &rTempView = GetView(); // Da GetView() nach Shellwechsel nicht mehr geht
+        SwView &rTempView = GetView(); // Because GetView() does not work after the shell exchange
         sal_Bool bHTMLMode = 0 != (::GetHtmlMode(rTempView.GetDocShell())&HTMLMODE_ON);
         bool bCallEndUndo = false;
 
@@ -2659,7 +2645,7 @@
                 aRewriter.AddRule(UndoArg3, SW_RESSTR(STR_END_QUOTE));
 
             }
-            rSh.EndUndo(UNDO_INSTABLE, &aRewriter); // wegen moegl. Shellwechsel
+            rSh.EndUndo(UNDO_INSTABLE, &aRewriter); // If possible change the Shell
         }
     }
 }

-- 
To view, visit https://gerrit.libreoffice.org/3512
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98af528c011a7d63b07b3aa71271d6816c11f7ab
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti_lx@yahoo.de>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.