[Libreoffice-commits] core.git: sw/source
Matthias Freund
matti_lx at yahoo.de
Mon Jun 10 00:27:49 PDT 2013
sw/source/ui/uiview/scroll.cxx | 16 +--
sw/source/ui/uiview/srcview.cxx | 30 +++----
sw/source/ui/uiview/swcli.cxx | 32 +++----
sw/source/ui/uiview/view.cxx | 163 ++++++++++++++++++----------------------
sw/source/ui/uiview/view.hrc | 10 +-
5 files changed, 115 insertions(+), 136 deletions(-)
New commits:
commit de34ef765f72754137f4b7216d22de8a7fac2f6a
Author: Matthias Freund <matti_lx at yahoo.de>
Date: Sat Jun 8 00:37:22 2013 +0200
fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview (Part 2)
Translations and cleanups.
Change-Id: I1894cf896ebfcbbad16323f620c0e986670279d1
Reviewed-on: https://gerrit.libreoffice.org/4192
Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
Tested-by: Miklos Vajna <vmiklos at suse.cz>
diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx
index 0bb2ee2..6a1ef23 100644
--- a/sw/source/ui/uiview/scroll.cxx
+++ b/sw/source/ui/uiview/scroll.cxx
@@ -41,10 +41,8 @@ SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) :
SwScrollbar::~SwScrollbar() {}
-/*------------------------------------------------------------------------
- Beschreibung: wird nach einer Aenderung der Dokumentgroesse gerufen, um den
- Range des Scrollbars neu einzustellen.
-------------------------------------------------------------------------*/
+// Will be called after a change of the document size
+// to refresh the range of the scrollbars.
void SwScrollbar::DocSzChgd( const Size &rSize )
{
@@ -55,11 +53,7 @@ void SwScrollbar::DocSzChgd( const Size &rSize )
SetPageSize( nVisSize * 77 / 100 );
}
-/*------------------------------------------------------------------------
- Beschreibung: wird nach einer Veraenderung des sichtbaren Ausschnittes
- gerufen.
-------------------------------------------------------------------------*/
-
+// Will be called after a change of the visible view section.
void SwScrollbar::ViewPortChgd( const Rectangle &rRect )
{
@@ -104,11 +98,11 @@ void SwScrollbar::SetAuto(sal_Bool bSet)
{
bAuto = bSet;
- // automatisch versteckt - dann anzeigen
+ // hide autmatically - automatisch versteckt - then show
if(!bAuto && bVisible && !ScrollBar::IsVisible())
ExtendedShow(sal_True);
else if(bAuto)
- AutoShow(); // oder automatisch verstecken
+ AutoShow(); // or hide automatically
}
}
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 53a856c..4092a2f 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -102,7 +102,7 @@ using ::com::sun::star::util::SearchOptions;
#define SRC_SEARCHOPTIONS (0xFFFF & ~(SEARCH_OPTIONS_FORMAT|SEARCH_OPTIONS_FAMILIES|SEARCH_OPTIONS_SEARCH_ALL))
-// Druckraender -> wie Basic - Ide
+// Printing margins -> like Basic - Ide
#define LMARGPRN 1700
#define RMARGPRN 900
#define TMARGPRN 2000
@@ -143,7 +143,7 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1
long nFontHeight = rOutDev.GetTextHeight();
- // 1.Border => Strich, 2+3 Border = Freiraum.
+ // 1.Border => Line, 2+3 Border = Space.
long nYTop = TMARGPRN-3*nBorder-nFontHeight;
long nXLeft = nLeftMargin-nBorder;
@@ -202,14 +202,14 @@ static void lcl_ConvertTabsToSpaces( String& rLine )
{
if ( rLine.GetChar(nPos) == '\t' )
{
- // Nicht 4 Blanks, sondern an 4er TabPos:
+ // Not 4 blanks, but on 4th TabPos:
OUStringBuffer aBlanker;
comphelper::string::padToLength(aBlanker, ( 4 - ( nPos % 4 ) ), ' ');
rLine.Erase( nPos, 1 );
rLine.Insert(aBlanker.makeStringAndClear(), nPos);
nMax = rLine.Len();
}
- nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt...
+ nPos++; // Not optimally, if tab, but not wrong...
}
}
}
@@ -227,7 +227,7 @@ SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) :
SwSrcView::~SwSrcView()
{
SwDocShell* pDocShell = GetDocShell();
- OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?");
+ OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Why no WebDocShell?");
const TextSelection& rSel = aEditWin.GetTextView()->GetSelection();
((SwWebDocShell*)pDocShell)->SetSourcePara( static_cast< sal_uInt16 >( rSel.GetStart().GetPara() ) );
@@ -256,8 +256,8 @@ void SwSrcView::Init()
SetName(OUString("Source"));
SetWindow( &aEditWin );
SwDocShell* pDocShell = GetDocShell();
- // wird das Doc noch geladen, dann muss die DocShell das Load
- // anwerfen, wenn das Laden abgeschlossen ist
+ // If the doc is still loading, then the DocShell must fire up
+ // the Load if the loading is completed.
if(!pDocShell->IsLoading())
Load(pDocShell);
else
@@ -364,7 +364,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
const SfxItemSet* pTmpArgs = rReq.GetArgs();
sal_uInt16 nWhich = pTmpArgs->GetWhichByPos( 0 );
- OSL_ENSURE( nWhich, "Wich fuer SearchItem ?" );
+ OSL_ENSURE( nWhich, "Which for SearchItem ?" );
const SfxPoolItem& rItem = pTmpArgs->Get( nWhich );
SetSearchItem( (const SvxSearchItem&)rItem);
StartSearchAndReplace( (const SvxSearchItem&)rItem, sal_False, rReq.IsAPI() );
@@ -679,7 +679,7 @@ sal_Int32 SwSrcView::PrintSource(
if (!pOutDev || nPage <= 0)
return 0;
- //! this a lgorithm for printing the n-th page is very poor since it
+ //! This logarithm for printing the n-th page is very poor since it
//! needs to go over the text of all previous pages to get to the correct one.
//! But since HTML source code is expected to be just a small number of pages
//! even this poor algorithm should be enough...
@@ -704,7 +704,7 @@ sal_Int32 SwSrcView::PrintSource(
aPaperSz.Width() -= (LMARGPRN + RMARGPRN);
aPaperSz.Height() -= (TMARGPRN + BMARGPRN);
- // nLinepPage stimmt nicht, wenn Zeilen umgebrochen werden muessen...
+ // nLinepPage is not true, if lines have to be wrapped...
sal_uInt16 nLinespPage = (sal_uInt16) (aPaperSz.Height() / nLineHeight);
sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pOutDev->GetTextWidth(OUString('X')));
sal_uInt16 nParas = static_cast< sal_uInt16 >( pTextEngine->GetParagraphCount() );
@@ -712,7 +712,7 @@ sal_Int32 SwSrcView::PrintSource(
sal_uInt16 nPages = (sal_uInt16) (nParas / nLinespPage + 1 );
sal_uInt16 nCurPage = 1;
- // Header drucken...
+ // Print header...
if (!bCalcNumPagesOnly && nPage == nCurPage)
lcl_PrintHeader( *pOutDev, nPages, nCurPage, aTitle );
const Point aStartPos( LMARGPRN, TMARGPRN );
@@ -757,7 +757,7 @@ void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
)
)
{
- // Broadcast kommt nur einmal!
+ // Broadcast only comes once!
const SwDocShell* pDocSh = GetDocShell();
const sal_Bool bReadonly = pDocSh->IsReadOnly();
aEditWin.SetReadonly(bReadonly);
@@ -849,10 +849,10 @@ void SwSrcView::Load(SwDocShell* pDocShell)
eLoadEncoding = eDestEnc;
if(bDocModified)
- pDocShell->SetModified();// das Flag wird zwischendurch zurueckgesetzt
- // AutoLoad abschalten
+ pDocShell->SetModified();// The flag will be reset in between times.
+ // Disable AutoLoad
pDocShell->SetAutoLoad(INetURLObject(), 0, sal_False);
- OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?");
+ OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Why no WebDocShell?");
sal_uInt16 nLine = ((SwWebDocShell*)pDocShell)->GetSourcePara();
aEditWin.SetStartLine(nLine);
aEditWin.GetTextEngine()->ResetUndo();
diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx
index a8a0bf6..138e4ba 100644
--- a/sw/source/ui/uiview/swcli.cxx
+++ b/sw/source/ui/uiview/swcli.cxx
@@ -41,14 +41,13 @@ SwOleClient::SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObj
void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect )
{
- //Der Server moechte die Clientgrosse verandern.
- //Wir stecken die Wunschgroesse in die Core. Die Attribute des Rahmens
- //werden auf den Wunschwert eingestellt. Dieser Wert wird also auch an
- //den InPlaceClient weitergegeben.
- //Die Core aktzeptiert bzw. formatiert die eingestellten Werte nicht
- //zwangslaeufig. Wenn der Ole-Frm formatiert wurde wird das CalcAndSetScale()
- //der WrtShell gerufen. Dort wird ggf. die Scalierung des SwOleClient
- //eingestellt.
+ // The server wants to change the client size.
+ // We put the desired size in the core. The attributes of the frame
+ // are set to the desired value. This value will be passed on to the
+ // InPlaceClient.
+ // The core accepts or formats the adjusted values ​​not necessarily.
+ // If the Ole-Frm is formatted, then the CalcAndSetScale() of the WrtShell
+ // will be called. There the scaling of the SwOleClient is set if necessary.
SwWrtShell &rSh = ((SwView*)GetViewShell())->GetWrtShell();
@@ -101,16 +100,17 @@ void SwOleClient::ViewChanged()
{
// the iconified object seems not to need such a scaling handling
// since the replacement image and the size a completely controlled by the container
- // TODO/LATER: when the icon exchange is implemented the scaling handling might be required again here
+ // TODO/LATER: when the icon exchange is implemented the scaling handling
+ // might be required again here
return;
}
SwWrtShell &rSh = ((SwView*)GetViewShell())->GetWrtShell();
- //Einstellen der Groesse des Objektes in der Core. Die Scalierung muss
- //beruecksichtigt werden. Rueckwirkung auf das Objekt werden von
- //CalcAndSetScale() der WrtShell beruecksichtig, wenn die Groesse/Pos des
- //Rahmens in der Core sich veraendert.
+ // Adjust the size of the object in the core. The Scaling must
+ // be considered. Repercussions on the object are considered by
+ // CalcAndSetScale() of the WrtShell if the size / position of
+ // the frame in the core changes.
// TODO/LEAN: getMapUnit can switch object to running state
awt::Size aSz;
@@ -130,8 +130,8 @@ void SwOleClient::ViewChanged()
Size aVisSize( aSz.Width, aSz.Height );
- // solange keine vernuenftige Size vom Object kommt,
- // kann nichts skaliert werden
+ // As long as from the object comes no reasonable size
+ // nothing can be scaled.
if( !aVisSize.Width() || !aVisSize.Height() )
return;
@@ -146,7 +146,7 @@ void SwOleClient::ViewChanged()
aVisSize.Height()= Fraction( aVisSize.Height() ) * GetScaleHeight();
SwRect aRect( Point( LONG_MIN, LONG_MIN ), aVisSize );
- rSh.LockView( sal_True ); //Scrollen im EndAction verhindern
+ rSh.LockView( sal_True ); // Prevent scrolling in the EndAction
rSh.StartAllAction();
rSh.RequestObjectResize( aRect, GetObject() );
rSh.EndAllAction();
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 2b8d883..0e0f4c3 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -118,9 +118,7 @@ extern bool bNoInterrupt; // in mainwn.cxx
#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \
SFX_VIEW_HAS_PRINTOPTIONS)
-/*--------------------------------------------------------------------
- Beschreibung: Statics
- --------------------------------------------------------------------*/
+// Statics
int bDocSzUpdated = 1;
@@ -168,10 +166,8 @@ void SwView::ImpSetVerb( int nSelType )
}
}
-/*--------------------------------------------------------------------
- Description:
- called by the SwEditWin when it gets the focus
- --------------------------------------------------------------------*/
+// Called by the SwEditWin when it gets the focus.
+
void SwView::GotFocus() const
{
// if we got the focus, and the form shell *is* on the top of the dispatcher
@@ -203,12 +199,9 @@ void SwView::GotFocus() const
}
}
-/*--------------------------------------------------------------------
- Description:
- called by the FormShell when a form control is focused. This is
- a request to put the form shell on the top of the dispatcher
- stack
- --------------------------------------------------------------------*/
+// called by the FormShell when a form control is focused. This is
+// a request to put the form shell on the top of the dispatcher stack
+
IMPL_LINK_NOARG(SwView, FormControlActivated)
{
// if a form control has been activated, and the form shell is not on the top
@@ -231,20 +224,19 @@ IMPL_LINK_NOARG(SwView, FormControlActivated)
void SwView::SelectShell()
{
-//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//
-// Achtung: SelectShell fuer die WebView mitpflegen
-//
-//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+
+// Attention: Maintain the SelectShell for the WebView additionally
+
if(m_bInDtor)
return;
- // Entscheidung, ob UpdateTable gerufen werden muss
+ // Decision if the UpdateTable has to be called
sal_Bool bUpdateTable = sal_False;
const SwFrmFmt* pCurTableFmt = m_pWrtShell->GetTableFmt();
if(pCurTableFmt && pCurTableFmt != m_pLastTableFormat)
{
- bUpdateTable = sal_True; // kann erst spaeter ausgefuehrt werden
+ bUpdateTable = sal_True; // can only be executed later
}
m_pLastTableFormat = pCurTableFmt;
@@ -260,7 +252,7 @@ void SwView::SelectShell()
GetViewFrame()->GetBindings().InvalidateAll( sal_False );
if ( m_nSelectionType & nsSelectionType::SEL_OLE ||
m_nSelectionType & nsSelectionType::SEL_GRF )
- //Fuer Grafiken und OLE kann sich natuerlich das Verb aendern!
+ // For graphs and OLE the verb can be modified of course!
ImpSetVerb( nNewSelectionType );
}
else
@@ -271,9 +263,8 @@ void SwView::SelectShell()
if ( m_pShell )
{
- rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen
-
- //Zur alten Selektion merken welche Toolbar sichtbar war
+ rDispatcher.Flush(); // Really erase all cached shells
+ //Remember to the old selection which toolbar was visible
sal_uInt16 nId = static_cast< sal_uInt16 >( rDispatcher.GetObjectBarId( SFX_OBJECTBAR_OBJECT ));
if ( nId )
pBarCfg->SetTopToolbar( m_nSelectionType, nId );
@@ -439,10 +430,9 @@ void SwView::SelectShell()
GetEditWin().SetInputContext( aCntxt );
}
- //Zur neuen Selektion die Toolbar aktivieren, die auch beim letzten Mal
- //aktiviert war
- //Vorher muss ein Flush() sein, betrifft aber lt. MBA nicht das UI und ist
- //kein Performance-Problem
+ // Activate the toolbar to the new selection which also was active last time.
+ // Before a flush () must be, but does not affect the UI according to MBA and
+ // is not a performance problem.
// TODO/LATER: maybe now the Flush() command is superfluous?!
rDispatcher.Flush();
@@ -455,7 +445,7 @@ void SwView::SelectShell()
m_pFormShell->SetView(PTR_CAST(FmFormView, pDView));
}
- //Guenstiger Zeitpunkt fuer die Kommunikation mit OLE-Objekten?
+ // Opportune time for the communication with OLE objects?
if ( GetDocShell()->GetDoc()->IsOLEPrtNotifyPending() )
GetDocShell()->GetDoc()->PrtOLENotify( sal_False );
@@ -466,11 +456,11 @@ void SwView::SelectShell()
GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged();
}
-//Zusammenspiel: AttrChangedNotify() und TimeoutHdl.
-//Falls noch Actions offen sind keine Aktualisierung, da der
-//Cursor auf der Core-Seite im Wald stehen kann.
-//Da wir aber keine Stati mehr liefern koennen und wollen locken wir
-//stattdessen den Dispatcher.
+// Interaction: AttrChangedNotify() and TimeoutHdl.
+// No Update if actions are still open, since the cursor on the core side
+// can be somewhere in no man's land.
+// But since we can no longer supply status and we want instead lock
+// the dispatcher.
extern "C"
{
@@ -485,8 +475,7 @@ IMPL_LINK_NOARG(SwView, AttrChangedNotify)
if ( GetEditWin().IsChainMode() )
GetEditWin().SetChainMode( sal_False );
- //Opt: Nicht wenn PaintLocked. Beim Unlock wird dafuer nocheinmal ein
- //Notify ausgeloest.
+ //Opt: Not if PaintLocked. During unlock a notify will be once more triggered.
if( !m_pWrtShell->IsPaintLocked() && !bNoInterrupt &&
GetDocShell()->IsReadOnly() )
_CheckReadonlyState();
@@ -563,11 +552,11 @@ IMPL_LINK_NOARG(SwView, TimeoutHdl)
void SwView::_CheckReadonlyState()
{
SfxDispatcher &rDis = GetDispatcher();
- //Um erkennen zu koennen ob bereits disabled ist!
+ // To be able to recognize if it is already disabled!
SfxItemState eStateRO, eStateProtAll;
const SfxPoolItem *pItem;
- // von einem nur uns bekannten Slot den Status abfragen.
- // Ansonsten kennen andere den Slot; wie z.B. die BasidIde
+ // Query the status from a slot which is only known to us.
+ // Otherwise the slot is known from other; like the BasidIde
eStateRO = rDis.QueryState( FN_INSERT_BOOKMARK, pItem );
eStateProtAll = rDis.QueryState( FN_EDIT_REGION, pItem );
sal_Bool bChgd = sal_False;
@@ -661,10 +650,10 @@ void SwView::_CheckReadonlySelection()
if( (SW_DISABLE_ON_PROTECTED_CURSOR & nDisableFlags ) !=
(SW_DISABLE_ON_PROTECTED_CURSOR & rDis.GetDisableFlags() ) )
{
- // zusaetzlich am Window den InputContext umsetzen, damit in
- // japanischen / chinesischen Versionen die externe Eingabe
- // ab-/angeschaltet wird. Das aber nur wenn auch die richtige
- // Shell auf dem Stack steht.
+ // Additionally move at the Window the InputContext, so that
+ // in japanese / chinese versions the external input will be
+ // turned on or off. This but only if the correct shell is on
+ // the stack.
switch( m_pViewImpl->GetShellMode() )
{
case SHELL_MODE_TEXT:
@@ -672,12 +661,12 @@ void SwView::_CheckReadonlySelection()
case SHELL_MODE_TABLE_TEXT:
case SHELL_MODE_TABLE_LIST_TEXT:
{
-// temporaere Loesung!!! Sollte bei jeder Cursorbewegung
-// den Font von der akt. Einfuegeposition setzen, also ausserhalb
-// dieses if's. Aber TH wertet den Font zur Zeit nicht aus und
-// das besorgen erscheint mir hier zu teuer zu sein.
-// Ausserdem haben wir keinen Font, sondern nur Attribute aus denen
-// die Textformatierung dann den richtigen Font zusammen baut.
+// Temporary solution!!! Should set the font of the current insertion point
+// at each cursor movement, so outside of this "if". But TH does not
+// evaluates the font at this time and the "purchase" appears to me
+// as too expensive.
+// Moreover, we don't have a font, but only attributes from which the
+// text formatting and the correct font will be build together.
InputContext aCntxt( GetEditWin().GetInputContext() );
aCntxt.SetOptions( SW_DISABLE_ON_PROTECTED_CURSOR & nDisableFlags
@@ -830,7 +819,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
else
aUsrPref.setBrowseMode( rDoc.get(IDocumentSettingAccess::BROWSE_MODE) );
- //Fuer den BrowseMode wollen wir keinen Factor uebernehmen.
+ //For the BrowseMode we do not assume a factor.
if( aUsrPref.getBrowseMode() && aUsrPref.GetZoomType() != SVX_ZOOM_PERCENT )
{
aUsrPref.SetZoomType( SVX_ZOOM_PERCENT );
@@ -881,8 +870,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
// isn't reset, if document is already modified.
const bool bIsDocModified = m_pWrtShell->GetDoc()->IsModified();
- // damit unter anderem das HRuler im
- // ReadonlyFall nicht angezeigt wird
+ // Thus among other things, the HRuler is not displayed in the read-only case.
aUsrPref.SetReadonly( m_pWrtShell->GetViewOptions()->IsReadonly() );
// no margin for OLE!
@@ -892,9 +880,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
m_pWrtShell->SetBrowseBorder( aBrwsBorder );
- // Im CTOR duerfen keine Shell wechsel erfolgen, die muessen ueber
- // den Timer "zwischen gespeichert" werden. Sonst raeumt der SFX
- // sie wieder vom Stack!
+ // In CTOR no shell changes may take place, which must be temporarily stored
+ // with the timer. Otherwise, the SFX removes them from the stack!
bool bOld = bNoInterrupt;
bNoInterrupt = true;
@@ -925,18 +912,18 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
m_pHRuler->SetCharWidth( 371 ); // default character width
m_pVRuler->SetLineHeight( 551 ); // default line height
- // DocShell setzen
+ // Set DocShell
pDocSh->SetView( this );
SW_MOD()->SetView( this );
m_pPostItMgr = new SwPostItMgr(this);
- // Die DocSize erfragen und verarbeiten. Ueber die Handler konnte
- // die Shell nicht gefunden werden, weil die Shell innerhalb CTOR-Phase
- // nicht in der SFX-Verwaltung bekannt ist.
+ // Check and process the DocSize. Via the handler, the shell could not
+ // be found, because the shell is not known in the SFX management
+ // within the CTOR phase.
DocSzChgd( m_pWrtShell->GetDocSize() );
- // AttrChangedNotify Link setzen
+ // Set AttrChangedNotify link
m_pWrtShell->SetChgLnk(LINK(this, SwView, AttrChangedNotify));
if( pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED &&
@@ -981,22 +968,22 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
m_pWrtShell->GetDoc()->SetUpdateExpFldStat( sal_False );
}
- // ggfs. alle Verzeichnisse updaten:
+ // Update all tables if necessary:
if( m_pWrtShell->GetDoc()->IsUpdateTOX() )
{
SfxRequest aSfxRequest( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() );
Execute( aSfxRequest );
- m_pWrtShell->GetDoc()->SetUpdateTOX( sal_False ); // wieder zurueck setzen
+ m_pWrtShell->GetDoc()->SetUpdateTOX( sal_False ); // reset again
m_pWrtShell->SttEndDoc(sal_True);
}
- // kein ResetModified, wenn es schone eine View auf dieses Doc gibt
+ // No ResetModified, if there is already a view to this doc.
SfxViewFrame* pVFrame = GetViewFrame();
SfxViewFrame* pFirst = SfxViewFrame::GetFirst(pDocSh);
- // zur Zeit(360) wird die View erst nach dem Ctor eingetragen
- // der folgende Ausdruck funktioniert auch, wenn sich das aendert
- // wenn per Undo nicht mehr die Modifizierung aufhebar ist,
- // so setze das Modified NICHT zurueck.
+ // Currently(360) the view is registered firstly after the CTOR,
+ // the following expression is also working if this changes.
+ // If the modification cannot be canceled by undo, then do NOT set
+ // the modify back.
// no reset of modified state, if document
// was already modified.
if (!m_pWrtShell->GetDoc()->GetIDocumentUndoRedo().IsUndoNoResetModified() &&
@@ -1008,7 +995,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
bNoInterrupt = bOld;
- // wird ein GlobalDoc neu angelegt, soll auch der Navigator erzeugt werden
+ // If a new GlobalDoc will be created, the navigator will also be generated.
if( pDocSh->IsA(SwGlobalDocShell::StaticType()) &&
!pVFrame->GetChildWindow( SID_NAVIGATOR ))
{
@@ -1079,7 +1066,7 @@ SwView::~SwView()
EndListening(*GetDocShell());
delete m_pScrollFill;
delete m_pWrtShell;
- m_pWrtShell = 0; // Auf 0 setzen, damit folgende DToren nicht drauf zugreifen
+ m_pWrtShell = 0; // Set to 0, so that it is not accessable by the following dtors cannot.
m_pShell = 0;
delete m_pHScrollbar;
delete m_pVScrollbar;
@@ -1101,14 +1088,13 @@ SwDocShell* SwView::GetDocShell()
return PTR_CAST(SwDocShell, pDocShell);
}
-/*--------------------------------------------------------------------
- Beschreibung: CursorPos merken
- --------------------------------------------------------------------*/
+// Remember CursorPos
+
void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse )
{
- //Das Browse-Flag wird vom Sfx durchgereicht, wenn Dokumente gebrowsed
- //werden (nicht zu verwechseln mit dem BrowseMode).
- //Die dann gespeicherten Daten sind nicht persistent!!
+ // The browse flag will be passed from Sfx when documents are browsed
+ // (not to be confused with the BrowseMode).
+ // Then that stored data are not persistent!
const SwRect& rRect = m_pWrtShell->GetCharRect();
const Rectangle& rVis = GetVisArea();
@@ -1133,9 +1119,8 @@ void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse )
rUserData += FRMTYPE_NONE == m_pWrtShell->GetSelFrmType() ? '0' : '1';
}
-/*--------------------------------------------------------------------
- Beschreibung: CursorPos setzen
- --------------------------------------------------------------------*/
+// Set CursorPos
+
static bool lcl_IsOwnDocument( SwView& rView )
{
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
@@ -1153,8 +1138,8 @@ static bool lcl_IsOwnDocument( SwView& rView )
void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse )
{
if ( comphelper::string::getTokenCount(rUserData, ';') > 1 &&
- //Fuer Dokumente ohne Layout nur im OnlineLayout oder beim
- //Forward/Backward
+ // For document without layout only in the onlinelayout or
+ // while forward/backward
(!m_pWrtShell->IsNewLayout() || m_pWrtShell->GetViewOptions()->getBrowseMode() || bBrowse) )
{
bool bIsOwnDocument = lcl_IsOwnDocument( *this );
@@ -1163,8 +1148,8 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse )
sal_Int32 nPos = 0;
- // Nein, es ist *keine* gute Idee GetToken gleich im Point-Konstr.
- // aufzurufen, denn welcher Parameter wird zuerst ausgewertet?
+ // No it is *no* good idea to call GetToken within Point-Konstr. immediately,
+ // because which parameter is evaluated first?
long nX = rUserData.GetToken( 0, ';', nPos ).ToInt32(),
nY = rUserData.GetToken( 0, ';', nPos ).ToInt32();
Point aCrsrPos( nX, nY );
@@ -1583,8 +1568,8 @@ ErrCode SwView::DoVerb( long nVerb )
return ERRCODE_NONE;
}
-/* only return sal_True for a text selection
-*/
+// only return sal_True for a text selection
+
sal_Bool SwView::HasSelection( sal_Bool bText ) const
{
return bText ? GetWrtShell().SwCrsrShell::HasSelection()
@@ -1636,7 +1621,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
break;
case SFX_HINT_MODECHANGED:
{
- // Modalmodus-Umschaltung?
+ // Modal mode change-over?
sal_Bool bModal = GetDocShell()->IsInModalMode();
m_pHRuler->SetActive( !bModal );
m_pVRuler->SetActive( !bModal );
@@ -1659,7 +1644,8 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
else
KillTab();
bool bReadonly = GetDocShell()->IsReadOnly();
- // if document is to be opened in alive-mode then this has to be regarded while switching from readonly-mode to edit-mode
+ // if document is to be opened in alive-mode then this has to be
+ // regarded while switching from readonly-mode to edit-mode
if( !bReadonly )
{
SwDrawDocument * pDrawDoc = 0;
@@ -1827,9 +1813,8 @@ void SwView::NotifyDBChanged()
GetViewImpl()->GetUNOObject_Impl()->NotifyDBChanged();
}
-/*--------------------------------------------------------------------
- Printing
- --------------------------------------------------------------------*/
+// Printing
+
SfxObjectShellLock SwView::CreateTmpSelectionDoc()
{
SwXTextView *const pImpl = GetViewImpl()->GetUNOObject_Impl();
diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc
index c987cdf..a78c35a 100644
--- a/sw/source/ui/uiview/view.hrc
+++ b/sw/source/ui/uiview/view.hrc
@@ -21,12 +21,12 @@
#include "rcid.hrc"
-// BTN -------------------------------------------------------------------
+// BTN
#define BTN_PAGEDOWN (RC_VIEW_BEGIN)
#define BTN_PAGEUP (RC_VIEW_BEGIN + 1)
-// STR -------------------------------------------------------------------
+// STR
#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3)
#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4)
@@ -58,18 +58,18 @@
#define STR_TEXTOPTIONS (RC_VIEW_BEGIN + 33)
#define STR_SAVEACOPY_SRC (RC_VIEW_BEGIN + 34)
-// MSG -------------------------------------------------------------------
+// MSG
#define MSG_ERR_INSERT_GLOS (RC_VIEW_BEGIN)
#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5)
#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6)
-// DLG -------------------------------------------------------------------
+// DLG
#define DLG_SPECIAL_FORCED (RC_VIEW_BEGIN)
-// Ueberlaufpruefung -----------------------------------------------------
+// Overflow checking
#define VIEW_ACT_END STR_EDIT_FOOTNOTE
More information about the Libreoffice-commits
mailing list