offapi/com/sun/star/drawing/XShapeGrouper.idl | 2 +-
reportdesign/source/filter/xml/xmlFixedContent.hxx | 2 +-
sal/textenc/tcvtjp6.tab | 20 ++++++++++----------
shell/source/win32/workbench/TestSmplMail.cxx | 2 +-
shell/source/win32/workbench/TestSysShExec.cxx | 2 +-
testtools/qa/cli/CLITest.java | 2 +-
testtools/qa/cliversioning/VersionTestCase.java | 2 +-
vcl/win/gdi/gdiimpl.cxx | 2 +-
vcl/win/window/salframe.cxx | 4 ++--
9 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit f4dc137734a7e0aaefdc854acd124cc2dbba72ec
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Fri Nov 16 16:40:39 2018 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Nov 19 08:34:08 2018 +0100
Fix typos
Change-Id: I6d51e4eb4a49a30193b904b2c7d62df1e16ea3d9
Reviewed-on: https://gerrit.libreoffice.org/63475
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/offapi/com/sun/star/drawing/XShapeGrouper.idl
b/offapi/com/sun/star/drawing/XShapeGrouper.idl
index f724c0f35d94..2716377ecfa6 100644
--- a/offapi/com/sun/star/drawing/XShapeGrouper.idl
+++ b/offapi/com/sun/star/drawing/XShapeGrouper.idl
@@ -60,7 +60,7 @@ published interface XShapeGrouper:
com::sun::star::uno::XInterface
@param aGroup
moves all Shapes from this GroupShape
to the parent XShapes of the GroupShape.
- The GroupShape is than removed from the
+ The GroupShape is then removed from the
GenericDrawPage and disposed.
*/
void ungroup( [in] com::sun::star::drawing::XShapeGroup aGroup );
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx
b/reportdesign/source/filter/xml/xmlFixedContent.hxx
index 78f85760cb1d..18bd802cfd3f 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.hxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx
@@ -32,7 +32,7 @@ namespace rptxml
OUString m_sPageText; // page count and page number
OUString m_sLabel;
OXMLCell& m_rCell;
- OXMLFixedContent* m_pInP; // if set than we are in text-p element
+ OXMLFixedContent* m_pInP; // if set then we are in text-p element
bool m_bFormattedField;
protected:
diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab
index 95adcad11a56..aca728f80d06 100644
--- a/sal/textenc/tcvtjp6.tab
+++ b/sal/textenc/tcvtjp6.tab
@@ -158,7 +158,7 @@ static ImplDBCSToUniLeadTab const aSJISUniLeadTab[256] =
{ 0x007D, 0, 0, nullptr }, /* 0x7D */
{ 0x007E, 0, 0, nullptr }, /* 0x7E */
/* is 0x0203E (SPACING OVERSCORE), but for compatibility with ASCII, we use
0x7E (TILDE) like MS CP392 */
{ 0x007F, 0, 0, nullptr }, /* 0x7F */
- { 0x005C, 0, 0, nullptr }, /* 0x80 */
/* APPLE additions over SJIS, we convert this like apple, because I think, this
gives better result, than we take a replacement char */
+ { 0x005C, 0, 0, nullptr }, /* 0x80 */
/* APPLE additions over SJIS, we convert this like Apple, because I think, this
gives better result, then we take a replacement char */
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */
{ 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */
{ 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */
@@ -190,7 +190,7 @@ static ImplDBCSToUniLeadTab const aSJISUniLeadTab[256] =
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9D }, /* 0x9D */
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9E }, /* 0x9E */
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9F }, /* 0x9F */
- { 0x00A0, 0, 0, nullptr }, /* 0xA0 */
/* APPLE additions over SJIS, we convert this like apple, because I think, this
gives better result, than we take a replacement char */
+ { 0x00A0, 0, 0, nullptr }, /* 0xA0 */
/* APPLE additions over SJIS, we convert this like Apple, because I think, this
gives better result, then we take a replacement char */
{ 0xFF61, 0, 0, nullptr }, /* 0xA1 */
{ 0xFF62, 0, 0, nullptr }, /* 0xA2 */
{ 0xFF63, 0, 0, nullptr }, /* 0xA3 */
@@ -283,9 +283,9 @@ static ImplDBCSToUniLeadTab const aSJISUniLeadTab[256] =
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FA }, /* 0xFA */ /*
We use the MS table for better MS compatibility */
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FB }, /* 0xFB */ /*
We use the MS table for better MS compatibility */
{ 0, 0x40, 0x4B, aImplDBCSToUniTab_MS932_FC }, /* 0xFC */ /*
We use the MS table for better MS compatibility */
- { 0x00A9, 0, 0, nullptr }, /* 0xFD */
/* APPLE additions over SJIS, we convert this like apple, because I think, this
gives better result, than we take a replacement char */
- { 0x2122, 0, 0, nullptr }, /* 0xFE */
/* APPLE additions over SJIS, we convert this like apple, because I think, this
gives better result, than we take a replacement char */
- { 0x2026, 0, 0, nullptr } /* 0xFF */
/* APPLE additions over SJIS, we convert this like apple, because I think, this
gives better result, than we take a replacement char */
+ { 0x00A9, 0, 0, nullptr }, /* 0xFD */
/* APPLE additions over SJIS, we convert this like Apple, because I think, this
gives better result, then we take a replacement char */
+ { 0x2122, 0, 0, nullptr }, /* 0xFE */
/* APPLE additions over SJIS, we convert this like Apple, because I think, this
gives better result, then we take a replacement char */
+ { 0x2026, 0, 0, nullptr } /* 0xFF */
/* APPLE additions over SJIS, we convert this like Apple, because I think, this
gives better result, then we take a replacement char */
};
/* ----------------------------------------------------------------------- */
@@ -730,7 +730,7 @@ static ImplDBCSToUniLeadTab const aMS932UniLeadTab[256] =
{ 0x007D, 0, 0, nullptr }, /* 0x7D */
{ 0x007E, 0, 0, nullptr }, /* 0x7E */
/* in SJIS this is 0x0203E (SPACING OVERSCORE), but for compatibility with
ASCII, we use 0x7E (TILDE) like MS CP392 */
{ 0x007F, 0, 0, nullptr }, /* 0x7F */
- { 0x005C, 0, 0, nullptr }, /* 0x80 */
/* APPLE additions over SJIS, we convert this like apple, because I think, this
gives better result, than we take a replacement char */
+ { 0x005C, 0, 0, nullptr }, /* 0x80 */
/* APPLE additions over SJIS, we convert this like Apple, because I think, this
gives better result, then we take a replacement char */
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */
{ 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */
{ 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */
@@ -762,7 +762,7 @@ static ImplDBCSToUniLeadTab const aMS932UniLeadTab[256] =
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9D }, /* 0x9D */
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9E }, /* 0x9E */
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_SJIS_9F }, /* 0x9F */
- { 0x00A0, 0, 0, nullptr }, /* 0xA0 */
/* APPLE additions over SJIS, we convert this like apple, because I think, this
gives better result, than we take a replacement char */
+ { 0x00A0, 0, 0, nullptr }, /* 0xA0 */
/* APPLE additions over SJIS, we convert this like Apple, because I think, this
gives better result, then we take a replacement char */
{ 0xFF61, 0, 0, nullptr }, /* 0xA1 */
{ 0xFF62, 0, 0, nullptr }, /* 0xA2 */
{ 0xFF63, 0, 0, nullptr }, /* 0xA3 */
@@ -855,9 +855,9 @@ static ImplDBCSToUniLeadTab const aMS932UniLeadTab[256] =
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FA }, /* 0xFA */
{ 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FB }, /* 0xFB */
{ 0, 0x40, 0x4B, aImplDBCSToUniTab_MS932_FC }, /* 0xFC */
- { 0x00A9, 0, 0, nullptr }, /* 0xFD */
/* APPLE additions over SJIS, we convert this like apple, because I think, this
gives better result, than we take a replacement char */
- { 0x2122, 0, 0, nullptr }, /* 0xFE */
/* APPLE additions over SJIS, we convert this like apple, because I think, this
gives better result, than we take a replacement char */
- { 0x2026, 0, 0, nullptr } /* 0xFF */
/* APPLE additions over SJIS, we convert this like apple, because I think, this
gives better result, than we take a replacement char */
+ { 0x00A9, 0, 0, nullptr }, /* 0xFD */
/* APPLE additions over SJIS, we convert this like Apple, because I think, this
gives better result, then we take a replacement char */
+ { 0x2122, 0, 0, nullptr }, /* 0xFE */
/* APPLE additions over SJIS, we convert this like Apple, because I think, this
gives better result, then we take a replacement char */
+ { 0x2026, 0, 0, nullptr } /* 0xFF */
/* APPLE additions over SJIS, we convert this like Apple, because I think, this
gives better result, then we take a replacement char */
};
/* ----------------------------------------------------------------------- */
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx
b/shell/source/win32/workbench/TestSmplMail.cxx
index b333d80e15bb..18b1741e838f 100644
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -145,7 +145,7 @@ int SAL_CALL main(int , char*, char* )
// Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
- OSL_FAIL("Error shuting down");
+ OSL_FAIL("Error shutting down");
}
// Dispose and clear factory
diff --git a/shell/source/win32/workbench/TestSysShExec.cxx
b/shell/source/win32/workbench/TestSysShExec.cxx
index 607e0998a5bc..2dd1ba246042 100644
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -117,7 +117,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* )
// Print a message if an error occurred.
if ( xComponent.is() == sal_False )
{
- OSL_FAIL("Error shuting down");
+ OSL_FAIL("Error shutting down");
}
// Dispose and clear factory
diff --git a/testtools/qa/cli/CLITest.java b/testtools/qa/cli/CLITest.java
index 13755dc8a3ee..c3d6f8919c86 100644
--- a/testtools/qa/cli/CLITest.java
+++ b/testtools/qa/cli/CLITest.java
@@ -74,7 +74,7 @@ public class CLITest extends ComplexTestCase
}
-/* This reads reads from an InputStream and discards the data.
+/* This reads from an InputStream and discards the data.
*/
class Reader extends Thread
{
diff --git a/testtools/qa/cliversioning/VersionTestCase.java
b/testtools/qa/cliversioning/VersionTestCase.java
index c430443d8164..d32faaa64276 100644
--- a/testtools/qa/cliversioning/VersionTestCase.java
+++ b/testtools/qa/cliversioning/VersionTestCase.java
@@ -72,7 +72,7 @@ public class VersionTestCase extends ComplexTestCase
}
-/* This reads reads from an InputStream and discards the data.
+/* This reads from an InputStream and discards the data.
*/
class Reader extends Thread
{
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 1ba590cc803e..e09745ae505e 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -449,7 +449,7 @@ void WinSalGraphicsImpl::copyArea( long nDestX, long nDestY,
}
while ( GetWindowStyle( hWndTopWindow ) & WS_CHILD );
- // If one or more Parents clip our window, than we must
+ // If one or more Parents clip our window, then we must
// calculate the outside area
if ( !EqualRect( &aSrcRect, &aTempRect3 ) )
{
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 9a81a865189b..e34600285c22 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1342,7 +1342,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long
nWidth, long nHeight,
// Search for TopLevel Frame
while ( hWndParent && (GetWindowStyle( hWndParent ) & WS_CHILD) )
hWndParent = ::GetParent( hWndParent );
- // if the Window has a Parent, than center the window to
+ // if the Window has a Parent, then center the window to
// the parent, in the other case to the screen
if ( hWndParent && !IsIconic( hWndParent ) &&
(GetWindowStyle( hWndParent ) & WS_VISIBLE) )
@@ -3556,7 +3556,7 @@ static bool ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
bIgnoreCharMsg = false;
- // char-message, than remove or ignore
+ // char-message, then remove or ignore
if ( bCharPeek )
{
nDeadChar = 0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
