[Libreoffice-commits] .: 2 commits - binfilter/bf_svx
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jan 13 01:07:01 PST 2011
binfilter/bf_svx/source/editeng/editdoc.hxx | 2
binfilter/bf_svx/source/editeng/makefile.mk | 2
binfilter/bf_svx/source/editeng/svx_editattr.cxx | 70 +++----
binfilter/bf_svx/source/editeng/svx_editdoc2.cxx | 12 -
binfilter/bf_svx/source/editeng/svx_editeng.cxx | 34 +--
binfilter/bf_svx/source/editeng/svx_editobj.cxx | 88 +++-----
binfilter/bf_svx/source/editeng/svx_editsel.cxx | 12 -
binfilter/bf_svx/source/editeng/svx_editundo.cxx | 16 -
binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx | 4
binfilter/bf_svx/source/editeng/svx_impedit.cxx | 2
binfilter/bf_svx/source/editeng/svx_impedit2.cxx | 63 ++----
binfilter/bf_svx/source/editeng/svx_impedit3.cxx | 43 ++--
binfilter/bf_svx/source/editeng/svx_impedit4.cxx | 13 -
binfilter/bf_svx/source/editeng/svx_impedit5.cxx | 22 --
binfilter/bf_svx/source/editeng/svx_txtrange.cxx | 37 ++-
binfilter/bf_svx/source/editeng/svx_unolingu.cxx | 12 -
binfilter/bf_svx/source/unodraw/makefile.mk | 2
binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx | 2
binfilter/bf_svx/source/unodraw/svx_UnoNamespaceMap.cxx | 4
binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx | 8
binfilter/bf_svx/source/unodraw/svx_gluepts.cxx | 2
binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx | 13 -
binfilter/bf_svx/source/unodraw/svx_unoipset.cxx | 2
binfilter/bf_svx/source/unodraw/svx_unomlstr.cxx | 4
binfilter/bf_svx/source/unodraw/svx_unomod.cxx | 4
binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx | 2
binfilter/bf_svx/source/unodraw/svx_unonrule.cxx | 2
binfilter/bf_svx/source/unodraw/svx_unopage.cxx | 2
binfilter/bf_svx/source/unodraw/svx_unopool.cxx | 4
binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx | 16 -
binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx | 28 +-
binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx | 8
binfilter/bf_svx/source/unodraw/svx_unoshape.cxx | 99 +++++-----
binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx | 8
34 files changed, 296 insertions(+), 346 deletions(-)
New commits:
commit a48a1574445aa7c654f170830938c96e5e335b92
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 12 11:15:44 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_svx/source/unodraw/makefile.mk b/binfilter/bf_svx/source/unodraw/makefile.mk
index 6089c9e..9e04015 100644
--- a/binfilter/bf_svx/source/unodraw/makefile.mk
+++ b/binfilter/bf_svx/source/unodraw/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx b/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx
index 6394b51..847730f 100644
--- a/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx
@@ -78,7 +78,7 @@ void SvxUnoNameItemTable::dispose()
maItemSetVector.clear();
}
-void SvxUnoNameItemTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw()
+void SvxUnoNameItemTable::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) throw()
{
const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint );
diff --git a/binfilter/bf_svx/source/unodraw/svx_UnoNamespaceMap.cxx b/binfilter/bf_svx/source/unodraw/svx_UnoNamespaceMap.cxx
index 3fd3a05..0fa2392 100644
--- a/binfilter/bf_svx/source/unodraw/svx_UnoNamespaceMap.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_UnoNamespaceMap.cxx
@@ -161,7 +161,7 @@ sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL )
// we need the next namespace item
mpCurrentAttr = NULL;
- const SfxPoolItem* pItem;
+ const SfxPoolItem* pItem = NULL;
// look for the next available item in the current pool
while( (mnItem < mnItemCount) && ( NULL == (pItem = mpPool->GetItem( *mpWhichId, mnItem ) ) ) )
mnItem++;
@@ -299,7 +299,7 @@ OUString SAL_CALL NamespaceMap::getImplementationName( )
return NamespaceMap_getImplementationName();
}
-sal_Bool SAL_CALL NamespaceMap::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL NamespaceMap::supportsService( const OUString& /*rServiceName*/ )
throw(RuntimeException)
{
return sal_True;
diff --git a/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx b/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
index adc0d31..7c82ee9 100644
--- a/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
@@ -93,12 +93,16 @@ public:
};
SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyTable* pTable ) throw()
-: mpTable( pTable ), mpList( NULL ), mnWhich( nWhich )
+ : mnWhich( nWhich )
+ , mpList( NULL )
+ , mpTable( pTable )
{
}
SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw()
-: mpTable( NULL ), mpList( pList ), mnWhich( nWhich )
+ : mnWhich( nWhich )
+ , mpList( pList )
+ , mpTable( NULL )
{
}
diff --git a/binfilter/bf_svx/source/unodraw/svx_gluepts.cxx b/binfilter/bf_svx/source/unodraw/svx_gluepts.cxx
index 97bd29b..ae8d269 100644
--- a/binfilter/bf_svx/source/unodraw/svx_gluepts.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_gluepts.cxx
@@ -400,7 +400,7 @@ uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() thro
/* deprecated */
// XIndexContainer
-void SAL_CALL SvxUnoGluePointAccess::insertByIndex( sal_Int32 Index, const uno::Any& Element )
+void SAL_CALL SvxUnoGluePointAccess::insertByIndex( sal_Int32 /*Index*/, const uno::Any& Element )
throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
lang::WrappedTargetException, uno::RuntimeException)
{
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx b/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
index 4aca092..79f892c 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
@@ -138,7 +138,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::
}
}
-void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name )
+void SAL_CALL SvxUnoColorTable::removeByName( const OUString& /*rName*/ )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{DBG_BF_ASSERT(0, "STRIP");//STRIP001
}
@@ -160,7 +160,7 @@ void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno:
}
// XNameAccess
-uno::Any SAL_CALL SvxUnoColorTable::getByName( const OUString& aName )
+uno::Any SAL_CALL SvxUnoColorTable::getByName( const OUString& /*rName*/ )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{DBG_BF_ASSERT(0, "STRIP"); uno::Any aAny; return aAny;//STRIP001
}
@@ -171,11 +171,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getElementNames( )
const long nCount = pTable ? pTable->Count() : 0;
uno::Sequence< OUString > aSeq( nCount );
- OUString* pStrings = aSeq.getArray();
-
- for( long nIndex = 0; nIndex < nCount; nIndex++ )
- {DBG_BF_ASSERT(0, "STRIP");//STRIP001
- }
return aSeq;
}
@@ -203,7 +198,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasElements( )
/**
* Create a colortable
*/
-uno::Reference< uno::XInterface > SAL_CALL SvxUnoColorTable_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw(uno::Exception)
+uno::Reference< uno::XInterface > SAL_CALL SvxUnoColorTable_createInstance(const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/) throw(uno::Exception)
{
return *new SvxUnoColorTable();
}
@@ -236,7 +231,7 @@ sal_Bool SAL_CALL sfx2_component_writeInfo( void* pServiceManager ,
extern "C"
{
-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_svx/source/unodraw/svx_unoipset.cxx b/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx
index ad76cea..296d358 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoipset.cxx
@@ -320,7 +320,7 @@ void SvxItemPropertySet::ObtainSettingsFromPropertySet(SvxItemPropertySet& rProp
This check is for items that store either metric values if theire positiv
or percentage if theire negativ.
*/
-sal_Bool SvxUnoCheckForConversion( const SfxItemSet& rSet, sal_Int32 nWID, const uno::Any& rVal )
+sal_Bool SvxUnoCheckForConversion( const SfxItemSet& /*rSet*/, sal_Int32 nWID, const uno::Any& rVal )
{
sal_Bool bConvert = sal_True; // the default is that all metric items must be converted
diff --git a/binfilter/bf_svx/source/unodraw/svx_unomlstr.cxx b/binfilter/bf_svx/source/unodraw/svx_unomlstr.cxx
index 8581543..eb09515 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unomlstr.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unomlstr.cxx
@@ -43,14 +43,14 @@ SvxUnoShapeModifyListener::~SvxUnoShapeModifyListener() throw()
}
// ::com::sun::star::util::XModifyListener
-void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& aEvent) throw( uno::RuntimeException )
+void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& /*rEvent*/) throw( uno::RuntimeException )
{
if( mpObj )
mpObj->SendRepaintBroadcast();
}
// ::com::sun::star::lang::XEventListener
-void SvxUnoShapeModifyListener::disposing(const lang::EventObject& Source) throw( uno::RuntimeException )
+void SvxUnoShapeModifyListener::disposing(const lang::EventObject& /*rSource*/) throw( uno::RuntimeException )
{
invalidate();
}
diff --git a/binfilter/bf_svx/source/unodraw/svx_unomod.cxx b/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
index 8551e55..2fa8658 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unomod.cxx
@@ -263,7 +263,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField(
return xRet;
}
-uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
+uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWithArguments( const OUString& /*rServiceSpecifier*/, const uno::Sequence< ::com::sun::star::uno::Any >& /*rArguments*/ )
throw( uno::Exception, uno::RuntimeException )
{
throw lang::NoSupportException();
@@ -603,7 +603,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames(
}
// XAnyCompareFactory
-uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel::createAnyCompareByName( const OUString& PropertyName )
+uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel::createAnyCompareByName( const OUString& /*rPropertyName*/ )
throw(uno::RuntimeException)
{
return SvxCreateNumRuleCompare();
diff --git a/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx b/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx
index ab4f5de..60a2fc2 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx
@@ -134,7 +134,7 @@ void SvxUnoMarkerTable::dispose()
}
// SfxListener
-void SvxUnoMarkerTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw()
+void SvxUnoMarkerTable::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) throw()
{
const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint );
diff --git a/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx b/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx
index 5d9e2d1..9a9556a 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unonrule.cxx
@@ -292,7 +292,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const uno::Sequence< beans::
if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_NUMBERINGTYPE)))
{
- sal_Int16 nSet;
+ sal_Int16 nSet(0);
aVal >>= nSet;
switch(nSet)
diff --git a/binfilter/bf_svx/source/unodraw/svx_unopage.cxx b/binfilter/bf_svx/source/unodraw/svx_unopage.cxx
index f9a9a8f..236408d 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unopage.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unopage.cxx
@@ -107,7 +107,7 @@ SvxDrawPage::~SvxDrawPage() throw()
// SfxListener
//----------------------------------------------------------------------
-void SvxDrawPage::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void SvxDrawPage::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if( pModel )
{
diff --git a/binfilter/bf_svx/source/unodraw/svx_unopool.cxx b/binfilter/bf_svx/source/unodraw/svx_unopool.cxx
index 918f952..9472329 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unopool.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unopool.cxx
@@ -189,10 +189,10 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
{
::std::auto_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() );
- const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric(nWhich) : SFX_MAPUNIT_100TH_MM;
+ const SfxMapUnit eLclMapUnit = pPool ? pPool->GetMetric(nWhich) : SFX_MAPUNIT_100TH_MM;
BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
- if( eMapUnit == SFX_MAPUNIT_100TH_MM )
+ if( eLclMapUnit == SFX_MAPUNIT_100TH_MM )
nMemberId &= (~CONVERT_TWIPS);
if( !pNewItem->PutValue( aValue, nMemberId ) )
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
index 24bfc99..e40c59c 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
@@ -453,7 +453,7 @@ void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize )
// XConnectorShape
-void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType nPos ) throw( uno::RuntimeException )
+void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType /*nPos*/ ) throw( uno::RuntimeException )
{
::SolarMutexGuard aGuard;
@@ -468,7 +468,7 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC
}
//----------------------------------------------------------------------
-void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType nPos )
+void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType /*nPos*/ )
throw( uno::RuntimeException )
{
::SolarMutexGuard aGuard;
@@ -484,7 +484,7 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon
}
//----------------------------------------------------------------------
-void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >& xShape )
+void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >& /*xShape*/ )
throw( uno::RuntimeException )
{
::SolarMutexGuard aGuard;
@@ -497,7 +497,7 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing:
}
//----------------------------------------------------------------------
-void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& xShape )
+void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& /*xShape*/ )
throw( uno::RuntimeException )
{
::SolarMutexGuard aGuard;
@@ -722,7 +722,7 @@ SvxShapeControlPropertyValueMapping[] =
void SvxShapeControl::valueAlignToParaAdjust(Any& rValue)
{
- sal_Int16 nValue;
+ sal_Int16 nValue(0);
rValue >>= nValue;
sal_uInt16 i = 0;
while (-1 != SvxShapeControlPropertyValueMapping[i].nFormValue)
@@ -738,7 +738,7 @@ void SvxShapeControl::valueAlignToParaAdjust(Any& rValue)
void SvxShapeControl::valueParaAdjustToAlign(Any& rValue)
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
rValue >>= nValue;
sal_uInt16 i = 0;
while (-1 != SvxShapeControlPropertyValueMapping[i].nAPIValue)
@@ -811,7 +811,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyNa
{
if( bNeedConversion )
{
- sal_Int16 nSlant;
+ sal_Int16 nSlant(0);
xControl->getPropertyValue( aFormsName ) >>= nSlant;
return uno::makeAny( (awt::FontSlant)nSlant );
}
@@ -907,7 +907,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const ::rtl::OUString& aP
{
if( bNeedConversion )
{
- sal_Int16 nSlant;
+ sal_Int16 nSlant(0);
xControl->getPropertyDefault( aFormsName ) >>= nSlant;
return uno::makeAny( (awt::FontSlant)nSlant );
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx
index ff29c72..c590995 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx
@@ -68,8 +68,8 @@ using rtl::OUString;
***********************************************************************/
//----------------------------------------------------------------------
-Svx3DSceneObject::Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw()
-: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DSCENEOBJECT) ), pPage( pDrawPage )
+Svx3DSceneObject::Svx3DSceneObject( SdrObject* pInObj, SvxDrawPage* pDrawPage ) throw()
+: SvxShape( pInObj, aSvxMapProvider.GetMap(SVXMAP_3DSCENEOBJECT) ), pPage( pDrawPage )
{
}
@@ -484,8 +484,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames()
***********************************************************************/
//----------------------------------------------------------------------
-Svx3DCubeObject::Svx3DCubeObject( SdrObject* pObj ) throw()
-: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DCUBEOBJEKT) )
+Svx3DCubeObject::Svx3DCubeObject( SdrObject* pInObj ) throw()
+: SvxShape( pInObj, aSvxMapProvider.GetMap(SVXMAP_3DCUBEOBJEKT) )
{
}
@@ -521,8 +521,8 @@ void SAL_CALL Svx3DCubeObject::setPropertyValue( const OUString& aPropertyName,
drawing::Direction3D aDirection;
if( aValue >>= aDirection )
{
- Vector3D aSize(aDirection.DirectionX, aDirection.DirectionY, aDirection.DirectionZ);
- ((E3dCubeObj*)pObj)->SetCubeSize(aSize);
+ Vector3D aLclSize(aDirection.DirectionX, aDirection.DirectionY, aDirection.DirectionZ);
+ ((E3dCubeObj*)pObj)->SetCubeSize(aLclSize);
}
}
else if(pObj && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_3D_POS_IS_CENTER)) )
@@ -602,8 +602,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames()
***********************************************************************/
//----------------------------------------------------------------------
-Svx3DSphereObject::Svx3DSphereObject( SdrObject* pObj ) throw()
-: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DSPHEREOBJECT) )
+Svx3DSphereObject::Svx3DSphereObject( SdrObject* pInObj ) throw()
+: SvxShape( pInObj, aSvxMapProvider.GetMap(SVXMAP_3DSPHEREOBJECT) )
{
}
@@ -709,8 +709,8 @@ namespace binfilter {//STRIP009
//----------------------------------------------------------------------
-Svx3DLatheObject::Svx3DLatheObject( SdrObject* pObj ) throw()
-: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DLATHEOBJECT) )
+Svx3DLatheObject::Svx3DLatheObject( SdrObject* pInObj ) throw()
+: SvxShape( pInObj, aSvxMapProvider.GetMap(SVXMAP_3DLATHEOBJECT) )
{
}
@@ -910,8 +910,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames()
* *
***********************************************************************/
-Svx3DExtrudeObject::Svx3DExtrudeObject( SdrObject* pObj ) throw()
-: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DEXTRUDEOBJECT) )
+Svx3DExtrudeObject::Svx3DExtrudeObject( SdrObject* pInObj ) throw()
+: SvxShape( pInObj, aSvxMapProvider.GetMap(SVXMAP_3DEXTRUDEOBJECT) )
{
}
@@ -1024,8 +1024,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames(
***********************************************************************/
//----------------------------------------------------------------------
-Svx3DPolygonObject::Svx3DPolygonObject( SdrObject* pObj ) throw()
-: SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DPOLYGONOBJECT) )
+Svx3DPolygonObject::Svx3DPolygonObject( SdrObject* pInObj ) throw()
+: SvxShape( pInObj, aSvxMapProvider.GetMap(SVXMAP_3DPOLYGONOBJECT) )
{
}
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
index 154ad71..1e4ff75 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
@@ -845,8 +845,8 @@ Any SAL_CALL SvxFrameShape::getPropertyValue( const OUString& PropertyName ) thr
DBG_ASSERT( xFrame.Is(), "wrong ole object inside frame" );
if( !xFrame.Is() )
{
- Any aAny;
- return aAny;
+ Any aLclAny;
+ return aLclAny;
}
const SfxFrameDescriptor *pDescriptor = xFrame->GetFrameDescriptor();
@@ -861,8 +861,8 @@ Any SAL_CALL SvxFrameShape::getPropertyValue( const OUString& PropertyName ) thr
case OWN_ATTR_FRAME_ISAUTOSCROLL:
if( pDescriptor->GetScrollingMode() == ScrollingAuto )
{
- Any aAny;
- return aAny;
+ Any aLclAny;
+ return aLclAny;
}
else
{
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
index b718a40..71dee91 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
@@ -111,7 +111,7 @@ const SfxItemPropertyMap* ImplGetSvxUnoOutlinerTextCursorPropertyMap()
SVX_UNOEDIT_PARA_PROPERTIES,
{MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0}
+ {0,0,0,0,0,0}
};
return aSvxUnoOutlinerTextCursorPropertyMap;
@@ -130,7 +130,7 @@ const SfxItemPropertyMap* ImplGetSvxTextPortionPropertyMap()
{MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0}
+ {0,0,0,0,0,0}
};
return aSvxTextPortionPropertyMap;
@@ -163,29 +163,29 @@ struct SvxShapeImpl
SvxShapeMaster* mpMaster;
};
-SvxShape::SvxShape( SdrObject* pObject ) throw()
-: aPropSet(aSvxMapProvider.GetMap(SVXMAP_SHAPE)),
- pObj (pObject),
- bDisposing( sal_False ),
- pModel(NULL),
+SvxShape::SvxShape( SdrObject* pObject ) throw() :
aSize(100,100),
- mnLockCount(0),
+ mpImpl(NULL),
+ aPropSet(aSvxMapProvider.GetMap(SVXMAP_SHAPE)),
aDisposeListeners( maMutex ),
- mpImpl(NULL)
+ bDisposing( sal_False ),
+ pObj (pObject),
+ pModel(NULL),
+ mnLockCount(0)
{
Init();
}
//----------------------------------------------------------------------
-SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMap* pPropertyMap ) throw()
-: aPropSet(pPropertyMap),
+SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMap* pPropertyMap ) throw() :
+ aSize(100,100),
+ mpImpl(NULL),
+ aPropSet(pPropertyMap),
+ aDisposeListeners( maMutex ),
bDisposing( sal_False ),
pObj (pObject),
pModel(NULL),
- aSize(100,100),
- mnLockCount(0),
- aDisposeListeners( maMutex ),
- mpImpl(NULL)
+ mnLockCount(0)
{
Init();
@@ -222,7 +222,7 @@ void SvxShape::setShapeKind( sal_uInt32 nKind )
sal_uInt32 SvxShape::getShapeKind() const
{
- return mpImpl ? mpImpl->mnObjId : OBJ_NONE;
+ return mpImpl ? mpImpl->mnObjId : 0;
}
//----------------------------------------------------------------------
@@ -315,7 +315,7 @@ sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence
}
else
{
- return NULL;
+ return 0;
}
}
@@ -384,7 +384,7 @@ void SvxShape::Init() throw()
}
//----------------------------------------------------------------------
-void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw()
+void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ ) throw()
{
if( pNewObj && ( (pObj != pNewObj) || (pModel == NULL) ) )
{
@@ -491,9 +491,9 @@ uno::Any SvxShape::GetBitmap( sal_Bool bMetaFile /* = sal_False */ ) const throw
VirtualDevice aVDev;
aVDev.SetMapMode(MapMode(MAP_100TH_MM));
- SdrModel* pModel = pObj->GetModel();
+ SdrModel* pLclModel = pObj->GetModel();
SdrPage* pPage = pObj->GetPage();
- E3dView* pView = new E3dView( pModel, &aVDev );
+ E3dView* pView = new E3dView( pLclModel, &aVDev );
pView->SetMarkHdlHidden( sal_True );
SdrPageView* pPageView = pView->ShowPage(pPage, Point());
@@ -502,7 +502,7 @@ uno::Any SvxShape::GetBitmap( sal_Bool bMetaFile /* = sal_False */ ) const throw
Rectangle aRect(pTempObj->GetBoundRect());
aRect.Justify();
- Size aSize(aRect.GetSize());
+ Size aLclSize(aRect.GetSize());
GDIMetaFile aMtf( pView->GetAllMarkedMetaFile() );
if( bMetaFile )
@@ -517,7 +517,7 @@ uno::Any SvxShape::GetBitmap( sal_Bool bMetaFile /* = sal_False */ ) const throw
else
{
Graphic aGraph(aMtf);
- aGraph.SetPrefSize(aSize);
+ aGraph.SetPrefSize(aLclSize);
aGraph.SetPrefMapMode(MAP_100TH_MM);
Reference< awt::XBitmap > xBmp( VCLUnoHelper::CreateBitmap(aGraph.GetBitmapEx()) );
@@ -806,7 +806,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId()
// SfxListener
//----------------------------------------------------------------------
-void SvxShape::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw()
+void SvxShape::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) throw()
{
if( pObj == NULL )
return;
@@ -1098,15 +1098,15 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException)
aEvt.Source = *(OWeakAggObject*) this;
aDisposeListeners.disposeAndClear(aEvt);
- SdrObject* pObj = GetSdrObject();
- if(pObj && pObj->IsInserted() && pObj->GetPage() )
+ SdrObject* pLclObj = GetSdrObject();
+ if(pLclObj && pLclObj->IsInserted() && pLclObj->GetPage() )
{
- SdrPage* pPage = pObj->GetPage();
+ SdrPage* pPage = pLclObj->GetPage();
// SdrObject aus der Page loeschen
sal_uInt32 nCount = pPage->GetObjCount();
for( sal_uInt32 nNum = 0; nNum < nCount; nNum++ )
{
- if(pPage->GetObj(nNum) == pObj)
+ if(pPage->GetObj(nNum) == pLclObj)
{
delete pPage->RemoveObject(nNum);
InvalidateSdrObject();
@@ -1162,10 +1162,10 @@ Reference< beans::XPropertySetInfo > SAL_CALL
//----------------------------------------------------------------------
-void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& aPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& aPropertyName, const Reference< beans::XPropertyChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& PropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& PropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& /*rPropertyName*/, const Reference< beans::XPropertyChangeListener >& /*rListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& /*rPropertyName*/, const Reference< beans::XPropertyChangeListener >& /*rListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& /*rPropertyName*/, const Reference< beans::XVetoableChangeListener >& /*rListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const Reference< beans::XVetoableChangeListener >& /*rListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
//----------------------------------------------------------------------
@@ -1463,6 +1463,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
SdrObject* pCheck =
pObjList->SetObjectOrdNum( pObj->GetOrdNum(), (ULONG)nNewOrdNum );
DBG_ASSERT( pCheck == pObj, "GetOrdNum() failed!" );
+ (void)pCheck;
return;
}
}
@@ -1512,14 +1513,14 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
SvGlobalName aClassName;
if( aClassName.MakeId( aCLSID ) )
{
- SvGlobalName aClassName;
+ SvGlobalName aInnerClassName;
- if( aClassName.MakeId( aCLSID ) )
+ if( aInnerClassName.MakeId( aCLSID ) )
{
// create storage and inplace object
String aEmptyStr;
SvStorageRef aStor( new SvStorage( aEmptyStr, STREAM_STD_READWRITE ) );
- SvInPlaceObjectRef aIPObj( &((SvFactory*)SvInPlaceObject::ClassFactory())->CreateAndInit( aClassName, aStor) );
+ SvInPlaceObjectRef aIPObj( &((SvFactory*)SvInPlaceObject::ClassFactory())->CreateAndInit( aInnerClassName, aStor) );
SvPersist* pPersist = pModel->GetPersist();
String aPersistName;
OUString aTmpStr;
@@ -2148,7 +2149,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
}
case OWN_ATTR_OLESIZE:
{
- awt::Size aSize;
+ awt::Size aLclSize;
if( pObj->ISA(SdrOle2Obj))
{
SdrOle2Obj& aObj = *(SdrOle2Obj*)pObj;
@@ -2156,10 +2157,10 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
if( xInplace.Is() )
{
Size aTmpSize( xInplace->GetVisArea().GetSize() );
- aSize = awt::Size( aTmpSize.Width(), aTmpSize.Height() );
+ aLclSize = awt::Size( aTmpSize.Width(), aTmpSize.Height() );
}
}
- aAny <<= aSize;
+ aAny <<= aLclSize;
break;
}
case OWN_ATTR_OLEMODEL:
@@ -2489,15 +2490,15 @@ void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence
return aRet;
}
-void SAL_CALL SvxShape::addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL SvxShape::addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /*rPropertyNames*/, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& /*xListener*/ ) throw (::com::sun::star::uno::RuntimeException)
{
}
-void SAL_CALL SvxShape::removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL SvxShape::removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& /*xListener*/ ) throw (::com::sun::star::uno::RuntimeException)
{
}
-void SAL_CALL SvxShape::firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL SvxShape::firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /*rPropertyNames*/, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& /*xListener*/ ) throw (::com::sun::star::uno::RuntimeException)
{
}
@@ -3500,7 +3501,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxShape::getParent( )
//----------------------------------------------------------------------
-void SAL_CALL SvxShape::setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent )
+void SAL_CALL SvxShape::setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& /*rParent*/ )
throw(lang::NoSupportException, uno::RuntimeException)
{
throw lang::NoSupportException();
@@ -3747,9 +3748,9 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId()
/** called from the XActionLockable interface methods on initial locking */
void SvxShapeText::lock()
{
- SvxTextEditSource* pEditSource = (SvxTextEditSource*)GetEditSource();
- if( pEditSource )
- pEditSource->lock();
+ SvxTextEditSource* pLclEditSource = (SvxTextEditSource*)GetEditSource();
+ if( pLclEditSource )
+ pLclEditSource->lock();
}
//----------------------------------------------------------------------
@@ -3757,17 +3758,17 @@ void SvxShapeText::lock()
/** called from the XActionLockable interface methods on final unlock */
void SvxShapeText::unlock()
{
- SvxTextEditSource* pEditSource = (SvxTextEditSource*)GetEditSource();
- if( pEditSource )
- pEditSource->unlock();
+ SvxTextEditSource* pLclEditSource = (SvxTextEditSource*)GetEditSource();
+ if( pLclEditSource )
+ pLclEditSource->unlock();
}
/***********************************************************************
* class SvxShapeRect *
***********************************************************************/
-SvxShapeRect::SvxShapeRect( SdrObject* pObj ) throw()
-: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_SHAPE) )
+SvxShapeRect::SvxShapeRect( SdrObject* pInObj ) throw()
+: SvxShapeText( pInObj, aSvxMapProvider.GetMap(SVXMAP_SHAPE) )
{
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
index cbb61c9..19140b2 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
@@ -216,7 +216,7 @@ void SAL_CALL SvxTextEditSourceImpl::release()
//------------------------------------------------------------------------
-void SvxTextEditSourceImpl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void SvxTextEditSourceImpl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint );
const SvxViewHint* pViewHint = PTR_CAST( SvxViewHint, &rHint );
@@ -228,6 +228,8 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
case SVX_HINT_VIEWCHANGED:
Broadcast( *pViewHint );
break;
+ default:
+ break;
}
}
else if( pSdrHint )
@@ -330,6 +332,8 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
}
break;
+ default:
+ break;
}
}
@@ -824,7 +828,7 @@ Point SvxTextEditSourceImpl::PixelToLogic( const Point& rPoint, const MapMode& r
return Point();
}
-IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, aNotify)
+IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, EMPTYARG)
{
return 0;
}
commit 8dfaffe1aff0178cd8305a778b786a1f36ff6c77
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 12 09:33:59 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_svx/source/editeng/editdoc.hxx b/binfilter/bf_svx/source/editeng/editdoc.hxx
index c9240a3..60a313d 100644
--- a/binfilter/bf_svx/source/editeng/editdoc.hxx
+++ b/binfilter/bf_svx/source/editeng/editdoc.hxx
@@ -436,7 +436,7 @@ public:
USHORT GetLen() const { return nEnd - nStart; }
USHORT GetStartPosX() const { return nStartPosX; }
- void SetStartPosX( USHORT nStart ) { nStartPosX = nStart; }
+ void SetStartPosX( USHORT nInStart ) { nStartPosX = nInStart; }
Size CalcTextSize( ParaPortion& rParaPortion );
diff --git a/binfilter/bf_svx/source/editeng/makefile.mk b/binfilter/bf_svx/source/editeng/makefile.mk
index 7779904..897b969 100644
--- a/binfilter/bf_svx/source/editeng/makefile.mk
+++ b/binfilter/bf_svx/source/editeng/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_svx/source/editeng/svx_editattr.cxx b/binfilter/bf_svx/source/editeng/svx_editattr.cxx
index b8be0ec..c616cb9 100644
--- a/binfilter/bf_svx/source/editeng/svx_editattr.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editattr.cxx
@@ -107,8 +107,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribFont
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribFont::EditCharAttribFont( const SvxFontItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribFont::EditCharAttribFont( const SvxFontItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_FONTINFO || rAttr.Which() == EE_CHAR_FONTINFO_CJK || rAttr.Which() == EE_CHAR_FONTINFO_CTL, "Kein Fontattribut!" );
/*N*/ }
@@ -126,8 +126,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribItalic
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribItalic::EditCharAttribItalic( const SvxPostureItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribItalic::EditCharAttribItalic( const SvxPostureItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_ITALIC || rAttr.Which() == EE_CHAR_ITALIC_CJK || rAttr.Which() == EE_CHAR_ITALIC_CTL, "Kein Italicattribut!" );
/*N*/ }
@@ -140,8 +140,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribWeight
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribWeight::EditCharAttribWeight( const SvxWeightItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribWeight::EditCharAttribWeight( const SvxWeightItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_WEIGHT || rAttr.Which() == EE_CHAR_WEIGHT_CJK || rAttr.Which() == EE_CHAR_WEIGHT_CTL, "Kein Weightttribut!" );
/*N*/ }
@@ -154,8 +154,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribUnderline
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_UNDERLINE, "Kein Underlineattribut!" );
/*N*/ }
@@ -170,8 +170,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribFontHeight
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribFontHeight::EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribFontHeight::EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_FONTHEIGHT || rAttr.Which() == EE_CHAR_FONTHEIGHT_CJK || rAttr.Which() == EE_CHAR_FONTHEIGHT_CTL, "Kein Heightattribut!" );
/*N*/ }
@@ -185,13 +185,13 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribFontWidth
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribFontWidth::EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribFontWidth::EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_FONTWIDTH, "Kein Widthattribut!" );
/*N*/ }
-/*N*/ void EditCharAttribFontWidth::SetFont( SvxFont& rFont, OutputDevice* )
+/*N*/ void EditCharAttribFontWidth::SetFont( SvxFont&, OutputDevice* )
/*N*/ {
/*N*/ // must be calculated outside, because f(device)...
/*N*/ }
@@ -199,8 +199,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribStrikeout
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribStrikeout::EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribStrikeout::EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_STRIKEOUT, "Kein Sizeattribut!" );
/*N*/ }
@@ -213,8 +213,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribColor
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribColor::EditCharAttribColor( const SvxColorItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribColor::EditCharAttribColor( const SvxColorItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_COLOR, "Kein Colorattribut!" );
/*N*/ }
@@ -227,8 +227,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribLanguage
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribLanguage::EditCharAttribLanguage( const SvxLanguageItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribLanguage::EditCharAttribLanguage( const SvxLanguageItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( ( rAttr.Which() == EE_CHAR_LANGUAGE ) || ( rAttr.Which() == EE_CHAR_LANGUAGE_CJK ) || ( rAttr.Which() == EE_CHAR_LANGUAGE_CTL ), "Kein Languageattribut!" );
/*N*/ }
@@ -241,8 +241,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribShadow
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribShadow::EditCharAttribShadow( const SvxShadowedItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribShadow::EditCharAttribShadow( const SvxShadowedItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_SHADOW, "Kein Shadowattribut!" );
/*N*/ }
@@ -255,8 +255,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribEscapement
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_ESCAPEMENT, "Kein Escapementattribut!" );
/*N*/ }
@@ -286,8 +286,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribOutline
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribOutline::EditCharAttribOutline( const SvxContourItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribOutline::EditCharAttribOutline( const SvxContourItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_OUTLINE, "Kein Outlineattribut!" );
/*N*/ }
@@ -381,8 +381,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribPairKerning
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribPairKerning::EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribPairKerning::EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_PAIRKERNING, "Kein PairKerning!" );
/*N*/ }
@@ -395,8 +395,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribKerning
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribKerning::EditCharAttribKerning( const SvxKerningItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribKerning::EditCharAttribKerning( const SvxKerningItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_KERNING, "Kein Kerning!" );
/*N*/ }
@@ -409,8 +409,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribWordLineMode
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribWordLineMode::EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribWordLineMode::EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_WLM, "Kein Kerning!" );
/*N*/ }
@@ -423,8 +423,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribEmphasisMark
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribEmphasisMark::EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribEmphasisMark::EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_EMPHASISMARK, "Kein Emphasisattribut!" );
/*N*/ }
@@ -437,8 +437,8 @@ namespace binfilter {
// -------------------------------------------------------------------------
// class EditCharAttribRelief
// -------------------------------------------------------------------------
-/*N*/ EditCharAttribRelief::EditCharAttribRelief( const SvxCharReliefItem& rAttr, USHORT nStart, USHORT nEnd )
-/*N*/ : EditCharAttrib( rAttr, nStart, nEnd )
+/*N*/ EditCharAttribRelief::EditCharAttribRelief( const SvxCharReliefItem& rAttr, USHORT nInStart, USHORT nInEnd )
+/*N*/ : EditCharAttrib( rAttr, nInStart, nInEnd )
/*N*/ {
/*N*/ DBG_ASSERT( rAttr.Which() == EE_CHAR_RELIEF, "Not a relief attribute!" );
/*N*/ }
diff --git a/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx b/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx
index ed31fed..3169820 100644
--- a/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx
@@ -185,18 +185,12 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
/*N*/ // aExtraCharInfos.Remove( 0, aExtraCharInfos.Count() );
/*N*/ }
-/*N*/ void ParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT nEnd )
+/*N*/ void ParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT /*nEnd*/ )
/*N*/ {
/*N*/ if ( bInvalid == FALSE )
-/*N*/ {
/*N*/ nInvalidPosStart = nStart;
-/*N*/ // nInvalidPosEnd = nEnd;
-/*N*/ }
/*N*/ else
-/*N*/ {
/*N*/ nInvalidPosStart = Min( nInvalidPosStart, nStart );
-/*N*/ // nInvalidPosEnd = pNode->Len();
-/*N*/ }
/*N*/ nInvalidDiff = 0;
/*N*/ bInvalid = TRUE;
/*N*/ bSimple = FALSE;
@@ -308,10 +302,8 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
-/*N*/ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit )
+/*N*/ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit, MapUnit )
/*N*/ {
-/*N*/ DBG_ASSERT( eSourceUnit != eDestUnit, "ConvertItem - Why?!" );
-/*N*/
/*N*/ switch ( rPoolItem.Which() )
/*N*/ {
/*N*/ case EE_PARA_LRSPACE:
diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.cxx b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
index 902f8ae..5760ec1 100644
--- a/binfilter/bf_svx/source/editeng/svx_editeng.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
@@ -388,12 +388,12 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ return pImpEditEngine->GetLineCount( nParagraph );
/*N*/ }
-/*N*/ sal_uInt16 EditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001
+/*N*/ sal_uInt16 EditEngine::GetLineLen( sal_uInt16, sal_uInt16 ) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
-/*?*/ sal_uInt32 EditEngine::GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine )
-/*?*/ {{DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001
+/*?*/ sal_uInt32 EditEngine::GetLineHeight( sal_uInt16, sal_uInt16 )
+/*?*/ {{DBG_BF_ASSERT(0, "STRIP");} return 0;
/*?*/ }
/*N*/ sal_uInt16 EditEngine::GetFirstLineOffset( sal_uInt16 nParagraph )
@@ -405,8 +405,8 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ return ( pPortion ? pPortion->GetFirstLineOffset() : 0 );
/*N*/ }
-/*N*/ sal_uInt32 EditEngine::GetTextHeight( sal_uInt16 nParagraph ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001
+/*N*/ sal_uInt32 EditEngine::GetTextHeight( sal_uInt16 ) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
@@ -634,8 +634,8 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ return pImpEditEngine->GetParaAttrib( nPara, nWhich );
/*N*/ }
-/*N*/ void EditEngine::GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void EditEngine::GetCharAttribs( sal_uInt16, EECharAttribArray& ) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib )
@@ -1094,7 +1094,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
// =====================================================================
// ====================== Virtuelle Methoden =======================
// =====================================================================
-/*N*/ void EditEngine::DrawingText( const Point&, const XubString&, USHORT nTextStart, USHORT nTextLen, const sal_Int32*, const SvxFont&, sal_uInt16 nPara, sal_uInt16 nIndex, BYTE nRightToLeft )
+/*N*/ void EditEngine::DrawingText( const Point&, const XubString&, USHORT, USHORT, const sal_Int32*, const SvxFont&, sal_uInt16, sal_uInt16, BYTE )
/*N*/ {
/*N*/ DBG_CHKTHIS( EditEngine, 0 );
/*N*/ }
@@ -1104,23 +1104,23 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ DBG_CHKTHIS( EditEngine, 0 );
/*N*/ }
-/*N*/ void EditEngine::ParagraphInserted( sal_uInt16 nPara )
+/*N*/ void EditEngine::ParagraphInserted( sal_uInt16 )
/*N*/ {
/*N*/ DBG_CHKTHIS( EditEngine, 0 );
/*N*/
/*N*/ if ( GetNotifyHdl().IsSet() )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_PARAGRAPHINSERTED );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-/*N*/ void EditEngine::ParagraphDeleted( sal_uInt16 nPara )
+/*N*/ void EditEngine::ParagraphDeleted( sal_uInt16 )
/*N*/ {
/*N*/ DBG_CHKTHIS( EditEngine, 0 );
/*N*/
/*N*/ if ( GetNotifyHdl().IsSet() )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_PARAGRAPHREMOVED );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
@@ -1137,13 +1137,13 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ }
-/*N*/ void EditEngine::ParagraphHeightChanged( sal_uInt16 nPara )
+/*N*/ void EditEngine::ParagraphHeightChanged( sal_uInt16 )
/*N*/ {
/*N*/ DBG_CHKTHIS( EditEngine, 0 );
/*N*/
/*N*/ if ( GetNotifyHdl().IsSet() )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_TEXTHEIGHTCHANGED );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
@@ -1200,12 +1200,12 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ return aComment;
/*N*/ }
-/*N*/ Rectangle EditEngine::GetBulletArea( sal_uInt16 nPara )
+/*N*/ Rectangle EditEngine::GetBulletArea( sal_uInt16 )
/*N*/ {
/*N*/ return Rectangle( Point(), Point() );
/*N*/ }
-/*N*/ XubString EditEngine::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16, sal_uInt16, Color*&, Color*& )
+/*N*/ XubString EditEngine::CalcFieldValue( const SvxFieldItem&, sal_uInt16, sal_uInt16, Color*&, Color*& )
/*N*/ {
/*N*/ DBG_CHKTHIS( EditEngine, 0 );
/*N*/ return ' ';
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index df500d6..73ad9c2 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -79,7 +79,7 @@ namespace binfilter {
/*N*/
/*N*/ if ( pFmt->GetBrush() && pFmt->GetBrush()->GetGraphic() )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Bitmap aBmp( pFmt->GetBrush()->GetGraphic()->GetBitmap() );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/
/*N*/ switch ( pFmt->GetNumberingType() )
@@ -246,55 +246,45 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-/*N*/ XubString EditTextObject::GetText( USHORT nParagraph ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return XubString();//STRIP001
+/*N*/ XubString EditTextObject::GetText( USHORT ) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return XubString();
/*N*/ }
-/*N*/ void EditTextObject::Insert( const EditTextObject& rObj, USHORT nPara )
+/*N*/ void EditTextObject::Insert( const EditTextObject&, USHORT )
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
-
-
-
/*N*/ void EditTextObject::ClearPortionInfo()
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
-
-
-
-/*N*/ void EditTextObject::MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart, USHORT nEnd )
+/*N*/ void EditTextObject::MergeParaAttribs( const SfxItemSet&, USHORT, USHORT )
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
-/*N*/ BOOL EditTextObject::HasField( TypeId aType ) const
+/*N*/ BOOL EditTextObject::HasField( TypeId ) const
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ return FALSE;
/*N*/ }
-/*N*/ SfxItemSet EditTextObject::GetParaAttribs( USHORT nPara ) const
+/*N*/ SfxItemSet EditTextObject::GetParaAttribs( USHORT ) const
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ return SfxItemSet( *(SfxItemPool*)NULL );
/*N*/ }
-
-
-
-
-/*N*/ void EditTextObject::GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const
+/*N*/ void EditTextObject::GetStyleSheet( USHORT, XubString&, SfxStyleFamily& ) const
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
-/*N*/ void EditTextObject::SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily )
+/*N*/ void EditTextObject::SetStyleSheet( USHORT, const XubString&, const SfxStyleFamily& )
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
@@ -306,8 +296,8 @@ namespace binfilter {
/*N*/ return FALSE;
/*N*/ }
-/*N*/ void EditTextObject::ChangeStyleSheetName( SfxStyleFamily eFamily,
-/*N*/ const XubString& rOldName, const XubString& rNewName )
+/*N*/ void EditTextObject::ChangeStyleSheetName( SfxStyleFamily,
+/*N*/ const XubString&, const XubString& )
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
@@ -318,7 +308,7 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-/*N*/ void EditTextObject::SetUserType( USHORT n )
+/*N*/ void EditTextObject::SetUserType( USHORT /*n*/ )
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
@@ -331,8 +321,8 @@ namespace binfilter {
/*N*/ return FALSE;
/*N*/ }
-/*N*/ void EditTextObject::SetVertical( BOOL bVertical )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void EditTextObject::SetVertical( BOOL /*bVertical*/ )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
@@ -345,8 +335,8 @@ namespace binfilter {
/*N*/ // Vorspann:
/*N*/ ULONG nStartPos = rOStream.Tell();
/*N*/
-/*N*/ USHORT nWhich = Which();
-/*N*/ rOStream << nWhich;
+/*N*/ USHORT nLclWhich = Which();
+/*N*/ rOStream << nLclWhich;
/*N*/
/*N*/ sal_uInt32 nStructSz = 0;
/*N*/ rOStream << nStructSz;
@@ -356,8 +346,8 @@ namespace binfilter {
/*N*/
/*N*/ // Nachspann:
/*N*/ ULONG nEndPos = rOStream.Tell();
-/*N*/ nStructSz = nEndPos - nStartPos - sizeof( nWhich ) - sizeof( nStructSz );
-/*N*/ rOStream.Seek( nStartPos + sizeof( nWhich ) );
+/*N*/ nStructSz = nEndPos - nStartPos - sizeof( nLclWhich ) - sizeof( nStructSz );
+/*N*/ rOStream.Seek( nStartPos + sizeof( nLclWhich ) );
/*N*/ rOStream << nStructSz;
/*N*/ rOStream.Seek( nEndPos );
/*N*/
@@ -369,19 +359,19 @@ namespace binfilter {
/*N*/ ULONG nStartPos = rIStream.Tell();
/*N*/
/*N*/ // Ertmal sehen, was fuer ein Object...
-/*N*/ USHORT nWhich;
-/*N*/ rIStream >> nWhich;
+/*N*/ USHORT nLclWhich;
+/*N*/ rIStream >> nLclWhich;
/*N*/
/*N*/ sal_uInt32 nStructSz;
/*N*/ rIStream >> nStructSz;
/*N*/
-/*N*/ DBG_ASSERT( ( nWhich == 0x22 /*EE_FORMAT_BIN300*/ ) || ( nWhich == EE_FORMAT_BIN ), "CreateTextObject: Unbekanntes Objekt!" );
+/*N*/ DBG_ASSERT( ( nLclWhich == 0x22 /*EE_FORMAT_BIN300*/ ) || ( nLclWhich == EE_FORMAT_BIN ), "CreateTextObject: Unbekanntes Objekt!" );
/*N*/
/*N*/ if ( rIStream.GetError() )
/*N*/ return NULL;
/*N*/
/*N*/ EditTextObject* pTxtObj = NULL;
-/*N*/ switch ( nWhich )
+/*N*/ switch ( nLclWhich )
/*N*/ {
/*N*/ case 0x22 /*BIN300*/: pTxtObj = new BinTextObject( 0 );
/*N*/ ((BinTextObject*)pTxtObj)->CreateData300( rIStream );
@@ -397,18 +387,18 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ // Sicherstellen, dass der Stream an der richtigen Stelle hinterlassen wird.
-/*N*/ ULONG nFullSz = sizeof( nWhich ) + sizeof( nStructSz ) + nStructSz;
+/*N*/ ULONG nFullSz = sizeof( nLclWhich ) + sizeof( nStructSz ) + nStructSz;
/*N*/ rIStream.Seek( nStartPos + nFullSz );
/*N*/ return pTxtObj;
/*N*/ }
-/*N*/ void EditTextObject::StoreData( SvStream& rOStream ) const
+/*N*/ void EditTextObject::StoreData( SvStream& /*rOStream*/ ) const
/*N*/ {
/*N*/ DBG_ERROR( "StoreData: Basisklasse!" );
/*N*/ }
-/*N*/ void EditTextObject::CreateData( SvStream& rIStream )
+/*N*/ void EditTextObject::CreateData( SvStream& /*rIStream*/ )
/*N*/ {
/*N*/ DBG_ERROR( "CreateData: Basisklasse!" );
/*N*/ }
@@ -420,12 +410,12 @@ namespace binfilter {
/*N*/ }
-/*N*/ void EditTextObject::AdjustImportedLRSpaceItems( BOOL bTurnOfBullets )
+/*N*/ void EditTextObject::AdjustImportedLRSpaceItems( BOOL /*bTurnOfBullets*/ )
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
-/*N*/ void EditTextObject::PrepareStore( SfxStyleSheetPool* pStyleSheetPool )
+/*N*/ void EditTextObject::PrepareStore( SfxStyleSheetPool* /*pStyleSheetPool*/ )
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
@@ -435,7 +425,7 @@ namespace binfilter {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
-/*N*/ void EditTextObject::FinishLoad( SfxStyleSheetPool* pStyleSheetPool )
+/*N*/ void EditTextObject::FinishLoad( SfxStyleSheetPool* /*pStyleSheetPool*/ )
/*N*/ {
/*N*/ DBG_ERROR( "V-Methode direkt vom EditTextObject!" );
/*N*/ }
@@ -700,8 +690,8 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void BinTextObject::SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& rFamily )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void BinTextObject::SetStyleSheet( USHORT, const XubString&, const SfxStyleFamily& )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ BOOL BinTextObject::ImpChangeStyleSheets(
@@ -990,12 +980,12 @@ namespace binfilter {
/*N*/ USHORT nAttr;
/*N*/ for ( nAttr = 0; nAttr < nAttribs; nAttr++ )
/*N*/ {
-/*N*/ USHORT nWhich, nStart, nEnd;
+/*N*/ USHORT nLclWhich, nStart, nEnd;
/*N*/ const SfxPoolItem* pItem;
/*N*/
-/*N*/ rIStream >> nWhich;
-/*N*/ nWhich = pPool->GetNewWhich( nWhich );
-/*N*/ pItem = pPool->LoadSurrogate( rIStream, nWhich, 0 );
+/*N*/ rIStream >> nLclWhich;
+/*N*/ nLclWhich = pPool->GetNewWhich( nLclWhich );
+/*N*/ pItem = pPool->LoadSurrogate( rIStream, nLclWhich, 0 );
/*N*/ rIStream >> nStart;
/*N*/ rIStream >> nEnd;
/*N*/ if ( pItem )
@@ -1009,7 +999,7 @@ namespace binfilter {
/*N*/ XEditAttribute* pAttr = new XEditAttribute( *pItem, nStart, nEnd );
/*N*/ pC->GetAttribs().Insert( pAttr, pC->GetAttribs().Count() );
/*N*/
-/*N*/ if ( ( nWhich >= EE_FEATURE_START ) && ( nWhich <= EE_FEATURE_END ) )
+/*N*/ if ( ( nLclWhich >= EE_FEATURE_START ) && ( nLclWhich <= EE_FEATURE_END ) )
/*N*/ {
/*N*/ // Convert CH_FEATURE to CH_FEATURE_OLD
/*N*/ DBG_ASSERT( (BYTE) aByteString.GetChar( nStart ) == CH_FEATURE_OLD, "CreateData: CH_FEATURE expected!" );
@@ -1499,12 +1489,12 @@ namespace binfilter {
/*N*/ // Which = 2; Surregat = 2; Start = 2; End = 2;
/*N*/ for ( sal_uInt32 nAttr = 0; nAttr < nAttribs; nAttr++ )
/*N*/ {
-/*N*/ USHORT nWhich, nStart, nEnd;
+/*N*/ USHORT nLclWhich, nStart, nEnd;
/*N*/ const SfxPoolItem* pItem;
/*N*/
-/*N*/ rIStream >> nWhich;
-/*N*/ nWhich = pPool->GetNewWhich( nWhich );
-/*N*/ pItem = pPool->LoadSurrogate( rIStream, nWhich, 0 );
+/*N*/ rIStream >> nLclWhich;
+/*N*/ nLclWhich = pPool->GetNewWhich( nLclWhich );
+/*N*/ pItem = pPool->LoadSurrogate( rIStream, nLclWhich, 0 );
/*N*/ rIStream >> nStart;
/*N*/ rIStream >> nEnd;
/*N*/ if ( pItem )
diff --git a/binfilter/bf_svx/source/editeng/svx_editsel.cxx b/binfilter/bf_svx/source/editeng/svx_editsel.cxx
index 6695fbb..dcdc893 100644
--- a/binfilter/bf_svx/source/editeng/svx_editsel.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editsel.cxx
@@ -49,7 +49,7 @@ namespace binfilter {
/*N*/ }
/*N*/ void EditSelFunctionSet::CreateAnchor()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ void EditSelFunctionSet::DestroyAnchor()
@@ -57,13 +57,13 @@ namespace binfilter {
/*N*/ // Nur bei Mehrfachselektion
/*N*/ }
-/*N*/ BOOL EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ BOOL EditSelFunctionSet::SetCursorAtPoint( const Point& /*rPointPixel*/, BOOL )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ return FALSE;
/*N*/ }
-/*N*/ BOOL EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ BOOL EditSelFunctionSet::IsSelectionAtPoint( const Point& /*rPointPixel*/ )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ return FALSE;
/*N*/ }
@@ -81,7 +81,7 @@ namespace binfilter {
/*N*/ void EditSelFunctionSet::DeselectAll()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
// ----------------------------------------------------------------------
diff --git a/binfilter/bf_svx/source/editeng/svx_editundo.cxx b/binfilter/bf_svx/source/editeng/svx_editundo.cxx
index 0c38f81..c1ab8f5 100644
--- a/binfilter/bf_svx/source/editeng/svx_editundo.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editundo.cxx
@@ -95,8 +95,8 @@ DBG_NAME( EditUndo )
// -----------------------------------------------------------------------
// EditUndoInsertChars
// ------------------------------------------------------------------------
-/*N*/ EditUndoInsertChars::EditUndoInsertChars( ImpEditEngine* pImpEE, const EPaM& rEPaM, const XubString& rStr )
-/*N*/ : EditUndo( EDITUNDO_INSERTCHARS, pImpEE ),
+/*N*/ EditUndoInsertChars::EditUndoInsertChars( ImpEditEngine* pInImpEE, const EPaM& rEPaM, const XubString& rStr )
+/*N*/ : EditUndo( EDITUNDO_INSERTCHARS, pInImpEE ),
/*N*/ aEPaM( rEPaM ), aText( rStr )
/*N*/ {
/*N*/ }
@@ -142,8 +142,8 @@ DBG_NAME( EditUndo )
// -----------------------------------------------------------------------
// EditUndoInsertFeature
// ------------------------------------------------------------------------
-/*N*/ EditUndoInsertFeature::EditUndoInsertFeature( ImpEditEngine* pImpEE, const EPaM& rEPaM, const SfxPoolItem& rFeature)
-/*N*/ : EditUndo( EDITUNDO_INSERTFEATURE, pImpEE ), aEPaM( rEPaM )
+/*N*/ EditUndoInsertFeature::EditUndoInsertFeature( ImpEditEngine* pInImpEE, const EPaM& rEPaM, const SfxPoolItem& rFeature)
+/*N*/ : EditUndo( EDITUNDO_INSERTFEATURE, pInImpEE ), aEPaM( rEPaM )
/*N*/ {
/*N*/ pFeature = rFeature.Clone();
/*N*/ DBG_ASSERT( pFeature, "Feature konnte nicht dupliziert werden: EditUndoInsertFeature" );
@@ -178,11 +178,11 @@ DBG_NAME( EditUndo )
// -----------------------------------------------------------------------
// EditUndoSetStyleSheet
// ------------------------------------------------------------------------
-/*N*/ EditUndoSetStyleSheet::EditUndoSetStyleSheet( ImpEditEngine* pImpEE, USHORT nP,
+/*N*/ EditUndoSetStyleSheet::EditUndoSetStyleSheet( ImpEditEngine* pInImpEE, USHORT nP,
/*N*/ const XubString& rPrevName, SfxStyleFamily ePrevFam,
/*N*/ const XubString& rNewName, SfxStyleFamily eNewFam,
/*N*/ const SfxItemSet& rPrevParaAttribs )
-/*N*/ : EditUndo( EDITUNDO_STYLESHEET, pImpEE ), aPrevName( rPrevName ), aNewName( rNewName ),
+/*N*/ : EditUndo( EDITUNDO_STYLESHEET, pInImpEE ), aPrevName( rPrevName ), aNewName( rNewName ),
/*N*/ aPrevParaAttribs( rPrevParaAttribs )
/*N*/ {
/*N*/ ePrevFamily = ePrevFam;
@@ -210,8 +210,8 @@ DBG_NAME( EditUndo )
// -----------------------------------------------------------------------
// EditUndoSetParaAttribs
// ------------------------------------------------------------------------
-/*N*/ EditUndoSetParaAttribs::EditUndoSetParaAttribs( ImpEditEngine* pImpEE, USHORT nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems )
-/*N*/ : EditUndo( EDITUNDO_PARAATTRIBS, pImpEE ),
+/*N*/ EditUndoSetParaAttribs::EditUndoSetParaAttribs( ImpEditEngine* pInImpEE, USHORT nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems )
+/*N*/ : EditUndo( EDITUNDO_PARAATTRIBS, pInImpEE ),
/*N*/ aPrevItems( rPrevItems ),
/*N*/ aNewItems(rNewItems )
/*N*/ {
diff --git a/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx b/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx
index 943f34f..d703c4b 100644
--- a/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx
@@ -80,8 +80,8 @@ const ::com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::
/*N*/ pInf->aForbiddenChars = rForbiddenChars;
/*N*/ }
-/*N*/ void SvxForbiddenCharactersTable::ClearForbiddenCharacters( USHORT nLanguage )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SvxForbiddenCharactersTable::ClearForbiddenCharacters( USHORT )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
}
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit.cxx b/binfilter/bf_svx/source/editeng/svx_impedit.cxx
index 2740a02..07cba82 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit.cxx
@@ -247,7 +247,7 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ return aRect;
/*N*/ }
-/*N*/ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, USHORT nShowCursorFlags )
+/*N*/ void ImpEditView::ShowCursor( sal_Bool /*bGotoCursor*/, sal_Bool /*bForceVisCursor*/, USHORT /*nShowCursorFlags*/ )
/*N*/ {
/*N*/ // Kein ShowCursor bei einer leeren View...
/*N*/ if ( ( aOutArea.Left() >= aOutArea.Right() ) && ( aOutArea.Top() >= aOutArea.Bottom() ) )
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
index 794864b..92104a8 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
@@ -91,26 +91,13 @@ String& EditUndoRemoveChars::GetStr() { return aText; }
using namespace ::com::sun::star;
-/*N*/ USHORT lcl_CalcExtraSpace( ParaPortion* pPortion, const SvxLineSpacingItem& rLSItem )
+/*N*/ USHORT lcl_CalcExtraSpace( const SvxLineSpacingItem& rLSItem )
/*N*/ {
/*N*/ USHORT nExtra = 0;
- /* if ( ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
- && ( rLSItem.GetPropLineSpace() != 100 ) )
- {
- // ULONG nH = pPortion->GetNode()->GetCharAttribs().GetDefFont().GetSize().Height();
- ULONG nH = pPortion->GetLines().GetObject( 0 )->GetHeight();
- long n = nH * rLSItem.GetPropLineSpace();
- n /= 100;
- n -= nH; // nur den Abstand
- if ( n > 0 )
- nExtra = (USHORT)n;
- }
- else */
/*N*/ if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
/*N*/ {
/*?*/ nExtra = rLSItem.GetInterLineSpace();
/*N*/ }
-/*N*/
/*N*/ return nExtra;
/*N*/ }
@@ -119,12 +106,12 @@ using namespace ::com::sun::star;
// ----------------------------------------------------------------------
/*N*/ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
-/*N*/ aEditDoc( pItemPool ),
/*N*/ aPaperSize( 0x7FFFFFFF, 0x7FFFFFFF ),
-/*N*/ aMaxAutoPaperSize( 0x7FFFFFFF, 0x7FFFFFFF ),
/*N*/ aMinAutoPaperSize( 0x0, 0x0 ),
-/*N*/ aGroupChars( RTL_CONSTASCII_USTRINGPARAM( "{}()[]" ) ),
-/*N*/ aWordDelimiters( RTL_CONSTASCII_USTRINGPARAM( " .,;:-'`'?!_=\"{}()[]\0xFF" ) )
+/*N*/ aMaxAutoPaperSize( 0x7FFFFFFF, 0x7FFFFFFF ),
+/*N*/ aEditDoc( pItemPool ),
+/*N*/ aWordDelimiters( RTL_CONSTASCII_USTRINGPARAM( " .,;:-'`'?!_=\"{}()[]\0xFF" ) ),
+/*N*/ aGroupChars( RTL_CONSTASCII_USTRINGPARAM( "{}()[]" ) )
/*N*/ {
/*N*/ pEditEngine = pEE;
/*N*/ pRefDev = NULL;
@@ -478,8 +465,8 @@ using namespace ::com::sun::star;
/*N*/ EditPaM aNewPaM( rPaM );
/*N*/ if ( aNewPaM.GetIndex() < nMax )
/*N*/ {
-/*N*/ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
-/*N*/ i18n::Boundary aBoundary = xBI->nextWord( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nWordType );
+/*N*/ uno::Reference < i18n::XBreakIterator > xLclBI = ImplGetBreakIterator();
+/*N*/ i18n::Boundary aBoundary = xLclBI->nextWord( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nWordType );
/*N*/ aNewPaM.SetIndex( (USHORT)aBoundary.startPos );
/*N*/ }
/*N*/ // not 'else', maybe the index reached nMax now...
@@ -503,11 +490,11 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ EditSelection aNewSel( rCurSel );
/*N*/ EditPaM aPaM( rCurSel.Max() );
-/*N*/ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
-/*N*/ sal_Int16 nType = xBI->getWordType( *aPaM.GetNode(), aPaM.GetIndex(), GetLocale( aPaM ) );
+/*N*/ uno::Reference < i18n::XBreakIterator > xLclBI = ImplGetBreakIterator();
+/*N*/ sal_Int16 nType = xLclBI->getWordType( *aPaM.GetNode(), aPaM.GetIndex(), GetLocale( aPaM ) );
/*N*/ if ( nType == i18n::WordType::ANY_WORD )
/*N*/ {
-/*N*/ i18n::Boundary aBoundary = xBI->getWordBoundary( *aPaM.GetNode(), aPaM.GetIndex(), GetLocale( aPaM ), nWordType, sal_True );
+/*N*/ i18n::Boundary aBoundary = xLclBI->getWordBoundary( *aPaM.GetNode(), aPaM.GetIndex(), GetLocale( aPaM ), nWordType, sal_True );
/*N*/ // don't select when curser at end of word
/*N*/ if ( ( aBoundary.endPos > aPaM.GetIndex() ) &&
/*N*/ ( bAcceptStartOfWord || ( aBoundary.startPos < aPaM.GetIndex() ) ) )
@@ -532,7 +519,7 @@ using namespace ::com::sun::star;
/*N*/ ContentNode* pNode = pParaPortion->GetNode();
/*N*/ if ( pNode->Len() )
/*N*/ {
-/*N*/ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
+/*N*/ uno::Reference < i18n::XBreakIterator > xLclBI = ImplGetBreakIterator();
/*N*/
/*N*/ String aText( *pNode );
/*N*/
@@ -545,11 +532,11 @@ using namespace ::com::sun::star;
/*N*/ if ( aFldText.getLength() )
/*N*/ {
/*N*/ aText.SetChar( pField->GetStart(), aFldText.getStr()[0] );
-/*N*/ short nFldScriptType = xBI->getScriptType( aFldText, 0 );
+/*N*/ short nFldScriptType = xLclBI->getScriptType( aFldText, 0 );
/*N*/
/*N*/ for ( USHORT nCharInField = 1; nCharInField < aFldText.getLength(); nCharInField++ )
/*N*/ {
-/*N*/ short nTmpType = xBI->getScriptType( aFldText, nCharInField );
+/*N*/ short nTmpType = xLclBI->getScriptType( aFldText, nCharInField );
/*N*/
/*N*/ // First char from field wins...
/*N*/ if ( nFldScriptType == i18n::ScriptType::WEAK )
@@ -574,15 +561,15 @@ using namespace ::com::sun::star;
/*N*/ USHORT nTextLen = (USHORT)aOUText.getLength();
/*N*/
/*N*/ long nPos = 0;
-/*N*/ short nScriptType = xBI->getScriptType( aOUText, nPos );
+/*N*/ short nScriptType = xLclBI->getScriptType( aOUText, nPos );
/*N*/ rTypes.Insert( ScriptTypePosInfo( nScriptType, (USHORT)nPos, nTextLen ), rTypes.Count() );
-/*N*/ nPos = xBI->endOfScript( aOUText, nPos, nScriptType );
+/*N*/ nPos = xLclBI->endOfScript( aOUText, nPos, nScriptType );
/*N*/ while ( ( nPos != (-1) ) && ( nPos < nTextLen ) )
/*N*/ {
/*N*/ rTypes[rTypes.Count()-1].nEndPos = (USHORT)nPos;
/*N*/
-/*N*/ nScriptType = xBI->getScriptType( aOUText, nPos );
-/*N*/ long nEndPos = xBI->endOfScript( aOUText, nPos, nScriptType );
+/*N*/ nScriptType = xLclBI->getScriptType( aOUText, nPos );
+/*N*/ long nEndPos = xLclBI->endOfScript( aOUText, nPos, nScriptType );
/*N*/
/*N*/ // #96850# Handle blanks as weak, remove if BreakIterator returns WEAK for spaces.
/*N*/ if ( ( nScriptType == i18n::ScriptType::LATIN ) && ( aOUText.getStr()[ nPos ] == 0x20 ) )
@@ -828,7 +815,6 @@ using namespace ::com::sun::star;
/*N*/ if ( !pParaPortion->aWritingDirectionInfos.Count() )
/*N*/ InitWritingDirections( nPara );
/*N*/
-/*N*/ BYTE nType = 0;
/*N*/ WritingDirectionInfos& rDirInfos = pParaPortion->aWritingDirectionInfos;
/*N*/ for ( USHORT n = 0; n < rDirInfos.Count(); n++ )
/*N*/ {
@@ -870,7 +856,7 @@ using namespace ::com::sun::star;
// Textaenderung
// ----------------------------------------------------------------------
-/*N*/ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars, EditUndoRemoveChars* pCurUndo )
+/*N*/ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars, EditUndoRemoveChars* /*pCurUndo*/ )
/*N*/ {
/*N*/ aEditDoc.RemoveChars( rPaM, nChars );
/*N*/ TextModified();
@@ -1176,7 +1162,6 @@ using namespace ::com::sun::star;
/*N*/ ContentNode* pNode = GetEditDoc().GetObject( nPara );
/*N*/ DBG_ASSERT( pNode, "NULL-Pointer im Doc" );
/*N*/ CharAttribArray& rAttribs = pNode->GetCharAttribs().GetAttribs();
-/*N*/ USHORT nAttrs = rAttribs.Count();
/*N*/ for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
/*N*/ {
/*N*/ EditCharAttrib* pAttr = rAttribs[nAttr];
@@ -1286,8 +1271,6 @@ using namespace ::com::sun::star;
/*N*/ // Ueber alle Absaetze...
/*N*/ // --------------------------------------------------
/*N*/ USHORT nParas = GetParaPortions().Count();
-/*N*/ USHORT nBiggestPara = 0;
-/*N*/ USHORT nBiggestLine = 0;
/*N*/ for ( USHORT nPara = 0; nPara < nParas; nPara++ )
/*N*/ {
/*N*/ ParaPortion* pPortion = GetParaPortions().GetObject( nPara );
@@ -1759,11 +1742,11 @@ using namespace ::com::sun::star;
/*N*/ USHORT nScriptType = GetScriptType( aPaM );
/*N*/ if ( nScriptType == i18n::ScriptType::COMPLEX )
/*N*/ {
-/*?*/ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
+/*?*/ uno::Reference < i18n::XBreakIterator > xLclBI = ImplGetBreakIterator();
/*?*/ sal_Int32 nCount = 1;
/*?*/ lang::Locale aLocale = GetLocale( aPaM );
-/*?*/ USHORT nRight = (USHORT)xBI->nextCharacters( *pParaPortion->GetNode(), nChar, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
-/*?*/ USHORT nLeft = (USHORT)xBI->previousCharacters( *pParaPortion->GetNode(), nRight, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
+/*?*/ USHORT nRight = (USHORT)xLclBI->nextCharacters( *pParaPortion->GetNode(), nChar, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
+/*?*/ USHORT nLeft = (USHORT)xLclBI->previousCharacters( *pParaPortion->GetNode(), nRight, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
/*?*/ if ( ( nLeft != nChar ) && ( nRight != nChar ) )
/*?*/ {
/*?*/ nChar = ( Abs( nRight - nChar ) < Abs( nLeft - nChar ) ) ? nRight : nLeft;
@@ -1946,7 +1929,7 @@ using namespace ::com::sun::star;
/*N*/ // Nur Writer3: Nicht aufaddieren, sondern Mindestabstand.
/*N*/
/*N*/ // Pruefen, ob Abstand durch LineSpacing > Upper:
-/*N*/ USHORT nExtraSpace = GetYValue( lcl_CalcExtraSpace( pPortion, rLSItem ) );
+/*N*/ USHORT nExtraSpace = GetYValue( lcl_CalcExtraSpace( rLSItem ) );
/*N*/ if ( nExtraSpace > pPortion->nFirstLineOffset )
/*N*/ {
/*?*/ // Absatz wird 'groesser':
@@ -1976,7 +1959,7 @@ using namespace ::com::sun::star;
/*N*/ // Dieser Wert steckt nicht in der Hoehe der PrevPortion.
/*N*/ if ( !pPrev->IsInvalid() )
/*N*/ {
-/*N*/ nExtraSpace = GetYValue( lcl_CalcExtraSpace( pPrev, rPrevLSItem ) );
+/*N*/ nExtraSpace = GetYValue( lcl_CalcExtraSpace( rPrevLSItem ) );
/*N*/ if ( nExtraSpace > nPrevLower )
/*N*/ {
/*?*/ USHORT nMoreLower = nExtraSpace - nPrevLower;
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
index 23227fe..bd83a13 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
@@ -606,7 +606,6 @@ struct TabInfo
/*N*/ if ( nXWidth <= nTmpWidth ) // while muss 1x durchlaufen werden
/*?*/ nXWidth = nTmpWidth+1;
/*N*/
-/*N*/ SvLongsPtr pTextRanges = 0;
/*N*/ long nTextExtraYOffset = 0;
/*N*/ long nTextXOffset = 0;
/*N*/ long nTextLineHeight = 0;
@@ -616,7 +615,7 @@ struct TabInfo
/*N*/ }
/*N*/
/*N*/ // Portion suchen, die nicht mehr in Zeile passt....
-/*N*/ TextPortion* pPortion;
+/*N*/ TextPortion* pPortion(NULL);
/*N*/ sal_Bool bBrokenLine = sal_False;
/*N*/ bLineBreak = sal_False;
/*N*/ EditCharAttrib* pNextFeature = pNode->GetCharAttribs().FindFeature( pLine->GetStart() );
@@ -781,14 +780,13 @@ struct TabInfo
/*N*/
/*N*/ nTmpWidth += pPortion->GetSize().Width();
/*N*/
-/*N*/ pPortion->SetRightToLeft( GetRightToLeft( nPara, nTmpPos+1 ) );
-/*N*/
-/*N*/ USHORT nPortionEnd = nTmpPos + pPortion->GetLen();
-/*N*/ if( bScriptSpace && ( nPortionEnd < pNode->Len() ) && ( nTmpWidth < nXWidth ) && IsScriptChange( EditPaM( pNode, nPortionEnd ) ) )
+/*N*/ pPortion->SetRightToLeft( GetRightToLeft( nPara, nTmpPos+1 ) );
+/*N*/ USHORT nLclPortionEnd = nTmpPos + pPortion->GetLen();
+/*N*/ if( bScriptSpace && ( nLclPortionEnd < pNode->Len() ) && ( nTmpWidth < nXWidth ) && IsScriptChange( EditPaM( pNode, nLclPortionEnd ) ) )
/*N*/ {
/*N*/ BOOL bAllow = FALSE;
-/*N*/ USHORT nScriptTypeLeft = GetScriptType( EditPaM( pNode, nPortionEnd ) );
-/*N*/ USHORT nScriptTypeRight = GetScriptType( EditPaM( pNode, nPortionEnd+1 ) );
+/*N*/ USHORT nScriptTypeLeft = GetScriptType( EditPaM( pNode, nLclPortionEnd ) );
+/*N*/ USHORT nScriptTypeRight = GetScriptType( EditPaM( pNode, nLclPortionEnd+1 ) );
/*N*/ if ( ( nScriptTypeLeft == i18n::ScriptType::ASIAN ) || ( nScriptTypeRight == i18n::ScriptType::ASIAN ) )
/*N*/ bAllow = TRUE;
/*N*/
@@ -811,7 +809,7 @@ struct TabInfo
/*N*/ TextPortion* pTP = pParaPortion->GetTextPortions().GetObject( n );
/*N*/ nWidthAfterTab += pTP->GetSize().Width();
/*N*/ }
-/*N*/ long nW; // Length before tab position
+/*N*/ long nW(0); // Length before tab position
/*N*/ if ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_RIGHT )
/*N*/ {
/*N*/ nW = nWidthAfterTab;
@@ -1274,7 +1272,7 @@ struct TabInfo
/*N*/ return bHeightChanged;
/*N*/ }
-/*N*/ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 nStartPosY )
+/*N*/ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 /*nStartPosY*/ )
/*N*/ {
/*N*/ DBG_ASSERT( !GetTextRanger(), "Don't use CreateAndInsertEmptyLine with a polygon!" );
/*N*/
@@ -1396,8 +1394,8 @@ struct TabInfo
/*N*/ EditLine* pLastLine = pParaPortion->GetLines().GetObject( pParaPortion->GetLines().Count()-2 );
/*N*/ DBG_ASSERT( pLastLine, "Weicher Umbruch, keine Zeile ?!" );
/*N*/ DBG_ASSERT( pLastLine->GetEnd() == pParaPortion->GetNode()->Len(), "Doch anders?" );
-/*N*/ // pTmpLine->SetStart( pLastLine->GetEnd() );
-/*N*/ // pTmpLine->SetEnd( pLastLine->GetEnd() );
+/*N*/ (void)pLastLine;
+
/*N*/ sal_uInt16 nPos = (sal_uInt16) pParaPortion->GetTextPortions().Count() - 1 ;
/*N*/ pTmpLine->SetStartPortion( nPos );
/*N*/ pTmpLine->SetEndPortion( nPos );
@@ -1419,7 +1417,7 @@ struct TabInfo
/*N*/ return bRet;
/*N*/ }
-/*N*/ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, TextPortion* pPortion, sal_uInt16 nPortionStart, long nRemainingWidth, sal_Bool bCanHyphenate )
+/*N*/ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, TextPortion* pPortion, sal_uInt16 nPortionStart, long nRemainingWidth, sal_Bool /*bCanHyphenate*/ )
/*N*/ {
/*N*/ ContentNode* const pNode = pParaPortion->GetNode();
/*N*/
@@ -1459,7 +1457,7 @@ struct TabInfo
/*N*/
/*N*/ lang::Locale aLocale = GetLocale( EditPaM( pNode, nMaxBreakPos ) );
/*N*/
-/*N*/ Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
+/*N*/ Reference < i18n::XBreakIterator > xLclBI = ImplGetBreakIterator();
/*N*/ OUString aText( *pNode );
/*N*/ Reference< XHyphenator > xHyph;
/*N*/ i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, Sequence< PropertyValue >(), 1 );
@@ -1472,7 +1470,7 @@ struct TabInfo
/*N*/ aUserOptions.allowPunctuationOutsideMargin = ((const SfxBoolItem&)pNode->GetContentAttribs().GetItem( EE_PARA_HANGINGPUNCTUATION )).GetValue();
/*N*/ aUserOptions.allowHyphenateEnglish = FALSE;
/*N*/
-/*N*/ i18n::LineBreakResults aLBR = xBI->getLineBreak( *pNode, nMaxBreakPos, aLocale, nMinBreakPos, aHyphOptions, aUserOptions );
+/*N*/ i18n::LineBreakResults aLBR = xLclBI->getLineBreak( *pNode, nMaxBreakPos, aLocale, nMinBreakPos, aHyphOptions, aUserOptions );
/*N*/ nBreakPos = (USHORT)aLBR.breakIndex;
/*N*/
/*N*/ // BUG in I18N - under special condition (break behind field, #87327#) breakIndex is < nMinBreakPos
@@ -1639,7 +1637,7 @@ struct TabInfo
/*N*/
/*N*/ // Die Positionen im Array und die Portion-Breiten korrigieren:
/*N*/ // Letztes Zeichen wird schon nicht mehr beachtet...
-/*N*/ for ( USHORT n = 0; n < aPositions.Count(); n++ )
+/*N*/ for ( USHORT n = 0; n < aPositions.Count(); n++ )
/*N*/ {
/*N*/ nChar = aPositions[n];
/*N*/ if ( nChar < nLastChar )
@@ -1656,11 +1654,11 @@ struct TabInfo
/*N*/ // Correct positions in array
/*N*/ // Even for kashidas just change positions, VCL will then draw the kashida automaticly
/*N*/ USHORT nPortionEnd = nPortionStart + pLastPortion->GetLen();
-/*N*/ for ( USHORT n = nChar; n < nPortionEnd; n++ )
+/*N*/ for ( USHORT k = nChar; k < nPortionEnd; k++ )
/*N*/ {
-/*N*/ pLine->GetCharPosArray()[n-nFirstChar] += nMore4Everyone;
+/*N*/ pLine->GetCharPosArray()[k-nFirstChar] += nMore4Everyone;
/*N*/ if ( nSomeExtraSpace )
-/*N*/ pLine->GetCharPosArray()[n-nFirstChar]++;
+/*N*/ pLine->GetCharPosArray()[k-nFirstChar]++;
/*N*/ }
/*N*/
/*N*/ if ( nSomeExtraSpace )
@@ -1904,6 +1902,7 @@ struct TabInfo
/*N*/ sal_uInt16 nInvPos;
/*N*/ sal_Bool bFound = aPositions.Seek_Entry( nPortionStart, &nInvPos );
/*N*/ DBG_ASSERT( bFound && ( nInvPos < (aPositions.Count()-1) ), "InvPos ?!" );
+/*N*/ (void)bFound;
/*N*/ for ( sal_uInt16 i = nInvPos+1; i < aPositions.Count(); i++ )
/*N*/ {
/*N*/ TextPortion* pNew = new TextPortion( (sal_uInt16)aPositions[i] - (sal_uInt16)aPositions[i-1] );
@@ -2514,11 +2513,11 @@ struct TabInfo
/*?*/
/*?*/ pTmpDXArray = new sal_Int32[ aText.Len() ];
/*?*/ pDXArray = pTmpDXArray;
-/*?*/ Font aOldFont( GetRefDevice()->GetFont() );
+/*?*/ Font aLclOldFont( GetRefDevice()->GetFont() );
/*?*/ aTmpFont.SetPhysFont( GetRefDevice() );
/*?*/ aTmpFont.QuickGetTextSize( GetRefDevice(), aText, 0, aText.Len(), pTmpDXArray );
/*?*/ if ( aStatus.DoRestoreFont() )
-/*?*/ GetRefDevice()->SetFont( aOldFont );
+/*?*/ GetRefDevice()->SetFont( aLclOldFont );
/*?*/
/*?*/ // add a meta file comment if we record to a metafile
/*?*/ GDIMetaFile* pMtf = pOutDev->GetConnectMetaFile();
@@ -2840,7 +2839,7 @@ struct TabInfo
/*N*/
/*N*/ Paint( pVDev, aTmpRec, aStartPos );
/*N*/
-/*N*/ sal_Bool bClipRegion;
+/*N*/ sal_Bool bClipRegion(sal_False);
/*N*/ Region aOldRegion;
/*N*/ MapMode aOldMapMode;
/*N*/ if ( GetTextRanger() )
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit4.cxx b/binfilter/bf_svx/source/editeng/svx_impedit4.cxx
index b5a0ad3..f767bf6 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit4.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit4.cxx
@@ -253,7 +253,7 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ {
/*N*/ // Da Setzen eines TextObject ist nicht Undo-faehig!
/*N*/ ResetUndoManager();
-/*N*/ sal_Bool bUpdate = GetUpdateMode();
+/*N*/ sal_Bool bLclUpdate = GetUpdateMode();
/*N*/ sal_Bool bUndo = IsUndoEnabled();
/*N*/
/*N*/ SetText( XubString() );
@@ -268,7 +268,7 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ #ifndef SVX_LIGHT
/*N*/ DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(), "Woher kommt das Undo in SetText ?!" );
/*N*/ #endif
-/*N*/ SetUpdateMode( bUpdate );
+/*N*/ SetUpdateMode( bLclUpdate );
/*N*/ EnableUndo( bUndo );
/*N*/ }
@@ -292,7 +292,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ EditSelection aSel( aPaM, aPaM );
/*N*/
/*N*/ sal_Bool bUsePortionInfo = sal_False;
-/*N*/ sal_Bool bFields = sal_False;
/*N*/ XParaPortionList* pPortionInfo = rTextObject.GetPortionInfo();
/*N*/
/*N*/ if ( pPortionInfo && ( (long)pPortionInfo->GetPaperWidth() == aPaperSize.Width() )
@@ -305,7 +304,7 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ }
/*N*/
/*N*/ sal_Bool bConvertItems = sal_False;
-/*N*/ MapUnit eSourceUnit, eDestUnit;
+/*N*/ MapUnit eSourceUnit = MapUnit(), eDestUnit = MapUnit();
/*N*/ if ( rTextObject.HasMetric() )
/*N*/ {
/*N*/ eSourceUnit = (MapUnit)rTextObject.GetMetric();
@@ -416,11 +415,11 @@ using namespace ::com::sun::star::linguistic2;
/*?*/ // Die TextPortions
/*?*/ pParaPortion->GetTextPortions().Reset();
/*?*/ sal_uInt16 nCount = pXP->aTextPortions.Count();
-/*?*/ for ( sal_uInt16 n = 0; n < nCount; n++ )
+/*?*/ for ( sal_uInt16 k = 0; k < nCount; k++ )
/*?*/ {
-/*?*/ TextPortion* pTextPortion = pXP->aTextPortions[n];
+/*?*/ TextPortion* pTextPortion = pXP->aTextPortions[k];
/*?*/ TextPortion* pNew = new TextPortion( *pTextPortion );
-/*?*/ pParaPortion->GetTextPortions().Insert( pNew, n );
+/*?*/ pParaPortion->GetTextPortions().Insert( pNew, k );
/*?*/ }
/*?*/
/*?*/ // Die Zeilen
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit5.cxx b/binfilter/bf_svx/source/editeng/svx_impedit5.cxx
index 7fb359d..8a66aad 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit5.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit5.cxx
@@ -113,7 +113,7 @@ namespace binfilter {
/*N*/ #endif
/*N*/ }
-/*N*/ void ImpEditEngine::UndoActionEnd( USHORT nId )
+/*N*/ void ImpEditEngine::UndoActionEnd( USHORT /*nId*/ )
/*N*/ {
/*N*/ #ifndef SVX_LIGHT
/*N*/ if ( IsUndoEnabled() && !IsInUndo() )
@@ -257,24 +257,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ #ifdef EDITDEBUG
-/*N*/ /*
-/*N*/ #ifdef MAC
-/*N*/ FILE* fp = fopen( "debug.log", "a" );
-/*N*/ #elif defined UNX
-/*N*/ FILE* fp = fopen( "/tmp/debug.log", "a" );
-/*N*/ #else
-/*N*/ FILE* fp = fopen( "d:\\debug.log", "a" );
-/*N*/ #endif
-/*N*/ if ( fp )
-/*N*/ {
-/*N*/ fprintf( fp, "\n \n<= Attribute: Absatz %i\n", nNode );
-/*N*/ DbgOutItemSet( fp, aCurSet, TRUE, FALSE );
-/*N*/ fclose( fp );
-/*N*/ }
-/*N*/ */
-/*N*/ #endif
-/*N*/
/*N*/ return aCurSet;
/*N*/ }
@@ -382,8 +364,6 @@ namespace binfilter {
/*N*/ USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
/*N*/ USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
/*N*/
-/*N*/ BOOL bCheckLanguage = FALSE;
-/*N*/
/*N*/ // ueber die Absaetze iterieren...
/*N*/ for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ )
/*N*/ {
diff --git a/binfilter/bf_svx/source/editeng/svx_txtrange.cxx b/binfilter/bf_svx/source/editeng/svx_txtrange.cxx
index a7b96ff..cecf4de 100644
--- a/binfilter/bf_svx/source/editeng/svx_txtrange.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_txtrange.cxx
@@ -54,10 +54,18 @@ namespace binfilter {
/*N*/ TextRanger::TextRanger( const XPolyPolygon& rXPoly, const XPolyPolygon* pXLine,
/*N*/ USHORT nCacheSz, USHORT nLft, USHORT nRght, BOOL bSimpl, BOOL bInnr,
-/*N*/ BOOL bVert ) :
-/*N*/ pBound( NULL ), nCacheSize( nCacheSz ), nCacheIdx( 0 ), nPointCount( 0 ),
-/*N*/ nLeft( nLft ), nRight( nRght ), nUpper( 0 ), nLower( 0 ),
-/*N*/ bSimple( bSimpl ), bInner( bInnr ), bVertical( bVert )
+/*N*/ BOOL bVert )
+/*N*/ : pBound( NULL )
+/*N*/ , nCacheSize( nCacheSz )
+/*N*/ , nCacheIdx( 0 )
+/*N*/ , nRight( nRght )
+/*N*/ , nLeft( nLft )
+/*N*/ , nUpper( 0 )
+/*N*/ , nLower( 0 )
+/*N*/ , nPointCount( 0 )
+/*N*/ , bSimple( bSimpl )
+/*N*/ , bInner( bInnr )
+/*N*/ , bVertical( bVert )
/*N*/ {
/*N*/ #ifdef DBG_UTIL
/*N*/ bFlag3 = bFlag4 = bFlag5 = bFlag6 = bFlag7 = FALSE;
@@ -214,14 +222,13 @@ namespace binfilter {
/*N*/ NotePoint( Cut( nTop, rLst, rNxt ) );
/*N*/ if( rLst.X() != rNxt.X() && rLst.Y() != rNxt.Y() )
/*N*/ {
-/*N*/ long nYps;
/*N*/ if( nLowDiff && ( ( nCut & 1 ) || nLast == 1 || nNext == 1 ) )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 nYps = CalcMax( rLst, rNxt, nBottom, nLower );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ if( nUpDiff && ( ( nCut & 2 ) || nLast == 2 || nNext == 2 ) )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 nYps = CalcMax( rLst, rNxt, nTop, nUpper );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
/*N*/ }
@@ -426,20 +433,20 @@ namespace binfilter {
/*N*/ {
/*N*/ if( bDelete )
/*N*/ {
-/*N*/ USHORT nNext = 2;
+/*N*/ USHORT nLclNext = 2;
/*N*/ while( nBoolIdx < nCount && !aBoolArr[ nBoolIdx++ ] &&
/*N*/ (!bInner || nBoolIdx < nCount ) )
-/*N*/ nNext += 2;
-/*N*/ pLongArr->Remove( nLongIdx, nNext );
-/*N*/ nNext /= 2;
-/*N*/ nBoolIdx -= nNext;
-/*N*/ nCount -= nNext;
-/*N*/ aBoolArr.Remove( nBoolIdx, nNext );
+/*N*/ nLclNext += 2;
+/*N*/ pLongArr->Remove( nLongIdx, nLclNext );
+/*N*/ nLclNext /= 2;
+/*N*/ nBoolIdx -= nLclNext;
+/*N*/ nCount -= nLclNext;
+/*N*/ aBoolArr.Remove( nBoolIdx, nLclNext );
/*N*/ if( nBoolIdx )
/*N*/ aBoolArr[ nBoolIdx - 1 ] = FALSE;
/*N*/ #if OSL_DEBUG_LEVEL > 1
/*N*/ else
-/*N*/ ++nNext;
+/*N*/ ++nLclNext;
/*N*/ #endif
/*N*/ }
/*N*/ bDelete = nBoolIdx < nCount && aBoolArr[ nBoolIdx ];
diff --git a/binfilter/bf_svx/source/editeng/svx_unolingu.cxx b/binfilter/bf_svx/source/editeng/svx_unolingu.cxx
index f9c6508..8046334 100644
--- a/binfilter/bf_svx/source/editeng/svx_unolingu.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_unolingu.cxx
@@ -214,9 +214,9 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE;
/*N*/ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
/*N*/ ThesDummy_Impl::queryMeanings(
-/*N*/ const ::rtl::OUString& rTerm,
-/*N*/ const lang::Locale& rLocale,
-/*N*/ const beans::PropertyValues& rProperties )
+/*N*/ const ::rtl::OUString& /*rTerm*/,
+/*N*/ const lang::Locale& /*rLocale*/,
+/*N*/ const beans::PropertyValues& /*rProperties*/ )
/*N*/ throw(lang::IllegalArgumentException,
/*N*/ uno::RuntimeException)
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); uno::Sequence< uno::Reference< linguistic2::XMeaning > > aRes;return aRes; //STRIP001
@@ -274,7 +274,7 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE;
/*N*/ sal_Bool SAL_CALL
-/*N*/ SpellDummy_Impl::hasLanguage( sal_Int16 nLanguage )
+/*N*/ SpellDummy_Impl::hasLanguage( sal_Int16 /*nLanguage*/ )
/*N*/ throw(uno::RuntimeException)
/*N*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE; //STRIP001
/*N*/ }
@@ -295,8 +295,8 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE;
/*N*/ uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL
-/*N*/ SpellDummy_Impl::spell( const ::rtl::OUString& rWord, sal_Int16 nLanguage,
-/*N*/ const beans::PropertyValues& rProperties )
+/*N*/ SpellDummy_Impl::spell( const ::rtl::OUString& /*rWord*/, sal_Int16 /*nLanguage*/,
+/*N*/ const beans::PropertyValues& /*rProperties*/ )
/*N*/ throw(lang::IllegalArgumentException,
/*N*/ uno::RuntimeException)
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); uno::Reference< linguistic2::XSpellAlternatives > xRes; return xRes; //STRIP001
More information about the Libreoffice-commits
mailing list