[Libreoffice-commits] core.git: svx/source

Sarper Akdemir (via logerrit) logerrit at kemper.freedesktop.org
Mon Jan 27 12:48:10 UTC 2020


 svx/source/dialog/fntctrl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 09a2432c5939f20be49d9f7e2ee5c65d00c9433f
Author:     Sarper Akdemir <q.sarperakdemir at gmail.com>
AuthorDate: Mon Jan 27 02:04:44 2020 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Mon Jan 27 13:47:38 2020 +0100

    tdf#75280: Convert inappropriate use of sal_uIntPtr to better integer types
    
    Change-Id: Ifa5991296bda4c4b3f86f01c3713b5a5f8f9acb5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87471
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 27c0fa2ddaf1..6dd3e62c5f21 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -143,7 +143,7 @@ class FontPrevWin_Impl
     bool mbDelPrinter;
 
     Reference <XBreakIterator> mxBreak;
-    std::vector<sal_uIntPtr> maTextWidth;
+    std::vector<long> maTextWidth;
     std::deque<sal_Int32> maScriptChg;
     std::vector<sal_uInt16> maScriptType;
     SvxFont maCJKFont;
@@ -327,7 +327,7 @@ Size FontPrevWin_Impl::CalcTextSize(vcl::RenderContext& rRenderContext, OutputDe
                                     ((nScript == css::i18n::ScriptType::COMPLEX) ?
                                         maCTLFont :
                                         rInFont);
-        sal_uIntPtr nWidth = rFont.GetTextSize(_pPrinter, maText, nStart, nEnd - nStart).Width();
+        long nWidth = rFont.GetTextSize(_pPrinter, maText, nStart, nEnd - nStart).Width();
         if (nIdx >= maTextWidth.size())
             break;
 


More information about the Libreoffice-commits mailing list