[Libreoffice-commits] core.git: editeng/inc framework/source qadevOOo/tests svx/inc xmerge/source
Tor Lillqvist
tml at iki.fi
Thu Feb 21 23:32:47 PST 2013
editeng/inc/editeng/AccessibleStaticTextBase.hxx | 2 +-
framework/source/helper/oframes.cxx | 4 ++--
framework/source/services/desktop.cxx | 2 +-
framework/source/services/frame.cxx | 8 ++++----
qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java | 2 +-
svx/inc/svx/AccessibleTextHelper.hxx | 2 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 0c317af38ae4c91f7472789cd53c571825610d0f
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Feb 22 09:32:10 2013 +0200
s/childrens/children/
Change-Id: I1731710811506383d29c835a613b07506e7232f0
diff --git a/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
index e159af3..bbc2e6d 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 48ebd42..33e3ff3 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 0c1daa5..7cdf730 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 fdefc0d..4f00cee 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 f52ec69..996f7e1 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 90c1397..9d46896 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 0e67e97..139f078 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++) {
More information about the Libreoffice-commits
mailing list