include/sfx2/sfxsids.hrc | 1 - include/svtools/helpopt.hxx | 3 --- sfx2/source/appl/appcfg.cxx | 12 ------------ svtools/source/config/helpopt.cxx | 14 -------------- 4 files changed, 30 deletions(-)
New commits: commit 359ff94950bc11c31685a6ca6280d4230b9e2f1b Author: Gabor Kelemen <[email protected]> Date: Wed Apr 5 18:07:52 2017 +0200 Drop remains of the Welcome Screen feature Which was dropped in e299ef4952a580bdbd416cef3e1a2feba4979e13 (that was in 2001) Change-Id: I5860bb44ced35b338f667e47d89f6ed1d597dc11 Reviewed-on: https://gerrit.libreoffice.org/36159 Tested-by: Jenkins <[email protected]> Reviewed-by: Samuel Mehrbrodt <[email protected]> diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 1d90b87e3d38..e425071874a8 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -466,7 +466,6 @@ #define SID_ATTR_DEFTABSTOP (SID_OPTIONS_START + 14) #define SID_ATTR_BUTTON_OUTSTYLE3D (SID_OPTIONS_START + 62) #define SID_ATTR_BUTTON_BIGSIZE (SID_OPTIONS_START + 63) -#define SID_ATTR_WELCOMESCREEN (SID_OPTIONS_START + 81) #define SID_ATTR_QUICKLAUNCHER (SID_OPTIONS_START + 74) #define SID_ATTR_YEAR2000 (SID_OPTIONS_START + 87) #define SID_ATTR_APPLYCHARUNIT (SID_OPTIONS_START + 88) diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx index 3e7210f09820..0a5bbf5666fb 100644 --- a/include/svtools/helpopt.hxx +++ b/include/svtools/helpopt.hxx @@ -44,9 +44,6 @@ public: const OUString& GetHelpStyleSheet()const; void SetHelpStyleSheet(const OUString& rStyleSheet); - void SetWelcomeScreen( bool b ); - bool IsWelcomeScreen() const; - OUString GetSystem() const; }; diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 873c1c5a4539..1c3cdc82aeca 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -247,11 +247,6 @@ void SfxApplication::GetOptions( SfxItemSet& rSet ) aHelpOptions.IsHelpTips() ) ) ) bRet = true; break; - case SID_ATTR_WELCOMESCREEN : - if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_ATTR_WELCOMESCREEN ), - aHelpOptions.IsWelcomeScreen() ) ) ) - bRet = true; - break; case SID_HELP_STYLESHEET : if(rSet.Put( SfxStringItem ( rPool.GetWhich( SID_HELP_STYLESHEET ), aHelpOptions.GetHelpStyleSheet() ) ) ) @@ -593,13 +588,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) aHelpOptions.SetHelpTips( static_cast<const SfxBoolItem *>(pItem)->GetValue()); } - // WelcomeScreen - if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WELCOMESCREEN ), true, &pItem)) - { - DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr, "BoolItem expected"); - aHelpOptions.SetWelcomeScreen( static_cast<const SfxBoolItem *>(pItem)->GetValue() ); - } - if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_HELP_STYLESHEET ), true, &pItem)) { DBG_ASSERT(dynamic_cast< const SfxStringItem *>( pItem ) != nullptr, "StringItem expected"); diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index d3dc601493ee..c25f51d5161c 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -54,7 +54,6 @@ class SvtHelpOptions_Impl : public utl::ConfigItem { bool bExtendedHelp; bool bHelpTips; - bool bWelcomeScreen; OUString aLocale; OUString aSystem; OUString sHelpStyleSheet; @@ -75,8 +74,6 @@ public: void SetHelpTips( bool b ) { bHelpTips = b; SetModified(); } bool IsHelpTips() const { return bHelpTips; } - void SetWelcomeScreen( bool b ) { bWelcomeScreen = b; SetModified(); } - bool IsWelcomeScreen() const { return bWelcomeScreen; } const OUString& GetSystem() const { return aSystem; } const OUString& GetHelpStyleSheet()const{return sHelpStyleSheet;} @@ -125,7 +122,6 @@ SvtHelpOptions_Impl::SvtHelpOptions_Impl() : ConfigItem( "Office.Common/Help" ) , bExtendedHelp( false ) , bHelpTips( true ) - , bWelcomeScreen( false ) { Sequence< OUString > aNames = GetPropertyNames(); Load( aNames ); @@ -298,16 +294,6 @@ bool SvtHelpOptions::IsHelpTips() const return pImpl->IsHelpTips(); } -void SvtHelpOptions::SetWelcomeScreen( bool b ) -{ - pImpl->SetWelcomeScreen( b ); -} - -bool SvtHelpOptions::IsWelcomeScreen() const -{ - return pImpl->IsWelcomeScreen(); -} - OUString SvtHelpOptions::GetSystem() const { return pImpl->GetSystem(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
