basic/source/app/textedit.cxx | 7 ++++--- comphelper/inc/comphelper/container.hxx | 24 +++++++++++++----------- 2 files changed, 17 insertions(+), 14 deletions(-)
New commits: commit d952f91d1b37cab3f634aa29a5ee84f96d4f47bd Author: Lionel Elie Mamane <lio...@mamane.lu> Date: Sun Dec 4 08:19:40 2011 +0100 Review translation by Mike Whiteley diff --git a/comphelper/inc/comphelper/container.hxx b/comphelper/inc/comphelper/container.hxx index c64b531..53b0c31 100644 --- a/comphelper/inc/comphelper/container.hxx +++ b/comphelper/inc/comphelper/container.hxx @@ -41,7 +41,7 @@ namespace comphelper //======================================================================== //= IndexAccessIterator //======================================================================== -/** ein Iterator, der von einem XIndexAccess ausgehend alle Elemente durchiteriert (pre-order) +/** an iterator that iterates through all elements, starting from an XIndexAccess (pre-order) */ class COMPHELPER_DLLPUBLIC IndexAccessIterator { @@ -49,13 +49,12 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStartingPoint; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xCurrentObject; - // The actual object + // The current object ::std::vector<sal_Int32> m_arrChildIndizies; - // Actually, as I move through this tree, there are elements but NO - // GetNextSibling, so I have to remember where each child - // is in relation to it's parent. This is the path from the - // root node to m_xCurrentObject + // I'm moving through a tree, but its elements have no GetNextSibling, + // so I have to remember where each child is in relation to its parent. + // That is the path from the root node to m_xCurrentObject ::rtl::OUString m_ustrProperty; // The Name of the requested property @@ -72,11 +71,11 @@ public: protected: virtual sal_Bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*rElement*/) { return sal_True; } - // So we can exclude certain elements, which are expected - // if this returns sal_True. If so, this element will be returned, - // which also allows us to return additional information. + // This can be used to exclude certain elements; elements for which + // this function returns sal_True will be simply skipped. + // If this element is returned from Next(), then one can get + // here get a little more information on the element. // That's why this method is not const. - virtual sal_Bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*xContainer*/) const { return sal_True; } }; commit 9f8d1f6b46d7a6be51e46bdde935a1c804baf228 Author: Mike Whiteley <m...@whiteley.org> Date: Thu Dec 1 19:13:20 2011 -0800 translated some comments from German to English diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx index ad66db9..9bdbf8c 100644 --- a/basic/source/app/textedit.cxx +++ b/basic/source/app/textedit.cxx @@ -384,11 +384,12 @@ IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG ) else pTextEngine->SetUpdateMode( sal_True ); // ! With VDev - // SetUpdateMode( sal_True ) soll kein Modify setzen + // SetUpdateMode (sal_True ) shouldn't set Modify pTextEngine->SetModified( bWasModified ); - // SyntaxTimerHdl wird gerufen, wenn Text-Aenderung - // => gute Gelegenheit, Textbreite zu ermitteln! + // SyntaxTimerHdl will be called when the text changes + // => Good opportunity to get the text width + bHighlightning = sal_False; if ( aSyntaxLineTable.First() ) diff --git a/comphelper/inc/comphelper/container.hxx b/comphelper/inc/comphelper/container.hxx index f0466fe..c64b531 100644 --- a/comphelper/inc/comphelper/container.hxx +++ b/comphelper/inc/comphelper/container.hxx @@ -49,15 +49,16 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStartingPoint; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xCurrentObject; - // das aktuelle Objekt + // The actual object ::std::vector<sal_Int32> m_arrChildIndizies; - // ich bewege mich eigentlich durch einen Baum, dummerweise haben dessen - // Elemente aber kein GetNextSibling, also muss ich mir merken, wo die Childs - // innerhalb ihres Parents sitzen (das ist sozusagen der Pfad von der Wurzel - // zu m_xCurrentObject + + // Actually, as I move through this tree, there are elements but NO + // GetNextSibling, so I have to remember where each child + // is in relation to it's parent. This is the path from the + // root node to m_xCurrentObject ::rtl::OUString m_ustrProperty; - // der Name der gesuchten property + // The Name of the requested property public: IndexAccessIterator(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xStartingPoint); @@ -70,10 +71,12 @@ public: protected: virtual sal_Bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*rElement*/) { return sal_True; } - // damit kann man bestimmte Elemente ausschliessen, die werden dann einfach - // uebergangen - // wenn hier sal_True zurueckkommt, wird dieses Element von Next zurueckgeliefert, man kann sich hier also auch - // gleich ein paar zusaetzliche Angaben zu dem Element holen (deswegen ist die Methode auch nicht const) + + // So we can exclude certain elements, which are expected + // if this returns sal_True. If so, this element will be returned, + // which also allows us to return additional information. + // That's why this method is not const. + virtual sal_Bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*xContainer*/) const { return sal_True; } }; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits