[Libreoffice-commits] .: vcl/android vcl/aqua vcl/headless vcl/inc vcl/ios vcl/source vcl/unx vcl/win
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 30 04:50:51 PST 2013
vcl/android/androidinst.cxx | 1 -
vcl/aqua/source/app/salinst.cxx | 6 ------
vcl/headless/headlessinst.cxx | 1 -
vcl/inc/salinst.hxx | 1 -
vcl/ios/source/app/salinst.cxx | 6 ------
vcl/source/app/svmain.cxx | 2 --
vcl/unx/generic/plugadapt/salplug.cxx | 4 ----
vcl/win/source/app/salinst.cxx | 4 ----
8 files changed, 25 deletions(-)
New commits:
commit eb7ccf863ce3e8f15e04f704bd90afa44faaaade
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 30 13:50:25 2013 +0100
Remove unused DeInitSalMain
Change-Id: I8fd733fe6535cc4f9f299f53adc1821ce344a85c
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 9eba26e..fc1c3f9 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -111,7 +111,6 @@ SalSystem *AndroidSalInstance::CreateSalSystem()
void InitSalData() {}
void DeInitSalData() {}
void InitSalMain() {}
-void DeInitSalMain() {}
void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
{
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 7c3009f..c0bc111 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -295,12 +295,6 @@ void InitSalMain()
{
}
-// -----------------------------------------------------------------------
-
-void DeInitSalMain()
-{
-}
-
// =======================================================================
SalYieldMutex::SalYieldMutex()
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index 1d1f15e..0eb790d 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -82,7 +82,6 @@ public:
void InitSalData() {}
void DeInitSalData() {}
void InitSalMain() {}
-void DeInitSalMain() {}
void SalAbort( const OUString& rErrorText, bool bDumpCore )
{
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index afa9e27..2c41bc8 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -199,7 +199,6 @@ void InitSalData(); // called from Application-Ctor
void DeInitSalData(); // called from Application-Dtor
void InitSalMain();
-void DeInitSalMain();
// ----------
// - SVMain -
diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index 6ff0e84..d99a18f 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -176,12 +176,6 @@ void InitSalMain()
// I doubt anything is needed on iOS
}
-// -----------------------------------------------------------------------
-
-void DeInitSalMain()
-{
-}
-
// =======================================================================
SalYieldMutex::SalYieldMutex()
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 4fef497..9b83c6d 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -572,8 +572,6 @@ void DeInitVCL()
DeInitTools();
- DeInitSalMain();
-
if( pOwnSvApp )
{
delete pOwnSvApp;
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 2b6b31f..87a5c05 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -268,10 +268,6 @@ void InitSalMain()
{
}
-void DeInitSalMain()
-{
-}
-
void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
{
if( rErrorText.isEmpty() )
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 4bfc9c1..aa449f2 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -471,10 +471,6 @@ void InitSalMain()
}
}
-void DeInitSalMain()
-{
-}
-
// -----------------------------------------------------------------------
SalInstance* CreateSalInstance()
More information about the Libreoffice-commits
mailing list