diff options
| -rw-r--r-- | editeng/inc/editeng/AccessibleStaticTextBase.hxx | 2 | ||||
| -rw-r--r-- | framework/source/helper/oframes.cxx | 4 | ||||
| -rw-r--r-- | framework/source/services/desktop.cxx | 2 | ||||
| -rw-r--r-- | framework/source/services/frame.cxx | 8 | ||||
| -rw-r--r-- | qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java | 2 | ||||
| -rw-r--r-- | svx/inc/svx/AccessibleTextHelper.hxx | 2 | ||||
| -rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx index e159af3713f1..bbc2e6d5f2e6 100644 --- a/editeng/inc/editeng/AccessibleStaticTextBase.hxx +++ b/editeng/inc/editeng/AccessibleStaticTextBase.hxx @@ -205,7 +205,7 @@ namespace accessibility only be called from the main office thread. This method reevaluates the visibility of all - childrens. Call this method if your visibility state has + children. Call this method if your visibility state has changed somehow, e.g. if the visible area has changed and the AccessibleStaticTextHelper isn't notified internally. Normally, there should not be a need to call diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 48ebd42edef5..33e3ff301b55 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -207,10 +207,10 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int // If searched for children, step over all elements in container and collect the informations. if ( nSearchFlags & FrameSearchFlag::CHILDREN ) { - // Don't search for parents, siblings and self at childrens! + // Don't search for parents, siblings and self at children! // These things are supported by this instance himself. sal_Int32 nChildSearchFlags = FrameSearchFlag::SELF | FrameSearchFlag::CHILDREN; - // Step over all items of container and ask childrens for frames. + // Step over all items of container and ask children for frames. sal_uInt32 nCount = m_pFrameContainer->getCount(); for ( sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex ) { diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 0c1daa56f8c4..7cdf7305791c 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1110,7 +1110,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r // II.II) TASKS // This is a special flag. Normaly it regulate search inside tasks and forbid access to parent trees. // But the desktop exists outside such task trees. They are our sub trees. So the desktop implement - // a special feature: We use it to start search on our direct childrens only. That means we supress + // a special feature: We use it to start search on our direct children only. That means we supress // search on ALL child frames. May that can be usefull to get access on opened document tasks // only without filter out all non realy required sub frames ... // Used helper method on our container doesn't create any frame - its a search only. diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index fdefc0d5398e..4f00ceed9aff 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -829,7 +829,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl //----------------------------------------------------------------------------------------------------- // I.V) "_beamer" - // This is a special sub frame of any task. We must return it if we found it on our direct childrens + // This is a special sub frame of any task. We must return it if we found it on our direct children // or create it there if it not already exists. // Note: Such beamer exists for task(top) frames only! //----------------------------------------------------------------------------------------------------- @@ -912,13 +912,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl { //------------------------------------------------------------------------------------------------- // II.III.I) SIBLINGS - // Search on all our direct siblings - means all childrens of our parent. + // Search on all our direct siblings - means all children of our parent. // Use this flag in combination with TASK. We must supress such upper search if // user has not set it and if we are a top frame. // Attention: Don't forward this request to our parent as a findFrame() call. // In such case we must protect us against recursive calls. // Use snapshot of our parent. But don't use queryFrames() of XFrames interface. - // Because it's return all siblings and all her childrens including our children too + // Because it's return all siblings and all her children including our children too // if we call it with the CHILDREN flag. We doesn't need that - we need the direct container // items of our parent only to start searches there. So we must use the container interface // XIndexAccess instead of XFrames. @@ -966,7 +966,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl // II.III.II) PARENT // Forward search to our parent (if he exists.) // To prevent us against recursive and superflous calls (which can occure if we allow him - // to search on his childrens too) we must change used search flags. + // to search on his children too) we must change used search flags. //------------------------------------------------------------------------------------------------- if ( ( ! xTarget.is() ) && diff --git a/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java b/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java index f52ec6946953..996f7e12ca26 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java +++ b/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java @@ -77,7 +77,7 @@ public class SdDocLinkTargets extends TestCase { /** * Creating a Testenvironment for the interfaces to be tested. - * Retrieves the possible links to childrens of the drawing document using + * Retrieves the possible links to children of the drawing document using * the interface <code>XLinkTargetSupplier</code>. The retrieved collection * is the instance of the service <code>com.sun.star.document.LinkTargets</code>. * @see com.sun.star.document.XLinkTargetSupplier diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx index 90c1397b5d61..9d4689687295 100644 --- a/svx/inc/svx/AccessibleTextHelper.hxx +++ b/svx/inc/svx/AccessibleTextHelper.hxx @@ -278,7 +278,7 @@ namespace accessibility from the main office thread. This method reevaluates the visibility of all - childrens. Call this method if your visibility state has + children. Call this method if your visibility state has changed somehow, e.g. if the visible area has changed and the AccessibleTextHelper isn't notified internally (e.g. via TEXT_HINT_VIEWSCROLLED). Normally, there should diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java index 0e67e9763693..139f078c88d0 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java @@ -230,7 +230,7 @@ public abstract class NodeIterator implements Iterator { break childrenCheck; } - // compare all the childrens + // compare all the children equal = true; for (int i = 0; i < node1Children.getLength(); i++) { |