[Libreoffice-commits] core.git: sw/source
Philipp Riemer
ruderphilipp at gmail.com
Wed Oct 2 08:53:50 PDT 2013
sw/source/core/doc/doctxm.cxx | 1
sw/source/core/docnode/nodes.cxx | 2
sw/source/core/docnode/section.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 48 ++++++++----------
sw/source/core/unocore/unoobj2.cxx | 10 +--
sw/source/core/unocore/unosett.cxx | 10 +--
sw/source/filter/ww8/ww8par5.cxx | 59 +++++++++++-----------
sw/source/ui/uiview/view2.cxx | 97 ++++++++++++++++---------------------
8 files changed, 103 insertions(+), 126 deletions(-)
New commits:
commit 52f5b6340863f2c80cd4e4ae7a2d1db3f8ed29f1
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sun Sep 29 19:16:46 2013 +0200
fdo#39468: translate German comments
Change-Id: Iabbd152c50c40a7db839370b6d74b6a488a90c4d
Reviewed-on: https://gerrit.libreoffice.org/6084
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index ae4b75a..45cc16d 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -156,7 +156,6 @@ sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
/// Delete table of contents Mark
void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark )
{
- // hole den TextNode und
const SwTxtTOXMark* pTxtTOXMark = pTOXMark->GetTxtTOXMark();
OSL_ENSURE( pTxtTOXMark, "No TxtTOXMark, cannot be deleted" );
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 995c232..22216e4 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -347,7 +347,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
if( bNewFrms )
{
- // Frames besorgen:
+ // get the frames:
SwNodeIndex aIdx( *pPrevInsNd, 1 );
SwNodeIndex aFrmNdIdx( aIdx );
SwNode* pFrmNd = rNds.FindPrvNxtFrmNode( aFrmNdIdx,
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 0bf8ad0..e9425d4 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -903,7 +903,7 @@ static bool lcl_SectionCmpNm( const SwSection *pFSect, const SwSection *pSSect)
return pFSect->GetSectionName() < pSSect->GetSectionName();
}
-// Alle Sections which have been derived from this one
+// get all Sections that have been derived from this one
sal_uInt16 SwSectionFmt::GetChildSections( SwSections& rArr,
SectionSort eSort,
sal_Bool bAllSections ) const
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 2d5cb7f..e816998 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -52,16 +52,16 @@
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <docary.hxx>
-#include <pam.hxx> // fuer SwPosition
+#include <pam.hxx> // for SwPosition
#include <fldbas.hxx>
#include <paratr.hxx>
#include <txtfrm.hxx>
#include <ftnfrm.hxx>
#include <ftnboss.hxx>
#include <rootfrm.hxx>
-#include <pagedesc.hxx> // fuer SwPageDesc
-#include <expfld.hxx> // fuer SwTblField
-#include <section.hxx> // fuer SwSection
+#include <pagedesc.hxx> // for SwPageDesc
+#include <expfld.hxx> // for SwTblField
+#include <section.hxx> // for SwSection
#include <mvsave.hxx>
#include <swcache.hxx>
#include <SwGrammarMarkUp.hxx>
@@ -87,9 +87,7 @@ typedef std::vector<SwTxtAttr*> SwpHts;
TYPEINIT1( SwTxtNode, SwCntntNode )
-// Leider ist das SwpHints nicht ganz wasserdicht:
-// Jeder darf an den Hints rumfummeln, ohne die Sortierreihenfolge
-// und Verkettung sicherstellen zu muessen.
+// unfortunately everyone can change Hints without ensuring order or the linking between them
#ifdef DBG_UTIL
#define CHECK_SWPHINTS(pNd) { if( pNd->GetpSwpHints() && \
!pNd->GetDoc()->IsInReading() ) \
@@ -102,7 +100,7 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
SwTxtFmtColl *pColl,
SwAttrSet* pAutoAttr )
{
- OSL_ENSURE( pColl, "Collectionpointer ist 0." );
+ OSL_ENSURE( pColl, "Collection pointer is 0." );
SwTxtNode *pNode = new SwTxtNode( rWhere, pColl, pAutoAttr );
@@ -113,8 +111,7 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
if ( IsDocNodes() )
UpdateOutlineNode(*pNode);
- //Wenn es noch kein Layout gibt oder in einer versteckten Section
- // stehen, brauchen wir uns um das MakeFrms nicht bemuehen.
+ // if there is no layout or it is in a hidden section, MakeFrms is not needed
const SwSectionNode* pSectNd;
if( !GetDoc()->GetCurrentViewShell() || //swmod 071108//swmod 071225
( 0 != (pSectNd = pNode->FindSectionNode()) &&
@@ -123,9 +120,9 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
SwNodeIndex aTmp( rWhere );
do {
- // max. 2 Durchlaeufe:
- // 1. den Nachfolger nehmen
- // 2. den Vorgaenger
+ // max. 2 loops:
+ // 1. take the successor
+ // 2. take the predecessor
SwNode * pNd = & aTmp.GetNode();
switch (pNd->GetNodeType())
@@ -172,11 +169,11 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
else if( pNd->StartOfSectionNode()->IsTableNode() &&
aTmp.GetIndex() < rWhere.GetIndex() )
{
- // wir stehen hinter einem TabellenNode
+ // after a table node
aTmp = *pNd->StartOfSectionNode();
break;
}
- // kein break !!!
+ // no break !!!
default:
if( rWhere == aTmp )
aTmp -= 2;
@@ -206,7 +203,6 @@ SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere,
{
InitSwParaStatistics( true );
- // soll eine Harte-Attributierung gesetzt werden?
if( pAutoAttr )
SetAttr( *pAutoAttr );
@@ -232,17 +228,16 @@ SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere,
SwTxtNode::~SwTxtNode()
{
- // delete loescht nur die Pointer, nicht die Arrayelemente!
+ // delete only removes the pointer not the array elements!
if ( m_pSwpHints )
{
- // damit Attribute die ihren Inhalt entfernen nicht doppelt
- // geloescht werden.
+ // do not delete attributes twice when those delte their content
SwpHints* pTmpHints = m_pSwpHints;
m_pSwpHints = 0;
for( sal_uInt16 j = pTmpHints->Count(); j; )
- // erst muss das Attribut aus dem Array entfernt werden,
- // denn sonst wuerde es sich selbst loeschen (Felder) !!!!
+ // first remove the attribute from the array otherwise
+ // if would delete itself
DestroyAttr( pTmpHints->GetTextHint( --j ) );
delete pTmpHints;
@@ -361,7 +356,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
{
bool parentIsOutline = IsOutline();
- // lege den Node "vor" mir an
+ // create a node "in front" of me
const xub_StrLen nSplitPos = rPos.nContent.GetIndex();
const xub_StrLen nTxtLen = m_Text.getLength();
SwTxtNode* const pNode =
@@ -390,12 +385,11 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
if ( GetDepends() && !m_Text.isEmpty() && (nTxtLen / 2) < nSplitPos )
{
-// JP 25.04.95: Optimierung fuer SplitNode:
-// Wird am Ende vom Node gesplittet, dann verschiebe die
-// Frames vom akt. auf den neuen und erzeuge fuer den akt.
-// neue. Dadurch entfaellt das neu aufbauen vom Layout.
+ // optimization for SplitNode: If a split is at the end of a node then
+ // move the frames from the current to the new one and create new ones
+ // for the current one. As a result, no need for recreating the layout.
- LockModify(); // Benachrichtigungen abschalten
+ LockModify(); // disable notifications
// werden FlyFrames mit verschoben, so muessen diese nicht ihre
// Frames zerstoeren. Im SwTxtFly::SetAnchor wird es abgefragt!
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 3cd6ca3..d938fc8 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -181,8 +181,7 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
// <sal_True>: at-character anchored objects are collected
// <sal_False>: at-paragraph anchored objects are collected
- // alle Rahmen, Grafiken und OLEs suchen, die an diesem Absatz
- // gebunden sind
+ // search all borders, images, and OLEs that are connected to the paragraph
SwDoc* pDoc = rIdx.GetNode().GetDoc();
sal_uInt16 nChkType = static_cast< sal_uInt16 >((_bAtCharAnchoredObjs)
@@ -302,7 +301,7 @@ void ClientModify(SwClient* pClient, const SfxPoolItem *pOld, const SfxPoolItem
break;
case RES_FMT_CHG:
- // wurden wir an das neue umgehaengt und wird das alte geloscht?
+ // Is the move to the new one finished and will the old one be deleted?
if( ((SwFmtChg*)pNew)->pChangedFmt == pClient->GetRegisteredIn() &&
((SwFmtChg*)pOld)->pChangedFmt->IsFmtInDTOR() )
((SwModify*)pClient->GetRegisteredIn())->Remove(pClient);
@@ -1625,9 +1624,8 @@ throw (uno::RuntimeException)
/****************************************************************************
* Text positions
- * Bis zum ersten Zugriff auf eine TextPosition wird ein SwCursor gehalten,
- * danach wird ein Array mit uno::Reference< XTextPosition > angelegt
- *
+ * Up to the first access to a text position, only a SwCursor is stored.
+ * Afterwards, an array with uno::Reference<XTextPosition> will be created.
****************************************************************************/
OUString SAL_CALL
SwXTextRanges::getImplementationName() throw (uno::RuntimeException)
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index afadc74..3ade2c6 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -259,7 +259,7 @@ static SwPageDesc* lcl_GetPageDesc(SwDoc* pDoc, const uno::Any& aValue)
return pRet;
}
-// Numerierung
+// Numbering
const unsigned short aSvxToUnoAdjust[] =
{
text::HoriOrientation::LEFT, //3
@@ -1160,8 +1160,8 @@ SwXNumberingRules::SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc) :
{
sal_uInt16 i;
- //erstmal das Doc organisieren; es haengt an den gesetzten Zeichenvorlagen - wenn
- // keine gesetzt sind, muss es auch ohne gehen
+ // first organize the document - it is dependent on the set character formats
+ // if no format is set, it should work as well
for( i = 0; i < MAXLEVEL; i++)
{
SwNumFmt rFmt(pNumRule->Get(i));
@@ -1242,7 +1242,7 @@ void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElemen
SwNumRule aNumRule( *(pDocShell->GetDoc()->GetOutlineNumRule()) );
SwXNumberingRules::SetNumberingRuleByIndex( aNumRule,
rProperties, nIndex);
- //hier noch die Zeichenformate bei Bedarf setzen
+ // set character format if needed
const SwCharFmts* pFmts = pDocShell->GetDoc()->GetCharFmts();
sal_uInt16 nChCount = pFmts->size();
for(sal_uInt16 i = 0; i < MAXLEVEL;i++)
@@ -1539,7 +1539,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
}
else
{
- //Vorlagenname
+ // template name
OUString sValue(SW_RES(STR_POOLCOLL_HEADLINE1 + nIndex));
const SwTxtFmtColls* pColls = pDocShell->GetDoc()->GetTxtFmtColls();
const sal_uInt16 nCount = pColls->size();
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index ad36694..4023dcb 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -97,17 +97,17 @@ using namespace nsSwDocInfoSubType;
long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
{
- // muesste auch ueber pRes.nCo2OrIdx gehen
+ // should also work via pRes.nCo2OrIdx
WW8PLCFx_Book* pB = pPlcxMan->GetBook();
if( !pB )
{
- OSL_ENSURE( pB, "WW8PLCFx_Book - Pointer nicht da" );
+ OSL_ENSURE( pB, "WW8PLCFx_Book - Pointer does not exist" );
return 0;
}
eBookStatus eB = pB->GetStatus();
if (eB & BOOK_IGNORE)
- return 0; // Bookmark zu ignorieren
+ return 0; // ignore bookmark
if (pB->GetIsEnd())
{
@@ -124,12 +124,12 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
return 0;
#endif
- //ToUpper darf auf keinen Fall gemacht werden, weil der Bookmark- name ein Hyperlink-Ziel sein kann!
+ // do NOT call ToUpper as the bookmark name can also be a hyperlink target!
OUString aVal;
if( SwFltGetFlag( nFieldFlags, SwFltControlStack::BOOK_TO_VAR_REF ) )
{
- // Fuer UEbersetzung Bookmark -> Variable setzen
+ // set variable for translation bookmark
long nLen = pB->GetLen();
if( nLen > MAX_FIELDLEN )
nLen = MAX_FIELDLEN;
@@ -207,19 +207,18 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
}
//----------------------------------------------------------------------
-// allgemeine Hilfsroutinen zum Auseinanderdroeseln der Parameter
+// general help methods to separate parameters
//----------------------------------------------------------------------
-// ConvertFFileName uebersetzt FeldParameter-Namen u. ae. in den
-// System-Zeichensatz.
-// Gleichzeitig werden doppelte Backslashes in einzelne uebersetzt.
+/// translate FieldParameter names into the system character set and
+/// at the same time, douple backslashes are converted into single ones
OUString SwWW8ImplReader::ConvertFFileName(const OUString& rOrg)
{
OUString aName = rOrg;
aName = aName.replaceAll("\\\\", OUString('\\'));
aName = aName.replaceAll("%20", OUString(' '));
- // ggfs. anhaengende Anfuehrungszeichen entfernen
+ // remove attached quotation marks
if (!aName.isEmpty() && '"' == aName[aName.getLength()-1])
aName = aName.copy(0, aName.getLength()-1);
@@ -231,10 +230,10 @@ OUString SwWW8ImplReader::ConvertFFileName(const OUString& rOrg)
return aName;
}
-// ConvertUFNneme uebersetzt FeldParameter-Namen u. ae. in den
-// System-Zeichensatz und Upcased sie ( z.B. fuer Ref-Felder )
namespace
{
+ /// translate FieldParameter names into the
+ /// system character set and makes them uppercase
void ConvertUFName( String& rName )
{
rName = GetAppCharClass().uppercase( rName );
@@ -252,7 +251,7 @@ static void lcl_ConvertSequenceName(String& rSequenceName)
// and returns start of this parameter or STRING_NOT_FOUND.
xub_StrLen FindParaStart( const String& rStr, sal_Unicode cToken, sal_Unicode cToken2 )
{
- bool bStr = false; // innerhalb String ignorieren
+ bool bStr = false; // ignore inside a string
for( xub_StrLen nBuf=0; nBuf+1 < rStr.Len(); nBuf++ )
{
@@ -281,8 +280,8 @@ xub_StrLen FindParaStart( const String& rStr, sal_Unicode cToken, sal_Unicode cT
// und alles, was zum Parameter gehoert, wird in ihm zurueckgeliefert.
String FindPara( const String& rStr, sal_Unicode cToken, sal_Unicode cToken2 )
{
- xub_StrLen n2; // Ende
- xub_StrLen n = FindParaStart( rStr, cToken, cToken2 ); // Anfang
+ xub_StrLen n2; // end
+ xub_StrLen n = FindParaStart( rStr, cToken, cToken2 ); // start
if( STRING_NOTFOUND == n )
return aEmptyStr;
@@ -1054,7 +1053,7 @@ long SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF )
}
//-----------------------------------------
-// normale Felder
+// normal fields
//-----------------------------------------
eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, OUString& rStr )
@@ -1098,14 +1097,14 @@ String SwWW8ImplReader::GetFieldResult( WW8FieldDesc* pF )
{
long nOldPos = pStrm->Tell();
- WW8_CP nStart = pF->nSRes; // Start Resultat
- long nL = pF->nLRes; // Laenge Resultat
+ WW8_CP nStart = pF->nSRes; // result start
+ long nL = pF->nLRes; // result length
if( !nL )
- return aEmptyStr; // kein Resultat
+ return aEmptyStr; // no result
if( nL > MAX_FIELDLEN )
- nL = MAX_FIELDLEN; // MaxLaenge, durch Quoten
- // max. 4* so gross
+ nL = MAX_FIELDLEN; // MaxLength, by quoting
+ // max. 4* as big
OUString sRes;
nL = pSBase->WW8ReadString( *pStrm, sRes, pPlcxMan->GetCpOfs() + nStart,
@@ -1729,11 +1728,11 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, OUString &rStr)
}
eF_ResT SwWW8ImplReader::Read_F_Anz( WW8FieldDesc* pF, OUString& rStr )
-{ // SeitenZahl - Feld
- sal_uInt16 nSub = DS_PAGE;
+{
+ sal_uInt16 nSub = DS_PAGE; // page number
switch ( pF->nId ){
- case 27: nSub = DS_WORD; break; // Wordzahl
- case 28: nSub = DS_CHAR; break; // Zeichenzahl
+ case 27: nSub = DS_WORD; break; // number of words
+ case 28: nSub = DS_CHAR; break; // number of characters
}
SwDocStatField aFld( (SwDocStatFieldType*)
rDoc.GetSysFldType( RES_DOCSTATFLD ), nSub,
@@ -1744,7 +1743,7 @@ eF_ResT SwWW8ImplReader::Read_F_Anz( WW8FieldDesc* pF, OUString& rStr )
eF_ResT SwWW8ImplReader::Read_F_CurPage( WW8FieldDesc*, OUString& rStr )
{
- // Seitennummer
+ // page number
SwPageNumberField aFld( (SwPageNumberFieldType*)
rDoc.GetSysFldType( RES_PAGENUMBERFLD ), PG_RANDOM,
GetNumberPara(rStr, true));
@@ -1788,7 +1787,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, OUString& rStr )
}
}
if( !aQ.Len() )
- return FLD_TAGIGN; // -> kein 0-Zeichen in Text
+ return FLD_TAGIGN; // -> no 0-char in text
if (sal_Unicode cChar = static_cast<sal_Unicode>(aQ.ToInt32()))
{
@@ -2220,7 +2219,7 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, OUString& rStr )
break;
case 'd':
- bEmbedded = false; // Embedded-Flag deaktivieren
+ bEmbedded = false;
break;
case 'c':// den Converter-Namen ueberlesen
@@ -2593,7 +2592,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
}
//-----------------------------------------
-// Verzeichnis-Felder
+// "table of ..." fields
//-----------------------------------------
static void lcl_toxMatchACSwitch( SwWW8ImplReader& /*rReader*/,
@@ -2785,7 +2784,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
if (pF->nLRes < 3)
return FLD_TEXT; // ignore (#i25440#)
- TOXTypes eTox; // Baue ToxBase zusammen
+ TOXTypes eTox; // create a ToxBase
switch( pF->nId )
{
case 8:
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 8651176..39939fb 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -267,7 +267,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
sal_Bool bReturn = sal_False;
SwDocShell* pDocShell = GetDocShell();
sal_uInt16 nHtmlMode = ::GetHtmlMode(pDocShell);
- // im HTML-Mode nur verknuepft einfuegen
+ // when in HTML mode insert only as a link
FileDialogHelper* pFileDlg = new FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE,
SFXWB_GRAPHIC );
@@ -429,7 +429,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
int nError = InsertGraphic( aFileName, aFilterName, bAsLink, &GraphicFilter::GetGraphicFilter() );
- // Format ist ungleich Current Filter, jetzt mit auto. detection
+ // format not equal to current filter (with autodetection)
if( nError == GRFILTER_FORMATERROR )
nError = InsertGraphic( aFileName, aEmptyStr, bAsLink, &GraphicFilter::GetGraphicFilter() );
if ( rSh.IsFrmSelected() )
@@ -734,12 +734,12 @@ void SwView::Execute(SfxRequest &rReq)
{
rReq.SetReturnValue( SfxInt32Item( nSlot, nFound ));
- if (nFound > 0) // Redline-Browser anzeigen
+ if (nFound > 0) // show Redline browser
{
SfxViewFrame* pVFrame = GetViewFrame();
pVFrame->ShowChildWindow(FN_REDLINE_ACCEPT);
- // RedlineDlg neu initialisieren
+ // re-initialize the Redline dialog
sal_uInt16 nId = SwRedlineAcceptChild::GetChildWindowId();
SwRedlineAcceptChild *pRed = (SwRedlineAcceptChild*)
pVFrame->GetChildWindow(nId);
@@ -765,7 +765,7 @@ void SwView::Execute(SfxRequest &rReq)
else if ( m_pWrtShell->IsDrawCreate() )
{
GetDrawFuncPtr()->BreakCreate();
- AttrChangedNotify(m_pWrtShell); // ggf Shellwechsel...
+ AttrChangedNotify(m_pWrtShell); // shell change if needed
}
else if ( m_pWrtShell->HasSelection() || IsDrawMode() )
{
@@ -787,7 +787,7 @@ void SwView::Execute(SfxRequest &rReq)
rBind.Invalidate( SID_ATTR_SIZE );
}
m_pWrtShell->EnterStdMode();
- AttrChangedNotify(m_pWrtShell); // ggf Shellwechsel...
+ AttrChangedNotify(m_pWrtShell); // shell change if necessary
}
}
else if ( GetEditWin().GetApplyTemplate() )
@@ -838,7 +838,7 @@ void SwView::Execute(SfxRequest &rReq)
const sal_uInt16 nCurIdx = m_pWrtShell->GetCurPageDesc();
SwPageDesc aPageDesc( m_pWrtShell->GetPageDesc( nCurIdx ) );
::ItemSetToPageDesc( *pArgs, aPageDesc );
- // Den Descriptor der Core veraendern.
+ // change the descriptor of the core
m_pWrtShell->ChgPageDesc( nCurIdx, aPageDesc );
}
}
@@ -889,10 +889,9 @@ void SwView::Execute(SfxRequest &rReq)
++i;
while( m_pWrtShell->GotoPrevTOXBase() )
- ; // aufs erste Verzeichnis springen
+ ; // jump to the first "table of ..."
- // falls wir nicht mehr in einem stehen, dann zum naechsten
- // springen.
+ // if we are not in one, jump to next
const SwTOXBase* pBase = m_pWrtShell->GetCurTOX();
if( !pBase )
{
@@ -908,8 +907,7 @@ void SwView::Execute(SfxRequest &rReq)
m_pWrtShell->ApplyAutoMark();
bAutoMarkApplied = sal_True;
}
- // das pBase wird nur fuer die Schnittstelle
- // benoetigt. Muss mal umgetstellt werden!!!
+ // pBase is needed only for the interface. Should be changed in future! (JP 1996)
m_pWrtShell->UpdateTableOf( *pBase );
if( m_pWrtShell->GotoNextTOXBase() )
@@ -1056,8 +1054,7 @@ void SwView::Execute(SfxRequest &rReq)
{
SwDBData aData;
aData = rSh.GetDBData();
- rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer
- // das Mischen von DB-Feldern notwendig.
+ rSh.EnterStdMode(); // force change in text shell; necessary for mixing DB fields
AttrChangedNotify( &rSh );
pNewDBMgr->SetMergeType( DBMGR_MERGE );
@@ -1208,9 +1205,7 @@ void SwView::Execute(SfxRequest &rReq)
rReq.Done();
}
-/*--------------------------------------------------------------------
- Beschreibung: SeitenNr-Feld invalidieren
- --------------------------------------------------------------------*/
+/// invalidate page numbering field
void SwView::UpdatePageNums(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const String& rPgStr)
{
String sTemp(GetPageStr( nPhyNum, nVirtNum, rPgStr ));
@@ -1232,9 +1227,7 @@ void SwView::SetAnnotationMode(bool bMode)
m_bAnnotationMode = bMode;
}
-/*--------------------------------------------------------------------
- Beschreibung: Status der Stauszeile
- --------------------------------------------------------------------*/
+/// get status of the status line
void SwView::StateStatusLine(SfxItemSet &rSet)
{
SwWrtShell& rShell = GetWrtShell();
@@ -1248,7 +1241,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
switch( nWhich )
{
case FN_STAT_PAGE: {
- // Anzahl der Seiten, log. SeitenNr. SeitenNr ermitteln
+ // number of pages, log. page number
sal_uInt16 nPage, nLogPage;
String sDisplay;
rShell.GetPageNumber( -1, rShell.IsCrsrVisible(), nPage, nLogPage, sDisplay );
@@ -1256,7 +1249,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
GetPageStr( nPage, nLogPage, sDisplay) ));
sal_uInt16 nCnt = GetWrtShell().GetPageCnt();
- if (m_nPageCnt != nCnt) // Basic benachrichtigen
+ if (m_nPageCnt != nCnt) // notify Basic
{
m_nPageCnt = nCnt;
SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_PAGE_COUNT, SwDocShell::GetEventName(STR_SW_EVENT_PAGE_COUNT), GetViewFrame()->GetObjectShell()), sal_False);
@@ -1447,7 +1440,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
else
{
OSL_ENSURE( !this,
- "was ist das fuer ein Verzeichnis?" );
+ "Unknown kind of section" );
sStr = pCurrSect->GetSectionName();
}
}
@@ -1462,7 +1455,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
const SwNumRule* pNumRule = rShell.GetCurNumRule();
const bool bOutlineNum = pNumRule ? pNumRule->IsOutlineRule() : 0;
- if (pNumRule && !bOutlineNum ) // Cursor in Numerierung
+ if (pNumRule && !bOutlineNum ) // cursor in numbering
{
sal_uInt8 nNumLevel = rShell.GetNumLevel();
if ( nNumLevel < MAXLEVEL )
@@ -1544,9 +1537,10 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
}
}
-/*--------------------------------------------------------------------
- Beschreibung: Execute fuer die Stauszeile
- --------------------------------------------------------------------*/
+/** excecute method for the status line
+ *
+ * @param rReq ???
+ */
void SwView::ExecuteStatusLine(SfxRequest &rReq)
{
SwWrtShell &rSh = GetWrtShell();
@@ -1632,7 +1626,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
if(pFact)
{
pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aCoreSet);
- OSL_ENSURE(pDlg, "Dialogdiet fail!");
+ OSL_ENSURE(pDlg, "Zooming fail!");
if (pDlg)
{
pDlg->SetLimits( MINZOOM, MAXZOOM );
@@ -1716,13 +1710,13 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
else
{
const SwNumRule* pNumRule = rSh.GetCurNumRule();
- if( pNumRule ) // Cursor in Numerierung
+ if( pNumRule ) // cursor in numbering
{
if( pNumRule->IsAutoRule() )
nId = FN_NUMBER_BULLETS;
else
{
- // Dialog vom Gestalter starten ;-)
+ // start dialog of the painter
nId = 0;
}
}
@@ -1832,9 +1826,7 @@ void SwView::InsFrmMode(sal_uInt16 nCols)
GetEditWin().InsFrm(nCols);
}
-/*--------------------------------------------------------------------
- Beschreibung: Links bearbeiten
- --------------------------------------------------------------------*/
+/// show "edit link" dialog
void SwView::EditLinkDlg()
{
sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
@@ -1852,13 +1844,12 @@ bool SwView::JumpToSwMark( const String& rMark )
bool bRet = false;
if( rMark.Len() )
{
- // wir wollen den Bookmark aber am oberen Rand haben
+ // place bookmark at top-center
sal_Bool bSaveCC = IsCrsrAtCenter();
sal_Bool bSaveCT = IsCrsrAtTop();
SetCrsrAtTop( sal_True );
- // Damit in FrameSet auch gescrollt werden kann, muss die
- // entsprechende Shell auch das Focus-Flag gesetzt haben!
+ // For scrolling the FrameSet, the corresponding shell needs to have the focus.
sal_Bool bHasShFocus = m_pWrtShell->HasShFcs();
if( !bHasShFocus )
m_pWrtShell->ShGetFcs( sal_False );
@@ -1920,7 +1911,7 @@ bool SwView::JumpToSwMark( const String& rMark )
}
else if( sCmp == "text" )
{
- // Normale Textsuche
+ // normal text search
m_pWrtShell->EnterStdMode();
SearchOptions aSearchOpt(
@@ -1934,7 +1925,7 @@ bool SwView::JumpToSwMark( const String& rMark )
sal_Bool bSearchInNotes = sal_False;
if( m_pWrtShell->SearchPattern( aSearchOpt, bSearchInNotes, DOCPOS_START, DOCPOS_END ))
{
- m_pWrtShell->EnterStdMode(); // Selektion wieder aufheben
+ m_pWrtShell->EnterStdMode(); // remove the selection
bRet = true;
}
}
@@ -1945,13 +1936,13 @@ bool SwView::JumpToSwMark( const String& rMark )
bRet = m_pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() );
}
- // fuer alle Arten von Flys
+ // for all types of Flys
if( FLYCNTTYPE_ALL != eFlyType && m_pWrtShell->GotoFly( sName, eFlyType ))
{
bRet = true;
if( FLYCNTTYPE_FRM == eFlyType )
{
- // TextFrames: Cursor in den Frame setzen
+ // TextFrames: set Cursor in the frame
m_pWrtShell->UnSelectFrm();
m_pWrtShell->LeaveSelFrmMode();
}
@@ -1971,7 +1962,7 @@ bool SwView::JumpToSwMark( const String& rMark )
if ( m_aVisArea.IsEmpty() )
m_bMakeSelectionVisible = sal_True;
- // ViewStatus wieder zurueck setzen
+ // reset ViewStatus
SetCrsrAtTop( bSaveCT, bSaveCC );
if( !bHasShFocus )
@@ -2002,9 +1993,6 @@ static sal_uInt16 lcl_PageDescWithHeader( const SwDoc& rDoc )
return nRet; // number of page styles with active header/footer
}
-/*--------------------------------------------------------------------
- Beschreibung: Links bearbeiten
- --------------------------------------------------------------------*/
void SwView::ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem )
{
m_pViewImpl->InitRequest( rRequest );
@@ -2112,8 +2100,8 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
return -1;
}
- pMedium->DownLoad(); // ggfs. den DownLoad anstossen
- if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref?
+ pMedium->DownLoad(); // start download if needed
+ if( aRef.Is() && 1 < aRef->GetRefCount() ) // still a valid ref?
{
SwReader* pRdr;
Reader *pRead = pDocSh->StartConvertFrom( *pMedium, &pRdr, m_pWrtShell );
@@ -2130,10 +2118,10 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
SwWait aWait( *GetDocShell(), sal_True );
m_pWrtShell->StartAllAction();
if ( m_pWrtShell->HasSelection() )
- m_pWrtShell->DelRight(); // Selektionen loeschen
+ m_pWrtShell->DelRight(); // delete selections
if( pRead )
{
- nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen
+ nErrno = pRdr->Read( *pRead ); // and insert document
delete pRdr;
}
else
@@ -2144,12 +2132,12 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
}
- // ggfs. alle Verzeichnisse updaten:
+ // update all "table of ..." sections if needed
if( m_pWrtShell->IsUpdateTOX() )
{
SfxRequest aReq( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() );
Execute( aReq );
- m_pWrtShell->SetUpdateTOX( sal_False ); // wieder zurueck setzen
+ m_pWrtShell->SetUpdateTOX( sal_False ); // reset
}
if( pDoc )
@@ -2185,7 +2173,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
SwWait aWait( *GetDocShell(), sal_True );
m_pWrtShell->StartAllAction();
- m_pWrtShell->EnterStdMode(); // Selektionen loeschen
+ m_pWrtShell->EnterStdMode(); // delete selections
if( bCompare )
nFound = m_pWrtShell->CompareDoc( *((SwDocShell*)&xDocSh)->GetDoc() );
@@ -2371,8 +2359,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument)
aData.sCommand = sDBName.GetToken(1, DB_DELIM);
aData.nCommandType = sDBName.GetToken(2, DB_DELIM ).ToInt32();
}
- rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer
- // das Mischen von DB-Feldern notwendig.
+ rSh.EnterStdMode(); // force change in text shell; necessary for mixing DB fields
AttrChangedNotify( &rSh );
if (pNewDBMgr)
@@ -2445,12 +2432,12 @@ IMPL_LINK( SwView, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
{
m_pViewImpl->GetRequest()->SetReturnValue( SfxInt32Item( nSlot, nFound ) );
- if ( nFound > 0 ) // Redline-Browser anzeigen
+ if ( nFound > 0 ) // show Redline browser
{
SfxViewFrame* pVFrame = GetViewFrame();
pVFrame->ShowChildWindow(FN_REDLINE_ACCEPT);
- // RedlineDlg neu initialisieren
+ // re-initialize Redline dialog
sal_uInt16 nId = SwRedlineAcceptChild::GetChildWindowId();
SwRedlineAcceptChild* pRed = (SwRedlineAcceptChild*)pVFrame->GetChildWindow( nId );
if ( pRed )
More information about the Libreoffice-commits
mailing list