[Libreoffice-commits] core.git: vcl/opengl vcl/osx vcl/qa
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 12 09:19:25 UTC 2019
vcl/opengl/shaders/combinedVertexShader.glsl | 2 +-
vcl/opengl/x11/X11DeviceInfo.cxx | 2 +-
vcl/osx/DataFlavorMapping.hxx | 6 +++---
vcl/osx/a11yfactory.mm | 2 +-
vcl/osx/a11ywrapper.mm | 4 ++--
vcl/osx/vclnsapp.mm | 2 +-
vcl/qa/cppunit/BitmapTest.cxx | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit f9c57222e7f108ba68f3910a5c8f007476ce6552
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sun Aug 11 18:13:06 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Aug 12 11:18:22 2019 +0200
Fix typos
Change-Id: Idb183e0ee9cccf0e4da16ff984ccf9b57eea0f9e
Reviewed-on: https://gerrit.libreoffice.org/77273
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/vcl/opengl/shaders/combinedVertexShader.glsl b/vcl/opengl/shaders/combinedVertexShader.glsl
index ff1f0709f837..16fc4a942ce2 100644
--- a/vcl/opengl/shaders/combinedVertexShader.glsl
+++ b/vcl/opengl/shaders/combinedVertexShader.glsl
@@ -63,7 +63,7 @@ void main()
multiply = 1.0 / (1.0 - (start / end));
}
- // lengthen the vertex in directon of the extrusion vector by line width.
+ // lengthen the vertex in direction of the extrusion vector by line width.
vec4 final_position = vec4(position + (extrusion_vector * (render_thickness / 2.0) ), 0.0, 1.0);
gl_Position = mvp * final_position;
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index 577e2c2ad3b2..ace010d8ed31 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -246,7 +246,7 @@ void X11OpenGLDeviceInfo::GetData()
else if (strstr(maVendor.getStr(), "ATI Technologies Inc"))
{
mbIsFGLRX = true;
- // with the FGLRX driver, the version string only gives a OpenGL version :/ so let's return that.
+ // with the FGLRX driver, the version string only gives an OpenGL version: so let's return that.
// that can at least give a rough idea of how old the driver is.
whereToReadVersionNumbers = maVersion.getStr();
}
diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index d98d1895cc43..4720a7f73423 100644
--- a/vcl/osx/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -64,7 +64,7 @@ public:
/* Map a system data flavor to an OpenOffice data flavor.
Return an empty string if there is not suitable
- mapping from a system data flavor to a OpenOffice data
+ mapping from a system data flavor to an LibreOffice data
flavor.
*/
css::datatransfer::DataFlavor systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const;
@@ -95,13 +95,13 @@ public:
*/
static DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSData* systemData);
- /* Translate a sequence of DataFlavors into a NSArray of system types.
+ /* Translate a sequence of DataFlavors into an NSArray of system types.
Only those DataFlavors for which a suitable mapping to a system
type exist will be contained in the returned types array.
*/
NSArray* flavorSequenceToTypesArray(const css::uno::Sequence<css::datatransfer::DataFlavor>& flavors) const;
- /* Translate a NSArray of system types into a sequence of DataFlavors.
+ /* Translate an NSArray of system types into a sequence of DataFlavors.
Only those types for which a suitable mapping to a DataFlavor
exist will be contained in the new DataFlavor Sequence.
*/
diff --git a/vcl/osx/a11yfactory.mm b/vcl/osx/a11yfactory.mm
index 6a173bbbf633..0a17f15dad8d 100644
--- a/vcl/osx/a11yfactory.mm
+++ b/vcl/osx/a11yfactory.mm
@@ -149,7 +149,7 @@ static bool enabled = false;
FIXME:
Unfortunately this can increase memory consumption drastically until the non transient parent
- is destroyed an finally all the transients are released.
+ is destroyed and finally all the transients are released.
*/
if ( ! rxAccessibleContext -> getAccessibleStateSet() -> contains ( AccessibleStateType::TRANSIENT ) )
#endif
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 555835021650..4b4ac43c4943 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -115,7 +115,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
FIXME:
Unfortunately this can increase memory consumption drastically until the non transient parent
- is destroyed an finally all the transients are released.
+ is destroyed and finally all the transients are released.
*/
if ( ! rxAccessibleContext -> getAccessibleStateSet() -> contains ( AccessibleStateType::TRANSIENT ) )
#endif
@@ -209,7 +209,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
/*
Radiobutton grouping is done differently in NSAccessibility and the UNO-API. In UNO related radio buttons share an entry in their
- RelationSet. In NSAccessibility the relationship is axpressed through the hierarchy. A AXRadioGroup contains two or more AXRadioButton
+ RelationSet. In NSAccessibility the relationship is expressed through the hierarchy. An AXRadioGroup contains two or more AXRadioButton
objects. Since this group is not available in the UNO hierarchy, an extra wrapper is used for it. This wrapper shares almost all
attributes with the first radio button of the group, except for the role, subrole, role description, parent and children attributes.
So in this five methods there is a special treatment for radio buttons and groups.
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 9effda6ff4c1..53d002a8aa46 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -286,7 +286,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
(void)app;
(void)printSettings;
(void)bShowPrintPanels;
- // currently ignores print settings an bShowPrintPanels
+ // currently ignores print settings a bShowPrintPanels
std::vector<OUString> aFileList;
NSEnumerator* it = [files objectEnumerator];
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index 4e96b192de2b..b59b7789aa57 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -499,7 +499,7 @@ void BitmapTest::testGreyPalette()
BitmapPalette aPalette = Bitmap::GetGreyPalette(16);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong number of palette entries", static_cast<sal_uInt16>(16),
aPalette.GetEntryCount());
- // this is a *reall* specific number of greys, incremented in units of 17 so may
+ // this is a *real* specific number of greys, incremented in units of 17 so may
// as well test them all...
CPPUNIT_ASSERT_EQUAL_MESSAGE("Entry 1 wrong", BitmapColor(0, 0, 0), aPalette[0]);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Entry 2 wrong", BitmapColor(17, 17, 17), aPalette[1]);
More information about the Libreoffice-commits
mailing list