[Libreoffice-commits] core.git: writerfilter/source xmerge/source xmlhelp/source xmloff/source
Andrea Gelmini
andrea.gelmini at gelma.net
Tue Sep 29 15:15:19 PDT 2015
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 +-
writerfilter/source/dmapper/FieldTypes.hxx | 4 ++--
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 2 +-
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java | 2 +-
xmlhelp/source/cxxhelp/provider/provider.hxx | 2 +-
xmloff/source/chart/SchXMLChartContext.cxx | 2 +-
xmloff/source/chart/SchXMLTableContext.cxx | 2 +-
xmloff/source/draw/animationimport.cxx | 2 +-
xmloff/source/draw/shapeimport.cxx | 2 +-
xmloff/source/forms/elementimport.cxx | 2 +-
xmloff/source/forms/formcellbinding.hxx | 2 +-
xmloff/source/style/FillStyleContext.hxx | 2 +-
xmloff/source/style/prstylei.cxx | 2 +-
xmloff/source/style/xmlexppr.cxx | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 79797f8e594650ca422a4236d033205f654c035c
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Sep 29 18:13:41 2015 +0200
Fix typos
Change-Id: If2e4adb2ce93c02ee14d831eedf4ef31da04b92d
Reviewed-on: https://gerrit.libreoffice.org/18996
Reviewed-by: Joren De Cuyper <jorendc at libreoffice.org>
Tested-by: Joren De Cuyper <jorendc at libreoffice.org>
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2a8621a..d6b1334c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -900,7 +900,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
rAppendContext.pLastParagraphProperties->GetWrap() :
pStyleProperties->GetWrap() >= 0 ? pStyleProperties->GetWrap() : 0 )));
- /** FDO#73546 : distL & distR should be unsigned intgers <Ecma 20.4.3.6>
+ /** FDO#73546 : distL & distR should be unsigned integers <Ecma 20.4.3.6>
Swapped the array elements 11,12 & 13,14 since 11 & 12 are
LEFT & RIGHT margins and 13,14 are TOP and BOTTOM margins respectively.
*/
diff --git a/writerfilter/source/dmapper/FieldTypes.hxx b/writerfilter/source/dmapper/FieldTypes.hxx
index 7fb9515..06bd44f 100644
--- a/writerfilter/source/dmapper/FieldTypes.hxx
+++ b/writerfilter/source/dmapper/FieldTypes.hxx
@@ -166,13 +166,13 @@ enum FieldId
,FIELD_PAGEREF
/* REF targetbkm \f \* MERGEFORMAT ->
imports a ShowVariable (bookmarkname)?
- \h hyerlink to paragraph
+ \h hyperlink to paragraph
\p relative to para above/below
\f refenence number
\d separator number separator
\n paragraph number
\r paragraph number in relative context
- \t suppres non delimiters
+ \t suppress non delimiters
\w paragraph number in full context
\* Upper/Lower...
*/
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 4fa867b..2125b81 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1823,7 +1823,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
// We have methods to _add_ individual tokens or whole namespaces to be
// processed by writerfilter (instead of oox), but we have no method to
- // filter out a single token. Just hardwire the wrap token here till we
+ // filter out a single token. Just hardwire the wrap token here untill we
// need a more generic solution.
bool bIsWrap = Element == static_cast<sal_Int32>(NMSP_vmlWord | XML_wrap);
bool bSkipImages = getDocument()->IsSkipImages() && oox::getNamespace(Element) == static_cast<sal_Int32>(NMSP_dml) &&
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b030d3d..1dd8197 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2374,7 +2374,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
if (m_bNeedPar)
dispatchSymbol(RTF_PAR);
m_bIgnoreNextContSectBreak = true;
- // arrange to clean up the syntetic RTF_SBKPAGE
+ // arrange to clean up the synthetic RTF_SBKPAGE
m_nResetBreakOnSectBreak = RTF_SBKNONE;
}
else
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
index 99f9d9e..fc21398 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
@@ -280,7 +280,7 @@ public class DOMDocument
// Now call serialize to write the document
meth.invoke(serializer, new Object[]{doc, baos});
} else {
- // We dont have another parser
+ // We don't have another parser
try {
DOMSource domSource = new DOMSource(doc);
StringWriter writer = new StringWriter();
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index 05f0a76..e42fbd0 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -115,7 +115,7 @@ namespace chelp {
(void)aListener;
}
- // XConainerListener ( deriver from XEventListener )
+ // XConainerListener ( derive from XEventListener )
virtual void SAL_CALL
disposing( const ::com::sun::star::lang::EventObject& Source )
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index b5ddec5..08c05e8 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -345,7 +345,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
if( bHasAddin )
{
- //correct charttype serveice name when having an addin
+ //correct charttype service name when having an addin
//and don't refresh addin during load
uno::Reference< beans::XPropertySet > xDocProp( mrImportHelper.GetChartDocument(), uno::UNO_QUERY );
if( xDocProp.is() )
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 85ba4ca..1f7d77e 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -661,7 +661,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
::sax::Converter::convertDouble( fData, aCellContent );
aCell.fValue = fData;
- // dont read text from following <text:p> or <text:list> element
+ // don't read text from following <text:p> or <text:list> element
mbReadText = false;
}
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 5bc91ff..5d03f99 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1277,7 +1277,7 @@ private:
AnimationsImport::AnimationsImport( const Reference< XComponentContext > & rxContext )
: SvXMLImport( rxContext, AnimationsImport_getImplementationName(), SvXMLImportFlags::META )
//FIXME: the above "IMPORT_META" used to be a nonsensical "true", question
- // remainst whether this should be IMPORT_META (same numerical value as
+ // remains whether this should be IMPORT_META (same numerical value as
// true) or default IMPORT_ALL
{
// add namespaces
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 2870816..7a05086 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -606,7 +606,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
return pContext;
}
-// This method is called from SdXMLFrameShapeContext to create children of drawe:frame
+// This method is called from SdXMLFrameShapeContext to create children of draw:frame
SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
SvXMLImport& rImport,
sal_uInt16 p_nPrefix,
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index dc4f424..41f0971 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1279,7 +1279,7 @@ namespace xmloff
// need to make the URL absolute if
// * it's the image-data attribute
- // * it's the target-location attribute, and we're dealign with an object which has the respective property
+ // * it's the target-location attribute, and we're dealing with an object which has the respective property
bool bMakeAbsolute =
_rLocalName.equalsAscii( s_pImageDataAttributeName )
|| ( _rLocalName.equalsAscii( s_pTargetLocationAttributeName )
diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx
index 5abffef..e58205e 100644
--- a/xmloff/source/forms/formcellbinding.hxx
+++ b/xmloff/source/forms/formcellbinding.hxx
@@ -57,7 +57,7 @@ namespace xmloff
the control model which is or will be bound
@param _rxDocument
the document. If this is <NULL/>, the document will be obtained from the model
- itself by walkong up the chain of its ancestors.<br/>
+ itself by walkon up the chain of its ancestors.<br/>
This parameter can be used if the control model is not (yet) part of a document
model.
*/
diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx
index 2db39fd..61d3408 100644
--- a/xmloff/source/style/FillStyleContext.hxx
+++ b/xmloff/source/style/FillStyleContext.hxx
@@ -24,7 +24,7 @@
#include <xmloff/xmlstyle.hxx>
#include <rtl/ustring.hxx>
-// draw:gardient context
+// draw:gradient context
class XMLGradientStyleContext: public SvXMLStyleContext
{
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 47f1910..da1cfbf 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -437,7 +437,7 @@ void XMLPropStyleContext::Finish( bool bOverwrite )
{
if( mxStyle.is() && (IsNew() || bOverwrite) )
{
- // The families cintaner must exist
+ // The families container must exist
Reference < XNameContainer > xFamilies =
static_cast<SvXMLStylesContext *>(&mxStyles)->GetStylesContainer( GetFamily() );
DBG_ASSERT( xFamilies.is(), "Families lost" );
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 04608346..bfcc89c 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -653,7 +653,7 @@ vector<XMLPropertyState> SvXMLExportPropertyMapper::_Filter(
}
}
- // Call centext-filter
+ // Call context-filter
if( !aPropStateArray.empty() )
ContextFilter(bEnableFoFontFamily, aPropStateArray, xPropSet);
More information about the Libreoffice-commits
mailing list