summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/shells/grfsh.cxx7
-rw-r--r--sw/source/ui/shells/listsh.cxx5
-rw-r--r--sw/source/ui/shells/navsh.cxx14
-rw-r--r--sw/source/ui/shells/shells.src4
-rw-r--r--sw/source/ui/shells/tabsh.cxx65
-rw-r--r--sw/source/ui/shells/textfld.cxx37
-rw-r--r--sw/source/ui/shells/textglos.cxx5
-rw-r--r--sw/source/ui/shells/textidx.cxx8
8 files changed, 60 insertions, 85 deletions
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index feceaae75fe3..d1dc7c49f2db 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -91,7 +91,6 @@ namespace
};
}
-
SFX_IMPL_INTERFACE(SwGrfShell, SwBaseShell, SW_RES(STR_SHELLNAME_GRAPHIC))
{
SFX_POPUPMENU_REGISTRATION(SW_RES(MN_GRF_POPUPMENU));
@@ -228,13 +227,12 @@ void SwGrfShell::Execute(SfxRequest &rReq)
aSet.Put( aMgr.GetAttrSet() );
aSet.SetParent( aMgr.GetAttrSet().GetParent() );
- // Bei %-Werten Groesse initialisieren
+ // At percentage values ​​initialize size
SwFmtFrmSize aSizeCopy = (const SwFmtFrmSize&)aSet.Get(RES_FRM_SIZE);
if (aSizeCopy.GetWidthPercent() && aSizeCopy.GetWidthPercent() != 0xff)
aSizeCopy.SetWidth(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Width());
if (aSizeCopy.GetHeightPercent() && aSizeCopy.GetHeightPercent() != 0xff)
aSizeCopy.SetHeight(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Height());
-
// and now set the size for "external" tabpages
{
SvxSizeItem aSzItm( SID_ATTR_GRAF_FRMSIZE, aSizeCopy.GetSize() );
@@ -319,7 +317,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
pSet->Put( aSize );
}
- // Vorlagen-AutoUpdate
+ // Templates AutoUpdate
SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
if(pFmt && pFmt->IsAutoUpdateFmt())
{
@@ -421,7 +419,6 @@ void SwGrfShell::Execute(SfxRequest &rReq)
}
}
-
void SwGrfShell::ExecAttr( SfxRequest &rReq )
{
sal_uInt16 nGrfType;
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index 30c2644d8a93..ddbc1b371dd7 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -150,7 +150,7 @@ void SwListShell::Execute(SfxRequest &rReq)
rReq.Done();
rSh.NumUpDown( nSlot == FN_NUM_BULLET_DOWN );
- pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten!
+ pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // Update status line!
}
break;
@@ -228,7 +228,6 @@ void SwListShell::Execute(SfxRequest &rReq)
}
}
-
void SwListShell::GetState(SfxItemSet &rSet)
{
SfxWhichIter aIter( rSet );
@@ -265,7 +264,6 @@ void SwListShell::GetState(SfxItemSet &rSet)
}
}
-
SwListShell::SwListShell(SwView &_rView) :
SwBaseShell(_rView)
{
@@ -273,5 +271,4 @@ SwListShell::SwListShell(SwView &_rView) :
SetHelpId(SW_LISTSHELL);
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx
index cc151363adb0..5d9ea9a30352 100644
--- a/sw/source/ui/shells/navsh.cxx
+++ b/sw/source/ui/shells/navsh.cxx
@@ -7,8 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-
-
#include "cmdid.h"
#include <svx/svdview.hxx>
#include <svl/srchitem.hxx>
@@ -18,23 +16,17 @@
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/objface.hxx>
-
#include "wrtsh.hxx"
#include "view.hxx"
#include "edtwin.hxx"
#include "helpid.h"
#include "globals.hrc"
-
#include "navsh.hxx"
-
-
#include "popup.hrc"
#include "shells.hrc"
#define SwNavigationShell
#include "swslots.hxx"
-
#include <unomid.h>
-
#include "navmgr.hxx"
@@ -80,10 +72,7 @@ void SwNavigationShell::Execute(SfxRequest &rReq)
pSdrView->GetModel()->SetChanged(sal_True);
}
-/*--------------------------------------------------------------------
- determine if the buttons should be enabled/disabled
- --------------------------------------------------------------------*/
-
+// determine if the buttons should be enabled/disabled
void SwNavigationShell::GetState(SfxItemSet &rSet)
{
@@ -114,4 +103,5 @@ void SwNavigationShell::GetState(SfxItemSet &rSet)
nWhich = aIter.NextWhich();
}
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index 89e3c6d5ef30..51017ecd19e3 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -200,7 +200,7 @@ String STR_SHELLNAME_NAVIGATION
{
Text [ en-US ] = "Navigation" ;
};
- //Strings fuer Gallery/Hintergrund
+ //Strings for gallery/background
String STR_SWBG_PARAGRAPH
{
Text [ en-US ] = "Paragraph" ;
@@ -241,7 +241,7 @@ String STR_SWBG_FOOTER
{
Text [ en-US ] = "Footer" ;
};
- //Ende: Strings fuer Gallery/Hintergrund
+ //End: strings for gallery/background
// #i68101# no longer needed:
// String STR_NAME_SHAPE_LABEL {// String STR_NAME_SHAPE_DIALOG { Text [ en-US ] = "Name Object"; };
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index e72aaa18c99f..8a35591f6013 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -45,7 +45,6 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/objface.hxx>
-
#include <fmtornt.hxx>
#include <fmtclds.hxx>
#include <fmtlsplt.hxx>
@@ -140,7 +139,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
SwTabCols aCols;
rSh.GetTabCols( aCols );
- //Ersteinmal die einfachen Attribute besorgen.
+ //At first get the simple attributes.
rSet.Put( SfxStringItem( FN_PARAM_TABLE_NAME, pFmt->GetName()));
rSet.Put( SfxUInt16Item( FN_PARAM_TABLE_HEADLINE, rSh.GetRowsToRepeat() ) );
rSet.Put( pFmt->GetShadow() );
@@ -174,19 +173,19 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
}
SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
- // Tabellenvariante, wenn mehrere Tabellenzellen selektiert
- rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert
+ // Table variant: If multiple table cells are selected.
+ rSh.GetCrsr(); //Thus GetCrsrCnt() returns the right thing
aBoxInfo.SetTable ((rSh.IsTableMode() && rSh.GetCrsrCnt() > 1) ||
!bTableSel);
- // Abstandsfeld immer anzeigen
+ // Always show distance field.
aBoxInfo.SetDist ((sal_Bool) sal_True);
- // Minimalgroesse in Tabellen und Absaetzen setzen
+ // Set minimum size in tables and paragraphs.
aBoxInfo.SetMinDist( !bTableSel || rSh.IsTableMode() ||
rSh.GetSelectionType() &
(nsSelectionType::SEL_TXT | nsSelectionType::SEL_TBL));
- // Default-Abstand immer setzen
+ // Always set the default spacing.
aBoxInfo.SetDefDist (MIN_BORDER_DIST);
- // Einzelne Linien koennen nur in Tabellen DontCare-Status haben
+ // Individual lines can have DontCare status only in tables.
aBoxInfo.SetValid( VALID_DISABLE, !bTableSel || !rSh.IsTableMode() );
rSet.Put(aBoxInfo);
@@ -212,14 +211,13 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
rSh.GetTabCols( aTabCols );
SvxColumnItem aColItem;
-
- // Pointer wird nach der Dialogausfuehrung geloescht
+ // Pointer will be deleted after the dialogue execution.
SwTableRep* pRep = new SwTableRep( aTabCols );
pRep->SetSpace(aCols.GetRightMax());
sal_uInt16 nPercent = 0;
long nWidth = ::GetTableWidth(pFmt, aCols, &nPercent, &rSh );
- // Die Tabellenbreite ist fuer relative Angaben nicht korrekt
+ // The table width is wrong for relative values.
if(nPercent)
nWidth = pRep->GetSpace() * nPercent / 100;
sal_uInt16 nAlign = pFmt->GetHoriOrient().GetHoriOrient();
@@ -253,7 +251,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
pRep->SetWidth(nWidth);
pRep->SetWidthPercent(nPercent);
- // sind einzelne Zeilen/Zellen selektiert, wird die Spaltenbearbeitung veraendert
+ // Are individual rows / cells are selected, the column processing will be changed.
pRep->SetLineSelected(bTableSel && ! rSh.HasWholeTabSelection());
rSet.Put(SwPtrItem(FN_TABLE_REP, pRep));
return pRep;
@@ -287,12 +285,9 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, sal_False, &pBoxDirection );
if( bBackground || bBorder || bRowSplit || bBoxDirection)
{
- /*
- Die Umrandung wird auf die vorliegende Selektion angewendet
- Liegt keine Selektion vor, wird die Tabelle vollstaendig selektiert.
- Der Hintergrund wird immer auf den aktuellen Zustand angewendet.
- */
-
+ // The border will be applied to the present selection.
+ // If there is no selection, the table will be completely selected.
+ // The background will always be applied to the current state.
sal_Bool bTableSel = rSh.IsTableMode();
rSh.StartAllAction();
@@ -381,8 +376,8 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
sal_Int16 eOrient = pRep->GetAlign();
SwFmtHoriOrient aAttr( 0, eOrient );
aSet.Put( aAttr );
- // Damit beim recording die Ausrichtung nicht durch die Abstaende ueberschrieben
- // wird, darf das Item nur bei manueller Ausrichtung aufgez. werden
+ // The item must only be recorded while manual alignment, so that the
+ // alignment is not overwritten by the distances while recording.
if(eOrient != text::HoriOrientation::NONE)
((SfxItemSet&)rSet).ClearItem( SID_ATTR_LRSPACE );
@@ -403,7 +398,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_NAME, sal_False, &pItem ))
rSh.SetTableName( *pFmt, ((const SfxStringItem*)pItem)->GetValue() );
- // kopiere die ausgesuchten Attribute in den ItemSet
+ // Copy the chosen attributes in the ItemSet.
static sal_uInt16 aIds[] =
{
RES_PAGEDESC,
@@ -450,7 +445,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
const SfxItemSet* pArgs = rReq.GetArgs();
SwWrtShell &rSh = GetShell();
- //Erstmal die Slots, die keinen FrmMgr benoetigen.
+ // At first the slots which doesn't need a FrmMgr.
bool bMore = false;
const SfxPoolItem* pItem = 0;
sal_uInt16 nSlot = rReq.GetSlot();
@@ -463,7 +458,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
{
if(!pArgs)
break;
- //Items erzeugen, weil wir sowieso nacharbeiten muessen
+ // Create items, because we have to rework anyway.
SvxBoxItem aBox( RES_BOX );
SfxItemSet aCoreSet( GetPool(),
RES_BOX, RES_BOX,
@@ -500,7 +495,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
aInfo.SetValid( VALID_DISABLE, sal_False );
-// Die Attribute aller Linien werden gelesen und das staerkste gewinnt
+// The attributes of all lines will be read and the strongest wins.
const SvxBorderLine* pBorderLine;
SvxBorderLine aBorderLine;
if ((pBorderLine = rCoreBox.GetTop()) != NULL)
@@ -575,7 +570,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
}
aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
rSh.GetTblAttr(aCoreSet);
- // GetTblAttr buegelt den Background ueber!
+ // GetTblAttr overwrites the background!
SvxBrushItem aBrush( RES_BACKGROUND );
if(rSh.GetBoxBackground(aBrush))
aCoreSet.Put( aBrush );
@@ -875,7 +870,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
nSlot = bColumn ? FN_TABLE_INSERT_COL_DLG : FN_TABLE_INSERT_ROW_DLG;
}
- // kein break; bei Count = 0 kommt der Dialog
+ // No break; on Count = 0 appears the dialog
case FN_TABLE_INSERT_COL_DLG:
case FN_TABLE_INSERT_ROW_DLG:
{
@@ -1062,7 +1057,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
}
else
bMore = false;
- //Jetzt die Slots, die direkt auf dem TableFmt arbeiten.
+ // Now the slots which are working directly on the TableFmt.
SwFrmFmt *pFmt = rSh.GetTableFmt();
switch ( nSlot )
{
@@ -1093,7 +1088,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
}
}
break;
-// der letzte case-Zweig der noch einen TabellenManager braucht!!
+// The last case branch which needs a table manager!!
case FN_TABLE_SET_COL_WIDTH:
{
SwTableFUNC aMgr( &rSh, sal_False);
@@ -1209,13 +1204,13 @@ void SwTableShell::GetState(SfxItemSet &rSet)
break;
case FN_INSERT_TABLE:
- // Irgendeinen Wert "putten", damit Controller enabled bleibt.
- // Statt "Insert:Table" erscheint dann "Format:Table".
+ // Put any value, so that the controller remains enabled.
+ // Instead "Insert:Table" appears "Format:Table".
break;
case FN_TABLE_OPTIMAL_HEIGHT:
{
- //Disablen wenn bereits auto-Hoehe eingestellt ist.
+ // Disable if auto height already is enabled.
SwFmtFrmSize *pSz;
rSh.GetRowHeight( pSz );
if ( pSz )
@@ -1414,13 +1409,13 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
const SfxItemSet* pArgs = rReq.GetArgs();
SwWrtShell &rSh = GetShell();
- //Erstmal die Slots, die keinen FrmMgr benoetigen.
+ // At first the slots, which doesn't need a FrmMgr.
const SfxPoolItem* pItem = 0;
sal_uInt16 nSlot = rReq.GetSlot();
if(pArgs)
pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem);
- // Sprache immer von Cursorposition besorgen
+ // Always aquire the language from the current cursor position.
LanguageType eLang = rSh.GetCurLang();
SvNumberFormatter* pFormatter = rSh.GetNumberFormatter();
sal_uInt32 nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;
@@ -1431,12 +1426,12 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
case FN_NUMBER_FORMAT:
if( pItem )
{
- // Index fuer String bestimmen
+ // Determine index for string.
OUString aCode( ((const SfxStringItem*)pItem)->GetValue() );
nNumberFormat = pFormatter->GetEntryKey( aCode, eLang );
if( NUMBERFORMAT_ENTRY_NOT_FOUND == nNumberFormat )
{
- // neu eintragen
+ // Re-enter
sal_Int32 nErrPos;
short nType;
if( !pFormatter->PutEntry( aCode, nErrPos, nType,
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index b0997d745bbe..87a66e517d90 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -19,7 +19,7 @@
#include <crsskip.hxx>
-#include <hintids.hxx> //_immer_ vor den solar-Items
+#include <hintids.hxx> //_always_ before the solar-items
#include <sfx2/lnkbase.hxx>
#include <fmtfld.hxx>
@@ -90,7 +90,6 @@ static String& lcl_AppendRedlineStr( String& rStr, sal_uInt16 nRedlId )
return rStr;
}
-// STATIC DATA -----------------------------------------------------------
void SwTextShell::ExecField(SfxRequest &rReq)
{
SwWrtShell& rSh = GetShell();
@@ -186,7 +185,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
}
if(bMore)
{
- // hier kommen die Slots mit FldMgr
+ // Here come the slots with FldMgr.
SwFldMgr aFldMgr(GetShellPtr());
switch(nSlot)
{
@@ -289,9 +288,9 @@ void SwTextShell::ExecField(SfxRequest &rReq)
{
SfxViewFrame* pVFrame = GetView().GetViewFrame();
if (!pVFrame->HasChildWindow(FN_INSERT_FIELD))
- pVFrame->ToggleChildWindow(FN_INSERT_FIELD); // Dialog anzeigen
+ pVFrame->ToggleChildWindow(FN_INSERT_FIELD); // Show dialog
- // Flddlg auf neue TabPage umschalten
+ // Switch Flddlg at a new TabPage
sal_uInt16 nId = SwFldDlgWrapper::GetChildWindowId();
SwFldDlgWrapper *pWrp = (SwFldDlgWrapper*)pVFrame->GetChildWindow(nId);
if (pWrp)
@@ -362,7 +361,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
rSh.Push();
rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, sal_False);
pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
- rSh.Pop(sal_False); // Cursorpos restaurieren
+ rSh.Pop(sal_False); // Restore cursor position
}
if (pPostIt)
@@ -418,15 +417,15 @@ void SwTextShell::ExecField(SfxRequest &rReq)
pRedline->GetRedlineData().GetTimeStamp() ),
SID_ATTR_POSTIT_DATE ));
- // Traveling nur bei mehr als einem Feld
+ // Traveling only if more than one field.
rSh.StartAction();
rSh.Push();
const SwRedline *pActRed = rSh.SelPrevRedline();
if (pActRed == pRedline)
- { // Neuer Cursor steht am Anfang des Current Redlines
- rSh.Pop(); // Alten Cursor wegwerfen
+ { // New cursor is at the beginning of the current redlines.
+ rSh.Pop(); // Throw old cursor away
rSh.Push();
pActRed = rSh.SelPrevRedline();
}
@@ -436,13 +435,13 @@ void SwTextShell::ExecField(SfxRequest &rReq)
rSh.EndAction();
rSh.ClearMark();
- rSh.SelNextRedline(); // Aktueller Redline wird selektiert
+ rSh.SelNextRedline(); // Select current redline.
rSh.StartAction();
rSh.Push();
pActRed = rSh.SelNextRedline();
sal_Bool bNext = pActRed != 0;
- rSh.Pop(sal_False); // Cursorpos restaurieren
+ rSh.Pop(sal_False); // Restore cursor position
if( rSh.IsCrsrPtAtEnd() )
rSh.SwapPam();
@@ -477,7 +476,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
String sMsg(((const SvxPostItTextItem&)pOutSet->Get(SID_ATTR_POSTIT_TEXT)).GetValue());
- // Kommentar einfuegen bzw aendern
+ // Insert or change a comment
rSh.SetRedlineComment(sMsg);
}
@@ -559,7 +558,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
goto FIELD_INSERT;
case FN_INSERT_FLD_PGNUMBER:
nInsertType = TYP_PAGENUMBERFLD;
- nInsertFormat = SVX_NUM_PAGEDESC; // wie Seitenvorlage
+ nInsertFormat = SVX_NUM_PAGEDESC; // Like page template
bIsText = false;
goto FIELD_INSERT;
case FN_INSERT_FLD_PGCOUNT :
@@ -724,7 +723,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, sal_False, &pItem))
{
- // Links selektieren
+ // Select links
rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT, sal_False);
}
switch (nType)
@@ -769,16 +768,16 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn )
SwWrtShell* pSh = GetShellPtr();
AbstractSvxPostItDialog *pDlg = (AbstractSvxPostItDialog*)pBtn;
- // Kommentar einfuegen bzw aendern
+ // Insert or change a comment.
pSh->SetRedlineComment(pDlg->GetNote());
const SwRedline *pRedline = pSh->GetCurrRedline();
if (pRedline)
{
- // Traveling nur bei mehr als einem Feld
+ // Traveling only if more than one field.
if( !pSh->IsCrsrPtAtEnd() )
- pSh->SwapPam(); // Cursor hinter den Redline stellen
+ pSh->SwapPam(); // Move the cursor behind the Redline.
pSh->Push();
const SwRedline *pActRed = pSh->SelNextRedline();
@@ -822,14 +821,14 @@ IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog *, pBtn )
SwWrtShell* pSh = GetShellPtr();
AbstractSvxPostItDialog *pDlg = (AbstractSvxPostItDialog*)pBtn;
- // Kommentar einfuegen bzw aendern
+ // Insert or change a comment.
pSh->SetRedlineComment(pDlg->GetNote());
const SwRedline *pRedline = pSh->GetCurrRedline();
if (pRedline)
{
- // Traveling nur bei mehr als einem Feld
+ // Traveling only if more than one field.
pSh->Push();
const SwRedline *pActRed = pSh->SelPrevRedline();
pSh->Pop(pActRed != 0);
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx
index fc981f177238..b1dbb1c34fd0 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/ui/shells/textglos.cxx
@@ -31,14 +31,13 @@
#include "swabstdlg.hxx"
#include <misc.hrc>
-// STATIC DATA -----------------------------------------------------------
void SwTextShell::ExecGlossary(SfxRequest &rReq)
{
sal_uInt16 nSlot = rReq.GetSlot();
::GetGlossaries()->UpdateGlosPath(!rReq.IsAPI() ||
FN_GLOSSARY_DLG == nSlot );
SwGlossaryHdl* pGlosHdl = GetView().GetGlosHdl();
- // SwGlossaryList updaten?
+ // Update SwGlossaryList?
bool bUpdateList = false;
const SfxItemSet *pArgs = rReq.GetArgs();
@@ -78,7 +77,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
if ( fnSetActGroup )
(*fnSetActGroup)( aGroup );
pGlosHdl->SetCurGroup(aGroup, sal_True);
- //eingestellte Gruppe muss in NewGlossary ggf. erzeugt werden!
+ // Chosen group must be created in NewGlossary if necessary!
pGlosHdl->NewGlossary( aName, aShortName, sal_True );
rReq.Done();
}
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index ef62e913ddb3..fecfcb9edf60 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -32,7 +32,7 @@
#include "cmdid.h"
#include "view.hxx"
#include "wrtsh.hxx"
-#include "swundo.hxx" // fuer Undo-Ids
+#include "swundo.hxx" // for Undo-Ids
#include "textsh.hxx"
#include "idxmrk.hxx"
#include "cnttab.hxx"
@@ -41,7 +41,6 @@
#include <index.hrc>
#include <globals.hrc>
-// STATIC DATA -----------------------------------------------------------
void SwTextShell::ExecIdx(SfxRequest &rReq)
{
const SfxItemSet *pArgs = rReq.GetArgs();
@@ -83,8 +82,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
SwTOXMgr aMgr(GetShellPtr());
sal_uInt16 nRet = RET_OK;
if(aMgr.GetTOXMarkCount() > 1)
- { // Mehrere Marken, welche solls denn sein ?
- //
+ { // Several marks, which should it be?
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
VclAbstractDialog* pMultDlg = pFact->CreateMultiTOXMarkDlg( DLG_MULTMRK,
@@ -125,7 +123,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
long nWidth = aRect.Width();
aSet.Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
- // Hoehe=Breite fuer konsistentere Vorschau (analog zu Bereich bearbeiten)
+ // Height = width for a more consistent preview (analogous to edit range)
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
const SwTOXBase* pCurTOX = 0;
sal_Bool bGlobal = sal_False;
generated by cgit (git 2.34.1) at 2025-02-01 07:47:39 +0000