Kaydet (Commit) d5d943fd authored tarafından Caolán McNamara's avatar Caolán McNamara

rename ParaPrevWindow back to SvxParaPrevWindow

Change-Id: I3dc51ed38509a588003137bf295f005b031c20c3
Reviewed-on: https://gerrit.libreoffice.org/60777
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst f00312e7
...@@ -59,7 +59,7 @@ private: ...@@ -59,7 +59,7 @@ private:
bool bRelativeMode; bool bRelativeMode;
OUString sAbsDist; OUString sAbsDist;
ParaPrevWindow m_aExampleWin; SvxParaPrevWindow m_aExampleWin;
// indention // indention
std::unique_ptr<RelativeField> m_xLeftIndent; std::unique_ptr<RelativeField> m_xLeftIndent;
...@@ -134,7 +134,7 @@ class SvxParaAlignTabPage : public SfxTabPage ...@@ -134,7 +134,7 @@ class SvxParaAlignTabPage : public SfxTabPage
using TabPage::DeactivatePage; using TabPage::DeactivatePage;
static const sal_uInt16 pAlignRanges[]; static const sal_uInt16 pAlignRanges[];
ParaPrevWindow m_aExampleWin; SvxParaPrevWindow m_aExampleWin;
// alignment // alignment
std::unique_ptr<weld::RadioButton> m_xLeft; std::unique_ptr<weld::RadioButton> m_xLeft;
......
...@@ -35,7 +35,7 @@ enum class SvxPrevLineSpace ...@@ -35,7 +35,7 @@ enum class SvxPrevLineSpace
Leading Leading
}; };
class SVX_DLLPUBLIC ParaPrevWindow final : public weld::CustomWidgetController class SVX_DLLPUBLIC SvxParaPrevWindow final : public weld::CustomWidgetController
{ {
Size aSize; Size aSize;
...@@ -60,7 +60,7 @@ class SVX_DLLPUBLIC ParaPrevWindow final : public weld::CustomWidgetController ...@@ -60,7 +60,7 @@ class SVX_DLLPUBLIC ParaPrevWindow final : public weld::CustomWidgetController
void DrawParagraph(vcl::RenderContext& rRenderContext); void DrawParagraph(vcl::RenderContext& rRenderContext);
public: public:
ParaPrevWindow(); SvxParaPrevWindow();
void SetFirstLineOfst( short nNew ) void SetFirstLineOfst( short nNew )
{ {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <vcl/builderfactory.hxx> #include <vcl/builderfactory.hxx>
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
ParaPrevWindow::ParaPrevWindow() : SvxParaPrevWindow::SvxParaPrevWindow() :
nLeftMargin ( 0 ), nLeftMargin ( 0 ),
nRightMargin ( 0 ), nRightMargin ( 0 ),
nFirstLineOfst ( 0 ), nFirstLineOfst ( 0 ),
...@@ -35,21 +35,21 @@ ParaPrevWindow::ParaPrevWindow() : ...@@ -35,21 +35,21 @@ ParaPrevWindow::ParaPrevWindow() :
aSize = Size(11905, 16837); aSize = Size(11905, 16837);
} }
void ParaPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) void SvxParaPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{ {
CustomWidgetController::SetDrawingArea(pDrawingArea); CustomWidgetController::SetDrawingArea(pDrawingArea);
Size aOptimalSize(getParagraphPreviewOptimalSize(pDrawingArea->get_ref_device())); Size aOptimalSize(getParagraphPreviewOptimalSize(pDrawingArea->get_ref_device()));
pDrawingArea->set_size_request(aOptimalSize.Width(), aOptimalSize.Height()); 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); DrawParagraph(rRenderContext);
} }
#define DEF_MARGIN 120 #define DEF_MARGIN 120
void ParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext)
{ {
// Count in Twips by default // Count in Twips by default
rRenderContext.Push(PushFlags::MAPMODE); rRenderContext.Push(PushFlags::MAPMODE);
......
...@@ -227,7 +227,7 @@ public: ...@@ -227,7 +227,7 @@ public:
class SwSectionIndentTabPage : public SfxTabPage class SwSectionIndentTabPage : public SfxTabPage
{ {
ParaPrevWindow m_aPreviewWin; SvxParaPrevWindow m_aPreviewWin;
std::unique_ptr<weld::MetricSpinButton> m_xBeforeMF; std::unique_ptr<weld::MetricSpinButton> m_xBeforeMF;
std::unique_ptr<weld::MetricSpinButton> m_xAfterMF; std::unique_ptr<weld::MetricSpinButton> m_xAfterMF;
std::unique_ptr<weld::CustomWeld> m_xPreviewWin; std::unique_ptr<weld::CustomWeld> m_xPreviewWin;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment