[Libreoffice-commits] core.git: dbaccess/source filter/source include/connectivity include/svtools include/svx odk/examples sal/qa sw/inc sw/source toolkit/source UnoControls/source xmloff/source
Andrea Gelmini
andrea.gelmini at gelma.net
Tue Nov 21 07:49:04 UTC 2017
UnoControls/source/controls/progressbar.cxx | 2 +-
UnoControls/source/inc/progressbar.hxx | 2 +-
dbaccess/source/ui/inc/JoinController.hxx | 2 +-
filter/source/config/cache/typedetection.hxx | 2 +-
include/connectivity/IParseContext.hxx | 2 +-
include/connectivity/sqlparse.hxx | 2 +-
include/svtools/genericunodialog.hxx | 2 +-
include/svx/ParseContext.hxx | 2 +-
odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java | 2 +-
sal/qa/rtl/ostring/rtl_str.cxx | 4 ++--
sal/qa/rtl/oustring/rtl_ustr.cxx | 8 ++++----
sw/inc/redline.hxx | 2 +-
sw/source/core/text/inftxt.cxx | 2 +-
toolkit/source/controls/controlmodelcontainerbase.cxx | 2 +-
xmloff/source/forms/elementexport.hxx | 2 +-
15 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 11ca1f86f80984ec07f5051ab05f864d55db5974
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Mon Nov 20 22:01:09 2017 +0100
Fix typos
Change-Id: I40b3a46d46f0586d086bdbe41876c088f8c1cb58
Reviewed-on: https://gerrit.libreoffice.org/45007
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 6ff8b8671530..d94409e5e337 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -344,7 +344,7 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra
nBlockStart += m_aBlockSize.Width;
}
}
- // draw vertikal progressbar
+ // draw vertical progressbar
// decision in "recalcRange()"
else
{
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index cdacc9c66ce3..f3d073d8bacc 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -135,7 +135,7 @@ protected:
private:
- bool m_bHorizontal; // orientation for steps [true=horizontal/false=vertikal]
+ bool m_bHorizontal; // orientation for steps [true=horizontal/false=vertical]
css::awt::Size m_aBlockSize; // width and height of a block [>=0,0]
sal_Int32 m_nForegroundColor; // (alpha,r,g,b)
sal_Int32 m_nBackgroundColor; // (alpha,r,g,b)
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index d254801c2e0f..81e226ade2e2 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -144,7 +144,7 @@ namespace dbaui
TTableWindowData::value_type createTableWindowData(const OUString& _sComposedName,const OUString& _sTableName,const OUString& _sWindowName);
// ask the user if the design should be saved when it is modified
virtual short saveModified() = 0;
- // called when the original state should be reseted (first time load)
+ // called when the original state should be reset (first time load)
virtual void reset() = 0;
virtual void describeSupportedFeatures() override;
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index 27937e4d3f05..18185134af5a 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -107,7 +107,7 @@ private:
@param rLastChance
the internal name of a "suggested type" ... (see before)
- Note: it will be reseted to an empty string every time. So
+ Note: it will be reset to an empty string every time. So
a set value of "rLastChance" can be detected outside very easy.
@param rUsedDetectors
diff --git a/include/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx
index 7277f421cfdd..46601b5f75db 100644
--- a/include/connectivity/IParseContext.hxx
+++ b/include/connectivity/IParseContext.hxx
@@ -89,7 +89,7 @@ namespace connectivity
// finds out, if we have an international keyword (only ASCII allowed)
virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const = 0;
- /** get's a locale instance which should be used when parsing in the context specified by this instance
+ /** gets a locale instance which should be used when parsing in the context specified by this instance
<p>if this is not overridden by derived classes, it returns the static default locale.</p>
*/
virtual css::lang::Locale getPreferredLocale( ) const = 0;
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index 7651162b3e30..49db658b202f 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -82,7 +82,7 @@ namespace connectivity
// determines the default international setting
static const css::lang::Locale& getDefaultLocale();
- /** get's a locale instance which should be used when parsing in the context specified by this instance
+ /** gets a locale instance which should be used when parsing in the context specified by this instance
<p>if this is not overridden by derived classes, it returns the static default locale.</p>
*/
virtual css::lang::Locale getPreferredLocale( ) const override;
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index bd79fb2e9e59..a5ec54f4cf79 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -114,7 +114,7 @@ namespace svt
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
protected:
- /** create the concrete dialog instance. note that m_aMutex is not locked when this method get's called,
+ /** create the concrete dialog instance. Note that m_aMutex is not locked when this method get called,
but the application-wide solar mutex is (to guard the not thread-safe ctor of the dialog).
@param pParent the parent window for the new dialog
*/
diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx
index 8a1794ede563..cc188ac6d99c 100644
--- a/include/svx/ParseContext.hxx
+++ b/include/svx/ParseContext.hxx
@@ -49,7 +49,7 @@ namespace svxform
// finds out, if we have an international keyword (only ASCII allowed)
virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const override;
- /** get's a locale instance which should be used when parsing in the context specified by this instance
+ /** gets a locale instance which should be used when parsing in the context specified by this instance
<p>if this is not overridden by derived classes, it returns the static default locale.</p>
*/
virtual css::lang::Locale getPreferredLocale( ) const override;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java
index 90451e7ab932..0d4b09bf09d3 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java
@@ -376,7 +376,7 @@ public class DisableCommandsTest {
* reset URL so it can be reused
*
* @param aURL
- * the URL that should be reseted
+ * the URL that should be reset
*/
private static void resetURL( com.sun.star.util.URL aURL )
{
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index 4ba29626efed..80c49b5deac8 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -120,7 +120,7 @@ namespace rtl_str
rtl::OString aStr2 = "LINE MUST BE EQUAL.";
sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
- CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitve).", nValue == 0);
+ CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
}
void compare_003()
@@ -188,7 +188,7 @@ namespace rtl_str
sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
aStr2.getStr(), aStr2.getLength(),
aStr1.getLength());
- CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitve).", nValue == 0);
+ CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
}
void compare_003()
diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx
index feedb9da803c..138bad1e8912 100644
--- a/sal/qa/rtl/oustring/rtl_ustr.cxx
+++ b/sal/qa/rtl/oustring/rtl_ustr.cxx
@@ -131,7 +131,7 @@ namespace rtl_ustr
rtl::OUString aStr2("LINE MUST BE EQUAL.");
sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
- CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitve).", nValue == 0);
+ CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
}
void compare_003()
@@ -199,7 +199,7 @@ namespace rtl_ustr
sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
aStr2.getStr(), aStr2.getLength(),
aStr1.getLength());
- CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitve).", nValue == 0);
+ CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
}
void compare_003()
@@ -1187,7 +1187,7 @@ namespace rtl_ustr
rtl::OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
- CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitve).", nValue == 0);
+ CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
}
void ascii_compareIgnoreAsciiCase_003()
@@ -1284,7 +1284,7 @@ namespace rtl_ustr
rtl::OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
- CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitve).", nValue == 0);
+ CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0);
}
void ascii_compareIgnoreAsciiCase_003()
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 29b3b0287aeb..f5898a30e020 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -83,7 +83,7 @@ public:
/*
* This class is used to store 'redline' data regarding formatting changes,
* e.g. - a text portion *was* italic and now is not italic,
- * e.g. - a text portion got a hightlight to it
+ * e.g. - a text portion got a highlight to it
*
* The way the information is stored is in an 'SfxItemSet' that holds all
* the WhichIds with their values.
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index f84a0ee7c69b..105c3871c4ce 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1169,7 +1169,7 @@ void SwTextPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
aFillColor = *m_pFnt->GetBackColor();
}
- // tdf#104349 do not hightlight portions of space chars before end of line if the compatibility option is enabled
+ // tdf#104349 do not highlight portions of space chars before end of line if the compatibility option is enabled
// for LTR mode only
if ( !GetTextFrame()->IsRightToLeft() )
{
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 57b80755554e..a92db2112f7c 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -492,7 +492,7 @@ void ControlModelContainerBase::replaceByName( const OUString& aName, const Any&
Reference< XNameContainer > xAllChildren( getPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ) ), UNO_QUERY );
if ( xAllChildren.is() )
{
- // remove old control (and children) from global list of containees
+ // remove old control (and children) from global list of containes
updateUserFormChildren( xAllChildren, aName, Remove, uno::Reference< XControlModel >() );
// Add new control (and containees if they exist)
updateUserFormChildren( xAllChildren, aName, Insert, xNewModel );
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index 6d007734c770..c59ab7530d90 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -199,7 +199,7 @@ namespace xmloff
*/
void exportListSourceAsElements();
- /** get's a Sequence< sal_Int16 > property value as set of sal_Int16's
+ /** gets a Sequence< sal_Int16 > property value as set of sal_Int16's
@param _rPropertyName
the property name to use
@param _rOut
More information about the Libreoffice-commits
mailing list