4 files changed, 7 insertions, 32 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index a4617bf3a1b4..fa2376f89cb6 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -549,7 +549,7 @@ bool SfxFrameItem::operator==( const SfxPoolItem &rItem ) const
 SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const
 {
     SfxFrameItem* pNew = new SfxFrameItem( wFrame);
-    pNew->SetFramePtr_Impl( pFrame );
+    pNew->pFrame = pFrame;
     return pNew;
 }
 
@@ -817,11 +817,6 @@ bool SfxFrame::IsInPlace() const
     return pImpl->bInPlace;
 }
 
-void SfxFrame::SetInPlace_Impl( bool bSet )
-{
-    pImpl->bInPlace = bSet;
-}
-
 void SfxFrame::Resize()
 {
     if ( IsClosing_Impl() )
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 6d00c6ffbd68..2672aa511926 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -401,7 +401,7 @@ void SfxFrame::PrepareForDoc_Impl( SfxObjectShell& i_rDoc )
     // plugin mode
     sal_Int16 nPluginMode = aDocumentArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
     if ( nPluginMode && ( nPluginMode != 2 ) )
-        SetInPlace_Impl( true );
+        pImpl->bInPlace = true;
 }
 
 bool SfxFrame::IsMarkedHidden_Impl() const
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 9f024b5ab51f..da20f4013e0a 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -202,16 +202,6 @@ static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHa
     return bResult;
 }
 
-void SfxViewFrame::SetDowning_Impl()
-{
-    m_pImpl->bIsDowning = true;
-}
-
-bool SfxViewFrame::IsDowning_Impl() const
-{
-    return m_pImpl->bIsDowning;
-}
-
 void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 {
     SfxFrame *pParent = GetFrame().GetParentFrame();
@@ -1083,7 +1073,7 @@ void SfxViewFrame::SetBorderPixelImpl
 {
     m_pImpl->aBorder = rBorder;
 
-    if ( IsResizeInToOut_Impl() && !GetFrame().IsInPlace() )
+    if ( m_pImpl->bResizeInToOut && !GetFrame().IsInPlace() )
     {
         Size aSize = pVSh->GetWindow()->GetOutputSizePixel();
         if ( aSize.Width() && aSize.Height() )
@@ -1121,7 +1111,7 @@ const SvBorder& SfxViewFrame::GetBorderPixelImpl() const
 
 void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
-    if( IsDowning_Impl())
+    if(m_pImpl->bIsDowning)
         return;
 
     // we know only SfxEventHint or simple SfxHint
@@ -1352,7 +1342,7 @@ SfxViewFrame::SfxViewFrame
 
 SfxViewFrame::~SfxViewFrame()
 {
-    SetDowning_Impl();
+    m_pImpl->bIsDowning = true;
 
     if ( SfxViewFrame::Current() == this )
         SfxViewFrame::SetViewFrame( nullptr );
@@ -1454,7 +1444,7 @@ SfxViewFrame* SfxViewFrame::GetNext
 
 SfxProgress* SfxViewFrame::GetProgress() const
 {
-    SfxObjectShell *pObjSh = GetObjectShell();
+    SfxObjectShell *pObjSh = m_xObjSh.get();
     return pObjSh ? pObjSh->GetProgress() : nullptr;
 }
 
@@ -1507,11 +1497,6 @@ void SfxViewFrame::ForceOuterResize_Impl()
     m_pImpl->bResizeInToOut = true;
 }
 
-bool SfxViewFrame::IsResizeInToOut_Impl() const
-{
-    return m_pImpl->bResizeInToOut;
-}
-
 void SfxViewFrame::GetDocNumber_Impl()
 {
     DBG_ASSERT( GetObjectShell(), "No Document!" );
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 616af3e99c28..ca5baf74771f 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -614,7 +614,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro
     StartPrint( rProps, bIsAPI, bIsDirect );
     // FIXME: job setup
     SfxPrinter* pDocPrt = GetPrinter();
-    JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup();
+    JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : JobSetup();
     Printer::PrintJob( GetPrinterController(), aJobSetup );
 }
 
@@ -899,9 +899,4 @@ bool SfxViewShell::HasPrintOptionsPage() const
     return false;
 }
 
-JobSetup SfxViewShell::GetJobSetup()
-{
-    return JobSetup();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */