summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-10-05 14:22:00 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-10-05 18:51:38 -0500
commitc6f8b749669589a2e645364033ea8882105ccf2d (patch)
treefe5f0555113efd43bc56efc6e5b4396fb6c1c71e
parentaccfixes2: bugfix (diff)
downloadcore-feature/accfixes2.tar.gz
core-feature/accfixes2.zip
accfixes2: fixes compiler issues feature/accfixes2
-rw-r--r--accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx21
-rw-r--r--accessibility/inc/accessibility/helper/listboxhelper.hxx5
2 files changed, 16 insertions, 10 deletions
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index 37bfd1997409..5a2ac2d83042 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -45,21 +45,22 @@ namespace accessibility
virtual Rectangle GetDropDownPosSizePixel( ) const = 0;
virtual Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
virtual Rectangle GetWindowExtentsRelative( Window* pRelativeWindow ) = 0;
- virtual sal_Bool IsActive() const = 0;
- virtual sal_Bool IsEntryVisible( sal_uInt16 nPos ) const = 0;
- virtual sal_uInt16 GetDisplayLineCount() const = 0;
+ virtual sal_Bool IsActive() const = 0;
+ virtual sal_Bool IsEnabled() const = 0;
+ virtual sal_Bool IsEntryVisible( sal_uInt16 nPos ) const = 0;
+ virtual sal_uInt16 GetDisplayLineCount() const = 0;
virtual void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const = 0;
virtual WinBits GetStyle() const = 0;
- virtual sal_Bool IsMultiSelectionEnabled() const = 0;
- virtual sal_uInt16 GetTopEntry() const = 0;
- virtual sal_Bool IsEntryPosSelected( sal_uInt16 nPos ) const = 0;
- virtual sal_uInt16 GetEntryCount() const = 0;
+ virtual sal_Bool IsMultiSelectionEnabled() const = 0;
+ virtual sal_uInt16 GetTopEntry() const = 0;
+ virtual sal_Bool IsEntryPosSelected( sal_uInt16 nPos ) const = 0;
+ virtual sal_uInt16 GetEntryCount() const = 0;
virtual void Select() = 0;
virtual void SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect = sal_True ) = 0;
- virtual sal_uInt16 GetSelectEntryCount() const = 0;
+ virtual sal_uInt16 GetSelectEntryCount() const = 0;
virtual void SetNoSelection() = 0;
- virtual sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const = 0;
- virtual sal_Bool IsInDropDown() const = 0;
+ virtual sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const = 0;
+ virtual sal_Bool IsInDropDown() const = 0;
virtual Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
virtual long GetIndexForPoint( const Point& rPoint, sal_uInt16& nPos ) const = 0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx
index c928735e42ea..390e805b8239 100644
--- a/accessibility/inc/accessibility/helper/listboxhelper.hxx
+++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx
@@ -94,6 +94,11 @@ public:
{
return m_aComboListBox.IsActive();
}
+ virtual sal_Bool IsEnabled() const
+ {
+ return m_aComboListBox.IsEnabled();
+ }
+
// -----------------------------------------------------------------------------
virtual sal_Bool IsEntryVisible( sal_uInt16 nPos ) const
{