diff options
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/app/docshini.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/dbui/README | 6 | ||||
-rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/dbui/maildispatcher.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/toxmgr.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/uitool.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uno/unomailmerge.cxx | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 1df546cb7350..5f3913e52488 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -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()) diff --git a/sw/source/uibase/dbui/README b/sw/source/uibase/dbui/README index be262b8dc160..f04d5389b60d 100644 --- a/sw/source/uibase/dbui/README +++ b/sw/source/uibase/dbui/README @@ -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. diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index de9a51471a60..39add21348c0 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -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() diff --git a/sw/source/uibase/dbui/maildispatcher.cxx b/sw/source/uibase/dbui/maildispatcher.cxx index 5d4fda3d2a31..8bc4dabdf5a9 100644 --- a/sw/source/uibase/dbui/maildispatcher.cxx +++ b/sw/source/uibase/dbui/maildispatcher.cxx @@ -33,7 +33,7 @@ namespace /* private */ { /* Generic event notifier for started, stopped, and idle events which are - very similary */ + very similarly */ class GenericEventNotifier { public: diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx index 2a42cd88031e..dc173313a62c 100644 --- a/sw/source/uibase/inc/toxmgr.hxx +++ b/sw/source/uibase/inc/toxmgr.hxx @@ -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; diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx index fc4620d377e4..0ad7d742b4f6 100644 --- a/sw/source/uibase/inc/uitool.hxx +++ b/sw/source/uibase/inc/uitool.hxx @@ -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 ); diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 93499c7267f1..6b9ae135da79 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -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; } |