[Libreoffice-commits] core.git: sw/inc sw/source

[Gulsah Kose]

 sw/inc/fmtcol.hxx                 |    2 +-
 sw/source/core/docnode/node.cxx   |    2 +-
 sw/source/filter/xml/xmlfmt.cxx   |    2 +-
 sw/source/uibase/chrdlg/ccoll.cxx |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b06a7b1298537d2b0e4ea9adb32f262af357ecf1
Author: Gulsah Kose <gulsah.1004 at gmail.com>
Date:   Sun Feb 26 15:54:50 2017 +0300

    Fix typo footenote -> footnote
    
    Change-Id: Iee166416aaca627e55f25a25ed69f468fa2e510d
    Signed-off-by: Gulsah Kose <gulsah.1004 at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/34653
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index da39308..1f707cd 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -164,7 +164,7 @@ enum class Master_CollCondition
     PARA_IN_TABLEHEAD,
     PARA_IN_TABLEBODY,
     PARA_IN_SECTION,
-    PARA_IN_FOOTENOTE,
+    PARA_IN_FOOTNOTE,
     PARA_IN_FOOTER,
     PARA_IN_HEADER,
     PARA_IN_ENDNOTE
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 31a68ef..758a7c4 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1836,7 +1836,7 @@ bool SwContentNode::IsAnyCondition( SwCollCondition& rTmp ) const
                 case SwFlyStartNode:        nCond = Master_CollCondition::PARA_IN_FRAME; break;
                 case SwFootnoteStartNode:
                     {
-                        nCond = Master_CollCondition::PARA_IN_FOOTENOTE;
+                        nCond = Master_CollCondition::PARA_IN_FOOTNOTE;
                         const SwFootnoteIdxs& rFootnoteArr = rNds.GetDoc()->GetFootnoteIdxs();
                         const SwTextFootnote* pTextFootnote;
                         const SwNode* pSrchNd = pSttNd;
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index fdcd4e4..685e7bc 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -156,7 +156,7 @@ SwXMLConditionParser_Impl::SwXMLConditionParser_Impl( const OUString& rInp ) :
         else if( IsXMLToken( sFunc, XML_FOOTER ) && !bHasSub )
             nCondition = Master_CollCondition::PARA_IN_FOOTER;
         else if( IsXMLToken( sFunc, XML_FOOTNOTE ) && !bHasSub )
-            nCondition = Master_CollCondition::PARA_IN_FOOTENOTE;
+            nCondition = Master_CollCondition::PARA_IN_FOOTNOTE;
         else if( IsXMLToken( sFunc, XML_HEADER ) && !bHasSub )
             nCondition = Master_CollCondition::PARA_IN_HEADER;
         else if( IsXMLToken( sFunc, XML_LIST_LEVEL) &&
diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx
index f2ab69e..cad9eaf 100644
--- a/sw/source/uibase/chrdlg/ccoll.cxx
+++ b/sw/source/uibase/chrdlg/ccoll.cxx
@@ -103,7 +103,7 @@ const CommandStruct SwCondCollItem::aCmds[] =
     { Master_CollCondition::PARA_IN_TABLEBODY,    0 },
     { Master_CollCondition::PARA_IN_FRAME,        0 },
     { Master_CollCondition::PARA_IN_SECTION,      0 },
-    { Master_CollCondition::PARA_IN_FOOTENOTE,    0 },
+    { Master_CollCondition::PARA_IN_FOOTNOTE,     0 },
     { Master_CollCondition::PARA_IN_ENDNOTE,      0 },
     { Master_CollCondition::PARA_IN_HEADER,       0 },
     { Master_CollCondition::PARA_IN_FOOTER,       0 },