Skip to content

C
core
Kaydet (Commit) 03dc1995 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat
Dosyalara gözat
Seçenekler

Writer styles: add the non-hidden pooled styles if mask is SFXSTYLEBIT_ALL 

Change-Id: I36054bf58f857b104abd83913d45f32f0c930c19
üst e337f82d
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 13 deletions
sw/inc/docstyle.hxx
Dosyayı görüntüle @ 03dc1995
...@@ -159,6 +159,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener ...@@ -159,6 +159,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
void AppendStyleList(const boost::ptr_vector<String>& rLst, void AppendStyleList(const boost::ptr_vector<String>& rLst,
sal_Bool bUsed, sal_Bool bUsed,
sal_Bool bTestHidden, sal_Bool bTestHidden,
bool bOnlyHidden,
sal_uInt16 nSection, sal_uInt16 nSection,
char cType); char cType);
......
sw/source/ui/app/docstyle.cxx
Dosyayı görüntüle @ 03dc1995
...@@ -2513,6 +2513,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() ...@@ -2513,6 +2513,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
const sal_Bool bIsSearchUsed = SearchUsed(); const sal_Bool bIsSearchUsed = SearchUsed();
bool bSearchHidden = ( nMask & SFXSTYLEBIT_HIDDEN ); bool bSearchHidden = ( nMask & SFXSTYLEBIT_HIDDEN );
bool bOnlyHidden = nMask == SFXSTYLEBIT_HIDDEN;
const sal_Bool bOrganizer = ((SwDocStyleSheetPool*)pBasePool)->IsOrganizerMode(); const sal_Bool bOrganizer = ((SwDocStyleSheetPool*)pBasePool)->IsOrganizerMode();
bool bAll = ( nSrchMask & SFXSTYLEBIT_ALL_VISIBLE ) == SFXSTYLEBIT_ALL_VISIBLE; bool bAll = ( nSrchMask & SFXSTYLEBIT_ALL_VISIBLE ) == SFXSTYLEBIT_ALL_VISIBLE;
...@@ -2566,7 +2567,8 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() ...@@ -2566,7 +2567,8 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
{ {
if( !rDoc.get(IDocumentSettingAccess::HTML_MODE) ) if( !rDoc.get(IDocumentSettingAccess::HTML_MODE) )
AppendStyleList(SwStyleNameMapper::GetChrFmtUINameArray(), AppendStyleList(SwStyleNameMapper::GetChrFmtUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR); bIsSearchUsed, bSearchHidden, bOnlyHidden,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR);
else else
{ {
aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[ aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[
...@@ -2579,7 +2581,8 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() ...@@ -2579,7 +2581,8 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
RES_POOLCHR_FOOTNOTE - RES_POOLCHR_BEGIN ] ); RES_POOLCHR_FOOTNOTE - RES_POOLCHR_BEGIN ] );
} }
AppendStyleList(SwStyleNameMapper::GetHTMLChrFmtUINameArray(), AppendStyleList(SwStyleNameMapper::GetHTMLChrFmtUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR); bIsSearchUsed, bSearchHidden, bOnlyHidden,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR);
} }
} }
...@@ -2682,19 +2685,19 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() ...@@ -2682,19 +2685,19 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
bAll = ( nSMask & SFXSTYLEBIT_ALL_VISIBLE ) == SFXSTYLEBIT_ALL_VISIBLE; bAll = ( nSMask & SFXSTYLEBIT_ALL_VISIBLE ) == SFXSTYLEBIT_ALL_VISIBLE;
if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_TEXT ) if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_TEXT )
AppendStyleList(SwStyleNameMapper::GetTextUINameArray(), AppendStyleList(SwStyleNameMapper::GetTextUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ); bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA );
if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CHAPTER ) if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CHAPTER )
AppendStyleList(SwStyleNameMapper::GetDocUINameArray(), AppendStyleList(SwStyleNameMapper::GetDocUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ; bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_LIST ) if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_LIST )
AppendStyleList(SwStyleNameMapper::GetListsUINameArray(), AppendStyleList(SwStyleNameMapper::GetListsUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ; bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_IDX ) if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_IDX )
AppendStyleList(SwStyleNameMapper::GetRegisterUINameArray(), AppendStyleList(SwStyleNameMapper::GetRegisterUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ; bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_EXTRA ) if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_EXTRA )
AppendStyleList(SwStyleNameMapper::GetExtraUINameArray(), AppendStyleList(SwStyleNameMapper::GetExtraUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ; bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CONDCOLL ) if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CONDCOLL )
{ {
if( !bIsSearchUsed || if( !bIsSearchUsed ||
...@@ -2708,7 +2711,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() ...@@ -2708,7 +2711,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
(SWSTYLEBIT_HTML | SFXSTYLEBIT_USERDEF) ) (SWSTYLEBIT_HTML | SFXSTYLEBIT_USERDEF) )
{ {
AppendStyleList(SwStyleNameMapper::GetHTMLUINameArray(), AppendStyleList(SwStyleNameMapper::GetHTMLUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ; bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
if( !bAll ) if( !bAll )
{ {
// then also the ones, that we are mapping: // then also the ones, that we are mapping:
...@@ -2777,7 +2780,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() ...@@ -2777,7 +2780,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
// //
if ( bAll ) if ( bAll )
AppendStyleList(SwStyleNameMapper::GetFrmFmtUINameArray(), AppendStyleList(SwStyleNameMapper::GetFrmFmtUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, cFRAME); bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, cFRAME);
} }
if( nSearchFamily == SFX_STYLE_FAMILY_PAGE || if( nSearchFamily == SFX_STYLE_FAMILY_PAGE ||
...@@ -2806,7 +2809,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() ...@@ -2806,7 +2809,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
} }
if ( bAll ) if ( bAll )
AppendStyleList(SwStyleNameMapper::GetPageDescUINameArray(), AppendStyleList(SwStyleNameMapper::GetPageDescUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, cPAGE); bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, cPAGE);
} }
if( nSearchFamily == SFX_STYLE_FAMILY_PSEUDO || if( nSearchFamily == SFX_STYLE_FAMILY_PSEUDO ||
...@@ -2837,7 +2840,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() ...@@ -2837,7 +2840,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
} }
if ( bAll ) if ( bAll )
AppendStyleList(SwStyleNameMapper::GetNumRuleUINameArray(), AppendStyleList(SwStyleNameMapper::GetNumRuleUINameArray(),
bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, cNUMRULE); bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, cNUMRULE);
} }
if(!aLst.empty()) if(!aLst.empty())
...@@ -2888,7 +2891,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Find(const rtl::OUString& rName) ...@@ -2888,7 +2891,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Find(const rtl::OUString& rName)
} }
void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector<String>& rList, void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector<String>& rList,
sal_Bool bTestUsed, sal_Bool bTestHidden, sal_Bool bTestUsed, sal_Bool bTestHidden, bool bOnlyHidden,
sal_uInt16 nSection, char cType ) sal_uInt16 nSection, char cType )
{ {
SwDoc& rDoc = ((SwDocStyleSheetPool*)pBasePool)->GetDoc(); SwDoc& rDoc = ((SwDocStyleSheetPool*)pBasePool)->GetDoc();
...@@ -2938,7 +2941,7 @@ void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector<String>& rLis ...@@ -2938,7 +2941,7 @@ void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector<String>& rLis
OSL_ENSURE( !this, "unknown PoolFmt-Id" ); OSL_ENSURE( !this, "unknown PoolFmt-Id" );
} }
bool bMatchHidden = ( bTestHidden && bHidden ) || ( !bTestHidden && ( !bHidden || bUsed ) ); bool bMatchHidden = ( bTestHidden && ( bHidden || !bOnlyHidden ) ) || ( !bTestHidden && ( !bHidden || bUsed ) );
if ( ( !bTestUsed && bMatchHidden ) || ( bTestUsed && bUsed ) ) if ( ( !bTestUsed && bMatchHidden ) || ( bTestUsed && bUsed ) )
aLst.Append( cType, rList[i] ); aLst.Append( cType, rList[i] );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment