strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sb88 (1.7.10); FILE MERGED

Browse source 
2008/06/03 15:29:47 sb 1.7.10.1: #i89553 applied patch by cmc
This commit is contained in:
Rüdiger Timm 2008-06-16 12:38:49 +00:00
parent dd3fd4d564
commit 97bddf1ec9
3 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configmgr/source/backend/binarywritehandler.hxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: binarywritehandler.hxx,v $ * $RCSfile: binarywritehandler.hxx,v $
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -109,9 +109,6 @@ namespace configmgr
void writeStop() void writeStop()
SAL_THROW( (io::IOException, uno::RuntimeException) ); SAL_THROW( (io::IOException, uno::RuntimeException) );
void writeType(uno::Type const& _aType)
SAL_THROW( (io::IOException, uno::RuntimeException) );
void writeValue( uno::Any const& _aValue) void writeValue( uno::Any const& _aValue)
SAL_THROW( (io::IOException, uno::RuntimeException) ); SAL_THROW( (io::IOException, uno::RuntimeException) );

3
configmgr/source/backend/layerupdatemerger.hxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: layerupdatemerger.hxx,v $ * $RCSfile: layerupdatemerger.hxx,v $
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -120,7 +120,6 @@ namespace configmgr
virtual void flushUpdate(); virtual void flushUpdate();
private: private:
void malformedUpdate(sal_Char const * pMsg); void malformedUpdate(sal_Char const * pMsg);
void illegalUpdate(sal_Char const * pMsg);
private: private:
LayerUpdate m_aLayerUpdate; LayerUpdate m_aLayerUpdate;
NodeUpdateRef m_xCurrentNode; NodeUpdateRef m_xCurrentNode;

15
configmgr/source/inc/anynoderef.hxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: anynoderef.hxx,v $ * $RCSfile: anynoderef.hxx,v $
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -101,8 +101,9 @@ namespace configmgr
friend class TreeImplHelper; friend class TreeImplHelper;
AnyNodeRef(NodeOffset nParentPos, TreeDepth m_nDepth); AnyNodeRef(NodeOffset nParentPos, TreeDepth m_nDepth);
AnyNodeRef(Name const& aName, NodeOffset nParentPos); AnyNodeRef(Name const& aName, NodeOffset nParentPos);
#if OSL_DEBUG_LEVEL > 0
bool checkValidState() const; bool checkValidState() const;
#endif
private: private:
Name m_sNodeName; Name m_sNodeName;
NodeOffset m_nUsedPos; NodeOffset m_nUsedPos;
@ -110,16 +111,6 @@ namespace configmgr
}; };
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
/** checks whether there are any immediate children of <var>aNode</var> (which is in <var>aTree</var>)
@return
<TRUE/> if a child node exists
<FALSE/> otherwise
*/
inline
bool hasChildOrElement(Tree const& aTree, AnyNodeRef const& aNode)
{ return aNode.isNode() && hasChildOrElement(aTree,aNode.toNode()); }
/** checks whether there is an immediate child of <var>aNode</var> (which is in <var>aTree</var>) /** checks whether there is an immediate child of <var>aNode</var> (which is in <var>aTree</var>)
specified by <var>aName</var> specified by <var>aName</var>