mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS vcl112

Browse Source
This commit is contained in:
obo
2010-06-21 15:48:10 +02:00
parent c49cbbfd98 715b125885
commit 58dc05cfb6
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
View File

@@ -173,14 +173,6 @@ public:
protected: protected:
// internal helper methods ------------------------------------------------ // internal helper methods ------------------------------------------------
/** @attention This method requires locked mutex's and a living object.
@param nColumn
the position of the column in the Accessible world
@return
the position of the column in VCL the Accessible world
*/
sal_uInt16 implToVCLColumnPos( sal_Int32 nColumn ) const;
/** @attention This method requires locked mutex's and a living object. /** @attention This method requires locked mutex's and a living object.
@return The number of cells of the table. */ @return The number of cells of the table. */
sal_Int32 implGetChildCount() const; sal_Int32 implGetChildCount() const;

13
accessibility/source/extended/AccessibleGridControlTableBase.cxx
View File

@@ -220,19 +220,6 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlTableBase::getImplementationI
// internal helper methods ---------------------------------------------------- // internal helper methods ----------------------------------------------------
sal_uInt16 AccessibleGridControlTableBase::implToVCLColumnPos( sal_Int32 nColumn ) const
{
sal_uInt16 nVCLPos = 0;
if( (0 <= nColumn) && (nColumn < m_aTable.GetColumnCount()) )
{
// regard "handle column"
if( m_aTable.HasRowHeader() )
++nColumn;
nVCLPos = static_cast< sal_uInt16 >( nColumn );
}
return nVCLPos;
}
sal_Int32 AccessibleGridControlTableBase::implGetChildCount() const sal_Int32 AccessibleGridControlTableBase::implGetChildCount() const
{ {
return m_aTable.GetRowCount()*m_aTable.GetColumnCount(); return m_aTable.GetRowCount()*m_aTable.GetColumnCount();

5
extensions/source/scanner/sane.cxx
View File

@@ -642,6 +642,11 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
nStatus = p_get_parameters( maHandle, &aParams ); nStatus = p_get_parameters( maHandle, &aParams );
DUMP_STATE( nStatus, "sane_get_parameters" ); DUMP_STATE( nStatus, "sane_get_parameters" );
CheckConsistency( "sane_get_parameters" ); CheckConsistency( "sane_get_parameters" );
if (nStatus != SANE_STATUS_GOOD || aParams.bytes_per_line == 0)
{
bSuccess = FALSE;
break;
}
#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
const char* ppFormats[] = { "SANE_FRAME_GRAY", "SANE_FRAME_RGB", const char* ppFormats[] = { "SANE_FRAME_GRAY", "SANE_FRAME_RGB",
"SANE_FRAME_RED", "SANE_FRAME_GREEN", "SANE_FRAME_RED", "SANE_FRAME_GREEN",