diff options
-rw-r--r-- | offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl | 2 | ||||
-rw-r--r-- | sw/source/core/draw/dcontact.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/draw/dview.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/text/atrstck.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/frmform.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/inftxt.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/itradj.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/itratr.cxx | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl b/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl index 93996a84b596..93eaa5ee3050 100644 --- a/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl +++ b/offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl @@ -51,7 +51,7 @@ interface XHierarchicalStorageAccess2 : XHierarchicalStorageAccess can be a combination of ElementModes values @param aEncryptionData - this parameter allowes to specify an encryption data for the + this parameter allows to specify an encryption data for the stream, the data must be correct, otherwise an exception will be thrown diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 9efa66eef1bc..6acc1c342a20 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -581,7 +581,7 @@ void SwFlyDrawContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj ) SwFlyFrame* pFlyFrame = static_cast<SwVirtFlyDrawObj*>(_pDrawObj)->GetFlyFrame(); // #i44464# - consider, that Writer fly frame content - // already exists - (e.g. WW8 document is inserted into a existing document). + // already exists - (e.g. WW8 document is inserted into an existing document). if ( !pFlyFrame->Lower() ) { pFlyFrame->InsertColumns(); @@ -2021,7 +2021,7 @@ namespace sdr class VCOfDrawVirtObj : public ViewContactOfVirtObj { protected: - /** Create a Object-Specific ViewObjectContact, set ViewContact and ObjectContact. + /** Create an Object-Specific ViewObjectContact, set ViewContact and ObjectContact. * * Always needs to return something. Default is to create a standard ViewObjectContact * containing the given ObjectContact and *this. diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 890ee455a28a..4b4d680001e3 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -650,7 +650,7 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz) const Point aNewPos( aOutRect.TopLeft() ); const SwRect aFlyRect( aOutRect ); - //If the Fly has a automatic align (right or top), + //If the Fly has an automatic align (right or top), //so preserve the automatic. SwFrameFormat *pFormat = GetFlyFrame()->GetFormat(); const sal_Int16 eHori = pFormat->GetHoriOrient().GetHoriOrient(); diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 590885d8b7f1..e617a6da8dec 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -545,7 +545,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, size_t nOldPos, while ( pTmpObj ) { // #i38563# - assure, that anchor frame exists. - // If object is anchored inside a invisible part of the document + // If object is anchored inside an invisible part of the document // (e.g. page header, whose page style isn't applied, or hidden // section), no anchor frame exists. const SwFrame* pTmpAnchorFrame = lcl_FindAnchor( pTmpObj, true ); @@ -598,7 +598,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, size_t nOldPos, break; // #i38563# - assure, that anchor frame exists. - // If object is anchored inside a invisible part of the document + // If object is anchored inside an invisible part of the document // (e.g. page header, whose page style isn't applied, or hidden // section), no anchor frame exists. const SwFrame* pTmpAnchorFrame = lcl_FindAnchor( pTmpObj, true ); @@ -769,9 +769,9 @@ void SwDrawView::MarkListHasChanged() void SwDrawView::ModelHasChanged() { // The ModelHasChanged() call in DrawingLayer also updates - // a eventually active text edit view (OutlinerView). This also leads + // an eventually active text edit view (OutlinerView). This also leads // to newly setting the background color for that edit view. Thus, - // this method rescues the current background color if a OutlinerView + // this method rescues the current background color if an OutlinerView // exists and re-establishes it then. To be more safe, the OutlinerView // will be fetched again (maybe textedit has ended). OutlinerView* pView = GetTextEditOutlinerView(); diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 39ea69a42b33..3447e0e2b889 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -129,7 +129,7 @@ const sal_uInt8 StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = namespace CharFormat { -/// Returns the item set associated with an character/inet/auto style +/// Returns the item set associated with a character/inet/auto style const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr ) { const SfxItemSet* pSet = nullptr; diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 492a738941c3..37543c700b76 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -1019,7 +1019,7 @@ void SwTextFrame::FormatAdjust( SwTextFormatter &rLine, : rFrameBreak.IsBreakNow( rLine ) ) ) ) ? 1 : 0; // i#84870 - // no split of text frame, which only contains a as-character anchored object + // no split of text frame, which only contains an as-character anchored object bool bOnlyContainsAsCharAnchoredObj = !IsFollow() && nStrLen == TextFrameIndex(1) && GetDrawObjs() && GetDrawObjs()->size() == 1 && @@ -1145,7 +1145,7 @@ void SwTextFrame::FormatAdjust( SwTextFormatter &rLine, } // Vertical Formatting: - // The (rotated) repaint rectangle's x coordinate referes to the frame. + // The (rotated) repaint rectangle's x coordinate refers to the frame. // If the frame grows (or shirks) the repaint rectangle cannot simply // be rotated back after formatting, because we use the upper left point // of the frame for rotation. This point changes when growing/shrinking. diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 0b87191beaff..c9178e61ede2 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -296,7 +296,7 @@ public: // If Kana Compression is enabled, a minimum and maximum portion width // is calculated. We format lines with minimal size and share remaining // space among compressed kanas. - // During formatting, the maximum values of compressable portions are + // During formatting, the maximum values of compressible portions are // stored in m_aMaxWidth and discarded after a line has been formatted. void SetMaxWidthDiff( const SwLinePortion *nKey, sal_uInt16 nVal ) { diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index 0065e7e5c5e8..27659330e387 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -428,7 +428,7 @@ SwTwips SwTextAdjuster::CalcKanaAdj( SwLineLayout* pCurrent ) // calculate difference between portion width and max. width nKanaDiffSum += nMaxWidthDiff; - // we store the beginning of the first compressable portion + // we store the beginning of the first compressible portion // for repaint if ( nMaxWidthDiff && !nRepaintOfst ) nRepaintOfst = nX + GetLeftMargin(); diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 77ded3fe3edf..c3e82b4c2f5b 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -304,7 +304,7 @@ void SwAttrIter::SeekFwd(const sal_Int32 nOldPos, const sal_Int32 nNewPos) bool SwAttrIter::Seek(TextFrameIndex const nNewPos) { - // note: nNewPos isn't necessarily a index returned from GetNextAttr + // note: nNewPos isn't necessarily an index returned from GetNextAttr std::pair<SwTextNode const*, sal_Int32> const newPos( m_pMergedPara ? sw::MapViewToModel(*m_pMergedPara, nNewPos) : std::make_pair(m_pTextNode, sal_Int32(nNewPos))); |