ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

childs -> children

Browse Source
This commit is contained in:
Michael T. Whiteley
2011-12-08 11:32:41 +02:00
committed by Tor Lillqvist
parent ad2eb6c4ba
commit dcfd4beb21
175 changed files with 1113 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnoControls/source/base/basecontainercontrol.cxx
+1 -1
View File
@@ -166,7 +166,7 @@ void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >&
// create own peer
BaseControl::createPeer( xToolkit, xParent );
// create peers at all childs
// create peers at all children
Sequence< Reference< XControl > > seqControlList = getControls();
sal_uInt32 nControls = seqControlList.getLength();
UnoControls/source/controls/progressmonitor.cxx
+1 -1
View File
@@ -659,7 +659,7 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int3
// calc new layout for controls
impl_recalcLayout () ;
// clear background (!)
// [Childs was repainted in "recalcLayout" by setPosSize() automaticly!]
// [Children were repainted in "recalcLayout" by setPosSize() automaticly!]
getPeer()->invalidate(2);
// and repaint the control
impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
UnoControls/source/controls/statusindicator.cxx
+1 -1
View File
@@ -418,7 +418,7 @@ void SAL_CALL StatusIndicator::setPosSize (
// calc new layout for controls
impl_recalcLayout ( WindowEvent(static_cast< OWeakObject* >(this),0,0,nWidth,nHeight,0,0,0,0) ) ;
// clear background (!)
// [Childs was repainted in "recalcLayout" by setPosSize() automaticly!]
// [Children were repainted in "recalcLayout" by setPosSize() automaticly!]
getPeer()->invalidate(2);
// and repaint the control
impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
animations/source/animcore/animcore.cxx
+31 -31
View File
@@ -352,7 +352,7 @@ private:
double mfIterateInterval;
/** sorted list of child nodes for XTimeContainer*/
ChildList_t maChilds;
ChildList_t maChildren;
};
// ====================================================================
@@ -360,7 +360,7 @@ private:
class TimeContainerEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
{
public:
TimeContainerEnumeration( const ChildList_t &rChilds );
TimeContainerEnumeration( const ChildList_t &rChildren );
virtual ~TimeContainerEnumeration();
// Methods
@@ -369,7 +369,7 @@ public:
private:
/** sorted list of child nodes */
ChildList_t maChilds;
ChildList_t maChildren;
/** current iteration position */
ChildList_t::iterator maIter;
@@ -378,10 +378,10 @@ private:
Mutex maMutex;
};
TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChilds )
: maChilds( rChilds )
TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChildren )
: maChildren( rChildren )
{
maIter = maChilds.begin();
maIter = maChildren.begin();
}
TimeContainerEnumeration::~TimeContainerEnumeration()
@@ -393,7 +393,7 @@ sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeExce
{
Guard< Mutex > aGuard( maMutex );
return maIter != maChilds.end();
return maIter != maChildren.end();
}
Any SAL_CALL TimeContainerEnumeration::nextElement()
@@ -401,7 +401,7 @@ Any SAL_CALL TimeContainerEnumeration::nextElement()
{
Guard< Mutex > aGuard( maMutex );
if( maIter == maChilds.end() )
if( maIter == maChildren.end() )
throw NoSuchElementException();
return makeAny( (*maIter++) );
@@ -1178,13 +1178,13 @@ Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeExce
{
xNewNode = new AnimationNode( *this );
if( maChilds.size() )
if( maChildren.size() )
{
Reference< XTimeContainer > xContainer( xNewNode, UNO_QUERY );
if( xContainer.is() )
{
ChildList_t::iterator aIter( maChilds.begin() );
ChildList_t::iterator aEnd( maChilds.end() );
ChildList_t::iterator aIter( maChildren.begin() );
ChildList_t::iterator aEnd( maChildren.end() );
while( aIter != aEnd )
{
Reference< XCloneable > xCloneable((*aIter++), UNO_QUERY );
@@ -1813,7 +1813,7 @@ Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException)
sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException)
{
Guard< Mutex > aGuard( maMutex );
return !maChilds.empty();
return !maChildren.empty();
}
// --------------------------------------------------------------------
@@ -1824,7 +1824,7 @@ Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
{
Guard< Mutex > aGuard( maMutex );
return new TimeContainerEnumeration( maChilds);
return new TimeContainerEnumeration( maChildren);
}
// --------------------------------------------------------------------
@@ -1839,14 +1839,14 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Referenc
if( !newChild.is() || !refChild.is() )
throw IllegalArgumentException();
ChildList_t::iterator before = ::std::find(maChilds.begin(), maChilds.end(), refChild);
if( before == maChilds.end() )
ChildList_t::iterator before = ::std::find(maChildren.begin(), maChildren.end(), refChild);
if( before == maChildren.end() )
throw NoSuchElementException();
if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException();
maChilds.insert( before, newChild );
maChildren.insert( before, newChild );
Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
newChild->setParent( xThis );
@@ -1865,18 +1865,18 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference
if( !newChild.is() || !refChild.is() )
throw IllegalArgumentException();
ChildList_t::iterator before = ::std::find(maChilds.begin(), maChilds.end(), refChild);
if( before == maChilds.end() )
ChildList_t::iterator before = ::std::find(maChildren.begin(), maChildren.end(), refChild);
if( before == maChildren.end() )
throw NoSuchElementException();
if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException();
++before;
if( before != maChilds.end() )
maChilds.insert( before, newChild );
if( before != maChildren.end() )
maChildren.insert( before, newChild );
else
maChilds.push_back( newChild );
maChildren.push_back( newChild );
Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
newChild->setParent( xThis );
@@ -1895,11 +1895,11 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc
if( !newChild.is() || !oldChild.is() )
throw IllegalArgumentException();
ChildList_t::iterator replace = ::std::find(maChilds.begin(), maChilds.end(), oldChild);
if( replace == maChilds.end() )
ChildList_t::iterator replace = ::std::find(maChildren.begin(), maChildren.end(), oldChild);
if( replace == maChildren.end() )
throw NoSuchElementException();
if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException();
Reference< XInterface > xNull( 0 );
@@ -1924,14 +1924,14 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference
if( !oldChild.is() )
throw IllegalArgumentException();
ChildList_t::iterator old = ::std::find(maChilds.begin(), maChilds.end(), oldChild);
if( old == maChilds.end() )
ChildList_t::iterator old = ::std::find(maChildren.begin(), maChildren.end(), oldChild);
if( old == maChildren.end() )
throw NoSuchElementException();
Reference< XInterface > xNull( 0 );
oldChild->setParent( xNull );
maChilds.erase( old );
maChildren.erase( old );
return oldChild;
}
@@ -1947,7 +1947,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference
if( !newChild.is() )
throw IllegalArgumentException();
if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException();
Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
@@ -1956,7 +1956,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference
if( xThis == xChild )
throw IllegalArgumentException();
maChilds.push_back( newChild );
maChildren.push_back( newChild );
newChild->setParent( xThis );
autodoc/inc/ary/symtreenode.hxx
+1 -1
View File
@@ -101,7 +101,7 @@ class Node
/** Gets a child with a specific name and of a specific type.
There may be more childs with the same name.
There may be more children with the same name.
@return id_t(0), if no matching child is found.
*/
basctl/source/basicide/baside2.hxx
+1 -1
View File
@@ -225,7 +225,7 @@ public:
WatchTreeListBox( Window* pParent, WinBits nWinBits );
~WatchTreeListBox();
void RequestingChilds( SvLBoxEntry * pParent );
void RequestingChildren( SvLBoxEntry * pParent );
void UpdateWatches( bool bBasicStopped = false );
using SvTabListBox::SetTabs;
basctl/source/basicide/baside2b.cxx
+3 -3
View File
@@ -1758,7 +1758,7 @@ void WatchTreeListBox::SetTabs()
}
}
void WatchTreeListBox::RequestingChilds( SvLBoxEntry * pParent )
void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
{
if( !StarBASIC::IsRunning() )
return;
@@ -2070,12 +2070,12 @@ void implEnableChildren( SvLBoxEntry* pEntry, bool bEnable )
pEntry->SetFlags(
(pEntry->GetFlags() &
~(SV_ENTRYFLAG_NO_NODEBMP | SV_ENTRYFLAG_HAD_CHILDREN))
| SV_ENTRYFLAG_CHILDS_ON_DEMAND );
| SV_ENTRYFLAG_CHILDREN_ON_DEMAND );
}
else
{
pEntry->SetFlags(
(pEntry->GetFlags() & ~(SV_ENTRYFLAG_CHILDS_ON_DEMAND)) );
(pEntry->GetFlags() & ~(SV_ENTRYFLAG_CHILDREN_ON_DEMAND)) );
}
}
basctl/source/basicide/bastype2.hxx
+1 -1
View File
@@ -159,7 +159,7 @@ private:
void SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage );
protected:
virtual void RequestingChilds( SvLBoxEntry* pParent );
virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual void ExpandedHdl();
virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource );
virtual long ExpandingHdl();
basctl/source/basicide/bastype3.cxx
+5 -5
View File
@@ -50,11 +50,11 @@ using namespace ::com::sun::star;
typedef std::deque< SvLBoxEntry* > EntryArray;
void BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
void BasicTreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
{
BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
ScriptDocument aDocument( aDesc.GetDocument() );
OSL_ENSURE( aDocument.isAlive(), "BasicTreeListBox::RequestingChilds: invalid document!" );
OSL_ENSURE( aDocument.isAlive(), "BasicTreeListBox::RequestingChildren: invalid document!" );
if ( !aDocument.isAlive() )
return;
@@ -124,7 +124,7 @@ void BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
}
else
{
OSL_FAIL( "BasicTreeListBox::RequestingChilds: Error loading library!" );
OSL_FAIL( "BasicTreeListBox::RequestingChildren: Error loading library!" );
}
}
}
@@ -137,7 +137,7 @@ void BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
ImpCreateLibSubSubEntriesInVBAMode( pEntry, aDocument, aLibName );
}
else {
OSL_FAIL( "BasicTreeListBox::RequestingChilds: Unknown Type!" );
OSL_FAIL( "BasicTreeListBox::RequestingChildren: Unknown Type!" );
}
}
@@ -146,7 +146,7 @@ void BasicTreeListBox::ExpandedHdl()
SvLBoxEntry* pEntry = GetHdlEntry();
DBG_ASSERT( pEntry, "Was wurde zugeklappt?" );
if ( !IsExpanded( pEntry ) && pEntry->HasChildsOnDemand() )
if ( !IsExpanded( pEntry ) && pEntry->HasChildrenOnDemand() )
{
SvLBoxEntry* pChild = FirstChild( pEntry );
while ( pChild )
basctl/source/dlged/dlgedobj.cxx
+11 -11
View File
@@ -593,7 +593,7 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) throw (Ru
if ( pForm )
{
// stop listening with all children
::std::vector<DlgEdObj*> aChildList = pForm->GetChilds();
::std::vector<DlgEdObj*> aChildList = pForm->GetChildren();
::std::vector<DlgEdObj*>::iterator aIter;
for ( aIter = aChildList.begin() ; aIter != aChildList.end() ; ++aIter )
{
@@ -1428,14 +1428,14 @@ void DlgEdForm::SetPropsFromRect()
void DlgEdForm::AddChild( DlgEdObj* pDlgEdObj )
{
pChilds.push_back( pDlgEdObj );
pChildren.push_back( pDlgEdObj );
}
//----------------------------------------------------------------------------
void DlgEdForm::RemoveChild( DlgEdObj* pDlgEdObj )
{
pChilds.erase( ::std::find( pChilds.begin() , pChilds.end() , pDlgEdObj ) );
pChildren.erase( ::std::find( pChildren.begin() , pChildren.end() , pDlgEdObj ) );
}
//----------------------------------------------------------------------------
@@ -1500,7 +1500,7 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
bool bAdjustedPageSize = pEditor->AdjustPageSize();
SetRectFromProps();
::std::vector< DlgEdObj* >::iterator aIter;
::std::vector< DlgEdObj* > aChildList = ((DlgEdForm*)this)->GetChilds();
::std::vector< DlgEdObj* > aChildList = ((DlgEdForm*)this)->GetChildren();
if ( bAdjustedPageSize )
{
@@ -1590,7 +1590,7 @@ void DlgEdForm::UpdateTabIndices()
{
// stop listening with all children
::std::vector<DlgEdObj*>::iterator aIter;
for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter )
{
(*aIter)->EndListening( sal_False );
}
@@ -1642,7 +1642,7 @@ void DlgEdForm::UpdateTabIndices()
}
// start listening with all children
for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter )
{
(*aIter)->StartListening();
}
@@ -1687,7 +1687,7 @@ void DlgEdForm::UpdateGroups()
if ( xTabModel.is() )
{
// create a global list of controls that belong to the dialog
::std::vector<DlgEdObj*> aChildList = GetChilds();
::std::vector<DlgEdObj*> aChildList = GetChildren();
sal_uInt32 nSize = aChildList.size();
Sequence< Reference< awt::XControl > > aSeqControls( nSize );
for ( sal_uInt32 i = 0; i < nSize; ++i )
@@ -1757,9 +1757,9 @@ void DlgEdForm::NbcMove( const Size& rSize )
SetPropsFromRect();
StartListening();
// set geometry properties of all childs
// set geometry properties of all children
::std::vector<DlgEdObj*>::iterator aIter;
for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter )
{
(*aIter)->EndListening(sal_False);
(*aIter)->SetPropsFromRect();
@@ -1781,9 +1781,9 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract
SetPropsFromRect();
StartListening();
// set geometry properties of all childs
// set geometry properties of all children
::std::vector<DlgEdObj*>::iterator aIter;
for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter )
{
(*aIter)->EndListening(sal_False);
(*aIter)->SetPropsFromRect();
basctl/source/inc/dlgedobj.hxx
+2 -2
View File
@@ -147,7 +147,7 @@ class DlgEdForm: public DlgEdObj
private:
DlgEditor* pDlgEditor;
::std::vector<DlgEdObj*> pChilds;
::std::vector<DlgEdObj*> pChildren;
mutable ::boost::optional< ::com::sun::star::awt::DeviceInfo > mpDeviceInfo;
@@ -169,7 +169,7 @@ public:
virtual void AddChild( DlgEdObj* pDlgEdObj );
virtual void RemoveChild( DlgEdObj* pDlgEdObj );
virtual ::std::vector<DlgEdObj*> GetChilds() const { return pChilds; }
virtual ::std::vector<DlgEdObj*> GetChildren() const { return pChildren; }
virtual void UpdateStep();
basic/source/sbx/sbxvar.cxx
+4 -4
View File
@@ -377,11 +377,11 @@ void SbxVariable::SetParent( SbxObject* p )
{
// then this had to be a child of the new parent
sal_Bool bFound = sal_False;
SbxArray *pChilds = p->GetObjects();
if ( pChilds )
SbxArray *pChildren = p->GetObjects();
if ( pChildren )
{
for ( sal_uInt16 nIdx = 0; !bFound && nIdx < pChilds->Count(); ++nIdx )
bFound = ( this == pChilds->Get(nIdx) );
for ( sal_uInt16 nIdx = 0; !bFound && nIdx < pChildren->Count(); ++nIdx )
bFound = ( this == pChildren->Get(nIdx) );
}
if ( !bFound )
{
connectivity/source/parse/sqlnode.cxx
+1 -1
View File
@@ -1662,7 +1662,7 @@ sal_Bool OSQLParseNode::operator==(OSQLParseNode& rParseNode) const
// Parameters are not equal!
bResult = bResult && !SQL_ISRULE(this, parameter);
// compare childs
// compare children
for (sal_uInt32 i=0; bResult && i < count(); i++)
bResult = *getChild(i) == *rParseNode.getChild(i);
cui/source/customize/acccfg.cxx
+1 -1
View File
@@ -1154,7 +1154,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
TAccInfo* pU1 = new TAccInfo(-1, -1, pUserData->m_aKey);
SvLBoxEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L, sal_True, LIST_APPEND );
pE1->SetUserData(pU1);
pE1->EnableChildsOnDemand( sal_False );
pE1->EnableChildrenOnDemand( sal_False );
}
pIt = aEntriesBox.Next(pIt);
}
cui/source/customize/cfgutil.cxx
+6 -6
View File
@@ -642,7 +642,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
String aTitle(pImp->m_sDlgMacros);
SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
pNewEntry->SetUserData( pInfo );
pNewEntry->EnableChildsOnDemand( sal_True );
pNewEntry->EnableChildrenOnDemand( sal_True );
aArr.Insert( pInfo, aArr.Count() );
}
else
@@ -728,7 +728,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
{
if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER )
{
pNewEntry->EnableChildsOnDemand( sal_True );
pNewEntry->EnableChildrenOnDemand( sal_True );
m = grandchildren.getLength();
}
}
@@ -751,7 +751,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, 0 ); // TODO last parameter should contain user data
aArr.Insert( pInfo, aArr.Count() );
pEntry->SetUserData( pInfo );
pEntry->EnableChildsOnDemand( sal_True );
pEntry->EnableChildrenOnDemand( sal_True );
}
MakeVisible( GetEntry( 0,0 ) );
@@ -1063,7 +1063,7 @@ sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
return bRet;
}
void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
void SfxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry )
/* Beschreibung
Ein Basic oder eine Bibliothek werden ge"offnet
*/
@@ -1148,7 +1148,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
{
if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER )
{
pNewEntry->EnableChildsOnDemand( sal_True );
pNewEntry->EnableChildrenOnDemand( sal_True );
m = grandchildren.getLength();
}
}
@@ -1179,7 +1179,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, pFamily );
aArr.Insert( pGrpInfo, aArr.Count() );
pStyleEntry->SetUserData( pGrpInfo );
pStyleEntry->EnableChildsOnDemand( sal_False );
pStyleEntry->EnableChildrenOnDemand( sal_False );
}
}
break;
cui/source/customize/selector.cxx
+6 -6
View File
@@ -303,7 +303,7 @@ namespace
}
}
void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrowseNode >& _rxRootNode, SvLBoxEntry* _pParentEntry, bool _bCheapChildsOnDemand )
void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrowseNode >& _rxRootNode, SvLBoxEntry* _pParentEntry, bool _bCheapChildrenOnDemand )
{
OSL_PRECOND( _rxRootNode.is(), "SvxConfigGroupListBox_Impl::fillScriptList: invalid root node!" );
if ( !_rxRootNode.is() )
@@ -380,13 +380,13 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
pNewEntry->SetUserData( pInfo );
aArr.Insert( pInfo, aArr.Count() );
if ( _bCheapChildsOnDemand )
if ( _bCheapChildrenOnDemand )
{
/* i30923 - Would be nice if there was a better
* way to determine if a basic lib had children
* without having to ask for them (which forces
* the library to be loaded */
pNewEntry->EnableChildsOnDemand( sal_True );
pNewEntry->EnableChildrenOnDemand( sal_True );
}
else
{
@@ -399,7 +399,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
{
if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER )
{
pNewEntry->EnableChildsOnDemand( sal_True );
pNewEntry->EnableChildrenOnDemand( sal_True );
break;
}
}
@@ -565,7 +565,7 @@ void SvxConfigGroupListBox_Impl::Init()
SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
pNewEntry->SetUserData( pInfo );
pNewEntry->EnableChildsOnDemand( sal_True );
pNewEntry->EnableChildrenOnDemand( sal_True );
aArr.Insert( pInfo, aArr.Count() );
}
else
@@ -899,7 +899,7 @@ sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
return bRet;
}
void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
void SvxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry )
{
SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData();
pInfo->bWasOpened = sal_True;
cui/source/dialogs/scriptdlg.cxx
+5 -5
View File
@@ -423,7 +423,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
}
SAL_WNODEPRECATED_DECLARATIONS_POP
void SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
void SFTreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
{
SFEntry* userData = 0;
if ( !pEntry )
@@ -992,7 +992,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
while ( !bValid );
// open up parent node (which ensures it's loaded)
aScriptsBox.RequestingChilds( pEntry );
aScriptsBox.RequestingChildren( pEntry );
Sequence< Any > args( 1 );
args[ 0 ] <<= aNewName;
@@ -1044,8 +1044,8 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
SAL_WNODEPRECATED_DECLARATIONS_POP
// If the Parent is not loaded then set to
// loaded, this will prevent RequestingChilds ( called
// from vcl via RequestingChilds ) from
// loaded, this will prevent RequestingChildren ( called
// from vcl via RequestingChildren ) from
// creating new ( duplicate ) children
SFEntry* userData = (SFEntry*)pEntry->GetUserData();
if ( userData && !userData->isLoaded() )
@@ -1284,7 +1284,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
}
if ( !pTmpEntry )
break;
aScriptsBox.RequestingChilds( pEntry );
aScriptsBox.RequestingChildren( pEntry );
}
aScriptsBox.SetCurEntry( pEntry );
}
cui/source/inc/cfgutil.hxx
+1 -1
View File
@@ -182,7 +182,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
SfxStylesInfo_Impl* pStylesInfo;
protected:
virtual void RequestingChilds( SvLBoxEntry *pEntry);
virtual void RequestingChildren( SvLBoxEntry *pEntry);
using SvListView::Expand;
virtual sal_Bool Expand( SvLBoxEntry* pParent );
cui/source/inc/scriptdlg.hxx
+1 -1
View File
@@ -86,7 +86,7 @@ private:
protected:
void ExpandTree( SvLBoxEntry* pRootEntry );
virtual void RequestingChilds( SvLBoxEntry* pParent );
virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual void ExpandedHdl();
virtual long ExpandingHdl();
public:
cui/source/inc/selector.hxx
+2 -2
View File
@@ -162,11 +162,11 @@ private:
void fillScriptList(
const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxRootNode,
SvLBoxEntry* _pParentEntry,
bool _bCheapChildsOnDemand
bool _bCheapChildrenOnDemand
);
protected:
virtual void RequestingChilds( SvLBoxEntry *pEntry);
virtual void RequestingChildren( SvLBoxEntry *pEntry);
virtual sal_Bool Expand( SvLBoxEntry* pParent );
using SvListView::Expand;
dbaccess/source/ui/browser/formadapter.cxx
+1 -1
View File
@@ -1149,7 +1149,7 @@ void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException )
m_aDisposeListeners.disposeAndClear(aEvt);
m_aContainerListeners.disposeAndClear(aEvt);
// dispose all childs
// dispose all children
for ( ::std::vector< Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = m_aChildren.begin();
aIter != m_aChildren.end();
++aIter
dbaccess/source/ui/browser/unodatbr.cxx
+3 -3
View File
@@ -2142,7 +2142,7 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image& _rDb
m_pTreeView->getListBox().InsertEntry(
_rQueryName, _rQueryImage, _rQueryImage, pDatasourceEntry,
sal_True /*ChildsOnDemand*/, LIST_APPEND, pQueriesData );
sal_True /*ChildrenOnDemand*/, LIST_APPEND, pQueriesData );
}
// the child for the tables container
@@ -2152,7 +2152,7 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image& _rDb
m_pTreeView->getListBox().InsertEntry(
_rTableName, _rTableImage, _rTableImage, pDatasourceEntry,
sal_True /*ChildsOnDemand*/, LIST_APPEND, pTablesData );
sal_True /*ChildrenOnDemand*/, LIST_APPEND, pTablesData );
}
}
@@ -2228,7 +2228,7 @@ SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const
//------------------------------------------------------------------------------
IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent)
{
if (_pParent->HasChilds())
if (_pParent->HasChildren())
// nothing to to ...
return 1L;
dbaccess/source/ui/control/FieldDescControl.cxx
+1 -1
View File
@@ -263,7 +263,7 @@ OFieldDescControl::~OFieldDescControl()
pLastFocusWindow = NULL;
//////////////////////////////////////////////////////////////////////
// Childs zerstoeren
// Children zerstoeren
DeactivateAggregate( tpDefault );
DeactivateAggregate( tpRequired );
DeactivateAggregate( tpTextLen );
dbaccess/source/ui/control/dbtreelistbox.cxx
+6 -6
View File
@@ -120,14 +120,14 @@ DBTreeListBox::~DBTreeListBox()
SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* pStart, const IEntryFilter* _pFilter ) const
{
SvLBoxTreeList* myModel = GetModel();
SvTreeEntryList* pChilds = myModel->GetChildList(pStart);
SvTreeEntryList* pChildren = myModel->GetChildList(pStart);
SvLBoxEntry* pEntry = NULL;
if ( pChilds )
if ( pChildren )
{
size_t nCount = pChilds->size();
size_t nCount = pChildren->size();
for (size_t i = 0; i < nCount; ++i)
{
pEntry = static_cast<SvLBoxEntry*>((*pChilds)[ i ]);
pEntry = static_cast<SvLBoxEntry*>((*pChildren)[ i ]);
SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
if ( pItem->GetText().Equals(aName) )
{
@@ -149,7 +149,7 @@ void DBTreeListBox::EnableExpandHandler(SvLBoxEntry* _pEntry)
}
// -------------------------------------------------------------------------
void DBTreeListBox::RequestingChilds( SvLBoxEntry* pParent )
void DBTreeListBox::RequestingChildren( SvLBoxEntry* pParent )
{
if (m_aPreExpandHandler.IsSet())
{
@@ -216,7 +216,7 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
IMPL_LINK(DBTreeListBox, OnResetEntry, SvLBoxEntry*, pEntry)
{
// set the flag which allows if the entry can be expanded
pEntry->SetFlags( (pEntry->GetFlags() & ~(SV_ENTRYFLAG_NO_NODEBMP | SV_ENTRYFLAG_HAD_CHILDREN)) | SV_ENTRYFLAG_CHILDS_ON_DEMAND );
pEntry->SetFlags( (pEntry->GetFlags() & ~(SV_ENTRYFLAG_NO_NODEBMP | SV_ENTRYFLAG_HAD_CHILDREN)) | SV_ENTRYFLAG_CHILDREN_ON_DEMAND );
// redraw the entry
GetModel()->InvalidateEntry( pEntry );
return 0L;
dbaccess/source/ui/control/marktree.cxx
+3 -3
View File
@@ -117,7 +117,7 @@ void OMarkableTreeListBox::KeyInput( const KeyEvent& rKEvt )
SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry)
{
SvButtonState eState = GetCheckButtonState(_pEntry);
if (!GetModel()->HasChilds(_pEntry))
if (!GetModel()->HasChildren(_pEntry))
// nothing to do in this bottom-up routine if there are no children ...
return eState;
#ifdef DBG_UTIL
@@ -202,7 +202,7 @@ void OMarkableTreeListBox::CheckButtonHdl()
void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
{
SvButtonState eState = GetCheckButtonState( _pEntry);
if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken
if (GetModel()->HasChildren(_pEntry)) // Falls Kinder, dann diese auch checken
{
SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry);
SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry);
@@ -217,7 +217,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
while(pEntry)
{
SetCheckButtonState(pEntry,eState);
if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken
if(GetModel()->HasChildren(pEntry)) // Falls Kinder, dann diese auch checken
{
SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry);
SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry);
dbaccess/source/ui/control/tabletree.cxx
+2 -2
View File
@@ -398,7 +398,7 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked,
// special emphasizing handling for the "all objects" entry
sal_Bool bAllObjectsEntryAffected = haveVirtualRoot() && (getAllObjectsEntry() == _pEntry);
if ( GetModel()->HasChilds(_pEntry) // the entry has children
if ( GetModel()->HasChildren(_pEntry) // the entry has children
|| bAllObjectsEntryAffected // or it is the "all objects" entry
)
{
@@ -416,7 +416,7 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked,
SvLBoxEntry* pChildLoop = FirstChild(_pEntry);
while (pChildLoop)
{
if (GetModel()->HasChilds(pChildLoop))
if (GetModel()->HasChildren(pChildLoop))
implEmphasize(pChildLoop, sal_False, sal_True, sal_False);
pChildLoop = NextSibling(pChildLoop);
}
dbaccess/source/ui/dlg/adtabdlg.cxx
+3 -3
View File
@@ -217,7 +217,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
m_rTableList.UpdateTableList( m_xConnection, sTables, sViews );
SvLBoxEntry* pEntry = m_rTableList.First();
while( pEntry && m_rTableList.GetModel()->HasChilds( pEntry ) )
while( pEntry && m_rTableList.GetModel()->HasChildren( pEntry ) )
{
m_rTableList.Expand( pEntry );
pEntry = m_rTableList.Next( pEntry );
@@ -235,7 +235,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
bool TableListFacade::isLeafSelected() const
{
SvLBoxEntry* pEntry = m_rTableList.FirstSelected();
return pEntry && !m_rTableList.GetModel()->HasChilds( pEntry );
return pEntry && !m_rTableList.GetModel()->HasChildren( pEntry );
}
//==============================================================================
@@ -335,7 +335,7 @@ String QueryListFacade::getSelectedName( String& _out_rAliasName ) const
bool QueryListFacade::isLeafSelected() const
{
SvLBoxEntry* pEntry = m_rQueryList.FirstSelected();
return pEntry && !m_rQueryList.GetModel()->HasChilds( pEntry );
return pEntry && !m_rQueryList.GetModel()->HasChildren( pEntry );
}
//==============================================================================
dbaccess/source/ui/dlg/tablespage.cxx
+1 -1
View File
@@ -492,7 +492,7 @@ DBG_NAME(OTableSubscriptionPage)
SvLBoxEntry* pSchema = NULL;
SvLBoxEntry* pCatalog = NULL;
if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChilds(pEntry))
if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChildren(pEntry))
{ // checked and a leaf, which means it's no catalog, no schema, but a real table
::rtl::OUString sCatalog;
if(m_aTablesList.GetModel()->HasParent(pEntry))
dbaccess/source/ui/inc/TableDesignView.hxx
+1 -1
View File
@@ -47,7 +47,7 @@ namespace dbaui
OTableEditorCtrl* m_pEditorCtrl;
void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
void ArrangeChilds( long nSplitPos ,Rectangle& rRect);
void ArrangeChildren( long nSplitPos ,Rectangle& rRect);
DECL_LINK( SplitHdl, Splitter* );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
dbaccess/source/ui/inc/dbtreelistbox.hxx
+1 -1
View File
@@ -122,7 +122,7 @@ namespace dbaui
void EnableExpandHandler(SvLBoxEntry* _pEntry);
SvLBoxEntry* GetEntryPosByName( const String& aName, SvLBoxEntry* pStart = NULL, const IEntryFilter* _pFilter = NULL ) const;
virtual void RequestingChilds( SvLBoxEntry* pParent );
virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual void SelectHdl();
virtual void DeselectHdl();
// Window
dbaccess/source/ui/tabledesign/TableDesignView.cxx
+2 -2
View File
@@ -59,7 +59,7 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD
ImplInitSettings( sal_True, sal_True, sal_True );
//////////////////////////////////////////////////////////////////////
// Childs erzeugen
// Children erzeugen
m_pEditorCtrl = new OTableEditorCtrl( this);
m_pFieldDescWin = new OTableFieldDescWin( this );
@@ -77,7 +77,7 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD
OTableBorderWindow::~OTableBorderWindow()
{
//////////////////////////////////////////////////////////////////////
// Childs zerstoeren
// Children zerstoeren
// ::dbaui::notifySystemWindow(this,m_pFieldDescWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
m_pEditorCtrl->Hide();
m_pFieldDescWin->Hide();
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+1 -1
View File
@@ -87,7 +87,7 @@ OTableFieldDescWin::~OTableFieldDescWin()
{
DBG_DTOR(OTableFieldDescWin,NULL);
//////////////////////////////////////////////////////////////////////
// Childs zerstoeren
// Children zerstoeren
m_pHelpBar->Hide();
getGenPage()->Hide();
m_pHeader->Hide();
dmake/unix/runargv.c
+3 -3
View File
@@ -577,7 +577,7 @@ char **cmd; /* Simulate a reference to *cmd. */
/* Really spawn or fork a child. */
#if defined( USE_SPAWN )
/* As no other childs are started while the output is redirected this
/* As no other children are started while the output is redirected this
* is save. */
if( Is_exec_shell ) {
/* Add error checking? */
@@ -781,7 +781,7 @@ int pqid;
return 0;
} else {
Fatal( "dmake was interrupted or a child terminated. "
"Stopping all childs ..." );
"Stopping all children ..." );
}
} else {
/* The child we were waiting for is missing or no child is
@@ -803,7 +803,7 @@ int pqid;
}
_proc_cnt = 0;
}
/* The pid we were waiting for or any of the remaining childs
/* The pid we were waiting for or any of the remaining children
* (pid == -1) is missing. This should not happen and means
* that the process got lost or was treated elsewhere. */
Fatal( "Internal Error: Child is missing but still listed in _procs[x] %d: %s\n"
drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+1 -1
View File
@@ -319,7 +319,7 @@ namespace drawinglayer
if(aMetaFileRealSize.getWidth() > aMetaFilePrefSize.getWidth()
|| aMetaFileRealSize.getHeight() > aMetaFilePrefSize.getHeight())
{
// clipping needed. Embed to MaskPrimitive2D. Create childs and mask polygon
// clipping needed. Embed to MaskPrimitive2D. Create children and mask polygon
const primitive2d::Primitive2DSequence aChildContent(&xPrimitive, 1);
basegfx::B2DPolygon aMaskPolygon(basegfx::tools::createUnitPolygon());
aMaskPolygon.transform(aTransform);
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+1 -1
View File
@@ -2021,7 +2021,7 @@ namespace drawinglayer
mpPDFExtOutDevData->BeginStructureElement(rTagElement);
}
// proccess childs normally
// proccess children normally
process(rStructureTagCandidate.getChildren());
if(mpPDFExtOutDevData && bTagUsed)
editeng/inc/editeng/outliner.hxx
+4 -4
View File
@@ -234,7 +234,7 @@ private:
EDITENG_DLLPRIVATE sal_uLong ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
EDITENG_DLLPRIVATE void ImpToggleExpand( Paragraph* pParentPara );
EDITENG_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds );
EDITENG_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChildren );
EDITENG_DLLPRIVATE Pointer ImpGetMousePointer( MouseTarget eTarget );
EDITENG_DLLPRIVATE sal_uInt16 ImpInitPaste( sal_uLong& rStart );
@@ -279,7 +279,7 @@ public:
// Retruns the number of selected paragraphs
sal_uLong Select( Paragraph* pParagraph,
sal_Bool bSelect=sal_True,
sal_Bool bWChilds=sal_True);
sal_Bool bWChildren=sal_True);
String GetSelected() const;
void SelectRange( sal_uLong nFirst, sal_uInt16 nCount );
@@ -626,7 +626,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
sal_Bool ImplHasBullet( sal_uInt16 nPara ) const;
Size ImplGetBulletSize( sal_uInt16 nPara );
sal_uInt16 ImplGetNumbering( sal_uInt16 nPara, const SvxNumberFormat* pParaFmt );
void ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChilds );
void ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChildren );
String ImplGetBulletText( sal_uInt16 nPara );
void ImplCheckNumBulletItem( sal_uInt16 nPara );
void ImplInitDepth( sal_uInt16 nPara, sal_Int16 nDepth, sal_Bool bCreateUndo, sal_Bool bUndoAction = sal_False );
@@ -733,7 +733,7 @@ public:
Paragraph* GetParagraph( sal_uLong nAbsPos ) const;
sal_Bool HasParent( Paragraph* pParagraph ) const;
sal_Bool HasChilds( Paragraph* pParagraph ) const;
sal_Bool HasChildren( Paragraph* pParagraph ) const;
sal_uLong GetChildCount( Paragraph* pParent ) const;
sal_Bool IsExpanded( Paragraph* pPara ) const;
Paragraph* GetParent( Paragraph* pParagraph ) const;
editeng/source/accessibility/AccessibleEditableTextPara.cxx
+1 -1
View File
@@ -805,7 +805,7 @@ namespace accessibility
SolarMutexGuard aGuard;
if( !HaveChildren() )
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No childs available")),
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No children available")),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy
editeng/source/accessibility/AccessibleImageBullet.cxx
+1 -1
View File
@@ -136,7 +136,7 @@ namespace accessibility
DBG_CHKTHIS( AccessibleImageBullet, NULL );
(void)i;
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No childs available")),
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No children available")),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy
}
editeng/source/outliner/outlin2.cxx
+1 -1
View File
@@ -279,7 +279,7 @@ void Outliner::SetMaxAutoPaperSize( const Size& rSz )
sal_Bool Outliner::IsExpanded( Paragraph* pPara ) const
{
DBG_CHKTHIS(Outliner,0);
return pParaList->HasVisibleChilds( pPara );
return pParaList->HasVisibleChildren( pPara );
}
Paragraph* Outliner::GetParent( Paragraph* pParagraph ) const
editeng/source/outliner/outliner.cxx
+7 -7
View File
@@ -795,7 +795,7 @@ sal_Bool Outliner::Expand( Paragraph* pPara )
{
DBG_CHKTHIS(Outliner,0);
if ( pParaList->HasHiddenChilds( pPara ) )
if ( pParaList->HasHiddenChildren( pPara ) )
{
OLUndoExpand* pUndo = 0;
sal_Bool bUndo = IsUndoEnabled() && !IsInUndo();
@@ -825,7 +825,7 @@ sal_Bool Outliner::Expand( Paragraph* pPara )
sal_Bool Outliner::Collapse( Paragraph* pPara )
{
DBG_CHKTHIS(Outliner,0);
if ( pParaList->HasVisibleChilds( pPara ) ) // expanded
if ( pParaList->HasVisibleChildren( pPara ) ) // expanded
{
OLUndoExpand* pUndo = 0;
sal_Bool bUndo = sal_False;
@@ -1070,7 +1070,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point& rStartPos,
}
// In case of collapsed subparagraphs paint a line before the text.
if( pParaList->HasChilds(pPara) && !pParaList->HasVisibleChilds(pPara) &&
if( pParaList->HasChildren(pPara) && !pParaList->HasVisibleChildren(pPara) &&
!bStrippingPortions && !nOrientation )
{
long nWidth = pOutDev->PixelToLogic( Size( 10, 0 ) ).Width();
@@ -1439,10 +1439,10 @@ Paragraph* Outliner::GetParagraph( sal_uLong nAbsPos ) const
return pParaList->GetParagraph( nAbsPos );
}
sal_Bool Outliner::HasChilds( Paragraph* pParagraph ) const
sal_Bool Outliner::HasChildren( Paragraph* pParagraph ) const
{
DBG_CHKTHIS(Outliner,0);
return pParaList->HasChilds( pParagraph );
return pParaList->HasChildren( pParagraph );
}
sal_Bool Outliner::ImplHasBullet( sal_uInt16 nPara ) const
@@ -1929,7 +1929,7 @@ sal_uInt16 Outliner::ImplGetNumbering( sal_uInt16 nPara, const SvxNumberFormat*
return nNumber;
}
void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChilds )
void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChildren )
{
DBG_CHKTHIS(Outliner,0);
@@ -1966,7 +1966,7 @@ void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_
sal_Int16 nDepth = pPara->GetDepth();
pPara = pParaList->GetParagraph( ++nPara );
if ( !bRecalcChilds )
if ( !bRecalcChildren )
{
while ( pPara && ( pPara->GetDepth() > nDepth ) )
pPara = pParaList->GetParagraph( ++nPara );
editeng/source/outliner/outlvw.cxx
+13 -13
View File
@@ -228,12 +228,12 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
if( !bSelection &&
aSel.nEndPos == pOwner->pEditEngine->GetTextLen( aSel.nEndPara ) )
{
sal_uLong nChilds = pOwner->pParaList->GetChildCount(pPara);
if( nChilds && !pOwner->pParaList->HasVisibleChilds(pPara))
sal_uLong nChildren = pOwner->pParaList->GetChildCount(pPara);
if( nChildren && !pOwner->pParaList->HasVisibleChildren(pPara))
{
pOwner->UndoActionStart( OLUNDO_INSERT );
sal_uLong nTemp = aSel.nEndPara;
nTemp += nChilds;
nTemp += nChildren;
nTemp++; // insert above next Non-Child
pOwner->Insert( String(),nTemp,pPara->GetDepth());
// Position the cursor
@@ -351,17 +351,17 @@ sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
if ( eTarget == MouseBullet )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
sal_Bool bHasChilds = (pPara && pOwner->pParaList->HasChilds(pPara));
sal_Bool bHasChildren = (pPara && pOwner->pParaList->HasChildren(pPara));
if( rMEvt.GetClicks() == 1 )
{
sal_uLong nEndPara = nPara;
if ( bHasChilds && pOwner->pParaList->HasVisibleChilds(pPara) )
if ( bHasChildren && pOwner->pParaList->HasVisibleChildren(pPara) )
nEndPara += pOwner->pParaList->GetChildCount( pPara );
// The selection is inverted, so that EditEngine does not scroll
ESelection aSel((sal_uInt16)nEndPara, 0xffff,(sal_uInt16)nPara, 0 );
pEditView->SetSelection( aSel );
}
else if( rMEvt.GetClicks() == 2 && bHasChilds )
else if( rMEvt.GetClicks() == 2 && bHasChildren )
ImpToggleExpand( pPara );
aDDStartPosPix = rMEvt.GetPosPixel();
@@ -375,7 +375,7 @@ sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
ESelection aSel( pEditView->GetSelection() );
nPara = aSel.nStartPara;
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
if( (pPara && pOwner->pParaList->HasChilds(pPara)) && pPara->HasFlag(PARAFLAG_ISPAGE) )
if( (pPara && pOwner->pParaList->HasChildren(pPara)) && pPara->HasFlag(PARAFLAG_ISPAGE) )
{
ImpToggleExpand( pPara );
}
@@ -406,12 +406,12 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara )
sal_uInt16 nPara = (sal_uInt16) pOwner->pParaList->GetAbsPos( pPara );
pEditView->SetSelection( ESelection( nPara, 0, nPara, 0 ) );
ImplExpandOrCollaps( nPara, nPara, !pOwner->pParaList->HasVisibleChilds( pPara ) );
ImplExpandOrCollaps( nPara, nPara, !pOwner->pParaList->HasVisibleChildren( pPara ) );
pEditView->ShowCursor();
}
sal_uLong OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
sal_Bool bWithChilds )
sal_Bool bWithChildren )
{
DBG_CHKTHIS(OutlinerView,0);
@@ -421,7 +421,7 @@ sal_uLong OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
nEnd = 0xffff;
sal_uLong nChildCount = 0;
if ( bWithChilds )
if ( bWithChildren )
nChildCount = pOwner->pParaList->GetChildCount( pParagraph );
ESelection aSel( (sal_uInt16)nPara, 0,(sal_uInt16)(nPara+nChildCount), nEnd );
@@ -460,7 +460,7 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
pEditView->SetEditEngineUpdateMode( bUpdate );
}
ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds )
ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChildren )
{
DBG_CHKTHIS( OutlinerView, 0 );
@@ -469,10 +469,10 @@ ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds
aParas.Adjust();
// Record the invisible Children of the last Parents in the selection
if ( bIncludeHiddenChilds )
if ( bIncludeHiddenChildren )
{
Paragraph* pLast = pOwner->pParaList->GetParagraph( aParas.nEndPara );
if ( pOwner->pParaList->HasHiddenChilds( pLast ) )
if ( pOwner->pParaList->HasHiddenChildren( pLast ) )
aParas.nEndPara =
sal::static_int_cast< sal_uInt16 >(
aParas.nEndPara +
editeng/source/outliner/paralist.cxx
+3 -3
View File
@@ -178,21 +178,21 @@ void ParagraphList::MoveParagraphs( sal_uLong nStart, sal_uLong nDest, sal_uLong
}
}
sal_Bool ParagraphList::HasChilds( Paragraph* pParagraph ) const
sal_Bool ParagraphList::HasChildren( Paragraph* pParagraph ) const
{
sal_uLong n = GetAbsPos( pParagraph );
Paragraph* pNext = GetParagraph( ++n );
return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) ) ? sal_True : sal_False;
}
sal_Bool ParagraphList::HasHiddenChilds( Paragraph* pParagraph ) const
sal_Bool ParagraphList::HasHiddenChildren( Paragraph* pParagraph ) const
{
sal_uLong n = GetAbsPos( pParagraph );
Paragraph* pNext = GetParagraph( ++n );
return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible() ) ? sal_True : sal_False;
}
sal_Bool ParagraphList::HasVisibleChilds( Paragraph* pParagraph ) const
sal_Bool ParagraphList::HasVisibleChildren( Paragraph* pParagraph ) const
{
sal_uLong n = GetAbsPos( pParagraph );
Paragraph* pNext = GetParagraph( ++n );
editeng/source/outliner/paralist.hxx
+3 -3
View File
@@ -58,9 +58,9 @@ public:
void MoveParagraphs( sal_uLong nStart, sal_uLong nDest, sal_uLong nCount );
Paragraph* GetParent( Paragraph* pParagraph /*, sal_uInt16& rRelPos */ ) const;
sal_Bool HasChilds( Paragraph* pParagraph ) const;
sal_Bool HasHiddenChilds( Paragraph* pParagraph ) const;
sal_Bool HasVisibleChilds( Paragraph* pParagraph ) const;
sal_Bool HasChildren( Paragraph* pParagraph ) const;
sal_Bool HasHiddenChildren( Paragraph* pParagraph ) const;
sal_Bool HasVisibleChildren( Paragraph* pParagraph ) const;
sal_uLong GetChildCount( Paragraph* pParagraph ) const;
void Expand( Paragraph* pParent );
extensions/source/propctrlr/selectlabeldialog.cxx
+1 -1
View File
@@ -216,7 +216,7 @@ namespace pcr
++nChildren;
}
else
{ // oops, no valid childs -> remove the entry
{ // oops, no valid children -> remove the entry
m_aControlTree.ModelIsRemoving(pCont);
m_aControlTree.GetModel()->Remove(pCont);
m_aControlTree.ModelHasRemoved(pCont);
forms/source/inc/InterfaceContainer.hxx
+1 -1
View File
@@ -267,7 +267,7 @@ protected:
/** validates the given index
@throws ::com::sun::star::lang::IndexOutOfBoundsException
if the given index does not denote a valid position in our childs array
if the given index does not denote a valid position in our children array
*/
void implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) );
forms/source/xforms/binding.cxx
+1 -1
View File
@@ -751,7 +751,7 @@ void Binding::valueModified()
maValidityListeners.end(),
::std::bind2nd( ::std::ptr_fun( lcl_validate ), xSource ) );
// now distribute MIPs to childs
// now distribute MIPs to children
if( xNode.is() )
distributeMIP( xNode->getFirstChild() );
}
forms/source/xforms/binding.hxx
+1 -1
View File
@@ -371,7 +371,7 @@ private:
/// 'clear' this binding - remove all listeners, etc.
void clear();
/// distribute MIPs from current node recursively to childs
/// distribute MIPs from current node recursively to children
void distributeMIP( const XNode_t &rxNode );
/// implement get*Namespaces()
framework/inc/classes/framecontainer.hxx
+2 -2
View File
@@ -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
framework/inc/helper/oframes.hxx
+1 -1
View File
@@ -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
framework/inc/helper/statusindicatorfactory.hxx
+1 -1
View File
@@ -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. */
framework/inc/services/desktop.hxx
+1 -1
View File
@@ -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"!
framework/source/helper/oframes.cxx
+1 -1
View File
@@ -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!!!
framework/source/jobs/helponstartup.cxx
+2 -2
View File
@@ -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())
framework/source/services/desktop.cxx
+8 -8
View File
@@ -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.
framework/source/services/frame.cxx
+5 -5
View File
@@ -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 )
l10ntools/inc/xmlparse.hxx
+1 -1
View File
@@ -174,7 +174,7 @@ public:
virtual int GetPosition( ByteString id );
int RemoveChild( XMLElement *pRefElement );
void RemoveAndDeleteAllChilds();
void RemoveAndDeleteAllChildren();
/// returns a child element which matches the given one
XMLElement *GetChildElement(
l10ntools/source/filter/utils/FileHelper.java
+8 -8
View File
@@ -307,22 +307,22 @@ public class FileHelper
if (!aDirectory.isDirectory())
throw new java.io.FileNotFoundException("\""+aDirectory.toString()+"\" is not a directory.");
java.io.File[] lChilds = aDirectory.listFiles();
for (int f=0; f<lChilds.length; ++f)
java.io.File[] lChildren = aDirectory.listFiles();
for (int f=0; f<lChildren.length; ++f)
{
if (lChilds[f].isDirectory())
if (lChildren[f].isDirectory())
{
FileHelper.makeDirectoryEmpty(lChilds[f], bFilesOnly);
FileHelper.makeDirectoryEmpty(lChildren[f], bFilesOnly);
if (!bFilesOnly)
{
if (!lChilds[f].delete())
throw new java.io.IOException("\""+lChilds[f].toString()+"\" could not be deleted.");
if (!lChildren[f].delete())
throw new java.io.IOException("\""+lChildren[f].toString()+"\" could not be deleted.");
}
}
else
{
if (!lChilds[f].delete())
throw new java.io.IOException("\""+lChilds[f].toString()+"\" could not be deleted.");
if (!lChildren[f].delete())
throw new java.io.IOException("\""+lChildren[f].toString()+"\" could not be deleted.");
}
}
}
l10ntools/source/filter/utils/XMLHelper.java
+18 -18
View File
@@ -674,7 +674,7 @@ public class XMLHelper
//___________________________________________
/** returns a list of childs, which are ELEMENT_NODES and have the right tag name.
/** returns a list of children, which are ELEMENT_NODES and have the right tag name.
*
* It analyze the list of all possible child nodes. Only ELEMENT_NODES are candidates.
* All other ones will be ignored. Further these element nodes are compared by it's tag
@@ -695,26 +695,26 @@ public class XMLHelper
{
// extract first all ELEMENT_NODES of he given parent
// Such nodes only provide tag names.
java.util.Vector lChilds = XMLHelper.extractChildNodesByType(aNode,org.w3c.dom.Node.ELEMENT_NODE);
java.util.Vector lExtractedChilds = new java.util.Vector(lChilds.size());
java.util.Vector lChildren = XMLHelper.extractChildNodesByType(aNode,org.w3c.dom.Node.ELEMENT_NODE);
java.util.Vector lExtractedChildren = new java.util.Vector(lChildren.size());
// step over the list and search for the right tags using the specified name
java.util.Enumeration en = lChilds.elements();
java.util.Enumeration en = lChildren.elements();
while (en.hasMoreElements())
{
org.w3c.dom.Node aChild = (org.w3c.dom.Node)en.nextElement();
if (aChild.getNodeName().equals(sTag))
lExtractedChilds.add(aChild);
lExtractedChildren.add(aChild);
}
// pack(!) and return the list
lExtractedChilds.trimToSize();
return lExtractedChilds;
lExtractedChildren.trimToSize();
return lExtractedChildren;
}
//___________________________________________
/** returns a list of childs, which supports the right node type.
/** returns a list of children, which supports the right node type.
*
* It analyze the list of all possible child nodes. If a node represent the right node type
* it is added to the return list. Otherwhise it will be ignored.
@@ -731,23 +731,23 @@ public class XMLHelper
public static java.util.Vector extractChildNodesByType(org.w3c.dom.Node aNode,
short nType)
{
// get list of all possibe childs and reserve enough space for our return list
// Attention: A null pointer is not allowed for return! (means lExtractedChilds)
org.w3c.dom.NodeList lChilds = aNode.getChildNodes();
int c = lChilds.getLength();
java.util.Vector lExtractedChilds = new java.util.Vector(c);
// get list of all possibe children and reserve enough space for our return list
// Attention: A null pointer is not allowed for return! (means lExtractedChildren)
org.w3c.dom.NodeList lChildren = aNode.getChildNodes();
int c = lChildren.getLength();
java.util.Vector lExtractedChildren = new java.util.Vector(c);
// step of these childs and select only needed ones
// step of these children and select only needed ones
for (int i=0; i<c; ++i)
{
org.w3c.dom.Node aChild = lChilds.item(i);
org.w3c.dom.Node aChild = lChildren.item(i);
if (aChild.getNodeType() == nType)
lExtractedChilds.add(aChild);
lExtractedChildren.add(aChild);
}
// pack(!) and return the list
lExtractedChilds.trimToSize();
return lExtractedChilds;
lExtractedChildren.trimToSize();
return lExtractedChildren;
}
//___________________________________________
l10ntools/source/helpmerge.cxx
+1 -1
View File
@@ -573,7 +573,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
if( pXMLElement != NULL )
{
data = new XMLData( sNewdata , NULL , true ); // Add new one
pXMLElement->RemoveAndDeleteAllChilds();
pXMLElement->RemoveAndDeleteAllChildren();
pXMLElement->AddChild( data );
aLangHM->erase( sCur );
}
l10ntools/source/xmlparse.cxx
+3 -3
View File
@@ -79,7 +79,7 @@ XMLParentNode::~XMLParentNode()
/*****************************************************************************/
{
if( pChildList ){
RemoveAndDeleteAllChilds();
RemoveAndDeleteAllChildren();
delete pChildList;
pChildList = NULL;
}
@@ -117,7 +117,7 @@ XMLParentNode& XMLParentNode::operator=(const XMLParentNode& obj){
if(this!=&obj){
XMLChildNode::operator=(obj);
if( pChildList ){
RemoveAndDeleteAllChilds();
RemoveAndDeleteAllChildren();
delete pChildList;
pChildList = NULL;
}
@@ -227,7 +227,7 @@ int XMLParentNode::RemoveChild( XMLElement *pRefElement )
}
/*****************************************************************************/
void XMLParentNode::RemoveAndDeleteAllChilds(){
void XMLParentNode::RemoveAndDeleteAllChildren(){
/*****************************************************************************/
if ( pChildList ) {
for ( size_t i = 0; i < pChildList->size(); i++ )
moz/seamonkey-source-1.1.14.patch
+73 -73
View File
@@ -4601,35 +4601,35 @@
+ */
+ //update OUTLOOK_EMAIL_LIST1
+ ULONG listTag=GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST1) | PT_MV_BINARY;
+ SBinaryArray oldChilds;
+ SBinaryArray oldChildren;
+ LPSBinary bins=NULL;
+ SBinaryArray newChilds;
+ SBinaryArray newChildren;
+ LPSPropValue oldChildValue = NULL ;
+ ULONG valueCount = 0 ;
+
+ if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
+ {
+ PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
+ PRINTF(("Cannot get old children %08x.\n", mLastError)) ;
+ return FALSE;
+ }
+
+ if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
+ {
+ oldChilds = oldChildValue->Value.MVbin;
+ newChilds.cValues=oldChilds.cValues + 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
+ newChilds.lpbin = bins;
+ for (ULONG i=0;i<oldChilds.cValues;i++)
+ oldChildren = oldChildValue->Value.MVbin;
+ newChildren.cValues=oldChildren.cValues + 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
+ newChildren.lpbin = bins;
+ for (ULONG i=0;i<oldChildren.cValues;i++)
+ {
+ newChilds.lpbin[i].lpb = oldChilds.lpbin[i].lpb;
+ newChilds.lpbin[i].cb = oldChilds.lpbin[i].cb;
+ newChildren.lpbin[i].lpb = oldChildren.lpbin[i].lpb;
+ newChildren.lpbin[i].cb = oldChildren.lpbin[i].cb;
+ }
+ }
+ else
+ {
+ newChilds.cValues = 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
+ newChilds.lpbin = bins;
+ newChildren.cValues = 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
+ newChildren.lpbin = bins;
+ }
+
+ nsMapiEntry orgEntryID;
@@ -4639,17 +4639,17 @@
+ {
+ return FALSE;
+ }
+ newChilds.lpbin[newChilds.cValues-1].lpb = NS_REINTERPRET_CAST(unsigned char *, orgEntryID.mEntryId);
+ newChilds.lpbin[newChilds.cValues-1].cb = orgEntryID.mByteCount;
+ newChildren.lpbin[newChildren.cValues-1].lpb = NS_REINTERPRET_CAST(unsigned char *, orgEntryID.mEntryId);
+ newChildren.lpbin[newChildren.cValues-1].cb = orgEntryID.mByteCount;
+
+ SPropValue childs;
+ childs.ulPropTag = listTag;
+ childs.Value.MVbin = newChilds;
+ SPropValue children;
+ children.ulPropTag = listTag;
+ children.Value.MVbin = newChildren;
+
+ LPSPropProblemArray problems = NULL ;
+ mLastError = container->SetProps(1, &childs, &problems) ;
+ mLastError = container->SetProps(1, &children, &problems) ;
+ if (HR_FAILED(mLastError)) {
+ PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
+ PRINTF(("Cannot set children %08x.\n", mLastError)) ;
+ return FALSE ;
+ }
+
@@ -4657,27 +4657,27 @@
+ listTag = GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST2) | PT_MV_BINARY;
+ if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
+ {
+ PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
+ PRINTF(("Cannot get old children %08x.\n", mLastError)) ;
+ return FALSE;
+ }
+
+ if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
+ {
+ oldChilds = oldChildValue->Value.MVbin;
+ newChilds.cValues=oldChilds.cValues + 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
+ newChilds.lpbin = bins;
+ for (ULONG i=0;i<oldChilds.cValues;i++)
+ oldChildren = oldChildValue->Value.MVbin;
+ newChildren.cValues=oldChildren.cValues + 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
+ newChildren.lpbin = bins;
+ for (ULONG i=0;i<oldChildren.cValues;i++)
+ {
+ newChilds.lpbin[i].lpb = oldChilds.lpbin[i].lpb;
+ newChilds.lpbin[i].cb = oldChilds.lpbin[i].cb;
+ newChildren.lpbin[i].lpb = oldChildren.lpbin[i].lpb;
+ newChildren.lpbin[i].cb = oldChildren.lpbin[i].cb;
+ }
+ }
+ else
+ {
+ newChilds.cValues = 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
+ newChilds.lpbin = bins;
+ newChildren.cValues = 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
+ newChildren.lpbin = bins;
+ }
+
+ /*
@@ -4688,16 +4688,16 @@
+ Currently we can only add first kind of address to a outlook distlist.
+ */
+
+ newChilds.lpbin[newChilds.cValues-1].lpb = NS_REINTERPRET_CAST(unsigned char *, orgEntryID.mEntryId);
+ newChilds.lpbin[newChilds.cValues-1].cb = orgEntryID.mByteCount;
+ newChildren.lpbin[newChildren.cValues-1].lpb = NS_REINTERPRET_CAST(unsigned char *, orgEntryID.mEntryId);
+ newChildren.lpbin[newChildren.cValues-1].cb = orgEntryID.mByteCount;
+
+ childs.ulPropTag = listTag;
+ childs.Value.MVbin = newChilds;
+ children.ulPropTag = listTag;
+ children.Value.MVbin = newChildren;
+
+ mLastError = container->SetProps(1, &childs, &problems) ;
+ mLastError = container->SetProps(1, &children, &problems) ;
+ if (HR_FAILED(mLastError))
+ {
+ PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
+ PRINTF(("Cannot set children %08x.\n", mLastError)) ;
+ return FALSE ;
+ }
+
@@ -4737,42 +4737,42 @@
+ //update OUTLOOK_EMAIL_LIST1
+ ULONG listTag=GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST1) | PT_MV_BINARY;
+
+ SBinaryArray oldChilds;
+ SBinaryArray oldChildren;
+ LPSBinary bins=NULL;
+ SBinaryArray newChilds;
+ SBinaryArray newChildren;
+ LPSPropValue oldChildValue = NULL ;
+ ULONG valueCount = 0 ;
+
+ newChilds.lpbin=NULL;
+ newChildren.lpbin=NULL;
+
+ ULONG lDeleteEntry=0;
+ ULONG newIndex=0;
+ ULONG oldIndex=0;
+ if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
+ {
+ PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
+ PRINTF(("Cannot get old children %08x.\n", mLastError)) ;
+ return FALSE;
+ }
+
+ if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
+ {
+ oldChilds = oldChildValue->Value.MVbin;
+ newChilds.cValues=oldChilds.cValues - 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
+ newChilds.lpbin = bins;
+ for (oldIndex=0;oldIndex<oldChilds.cValues;oldIndex++)
+ oldChildren = oldChildValue->Value.MVbin;
+ newChildren.cValues=oldChildren.cValues - 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
+ newChildren.lpbin = bins;
+ for (oldIndex=0;oldIndex<oldChildren.cValues;oldIndex++)
+ {
+ if ( oldChilds.lpbin[oldIndex].cb == aNewEntry.mByteCount &&
+ !memcmp((void*)(oldChilds.lpbin[oldIndex].lpb+4),
+ if ( oldChildren.lpbin[oldIndex].cb == aNewEntry.mByteCount &&
+ !memcmp((void*)(oldChildren.lpbin[oldIndex].lpb+4),
+ (void*)(aNewEntry.mEntryId->ab),
+ oldChilds.lpbin[oldIndex].cb-4))
+ oldChildren.lpbin[oldIndex].cb-4))
+ {
+ lDeleteEntry=oldIndex;
+ }
+ else
+ {
+ newChilds.lpbin[newIndex].lpb = oldChilds.lpbin[oldIndex].lpb;
+ newChilds.lpbin[newIndex].cb = oldChilds.lpbin[oldIndex].cb;
+ newChildren.lpbin[newIndex].lpb = oldChildren.lpbin[oldIndex].lpb;
+ newChildren.lpbin[newIndex].cb = oldChildren.lpbin[oldIndex].cb;
+ newIndex++;
+ }
+ }
@@ -4781,10 +4781,10 @@
+ return FALSE;
+
+
+ SPropValue childs;
+ SPropValue children;
+ LPSPropProblemArray problems = NULL ;
+
+ if (newChilds.cValues == 0)
+ if (newChildren.cValues == 0)
+ {
+ SPropTagArray delTags;
+ delTags.cValues = 1;
@@ -4794,13 +4794,13 @@
+ }
+ else
+ {
+ childs.ulPropTag = listTag;
+ childs.Value.MVbin = newChilds;
+ mLastError = container->SetProps(1, &childs, &problems) ;
+ children.ulPropTag = listTag;
+ children.Value.MVbin = newChildren;
+ mLastError = container->SetProps(1, &children, &problems) ;
+ }
+
+ if (HR_FAILED(mLastError)) {
+ PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
+ PRINTF(("Cannot set children %08x.\n", mLastError)) ;
+ return FALSE ;
+ }
+
@@ -4808,37 +4808,37 @@
+ listTag = GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST2) | PT_MV_BINARY;
+ if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
+ {
+ PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
+ PRINTF(("Cannot get old children %08x.\n", mLastError)) ;
+ return FALSE;
+ }
+
+ newIndex=0;
+ if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
+ {
+ oldChilds = oldChildValue->Value.MVbin;
+ newChilds.cValues=oldChilds.cValues - 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
+ newChilds.lpbin = bins;
+ for (oldIndex=0;oldIndex<oldChilds.cValues;oldIndex++)
+ oldChildren = oldChildValue->Value.MVbin;
+ newChildren.cValues=oldChildren.cValues - 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
+ newChildren.lpbin = bins;
+ for (oldIndex=0;oldIndex<oldChildren.cValues;oldIndex++)
+ {
+ if (oldIndex != lDeleteEntry)
+ {
+ newChilds.lpbin[newIndex].lpb = oldChilds.lpbin[oldIndex].lpb;
+ newChilds.lpbin[newIndex].cb = oldChilds.lpbin[oldIndex].cb;
+ newChildren.lpbin[newIndex].lpb = oldChildren.lpbin[oldIndex].lpb;
+ newChildren.lpbin[newIndex].cb = oldChildren.lpbin[oldIndex].cb;
+ newIndex++;
+ }
+ }
+ }
+ else
+ {
+ newChilds.cValues = 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
+ newChilds.lpbin = bins;
+ newChildren.cValues = 1;
+ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
+ newChildren.lpbin = bins;
+ }
+
+ if (newChilds.cValues == 0)
+ if (newChildren.cValues == 0)
+ {
+ SPropTagArray delTags;
+ delTags.cValues = 1;
@@ -4848,12 +4848,12 @@
+ }
+ else
+ {
+ childs.ulPropTag = listTag;
+ childs.Value.MVbin = newChilds;
+ mLastError = container->SetProps(1, &childs, &problems) ;
+ children.ulPropTag = listTag;
+ children.Value.MVbin = newChildren;
+ mLastError = container->SetProps(1, &children, &problems) ;
+ }
+ if (HR_FAILED(mLastError)) {
+ PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
+ PRINTF(("Cannot set children %08x.\n", mLastError)) ;
+ return FALSE ;
+ }
+
package/source/xstor/xstorage.cxx
+1 -1
View File
@@ -1718,7 +1718,7 @@ void OStorage_Impl::CloneStreamElement( const ::rtl::OUString& aStreamName,
// the copy will be created internally
// usual copying is not applicable here, only last flushed version of the
// child stream should be used for copiing. Probably the childs m_xPackageStream
// child stream should be used for copiing. Probably the children m_xPackageStream
// can be used as a base of a new stream, that would be copied to result
// storage. The only problem is that some package streams can be accessed from outside
// at the same time ( now solwed by wrappers that remember own position ).
qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
+9 -9
View File
@@ -138,16 +138,16 @@ public class _XAccessibleSelection extends MultiMethodTest {
log.println("ChildCount: " + childCount);
int usedChilds = childCount;
int usedChildren = childCount;
if (childCount > 500) {
log.println("Restricting to 500");
usedChilds = 500;
usedChildren = 500;
}
if (usedChilds > 0) {
if (usedChildren > 0) {
try {
for (int i = 0; i < usedChilds; i++) {
for (int i = 0; i < usedChildren; i++) {
log.print("Trying to select child with index " + i + ": ");
if (isSelectable(tEnv.getTestObject(), i)) {
@@ -334,16 +334,16 @@ public class _XAccessibleSelection extends MultiMethodTest {
if (multiSelection) {
oObj.selectAllAccessibleChildren();
} else {
int usedChilds = childCount;
int usedChildren = childCount;
if (childCount > 500) {
log.println("Restricting to 500");
usedChilds = 500;
usedChildren = 500;
}
if (usedChilds > 0) {
if (usedChildren > 0) {
try {
for (int i = 0; i < usedChilds; i++) {
for (int i = 0; i < usedChildren; i++) {
if (isSelectable(tEnv.getTestObject(), i)) {
log.print("Trying to select child with index "+i+": ");
@@ -366,7 +366,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
}
int sCount = chkSelectable(tEnv.getTestObject());
log.println("Found " + sCount + " selectable Childs");
log.println("Found " + sCount + " selectable Children");
int selectedCount = oObj.getSelectedAccessibleChildCount();
log.println("After selecting all accessible " + selectedCount +
qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
+4 -4
View File
@@ -383,7 +383,7 @@ public class _XAccessibleTable extends MultiMethodTest {
/**
* If the interface <code>XAccessibleSelection</code> is supported by
* the component than selects all accessible childs.
* the component than selects all accessible children.
* Calls the method and checks a returned sequence.
* Has OK status if a returned sequince is in ascending order.
* The following method tests are to be executed before:
@@ -432,7 +432,7 @@ public class _XAccessibleTable extends MultiMethodTest {
/**
* If the interface <code>XAccessibleSelection</code> is supported by
* the component than selects all accessible childs.
* the component than selects all accessible children.
* Calls the method and checks a returned sequence.
* Has OK status if a returned sequince is in ascending order.
* The following method tests are to be executed before:
@@ -483,7 +483,7 @@ public class _XAccessibleTable extends MultiMethodTest {
/**
* Calls the method with invalid indexes.
* If the interface <code>XAccessibleSelection</code> is supported by
* the component than selects all accessible childs.
* the component than selects all accessible children.
* Calls the method for every row and checks returned values.
* The following method tests are to be executed before:
* <ul>
@@ -545,7 +545,7 @@ public class _XAccessibleTable extends MultiMethodTest {
/**
* Calls the method with invalid indexes.
* If the interface <code>XAccessibleSelection</code> is supported by
* the component than selects all accessible childs.
* the component than selects all accessible children.
* Calls the method for every column and checks returned values.
* The following method tests are to be executed before:
* <ul>
qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
+2 -2
View File
@@ -137,10 +137,10 @@ public class SmEditAccessible extends TestCase {
new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){
public void fireEvent() {
try {
System.out.println("Childs "+con.getAccessibleChildCount());
System.out.println("Children "+con.getAccessibleChildCount());
xPS.setPropertyValue("Formula", "sum hat x \n int a \n sum b");
shortWait();
System.out.println("Childs "+con.getAccessibleChildCount());
System.out.println("Children "+con.getAccessibleChildCount());
xPS.setPropertyValue("Formula", expFormula);
shortWait();
} catch(com.sun.star.lang.WrappedTargetException e) {
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class AccessibleIconChoiceCtrl extends TestCase {
* <ul>
* <li> <code>'EventProducer'</code> for
* {@link ifc.accessibility._XAccessibleEventBroadcaster}:
* method <code>fireEvent()</code> selects accessible childs
* method <code>fireEvent()</code> selects accessible children
* </li>
* </ul>
*
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+1 -1
View File
@@ -47,7 +47,7 @@ import org.jfree.report.structure.Section;
import org.pentaho.reporting.libraries.base.util.ObjectUtilities;
/**
* Before writing the table cell, we have to evaluate the childs of the cell. The cell itself can either be empty or it
* Before writing the table cell, we have to evaluate the children of the cell. The cell itself can either be empty or it
* has a one ore more paragraphs inside. The paragraph contains a single report element, but may contain additional
* other content.
*
reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
+4 -4
View File
@@ -108,14 +108,14 @@ public class OfficeStyles extends Element
private final Map pageStyles;
private final Map dataStyles;
private final Map styles;
private final List otherChilds;
private final List otherChildren;
public OfficeStyles()
{
this.styles = new HashMap();
this.dataStyles = new HashMap();
this.pageStyles = new HashMap();
this.otherChilds = new ArrayList();
this.otherChildren = new ArrayList();
}
public OfficeStyle getStyle(final String family, final String name)
@@ -163,7 +163,7 @@ public class OfficeStyles extends Element
public void addOtherNode(final Element node)
{
otherChilds.add(node);
otherChildren.add(node);
}
public DataStyle[] getAllDataStyles()
@@ -183,7 +183,7 @@ public class OfficeStyles extends Element
public Element[] getOtherStyles()
{
return (Element[]) otherChilds.toArray(new Element[otherChilds.size()]);
return (Element[]) otherChildren.toArray(new Element[otherChildren.size()]);
}
public boolean containsStyle(final String family, final String name)
reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
+4 -4
View File
@@ -151,7 +151,7 @@ public class StylesWriter
writeSection(masterPage);
}
writeSectionChilds(officeStyles.getOtherNodes().getNodeArray());
writeSectionChildren(officeStyles.getOtherNodes().getNodeArray());
}
xmlWriter.writeCloseTag();
@@ -238,7 +238,7 @@ public class StylesWriter
writeSection(style);
}
writeSectionChilds(styles.getOtherStyles());
writeSectionChildren(styles.getOtherStyles());
}
private void writeElement(final Element element)
@@ -263,12 +263,12 @@ public class StylesWriter
}
xmlWriter.writeTag(namespace, type, attrList, XmlWriterSupport.OPEN);
writeSectionChilds(section.getNodeArray());
writeSectionChildren(section.getNodeArray());
xmlWriter.writeCloseTag();
}
private void writeSectionChilds(final Node[] nodes)
private void writeSectionChildren(final Node[] nodes)
throws IOException
{
for (int i = 0; i < nodes.length; i++)
reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
+5 -5
View File
@@ -48,12 +48,12 @@ public class OfficeStyleReadHandler extends ElementReadHandler
{
private final OfficeStyle officeStyle;
private final List childs;
private final List children;
public OfficeStyleReadHandler()
{
this.officeStyle = new OfficeStyle();
this.childs = new ArrayList();
this.children = new ArrayList();
}
/**
@@ -75,7 +75,7 @@ public class OfficeStyleReadHandler extends ElementReadHandler
// }
final StyleDefinitionReadHandler readHandler =
new StyleDefinitionReadHandler();
childs.add(readHandler);
children.add(readHandler);
return readHandler;
}
@@ -86,9 +86,9 @@ public class OfficeStyleReadHandler extends ElementReadHandler
*/
protected void doneParsing() throws SAXException
{
for (int i = 0; i < childs.size(); i++)
for (int i = 0; i < children.size(); i++)
{
final ElementReadHandler handler = (ElementReadHandler) childs.get(i);
final ElementReadHandler handler = (ElementReadHandler) children.get(i);
officeStyle.addNode(handler.getElement());
}
}
reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
+20 -20
View File
@@ -45,19 +45,19 @@ import org.xml.sax.SAXException;
public class OfficeStylesReadHandler extends ElementReadHandler
{
private final List textStyleChilds;
private final List dataStyleChilds;
private final List otherStyleChilds;
private final List pageLayoutChilds;
private final List textStyleChildren;
private final List dataStyleChildren;
private final List otherStyleChildren;
private final List pageLayoutChildren;
private final OfficeStyles officeStyles;
public OfficeStylesReadHandler(final OfficeStyles officeStyles)
{
this.officeStyles = officeStyles;
this.pageLayoutChilds = new ArrayList();
this.dataStyleChilds = new ArrayList();
this.textStyleChilds = new ArrayList();
this.otherStyleChilds = new ArrayList();
this.pageLayoutChildren = new ArrayList();
this.dataStyleChildren = new ArrayList();
this.textStyleChildren = new ArrayList();
this.otherStyleChildren = new ArrayList();
}
/**
@@ -78,25 +78,25 @@ public class OfficeStylesReadHandler extends ElementReadHandler
if ("style".equals(tagName))
{
final OfficeStyleReadHandler xrh = new OfficeStyleReadHandler();
textStyleChilds.add(xrh);
textStyleChildren.add(xrh);
return xrh;
}
else if ("page-layout".equals(tagName))
{
final PageLayoutReadHandler prh = new PageLayoutReadHandler();
pageLayoutChilds.add(prh);
pageLayoutChildren.add(prh);
return prh;
}
}
else if (OfficeNamespaces.DATASTYLE_NS.equals(uri))
{
final DataStyleReadHandler xrh = new DataStyleReadHandler(false);
dataStyleChilds.add(xrh);
dataStyleChildren.add(xrh);
return xrh;
}
final SectionReadHandler genericReadHander = new SectionReadHandler();
otherStyleChilds.add(genericReadHander);
otherStyleChildren.add(genericReadHander);
return genericReadHander;
}
@@ -107,31 +107,31 @@ public class OfficeStylesReadHandler extends ElementReadHandler
*/
protected void doneParsing() throws SAXException
{
for (int i = 0; i < textStyleChilds.size(); i++)
for (int i = 0; i < textStyleChildren.size(); i++)
{
final OfficeStyleReadHandler handler =
(OfficeStyleReadHandler) textStyleChilds.get(i);
(OfficeStyleReadHandler) textStyleChildren.get(i);
officeStyles.addStyle(handler.getOfficeStyle());
}
for (int i = 0; i < pageLayoutChilds.size(); i++)
for (int i = 0; i < pageLayoutChildren.size(); i++)
{
final PageLayoutReadHandler handler =
(PageLayoutReadHandler) pageLayoutChilds.get(i);
(PageLayoutReadHandler) pageLayoutChildren.get(i);
officeStyles.addPageStyle(handler.getPageLayout());
}
for (int i = 0; i < dataStyleChilds.size(); i++)
for (int i = 0; i < dataStyleChildren.size(); i++)
{
final DataStyleReadHandler handler =
(DataStyleReadHandler) dataStyleChilds.get(i);
(DataStyleReadHandler) dataStyleChildren.get(i);
officeStyles.addDataStyle(handler.getDataStyle());
}
for (int i = 0; i < otherStyleChilds.size(); i++)
for (int i = 0; i < otherStyleChildren.size(); i++)
{
final SectionReadHandler handler =
(SectionReadHandler) otherStyleChilds.get(i);
(SectionReadHandler) otherStyleChildren.get(i);
officeStyles.addOtherNode((Element) handler.getNode());
}
}
reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
+5 -5
View File
@@ -50,12 +50,12 @@ public class PageLayoutReadHandler extends ElementReadHandler
{
private final PageLayout pageLayout;
private final List childs;
private final List children;
public PageLayoutReadHandler()
{
this.pageLayout = new PageLayout();
this.childs = new ArrayList();
this.children = new ArrayList();
}
/**
@@ -74,7 +74,7 @@ public class PageLayoutReadHandler extends ElementReadHandler
{
final StyleDefinitionReadHandler readHandler =
new StyleDefinitionReadHandler();
childs.add(readHandler);
children.add(readHandler);
return readHandler;
}
@@ -85,9 +85,9 @@ public class PageLayoutReadHandler extends ElementReadHandler
*/
protected void doneParsing() throws SAXException
{
for (int i = 0; i < childs.size(); i++)
for (int i = 0; i < children.size(); i++)
{
final ElementReadHandler handler = (ElementReadHandler) childs.get(i);
final ElementReadHandler handler = (ElementReadHandler) children.get(i);
pageLayout.addNode(handler.getElement());
}
}
reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
+6 -6
View File
@@ -41,7 +41,7 @@ import org.xml.sax.SAXException;
/**
* Reads all childs of a style-definition. This simply copies everything that
* Reads all children of a style-definition. This simply copies everything that
* is contained in the source-file into a generic structure that can be
* written out later.
*/
@@ -49,12 +49,12 @@ public class StyleDefinitionReadHandler extends ElementReadHandler
{
private final Section rawSection;
private final List childs;
private final List children;
public StyleDefinitionReadHandler()
{
this.rawSection = new Section();
this.childs = new ArrayList();
this.children = new ArrayList();
}
/**
@@ -73,7 +73,7 @@ public class StyleDefinitionReadHandler extends ElementReadHandler
{
final StyleDefinitionReadHandler readHandler =
new StyleDefinitionReadHandler();
childs.add(readHandler);
children.add(readHandler);
return readHandler;
}
@@ -85,9 +85,9 @@ public class StyleDefinitionReadHandler extends ElementReadHandler
protected void doneParsing()
throws SAXException
{
for (int i = 0; i < childs.size(); i++)
for (int i = 0; i < children.size(); i++)
{
final ElementReadHandler handler = (ElementReadHandler) childs.get(i);
final ElementReadHandler handler = (ElementReadHandler) children.get(i);
rawSection.addNode(handler.getElement());
}
}
rsc/doku/feinkonz.43/rsc.sdw
+3 -3
View File
@@ -1949,7 +1949,7 @@ MODELESSDIALOG DLG_PROTOTYPE
CLOSEABLE = TRUE;
// Diese Objekte werden automatisch angezeigt.
WinChilds =
WinChildren =
{
 PUSHBUTTON
 {
@@ -1989,7 +1989,7 @@ MODELESSDIALOG DLG_PROTOTYPE
// Ueber solche Konstruktionen koennen Objekte in der
// Resource automatisch angezeigt werden.
WinChilds =
WinChildren =
{
 MODELESSDIALOG , DLG_PROTOTYPE;
};
@@ -3186,7 +3186,7 @@ abgeleiteten Klassen zu lesen.
 Closeable  = TRUE;
 App   = TRUE;
 OutputSize  = TRUE;
 WinChilds =
 WinChildren =
 {
  FText
  {
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+90 -90
View File
@@ -87,14 +87,14 @@ struct ScAccNote
ScAccNote() : mpTextHelper(NULL), mnParaCount(0) {}
};
class ScNotesChilds
class ScNotesChildren
{
public:
ScNotesChilds(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc);
~ScNotesChilds();
ScNotesChildren(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc);
~ScNotesChildren();
void Init(const Rectangle& rVisRect, sal_Int32 nOffset);
sal_Int32 GetChildsCount() const;
sal_Int32 GetChildrenCount() const;
uno::Reference<XAccessible> GetChild(sal_Int32 nIndex) const;
uno::Reference<XAccessible> GetAt(const awt::Point& rPoint) const;
@@ -113,7 +113,7 @@ private:
sal_Int32 AddNotes(const ScPreviewLocationData& rData, const Rectangle& rVisRect, sal_Bool bMark, ScAccNotes& rNotes);
sal_Int8 CompareCell(const ScAddress& aCell1, const ScAddress& aCell2);
void CollectChilds(const ScAccNote& rNote, ScXAccList& rList);
void CollectChildren(const ScAccNote& rNote, ScXAccList& rList);
sal_Int32 CheckChanges(const ScPreviewLocationData& rData, const Rectangle& rVisRect,
sal_Bool bMark, ScAccNotes& rOldNotes, ScAccNotes& rNewNotes,
ScXAccList& rOldParas, ScXAccList& rNewParas);
@@ -121,7 +121,7 @@ private:
inline ScDocument* GetDocument() const;
};
ScNotesChilds::ScNotesChilds(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc)
ScNotesChildren::ScNotesChildren(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc)
: mpViewShell(pViewShell),
mpAccDoc(pAccDoc),
mnParagraphs(0),
@@ -138,13 +138,13 @@ struct DeleteAccNote
}
};
ScNotesChilds::~ScNotesChilds()
ScNotesChildren::~ScNotesChildren()
{
std::for_each(maNotes.begin(), maNotes.end(), DeleteAccNote());
std::for_each(maMarks.begin(), maMarks.end(), DeleteAccNote());
}
::accessibility::AccessibleTextHelper* ScNotesChilds::CreateTextHelper(const String& rString, const Rectangle& rVisRect, const ScAddress& aCellPos, sal_Bool bMarkNote, sal_Int32 nChildOffset) const
::accessibility::AccessibleTextHelper* ScNotesChildren::CreateTextHelper(const String& rString, const Rectangle& rVisRect, const ScAddress& aCellPos, sal_Bool bMarkNote, sal_Int32 nChildOffset) const
{
::accessibility::AccessibleTextHelper* pTextHelper = NULL;
@@ -166,7 +166,7 @@ ScNotesChilds::~ScNotesChilds()
return pTextHelper;
}
sal_Int32 ScNotesChilds::AddNotes(const ScPreviewLocationData& rData, const Rectangle& rVisRect, sal_Bool bMark, ScAccNotes& rNotes)
sal_Int32 ScNotesChildren::AddNotes(const ScPreviewLocationData& rData, const Rectangle& rVisRect, sal_Bool bMark, ScAccNotes& rNotes)
{
sal_Int32 nCount = rData.GetNoteCountInRange(rVisRect, bMark);
@@ -205,7 +205,7 @@ sal_Int32 ScNotesChilds::AddNotes(const ScPreviewLocationData& rData, const Rect
return nParagraphs;
}
void ScNotesChilds::Init(const Rectangle& rVisRect, sal_Int32 nOffset)
void ScNotesChildren::Init(const Rectangle& rVisRect, sal_Int32 nOffset)
{
if (mpViewShell && !mnParagraphs)
{
@@ -217,7 +217,7 @@ void ScNotesChilds::Init(const Rectangle& rVisRect, sal_Int32 nOffset)
}
}
sal_Int32 ScNotesChilds::GetChildsCount() const
sal_Int32 ScNotesChildren::GetChildrenCount() const
{
return mnParagraphs;
}
@@ -237,7 +237,7 @@ struct ScParaFound
}
};
uno::Reference<XAccessible> ScNotesChilds::GetChild(sal_Int32 nIndex) const
uno::Reference<XAccessible> ScNotesChildren::GetChild(sal_Int32 nIndex) const
{
uno::Reference<XAccessible> xAccessible;
@@ -294,7 +294,7 @@ struct ScPointFound
}
};
uno::Reference<XAccessible> ScNotesChilds::GetAt(const awt::Point& rPoint) const
uno::Reference<XAccessible> ScNotesChildren::GetAt(const awt::Point& rPoint) const
{
uno::Reference<XAccessible> xAccessible;
@@ -317,7 +317,7 @@ uno::Reference<XAccessible> ScNotesChilds::GetAt(const awt::Point& rPoint) const
return xAccessible;
}
sal_Int8 ScNotesChilds::CompareCell(const ScAddress& aCell1, const ScAddress& aCell2)
sal_Int8 ScNotesChildren::CompareCell(const ScAddress& aCell1, const ScAddress& aCell2)
{
OSL_ENSURE(aCell1.Tab() == aCell2.Tab(), "the notes should be on the same table");
sal_Int8 nResult(0);
@@ -331,14 +331,14 @@ sal_Int8 ScNotesChilds::CompareCell(const ScAddress& aCell1, const ScAddress& aC
return nResult;
}
void ScNotesChilds::CollectChilds(const ScAccNote& rNote, ScXAccList& rList)
void ScNotesChildren::CollectChildren(const ScAccNote& rNote, ScXAccList& rList)
{
if (rNote.mpTextHelper)
for (sal_Int32 i = 0; i < rNote.mnParaCount; ++i)
rList.push_back(rNote.mpTextHelper->GetChild(i + rNote.mpTextHelper->GetStartIndex()));
}
sal_Int32 ScNotesChilds::CheckChanges(const ScPreviewLocationData& rData,
sal_Int32 ScNotesChildren::CheckChanges(const ScPreviewLocationData& rData,
const Rectangle& rVisRect, sal_Bool bMark, ScAccNotes& rOldNotes,
ScAccNotes& rNewNotes, ScXAccList& rOldParas, ScXAccList& rNewParas)
{
@@ -394,10 +394,10 @@ sal_Int32 ScNotesChilds::CheckChanges(const ScPreviewLocationData& rData,
if (aNote.mpTextHelper)
aNote.mnParaCount = aNote.mpTextHelper->GetChildCount();
// collect removed children
CollectChilds(*aItr, rOldParas);
CollectChildren(*aItr, rOldParas);
DELETEZ(aItr->mpTextHelper);
// collect new children
CollectChilds(aNote, rNewParas);
CollectChildren(aNote, rNewParas);
}
bAddNote = sal_True;
// not necessary, because this branch should not be reached if it is the end
@@ -410,13 +410,13 @@ sal_Int32 ScNotesChilds::CheckChanges(const ScPreviewLocationData& rData,
if (aNote.mpTextHelper)
aNote.mnParaCount = aNote.mpTextHelper->GetChildCount();
// collect new children
CollectChilds(aNote, rNewParas);
CollectChildren(aNote, rNewParas);
bAddNote = sal_True;
}
else
{
// collect removed children
CollectChilds(*aItr, rOldParas);
CollectChildren(*aItr, rOldParas);
DELETEZ(aItr->mpTextHelper);
// no note to add
@@ -472,7 +472,7 @@ struct ScChildNew
}
};
void ScNotesChilds::DataChanged(const Rectangle& rVisRect)
void ScNotesChildren::DataChanged(const Rectangle& rVisRect)
{
if (mpViewShell && mpAccDoc)
{
@@ -501,7 +501,7 @@ struct ScChangeOffset
}
};
inline ScDocument* ScNotesChilds::GetDocument() const
inline ScDocument* ScNotesChildren::GetDocument() const
{
ScDocument* pDoc = NULL;
if (mpViewShell)
@@ -678,12 +678,12 @@ struct ScShapeRange
typedef std::vector<ScShapeRange> ScShapeRangeVec;
class ScShapeChilds : public SfxListener,
class ScShapeChildren : public SfxListener,
public ::accessibility::IAccessibleParent
{
public:
ScShapeChilds(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc);
~ScShapeChilds();
ScShapeChildren(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc);
~ScShapeChildren();
///===== SfxListener =====================================================
@@ -731,7 +731,7 @@ private:
SdrPage* GetDrawPage() const;
};
ScShapeChilds::ScShapeChilds(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc)
ScShapeChildren::ScShapeChildren(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc)
:
mpAccDoc(pAccDoc),
mpViewShell(pViewShell),
@@ -745,7 +745,7 @@ ScShapeChilds::ScShapeChilds(ScPreviewShell* pViewShell, ScAccessibleDocumentPag
}
}
ScShapeChilds::~ScShapeChilds()
ScShapeChildren::~ScShapeChildren()
{
if (mpViewShell)
{
@@ -755,7 +755,7 @@ ScShapeChilds::~ScShapeChilds()
}
}
void ScShapeChilds::SetDrawBroadcaster()
void ScShapeChildren::SetDrawBroadcaster()
{
if (mpViewShell)
{
@@ -765,7 +765,7 @@ void ScShapeChilds::SetDrawBroadcaster()
}
}
void ScShapeChilds::Notify(SfxBroadcaster&, const SfxHint& rHint)
void ScShapeChildren::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
if ( rHint.ISA( SdrHint ) )
{
@@ -792,7 +792,7 @@ void ScShapeChilds::Notify(SfxBroadcaster&, const SfxHint& rHint)
}
}
void ScShapeChilds::FindChanged(ScShapeChildVec& rOld, ScShapeChildVec& rNew) const
void ScShapeChildren::FindChanged(ScShapeChildVec& rOld, ScShapeChildVec& rNew) const
{
ScShapeChildVec::iterator aOldItr = rOld.begin();
ScShapeChildVec::iterator aOldEnd = rOld.end();
@@ -849,14 +849,14 @@ void ScShapeChilds::FindChanged(ScShapeChildVec& rOld, ScShapeChildVec& rNew) co
}
}
void ScShapeChilds::FindChanged(ScShapeRange& rOld, ScShapeRange& rNew) const
void ScShapeChildren::FindChanged(ScShapeRange& rOld, ScShapeRange& rNew) const
{
FindChanged(rOld.maBackShapes, rNew.maBackShapes);
FindChanged(rOld.maForeShapes, rNew.maForeShapes);
FindChanged(rOld.maControls, rNew.maControls);
}
void ScShapeChilds::DataChanged()
void ScShapeChildren::DataChanged()
{
ScShapeRangeVec aOldShapeRanges(maShapeRanges);
maShapeRanges.clear();
@@ -881,7 +881,7 @@ struct ScVisAreaChanged
}
};
void ScShapeChilds::VisAreaChanged() const
void ScShapeChildren::VisAreaChanged() const
{
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
ScShapeRangeVec::const_iterator aItr = maShapeRanges.begin();
@@ -897,7 +897,7 @@ void ScShapeChilds::VisAreaChanged() const
///===== IAccessibleParent ==============================================
sal_Bool ScShapeChilds::ReplaceChild (::accessibility::AccessibleShape* /* pCurrentChild */,
sal_Bool ScShapeChildren::ReplaceChild (::accessibility::AccessibleShape* /* pCurrentChild */,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& /* _rxShape */,
const long /* _nIndex */, const ::accessibility::AccessibleShapeTreeInfo& /* _rShapeTreeInfo */)
throw (uno::RuntimeException)
@@ -908,7 +908,7 @@ sal_Bool ScShapeChilds::ReplaceChild (::accessibility::AccessibleShape* /* pCurr
///===== Internal ========================================================
void ScShapeChilds::Init()
void ScShapeChildren::Init()
{
if(mpViewShell)
{
@@ -925,7 +925,7 @@ void ScShapeChilds::Init()
}
}
sal_Int32 ScShapeChilds::GetBackShapeCount() const
sal_Int32 ScShapeChildren::GetBackShapeCount() const
{
sal_Int32 nCount(0);
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -934,7 +934,7 @@ sal_Int32 ScShapeChilds::GetBackShapeCount() const
return nCount;
}
uno::Reference<XAccessible> ScShapeChilds::GetBackShape(sal_Int32 nIndex) const
uno::Reference<XAccessible> ScShapeChildren::GetBackShape(sal_Int32 nIndex) const
{
uno::Reference<XAccessible> xAccessible;
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -955,7 +955,7 @@ uno::Reference<XAccessible> ScShapeChilds::GetBackShape(sal_Int32 nIndex) const
return xAccessible;
}
sal_Int32 ScShapeChilds::GetForeShapeCount() const
sal_Int32 ScShapeChildren::GetForeShapeCount() const
{
sal_Int32 nCount(0);
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -964,7 +964,7 @@ sal_Int32 ScShapeChilds::GetForeShapeCount() const
return nCount;
}
uno::Reference<XAccessible> ScShapeChilds::GetForeShape(sal_Int32 nIndex) const
uno::Reference<XAccessible> ScShapeChildren::GetForeShape(sal_Int32 nIndex) const
{
uno::Reference<XAccessible> xAccessible;
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -985,7 +985,7 @@ uno::Reference<XAccessible> ScShapeChilds::GetForeShape(sal_Int32 nIndex) const
return xAccessible;
}
sal_Int32 ScShapeChilds::GetControlCount() const
sal_Int32 ScShapeChildren::GetControlCount() const
{
sal_Int32 nCount(0);
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -994,7 +994,7 @@ sal_Int32 ScShapeChilds::GetControlCount() const
return nCount;
}
uno::Reference<XAccessible> ScShapeChilds::GetControl(sal_Int32 nIndex) const
uno::Reference<XAccessible> ScShapeChildren::GetControl(sal_Int32 nIndex) const
{
uno::Reference<XAccessible> xAccessible;
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -1028,7 +1028,7 @@ struct ScShapePointFound
}
};
uno::Reference<XAccessible> ScShapeChilds::GetForegroundShapeAt(const awt::Point& rPoint) const //inclusive Controls
uno::Reference<XAccessible> ScShapeChildren::GetForegroundShapeAt(const awt::Point& rPoint) const //inclusive Controls
{
uno::Reference<XAccessible> xAcc;
@@ -1052,7 +1052,7 @@ uno::Reference<XAccessible> ScShapeChilds::GetForegroundShapeAt(const awt::Point
return xAcc;
}
uno::Reference<XAccessible> ScShapeChilds::GetBackgroundShapeAt(const awt::Point& rPoint) const
uno::Reference<XAccessible> ScShapeChildren::GetBackgroundShapeAt(const awt::Point& rPoint) const
{
uno::Reference<XAccessible> xAcc;
@@ -1070,12 +1070,12 @@ uno::Reference<XAccessible> ScShapeChilds::GetBackgroundShapeAt(const awt::Point
return xAcc;
}
::accessibility::AccessibleShape* ScShapeChilds::GetAccShape(const ScShapeChild& rShape) const
::accessibility::AccessibleShape* ScShapeChildren::GetAccShape(const ScShapeChild& rShape) const
{
if (!rShape.mpAccShape)
{
::accessibility::ShapeTypeHandler& rShapeHandler = ::accessibility::ShapeTypeHandler::Instance();
::accessibility::AccessibleShapeInfo aShapeInfo(rShape.mxShape, mpAccDoc, const_cast<ScShapeChilds*>(this));
::accessibility::AccessibleShapeInfo aShapeInfo(rShape.mxShape, mpAccDoc, const_cast<ScShapeChildren*>(this));
if (mpViewShell)
{
@@ -1095,12 +1095,12 @@ uno::Reference<XAccessible> ScShapeChilds::GetBackgroundShapeAt(const awt::Point
return rShape.mpAccShape;
}
::accessibility::AccessibleShape* ScShapeChilds::GetAccShape(const ScShapeChildVec& rShapes, sal_Int32 nIndex) const
::accessibility::AccessibleShape* ScShapeChildren::GetAccShape(const ScShapeChildVec& rShapes, sal_Int32 nIndex) const
{
return (GetAccShape(rShapes[nIndex]));
}
void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const MapMode& aMapMode, sal_uInt8 nRangeId)
void ScShapeChildren::FillShapes(const Rectangle& aPixelPaintRect, const MapMode& aMapMode, sal_uInt8 nRangeId)
{
OSL_ENSURE(nRangeId < maShapeRanges.size(), "this is not a valid range for draw objects");
SdrPage* pPage = GetDrawPage();
@@ -1175,7 +1175,7 @@ void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const MapMode&
}
}
SdrPage* ScShapeChilds::GetDrawPage() const
SdrPage* ScShapeChildren::GetDrawPage() const
{
SCTAB nTab( mpViewShell->GetLocationData().GetPrintTab() );
SdrPage* pDrawPage = NULL;
@@ -1206,7 +1206,7 @@ struct ScPagePreviewCountData
long nControls;
ScPagePreviewCountData( const ScPreviewLocationData& rData, Window* pSizeWindow,
ScNotesChilds* pNotesChilds, ScShapeChilds* pShapeChilds );
ScNotesChildren* pNotesChildren, ScShapeChildren* pShapeChildren );
long GetTotal() const
{
@@ -1215,8 +1215,8 @@ struct ScPagePreviewCountData
};
ScPagePreviewCountData::ScPagePreviewCountData( const ScPreviewLocationData& rData,
Window* pSizeWindow, ScNotesChilds* pNotesChilds,
ScShapeChilds* pShapeChilds) :
Window* pSizeWindow, ScNotesChildren* pNotesChildren,
ScShapeChildren* pShapeChildren) :
nBackShapes( 0 ),
nHeaders( 0 ),
nTables( 0 ),
@@ -1243,13 +1243,13 @@ ScPagePreviewCountData::ScPagePreviewCountData( const ScPreviewLocationData& rDa
nTables = 1;
//! shapes...
nBackShapes = pShapeChilds->GetBackShapeCount();
nForeShapes = pShapeChilds->GetForeShapeCount();
nControls = pShapeChilds->GetControlCount();
nBackShapes = pShapeChildren->GetBackShapeCount();
nForeShapes = pShapeChildren->GetForeShapeCount();
nControls = pShapeChildren->GetControlCount();
// there are only notes if there is no table
if (nTables == 0)
nNoteParagraphs = pNotesChilds->GetChildsCount();
nNoteParagraphs = pNotesChildren->GetChildrenCount();
}
//===== internal ========================================================
@@ -1258,8 +1258,8 @@ ScAccessibleDocumentPagePreview::ScAccessibleDocumentPagePreview(
const uno::Reference<XAccessible>& rxParent, ScPreviewShell* pViewShell ) :
ScAccessibleDocumentBase(rxParent),
mpViewShell(pViewShell),
mpNotesChilds(NULL),
mpShapeChilds(NULL),
mpNotesChildren(NULL),
mpShapeChildren(NULL),
mpTable(NULL),
mpHeader(NULL),
mpFooter(NULL)
@@ -1306,12 +1306,12 @@ void SAL_CALL ScAccessibleDocumentPagePreview::disposing()
}
// no need to Dispose the AccessibleTextHelper,
// as long as mpNotesChilds are destructed here
if (mpNotesChilds)
DELETEZ(mpNotesChilds);
// as long as mpNotesChildren are destructed here
if (mpNotesChildren)
DELETEZ(mpNotesChildren);
if (mpShapeChilds)
DELETEZ(mpShapeChilds);
if (mpShapeChildren)
DELETEZ(mpShapeChildren);
ScAccessibleDocumentBase::disposing();
}
@@ -1348,12 +1348,12 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint
aOutputSize = pSizeWindow->GetOutputSizePixel();
Point aPoint;
Rectangle aVisRect( aPoint, aOutputSize );
GetNotesChilds()->DataChanged(aVisRect);
GetNotesChildren()->DataChanged(aVisRect);
GetShapeChilds()->DataChanged();
GetShapeChildren()->DataChanged();
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() );
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChildren(), GetShapeChildren() );
if (aCount.nTables > 0)
{
@@ -1376,7 +1376,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint
}
else if (rRef.GetId() == SC_HINT_ACC_MAKEDRAWLAYER)
{
GetShapeChilds()->SetDrawBroadcaster();
GetShapeChildren()->SetDrawBroadcaster();
}
else if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED)
{
@@ -1386,9 +1386,9 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint
aOutputSize = pSizeWindow->GetOutputSizePixel();
Point aPoint;
Rectangle aVisRect( aPoint, aOutputSize );
GetNotesChilds()->DataChanged(aVisRect);
GetNotesChildren()->DataChanged(aVisRect);
GetShapeChilds()->VisAreaChanged();
GetShapeChildren()->VisAreaChanged();
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::VISIBLE_DATA_CHANGED;
@@ -1420,11 +1420,11 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
if ( mpViewShell )
{
xAccessible = GetShapeChilds()->GetForegroundShapeAt(rPoint);
xAccessible = GetShapeChildren()->GetForegroundShapeAt(rPoint);
if (!xAccessible.is())
{
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() );
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChildren(), GetShapeChildren() );
if ( !mpTable && (aCount.nTables > 0) )
{
@@ -1439,13 +1439,13 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
xAccessible = mpTable;
}
if (!xAccessible.is())
xAccessible = GetNotesChilds()->GetAt(rPoint);
xAccessible = GetNotesChildren()->GetAt(rPoint);
if (!xAccessible.is())
{
if (!mpHeader || !mpFooter)
{
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() );
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChildren(), GetShapeChildren() );
if (!mpHeader)
{
@@ -1467,7 +1467,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
xAccessible = mpFooter;
}
if (!xAccessible.is())
xAccessible = GetShapeChilds()->GetBackgroundShapeAt(rPoint);
xAccessible = GetShapeChildren()->GetBackgroundShapeAt(rPoint);
}
}
@@ -1499,7 +1499,7 @@ sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount(void
long nRet = 0;
if ( mpViewShell )
{
ScPagePreviewCountData aCount( mpViewShell->GetLocationData(), mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() );
ScPagePreviewCountData aCount( mpViewShell->GetLocationData(), mpViewShell->GetWindow(), GetNotesChildren(), GetShapeChildren() );
nRet = aCount.GetTotal();
}
@@ -1516,11 +1516,11 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi
if ( mpViewShell )
{
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() );
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChildren(), GetShapeChildren() );
if ( nIndex < aCount.nBackShapes )
{
xAccessible = GetShapeChilds()->GetBackShape(nIndex);
xAccessible = GetShapeChildren()->GetBackShape(nIndex);
}
else if ( nIndex < aCount.nBackShapes + aCount.nHeaders )
{
@@ -1544,7 +1544,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi
}
else if ( nIndex < aCount.nBackShapes + aCount.nHeaders + aCount.nNoteParagraphs )
{
xAccessible = GetNotesChilds()->GetChild(nIndex - aCount.nBackShapes - aCount.nHeaders);
xAccessible = GetNotesChildren()->GetChild(nIndex - aCount.nBackShapes - aCount.nHeaders);
}
else if ( (nIndex < aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs + aCount.nFooters) )
{
@@ -1559,9 +1559,9 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi
{
sal_Int32 nIdx(nIndex - (aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs + aCount.nFooters));
if (nIdx < aCount.nForeShapes)
xAccessible = GetShapeChilds()->GetForeShape(nIdx);
xAccessible = GetShapeChildren()->GetForeShape(nIdx);
else
xAccessible = GetShapeChilds()->GetControl(nIdx - aCount.nForeShapes);
xAccessible = GetShapeChildren()->GetControl(nIdx - aCount.nForeShapes);
}
}
@@ -1680,30 +1680,30 @@ sal_Bool ScAccessibleDocumentPagePreview::IsDefunc(
(rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC));
}
ScNotesChilds* ScAccessibleDocumentPagePreview::GetNotesChilds()
ScNotesChildren* ScAccessibleDocumentPagePreview::GetNotesChildren()
{
if (!mpNotesChilds && mpViewShell)
if (!mpNotesChildren && mpViewShell)
{
mpNotesChilds = new ScNotesChilds(mpViewShell, this);
mpNotesChildren = new ScNotesChildren(mpViewShell, this);
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() );
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChildren(), GetShapeChildren() );
//! order is background shapes, header, table or notes, footer, foreground shapes, controls
mpNotesChilds->Init(aCount.aVisRect, aCount.nBackShapes + aCount.nHeaders);
mpNotesChildren->Init(aCount.aVisRect, aCount.nBackShapes + aCount.nHeaders);
}
return mpNotesChilds;
return mpNotesChildren;
}
ScShapeChilds* ScAccessibleDocumentPagePreview::GetShapeChilds()
ScShapeChildren* ScAccessibleDocumentPagePreview::GetShapeChildren()
{
if (!mpShapeChilds && mpViewShell)
if (!mpShapeChildren && mpViewShell)
{
mpShapeChilds = new ScShapeChilds(mpViewShell, this);
mpShapeChilds->Init();
mpShapeChildren = new ScShapeChildren(mpViewShell, this);
mpShapeChildren->Init();
}
return mpShapeChilds;
return mpShapeChildren;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
+7 -7
View File
@@ -33,8 +33,8 @@
#include "AccessibleDocumentBase.hxx"
class ScPreviewShell;
class ScNotesChilds;
class ScShapeChilds;
class ScNotesChildren;
class ScShapeChildren;
class ScAccessiblePreviewTable;
class ScAccessiblePageHeader;
@@ -125,7 +125,7 @@ protected:
createAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
public: // needed in ScShapeChilds
public: // needed in ScShapeChildren
/// Return the object's current bounding box relative to the desktop.
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw (::com::sun::star::uno::RuntimeException);
@@ -137,8 +137,8 @@ protected:
private:
ScPreviewShell* mpViewShell;
ScNotesChilds* mpNotesChilds;
ScShapeChilds* mpShapeChilds;
ScNotesChildren* mpNotesChildren;
ScShapeChildren* mpShapeChildren;
ScAccessiblePreviewTable* mpTable;
ScAccessiblePageHeader* mpHeader;
ScAccessiblePageHeader* mpFooter;
@@ -147,8 +147,8 @@ private:
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
ScNotesChilds* GetNotesChilds();
ScShapeChilds* GetShapeChilds();
ScNotesChildren* GetNotesChildren();
ScShapeChildren* GetShapeChildren();
};
sc/source/ui/inc/acredlin.hxx
+3 -3
View File
@@ -215,14 +215,14 @@ protected:
ScChangeActionTable& aActionTable,
SvLBoxEntry* pEntry);
bool InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
bool InsertContentChildren(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
bool InsertAcceptedORejected(SvLBoxEntry* pParent);
bool InsertDeletedChilds(const ScChangeAction *pChangeAction, ScChangeActionTable* pActionTable,
bool InsertDeletedChildren(const ScChangeAction *pChangeAction, ScChangeActionTable* pActionTable,
SvLBoxEntry* pParent);
bool InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
bool InsertChildren(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
void AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction, sal_uLong nEndAction,
sal_uLong nPos=LIST_APPEND);
sc/source/ui/inc/anyrefdg.hxx
+1 -1
View File
@@ -97,7 +97,7 @@ public:
inline void SetWindow(Window* _pWindow) { m_pWindow = _pWindow; }
sal_Bool DoClose( sal_uInt16 nId );
void SetDispatcherLock( sal_Bool bLock );
void EnableSpreadsheets( sal_Bool bFlag = sal_True, sal_Bool bChilds = sal_True );
void EnableSpreadsheets( sal_Bool bFlag = sal_True, sal_Bool bChildren = sal_True );
void ViewShellChanged( ScTabViewShell* pScViewShell );
static void enableInput(sal_Bool _bInput);
sc/source/ui/miscdlgs/acredlin.cxx
+15 -15
View File
@@ -850,7 +850,7 @@ void ScAcceptChgDlg::UpdateView()
if(pParent!=NULL && pScChangeAction->IsDialogParent())
{
if(!bFilterFlag)
pParent->EnableChildsOnDemand(true);
pParent->EnableChildrenOnDemand(true);
else
{
bool bTestFlag = bHasFilterEntry;
@@ -876,14 +876,14 @@ void ScAcceptChgDlg::UpdateView()
pParent=pTheView->InsertEntry(
aStrAllAccepted, static_cast< RedlinData * >(NULL),
static_cast< SvLBoxEntry * >(NULL));
pParent->EnableChildsOnDemand(true);
pParent->EnableChildrenOnDemand(true);
}
if(nRejectCount>0)
{
pParent=pTheView->InsertEntry(
aStrAllRejected, static_cast< RedlinData * >(NULL),
static_cast< SvLBoxEntry * >(NULL));
pParent->EnableChildsOnDemand(true);
pParent->EnableChildrenOnDemand(true);
}
pTheView->SetUpdateMode(true);
SetPointer(Pointer(POINTER_ARROW));
@@ -1191,7 +1191,7 @@ void ScAcceptChgDlg::GetDependents( const ScChangeAction* pScChangeAction,
aActionTable,pScChangeAction->IsMasterDelete());
}
bool ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
{
bool bTheTestFlag = true;
ScRedlinData *pEntryData=(ScRedlinData *)(pParent->GetUserData());
@@ -1293,7 +1293,7 @@ bool ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent)
return bTheTestFlag;
}
bool ScAcceptChgDlg::InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
bool ScAcceptChgDlg::InsertChildren(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
{
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
bool bTheTestFlag = true;
@@ -1320,7 +1320,7 @@ bool ScAcceptChgDlg::InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry*
return bTheTestFlag;
}
bool ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction,
bool ScAcceptChgDlg::InsertDeletedChildren(const ScChangeAction* pScChangeAction,
ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
{
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
@@ -1370,7 +1370,7 @@ bool ScAcceptChgDlg::Expand(
{
case SC_CAT_CONTENT:
{
InsertContentChilds(&aActionTable,pEntry);
InsertContentChildren(&aActionTable,pEntry);
bTheTestFlag=!bHasFilterEntry;
break;
}
@@ -1378,14 +1378,14 @@ bool ScAcceptChgDlg::Expand(
case SC_CAT_DELETE_ROWS:
case SC_CAT_DELETE_TABS:
{
InsertDeletedChilds(pScChangeAction,&aActionTable,pEntry);
InsertDeletedChildren(pScChangeAction,&aActionTable,pEntry);
bTheTestFlag=!bHasFilterEntry;
break;
}
default:
{
if(!bFilter)
bTheTestFlag=InsertChilds(&aActionTable,pEntry);
bTheTestFlag=InsertChildren(&aActionTable,pEntry);
break;
}
}
@@ -1409,10 +1409,10 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
if(pEntryData!=NULL)
pScChangeAction=(ScChangeAction*) pEntryData->pData;
if(pEntry->HasChildsOnDemand())
if(pEntry->HasChildrenOnDemand())
{
bool bTheTestFlag = true;
pEntry->EnableChildsOnDemand(false);
pEntry->EnableChildrenOnDemand(false);
pTheView->RemoveEntry(pTheView->FirstChild(pEntry));
if(pEntryData!=NULL)
@@ -1425,19 +1425,19 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
{
case SC_CAT_CONTENT:
{
bTheTestFlag=InsertContentChilds(&aActionTable,pEntry);
bTheTestFlag=InsertContentChildren(&aActionTable,pEntry);
break;
}
case SC_CAT_DELETE_COLS:
case SC_CAT_DELETE_ROWS:
case SC_CAT_DELETE_TABS:
{
bTheTestFlag=InsertDeletedChilds(pScChangeAction,&aActionTable,pEntry);
bTheTestFlag=InsertDeletedChildren(pScChangeAction,&aActionTable,pEntry);
break;
}
default:
{
bTheTestFlag=InsertChilds(&aActionTable,pEntry);
bTheTestFlag=InsertChildren(&aActionTable,pEntry);
break;
}
}
@@ -1515,7 +1515,7 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartActio
if(pParent!=NULL && pScChangeAction->IsDialogParent())
{
if(!bFilterFlag)
pParent->EnableChildsOnDemand(true);
pParent->EnableChildrenOnDemand(true);
else
{
bool bTestFlag = bHasFilterEntry;
sc/source/ui/miscdlgs/anyrefdg.cxx
+3 -3
View File
@@ -114,7 +114,7 @@ void ScFormulaReferenceHelper::enableInput( sal_Bool bEnable )
if(pParent)
{
pParent->EnableInput(bEnable,sal_True /* sal_False */);
if(sal_True /*bChilds*/)
if(sal_True /*bChildren*/)
pViewSh->EnableRefInput(bEnable);
}
}
@@ -578,7 +578,7 @@ void ScFormulaReferenceHelper::ViewShellChanged(ScTabViewShell* /* pScViewShell
EnableSpreadsheets();
}
void ScFormulaReferenceHelper::EnableSpreadsheets(sal_Bool bFlag, sal_Bool bChilds)
void ScFormulaReferenceHelper::EnableSpreadsheets(sal_Bool bFlag, sal_Bool bChildren)
{
TypeId aType(TYPE(ScDocShell));
ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType);
@@ -601,7 +601,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(sal_Bool bFlag, sal_Bool bChil
if(pParent)
{
pParent->EnableInput(bFlag,false);
if(bChilds)
if(bChildren)
pViewSh->EnableRefInput(bFlag);
}
}
scripting/source/basprov/basprov.cxx
+4 -4
View File
@@ -499,7 +499,7 @@ namespace basprov
const ::rtl::OUString* pLibNames = aLibNames.getConstArray();
aChildNodes.realloc( nLibCount );
Reference< browse::XBrowseNode >* pChildNodes = aChildNodes.getArray();
sal_Int32 childsFound = 0;
sal_Int32 childrenFound = 0;
for ( sal_Int32 i = 0 ; i < nLibCount ; ++i )
{
@@ -516,13 +516,13 @@ namespace basprov
}
if ( bCreate )
{
pChildNodes[childsFound++] = static_cast< browse::XBrowseNode* >( new BasicLibraryNodeImpl(
pChildNodes[childrenFound++] = static_cast< browse::XBrowseNode* >( new BasicLibraryNodeImpl(
m_xContext, m_sScriptingContext, pBasicManager, xLibContainer, pLibNames[i], m_bIsAppScriptCtx ) );
}
}
if ( childsFound != nLibCount )
aChildNodes.realloc( childsFound );
if ( childrenFound != nLibCount )
aChildNodes.realloc( childrenFound );
}
return aChildNodes;
scripting/source/provider/BrowseNodeFactoryImpl.cxx
+7 -7
View File
@@ -104,12 +104,12 @@ public:
for ( sal_Int32 i = 0; i < m_Nodes.getLength(); i++ )
{
Sequence< Reference < browse::XBrowseNode > > childs;
Sequence< Reference < browse::XBrowseNode > > children;
try
{
childs = m_Nodes[ i ]->getChildNodes();
seqs.push_back( childs );
numChildren += childs.getLength();
children = m_Nodes[ i ]->getChildNodes();
seqs.push_back( children );
numChildren += children.getLength();
}
catch ( Exception& )
{
@@ -124,10 +124,10 @@ public:
Sequence< Reference < browse::XBrowseNode > > result( numChildren );
for ( sal_Int32 index = 0; it != it_end && index < numChildren ; ++it )
{
Sequence< Reference < browse::XBrowseNode > > childs = *it;
for ( sal_Int32 j = 0; j < childs.getLength(); j++ )
Sequence< Reference < browse::XBrowseNode > > children = *it;
for ( sal_Int32 j = 0; j < children.getLength(); j++ )
{
result[ index++ ] = childs[ j ];
result[ index++ ] = children[ j ];
}
}
return result;
sd/source/filter/ppt/pptinanimations.cxx
+1 -1
View File
@@ -419,7 +419,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer
importTimeContainer( pAtom, xNode );
dump( "</par>\n" );
// for iteration containers, map target from childs to iteration
// for iteration containers, map target from children to iteration
Reference< XIterateContainer > xIter( xNode, UNO_QUERY );
if( xIter.is() )
{
sd/source/ui/dlg/navigatr.cxx
+1 -1
View File
@@ -979,7 +979,7 @@ void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
DBG_ASSERT( pStateItem, "SfxStringItem erwartet");
String aPageName = pStateItem->GetValue();
if( !pNavigatorWin->maTlbObjects.HasSelectedChilds( aPageName ) )
if( !pNavigatorWin->maTlbObjects.HasSelectedChildren( aPageName ) )
{
if( pNavigatorWin->maTlbObjects.GetSelectionMode() == MULTIPLE_SELECTION )
{
sd/source/ui/dlg/sdtreelb.cxx
+12 -12
View File
@@ -328,14 +328,14 @@ sal_Bool SdPageObjsTLB::SelectEntry( const String& rName )
/*************************************************************************
|*
|* Gibt zurueck, ob Childs des uebergebenen Strings selektiert sind
|* Gibt zurueck, ob Children des uebergebenen Strings selektiert sind
|*
\************************************************************************/
sal_Bool SdPageObjsTLB::HasSelectedChilds( const String& rName )
sal_Bool SdPageObjsTLB::HasSelectedChildren( const String& rName )
{
sal_Bool bFound = sal_False;
sal_Bool bChilds = sal_False;
sal_Bool bChildren = sal_False;
if( rName.Len() )
{
@@ -351,11 +351,11 @@ sal_Bool SdPageObjsTLB::HasSelectedChilds( const String& rName )
sal_Bool bExpanded = IsExpanded( pEntry );
long nCount = GetChildSelectionCount( pEntry );
if( bExpanded && nCount > 0 )
bChilds = sal_True;
bChildren = sal_True;
}
}
}
return( bChilds );
return( bChildren );
}
@@ -423,7 +423,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages,
/*************************************************************************
|*
|* Es wird nur der erste Eintrag eingefuegt. Childs werden OnDemand erzeugt
|* Es wird nur der erste Eintrag eingefuegt. Children werden OnDemand erzeugt
|*
\************************************************************************/
@@ -541,7 +541,7 @@ void SdPageObjsTLB::AddShapeList (
}
}
if( pEntry->HasChilds() )
if( pEntry->HasChildren() )
{
SetExpandedEntryBmp(
pEntry,
@@ -699,9 +699,9 @@ List* SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth )
|*
\************************************************************************/
void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
void SdPageObjsTLB::RequestingChildren( SvLBoxEntry* pFileEntry )
{
if( !pFileEntry->HasChilds() )
if( !pFileEntry->HasChildren() )
{
if( GetBookmarkDoc() )
{
@@ -754,7 +754,7 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
}
}
}
if( pPageEntry->HasChilds() )
if( pPageEntry->HasChildren() )
{
SetExpandedEntryBmp( pPageEntry, aImgPageObjs );
SetCollapsedEntryBmp( pPageEntry, aImgPageObjs );
@@ -765,7 +765,7 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
}
}
else
SvTreeListBox::RequestingChilds( pFileEntry );
SvTreeListBox::RequestingChildren( pFileEntry );
}
/*************************************************************************
@@ -892,7 +892,7 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt )
{
// Auskommentierter Code aus svtools/source/contnr/svimpbox.cxx
SvLBoxEntry* pCursor = GetCurEntry();
if( pCursor->HasChilds() || pCursor->HasChildsOnDemand() )
if( pCursor->HasChildren() || pCursor->HasChildrenOnDemand() )
{
if( IsExpanded( pCursor ) )
Collapse( pCursor );
sd/source/ui/func/unmovss.cxx
+1 -1
View File
@@ -68,7 +68,7 @@ void SdMoveStyleSheetsUndoAction::Undo()
pPool->Insert((*iter).get());
}
// now assign the childs again
// now assign the children again
std::vector< SdStyleSheetVector >::iterator childlistiter( maListOfChildLists.begin() );
for(SdStyleSheetVector::iterator iter = maStyles.begin(); iter != maStyles.end(); ++iter, ++childlistiter )
{
sd/source/ui/inc/sdtreelb.hxx
+2 -2
View File
@@ -150,7 +150,7 @@ protected:
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
virtual void RequestingChilds( SvLBoxEntry* pParent );
virtual void RequestingChildren( SvLBoxEntry* pParent );
void DoDrag();
void OnDragFinished( sal_uInt8 nDropAction );
@@ -203,7 +203,7 @@ public:
void SetShowAllShapes (const bool bShowAllShapes, const bool bFill);
bool GetShowAllShapes (void) const;
sal_Bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL );
sal_Bool HasSelectedChilds( const String& rName );
sal_Bool HasSelectedChildren( const String& rName );
sal_Bool SelectEntry( const String& rName );
String GetSelectEntry();
List* GetSelectEntryList( sal_uInt16 nDepth );
sd/source/ui/slideshow/slideshowimpl.cxx
+5 -5
View File
@@ -2579,7 +2579,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
typedef sal_uInt16 (*FncGetChildWindowId)();
FncGetChildWindowId aShowChilds[] =
FncGetChildWindowId aShowChildren[] =
{
&AnimationChildWindow::GetChildWindowId,
&Svx3DChildWindow::GetChildWindowId,
@@ -2608,9 +2608,9 @@ void SlideshowImpl::hideChildWindows()
if( pViewFrame->GetChildWindow( SID_NAVIGATOR ) != NULL )
mnChildMask |= NAVIGATOR_CHILD_MASK;
for( sal_uLong i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
for( sal_uLong i = 0, nCount = sizeof( aShowChildren ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
{
const sal_uInt16 nId = ( *aShowChilds[ i ] )();
const sal_uInt16 nId = ( *aShowChildren[ i ] )();
if( pViewFrame->GetChildWindow( nId ) )
{
@@ -2633,10 +2633,10 @@ void SlideshowImpl::showChildWindows()
{
pViewFrame->SetChildWindow( SID_NAVIGATOR, ( mnChildMask & NAVIGATOR_CHILD_MASK ) != 0 );
for( sal_uLong i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
for( sal_uLong i = 0, nCount = sizeof( aShowChildren ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
{
if( mnChildMask & ( 1 << i ) )
pViewFrame->SetChildWindow( ( *aShowChilds[ i ] )(), sal_True );
pViewFrame->SetChildWindow( ( *aShowChildren[ i ] )(), sal_True );
}
}
}
sd/source/ui/view/outlnvsh.cxx
+3 -3
View File
@@ -886,7 +886,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
if( nDepth != nTmpDepth || bPage != pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ))
bUnique = sal_False;
if (pOutl->HasChilds(pPara))
if (pOutl->HasChildren(pPara))
{
if (!pOutl->IsExpanded(pPara))
bDisableExpand = sal_False;
@@ -934,10 +934,10 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
Paragraph* pPara = pOutl->GetParagraph( nParaPos );
while (pPara && (bDisableCollapseAll || bDisableExpandAll))
{
if (!pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara))
if (!pOutl->IsExpanded(pPara) && pOutl->HasChildren(pPara))
bDisableExpandAll = sal_False;
if (pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara))
if (pOutl->IsExpanded(pPara) && pOutl->HasChildren(pPara))
bDisableCollapseAll = sal_False;
pPara = pOutl->GetParagraph( ++nParaPos );
sfx2/inc/docvor.hxx
+2 -2
View File
@@ -73,7 +73,7 @@ protected:
virtual sal_Bool NotifyCopying(SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent, sal_uIntPtr &);
virtual void RequestingChilds( SvLBoxEntry* pParent );
virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual long ExpandingHdl();
virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
@@ -125,7 +125,7 @@ private:
sal_uInt16 GetLevelCount_Impl( SvLBoxEntry* pParent ) const;
SvLBoxEntry* InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType,
SvLBoxEntry* pParent = NULL, sal_Bool bChildsOnDemand = sal_False,
SvLBoxEntry* pParent = NULL, sal_Bool bChildrenOnDemand = sal_False,
sal_uIntPtr nPos = LIST_APPEND, void* pUserData = NULL );
};
sfx2/inc/sfx2/objsh.hxx
+1 -1
View File
@@ -507,7 +507,7 @@ public:
virtual sal_uInt16 GetContentCount( sal_uInt16 nIdx1 = INDEX_IGNORE );
virtual sal_Bool CanHaveChilds(
virtual sal_Bool CanHaveChildren(
sal_uInt16 nIdx1,
sal_uInt16 nIdx2 = INDEX_IGNORE
);
sfx2/source/appl/newhelp.cxx
+3 -3
View File
@@ -358,11 +358,11 @@ void ContentListBox_Impl::ClearChildren( SvLBoxEntry* pParent )
// -----------------------------------------------------------------------
void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
void ContentListBox_Impl::RequestingChildren( SvLBoxEntry* pParent )
{
try
{
if ( !pParent->HasChilds() )
if ( !pParent->HasChildren() )
{
if ( pParent->GetUserData() )
{
@@ -401,7 +401,7 @@ void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
}
catch( Exception& )
{
OSL_FAIL( "ContentListBox_Impl::RequestingChilds(): unexpected exception" );
OSL_FAIL( "ContentListBox_Impl::RequestingChildren(): unexpected exception" );
}
}
sfx2/source/appl/newhelp.hxx
+1 -1
View File
@@ -94,7 +94,7 @@ public:
~ContentListBox_Impl();
virtual void RequestingChilds( SvLBoxEntry* pParent );
virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual long Notify( NotifyEvent& rNEvt );
inline void SetOpenHdl( const Link& rLink ) { SetDoubleClickHdl( rLink ); }
sfx2/source/appl/workwin.cxx
+73 -73
View File
@@ -301,14 +301,14 @@ throw (css::uno::RuntimeException)
if ( eLayoutEvent == css::frame::LayoutManagerEvents::VISIBLE )
{
m_pWrkWin->MakeVisible_Impl( sal_True );
m_pWrkWin->ShowChilds_Impl();
m_pWrkWin->ArrangeChilds_Impl( sal_True );
m_pWrkWin->ShowChildren_Impl();
m_pWrkWin->ArrangeChildren_Impl( sal_True );
}
else if ( eLayoutEvent == css::frame::LayoutManagerEvents::INVISIBLE )
{
m_pWrkWin->MakeVisible_Impl( sal_False );
m_pWrkWin->HideChilds_Impl();
m_pWrkWin->ArrangeChilds_Impl( sal_True );
m_pWrkWin->HideChildren_Impl();
m_pWrkWin->ArrangeChildren_Impl( sal_True );
}
else if ( eLayoutEvent == css::frame::LayoutManagerEvents::LOCK )
{
@@ -515,14 +515,14 @@ sal_uInt16 ChildTravelValue( SfxChildAlignment eAlign )
void SfxWorkWindow::Sort_Impl()
{
aSortedList.clear();
for (sal_uInt16 i=0; i<pChilds->Count(); i++)
for (sal_uInt16 i=0; i<pChildren->Count(); i++)
{
SfxChild_Impl *pCli = (*pChilds)[i];
SfxChild_Impl *pCli = (*pChildren)[i];
if (pCli)
{
sal_uInt16 k;
for (k=0; k<aSortedList.size(); k++)
if (ChildAlignValue((*pChilds)[aSortedList[k]]->eAlign) >
if (ChildAlignValue((*pChildren)[aSortedList[k]]->eAlign) >
ChildAlignValue(pCli->eAlign))
break;
aSortedList.insert( aSortedList.begin() + k, i );
@@ -580,12 +580,12 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
pWorkWin (pWin),
pConfigShell( 0 ),
pActiveChild( 0 ),
nChilds( 0 ),
nChildren( 0 ),
nOrigMode( 0 ),
bSorted( sal_True ),
bDockingAllowed(sal_True),
bInternalDockingAllowed(sal_True),
bAllChildsVisible(sal_True),
bAllChildrenVisible(sal_True),
bIsFullScreen( sal_False ),
bShowStatusBar( sal_True ),
m_nLock( 0 ),
@@ -600,13 +600,13 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
pBindings->SetWorkWindow_Impl( this );
pChildWins = new SfxChildWindows_Impl;
pChilds = new SfxChildList_Impl;
pChildren = new SfxChildList_Impl;
// For the ObjectBars a integral place in the Childlist is reserved,
// so that they always come in a defined order.
SfxChild_Impl* pChild=0;
for (sal_uInt16 n=0; n < SFX_OBJECTBAR_MAX; ++n)
pChilds->Insert(0,pChild);
pChildren->Insert(0,pChild);
// create and initialize layout manager listener
Reference< com::sun::star::frame::XFrame > xFrame = GetFrameInterface();
@@ -634,8 +634,8 @@ SfxWorkWindow::~SfxWorkWindow()
}
// Delete help structure for Child-Windows
DBG_ASSERT( pChilds->Count() == 0, "dangling childs" );
delete pChilds;
DBG_ASSERT( pChildren->Count() == 0, "dangling children" );
delete pChildren;
delete pChildWins;
if ( m_xLayoutManagerListener.is() )
@@ -655,7 +655,7 @@ void SfxWorkWindow::Lock_Impl( sal_Bool bLock )
}
if ( !m_nLock )
ArrangeChilds_Impl();
ArrangeChildren_Impl();
}
//--------------------------------------------------------------------
@@ -704,7 +704,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
// ATTENTION: The array itself is cleared after this loop!!
// Therefore we have to set every array entry to zero as it could be
// accessed by calling pChild->Destroy().
// Window::NotifyAllChilds() calls SfxWorkWindow::DataChanged_Impl for
// Window::NotifyAllChildren() calls SfxWorkWindow::DataChanged_Impl for
// 8-bit displays (WM_QUERYPALETTECHANGED message due to focus change)!!
}
@@ -730,7 +730,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
// Delete StatusBar
ResetStatusBar_Impl();
// Delete ObjectBars (this is done last, so that pChilds does not
// Delete ObjectBars (this is done last, so that pChildren does not
// receive dead Pointers)
for ( sal_uInt16 i = 0; i < aObjBarList.size(); i++ )
{
@@ -743,21 +743,21 @@ void SfxWorkWindow::DeleteControllers_Impl()
// ObjectBars are all released at once, since they occupy a
// fixed contiguous area in the array pChild
pChilds->Remove(0, SFX_OBJECTBAR_MAX);
pChildren->Remove(0, SFX_OBJECTBAR_MAX);
bSorted = sal_False;
nChilds = 0;
nChildren = 0;
}
//====================================================================
// Virtual method for placing the child window.
void SfxWorkWindow::ArrangeChilds_Impl( sal_Bool /*bForce*/)
void SfxWorkWindow::ArrangeChildren_Impl( sal_Bool /*bForce*/)
{
Arrange_Impl();
}
void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( sal_Bool bForce )
{
if ( pFrame->IsClosing_Impl() || ( m_nLock && !bForce ))
return;
@@ -775,7 +775,7 @@ void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
return;
SvBorder aBorder;
if ( nChilds )
if ( nChildren )
{
if ( IsVisible_Impl() )
aBorder = Arrange_Impl();
@@ -783,12 +783,12 @@ void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
// If the current application document contains a IPClient, then the
// object through SetTopToolFramePixel has to be assigned the available
// space. The object will then point to its UITools and sets the app border
// (-> SfxInPlaceEnv_Impl:: ArrangeChilds_Impl ()). Otherwise the
// (-> SfxInPlaceEnv_Impl:: ArrangeChildren_Impl ()). Otherwise the
// app border is set here directly to possibly overwrite the Border that
// was set by an object from another document. The object does not set
// the SetAppBorder when it removes its UI tools so that no-dithering
// ObjectBar arises.
// (->SfxInPlaceEnv_Impl::ArrangeChilds_Impl())
// (->SfxInPlaceEnv_Impl::ArrangeChildren_Impl())
pMasterFrame->SetToolSpaceBorderPixel_Impl( aBorder );
@@ -813,7 +813,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
aUpperClientArea = aClientArea;
SvBorder aBorder;
if ( !nChilds )
if ( !nChildren )
return aBorder;
if (!bSorted)
@@ -825,7 +825,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
{
SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
if ( !pCli->pWin )
continue;
@@ -967,7 +967,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
SfxChildAlignment eAlign, sal_Bool bCanGetFocus )
{
DBG_CHKTHIS(SfxWorkWindow, 0);
DBG_ASSERT( pChilds->Count() < 255, "too many children" );
DBG_ASSERT( pChildren->Count() < 255, "too many children" );
DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" );
DBG_ASSERT( !FindChild_Impl(rWindow), "child registered more than once" );
@@ -979,10 +979,10 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
eAlign, rWindow.IsVisible());
pChild->bCanGetFocus = bCanGetFocus;
pChilds->Insert(pChilds->Count(), pChild);
pChildren->Insert(pChildren->Count(), pChild);
bSorted = sal_False;
nChilds++;
return (*pChilds)[pChilds->Count()-1];
nChildren++;
return (*pChildren)[pChildren->Count()-1];
}
//--------------------------------------------------------------------
@@ -993,19 +993,19 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
SfxChild_Impl *pChild = 0;
sal_uInt16 nPos;
for ( nPos = 0; nPos < pChilds->Count(); ++nPos )
for ( nPos = 0; nPos < pChildren->Count(); ++nPos )
{
pChild = (*pChilds)[nPos];
pChild = (*pChildren)[nPos];
if ( pChild )
if ( pChild->pWin == &rWindow )
break;
}
if ( nPos < pChilds->Count() )
if ( nPos < pChildren->Count() )
{
bSorted = sal_False;
nChilds--;
pChilds->Remove(nPos);
nChildren--;
pChildren->Remove(nPos);
delete pChild;
}
else {
@@ -1020,10 +1020,10 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
DBG_CHKTHIS(SfxWorkWindow, 0);
SfxChild_Impl *pChild = 0;
sal_uInt16 nCount = pChilds->Count();
sal_uInt16 nCount = pChildren->Count();
for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
{
pChild = (*pChilds)[nPos];
pChild = (*pChildren)[nPos];
if ( pChild )
if ( pChild->pWin == &rWindow )
return pChild;
@@ -1034,17 +1034,17 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
//--------------------------------------------------------------------
void SfxWorkWindow::ShowChilds_Impl()
void SfxWorkWindow::ShowChildren_Impl()
{
DBG_CHKTHIS(SfxWorkWindow, 0);
bool bInvisible = ( !IsVisible_Impl() || ( !pWorkWin->IsReallyVisible() && !pWorkWin->IsReallyShown() ));
SfxChild_Impl *pCli = 0;
for ( sal_uInt16 nPos = 0; nPos < pChilds->Count(); ++nPos )
for ( sal_uInt16 nPos = 0; nPos < pChildren->Count(); ++nPos )
{
SfxChildWin_Impl* pCW = 0;
pCli = (*pChilds)[nPos];
pCli = (*pChildren)[nPos];
if ( pCli && pCli->pWin )
{
@@ -1107,12 +1107,12 @@ void SfxWorkWindow::ShowChilds_Impl()
//--------------------------------------------------------------------
void SfxWorkWindow::HideChilds_Impl()
void SfxWorkWindow::HideChildren_Impl()
{
SfxChild_Impl *pChild = 0;
for ( sal_uInt16 nPos = pChilds->Count(); nPos > 0; --nPos )
for ( sal_uInt16 nPos = pChildren->Count(); nPos > 0; --nPos )
{
pChild = (*pChilds)[nPos-1];
pChild = (*pChildren)[nPos-1];
if (pChild && pChild->pWin)
{
switch ( pChild->pWin->GetType() )
@@ -1240,23 +1240,23 @@ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl()
pWork = pParent;
while ( pWork )
{
pWork->ArrangeChilds_Impl();
pWork->ArrangeChildren_Impl();
pWork = pWork->GetParent_Impl();
}
ArrangeChilds_Impl( sal_False );
ArrangeChildren_Impl( sal_False );
pWork = pParent;
while ( pWork )
{
pWork->ShowChilds_Impl();
pWork->ShowChildren_Impl();
pWork = pWork->GetParent_Impl();
}
ShowChilds_Impl();
ShowChildren_Impl();
}
ShowChilds_Impl();
ShowChildren_Impl();
}
Reference< ::com::sun::star::task::XStatusIndicator > SfxWorkWindow::GetStatusIndicator()
@@ -1469,7 +1469,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
if ( bCreate )
CreateChildWin_Impl( pCW, sal_False );
if ( !bAllChildsVisible )
if ( !bAllChildrenVisible )
{
if ( pCW->pCli )
pCW->pCli->nVisible &= ~CHILD_ACTIVE;
@@ -1478,7 +1478,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
else if ( pChildWin )
{
// Window already exists, it should also be visible?
if ( ( !bIsFullScreen || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT ) && bAllChildsVisible )
if ( ( !bIsFullScreen || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT ) && bAllChildrenVisible )
{
// Update Mode is compatible; definitely enable it
bCreate = AllowChildWindowCreation_Impl( *pCW );
@@ -1487,7 +1487,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
if ( pCW->pCli )
{
// The window is a direct Child
if ( bAllChildsVisible && ( (IsDockingAllowed() && bInternalDockingAllowed) || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
if ( bAllChildrenVisible && ( (IsDockingAllowed() && bInternalDockingAllowed) || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
pCW->pCli->nVisible |= CHILD_NOT_HIDDEN;
}
else
@@ -1548,10 +1548,10 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, sal_Bool bSetFoc
if (nPos != CHILDWIN_NOPOS)
{
DBG_ASSERT(nPos < SFX_OBJECTBAR_MAX, "Illegal objectbar position!");
if ((*pChilds)[TbxMatch(nPos)])// &&
if ((*pChildren)[TbxMatch(nPos)])// &&
{
// ChildWindow replaces ObjectBar
(*pChilds)[TbxMatch(nPos)]->nVisible ^= CHILD_NOT_HIDDEN;
(*pChildren)[TbxMatch(nPos)]->nVisible ^= CHILD_NOT_HIDDEN;
}
}
@@ -1786,7 +1786,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
sal_uInt16 n;
for ( n=0; n<aSortedList.size(); ++n )
{
pChild = (*pChilds)[aSortedList[n]];
pChild = (*pChildren)[aSortedList[n]];
if ( pChild )
if ( pChild->pWin == pWin )
break;
@@ -1813,7 +1813,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
for ( sal_uInt16 m=0; m<aSortedList.size(); ++m )
{
sal_uInt16 i=aSortedList[m];
SfxChild_Impl* pCli = (*pChilds)[i];
SfxChild_Impl* pCli = (*pChildren)[i];
if ( pCli && pCli->nVisible == CHILD_VISIBLE && pCli->pWin )
{
@@ -1924,7 +1924,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
return;
SfxChildAlignment eAlign = SFX_ALIGN_NOALIGNMENT;
SfxChild_Impl *pCli = ( nPos != USHRT_MAX ) ? (*pChilds)[nPos] : 0;
SfxChild_Impl *pCli = ( nPos != USHRT_MAX ) ? (*pChildren)[nPos] : 0;
if ( pCli && pDockWin )
{
eAlign = pDockWin->GetAlignment();
@@ -1944,8 +1944,8 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
pCli->eAlign = eAlign;
}
ArrangeChilds_Impl();
ShowChilds_Impl();
ArrangeChildren_Impl();
ShowChildren_Impl();
}
if ( pCW && pCW->pWin )
@@ -2096,8 +2096,8 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus)
}
}
ArrangeChilds_Impl();
ShowChilds_Impl();
ArrangeChildren_Impl();
ShowChildren_Impl();
if ( pCW->bCreate && bCreationAllowed )
{
@@ -2335,8 +2335,8 @@ void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible, sal_
}
ArrangeChilds_Impl();
ShowChilds_Impl();
ArrangeChildren_Impl();
ShowChildren_Impl();
}
else if ( bVisible )
{
@@ -2530,19 +2530,19 @@ SfxSplitWindow* SfxWorkWindow::GetSplitWindow_Impl( SfxChildAlignment eAlign )
}
}
void SfxWorkWindow::MakeChildsVisible_Impl( sal_Bool bVis )
void SfxWorkWindow::MakeChildrenVisible_Impl( sal_Bool bVis )
{
if ( pParent )
pParent->MakeChildsVisible_Impl( bVis );
pParent->MakeChildrenVisible_Impl( bVis );
bAllChildsVisible = bVis;
bAllChildrenVisible = bVis;
if ( bVis )
{
if ( !bSorted )
Sort_Impl();
for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
{
SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
if ( (pCli->eAlign == SFX_ALIGN_NOALIGNMENT) || (IsDockingAllowed() && bInternalDockingAllowed) )
pCli->nVisible |= CHILD_ACTIVE;
}
@@ -2553,7 +2553,7 @@ void SfxWorkWindow::MakeChildsVisible_Impl( sal_Bool bVis )
Sort_Impl();
for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
{
SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
pCli->nVisible &= ~CHILD_ACTIVE;
}
}
@@ -2760,14 +2760,14 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
{
// Sort all children under list
std::vector<sal_uInt16> aList;
for ( sal_uInt16 i=SFX_OBJECTBAR_MAX; i<pChilds->Count(); i++)
for ( sal_uInt16 i=SFX_OBJECTBAR_MAX; i<pChildren->Count(); i++)
{
SfxChild_Impl *pCli = (*pChilds)[i];
SfxChild_Impl *pCli = (*pChildren)[i];
if ( pCli && pCli->bCanGetFocus && pCli->pWin )
{
sal_uInt16 k;
for (k=0; k<aList.size(); k++)
if ( ChildTravelValue((*pChilds)[aList[k]]->eAlign) > ChildTravelValue(pCli->eAlign) )
if ( ChildTravelValue((*pChildren)[aList[k]]->eAlign) > ChildTravelValue(pCli->eAlign) )
break;
aList.insert( aList.begin() + k, i );
}
@@ -2779,7 +2779,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
sal_uInt16 nTopValue = ChildTravelValue( SFX_ALIGN_LOWESTTOP );
for ( sal_uInt16 i=0; i<aList.size(); i++ )
{
SfxChild_Impl* pCli = (*pChilds)[aList[i]];
SfxChild_Impl* pCli = (*pChildren)[aList[i]];
if ( pCli->pWin && ChildTravelValue( pCli->eAlign ) > nTopValue )
break;
}
@@ -2791,7 +2791,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
// Look for the active window
for ( n=0; n<aList.size(); n++ )
{
SfxChild_Impl* pCli = (*pChilds)[aList[n]];
SfxChild_Impl* pCli = (*pChildren)[aList[n]];
if ( pCli && pCli->pWin && ( pCli->pWin == pActiveChild || !pActiveChild ) )
{
pAct = pCli;
@@ -2831,7 +2831,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
for( ;; )
{
SfxChild_Impl* pCli = (*pChilds)[aList[n]];
SfxChild_Impl* pCli = (*pChildren)[aList[n]];
if ( pCli->pWin )
{
SfxChild_Impl* pNext = pCli;
@@ -2881,7 +2881,7 @@ void SfxWorkWindow::DataChanged_Impl( const DataChangedEvent& )
pCW->pWin->GetWindow()->UpdateSettings( Application::GetSettings() );
}
ArrangeChilds_Impl();
ArrangeChildren_Impl();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sfx2/source/dialog/splitwin.cxx
+12 -12
View File
@@ -378,8 +378,8 @@ void SfxSplitWindow::SplitResize()
{
if ( bPinned )
{
pWorkWin->ArrangeChilds_Impl();
pWorkWin->ShowChilds_Impl();
pWorkWin->ArrangeChildren_Impl();
pWorkWin->ShowChildren_Impl();
}
else
pWorkWin->ArrangeAutoHideWindows( this );
@@ -723,7 +723,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
pEmptyWin->Actualize();
OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" );
pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible = CHILD_VISIBLE;
pWorkWin->ArrangeChilds_Impl();
pWorkWin->ArrangeChildren_Impl();
if ( bFadeIn )
FadeIn();
}
@@ -743,12 +743,12 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
}
#endif
pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible = CHILD_VISIBLE;
pWorkWin->ArrangeChilds_Impl();
pWorkWin->ArrangeChildren_Impl();
if ( bFadeIn )
FadeIn();
}
pWorkWin->ShowChilds_Impl();
pWorkWin->ShowChildren_Impl();
}
if ( bUpdateMode )
@@ -1137,8 +1137,8 @@ void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn )
pEmptyWin->Hide();
OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering real Splitwindow" );
pWorkWin->RegisterChild_Impl( *this, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
pWorkWin->ArrangeChilds_Impl();
pWorkWin->ShowChilds_Impl();
pWorkWin->ArrangeChildren_Impl();
pWorkWin->ShowChildren_Impl();
}
}
else
@@ -1154,8 +1154,8 @@ void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn )
pEmptyWin->Actualize();
OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering empty Splitwindow" );
pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
pWorkWin->ArrangeChilds_Impl();
pWorkWin->ShowChilds_Impl();
pWorkWin->ArrangeChildren_Impl();
pWorkWin->ShowChildren_Impl();
pWorkWin->ArrangeAutoHideWindows( this );
}
else
@@ -1174,17 +1174,17 @@ void SfxSplitWindow::AutoHide()
{
// It "floats", thus dock it again
SetPinned_Impl( sal_True );
pWorkWin->ArrangeChilds_Impl();
pWorkWin->ArrangeChildren_Impl();
}
else
{
// In "limbo"
SetPinned_Impl( sal_False );
pWorkWin->ArrangeChilds_Impl();
pWorkWin->ArrangeChildren_Impl();
pWorkWin->ArrangeAutoHideWindows( this );
}
pWorkWin->ShowChilds_Impl();
pWorkWin->ShowChildren_Impl();
SaveConfig_Impl();
}
sfx2/source/dialog/templdlg.cxx
+12 -12
View File
@@ -638,12 +638,12 @@ struct StyleTree_Impl
{
String aName;
String aParent;
StyleTreeArr_Impl *pChilds;
StyleTreeArr_Impl *pChildren;
sal_Bool bIsExpanded;
sal_Bool HasParent() const { return aParent.Len() != 0; }
StyleTree_Impl(const String &rName, const String &rParent):
aName(rName), aParent(rParent), pChilds(0), bIsExpanded(0) {}
aName(rName), aParent(rParent), pChildren(0), bIsExpanded(0) {}
~StyleTree_Impl();
void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX);
sal_uIntPtr Count();
@@ -656,26 +656,26 @@ SV_IMPL_PTRARR(StyleTreeArr_Impl, StyleTree_ImplPtr)
sal_uIntPtr StyleTree_Impl::Count()
{
return pChilds ? pChilds->Count() : 0L;
return pChildren ? pChildren->Count() : 0L;
}
//-------------------------------------------------------------------------
StyleTree_Impl::~StyleTree_Impl()
{
delete pChilds;
delete pChildren;
}
//-------------------------------------------------------------------------
void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos)
{
if ( !pChilds )
pChilds = new StyleTreeArr_Impl;
if ( !pChildren )
pChildren = new StyleTreeArr_Impl;
if ( ULONG_MAX == lPos )
lPos = pChilds->Count();
pChilds->Insert( pIns, (sal_uInt16)lPos );
lPos = pChildren->Count();
pChildren->Insert( pIns, (sal_uInt16)lPos );
}
//-------------------------------------------------------------------------
@@ -703,7 +703,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
// Paste initial filter
sal_uInt16 nPos;
for( nPos = 0 ; nPos < pCmp->Count() &&
aSorter.compare((*pCmp->pChilds)[nPos]->aName, pEntry->aName) < 0 ; nPos++)
aSorter.compare((*pCmp->pChildren)[nPos]->aName, pEntry->aName) < 0 ; nPos++)
{};
pCmp->Put(pEntry,nPos);
break;
@@ -743,9 +743,9 @@ SvLBoxEntry* FillBox_Impl(SvTreeListBox *pBox,
SvLBoxEntry* pParent = 0)
{
SvLBoxEntry* pNewEntry = pBox->InsertEntry(pEntry->aName, pParent);
const sal_uInt16 nCount = pEntry->pChilds? pEntry->pChilds->Count(): 0;
const sal_uInt16 nCount = pEntry->pChildren? pEntry->pChildren->Count(): 0;
for(sal_uInt16 i = 0; i < nCount; ++i)
FillBox_Impl(pBox, (*pEntry->pChilds)[i], rEntries, pNewEntry);
FillBox_Impl(pBox, (*pEntry->pChildren)[i], rEntries, pNewEntry);
return pNewEntry;
}
@@ -2069,7 +2069,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
if ( pTreeBox )
{
pTreeBox->RemoveParentKeepChilds( pTreeBox->FirstSelected() );
pTreeBox->RemoveParentKeepChildren( pTreeBox->FirstSelected() );
bDontUpdate = sal_False;
}
}
sfx2/source/doc/docvor.cxx
+17 -17
View File
@@ -706,9 +706,9 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
// the general reference point
while(GetModel()->GetDepth(pParentIter) != nTLevel)
pParentIter = GetParent(pParentIter);
if(pParentIter->HasChildsOnDemand() &&
!GetModel()->HasChilds(pParentIter))
RequestingChilds(pParentIter);
if(pParentIter->HasChildrenOnDemand() &&
!GetModel()->HasChildren(pParentIter))
RequestingChildren(pParentIter);
SvLBoxEntry *pChildIter = 0;
sal_uInt16 i = 0;
@@ -721,16 +721,16 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
// If possible, fill in Items onDemand
++i;
if(i < 2 && p[i+1] != INDEX_IGNORE &&
pChildIter->HasChildsOnDemand() &&
!GetModel()->HasChilds(pChildIter))
RequestingChilds(pChildIter);
pChildIter->HasChildrenOnDemand() &&
!GetModel()->HasChildren(pChildIter))
RequestingChildren(pChildIter);
pParentIter = pChildIter;
}
rIdx = p[i];
pNewParent = pParentIter;
if(!IsExpanded(pNewParent) &&
pNewParent->HasChildsOnDemand() &&
!GetModel()->HasChilds(pNewParent))
pNewParent->HasChildrenOnDemand() &&
!GetModel()->HasChildren(pNewParent))
{
bOk = sal_False;
if(!bCopy)
@@ -1132,20 +1132,20 @@ SfxObjectShellRef SfxOrganizeListBox_Impl::GetObjectShell(const Path &rPath)
//-------------------------------------------------------------------------
void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
void SfxOrganizeListBox_Impl::RequestingChildren( SvLBoxEntry* pEntry )
/* [Description]
Sent to the Childs of an entry that is going to be inserted.
Sent to the children of an entry that is going to be inserted.
(SV-Handler)
[Parameter]
SvLBoxEntry* pEntry the entry whose Childs is requested
SvLBoxEntry* pEntry the entry whose children is requested
*/
{
if ( !GetModel()->HasChilds( pEntry ) )
if ( !GetModel()->HasChildren( pEntry ) )
{
WaitObject aWaitCursor( this );
@@ -1175,8 +1175,8 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
const sal_uInt16 nCount = aRef->GetContentCount(aPath[nDocLevel+1]);
String aText;
Bitmap aClosedBmp, aOpenedBmp;
const bool bCanHaveChilds =
aRef->CanHaveChilds(aPath[nDocLevel+1],
const bool bCanHaveChildren =
aRef->CanHaveChildren(aPath[nDocLevel+1],
aPath[nDocLevel+2]);
for(sal_uInt16 i = 0; i < nCount; ++i)
{
@@ -1191,7 +1191,7 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
SvLBoxEntry *pNew = SvTreeListBox::InsertEntry(
aText, aOpenedImage, aClosedImage,
pEntry, bCanHaveChilds);
pEntry, bCanHaveChildren);
pNew->SetUserData(bDeletable ? &bDeletable : 0);
}
}
@@ -1285,7 +1285,7 @@ SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType(
const XubString& rText,
BMPTYPE eBmpType,
SvLBoxEntry* pParent,
sal_Bool bChildsOnDemand,
sal_Bool bChildrenOnDemand,
sal_uIntPtr nPos,
void* pUserData
)
@@ -1310,7 +1310,7 @@ SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType(
OSL_FAIL( "SfxOrganizeListBox_Impl::InsertEntryByBmpType(): something forgotten?!" );
}
pEntry = SvTreeListBox::InsertEntry( rText, *pExp, *pCol, pParent, bChildsOnDemand, nPos, pUserData );
pEntry = SvTreeListBox::InsertEntry( rText, *pExp, *pCol, pParent, bChildrenOnDemand, nPos, pUserData );
return pEntry;
}
sfx2/source/doc/objcont.cxx
+1 -1
View File
@@ -351,7 +351,7 @@ void SfxObjectShell::TriggerHelpPI(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
}
}
sal_Bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
sal_Bool SfxObjectShell::CanHaveChildren(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
{
switch(nIdx1)
{
sfx2/source/doc/objmisc.cxx
+1 -1
View File
@@ -1075,7 +1075,7 @@ sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const
if ( !pObjSh || !pObjSh->IsAutoLoadLocked() )
return sal_False;
// Its Childs are locked?
// Its children are locked?
for ( sal_uInt16 n = GetChildFrameCount(); n--; )
if ( !GetChildFrame(n)->IsAutoLoadLocked_Impl() )
return sal_False;
sfx2/source/inc/workwin.hxx
+8 -8
View File
@@ -239,19 +239,19 @@ protected:
Rectangle aUpperClientArea;
SfxWorkWindow* pParent;
SfxSplitWindow* pSplit[SFX_SPLITWINDOWS_MAX];
SfxChildList_Impl* pChilds;
SfxChildList_Impl* pChildren;
SfxChildWindows_Impl* pChildWins;
SfxBindings* pBindings;
Window* pWorkWin;
SfxShell* pConfigShell;
Window* pActiveChild;
sal_uInt16 nUpdateMode;
sal_uInt16 nChilds;
sal_uInt16 nChildren;
sal_uInt16 nOrigMode;
sal_Bool bSorted : 1;
sal_Bool bDockingAllowed : 1;
sal_Bool bInternalDockingAllowed : 1;
sal_Bool bAllChildsVisible : 1;
sal_Bool bAllChildrenVisible : 1;
sal_Bool bIsFullScreen : 1;
sal_Bool bShowStatusBar : 1;
sal_Int32 m_nLock;
@@ -295,15 +295,15 @@ public:
void DataChanged_Impl( const DataChangedEvent& rDCEvt );
void ReleaseChild_Impl( Window& rWindow );
SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, sal_Bool bCanGetFocus=sal_False );
void ShowChilds_Impl();
void HideChilds_Impl();
void ShowChildren_Impl();
void HideChildren_Impl();
sal_Bool PrepareClose_Impl();
virtual void ArrangeChilds_Impl( sal_Bool bForce = sal_True );
virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True );
void DeleteControllers_Impl();
void HidePopups_Impl(sal_Bool bHide, sal_Bool bParent=sal_False, sal_uInt16 nId=0);
void ConfigChild_Impl(SfxChildIdentifier,
SfxDockingConfig, sal_uInt16);
void MakeChildsVisible_Impl( sal_Bool bVis );
void MakeChildrenVisible_Impl( sal_Bool bVis );
void ArrangeAutoHideWindows( SfxSplitWindow *pSplit );
sal_Bool IsAutoHideMode( const SfxSplitWindow *pSplit );
void EndAutoShow_Impl( Point aPos );
@@ -355,7 +355,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow
SfxFrame* pFrame;
public:
SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster );
virtual void ArrangeChilds_Impl( sal_Bool bForce = sal_True );
virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True );
virtual void UpdateObjectBars_Impl();
virtual Rectangle GetTopRect_Impl();
};

Some files were not shown because too many files have changed in this diff Show More