summaryrefslogtreecommitdiff
path: root/ucb
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 /ucb
parentad2eb6c4ba3ca36e2302c721a106dac80d266325 (diff)
childs -> children
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/file/bc.cxx2
-rw-r--r--ucb/source/ucp/file/shell.cxx26
-rw-r--r--ucb/source/ucp/file/shell.hxx6
3 files changed, 17 insertions, 17 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index cf9d1b22ee25..313e73b35e0d 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -968,7 +968,7 @@ BaseContent::setPropertyValues(
rtl_UriEncodeIgnoreEscapes,
RTL_TEXTENCODING_UTF8 );
- m_pMyShell->move( nMyCommandIdentifier, // move notifies the childs also;
+ m_pMyShell->move( nMyCommandIdentifier, // move notifies the children also;
m_aUncPath,
aDstName,
NameClash::KEEP );
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index fcc238be7623..deb00e08a985 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -2715,7 +2715,7 @@ shell::notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* liste
std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL
shell::getContentExchangedEventListeners( const rtl::OUString aOldPrefix,
const rtl::OUString aNewPrefix,
- sal_Bool withChilds )
+ sal_Bool withChildren )
{
std::vector< std::list< ContentEventNotifier* >* >* aVectorOnHeap =
@@ -2730,7 +2730,7 @@ shell::getContentExchangedEventListeners( const rtl::OUString aOldPrefix,
{
osl::MutexGuard aGuard( m_aMutex );
- if( ! withChilds )
+ if( ! withChildren )
{
aOldName = aOldPrefix;
aNewName = aNewPrefix;
@@ -2756,7 +2756,7 @@ shell::getContentExchangedEventListeners( const rtl::OUString aOldPrefix,
std::list< ContentEventNotifier* >* p = new std::list< ContentEventNotifier* >;
std::list< ContentEventNotifier* >& listeners = *p;
- if( withChilds )
+ if( withChildren )
{
aOldName = oldChildList[j];
aNewName = newName( aNewPrefix,aOldPrefix,aOldName );
@@ -2885,7 +2885,7 @@ void SAL_CALL shell::notifyPropertyChanges( std::list< PropertyChangeNotifier* >
void SAL_CALL
shell::erasePersistentSet( const rtl::OUString& aUnqPath,
- sal_Bool withChilds )
+ sal_Bool withChildren )
{
if( ! m_xFileRegistry.is() )
{
@@ -2895,23 +2895,23 @@ shell::erasePersistentSet( const rtl::OUString& aUnqPath,
uno::Sequence< rtl::OUString > seqNames;
- if( withChilds )
+ if( withChildren )
{
uno::Reference< container::XNameAccess > xName( m_xFileRegistry,uno::UNO_QUERY );
seqNames = xName->getElementNames();
}
- sal_Int32 count = withChilds ? seqNames.getLength() : 1;
+ sal_Int32 count = withChildren ? seqNames.getLength() : 1;
rtl::OUString
old_Name = aUnqPath;
for( sal_Int32 j = 0; j < count; ++j )
{
- if( withChilds && ! ( isChild( old_Name,seqNames[j] ) ) )
+ if( withChildren && ! ( isChild( old_Name,seqNames[j] ) ) )
continue;
- if( withChilds )
+ if( withChildren )
{
old_Name = seqNames[j];
}
@@ -2948,7 +2948,7 @@ shell::erasePersistentSet( const rtl::OUString& aUnqPath,
void SAL_CALL
shell::copyPersistentSet( const rtl::OUString& srcUnqPath,
const rtl::OUString& dstUnqPath,
- sal_Bool withChilds )
+ sal_Bool withChildren )
{
if( ! m_xFileRegistry.is() )
{
@@ -2958,13 +2958,13 @@ shell::copyPersistentSet( const rtl::OUString& srcUnqPath,
uno::Sequence< rtl::OUString > seqNames;
- if( withChilds )
+ if( withChildren )
{
uno::Reference< container::XNameAccess > xName( m_xFileRegistry,uno::UNO_QUERY );
seqNames = xName->getElementNames();
}
- sal_Int32 count = withChilds ? seqNames.getLength() : 1;
+ sal_Int32 count = withChildren ? seqNames.getLength() : 1;
rtl::OUString
old_Name = srcUnqPath,
@@ -2972,10 +2972,10 @@ shell::copyPersistentSet( const rtl::OUString& srcUnqPath,
for( sal_Int32 j = 0; j < count; ++j )
{
- if( withChilds && ! ( isChild( srcUnqPath,seqNames[j] ) ) )
+ if( withChildren && ! ( isChild( srcUnqPath,seqNames[j] ) ) )
continue;
- if( withChilds )
+ if( withChildren )
{
old_Name = seqNames[j];
new_Name = newName( dstUnqPath,srcUnqPath,old_Name );
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 2660fa119bfa..2584b76a9c3f 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -429,7 +429,7 @@ namespace fileaccess {
std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL
getContentExchangedEventListeners( const rtl::OUString aOldPrefix,
const rtl::OUString aNewPrefix,
- sal_Bool withChilds );
+ sal_Bool withChildren );
std::list< PropertyChangeNotifier* >* SAL_CALL
getPropertyChangeNotifier( const rtl::OUString& aName );
@@ -473,7 +473,7 @@ namespace fileaccess {
/********************************************************************************/
void SAL_CALL erasePersistentSet( const rtl::OUString& aUnqPath,
- sal_Bool withChilds = false );
+ sal_Bool withChildren = false );
/********************************************************************************/
/* copy persistent propertyset */
@@ -482,7 +482,7 @@ namespace fileaccess {
void SAL_CALL copyPersistentSet( const rtl::OUString& srcUnqPath,
const rtl::OUString& dstUnqPath,
- sal_Bool withChilds = false );
+ sal_Bool withChildren = false );
// Special optimized method for getting the properties of a directoryitem, which