diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-05-31 13:28:28 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-01 16:30:31 +0200 |
commit | 33a15db2aa9fca54b95907958e07a18b211732b7 (patch) | |
tree | 130d0d5132bc9280aa3142838b1793910edc057e | |
parent | 6036f1001bc594043dbd9fec462d346ad873ed78 (diff) |
rename OneExampleFrame back to SwOneExampleFrame
Change-Id: I11fafbbba752cec1a477ddcab74b6a749637b2b3
Reviewed-on: https://gerrit.libreoffice.org/73265
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/index/cntex.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/misc/glossary.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/inc/glossary.hxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/inc/swuicnttab.hxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/inc/unotools.hxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/utlui/unotools.cxx | 28 |
9 files changed, 37 insertions, 37 deletions
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 01cdb6b1576c..88070a1da2b1 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -116,8 +116,8 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage(SwMailMergeWizard* pWizard, TabPage uno::Reference< frame::XStorable > xStore( pView->GetDocShell()->GetModel(), uno::UNO_QUERY); xStore->storeToURL( m_sExampleURL, aValues ); - Link<OneExampleFrame&,void> aLink(LINK(this, SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)); - m_xExampleFrame.reset(new OneExampleFrame(EX_SHOW_DEFAULT_PAGE, &aLink, &m_sExampleURL)); + Link<SwOneExampleFrame&,void> aLink(LINK(this, SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)); + m_xExampleFrame.reset(new SwOneExampleFrame(EX_SHOW_DEFAULT_PAGE, &aLink, &m_sExampleURL)); m_xExampleContainerWIN.reset(new weld::CustomWeld(*m_xBuilder, "example", *m_xExampleFrame)); Size aSize = m_xExampleFrame->GetDrawingArea()->get_ref_device().LogicToPixel( @@ -605,7 +605,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig OSL_ENSURE(nullptr == rShell.GetTableFormat(), "What to do with a table here?"); } -IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, OneExampleFrame&, void) +IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, SwOneExampleFrame&, void) { m_xExampleContainerWIN->show(); diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 4d8c810a4a6d..591eadd8623b 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -29,7 +29,7 @@ class SwMailMergeWizard; class SwFrameFormat; -class OneExampleFrame; +class SwOneExampleFrame; class SwWrtShell; class SwView; @@ -57,10 +57,10 @@ class SwMailMergeLayoutPage : public svt::OWizardPage std::unique_ptr<weld::Button> m_xUpPB; std::unique_ptr<weld::Button> m_xDownPB; std::unique_ptr<weld::ComboBox> m_xZoomLB; - std::unique_ptr<OneExampleFrame> m_xExampleFrame; + std::unique_ptr<SwOneExampleFrame> m_xExampleFrame; std::unique_ptr<weld::CustomWeld> m_xExampleContainerWIN; - DECL_LINK(PreviewLoadedHdl_Impl, OneExampleFrame&, void); + DECL_LINK(PreviewLoadedHdl_Impl, SwOneExampleFrame&, void); DECL_LINK(ZoomHdl_Impl, weld::ComboBox&, void); DECL_LINK(ChangeAddressHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(GreetingsHdl_Impl, weld::Button&, void); diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index e70fd8d4f179..361bf7520d37 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -94,7 +94,7 @@ static void lcl_SetBOOLProp( } } -IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl, OneExampleFrame&, void) +IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame&, void) { try { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 8f2a9a14fb55..13c5f4406081 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -445,8 +445,8 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, ShowPreviewHdl, weld::ToggleButton&, void) } else { - Link<OneExampleFrame&,void> aLink(LINK(this, SwMultiTOXTabDialog, CreateExample_Hdl)); - m_xExampleFrame.reset(new OneExampleFrame(EX_SHOW_ONLINE_LAYOUT, &aLink, &sTemplate)); + Link<SwOneExampleFrame&,void> aLink(LINK(this, SwMultiTOXTabDialog, CreateExample_Hdl)); + m_xExampleFrame.reset(new SwOneExampleFrame(EX_SHOW_ONLINE_LAYOUT, &aLink, &sTemplate)); m_xExampleFrameWin.reset(new weld::CustomWeld(*m_xBuilder, "example", *m_xExampleFrame)); } m_xShowExampleCB->set_visible(m_xExampleFrame != nullptr); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 31e385d91b0e..76d92cfa98c4 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -213,8 +213,8 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame const * pViewFrame, m_xCategoryBox->set_size_request(m_xCategoryBox->get_approximate_digit_width() * 52, m_xCategoryBox->get_height_rows(12)); - Link<OneExampleFrame&,void> aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl)); - m_xExampleFrame.reset(new OneExampleFrame(EX_SHOW_ONLINE_LAYOUT, &aLink)); + Link<SwOneExampleFrame&,void> aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl)); + m_xExampleFrame.reset(new SwOneExampleFrame(EX_SHOW_ONLINE_LAYOUT, &aLink)); m_xExampleFrameWin.reset(new weld::CustomWeld(*m_xBuilder, "example", *m_xExampleFrame)); Size aSize = m_xExampleFrame->GetDrawingArea()->get_ref_device().LogicToPixel( Size(82, 124), MapMode(MapUnit::MapAppFont)); @@ -898,7 +898,7 @@ void SwGlossaryDlg::ShowPreview() ShowAutoText(::GetCurrGlosGroup(), m_xShortNameEdit->get_text()); }; -IMPL_LINK_NOARG(SwGlossaryDlg, PreviewLoadedHdl, OneExampleFrame&, void) +IMPL_LINK_NOARG(SwGlossaryDlg, PreviewLoadedHdl, SwOneExampleFrame&, void) { ResumeShowAutoText(); } diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index b9aed7adec9b..82937932c032 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -41,7 +41,7 @@ class SwWrtShell; class SfxViewFrame; class PopupMenu; class Menu; -class OneExampleFrame; +class SwOneExampleFrame; const short RET_EDIT = 100; @@ -80,7 +80,7 @@ class SwGlossaryDlg : public SfxDialogController std::unique_ptr<weld::MenuButton> m_xEditBtn; std::unique_ptr<weld::Button> m_xBibBtn; std::unique_ptr<weld::Button> m_xPathBtn; - std::unique_ptr<OneExampleFrame> m_xExampleFrame; + std::unique_ptr<SwOneExampleFrame> m_xExampleFrame; std::unique_ptr<weld::CustomWeld> m_xExampleFrameWin; void EnableShortName(bool bOn = true); @@ -95,7 +95,7 @@ class SwGlossaryDlg : public SfxDialogController DECL_LINK( InsertHdl, weld::Button&, void ); DECL_LINK( PathHdl, weld::Button&, void ); DECL_LINK( CheckBoxHdl, weld::ToggleButton&, void ); - DECL_LINK( PreviewLoadedHdl, OneExampleFrame&, void ); + DECL_LINK( PreviewLoadedHdl, SwOneExampleFrame&, void ); DECL_LINK( KeyInputHdl, const KeyEvent&, bool ); DECL_LINK( TextFilterHdl, OUString&, bool ); diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 753ac348c00a..64526975d3cd 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -43,7 +43,7 @@ class SwTOXWidget; class SwTOXEdit; class SwTOXButton; class SwTOXEntryTabPage; -class OneExampleFrame; +class SwOneExampleFrame; class SwWrtShell; namespace com{namespace sun{namespace star{ @@ -83,14 +83,14 @@ class SwMultiTOXTabDialog : public SfxTabDialogController bool m_bExampleCreated; bool const m_bGlobalFlag; - std::unique_ptr<OneExampleFrame> m_xExampleFrame; + std::unique_ptr<SwOneExampleFrame> m_xExampleFrame; std::unique_ptr<weld::CheckButton> m_xShowExampleCB; std::unique_ptr<weld::CustomWeld> m_xExampleFrameWin; virtual short Ok() override; std::unique_ptr<SwTOXDescription> CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); - DECL_LINK(CreateExample_Hdl, OneExampleFrame&, void); + DECL_LINK(CreateExample_Hdl, SwOneExampleFrame&, void); DECL_LINK(ShowPreviewHdl, weld::ToggleButton&, void); public: diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index cb3cac1d63b6..51931ec1ce5f 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -41,7 +41,7 @@ class SwView; -class SW_DLLPUBLIC OneExampleFrame : public weld::CustomWidgetController +class SW_DLLPUBLIC SwOneExampleFrame : public weld::CustomWidgetController { ScopedVclPtr<VirtualDevice> m_xVirDev; css::uno::Reference< css::frame::XModel > m_xModel; @@ -49,7 +49,7 @@ class SW_DLLPUBLIC OneExampleFrame : public weld::CustomWidgetController css::uno::Reference< css::text::XTextCursor > m_xCursor; Idle m_aLoadedIdle; - Link<OneExampleFrame&,void> m_aInitializedLink; + Link<SwOneExampleFrame&,void> m_aInitializedLink; OUString m_sArgumentURL; @@ -66,13 +66,13 @@ class SW_DLLPUBLIC OneExampleFrame : public weld::CustomWidgetController SAL_DLLPRIVATE void DisposeControl(); public: - OneExampleFrame(sal_uInt32 nStyleFlags, - const Link<OneExampleFrame&,void>* pInitalizedLink, + SwOneExampleFrame(sal_uInt32 nStyleFlags, + const Link<SwOneExampleFrame&,void>* pInitalizedLink, const OUString* pURL = nullptr); virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual bool ContextMenu(const CommandEvent& rCEvt) override; - virtual ~OneExampleFrame() override; + virtual ~SwOneExampleFrame() override; css::uno::Reference< css::frame::XModel > & GetModel() {return m_xModel;} css::uno::Reference< css::frame::XController > & GetController() {return m_xController;} diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 0122f5ab6b5b..e4069815e527 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -96,10 +96,10 @@ static const sal_Int16 nZoomValues[] = 100 }; -OneExampleFrame::OneExampleFrame(sal_uInt32 nFlags, - const Link<OneExampleFrame&,void>* pInitializedLink, +SwOneExampleFrame::SwOneExampleFrame(sal_uInt32 nFlags, + const Link<SwOneExampleFrame&,void>* pInitializedLink, const OUString* pURL) - : m_aLoadedIdle("sw uibase OneExampleFrame Loaded") + : m_aLoadedIdle("sw uibase SwOneExampleFrame Loaded") , m_pModuleView(SW_MOD()->GetView()) , m_nStyleFlags(nFlags) , m_bIsInitialized(false) @@ -111,11 +111,11 @@ OneExampleFrame::OneExampleFrame(sal_uInt32 nFlags, m_aInitializedLink = *pInitializedLink; // the controller is asynchronously set - m_aLoadedIdle.SetInvokeHandler(LINK(this, OneExampleFrame, TimeoutHdl)); + m_aLoadedIdle.SetInvokeHandler(LINK(this, SwOneExampleFrame, TimeoutHdl)); m_aLoadedIdle.SetPriority(TaskPriority::HIGH_IDLE); } -void OneExampleFrame::SetDrawingArea(weld::DrawingArea* pDrawingArea) +void SwOneExampleFrame::SetDrawingArea(weld::DrawingArea* pDrawingArea) { CustomWidgetController::SetDrawingArea(pDrawingArea); m_xVirDev = VclPtr<VirtualDevice>::Create(); @@ -125,7 +125,7 @@ void OneExampleFrame::SetDrawingArea(weld::DrawingArea* pDrawingArea) CreateControl(); } -bool OneExampleFrame::ContextMenu(const CommandEvent& rCEvt) +bool SwOneExampleFrame::ContextMenu(const CommandEvent& rCEvt) { switch (rCEvt.GetCommand()) { @@ -142,7 +142,7 @@ bool OneExampleFrame::ContextMenu(const CommandEvent& rCEvt) return false; } -void OneExampleFrame::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) +void SwOneExampleFrame::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { Size aSize(GetOutputSizePixel()); // m_xVirDev instead of rRenderContext just to avoid overlays in writer re-triggering @@ -184,12 +184,12 @@ void OneExampleFrame::Paint(vcl::RenderContext& rRenderContext, const tools::Rec rRenderContext.DrawOutDev(Point(), aSize, Point(), aSize, *m_xVirDev); } -OneExampleFrame::~OneExampleFrame() +SwOneExampleFrame::~SwOneExampleFrame() { DisposeControl(); } -void OneExampleFrame::CreateControl() +void SwOneExampleFrame::CreateControl() { // create new doc OUString sTempURL(cFactory); @@ -211,7 +211,7 @@ void OneExampleFrame::CreateControl() m_aLoadedIdle.Start(); } -void OneExampleFrame::DisposeControl() +void SwOneExampleFrame::DisposeControl() { m_aLoadedIdle.Stop(); m_xCursor = nullptr; @@ -223,7 +223,7 @@ void OneExampleFrame::DisposeControl() m_xController = nullptr; } -IMPL_LINK( OneExampleFrame, TimeoutHdl, Timer*, pTimer, void ) +IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer, void ) { if (!m_xModel.is()) return; @@ -420,7 +420,7 @@ IMPL_LINK( OneExampleFrame, TimeoutHdl, Timer*, pTimer, void ) pTimer->Start(); } -void OneExampleFrame::ClearDocument() +void SwOneExampleFrame::ClearDocument() { uno::Reference< lang::XUnoTunnel> xTunnel( m_xCursor, uno::UNO_QUERY); if( xTunnel.is() ) @@ -454,7 +454,7 @@ void OneExampleFrame::ClearDocument() } } -bool OneExampleFrame::CreatePopup(const Point& rPt) +bool SwOneExampleFrame::CreatePopup(const Point& rPt) { if (EX_SHOW_ONLINE_LAYOUT != m_nStyleFlags) return false; @@ -484,7 +484,7 @@ bool OneExampleFrame::CreatePopup(const Point& rPt) return true; } -void OneExampleFrame::PopupHdl(const OString& rId) +void SwOneExampleFrame::PopupHdl(const OString& rId) { OString sZoomValue; if (rId.startsWith("zoom", &sZoomValue)) |