diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-01-21 01:26:32 +1100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-01-20 15:27:56 +0000 |
| commit | b799cb7528552b0538f3ee1f5afc935c406f5637 (patch) | |
| tree | 5c64e5fd3dafc7492c8bf0ea9332ffc603fe9f3f /desktop | |
| parent | 305077c6c382aee1c5509b5b7809d8d73d65c674 (diff) | |
Remove unused Window parameter from SystemSettingsChanging
This took a bit of code archaelogy for me to track down. It turns out that
as part of an effort to optimize startup, the line of code in this function
was commented out, presumably to be rewritten later. This happened in
commit ee3351d78c in July 2001 (!).
About three years later, in February 2004, the function was rewritten in
commit 189c2388d80. As it turns out, the only two functions that used
the Window parameter were vcl/source/window/window.cxx (which passed
itself in, but of course this did nothing) and
vcl/source/window/winproc.cxx. Furthermore, winproc only ever passed in
the first frame, so it didn't really do anything either.
Consequently, the function as it stands *now* only notifies the
application that system settings have been changed. It doesn't care
which window it tells.
Therefore, I have excised this parameter from the function. I don't
think it made sense when it was implemented anyway, so there is no net
loss.
After removing the unneeded parameter, I was also able to remove the
Window parameter from winproc.cxx's ImplHandleSalSettings function as
it was only ever used to set the top level window, which is now
irrelevant.
Change-Id: I84f2c5c5ff8969387da3af81e4a9c7f9ac6237e1
Reviewed-on: https://gerrit.libreoffice.org/7541
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/inc/app.hxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 31d0daee9589..009bd759ea2b 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -78,7 +78,7 @@ class Desktop : public Application virtual void DeInit(); virtual sal_Bool QueryExit(); virtual sal_uInt16 Exception(sal_uInt16 nError); - virtual void SystemSettingsChanging( AllSettings& rSettings, Window* pFrame ); + virtual void SystemSettingsChanging( AllSettings& rSettings ); virtual void AppEvent( const ApplicationEvent& rAppEvent ); DECL_LINK( OpenClients_Impl, void* ); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 691dc6cddf35..962e2b4e1984 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1933,7 +1933,7 @@ sal_Bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext > } } -void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* ) +void Desktop::SystemSettingsChanging( AllSettings& rSettings ) { if ( !SvtTabAppearanceCfg::IsInitialized () ) return; |