[Libreoffice-commits] core.git: sw/source

[Jan Holesovsky]

 sw/source/uibase/uiview/viewling.cxx |    6 +++---
 sw/source/uibase/utlui/glbltree.cxx  |   14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b317d5fbb5a0a8dc695391de3f9f6ee339341987
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Nov 16 12:34:50 2015 +0100

    sw: Rename to avoid conflict after Frm -> Frame rename.
    
    Change-Id: I4d02024fd80ad85c8c3ecd830dcc5c4b49ad2014

diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index af2e46e..b9e2ef4 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -654,12 +654,12 @@ bool SwView::ExecSpellPopup(const Point& rPt)
                 !pCrsrShell->IsTableMode() &&
                 !pCrsr->HasMark() && !pCrsr->IsMultiSelection())
             {
-                SwContentFrm *pFrm = pCrsr->GetContentNode()->getLayoutFrm(
+                SwContentFrm *pContentFrame = pCrsr->GetContentNode()->getLayoutFrm(
                                         pCrsrShell->GetLayout(),
                                         &rPt, &aPoint, false);
-                if (pFrm)
+                if (pContentFrame)
                 {
-                    SwRect aRepaint(static_cast<SwTextFrm*>(pFrm)->_AutoSpell(nullptr, 0));
+                    SwRect aRepaint(static_cast<SwTextFrm*>(pContentFrame)->_AutoSpell(nullptr, 0));
                     if (aRepaint.HasArea())
                         m_pWrtShell->InvalidateWindows(aRepaint);
                 }
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index d2014dd..0b11418 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -937,13 +937,13 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
 
             // save at
             SfxFrame* pFrm = pItem ? pItem->GetFrame() : nullptr;
-            SfxViewFrame* pFrame = pFrm ? pFrm->GetCurrentViewFrame() : nullptr;
-            if( pFrame )
+            SfxViewFrame* pViewFrame = pFrm ? pFrm->GetCurrentViewFrame() : nullptr;
+            if (pViewFrame)
             {
                 const SfxBoolItem* pBool = static_cast<const SfxBoolItem*>(
-                        pFrame->GetDispatcher()->Execute(
+                        pViewFrame->GetDispatcher()->Execute(
                                 SID_SAVEASDOC, SfxCallMode::SYNCHRON ));
-                SfxObjectShell& rObj = *pFrame->GetObjectShell();
+                SfxObjectShell& rObj = *pViewFrame->GetObjectShell();
                 const SfxMedium* pMedium = rObj.GetMedium();
                 OUString sNewFile(pMedium->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI));
                 // Insert the area with the Doc-Name
@@ -968,15 +968,15 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
                     if(pBool->GetValue())
                     {
                         InsertRegion(pCont, &sNewFile);
-                        pFrame->ToTop();
+                        pViewFrame->ToTop();
                     }
                     else
-                        pFrame->GetDispatcher()->Execute(SID_CLOSEWIN,
+                        pViewFrame->GetDispatcher()->Execute(SID_CLOSEWIN,
                                                 SfxCallMode::SYNCHRON);
                 }
                 else
                 {
-                    pFrame->ToTop();
+                    pViewFrame->ToTop();
                     return;
                 }
             }