summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-07-24 09:42:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-07-24 12:46:54 +0100
commit1af0e46102350114dd5e854b7692c640dae2727f (patch)
tree0a257d8dfb164038da04f0758cccf7fbcd1bfb05
parentb8a72f7e344fec02a0ea0fcc3848d5960a21fc0b (diff)
Resolves: fdo#81641 the new style shouldn't be a conditional style
regression from commit 715d79bcc59d68c77dc84a1038998dd873df92e9 Author: Cédric Bosdonnat <cedric.bosdonnat@free.fr> Date: Fri Nov 30 11:51:46 2012 +0100 Styles & Formatting: added SFXSTYLEBIT_ALL_VISIBLE and show hidden styles commit 2fd9c2bf9af0c50dae3af3dbe5e22965ccdb4ae7 Author: Cédric Bosdonnat <cedric.bosdonnat@free.fr> Date: Sun Nov 25 15:24:42 2012 +0100 Allow to hide styles in the "Styles & Formating" dialog In its current state, the feature only hides the styles. Things to sort out are: + Add some automatic filter to show hidden styles + Make the visibility persist in the file format Change-Id: I7244d424765db0d5ed3aeaf380a8e1af56aa7eaf
-rw-r--r--sw/source/uibase/app/docst.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 4e9580d8f93f..929919c5aa27 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -634,7 +634,7 @@ sal_uInt16 SwDocShell::Edit(
if( bNew )
{
- if( SFXSTYLEBIT_ALL != nMask && SFXSTYLEBIT_USED != nMask )
+ if( SFXSTYLEBIT_ALL != nMask && SFXSTYLEBIT_ALL_VISIBLE != nMask && SFXSTYLEBIT_USED != nMask )
nMask |= SFXSTYLEBIT_USERDEF;
else
nMask = SFXSTYLEBIT_USERDEF;