diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-12-17 09:02:23 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-12-17 09:02:23 +0100 |
| commit | bee0ab39bd38fc866e4e7149b9ac59b6a0209b63 (patch) | |
| tree | b99b992f23c4624ca5a35df1cb1d1f30a14e8ec4 /sw/source/core/edit/edfldexp.cxx | |
| parent | 7741a4a9fbcf7df47839d43081e0318e47fe63a6 (diff) | |
CWS swlayoutrefactoring: #i115510#: first step to clean up the SwClient mess
Diffstat (limited to 'sw/source/core/edit/edfldexp.cxx')
| -rw-r--r-- | sw/source/core/edit/edfldexp.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx index ff548882ff..e5d149d481 100644 --- a/sw/source/core/edit/edfldexp.cxx +++ b/sw/source/core/edit/edfldexp.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" #include <editsh.hxx> #include <dbfld.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -42,13 +40,11 @@ #include <fmtfld.hxx> #include <edimp.hxx> #include <flddat.hxx> +#include <switerator.hxx> using namespace com::sun::star; using ::rtl::OUString; -/* -----------------28.11.2002 17:53----------------- - * - * --------------------------------------------------*/ BOOL SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const { const SwFldTypes * pFldTypes = GetDoc()->GetFldTypes(); @@ -70,8 +66,8 @@ BOOL SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const { case RES_DBFLD: { - SwClientIter aIter( rFldType ); - SwFmtFld* pFld = (SwFmtFld*)aIter.First( TYPE( SwFmtFld )); + SwIterator<SwFmtFld,SwFieldType> aIter( rFldType ); + SwFmtFld* pFld = aIter.First(); while(pFld) { if(pFld->IsFldInDoc()) @@ -88,7 +84,7 @@ BOOL SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const return FALSE; } } - pFld = (SwFmtFld*)aIter.Next(); + pFld = aIter.Next(); } } break; |