[Libreoffice-commits] .: binfilter/bf_forms binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Dec 31 05:16:19 PST 2010
binfilter/bf_forms/source/component/Filter.hxx | 6
binfilter/bf_forms/source/component/ImageButton.hxx | 8 -
binfilter/bf_forms/source/component/ImageControl.hxx | 8 -
binfilter/bf_forms/source/component/forms_Button.cxx | 4
binfilter/bf_forms/source/component/forms_CheckBox.cxx | 8 -
binfilter/bf_forms/source/component/forms_Columns.cxx | 7
binfilter/bf_forms/source/component/forms_ComboBox.cxx | 28 +--
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx | 79 ++++------
binfilter/bf_forms/source/component/forms_Date.cxx | 2
binfilter/bf_forms/source/component/forms_Edit.cxx | 22 +-
binfilter/bf_forms/source/component/forms_EditBase.cxx | 6
binfilter/bf_forms/source/component/forms_Filter.cxx | 10 -
binfilter/bf_forms/source/component/forms_FormattedField.cxx | 7
binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx | 4
binfilter/bf_forms/source/component/forms_Image.cxx | 20 +-
binfilter/bf_forms/source/component/forms_ImageButton.cxx | 2
binfilter/bf_forms/source/component/forms_ImageControl.cxx | 4
binfilter/bf_forms/source/component/forms_ListBox.cxx | 30 +--
binfilter/bf_forms/source/component/forms_RadioButton.cxx | 6
binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx | 2
binfilter/bf_forms/source/component/forms_imgprod.cxx | 2
binfilter/bf_forms/source/component/makefile.mk | 2
binfilter/bf_forms/util/makefile.mk | 2
binfilter/inc/bf_sfx2/docfile.hxx | 1
24 files changed, 130 insertions(+), 140 deletions(-)
New commits:
commit c4ec1b5658ee49ee48bc98dcdba570685a4e2516
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 31 13:14:31 2010 +0000
WaE: make this dir warning free
diff --git a/binfilter/bf_forms/source/component/Filter.hxx b/binfilter/bf_forms/source/component/Filter.hxx
index 5d8ba2e..6b9913e 100644
--- a/binfilter/bf_forms/source/component/Filter.hxx
+++ b/binfilter/bf_forms/source/component/Filter.hxx
@@ -116,8 +116,8 @@ namespace frm
virtual sal_Int16 SAL_CALL getMaxTextLen() throw( ::com::sun::star::uno::RuntimeException );
// ::com::sun::star::form::XBoundComponent
- virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & l) throw( ::com::sun::star::uno::RuntimeException ) {}
- virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & l) throw( ::com::sun::star::uno::RuntimeException ) {}
+ virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {}
+ virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {}
virtual sal_Bool SAL_CALL commit() throw( ::com::sun::star::uno::RuntimeException );
// ::com::sun::star::lang::XEventListener
@@ -125,7 +125,7 @@ namespace frm
// ::com::sun::star::awt::XFocusListener
virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException ){}
+ virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& /*e*/) throw( ::com::sun::star::uno::RuntimeException ){}
// ::com::sun::star::awt::XItemListener
virtual void SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/binfilter/bf_forms/source/component/ImageButton.hxx b/binfilter/bf_forms/source/component/ImageButton.hxx
index 680b0c2..45efa99 100644
--- a/binfilter/bf_forms/source/component/ImageButton.hxx
+++ b/binfilter/bf_forms/source/component/ImageButton.hxx
@@ -100,10 +100,10 @@ public:
{ OControl::disposing(_rSource); }
// ::com::sun::star::awt::XMouseListener
- virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException) { }
- virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException) { }
- virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException) { }
+ virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException) { }
+ virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException) { }
+ virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException) { }
};
//.........................................................................
diff --git a/binfilter/bf_forms/source/component/ImageControl.hxx b/binfilter/bf_forms/source/component/ImageControl.hxx
index bedfaa3..accb705 100644
--- a/binfilter/bf_forms/source/component/ImageControl.hxx
+++ b/binfilter/bf_forms/source/component/ImageControl.hxx
@@ -161,10 +161,10 @@ public:
virtual StringSequence SAL_CALL getSupportedServiceNames() throw();
// ::com::sun::star::awt::XMouseListener
- virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException) { }
- virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException) { }
- virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException) { }
+ virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException) { }
+ virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException) { }
+ virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException) { }
// ::com::sun::star::awt::XControl
virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit>& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& _rParent) throw(::com::sun::star::uno::RuntimeException);
diff --git a/binfilter/bf_forms/source/component/forms_Button.cxx b/binfilter/bf_forms/source/component/forms_Button.cxx
index 6e54cd4..326dda0 100644
--- a/binfilter/bf_forms/source/component/forms_Button.cxx
+++ b/binfilter/bf_forms/source/component/forms_Button.cxx
@@ -272,7 +272,7 @@ OButtonControl::OButtonControl(const Reference<XMultiServiceFactory>& _rxFactory
xButton->addActionListener(this);
}
// Refcount bei 1 fuer Listener
- sal_Int32 n = decrement(m_refCount);
+ /*sal_Int32 n =*/ decrement(m_refCount);
}
//------------------------------------------------------------------------------
@@ -299,7 +299,7 @@ Any SAL_CALL OButtonControl::queryAggregation(const Type& _rType) throw (Runtime
// ActionListener
//------------------------------------------------------------------------------
-void OButtonControl::actionPerformed(const ActionEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException)
+void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException)
{
// Asynchron fuer starutil::URL-Button
sal_uInt32 n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) );
diff --git a/binfilter/bf_forms/source/component/forms_CheckBox.cxx b/binfilter/bf_forms/source/component/forms_CheckBox.cxx
index 9c61b22..8faadcc 100644
--- a/binfilter/bf_forms/source/component/forms_CheckBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_CheckBox.cxx
@@ -173,7 +173,7 @@ void OCheckBoxModel::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(
if (getField().is() && !m_bInReset)
{
- sal_uInt16 nState;
+ sal_uInt16 nState(0);
_rEvent.NewValue >>= nState;
switch (nState)
{
@@ -371,9 +371,9 @@ void OCheckBoxModel::_onValueChanged()
sal_Bool bValue = m_xColumn->getBoolean();
if (m_xColumn->wasNull())
{
- sal_Bool bTriState;
+ sal_Bool bTriState(sal_False);
m_xAggregateSet->getPropertyValue(PROPERTY_TRISTATE) >>= bTriState;
- aValue <<= (sal_Int16)(bTriState ? CB_DONTKNOW : m_nDefaultChecked);
+ aValue <<= (bTriState ? (sal_Int16)CB_DONTKNOW : m_nDefaultChecked);
}
else
aValue <<= ( bValue ? (sal_Int16)CB_CHECK : (sal_Int16)CB_NOCHECK );
@@ -423,7 +423,7 @@ sal_Bool OCheckBoxModel::_commit()
{
try
{
- sal_Int16 nValue;
+ sal_Int16 nValue(0);
m_xAggregateSet->getPropertyValue(PROPERTY_STATE) >>= nValue;
switch (nValue)
{
diff --git a/binfilter/bf_forms/source/component/forms_Columns.cxx b/binfilter/bf_forms/source/component/forms_Columns.cxx
index b041606..814fdd6 100644
--- a/binfilter/bf_forms/source/component/forms_Columns.cxx
+++ b/binfilter/bf_forms/source/component/forms_Columns.cxx
@@ -111,9 +111,10 @@ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
else
{
sal_Int32 nPrefixPos = aModelName.indexOf(aModelPrefix);
- sal_Int32 nCampatiblePrefixPos = aModelName.indexOf(aCompatibleModelPrefix);
- DBG_ASSERT( (nPrefixPos != -1) || (nCampatiblePrefixPos != -1),
+ sal_Int32 nCompatiblePrefixPos = aModelName.indexOf(aCompatibleModelPrefix);
+ DBG_ASSERT( (nPrefixPos != -1) || (nCompatiblePrefixPos != -1),
"::getColumnTypeByModelName() : wrong servivce !");
+ (void)nCompatiblePrefixPos;
::rtl::OUString aColumnType = (nPrefixPos != -1)
? aModelName.copy(aModelPrefix.getLength())
@@ -206,8 +207,8 @@ DBG_NAME(OGridColumn)
OGridColumn::OGridColumn(const Reference<XMultiServiceFactory>& _rxFactory, const ::rtl::OUString& _sModelName)
:OGridColumn_BASE(m_aMutex)
,OPropertySetAggregationHelper(OGridColumn_BASE::rBHelper)
- ,m_aModelName(_sModelName)
,m_aHidden( makeAny( sal_False ) )
+ ,m_aModelName(_sModelName)
{
DBG_CTOR(OGridColumn,NULL);
diff --git a/binfilter/bf_forms/source/component/forms_ComboBox.cxx b/binfilter/bf_forms/source/component/forms_ComboBox.cxx
index a80a548..75226ad 100644
--- a/binfilter/bf_forms/source/component/forms_ComboBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_ComboBox.cxx
@@ -121,11 +121,11 @@ OComboBoxModel::OComboBoxModel(const Reference<XMultiServiceFactory>& _rxFactory
// use the old control name for compytibility reasons
,OErrorBroadcaster( OComponentHelper::rBHelper )
,m_eListSourceType(ListSourceType_TABLE)
- ,m_bEmptyIsNull(sal_True)
,m_aNullDate(DBTypeConversion::getStandardDate())
- ,m_nKeyType(NumberFormat::UNDEFINED)
,m_nFormatKey(0)
,m_nFieldType(DataType::OTHER)
+ ,m_nKeyType(NumberFormat::UNDEFINED)
+ ,m_bEmptyIsNull(sal_True)
{
DBG_CTOR( OComboBoxModel, NULL );
@@ -140,9 +140,9 @@ OComboBoxModel::OComboBoxModel( const OComboBoxModel* _pOriginal, const Referenc
:OBoundControlModel( _pOriginal, _rxFactory )
,OErrorBroadcaster( OComponentHelper::rBHelper )
,m_aNullDate(DBTypeConversion::getStandardDate())
- ,m_nKeyType(NumberFormat::UNDEFINED)
,m_nFormatKey(0)
,m_nFieldType(DataType::OTHER)
+ ,m_nKeyType(NumberFormat::UNDEFINED)
{
DBG_CTOR( OComboBoxModel, NULL );
@@ -329,7 +329,7 @@ void SAL_CALL OComboBoxModel::write(const Reference<stario::XObjectOutputStream>
if ((nAnyMask & BOUNDCOLUMN) == BOUNDCOLUMN)
{
- sal_Int16 nBoundColumn;
+ sal_Int16 nBoundColumn(0);
m_aBoundColumn >>= nBoundColumn;
_rxOutStream << nBoundColumn;
}
@@ -391,9 +391,9 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>&
if ((nAnyMask & BOUNDCOLUMN) == BOUNDCOLUMN)
{
- sal_Int16 nValue;
- _rxInStream >> nValue;
- m_aBoundColumn <<= nValue;
+ sal_Int16 nLclValue;
+ _rxInStream >> nLclValue;
+ m_aBoundColumn <<= nLclValue;
}
if (nVersion > 0x0001)
@@ -556,9 +556,8 @@ void OComboBoxModel::loadData()
disposeComponent(xStmt);
return;
}
- catch(Exception& eUnknown)
+ catch(Exception& /*eUnknown*/)
{
- eUnknown;
disposeComponent(xListCursor);
disposeComponent(xStmt);
return;
@@ -581,7 +580,7 @@ void OComboBoxModel::loadData()
{
// die XDatabaseVAriant der ersten Spalte
Reference<XColumnsSupplier> xSupplyCols(xListCursor, UNO_QUERY);
- DBG_ASSERT(xSupplyCols.is(), "OComboBoxModel::loadData : cursor supports the row set service but is no column supplier ??!");
+ DBG_ASSERT(xSupplyCols.is(), "OComboBoxModel::loadData : cursor supports the row set service but is no column supplier!");
Reference<XIndexAccess> xColumns;
if (xSupplyCols.is())
{
@@ -625,6 +624,8 @@ void OComboBoxModel::loadData()
}
}
break;
+ default:
+ break;
}
}
catch(SQLException& eSQL)
@@ -634,9 +635,8 @@ void OComboBoxModel::loadData()
disposeComponent(xStmt);
return;
}
- catch(Exception& eUnknown)
+ catch(Exception& /*eUnknown*/)
{
- eUnknown;
disposeComponent(xListCursor);
disposeComponent(xStmt);
return;
@@ -765,8 +765,8 @@ sal_Bool OComboBoxModel::_commit()
{
sal_Int32 nOldLen = aStringItemList.getLength();
aStringItemList.realloc(nOldLen + 1);
- ::rtl::OUString* pStringItems = aStringItemList.getArray() + nOldLen;
- *pStringItems = aNewValue;
+ ::rtl::OUString* pLclStringItems = aStringItemList.getArray() + nOldLen;
+ *pLclStringItems = aNewValue;
aAnyList <<= aStringItemList;
m_xAggregateSet->setPropertyValue(PROPERTY_STRINGITEMLIST, aAnyList);
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index 716afba..46be38b 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -394,21 +394,21 @@ ODatabaseForm::ODatabaseForm(const Reference<XMultiServiceFactory>& _rxFactory)
,m_aResetListeners(m_aMutex)
,m_aSubmitListeners(m_aMutex)
,m_aErrorListeners(m_aMutex)
- ,m_bLoaded(sal_False)
- ,m_bSubForm(sal_False)
- ,m_eNavigation(NavigationBarMode_CURRENT)
- ,m_nPrivileges(0)
+ ,m_pAggregatePropertyMultiplexer(NULL)
,m_pParameterInfo(NULL)
+ ,m_pLoadTimer(NULL)
,m_pThread(NULL)
+ ,m_nResetsPending(0)
+ ,m_nPrivileges(0)
,m_eSubmitMethod(FormSubmitMethod_GET)
,m_eSubmitEncoding(FormSubmitEncoding_URL)
- ,m_bAllowDelete(sal_True)
- ,m_bAllowUpdate(sal_True)
+ ,m_eNavigation(NavigationBarMode_CURRENT)
,m_bAllowInsert(sal_True)
- ,m_pLoadTimer(NULL)
- ,m_nResetsPending(0)
+ ,m_bAllowUpdate(sal_True)
+ ,m_bAllowDelete(sal_True)
+ ,m_bLoaded(sal_False)
+ ,m_bSubForm(sal_False)
,m_bForwardingConnection(sal_False)
- ,m_pAggregatePropertyMultiplexer(NULL)
,m_bSharingConnection( sal_False )
{
DBG_CTOR(ODatabaseForm,NULL);
@@ -1134,7 +1134,7 @@ void ODatabaseForm::onError(const SQLErrorEvent& _rEvent)
}
//------------------------------------------------------------------------------
-void ODatabaseForm::onError(SQLException& _rException, const ::rtl::OUString& _rContextDescription)
+void ODatabaseForm::onError(SQLException& /*_rException*/, const ::rtl::OUString& /*_rContextDescription*/)
{
DBG_ERROR( "ODatabaseForm::onError: dead code!" );
}
@@ -1404,9 +1404,8 @@ sal_Bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNot
m_xAggregateAsRowSet->execute();
bSuccess = sal_True;
}
- catch(RowSetVetoException& eVeto)
+ catch(RowSetVetoException& /*eVeto*/)
{
- eVeto;
}
catch(SQLException& eDb)
{
@@ -1989,7 +1988,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
const ::rtl::OUString* pMasterFields = m_aMasterFields.getConstArray();
const ::rtl::OUString* pDetailFields = m_aDetailFields.getConstArray();
const ::rtl::OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength();
- for (pDetailFields; pDetailFields < pDetailFieldsEnd; ++pDetailFields, ++pMasterFields)
+ for (; pDetailFields < pDetailFieldsEnd; ++pDetailFields, ++pMasterFields)
{
Reference<XPropertySet> xMasterField, xField;
MapUString2INT32::const_iterator aFind;
@@ -2411,7 +2410,7 @@ sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(com::sun::star::uno::Ru
// Sollen Controls in einer TabOrder gruppe zusammengefasst werden?
if (m_aCycle.hasValue())
{
- sal_Int32 nCycle;
+ sal_Int32 nCycle(0);
::cppu::enum2int(nCycle, m_aCycle);
return nCycle != TabulatorCycle_PAGE;
}
@@ -2468,14 +2467,13 @@ Sequence<Reference<XControlModel> > SAL_CALL ODatabaseForm::getControlModels() t
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const ::rtl::OUString& Name ) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const ::rtl::OUString& /*Name*/ ) throw( RuntimeException )
{
::osl::MutexGuard aGuard(m_aMutex);
// Die Controls werden gruppiert, indem ihr Name dem Namen des ersten
// Controls der Sequenz angepasst wird
const Reference<XControlModel>* pControls = _rGroup.getConstArray();
- Reference<XPropertySet> xSet;
::rtl::OUString sGroupName;
for( sal_Int32 i=0; i<_rGroup.getLength(); ++i, ++pControls )
@@ -2558,7 +2556,7 @@ void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( Runtime
//==============================================================================
// com::sun::star::form::XLoadListener
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::loaded(const EventObject& aEvent) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( RuntimeException )
{
// now start the rowset listening to recover cursor events
load_impl(sal_True);
@@ -2575,7 +2573,7 @@ void SAL_CALL ODatabaseForm::loaded(const EventObject& aEvent) throw( RuntimeExc
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::unloading(const EventObject& aEvent) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) throw( RuntimeException )
{
{
// now stop the rowset listening if we are a subform
@@ -2591,13 +2589,13 @@ void SAL_CALL ODatabaseForm::unloading(const EventObject& aEvent) throw( Runtime
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::unloaded(const EventObject& aEvent) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
{
// nothing to do
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::reloading(const EventObject& aEvent) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) throw( RuntimeException )
{
// now stop the rowset listening if we are a subform
::osl::MutexGuard aGuard(m_aMutex);
@@ -2610,7 +2608,7 @@ void SAL_CALL ODatabaseForm::reloading(const EventObject& aEvent) throw( Runtime
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::reloaded(const EventObject& aEvent) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
{
reload_impl(sal_True);
{
@@ -2637,7 +2635,7 @@ void SAL_CALL ODatabaseForm::load() throw( RuntimeException )
}
//------------------------------------------------------------------------------
-void ODatabaseForm::disposingSharedConnection( const Reference< XConnection >& _rxConn )
+void ODatabaseForm::disposingSharedConnection( const Reference< XConnection >& /*_rxConn*/ )
{
stopSharingConnection();
@@ -2762,9 +2760,8 @@ void SAL_CALL ODatabaseForm::unload() throw( RuntimeException )
if (xCloseable.is())
xCloseable->close();
}
- catch(SQLException& eDB)
+ catch(SQLException& /*eDB*/)
{
- eDB;
}
aGuard.reset();
}
@@ -2816,10 +2813,9 @@ void ODatabaseForm::reload_impl(sal_Bool bMoveToFirst, const Reference< XInterac
m_sCurrentErrorContext = FRM_RES_STRING(RID_ERR_REFRESHING_FORM);
bSuccess = executeRowSet(aGuard, bMoveToFirst, _rxCompletionHandler);
}
- catch(SQLException& e)
+ catch(SQLException& /*e*/)
{
DBG_ERROR("ODatabaseForm::reload_impl : shouldn't executeRowSet catch this exception ?");
- e;
}
if (bSuccess)
@@ -2868,7 +2864,7 @@ void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException )
//==============================================================================
// com::sun::star::sdbc::XRowSetListener
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& event) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( RuntimeException )
{
// reload the subform with the new parameters of the parent
// do this handling delayed to provide of execute too many SQL Statements
@@ -2881,13 +2877,13 @@ void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& event) throw( Runtim
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::rowChanged(const EventObject& event) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::rowChanged(const EventObject& /*event*/) throw( RuntimeException )
{
// ignore it
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& event) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException )
{
// not interested in :
// if our parent is an ODatabaseForm, too, then after this rowSetChanged we'll get a "reloaded"
@@ -3213,9 +3209,8 @@ void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException )
if (query_aggregation( m_xAggregate, xUpdate))
xUpdate->insertRow();
}
- catch(RowSetVetoException& eVeto)
+ catch(RowSetVetoException& /*eVeto*/)
{
- eVeto;
throw;
}
catch(SQLException& eDb)
@@ -3234,9 +3229,8 @@ void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException )
if (query_aggregation( m_xAggregate, xUpdate))
xUpdate->updateRow();
}
- catch(RowSetVetoException& eVeto)
+ catch(RowSetVetoException& /*eVeto*/)
{
- eVeto;
throw;
}
catch(SQLException& eDb)
@@ -3255,9 +3249,8 @@ void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException )
if (query_aggregation( m_xAggregate, xUpdate))
xUpdate->deleteRow();
}
- catch(RowSetVetoException& eVeto)
+ catch(RowSetVetoException& /*eVeto*/)
{
- eVeto;
throw;
}
catch(SQLException& eDb)
@@ -3276,9 +3269,8 @@ void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeExce
if (query_aggregation( m_xAggregate, xUpdate))
xUpdate->cancelRowUpdates();
}
- catch(RowSetVetoException& eVeto)
+ catch(RowSetVetoException& /*eVeto*/)
{
- eVeto;
throw;
}
catch(SQLException& eDb)
@@ -3343,9 +3335,8 @@ Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows
if (query_aggregation( m_xAggregate, xDelete))
return xDelete->deleteRows(rows);
}
- catch(RowSetVetoException& eVeto)
+ catch(RowSetVetoException& /*eVeto*/)
{
- eVeto; // make compiler happy
throw;
}
catch(SQLException& eDb)
@@ -3649,7 +3640,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
DataSelectionType eTranslated = DataSelectionType_TABLE;
if (m_xAggregateSet.is())
{
- sal_Int32 nCommandType;
+ sal_Int32 nCommandType(0);
m_xAggregateSet->getPropertyValue(PROPERTY_COMMANDTYPE) >>= nCommandType;
switch (nCommandType)
{
@@ -3724,9 +3715,9 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
if (nAnyMask & CYCLE)
{
- sal_Int32 nCycle;
- ::cppu::enum2int(nCycle, m_aCycle);
- _rxOutStream->writeShort((sal_Int16)nCycle);
+ sal_Int32 nLclCycle(0);
+ ::cppu::enum2int(nLclCycle, m_aCycle);
+ _rxOutStream->writeShort((sal_Int16)nLclCycle);
}
}
@@ -3773,7 +3764,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
m_xAggregateSet->setPropertyValue(PROPERTY_COMMANDTYPE, makeAny(nCommandType));
// obsolete
- sal_Int16 nDummy = _rxInStream->readShort();
+ /*sal_Int16 nDummy =*/ _rxInStream->readShort();
// navigation mode was a boolean in version 1
// war in der version 1 ein sal_Bool
diff --git a/binfilter/bf_forms/source/component/forms_Date.cxx b/binfilter/bf_forms/source/component/forms_Date.cxx
index ea3d7fe..d9cd15a 100644
--- a/binfilter/bf_forms/source/component/forms_Date.cxx
+++ b/binfilter/bf_forms/source/component/forms_Date.cxx
@@ -244,7 +244,7 @@ void ODateModel::_loaded(const EventObject& rEvent)
m_bDateTimeField = sal_False;
try
{
- sal_Int32 nFieldType;
+ sal_Int32 nFieldType(0);
xField->getPropertyValue(PROPERTY_FIELDTYPE) >>= nFieldType;
m_bDateTimeField = (nFieldType == DataType::TIMESTAMP);
}
diff --git a/binfilter/bf_forms/source/component/forms_Edit.cxx b/binfilter/bf_forms/source/component/forms_Edit.cxx
index 9a45009..4df734d 100644
--- a/binfilter/bf_forms/source/component/forms_Edit.cxx
+++ b/binfilter/bf_forms/source/component/forms_Edit.cxx
@@ -131,7 +131,7 @@ OEditControl::OEditControl(const Reference<XMultiServiceFactory>& _rxFactory)
}
}
// Refcount wieder bei 2 fuer beide Listener
- sal_Int32 n = decrement(m_refCount);
+ /*sal_Int32 n =*/ decrement(m_refCount);
}
//------------------------------------------------------------------------------
@@ -193,7 +193,7 @@ void OEditControl::disposing(const EventObject& Source) throw( RuntimeException
// XFocusListener
//------------------------------------------------------------------------------
-void OEditControl::focusGained( const FocusEvent& e ) throw ( ::com::sun::star::uno::RuntimeException)
+void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( ::com::sun::star::uno::RuntimeException)
{
Reference<XPropertySet> xSet(getModel(), UNO_QUERY);
if (xSet.is())
@@ -201,7 +201,7 @@ void OEditControl::focusGained( const FocusEvent& e ) throw ( ::com::sun::star::
}
//------------------------------------------------------------------------------
-void OEditControl::focusLost( const FocusEvent& e ) throw ( ::com::sun::star::uno::RuntimeException)
+void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( ::com::sun::star::uno::RuntimeException)
{
Reference<XPropertySet> xSet(getModel(), UNO_QUERY);
if (xSet.is())
@@ -276,7 +276,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw (
}
//------------------------------------------------------------------------------
-void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException)
+void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException)
{
}
@@ -314,11 +314,11 @@ DBG_NAME(OEditModel)
OEditModel::OEditModel(const Reference<XMultiServiceFactory>& _rxFactory)
:OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_EDIT, FRM_CONTROL_EDIT )
// use the old control name for compytibility reasons
- ,m_bMaxTextLenModified(sal_False)
- ,m_nKeyType(NumberFormat::UNDEFINED)
- ,m_aNullDate(DBTypeConversion::getStandardDate())
,m_nFormatKey(0)
+ ,m_aNullDate(DBTypeConversion::getStandardDate())
,m_nFieldType(DataType::OTHER)
+ ,m_nKeyType(NumberFormat::UNDEFINED)
+ ,m_bMaxTextLenModified(sal_False)
,m_bWritingFormattedFake(sal_False)
,m_bNumericField(sal_False)
{
@@ -333,11 +333,11 @@ OEditModel::OEditModel(const Reference<XMultiServiceFactory>& _rxFactory)
//------------------------------------------------------------------
OEditModel::OEditModel( const OEditModel* _pOriginal, const Reference<XMultiServiceFactory>& _rxFactory )
:OEditBaseModel( _pOriginal, _rxFactory )
- ,m_bMaxTextLenModified(sal_False)
- ,m_nKeyType(NumberFormat::UNDEFINED)
- ,m_aNullDate(DBTypeConversion::getStandardDate())
,m_nFormatKey(0)
+ ,m_aNullDate(DBTypeConversion::getStandardDate())
,m_nFieldType(DataType::OTHER)
+ ,m_nKeyType(NumberFormat::UNDEFINED)
+ ,m_bMaxTextLenModified(sal_False)
,m_bWritingFormattedFake(sal_False)
,m_bNumericField(sal_False)
{
@@ -563,7 +563,7 @@ void OEditModel::_loaded(const EventObject& rEvent)
m_bMaxTextLenModified = getINT16(m_xAggregateSet->getPropertyValue(PROPERTY_MAXTEXTLEN)) != 0;
if ( !m_bMaxTextLenModified )
{
- sal_Int32 nFieldLen;
+ sal_Int32 nFieldLen(0);
xField->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Precision" ))) >>= nFieldLen;
if (nFieldLen && nFieldLen <= USHRT_MAX)
diff --git a/binfilter/bf_forms/source/component/forms_EditBase.cxx b/binfilter/bf_forms/source/component/forms_EditBase.cxx
index 4fbff3d..4aeb213 100644
--- a/binfilter/bf_forms/source/component/forms_EditBase.cxx
+++ b/binfilter/bf_forms/source/component/forms_EditBase.cxx
@@ -60,9 +60,9 @@ DBG_NAME( OEditBaseModel )
OEditBaseModel::OEditBaseModel( const Reference< XMultiServiceFactory >& _rxFactory, const ::rtl::OUString& rUnoControlModelName,
const ::rtl::OUString& rDefault, const sal_Bool _bSetDelegator )
:OBoundControlModel( _rxFactory, rUnoControlModelName, rDefault, sal_True, _bSetDelegator )
- ,m_bFilterProposal(sal_False)
- ,m_bEmptyIsNull(sal_True)
,m_nLastReadVersion(0)
+ ,m_bEmptyIsNull(sal_True)
+ ,m_bFilterProposal(sal_False)
{
DBG_CTOR( OEditBaseModel, NULL );
}
@@ -158,7 +158,7 @@ void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream) thro
sal_Bool bHandleCommonProps = (nVersion & PF_HANDLE_COMMON_PROPS) != 0;
nVersion = nVersion & ~PF_SPECIAL_FLAGS;
- sal_uInt16 nOld = _rxInStream->readShort();
+ /*sal_uInt16 nOld =*/ _rxInStream->readShort();
_rxInStream >> m_aDefaultText;
if (nVersion >= 0x0003)
diff --git a/binfilter/bf_forms/source/component/forms_Filter.cxx b/binfilter/bf_forms/source/component/forms_Filter.cxx
index a780d7f..349b13f 100644
--- a/binfilter/bf_forms/source/component/forms_Filter.cxx
+++ b/binfilter/bf_forms/source/component/forms_Filter.cxx
@@ -93,12 +93,12 @@ namespace frm
//---------------------------------------------------------------------
OFilterControl::OFilterControl( const Reference< XMultiServiceFactory >& _rxORB )
:m_aTextListeners( *this )
+ ,m_xORB( _rxORB )
+ ,m_aParser( _rxORB )
+ ,m_nControlClass( FormComponentType::TEXTFIELD )
,m_bFilterList( sal_False )
,m_bMultiLine( sal_False )
- ,m_nControlClass( FormComponentType::TEXTFIELD )
,m_bFilterListFilled( sal_False )
- ,m_xORB( _rxORB )
- ,m_aParser( _rxORB )
{
}
@@ -432,10 +432,10 @@ namespace frm
aStatement.appendAscii( " FROM " );
aStatement.append( ::dbtools::quoteTableName( xMeta, sTableName, ::dbtools::eInDataManipulation ) );
- ::rtl::OUString sStatement( aStatement.makeStringAndClear( ) );
+ ::rtl::OUString sLclStatement( aStatement.makeStringAndClear( ) );
xStatement = xConnection->createStatement();
- xListCursor = xStatement->executeQuery( sStatement );
+ xListCursor = xStatement->executeQuery( sLclStatement );
Reference< XColumnsSupplier > xSupplyCols(xListCursor, UNO_QUERY);
Reference< XIndexAccess > xFields;
diff --git a/binfilter/bf_forms/source/component/forms_FormattedField.cxx b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
index a56f6ac..958baa9 100644
--- a/binfilter/bf_forms/source/component/forms_FormattedField.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
@@ -166,7 +166,7 @@ OFormattedControl::OFormattedControl(const Reference<XMultiServiceFactory>& _rxF
}
}
// Refcount wieder bei 1 fuer den Listener
- sal_Int32 n = decrement(m_refCount);
+ /*sal_Int32 n =*/ decrement(m_refCount);
}
//------------------------------------------------------------------------------
@@ -245,7 +245,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr
}
//------------------------------------------------------------------------------
-void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException)
+void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException)
{
}
@@ -737,7 +737,6 @@ void OFormattedModel::_loaded(const EventObject& rEvent)
{
Locale aApplicationLocale = Application::GetSettings().GetUILocale();
- sal_Int32 nNewKey = 0;
if (m_bOriginalNumeric)
aFmtKey <<= (sal_Int32)xTypes->getStandardFormat(NumberFormat::NUMBER, aApplicationLocale);
else
@@ -972,7 +971,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
Reference< XDataInputStream > xIn(_rxInStream, UNO_QUERY);
OStreamSection aDownCompat(xIn);
- sal_Int16 nSubVersion = _rxInStream->readShort();
+ /*sal_Int16 nSubVersion =*/ _rxInStream->readShort();
// version 0 and higher : the "effective value" property
Any aEffectiveValue;
diff --git a/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx b/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx
index 3595914..ea5d771 100644
--- a/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx
@@ -82,8 +82,8 @@ InterfaceRef SAL_CALL OFormattedFieldWrapper_CreateInstance(const Reference<XMul
//------------------------------------------------------------------
OFormattedFieldWrapper::OFormattedFieldWrapper(const Reference<XMultiServiceFactory>& _rxFactory, sal_Bool _bActAsFormatted)
- :m_pEditPart(NULL)
- ,m_xServiceFactory(_rxFactory)
+ :m_xServiceFactory(_rxFactory)
+ ,m_pEditPart(NULL)
{
DBG_CTOR(OFormattedFieldWrapper, NULL);
diff --git a/binfilter/bf_forms/source/component/forms_Image.cxx b/binfilter/bf_forms/source/component/forms_Image.cxx
index afaad63..97aa75d 100644
--- a/binfilter/bf_forms/source/component/forms_Image.cxx
+++ b/binfilter/bf_forms/source/component/forms_Image.cxx
@@ -161,10 +161,12 @@ void OImageControl::propertyChange( const PropertyChangeEvent& rEvt )
Reference<XPointer> xPoint(
m_xServiceFactory->createInstance(SRV_AWT_POINTER), UNO_QUERY);
if (xPoint.is())
+ {
if (getString(rEvt.NewValue).getLength())
xPoint->setType(SystemPointer::REFHAND);
else
xPoint->setType(SystemPointer::ARROW);
+ }
xPeer->setPointer(xPoint);
}
@@ -444,11 +446,11 @@ OImageModel::OImageModel( const Reference< XMultiServiceFactory >& _rxFactory, c
const ::rtl::OUString& rDefault, const sal_Bool _bSetDelegator )
:OControlModel( _rxFactory, _rUnoControlModelTypeName, rDefault, _bSetDelegator )
,OPropertyChangeListener(m_aMutex)
- ,m_pProducer( NULL )
,m_pMedium(NULL)
+ ,m_pProducer( NULL )
+ ,m_bDispatchUrlInternal(sal_False)
,m_bDownloading(sal_False)
,m_bProdStarted(sal_False)
- ,m_bDispatchUrlInternal(sal_False)
{
DBG_CTOR( OImageModel, NULL );
implConstruct();
@@ -459,11 +461,11 @@ OImageModel::OImageModel( const Reference< XMultiServiceFactory >& _rxFactory, c
OImageModel::OImageModel( const OImageModel* _pOriginal, const Reference<XMultiServiceFactory>& _rxFactory, const sal_Bool _bSetDelegator )
:OControlModel( _pOriginal, _rxFactory, _bSetDelegator )
,OPropertyChangeListener( m_aMutex )
- ,m_pProducer( NULL )
,m_pMedium( NULL )
+ ,m_pProducer( NULL )
+ ,m_bDispatchUrlInternal(sal_False)
,m_bDownloading( sal_False )
,m_bProdStarted( sal_False )
- ,m_bDispatchUrlInternal(sal_False)
{
DBG_CTOR( OImageModel, NULL );
implConstruct();
@@ -729,14 +731,14 @@ void OImageModel::SetURL( const ::rtl::OUString& rURL )
}
if( !pObjSh )
{
- SfxObjectShell *pTestObjSh = SfxObjectShell::GetFirst();
- while( !pObjSh && pTestObjSh )
+ SfxObjectShell *pLclTestObjSh = SfxObjectShell::GetFirst();
+ while( !pObjSh && pLclTestObjSh )
{
- Reference< XModel > xTestModel = pTestObjSh->GetModel();
+ Reference< XModel > xTestModel = pLclTestObjSh->GetModel();
if( xTestModel == xModel )
- pObjSh = pTestObjSh;
+ pObjSh = pLclTestObjSh;
else
- pTestObjSh = SfxObjectShell::GetNext( *pTestObjSh );
+ pLclTestObjSh = SfxObjectShell::GetNext( *pLclTestObjSh );
}
}
}
diff --git a/binfilter/bf_forms/source/component/forms_ImageButton.cxx b/binfilter/bf_forms/source/component/forms_ImageButton.cxx
index d45751c..b0fb480 100644
--- a/binfilter/bf_forms/source/component/forms_ImageButton.cxx
+++ b/binfilter/bf_forms/source/component/forms_ImageButton.cxx
@@ -245,7 +245,7 @@ OImageButtonControl::OImageButtonControl(const Reference<XMultiServiceFactory>&
xComp->addMouseListener((XMouseListener*)this);
}
// Refcount bei 1 fuer angemeldeten Listener
- sal_Int32 n = decrement(m_refCount);
+ /*sal_Int32 n =*/ decrement(m_refCount);
}
// UNO Anbindung
diff --git a/binfilter/bf_forms/source/component/forms_ImageControl.cxx b/binfilter/bf_forms/source/component/forms_ImageControl.cxx
index af07cc7..e241d7c 100644
--- a/binfilter/bf_forms/source/component/forms_ImageControl.cxx
+++ b/binfilter/bf_forms/source/component/forms_ImageControl.cxx
@@ -535,7 +535,7 @@ OImageControlControl::OImageControlControl(const Reference<XMultiServiceFactory>
xComp->addMouseListener(this);
}
// Refcount bei 1 fuer den Listener
- sal_Int32 n = decrement(m_refCount);
+ /*sal_Int32 n =*/ decrement(m_refCount);
}
// UNO Anbindung
@@ -724,7 +724,7 @@ void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent&
return;
}
- sal_Bool bReadOnly;
+ sal_Bool bReadOnly(sal_False);
xSet->getPropertyValue(PROPERTY_READONLY) >>= bReadOnly;
if (bReadOnly)
return;
diff --git a/binfilter/bf_forms/source/component/forms_ListBox.cxx b/binfilter/bf_forms/source/component/forms_ListBox.cxx
index e546539..bcb4ea3 100644
--- a/binfilter/bf_forms/source/component/forms_ListBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_ListBox.cxx
@@ -105,8 +105,8 @@ OListBoxModel::OListBoxModel(const Reference<XMultiServiceFactory>& _rxFactory)
// use the old control name for compytibility reasons
,OErrorBroadcaster( OComponentHelper::rBHelper )
,m_aRefreshListeners(m_aMutex)
- ,m_bBoundComponent(sal_False)
,m_nNULLPos(-1)
+ ,m_bBoundComponent(sal_False)
{
DBG_CTOR(OListBoxModel,NULL);
@@ -123,8 +123,8 @@ OListBoxModel::OListBoxModel( const OListBoxModel* _pOriginal, const Reference<X
:OBoundControlModel( _pOriginal, _rxFactory )
,OErrorBroadcaster( OComponentHelper::rBHelper )
,m_aRefreshListeners( m_aMutex )
- ,m_bBoundComponent(sal_False)
,m_nNULLPos(-1)
+ ,m_bBoundComponent(sal_False)
{
DBG_CTOR(OListBoxModel,NULL);
m_eListSourceType = _pOriginal->m_eListSourceType;
@@ -694,9 +694,8 @@ void OListBoxModel::loadData()
disposeComponent(xListCursor);
return;
}
- catch(Exception& eUnknown)
+ catch(Exception& /*eUnknown*/)
{
- eUnknown;
disposeComponent(xListCursor);
return;
}
@@ -721,7 +720,7 @@ void OListBoxModel::loadData()
{
// Feld der 1. Column des ResultSets holen
Reference<XColumnsSupplier> xSupplyCols(xListCursor, UNO_QUERY);
- DBG_ASSERT(xSupplyCols.is(), "OListBoxModel::loadData : cursor supports the row set service but is no column supplier ??!");
+ DBG_ASSERT(xSupplyCols.is(), "OListBoxModel::loadData : cursor supports the row set service but is no column supplier!");
Reference<XIndexAccess> xColumns;
if (xSupplyCols.is())
{
@@ -793,9 +792,9 @@ void OListBoxModel::loadData()
// dann wird die Position fuer einen Leereintrag gemerkt
::rtl::OUString aStr;
- sal_Int16 i = 0;
+ sal_Int16 k = 0;
// per definitionem the list cursor is positioned _before_ the first row at the moment
- while (xListCursor->next() && (i++<SHRT_MAX)) // max anzahl eintraege
+ while (xListCursor->next() && (k++<SHRT_MAX)) // max anzahl eintraege
{
aStr = DBTypeConversion::getValue(xDataField,
xFormatter,
@@ -831,6 +830,8 @@ void OListBoxModel::loadData()
}
}
break;
+ default:
+ break;
}
}
catch(SQLException& eSQL)
@@ -839,9 +840,8 @@ void OListBoxModel::loadData()
disposeComponent(xListCursor);
return;
}
- catch(Exception& eUnknown)
+ catch(Exception& /*eUnknown*/)
{
- eUnknown;
disposeComponent(xListCursor);
return;
}
@@ -877,7 +877,7 @@ void OListBoxModel::loadData()
}
//------------------------------------------------------------------------------
-void OListBoxModel::_loaded(const EventObject& rEvent)
+void OListBoxModel::_loaded(const EventObject& /*rEvent*/)
{
// an Felder gebundene Listboxen haben keine Multiselektion
if (getField().is())
@@ -943,7 +943,7 @@ StringSequence OListBoxModel::GetCurValueSeq() const
if (nSelCount > 1)
{
// Einfach- oder Mehrfach-Selektion
- sal_Bool bMultiSel;
+ sal_Bool bMultiSel(sal_False);
const_cast<OListBoxModel*>(this)->OPropertySetAggregationHelper::getFastPropertyValue(PROPERTY_ID_MULTISELECTION) >>= bMultiSel;
if (bMultiSel)
nSelCount = 1;
@@ -1156,7 +1156,7 @@ StringSequence SAL_CALL OListBoxControl::getSupportedServiceNames() throw(Runtim
// XFocusListener
//------------------------------------------------------------------------------
-void SAL_CALL OListBoxControl::focusGained(const FocusEvent& _rEvent) throw(RuntimeException)
+void SAL_CALL OListBoxControl::focusGained(const FocusEvent& /*_rEvent*/) throw(RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
if (m_aChangeListeners.getLength()) // only if there are listeners
@@ -1171,14 +1171,14 @@ void SAL_CALL OListBoxControl::focusGained(const FocusEvent& _rEvent) throw(Runt
}
//------------------------------------------------------------------------------
-void SAL_CALL OListBoxControl::focusLost(const FocusEvent& _rEvent) throw(RuntimeException)
+void SAL_CALL OListBoxControl::focusLost(const FocusEvent& /*_rEvent*/) throw(RuntimeException)
{
m_aCurrentSelection.clear();
}
// XItemListener
//------------------------------------------------------------------------------
-void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) throw(RuntimeException)
+void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& /*_rEvent*/) throw(RuntimeException)
{
// call the changelistener delayed
::osl::ClearableMutexGuard aGuard(m_aMutex);
@@ -1261,7 +1261,7 @@ void OListBoxControl::disposing()
}
//------------------------------------------------------------------------------
-IMPL_LINK(OListBoxControl, OnTimeout, void*, EMPTYTAG)
+IMPL_LINK(OListBoxControl, OnTimeout, void*, EMPTYARG)
{
EventObject aEvt(static_cast< XWeak*>(this));
m_aChangeListeners.notifyEach(&XChangeListener::changed, aEvt);
diff --git a/binfilter/bf_forms/source/component/forms_RadioButton.cxx b/binfilter/bf_forms/source/component/forms_RadioButton.cxx
index 5fdef78..9c4299b 100644
--- a/binfilter/bf_forms/source/component/forms_RadioButton.cxx
+++ b/binfilter/bf_forms/source/component/forms_RadioButton.cxx
@@ -213,7 +213,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
// nur wenn es ein Radio-Button ist
if (!hasProperty(PROPERTY_CLASSID, xSiblingProperties))
continue;
- sal_Int16 nType;
+ sal_Int16 nType(0);
xSiblingProperties->getPropertyValue(PROPERTY_CLASSID) >>= nType;
if (nType != FormComponentType::RADIOBUTTON)
continue;
@@ -281,7 +281,7 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
// nur wenn ich nicht mich selber gefunden habe
continue;
- sal_Int16 nType;
+ sal_Int16 nType(0);
xSiblingProperties->getPropertyValue(PROPERTY_CLASSID) >>= nType;
if (nType != FormComponentType::RADIOBUTTON)
// nur Radio-Buttons
@@ -505,7 +505,7 @@ sal_Bool ORadioButtonModel::_commit()
{
try
{
- sal_Int16 nValue;
+ sal_Int16 nValue(0);
m_xAggregateSet->getPropertyValue(PROPERTY_STATE) >>= nValue;
if (nValue == 1)
xField->setPropertyValue(PROPERTY_VALUE, makeAny(m_sReferenceValue));
diff --git a/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx b/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx
index fde9e77..899b6eb 100644
--- a/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx
+++ b/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx
@@ -72,7 +72,7 @@ namespace frm
}
//------------------------------------------------------------------------------
- void SAL_CALL OErrorBroadcaster::onError( const SQLException& _rException, const ::rtl::OUString& _rContextDescription )
+ void SAL_CALL OErrorBroadcaster::onError( const SQLException& /*_rException*/, const ::rtl::OUString& /*_rContextDescription*/ )
{
OSL_ENSURE( false, "OErrorBroadcaster::onError: dead code!" );
}
diff --git a/binfilter/bf_forms/source/component/forms_imgprod.cxx b/binfilter/bf_forms/source/component/forms_imgprod.cxx
index 576e1d2..fdc6fc7 100644
--- a/binfilter/bf_forms/source/component/forms_imgprod.cxx
+++ b/binfilter/bf_forms/source/component/forms_imgprod.cxx
@@ -443,7 +443,7 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
List aTmp;
void * pCons;
sal_uInt16 nPalCount = 0;
- const sal_uInt16 nBitCount = pBmpAcc->GetBitCount();
+ /*const sal_uInt16 nBitCount =*/ pBmpAcc->GetBitCount();
sal_uInt32 nRMask = 0;
sal_uInt32 nGMask = 0;
sal_uInt32 nBMask = 0;
diff --git a/binfilter/bf_forms/source/component/makefile.mk b/binfilter/bf_forms/source/component/makefile.mk
index 75bcadc..31c6524 100644
--- a/binfilter/bf_forms/source/component/makefile.mk
+++ b/binfilter/bf_forms/source/component/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_forms/util/makefile.mk b/binfilter/bf_forms/util/makefile.mk
index 06e1530..41b6a4f 100644
--- a/binfilter/bf_forms/util/makefile.mk
+++ b/binfilter/bf_forms/util/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..
BFPRJ=..
diff --git a/binfilter/inc/bf_sfx2/docfile.hxx b/binfilter/inc/bf_sfx2/docfile.hxx
index a6b899c..5c9509d 100644
--- a/binfilter/inc/bf_sfx2/docfile.hxx
+++ b/binfilter/inc/bf_sfx2/docfile.hxx
@@ -139,6 +139,7 @@ public:
{}
SfxVersionTableDtor( const SfxVersionTableDtor &rCpy )
+ : _SfxVersionTable(0, 1)
{ *this = rCpy; }
~SfxVersionTableDtor()
More information about the Libreoffice-commits
mailing list