summaryrefslogtreecommitdiff
path: root/sc/source/ui/drawfunc/drtxtob1.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-09-27 14:09:02 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-09-27 21:27:41 +0200
commit3f7b48c4a726f51bdc5c78886957c08506e4d336 (patch)
tree85ae79279dc7f8510bfaee33ad1f9c591f500d85 /sc/source/ui/drawfunc/drtxtob1.cxx
parent754887aa9f1c57f8f56b9099b3dcc876e5b6f89f (diff)
never null ScViewData*
Change-Id: If5ad4c637a8c4db67ca4bfe99612e90ae6237ff6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103513 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/drawfunc/drtxtob1.cxx')
-rw-r--r--sc/source/ui/drawfunc/drtxtob1.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 76964b6ebdeb..2e3a76d9f425 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -42,8 +42,8 @@ bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg(
- pViewData->GetDialogParent(), &rArgs,
- pViewData->GetSfxDocShell(), true));
+ mrViewData.GetDialogParent(), &rArgs,
+ mrViewData.GetSfxDocShell(), true));
if (nSlot == SID_CHAR_DLG_EFFECT)
{
pDlg->SetCurPageId("fonteffects");
@@ -84,7 +84,7 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateScParagraphDlg(
- pViewData->GetDialogParent(), &aNewAttr));
+ mrViewData.GetDialogParent(), &aNewAttr));
bool bRet = ( pDlg->Execute() == RET_OK );
if ( bRet )
@@ -99,16 +99,16 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest & /* rReq */ )
{
- SdrView* pView = pViewData->GetScDrawView();
+ SdrView* pView = mrViewData.GetScDrawView();
OutlinerView* pOutView = pView->GetTextEditOutlinerView();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- ScopedVclPtr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog(pViewData->GetDialogParent()));
+ ScopedVclPtr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog(mrViewData.GetDialogParent()));
pDlg->Insert( SotClipboardFormatId::STRING, EMPTY_OUSTRING );
pDlg->Insert( SotClipboardFormatId::RTF, EMPTY_OUSTRING );
pDlg->Insert( SotClipboardFormatId::RICHTEXT, EMPTY_OUSTRING );
- TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
+ TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mrViewData.GetActiveWin() ) );
SotClipboardFormatId nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() );