summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/crsr/bookmrk.cxx4
-rw-r--r--sw/source/core/crsr/pam.cxx2
-rw-r--r--sw/source/core/doc/docnew.cxx12
-rw-r--r--sw/source/core/frmedt/fefly1.cxx2
-rw-r--r--sw/source/core/inc/frame.hxx2
-rw-r--r--sw/source/core/layout/calcmove.cxx4
-rw-r--r--sw/source/core/layout/findfrm.cxx2
-rw-r--r--sw/source/core/layout/newfrm.cxx10
-rw-r--r--sw/source/core/layout/tabfrm.cxx4
-rw-r--r--sw/source/core/layout/trvlfrm.cxx2
-rw-r--r--sw/source/core/text/porfld.cxx2
-rw-r--r--sw/source/core/text/porrst.cxx2
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx2
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx8
-rw-r--r--sw/source/core/unocore/unoport.cxx4
-rw-r--r--sw/source/core/unocore/unorefmk.cxx2
-rw-r--r--sw/source/filter/html/css1atr.cxx2
-rw-r--r--sw/source/ui/misc/glosbib.cxx2
-rw-r--r--sw/source/ui/misc/srtdlg.cxx2
-rw-r--r--sw/source/uibase/uiview/formatclipboard.cxx8
20 files changed, 39 insertions, 39 deletions
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index e0f1d8e12ed0..057ba46d3827 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -371,7 +371,7 @@ namespace sw { namespace mark
{
// TODO: Does exist a better solution to trigger a format of the
// fieldmark portion? If yes, please use it.
- SwPaM aPaM( this->GetMarkPos(), this->GetOtherMarkPos() );
+ SwPaM aPaM( GetMarkPos(), GetOtherMarkPos() );
aPaM.InvalidatePaM();
}
@@ -417,7 +417,7 @@ namespace sw { namespace mark
// For some reason the end mark is moved from 1 by the Insert: we don't
// want this for checkboxes
- SwPosition aNewEndPos = this->GetMarkEnd();
+ SwPosition aNewEndPos = GetMarkEnd();
aNewEndPos.nContent--;
SetMarkEndPos( aNewEndPos );
}
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 18fc17769dfc..d910d7e2050e 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1013,7 +1013,7 @@ OUString SwPaM::GetText() const
void SwPaM::InvalidatePaM()
{
- const SwNode &_pNd = this->GetNode();
+ const SwNode &_pNd = GetNode();
const SwTextNode *_pTextNd = _pNd.GetTextNode();
if (_pTextNd != nullptr)
{
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 8c7be64c3763..f505955e1a68 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -989,10 +989,10 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
// copy the pagedesc from the current document to the new
// document and change the name of the to-be-applied style
OUString sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
- pTargetPageDesc = this->MakePageDesc( sNewPageDescName );
+ pTargetPageDesc = MakePageDesc( sNewPageDescName );
if( pTargetPageDesc )
{
- this->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, false );
+ CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, false );
lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
}
}
@@ -1074,8 +1074,8 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
<< " " << aCpyPam.GetNode().GetIndex() << ")" );
#endif
- this->GetIDocumentUndoRedo().StartUndo( SwUndoId::INSGLOSSARY, nullptr );
- this->getIDocumentFieldsAccess().LockExpFields();
+ GetIDocumentUndoRedo().StartUndo( SwUndoId::INSGLOSSARY, nullptr );
+ getIDocumentFieldsAccess().LockExpFields();
// Position where the appended doc starts. Will be filled in later.
// Initially uses GetEndOfContent() because SwNodeIndex has no default ctor.
@@ -1213,11 +1213,11 @@ else
<< " => " << aAnchor.GetPageNum() + pageOffset );
if ( pageOffset != 0 )
aAnchor.SetPageNum( aAnchor.GetPageNum() + pageOffset );
- this->getIDocumentLayoutAccess().CopyLayoutFormat( rCpyFormat, aAnchor, true, true );
+ getIDocumentLayoutAccess().CopyLayoutFormat( rCpyFormat, aAnchor, true, true );
}
}
- this->GetIDocumentUndoRedo().EndUndo( SwUndoId::INSGLOSSARY, nullptr );
+ GetIDocumentUndoRedo().EndUndo( SwUndoId::INSGLOSSARY, nullptr );
getIDocumentFieldsAccess().UnlockExpFields();
getIDocumentFieldsAccess().UpdateFields(false);
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 575a16bbf96c..dd34c7002f26 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -772,7 +772,7 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName,
SwFlyFrameFormat* pFormat = nullptr;
SET_CURR_SHELL( this );
StartAllAction();
- SwShellCursor *pStartCursor = dynamic_cast<SwShellCursor*>(this->GetSwCursor());
+ SwShellCursor *pStartCursor = dynamic_cast<SwShellCursor*>(GetSwCursor());
SwShellCursor *pCursor = pStartCursor;
do
{
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 62ce2de3feae..e2a3e190c0f7 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -453,7 +453,7 @@ public:
method replaced 'old' method <bool IsMoveable() const>.
Determines, if frame is moveable in given environment. if no environment
is given (parameter _pLayoutFrame == 0L), the movability in the actual
- environment (<this->GetUpper()) is checked.
+ environment (<GetUpper()) is checked.
@param _pLayoutFrame
input parameter - given environment (layout frame), in which the movability
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index b51da88350cd..36a4e5e36eca 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -925,9 +925,9 @@ bool SwTextNode::IsCollapse() const
const SwEndNode *pNdAfter=GetNodes()[nIdx+1]->GetEndNode();
// The paragraph is collapsed only if the NdAfter is the end of a cell
- bool bInTable = this->FindTableNode( ) != nullptr;
+ bool bInTable = FindTableNode( ) != nullptr;
- SwSortedObjs* pObjs = this->getLayoutFrame( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() )->GetDrawObjs( );
+ SwSortedObjs* pObjs = getLayoutFrame( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() )->GetDrawObjs( );
const size_t nObjs = ( pObjs != nullptr ) ? pObjs->size( ) : 0;
return pNdBefore!=nullptr && pNdAfter!=nullptr && nObjs == 0 && bInTable;
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index b4e61b7a19f4..8aef88ce2d1c 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1282,7 +1282,7 @@ static bool lcl_IsInSectionDirectly( const SwFrame *pUp )
method replaced 'old' method <sal_Bool IsMoveable() const>.
Determines, if frame is moveable in given environment. if no environment
is given (parameter _pLayoutFrame == 0L), the movability in the actual
- environment (<this->GetUpper()) is checked.
+ environment (<GetUpper()) is checked.
*/
bool SwFrame::IsMoveable( const SwLayoutFrame* _pLayoutFrame ) const
{
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 4de02e342015..ddefc54aecdf 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -489,7 +489,7 @@ void SwRootFrame::Init( SwFrameFormat* pFormat )
const IDocumentSettingAccess& rSettingAccess = pFormat->getIDocumentSettingAccess();
rTimerAccess.StopIdling();
// For creating the Flys by MakeFrames()
- rLayoutAccess.SetCurrentViewShell( this->GetCurrShell() );
+ rLayoutAccess.SetCurrentViewShell( GetCurrShell() );
mbCallbackActionEnabled = false; // needs to be set to true before leaving!
SwDrawModel* pMd = pFormat->getIDocumentDrawModelAccess().GetDrawModel();
@@ -631,12 +631,12 @@ void SwRootFrame::RemoveMasterObjs( SdrPage *pPg )
void SwRootFrame::AllCheckPageDescs() const
{
if ( !IsLayoutFreezed() )
- CheckPageDescs( const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(this->Lower())) );
+ CheckPageDescs( const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(Lower())) );
}
void SwRootFrame::AllInvalidateAutoCompleteWords() const
{
- SwPageFrame *pPage = const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(this->Lower()));
+ SwPageFrame *pPage = const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(Lower()));
while ( pPage )
{
pPage->InvalidateAutoCompleteWords();
@@ -646,7 +646,7 @@ void SwRootFrame::AllInvalidateAutoCompleteWords() const
void SwRootFrame::AllAddPaintRect() const
{
- GetCurrShell()->AddPaintRect( this->Frame() );
+ GetCurrShell()->AddPaintRect( Frame() );
}
void SwRootFrame::AllRemoveFootnotes()
@@ -656,7 +656,7 @@ void SwRootFrame::AllRemoveFootnotes()
void SwRootFrame::AllInvalidateSmartTagsOrSpelling(bool bSmartTags) const
{
- SwPageFrame *pPage = const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(this->Lower()));
+ SwPageFrame *pPage = const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(Lower()));
while ( pPage )
{
if ( bSmartTags )
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index d7215c74fd96..fb31aae370ce 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -951,10 +951,10 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowK
// #i26745# - format row and cell frames of table
{
- this->Lower()->InvalidatePos_();
+ Lower()->InvalidatePos_();
// #i43913# - correction
// call method <lcl_InnerCalcLayout> with first lower.
- lcl_InnerCalcLayout( this->Lower(), LONG_MAX, true );
+ lcl_InnerCalcLayout( Lower(), LONG_MAX, true );
}
//In order to be able to compare the positions of the cells with CutPos,
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 999bc8897c1d..d2c7a62111e8 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1609,7 +1609,7 @@ bool SwRootFrame::IsDummyPage( sal_uInt16 nPageNum ) const
*/
bool SwFrame::IsProtected() const
{
- if (this->IsContentFrame() && static_cast<const SwContentFrame*>(this)->GetNode())
+ if (IsContentFrame() && static_cast<const SwContentFrame*>(this)->GetNode())
{
const SwDoc *pDoc=static_cast<const SwContentFrame*>(this)->GetNode()->GetDoc();
bool isFormProtected=pDoc->GetDocumentSettingManager().get(DocumentSettingId::PROTECT_FORM );
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 0e7b5e97c1eb..e6a8ab110248 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -59,7 +59,7 @@ SwFieldPortion *SwFieldPortion::Clone( const OUString &rExpand ) const
// pass placeholder property to created <SwFieldPortion> instance.
SwFieldPortion* pClone = new SwFieldPortion( rExpand, pNewFnt, bPlaceHolder );
pClone->SetNextOffset( nNextOffset );
- pClone->m_bNoLength = this->m_bNoLength;
+ pClone->m_bNoLength = m_bNoLength;
return pClone;
}
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 588bf06dd58c..c40d9cff79c5 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -280,7 +280,7 @@ bool SwTextFrame::FormatEmpty()
{
OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTextFrame::FormatEmpty with swapped frame" );
- bool bCollapse = EmptyHeight( ) == 1 && this->IsCollapse( );
+ bool bCollapse = EmptyHeight( ) == 1 && IsCollapse( );
if ( HasFollow() || GetTextNode()->GetpSwpHints() ||
nullptr != GetTextNode()->GetNumRule() ||
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index d2099dff14b2..b2721257dd6c 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -664,7 +664,7 @@ void Meta::NotifyChangeTextNode(SwTextNode *const pTextNode)
{
SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT,
&static_cast<SwModify&>(*this) ); // cast to base class!
- this->Modify(&aMsgHint, &aMsgHint);
+ Modify(&aMsgHint, &aMsgHint);
}
}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index ade444d30f54..83ebfe995a46 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -386,7 +386,7 @@ SwContentNode *SwTextNode::SplitContentNode( const SwPosition &rPos )
pNode->RegisterAsCopyOf(*this, true);
if (nSplitPos == nTextLen)
{
- this->RemoveMetadataReference();
+ RemoveMetadataReference();
// NB: SwUndoSplitNode will call pNode->JoinNext,
// which is sufficient even in this case!
}
@@ -642,7 +642,7 @@ SwContentNode *SwTextNode::JoinNext()
sal_Int32 nOldLen = m_Text.getLength();
// METADATA: merge
- this->JoinMetadatable(*pTextNode, !this->Len(), !pTextNode->Len());
+ JoinMetadatable(*pTextNode, !Len(), !pTextNode->Len());
SwWrongList *pList = GetWrong();
if( pList )
@@ -1682,12 +1682,12 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
sal_Int32 nTextStartIdx = rStart.GetIndex();
sal_Int32 nDestStart = rDestStart.GetIndex(); // remember old Pos
- if (pDest->GetDoc()->IsClipBoard() && this->GetNum())
+ if (pDest->GetDoc()->IsClipBoard() && GetNum())
{
// #i111677# cache expansion of source (for clipboard)
pDest->m_pNumStringCache.reset( (nTextStartIdx != 0)
? new OUString // fdo#49076: numbering only if copy from para start
- : new OUString(this->GetNumString()));
+ : new OUString(GetNumString()));
}
if( !nLen )
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index cff01e15c9a6..5aef3386aa1c 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -489,7 +489,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr
if (rPropertyNames.getLength() != rValues.getLength())
throw lang::IllegalArgumentException();
- SwUnoCursor& rUnoCursor = this->GetCursor();
+ SwUnoCursor& rUnoCursor = GetCursor();
sal_Int32 nProps = rPropertyNames.getLength();
const OUString *pProp = rPropertyNames.getConstArray();
@@ -580,7 +580,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
{
SolarMutexGuard aGuard;
- SwUnoCursor& rUnoCursor = this->GetCursor();
+ SwUnoCursor& rUnoCursor = GetCursor();
std::vector< beans::GetDirectPropertyTolerantResult > aResultVector;
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 675b98813150..a01ebcbd3179 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -1534,7 +1534,7 @@ SwXMetaField::getPresentation(sal_Bool bShowCommand)
else
{
// getString should check if this is invalid
- const OUString content( this->getString() );
+ const OUString content( getString() );
OUString prefix;
OUString suffix;
getPrefixAndSuffix(GetModel(), this, &prefix, &suffix);
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index fc83c2a1326a..78ed4b2b7850 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2093,7 +2093,7 @@ void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrameFormat const& rFrameFormat
OutCSS1_SvxBox(*this, rFrameFormat.GetBox());
if (!m_bFirstCSS1Property)
{
- this->Strm().WriteChar( cCSS1_style_opt_end );
+ Strm().WriteChar( cCSS1_style_opt_end );
}
}
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 2e23384246d2..358ec557446c 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -152,7 +152,7 @@ void SwGlossaryGroupDlg::Apply()
const OUString sMsg(SwResId(STR_QUERY_DELETE_GROUP1)
+ sTitle
+ SwResId(STR_QUERY_DELETE_GROUP2));
- ScopedVclPtrInstance< QueryBox > aQuery(this->GetParent(), WB_YES_NO|WB_DEF_NO, sMsg );
+ ScopedVclPtrInstance< QueryBox > aQuery(GetParent(), WB_YES_NO|WB_DEF_NO, sMsg );
if(RET_YES == aQuery->Execute())
pGlosHdl->DelGroup( sDelGroup );
}
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 7ee772395282..f2a98831641f 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -365,7 +365,7 @@ void SwSortDlg::Apply()
}
if( !bRet )
- ScopedVclPtrInstance<MessageDialog>(this->GetParent(), SwResId(STR_SRTERR), VclMessageType::Info)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(GetParent(), SwResId(STR_SRTERR), VclMessageType::Info)->Execute();
}
IMPL_LINK( SwSortDlg, DelimHdl, Button*, pButton, void )
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index 4ede6d755fe7..d4af4906b67a 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -277,7 +277,7 @@ bool SwFormatClipboard::CanCopyThisType( SelectionType nSelectionType )
void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bPersistentCopy )
{
// first clear the previously stored attributes
- this->Erase();
+ Erase();
m_bPersistentCopy = bPersistentCopy;
SelectionType nSelectionType = rWrtShell.GetSelectionType();
@@ -459,10 +459,10 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
, bool bNoCharacterFormats, bool bNoParagraphFormats )
{
SelectionType nSelectionType = rWrtShell.GetSelectionType();
- if( !this->HasContentForThisType(nSelectionType) )
+ if( !HasContentForThisType(nSelectionType) )
{
if(!m_bPersistentCopy)
- this->Erase();
+ Erase();
return;
}
@@ -576,7 +576,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
rWrtShell.EndAction();
if(!m_bPersistentCopy)
- this->Erase();
+ Erase();
}
void SwFormatClipboard::Erase()
generated by cgit (git 2.34.1) at 2024-07-24 10:36:19 +0000