summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r--sc/source/ui/inc/AccessibleCellBase.hxx6
-rw-r--r--sc/source/ui/inc/AccessibleContextBase.hxx13
-rw-r--r--sc/source/ui/inc/AccessibleCsvControl.hxx6
-rw-r--r--sc/source/ui/inc/drawsh.hxx2
-rw-r--r--sc/source/ui/inc/inscldlg.hxx2
-rw-r--r--sc/source/ui/inc/instbdlg.hxx6
6 files changed, 18 insertions, 17 deletions
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx
index a2af98ca822f..8445a52ea116 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -46,6 +46,9 @@ protected:
virtual ~ScAccessibleCellBase();
public:
+ virtual bool SAL_CALL isVisible()
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
///===== XInterface =====================================================
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
@@ -58,9 +61,6 @@ public:
///===== XAccessibleComponent ============================================
- virtual sal_Bool SAL_CALL isVisible()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
virtual sal_Int32 SAL_CALL getForeground( )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index f780fef556e5..8fa0a696525b 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -80,6 +80,13 @@ public:
protected:
virtual ~ScAccessibleContextBase(void);
public:
+
+ virtual bool SAL_CALL isShowing( )
+ throw (::com::sun::star::uno::RuntimeException);
+
+ virtual bool SAL_CALL isVisible()
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
+
///===== SfxListener =====================================================
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
@@ -123,12 +130,6 @@ public:
virtual ::com::sun::star::awt::Size SAL_CALL getSize( )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isShowing( )
- throw (::com::sun::star::uno::RuntimeException);
-
- virtual sal_Bool SAL_CALL isVisible()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
-
virtual void SAL_CALL grabFocus( )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index 2d35ffa4400f..1c95dfbf2155 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -63,15 +63,15 @@ public:
using ScAccessibleContextBase::disposing;
virtual void SAL_CALL disposing() SAL_OVERRIDE;
+ /** Returns true, if the control is visible. */
+ virtual bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
// XAccessibleComponent ---------------------------------------------------
/** Returns the child at the specified point (cell returns NULL). */
virtual XAccessibleRef SAL_CALL getAccessibleAtPoint( const AwtPoint& rPoint )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- /** Returns true, if the control is visible. */
- virtual sal_Bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
/** Sets the focus to this control. */
virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 2643ff09ee54..61eb936cafb5 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -85,7 +85,7 @@ public:
ScDrawView* GetDrawView();
- sal_Bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark);
+ bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark);
void GetDrawAttrStateForIFBX( SfxItemSet& rSet );
::rtl::OUString GetSidebarContextName (void);
diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx
index 39b4d3fab705..cd7a4b59b549 100644
--- a/sc/source/ui/inc/inscldlg.hxx
+++ b/sc/source/ui/inc/inscldlg.hxx
@@ -36,7 +36,7 @@ private:
RadioButton* m_pBtnInsCol;
public:
- ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove = false );
+ ScInsertCellDlg( Window* pParent,bool bDisallowCellMove = false );
virtual ~ScInsertCellDlg();
InsCellCmd GetInsCellCmd() const;
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 2e6842d691a5..d247b356214f 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -47,13 +47,13 @@ public:
virtual short Execute() SAL_OVERRIDE; // overloaded to set parent dialog
- sal_Bool GetTablesFromFile() const { return m_pBtnFromFile->IsChecked(); }
- sal_Bool GetTablesAsLink() const { return m_pBtnLink->IsChecked(); }
+ bool GetTablesFromFile() const { return m_pBtnFromFile->IsChecked(); }
+ bool GetTablesAsLink() const { return m_pBtnLink->IsChecked(); }
const OUString* GetFirstTable( sal_uInt16* pN = NULL );
const OUString* GetNextTable( sal_uInt16* pN = NULL );
ScDocShell* GetDocShellTables() { return pDocShTables; }
- sal_Bool IsTableBefore() const { return m_pBtnBefore->IsChecked(); }
+ bool IsTableBefore() const { return m_pBtnBefore->IsChecked(); }
SCTAB GetTableCount() const { return nTableCount;}
private: