sw/inc/tox.hxx | 2 +-
sw/source/core/doc/doctxm.cxx | 16 ++++++++--------
sw/source/core/inc/doctxm.hxx | 2 +-
sw/source/core/inc/txmsrt.hxx | 2 +-
sw/source/core/tox/txmsrt.cxx | 2 +-
sw/source/ui/index/cnttab.cxx | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit e63582b4e5eca27ac55259fff52d5a087e433cf3
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Mon Jul 29 14:45:34 2019 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Jul 29 19:39:37 2019 +0200
Fix typo in code
"delimitter"
It passed "make check"
Change-Id: I54fb7200a71365675cefc506ea3c9f2c65bbff6d
Reviewed-on: https://gerrit.libreoffice.org/76554
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index d023cf1961f0..f4d05b3f1246 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -167,7 +167,7 @@ private:
// Structure of the index lines
#define FORM_TITLE 0
-#define FORM_ALPHA_DELIMITTER 1
+#define FORM_ALPHA_DELIMITER 1
#define FORM_PRIMARY_KEY 2
#define FORM_SECONDARY_KEY 3
#define FORM_ENTRY 4
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index f5f40af1222d..d5645c8ff312 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -907,10 +907,10 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
if(TOX_AUTHORITIES == SwTOXBase::GetType())
UpdateAuthorities( aIntl, pLayout );
- // Insert AlphaDelimitters if needed (just for keywords)
+ // Insert AlphaDelimiters if needed (just for keywords)
if( TOX_INDEX == SwTOXBase::GetType() &&
( GetOptions() & SwTOIOptions::AlphaDelimiter ) )
- InsertAlphaDelimitter( aIntl );
+ InsertAlphaDelimiter( aIntl );
// remove old content an insert one empty textnode (to hold the layout!)
SwTextNode* pFirstEmptyNd;
@@ -1080,7 +1080,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
SetProtect( SwTOXBase::IsProtected() );
}
-void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
+void SwTOXBaseSection::InsertAlphaDelimiter( const SwTOXInternational& rIntl )
{
SwDoc* pDoc = GetFormat()->GetDoc();
OUString sLastDeli;
@@ -1091,14 +1091,14 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const
SwTOXInternational& rIntl )
sal_uInt16 nLevel = m_aSortArr[i]->GetLevel();
- // Skip AlphaDelimitter
- if( nLevel == FORM_ALPHA_DELIMITTER )
+ // Skip AlphaDelimiter
+ if( nLevel == FORM_ALPHA_DELIMITER )
continue;
const OUString sDeli = rIntl.GetIndexKey( m_aSortArr[i]->GetText(),
m_aSortArr[i]->GetLocale() );
- // Do we already have a Delimitter?
+ // Do we already have a Delimiter?
if( !sDeli.isEmpty() && sLastDeli != sDeli )
{
// We skip all that are less than a small Blank (these are special
characters)
@@ -1107,7 +1107,7 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const
SwTOXInternational& rIntl )
std::unique_ptr<SwTOXCustom> pCst(
MakeSwTOXSortTabBase<SwTOXCustom>(nullptr,
TextAndReading(sDeli, OUString()),
- FORM_ALPHA_DELIMITTER,
+ FORM_ALPHA_DELIMITER,
rIntl,
m_aSortArr[i]->GetLocale() ));
m_aSortArr.insert( m_aSortArr.begin() + i, std::move(pCst));
i++;
@@ -1534,7 +1534,7 @@ void SwTOXBaseSection::UpdateContent( SwTOXElement
eMyType,
pLayout, *pCNd, eMyType,
( USHRT_MAX != nSetLevel )
? static_cast<sal_uInt16>(nSetLevel)
- : FORM_ALPHA_DELIMITTER ) );
+ : FORM_ALPHA_DELIMITER ) );
InsertSorted( std::move(pNew) );
}
}
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 59875566fa8f..5c005b37f119 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -56,7 +56,7 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
void InsertSorted(std::unique_ptr<SwTOXSortTabBase> pBase);
// insert alpha delimiter at creation
- void InsertAlphaDelimitter( const SwTOXInternational& rIntl );
+ void InsertAlphaDelimiter( const SwTOXInternational& rIntl );
// replace page num placeholder with actual page number
void UpdatePageNum_( SwTextNode* pNd,
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index a722921acdba..e6d09240e3ce 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -241,7 +241,7 @@ private:
struct SwTOXPara : public SwTOXSortTabBase
{
SwTOXPara(SwContentNode&, SwTOXElement,
- sal_uInt16 nLevel = FORM_ALPHA_DELIMITTER,
+ sal_uInt16 nLevel = FORM_ALPHA_DELIMITER,
const OUString& sSeqName = OUString());
void SetStartIndex(sal_Int32 nSet) { nStartIndex = nSet; }
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 765d9023978f..1d14bbf9510e 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -722,7 +722,7 @@ bool SwTOXPara::IsFullPara() const
// Table
SwTOXTable::SwTOXTable( const SwContentNode& rNd )
: SwTOXSortTabBase( TOX_SORT_TABLE, &rNd, nullptr, nullptr ),
- nLevel(FORM_ALPHA_DELIMITTER)
+ nLevel(FORM_ALPHA_DELIMITER)
{
}
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 8bd225fde246..3674207acebb 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3439,7 +3439,7 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
for( sal_uInt16 i=1; i < nSize; ++i )
{
if( TOX_INDEX == m_pCurrentForm->GetTOXType() &&
- FORM_ALPHA_DELIMITTER == i )
+ FORM_ALPHA_DELIMITER == i )
{
aStr = SwResId(STR_ALPHA);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
