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/doc/DocumentDrawModelManager.cxx | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.shlibreoffice-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/doc/DocumentDrawModelManager.cxx')
| -rw-r--r-- | sw/source/core/doc/DocumentDrawModelManager.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index bed970f0d55e..50a3ab13af53 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -226,8 +226,8 @@ SwDrawModel* DocumentDrawModelManager::_MakeDrawModel() // Broadcast, so that the FormShell can be connected to the DrawView if( m_rDoc.GetDocShell() ) { - SfxSimpleHint aHnt( SW_BROADCAST_DRAWVIEWS_CREATED ); - m_rDoc.GetDocShell()->Broadcast( aHnt ); + SfxSimpleHint aHint( SW_BROADCAST_DRAWVIEWS_CREATED ); + m_rDoc.GetDocShell()->Broadcast( aHint ); } } return mpDrawModel; @@ -372,19 +372,19 @@ SdrLayerID DocumentDrawModelManager::GetInvisibleLayerIdByVisibleOne( const SdrL bool DocumentDrawModelManager::Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) { - SwPosFlyFrms aFrames = m_rDoc.GetAllFlyFmts(&rPaM, /*bDrawAlso=*/true); + SwPosFlyFrms aFrames = m_rDoc.GetAllFlyFormats(&rPaM, /*bDrawAlso=*/true); for (const SwPosFlyFrmPtr& pPosFlyFrm : aFrames) { // Filter for at-paragraph anchored draw frames. - const SwFrmFmt& rFrmFmt = pPosFlyFrm->GetFmt(); - const SwFmtAnchor& rAnchor = rFrmFmt.GetAnchor(); - if (rAnchor.GetAnchorId() != FLY_AT_PARA || rFrmFmt.Which() != RES_DRAWFRMFMT) + const SwFrameFormat& rFrameFormat = pPosFlyFrm->GetFormat(); + const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor(); + if (rAnchor.GetAnchorId() != FLY_AT_PARA || rFrameFormat.Which() != RES_DRAWFRMFMT) continue; // Does the shape have matching text? SdrOutliner& rOutliner = GetDrawModel()->GetDrawOutliner(); - SdrObject* pObject = const_cast<SdrObject*>(rFrmFmt.FindSdrObject()); + SdrObject* pObject = const_cast<SdrObject*>(rFrameFormat.FindSdrObject()); SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>(pObject); if (!pTextObj) continue; |