[Libreoffice-commits] core.git: include/sfx2 sfx2/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Jun 12 09:24:30 UTC 2018
include/sfx2/styfitem.hxx | 6 +++---
sfx2/source/dialog/mgetempl.cxx | 2 +-
sfx2/source/dialog/templdlg.cxx | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7aa1dcc682a54890be2d23a1778758e1ec5b00fc
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Jun 12 09:37:23 2018 +0200
rename SfxFilterTupel->SfxFilterTuple
Change-Id: Idbbc5d0b28f7f876a774904d8279d342906b642d
Reviewed-on: https://gerrit.libreoffice.org/55662
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index 1c72f4dffa94..d8f6057e7513 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -27,18 +27,18 @@
#include <svl/style.hxx>
#include <vector>
-struct SFX2_DLLPUBLIC SfxFilterTupel
+struct SFX2_DLLPUBLIC SfxFilterTuple
{
OUString aName;
SfxStyleSearchBits nFlags;
- SfxFilterTupel(const OUString& rName, SfxStyleSearchBits nArg)
+ SfxFilterTuple(const OUString& rName, SfxStyleSearchBits nArg)
: aName(rName)
, nFlags(nArg)
{
}
};
-typedef std::vector<SfxFilterTupel> SfxStyleFilter;
+typedef std::vector<SfxFilterTuple> SfxStyleFilter;
class SFX2_DLLPUBLIC SfxStyleFamilyItem
{
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index d930bab81598..7464708f1509 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -196,7 +196,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx
for ( i = 0; i < nCount; ++i )
{
- const SfxFilterTupel& rTupel = rList[ i ];
+ const SfxFilterTuple& rTupel = rList[ i ];
if ( rTupel.nFlags != SfxStyleSearchBits::Auto &&
rTupel.nFlags != SfxStyleSearchBits::Used &&
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 02453fb2f9a0..02e92bca8069 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1125,7 +1125,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags)
sal_Int32 nPos = aFilterLb->InsertEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL), 0);
aFilterLb->SetEntryData( nPos, reinterpret_cast<void*>(SfxStyleSearchBits::All) );
const SfxStyleFilter& rFilter = pItem->GetFilterList();
- for(const SfxFilterTupel& i : rFilter)
+ for(const SfxFilterTuple& i : rFilter)
{
SfxStyleSearchBits nFilterFlags = i.nFlags;
nPos = aFilterLb->InsertEntry( i.aName );
@@ -1577,7 +1577,7 @@ bool SfxCommonTemplateDialog_Impl::Execute_Impl(
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 )
*pIdx = i;
More information about the Libreoffice-commits
mailing list