desktop/inc/app.hxx | 43 ++++++++++++++++++-------------------
desktop/source/app/app.cxx | 2 -
include/vcl/svapp.hxx | 8 +++---
svtools/source/config/apearcfg.cxx | 3 --
vcl/source/app/svapp.cxx | 2 -
vcl/source/window/window.cxx | 2 -
vcl/source/window/winproc.cxx | 2 -
7 files changed, 30 insertions(+), 32 deletions(-)
New commits:
commit a1e4bd413e7a8e4db454d65e5226b9d1859bd5d7
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Fri Jan 24 19:27:41 2014 +1100
Change Application::SystemSettingsChanging to OverrideSystemSettings
The name Application::SystemSettingsChanging implies that the app is
being notified that system settings are being changed. This is not
what the function does - in fact, SystemSettingsChanging overrides
a settings object with user defined settings
Change-Id: Ibbf821ff3c7ec5b38e2e79751058494c749b6428
Reviewed-on: https://gerrit.libreoffice.org/7629
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 009bd75..fb30a7a 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -72,16 +72,16 @@ class Desktop : public Application
Desktop();
~Desktop();
- virtual int Main( );
+ virtual int Main( );
virtual void Init();
virtual void InitFinished();
virtual void DeInit();
- virtual sal_Bool QueryExit();
- virtual sal_uInt16 Exception(sal_uInt16 nError);
- virtual void SystemSettingsChanging( AllSettings& rSettings
);
+ virtual sal_Bool QueryExit();
+ virtual sal_uInt16 Exception(sal_uInt16 nError);
+ virtual void OverrideSystemSettings( AllSettings& rSettings
);
virtual void AppEvent( const ApplicationEvent& rAppEvent );
- DECL_LINK( OpenClients_Impl, void* );
+ DECL_LINK( OpenClients_Impl, void* );
static void OpenClients();
static void OpenDefault();
@@ -93,9 +93,9 @@ class Desktop : public Application
static CommandLineArgs& GetCommandLineArgs();
void HandleBootstrapErrors(
- BootstrapError nError, OUString const & aMessage );
+ BootstrapError nError, OUString const &
aMessage );
void SetBootstrapError(
- BootstrapError nError, OUString const & aMessage )
+ BootstrapError nError, OUString const &
aMessage )
{
if ( m_aBootstrapError == BE_OK )
{
@@ -127,9 +127,8 @@ class Desktop : public Application
// throws an exception upon failure
private:
- void RegisterServices(
- css::uno::Reference<
- css::uno::XComponentContext > const & context);
+ void RegisterServices(
+ css::uno::Reference<
css::uno::XComponentContext > const & context);
void DeregisterServices();
void CreateTemporaryDirectory();
@@ -144,7 +143,7 @@ class Desktop : public Application
void StartSetup( const OUString& aParameters );
// Create a error message depending on bootstrap failure code and an
optional file url
- OUString CreateErrorMsgString( utl::Bootstrap::FailureCode
nFailureCode,
+ OUString CreateErrorMsgString(
utl::Bootstrap::FailureCode nFailureCode,
const OUString& aFileURL
);
static void PreloadModuleData( const CommandLineArgs& );
@@ -156,7 +155,7 @@ class Desktop : public Application
void EnableOleAutomation();
DECL_LINK( ImplInitFilterHdl, ConvertData* );
- DECL_LINK( AsyncInitFirstRun, void* );
+ DECL_LINK( AsyncInitFirstRun, void* );
/** checks if the office is run the first time
<p>If so, <method>DoFirstRunInitializations</method> is called
(asynchronously and delayed) and the
respective flag in the configuration is reset.</p>
@@ -174,20 +173,20 @@ class Desktop : public Application
static sal_Bool isUIOnSessionShutdownAllowed();
// on-demand acceptors
- static void createAcceptor(const OUString&
aDescription);
- static void enableAcceptors();
- static void destroyAcceptor(const OUString&
aDescription);
+ static void createAcceptor(const OUString& aDescription);
+ static void enableAcceptors();
+ static void destroyAcceptor(const OUString& aDescription);
- bool m_bCleanedExtensionCache;
- bool m_bServicesRegistered;
- BootstrapError m_aBootstrapError;
- OUString m_aBootstrapErrorMessage;
- BootstrapStatus m_aBootstrapStatus;
+ bool m_bCleanedExtensionCache;
+ bool m_bServicesRegistered;
+ BootstrapError m_aBootstrapError;
+ OUString m_aBootstrapErrorMessage;
+ BootstrapStatus m_aBootstrapStatus;
boost::scoped_ptr<Lockfile> m_xLockfile;
- Timer m_firstRunTimer;
+ Timer m_firstRunTimer;
- static ResMgr* pResMgr;
+ static ResMgr* pResMgr;
};
}
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e391c86..e16697b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1925,7 +1925,7 @@ sal_Bool Desktop::InitializeQuickstartMode( const
Reference< XComponentContext >
}
}
-void Desktop::SystemSettingsChanging( AllSettings& rSettings )
+void Desktop::OverrideSystemSettings( AllSettings& rSettings )
{
if ( !SvtTabAppearanceCfg::IsInitialized () )
return;
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index efc4454..ff74325 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -642,14 +642,14 @@ public:
@see MergeSystemSettings, SetSettings, GetSettings
*/
- virtual void SystemSettingsChanging( AllSettings& rSettings
);
+ virtual void OverrideSystemSettings( AllSettings& rSettings
);
/** Set the settings object to the platform/desktop environment system
settings.
@param rSettings Reference to the settings object to change.
- @see SystemSettingsChanging, SetSettings, GetSettings
+ @see OverrideSystemSettings, SetSettings, GetSettings
*/
static void MergeSystemSettings( AllSettings& rSettings );
@@ -659,7 +659,7 @@ public:
@param rSettings const reference to settings object used to
change the application's settings.
- @see SystemSettingsChanging, MergeSystemSettings, GetSettings
+ @see OverrideSystemSettings, MergeSystemSettings, GetSettings
*/
static void SetSettings( const AllSettings& rSettings );
@@ -669,7 +669,7 @@ public:
@returns AllSettings instance that contains the current settings of the
application.
- @see SystemSettingsChanging, MergeSystemSettings, SetSettings
+ @see OverrideSystemSettings, MergeSystemSettings, SetSettings
*/
static const AllSettings& GetSettings();
diff --git a/svtools/source/config/apearcfg.cxx
b/svtools/source/config/apearcfg.cxx
index 81948c6..0276b91 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -219,8 +219,7 @@ void SvtTabAppearanceCfg::SetApplicationDefaults (
Application* pApp )
hAppSettings.SetStyleSettings( hAppStyle );
pApp->MergeSystemSettings ( hAppSettings ); // Allow
system-settings to apply
- pApp->SystemSettingsChanging ( hAppSettings ); // Allow overruling of
system-settings
- //is concerned with
window drag
+ pApp->OverrideSystemSettings ( hAppSettings );
pApp->SetSettings ( hAppSettings );
}
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 877f29e..16d8544 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -473,7 +473,7 @@ sal_Bool Application::IsUICaptured()
return sal_False;
}
-void Application::SystemSettingsChanging( AllSettings& /*rSettings*/ )
+void Application::OverrideSystemSettings( AllSettings& /*rSettings*/ )
{
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e0226b4..53011b7 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 );
+ GetpApp()->OverrideSystemSettings( rSettings );
}
// -----------------------------------------------------------------------
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 0d5de81..f494b5a 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2134,7 +2134,7 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent )
{
AllSettings aSettings = pApp->GetSettings();
pApp->MergeSystemSettings( aSettings );
- pApp->SystemSettingsChanging( aSettings );
+ pApp->OverrideSystemSettings( aSettings );
pApp->SetSettings( aSettings );
}
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
