[Libreoffice-commits] .: 3 commits - binfilter/bf_basic binfilter/bf_sw binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jun 2 09:21:54 PDT 2011
binfilter/bf_basic/source/sbx/sbxvar.cxx | 3 ---
binfilter/bf_sw/source/core/draw/makefile.mk | 2 --
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 2 ++
binfilter/bf_sw/source/core/draw/sw_dflyobj.cxx | 2 --
binfilter/bf_sw/source/core/frmedt/makefile.mk | 2 --
binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx | 12 ++++++------
binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx | 4 ++--
7 files changed, 10 insertions(+), 17 deletions(-)
New commits:
commit 489d01ac2f12a28b2f6bfa9ff3f467ac7558a7b7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 2 12:38:08 2011 +0100
WaE: unused variable
diff --git a/binfilter/bf_basic/source/sbx/sbxvar.cxx b/binfilter/bf_basic/source/sbx/sbxvar.cxx
index 62079fd..ab208c2 100644
--- a/binfilter/bf_basic/source/sbx/sbxvar.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvar.cxx
@@ -44,9 +44,6 @@ TYPEINIT1(SbxVariable,SbxValue)
TYPEINIT1(SbxHint,SfxSimpleHint)
extern UINT32 nVarCreator; // in SBXBASE.CXX, fuer LoadData()
-#ifdef DBG_UTIL
-static ULONG nVar = 0;
-#endif
///////////////////////////// Konstruktoren //////////////////////////////
commit b74ffa6c9ecb02ab6d0a4f8b4d4a5552e86919ca
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 2 12:30:59 2011 +0100
WaE: can only be >= 0 by definition
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx
index 7f1ec92..0a858e4 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx
@@ -204,14 +204,14 @@ sal_uInt16 SvXMLAttrContainerData::GetAttrCount() const
const ::rtl::OUString& SvXMLAttrContainerData::GetAttrLName(sal_uInt16 i) const
{
- OSL_ENSURE( i >= 0 && i < pLNames->Count(),
+ OSL_ENSURE( i < pLNames->Count(),
"SvXMLAttrContainerData::GetLName: illegal index" );
return *(*pLNames)[i];
}
const ::rtl::OUString& SvXMLAttrContainerData::GetAttrValue(sal_uInt16 i) const
{
- OSL_ENSURE( i >= 0 && i < pValues->Count(),
+ OSL_ENSURE( i < pValues->Count(),
"SvXMLAttrContainerData::GetValue: illegal index" );
return *(*pValues)[i];
}
commit dae27cfde539fecec1e8ac4d4e0afb6e4ba08684
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 2 12:16:26 2011 +0100
WaE: set this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/draw/makefile.mk b/binfilter/bf_sw/source/core/draw/makefile.mk
index ad87fd2..a38e024 100644
--- a/binfilter/bf_sw/source/core/draw/makefile.mk
+++ b/binfilter/bf_sw/source/core/draw/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 0c79368..6a6474e 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -594,6 +594,8 @@ namespace binfilter {
/*N*/ if( bNotify )
/*N*/ lcl_Notify( this, pOldBoundRect );
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/draw/sw_dflyobj.cxx b/binfilter/bf_sw/source/core/draw/sw_dflyobj.cxx
index 86f0822..5a47d47 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dflyobj.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dflyobj.cxx
@@ -45,8 +45,6 @@
#include "flyfrms.hxx"
namespace binfilter {
-static bool bInResize = FALSE;
-
/*N*/ TYPEINIT1( SwFlyDrawObj, SdrObject )
/*N*/ TYPEINIT1( SwVirtFlyDrawObj, SdrVirtObj )
diff --git a/binfilter/bf_sw/source/core/frmedt/makefile.mk b/binfilter/bf_sw/source/core/frmedt/makefile.mk
index b0ace78..758d062 100644
--- a/binfilter/bf_sw/source/core/frmedt/makefile.mk
+++ b/binfilter/bf_sw/source/core/frmedt/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx b/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx
index 066e0dc..2793bd4 100644
--- a/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx
+++ b/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx
@@ -755,8 +755,8 @@ USHORT CheckMergeSel( const SwSelBoxes& rBoxes )
/*M*/ (!pTmp->IsCellFrm() ||
/*M*/ ( ( ! bRTL && (pTmp->Frm().*fnRect->fnGetLeft)() < nSX &&
/*M*/ (pTmp->Frm().*fnRect->fnGetRight)()< nSX2 ) ||
-/*M*/ bRTL && (pTmp->Frm().*fnRect->fnGetLeft)() > nSX &&
-/*M*/ (pTmp->Frm().*fnRect->fnGetRight)()> nSX2 ) ) )
+/*M*/ ( bRTL && (pTmp->Frm().*fnRect->fnGetLeft)() > nSX &&
+/*M*/ (pTmp->Frm().*fnRect->fnGetRight)()> nSX2 ) ) ) )
/*M*/ #else
/*M*/ while ( pTmp &&
/*M*/ (!pTmp->IsCellFrm() ||
@@ -1472,11 +1472,11 @@ void _FndBox::SaveChartData( const SwTable &rTable )
rTable.GetTabLines()[rTable.GetTabLines().Count()-1];
pEndBox = pLine->GetTabBoxes()[pLine->GetTabBoxes().Count()-1];
}
- pData->SomeData3() = String::CreateFromInt32(
+ pData->SomeData3() = String::CreateFromInt64(
pSttBox != ::binfilter::lcl_FindFirstBox(rTable)
? long(pSttBox)
: LONG_MAX );
- pData->SomeData4() = String::CreateFromInt32(
+ pData->SomeData4() = String::CreateFromInt64(
pEndBox != ::binfilter::lcl_FindLastBox(rTable)
? long(pEndBox)
: LONG_MAX );
@@ -1502,11 +1502,11 @@ void _FndBox::SaveChartData( const SwTable &rTable )
if ( pData )
{
const SwTableBox *pSttBox = (SwTableBox*)
- pData->SomeData3().ToInt32();
+ pData->SomeData3().ToInt64();
if ( long(pSttBox) == LONG_MAX )
pSttBox = ::binfilter::lcl_FindFirstBox( rTable );
const SwTableBox *pEndBox = (SwTableBox*)
- pData->SomeData4().ToInt32();
+ pData->SomeData4().ToInt64();
if ( long(pEndBox) == LONG_MAX )
pEndBox = ::binfilter::lcl_FindLastBox( rTable );
bool bSttFound = FALSE, bEndFound = FALSE;
More information about the Libreoffice-commits
mailing list