diff options
Diffstat (limited to 'sw/source/uibase/app')
-rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 32 | ||||
-rw-r--r-- | sw/source/uibase/app/appopt.cxx | 12 | ||||
-rw-r--r-- | sw/source/uibase/app/docsh.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 48 | ||||
-rw-r--r-- | sw/source/uibase/app/docst.cxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/app/swmodul1.cxx | 2 |
6 files changed, 53 insertions, 53 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 8078729a7f38..5d6a0a66514a 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -310,7 +310,7 @@ SwView* lcl_LoadDoc(SwView* pView, const OUString& rURL) SfxBoolItem aHidden( SID_HIDDEN, true ); SfxStringItem aReferer(SID_REFERER, pView->GetDocShell()->GetTitle()); const SfxObjectItem* pItem = static_cast<const SfxObjectItem*>( - pView->GetViewFrame()->GetDispatcher()->ExecuteList(SID_OPENDOC, + pView->GetViewFrame().GetDispatcher()->ExecuteList(SID_OPENDOC, SfxCallMode::SYNCHRON, { &aURL, &aHidden, &aReferer, &aTargetFrameName })); SfxShell* pShell = pItem ? pItem->GetShell() : nullptr; @@ -323,11 +323,11 @@ SwView* lcl_LoadDoc(SwView* pView, const OUString& rURL) pNewView = dynamic_cast<SwView*>(pViewShell); if (pNewView) { - pNewView->GetViewFrame()->GetFrame().Appear(); + pNewView->GetViewFrame().GetFrame().Appear(); } else { - pViewShell->GetViewFrame()->DoClose(); + pViewShell->GetViewFrame().DoClose(); } } } @@ -336,7 +336,7 @@ SwView* lcl_LoadDoc(SwView* pView, const OUString& rURL) { SfxStringItem aFactory(SID_NEWDOCDIRECT, SwDocShell::Factory().GetFilterContainer()->GetName()); const SfxFrameItem* pItem = static_cast<const SfxFrameItem*>( - pView->GetViewFrame()->GetDispatcher()->ExecuteList( + pView->GetViewFrame().GetDispatcher()->ExecuteList( SID_NEWDOCDIRECT, SfxCallMode::SYNCHRON, { &aFactory })); SfxFrame* pFrame = pItem ? pItem->GetFrame() : nullptr; SfxViewFrame* pViewFrame = pFrame ? pFrame->GetCurrentViewFrame() : nullptr; @@ -493,7 +493,7 @@ void SwMailMergeWizardExecutor::ExecutionFinished() FN_MAILMERGE_PRINT_DOCUMENTS, FN_MAILMERGE_EMAIL_DOCUMENTS, 0 }; - m_pView->GetViewFrame()->GetBindings().Invalidate(slotIds); + m_pView->GetViewFrame().GetBindings().Invalidate(slotIds); } // release/destroy asynchronously @@ -579,8 +579,8 @@ void SwMailMergeWizardExecutor::EndDialogHdl(sal_Int32 nRet) if(pTargetView && pSourceView) { m_pView2Close = pTargetView; - pTargetView->GetViewFrame()->GetTopViewFrame()->GetWindow().Hide(); - pSourceView->GetViewFrame()->GetFrame().AppearWithUpdate(); + pTargetView->GetViewFrame().GetTopViewFrame()->GetWindow().Hide(); + pSourceView->GetViewFrame().GetFrame().AppearWithUpdate(); // the current view has be set when the target is destroyed m_pView = pSourceView; xMMConfig->SetTargetView(nullptr); @@ -617,7 +617,7 @@ void SwMailMergeWizardExecutor::EndDialogHdl(sal_Int32 nRet) SwView* pSourceView = xMMConfig ? xMMConfig->GetSourceView() : nullptr; if(pSourceView) { - xMMConfig->GetSourceView()->GetViewFrame()->GetFrame().Appear(); + xMMConfig->GetSourceView()->GetViewFrame().GetFrame().Appear(); } ExecutionFinished(); break; @@ -645,13 +645,13 @@ IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CancelHdl, void*, void) { if (xMMConfig->GetTargetView()) { - xMMConfig->GetTargetView()->GetViewFrame()->DoClose(); + xMMConfig->GetTargetView()->GetViewFrame().DoClose(); xMMConfig->SetTargetView(nullptr); } if (xMMConfig->GetSourceView()) { - auto pViewFrame(xMMConfig->GetSourceView()->GetViewFrame()); - pViewFrame->GetFrame().AppearWithUpdate(); + auto& rViewFrame(xMMConfig->GetSourceView()->GetViewFrame()); + rViewFrame.GetFrame().AppearWithUpdate(); } xMMConfig->Commit(); } @@ -670,7 +670,7 @@ IMPL_LINK_NOARG(SwMailMergeWizardExecutor, CloseFrameHdl, void*, void) { if ( m_pView2Close ) { - m_pView2Close->GetViewFrame()->DoClose(); + m_pView2Close->GetViewFrame().DoClose(); m_pView2Close = nullptr; } m_pWizardToDestroyInCallback.disposeAndClear(); @@ -788,7 +788,7 @@ void SwModule::ExecOther(SfxRequest& rReq) rSh.GetDBManager()->Merge(aMergeDesc); // update enabled / disabled status of the buttons in the toolbar - SfxBindings& rBindings = rSh.GetView().GetViewFrame()->GetBindings(); + SfxBindings& rBindings = rSh.GetView().GetViewFrame().GetBindings(); rBindings.Invalidate(FN_MAILMERGE_FIRST_ENTRY); rBindings.Invalidate(FN_MAILMERGE_PREV_ENTRY); rBindings.Invalidate(FN_MAILMERGE_NEXT_ENTRY); @@ -819,7 +819,7 @@ void SwModule::ExecOther(SfxRequest& rReq) // The connection has been attempted, but failed or no results found, // so invalidate the toolbar buttons in case they need to be disabled. SfxBindings& rBindings - = GetActiveView()->GetWrtShell().GetView().GetViewFrame()->GetBindings(); + = GetActiveView()->GetWrtShell().GetView().GetViewFrame().GetBindings(); rBindings.Invalidate(FN_MAILMERGE_CREATE_DOCUMENTS); rBindings.Invalidate(FN_MAILMERGE_SAVE_DOCUMENTS); rBindings.Invalidate(FN_MAILMERGE_PRINT_DOCUMENTS); @@ -837,7 +837,7 @@ void SwModule::ExecOther(SfxRequest& rReq) xConfigItem = SwDBManager::PerformMailMerge(GetActiveView()); if (xConfigItem && xConfigItem->GetTargetView()) - xConfigItem->GetTargetView()->GetViewFrame()->GetFrame().Appear(); + xConfigItem->GetTargetView()->GetViewFrame().GetFrame().Appear(); } else { @@ -879,7 +879,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { // assume that not calling via SwEditShell::SetFixFields // is allowed, because the shell hasn't been created yet - assert(!pWrtSh || pWrtSh->GetView().GetViewFrame()->GetFrame().IsClosing_Impl()); + assert(!pWrtSh || pWrtSh->GetView().GetViewFrame().GetFrame().IsClosing_Impl()); pDocSh->GetDoc()->getIDocumentFieldsAccess().SetFixFields(nullptr); } } diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 6e338564e124..4f06d121ff78 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -70,7 +70,7 @@ std::optional<SfxItemSet> SwModule::CreateItemSet( sal_uInt16 nId ) SwMasterUsrPref* pPref = bTextDialog ? m_pUsrPref.get() : m_pWebUsrPref.get(); // no MakeUsrPref, because only options from textdoks can be used here SwView* pAppView = GetView(); - if(pAppView && pAppView->GetViewFrame() != SfxViewFrame::Current()) + if(pAppView && &pAppView->GetViewFrame() != SfxViewFrame::Current()) pAppView = nullptr; if(pAppView) { @@ -215,7 +215,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) { bool bTextDialog = nId == SID_SW_EDITOPTIONS; SwView* pAppView = GetView(); - if(pAppView && pAppView->GetViewFrame() != SfxViewFrame::Current()) + if(pAppView && &pAppView->GetViewFrame() != SfxViewFrame::Current()) pAppView = nullptr; if(pAppView) { @@ -228,7 +228,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SwViewOption aViewOpt = *GetUsrPref(!bTextDialog); SwMasterUsrPref* pPref = bTextDialog ? m_pUsrPref.get() : m_pWebUsrPref.get(); - SfxBindings *pBindings = pAppView ? &pAppView->GetViewFrame()->GetBindings() + SfxBindings *pBindings = pAppView ? &pAppView->GetViewFrame().GetBindings() : nullptr; // Interpret the page Documentview @@ -273,7 +273,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) // Outline-folding options have change which require to show all content. // Either outline-folding is being switched off or outline-folding is currently on // and the treat subs option has changed. - pWrtShell->GetView().GetViewFrame()->GetDispatcher()->Execute(FN_SHOW_OUTLINECONTENTVISIBILITYBUTTON); + pWrtShell->GetView().GetViewFrame().GetDispatcher()->Execute(FN_SHOW_OUTLINECONTENTVISIBILITYBUTTON); if (bTreatSubsChanged) bReFoldOutlineFolding = true; // folding method changed, set flag to refold below } @@ -400,8 +400,8 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) if (bReFoldOutlineFolding) { - GetActiveWrtShell()->GetView().GetViewFrame()->GetDispatcher()->Execute(FN_SHOW_OUTLINECONTENTVISIBILITYBUTTON); - GetActiveWrtShell()->GetView().GetViewFrame()->GetDispatcher()->Execute(FN_SHOW_OUTLINECONTENTVISIBILITYBUTTON); + GetActiveWrtShell()->GetView().GetViewFrame().GetDispatcher()->Execute(FN_SHOW_OUTLINECONTENTVISIBILITYBUTTON); + GetActiveWrtShell()->GetView().GetViewFrame().GetDispatcher()->Execute(FN_SHOW_OUTLINECONTENTVISIBILITYBUTTON); } } diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 72dd3319fc4b..22c9a18c45ae 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -341,7 +341,7 @@ bool SwDocShell::Save() SetError(nErr ? nErr : nVBWarning); SfxViewFrame *const pFrame = - m_pWrtShell ? m_pWrtShell->GetView().GetViewFrame() : nullptr; + m_pWrtShell ? &m_pWrtShell->GetView().GetViewFrame() : nullptr; if( pFrame ) { pFrame->GetBindings().SetState(SfxBoolItem(SID_DOC_MODIFIED, false)); @@ -1106,7 +1106,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) case SID_NOTEBOOKBAR: { SfxViewShell* pViewShell = GetView()? GetView(): SfxViewShell::Current(); - bool bVisible = sfx2::SfxNotebookBar::StateMethod(pViewShell->GetViewFrame()->GetBindings(), + bool bVisible = sfx2::SfxNotebookBar::StateMethod(pViewShell->GetViewFrame().GetBindings(), u"modules/swriter/ui/"); rSet.Put( SfxBoolItem( SID_NOTEBOOKBAR, bVisible ) ); } diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index bc9647d77dd7..3cbd7673a6b7 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -161,14 +161,14 @@ void SwDocShell::ToggleLayoutMode(SwView* pView) GetDoc()->getIDocumentSettingAccess().set(DocumentSettingId::BROWSE_MODE, rViewOptions.getBrowseMode()); UpdateFontList(); // Why is this necessary here? - pView->GetViewFrame()->GetBindings().Invalidate(FN_SHADOWCURSOR); + pView->GetViewFrame().GetBindings().Invalidate(FN_SHADOWCURSOR); if( !GetDoc()->getIDocumentDeviceAccess().getPrinter( false ) ) pView->SetPrinter( GetDoc()->getIDocumentDeviceAccess().getPrinter( false ), SfxPrinterChangeFlags::PRINTER | SfxPrinterChangeFlags::JOBSETUP ); GetDoc()->CheckDefaultPageFormat(); SfxViewFrame *pTmpFrame = SfxViewFrame::GetFirst(this, false); while (pTmpFrame) { - if( pTmpFrame != pView->GetViewFrame() ) + if( pTmpFrame != &pView->GetViewFrame() ) { pTmpFrame->DoClose(); pTmpFrame = SfxViewFrame::GetFirst(this, false); @@ -507,7 +507,7 @@ void SwDocShell::Execute(SfxRequest& rReq) nSlotId = SID_VIEWSHELL2; if( pCurrView && pCurrView->GetDocShell() == this ) - pTmpFrame = pCurrView->GetViewFrame(); + pTmpFrame = &pCurrView->GetViewFrame(); else pTmpFrame = SfxViewFrame::GetFirst( this ); @@ -642,7 +642,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SfxViewShell* pViewShell = GetView() ? static_cast<SfxViewShell*>(GetView()) : SfxViewShell::Current(); - SfxViewFrame* pViewFrame = pViewShell->GetViewFrame(); + SfxViewFrame& rViewFrame = pViewShell->GetViewFrame(); SwSrcView* pSrcView = dynamic_cast< SwSrcView *>( pViewShell ); if(!pSrcView) { @@ -661,7 +661,7 @@ void SwDocShell::Execute(SfxRequest& rReq) std::shared_ptr<const SfxFilter> pFlt = GetMedium()->GetFilter(); if(!pFlt || pFlt->GetUserData() != pHtmlFlt->GetUserData()) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pViewFrame->GetFrameWeld(), "modules/swriter/ui/saveashtmldialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(rViewFrame.GetFrameWeld(), "modules/swriter/ui/saveashtmldialog.ui")); std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("SaveAsHTMLDialog")); if (RET_YES == xQuery->run()) bLocalHasName = false; @@ -685,7 +685,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SfxStringItem aName(SID_FILE_NAME, sPath); SfxStringItem aFilter(SID_FILTER_NAME, pHtmlFlt->GetName()); const SfxBoolItem* pBool = static_cast<const SfxBoolItem*>( - pViewFrame->GetDispatcher()->ExecuteList( + rViewFrame.GetDispatcher()->ExecuteList( SID_SAVEASDOC, SfxCallMode::SYNCHRON, { &aName, &aFilter })); if(!pBool || !pBool->GetValue()) @@ -724,8 +724,8 @@ void SwDocShell::Execute(SfxRequest& rReq) nSlot = SID_VIEWSHELL0; } } - if(nSlot) - pViewFrame->GetDispatcher()->Execute(nSlot, SfxCallMode::SYNCHRON); + if (nSlot) + rViewFrame.GetDispatcher()->Execute(nSlot, SfxCallMode::SYNCHRON); if(bSetModified) GetDoc()->getIDocumentState().SetModified(); if(pSavePrinter) @@ -733,10 +733,10 @@ void SwDocShell::Execute(SfxRequest& rReq) GetDoc()->getIDocumentDeviceAccess().setPrinter( pSavePrinter, true, true); //pSavePrinter must not be deleted again } - pViewFrame->GetBindings().SetState(SfxBoolItem(SID_SOURCEVIEW, false)); // not SID_VIEWSHELL2 - pViewFrame->GetBindings().Invalidate( SID_NEWWINDOW ); - pViewFrame->GetBindings().Invalidate( SID_BROWSER_MODE ); - pViewFrame->GetBindings().Invalidate( FN_PRINT_LAYOUT ); + rViewFrame.GetBindings().SetState(SfxBoolItem(SID_SOURCEVIEW, false)); // not SID_VIEWSHELL2 + rViewFrame.GetBindings().Invalidate( SID_NEWWINDOW ); + rViewFrame.GetBindings().Invalidate( SID_BROWSER_MODE ); + rViewFrame.GetBindings().Invalidate( FN_PRINT_LAYOUT ); } break; case SID_GET_COLORLIST: @@ -1138,7 +1138,7 @@ void SwDocShell::Execute(SfxRequest& rReq) //search for the view that created the call if(pViewShell->GetObjectShell() == this && pViewShell->GetDispatcher()) { - SfxFrameItem aFrameItem( SID_DOCFRAME, pViewShell->GetViewFrame() ); + SfxFrameItem aFrameItem(SID_DOCFRAME, &pViewShell->GetViewFrame()); SfxDispatcher* pDispatch = pViewShell->GetDispatcher(); pDispatch->ExecuteList(SID_OPENDOC, SfxCallMode::ASYNCHRON, @@ -1279,8 +1279,8 @@ void SwDocShell::Execute(SfxRequest& rReq) else { SfxViewShell* pViewShell = GetView() ? GetView() : SfxViewShell::Current(); - SfxBindings& rBindings( pViewShell->GetViewFrame()->GetBindings() ); - auto xDlg = std::make_shared<SwWatermarkDialog>(pViewShell->GetViewFrame()->GetFrameWeld(), + SfxBindings& rBindings( pViewShell->GetViewFrame().GetBindings() ); + auto xDlg = std::make_shared<SwWatermarkDialog>(pViewShell->GetViewFrame().GetFrameWeld(), rBindings); weld::DialogController::runAsync(xDlg, [](sal_Int32 /*nResult*/){}); } @@ -1291,7 +1291,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { const SfxStringItem* pFile = rReq.GetArg<SfxStringItem>( SID_NOTEBOOKBAR ); SfxViewShell* pViewShell = GetView()? GetView(): SfxViewShell::Current(); - SfxBindings& rBindings( pViewShell->GetViewFrame()->GetBindings() ); + SfxBindings& rBindings( pViewShell->GetViewFrame().GetBindings() ); if ( SfxNotebookBar::IsActive() ) sfx2::SfxNotebookBar::ExecMethod( rBindings, pFile ? pFile->GetValue() : "" ); @@ -1334,7 +1334,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SfxViewShell* pViewShell = GetView() ? GetView() : SfxViewShell::Current(); - pViewShell->GetViewFrame()->GetDispatcher()->ExecuteList( + pViewShell->GetViewFrame().GetDispatcher()->ExecuteList( FN_REDLINE_SHOW, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, { &aShow }); bChangedHideChanges = true; @@ -1361,7 +1361,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { SfxBoolItem aShow(FN_REDLINE_SHOW, false); SfxViewShell* pViewShell = GetView()? GetView(): SfxViewShell::Current(); - pViewShell->GetViewFrame()->GetDispatcher()->ExecuteList( + pViewShell->GetViewFrame().GetDispatcher()->ExecuteList( FN_REDLINE_SHOW, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, { &aShow }); } @@ -1465,14 +1465,14 @@ void SwDocShell::UpdateChildWindows() // if necessary newly initialize Fielddlg (i.e. for TYP_SETVAR) if(!GetView()) return; - SfxViewFrame* pVFrame = GetView()->GetViewFrame(); - SwFieldDlgWrapper *pWrp = static_cast<SwFieldDlgWrapper*>(pVFrame-> + SfxViewFrame& rVFrame = GetView()->GetViewFrame(); + SwFieldDlgWrapper *pWrp = static_cast<SwFieldDlgWrapper*>(rVFrame. GetChildWindow( SwFieldDlgWrapper::GetChildWindowId() )); if( pWrp ) pWrp->ReInitDlg( this ); // if necessary newly initialize RedlineDlg - SwRedlineAcceptChild *pRed = static_cast<SwRedlineAcceptChild*>(pVFrame-> + SwRedlineAcceptChild *pRed = static_cast<SwRedlineAcceptChild*>(rVFrame. GetChildWindow( SwRedlineAcceptChild::GetChildWindowId() )); if( pRed ) pRed->ReInitDlg( this ); @@ -1526,7 +1526,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie SfxUnoAnyItem aShellItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, Any( GetModel() ) ); OUString aLibName( pBasic->GetName() ); SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName ); - pSrcView->GetViewFrame()->GetDispatcher()->ExecuteList( + pSrcView->GetViewFrame().GetDispatcher()->ExecuteList( SID_BASICIDE_LIBREMOVED, SfxCallMode::SYNCHRON, { &aShellItem, &aLibNameItem }); @@ -1565,8 +1565,8 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie SfxViewShell* pViewShell = GetView() ? static_cast<SfxViewShell*>(GetView()) : SfxViewShell::Current(); - SfxViewFrame* pViewFrame = pViewShell->GetViewFrame(); - pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL0, SfxCallMode::SYNCHRON ); + SfxViewFrame& rViewFrame = pViewShell->GetViewFrame(); + rViewFrame.GetDispatcher()->Execute( SID_VIEWSHELL0, SfxCallMode::SYNCHRON ); SubInitNew(); diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 436335302c7e..84aacfa1d47d 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -104,9 +104,9 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) } else { - SfxViewFrame* pFrame = pShell->GetView().GetViewFrame(); + SfxViewFrame& rFrame = pShell->GetView().GetViewFrame(); std::unique_ptr<SfxUInt16Item> pFamilyItem; - pFrame->GetBindings().QueryState(SID_STYLE_FAMILY, pFamilyItem); + rFrame.GetBindings().QueryState(SID_STYLE_FAMILY, pFamilyItem); if (pFamilyItem) { nActualFamily = static_cast<SfxStyleFamily>(pFamilyItem->GetValue()); @@ -328,7 +328,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) case SID_STYLE_APPLY: if( !pArgs ) { - GetView()->GetViewFrame()->GetDispatcher()->Execute(SID_STYLE_DESIGNER); + GetView()->GetViewFrame().GetDispatcher()->Execute(SID_STYLE_DESIGNER); break; } else @@ -606,7 +606,7 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl, LinkParamNone*, void) FN_INSERT_CTRL, FN_INSERT_OBJ_CTRL, FN_TABLE_INSERT_COL_BEFORE, FN_TABLE_INSERT_COL_AFTER, 0}; - pView->GetViewFrame()->GetBindings().Invalidate(aInval); + pView->GetViewFrame().GetBindings().Invalidate(aInval); } SfxItemSet aTmpSet( *m_pDlg->GetOutputItemSet() ); if( SfxStyleFamily::Char == m_nFamily ) diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index 781c30a5e74a..a74b43821643 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -367,7 +367,7 @@ SwChapterNumRules* SwModule::GetChapterNumRules() void SwModule::ShowDBObj(SwView const & rView, const SwDBData& rData) { - Reference<XFrame> xFrame = rView.GetViewFrame()->GetFrame().GetFrameInterface(); + Reference<XFrame> xFrame = rView.GetViewFrame().GetFrame().GetFrameInterface(); uno::Reference<XFrame> xBeamerFrame = xFrame->findFrame("_beamer", FrameSearchFlag::CHILDREN); if (!xBeamerFrame.is()) |