diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-09-19 17:02:31 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-20 09:59:30 +0200 |
commit | d5d943fdc729763a5277cd0ac2093ae8acb6fccd (patch) | |
tree | ef99ce60a481799040d5b330059a79d53df96b6e | |
parent | f00312e7fa960b64accd25c3a55533f61893daae (diff) |
rename ParaPrevWindow back to SvxParaPrevWindow
Change-Id: I3dc51ed38509a588003137bf295f005b031c20c3
Reviewed-on: https://gerrit.libreoffice.org/60777
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | cui/source/inc/paragrph.hxx | 4 | ||||
-rw-r--r-- | include/svx/paraprev.hxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/paraprev.cxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/inc/regionsw.hxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index b682fa126d60..b656f8d52b05 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -59,7 +59,7 @@ private: bool bRelativeMode; OUString sAbsDist; - ParaPrevWindow m_aExampleWin; + SvxParaPrevWindow m_aExampleWin; // indention std::unique_ptr<RelativeField> m_xLeftIndent; @@ -134,7 +134,7 @@ class SvxParaAlignTabPage : public SfxTabPage using TabPage::DeactivatePage; static const sal_uInt16 pAlignRanges[]; - ParaPrevWindow m_aExampleWin; + SvxParaPrevWindow m_aExampleWin; // alignment std::unique_ptr<weld::RadioButton> m_xLeft; diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index 62b8eda4ab80..18e7ec5ea2bb 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -35,7 +35,7 @@ enum class SvxPrevLineSpace Leading }; -class SVX_DLLPUBLIC ParaPrevWindow final : public weld::CustomWidgetController +class SVX_DLLPUBLIC SvxParaPrevWindow final : public weld::CustomWidgetController { Size aSize; @@ -60,7 +60,7 @@ class SVX_DLLPUBLIC ParaPrevWindow final : public weld::CustomWidgetController void DrawParagraph(vcl::RenderContext& rRenderContext); public: - ParaPrevWindow(); + SvxParaPrevWindow(); void SetFirstLineOfst( short nNew ) { diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 0ac65ad075a9..97eb87ecc64e 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -22,7 +22,7 @@ #include <vcl/builderfactory.hxx> #include <vcl/settings.hxx> -ParaPrevWindow::ParaPrevWindow() : +SvxParaPrevWindow::SvxParaPrevWindow() : nLeftMargin ( 0 ), nRightMargin ( 0 ), nFirstLineOfst ( 0 ), @@ -35,21 +35,21 @@ ParaPrevWindow::ParaPrevWindow() : aSize = Size(11905, 16837); } -void ParaPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) +void SvxParaPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) { CustomWidgetController::SetDrawingArea(pDrawingArea); Size aOptimalSize(getParagraphPreviewOptimalSize(pDrawingArea->get_ref_device())); pDrawingArea->set_size_request(aOptimalSize.Width(), aOptimalSize.Height()); } -void ParaPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) +void SvxParaPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { DrawParagraph(rRenderContext); } #define DEF_MARGIN 120 -void ParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) +void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) { // Count in Twips by default rRenderContext.Push(PushFlags::MAPMODE); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 8f44ea17fbd3..3ff899a2bfea 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -227,7 +227,7 @@ public: class SwSectionIndentTabPage : public SfxTabPage { - ParaPrevWindow m_aPreviewWin; + SvxParaPrevWindow m_aPreviewWin; std::unique_ptr<weld::MetricSpinButton> m_xBeforeMF; std::unique_ptr<weld::MetricSpinButton> m_xAfterMF; std::unique_ptr<weld::CustomWeld> m_xPreviewWin; |