[Libreoffice-commits] core.git: compilerplugins/clang include/sfx2 sfx2/source

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.readonly.results |    2 --
 include/sfx2/viewsh.hxx                                    |    4 +---
 sfx2/source/view/sfxbasecontroller.cxx                     |    2 +-
 sfx2/source/view/viewimp.hxx                               |    1 -
 sfx2/source/view/viewsh.cxx                                |    6 ------
 5 files changed, 2 insertions(+), 13 deletions(-)

New commits:
commit a4a98dd0353db408708dd09a30fbfe6ada539770
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Nov 26 11:50:09 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Nov 27 13:56:13 2018 +0100

    remove unused SfxViewShellFlags enum value
    
    Change-Id: Ie754752203dcb066c69dff6effb835d7e1db1753
    Reviewed-on: https://gerrit.libreoffice.org/64088
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index 1adf3e14a4fc..a85cdefcaa73 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -410,8 +410,6 @@ include/sfx2/objsh.hxx:120
     enum SfxObjectShellFlags DONTCLOSE
 include/sfx2/objsh.hxx:121
     enum SfxObjectShellFlags NODOCINFO
-include/sfx2/viewsh.hxx:101
-    enum SfxViewShellFlags NO_SHOW
 include/svl/ctloptions.hxx:64
     enum SvtCTLOptions::TextNumerals NUMERALS_HINDI
 include/svl/ctloptions.hxx:65
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index cb185bb7b058..67a304a14873 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -98,12 +98,11 @@ enum class SfxViewShellFlags
 {
     NONE              = 0x0000,
     HAS_PRINTOPTIONS  = 0x0010, /* Options-Button and Options-Dialog in PrintDialog */
-    NO_SHOW           = 0x0040, /* Window of the ViewShell shall not be showed automatically */
     NO_NEWWINDOW      = 0x0100, /* Allow N View */
 };
 namespace o3tl
 {
-    template<> struct typed_flags<SfxViewShellFlags> : is_typed_flags<SfxViewShellFlags, 0x0150> {};
+    template<> struct typed_flags<SfxViewShellFlags> : is_typed_flags<SfxViewShellFlags, 0x0110> {};
 }
 
 /*  [Description]
@@ -305,7 +304,6 @@ public:
     SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient const *pIP );
 
     SAL_DLLPRIVATE void SetPrinter_Impl( VclPtr<SfxPrinter>& pNewPrinter );
-    SAL_DLLPRIVATE bool IsShowView_Impl() const;
 
     SAL_DLLPRIVATE bool HandleNotifyEvent_Impl( NotifyEvent const & rEvent );
     SAL_DLLPRIVATE bool HasKeyListeners_Impl();
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 697a78450279..1d3990b01322 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1220,7 +1220,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
         }
 
         vcl::Window* pEditWin = m_pData->m_pViewShell->GetWindow();
-        if ( pEditWin && m_pData->m_pViewShell->IsShowView_Impl() )
+        if ( pEditWin )
             pEditWin->Show();
 
         if ( SfxViewFrame::Current() == pViewFrame )
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 00b7b51590fe..756b7bcb8da1 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -44,7 +44,6 @@ struct SfxViewShell_Impl
     SfxShellArr_Impl aArr;
     Size aMargin;
     bool const m_bHasPrintOptions;
-    bool const m_bIsShowView;
     sal_uInt16 m_nFamily;
     ::rtl::Reference<SfxBaseController> m_pController;
     std::unique_ptr< ::svt::AcceleratorExecute > m_xAccExec;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 04733ec20cfb..fa571944a96a 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -221,7 +221,6 @@ sal_uInt32 SfxViewShell_Impl::m_nLastViewShellId = 0;
 SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags const nFlags)
 : aInterceptorContainer( aMutex )
 ,   m_bHasPrintOptions(nFlags & SfxViewShellFlags::HAS_PRINTOPTIONS)
-,   m_bIsShowView(!(nFlags & SfxViewShellFlags::NO_SHOW))
 ,   m_nFamily(0xFFFF)   // undefined, default set by TemplateDialog
 ,   m_pLibreOfficeKitViewCallback(nullptr)
 ,   m_pLibreOfficeKitViewData(nullptr)
@@ -1721,11 +1720,6 @@ void SfxViewShell::MarginChanged()
 {
 }
 
-bool SfxViewShell::IsShowView_Impl() const
-{
-    return pImpl->m_bIsShowView;
-}
-
 void SfxViewShell::JumpToMark( const OUString& rMark )
 {
     SfxStringItem aMarkItem( SID_JUMPTOMARK, rMark );