[Libreoffice-commits] core.git: 2 commits - include/tools include/vcl vcl/source
Caolán McNamara
caolanm at redhat.com
Tue Oct 22 10:28:21 PDT 2013
include/tools/string.hxx | 3 ---
include/vcl/menu.hxx | 4 ++--
vcl/source/window/menu.cxx | 4 ++--
3 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit b566f08a480d2af3c71dad9b33f0b69adafaf0f1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 22 16:33:21 2013 +0100
ImplCalcSize etc can be const
Change-Id: Idd1e33b6da8be9575e74701735f0dbc742849c07
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 78a1644..454ddd0 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -148,7 +148,7 @@ protected:
SAL_DLLPRIVATE Menu* ImplGetStartMenu();
SAL_DLLPRIVATE Menu* ImplFindSelectMenu();
SAL_DLLPRIVATE Menu* ImplFindMenu( sal_uInt16 nId );
- SAL_DLLPRIVATE Size ImplCalcSize( Window* pWin );
+ SAL_DLLPRIVATE Size ImplCalcSize( const Window* pWin );
SAL_DLLPRIVATE sal_Bool ImplIsVisible( sal_uInt16 nPos ) const;
SAL_DLLPRIVATE sal_Bool ImplIsSelectable( sal_uInt16 nPos ) const;
SAL_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const;
@@ -168,7 +168,7 @@ protected:
// returns native check and option menu symbol height in rCheckHeight and rRadioHeight
// return value is maximum width and height of checkboxes and radiobuttons
- SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( Window*, long& rCheckHeight, long& rRadioHeight ) const;
+ SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( const Window*, long& rCheckHeight, long& rRadioHeight ) const;
// returns native submenu arrow size and spacing from right border
// return value is whether it's supported natively
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 23545a9..f567ba3 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2252,7 +2252,7 @@ void Menu::SetAccessible( const ::com::sun::star::uno::Reference< ::com::sun::st
mxAccessible = rxAccessible;
}
-Size Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight ) const
+Size Menu::ImplGetNativeCheckAndRadioSize( const Window* pWin, long& rCheckHeight, long& rRadioHeight ) const
{
long nCheckWidth = 0, nRadioWidth = 0;
rCheckHeight = rRadioHeight = 0;
@@ -2367,7 +2367,7 @@ void Menu::ImplRemoveDel( ImplMenuDelData& rDel )
// -----------------------------------------------------------------------
-Size Menu::ImplCalcSize( Window* pWin )
+Size Menu::ImplCalcSize( const Window* pWin )
{
// | Check/Radio/Image| Text| Accel/Popup|
commit 7e322f2d784de63085a84c0012ed5096ad863b83
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 22 14:59:40 2013 +0100
drop unused StringCompare
Change-Id: I09a350dbd35a04f737d360bff7804dab74fdce82
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 1757a64..0c4571d 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -24,15 +24,12 @@
/*******************************************************************************
* THIS CODE IS DEPRECATED. DO NOT USE IT IN ANY NEW CODE.
- * There will not be any fixes to the code here.
******************************************************************************/
#define STRING_NOTFOUND ((xub_StrLen)0xFFFF)
#define STRING_LEN ((xub_StrLen)0xFFFF)
#define STRING_MAXLEN ((xub_StrLen)0xFFFF)
-enum StringCompare { COMPARE_LESS = -1, COMPARE_EQUAL = 0, COMPARE_GREATER = 1 };
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list