[Libreoffice-commits] core.git: Branch 'aoo/trunk' - chart2/source comphelper/inc cui/source dbaccess/source filter/source i18npool/source javaunohelper/com sal/inc stoc/source svx/sdi sw/inc toolkit/source xmerge/source
Matthias Seidel
mseidel at apache.org
Thu May 31 18:12:55 UTC 2018
chart2/source/inc/NameContainer.hxx | 2 -
comphelper/inc/comphelper/implementationreference.hxx | 2 -
cui/source/dialogs/cuihyperdlg.cxx | 2 -
cui/source/dialogs/hldocntp.cxx | 2 -
cui/source/dialogs/hldoctp.cxx | 2 -
cui/source/dialogs/hlinettp.cxx | 2 -
cui/source/dialogs/hlmailtp.cxx | 2 -
cui/source/dialogs/hlmarkwn.cxx | 4 +--
cui/source/dialogs/hltpbase.cxx | 4 +--
dbaccess/source/ui/inc/ScrollHelper.hxx | 2 -
filter/source/pdf/pdfexport.cxx | 2 -
i18npool/source/collator/collator_unicode.cxx | 2 -
javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 11 ++--------
sal/inc/rtl/strbuf.hxx | 4 +--
sal/inc/rtl/ustrbuf.hxx | 4 +--
stoc/source/javaloader/javaloader.cxx | 2 -
svx/sdi/fmslots.sdi | 2 -
sw/inc/tox.hxx | 6 ++---
toolkit/source/awt/vclxtoolkit.cxx | 2 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java | 4 +--
20 files changed, 29 insertions(+), 34 deletions(-)
New commits:
commit a13841aca2519a7272fba336bf643f7d0ad2fcf3
Author: Matthias Seidel <mseidel at apache.org>
Date: Thu May 31 17:29:02 2018 +0000
Fixed typos:
contructor -> constructor
convinient -> convenient
diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx
index 0cdf85e2319c..7bacaceba032 100644
--- a/chart2/source/inc/NameContainer.hxx
+++ b/chart2/source/inc/NameContainer.hxx
@@ -82,7 +82,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException);
private: //methods
- NameContainer();//no default contructor
+ NameContainer();//no default constructor
private: //member
const ::com::sun::star::uno::Type m_aType;
diff --git a/comphelper/inc/comphelper/implementationreference.hxx b/comphelper/inc/comphelper/implementationreference.hxx
index b0fb49d07a80..b066941454d0 100644
--- a/comphelper/inc/comphelper/implementationreference.hxx
+++ b/comphelper/inc/comphelper/implementationreference.hxx
@@ -152,7 +152,7 @@ namespace comphelper
queried for the template-parameterized UNO type.
@param dummy
- Dummy parameter, to distinguish this contructor from the
+ Dummy parameter, to distinguish this constructor from the
default unary one (which does not perform a
QueryInterface)
*/
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index dce804b6cea1..1573e77270b3 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -92,7 +92,7 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
/*************************************************************************
|*
-|* Contructor / Destructor
+|* Constructor / Destructor
|*
|************************************************************************/
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 7b7273041f07..ec4eba883502 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -103,7 +103,7 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const String& rPath, const Stri
/*************************************************************************
|*
-|* Contructor / Destructor
+|* Constructor / Destructor
|*
|************************************************************************/
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 9a37e01ba5cf..cd34851aea77 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -41,7 +41,7 @@ sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME;
/*************************************************************************
|*
-|* Contructor / Destructor
+|* Constructor / Destructor
|*
|************************************************************************/
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 580890a7e777..e96cc2f08ef2 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -43,7 +43,7 @@ sal_Char __READONLY_DATA sTelnetScheme[] = INET_TELNET_SCHEME;
/*************************************************************************
|*
-|* Contructor / Destructor
+|* Constructor / Destructor
|*
|************************************************************************/
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 25dcf3b53d2f..e1dbce01a4e2 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
/*************************************************************************
|*
-|* Contructor / Destructor
+|* Constructor / Destructor
|*
|************************************************************************/
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index a594248472cd..850649c77d52 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -120,7 +120,7 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect )
/*************************************************************************
|*
-|* Contructor / Destructor
+|* Constructor / Destructor
|*
|************************************************************************/
@@ -465,7 +465,7 @@ void SvxHlinkDlgMarkWnd::ClearTree()
/*************************************************************************
|*
-|* Find Entry for Strng
+|* Find Entry for String
|*
|************************************************************************/
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index bee2bc85e688..6a227e7c0c3f 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -48,7 +48,7 @@ using namespace ::ucbhelper;
/*************************************************************************
|*
-|* Contructor / Destructor
+|* Constructor / Destructor
|*
|************************************************************************/
@@ -90,7 +90,7 @@ SvxFramesComboBox::~SvxFramesComboBox ()
/*************************************************************************
|*
-|* Contructor / Destructor
+|* Constructor / Destructor
|*
|************************************************************************/
diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx
index 6b0078cfd3a4..2ffd1522f2a3 100644
--- a/dbaccess/source/ui/inc/ScrollHelper.hxx
+++ b/dbaccess/source/ui/inc/ScrollHelper.hxx
@@ -40,7 +40,7 @@ namespace dbaui
Link m_aUpScroll;
Link m_aDownScroll;
public:
- /** default contructor
+ /** default constructor
*/
OScrollHelper();
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 59644118ce01..c8fac4998288 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -591,7 +591,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
break;
}
-//copy in context the values default in the contructor or set by the FilterData sequence of properties
+//copy in context the values default in the constructor or set by the FilterData sequence of properties
aContext.Tagged = mbUseTaggedPDF;
//values used in viewer
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 06178c28d8e9..981e57c95368 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -124,7 +124,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
/** ICU collators are loaded using a locale only.
ICU uses Variant as collation algorithm name (like de__PHONEBOOK
locale), note the empty territory (Country) designator in this special
- case here. The icu::Locale contructor changes the algorithm name to
+ case here. The icu::Locale constructor changes the algorithm name to
uppercase itself, so we don't have to bother with that.
*/
icu::Locale icuLocale(
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index ba44a646ee7b..afa7c26f1559 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -132,13 +132,13 @@ XMultiPropertySet
registerProperty(p, id);
}
- /** Registers a property with this class and associates the argument id with it.
+ /** Registers a property with this class and associates the argument id with it.
* It does the same as {@link #registerProperty(Property, Object)}. The first three
* arguments are used to construct a Property object. The value for the Property.Handle
* is generated and does not have to be specified here. Use this method for registering
* a property if you do not care about the Property's handles.
* Registration has to occur during
- * initialization of the inheriting class (i.e. within the contructor).
+ * initialization of the inheriting class (i.e. within the constructor).
* @param name The property's name (Property.Name).
* @param type The property's type (Property.Type).
* @param attributes The property's attributes (Property.Attributes).
@@ -197,8 +197,6 @@ XMultiPropertySet
registerProperty(propertyName, propertyName, attributes);
}
-
-
/** Returns the Property object for a given property name or null if that property does
* not exists (i.e. it has not been registered). Override this method
* if you want to implement your own mapping from property names to Property objects.
@@ -260,7 +258,7 @@ XMultiPropertySet
* override {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} or {@link #getPropertyValue(Property)}
* then the argument <em>id</em> has to be a java.lang.String that equals the name of
* the member variable that holds the Property's value.
- * Override this method if you want to implement your own mapping from Property objects to ids or
+ * Override this method if you want to implement your own mapping from Property objects to ids or
* if you need ids of a type other then java.lang.String.
* Then you also need to override {@link #initMappings initMappings} and {@link #getPropertyId getPropertyId}.
* @param prop The Property object that is being assigned an id.
@@ -1092,6 +1090,3 @@ XMultiPropertySet
}
-
-
-
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index a392c6598c5f..ecd59d9f9613 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -155,7 +155,7 @@ public:
/**
Fill the string data in the new string and clear the buffer.
- This method is more efficient than the contructor of the string. It does
+ This method is more efficient than the constructor of the string. It does
not copy the buffer.
@return the string previously contained in the buffer.
@@ -199,7 +199,7 @@ public:
The new capacity will be at least as large as the maximum of the current
length (so that no contents of the buffer is destroyed) and the given
- minimumCapacity. If the given minimumCapacity is negative, nothing is
+ minimumCapacity. If the given minimumCapacity is negative, nothing is
changed.
@param minimumCapacity the minimum desired capacity.
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index a11fe9156e89..708761655c20 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -156,7 +156,7 @@ public:
/**
Fill the string data in the new string and clear the buffer.
- This method is more efficient than the contructor of the string. It does
+ This method is more efficient than the constructor of the string. It does
not copy the buffer.
@return the string previously contained in the buffer.
@@ -200,7 +200,7 @@ public:
The new capacity will be at least as large as the maximum of the current
length (so that no contents of the buffer is destroyed) and the given
- minimumCapacity. If the given minimumCapacity is negative, nothing is
+ minimumCapacity. If the given minimumCapacity is negative, nothing is
changed.
@param minimumCapacity the minimum desired capacity.
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index eeed43eabef6..ef22446c518b 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -257,7 +257,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
"javaloader error - no Java environment available")), css::uno::Reference<XInterface>());
- // why is there no convinient contructor?
+ // why is there no convenient constructor?
OUString sCppu_current_lb_name(RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME));
uno_getEnvironment(&pUno_environment, sCppu_current_lb_name.pData, NULL);
if(!pUno_environment)
diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi
index c4b8138ceaf8..91aa64216587 100644
--- a/svx/sdi/fmslots.sdi
+++ b/svx/sdi/fmslots.sdi
@@ -552,7 +552,7 @@ interface FormTextAttributeShell
/**** <HACK> ****/
// the following is a slight hack. Problem is that the form shell needs to translate
// slot names/args into URL dispatch names/args. For this, the SfxSlotPool is used
- // - it provides convinient methods for this. However, the "pool" is not really a
+ // - it provides convenient methods for this. However, the "pool" is not really a
// "pool" - it only knows slots, if there is a shell on the dispatcher stack which
// which is responsible for this slot.
// So, we declare the form shell as responsible for the following slots.
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 6ca8d3bbdf33..461defbdee7a 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -332,7 +332,7 @@ class SW_DLLPUBLIC SwFormTokensHelper
public:
/**
- contructor
+ constructor
@param rTokens vector of tokens
*/
@@ -752,7 +752,7 @@ inline const String& SwTOXBase::GetTitle() const
{ return aTitle; }
inline const String& SwTOXBase::GetTypeName() const
- { return GetTOXType()->GetTypeName(); }
+ { return GetTOXType()->GetTypeName(); }
inline const SwForm& SwTOXBase::GetTOXForm() const
{ return aForm; }
@@ -761,7 +761,7 @@ inline void SwTOXBase::SetCreate(sal_uInt16 nCreate)
{ nCreateType = nCreate; }
inline void SwTOXBase::SetTOXForm(const SwForm& rForm)
- { aForm = rForm; }
+ { aForm = rForm; }
inline TOXTypes SwTOXBase::GetType() const
{ return GetTOXType()->GetType(); }
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index fb680124ae9f..c6bc241f33a0 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -521,7 +521,7 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
}
}
-// contructor, which might initialize VCL
+// constructor, which might initialize VCL
VCLXToolkit::VCLXToolkit( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ):
cppu::WeakComponentImplHelper7<
::com::sun::star::awt::XToolkit,
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
index d0568e6ced11..f6ce7098cac6 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
@@ -61,7 +61,7 @@ public class Worksheet {
}
/**
- * Default Contructor
+ * Default Constructor
*/
public Worksheet() {
}
@@ -97,7 +97,7 @@ public class Worksheet {
}
/**
- * Reads a worksheet from the <code>InputStream</code> and contructs a
+ * Reads a worksheet from the <code>InputStream</code> and constructs a
* workbook object from it
*
* @param is InputStream containing a Pocket Excel Data file.
More information about the Libreoffice-commits
mailing list