[Libreoffice-commits] core.git: connectivity/source desktop/source filter/source lotuswordpro/inc vcl/inc vcl/README.vars
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 25 19:31:43 UTC 2019
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 2 +-
desktop/source/lib/init.cxx | 6 +++---
filter/source/pdf/pdfexport.cxx | 2 +-
lotuswordpro/inc/xfilter/xfstylecont.hxx | 2 +-
vcl/README.vars | 2 +-
vcl/inc/opengl/PackedTextureAtlas.hxx | 2 +-
vcl/inc/win/salgdi.h | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 1729f554f8ecc4a4f6fa92b71dff8bab67d238c7
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Thu Jul 25 20:17:31 2019 +0200
Commit: Andrea Gelmini <andrea.gelmini at gelma.net>
CommitDate: Thu Jul 25 21:30:50 2019 +0200
Fix typos
Change-Id: I1efccb8b926e4aa10e9ccee7e8e36919e38c05fc
Reviewed-on: https://gerrit.libreoffice.org/76339
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini <andrea.gelmini at gelma.net>
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 1b3a1692b0c8..f73cc5e62a8d 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1117,7 +1117,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
"fields.RDB$FIELD_SCALE, " // 10
// Specifically use relfields null flag -- the one in fields is used
// for domains, whether a specific field is nullable is set in relfields,
- // this is also the one we manually fiddle when changin NULL/NOT NULL
+ // this is also the one we manually fiddle when changing NULL/NOT NULL
// (see Table.cxx)
"relfields.RDB$NULL_FLAG, " // 11
"fields.RDB$CHARACTER_LENGTH, " // 12
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3f00cd57020f..6bed02b869e6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -950,7 +950,7 @@ CallbackFlushHandler::CallbackFlushHandler(LibreOfficeKitDocument* pDocument, Li
SetPriority(TaskPriority::POST_PAINT);
// Add the states that are safe to skip duplicates on, even when
- // not consequent (i.e. do no emmit them if unchanged from last).
+ // not consequent (i.e. do no emit them if unchanged from last).
m_states.emplace(LOK_CALLBACK_TEXT_SELECTION, "NIL");
m_states.emplace(LOK_CALLBACK_GRAPHIC_SELECTION, "NIL");
m_states.emplace(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, "NIL");
@@ -1276,7 +1276,7 @@ bool CallbackFlushHandler::processInvalidateTilesEvent(CallbackData& aCallbackDa
if (rcNew.m_nPart == -1)
{
- // Don't merge unless fully overlaped.
+ // Don't merge unless fully overlapped.
SAL_INFO("lok", "New " << rcNew.toString() << " has " << rcOld.toString()
<< "?");
if (rcNew.m_aRectangle.IsInside(rcOld.m_aRectangle))
@@ -1288,7 +1288,7 @@ bool CallbackFlushHandler::processInvalidateTilesEvent(CallbackData& aCallbackDa
}
else if (rcOld.m_nPart == -1)
{
- // Don't merge unless fully overlaped.
+ // Don't merge unless fully overlapped.
SAL_INFO("lok", "Old " << rcOld.toString() << " has " << rcNew.toString()
<< "?");
if (rcOld.m_aRectangle.IsInside(rcNew.m_aRectangle))
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 051f73fc66b8..6c293392effe 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -1162,7 +1162,7 @@ void PDFExport::ImplWriteTiledWatermark( vcl::PDFWriter& rWriter, const Size& rP
OUString watermark = msTiledWatermark;
int watermarkLength = watermark.getLength();
// Maximum number of characters in one line.
- // it is set to 21 to make it look like tiled watermaks as online in secure view
+ // it is set to 21 to make it look like tiled watermarks as online in secure view
const int lineLength = 21;
int lnIndex = lineLength;
int lnCount = watermarkLength / lineLength;
diff --git a/lotuswordpro/inc/xfilter/xfstylecont.hxx b/lotuswordpro/inc/xfilter/xfstylecont.hxx
index 15783b5d65fa..0ddf5ca4db80 100644
--- a/lotuswordpro/inc/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/inc/xfilter/xfstylecont.hxx
@@ -79,7 +79,7 @@ struct IXFStyleRet
/**
* @descr container object for styles.
- * All styles can be placed into an style container.
+ * All styles can be placed into a style container.
*/
class XFStyleContainer
{
diff --git a/vcl/README.vars b/vcl/README.vars
index 786be8cbf166..b170bb22c027 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -33,6 +33,6 @@ OpenGL
SAL_FORCEGL - force enable OpenGL
SAL_GL_NO_SWAP - disable buffer swapping if set (should show nothing)
SAL_GL_SLEEP_ON_SWAP - sleep for half a second on each swap-buffers.
-SAL_WITHOUT_WIDGET_CACHE - disable LRU caching of native widget texutres
+SAL_WITHOUT_WIDGET_CACHE - disable LRU caching of native widget textures
SAL_DISABLE_GLYPH_CACHING - don't render glyphs through OpenGL textures
SAL_DISABLE_GL_WATCHDOG - don't start the thread that watches for broken GL drivers
diff --git a/vcl/inc/opengl/PackedTextureAtlas.hxx b/vcl/inc/opengl/PackedTextureAtlas.hxx
index c7f39d86b4d9..6dadcc59e0ad 100644
--- a/vcl/inc/opengl/PackedTextureAtlas.hxx
+++ b/vcl/inc/opengl/PackedTextureAtlas.hxx
@@ -17,7 +17,7 @@
struct PackedTexture;
/**
- * Pack texutres into one texutre atlas.
+ * Pack textures into one texture atlas.
*
* This is based on algorithm described in [1] and is an
* adaptation of "texture atlas generator" from [2].
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 23f201fea6fa..344d8cd3e2e6 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -134,7 +134,7 @@ public:
/// Obtain the texture; the caller must delete it after use.
OpenGLTexture* getTexture();
- /// Copy bitmap data to the texture. Texutre must be initialized and the correct size to hold the bitmap.
+ /// Copy bitmap data to the texture. Texture must be initialized and the correct size to hold the bitmap.
bool copyToTexture(OpenGLTexture& aTexture);
};
More information about the Libreoffice-commits
mailing list