diff options
author | Jan Holesovsky <kendy@collabora.com> | 2015-11-16 12:27:59 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2015-11-16 12:27:59 +0100 |
commit | a5055366c3865a443d1c688e48b581dad5e5fdc0 (patch) | |
tree | 7000516681565513842fa4b136af75a46c7017d8 /sw/source/uibase/app | |
parent | 78bad759600e868753934df00b237e6bb48005b8 (diff) |
sw: Rename to avoid conflict after Frm -> Frame rename.
Change-Id: I59147583c74e7211ac56d75468501f328122ba0f
Diffstat (limited to 'sw/source/uibase/app')
-rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 42ea0433027e..567a65c1bb43 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -253,8 +253,8 @@ SwView* lcl_LoadDoc(SwView* pView, const OUString& rURL) pView->GetViewFrame()->GetDispatcher()->Execute(SID_NEWDOCDIRECT, SfxCallMode::SYNCHRON, &aFactory, 0L)); SfxFrame* pFrm = pItem ? pItem->GetFrame() : nullptr; - SfxViewFrame* pFrame = pFrm ? pFrm->GetCurrentViewFrame() : nullptr; - pNewView = pFrame ? dynamic_cast<SwView*>( pFrame->GetViewShell() ) : nullptr; + SfxViewFrame* pViewFrame = pFrm ? pFrm->GetCurrentViewFrame() : nullptr; + pNewView = pViewFrame ? dynamic_cast<SwView*>( pViewFrame->GetViewShell() ) : nullptr; } return pNewView; |