Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/2625 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/2625/1 Comment translation german-english in sw/source/ui/table/ Translations and cleanups... Change-Id: I486a0caac11786c8edb4dd8b6099771db075a336 --- M sw/source/ui/table/convert.cxx M sw/source/ui/table/instable.cxx M sw/source/ui/table/swtablerep.cxx M sw/source/ui/table/tabledlg.cxx M sw/source/ui/table/tablemgr.cxx M sw/source/ui/table/tablepg.hxx M sw/source/ui/table/tautofmt.cxx 7 files changed, 58 insertions(+), 156 deletions(-) diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 93e3624..d2ea4ca 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -147,7 +147,7 @@ } else { - //Einfuege-Optionen verstecken + //hide insert options mpOptions->Hide(); } mpKeepColumn->SaveValue(); diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 466acbc..440323b 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -70,9 +70,6 @@ rInsTblOpts.mnInsMode = nInsMode; } -// CTOR / DTOR ----------------------------------------------------------- - - SwInsTableDlg::SwInsTableDlg( SwView& rView ) : SfxModalDialog(rView.GetWindow(), "InsertTableDialog", "modules/swriter/ui/inserttable.ui") , pShell(&rView.GetWrtShell()) diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx index 96944b2..88d86a8 100644 --- a/sw/source/ui/table/swtablerep.cxx +++ b/sw/source/ui/table/swtablerep.cxx @@ -110,8 +110,8 @@ rTabCols.SetLeft(nLeft); if(bSingleLine) { - // die unsichtbaren Trenner werden aus den alten TabCols genommen - // die sichtbaren kommen aus pTColumns + // The invisible separators are taken from the old TabCols, + // the visible coming from pTColumns. TColumn* pOldTColumns = new TColumn[nAllCols + 1]; SwTwips nStart = 0, nEnd; @@ -150,7 +150,7 @@ break; } bFirst = false; - // sie muessen sortiert eingefuegt werden + // They have to be inserted sorted. bOld = nOld < nNew; nPos = sal_uInt16(bOld ? nOld : nNew); rTabCols[i] = nPos + nLeft; @@ -172,7 +172,7 @@ } } -// Rundungsfehler abfangen +// intercept rounding errors if(Abs((long)nOldLeft - (long)rTabCols.GetLeft()) < 3) rTabCols.SetLeft(nOldLeft); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 3efc619..9311d95 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -140,8 +140,6 @@ m_pRelWidthCB->SetClickHdl(LINK( this, SwFormatTablePage, RelWidthClickHdl )); } -/*------------------------------------------------------------------------*/ - IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn ) { OSL_ENSURE(pTblData, "table data not available?"); @@ -157,7 +155,7 @@ m_aWidthMF.SetRefValue(pTblData->GetSpace()); m_aLeftMF.SetRefValue(pTblData->GetSpace()); m_aRightMF.SetRefValue(pTblData->GetSpace()); - m_aLeftMF.SetMetricFieldMin(0); // wird vom Percentfield ueberschrieben + m_aLeftMF.SetMetricFieldMin(0); // will be overwritten by the Percentfield m_aRightMF.SetMetricFieldMin(0); // -""- m_aLeftMF.SetMetricFieldMax(99); // m_aRightMF.SetMetricFieldMax(99); // @@ -165,7 +163,7 @@ m_aRightMF.SetPrcntValue(m_aRightMF.NormalizePercent(nRight ), FUNIT_TWIP ); } else - ModifyHdl(m_aLeftMF.get()); // Werte wieder korrigieren + ModifyHdl(m_aLeftMF.get()); // correct values again if(m_pFreeBtn->IsChecked()) { @@ -234,8 +232,8 @@ if(bFull && bRestore) { - // nachdem auf autom. geschaltet wurde, wurde die Breite gemerkt, - // um sie beim Zurueckschalten restaurieren zu koennen + // After being switched on automatically, the width was pinned + // in order to restore the width while switching back to. bFull = sal_False; m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(nSaveWidth ), FUNIT_TWIP ); } @@ -244,7 +242,6 @@ return 0; } -/*----------------------------------------------------------------------*/ void SwFormatTablePage::RightModify() { if(m_pFreeBtn->IsChecked()) @@ -286,13 +283,13 @@ if( nCurWidth < MINLAY ) nCurWidth = MINLAY; nDiff = nRight + nLeft + nCurWidth - pTblData->GetSpace() ; - //rechtsbuendig nur linken Rand veraendern + //only change the left boundary right aligned if(m_pRightBtn->IsChecked()) nLeft -= nDiff; - //linksbuendig nur rechten Rand veraendern + //only change the right boundary left aligned else if(m_pLeftBtn->IsChecked()) nRight -= nDiff; - //linker Rand und Breite erlaubt - erst rechts - dann links + //left boundary and width allowed - first right - then left else if(m_pFromLeftBtn->IsChecked()) { if( nRight >= nDiff ) @@ -312,7 +309,7 @@ } } - //zentriert beide Seiten gleichmaessig veraendern + //change both sides centered equally else if(m_pCenterBtn->IsChecked()) { if((nLeft != nRight)) @@ -327,7 +324,7 @@ nRight -= nDiff/2; } } - //freie Ausrichtung: beide Raender verkleinern + //free alignment: decrease both boundaries else if(m_pFreeBtn->IsChecked()) { nLeft -= nDiff/2; @@ -359,8 +356,7 @@ } else { - //hier wird bei Aenderung an der linken Seite zuerst der - //rechte Rand veraendert, dann die Breite + //Here upon changes the right boundary will be changed, then the width. nDiff = nRight + nLeft + nCurWidth - pTblData->GetSpace() ; nRight -= nDiff; @@ -384,7 +380,7 @@ sal_Bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) { - // Testen, ob eins der Control noch den Focus hat + // Test if one of the controls still has the focus. if (m_aWidthMF.HasFocus()) ModifyHdl(m_aWidthMF.get()); else if (m_aLeftMF.HasFocus()) @@ -550,7 +546,7 @@ } - //Raender + //Margins if(SFX_ITEM_SET == rSet.GetItemState( RES_UL_SPACE, sal_False,&pItem )) { m_pTopMF->SetValue(m_pTopMF->Normalize( @@ -609,7 +605,7 @@ // os: VCL sorgt nicht dafuer, dass das aktive Control im // dialog bei OK den focus verliert m_pNameED->GrabFocus(); - // Test des Tabellennamens auf Leerzeichen + // Test of the tablename for spaces String sTblName = m_pNameED->GetText(); if(sTblName.Search(' ') != STRING_NOTFOUND) { @@ -719,9 +715,7 @@ } return sal_True; } -/*------------------------------------------------------------------------ - Beschreibung: Seite Spaltenkonfiguration -------------------------------------------------------------------------*/ +//Description: Page column configuration SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "TableColumnPage", "modules/swriter/ui/tablecolumnpage.ui", rSet) @@ -761,9 +755,7 @@ && ((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)); }; -/*------------------------------------------------------------------------ - Beschreibung: Seite Spaltenkonfiguration -------------------------------------------------------------------------*/ +//Description: Page column configuration SwTableColumnPage::~SwTableColumnPage() { }; @@ -851,7 +843,7 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox ) { - //Anzeigefenster verschieben + //move display window if(pBox == (CheckBox *)m_pDownBtn) { if(aValueTbl[0] > 0) @@ -1034,8 +1026,8 @@ } else if(bModifyTable && !bProp) { -// Differenz wird ueber die Tabellenbreite ausgeglichen, -// andere Spalten bleiben unveraendert +// Difference is balanced by the width of the table, +// other columns remain unchanged. OSL_ENSURE(nDiff <= pTblData->GetSpace() - nTableWidth, "wrong maximum" ); SwTwips nActSpace = pTblData->GetSpace() - nTableWidth; if(nDiff > nActSpace) @@ -1050,8 +1042,8 @@ } else if(bModifyTable & bProp) { -// Alle Spalten werden proportional mitveraendert, die Tabellenbreite wird -// entsprechend angepasst +// All columns will changed proportionally with, +// the table width is adjusted accordingly. OSL_ENSURE(nDiff * nNoOfVisibleCols <= pTblData->GetSpace() - nTableWidth, "wrong maximum" ); long nAdd = nDiff; if(nDiff * nNoOfVisibleCols > pTblData->GetSpace() - nTableWidth) @@ -1477,7 +1469,7 @@ bool bFlowAllowed = !bHtmlMode || rHtmlOpt.IsPrintLayoutExtension(); if(bFlowAllowed) { - // Einfuegen der vorhandenen Seitenvorlagen in die Listbox + // Inserting of the existing page templates in the list box. const sal_uInt16 nCount = pShell->GetPageDescCnt(); sal_uInt16 i; diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/ui/table/tablemgr.cxx index 693e6fb..63aa5f8 100644 --- a/sw/source/ui/table/tablemgr.cxx +++ b/sw/source/ui/table/tablemgr.cxx @@ -46,10 +46,7 @@ using namespace ::com::sun::star; -/*------------------------------------------------------------------------ - Beschreibung: Zeilenhoehe einstellen (Dialog) -------------------------------------------------------------------------*/ - +// Adjust line height (dialogue) void SwTableFUNC::ColWidthDlg( Window *pParent ) { @@ -63,9 +60,7 @@ delete pDlg; } -/*-------------------------------------------------------------------- - Beschreibung: Breite ermitteln - --------------------------------------------------------------------*/ +// Determine the width SwTwips SwTableFUNC::GetColWidth(sal_uInt16 nNum) const @@ -106,8 +101,8 @@ if ( GetColCount() > 0 ) { - // Die max. Breite ergibt sich aus der eigenen Breite und - // der Breite der Nachbarzellen um je MINLAY verringert + // The maximum width arises from the own width and + // the width of the neighbor cells reduced by per MINLAY. SwTwips nMax = nNum == 0 ? GetColWidth(1) - MINLAY : nNum == GetColCount() ? @@ -124,8 +119,8 @@ void SwTableFUNC::SetColWidth(sal_uInt16 nNum, SwTwips nNewWidth ) { - // aktuelle Breite setzen - // alle folgenden Verschieben + // set current width + // move all of the following sal_Bool bCurrentOnly = sal_False; if ( aCols.Count() > 0 ) @@ -176,7 +171,7 @@ pSh(pShell), bCopy(bCopyFmt) { - // gfs. das Format fuer die Bearbeitung kopieren + // if applicable copy the format for edit if( pFmt && bCopy ) pFmt = new SwFrmFmt( *pFmt ); } @@ -191,8 +186,8 @@ void SwTableFUNC::UpdateChart() { - //Update der Felder in der Tabelle vom User ausgeloesst, alle - //Charts zu der Tabelle werden auf den neuesten Stand gebracht. + //Update of the fields triggered by the user, all Charts of + //the table will be brought up to date SwFrmFmt *pFmt2 = pSh->GetTableFmt(); if ( pFmt2 && pSh->HasOLEObj( pFmt2->GetName() ) ) { @@ -266,8 +261,8 @@ pSh->SetCheckForOLEInCaption( sal_True ); } pSh->CalcAndSetScale( aEmbObjRef ); - //#50270# Error brauchen wir nicht handeln, das erledigt das - //DoVerb in der SfxViewShell + //#50270# We don't need to precess errors, + //this does the DoVerb in the SfxViewShell. ErrCode nErr = pClient->DoVerb( SVVERB_SHOW ); (void) nErr; } diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index e65a574..84703bd 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -89,9 +89,8 @@ virtual int DeactivatePage( SfxItemSet* pSet = 0 ); }; -/*------------------------------------------------------- - TabPage Format/Table/Columns ---------------------------------------------------------- */ +// TabPage Format/Table/Columns + #define MET_FIELDS 6 //Number of the used MetricFields class SwTableColumnPage : public SfxTabPage diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 57545a0..6168613 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -41,8 +41,6 @@ #define FRAME_OFFSET 4 -//======================================================================== - class AutoFmtPreview : public Window { public: @@ -80,7 +78,6 @@ uno::Reference< i18n::XBreakIterator > m_xBreak; - //------------------------------------------- void Init (); void DoPaint ( const Rectangle& rRect ); void CalcCellArray ( sal_Bool bFitWidth ); @@ -98,8 +95,6 @@ String MakeNumberString( String cellString, sal_Bool bAddDec ); }; -//======================================================================== - class SwStringInputDlg : public ModalDialog { public: @@ -112,7 +107,7 @@ void GetInputString( String& rString ) const; private: - Edit* m_pEdInput; // Edit erhaelt so den Focus + Edit* m_pEdInput; // Edit obtains the focus. }; @@ -127,8 +122,6 @@ m_pEdInput->SetText(rDefault); } -//------------------------------------------------------------------------ - void SwStringInputDlg::GetInputString( String& rString ) const { rString = m_pEdInput->GetText(); @@ -139,9 +132,7 @@ { } -//======================================================================== -// AutoFormat-Dialog: - +// AutoFormat-Dialogue: SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent, SwWrtShell* pWrtShell, sal_Bool bSetAutoFormat, const SwTableAutoFmt* pSelFmt ) @@ -181,18 +172,12 @@ Init(pSelFmt); } -//------------------------------------------------------------------------ - - SwAutoFormatDlg::~SwAutoFormatDlg() { if (bCoreDataChanged) pTableTbl->Save(); delete pTableTbl; } - -//------------------------------------------------------------------------ - void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt ) { @@ -214,7 +199,7 @@ nIndex = 0; if( !bSetAutoFmt ) { - // dann muss die Liste um den Eintrag <Keins> erweitert werden. + // Then the list to be expanded by the entry <Keins> respectively <None>. m_pLbFormat->InsertEntry( ViewShell::GetShellRes()->aStrNone ); nDfltStylePos = 1; nIndex = 255; @@ -232,9 +217,6 @@ m_pLbFormat->SelectEntryPos( 255 != nIndex ? (nDfltStylePos + nIndex) : 0 ); SelFmtHdl( 0 ); } - -//------------------------------------------------------------------------ - void SwAutoFormatDlg::UpdateChecks( const SwTableAutoFmt& rFmt, sal_Bool bEnable ) { @@ -268,10 +250,7 @@ } -/*------------------------------------------------------------------------ - Handler: - ---------*/ - +// Handler: IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn ) { @@ -304,9 +283,6 @@ return 0; } -/*------------------------------------------------------------------------*/ - - IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl) { bool bOk = false, bFmtInserted = false; @@ -330,13 +306,12 @@ if( n >= pTableTbl->size() ) { - // Format mit dem Namen noch nicht vorhanden, also - // aufnehmen + // Format with the name does not already exist, so take up. SwTableAutoFmt* pNewData = new SwTableAutoFmt( aFormatName ); pShell->GetTableAutoFmt( *pNewData ); - // Sortiert einfuegen!! + // Insert sorted!! for( n = 1; n < pTableTbl->size(); ++n ) if( (*pTableTbl)[ n ].GetName() > aFormatName ) break; @@ -371,8 +346,6 @@ } return 0; } - -//------------------------------------------------------------------------ IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl) { @@ -479,8 +452,6 @@ return 0; } -//------------------------------------------------------------------------ - IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl) { sal_Bool bBtnEnable = sal_False; @@ -514,7 +485,6 @@ return 0; } -//------------------------------------------------------------------------ IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl) { @@ -525,10 +495,7 @@ } IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl) -//======================================================================== // AutoFmtPreview - -//------------------------------------------------------------------------ AutoFmtPreview::AutoFmtPreview(Window* pParent) : Window ( pParent ), @@ -575,14 +542,10 @@ mbRTL = pWrtShell->IsTableRightToLeft(); } -//------------------------------------------------------------------------ - AutoFmtPreview::~AutoFmtPreview() { delete pNumFmt; } - -//------------------------------------------------------------------------ static void lcl_SetFontProperties( Font& rFont, @@ -625,8 +588,6 @@ SETONALLFONTS( SetTransparent, sal_True ); } -//------------------------------------------------------------------------ - sal_uInt8 AutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const { static const sal_uInt8 pnFmtMap[] = @@ -645,13 +606,9 @@ return aCurData.GetBoxFmt( GetFormatIndex( nCol, nRow ) ).GetBox(); } -//------------------------------------------------------------------------ - void AutoFmtPreview::DrawString( size_t nCol, size_t nRow ) { - //------------------------ - // Ausgabe des Zelltextes: - //------------------------ + // Output of the cell text: sal_uLong nNum; double nVal; String cellString; @@ -736,9 +693,9 @@ if( aCurData.IsFont() && theMaxStrSize.Height() < aStrSize.Height() ) { - // wenn der String in diesem Font nicht - // in die Zelle passt, wird wieder der - // Standard-Font genommen: + // If the string in this font does not + // fit into the cell, the standard font + // is taken again: aScriptedText.SetDefaultFont(); aStrSize = aScriptedText.GetTextSize(); } @@ -755,14 +712,10 @@ - aStrSize.Width() - FRAME_OFFSET ); - //----------------------------- - // vertikal (immer zentrieren): - //----------------------------- + // vertical (always centering): aPos.Y() += (nRowHeight - (sal_uInt16)aStrSize.Height()) / 2; - //----------- // horizontal - //----------- if( mbRTL ) aPos.X() += nRightX; else if (aCurData.IsJustify()) @@ -785,30 +738,24 @@ } else { - //--------------------- - // Standardausrichtung: - //--------------------- + // Standard align: if ( (nCol == 0) || (nIndex == 4) ) { - // Text-Label links oder Summe linksbuendig + // Text-Label left or sum left aligned aPos.X() += FRAME_OFFSET; } else { - // Zahlen/Datum rechtsbuendig + // numbers/dates right aligned aPos.X() += nRightX; } } - //------------------------------- aScriptedText.DrawText( aPos ); - //------------------------------- } } #undef FRAME_OFFSET - -//------------------------------------------------------------------------ void AutoFmtPreview::DrawStrings() { @@ -816,9 +763,6 @@ for( size_t nCol = 0; nCol < 5; ++nCol ) DrawString( nCol, nRow ); } - -//------------------------------------------------------------------------ - void AutoFmtPreview::DrawBackground() { @@ -837,9 +781,6 @@ } } -//------------------------------------------------------------------------ - - void AutoFmtPreview::PaintCells() { // 1) background @@ -854,9 +795,6 @@ maArray.DrawArray( aVD ); } -//------------------------------------------------------------------------ - - void AutoFmtPreview::Init() { SetBorderStyle( GetBorderStyle() | WINDOW_BORDER_MONO ); @@ -865,9 +803,6 @@ CalcCellArray( sal_False ); CalcLineMap(); } - -//------------------------------------------------------------------------ - void AutoFmtPreview::CalcCellArray( sal_Bool _bFitWidth ) { @@ -882,8 +817,6 @@ aPrvSize.Width() = maArray.GetWidth() + 4; aPrvSize.Height() = maArray.GetHeight() + 4; } - -//------------------------------------------------------------------------ inline void lclSetStyleFromBorder( svx::frame::Style& rStyle, const ::editeng::SvxBorderLine* pBorder ) { @@ -917,9 +850,6 @@ } } -//------------------------------------------------------------------------ - - void AutoFmtPreview::NotifyChange( const SwTableAutoFmt& rNewData ) { aCurData = rNewData; @@ -928,9 +858,6 @@ CalcLineMap(); DoPaint( Rectangle( Point(0,0), GetSizePixel() ) ); } - -//------------------------------------------------------------------------ - void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ ) { @@ -954,17 +881,13 @@ aVD.SetFillColor ( rWinColor ); aVD.SetOutputSizePixel ( aPrvSize ); - //-------------------------------- - // Zellen auf virtual Device malen - // und Ergebnis sichern - //-------------------------------- + // Draw cells on virtual device + // and save the result PaintCells(); thePreview = aVD.GetBitmap( Point(0,0), aPrvSize ); - //-------------------------------------- - // Rahmen malen und Vorschau zentrieren: - // (virtual Device fuer Fensterausgabe) - //-------------------------------------- + // Draw the Frame and center the preview: + // (virtual Device for window output) aVD.SetOutputSizePixel( theWndSize ); oldColor = aVD.GetLineColor(); aVD.SetLineColor(); @@ -974,15 +897,11 @@ (theWndSize.Height() - aPrvSize.Height()) / 2 ); aVD.DrawBitmap( aCenterPos, thePreview ); - //---------------------------- - // Ausgabe im Vorschaufenster: - //---------------------------- + // Output in the preview window: DrawBitmap( Point(0,0), aVD.GetBitmap( Point(0,0), theWndSize ) ); aVD.SetDrawMode( nOldDrawMode ); } - -//------------------------------------------------------------------------ void AutoFmtPreview::Paint( const Rectangle& rRect ) { -- To view, visit https://gerrit.libreoffice.org/2625 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I486a0caac11786c8edb4dd8b6099771db075a336 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund <matti...@yahoo.de> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice