diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
| commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
| tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/source/core/edit/edfldexp.cxx | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.sh
libreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/source/core/edit/edfldexp.cxx')
| -rw-r--r-- | sw/source/core/edit/edfldexp.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx index 52de1dea2de2..74a7ae9204ae 100644 --- a/sw/source/core/edit/edfldexp.cxx +++ b/sw/source/core/edit/edfldexp.cxx @@ -37,25 +37,25 @@ using namespace com::sun::star; bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const { - const SwFldTypes * pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes(); + const SwFieldTypes * pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes(); uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); uno::Reference<sdb::XDatabaseContext> xDBContext = sdb::DatabaseContext::create(xContext); - for(const auto pFldType : *pFldTypes) + for(const auto pFieldType : *pFieldTypes) { - if(IsUsed(*pFldType)) + if(IsUsed(*pFieldType)) { - switch(pFldType->Which()) + switch(pFieldType->Which()) { case RES_DBFLD: { - SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType ); - SwFmtFld* pFmtFld = aIter.First(); - while(pFmtFld) + SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType ); + SwFormatField* pFormatField = aIter.First(); + while(pFormatField) { - if(pFmtFld->IsFldInDoc()) + if(pFormatField->IsFieldInDoc()) { const SwDBData& rData = - static_cast<SwDBFieldType*>(pFmtFld->GetField()->GetTyp())->GetDBData(); + static_cast<SwDBFieldType*>(pFormatField->GetField()->GetTyp())->GetDBData(); try { return xDBContext->getByName(rData.sDataSource).hasValue(); @@ -66,7 +66,7 @@ bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const return false; } } - pFmtFld = aIter.Next(); + pFormatField = aIter.Next(); } } break; |