David Tardon
9 years ago
parent
bd9544e2e2
commit
9ccd3e933b
@ -1,150 +0,0 @@
|
|||||||
From c4c7fe98b0f05329edf7930ff92b44892d4724e6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Wed, 15 Jun 2016 16:52:26 +0200
|
|
||||||
Subject: [PATCH 1/2] rhbz#1343752 fix view status in menu
|
|
||||||
|
|
||||||
... after commit 229fc164dc1773484b74eca016863cf68860e81b .
|
|
||||||
|
|
||||||
Change-Id: Ibfbbb86c81527f008b8e1cbe9d8ca3174a944931
|
|
||||||
---
|
|
||||||
sd/source/ui/view/ViewShellBase.cxx | 86 +++++++++++++------------------------
|
|
||||||
1 file changed, 30 insertions(+), 56 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
|
|
||||||
index e5c92f4..340948a 100644
|
|
||||||
--- a/sd/source/ui/view/ViewShellBase.cxx
|
|
||||||
+++ b/sd/source/ui/view/ViewShellBase.cxx
|
|
||||||
@@ -1221,13 +1221,13 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
|
|
||||||
SfxWhichIter aSetIterator (rSet);
|
|
||||||
sal_uInt16 nItemId (aSetIterator.FirstWhich());
|
|
||||||
|
|
||||||
- FrameView *pFrameView;
|
|
||||||
while (nItemId > 0)
|
|
||||||
{
|
|
||||||
bool bState (false);
|
|
||||||
Reference<XResourceId> xResourceId;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
+ // Check if the right view is active
|
|
||||||
switch (nItemId)
|
|
||||||
{
|
|
||||||
case SID_LEFT_PANE_IMPRESS:
|
|
||||||
@@ -1242,22 +1242,13 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
|
|
||||||
bState = xConfiguration->hasResource(xResourceId);
|
|
||||||
break;
|
|
||||||
|
|
||||||
+ case SID_DRAWINGMODE:
|
|
||||||
case SID_NORMAL_MULTI_PANE_GUI:
|
|
||||||
- if (ViewShell* pViewShell = mrBase.GetMainViewShell().get())
|
|
||||||
- {
|
|
||||||
- pFrameView = pViewShell->GetFrameView();
|
|
||||||
- bState = pFrameView->GetViewShEditMode() == EM_PAGE
|
|
||||||
- && pFrameView->GetPageKind() == PK_STANDARD;
|
|
||||||
- }
|
|
||||||
- break;
|
|
||||||
-
|
|
||||||
case SID_SLIDE_MASTER_MODE:
|
|
||||||
- if (ViewShell* pViewShell = mrBase.GetMainViewShell().get())
|
|
||||||
- {
|
|
||||||
- pFrameView = pViewShell->GetFrameView();
|
|
||||||
- bState = pFrameView->GetViewShEditMode() == EM_MASTERPAGE
|
|
||||||
- && pFrameView->GetPageKind() == PK_STANDARD;
|
|
||||||
- }
|
|
||||||
+ xResourceId = ResourceId::createWithAnchorURL(
|
|
||||||
+ xContext, FrameworkHelper::msImpressViewURL,
|
|
||||||
+ FrameworkHelper::msCenterPaneURL);
|
|
||||||
+ bState = xConfiguration->hasResource(xResourceId);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SID_SLIDE_SORTER_MULTI_PANE_GUI:
|
|
||||||
@@ -1278,30 +1269,18 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SID_HANDOUT_MASTER_MODE:
|
|
||||||
- if (ViewShell* pViewShell = mrBase.GetMainViewShell().get())
|
|
||||||
- {
|
|
||||||
- pFrameView = pViewShell->GetFrameView();
|
|
||||||
- bState = pFrameView->GetViewShEditMode() == EM_MASTERPAGE
|
|
||||||
- && pFrameView->GetPageKind() == PK_HANDOUT;
|
|
||||||
- }
|
|
||||||
+ xResourceId = ResourceId::createWithAnchorURL(
|
|
||||||
+ xContext, FrameworkHelper::msHandoutViewURL,
|
|
||||||
+ FrameworkHelper::msCenterPaneURL);
|
|
||||||
+ bState = xConfiguration->hasResource(xResourceId);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SID_NOTES_MODE:
|
|
||||||
- if (ViewShell* pViewShell = mrBase.GetMainViewShell().get())
|
|
||||||
- {
|
|
||||||
- pFrameView = pViewShell->GetFrameView();
|
|
||||||
- bState = pFrameView->GetViewShEditMode() == EM_PAGE
|
|
||||||
- && pFrameView->GetPageKind() == PK_NOTES;
|
|
||||||
- }
|
|
||||||
- break;
|
|
||||||
-
|
|
||||||
case SID_NOTES_MASTER_MODE:
|
|
||||||
- if (ViewShell* pViewShell = mrBase.GetMainViewShell().get())
|
|
||||||
- {
|
|
||||||
- pFrameView = pViewShell->GetFrameView();
|
|
||||||
- bState = pFrameView->GetViewShEditMode() == EM_MASTERPAGE
|
|
||||||
- && pFrameView->GetPageKind() == PK_NOTES;
|
|
||||||
- }
|
|
||||||
+ xResourceId = ResourceId::createWithAnchorURL(
|
|
||||||
+ xContext, FrameworkHelper::msNotesViewURL,
|
|
||||||
+ FrameworkHelper::msCenterPaneURL);
|
|
||||||
+ bState = xConfiguration->hasResource(xResourceId);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SID_TOGGLE_TABBAR_VISIBILITY:
|
|
||||||
@@ -1318,32 +1297,27 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
- // Take the master page mode into account.
|
|
||||||
- switch (nItemId)
|
|
||||||
+ // Check if edit mode fits too
|
|
||||||
+ if (bState)
|
|
||||||
{
|
|
||||||
- case SID_NORMAL_MULTI_PANE_GUI:
|
|
||||||
- case SID_NOTES_MODE:
|
|
||||||
+ ViewShell* const pCenterViewShell = FrameworkHelper::Instance(mrBase)->GetViewShell(
|
|
||||||
+ FrameworkHelper::msCenterPaneURL).get();
|
|
||||||
+ DrawViewShell* const pShell = dynamic_cast<DrawViewShell*>(pCenterViewShell);
|
|
||||||
+ if (pShell)
|
|
||||||
{
|
|
||||||
- // Determine the master page mode.
|
|
||||||
- ViewShell* pCenterViewShell = FrameworkHelper::Instance(mrBase)->GetViewShell(
|
|
||||||
- FrameworkHelper::msCenterPaneURL).get();
|
|
||||||
- bool bMasterPageMode (false);
|
|
||||||
- if (DrawViewShell* pShell = dynamic_cast<DrawViewShell*>(pCenterViewShell))
|
|
||||||
+ switch (nItemId)
|
|
||||||
{
|
|
||||||
- if (pShell->GetEditMode() == EM_MASTERPAGE)
|
|
||||||
- {
|
|
||||||
- bMasterPageMode = true;
|
|
||||||
- }
|
|
||||||
+ case SID_DRAWINGMODE:
|
|
||||||
+ case SID_NORMAL_MULTI_PANE_GUI:
|
|
||||||
+ case SID_NOTES_MODE:
|
|
||||||
+ bState = pShell->GetEditMode() == EM_PAGE;
|
|
||||||
+ break;
|
|
||||||
+ case SID_SLIDE_MASTER_MODE:
|
|
||||||
+ case SID_NOTES_MASTER_MODE:
|
|
||||||
+ bState = pShell->GetEditMode() == EM_MASTERPAGE;
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
- bState &= !bMasterPageMode;
|
|
||||||
- break;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
- case SID_HANDOUT_MASTER_MODE:
|
|
||||||
- // There is only the master page mode for the handout
|
|
||||||
- // view so ignore the master page flag.
|
|
||||||
- break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// And finally set the state.
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
From 90fa0d8f1a00c690d5199129d26fbe6ee4762972 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tardon <dtardon@redhat.com>
|
|
||||||
Date: Thu, 16 Jun 2016 16:11:17 +0200
|
|
||||||
Subject: [PATCH 2/2] sort the array
|
|
||||||
|
|
||||||
Change-Id: Iab15a4344d2174db2763603d0107bc9ec372e4fb
|
|
||||||
---
|
|
||||||
sd/source/ui/sidebar/SlideBackground.cxx | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
|
|
||||||
index 4cd012f..d2fb73c 100644
|
|
||||||
--- a/sd/source/ui/sidebar/SlideBackground.cxx
|
|
||||||
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
|
|
||||||
@@ -339,9 +339,9 @@ IMPL_LINK_TYPED(SlideBackground, EventMultiplexerListener,
|
|
||||||
{
|
|
||||||
static sal_uInt16 SidArray[] = {
|
|
||||||
SID_ATTR_PAGE_COLOR,
|
|
||||||
+ SID_ATTR_PAGE_GRADIENT,
|
|
||||||
SID_ATTR_PAGE_HATCH,
|
|
||||||
SID_ATTR_PAGE_BITMAP,
|
|
||||||
- SID_ATTR_PAGE_GRADIENT,
|
|
||||||
SID_ATTR_PAGE_FILLSTYLE,
|
|
||||||
SID_DISPLAY_MASTER_BACKGROUND,
|
|
||||||
SID_DISPLAY_MASTER_OBJECTS,
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
||||||
Loading…
Reference in new issue