diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-06 13:23:26 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-06 13:23:26 +0000 |
| commit | 50b0cce38af125aaeff177d9743b6ee342aa4e98 (patch) | |
| tree | a3bb3ed3a808d8c63e6a644c0248bc67416a4b40 /xmloff/source/style/impastp4.cxx | |
| parent | a17ad42d5f5ac601af6d30f50db32b85e6aea221 (diff) | |
INTEGRATION: CWS warningfixes01 (1.17.8); FILE MERGED
2006/06/27 13:15:34 sb 1.17.8.1: #i66728# Fixed broken automatic CVS merge (new ULONG in 1.16 was changed back to old sal_uInt32 in 1.17).
Diffstat (limited to 'xmloff/source/style/impastp4.cxx')
| -rw-r--r-- | xmloff/source/style/impastp4.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index 9c17a0098583..bc3683bb689d 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -4,9 +4,9 @@ * * $RCSfile: impastp4.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2006-06-19 18:33:22 $ + * last change: $Author: kz $ $Date: 2006-07-06 14:23:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -276,7 +276,7 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily, { OUString sName; - sal_uInt32 nPos; + ULONG nPos; XMLFamilyData_Impl aTemporary( nFamily ); XMLFamilyData_Impl *pFamily = 0; if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) ) |