[Libreoffice-commits] .: sfx2/inc sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Aug 20 04:28:25 PDT 2012
sfx2/inc/sfx2/app.hxx | 1 -
sfx2/inc/sfx2/objsh.hxx | 1 -
sfx2/source/appl/app.cxx | 1 -
sfx2/source/appl/appmain.cxx | 6 ------
sfx2/source/doc/objmisc.cxx | 6 ------
5 files changed, 15 deletions(-)
New commits:
commit 5eac8941849c30b454f8a1e74a232cd995fc57d3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 20 12:24:14 2012 +0100
PreInit and MemoryError can be removed from core
The logic of 8fb5a686f40eadd2bdd9519fc65f23cc29ec3163 in binfilter
appears to hold for core as well
Change-Id: I73cd47586c4c83858f9eca92e019ad0108b514e0
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 80be15d..5ff15f2 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -136,7 +136,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
void Init();
void Exit();
void SettingsChange( sal_uInt16, const AppSettings & );
- void PreInit( );
void Quit();
void Deinitialize();
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 5e96dc8..4b1c16b 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -443,7 +443,6 @@ public:
// Misc
sal_Bool IsPreview() const;
SfxObjectCreateMode GetCreateMode() const { return eCreateMode; }
- virtual void MemoryError();
SfxProgress* GetProgress() const;
void SetWaitCursor( sal_Bool bSet ) const;
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 4ee6df4..3aa48ab 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -187,7 +187,6 @@ SfxApplication::SfxApplication()
pAppData_Impl = new SfxAppData_Impl( this );
pAppData_Impl->m_xImeStatusWindow->init();
- pApp->PreInit();
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ initialize DDE" );
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index d2f66bf..edf1478 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -103,12 +103,6 @@ void SfxApplication::Exit()
{
}
-//---------------------------------------------------------------------------
-
-void SfxApplication::PreInit( )
-{
-}
-
//-------------------------------------------------------------------------
SfxFilterMatcher& SfxApplication::GetFilterMatcher()
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index ada681f..842d716 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -983,12 +983,6 @@ void SfxObjectShell::SetNoName()
//--------------------------------------------------------------------
-void SfxObjectShell::MemoryError()
-{
-}
-
-//--------------------------------------------------------------------
-
SfxProgress* SfxObjectShell::GetProgress() const
{
return pImp->pProgress;
More information about the Libreoffice-commits
mailing list