slidecopy: make Get(CLient)WindowExtentsRelative const

8 files changed, 41 insertions, 41 deletions

diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
index 0e3f08bfc568..b5bc53f33709 100755
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/svtools/inc/svtools/accessibletable.hxx
@@ -103,7 +103,7 @@ public:
             AccessibleTableControlObjType eObjType ) const= 0;
 
     // Window
-    virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) = 0;
+    virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0;
     virtual void GrabFocus()= 0;
     virtual XACC GetAccessible( BOOL bCreate = TRUE )= 0;
     virtual Window* GetAccessibleParentWindow() const= 0;
diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx
index f77f34aeb463..e0e8a042d7aa 100644
--- a/svtools/inc/svtools/accessibletableprovider.hxx
+++ b/svtools/inc/svtools/accessibletableprovider.hxx
@@ -135,7 +135,7 @@ public:
     virtual BOOL                    GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0;
 
     // Window
-    virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) = 0;
+    virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0;
     virtual void                    GrabFocus() = 0;
     virtual XACC                    GetAccessible( BOOL bCreate = TRUE ) = 0;
     virtual Window*                 GetAccessibleParentWindow() const = 0;
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index 8296c9f994f6..7c3ded029e11 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -851,7 +851,7 @@ public:
     virtual sal_Bool                IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
     virtual String                  GetAccessibleCellText(long _nRow, USHORT _nColPos) const;
     virtual BOOL                    GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
-    virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow );
+    virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) const;
     virtual void                    GrabFocus();
     virtual XACC                    GetAccessible( BOOL bCreate = TRUE );
     virtual Window*                 GetAccessibleParentWindow() const;
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index 8018b8650dc5..5c16afa1232f 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -254,7 +254,7 @@ public:
     virtual BOOL                    GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
 
     // Window
-    virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow );
+    virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) const;
     virtual void                    GrabFocus();
     virtual XACC                    GetAccessible( BOOL bCreate = TRUE );
     virtual Window*                 GetAccessibleParentWindow() const;
diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx
index e3edd0b681ae..0c8d9d92b2b9 100644
--- a/svtools/inc/svtools/table/tablecontrol.hxx
+++ b/svtools/inc/svtools/table/tablecontrol.hxx
@@ -179,7 +179,7 @@ namespace svt { namespace table
             AccessibleTableControlObjType eObjType ) const;
 
         //// Window
-        virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow );
+        virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const;
         virtual void GrabFocus();
         virtual XACC GetAccessible( BOOL bCreate = TRUE );
         virtual Window* GetAccessibleParentWindow() const;
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index cc1816551237..8fb5d91ad27c 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -545,7 +545,7 @@ BOOL BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const String& rStr, in
     return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector );
 }
 // -----------------------------------------------------------------------------
-Rectangle BrowseBox::GetWindowExtentsRelative( Window *pRelativeWindow )
+Rectangle BrowseBox::GetWindowExtentsRelative( Window *pRelativeWindow ) const
 {
     return Control::GetWindowExtentsRelative( pRelativeWindow );
 }
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 3b4907e7a80d..122d0016d568 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -1235,7 +1235,7 @@ BOOL SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const String&
     return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector );
 }
 // -----------------------------------------------------------------------
-Rectangle SvHeaderTabListBox::GetWindowExtentsRelative( Window *pRelativeWindow )
+Rectangle SvHeaderTabListBox::GetWindowExtentsRelative( Window *pRelativeWindow ) const
 {
     return Control::GetWindowExtentsRelative( pRelativeWindow );
 }
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 1d7b046ae94b..d7fd48962b89 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -393,7 +393,7 @@ void TableControl::FillAccessibleStateSet(
     }
 }
 
-Rectangle TableControl::GetWindowExtentsRelative( Window *pRelativeWindow )
+Rectangle TableControl::GetWindowExtentsRelative( Window *pRelativeWindow ) const
 {
     return Control::GetWindowExtentsRelative( pRelativeWindow );
 }
