officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 7 ++ sfx2/uiconfig/ui/checkin.ui | 2 sw/inc/docstyle.hxx | 1 sw/source/ui/app/docstyle.cxx | 29 +++++----- 4 files changed, 24 insertions(+), 15 deletions(-)
New commits: commit 03dc19955cbf3d302e9b7621f135f1e1bf949cca Author: Cédric Bosdonnat <cedric.bosdon...@free.fr> Date: Tue Dec 4 15:20:03 2012 +0100 Writer styles: add the non-hidden pooled styles if mask is SFXSTYLEBIT_ALL Change-Id: I36054bf58f857b104abd83913d45f32f0c930c19 diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 9c05f54..42d1b92 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -159,6 +159,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener void AppendStyleList(const boost::ptr_vector<String>& rLst, sal_Bool bUsed, sal_Bool bTestHidden, + bool bOnlyHidden, sal_uInt16 nSection, char cType); diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index c2228dc..4a8458a 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -2513,6 +2513,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() const sal_Bool bIsSearchUsed = SearchUsed(); bool bSearchHidden = ( nMask & SFXSTYLEBIT_HIDDEN ); + bool bOnlyHidden = nMask == SFXSTYLEBIT_HIDDEN; const sal_Bool bOrganizer = ((SwDocStyleSheetPool*)pBasePool)->IsOrganizerMode(); bool bAll = ( nSrchMask & SFXSTYLEBIT_ALL_VISIBLE ) == SFXSTYLEBIT_ALL_VISIBLE; @@ -2566,7 +2567,8 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() { if( !rDoc.get(IDocumentSettingAccess::HTML_MODE) ) AppendStyleList(SwStyleNameMapper::GetChrFmtUINameArray(), - bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR); + bIsSearchUsed, bSearchHidden, bOnlyHidden, + nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR); else { aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[ @@ -2579,7 +2581,8 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() RES_POOLCHR_FOOTNOTE - RES_POOLCHR_BEGIN ] ); } 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() 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 ); + bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ); if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CHAPTER ) 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 ) 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 ) 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 ) 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( !bIsSearchUsed || @@ -2708,7 +2711,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() (SWSTYLEBIT_HTML | SFXSTYLEBIT_USERDEF) ) { AppendStyleList(SwStyleNameMapper::GetHTMLUINameArray(), - bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ; + bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ; if( !bAll ) { // then also the ones, that we are mapping: @@ -2777,7 +2780,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() // if ( bAll ) AppendStyleList(SwStyleNameMapper::GetFrmFmtUINameArray(), - bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, cFRAME); + bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, cFRAME); } if( nSearchFamily == SFX_STYLE_FAMILY_PAGE || @@ -2806,7 +2809,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() } if ( bAll ) AppendStyleList(SwStyleNameMapper::GetPageDescUINameArray(), - bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, cPAGE); + bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, cPAGE); } if( nSearchFamily == SFX_STYLE_FAMILY_PSEUDO || @@ -2837,7 +2840,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() } if ( bAll ) AppendStyleList(SwStyleNameMapper::GetNumRuleUINameArray(), - bIsSearchUsed, bSearchHidden, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, cNUMRULE); + bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, cNUMRULE); } if(!aLst.empty()) @@ -2888,7 +2891,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Find(const rtl::OUString& rName) } 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 ) { SwDoc& rDoc = ((SwDocStyleSheetPool*)pBasePool)->GetDoc(); @@ -2938,7 +2941,7 @@ void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector<String>& rLis 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 ) ) aLst.Append( cType, rList[i] ); } commit e337f82d551bb55a5981a1ee2f79867f45d97954 Author: Cédric Bosdonnat <cedric.bosdon...@free.fr> Date: Tue Dec 4 14:09:13 2012 +0100 Checkin/out: some cleanup in UI strings + translators comments Change-Id: Ifd1b4f2385523fb845332aaff84eb3528258a469 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index a814cdd..c7b0616 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1890,6 +1890,8 @@ <node oor:name=".uno:CheckOut" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Check-Out</value> + <value xml_lang="x-comment">This is the action to create a private working copy + of the document on a server</value> </prop> </node> <node oor:name=".uno:CancelCheckOut" oor:op="replace"> @@ -1899,7 +1901,10 @@ </node> <node oor:name=".uno:CheckIn" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Check-In...</value> + <value xml:lang="en-US">Check-In...</value> + <value xml_lang="x-comment">This is the action to merge a private working copy + of the document on a server. It shows a dialog to input some informations on + the new version to create on the server.</value> </prop> </node> <node oor:name=".uno:CloseDoc" oor:op="replace"> diff --git a/sfx2/uiconfig/ui/checkin.ui b/sfx2/uiconfig/ui/checkin.ui index 0585acb..8215c59 100644 --- a/sfx2/uiconfig/ui/checkin.ui +++ b/sfx2/uiconfig/ui/checkin.ui @@ -4,7 +4,7 @@ <object class="GtkDialog" id="CheckinDialog"> <property name="can_focus">False</property> <property name="border_width">5</property> - <property name="title" translatable="yes">Check-in</property> + <property name="title" translatable="yes">Check-In</property> <property name="modal">True</property> <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits