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

[Stephan Bergmann]

 vcl/source/window/menubarwindow.cxx      |    2 +-
 vcl/source/window/menufloatingwindow.cxx |    4 ++--
 vcl/source/window/menuitemlist.cxx       |    6 +++---
 vcl/source/window/menuitemlist.hxx       |    6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ea4fdc135e879ea6087f3f4a0a6ce0f04b1d1d7d
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Sat Feb 25 17:24:04 2017 +0100

    Propagate sal_uInt16/size_t mismatch out of MenuItemList::SearchItem
    
    Change-Id: I31ae81876c541979600ecd25ab7a6e3a0e3b0d0b

diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index a2ad3a9..dfca714 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -825,7 +825,7 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& 
rKEvent, bool bFromMenu )
         sal_Unicode nCharCode = rKEvent.GetCharCode();
         if ( nCharCode )
         {
-            sal_uInt16 nEntry, nDuplicates;
+            size_t nEntry, nDuplicates;
             MenuItemData* pData = pMenu->GetItemList()->SearchItem( nCharCode, 
rKEvent.GetKeyCode(), nEntry, nDuplicates, nHighlightedItem );
             if ( pData && (nEntry != ITEMPOS_INVALID) )
             {
diff --git a/vcl/source/window/menufloatingwindow.cxx 
b/vcl/source/window/menufloatingwindow.cxx
index 4acbb06..32de3fd 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1124,8 +1124,8 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& 
rKEvent )
         default:
         {
             sal_Unicode nCharCode = rKEvent.GetCharCode();
-            sal_uInt16 nPos = 0;
-            sal_uInt16 nDuplicates = 0;
+            size_t nPos = 0;
+            size_t nDuplicates = 0;
             MenuItemData* pData = (nCharCode && pMenu && accel) ?
                 pMenu->GetItemList()->SearchItem(nCharCode, 
rKEvent.GetKeyCode(), nPos, nDuplicates, nHighlightedItem) : nullptr;
             if (pData)
diff --git a/vcl/source/window/menuitemlist.cxx 
b/vcl/source/window/menuitemlist.cxx
index 44757a4..7316ed9 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -151,9 +151,9 @@ MenuItemData* MenuItemList::GetData( sal_uInt16 nSVId, 
size_t& rPos ) const
 MenuItemData* MenuItemList::SearchItem(
     sal_Unicode cSelectChar,
     KeyCode aKeyCode,
-    sal_uInt16& rPos,
-    sal_uInt16& nDuplicates,
-    sal_uInt16 nCurrentPos
+    size_t& rPos,
+    size_t& nDuplicates,
+    size_t nCurrentPos
 ) const
 {
     const vcl::I18nHelper& rI18nHelper = 
Application::GetSettings().GetUILocaleI18nHelper();
diff --git a/vcl/source/window/menuitemlist.hxx 
b/vcl/source/window/menuitemlist.hxx
index 89befc1..b06a614 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -131,9 +131,9 @@ public:
     MenuItemData*   SearchItem(
                         sal_Unicode cSelectChar,
                         vcl::KeyCode aKeyCode,
-                        sal_uInt16& rPos,
-                        sal_uInt16& nDuplicates,
-                        sal_uInt16 nCurrentPos
+                        size_t& rPos,
+                        size_t& nDuplicates,
+                        size_t nCurrentPos
                     ) const;
     size_t          GetItemCount( sal_Unicode cSelectChar ) const;
     size_t          GetItemCount( vcl::KeyCode aKeyCode ) const;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits