[Libreoffice-commits] .: 2 commits - binfilter/bf_svx
Caolán McNamara
caolan at kemper.freedesktop.org
Sat Jan 15 08:53:41 PST 2011
binfilter/bf_svx/source/form/svx_ParseContext.cxx | 19 ++++++-------------
binfilter/bf_svx/source/form/svx_fmmodel.cxx | 4 ++--
binfilter/bf_svx/source/form/svx_fmobj.cxx | 20 ++++++++++----------
binfilter/bf_svx/source/form/svx_fmpage.cxx | 2 +-
binfilter/bf_svx/source/form/svx_fmpgeimp.cxx | 4 +---
binfilter/bf_svx/source/inc/fmshimp.hxx | 4 ++--
6 files changed, 22 insertions(+), 31 deletions(-)
New commits:
commit 4b931bc832ce174ab8ac5be25fa39a958448f381
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 15 16:46:28 2011 +0000
WaE: throw out some warnings
diff --git a/binfilter/bf_svx/source/inc/fmshimp.hxx b/binfilter/bf_svx/source/inc/fmshimp.hxx
index 0d7093b..e192391 100644
--- a/binfilter/bf_svx/source/inc/fmshimp.hxx
+++ b/binfilter/bf_svx/source/inc/fmshimp.hxx
@@ -111,9 +111,9 @@ struct FmLoadAction
sal_uInt32 nEventId;
sal_uInt16 nFlags;
- FmLoadAction( ) : pPage( NULL ), nFlags( 0 ), nEventId( 0 ) { }
+ FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { }
FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, sal_uInt32 _nEventId )
- :pPage( _pPage ), nFlags( _nFlags ), nEventId( _nEventId )
+ :pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags )
{
}
};
commit 86a72d308c7d514f64b8927464b00ff01f4a8099
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 15 15:01:34 2011 +0000
WaE, throw out some warnings
diff --git a/binfilter/bf_svx/source/form/svx_ParseContext.cxx b/binfilter/bf_svx/source/form/svx_ParseContext.cxx
index bc90a95..1639289 100644
--- a/binfilter/bf_svx/source/form/svx_ParseContext.cxx
+++ b/binfilter/bf_svx/source/form/svx_ParseContext.cxx
@@ -60,32 +60,25 @@ using namespace ::connectivity;
//-----------------------------------------------------------------------------
/*?*/ ::com::sun::star::lang::Locale OSystemParseContext::getPreferredLocale( ) const
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); ::com::sun::star::lang::Locale alocal; return alocal;//STRIP001
-/*?*/ //STRIP001 return SvtSysLocale().GetLocaleData().getLocale();
/*?*/ }
//-----------------------------------------------------------------------------
-/*?*/ ::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); String astring; return astring;//STRIP001
+/*?*/ ::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode) const
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); String astring; return astring;
/*?*/ }
//-----------------------------------------------------------------------------
-/*?*/ ::rtl::OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); ByteString aKeyword; return aKeyword;//STRIP001
+/*?*/ ::rtl::OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode) const
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); ByteString aKeyword; return aKeyword;
/*?*/ }
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
-/*?*/ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::rtl::OString& rToken) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return KEY_NONE;//STRIP001
+/*?*/ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::rtl::OString&) const
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return KEY_NONE;
/*?*/ }
// =============================================================================
-// =============================================================================
namespace
{
// -----------------------------------------------------------------------------
diff --git a/binfilter/bf_svx/source/form/svx_fmmodel.cxx b/binfilter/bf_svx/source/form/svx_fmmodel.cxx
index 378dad7..c1be20c 100644
--- a/binfilter/bf_svx/source/form/svx_fmmodel.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmmodel.cxx
@@ -75,9 +75,9 @@ struct FmFormModelImplData
\************************************************************************/
/*N*/ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SvPersist* pPers)
/*N*/ :SdrModel(rPath, pPool, pPers)
+/*N*/ ,m_pImpl(NULL)
/*N*/ ,pObjShell(0)
/*N*/ ,bStreamingOldVersion(sal_False)
-/*N*/ ,m_pImpl(NULL)
/*N*/ ,m_bOpenInDesignMode(sal_False)
/*N*/ ,m_bAutoControlFocus(sal_False)
/*N*/ {
@@ -259,7 +259,7 @@ struct FmFormModelImplData
|* MovePage
|*
\************************************************************************/
-/*?*/ void FmFormModel::MovePage( USHORT nPgNum, USHORT nNewPos )
+/*?*/ void FmFormModel::MovePage( USHORT, USHORT )
/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
/*?*/ }
diff --git a/binfilter/bf_svx/source/form/svx_fmobj.cxx b/binfilter/bf_svx/source/form/svx_fmobj.cxx
index 228ff8a..98a8e3e 100644
--- a/binfilter/bf_svx/source/form/svx_fmobj.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmobj.cxx
@@ -67,8 +67,8 @@ using namespace ::binfilter::svxform;//STRIP008 using namespace ::svxform;
//------------------------------------------------------------------
/*N*/ FmFormObj::FmFormObj(sal_Int32 _nType)
/*N*/ :SdrUnoObj(String(), sal_False)
-/*N*/ ,nEvent(0)
/*N*/ ,pTempView(0)
+/*N*/ ,nEvent(0)
/*N*/ ,nPos(-1)
/*N*/ ,m_nType(_nType)
/*N*/ {
@@ -149,9 +149,9 @@ using namespace ::binfilter::svxform;//STRIP008 using namespace ::svxform;
/*?*/ ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > xOldParent(xMeAsFormComp->getParent(), ::com::sun::star::uno::UNO_QUERY);
/*?*/ if (xOldParent.is())
/*?*/ {
-/*?*/ sal_Int32 nPos = getElementPos(::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > (xOldParent, ::com::sun::star::uno::UNO_QUERY), xMeAsFormComp);
-/*?*/ if (nPos > -1)
-/*?*/ xOldParent->removeByIndex(nPos);
+/*?*/ sal_Int32 nLclPos = getElementPos(::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > (xOldParent, ::com::sun::star::uno::UNO_QUERY), xMeAsFormComp);
+/*?*/ if (nLclPos > -1)
+/*?*/ xOldParent->removeByIndex(nLclPos);
/*?*/ }
/*?*/ // and insert into the new container
/*?*/ xNewParent->insertByIndex(xNewParent->getCount(), ::com::sun::star::uno::makeAny(xMeAsFormComp));
@@ -165,9 +165,9 @@ using namespace ::binfilter::svxform;//STRIP008 using namespace ::svxform;
/*?*/ ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > xManagerAsIndex(xEventManager, ::com::sun::star::uno::UNO_QUERY);
/*?*/ if (xManagerAsIndex.is())
/*?*/ {
-/*?*/ sal_Int32 nPos = getElementPos(xManagerAsIndex, xMeAsFormComp);
-/*?*/ DBG_ASSERT(nPos >= 0, "FmFormObj::SetPage : inserted but not present ?");
-/*?*/ xEventManager->registerScriptEvents(nPos, aNewEvents);
+/*?*/ sal_Int32 nLclPos = getElementPos(xManagerAsIndex, xMeAsFormComp);
+/*?*/ DBG_ASSERT(nLclPos >= 0, "FmFormObj::SetPage : inserted but not present ?");
+/*?*/ xEventManager->registerScriptEvents(nLclPos, aNewEvents);
/*?*/ }
/*?*/ }
/*?*/ catch(...)
@@ -215,11 +215,11 @@ using namespace ::binfilter::svxform;//STRIP008 using namespace ::svxform;
//------------------------------------------------------------------
/*N*/ void FmFormObj::WriteData(SvStream& rOut) const
/*N*/ {
-/*N*/ FmFormModel* pModel = (FmFormModel*)GetModel();
-/*N*/ if( pModel && pModel->IsStreamingOldVersion() )
+/*N*/ FmFormModel* pLclModel = (FmFormModel*)GetModel();
+/*N*/ if( pLclModel && pLclModel->IsStreamingOldVersion() )
/*N*/ {
/*?*/ SdrLayerID nOld = GetLayer();
-/*?*/ ((FmFormObj*)this)->NbcSetLayer( pModel->GetControlExportLayerId( *this ) );
+/*?*/ ((FmFormObj*)this)->NbcSetLayer( pLclModel->GetControlExportLayerId( *this ) );
/*?*/ SdrUnoObj::WriteData( rOut );
/*?*/ ((FmFormObj*)this)->NbcSetLayer( nOld );
/*?*/ return;
diff --git a/binfilter/bf_svx/source/form/svx_fmpage.cxx b/binfilter/bf_svx/source/form/svx_fmpage.cxx
index 16b9b8d..3ed94a3 100644
--- a/binfilter/bf_svx/source/form/svx_fmpage.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpage.cxx
@@ -74,12 +74,12 @@ namespace binfilter {
//------------------------------------------------------------------
/*N*/ FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, bool bMasterPage)
/*N*/ :SdrPage(rModel, bMasterPage)
-/*N*/ ,pBasic(_pBasic)
/*N*/ #ifndef SVX_LIGHT
/*N*/ ,pImpl(new FmFormPageImpl(this))
/*N*/ #else
/*N*/ ,pImpl(NULL)
/*N*/ #endif
+/*N*/ ,pBasic(_pBasic)
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
index cef969e..a90c99e 100644
--- a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
@@ -180,7 +180,7 @@ using namespace ::binfilter::svxform;
/*N*/ }
//------------------------------------------------------------------------------
-/*N*/ void FmFormPageImpl::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
+/*N*/ void FmFormPageImpl::ReadData(const SdrIOHeader& /*rHead*/, SvStream& rIn)
/*N*/ {
/*N*/ // Abholen des InputStreams ueber uno
/*N*/ Reference< ::com::sun::star::io::XActiveDataSink > xSink(::legacy_binfilters::getLegacyProcessServiceFactory()->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.ObjectInputStream" ))), UNO_QUERY);
@@ -253,8 +253,6 @@ using namespace ::binfilter::svxform;
/*N*/ {
/*N*/ xOutStrm->writeObject(xObj);
/*N*/ }
-/*N*/ else
-/*N*/ ;// exception
/*N*/ }
/*N*/ }
More information about the Libreoffice-commits
mailing list