Kaydet (Commit) 50b0cce3 authored tarafından Kurt Zenker's avatar Kurt Zenker

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).
üst a17ad42d
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: impastp4.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -276,7 +276,7 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily, ...@@ -276,7 +276,7 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
{ {
OUString sName; OUString sName;
sal_uInt32 nPos; ULONG nPos;
XMLFamilyData_Impl aTemporary( nFamily ); XMLFamilyData_Impl aTemporary( nFamily );
XMLFamilyData_Impl *pFamily = 0; XMLFamilyData_Impl *pFamily = 0;
if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) ) if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment