[Libreoffice-commits] core.git: filter/source lotuswordpro/source sd/source svx/source sw/qa sw/source writerfilter/source

[Julien Nabet]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl        |    2 +-
 lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx |    2 +-
 sd/source/filter/ppt/pptin.cxx                            |    2 +-
 svx/source/xoutdev/xattr.cxx                              |    6 +++---
 sw/qa/extras/rtfimport/rtfimport.cxx                      |    2 +-
 sw/source/filter/ww8/rtfattributeoutput.hxx               |    2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx            |    2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit d6727ae7ffa93dd7624ad98c49720199e6c36b61
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Mar 12 22:12:37 2015 +0100

    Typos
    
    Change-Id: I55d7440ba5bee16bbce5930c81c604858131b5c7

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 32f0ffe..d591bbf 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -392,7 +392,7 @@
 					</xsl:apply-templates>
 				</xsl:element>
 				<!-- after the last draw:frame sibling the CSS float is disabled
-					  is an unbreakable whitespace to give conent to the element and force a browser not to ignore the element -->
+					  is an unbreakable whitespace to give content to the element and force a browser not to ignore the element -->
 				<div style="clear:both; line-height:0; width:0; height:0; margin:0; padding:0;"> </div>
 			</xsl:when>
 			<xsl:when test="text:tab and not(ancestor::text:index-body)">
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
index 7abdf63..f83af6b 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
@@ -85,7 +85,7 @@ public:
 
 public:
     /**
-     * @descr   Add conent.
+     * @descr   Add content.
      */
     virtual void    Add(XFContent *pContent);
 
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 88f5f4b..8205f8a 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2092,7 +2092,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
             }
         }
         break;
-        case 0x05 :                     // OLEAction ( OLEVerb to use, 0==first, 1==secnd, .. )
+        case 0x05 :                     // OLEAction ( OLEVerb to use, 0==first, 1==second, .. )
         case 0x06 :                     // MediaAction
         case 0x07 :                     // CustomShowAction
         default :                       // 0x00: no action, else unknown action
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 372e89e..042dc73 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -164,7 +164,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u
         }
     }
 
-    // if we have no name yet, find existing item with same conent or
+    // if we have no name yet, find existing item with same content or
     // create a unique name
     if (aUniqueName.isEmpty())
     {
@@ -1477,7 +1477,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
             }
         }
 
-        // if we have no name yet, find existing item with same conent or
+        // if we have no name yet, find existing item with same content or
         // create a unique name
         if( aUniqueName.isEmpty() )
         {
@@ -1760,7 +1760,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
             }
         }
 
-        // if we have no name yet, find existing item with same conent or
+        // if we have no name yet, find existing item with same content or
         // create a unique name
         if( aUniqueName.isEmpty() )
         {
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 7e7c96d..766ade9 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2267,7 +2267,7 @@ DECLARE_RTFIMPORT_TEST(testFdo49893, "fdo49893.rtf")
 
 DECLARE_RTFIMPORT_TEST(testFdo49893_2, "fdo49893-2.rtf")
 {
-    // Ensure that header text exists on each page (especially on secnd page)
+    // Ensure that header text exists on each page (especially on second page)
     CPPUNIT_ASSERT_EQUAL(OUString("HEADER"),  parseDump("/root/page[1]/header/txt/text()"));
     CPPUNIT_ASSERT_EQUAL(OUString("HEADER"),  parseDump("/root/page[2]/header/txt/text()"));
     CPPUNIT_ASSERT_EQUAL(OUString("HEADER"),  parseDump("/root/page[3]/header/txt/text()"));
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 67fca71..20b76a2 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -503,7 +503,7 @@ private:
      */
     OStringBuffer m_aStyles;
     /*
-     * This is the same as m_aStyles but the conents of it is written last.
+     * This is the same as m_aStyles but the contents of it is written last.
      */
     OStringBuffer m_aStylesEnd;
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c225dc4..ddf1e52 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4786,7 +4786,7 @@ RTFError RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int n
         return RTFError::OK;
     }
 
-    // Accent characters (over dot / over coma).
+    // Accent characters (over dot / over comma).
     switch (nKeyword)
     {
     case RTF_ACCNONE: