sw/inc/viewsh.hxx                    |    3 ---
 sw/source/core/view/vnew.cxx         |    4 ++--
 sw/source/uibase/uiview/viewport.cxx |    2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 396f7dfc17ceb24de8cfa0a9480943f7b397f8f4
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jun 30 15:33:43 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jun 30 20:29:05 2023 +0200

    mbFrameView is dead since
    
    commit 407731c9f403c35357a0d1428c9b99835f79a5f7
        Author: Noel Grandin <n...@peralex.com>
        Date:   Tue Jul 21 10:44:17 2015 +0200
        loplugin:unusedmethods sw
    
    removed the SetFrameView() method, which in turn
    was dead since
    
        commit 1c6da69ba2bc437d826573c7909a220290a67311
        Author: Frank Schoenheit [fs] <frank.schoenh...@sun.com>
        Date:   Mon Nov 30 12:56:05 2009 +0100
        [CWS autorecovery] removed some dead/unused stuff
    
    Change-Id: I6e74dd7609ecd6ce459b6397a852caa6bde7fac8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153812
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 583b795a1b22..1fb861748f20 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -153,7 +153,6 @@ class SW_DLLPUBLIC SwViewShell : public 
sw::Ring<SwViewShell>
                                     // in this case MakeVisible is ineffectual.
     bool  mbInEndAction     :1;  // Avoid problems, cf. viewsh.cxx.
     bool  mbPreview         :1;  // If true it is a Preview-SwViewShell.
-    bool  mbFrameView       :1;  // If true it is a  (HTML-)Frame.
     bool  mbEnableSmooth    :1;  // Disable SmoothScroll, e.g. for drag
                                     // of scrollbars.
     bool      mbShowHeaderSeparator:1; ///< Flag to say that we are showing 
the header control
@@ -515,8 +514,6 @@ public:
 
     bool IsPreview() const { return mbPreview; }
 
-    bool IsFrameView()  const { return mbFrameView; }
-
     // Invalidates pages and contents.
     // When bSizeChanged==true, adds/removes
     // headers and footers as necessary.
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 0d097f0a9475..613a15df633b 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -168,7 +168,7 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window 
*pWindow,
     // <SwDrawContact::Changed> during construction of <SwViewShell> instance
     mbInConstructor = true;
 
-    mbPaintInProgress = mbViewLocked = mbInEndAction = mbFrameView = false;
+    mbPaintInProgress = mbViewLocked = mbInEndAction = false;
     mbPaintWorks = mbEnableSmooth = true;
     mbPreview = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags );
 
@@ -237,7 +237,7 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window 
*pWindow,
     mbInConstructor = true;
 
     mbPaintWorks = mbEnableSmooth = true;
-    mbPaintInProgress = mbViewLocked = mbInEndAction = mbFrameView = false;
+    mbPaintInProgress = mbViewLocked = mbInEndAction = false;
     mbPreview = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags );
 
     if( nFlags & VSHELLFLAG_SHARELAYOUT )
diff --git a/sw/source/uibase/uiview/viewport.cxx 
b/sw/source/uibase/uiview/viewport.cxx
index 5446c708a5e9..415771aae940 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -294,7 +294,7 @@ void SwView::SetVisArea( const Point &rPt, bool 
bUpdateScrollbar )
     // Let's see how far we get with half BrushSize.
     Point aPt = GetEditWin().LogicToPixel( rPt );
 #if HAVE_FEATURE_DESKTOP
-    const tools::Long nTmp = GetWrtShell().IsFrameView() ? 4 : 8;
+    const tools::Long nTmp = 8;
     aPt.AdjustX( -(aPt.X() % nTmp) );
     aPt.AdjustY( -(aPt.Y() % nTmp) );
 #endif

Reply via email to