Kaydet (Commit) 5e135c65 authored tarafından Andrea Gelmini's avatar Andrea Gelmini Kaydeden (comit) Samuel Mehrbrodt

Fix typos

Change-Id: Ib725427225fe95fb39a72f96bbd60d5464c9351a
Reviewed-on: https://gerrit.libreoffice.org/34782Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 2fdd5760
......@@ -44,7 +44,7 @@ class SW_DLLPUBLIC SwFormatURL: public SfxPoolItem
public:
SwFormatURL();
/// @@@ copy construction allowed, but assigment is not? @@@
/// @@@ copy construction allowed, but assignment is not? @@@
SwFormatURL( const SwFormatURL& );
virtual ~SwFormatURL() override;
......
......@@ -658,7 +658,7 @@ sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole()
OUString SAL_CALL SwAccessibleContext::getAccessibleDescription()
{
OSL_ENSURE(false, "description needs to be overriden");
OSL_ENSURE(false, "description needs to be overridden");
THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overridden)" );
}
......
......@@ -1266,7 +1266,7 @@ bool SwDoc::NoNum( const SwPaM& rPam )
// Do we actually use Numbering at all?
if( bRet )
{
// Set NoNum and Upate
// Set NoNum and Update
const SwNodeIndex& rIdx = rPam.GetPoint()->nNode;
SwTextNode* pNd = rIdx.GetNode().GetTextNode();
const SwNumRule* pRule = pNd->GetNumRule();
......
......@@ -422,7 +422,7 @@ namespace
}
void SwContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint)
{
// this does not call SwClient::SwClientNotify and thus doesnt handle RES_OBJECTDYING as usual. Is this intentional?
// this does not call SwClient::SwClientNotify and thus doesn't handle RES_OBJECTDYING as usual. Is this intentional?
if (auto pFindSdrObjectHint = dynamic_cast<const sw::FindSdrObjectHint*>(&rHint))
{
if(!pFindSdrObjectHint->m_rpObject)
......@@ -1355,7 +1355,7 @@ namespace
void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint)
{
SwClient::SwClientNotify(rMod, rHint); // needed as SwContact::SwClientNotify doesnt explicitly call SwClient::SwClientNotify
SwClient::SwClientNotify(rMod, rHint); // needed as SwContact::SwClientNotify doesn't explicitly call SwClient::SwClientNotify
SwContact::SwClientNotify(rMod, rHint);
if (auto pLegacyHint = dynamic_cast<const sw::LegacyModifyHint*>(&rHint))
{
......@@ -1522,7 +1522,7 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint)
{
if(*pCreatePortionHint->m_ppContact)
return;
*pCreatePortionHint->m_ppContact = this; // This is kind of ridiculous: the FrameFormat doesnt even hold a pointer to the contact itself, but here we are leaking it out randomly
*pCreatePortionHint->m_ppContact = this; // This is kind of ridiculous: the FrameFormat doesn't even hold a pointer to the contact itself, but here we are leaking it out randomly
if(!GetAnchorFrame())
{
// No direct positioning needed any more
......
......@@ -876,7 +876,7 @@ uno::Reference< XSpellAlternatives >
// Note: That could of course be done by clipping the
// resulting sequence but the current third party
// implementations result differs greatly if the number of
// suggestions to be retuned gets changed. Statistically
// suggestions to be returned gets changed. Statistically
// it gets much better if told to return e.g. only 7 strings
// than returning e.g. 16 suggestions and using only the
// first 7. Thus we hand down the value to use to that
......
......@@ -63,7 +63,7 @@ protected:
SwDoc* pDoc; // Document to be switched
sal_uInt16 nCur; // Current Index
bool bReadOnly : 1;
bool bInPutMuchBlocks : 1; // Put serveral block entries
bool bInPutMuchBlocks : 1; // Put several block entries
bool bInfoChanged : 1; // Whether any info of TextBlock changed
explicit SwImpBlocks( const OUString& );
......
......@@ -1975,7 +1975,7 @@ void SwRootFrame::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* p
long nWidthRemain = nVisWidth;
// after one row has been processed, these variables contain
// the width of the row and the maxium of the page heights
// the width of the row and the maximum of the page heights
long nCurrentRowHeight = 0;
long nCurrentRowWidth = 0;
......
......@@ -838,7 +838,7 @@ bool SwTabFrame::RemoveFollowFlowLine()
pLastLine, "There should be a flowline in the follow" );
// We have to reset the flag here, because lcl_MoveRowContent
// calls a GrowFrame(), which has a different bahavior if
// calls a GrowFrame(), which has a different behavior if
// this flag is set.
SetFollowFlowLine( false );
......
......@@ -1438,7 +1438,7 @@ void SwQuoVadisPortion::HandlePortion( SwPortionHandler& rPH ) const
void SwQuoVadisPortion::Paint( const SwTextPaintInfo &rInf ) const
{
// We _always_ want to ouput per DrawStretchText, because nErgo
// We _always_ want to output per DrawStretchText, because nErgo
// can quickly switch
if( PrtWidth() )
{
......
......@@ -389,7 +389,7 @@ bool WidowsAndOrphans::FindWidows( SwTextFrame *pFrame, SwTextMargin &rLine )
const SwTwips nChg = aRectFnSet.YDiff( nTmpY, nDocPrtTop + nOldHeight );
// below the Widows-treshold...
// below the Widows-threshold...
if( rLine.GetLineNr() >= nWidLines )
{
// Follow to Master I
......
......@@ -1947,7 +1947,7 @@ void SwTextNode::ReplaceTextOnly( sal_Int32 nPos, sal_Int32 nLen,
sal_Int32 nTLen = rText.getLength();
const sal_Int32* pOffsets = rOffsets.getConstArray();
// now look for no 1-1 mapping -> move the indizies!
// now look for no 1-1 mapping -> move the indices!
sal_Int32 nMyOff = nPos;
for( sal_Int32 nI = 0; nI < nTLen; ++nI )
{
......
......@@ -262,7 +262,7 @@ void SwFltControlStack::NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr
SwFltStackEntry *pExtendCandidate = SetAttr(rPos, nWhich);
if (couldExtendEntry(pExtendCandidate, rAttr))
{
//Here we optimize by seeing if there is an attribute uncommited
//Here we optimize by seeing if there is an attribute uncommitted
//to the document which
//a) has the same value as this attribute
......
......@@ -1915,7 +1915,7 @@ void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
if( pContext )
{
HTMLOutFuncs::FlushToAscii( rHWrt.Strm(), *pContext );
pContext = nullptr; // one time ony
pContext = nullptr; // one time only
}
Out( aHTMLAttrFnTab, *pPos->GetItem(), rHWrt );
rHWrt.m_nCSS1Script = nCSS1Script;
......
......@@ -37,8 +37,8 @@ enum SvxCSS1Position
{
SVX_CSS1_POS_NONE, // nichts angegeben
SVX_CSS1_POS_STATIC, // normal
SVX_CSS1_POS_ABSOLUTE, // absolut
SVX_CSS1_POS_RELATIVE, // relativ
SVX_CSS1_POS_ABSOLUTE, // absolute
SVX_CSS1_POS_RELATIVE, // relative
};
enum SvxCSS1LengthType
......
......@@ -135,7 +135,7 @@ OOo KO)
--------------
The followings are now supported:
The following are now supported:
* blinking (MSO OK, OOo KO)
* expanded spacing (MSO OK, OOo OK)
......
......@@ -472,7 +472,7 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
{
if (m_bStartedCharSdt)
{
// Run-level SDT still open? Close it befor AlternateContent.
// Run-level SDT still open? Close it before AlternateContent.
EndSdtBlock();
m_bStartedCharSdt = false;
}
......@@ -3386,7 +3386,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
SAL_WARN("sw.ww8", "DocxAttributeOutput::TableDefinition: unhandled property: " << aGrabBagElement->first);
}
// Output the table alignement
// Output the table alignment
const char* pJcVal;
sal_Int32 nIndent = 0;
switch ( pTableFormat->GetHoriOrient( ).GetHoriOrient( ) )
......
......@@ -1278,7 +1278,7 @@ void DocxExport::WriteEmbeddings()
embeddingsList[j].Value >>= embeddingsStream;
OUString contentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
// FIXME: this .xlsm hack is silly - if anything the mime-type for an existing embedded object shoud be read from [Content_Types].xml
// FIXME: this .xlsm hack is silly - if anything the mime-type for an existing embedded object should be read from [Content_Types].xml
if (embeddingPath.endsWith(".xlsm"))
contentType = "application/vnd.ms-excel.sheet.macroEnabled.12";
else if (embeddingPath.endsWith(".bin"))
......
......@@ -447,7 +447,7 @@ void WW8Export::DoComboBox(const OUString &rName,
{
OutputField(nullptr, ww::eFORMDROPDOWN, FieldString(ww::eFORMDROPDOWN),
FieldFlags::Start | FieldFlags::CmdStart);
// write the refence to the "picture" structure
// write the reference to the "picture" structure
sal_uLong nDataStt = pDataStrm->Tell();
m_pChpPlc->AppendFkpEntry( Strm().Tell() );
......@@ -494,7 +494,7 @@ void WW8Export::DoCheckBox(uno::Reference<beans::XPropertySet> const & xPropSet)
OutputField(nullptr, ww::eFORMCHECKBOX, FieldString(ww::eFORMCHECKBOX),
FieldFlags::Start | FieldFlags::CmdStart);
// write the refence to the "picture" structure
// write the reference to the "picture" structure
sal_uLong nDataStt = pDataStrm->Tell();
m_pChpPlc->AppendFkpEntry( Strm().Tell() );
......@@ -554,7 +554,7 @@ void WW8Export::DoFormText(const SwInputField * pField)
{
OutputField(nullptr, ww::eFORMTEXT, FieldString(ww::eFORMTEXT),
FieldFlags::Start | FieldFlags::CmdStart);
// write the refence to the "picture" structure
// write the reference to the "picture" structure
sal_uLong nDataStt = pDataStrm->Tell();
m_pChpPlc->AppendFkpEntry( Strm().Tell() );
......
......@@ -1042,7 +1042,7 @@ bool WW8_WrPlcSepx::HeaderFooterWritten()
sal_uInt16 MSWordSections::CurrentNumberOfColumns( const SwDoc &rDoc ) const
{
OSL_ENSURE( !aSects.empty(), "no segement inserted yet" );
OSL_ENSURE( !aSects.empty(), "no segment inserted yet" );
if ( aSects.empty() )
return 1;
......
......@@ -334,7 +334,7 @@ void WW8Export::OutputLinkedOLE( const OUString& rOleId )
{
xOleDst->Commit();
// Ouput the cPicLocation attribute
// Output the cPicLocation attribute
std::unique_ptr<ww::bytes> pBuf( new ww::bytes );
SwWW8Writer::InsUInt16( *pBuf, NS_sprm::sprmCPicLocation );
SwWW8Writer::InsUInt32( *pBuf, rOleId.copy( 1 ).toInt32() );
......
......@@ -5625,7 +5625,7 @@ namespace
//stream thing
static bool lclReadCryptoAPIHeader(msfilter::RC4EncryptionInfo &info, SvStream &rStream)
{
//Its possible there are other variants in existance but these
//It is possible there are other variants in existence but these
//are the defaults I get with Word 2013
rStream.ReadUInt32(info.header.flags);
......
......@@ -1327,7 +1327,7 @@ short WW8_BRCVer9::DetermineBorderProperties(short *pSpace) const
case 20:
/*
wave, the dimensions appear to be created by the drawing of
the wave, so we have only two possibilites in the menus, 3/4
the wave, so we have only two possibilities in the menus, 3/4
point is equal to solid 3 point. This calculation seems to
match well to results.
*/
......@@ -1336,7 +1336,7 @@ short WW8_BRCVer9::DetermineBorderProperties(short *pSpace) const
case 21:
/*
double wave, the dimensions appear to be created by the
drawing of the wave, so we have only one possibilites in the
drawing of the wave, so we have only one possibilities in the
menus, that of 3/4 point is equal to solid 3 point. This
calculation seems to match well to results.
*/
......@@ -5486,7 +5486,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
nFibMax = 0x00c1; // to 193 WinWord 97 (?)
break;
default:
nFibMin = 0; // programm error!
nFibMin = 0; // program error!
nFibMax = 0;
m_nFib = 1;
OSL_ENSURE( false, "nVersion not implemented!" );
......
......@@ -493,7 +493,7 @@ bool SwDocShell::Load( SfxMedium& rMedium )
bool bRet = false;
// If this is an ODF file being loaded, then by default, use legacy processing
// for tdf#99729 (if required, it will be overriden in *::ReadUserDataSequence())
// for tdf#99729 (if required, it will be overridden in *::ReadUserDataSequence())
if (IsOwnStorageFormat(rMedium))
{
if (m_pDoc && m_pDoc->getIDocumentDrawModelAccess().GetDrawModel())
......
......@@ -10,11 +10,11 @@ There is one property, which changes the overall behaviour of these modes:
*bCreateSingleFile*. This is the primary controller of the mail merge source
code workflow, as it affects all modes!
This also has timing contraints: for individual files the result can be
This also has timing constraints: for individual files the result can be
defined in advance, while further processing of the single result can just
be done after the merging. It mainly affects printing and the generation
of huge (1000+ datasets) combined non-PRINT merge results. A valid
combined document has to follow contraints, which are already met by
combined document has to follow constraints, which are already met by
individual documents, as these are just modified copies.
LO currently has six working combinations of mode and *bCreateSingleFile*
......@@ -28,7 +28,7 @@ implemented. But the list contains implementation proposals for both.
with a new / reset page style. Depending on the page style this inserts
hidden blank pages
* Mode: PRINTER
** false: Generates indivividual print jobs, which may be grouped on some
** false: Generates individual print jobs, which may be grouped on some
platforms for easier abortion (needs verification!). All print options
affect only the individual document! Printing starts after the first
document is generated.
......
......@@ -1310,7 +1310,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
sal_Int32 nRecordCount = 1;
lcl_getCountFromResultSet( nRecordCount, pImpl->pMergeData );
// syncronized docs don't auto-advance the record set, but there is a
// Synchronized docs don't auto-advance the record set, but there is a
// "security" check, which will always advance the record set, if there
// is no "next record" field in a synchronized doc => nRecordPerDoc > 0
sal_Int32 nRecordPerDoc = pSourceShell->GetDoc()
......
......@@ -33,7 +33,7 @@ namespace /* private */
{
/* Generic event notifier for started,
stopped, and idle events which are
very similary */
very similarly */
class GenericEventNotifier
{
public:
......
......@@ -28,7 +28,7 @@ class SwWrtShell;
class SwForm;
// manager for directory functionality
//one single method will be sufficient to insert AND upate indexes
//one single method will be sufficient to insert AND update indexes
class SW_DLLPUBLIC SwTOXDescription
{
TOXTypes m_eTOXType;
......
......@@ -95,7 +95,7 @@ SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, boo
//inserts a string sorted into a ListBox,
SW_DLLPUBLIC sal_Int32 InsertStringSorted(const OUString& rEntry, ListBox& rToFill, sal_Int32 nOffset);
// Get table width and alignement
// Get table width and alignment
SwTwips GetTableWidth( SwFrameFormat* pFormat, SwTabCols& rCols, sal_uInt16 *pPercent,
SwWrtShell* pSh );
......
......@@ -342,7 +342,7 @@ static bool DeleteTmpFile_Impl(
// somebody vetoed the closing, and took the ownership of the document
// -> ensure that the temporary file is deleted later on
Reference< XEventListener > xEnsureDelete( new DelayedFileDeletion( rxModel, rTmpFileURL ) );
// note: as soon as #106931# is fixed, the whole DelayedFileDeletion is to be superseeded by
// note: as soon as #106931# is fixed, the whole DelayedFileDeletion is to be superseded by
// a better solution
bDelete = false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment