include/sfx2/shell.hxx | 2 +-
include/sfx2/viewsh.hxx | 4 ----
sc/source/ui/inc/tabvwsh.hxx | 3 +--
sfx2/source/view/viewfrm.cxx | 20 +++-----------------
svx/source/form/fmview.cxx | 3 +++
sw/source/uibase/app/docsh.cxx | 1 -
sw/source/uibase/inc/view.hxx | 4 ++--
7 files changed, 10 insertions(+), 27 deletions(-)
New commits:
commit 4e4ae20ab26937200d53caa15175e7847a790268
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Sep 1 10:41:00 2014 +0200
Revert "fdo#83302 don't display read-only infobar for Base form in normal
mode"
This reverts commit 542ae4e06f9f70e328a3e85f1272ead558b36766, which
breaks the build without 15cea073e7ed4970e60967fe036fc492e2052203, which
had to reverted.
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index c01974d..40d4b67 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1346,13 +1346,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
SfxBindings& rBind = GetBindings();
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
- SfxViewShell *pVSh;
- FmFormShell *pFSh;
- if ( !xObjSh->IsReadOnly() ||
- ( xObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED &&
- (pVSh = xObjSh->GetViewShell()) &&
- (pFSh = pVSh->GetFormShell()) &&
- !pFSh->IsDesignMode()))
+ if ( !xObjSh->IsReadOnly() )
{
// In contrast to above (TITLE_CHANGED) does the UI not
// have to be updated because it was not obstructed
commit 024f334c48bc3d6cfac91ab7499f6b2863223c24
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Sep 1 10:40:56 2014 +0200
Revert "fdo#44081 don't remove 'edit' pop-up menu entry from form in design
mode"
This reverts commit 15cea073e7ed4970e60967fe036fc492e2052203. I
overlooked the fact during review that this introduces an svx <-> sfx2
circular dependency.
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 9359324..b79fd2d 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -160,7 +160,7 @@ protected:
*/
SfxShell( SfxViewShell *pViewSh );
- void SetViewShell_Impl( SfxViewShell* pView );
+ SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell* pView );
SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, sal_uInt16
nId );
SAL_DLLPRIVATE SfxShellObject* GetShellObj_Impl() const;
SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj );
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 0ed5838..5cde831 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -59,7 +59,6 @@ class SfxFrameItem;
class Dialog;
class Menu;
class NotifyEvent;
-class FmFormShell;
#define SFX_PRINTER_PRINTER 1 // without JOB SETUP => Temporary
#define SFX_PRINTER_JOBSETUP 2
@@ -208,9 +207,6 @@ public:
void RemoveSubShell( SfxShell *pShell=NULL );
SfxShell* GetSubShell( sal_uInt16 );
- virtual FmFormShell* GetFormShell() { return 0; };
- virtual const FmFormShell* GetFormShell() const { return 0; };
-
// Focus, KeyInput, Cursor
void GotFocus() const;
inline void LostFocus() const;
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index d1be501..b20b829 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -366,8 +366,7 @@ public:
inline void SetScSbxObject( SbxObject* pOb )
{ pScSbxObject = pOb; }
- virtual const FmFormShell* GetFormShell() const SAL_OVERRIDE { return
pFormShell; }
- virtual FmFormShell* GetFormShell() SAL_OVERRIDE { return
pFormShell; }
+ FmFormShell* GetFormShell() const { return pFormShell; }
void InsertURL( const OUString& rName, const OUString& rURL, const
OUString& rTarget,
sal_uInt16 nMode );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5434fa6..c01974d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -21,7 +21,6 @@
#include <stdio.h>
-#include <svx/fmshell.hxx>
#include <sfx2/infobar.hxx>
#include <sfx2/viewfrm.hxx>
#include <com/sun/star/document/MacroExecMode.hpp>
@@ -867,15 +866,8 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
{
case SID_EDITDOC:
{
- SfxViewShell *pVSh;
- FmFormShell *pFSh;
- if ( !pSh ||
- !pSh->HasName() ||
- !( pSh->Get_Impl()->nLoadedFlags &
SFX_LOADED_MAINDOCUMENT ) ||
- ( pSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED &&
- ( !(pVSh = pSh->GetViewShell()) ||
- !(pFSh = pVSh->GetFormShell()) ||
- !pFSh->IsDesignMode())))
+ if ( !pSh || !pSh->HasName() || !(
pSh->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT )
+ || pSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
rSet.DisableItem( SID_EDITDOC );
else
{
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index b4e8a96..343c624 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -130,6 +130,9 @@ void FmFormView::Init()
}
}
+ if( pObjShell && pObjShell->IsReadOnly() )
+ bInitDesignMode = false;
+
// dieses wird in der Shell vorgenommen
// bDesignMode = !bInitDesignMode; // erzwingt, dass SetDesignMode
ausgefuehrt wird
SetDesignMode( bInitDesignMode );
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 3da9550..e3491cb 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1084,7 +1084,6 @@ SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool()
void SwDocShell::SetView(SwView* pVw)
{
- SetViewShell_Impl(pVw);
if ( 0 != (mpView = pVw) )
mpWrtShell = &mpView->GetWrtShell();
else
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx
index 6e7db31..fd09bf4 100644
--- a/sw/source/uibase/inc/view.hxx
+++ b/sw/source/uibase/inc/view.hxx
@@ -588,8 +588,8 @@ public:
SfxShell *GetCurShell() { return m_pShell; }
SwDocShell *GetDocShell();
inline const SwDocShell *GetDocShell() const;
- inline virtual FmFormShell *GetFormShell() SAL_OVERRIDE {
return m_pFormShell; }
- inline virtual const FmFormShell *GetFormShell() const SAL_OVERRIDE {
return m_pFormShell; }
+ inline FmFormShell *GetFormShell() { return m_pFormShell; }
+ inline const FmFormShell *GetFormShell() const { return m_pFormShell; }
// so that in the SubShells' DTors m_pShell can be reset if applicable
void ResetSubShell() { m_pShell = 0; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
