diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-07-21 14:41:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-07-22 08:51:27 +0200 |
| commit | 0df982ac881d80db7caf06ce9402691a4a0ad7fd (patch) | |
| tree | 79a1bbcced549f011c7af72bab4fe5e5aa02ba31 /sfx2 | |
| parent | 6d9e304d1748668cc25905945129095bd14fd1af (diff) | |
merge SetOptions_Nbc and SetOptions
since the Nbc variant is no longer necessary
Change-Id: I4a846dcdbe68116dd511e45f018af2cdc5fbcf48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154725
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 1f030223c2f3..679eb2cd3da9 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -231,7 +231,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet ) } } -void SfxApplication::SetOptions_Nbc(const SfxItemSet& rSet) +void SfxApplication::SetOptions(const SfxItemSet &rSet) { std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); @@ -335,12 +335,6 @@ void SfxApplication::SetOptions_Nbc(const SfxItemSet& rSet) } -void SfxApplication::SetOptions(const SfxItemSet &rSet) -{ - SetOptions_Nbc( rSet ); -} - - void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron ) { SfxObjectShell *pDoc = rEventHint.GetObjShell(); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index b7e89ab735ad..507cc60cc672 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -325,7 +325,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_SETOPTIONS: { if( rReq.GetArgs() ) - SetOptions_Nbc( *rReq.GetArgs() ); + SetOptions( *rReq.GetArgs() ); break; } |