mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused SfxViewShellFlags enum value

Browse Source 
Change-Id: Ie754752203dcb066c69dff6effb835d7e1db1753
Reviewed-on: https://gerrit.libreoffice.org/64088
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-11-26 11:50:09 +02:00
parent 4a68aec049
commit a4a98dd035
5 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/clang/unusedenumconstants.readonly.results
View File

@@ -410,8 +410,6 @@ include/sfx2/objsh.hxx:120
enum SfxObjectShellFlags DONTCLOSE enum SfxObjectShellFlags DONTCLOSE
include/sfx2/objsh.hxx:121 include/sfx2/objsh.hxx:121
enum SfxObjectShellFlags NODOCINFO enum SfxObjectShellFlags NODOCINFO
include/sfx2/viewsh.hxx:101
enum SfxViewShellFlags NO_SHOW
include/svl/ctloptions.hxx:64 include/svl/ctloptions.hxx:64
enum SvtCTLOptions::TextNumerals NUMERALS_HINDI enum SvtCTLOptions::TextNumerals NUMERALS_HINDI
include/svl/ctloptions.hxx:65 include/svl/ctloptions.hxx:65

4
include/sfx2/viewsh.hxx
View File

@@ -98,12 +98,11 @@ enum class SfxViewShellFlags
{ {
NONE = 0x0000, NONE = 0x0000,
HAS_PRINTOPTIONS = 0x0010, /* Options-Button and Options-Dialog in PrintDialog */ 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 */ NO_NEWWINDOW = 0x0100, /* Allow N View */
}; };
namespace o3tl namespace o3tl
{ {
template<> struct typed_flags<SfxViewShellFlags> : is_typed_flags<SfxViewShellFlags, 0x0150> {}; template<> struct typed_flags<SfxViewShellFlags> : is_typed_flags<SfxViewShellFlags, 0x0110> {};
} }
/* [Description] /* [Description]
@@ -305,7 +304,6 @@ public:
SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient const *pIP ); SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient const *pIP );
SAL_DLLPRIVATE void SetPrinter_Impl( VclPtr<SfxPrinter>& pNewPrinter ); 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 HandleNotifyEvent_Impl( NotifyEvent const & rEvent );
SAL_DLLPRIVATE bool HasKeyListeners_Impl(); SAL_DLLPRIVATE bool HasKeyListeners_Impl();

2
sfx2/source/view/sfxbasecontroller.cxx
View File

@@ -1220,7 +1220,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
} }
vcl::Window* pEditWin = m_pData->m_pViewShell->GetWindow(); vcl::Window* pEditWin = m_pData->m_pViewShell->GetWindow();
if ( pEditWin && m_pData->m_pViewShell->IsShowView_Impl() ) if ( pEditWin )
pEditWin->Show(); pEditWin->Show();
if ( SfxViewFrame::Current() == pViewFrame ) if ( SfxViewFrame::Current() == pViewFrame )

1
sfx2/source/view/viewimp.hxx
View File

@@ -44,7 +44,6 @@ struct SfxViewShell_Impl
SfxShellArr_Impl aArr; SfxShellArr_Impl aArr;
Size aMargin; Size aMargin;
bool const m_bHasPrintOptions; bool const m_bHasPrintOptions;
bool const m_bIsShowView;
sal_uInt16 m_nFamily; sal_uInt16 m_nFamily;
::rtl::Reference<SfxBaseController> m_pController; ::rtl::Reference<SfxBaseController> m_pController;
std::unique_ptr< ::svt::AcceleratorExecute > m_xAccExec; std::unique_ptr< ::svt::AcceleratorExecute > m_xAccExec;

6
sfx2/source/view/viewsh.cxx
View File

@@ -221,7 +221,6 @@ sal_uInt32 SfxViewShell_Impl::m_nLastViewShellId = 0;
SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags const nFlags) SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags const nFlags)
: aInterceptorContainer( aMutex ) : aInterceptorContainer( aMutex )
, m_bHasPrintOptions(nFlags & SfxViewShellFlags::HAS_PRINTOPTIONS) , m_bHasPrintOptions(nFlags & SfxViewShellFlags::HAS_PRINTOPTIONS)
, m_bIsShowView(!(nFlags & SfxViewShellFlags::NO_SHOW))
, m_nFamily(0xFFFF) // undefined, default set by TemplateDialog , m_nFamily(0xFFFF) // undefined, default set by TemplateDialog
, m_pLibreOfficeKitViewCallback(nullptr) , m_pLibreOfficeKitViewCallback(nullptr)
, m_pLibreOfficeKitViewData(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 ) void SfxViewShell::JumpToMark( const OUString& rMark )
{ {
SfxStringItem aMarkItem( SID_JUMPTOMARK, rMark ); SfxStringItem aMarkItem( SID_JUMPTOMARK, rMark );