From f7a24eff2d40ca30c6f299ab6534393c5c146b95 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Fri, 12 Oct 2012 13:26:46 +0200 Subject: mark lcl_ functions static or rename them if they are not local at all http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html Change-Id: I231f0b367bf0b513c6c1ce4c4cfdb7c3dc8660d5 --- connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 4 ++-- connectivity/source/drivers/calc/CTable.cxx | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'connectivity/source/drivers/calc') diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index a72ab7a52cc5..9afd1b1843c9 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -284,7 +284,7 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLExce // ------------------------------------------------------------------------- -sal_Bool lcl_IsEmptyOrHidden( const Reference& xSheets, const ::rtl::OUString& rName ) +static sal_Bool lcl_IsEmptyOrHidden( const Reference& xSheets, const ::rtl::OUString& rName ) { Any aAny = xSheets->getByName( rName ); Reference xSheet; @@ -326,7 +326,7 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference& xSheets, const ::r return sal_False; } -sal_Bool lcl_IsUnnamed( const Reference& xRanges, const ::rtl::OUString& rName ) +static sal_Bool lcl_IsUnnamed( const Reference& xRanges, const ::rtl::OUString& rName ) { sal_Bool bUnnamed = sal_False; diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 3d0f2cbcc956..da8cbe573657 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::util; -void lcl_UpdateArea( const Reference& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow ) +static void lcl_UpdateArea( const Reference& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_UpdateArea" ); // update rEndCol, rEndRow if any non-empty cell in xUsedRange is right/below @@ -90,7 +90,7 @@ void lcl_UpdateArea( const Reference& xUsedRange, sal_Int32& rEndCol } } -void lcl_GetDataArea( const Reference& xSheet, sal_Int32& rColumnCount, sal_Int32& rRowCount ) +static void lcl_GetDataArea( const Reference& xSheet, sal_Int32& rColumnCount, sal_Int32& rRowCount ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetDataArea" ); Reference xCursor = xSheet->createCursor(); @@ -140,7 +140,7 @@ void lcl_GetDataArea( const Reference& xSheet, sal_Int32& rColumnC rRowCount = nEndRow; // first row (headers) is not counted } -CellContentType lcl_GetContentOrResultType( const Reference& xCell ) +static CellContentType lcl_GetContentOrResultType( const Reference& xCell ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetContentOrResultType" ); CellContentType eCellType = xCell->getType(); @@ -160,7 +160,7 @@ CellContentType lcl_GetContentOrResultType( const Reference& xCell ) return eCellType; } -Reference lcl_GetUsedCell( const Reference& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow ) +static Reference lcl_GetUsedCell( const Reference& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetUsedCell" ); Reference xCell = xSheet->getCellByPosition( nDocColumn, nDocRow ); @@ -198,7 +198,7 @@ Reference lcl_GetUsedCell( const Reference& xSheet, sal_Int return xCell; } -bool lcl_HasTextInColumn( const Reference& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow ) +static bool lcl_HasTextInColumn( const Reference& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_HasTextInColumn" ); // look for any text cell or text result in the column @@ -226,7 +226,7 @@ bool lcl_HasTextInColumn( const Reference& xSheet, sal_Int32 nDocC return false; } -void lcl_GetColumnInfo( const Reference& xSheet, const Reference& xFormats, +static void lcl_GetColumnInfo( const Reference& xSheet, const Reference& xFormats, sal_Int32 nDocColumn, sal_Int32 nStartRow, sal_Bool bHasHeaders, ::rtl::OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency ) { @@ -314,7 +314,7 @@ void lcl_GetColumnInfo( const Reference& xSheet, const Reference& xSheet, +static void lcl_SetValue( ORowSetValue& rValue, const Reference& xSheet, sal_Int32 nStartCol, sal_Int32 nStartRow, sal_Bool bHasHeaders, const ::Date& rNullDate, sal_Int32 nDBRow, sal_Int32 nDBColumn, sal_Int32 nType ) @@ -431,7 +431,7 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference& xSheet, // ------------------------------------------------------------------------- -::rtl::OUString lcl_GetColumnStr( sal_Int32 nColumn ) +static ::rtl::OUString lcl_GetColumnStr( sal_Int32 nColumn ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetColumnStr" ); if ( nColumn < 26 ) -- cgit