[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - dbaccess/source desktop/source extensions/source qadevOOo/tests sc/source sd/source svx/inc sw/source
Matthias Seidel
mseidel at apache.org
Wed Jan 17 01:09:41 UTC 2018
dbaccess/source/ext/adabas/Acomponentmodule.hxx | 2 +-
desktop/source/app/lockfile.hxx | 2 +-
extensions/source/inc/componentmodule.hxx | 2 +-
extensions/source/propctrlr/eformshelper.hxx | 2 +-
qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java | 6 +++---
sc/source/ui/dbgui/asciiopt.cxx | 4 ++--
sd/source/ui/inc/fusel.hxx | 2 +-
svx/inc/galtheme.hrc | 2 +-
sw/source/core/layout/frmtool.cxx | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit b57158fc128c7f0bba3d8708004348d9e7ff749c
Author: Matthias Seidel <mseidel at apache.org>
Date: Wed Jan 17 00:57:14 2018 +0000
Fixed typos
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
index 5048c25d88c8..1da2b30ae552 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
@@ -103,7 +103,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
s_pFactoryFunctionPointers;
public:
- // cna be set as long as no resource has been accessed ...
+ // can be set as long as no resource has been accessed ...
static void setResourceFilePrefix(const ::rtl::OString& _rPrefix);
/// get the vcl res manager of the module
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 216722f41be8..afca66b5aa10 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -87,7 +87,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
s_pFactoryFunctionPointers;
public:
- // cna be set as long as no resource has been accessed ...
+ // can be set as long as no resource has been accessed ...
static void setResourceFilePrefix(const ::rtl::OString& _rPrefix);
/// get the vcl res manager of the module
diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx
index 81a94d870563..821928031bb2 100644
--- a/extensions/source/propctrlr/eformshelper.hxx
+++ b/extensions/source/propctrlr/eformshelper.hxx
@@ -113,7 +113,7 @@ namespace pcr
*/
bool canBindToDataType( sal_Int32 _nDataType = -1 ) const SAL_THROW(());
- /** checks whether the control model cna be bound to any XSD data type
+ /** checks whether the control model can be bound to any XSD data type
*/
bool canBindToAnyDataType() const SAL_THROW(()) { return canBindToDataType( -1 ); }
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 436cc8be4670..713ccfbb240d 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -28,7 +28,7 @@
// These defines are used to map gallery names to translated string ressources. Since
// galleries may be copied from older offices to newer, do *never* change this
// IDs except adding new ones (and adapting RID_GALLERYSTR_THEME_LAST). The ID
-// *is* written into the binary file *.thm (which is a galler theme combined of
+// *is* written into the binary file *.thm (which is a gallery theme combined of
// three files, *.thm, *.sdv and *.sdg)
#define RID_GALLERYSTR_THEME_3D (RID_GALLERYSTR_THEME_START + 1)
commit f9d7fc5c44d66faf19262e6ee0c13d4167acf158
Author: Matthias Seidel <mseidel at apache.org>
Date: Wed Jan 17 00:28:33 2018 +0000
Fixed typos
diff --git a/desktop/source/app/lockfile.hxx b/desktop/source/app/lockfile.hxx
index f563ca7e93f6..8b5953985a07 100644
--- a/desktop/source/app/lockfile.hxx
+++ b/desktop/source/app/lockfile.hxx
@@ -50,7 +50,7 @@ namespace desktop {
{
public:
- // contructs a new lockfile onject
+ // constructs a new lockfile onject
Lockfile( bool bIPCserver = true );
// separating GUI code:
diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
index 79836f0c7c79..8731ce8cfa38 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
@@ -110,7 +110,7 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest {
}
/*
- * gets one phonetic canidate for the chinese local
+ * gets one phonetic candidate for the chinese local
* is ok if 'yi' is returned as expected.
*/
public void _getPhoneticCandidate() {
@@ -220,8 +220,8 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest {
/**
* Helper class to handle the phonetic equivalence of unicode characters
- * This class delivers an amount oif unicode characters and the equivalent phonetics
- * for the "getPhoneticCandidate" test. Euivalents are only usable for zh,CN locale.
+ * This class delivers an amount of unicode characters and the equivalent phonetics
+ * for the "getPhoneticCandidate" test. Equivalents are only usable for zh,CN locale.
*/
public static class UnicodeStringPair {
final static int valCount = 78;
diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx
index 98ad41f37d07..da4b7692d553 100644
--- a/sd/source/ui/inc/fusel.hxx
+++ b/sd/source/ui/inc/fusel.hxx
@@ -89,7 +89,7 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer;
private:
- /** This pointer stores a canidate for assigning a style in the water
+ /** This pointer stores a candidate for assigning a style in the water
can mode between mouse button down and mouse button up.
*/
SdrObject* pWaterCanCandidate;
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 56726cc218c6..8a1df586f502 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2472,7 +2472,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
return NULL;
}
- // Tables should be saved as a whole, expection:
+ // Tables should be saved as a whole, exception:
// The contents of a section or a cell inside a table should be saved
if ( pSav->IsInTab() && !( ( pLay->IsSctFrm() || pLay->IsCellFrm() ) && pLay->IsInTab() ) )
while ( !pSav->IsTabFrm() )
commit 8497b3ed351f2316bea7b735826723148931291a
Author: Matthias Seidel <mseidel at apache.org>
Date: Wed Jan 17 00:10:28 2018 +0000
Fixed typos
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index b54d0f3e7a13..5b95687197e4 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -302,7 +302,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
bQuotedFieldAsText = aToken.EqualsAscii("true") ? true : false;
}
- // Detect special nubmers.
+ // Detect special numbers.
if (nCount >= 8)
{
aToken = rString.GetToken(7, ',');
@@ -396,7 +396,7 @@ String ScAsciiOptions::WriteToString() const
aOutStr += String::CreateFromAscii(bQuotedFieldAsText ? "true" : "false");
aOutStr += ',';
- // Detect special nubmers.
+ // Detect special numbers.
aOutStr += String::CreateFromAscii(bDetectSpecialNumber ? "true" : "false");
// 9th token is used for "Save as shown" in export options
More information about the Libreoffice-commits
mailing list