diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-30 15:47:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-31 06:59:31 +0000 |
| commit | dcffc21805828ddff7de1282f3d40ffdf3fac38d (patch) | |
| tree | 1b4e81850b3fcd42cee470a18413745732c36c4a /svx/source/dialog | |
| parent | 7fca8e61ce992e9dc6f900b77142a123c0c10b6d (diff) | |
use actual UNO enums in svx
Change-Id: I00f53260667861ca2595892b5605479da3401adb
Reviewed-on: https://gerrit.libreoffice.org/35913
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/rubydialog.cxx | 7 | ||||
| -rw-r--r-- | svx/source/dialog/swframeexample.cxx | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 2b74ef1251f7..415e3d23eb92 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -807,10 +807,10 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang long nRubyWidth = rRenderContext.GetTextWidth(sRubyText); rRenderContext.SetFont(aSaveFont); - sal_Int32 nAdjust = m_pParentDlg->m_pAdjustLB->GetSelectEntryPos(); + RubyAdjust nAdjust = (RubyAdjust)m_pParentDlg->m_pAdjustLB->GetSelectEntryPos(); //use center if no adjustment is available - if (nAdjust > 4) - nAdjust = 1; + if (nAdjust > RubyAdjust_INDENT_BLOCK) + nAdjust = RubyAdjust_CENTER; //which part is stretched ? bool bRubyStretch = nBaseWidth >= nRubyWidth; @@ -892,6 +892,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang case RubyAdjust_CENTER: rRenderContext.DrawText(Point(nCenter - nOutTextWidth / 2 , nYOutput), sOutputText); break; + default: break; } rRenderContext.SetFont(aSaveFont); rRenderContext.Pop(); diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 8f0a9e5d8fb8..46f8db0778f1 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> -#include <com/sun/star/text/WrapTextMode.hpp> using namespace ::com::sun::star::text; @@ -662,6 +661,7 @@ void SvxSwFrameExample::Paint(vcl::RenderContext& rRenderContext, const tools::R case WrapTextMode_RIGHT: aTxt.Left() = aFrmRect.Right(); break; + default: break; } } if (pOuterFrame->IsInside(aTxt)) |