cui/source/inc/numpages.hxx | 12 ++++--------
cui/source/tabpages/numpages.cxx | 4 ++--
2 files changed, 6 insertions(+), 10 deletions(-)
New commits:
commit ff418ffebbdbef98d346c153bc2315fcdcc97945
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 2 16:46:49 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 3 09:51:45 2018 +0200
rename cui::NumberingPreview back to SvxNumberingPreview
Change-Id: I5c8b9ac10babd0535fa55f490a5478f88fc76222
Reviewed-on: https://gerrit.libreoffice.org/61264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 5d0a1574e0c6..4da0aae75e2e 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -44,9 +44,7 @@ class SvxBmpNumValueSet;
class SvxBrushItem;
class ValueSet;
-namespace cui {
-
-class NumberingPreview : public weld::CustomWidgetController
+class SvxNumberingPreview : public weld::CustomWidgetController
{
const SvxNumRule* pActNum;
vcl::Font aStdFont;
@@ -57,7 +55,7 @@ protected:
virtual void Paint( vcl::RenderContext& rRenderContext, const
::tools::Rectangle& rRect ) override;
public:
- NumberingPreview();
+ SvxNumberingPreview();
void SetNumRule(const SvxNumRule* pNum)
{pActNum = pNum; Invalidate();};
@@ -67,8 +65,6 @@ public:
};
-}
-
struct SvxNumSettings_Impl
{
SvxNumType nNumberType;
@@ -267,7 +263,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
sal_uInt16 nNumItemId;
MapUnit eCoreUnit;
- cui::NumberingPreview m_aPreviewWIN;
+ SvxNumberingPreview m_aPreviewWIN;
std::unique_ptr<weld::Widget> m_xGrid;
std::unique_ptr<weld::TreeView> m_xLevelLB;
std::unique_ptr<weld::ComboBox> m_xFmtLB;
@@ -370,7 +366,7 @@ class SvxNumPositionTabPage : public SfxTabPage
bool bInInintControl : 1; // workaround for
Modify-error, is said to be corrected from 391 on
bool bLabelAlignmentPosAndSpaceModeActive;
- cui::NumberingPreview m_aPreviewWIN;
+ SvxNumberingPreview m_aPreviewWIN;
std::unique_ptr<weld::TreeView> m_xLevelLB;
// former set of controls shown for numbering rules containing list level
// attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode ==
LABEL_WIDTH_AND_POSITION
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index a853745965aa..557065396065 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2199,7 +2199,7 @@ static long lcl_DrawBullet(VirtualDevice* pVDev,
return nRet;
}
-cui::NumberingPreview::NumberingPreview()
+SvxNumberingPreview::SvxNumberingPreview()
: pActNum(nullptr)
, bPosition(false)
, nActLevel(SAL_MAX_UINT16)
@@ -2207,7 +2207,7 @@ cui::NumberingPreview::NumberingPreview()
}
// paint preview of numeration
-void cui::NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const
::tools::Rectangle& /*rRect*/)
+void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const
::tools::Rectangle& /*rRect*/)
{
Size aSize(rRenderContext.PixelToLogic(GetOutputSizePixel()));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
