[Libreoffice-commits] .: sfx2/inc sfx2/source
Tor Lillqvist
tml at kemper.freedesktop.org
Mon May 28 06:05:29 PDT 2012
sfx2/inc/sfx2/childwin.hxx | 3 ---
sfx2/inc/sfx2/viewfrm.hxx | 3 ---
sfx2/source/view/viewfrm.cxx | 8 --------
3 files changed, 14 deletions(-)
New commits:
commit dc4f1b6c2116bfca4a12cc6ef6f2a9a596c0a6da
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon May 28 15:54:47 2012 +0300
Whatever an inimanager was, it has been dead for a decade
Change-Id: I6efd7877df34af515e61b6b7fcd112fa041f5e61
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index c96d1a6..c3f554f 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -34,9 +34,6 @@
#include <vcl/window.hxx>
#include <com/sun/star/frame/XFrame.hpp>
-#ifdef ENABLE_INIMANAGER
-#include "inimgr.hxx"
-#endif
#include <sfx2/shell.hxx>
#include <sfx2/chalign.hxx>
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 5a99c48..18c8678 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -129,9 +129,6 @@ public:
virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY );
SfxProgress* GetProgress() const;
-#ifdef ENABLE_INIMANAGER//MUSTINI
- SfxIniManager* GetIniManager() const;
-#endif
SfxObjectShell* GetObjectShell() const
{ return xObjSh; }
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 579a10d..0538bce 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1594,14 +1594,6 @@ void SfxViewFrame::HideStatusText()
}
//--------------------------------------------------------------------
-#ifdef ENABLE_INIMANAGER//MUSTINI
-SfxIniManager* SfxViewFrame::GetIniManager() const
-{
- return SFX_APP()->GetAppIniManager();
-}
-#endif
-
-//--------------------------------------------------------------------
void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer...
(
SfxViewShell* pSh,
More information about the Libreoffice-commits
mailing list