[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_svx
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Dec 23 06:09:28 PST 2010
binfilter/bf_forms/source/component/DatabaseForm.hxx | 2 -
binfilter/bf_forms/source/component/forms_Columns.cxx | 2 -
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx | 8 +++---
binfilter/bf_forms/source/component/forms_FormComponent.cxx | 15 ++++++------
binfilter/bf_forms/source/component/forms_ListBox.cxx | 2 -
binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx | 12 ++++-----
binfilter/bf_forms/source/misc/forms_limitedformats.cxx | 8 +++---
binfilter/bf_forms/source/misc/forms_services.cxx | 2 -
binfilter/bf_forms/source/misc/makefile.mk | 2 -
binfilter/bf_forms/source/resource/makefile.mk | 2 -
binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx | 6 +---
11 files changed, 27 insertions(+), 34 deletions(-)
New commits:
commit 51baaabfa4b9e43f1aa2640a71f8e85c6ca8ae49
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 23 13:57:18 2010 +0000
WaE: throw out some more warnings
diff --git a/binfilter/bf_forms/source/component/DatabaseForm.hxx b/binfilter/bf_forms/source/component/DatabaseForm.hxx
index 8861d68..9476503 100644
--- a/binfilter/bf_forms/source/component/DatabaseForm.hxx
+++ b/binfilter/bf_forms/source/component/DatabaseForm.hxx
@@ -264,7 +264,7 @@ public:
// com::sun::star::awt::XTabControllerModel
virtual sal_Bool SAL_CALL getGroupControl() throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setGroupControl(sal_Bool _bGroupControl) throw(::com::sun::star::uno::RuntimeException) { }
+ virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) throw(::com::sun::star::uno::RuntimeException) { }
virtual void SAL_CALL setControlModels(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rControls) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const ::rtl::OUString& _rGroupName) throw(::com::sun::star::uno::RuntimeException);
diff --git a/binfilter/bf_forms/source/component/forms_Columns.cxx b/binfilter/bf_forms/source/component/forms_Columns.cxx
index 156708d..b041606 100644
--- a/binfilter/bf_forms/source/component/forms_Columns.cxx
+++ b/binfilter/bf_forms/source/component/forms_Columns.cxx
@@ -577,7 +577,7 @@ void SAL_CALL OGridColumn::read(const Reference<XObjectInputStream>& _rxInStream
}
// 2. Lesen des Versionsnummer
- sal_uInt16 nVersion = _rxInStream->readShort();
+ /*sal_uInt16 nVersion =*/ _rxInStream->readShort();
sal_uInt16 nAnyMask = _rxInStream->readShort();
if (nAnyMask & WIDTH)
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index ccbf7a8..716afba 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -627,7 +627,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
if (!hasProperty(PROPERTY_NAME, xComponentSet))
return;
- sal_Int16 nClassId;
+ sal_Int16 nClassId(0);
xComponentSet->getPropertyValue(PROPERTY_CLASSID) >>= nClassId;
::rtl::OUString aName;
xComponentSet->getPropertyValue( PROPERTY_NAME ) >>= aName;
@@ -690,7 +690,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
// <name>=<refValue>
if( !hasProperty(PROPERTY_STATE, xComponentSet) )
break;
- sal_Int16 nChecked;
+ sal_Int16 nChecked(0);
xComponentSet->getPropertyValue( PROPERTY_STATE ) >>= nChecked;
if( nChecked != 1 )
break;
@@ -772,10 +772,10 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
::rtl::OUString aText;
Any aVal = xComponentSet->getPropertyValue( PROPERTY_VALUE );
- double aDoubleVal;
+ double aDoubleVal(0.0);
if (aVal >>= aDoubleVal)
{
- sal_Int16 nScale;
+ sal_Int16 nScale(0);
xComponentSet->getPropertyValue( PROPERTY_DECIMAL_ACCURACY ) >>= nScale;
aText = ::rtl::math::doubleToUString(aDoubleVal, rtl_math_StringFormat_F, nScale, '.', sal_True);
}
diff --git a/binfilter/bf_forms/source/component/forms_FormComponent.cxx b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
index 1e9d729..84ee6f5 100644
--- a/binfilter/bf_forms/source/component/forms_FormComponent.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
@@ -100,7 +100,7 @@ OControl::OControl(const Reference<com::sun::star::lang::XMultiServiceFactory>&
}
// Refcount wieder bei NULL
- sal_Int32 n = decrement(m_refCount);
+ /*sal_Int32 n =*/ decrement(m_refCount);
}
//------------------------------------------------------------------------------
@@ -1352,7 +1352,7 @@ sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
// darf ich mich ueberhaupt an dieses Feld binden (Typ-Check)
if (xFieldCandidate.is())
{
- sal_Int32 nFieldType;
+ sal_Int32 nFieldType(0);
xFieldCandidate->getPropertyValue(PROPERTY_FIELDTYPE) >>= nFieldType;
if (_approve(nFieldType))
setField(xFieldCandidate,sal_False);
@@ -1368,7 +1368,8 @@ sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
m_xField->addPropertyChangeListener(PROPERTY_VALUE, this);
m_xColumnUpdate = Reference<XColumnUpdate>(m_xField, UNO_QUERY);
m_xColumn = Reference<XColumn>(m_xField, UNO_QUERY);
- INT32 nNullableFlag; m_xField->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullableFlag;
+ INT32 nNullableFlag(0);
+ m_xField->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullableFlag;
m_bRequired = (ColumnValue::NO_NULLS == nNullableFlag);
// we're optimistic : in case of ColumnValue_NULLABLE_UNKNOWN we assume nullability ....
}
@@ -1432,19 +1433,19 @@ void SAL_CALL OBoundControlModel::loaded(const com::sun::star::lang::EventObject
//------------------------------------------------------------------------------
-void SAL_CALL OBoundControlModel::unloaded( const com::sun::star::lang::EventObject& aEvent ) throw(RuntimeException)
+void SAL_CALL OBoundControlModel::unloaded( const com::sun::star::lang::EventObject& ) throw(RuntimeException)
{
}
//------------------------------------------------------------------------------
-void SAL_CALL OBoundControlModel::reloading( const com::sun::star::lang::EventObject& aEvent ) throw(RuntimeException)
+void SAL_CALL OBoundControlModel::reloading( const com::sun::star::lang::EventObject& ) throw(RuntimeException)
{
osl::MutexGuard aGuard(m_aMutex);
m_bForwardValueChanges = sal_False;
}
//------------------------------------------------------------------------------
-void SAL_CALL OBoundControlModel::unloading(const com::sun::star::lang::EventObject& aEvent) throw(RuntimeException)
+void SAL_CALL OBoundControlModel::unloading(const com::sun::star::lang::EventObject& ) throw(RuntimeException)
{
osl::MutexGuard aGuard(m_aMutex);
_unloaded();
@@ -1487,7 +1488,7 @@ void SAL_CALL OBoundControlModel::reloaded(const com::sun::star::lang::EventObje
}
//------------------------------------------------------------------------------
-void OBoundControlModel::_loaded(const com::sun::star::lang::EventObject& rEvent)
+void OBoundControlModel::_loaded(const com::sun::star::lang::EventObject& )
{
}
diff --git a/binfilter/bf_forms/source/component/forms_ListBox.cxx b/binfilter/bf_forms/source/component/forms_ListBox.cxx
index 209e177..e546539 100644
--- a/binfilter/bf_forms/source/component/forms_ListBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_ListBox.cxx
@@ -406,7 +406,7 @@ void SAL_CALL OListBoxModel::write(const Reference<stario::XObjectOutputStream>&
if ((nAnyMask & BOUNDCOLUMN) == BOUNDCOLUMN)
{
- sal_Int16 nBoundColumn;
+ sal_Int16 nBoundColumn(0);
m_aBoundColumn >>= nBoundColumn;
_rxOutStream << nBoundColumn;
}
diff --git a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
index 40c9c75..91a097c 100644
--- a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
+++ b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
@@ -91,8 +91,8 @@ OInterfaceContainer::OInterfaceContainer(
const Reference<XMultiServiceFactory>& _rxFactory,
::osl::Mutex& _rMutex,
const Type& _rElementType)
- :m_rMutex(_rMutex)
- ,m_aContainerListeners(_rMutex)
+ :m_aContainerListeners(_rMutex)
+ ,m_rMutex(_rMutex)
,m_aElementType(_rElementType)
,m_xServiceFactory(_rxFactory)
{
@@ -272,9 +272,8 @@ void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat )
}
}
}
- catch( const Exception& e )
+ catch( const Exception& )
{
- e; // make compiler happy
DBG_ERROR( "OInterfaceContainer::transformEvents: caught an exception!" );
}
}
@@ -384,7 +383,7 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
if (nLen)
{
// 1. Version
- sal_uInt16 nVersion = _rxInStream->readShort();
+ /*sal_uInt16 nVersion =*/ _rxInStream->readShort();
// 2. Objekte
for (sal_Int32 i = 0; i < nLen; i++)
@@ -394,9 +393,8 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
{
xObj = _rxInStream->readObject();
}
- catch(WrongFormatException& e)
+ catch(WrongFormatException& )
{
- e; // make compiler happy
// the object could not be read
// create a object (so the readEvents below will assign the events to the right controls)
xObj = lcl_createPlaceHolder( m_xServiceFactory );
diff --git a/binfilter/bf_forms/source/misc/forms_limitedformats.cxx b/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
index 248d677..754651e 100644
--- a/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
+++ b/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
@@ -104,7 +104,7 @@ namespace frm
{ "HH:MM:SS", -1, ltEnglishUS },
{ "HH:MM AM/PM", -1, ltEnglishUS },
{ "HH:MM:SS AM/PM", -1, ltEnglishUS },
- { NULL, -1 }
+ { NULL, -1, ltSystem }
};
// don't switch this table here to const. The compiler could be tempted to really place this
// in a non-writeable segment, but we want to fill in the format keys later ....
@@ -129,7 +129,7 @@ namespace frm
{ "JJ-MM-TT", -1, ltGerman },
{ "JJJJ-MM-TT", -1, ltGerman },
- { NULL, -1 }
+ { NULL, -1, ltSystem }
};
return s_aFormats;
}
@@ -144,8 +144,8 @@ namespace frm
//=====================================================================
//---------------------------------------------------------------------
OLimitedFormats::OLimitedFormats(const Reference< XMultiServiceFactory >& _rxORB, const sal_Int16 _nClassId)
- :m_nTableId(_nClassId)
- ,m_nFormatEnumPropertyHandle(-1)
+ :m_nFormatEnumPropertyHandle(-1)
+ ,m_nTableId(_nClassId)
{
OSL_ENSURE(_rxORB.is(), "OLimitedFormats::OLimitedFormats: invalid service factory!");
acquireSupplier(_rxORB);
diff --git a/binfilter/bf_forms/source/misc/forms_services.cxx b/binfilter/bf_forms/source/misc/forms_services.cxx
index fafc36e..f9f6556 100644
--- a/binfilter/bf_forms/source/misc/forms_services.cxx
+++ b/binfilter/bf_forms/source/misc/forms_services.cxx
@@ -477,7 +477,7 @@ void SAL_CALL createRegistryInfo_FORMS()
}
//---------------------------------------------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** _ppEnv)
+void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/)
{
*_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
diff --git a/binfilter/bf_forms/source/misc/makefile.mk b/binfilter/bf_forms/source/misc/makefile.mk
index 6bed9b3..8ca0a98 100644
--- a/binfilter/bf_forms/source/misc/makefile.mk
+++ b/binfilter/bf_forms/source/misc/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_forms/source/resource/makefile.mk b/binfilter/bf_forms/source/resource/makefile.mk
index 401be54..7bcf9bf 100644
--- a/binfilter/bf_forms/source/resource/makefile.mk
+++ b/binfilter/bf_forms/source/resource/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
index 3add7e3..915fd93 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
@@ -155,7 +155,7 @@ namespace binfilter {
/*N*/ rIn>>nReserve;
/*N*/ }
-/*N*/ void SdrObjConnection::AfterRead(const SdrObject* pEdgeObj)
+/*N*/ void SdrObjConnection::AfterRead(const SdrObject* /*pEdgeObj*/)
/*N*/ {
/*N*/ if (pSuro!=NULL) {
/*N*/ pObj=pSuro->GetObject();
@@ -916,8 +916,6 @@ namespace binfilter {
/*?*/ nQ+=Abs(aXP[3].X()-aXP[2].X())+Abs(aXP[3].Y()-aXP[2].Y());
/*?*/ *pnQuality=nQ;
/*?*/ }
-/*?*/ USHORT n1=1;
-/*?*/ USHORT n2=1;
/*?*/ if (bInfo) {
/*?*/ pInfo->nObj1Lines=2;
/*?*/ pInfo->nObj2Lines=2;
@@ -1684,7 +1682,7 @@ je Objekt variiert von 0-3:
-/*N*/ void SdrEdgeObj::NbcSetPoint(const Point& rPnt, USHORT i)
+/*N*/ void SdrEdgeObj::NbcSetPoint(const Point&, USHORT)
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ // ToDo: Umconnekten fehlt noch
/*N*/ }
More information about the Libreoffice-commits
mailing list