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/uibase/docvw/romenu.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/uibase/docvw/romenu.cxx')
-rw-r--r-- | sw/source/uibase/docvw/romenu.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index a4d51ae14ceb..77c0adc07063 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -93,13 +93,13 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : rSh.IsURLGrfAtPos( rDocPos, &sURL, &sTargetFrameName, &sDescription ); if ( sURL.isEmpty() ) { - SwContentAtPos aCntntAtPos( SwContentAtPos::SW_INETATTR ); - if( rSh.GetContentAtPos( rDocPos, aCntntAtPos, false)) + SwContentAtPos aContentAtPos( SwContentAtPos::SW_INETATTR ); + if( rSh.GetContentAtPos( rDocPos, aContentAtPos, false)) { - const SwFmtINetFmt &rIItem = *static_cast<const SwFmtINetFmt*>(aCntntAtPos.aFnd.pAttr); + const SwFormatINetFormat &rIItem = *static_cast<const SwFormatINetFormat*>(aContentAtPos.aFnd.pAttr); sURL = rIItem.GetValue(); sTargetFrameName = rIItem.GetTargetFrame(); - sDescription = aCntntAtPos.sStr; + sDescription = aContentAtPos.sStr; } } @@ -113,12 +113,12 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : else { aGraphic = *pGrf; - const SwFrmFmt* pGrfFmt = rSh.GetFmtFromObj( rDocPos ); + const SwFrameFormat* pGrfFormat = rSh.GetFormatFromObj( rDocPos ); const SfxPoolItem* pURLItem; - if( pGrfFmt && SfxItemState::SET == pGrfFmt->GetItemState( + if( pGrfFormat && SfxItemState::SET == pGrfFormat->GetItemState( RES_URL, true, &pURLItem )) { - const SwFmtURL& rURL = *static_cast<const SwFmtURL*>(pURLItem); + const SwFormatURL& rURL = *static_cast<const SwFormatURL*>(pURLItem); if( rURL.GetMap() ) pImageMap = new ImageMap( *rURL.GetMap() ); else if( !rURL.GetURL().isEmpty() ) |