[PATCH] fdo#39468 Comment translation GER-ENG in sw/source/ui/shells...
Matthias Freund (via Code Review)
gerrit at gerrit.libreoffice.org
Sun Apr 28 00:36:07 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3646
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/3646/1
fdo#39468 Comment translation GER-ENG in sw/source/ui/shells/ (Part 2)
Change-Id: I389569b027a900f42e43762c5685ec239bc4b565
---
M sw/source/ui/shells/beziersh.cxx
M sw/source/ui/shells/drawsh.cxx
M sw/source/ui/shells/drformsh.cxx
M sw/source/ui/shells/drwbassh.cxx
M sw/source/ui/shells/drwtxtex.cxx
M sw/source/ui/shells/drwtxtsh.cxx
M sw/source/ui/shells/frmsh.cxx
7 files changed, 82 insertions(+), 118 deletions(-)
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx
index a5948bd..cdabed2 100644
--- a/sw/source/ui/shells/beziersh.cxx
+++ b/sw/source/ui/shells/beziersh.cxx
@@ -89,7 +89,7 @@
pSh->LeaveSelFrmMode();
pSh->NoEdit();
}
- GetView().AttrChangedNotify(pSh); // ggf Shellwechsel...
+ GetView().AttrChangedNotify(pSh); // Shell change if applicable...
}
}
break;
@@ -102,13 +102,13 @@
if ( pSh->IsDrawCreate() )
{
GetView().GetDrawFuncPtr()->BreakCreate();
- GetView().AttrChangedNotify(pSh); // ggf Shellwechsel...
+ GetView().AttrChangedNotify(pSh); // Shell change if applicable...
}
else if ( pSh->HasSelection() || GetView().IsDrawMode() )
{
GetView().LeaveDrawCreate();
pSh->EnterStdMode();
- GetView().AttrChangedNotify(pSh); // ggf Shellwechsel...
+ GetView().AttrChangedNotify(pSh); // Shell change if applicable...
}
}
break;
@@ -261,7 +261,7 @@
switch (eSegm)
{
case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break;
- case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button reingedrueckt = Kurve
+ case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button pressed = curve
case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_True)); break;
default:; //prevent warning
}
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index eb402f7..bcf1b08 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -112,7 +112,7 @@
}
GetView().FlipDrawSelMode();
pSdrView->SetFrameDragSingles(GetView().IsDrawSelMode());
- GetView().AttrChangedNotify(&rSh); // Shellwechsel...
+ GetView().AttrChangedNotify(&rSh); // Shell switch
break;
case SID_OBJECT_HELL:
@@ -283,7 +283,7 @@
sal_uInt16 nWhich = aIter.FirstWhich();
sal_Bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT);
- if (!bProtected) // Im Parent nachsehen
+ if (!bProtected) // Check the parent
bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
while( nWhich )
@@ -355,11 +355,8 @@
SetName(OUString("Draw"));
}
-/*************************************************************************
-|*
-|* SfxRequests fuer FontWork bearbeiten
-|*
-\************************************************************************/
+// Edit SfxRequests for FontWork
+
void SwDrawShell::ExecFormText(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
@@ -406,11 +403,8 @@
pDrView->GetModel()->SetChanged(sal_True);
}
-/*************************************************************************
-|*
-|* Statuswerte fuer FontWork zurueckgeben
-|*
-\************************************************************************/
+//Return status values for FontWork
+
void SwDrawShell::GetFormTextState(SfxItemSet& rSet)
{
SwWrtShell &rSh = GetShell();
diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx
index 1e7b3a7..e0d4112 100644
--- a/sw/source/ui/shells/drformsh.cxx
+++ b/sw/source/ui/shells/drformsh.cxx
@@ -111,7 +111,7 @@
uno::Reference< beans::XPropertySet > xPropSet(xControlModel, uno::UNO_QUERY);
- // Darf man eine URL an dem Objekt setzen?
+ // Can we set an URL to the object?
OUString sTargetURL( "TargetURL" );
uno::Reference< beans::XPropertySetInfo > xPropInfoSet = xPropSet->getPropertySetInfo();
if( xPropInfoSet->hasPropertyByName( sTargetURL ))
@@ -120,7 +120,7 @@
if( !aProp.Name.isEmpty() )
{
uno::Any aTmp;
- // Ja!
+ // Yes!
OUString sLabel("Label");
if( xPropInfoSet->hasPropertyByName(sLabel) )
{
@@ -245,7 +245,6 @@
}
}
-
SwDrawFormShell::SwDrawFormShell(SwView &_rView) :
SwDrawBaseShell(_rView)
{
@@ -257,7 +256,5 @@
SwDrawFormShell::~SwDrawFormShell()
{
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index 3a2a634..4658462 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -107,7 +107,7 @@
if(pArgs)
pArgs->GetItemState(nSlotId, sal_False, &pItem);
- //Sonderfall Align per Menue
+ //Special case align by menu
if(pItem && nSlotId == SID_OBJECT_ALIGN)
{
OSL_ENSURE(PTR_CAST(SfxEnumItem, pItem),"SfxEnumItem expected");
@@ -187,7 +187,7 @@
SfxAbstractTabDialog *pDlg=NULL;
bool bCaption = false;
- // Erlaubte Verankerungen:
+ // Allowed anchorages:
short nAnchor = pSh->GetAnchorId();
sal_uInt16 nAllowedAnchors = SVX_OBJ_AT_CNTNT | SVX_OBJ_IN_CNTNT | SVX_OBJ_PAGE;
sal_uInt16 nHtmlMode = ::GetHtmlMode(pSh->GetView().GetDocShell());
@@ -379,14 +379,14 @@
if (rReq.IsAPI() ||
GetView().GetEditWin().IsObjectSelect() )
{
- // Wenn Basic-Aufruf, dann zurueck in die Textshell, da das
- // Basic sonst keine Rueckkehrmoeglichkeit hat.
+ // If basic call, then back to the text shell, because the
+ // Basic otherwise has no possibility to return.
if (GetView().GetDrawFuncPtr())
{
GetView().GetDrawFuncPtr()->Deactivate();
GetView().SetDrawFuncPtr(NULL);
}
- GetView().LeaveDrawCreate(); // In Selektionsmode wechseln
+ GetView().LeaveDrawCreate(); // Switch to selection mode
}
if (pSh->IsSelFrmMode())
@@ -401,7 +401,7 @@
case SID_GROUP:
if (pSh->IsObjSelected() > 1 && pSh->IsGroupAllowed())
{
- pSh->GroupSelection(); // Objekt gruppieren
+ pSh->GroupSelection();
rBind.Invalidate(SID_UNGROUP);
}
break;
@@ -409,7 +409,7 @@
case SID_UNGROUP:
if (pSh->IsGroupSelected())
{
- pSh->UnGroupSelection(); // Objektgruppierung aufheben
+ pSh->UnGroupSelection();
rBind.Invalidate(SID_GROUP);
}
break;
@@ -442,8 +442,7 @@
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
if( rMarkList.GetMarkCount() == 1 && bAlignPossible )
- { // Objekte nicht aneinander ausrichten
-
+ { // Do not align objects to each other
sal_uInt16 nAnchor = pSh->GetAnchorId();
if (nAnchor == FLY_AS_CHAR)
{
@@ -476,7 +475,7 @@
break;
}
if (nAnchor == FLY_AT_PARA)
- break; // Absatzverankerte Rahmen nicht ausrichten
+ break; // Do not align frames of an anchored paragraph
}
pSh->StartAction();
@@ -597,15 +596,14 @@
pSh->SetModified();
else if (bChanged)
pSdrView->GetModel()->SetChanged(sal_True);
- // 40220: Nach dem Loeschen von DrawObjekten ueber die API GPF durch Selbstzerstoerung
+ // 40220: After Delete from DrawObjecs over the API GPF through self-destruction
if(bNotify)
- GetView().AttrChangedNotify(pSh); // ggf Shellwechsel...
+ GetView().AttrChangedNotify(pSh); // Shell switch if applicable...
}
}
-/* ---------------------------------------------------------------------------
- Checks whether a given name is allowed for a group shape
- ---------------------------------------------------------------------------*/
+// Checks whether a given name is allowed for a group shape
+
IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxNameDialog*, pNameDialog )
{
SwWrtShell &rSh = GetShell();
@@ -645,7 +643,7 @@
sal_uInt16 nWhich = aIter.FirstWhich();
sal_Bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT);
- if (!bProtected) // Im Parent nachsehen
+ if (!bProtected) // Look in the parent
bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
while( nWhich )
@@ -752,9 +750,8 @@
return bDisable;
}
-/*-------------------------------------------------------------------------
- Validate of drawing positions
- -----------------------------------------------------------------------*/
+// Validate of drawing positions
+
IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation*, pValidation )
{
SwWrtShell *pSh = &GetShell();
@@ -904,7 +901,7 @@
pValidation->nMaxVPos = aBoundRect.Height() - pValidation->nHeight;
}
- // Maximale Breite Hoehe
+ // Maximum width height
const SwTwips nH = ( pValidation->nHoriOrient != text::HoriOrientation::NONE )
? aBoundRect.Left()
: pValidation->nHPos;
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 8f29349..3176025 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -80,7 +80,7 @@
#include <edtwin.hxx>
#include <globals.hrc>
#include <hintids.hxx>
-#include <initui.hxx> // fuer SpellPointer
+#include <initui.hxx> // for SpellPointer
#include <langhelper.hxx>
#include <pardlg.hxx>
#include <shells.hrc>
@@ -275,7 +275,7 @@
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) );
SfxItemSet aDlgAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
- // util::Language gibts an der EditEngine nicht! Daher nicht im Set.
+ // util::Language does not exists in the EditEngine! That is why not in set.
aDlgAttr.Put( aEditAttr );
aDlgAttr.Put( SvxKerningItem(0, RES_CHRATR_KERNING) );
@@ -429,7 +429,7 @@
if (pFieldItem && pFieldItem->GetField()->ISA(SvxURLField))
{
- // Feld selektieren, so dass es beim Insert geloescht wird
+ // Select field so that it will be deleted during insert
ESelection aSel = pOLV->GetSelection();
aSel.nEndPos++;
pOLV->SetSelection(aSel);
@@ -441,7 +441,7 @@
case SID_TEXTDIRECTION_LEFT_TO_RIGHT:
case SID_TEXTDIRECTION_TOP_TO_BOTTOM:
- // Shellwechsel!
+ // Shell switch!
{
SdrObject* pTmpObj = pSdrView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
SdrPageView* pTmpPV = pSdrView->GetSdrPageView();
@@ -529,7 +529,7 @@
void SwDrawTextShell::GetState(SfxItemSet& rSet)
{
- if (!IsTextEdit()) // Sonst manchmal Absturz!
+ if (!IsTextEdit()) // Otherwise sometimes crash!
return;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -750,7 +750,7 @@
void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet)
{
- if (!IsTextEdit()) // Sonst Absturz!
+ if (!IsTextEdit()) // Otherwise crash!
return;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -814,7 +814,7 @@
void SwDrawTextShell::ExecClpbrd(SfxRequest &rReq)
{
- if (!IsTextEdit()) // Sonst Absturz!
+ if (!IsTextEdit()) // Otherwise crash!
return;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -844,12 +844,9 @@
}
}
-/*--------------------------------------------------------------------
- Beschreibung: ClipBoard-Status
- --------------------------------------------------------------------*/
void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
{
- if (!IsTextEdit()) // Sonst Absturz!
+ if (!IsTextEdit()) // Otherwise crash!
return;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -895,12 +892,11 @@
}
}
-/*--------------------------------------------------------------------
- Beschreibung: Hyperlink-Status
- --------------------------------------------------------------------*/
+// Hyperlink status
+
void SwDrawTextShell::StateInsert(SfxItemSet &rSet)
{
- if (!IsTextEdit()) // Sonst Absturz!
+ if (!IsTextEdit()) // Otherwise crash!
return;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index e60e5ff..6060f6c 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -50,7 +50,7 @@
#include <view.hxx>
#include <wrtsh.hxx>
#include <viewopt.hxx>
-#include <initui.hxx> // fuer SpellPointer
+#include <initui.hxx> // for SpellPointer
#include <drwtxtsh.hxx>
#include <swundo.hxx>
#include <breakit.hxx>
@@ -105,7 +105,7 @@
SetUndoManager(&pOutliner->GetUndoManager());
- // jetzt versuchen wir mal ein AutoSpell
+ // Now let's try an AutoSpell.
const SwViewOption* pVOpt = rSh.GetViewOptions();
if(pVOpt->IsOnlineSpell())
@@ -144,9 +144,8 @@
return rView.GetWrtShell();
}
-/*--------------------------------------------------------------------
- Beschreibung: Slots mit dieser Statusmethode disablen
- --------------------------------------------------------------------*/
+// Disable slots with this status method
+
void SwDrawTextShell::StateDisableItems( SfxItemSet &rSet )
{
SfxWhichIter aIter(rSet);
@@ -159,11 +158,6 @@
}
}
-/*************************************************************************
-|*
-|* Attribute setzen
-|*
-\************************************************************************/
void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr)
{
Rectangle aNullRect;
@@ -206,11 +200,8 @@
rSet.Put(SfxBoolItem(SID_FONTWORK, GetView().GetViewFrame()->HasChildWindow(nId)));
}
-/*************************************************************************
-|*
-|* SfxRequests fuer FontWork bearbeiten
-|*
-\************************************************************************/
+// Edit SfxRequests for FontWork
+
void SwDrawTextShell::ExecFormText(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
@@ -255,11 +246,8 @@
}
-/*************************************************************************
-|*
-|* Statuswerte fuer FontWork zurueckgeben
-|*
-\************************************************************************/
+// Return Status values back to FontWork
+
void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet)
{
SwWrtShell &rSh = GetShell();
@@ -424,7 +412,7 @@
}
break;
case SID_CHARMAP:
- { // Sonderzeichen einfuegen
+ { // Insert special character
InsertSymbol(rReq);
break;
}
@@ -464,7 +452,7 @@
case FN_ESCAPE:
if (pSdrView->IsTextEdit())
{
- // Shellwechsel!
+ // Shell switch!
rSh.EndTextEdit();
SwView& rTempView = rSh.GetView();
rTempView.ExitDraw();
@@ -510,9 +498,8 @@
rSh.SetModified();
}
-/*--------------------------------------------------------------------
- Beschreibung: Undo ausfuehren
- --------------------------------------------------------------------*/
+// Execute undo
+
void SwDrawTextShell::ExecUndo(SfxRequest &rReq)
{
if( IsTextEdit() )
@@ -555,9 +542,8 @@
}
}
-/*--------------------------------------------------------------------
- Beschreibung: Zustand Undo
- --------------------------------------------------------------------*/
+// State of undo
+
void SwDrawTextShell::StateUndo(SfxItemSet &rSet)
{
if ( !IsTextEdit() )
@@ -687,9 +673,8 @@
}
}
-/*--------------------------------------------------------------------
- Beschreibung: Sonderzeichen einfuegen (siehe SDraw: FUBULLET.CXX)
- --------------------------------------------------------------------*/
+// Insert special character (see SDraw: FUBULLET.CXX)
+
void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
{
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -742,7 +727,7 @@
else
aAllSet.Put( SfxStringItem( SID_FONT_NAME, aSetDlgFont.GetFamilyName() ) );
- // Wenn Zeichen selektiert ist kann es angezeigt werden
+ // If character is selected, it can be shown
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( rView.GetWindow(), aAllSet,
rView.GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP );
@@ -772,7 +757,7 @@
if( sSym.Len() )
{
- // nicht flackern
+ // do not flicker
pOLV->HideCursor();
SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
pOutliner->SetUpdateMode(sal_False);
@@ -785,10 +770,10 @@
0 );
aFontSet.Set( aOldSet );
- // String einfuegen
+ // Insert string
pOLV->InsertText( sSym );
- // attributieren (Font setzen)
+ // assign attributes (Set font)
SfxItemSet aFontAttribSet( *aFontSet.GetPool(), aFontSet.GetRanges() );
SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(),
aFont.GetStyleName(), aFont.GetPitch(),
@@ -803,16 +788,16 @@
aFontAttribSet.Put( aFontItem, EE_CHAR_FONTINFO_CTL );
pOLV->SetAttribs(aFontAttribSet);
- // Selektion loeschen
+ // Remove 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 again
pOutliner->SetUpdateMode(sal_True);
pOLV->ShowCursor();
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index ece4719..b7998c4 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -81,7 +81,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-// Prototypen ------------------------------------------------------------
+// Prototypes
static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine);
static const SwFrmFmt* lcl_GetFrmFmtByName(SwWrtShell& rSh, const String& rName)
{
@@ -107,7 +107,7 @@
void SwFrameShell::Execute(SfxRequest &rReq)
{
- //Erstmal die, die keinen FrmMgr benoetigen.
+ //First those who do not need FrmMgr.
SwWrtShell &rSh = GetShell();
bool bMore = false;
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -142,7 +142,7 @@
case FN_INSERT_FRAME:
if (!pArgs)
{
- // Rahmen existiert bereits, Rahmendialog zur Bearbeitung oeffnen
+ // Frame already exists, open frame dialog for editing.
SfxUInt16Item aDefPage(FN_FORMAT_FRAME_DLG, TP_COLUMN);
rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( FN_FORMAT_FRAME_DLG,
SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
@@ -151,7 +151,7 @@
}
else
{
- // Rahmen existiert bereits, nur Spaltenanzahl wird geaendert
+ // Frame already exists, only the number of columns will be changed.
sal_uInt16 nCols = 1;
if(pArgs->GetItemState(SID_ATTR_COLUMNS, sal_False, &pItem) == SFX_ITEM_SET)
nCols = ((SfxUInt16Item *)pItem)->GetValue();
@@ -159,13 +159,14 @@
SfxItemSet aSet(GetPool(),RES_COL,RES_COL);
rSh.GetFlyFrmAttr( aSet );
SwFmtCol aCol((const SwFmtCol&)aSet.Get(RES_COL));
- // GutterWidth wird nicht immer uebergeben, daher erst besorgen (siehe view2: Execute auf diesen Slot)
+ // GutterWidth will not always passed, hence get firstly
+ // (see view2: Execute on this slot)
sal_uInt16 nGutterWidth = aCol.GetGutterWidth();
if(!nCols )
nCols++;
aCol.Init(nCols, nGutterWidth, aCol.GetWishWidth());
aSet.Put(aCol);
- // Vorlagen-AutoUpdate
+ // Template AutoUpdate
SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
if(pFmt && pFmt->IsAutoUpdateFmt())
{
@@ -415,7 +416,7 @@
aSet.Put(aMgr.GetAttrSet());
aSet.SetParent( aMgr.GetAttrSet().GetParent() );
- // Bei %-Werten Groesse initialisieren
+ // On % values initialize size
SwFmtFrmSize& rSize = (SwFmtFrmSize&)aSet.Get(RES_FRM_SIZE);
if (rSize.GetWidthPercent() && rSize.GetWidthPercent() != 0xff)
rSize.SetWidth(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Width());
@@ -466,13 +467,12 @@
// #i73249#
rSh.SetObjTitle(((const SfxStringItem*)pItem)->GetValue());
}
- // Vorlagen-AutoUpdate
+ // Template AutoUpdate
SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
if(pFmt && pFmt->IsAutoUpdateFmt())
{
rSh.AutoUpdateFrame(pFmt, *pOutSet);
- // alles, dass das Format nicht kann, muss hart
- // gesetzt werden
+ // Anything which is not supported by the format must be set hard.
if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, sal_False, &pItem))
rSh.SetFlyName(((SfxStringItem*)pItem)->GetValue());
SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
@@ -615,7 +615,7 @@
OSL_ENSURE( !this, "wrong dispatcher" );
return;
}
- // Vorlagen-AutoUpdate
+ // Template AutoUpdate
SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
if ( bUpdateMgr )
{
@@ -863,24 +863,19 @@
}
}
-/*--------------------------------------------------------------------
- Beschreibung: Ctor fuer FrameShell
- --------------------------------------------------------------------*/
SwFrameShell::SwFrameShell(SwView &_rView) :
SwBaseShell( _rView )
{
SetName(OUString("Frame"));
SetHelpId(SW_FRAMESHELL);
- /* #96392# Use this to announce it is the frame shell who creates the
- selection. */
+ // #96392# Use this to announce it is the frame shell who creates the selection.
SwTransferable::CreateSelection( _rView.GetWrtShell(), (ViewShell *) this );
}
SwFrameShell::~SwFrameShell()
{
- /* #96392# Only clear the selection if it was this frame shell who created
- it. */
+ // #96392# Only clear the selection if it was this frame shell who created it.
SwTransferable::ClearSelection( GetShell(), (ViewShell *) this );
}
@@ -890,9 +885,9 @@
bool bDefault = false;
if (!rSh.IsFrmSelected())
return;
-
- // Erst Default-BoxItem aus Pool holen. Wenn ungleich normalem Boxitem,
- // dann ist es bereits geaendert worden (neues ist kein Default).
+ // At first pick the default BoxItem out of the pool.
+ // If unequal to regular box item, then it has already
+ // been changed (New one is no default).
const SvxBoxItem* pPoolBoxItem = (const SvxBoxItem*)::GetDfltAttr(RES_BOX);
const SfxItemSet *pArgs = rReq.GetArgs();
@@ -909,7 +904,7 @@
SvxBorderLine aBorderLine;
const SfxPoolItem *pItem = 0;
- if(pArgs) //irgendein Controller kann auch mal nichts liefern #48169#
+ if(pArgs) // Any controller can sometimes deliver nothing #48169#
{
switch (rReq.GetSlot())
{
@@ -935,7 +930,7 @@
table::BorderLineStyle::SOLID);
aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
}
- //Distance nur setzen, wenn der Request vom Controller kommt
+ //Set distance only if the request is received from the controller.
#ifndef DISABLE_SCRIPTING
if(!StarBASIC::IsRunning())
@@ -1050,7 +1045,7 @@
aBoxItem.SetDistance(MIN_BORDER_DIST);
}
aFrameSet.Put( aBoxItem );
- // Vorlagen-AutoUpdate
+ // Template AutoUpdate
SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
if(pFmt && pFmt->IsAutoUpdateFmt())
{
--
To view, visit https://gerrit.libreoffice.org/3646
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I389569b027a900f42e43762c5685ec239bc4b565
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti_lx at yahoo.de>
More information about the LibreOffice
mailing list