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/ui/envelp/labelexp.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/ui/envelp/labelexp.cxx')
| -rw-r--r-- | sw/source/ui/envelp/labelexp.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index d1d4d27ca74a..b5a9c92eeb43 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -169,8 +169,8 @@ void SwVisitingCardPage::UpdateFields() void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, const SwLabItem& rItem) { - uno::Reference< text::XTextFieldsSupplier > xFlds(xModel, uno::UNO_QUERY); - uno::Reference< container::XNameAccess > xFldMasters = xFlds->getTextFieldMasters(); + uno::Reference< text::XTextFieldsSupplier > xFields(xModel, uno::UNO_QUERY); + uno::Reference< container::XNameAccess > xFieldMasters = xFields->getTextFieldMasters(); static const struct _SwLabItemMap { const char* pName; @@ -215,17 +215,17 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, { for( const _SwLabItemMap* p = aArr; p->pName; ++p ) { - OUString uFldName( + OUString uFieldName( "com.sun.star.text.FieldMaster.User." + OUString::createFromAscii(p->pName)); - if( xFldMasters->hasByName( uFldName )) + if( xFieldMasters->hasByName( uFieldName )) { - uno::Any aFirstName = xFldMasters->getByName( uFldName ); - uno::Reference< beans::XPropertySet > xFld; - aFirstName >>= xFld; + uno::Any aFirstName = xFieldMasters->getByName( uFieldName ); + uno::Reference< beans::XPropertySet > xField; + aFirstName >>= xField; uno::Any aContent; aContent <<= rItem.*p->pValue; - xFld->setPropertyValue( UNO_NAME_CONTENT, aContent ); + xField->setPropertyValue( UNO_NAME_CONTENT, aContent ); } } } @@ -234,8 +234,8 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, } - uno::Reference< container::XEnumerationAccess > xFldAcc = xFlds->getTextFields(); - uno::Reference< util::XRefreshable > xRefresh(xFldAcc, uno::UNO_QUERY); + uno::Reference< container::XEnumerationAccess > xFieldAcc = xFields->getTextFields(); + uno::Reference< util::XRefreshable > xRefresh(xFieldAcc, uno::UNO_QUERY); xRefresh->refresh(); } |