[Libreoffice-commits] core.git: configure.ac dbaccess/inc dbaccess/source drawinglayer/source editeng/source include/rtl sfx2/source solenv/bin svl/source svtools/source svx/source sw/source vcl/inc vcl/win
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 19 07:33:31 UTC 2018
configure.ac | 10 -
dbaccess/inc/strings.hrc | 4
dbaccess/source/ui/misc/HtmlReader.cxx | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2
editeng/source/editeng/impedit3.cxx | 70 ++++++-------
include/rtl/string.hxx | 10 -
sfx2/source/dialog/filtergrouping.cxx | 2
solenv/bin/modules/installer/worker.pm | 2
svl/source/numbers/zforfind.cxx | 2
svtools/source/misc/templatefoldercache.cxx | 4
svx/source/form/fmshimp.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 2
sw/source/core/undo/untbl.cxx | 2
sw/source/uibase/inc/swruler.hxx | 2
vcl/inc/strings.hrc | 2
vcl/win/window/salframe.cxx | 2
16 files changed, 60 insertions(+), 60 deletions(-)
New commits:
commit 2f049ebdb343eeb377720e27463c1975a83a1985
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Nov 19 00:12:20 2018 +0100
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Nov 19 08:33:09 2018 +0100
Fix typos
Change-Id: I0c966f517e337caa340526b48fa62b9910ce0a3e
Reviewed-on: https://gerrit.libreoffice.org/63504
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/configure.ac b/configure.ac
index b968f83938ff..c5591303209b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,7 +122,7 @@ add_warning()
echo "$COLORWARN $@" >> warn
}
-dnl Some Mac User have the bad habbit of letting a lot fo crap
+dnl Some Mac User have the bad habit of letting a lot of crap
dnl accumulate in their PATH and even adding stuff in /usr/local/bin
dnl that confuse the build.
dnl For the ones that use LODE, let's be nice and protect them
@@ -548,7 +548,7 @@ test_fontconfig=yes
test_cairo=no
# Default values, as such probably valid just for Linux, set
-# differently below just for Mac OSX,but at least better than
+# differently below just for Mac OSX, but at least better than
# hardcoding these as we used to do. Much of this is duplicated also
# in solenv for old build system and for gbuild, ideally we should
# perhaps define stuff like this only here in configure.ac?
@@ -2522,7 +2522,7 @@ if test $_os = iOS -o $_os = Android; then
# Disable dynamic_loading always for iOS and Android
enable_dynamic_loading=no
elif test -z "$enable_dynamic_loading"; then
- # Otherwise enable it unless speficically disabled
+ # Otherwise enable it unless specifically disabled
enable_dynamic_loading=yes
fi
@@ -2843,7 +2843,7 @@ if test $_os = Darwin -o $_os = iOS; then
AC_MSG_CHECKING([that macosx-version-min-required is coherent with macosx-version-max-allowed])
if test $MAC_OS_X_VERSION_MIN_REQUIRED -gt $MAC_OS_X_VERSION_MAX_ALLOWED; then
- AC_MSG_ERROR([the version minimumn required, $MAC_OS_X_VERSION_MIN_REQUIRED, must be <= the version maximum allowed, $MAC_OS_X_VERSION_MAX_ALLOWED])
+ AC_MSG_ERROR([the version minimum required, $MAC_OS_X_VERSION_MIN_REQUIRED, must be <= the version maximum allowed, $MAC_OS_X_VERSION_MAX_ALLOWED])
else
AC_MSG_RESULT([ok])
fi
@@ -11384,7 +11384,7 @@ if test "x$with_theme" != "xno"; then
fi
AC_MSG_RESULT([$WITH_THEMES])
AC_SUBST([WITH_THEMES])
-# FIXME: remove this, and the convenience default->colibre remapping after a crace period
+# FIXME: remove this, and the convenience default->colibre remapping after a grace period
for theme in $with_theme; do
case $theme in
default) AC_MSG_WARN([--with-theme=default is deprecated and will be removed, use --with-theme=colibre]) ;;
diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index 840e0b87e5e1..7e67c0b77665 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -98,9 +98,9 @@
#define STR_STATE_BACKUP_DBDOC NC_("STR_STATE_BACKUP_DBDOC", "Backup Document")
#define STR_STATE_MIGRATE NC_("STR_STATE_MIGRATE", "Migrate")
#define STR_STATE_SUMMARY NC_("STR_STATE_SUMMARY", "Summary")
-// To translators: This refers to a form documen t inside a database document.
+// To translators: This refers to a form document inside a database document.
#define STR_FORM NC_("STR_FORM", "Form '$name$'")
-// To translators: This refers to a report docum ent inside a database document.
+// To translators: This refers to a report document inside a database document.
#define STR_REPORT NC_("STR_REPORT", "Report '$name$'")
#define STR_OVERALL_PROGRESS NC_("STR_OVERALL_PROGRESS", "document $current$ of $overall$")
#define STR_DATABASE_DOCUMENT NC_("STR_DATABASE_DOCUMENT", "Database Document")
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index ad79d3b751ba..246d666ebd42 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -343,7 +343,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont, Color &_rTextColor)
sal_Int32 nPos = 0;
while( nPos != -1 )
{
- // list fo fonts, VCL: semicolon as separator, HTML: comma
+ // list of fonts, VCL: semicolon as separator, HTML: comma
OUString aFName = rFace.getToken( 0, ',', nPos );
aFName = comphelper::string::strip(aFName, ' ');
if( !aFontName.isEmpty() )
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 6ac21b0985b0..7f0c2e37f844 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1491,7 +1491,7 @@ namespace drawinglayer
if(!mnSvtGraphicFillCount && aLocalPolyPolygon.count())
{
- // #121194# Changed implementation and checked usages fo convert to metafile,
+ // #121194# Changed implementation and checked usages of convert to metafile,
// presentation start (uses SvtGraphicFill) and printing.
// calculate transformation. Get real object size, all values in FillGraphicAttribute
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 208aabaf2100..641adf60ea25 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -162,7 +162,7 @@ static void lcl_DrawRedLines( OutputDevice* pOutDev,
bool bVertical,
bool bIsRightToLeft )
{
- // But only if font is not too small ...
+ // But only if font is not too small...
long nHght = pOutDev->LogicToPixel( Size( 0, nFontHeight ) ).Height();
if( WRONG_SHOW_MIN < nHght )
{
@@ -284,7 +284,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView )
if ( !aClipRect.IsEmpty() )
{
- // convert to window coordinates ....
+ // convert to window coordinates...
aClipRect = pView->pImpEditView->GetWindowPos( aClipRect );
// moved to one executing method to allow finer control
@@ -358,7 +358,7 @@ void ImpEditEngine::FormatDoc()
bIsFormatting = true;
- // Then I can also start the spell-timer ...
+ // Then I can also start the spell-timer...
if ( GetStatus().DoOnlineSpelling() )
StartOnlineSpellTimer();
@@ -382,7 +382,7 @@ void ImpEditEngine::FormatDoc()
{
if ( !bGrow && GetTextRanger() )
{
- // For a change in height all below must be reformatted ...
+ // For a change in height all below must be reformatted...
for ( sal_Int32 n = nPara+1; n < GetParaPortions().Count(); n++ )
{
ParaPortion* pPP = GetParaPortions()[n];
@@ -418,7 +418,7 @@ void ImpEditEngine::FormatDoc()
}
// One can also get into the formatting through UpdateMode ON=>OFF=>ON...
- // enable optimization first after Vobis delivery ...
+ // enable optimization first after Vobis delivery...
{
sal_uInt32 nNewHeightNTP;
sal_uInt32 nNewHeight = CalcTextHeight( &nNewHeightNTP );
@@ -512,7 +512,7 @@ void ImpEditEngine::CheckAutoPageSize()
if ( ( !IsVertical() && ( aPaperSize.Width() != aPrevPaperSize.Width() ) )
|| ( IsVertical() && ( aPaperSize.Height() != aPrevPaperSize.Height() ) ) )
{
- // If ahead is centered / right or tabs ...
+ // If ahead is centered / right or tabs...
aStatus.GetStatusWord() |= !IsVertical() ? EditStatusFlags::TEXTWIDTHCHANGED : EditStatusFlags::TextHeightChanged;
for ( sal_Int32 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
{
@@ -599,11 +599,11 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
bool bEmptyNodeWithPolygon = ( pParaPortion->GetNode()->Len() == 0 ) && GetTextRanger();
- // Fast special treatment for empty paragraphs ...
+ // Fast special treatment for empty paragraphs...
if ( ( pParaPortion->GetNode()->Len() == 0 ) && !GetTextRanger() )
{
- // fast special treatment ...
+ // fast special treatment...
if ( pParaPortion->GetTextPortions().Count() )
pParaPortion->GetTextPortions().Reset();
if ( pParaPortion->GetLines().Count() )
@@ -613,7 +613,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
}
- // Initialization ......
+ // Initialization...
// Always format for 100%:
@@ -626,7 +626,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
}
- // Get Paragraph attributes ......
+ // Get Paragraph attributes...
ContentNode* const pNode = pParaPortion->GetNode();
@@ -655,7 +655,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
}
else if ( ( pParaPortion->IsSimpleInvalid() ) && ( nInvalidDiff < 0 ) )
{
- // check if delete over the portion boundaries was done ...
+ // check if delete over the portion boundaries was done...
sal_Int32 nStart = nInvalidStart; // DOUBLE !!!!!!!!!!!!!!!
sal_Int32 nEnd = nStart - nInvalidDiff; // negative
bQuickFormat = true;
@@ -693,7 +693,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
// faster Method:
RecalcTextPortion( pParaPortion, nInvalidStart, nInvalidDiff );
}
- else // nRealInvalidStart can be before InvalidStart, since Portions were deleted....
+ else // nRealInvalidStart can be before InvalidStart, since Portions were deleted...
{
CreateTextPortions( pParaPortion, nRealInvalidStart );
}
@@ -733,7 +733,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
}
- // Reformat all lines from here ...
+ // Reformat all lines from here...
sal_Int32 nDelFromLine = -1;
bool bLineBreak = false;
@@ -793,10 +793,10 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
// Problem:
// Since formatting starts a line _before_ the invalid position,
- // the positions unfortunately have to be redefined ...
+ // the positions unfortunately have to be redefined...
// Solution:
// The line before can only become longer, not smaller
- // => ...
+ // =>...
pLine->GetCharPosArray().clear();
sal_Int32 nTmpPos = nIndex;
@@ -847,7 +847,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
pTextRanges = GetTextRanger()->GetTextRanges( Range( nYOff, nYOff + nYDiff ) );
DBG_ASSERT( pTextRanges, "GetTextRanges?!" );
long nMaxRangeWidth = 0;
- // Use the widest range ...
+ // Use the widest range...
// The widest range could be a bit confusing, so normally it
// is the first one. Best with gaps.
assert(pTextRanges->size() % 2 == 0 && "textranges are always in pairs");
@@ -881,7 +881,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
}
}
- // search for Portion that no longer fits in line ....
+ // search for Portion that no longer fits in line...
TextPortion* pPortion = nullptr;
sal_Int32 nPortionLen = 0;
bool bContinueLastPortion = false;
@@ -912,7 +912,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
if ( !bContinueLastPortion && pPortion->GetKind() == PortionKind::HYPHENATOR )
{
// Throw away a Portion, if necessary correct the one before,
- // if the Hyph portion has swallowed a character ...
+ // if the Hyph portion has swallowed a character...
sal_Int32 nTmpLen = pPortion->GetLen();
pParaPortion->GetTextPortions().Remove( nTmpPortion );
if (nTmpPortion && nTmpLen)
@@ -1518,7 +1518,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
}
- // Check whether the line must be re-issued ...
+ // Check whether the line must be re-issued...
pLine->SetInvalid();
@@ -1543,7 +1543,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
// for <0 think over !
if ( pParaPortion->IsSimpleInvalid() )
{
- // Change through simple Text changes ...
+ // Change through simple Text changes...
// Do mot cancel formatting since Portions possibly have to be split
// again! If at some point cancelable, then validate the following
// line! But if applicable, mark as valid, so there is less output...
@@ -1595,7 +1595,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
sal_Int32 nEndPortion = pLine->GetEndPortion();
- // Next line or maybe a new line....
+ // Next line or maybe a new line...
pLine = nullptr;
if ( nLine < pParaPortion->GetLines().Count()-1 )
pLine = &pParaPortion->GetLines()[++nLine];
@@ -1905,10 +1905,10 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
pLine->SetHangingPunctuation( bHangingPunctuation );
// Whether a separator or not, push the word after the separator through
- // hyphenation ... NMaxBreakPos is the last character that fits into
+ // hyphenation... NMaxBreakPos is the last character that fits into
// the line, nBreakPos is the beginning of the word.
// There is a problem if the Doc is so narrow that a word is broken
- // into more than two lines ...
+ // into more than two lines...
if ( !bHangingPunctuation && bCanHyphenate && GetHyphenator().is() )
{
i18n::Boundary aBoundary = _xBI->getWordBoundary(
@@ -2038,7 +2038,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
}
else if ( bHyphenated )
{
- // A portion for inserting the separator ...
+ // A portion for inserting the separator...
TextPortion* pHyphPortion = new TextPortion( 0 );
pHyphPortion->SetKind( PortionKind::HYPHENATOR );
OUString aHyphText(CH_HYPH);
@@ -2154,7 +2154,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
DBG_ASSERT( nSomeExtraSpace >= 0, "AdjustBlocks: ExtraSpace < 0 " );
// Correct the positions in the Array and the portion widths:
- // Last character won't be considered ...
+ // Last character won't be considered...
for (auto const& nChar : aPositions)
{
if ( nChar < nLastChar )
@@ -2383,7 +2383,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_Int32& rS
while ( pAttrib )
{
// Insert Start and End into the Array...
- // The Insert method does not allow for duplicate values....
+ // The Insert method does not allow for duplicate values...
aPositions.insert( pAttrib->GetStart() );
aPositions.insert( pAttrib->GetEnd() );
nAttr++;
@@ -2437,7 +2437,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_Int32& rS
DBG_ASSERT( nP < pParaPortion->GetTextPortions().Count() || !pParaPortion->GetTextPortions().Count(), "Nothing to delete: CreateTextPortions" );
if ( nInvPortion && ( nPortionStart+pParaPortion->GetTextPortions()[nInvPortion].GetLen() > nStartPos ) )
{
- // prefer one in front ...
+ // prefer one in front...
// But only if it was in the middle of the portion of, otherwise it
// might be the only one in the row in front!
nInvPortion--;
@@ -2627,7 +2627,7 @@ void ImpEditEngine::SetFixedCellHeight( bool bUseFixedCellHeight )
void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut )
{
- // It was planned, SeekCursor( nStartPos, nEndPos, ... ), so that it would
+ // It was planned, SeekCursor( nStartPos, nEndPos,... ), so that it would
// only be searched anew at the StartPosition.
// Problem: There would be two lists to consider/handle:
// OrderedByStart,OrderedByEnd.
@@ -2798,7 +2798,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
aRealSz.setWidth( aRealSz.Width() / 100 );
}
rFont.SetFontSize( aRealSz );
- // Font is not restored ...
+ // Font is not restored...
}
if ( ( ( rFont.GetColor() == COL_AUTO ) || ( IsForceAutoColor() ) ) && pOut )
@@ -2959,7 +2959,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po
long nVertLineSpacing = CalcVertLineSpacing(aStartPos);
- // Over all the paragraphs ...
+ // Over all the paragraphs...
for ( sal_Int32 n = 0; n < GetParaPortions().Count(); n++ )
{
@@ -2982,7 +2982,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po
{
- // Over the lines of the paragraph ...
+ // Over the lines of the paragraph...
sal_Int32 nLines = pPortion->GetLines().Count();
sal_Int32 nLastLine = nLines-1;
@@ -3060,7 +3060,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po
}
- // Over the Portions of the line ...
+ // Over the Portions of the line...
bool bParsingFields = false;
std::vector< sal_Int32 >::iterator itSubLines;
@@ -3516,7 +3516,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po
{
// Paint the high/low without underline,
// Display the Underline on the
- // base line of the original font height ...
+ // base line of the original font height...
// But only if there was something underlined before!
bool bSpecialUnderline = false;
EditCharAttrib* pPrev = pPortion->GetNode()->GetCharAttribs().FindAttrib( EE_CHAR_ESCAPEMENT, nIndex );
@@ -4064,7 +4064,7 @@ void ImpEditEngine::CallStatusHdl()
EditStatus aTmpStatus( aStatus );
aStatus.Clear();
aStatusHdlLink.Call( aTmpStatus );
- aStatusTimer.Stop(); // If called by hand ...
+ aStatusTimer.Stop(); // If called by hand...
}
}
@@ -4518,7 +4518,7 @@ bool ImpEditEngine::ImplCalcAsianCompression(ContentNode* pNode,
// Special handling for rightpunctuation: For the 'compression' we must
- // start the output before the normal char position....
+ // start the output before the normal char position...
if ( bManipulateDXArray && ( pTextPortion->GetLen() > 1 ) )
{
if ( !pTextPortion->GetExtraInfos()->pOrgDXArray )
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 812ceb71cd9e..cac60d34d8e6 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -75,14 +75,14 @@ namespace rtl
stores also the length of the string, so that many operations are
faster as the C-str-functions.
- This class provide only readonly string handling. So you could create
+ This class provides only readonly string handling. So you could create
a string and you could only query the content from this string.
- It provide also functionality to change the string, but this results
+ It provides also functionality to change the string, but this results
in every case in a new string instance (in the most cases with an
memory allocation). You don't have functionality to change the
- content of the string. If you want change the string content, than
- you should us the OStringBuffer class, which provide these
- functionality and avoid to much memory allocation.
+ content of the string. If you want to change the string content, then
+ you should use the OStringBuffer class, which provides these
+ functionalities and avoid too much memory allocation.
The design of this class is similar to the string classes in Java
and so more people should have fewer understanding problems when they
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 866e6e1a2292..ec81a7bcf049 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -321,7 +321,7 @@ namespace sfx2
lcl_ReadGlobalFilters( aFilterClassification, _rGlobalClasses, _rGlobalClassNames );
- // fo for the local classes
+ // go for the local classes
lcl_ReadLocalFilters( aFilterClassification, _rLocalClasses );
}
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 23be314b8276..3755b99ecdf8 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -730,7 +730,7 @@ sub generate_cygwin_paths
}
}
- # Checking existence fo cyg_sourcepath for every file
+ # Checking existence of cyg_sourcepath for every file
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
if (( ! exists(${$filesref}[$i]->{'cyg_sourcepath'}) ) || ( ${$filesref}[$i]->{'cyg_sourcepath'} eq "" ))
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 0ec1cd812418..ba72b005f12c 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1255,7 +1255,7 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern( sal_uInt16 nStartPatternAt )
xLocaleData.changeLocale( aSaveLocale);
// When concatenating don't care about duplicates, combining
// weeding those out reallocs yet another time and probably doesn't
- // take less time than looping over two additional patterns below..
+ // take less time than looping over two additional patterns below...
switch (eEDF)
{
case NF_EVALDATEFORMAT_FORMAT:
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 586e85bacf9e..ac997716d098 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -259,7 +259,7 @@ namespace svt
{
// use the base class operator with the local name of the content
OUString sURL = _rxContent->getURL();
- // #116281# Keep office installtion relocatable. Never store
+ // #116281# Keep office installation relocatable. Never store
// any direct references to office installation directory.
sURL = m_xOfficeInstDirs->makeRelocatableURL( sURL );
m_rStorage.WriteUniOrByteString( sURL, m_rStorage.GetStreamCharSet() );
@@ -660,7 +660,7 @@ namespace svt
while ( nRootDirectories-- )
{
OUString sURL = m_pCacheStream->ReadUniOrByteString(m_pCacheStream->GetStreamCharSet());
- // #116281# Keep office installtion relocatable. Never store
+ // #116281# Keep office installation relocatable. Never store
// any direct references to office installation directory.
sURL = getOfficeInstDirs()->makeAbsoluteURL( sURL );
m_aPreviousState.push_back(
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index b4fe6dc14805..14f1ba9e3c60 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1546,7 +1546,7 @@ void FmXFormShell::ExecuteSearch_Lock()
if (xCurrentCol.is())
strActiveField = ::comphelper::getString(xCurrentCol->getPropertyValue(FM_PROP_LABEL));
- // the text fo the current column
+ // the text of the current column
Reference< XIndexAccess> xColControls(xGridPeer, UNO_QUERY);
Reference< XInterface> xCurControl;
xColControls->getByIndex(nViewCol) >>= xCurControl;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 84e6ab9f62b4..7c59d0d70751 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2678,7 +2678,7 @@ void SwCursorShell::ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing )
const SwPosition *pTmpStt = pTmp->Start(),
*pTmpEnd = pTmp->GetPoint() == pTmpStt ?
pTmp->GetMark() : pTmp->GetPoint();
- // If a SPoint or GetMark are in a cursor area than cancel the old area.
+ // If a SPoint or GetMark are in a cursor area then cancel the old area.
// During comparison keep in mind that End() is outside the area.
if( *pStt <= *pTmpStt )
{
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index bced4f3fa38c..95ad7f2a6397 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2451,7 +2451,7 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext)
{
// The old content was not empty or he has been merged with the new content
bDeleteCompleteParagraph = !pEntry->bJoin; // bJoin is set when merged
- // Set aTmpIdx to the beginning fo the old content
+ // Set aTmpIdx to the beginning of the old content
SwNodeIndex aTmpIdx( *pEndNode,
pUndoRedlineDelete->NodeDiff()-1 );
SwTextNode *pText = aTmpIdx.GetNode().GetTextNode();
diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx
index e5a94ad1de6d..59e115d21ec1 100644
--- a/sw/source/uibase/inc/swruler.hxx
+++ b/sw/source/uibase/inc/swruler.hxx
@@ -18,7 +18,7 @@ namespace vcl { class Window; }
class SwEditWin;
/**
- * An horizontal ruler with a control for comment panel visibility fo Writer.
+ * An horizontal ruler with a control for comment panel visibility for Writer.
*
* The comment control only appears when the document has comments already.
*/
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index dfaa89fda9e5..79de52c07ff9 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -42,7 +42,7 @@
#define SV_HELPTEXT_FADEOUT NC_("SV_HELPTEXT_FADEOUT", "Hide")
#define SV_HELPTEXT_CLOSEDOCUMENT NC_("SV_HELPTEXT_CLOSEDOCUMENT", "Close Document")
-// To translators: This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string
+// To translators: This is used on buttons for platforms other than Windows, there should be a ~ mnemonic in this string
#define SV_BUTTONTEXT_OK NC_("SV_BUTTONTEXT_OK", "~OK")
// To translators: This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string
#define SV_BUTTONTEXT_CANCEL NC_("SV_BUTTONTEXT_CANCEL", "~Cancel")
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 068e1a3a19d7..9a81a865189b 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -4355,7 +4355,7 @@ static int ImplGetSelectedIndex( HMENU hMenu )
for(int i=0; i<n; i++ )
{
if( !GetMenuItemInfoW( hMenu, i, TRUE, &mi) )
- SAL_WARN( "vcl", "GetMenuItemInfoW faled: " << WindowsErrorString( GetLastError() ) );
+ SAL_WARN( "vcl", "GetMenuItemInfoW failed: " << WindowsErrorString( GetLastError() ) );
else
{
if( mi.fState & MFS_HILITE )
More information about the Libreoffice-commits
mailing list