[Libreoffice-commits] .: 2 commits - binfilter/bf_forms binfilter/bf_sc binfilter/bf_sch binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svx binfilter/inc lotuswordpro/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Apr 15 07:50:44 PDT 2011
binfilter/bf_forms/source/component/forms_GroupManager.cxx | 8 ++++----
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 10 ++++++++++
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx | 6 +++++-
binfilter/bf_sch/source/core/sch_chtmode4.cxx | 4 ++--
binfilter/bf_sch/source/core/sch_globfunc.cxx | 8 ++++----
binfilter/bf_so3/source/inplace/embobj.cxx | 2 +-
binfilter/bf_starmath/source/starmath_format.cxx | 3 ---
binfilter/bf_svx/source/editeng/svx_editeng.cxx | 4 ----
binfilter/inc/bf_sch/globfunc.hxx | 4 +---
lotuswordpro/source/filter/genericfilter.cxx | 4 ++--
10 files changed, 29 insertions(+), 24 deletions(-)
New commits:
commit 139e51ae493ae132402db9666d8658ec6d9886d0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 15 15:46:30 2011 +0100
if using gbuild component_getFactory needs to be SAL_DLLPUBLIC_EXPORT
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index 0594500..5f82b1e 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -19,12 +19,12 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
commit 3f9a9a4f89fd5ab65d1a370978bd346ae17d9ab7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 15 15:25:05 2011 +0100
WaE: for enable-dbgutil
diff --git a/binfilter/bf_forms/source/component/forms_GroupManager.cxx b/binfilter/bf_forms/source/component/forms_GroupManager.cxx
index fa6919d..db93afc 100644
--- a/binfilter/bf_forms/source/component/forms_GroupManager.cxx
+++ b/binfilter/bf_forms/source/component/forms_GroupManager.cxx
@@ -162,10 +162,10 @@ OGroup::OGroup( const ::rtl::OUString& rGroupName )
#ifdef DBG_UTIL
//------------------------------------------------------------------
OGroup::OGroup( const OGroup& _rSource )
- :m_aGroupName(_rSource.m_aGroupName)
- ,m_nInsertPos(_rSource.m_nInsertPos)
- ,m_aCompArray(_rSource.m_aCompArray)
+ :m_aCompArray(_rSource.m_aCompArray)
,m_aCompAccArray(_rSource.m_aCompAccArray)
+ ,m_aGroupName(_rSource.m_aGroupName)
+ ,m_nInsertPos(_rSource.m_nInsertPos)
{
DBG_CTOR(OGroup,NULL);
}
@@ -386,7 +386,7 @@ sal_Int32 OGroupManager::getGroupCount()
//------------------------------------------------------------------
void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel> >& _rGroup, ::rtl::OUString& _rName)
{
- OSL_ENSURE(nGroup >= 0 && nGroup < m_aActiveGroupMap.size(),"OGroupManager::getGroup: Invalid group index!");
+ OSL_ENSURE(nGroup >= 0 && nGroup < static_cast<sal_Int32>(m_aActiveGroupMap.size()),"OGroupManager::getGroup: Invalid group index!");
OGroupArr::iterator aGroupPos = m_aActiveGroupMap[nGroup];
_rName = aGroupPos->second.GetGroupName();
_rGroup = aGroupPos->second.GetControlModels();
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index d38a876..e42fa7e 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -2060,6 +2060,8 @@ namespace binfilter {
/*?*/ bCorrected = TRUE;
/*?*/ }
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*?*/ }
/*?*/ }
/*?*/ }
@@ -2212,6 +2214,8 @@ namespace binfilter {
/*N*/ case ocGetActTime:
/*N*/ pArr->SetRecalcModeAlways();
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ pFacToken = pToken;
/*N*/ eOp = NextToken();
@@ -2239,6 +2243,8 @@ namespace binfilter {
/*N*/ case ocFormula:
/*?*/ pArr->SetRecalcModeAlways();
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ pFacToken = pToken;
/*N*/ eOp = NextToken();
@@ -2370,6 +2376,8 @@ namespace binfilter {
/*?*/ case ocCell : // CELL needs recalc on move for some possible type values
/*?*/ pArr->SetRecalcModeOnRefMove();
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*N*/ }
/*N*/ }
/*N*/ else if (eOp == ocIf || eOp == ocChose)
@@ -3128,6 +3136,8 @@ namespace binfilter {
/*N*/ /*?*/ aBuffer.append(pDBData->GetName());
/*?*/ }
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*?*/ }
/*N*/ if ( aBuffer.getLength() )
/*N*/ rBuffer.append(aBuffer);
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
index 7e4a91b..e83504b 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
@@ -3017,7 +3017,11 @@ void ScInterpreter::ScTTT()
/*N*/ case ocIsValue : \
/*N*/ case ocN : \
/*N*/ case ocType : \
-/*N*/ statement;
+/*N*/ statement; \
+/*N*/ break; \
+/*N*/ default : \
+/*N*/ break;
+
/*N*/
/*N*/ switch ( eOp )
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_chtmode4.cxx b/binfilter/bf_sch/source/core/sch_chtmode4.cxx
index ae13c2c..481ccec 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode4.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode4.cxx
@@ -1406,8 +1406,8 @@ private:
/*?*/ #ifdef DBG_UTIL
/*?*/ // convert ::rtl::OUString => tools String => ByteString
/*?*/ String aStr( aEx.Message );
-/*?*/ ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
-/*?*/ OSL_TRACE( "AddIn threw exception during refresh(): %s", aBStr.GetBuffer());
+/*?*/ ByteString aTmpBStr( aStr, RTL_TEXTENCODING_ASCII_US );
+/*?*/ OSL_TRACE( "AddIn threw exception during refresh(): %s", aTmpBStr.GetBuffer());
/*?*/ #endif
/*?*/ }
/*?*/ ResetChartStatusFlag( CHS_NO_ADDIN_REFRESH );
diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx b/binfilter/bf_sch/source/core/sch_globfunc.cxx
index 80c7e40..5715a85 100644
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
@@ -1276,7 +1276,7 @@ namespace binfilter {
#include <cstdio> // for snprintf
#include <cstring> // for strncat
namespace binfilter {
-/*N*/ void Dbg_DebugItems( SfxItemSet& rSet, ChartModel* pModel, long num )
+/*N*/ void Dbg_DebugItems( SfxItemSet& rSet, ChartModel* pModel )
/*N*/ {
/*N*/ SfxItemPool *pItemPool=&( pModel->GetItemPool() );
/*N*/
@@ -1284,9 +1284,9 @@ namespace binfilter {
/*N*/ char pSmallBuf[ 128 ] = "";
/*N*/
/*N*/ const USHORT* pRanges = rSet.GetRanges();
-/*N*/ for( long n = 0; pRanges[ n ] && n<32; n++ )
+/*N*/ for( long n = 0; pRanges[ n ] && n<32; n+=2 )
/*N*/ {
-/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "[%ld; %ld] ", pRanges[ n ], pRanges[ ++n ] );
+/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "[%"SAL_PRIdINT32"; %"SAL_PRIdINT32"] ", pRanges[ n ], pRanges[ n+1 ] );
/*N*/ strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 );
/*N*/ }
/*N*/
@@ -1312,7 +1312,7 @@ namespace binfilter {
/*N*/ nCns++;
/*N*/ if( nCnt < 100 )
/*N*/ {
-/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "%ld, ", nWhich );
+/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), "%"SAL_PRIdINT32", ", nWhich );
/*N*/ strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 );
/*N*/ }
/*N*/
diff --git a/binfilter/bf_so3/source/inplace/embobj.cxx b/binfilter/bf_so3/source/inplace/embobj.cxx
index d403a30..e7d656e 100644
--- a/binfilter/bf_so3/source/inplace/embobj.cxx
+++ b/binfilter/bf_so3/source/inplace/embobj.cxx
@@ -423,7 +423,7 @@ void SvEmbeddedObject::SetModified( BOOL bModifiedP )
// Fuer diesen Fall muss der gesammte Ablauf noch
// einmal geprueft werden
- DBG_ASSERT( xPar.Is() && pP || !pP && !xPar.Is(),
+ DBG_ASSERT( (xPar.Is() && pP) || (!pP && !xPar.Is()),
"Persist-Parent ist kein EmbeddedObject" );
}
}
diff --git a/binfilter/bf_starmath/source/starmath_format.cxx b/binfilter/bf_starmath/source/starmath_format.cxx
index 9f4cdd3..1d170f2 100644
--- a/binfilter/bf_starmath/source/starmath_format.cxx
+++ b/binfilter/bf_starmath/source/starmath_format.cxx
@@ -84,9 +84,6 @@ namespace binfilter {
/*N*/ String GetDefaultFontName( LanguageType nLang, USHORT nIdent )
/*N*/ {
-/*N*/ DBG_ASSERT( FNT_BEGIN <= nIdent && nIdent <= FNT_END,
-/*N*/ "index out opd range" );
-/*N*/
/*N*/ if (FNT_MATH == nIdent)
/*?*/ return String::CreateFromAscii( FNTNAME_MATH );
/*N*/ else
diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.cxx b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
index 0f6a37c..f079aa1 100644
--- a/binfilter/bf_svx/source/editeng/svx_editeng.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
@@ -62,10 +62,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ DBG_NAME( EditEngine )
/*N*/ DBG_NAMEEX( EditView )
-#if (OSL_DEBUG_LEVEL > 1) || defined ( DBG_UTIL )
-/*N*/ static sal_Bool bDebugPaint = sal_False;
-#endif
-
SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
diff --git a/binfilter/inc/bf_sch/globfunc.hxx b/binfilter/inc/bf_sch/globfunc.hxx
index 1a09d3d..b8adf95 100644
--- a/binfilter/inc/bf_sch/globfunc.hxx
+++ b/binfilter/inc/bf_sch/globfunc.hxx
@@ -50,12 +50,10 @@ namespace binfilter {
//Item-Debugging
#ifdef DBG_UTIL
class ChartModel;
- extern void Dbg_DebugItems(SfxItemSet& rSet,ChartModel* pModel,long num = 32);
+ extern void Dbg_DebugItems(SfxItemSet& rSet,ChartModel* pModel);
#define DBG_ITEMS(a,b) Dbg_DebugItems(a,b)
- #define DBG_ITEMSX(a,b,c) Dbg_DebugItems(a,b,c)
#else
#define DBG_ITEMS(a,b)
- #define DBG_ITEMSX(a,b,c)
#endif
//hunderstel Grad (centi-degrees)in Rad
More information about the Libreoffice-commits
mailing list