summaryrefslogtreecommitdiffstats
path: root/framework
diff options
context:
space:
mode:
authorMichael T. Whiteley <mike@whiteley.org>2011-12-07 02:33:51 -0800
committerTor Lillqvist <tlillqvist@suse.com>2011-12-08 11:32:41 +0200
commitdcfd4beb213c551f6ef6ba379651bf303bd9017a (patch)
treea819f50716357c2a5561f6b9a09809cfc52d7dbf /framework
parentLess succes, more success (diff)
downloadcore-dcfd4beb213c551f6ef6ba379651bf303bd9017a.tar.gz
core-dcfd4beb213c551f6ef6ba379651bf303bd9017a.zip
childs -> children
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/classes/framecontainer.hxx4
-rw-r--r--framework/inc/helper/oframes.hxx2
-rw-r--r--framework/inc/helper/statusindicatorfactory.hxx2
-rw-r--r--framework/inc/services/desktop.hxx2
-rw-r--r--framework/source/helper/oframes.cxx2
-rw-r--r--framework/source/jobs/helponstartup.cxx4
-rw-r--r--framework/source/services/desktop.cxx16
-rw-r--r--framework/source/services/frame.cxx10
8 files changed, 21 insertions, 21 deletions
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index f96a0373c1ca..f24e27dc19f1 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -78,8 +78,8 @@ typedef TFrameContainer::iterator TFrameIterat
typedef TFrameContainer::const_iterator TConstFrameIterator ;
/*-************************************************************************************************************//**
- @short implement a container to hold childs of frame, task or desktop
- @descr Every object of frame, task or desktop hold reference to his childs. These container is used as helper
+ @short implement a container to hold children of frame, task or desktop
+ @descr Every object of frame, task or desktop hold reference to his children. These container is used as helper
to do this. Some helper-classe like OFrames or OTasksAccess use it to. They hold a pointer to an instance
of this class, which is a member of a frame, task or desktop! You can append and remove frames.
It's possible to set one of these frames as active or deactive. You could have full index-access to
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 1c46f74bce20..1de47d1e243c 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -346,7 +346,7 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// reference to global servicemanager
css::uno::WeakReference< css::frame::XFrame > m_xOwner ; /// reference to owner of this instance (Hold no hard reference!)
- FrameContainer* m_pFrameContainer ; /// with owner shared list to hold all direct childs of an XFramesSupplier
+ FrameContainer* m_pFrameContainer ; /// with owner shared list to hold all direct children of an XFramesSupplier
sal_Bool m_bRecursiveSearchProtection ; /// flag to protect against recursive searches of frames at parents
}; // class OFrames
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index a01bf9570296..51ea0eb44d5b 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -179,7 +179,7 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider
// member
private:
- /** stack with all current indicator childs. */
+ /** stack with all current indicator children. */
IndicatorStack m_aStack;
/** uno service manager to create own needed uno resources. */
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 8dcc87227780..ac51f258d9a9 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -452,7 +452,7 @@ class Desktop : // interfaces
private:
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// reference to factory, which has create this instance
- FrameContainer m_aChildTaskContainer ; /// array of child tasks (childs of desktop are tasks; and tasks are also frames - But pure frames are not accepted!)
+ FrameContainer m_aChildTaskContainer ; /// array of child tasks (children of desktop are tasks; and tasks are also frames - But pure frames are not accepted!)
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer ; /// container for ALL Listener
css::uno::Reference< css::frame::XFrames > m_xFramesHelper ; /// helper for XFrames, XIndexAccess, XElementAccess and implementation of a childcontainer!
css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchHelper ; /// helper to dispatch something for new tasks, created by "_blank"!
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 171612d68561..8f518427b75a 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -178,7 +178,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
if( m_bRecursiveSearchProtection == sal_False )
{
// This class is a helper for services, which must implement XFrames.
- // His parent and childs are MY parent and childs to.
+ // His parent and children are MY parent and children to.
// All searchflags are supported by this implementation!
// If some flags should not be supported - don't call me with this flags!!!
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 46b176441417..fa2a67a7fe8b 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -296,13 +296,13 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
try
{
css::uno::Reference< css::frame::XFramesSupplier > xHelpRoot (xHelp , css::uno::UNO_QUERY_THROW);
- css::uno::Reference< css::container::XIndexAccess > xHelpChilds(xHelpRoot->getFrames(), css::uno::UNO_QUERY_THROW);
+ css::uno::Reference< css::container::XIndexAccess > xHelpChildren(xHelpRoot->getFrames(), css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::frame::XFrame > xHelpChild ;
css::uno::Reference< css::frame::XController > xHelpView ;
css::uno::Reference< css::frame::XModel > xHelpContent;
- xHelpChilds->getByIndex(0) >>= xHelpChild;
+ xHelpChildren->getByIndex(0) >>= xHelpChild;
if (xHelpChild.is())
xHelpView = xHelpChild->getController();
if (xHelpView.is())
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 5cdf44d80700..a65eb0996af7 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -659,8 +659,8 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom
/*-************************************************************************************************************//**
@interface XTasksSupplier
- @short get access to create enumerations of ouer taskchilds
- @descr Direct childs of desktop are tasks everytime.
+ @short get access to create enumerations of ouer taskchildren
+ @descr Direct children of desktop are tasks everytime.
Call these method to could create enumerations of it.
But; Don't forget - you will be the owner of returned object and must release it!
@@ -686,11 +686,11 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
/*-************************************************************************************************************//**
@interface XTasksSupplier
- @short return current active task of ouer direct childs
- @descr Desktop childs are tasks only ! If we have an active path from desktop
+ @short return current active task of ouer direct children
+ @descr Desktop children are tasks only ! If we have an active path from desktop
as top to any frame on bottom, we must have an active direct child. His reference is returned here.
- @attention a) Do not confuse it with getCurrentFrame()! The current frame don't must one of ouer direct childs.
+ @attention a) Do not confuse it with getCurrentFrame()! The current frame don't must one of ouer direct children.
It can be every frame in subtree and must have the focus (Is the last one of an active path!).
b) We don't need any lock here. Our container is threadsafe himself and live, if we live!
@@ -796,9 +796,9 @@ void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Refe
/*-************************************************************************************************************//**
@interface XFramesSupplier
- @short return access to append or remove childs on desktop
+ @short return access to append or remove children on desktop
@descr We don't implement these interface directly. We use a helper class to do this.
- If you wish to add or delete childs to/from the container, call these method to get
+ If you wish to add or delete children to/from the container, call these method to get
a reference to the helper.
@attention Helper is threadsafe himself. So we don't need any lock here.
@@ -823,7 +823,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw(
/*-************************************************************************************************************//**
@interface XFramesSupplier
@short set/get the current active child frame
- @descr It must be a task. Direct childs of desktop are tasks only! No frames are accepted.
+ @descr It must be a task. Direct children of desktop are tasks only! No frames are accepted.
We don't save this information directly in this class. We use ouer container-helper
to do that.
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 90d47d43d4c4..7a057bf15175 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -359,9 +359,9 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
}
/*-****************************************************************************************************//**
- @short return access to append or remove childs on desktop
+ @short return access to append or remove children on desktop
@descr We don't implement these interface directly. We use a helper class to do this.
- If you wish to add or delete childs to/from the container, call these method to get
+ If you wish to add or delete children to/from the container, call these method to get
a reference to the helper.
@seealso class OFrames
@@ -395,7 +395,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( cs
/*-****************************************************************************************************//**
@short get the current active child frame
- @descr It must be a frameto. Direct childs of a frame are frames only! No task or desktop is accepted.
+ @descr It must be a frameto. Direct children of a frame are frames only! No task or desktop is accepted.
We don't save this information directly in this class. We use ouer container-helper
to do that.
@@ -424,7 +424,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw
/*-****************************************************************************************************//**
@short set the new active direct child frame
- @descr It must be a frame to. Direct childs of frame are frames only! No task or desktop is accepted.
+ @descr It must be a frame to. Direct children of frame are frames only! No task or desktop is accepted.
We don't save this information directly in this class. We use ouer container-helper
to do that.
@@ -1213,7 +1213,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException )
if( eState != E_INACTIVE )
{
//_____________________________________________________________________________________________________
- // 1) Deactivate all active childs.
+ // 1) Deactivate all active children.
if (
( xActiveChild.is() == sal_True ) &&
( xActiveChild->isActive() == sal_True )