Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4296
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/4296/1
fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview (Part 3)
And again translations and cleanups.
Change-Id: I13ebd6c9073af855f34a425cfda247155b634f34
---
M sw/source/ui/uiview/srcview.cxx
M sw/source/ui/uiview/view0.cxx
M sw/source/ui/uiview/view1.cxx
M sw/source/ui/uiview/viewdlg.cxx
M sw/source/ui/uiview/viewdlg2.cxx
M sw/source/ui/uiview/viewdraw.cxx
M sw/source/ui/uiview/viewfunc.hxx
7 files changed, 45 insertions(+), 61 deletions(-)
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 4092a2f..805847f 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -697,7 +697,7 @@
String aTitle( GetViewFrame()->GetWindow().GetText() );
- sal_uInt16 nLineHeight = (sal_uInt16) pOutDev->GetTextHeight(); // etwas mehr.
+ sal_uInt16 nLineHeight = (sal_uInt16) pOutDev->GetTextHeight(); // slightly more
sal_uInt16 nParaSpace = 10;
Size aPaperSz = pOutDev->GetOutputSize();
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 73555a8..891680d 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -184,7 +184,7 @@
void SwView::RecheckBrowseMode()
{
- // OS: numerische Reihenfolge beachten!
+ // OS: pay attention to numerical order!
static sal_uInt16 const aInva[] =
{
//SID_NEWWINDOW,/*5620*/
@@ -222,9 +222,8 @@
InvalidateBorder();
}
-/*--------------------------------------------------------------------
- State of view options
- --------------------------------------------------------------------*/
+// State of view options
+
void SwView::StateViewOptions(SfxItemSet &rSet)
{
SfxWhichIter aIter(rSet);
@@ -335,9 +334,8 @@
}
}
-/*--------------------------------------------------------------------
- execute view options
- --------------------------------------------------------------------*/
+// execute view options
+
void SwView::ExecViewOptions(SfxRequest &rReq)
{
SwViewOption* pOpt = new SwViewOption( *GetWrtShell().GetViewOptions() );
@@ -535,7 +533,7 @@
return;
}
- // UserPrefs setzen Request als bearbeitet kennzeichnen
+ // Set UserPrefs, mark request as modified
sal_Bool bWebView = 0 != dynamic_cast<const SwWebView*>(this);
SwWrtShell &rSh = GetWrtShell();
rSh.StartAction();
@@ -549,13 +547,12 @@
CheckVisArea();
}
- //Die UsrPref muessen als Modified gekennzeichnet werden.
- //call for initialization
+ // The UsrPref must be marked as modified.
+ // call for initialization
pModule->GetUsrPref(bWebView);
pModule->CheckSpellChanges( pOpt->IsOnlineSpell(), false, false, false );
}
- //OS: Modified wieder zuruecksetzen, weil Ansicht/Felder
- // das Doc modified setzt.
+ //OS: Set back modified again, because view/fields sets the Doc modified.
if( !bModified )
rSh.ResetModified();
diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx
index c736e26..c97a4ae 100644
--- a/sw/source/ui/uiview/view1.cxx
+++ b/sw/source/ui/uiview/view1.cxx
@@ -49,17 +49,16 @@
m_pWrtShell->StartAction();
m_pWrtShell->EndAction( sal_True );
- // aktuelle View anmelden an der DocShell
- // die View bleibt solange an der DocShell
- // aktiv bis Sie zerstoert wird oder durch Activate eine
- // neue gesetzt wird
+ // Register the current View at the DocShell.
+ // The view remains active at the DocShell until it will
+ // be destroyed or by Activate a new one will be set.
SwDocShell* pDocSh = GetDocShell();
if(pDocSh)
pDocSh->SetView(this);
SwModule* pSwMod = SW_MOD();
pSwMod->SetView(this);
- // Dokumentgroesse hat sich geaendert
+ // Document size has changed.
if(!bDocSzUpdated)
DocSzChgd(m_aDocSz);
@@ -74,7 +73,7 @@
if ( bMDIActivate )
{
- m_pWrtShell->ShGetFcs(sal_False); // Selektionen sichtbar
+ m_pWrtShell->ShGetFcs(sal_False); // Selections visible
if( m_sSwViewData.Len() )
{
@@ -84,14 +83,14 @@
AttrChangedNotify(m_pWrtShell);
- // Flddlg ggf neu initialisieren (z.B. fuer TYP_SETVAR)
+ // Initialize Flddlg newly if necessary (e.g. for TYP_SETVAR)
sal_uInt16 nId = SwFldDlgWrapper::GetChildWindowId();
SfxViewFrame* pVFrame = GetViewFrame();
SwFldDlgWrapper *pWrp = (SwFldDlgWrapper*)pVFrame->GetChildWindow(nId);
if (pWrp)
pWrp->ReInitDlg(GetDocShell());
- // RedlineDlg ggf neu initialisieren
+ // Initialize RedlineDlg newly if necessary
nId = SwRedlineAcceptChild::GetChildWindowId();
SwRedlineAcceptChild *pRed = (SwRedlineAcceptChild*)pVFrame->GetChildWindow(nId);
if (pRed)
@@ -111,7 +110,7 @@
pAuthMrk->ReInitDlg(*m_pWrtShell);
}
else
- //Wenigstens das Notify rufen (vorsichtshalber wegen der SlotFilter
+ // At least call the Notify (as a precaution because of the SlotFilter).
AttrChangedNotify(m_pWrtShell);
SfxViewShell::Activate(bMDIActivate);
@@ -120,13 +119,13 @@
void SwView::Deactivate(sal_Bool bMDIActivate)
{
extern bool bFlushCharBuffer ;
- // Befinden sich noch Zeichen im Input Buffer?
+ // Are Characters still in the input buffer?
if( bFlushCharBuffer )
GetEditWin().FlushInBuffer();
if( bMDIActivate )
{
- m_pWrtShell->ShLooseFcs(); // Selektionen unsichtbar
+ m_pWrtShell->ShLooseFcs(); // Selections invisible
m_pHRuler->SetActive( sal_False );
m_pVRuler->SetActive( sal_False );
diff --git a/sw/source/ui/uiview/viewdlg.cxx b/sw/source/ui/uiview/viewdlg.cxx
index 1c8fe68..cc9a2b6 100644
--- a/sw/source/ui/uiview/viewdlg.cxx
+++ b/sw/source/ui/uiview/viewdlg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "hintids.hxx"
#include <sfx2/viewfrm.hxx>
#include <editeng/tstpitem.hxx>
@@ -34,11 +33,10 @@
#include "pagedesc.hxx"
-
void SwView::ExecDlg(SfxRequest &rReq)
{
ModalDialog *pDialog = 0;
- //Damit aus dem Basic keine Dialoge fuer Hintergrund-Views aufgerufen werden:
+ // Thus, from the basic no dialogues for background views are called:
const SfxPoolItem* pItem = 0;
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -80,7 +78,5 @@
delete pDialog;
}
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx
index 136da95..2594c8f 100644
--- a/sw/source/ui/uiview/viewdlg2.cxx
+++ b/sw/source/ui/uiview/viewdlg2.cxx
@@ -105,17 +105,17 @@
const String &rName = pOpt->GetCategory();
- // Existiert Pool-Vorlage gleichen Namens?
+ // Is there a pool template with the same name?
SwWrtShell &rSh = GetWrtShell();
if(rName.Len())
{
sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName(rName,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
if( USHRT_MAX != nPoolId )
rSh.GetTxtCollFromPool(nPoolId);
- // Pool-Vorlage existiert nicht: Existiert sie am Dokument?
+ // Pool template does not exist: Does it exist on the document?
else if( !rSh.GetParaStyle(rName) )
{
- // Sie existiert auch nicht am Dokument: erzeugen
+ // It also does not exist in the document: generate
SwTxtFmtColl* pDerivedFrom = rSh.GetTxtCollFromPool(RES_POOLCOLL_LABEL);
rSh.MakeTxtFmtColl(rName, pDerivedFrom);
}
@@ -125,7 +125,6 @@
if (eType & nsSelectionType::SEL_OLE)
eType = nsSelectionType::SEL_GRF;
- // SwLabelType
const SwLabelType eT = eType & nsSelectionType::SEL_TBL ? LTYPE_TABLE :
eType & nsSelectionType::SEL_FRM ? LTYPE_FLY :
eType == nsSelectionType::SEL_TXT ? LTYPE_FLY :
@@ -137,7 +136,7 @@
(SwSetExpFieldType*)aMgr.GetFldType(RES_SETEXPFLD, rName);
if (!pFldType && rName.Len() )
{
- // Neuen Feldtypen erzeugen
+ // Create new field types
SwSetExpFieldType aSwSetExpFieldType(rSh.GetDoc(), rName, nsSwGetSetExpType::GSE_SEQ);
aMgr.InsertFldType(aSwSetExpFieldType);
pFldType = (SwSetExpFieldType*)aMgr.GetFldType(RES_SETEXPFLD, rName);
@@ -178,7 +177,7 @@
nID,
pOpt->GetCharacterStyle(),
pOpt->CopyAttributes() );
- // Nummernformat setzen
+ // Set Number Format
if(pType)
((SwSetExpFieldType*)pType)->SetSeqFormat(pOpt->GetNumType());
@@ -192,7 +191,7 @@
rSh.EnterSelFrmMode();
}
- // Kategorie merken
+ // rember category
String** ppStr = 0;
if (eType & nsSelectionType::SEL_GRF)
ppStr = &pOldGrfCat;
@@ -213,6 +212,5 @@
**ppStr = rName;
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index 1f27523..6cd9188 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -70,9 +70,8 @@
using namespace ::com::sun::star;
-/*--------------------------------------------------------------------
- Beschreibung: Drawing-Ids ausfuehren
- --------------------------------------------------------------------*/
+// Execute Drawing-Ids
+
void SwView::ExecDraw(SfxRequest& rReq)
{
const SfxItemSet *pArgs = rReq.GetArgs();
@@ -122,7 +121,7 @@
if (nNewId == m_nFormSfxId)
{
bDeselect = sal_True;
- GetViewFrame()->GetDispatcher()->Execute(SID_FM_LEAVE_CREATE); // Button soll
rauspoppen
+ GetViewFrame()->GetDispatcher()->Execute(SID_FM_LEAVE_CREATE); // Button should
popping out
}
}
}
@@ -253,7 +252,7 @@
LeaveDrawCreate();
if (m_pWrtShell->IsFrmSelected())
- m_pWrtShell->EnterStdMode(); // wegen Bug #45639
+ m_pWrtShell->EnterStdMode(); // because bug #45639
SwDrawBase* pFuncPtr = NULL;
@@ -335,7 +334,7 @@
static sal_uInt16 const aInval[] =
{
- // Slot-Ids muessen beim Aufruf von Invalidate sortiert sein!
+ // Slot IDs must be sorted when calling Invalidate!
SID_ATTRIBUTES_AREA,
SID_INSERT_DRAW,
0
@@ -394,9 +393,8 @@
AttrChangedNotify(m_pWrtShell);
}
-/*--------------------------------------------------------------------
- Beschreibung: Drawing beenden
- --------------------------------------------------------------------*/
+// End drawing
+
void SwView::ExitDraw()
{
NoRotate();
@@ -445,9 +443,8 @@
}
}
-/*--------------------------------------------------------------------
- Beschreibung: Rotate-Mode abschalten
- --------------------------------------------------------------------*/
+// Disable rotate mode
+
void SwView::NoRotate()
{
if (IsDrawRotate())
@@ -460,9 +457,8 @@
}
}
-/******************************************************************************
- * Beschreibung: DrawTextEditMode einschalten
- ******************************************************************************/
+// Enable DrawTextEditMode
+
sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
{
SdrObject* pObj;
@@ -495,9 +491,8 @@
return bReturn;
}
-/******************************************************************************
- * Beschreibung: DrawTextEditMode einschalten
- ******************************************************************************/
+// Enable DrawTextEditMode
+
sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
bool bIsNewObj, bool bSetSelectionToStart)
{
@@ -590,9 +585,8 @@
return bRet;
}
-/******************************************************************************
- * Beschreibung: Ist ein DrawTextObjekt selektiert?
- ******************************************************************************/
+// Is a DrawTextObjekt selected?
+
bool SwView::IsTextTool() const
{
sal_uInt16 nId;
@@ -655,7 +649,7 @@
{
for (sal_uInt32 i = 0; i < nCount; i++)
{
- // Sind ausser Controls noch normale Draw-Objekte selektiert?
+ // Except controls, are still normal draw objects selected?
SdrObject *pSdrObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
if (!HasOnlyObj(pSdrObj, FmFormInventor))
diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx
index cfef646..c4acb72 100644
--- a/sw/source/ui/uiview/viewfunc.hxx
+++ b/sw/source/ui/uiview/viewfunc.hxx
@@ -31,12 +31,12 @@
class ViewShell;
class Window;
-// folgende Funktionen stehen im viewprt.cxx
+// The following functions are available in viewprt.cxx
void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, sal_Bool bWeb );
SfxTabPage* CreatePrintOptionsPage( Window*, const SfxItemSet& );
void SetAppPrintOptions( ViewShell* pSh, sal_Bool bWeb );
-// folgende Funktionen stehen im viewport.cxx
+// The following functions are available in viewport.cxx
void ViewResizePixel( const Window &rRef,
const Point &rOfst,
const Size &rSize,
--
To view, visit https://gerrit.libreoffice.org/4296
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13ebd6c9073af855f34a425cfda247155b634f34
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti_lx@yahoo.de>
Context
- [PATCH] fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview... · Matthias Freund (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.