[Libreoffice-commits] core.git: 2 commits - basic/source svtools/source

[Noel Grandin]

 basic/source/runtime/methods1.cxx  |    2 +-
 basic/source/runtime/stdobj.cxx    |    2 +-
 svtools/source/contnr/imivctl.hxx  |    7 +++----
 svtools/source/contnr/imivctl1.cxx |   14 +++++++-------
 4 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 93bde3156284df4419c49447cbf455de9d74f00a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Feb 6 15:57:42 2017 +0200

    Revert "[API CHANGE] return sal_uInt64 from GetSystemTicks in basic"
    
    This reverts commit fce604c8ae11b462113305aba080d77f8193cfea,
    and fixes
      tdf#105735 - xray ThisComponent no longer works
    in the process.
    
    It turns out Basic doesn't support sal_uInt64 very well, so lets rather
    have a small possibility of bad timestamps instead of broken scripts.
    
    Change-Id: Ic00485bd517a4fc61e05632001c9a5f92e05ddd6
    Reviewed-on: https://gerrit.libreoffice.org/33972
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index f24e426..c14281c 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1415,7 +1415,7 @@ RTLFUNC(GetSystemTicks)
         StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
         return;
     }
-    rPar.Get(0)->PutUInt64( tools::Time::GetSystemTicks() );
+    rPar.Get(0)->PutLong( tools::Time::GetSystemTicks() );
 }
 
 RTLFUNC(GetPathSeparator)
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 34ce7d8..0eac637 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -307,7 +307,7 @@ static Methods aMethods[] = {
 { "GetPathSeparator",  SbxSTRING,     FUNCTION_,RTLNAME(GetPathSeparator),0 },
 { "GetProcessServiceManager", SbxOBJECT, 0 | FUNCTION_, RTLNAME(GetProcessServiceManager),0 },
 { "GetSolarVersion",  SbxLONG,     FUNCTION_,RTLNAME(GetSolarVersion),0     },
-{ "GetSystemTicks",   SbxSALUINT64,FUNCTION_,RTLNAME(GetSystemTicks),0      },
+{ "GetSystemTicks",  SbxLONG,      FUNCTION_,RTLNAME(GetSystemTicks),0      },
 { "GetSystemType",  SbxINTEGER,    FUNCTION_,RTLNAME(GetSystemType),0       },
 { "GlobalScope",    SbxOBJECT,     FUNCTION_,RTLNAME(GlobalScope),0         },
 { "Green",          SbxINTEGER,   1 | FUNCTION_ | NORMONLY_, RTLNAME(Green),0           },
commit d16e1336f0b1251c0e1ffbe171bc26ed48ea49f0
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Feb 6 13:53:56 2017 +0200

    convert IcnViewFieldType to scoped enum
    
    and drop unused IcnViewFieldTypeDontknow constant
    
    Change-Id: I583c05d8b312b0e4fb291fa4ce8d0989318f79df
    Reviewed-on: https://gerrit.libreoffice.org/33966
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 6a108e3..b9b7975 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -82,11 +82,10 @@ namespace o3tl {
 #define VIEWMODE_MASK   (WB_ICON | WB_SMALLICON | WB_DETAILS)
 
 
-enum IcnViewFieldType
+enum class IcnViewFieldType
 {
-    IcnViewFieldTypeDontknow = 0,
-    IcnViewFieldTypeImage = 1,
-    IcnViewFieldTypeText = 2
+    Image,
+    Text
 };
 
 
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index a08a262..f1454f5 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -1556,7 +1556,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem(const Rectangle& rRect,
     IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry, sal_uInt16 nPaintFlags,
     vcl::RenderContext& rRenderContext )
 {
-    if (eItem == IcnViewFieldTypeText)
+    if (eItem == IcnViewFieldType::Text)
     {
         OUString aText = SvtIconChoiceCtrl::GetEntryText(pEntry, false);
 
@@ -1651,9 +1651,9 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po
                                                   bActiveSelection ? 1 : 2, false, true, false);
 
 
-    PaintItem(aBmpRect, IcnViewFieldTypeImage, pEntry, nBmpPaintFlags, rRenderContext);
+    PaintItem(aBmpRect, IcnViewFieldType::Image, pEntry, nBmpPaintFlags, rRenderContext);
 
-    PaintItem(aTextRect, IcnViewFieldTypeText, pEntry, nTextPaintFlags, rRenderContext);
+    PaintItem(aTextRect, IcnViewFieldType::Text, pEntry, nTextPaintFlags, rRenderContext);
 
     // draw highlight frame
     if (pEntry == pCurHighlightFrame && !bNoEmphasis)
@@ -1856,7 +1856,7 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* pEntry,
 
 long SvxIconChoiceCtrl_Impl::CalcBoundingWidth( SvxIconChoiceCtrlEntry* pEntry ) const
 {
-    long nStringWidth = GetItemSize( pEntry, IcnViewFieldTypeText ).Width();
+    long nStringWidth = GetItemSize( pEntry, IcnViewFieldType::Text ).Width();
 //  nStringWidth += 2*LROFFS_TEXT;
     long nWidth = 0;
 
@@ -1878,7 +1878,7 @@ long SvxIconChoiceCtrl_Impl::CalcBoundingWidth( SvxIconChoiceCtrlEntry* pEntry )
 
 long SvxIconChoiceCtrl_Impl::CalcBoundingHeight( SvxIconChoiceCtrlEntry* pEntry ) const
 {
-    long nStringHeight = GetItemSize( pEntry, IcnViewFieldTypeText).Height();
+    long nStringHeight = GetItemSize( pEntry, IcnViewFieldType::Text).Height();
     long nHeight = 0;
 
     switch( nWinBits & (VIEWMODE_MASK) )
@@ -2437,9 +2437,9 @@ void SvxIconChoiceCtrl_Impl::Scroll( long nDeltaX, long nDeltaY )
 const Size& SvxIconChoiceCtrl_Impl::GetItemSize( SvxIconChoiceCtrlEntry*,
     IcnViewFieldType eItem ) const
 {
-    if (eItem == IcnViewFieldTypeText)
+    if (eItem == IcnViewFieldType::Text)
         return aDefaultTextSize;
-    return aImageSize;
+    return aImageSize; // IcnViewFieldType::Image
 }
 
 Rectangle SvxIconChoiceCtrl_Impl::CalcFocusRect( SvxIconChoiceCtrlEntry* pEntry )