@@ -491,48 +491,48 @@ sal_Int32 TableControl::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnP
 {
     (void)_nRow;
     (void)_nColumnPos;
-    return GetIndexForPoint(_rPoint);

+    return GetIndexForPoint(_rPoint);
 ;
 }
- // -----------------------------------------------------------------------------

-sal_Bool TableControl::isAccessibleAlive( ) const

-{

-    return ( NULL != m_pAccessTable->m_pAccessible ) && m_pAccessTable->m_pAccessible->isAlive();

-}

+ // -----------------------------------------------------------------------------
+sal_Bool TableControl::isAccessibleAlive( ) const
+{
+    return ( NULL != m_pAccessTable->m_pAccessible ) && m_pAccessTable->m_pAccessible->isAlive();
+}
 
 // -----------------------------------------------------------------------------
 ::svt::IAccessibleFactory& TableControl::getAccessibleFactory()
 {
     return m_pAccessTable->m_aFactoryAccess.getFactory();
 }
-// -----------------------------------------------------------------------------

-void TableControl::commitGridControlEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue )

-{

-     if ( isAccessibleAlive() )

-         m_pAccessTable->m_pAccessible->commitEvent( _nEventId, _rNewValue, _rOldValue);

+// -----------------------------------------------------------------------------
+void TableControl::commitGridControlEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue )
+{
+     if ( isAccessibleAlive() )
+         m_pAccessTable->m_pAccessible->commitEvent( _nEventId, _rNewValue, _rOldValue);
+}
+// -----------------------------------------------------------------------------
+Rectangle TableControl::calcHeaderRect(sal_Bool _bIsColumnBar,BOOL _bOnScreen)
+{
+    (void)_bOnScreen;
+    Rectangle aRectTable, aRectTableWithHeaders;
+    m_pImpl->impl_getAllVisibleDataCellArea(aRectTable);
+    m_pImpl->impl_getAllVisibleCellsArea(aRectTableWithHeaders);
+    Size aSizeTable(aRectTable.GetSize());
+    Size aSizeTableWithHeaders(aRectTableWithHeaders.GetSize());
+    if(_bIsColumnBar)
+        return Rectangle(aRectTableWithHeaders.TopLeft(),Size(aSizeTableWithHeaders.Width()-aSizeTable.Width(), aSizeTableWithHeaders.Height()));
+    else
+        return Rectangle(aRectTableWithHeaders.TopLeft(),Size(aSizeTableWithHeaders.Width(), aSizeTableWithHeaders.Height()-aSizeTable.Height()));
+}
+// -----------------------------------------------------------------------------
+Rectangle TableControl::calcTableRect(BOOL _bOnScreen)
+{
+    (void)_bOnScreen;
+    Rectangle aRect;
+    m_pImpl->impl_getAllVisibleDataCellArea(aRect);
+    return aRect;
 }
-// -----------------------------------------------------------------------------

-Rectangle TableControl::calcHeaderRect(sal_Bool _bIsColumnBar,BOOL _bOnScreen)

-{

-    (void)_bOnScreen;

-    Rectangle aRectTable, aRectTableWithHeaders;

-    m_pImpl->impl_getAllVisibleDataCellArea(aRectTable);

-    m_pImpl->impl_getAllVisibleCellsArea(aRectTableWithHeaders);

-    Size aSizeTable(aRectTable.GetSize());

-    Size aSizeTableWithHeaders(aRectTableWithHeaders.GetSize());

-    if(_bIsColumnBar)

-        return Rectangle(aRectTableWithHeaders.TopLeft(),Size(aSizeTableWithHeaders.Width()-aSizeTable.Width(), aSizeTableWithHeaders.Height()));

-    else

-        return Rectangle(aRectTableWithHeaders.TopLeft(),Size(aSizeTableWithHeaders.Width(), aSizeTableWithHeaders.Height()-aSizeTable.Height()));

-}

-// -----------------------------------------------------------------------------

-Rectangle TableControl::calcTableRect(BOOL _bOnScreen)

-{

-    (void)_bOnScreen;

-    Rectangle aRect;

-    m_pImpl->impl_getAllVisibleDataCellArea(aRect);

-    return aRect;

-}

 
 //........................................................................
 }} // namespace svt::table