diff options
author | Matthias Freund <matti_lx@yahoo.de> | 2013-06-16 00:52:54 +0200 |
---|---|---|
committer | Noel Power <noel.power@suse.com> | 2013-06-17 14:38:29 +0000 |
commit | 0669c58d6016a6447317b0f10dad8896f6dd9f38 (patch) | |
tree | 8273d0dac3526985bb90b7a4a7ced659237d18b8 /sw/source | |
parent | ef4872f6c6a49878ea2fc6b3a4ea3cd9ad52de33 (diff) |
fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview (Part 3)
And again translations and cleanups.
Change-Id: I13ebd6c9073af855f34a425cfda247155b634f34
Reviewed-on: https://gerrit.libreoffice.org/4296
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/ui/uiview/srcview.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uiview/view0.cxx | 21 | ||||
-rw-r--r-- | sw/source/ui/uiview/view1.cxx | 21 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewdlg.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewdlg2.cxx | 14 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewdraw.cxx | 38 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewfunc.hxx | 4 |
7 files changed, 45 insertions, 61 deletions
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 4092a2f92617..805847fc822a 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -697,7 +697,7 @@ sal_Int32 SwSrcView::PrintSource( 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 73555a8e9fdf..891680db91ad 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -184,7 +184,7 @@ static void lcl_SetViewMetaChars( SwViewOption& rVOpt, sal_Bool bOn) 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 @@ void SwView::RecheckBrowseMode() InvalidateBorder(); } -/*-------------------------------------------------------------------- - State of view options - --------------------------------------------------------------------*/ +// State of view options + void SwView::StateViewOptions(SfxItemSet &rSet) { SfxWhichIter aIter(rSet); @@ -335,9 +334,8 @@ void SwView::StateViewOptions(SfxItemSet &rSet) } } -/*-------------------------------------------------------------------- - execute view options - --------------------------------------------------------------------*/ +// execute view options + void SwView::ExecViewOptions(SfxRequest &rReq) { SwViewOption* pOpt = new SwViewOption( *GetWrtShell().GetViewOptions() ); @@ -535,7 +533,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq) 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 @@ void SwView::ExecViewOptions(SfxRequest &rReq) 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 c736e2614348..c97a4ae82d7f 100644 --- a/sw/source/ui/uiview/view1.cxx +++ b/sw/source/ui/uiview/view1.cxx @@ -49,17 +49,16 @@ void SwView::Activate(sal_Bool bMDIActivate) 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 @@ void SwView::Activate(sal_Bool bMDIActivate) if ( bMDIActivate ) { - m_pWrtShell->ShGetFcs(sal_False); // Selektionen sichtbar + m_pWrtShell->ShGetFcs(sal_False); // Selections visible if( m_sSwViewData.Len() ) { @@ -84,14 +83,14 @@ void SwView::Activate(sal_Bool bMDIActivate) 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 @@ void SwView::Activate(sal_Bool bMDIActivate) 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::Activate(sal_Bool bMDIActivate) 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 1c8fe6867c35..cc9a2b6afd21 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(); @@ -81,6 +79,4 @@ void SwView::ExecDlg(SfxRequest &rReq) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx index 136da959671e..2594c8fd7599 100644 --- a/sw/source/ui/uiview/viewdlg2.cxx +++ b/sw/source/ui/uiview/viewdlg2.cxx @@ -105,17 +105,17 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) 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 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) 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 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) (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 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) nID, pOpt->GetCharacterStyle(), pOpt->CopyAttributes() ); - // Nummernformat setzen + // Set Number Format if(pType) ((SwSetExpFieldType*)pType)->SetSeqFormat(pOpt->GetNumType()); @@ -192,7 +191,7 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) rSh.EnterSelFrmMode(); } - // Kategorie merken + // rember category String** ppStr = 0; if (eType & nsSelectionType::SEL_GRF) ppStr = &pOldGrfCat; @@ -214,5 +213,4 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx index 1f275234b1dd..6cd9188ed6e7 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 @@ void SwView::ExecDraw(SfxRequest& rReq) 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 @@ void SwView::ExecDraw(SfxRequest& rReq) LeaveDrawCreate(); if (m_pWrtShell->IsFrmSelected()) - m_pWrtShell->EnterStdMode(); // wegen Bug #45639 + m_pWrtShell->EnterStdMode(); // because bug #45639 SwDrawBase* pFuncPtr = NULL; @@ -335,7 +334,7 @@ void SwView::ExecDraw(SfxRequest& rReq) 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 @@ void SwView::ExecDraw(SfxRequest& rReq) AttrChangedNotify(m_pWrtShell); } -/*-------------------------------------------------------------------- - Beschreibung: Drawing beenden - --------------------------------------------------------------------*/ +// End drawing + void SwView::ExitDraw() { NoRotate(); @@ -445,9 +443,8 @@ void SwView::ExitDraw() } } -/*-------------------------------------------------------------------- - Beschreibung: Rotate-Mode abschalten - --------------------------------------------------------------------*/ +// Disable rotate mode + void SwView::NoRotate() { if (IsDrawRotate()) @@ -460,9 +457,8 @@ void SwView::NoRotate() } } -/****************************************************************************** - * Beschreibung: DrawTextEditMode einschalten - ******************************************************************************/ +// Enable DrawTextEditMode + sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos) { SdrObject* pObj; @@ -495,9 +491,8 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos) 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 @@ sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, return bRet; } -/****************************************************************************** - * Beschreibung: Ist ein DrawTextObjekt selektiert? - ******************************************************************************/ +// Is a DrawTextObjekt selected? + bool SwView::IsTextTool() const { sal_uInt16 nId; @@ -655,7 +649,7 @@ bool SwView::AreOnlyFormsSelected() const { 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 cfef646ca3d3..c4acb7207eba 100644 --- a/sw/source/ui/uiview/viewfunc.hxx +++ b/sw/source/ui/uiview/viewfunc.hxx @@ -31,12 +31,12 @@ class SwScrollbar; 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, |