Styles & Formatting: added SFXSTYLEBIT_ALL_VISIBLE and show hidden styles

Change-Id: Ie74ec3c15ba270afd0a6864bd5824a5bc0e3ea8b

2 files changed, 17 insertions, 11 deletions

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index d56012d7df65..2af7888aef49 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -92,7 +92,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
             StyleFamily = SFX_STYLE_FAMILY_PARA ;
             FilterList [ en-US ] =
             {
-                < "All Styles"          ; SFXSTYLEBIT_ALL       ; > ;
+                < "All Styles"          ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
+                < "Hidden Styles"       ; SFXSTYLEBIT_HIDDEN    ; > ;
                 < "Applied Styles"      ; SFXSTYLEBIT_USED      ; > ;
                 < "Custom Styles"       ; SFXSTYLEBIT_USERDEF   ; > ;
                 < "Automatic"           ; SFXSTYLEBIT_AUTO      ; > ;
@@ -111,7 +112,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
             StyleFamily = SFX_STYLE_FAMILY_CHAR ;
             FilterList [ en-US ] =
             {
-                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
+                < "Hidden Styles"   ; SFXSTYLEBIT_HIDDEN    ; > ;
                 < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
                 < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
@@ -122,7 +124,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
             StyleFamily = SFX_STYLE_FAMILY_FRAME ;
             FilterList [ en-US ] =
             {
-                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
+                < "Hidden Styles"   ; SFXSTYLEBIT_HIDDEN    ; > ;
                 < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
                 < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
@@ -133,7 +136,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
             StyleFamily = SFX_STYLE_FAMILY_PAGE ;
             FilterList [ en-US ] =
             {
-                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
+                < "Hidden Styles"   ; SFXSTYLEBIT_HIDDEN    ; > ;
                 < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
                 < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
@@ -143,7 +147,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
             StyleFamily = SFX_STYLE_FAMILY_PSEUDO ;
             FilterList [ en-US ] =
             {
-                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
+                < "Hidden Styles"   ; SFXSTYLEBIT_HIDDEN    ; > ;
                 < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
                 < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index e881cb1f4ac8..f6f96f879be2 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -2518,6 +2518,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
     bool bSearchHidden = ( nMask & SFXSTYLEBIT_HIDDEN );
 
     const sal_Bool bOrganizer = ((SwDocStyleSheetPool*)pBasePool)->IsOrganizerMode();
+    bool bAll = ( nSrchMask & SFXSTYLEBIT_ALL_VISIBLE ) == SFXSTYLEBIT_ALL_VISIBLE;
 
     if( nSearchFamily == SFX_STYLE_FAMILY_CHAR
      || nSearchFamily == SFX_STYLE_FAMILY_ALL )
@@ -2561,7 +2562,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
 
         // PoolFormate
         //
-        if( nSrchMask == SFXSTYLEBIT_ALL )
+        if( bAll )
         {
             if( !rDoc.get(IDocumentSettingAccess::HTML_MODE) )
                 AppendStyleList(SwStyleNameMapper::GetChrFmtUINameArray(),
@@ -2589,7 +2590,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
         if( rDoc.get(IDocumentSettingAccess::HTML_MODE) )
         {
             // then only HTML-Template are of interest
-            if( SFXSTYLEBIT_ALL == nSMask )
+            if( SFXSTYLEBIT_ALL_VISIBLE == ( nSMask & SFXSTYLEBIT_ALL_VISIBLE ) )
                 nSMask = SWSTYLEBIT_HTML | SFXSTYLEBIT_USERDEF |
                             SFXSTYLEBIT_USED;
             else
@@ -2675,7 +2676,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
             aLst.Append( cPARA, pColl->GetName() );
         }
 
-        const sal_Bool bAll = nSMask == SFXSTYLEBIT_ALL;
+        bAll = ( nSMask & SFXSTYLEBIT_ALL_VISIBLE ) == SFXSTYLEBIT_ALL_VISIBLE;
         if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_TEXT )
             AppendStyleList(SwStyleNameMapper::GetTextUINameArray(),
                             bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA );
@@ -2770,7 +2771,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
 
         // PoolFormate
         //
-        if ( nSrchMask == SFXSTYLEBIT_ALL )
+        if ( bAll )
             AppendStyleList(SwStyleNameMapper::GetFrmFmtUINameArray(),
                                     bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, cFRAME);
     }
@@ -2796,7 +2797,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
 
             aLst.Append( cPAGE, rDesc.GetName() );
         }
-        if ( nSrchMask == SFXSTYLEBIT_ALL )
+        if ( bAll )
             AppendStyleList(SwStyleNameMapper::GetPageDescUINameArray(),
                             bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, cPAGE);
     }
@@ -2824,7 +2825,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
                 aLst.Append( cNUMRULE, rRule.GetName() );
             }
         }
-        if ( nSrchMask == SFXSTYLEBIT_ALL )
+        if ( bAll )
             AppendStyleList(SwStyleNameMapper::GetNumRuleUINameArray(),
                             bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, cNUMRULE);
     }