Kaydet (Commit) 7aa1dcc6 authored tarafından Noel Grandin's avatar Noel Grandin

rename SfxFilterTupel->SfxFilterTuple

Change-Id: Idbbc5d0b28f7f876a774904d8279d342906b642d
Reviewed-on: https://gerrit.libreoffice.org/55662Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 4c6e1188
...@@ -27,18 +27,18 @@ ...@@ -27,18 +27,18 @@
#include <svl/style.hxx> #include <svl/style.hxx>
#include <vector> #include <vector>
struct SFX2_DLLPUBLIC SfxFilterTupel struct SFX2_DLLPUBLIC SfxFilterTuple
{ {
OUString aName; OUString aName;
SfxStyleSearchBits nFlags; SfxStyleSearchBits nFlags;
SfxFilterTupel(const OUString& rName, SfxStyleSearchBits nArg) SfxFilterTuple(const OUString& rName, SfxStyleSearchBits nArg)
: aName(rName) : aName(rName)
, nFlags(nArg) , nFlags(nArg)
{ {
} }
}; };
typedef std::vector<SfxFilterTupel> SfxStyleFilter; typedef std::vector<SfxFilterTuple> SfxStyleFilter;
class SFX2_DLLPUBLIC SfxStyleFamilyItem class SFX2_DLLPUBLIC SfxStyleFamilyItem
{ {
......
...@@ -196,7 +196,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx ...@@ -196,7 +196,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx
for ( i = 0; i < nCount; ++i ) for ( i = 0; i < nCount; ++i )
{ {
const SfxFilterTupel& rTupel = rList[ i ]; const SfxFilterTuple& rTupel = rList[ i ];
if ( rTupel.nFlags != SfxStyleSearchBits::Auto && if ( rTupel.nFlags != SfxStyleSearchBits::Auto &&
rTupel.nFlags != SfxStyleSearchBits::Used && rTupel.nFlags != SfxStyleSearchBits::Used &&
......
...@@ -1125,7 +1125,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags) ...@@ -1125,7 +1125,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags)
sal_Int32 nPos = aFilterLb->InsertEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL), 0); sal_Int32 nPos = aFilterLb->InsertEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL), 0);
aFilterLb->SetEntryData( nPos, reinterpret_cast<void*>(SfxStyleSearchBits::All) ); aFilterLb->SetEntryData( nPos, reinterpret_cast<void*>(SfxStyleSearchBits::All) );
const SfxStyleFilter& rFilter = pItem->GetFilterList(); const SfxStyleFilter& rFilter = pItem->GetFilterList();
for(const SfxFilterTupel& i : rFilter) for(const SfxFilterTuple& i : rFilter)
{ {
SfxStyleSearchBits nFilterFlags = i.nFlags; SfxStyleSearchBits nFilterFlags = i.nFlags;
nPos = aFilterLb->InsertEntry( i.aName ); nPos = aFilterLb->InsertEntry( i.aName );
...@@ -1577,7 +1577,7 @@ bool SfxCommonTemplateDialog_Impl::Execute_Impl( ...@@ -1577,7 +1577,7 @@ bool SfxCommonTemplateDialog_Impl::Execute_Impl(
for ( size_t i = 0; i < nFilterCount; ++i ) for ( size_t i = 0; i < nFilterCount; ++i )
{ {
const SfxFilterTupel &rTupel = pFamilyItem->GetFilterList()[ i ]; const SfxFilterTuple &rTupel = pFamilyItem->GetFilterList()[ i ];
if ( ( rTupel.nFlags & nFilterFlags ) == nFilterFlags && pIdx ) if ( ( rTupel.nFlags & nFilterFlags ) == nFilterFlags && pIdx )
*pIdx = i; *pIdx = 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