summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2012-12-04 10:31:35 +0100
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2012-12-04 12:41:05 +0100
commit708447f2a5011ef76cb5ed6aa02bbac45e93a532 (patch)
tree815d57bf6fa4ecbb1b5832bf1f9f91f7af2cfc94 /sd
parentd911673a64250ece50f6ca5578385adabcae5e5d (diff)
Styles & Formatting: added Show menu item on hidden styles
The command to show hidden styles again was missing. Change-Id: Ic25b0cfc4d021d949124b8c4ef4016d6dba7e39f
Diffstat (limited to 'sd')
-rw-r--r--sd/sdi/_drvwsh.sdi7
-rw-r--r--sd/sdi/outlnvsh.sdi7
-rw-r--r--sd/source/ui/func/futempl.cxx4
-rw-r--r--sd/source/ui/view/drviewsc.cxx1
-rw-r--r--sd/source/ui/view/outlnvsh.cxx3
5 files changed, 21 insertions, 1 deletions
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 0fabae44e060..5cbbefa2372e 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1373,6 +1373,13 @@ interface DrawView
GroupId = GID_DOCUMENT ;
Cachable ;
]
+ SID_STYLE_SHOW
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetAttrState ;
+ GroupId = GID_DOCUMENT ;
+ Cachable ;
+ ]
SID_STYLE_APPLY // ole : no, status : ?
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 6632f09f6feb..82e5fb7a800f 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -333,6 +333,13 @@ interface OutlineView
GroupId = GID_DOCUMENT ;
Cachable ;
]
+ SID_STYLE_SHOW
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetAttrState ;
+ GroupId = GID_DOCUMENT ;
+ Cachable ;
+ ]
SID_AUTOSPELL_CHECK // ole : no, status : play rec
[
ExecMethod = FuSupport ;
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index f1d9feae1487..80f57490d7bd 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -136,6 +136,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
case SID_STYLE_EDIT:
case SID_STYLE_DELETE:
case SID_STYLE_HIDE:
+ case SID_STYLE_SHOW:
case SID_STYLE_FAMILY:
case SID_STYLE_NEW_BY_EXAMPLE:
{
@@ -227,8 +228,9 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
break;
case SID_STYLE_HIDE:
+ case SID_STYLE_SHOW:
pStyleSheet = pSSPool->Find( aStyleName, (SfxStyleFamily) nFamily);
- pStyleSheet->SetHidden( true );
+ pStyleSheet->SetHidden( nSId == SID_STYLE_HIDE );
nRetMask = sal_True;
break;
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 9074fc2fa502..e4f1be1eea15 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -540,6 +540,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
case SID_STYLE_EDIT:
case SID_STYLE_DELETE:
case SID_STYLE_HIDE:
+ case SID_STYLE_SHOW:
case SID_STYLE_FAMILY:
case SID_STYLE_WATERCAN:
case SID_STYLE_UPDATE_BY_EXAMPLE:
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 881722dbd3ee..5fbb6f343e7c 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1519,6 +1519,7 @@ sal_Bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
Invalidate(SID_STYLE_NEW);
Invalidate(SID_STYLE_DELETE);
Invalidate(SID_STYLE_HIDE);
+ Invalidate(SID_STYLE_SHOW);
Invalidate(SID_STYLE_UPDATE_BY_EXAMPLE);
Invalidate(SID_STYLE_NEW_BY_EXAMPLE);
Invalidate(SID_STYLE_WATERCAN);
@@ -1712,6 +1713,7 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet )
case SID_STYLE_NEW:
case SID_STYLE_DELETE:
case SID_STYLE_HIDE:
+ case SID_STYLE_SHOW:
case SID_STYLE_NEW_BY_EXAMPLE:
case SID_STYLE_WATERCAN:
{
@@ -1743,6 +1745,7 @@ void OutlineViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin
Invalidate(SID_STYLE_NEW);
Invalidate(SID_STYLE_DELETE);
Invalidate(SID_STYLE_HIDE);
+ Invalidate(SID_STYLE_SHOW);
Invalidate(SID_STYLE_UPDATE_BY_EXAMPLE);
Invalidate(SID_STYLE_NEW_BY_EXAMPLE);
Invalidate(SID_STYLE_WATERCAN);