diff options
| -rw-r--r-- | desktop/inc/app.hxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 3 | ||||
| -rw-r--r-- | svtools/source/config/apearcfg.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 11 |
7 files changed, 9 insertions, 16 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; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index a3333ee1835d..0432a1755572 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -563,8 +563,7 @@ public: */ static sal_Bool IsUICaptured(); - virtual void SystemSettingsChanging( AllSettings& rSettings, - Window* pFrame ); + virtual void SystemSettingsChanging( AllSettings& rSettings ); static void MergeSystemSettings( AllSettings& rSettings ); static void SetSettings( const AllSettings& rSettings ); diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index b24c20085124..81948c6eee61 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -219,7 +219,7 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp ) hAppSettings.SetStyleSettings( hAppStyle ); pApp->MergeSystemSettings ( hAppSettings ); // Allow system-settings to apply - pApp->SystemSettingsChanging ( hAppSettings, NULL );// Allow overruling of system-settings + pApp->SystemSettingsChanging ( hAppSettings ); // Allow overruling of system-settings //is concerned with window drag pApp->SetSettings ( hAppSettings ); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 5e573d065c90..6d345f376b27 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -476,8 +476,7 @@ sal_Bool Application::IsUICaptured() return sal_False; } -void Application::SystemSettingsChanging( AllSettings& /*rSettings*/, - Window* /*pFrame*/ ) +void Application::SystemSettingsChanging( AllSettings& /*rSettings*/ ) { } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 3c9b9dea9e85..a24819c4354d 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -689,7 +689,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl #endif if ( bCallHdl ) - GetpApp()->SystemSettingsChanging( rSettings, this ); + GetpApp()->SystemSettingsChanging( rSettings ); } // ----------------------------------------------------------------------- diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index ad61e89a821c..fecf3bc3ebcb 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2124,13 +2124,8 @@ static void ImplHandleInputLanguageChange( Window* pWindow ) // ----------------------------------------------------------------------- -static void ImplHandleSalSettings( Window* pWindow, sal_uInt16 nEvent ) +static void ImplHandleSalSettings( sal_uInt16 nEvent ) { - // Application Notification werden nur fuer das erste Window ausgeloest - ImplSVData* pSVData = ImplGetSVData(); - if ( pWindow != pSVData->maWinData.mpFirstFrame ) - return; - Application* pApp = GetpApp(); if ( !pApp ) return; @@ -2139,7 +2134,7 @@ static void ImplHandleSalSettings( Window* pWindow, sal_uInt16 nEvent ) { AllSettings aSettings = pApp->GetSettings(); pApp->MergeSystemSettings( aSettings ); - pApp->SystemSettingsChanging( aSettings, pWindow ); + pApp->SystemSettingsChanging( aSettings ); pApp->SetSettings( aSettings ); } else @@ -2539,7 +2534,7 @@ bool ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, case SALEVENT_FONTCHANGED: case SALEVENT_DATETIMECHANGED: case SALEVENT_KEYBOARDCHANGED: - ImplHandleSalSettings( pWindow, nEvent ); + ImplHandleSalSettings( nEvent ); break; case SALEVENT_USEREVENT: |