sw/source/uibase/app/apphdl.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a5055366c3865a443d1c688e48b581dad5e5fdc0
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Nov 16 12:27:59 2015 +0100
sw: Rename to avoid conflict after Frm -> Frame rename.
Change-Id: I59147583c74e7211ac56d75468501f328122ba0f
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 42ea043..567a65c 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
