diff options
| -rw-r--r-- | editeng/source/editeng/impedit2.cxx | 6 | ||||
| -rw-r--r-- | offapi/com/sun/star/frame/status/ItemState.idl | 2 | ||||
| -rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index ec3ef06aa4bc..05ae8ee6a464 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -3444,7 +3444,7 @@ tools::Long ImpEditEngine::CalcTextHeight(tools::Long* pHeightNTP) // This does the necessary column balancing for the case when the text does not fit min height. // When the height of column (taken from nCurTextHeight) is too small, the last column will // overflow, so the resulting height of the text will exceed the set column height. Increasing - // the column height step by step by the minimal value that allows one of columns to accomodate + // the column height step by step by the minimal value that allows one of columns to accommodate // one line more, we finally get to the point where all the text fits. At each iteration, the // height is only increased, so it's impossible to have infinite layout loops. The found value // is the global minimum. @@ -3463,7 +3463,7 @@ tools::Long ImpEditEngine::CalcTextHeight(tools::Long* pHeightNTP) // * Line 4 goes to column 2 after Line 3. // * Final iteration columns are: {empty}, {Line 1}, {Line 2, Line 3, Line 4} // * Total text height is max({0, 10, 32}) == 32 > Tentative column height 5 => NEXT ITERATION - // * Minimal height increase that allows at least one column to accomodate one more line is + // * Minimal height increase that allows at least one column to accommodate one more line is // min({5, 17, 17}) = 5. // * Tentative column height is set to 5 + 5 = 10. // <ITERATION 2> @@ -3473,7 +3473,7 @@ tools::Long ImpEditEngine::CalcTextHeight(tools::Long* pHeightNTP) // * Line 4 is attempted to go to column 2 after Line 3; overflow is 10, stays in max column 2. // * Final iteration columns are: {Line 1}, {Line 2}, {Line 3, Line 4} // * Total text height is max({10, 12, 20}) == 20 > Tentative column height 10 => NEXT ITERATION - // * Minimal height increase that allows at least one column to accomodate one more line is + // * Minimal height increase that allows at least one column to accommodate one more line is // min({12, 12, 10}) = 10. // * Tentative column height is set to 10 + 10 == 20. // <ITERATION 3> diff --git a/offapi/com/sun/star/frame/status/ItemState.idl b/offapi/com/sun/star/frame/status/ItemState.idl index e2de7538775a..011f5ba2b6fd 100644 --- a/offapi/com/sun/star/frame/status/ItemState.idl +++ b/offapi/com/sun/star/frame/status/ItemState.idl @@ -48,7 +48,7 @@ constants ItemState * * There are only three usages of ::ItemState in the code which * all set the internal SfxItem to SfxVoidItem when triggered, - * which is equlivalent to state SfxItemState::DISABLED (see + * which is equivalent to state SfxItemState::DISABLED (see * e.g. SfxItemSet::GetItemState), so READ_ONLY gets not used * in internal handling, even when eventually existing UNO API * usages hand it over the office. diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index f665fbdc29a6..f1a57253b125 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -319,7 +319,7 @@ void WriterFilter::setTargetDocument(const uno::Reference<lang::XComponent>& xDo xSettings->setPropertyValue("InvertBorderSpacing", uno::makeAny(true)); xSettings->setPropertyValue("CollapseEmptyCellPara", uno::makeAny(true)); xSettings->setPropertyValue("TabOverflow", uno::makeAny(true)); - // tdf#142404 TabOverSpacing (new for compatiblityMode15/Word2013+) is a subset of TabOverMargin + // tdf#142404 TabOverSpacing (new for compatibilityMode15/Word2013+) is a subset of TabOverMargin // (which applied to DOCX <= compatibilityMode14). // TabOverMargin looks at tabs beyond the normal text area, // while TabOverSpacing only refers to a tab beyond the paragraph margin. |