From e72dfbaa281be04721a019cf61626a520a9ff622 Mon Sep 17 00:00:00 2001 From: "Christian M. Heller" Date: Thu, 28 Feb 2013 20:54:13 -0500 Subject: [PATCH] [PATCH] fdo#39468: German comment translation - vcl modified: vcl/inc/vcl/textdata.hxx modified: vcl/inc/vcl/texteng.hxx modified: vcl/source/control/combobox.cxx --- vcl/inc/vcl/textdata.hxx | 2 +- vcl/inc/vcl/texteng.hxx | 8 ++++---- vcl/source/control/combobox.cxx | 23 ++++++++++++----------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/vcl/inc/vcl/textdata.hxx b/vcl/inc/vcl/textdata.hxx index 4ee0e2f..e9305c7 100644 --- a/vcl/inc/vcl/textdata.hxx +++ b/vcl/inc/vcl/textdata.hxx @@ -25,7 +25,7 @@ #include #include -// Fuer Notify, wenn alle Absaetze geloescht wurden... +// For Notify, when all paragraphs were deleted... #define TEXT_PARA_ALL 0xFFFFFFFF class TextPaM diff --git a/vcl/inc/vcl/texteng.hxx b/vcl/inc/vcl/texteng.hxx index e5f4582..ce83e0a 100644 --- a/vcl/inc/vcl/texteng.hxx +++ b/vcl/inc/vcl/texteng.hxx @@ -122,7 +122,7 @@ private: TxtAlign meAlign; - sal_Bool mbIsFormatting : 1; // Semaphore wegen der Hook's + sal_Bool mbIsFormatting : 1; // semaphore because of hooks sal_Bool mbFormatted : 1; sal_Bool mbUpdate : 1; sal_Bool mbModified : 1; @@ -161,7 +161,7 @@ protected: SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker() const; SAL_DLLPRIVATE sal_Bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; - // Broadcasten bzw. Selektionen anpassen: + // Broadcast or adjust selections: void ImpParagraphInserted( sal_uLong nPara ); void ImpParagraphRemoved( sal_uLong nPara ); void ImpCharsRemoved( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16 nChars ); @@ -210,12 +210,12 @@ protected: sal_uLong CalcTextWidth( sal_uLong nPara, sal_uInt16 nPortionStart, sal_uInt16 nPortionLen, const Font* pFont = 0 ); Range GetInvalidYOffsets( sal_uLong nPortion ); - // Fuer Undo/Redo + // For Undo/Redo void InsertContent( TextNode* pNode, sal_uLong nPara ); TextPaM SplitContent( sal_uLong nNode, sal_uInt16 nSepPos ); TextPaM ConnectContents( sal_uLong nLeftNode ); - // Ans API uebergebene PaM's und Selektionen auf einen gueltigen Bereich einstellen + // transfer to API PaM's and adjust selections to a valid range void ValidateSelection( TextSelection& rSel ) const; void ValidatePaM( TextPaM& rPaM ) const; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 8356a52..97e422c 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -381,7 +381,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) { aText = mpSubEdit->GetText(); - // Alle Eintraege entfernen, zu denen es einen Entry gibt, der aber nicht selektiert ist. + // remove all entries that are linked to another entry that is not selected xub_StrLen nIndex = 0; while ( nIndex != STRING_NOTFOUND ) { @@ -403,7 +403,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) aText = comphelper::string::strip(aText, ' '); } - // Fehlende Eintraege anhaengen... + // attach missing entries ::std::set< sal_uInt16 > aSelInText; lcl_GetSelectedEntries( aSelInText, aText, mcMultiSep, mpImplLB->GetEntryList() ); sal_uInt16 nSelectedEntries = mpImplLB->GetEntryList()->GetSelectEntryCount(); @@ -415,7 +415,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) if ( aText.Len() && (aText.GetChar( aText.Len()-1 ) != mcMultiSep) ) aText += mcMultiSep; if ( aText.Len() ) - aText += ' '; // etwas auflockern + aText += ' '; // lighten up some aText += mpImplLB->GetEntryList()->GetEntryText( nP ); aText += mcMultiSep; } @@ -611,8 +611,8 @@ void ComboBox::Resize() ImplUpdateFloatSelection(); } - // FloatingWindow-Groesse auch im unsichtbare Zustand auf Stand halten, - // weil KEY_PGUP/DOWN ausgewertet wird... + // adjust FloatingWindow-size even if not visible + // as KEY_PGUP/DOWN is being processed... if ( mpFloatWin ) mpFloatWin->SetSizePixel( mpFloatWin->CalcFloatSize() ); } @@ -723,8 +723,9 @@ void ComboBox::DataChanged( const DataChangedEvent& rDCEvt ) mpBtn->SetSettings( GetSettings() ); ImplInitDropDownButton( mpBtn ); } + Resize(); - mpImplLB->Resize(); // Wird nicht durch ComboBox::Resize() gerufen, wenn sich die ImplLB nicht aendert. + mpImplLB->Resize(); // not called by ComboBox::Resize() if ImpLB doesn't change SetBackground(); // due to a hack in Window::UpdateSettings the background must be reset // otherwise it will overpaint NWF drawn comboboxes } @@ -857,7 +858,7 @@ void ComboBox::Modify() void ComboBox::ImplUpdateFloatSelection() { - // Text in der ListBox in den sichtbaren Bereich bringen + // move text into the visible ListBox area mpImplLB->SetCallSelectionChangedHdl( sal_False ); if ( !IsMultiSelectionEnabled() ) { @@ -1112,11 +1113,11 @@ Size ComboBox::CalcAdjustedSize( const Size& rPrefSize ) const Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const { - // ggf. werden ScrollBars eingeblendet + // if necessary, show scrollbars Size aMinSz = CalcMinimumSize(); Size aSz; - // Hoehe + // height if ( nLines ) { if ( !IsDropDownBox() ) @@ -1127,7 +1128,7 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const else aSz.Height() = aMinSz.Height(); - // Breite + // width if ( nColumns ) aSz.Width() = nColumns * GetTextWidth(rtl::OUString(static_cast('X'))); else @@ -1203,7 +1204,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, s } } - // Inhalt + // contents if ( !IsDropDownBox() ) { long nOnePixel = GetDrawPixel( pDev, 1 ); -- 1.7.10.4