[Libreoffice-commits] core.git: vbahelper/source vcl/inc vcl/opengl vcl/quartz vcl/README.GDIMetaFile vcl/source vcl/unx vcl/win vcl/workben
Andrea Gelmini
andrea.gelmini at gelma.net
Thu Mar 2 12:44:03 UTC 2017
vbahelper/source/msforms/vbacombobox.cxx | 2 +-
vcl/README.GDIMetaFile | 2 +-
vcl/inc/listbox.hxx | 2 +-
vcl/inc/quartz/salgdi.h | 2 +-
vcl/inc/salgdi.hxx | 2 +-
vcl/inc/win/salgdi.h | 4 ++--
vcl/opengl/RenderList.cxx | 4 ++--
vcl/quartz/salgdicommon.cxx | 2 +-
vcl/source/control/scrbar.cxx | 2 +-
vcl/source/filter/sgvmain.hxx | 8 ++++----
vcl/source/filter/sgvtext.cxx | 2 +-
vcl/source/font/fontmetric.cxx | 2 +-
vcl/source/gdi/bitmapex.cxx | 2 +-
vcl/source/gdi/pdfwriter_impl.cxx | 2 +-
vcl/source/outdev/polyline.cxx | 2 +-
vcl/source/outdev/textline.cxx | 4 ++--
vcl/source/outdev/transparent.cxx | 2 +-
vcl/source/window/toolbox.cxx | 2 +-
vcl/unx/gtk/gtksalmenu.cxx | 2 +-
vcl/win/window/salobj.cxx | 2 +-
vcl/workben/fftester.cxx | 2 +-
21 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 65434e8701ab71c8bff8b0ac722d41b0592483dc
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Mar 2 09:38:03 2017 +0100
Fix typos
Change-Id: I72db7ff99cde394bc161dfd835bfb0d9a47a53d1
Reviewed-on: https://gerrit.libreoffice.org/34780
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx
index ab26e01..6203355 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -54,7 +54,7 @@ ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent,
// Attributes
-// Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in
+// Value, [read] e.g. getValue returns the value of ooo Text property e.g. the value in
// the drop down
uno::Any SAL_CALL
ScVbaComboBox::getValue()
diff --git a/vcl/README.GDIMetaFile b/vcl/README.GDIMetaFile
index 80749c8..2c8879d 100644
--- a/vcl/README.GDIMetaFile
+++ b/vcl/README.GDIMetaFile
@@ -3,7 +3,7 @@ GDIMetaFile class
The GDIMetaFile class reads, writes, manipulates and replays metafiles via the VCL module.
-A typical use case is to intialize a new GDIMetaFile, open the actual stored metafile and
+A typical use case is to initialize a new GDIMetaFile, open the actual stored metafile and
read it in via GDIMetaFile::Read( aIStream ). This reads in the metafile into the GDIMetafile
object - it can read in an old-style VCLMTF metafile (back in the days that Microsoft didn't
document the metafile format this was used), as well as EMF+ files - and adds them to a list
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 8003fd7..bc411a5 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -276,7 +276,7 @@ public:
void SetTopEntry( sal_Int32 nTop );
sal_Int32 GetTopEntry() const { return mnTop; }
- /** ShowProminentEntry will set the entry correspoding to nEntryPos
+ /** ShowProminentEntry will set the entry corresponding to nEntryPos
either at top or in the middle depending on the chosen style*/
void ShowProminentEntry( sal_Int32 nEntryPos );
void SetProminentEntryType( ProminentEntry eType ) { meProminentType = eType; }
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 086266d..248d07e 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -348,7 +348,7 @@ public:
// pFont: describes from which font to create a subset
// pGlyphIDs: the glyph ids to be extracted
// pEncoding: the character code corresponding to each glyph
- // pWidths: the advance widths of the correspoding glyphs (in PS font units)
+ // pWidths: the advance widths of the corresponding glyphs (in PS font units)
// nGlyphs: the number of glyphs
// rInfo: additional outgoing information
// implementation note: encoding 0 with glyph id 0 should be added implicitly
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index d71098a..a2b67c0 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -156,7 +156,7 @@ public:
// pFont: describes from which font to create a subset
// pGlyphIDs: the glyph ids to be extracted
// pEncoding: the character code corresponding to each glyph
- // pWidths: the advance widths of the correspoding glyphs (in PS font units)
+ // pWidths: the advance widths of the corresponding glyphs (in PS font units)
// nGlyphs: the number of glyphs
// rInfo: additional outgoing information
// implementation note: encoding 0 with glyph id 0 should be added implicitly
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index f6faf4a..e357083 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -81,7 +81,7 @@ public:
private:
sal_IntPtr mnId;
- // some members that are initalized lazily when the font gets selected into a HDC
+ // some members that are initialized lazily when the font gets selected into a HDC
mutable bool mbFontCapabilitiesRead;
mutable FontCharMapRef mxUnicodeMap;
mutable vcl::FontCapabilities maFontCapabilities;
@@ -351,7 +351,7 @@ public:
// pFont: describes from which font to create a subset
// pGlyphIDs: the glyph ids to be extracted
// pEncoding: the character code corresponding to each glyph
- // pWidths: the advance widths of the correspoding glyphs (in PS font units)
+ // pWidths: the advance widths of the corresponding glyphs (in PS font units)
// nGlyphs: the number of glyphs
// rInfo: additional outgoing information
// implementation note: encoding 0 with glyph id 0 should be added implicitly
diff --git a/vcl/opengl/RenderList.cxx b/vcl/opengl/RenderList.cxx
index cef311f..4c191fd 100644
--- a/vcl/opengl/RenderList.cxx
+++ b/vcl/opengl/RenderList.cxx
@@ -40,7 +40,7 @@ void appendPolyLine(vcl::LineBuilder& rBuilder, const basegfx::B2DPolygon& rPoly
if (nPoints == 2 || eLineJoin == basegfx::B2DLineJoin::NONE)
{
// If line joint is NONE or a simple line with 2 points, draw the polyline
- // each line segment separatly.
+ // each line segment separately.
for (sal_uInt32 i = 0; i < (bClosed ? nPoints : nPoints - 1); ++i)
{
@@ -74,7 +74,7 @@ void appendPolyLine(vcl::LineBuilder& rBuilder, const basegfx::B2DPolygon& rPoly
rBuilder.appendAndConnectLinePoint(p1, normal, 1.0f);
i++; // first point done already
- lastPoint--; // last point will be calculated separatly from the loop
+ lastPoint--; // last point will be calculated separately from the loop
p0 = p1;
previousLineVector = nextLineVector;
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index b472a49..11d831b 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -2139,7 +2139,7 @@ void XorEmulation::SetTarget( int nWidth, int nHeight, int nTargetDepth,
{
CGContextSetBlendMode( m_xMaskContext, kCGBlendModeDifference );
}
- // intialize the transformation matrix to the drawing target
+ // initialize the transformation matrix to the drawing target
const CGAffineTransform aCTM = CGContextGetCTM( xTargetContext );
CGContextConcatCTM( m_xMaskContext, aCTM );
if( m_xTempContext )
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 672cf6a..33ede81 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -379,7 +379,7 @@ void ScrollBar::ImplCalc( bool bUpdate )
}
}
- // If we're ought to ouput again and we have been triggered
+ // If we're ought to output again and we have been triggered
// a Paint event via an Action, we don't output directly,
// but invalidate everything
if ( bUpdate && HasPaintEvent() )
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index 37978c3..d15ffc6 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -116,7 +116,7 @@ class ObjTextType {
public:
ObjLineType L; // text outline (future)
ObjAreaType F; // inner text
- sal_uInt16 FontLo,FontHi; // e.g. 92500 (CG Times), split due to DWordAllign in TextType.
+ sal_uInt16 FontLo,FontHi; // e.g. 92500 (CG Times), split due to DWord-Align in TextType.
sal_uInt16 Grad; // 0.5..32767.5 pt - we should stop at 1000 pt
sal_uInt16 Breite; // 1..65535% please not more as 500%
sal_uInt8 Justify; // 2 bit vertical (Hi), 3 bit horizontal (Lo)
@@ -243,15 +243,15 @@ class TextType: public ObjkType {
public:
sal_uInt8 Flags; // (cheat due to alignment in NT)
sal_uInt8 Reserve; // for Word Align
- ObjTextType T; // 64 bytes << DWord-Allign needed for FontID
+ ObjTextType T; // 64 bytes << DWord-Align needed for FontID
PointType Pos1; // reference point (upper left)
PointType Pos2; // (lower right)
sal_Int16 TopOfs; // from upper side to start of text (future for vJustify)
sal_uInt16 RotationAngle; // 0...<360
sal_uInt16 BoxSlant; // >270...<90 (only Box)
sal_uInt16 BufSize; // size of buffer for Load, Save, Copy etc.
- sal_uInt16 BufLo,BufHi; // (UCHAR*) pointer to Textbuffer << ShortArr, otherwise DWord-Allign needed
- sal_uInt16 ExtLo,ExtHi; // (Ptr) text over more frames << ShortArr, otherwise DWord-Allign needed
+ sal_uInt16 BufLo,BufHi; // (UCHAR*) pointer to Textbuffer << ShortArr, otherwise DWord-Align needed
+ sal_uInt16 ExtLo,ExtHi; // (Ptr) text over more frames << ShortArr, otherwise DWord-Align needed
PointType FitSize; // size of origin for Fit2Size
sal_Int16 FitBreit; // width to format for Fit2Size
UCHAR* Buffer; // this variable is not set by reading from disk, but explicit!
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index a60dd0b..3cae515 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -374,7 +374,7 @@ UCHAR GetTextChar(UCHAR* TBuf, sal_uInt16& Index,
return c;
}
- // HardSpace and HardTrenn should be converted explicitely ! }
+ // HardSpace and HardTrenn should be converted explicitly ! }
// if AktAtr.Schnitt and TextKaptBit =TextKaptBit then c:=UpCase(c);(explizit) }
// The separationmethod SoftTrennAdd assumes, the separating consonant }
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 1669ae6..0815309 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -223,7 +223,7 @@ ImplFontMetricData::ImplFontMetricData( const FontSelectPattern& rFontSelData )
, mnDStrikeoutOffset1( 0 )
, mnDStrikeoutOffset2( 0 )
{
- // intialize the used font name
+ // initialize the used font name
if( rFontSelData.mpFontData )
{
SetFamilyName( rFontSelData.mpFontData->GetFamilyName() );
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 218aac4..7a23c9a 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -1014,7 +1014,7 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod
{
// do NOT use erase; for e.g. 8bit Bitmaps, the nearest color to the given
// erase color is determined and used -> this may be different from what is
- // wanted here. Better create a new bitmap with the needed color explicitely
+ // wanted here. Better create a new bitmap with the needed color explicitly
Bitmap::ScopedReadAccess xReadAccess(aChangedBitmap);
OSL_ENSURE(xReadAccess, "Got no Bitmap ReadAccess ?!?");
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index fc9443c..6a64813 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -10303,7 +10303,7 @@ void PDFWriterImpl::drawPolyLine( const tools::Polygon& rPoly, const PDFWriter::
aLine.append( "q " );
m_aPages.back().appendMappedLength( rInfo.m_fLineWidth, aLine );
aLine.append( " w" );
- if( rInfo.m_aDashArray.size() < 10 ) // implmentation limit of acrobat reader
+ if( rInfo.m_aDashArray.size() < 10 ) // implementation limit of acrobat reader
{
switch( rInfo.m_eCap )
{
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index 8788afd..02d1cb5 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -359,7 +359,7 @@ bool OutputDevice::DrawPolyLineDirect( const basegfx::B2DPolygon& rB2DPolygon,
LineInfo aLineInfo;
if( fLineWidth != 0.0 )
aLineInfo.SetWidth( static_cast<long>(fLineWidth+0.5) );
- // Transport known informations, might be needed
+ // Transport known information, might be needed
aLineInfo.SetLineJoin(eLineJoin);
aLineInfo.SetLineCap(eLineCap);
// MiterMinimumAngle does not exist yet in LineInfo
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 1e2970c..ba974d5 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -96,7 +96,7 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
long nStartX = nBaseX + nDistX;
long nStartY = nBaseY + nDistY;
- // If the height is 1 pixel, it's enough ouput a line
+ // If the height is 1 pixel, it's enough output a line
if ( (nLineWidth == 1) && (nHeight == 1) )
{
mpGraphics->SetLineColor( ImplColorToSal( rColor ) );
@@ -123,7 +123,7 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
long nPixWidth;
long nPixHeight;
bool bDrawPixAsRect;
- // On printers that ouput pixel via DrawRect()
+ // On printers that output pixel via DrawRect()
if ( (GetOutDevType() == OUTDEV_PRINTER) || (nLineWidth > 1) )
{
if ( mbLineColor || mbInitLineColor )
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 1329ac1..96e106c 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -341,7 +341,7 @@ bool OutputDevice::DrawTransparentNatively ( const tools::PolyPolygon& rPolyPoly
// should be used when printing. Normally this is avoided by the printer being
// non-AAed and thus e.g. on WIN GdiPlus calls are not used. It may be necessary
// to figure out a way of moving this code to its own function that is
- // overriden by the Print class, which will mean we deliberately override the
+ // overridden by the Print class, which will mean we deliberately override the
// functionality and we use the fallback some lines below (which is not very good,
// though. For now, WinSalGraphics::drawPolyPolygon will detect printer usage and
// correct the wrong mapping (see there for details)
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index e74baa7..403c823 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1944,7 +1944,7 @@ bool ToolBox::ImplCalcItem()
{
// make sure all vertical toolbars have the same width and horizontal have the same height
// this depends on the used button sizes
- // as this is used for alignement of multiple toolbars
+ // as this is used for alignment of multiple toolbars
// it is only required for docked toolbars
long nFixedWidth = nDefWidth+nDropDownArrowWidth;
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index a86d807..90b29e7 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -693,7 +693,7 @@ gboolean GtkSalMenu::SignalKey(GdkEventKey* pEvent)
mbReturnFocusToDocument = false;
gtk_menu_shell_cancel(GTK_MENU_SHELL(mpMenuBarWidget));
//because we return false here, the keypress will continue
- //to propogate and in the case that vcl focus is in
+ //to propagate and in the case that vcl focus is in
//the vcl menubar then that will also process F6 and move
//to the next pane
}
diff --git a/vcl/win/window/salobj.cxx b/vcl/win/window/salobj.cxx
index f21dfb7..808f6c8 100644
--- a/vcl/win/window/salobj.cxx
+++ b/vcl/win/window/salobj.cxx
@@ -509,7 +509,7 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
HWND hWndChild = nullptr;
if ( hWnd )
{
- // #135235# Explicitely stack SystemChildWindows in
+ // #135235# Explicitly stack SystemChildWindows in
// the order they're created - since there's no notion
// of zorder.
SetWindowPos(hWnd,HWND_TOP,0,0,0,0,
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 6d7ff45..56af89e 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -25,7 +25,7 @@
LD_LIBRARY_PATH=`pwd`/instdir/program SAL_USE_VCLPLUGIN=svp AFL_PERSISTENT=1 afl-fuzz -t 50 -i ~/fuzz/in.png -o ~/fuzz/out.png -d -T png -m 50000000 instdir/program/fftester @@ png
On slower file formats like .doc you can probably drop the -t and rely on the
- estimations, on faster file formats ironically not specifing a timeout will
+ estimations, on faster file formats ironically not specifying a timeout will
result in a hilarious dramatic falloff in performance from thousands per second
to teens per second as tiny variations from the initial calculated
timeout will trigger a shutdown of the fftester and a restart and the
More information about the Libreoffice-commits
mailing list