[Libreoffice-commits] .: 5 commits - binfilter/bf_sc binfilter/bf_svtools binfilter/bf_svx
Caolán McNamara
caolan at kemper.freedesktop.org
Sat Jan 15 05:52:48 PST 2011
binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx | 1
binfilter/bf_svtools/source/svdde/svt_ddemldeb.cxx | 2
binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx | 6
binfilter/bf_svx/source/items/makefile.mk | 2
binfilter/bf_svx/source/items/svx_flditem.cxx | 1
binfilter/bf_svx/source/items/svx_numitem.cxx | 10
binfilter/bf_svx/source/items/svx_xmlcnitm.cxx | 11 -
binfilter/bf_svx/source/unoedit/makefile.mk | 2
binfilter/bf_svx/source/unoedit/svx_unoedsrc.cxx | 2
binfilter/bf_svx/source/unoedit/svx_unofored.cxx | 8
binfilter/bf_svx/source/unoedit/svx_unoforou.cxx | 4
binfilter/bf_svx/source/unoedit/svx_unotext.cxx | 136 ++++++-------
12 files changed, 92 insertions(+), 93 deletions(-)
New commits:
commit c93396075e83657e580291c25fdd4909d072d983
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 15 13:52:26 2011 +0000
cppcheck: unused variables
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddemldeb.cxx b/binfilter/bf_svtools/source/svdde/svt_ddemldeb.cxx
index 9b11849..adb92bb 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddemldeb.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddemldeb.cxx
@@ -55,7 +55,6 @@ void ImpAddHSZ( HSZ hszString, String& rStr )
void ImpWriteDdeStatus(char* aFilename, char* pAppContext)
{
- char aBuf[ 128 ];
USHORT nCtr;
HWND* pAppPtr;
ImpHCONV* pConvPtr;
@@ -190,7 +189,6 @@ void ImpWriteDdeStatus(char* aFilename, char* pAppContext)
void ImpWriteDdeData(char* aFilename, DDESTRUCT* pData)
{
- char aBuf[ 128 ];
USHORT nCtr;
SvFileStream aStrm(aFilename, STREAM_READWRITE );
aStrm.Seek( STREAM_SEEK_TO_END );
commit 3e1c03ff19f4560f0ef7c5dd65e9f6b5ff411d08
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 15 13:50:54 2011 +0000
cppcheck: Member variable not initialized
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx
index fed2605..85c881f 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx
@@ -485,6 +485,7 @@ void ScMyDetectiveOpContainer::Sort()
ScMyCell::ScMyCell() :
aShapeList(),
aDetectiveObjVec(),
+ fValue( 0.0 ),
bIsAutoStyle( sal_False ),
bHasShape( sal_False ),
bIsMergedBase( sal_False ),
commit d2f548e9e7ba90730591f08edbeff1a389297e04
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 15 13:46:31 2011 +0000
WaE, this dir is now warnings free
diff --git a/binfilter/bf_svx/source/items/makefile.mk b/binfilter/bf_svx/source/items/makefile.mk
index 7fd6452..481eb2a 100644
--- a/binfilter/bf_svx/source/items/makefile.mk
+++ b/binfilter/bf_svx/source/items/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_svx/source/items/svx_flditem.cxx b/binfilter/bf_svx/source/items/svx_flditem.cxx
index ca4e09c..44cb2d4 100644
--- a/binfilter/bf_svx/source/items/svx_flditem.cxx
+++ b/binfilter/bf_svx/source/items/svx_flditem.cxx
@@ -84,6 +84,7 @@ namespace binfilter {
/*N*/ int SvxFieldData::operator==( const SvxFieldData& rFld ) const
/*N*/ {
/*N*/ DBG_ASSERT( Type() == rFld.Type(), "==: Verschiedene Typen" );
+/*N*/ (void)rFld;
/*N*/ return TRUE; // Basicklasse immer gleich.
/*N*/ }
diff --git a/binfilter/bf_svx/source/items/svx_numitem.cxx b/binfilter/bf_svx/source/items/svx_numitem.cxx
index fca97d5..853cf63 100644
--- a/binfilter/bf_svx/source/items/svx_numitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_numitem.cxx
@@ -168,14 +168,14 @@ sal_Int32 SvxNumberType::nRefCount = 0;
/*N*/ nInclUpperLevels(0),
/*N*/ nStart(1),
/*N*/ cBullet(SVX_DEF_BULLET),
+/*N*/ nBulletRelSize(100),
+/*N*/ nBulletColor(COL_BLACK),
/*N*/ nFirstLineOffset(0),
/*N*/ nAbsLSpace(0),
/*N*/ nLSpace(0),
/*N*/ nCharTextDistance(0),
/*N*/ pGraphicBrush(0),
/*N*/ eVertOrient(SVX_VERT_NONE),
-/*N*/ nBulletRelSize(100),
-/*N*/ nBulletColor(COL_BLACK),
/*N*/ pBulletFont(0)
/*N*/ {
/*N*/ }
@@ -409,7 +409,7 @@ sal_Int32 SvxNumberType::nRefCount = 0;
/*N*/ (!pGraphicBrush && rFormat.pGraphicBrush) ||
/*N*/ (pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush ))
/*N*/ return FALSE;
-/*N*/ if(pBulletFont && !rFormat.pBulletFont ||
+/*N*/ if( (pBulletFont && !rFormat.pBulletFont) ||
/*N*/ (!pBulletFont && rFormat.pBulletFont) ||
/*N*/ (pBulletFont && (*pBulletFont != *rFormat.pBulletFont)))
/*N*/ return FALSE;
@@ -569,9 +569,9 @@ static SvxNumberFormat* pStdNumFmt = 0;
static SvxNumberFormat* pStdOutlineNumFmt = 0;
/*N*/ SvxNumRule::SvxNumRule(ULONG nFeatures, USHORT nLevels, BOOL bCont, SvxNumRuleType eType) :
/*N*/ nLevelCount(nLevels),
-/*N*/ bContinuousNumbering(bCont),
+/*N*/ nFeatureFlags(nFeatures),
/*N*/ eNumberingType(eType),
-/*N*/ nFeatureFlags(nFeatures)
+/*N*/ bContinuousNumbering(bCont)
/*N*/ {
/*N*/ ++nRefCount;
/*N*/ LanguageType eLang = Application::GetSettings().GetLanguage();
diff --git a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
index 7299446..7f5625e 100644
--- a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
+++ b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
@@ -129,7 +129,7 @@ using rtl::OUString;
/*NBFF*/ return false;
/*NBFF*/
/*NBFF*/ pData = (AttributeData*)aAny.getValue();
-/*NBFF*/ USHORT pos = aName.indexOf( sal_Unicode(':') );
+/*NBFF*/ sal_Int32 pos = aName.indexOf( sal_Unicode(':') );
/*NBFF*/ if( pos != -1 )
/*NBFF*/ {
/*NBFF*/ const OUString aPrefix( aName.copy( 0, pos ));
@@ -222,12 +222,17 @@ using rtl::OUString;
/*N*/ }
/*N*/ const OUString& SvXMLAttrContainerItem::GetNamespace( USHORT /*i*/ ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return OUString();
+/*N*/ {
+/*N*/ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ static OUString aStripped;
+/*N*/ return aStripped;
/*N*/ }
/*N*/ const OUString& SvXMLAttrContainerItem::GetPrefix( USHORT /*i*/ ) const
/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP"); return ::rtl::OUString();
+/*N*/ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ static OUString aStripped;
+/*N*/ return aStripped;
/*N*/ }
diff --git a/binfilter/bf_svx/source/unoedit/makefile.mk b/binfilter/bf_svx/source/unoedit/makefile.mk
index f4272cf..b22daea 100644
--- a/binfilter/bf_svx/source/unoedit/makefile.mk
+++ b/binfilter/bf_svx/source/unoedit/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
commit 7b9fe9bc80326f434adccc6c8d9faad52fad942d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 15 13:36:00 2011 +0000
WaE, this dir is now warnings free
diff --git a/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx b/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx
index 22943fe..419ac44 100644
--- a/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx
+++ b/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx
@@ -50,10 +50,10 @@ class AccessibleStringWrap
{
public:
- AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText ){DBG_BF_ASSERT(0, "STRIP");}//STRIP001 AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText );
+ AccessibleStringWrap( OutputDevice&, SvxFont&, const String&){DBG_BF_ASSERT(0, "STRIP");}
- sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect ){DBG_BF_ASSERT(0, "STRIP"); return false;}//STRIP001 sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
- sal_Int32 GetIndexAtPoint( const Point& rPoint ){DBG_BF_ASSERT(0, "STRIP"); return 0;}//STRIP001 sal_Int32 GetIndexAtPoint( const Point& rPoint );
+ sal_Bool GetCharacterBounds(sal_Int32, Rectangle&){DBG_BF_ASSERT(0, "STRIP"); return false;}
+ sal_Int32 GetIndexAtPoint(const Point&){DBG_BF_ASSERT(0, "STRIP"); return 0;}
private:
diff --git a/binfilter/bf_svx/source/unoedit/svx_unoedsrc.cxx b/binfilter/bf_svx/source/unoedit/svx_unoedsrc.cxx
index 9f92ec1..3519dec 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unoedsrc.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unoedsrc.cxx
@@ -58,7 +58,7 @@ SvxViewForwarder* SvxEditSource::GetViewForwarder()
return NULL;
}
-SvxEditViewForwarder* SvxEditSource::GetEditViewForwarder( sal_Bool bCreate )
+SvxEditViewForwarder* SvxEditSource::GetEditViewForwarder( sal_Bool /*bCreate*/ )
{
return NULL;
}
diff --git a/binfilter/bf_svx/source/unoedit/svx_unofored.cxx b/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
index 8513850..4a8046a 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
@@ -323,7 +323,7 @@ EFieldInfo SvxEditEngineForwarder::GetFieldInfo( USHORT nPara, USHORT nField ) c
return rEditEngine.GetFieldInfo( nPara, nField );
}
-EBulletInfo SvxEditEngineForwarder::GetBulletInfo( USHORT nPara ) const
+EBulletInfo SvxEditEngineForwarder::GetBulletInfo( USHORT ) const
{
return EBulletInfo();
}
@@ -462,7 +462,7 @@ USHORT SvxEditEngineForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
return rEditEngine.GetLineLen(nPara, nLine);
}
-sal_Bool SvxEditEngineForwarder::QuickFormatDoc( BOOL bFull )
+sal_Bool SvxEditEngineForwarder::QuickFormatDoc( BOOL )
{
rEditEngine.QuickFormatDoc();
@@ -485,13 +485,13 @@ sal_Bool SvxEditEngineForwarder::InsertText( const String& rStr, const ESelectio
return sal_True;
}
-USHORT SvxEditEngineForwarder::GetDepth( USHORT nPara ) const
+USHORT SvxEditEngineForwarder::GetDepth( USHORT ) const
{
// EditEngine does not support outline depth
return 0;
}
-sal_Bool SvxEditEngineForwarder::SetDepth( USHORT nPara, USHORT nNewDepth )
+sal_Bool SvxEditEngineForwarder::SetDepth( USHORT, USHORT nNewDepth )
{
// EditEngine does not support outline depth
return nNewDepth == 0 ? sal_True : sal_False;
diff --git a/binfilter/bf_svx/source/unoedit/svx_unoforou.cxx b/binfilter/bf_svx/source/unoedit/svx_unoforou.cxx
index 202885a..694347b 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unoforou.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unoforou.cxx
@@ -423,7 +423,7 @@ USHORT SvxOutlinerForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
return rOutliner.GetLineLen(nPara, nLine);
}
-sal_Bool SvxOutlinerForwarder::QuickFormatDoc( BOOL bFull )
+sal_Bool SvxOutlinerForwarder::QuickFormatDoc( BOOL )
{
rOutliner.QuickFormatDoc();
@@ -483,7 +483,7 @@ sal_Bool SvxOutlinerForwarder::SetDepth( USHORT nPara, USHORT nNewDepth )
if(bOutlinerText)
++nNewDepth;
- if(nNewDepth >= 0 && nNewDepth <= 9)
+ if(nNewDepth <= 9)
{
Paragraph* pPara = rOutliner.GetParagraph( nPara );
if( pPara )
diff --git a/binfilter/bf_svx/source/unoedit/svx_unotext.cxx b/binfilter/bf_svx/source/unoedit/svx_unotext.cxx
index a0ae16e..2a6ba8d 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unotext.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unotext.cxx
@@ -74,7 +74,7 @@ using namespace ::com::sun::star;
SfxItemPropertyMap aEmptyPropMap[] =
{
- {0,0}
+ {0,0,0,0,0,0}
};
extern const SfxItemPropertyMap* ImplGetSvxTextPortionPropertyMap();
@@ -186,7 +186,8 @@ void CheckSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) thr
UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextRangeBase );
SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SfxItemPropertyMap* _pMap ) throw()
-: aPropSet(_pMap), pEditSource(NULL)
+ : pEditSource(NULL)
+ , aPropSet(_pMap)
{
}
@@ -198,9 +199,9 @@ SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxEditSource* pSource, const Sf
DBG_ASSERT(pSource,"SvxUnoTextRangeBase: I need a valid SvxEditSource!");
pEditSource = pSource->Clone();
- ESelection aSelection;
- ::binfilter::GetSelection( aSelection, pEditSource->GetTextForwarder() );//STRIP008 ::GetSelection( aSelection, pEditSource->GetTextForwarder() );
- SetSelection( aSelection );
+ ESelection aLclSelection;
+ ::binfilter::GetSelection( aLclSelection, pEditSource->GetTextForwarder() );
+ SetSelection( aLclSelection );
}
SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxUnoTextRangeBase& rRange ) throw()
@@ -449,7 +450,7 @@ void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertyMap* pMap, cons
}
}
-sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertyMap* pMap, const uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection /* = NULL */, SvxTextEditSource* pEditSource /* = NULL*/ ) throw( uno::RuntimeException )
+sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet& /*rOldSet*/, const SfxItemPropertyMap* pMap, const uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection /* = NULL */, SvxTextEditSource* pEditSource /* = NULL*/ ) throw( uno::RuntimeException )
{
switch( pMap->nWID )
{
@@ -654,10 +655,10 @@ sal_Bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const S
}
// wird (noch) nicht unterstuetzt
-void SAL_CALL SvxUnoTextRangeBase::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SvxUnoTextRangeBase::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SvxUnoTextRangeBase::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxUnoTextRangeBase::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxUnoTextRangeBase::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxUnoTextRangeBase::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
// XMultiPropertySet
void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
@@ -853,15 +854,15 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( cons
return aValues;
}
-void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& xListener ) throw (uno::RuntimeException)
+void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< ::rtl::OUString >&, const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException)
{
}
-void SAL_CALL SvxUnoTextRangeBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& xListener ) throw (uno::RuntimeException)
+void SAL_CALL SvxUnoTextRangeBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException)
{
}
-void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& xListener ) throw (uno::RuntimeException)
+void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< ::rtl::OUString >&, const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException)
{
}
@@ -983,10 +984,6 @@ uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(co
uno::Sequence< beans::PropertyState > aRet( nCount );
beans::PropertyState* pState = aRet.getArray();
-
-
- const sal_Bool bPara = nPara != -1;
-
SvxTextForwarder* pForwarder = pEditSource ? pEditSource->GetTextForwarder() : NULL;
if( pForwarder )
{
@@ -1470,9 +1467,9 @@ SvxUnoTextBase::SvxUnoTextBase( const SvxEditSource* pSource, const SfxItemPrope
: SvxUnoTextRangeBase( pSource, _pMap )
{
xParentText = xParent;
- ESelection aSelection;
- ::binfilter::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );//STRIP008 ::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );
- SetSelection( aSelection );
+ ESelection aLclSelection;
+ ::binfilter::GetSelection( aLclSelection, GetEditSource()->GetTextForwarder() );
+ SetSelection( aLclSelection );
}
SvxUnoTextBase::SvxUnoTextBase( const SvxUnoTextBase& rText ) throw()
@@ -1590,9 +1587,9 @@ void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRan
if( !xRange.is() )
return;
- ESelection aSelection;
- ::binfilter::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );//STRIP008 ::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );
- SetSelection( aSelection );
+ ESelection aLclSelection;
+ ::binfilter::GetSelection( aLclSelection, GetEditSource()->GetTextForwarder() );
+ SetSelection( aLclSelection );
SvxUnoTextRangeBase* pRange = SvxUnoTextRange::getImplementation( xRange );
if(pRange)
@@ -1619,9 +1616,9 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text
if( pForwarder )
{
- ESelection aSelection;
- ::binfilter::GetSelection( aSelection, pForwarder );//STRIP008 ::GetSelection( aSelection, pForwarder );
- SetSelection( aSelection );
+ ESelection aLclSelection;
+ ::binfilter::GetSelection( aLclSelection, pForwarder );
+ SetSelection( aLclSelection );
switch( nControlCharacter )
{
@@ -1713,11 +1710,11 @@ void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTe
if( pRange == NULL || pField == NULL )
throw lang::IllegalArgumentException();
- ESelection aSelection = pRange->GetSelection();
+ ESelection aLclSelection = pRange->GetSelection();
if( !bAbsorb )
{
- aSelection.nStartPara = aSelection.nEndPara;
- aSelection.nStartPos = aSelection.nEndPos;
+ aLclSelection.nStartPara = aLclSelection.nEndPara;
+ aLclSelection.nStartPos = aLclSelection.nEndPos;
}
SvxFieldData* pFieldData = pField->CreateFieldData();
@@ -1725,20 +1722,20 @@ void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTe
throw lang::IllegalArgumentException();
SvxFieldItem aField( *pFieldData );
- pForwarder->QuickInsertField( aField, aSelection );
+ pForwarder->QuickInsertField( aField, aLclSelection );
GetEditSource()->UpdateData();
pField->SetAnchor( uno::Reference< text::XTextRange >::query( (cppu::OWeakObject*)this ) );
- aSelection.nEndPos += 1;
- aSelection.nStartPos = aSelection.nEndPos;
- pRange->SetSelection( aSelection );
+ aLclSelection.nEndPos += 1;
+ aLclSelection.nStartPos = aLclSelection.nEndPos;
+ pRange->SetSelection( aLclSelection );
delete pFieldData;
}
}
-void SAL_CALL SvxUnoTextBase::removeTextContent( const uno::Reference< text::XTextContent >& xContent ) throw(container::NoSuchElementException, uno::RuntimeException)
+void SAL_CALL SvxUnoTextBase::removeTextContent( const uno::Reference< text::XTextContent >& ) throw(container::NoSuchElementException, uno::RuntimeException)
{
}
@@ -1749,9 +1746,9 @@ uno::Reference< text::XText > SAL_CALL SvxUnoTextBase::getText()
{
SolarMutexGuard aGuard;
- ESelection aSelection;
- ::binfilter::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );//STRIP008 ::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );
- ((SvxUnoTextBase*)this)->SetSelection( aSelection );
+ ESelection aLclSelection;
+ ::binfilter::GetSelection( aLclSelection, GetEditSource()->GetTextForwarder() );
+ ((SvxUnoTextBase*)this)->SetSelection( aLclSelection );
return (text::XText*)this;
}
@@ -1785,9 +1782,9 @@ uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextBase::createEnumera
{
SolarMutexGuard aGuard;
- ESelection aSelection;
- ::binfilter::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );//STRIP008 ::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );
- SetSelection( aSelection );
+ ESelection aLclSelection;
+ ::binfilter::GetSelection( aLclSelection, GetEditSource()->GetTextForwarder() );
+ SetSelection( aLclSelection );
uno::Reference< container::XEnumeration > xEnum( (container::XEnumeration*) new SvxUnoTextContentEnumeration( *this ) );
return xEnum;
@@ -1814,7 +1811,7 @@ sal_Bool SAL_CALL SvxUnoTextBase::hasElements( ) throw(uno::RuntimeException)
}
// text::XTextRangeMover
-void SAL_CALL SvxUnoTextBase::moveTextRange( const uno::Reference< text::XTextRange >& xRange, sal_Int16 nParagraphs )
+void SAL_CALL SvxUnoTextBase::moveTextRange( const uno::Reference< text::XTextRange >&, sal_Int16 )
throw(uno::RuntimeException)
{
}
@@ -1880,7 +1877,8 @@ SvxUnoText::SvxUnoText( const SvxEditSource* pSource, const SfxItemPropertyMap*
}
SvxUnoText::SvxUnoText( const SvxUnoText& rText ) throw()
-: SvxUnoTextBase( rText )
+ : SvxUnoTextBase( rText )
+ , cppu::OWeakAggObject()
{
}
@@ -1985,42 +1983,42 @@ sal_uInt16 SvxDummyTextSource::GetParagraphCount() const
return 0;
}
-sal_uInt16 SvxDummyTextSource::GetTextLen( sal_uInt16 nParagraph ) const
+sal_uInt16 SvxDummyTextSource::GetTextLen( sal_uInt16 ) const
{
return 0;
}
-String SvxDummyTextSource::GetText( const ESelection& rSel ) const
+String SvxDummyTextSource::GetText( const ESelection& ) const
{
return String();
}
-SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib ) const
+SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, BOOL ) const
{
String aDummyStr(RTL_CONSTASCII_USTRINGPARAM("Dummy"));
SfxItemPool aPool(aDummyStr,0,0,NULL);
return SfxItemSet(aPool);
}
-SfxItemSet SvxDummyTextSource::GetParaAttribs( sal_uInt16 nPara ) const
+SfxItemSet SvxDummyTextSource::GetParaAttribs( sal_uInt16 ) const
{
return GetAttribs(ESelection());
}
-void SvxDummyTextSource::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
+void SvxDummyTextSource::SetParaAttribs( sal_uInt16, const SfxItemSet& )
{
}
-void SvxDummyTextSource::GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const
+void SvxDummyTextSource::GetPortions( sal_uInt16, SvUShorts& ) const
{
}
-sal_uInt16 SvxDummyTextSource::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const
+sal_uInt16 SvxDummyTextSource::GetItemState( const ESelection&, sal_uInt16 ) const
{
return 0;
}
-sal_uInt16 SvxDummyTextSource::GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const
+sal_uInt16 SvxDummyTextSource::GetItemState( sal_uInt16, sal_uInt16 ) const
{
return 0;
}
@@ -2030,23 +2028,23 @@ SfxItemPool* SvxDummyTextSource::GetPool() const
return NULL;
}
-void SvxDummyTextSource::QuickInsertText( const String& rText, const ESelection& rSel )
+void SvxDummyTextSource::QuickInsertText( const String&, const ESelection& )
{
}
-void SvxDummyTextSource::QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel )
+void SvxDummyTextSource::QuickInsertField( const SvxFieldItem&, const ESelection& )
{
}
-void SvxDummyTextSource::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel )
+void SvxDummyTextSource::QuickSetAttribs( const SfxItemSet&, const ESelection& )
{
}
-void SvxDummyTextSource::QuickInsertLineBreak( const ESelection& rSel )
+void SvxDummyTextSource::QuickInsertLineBreak( const ESelection& )
{
};
-XubString SvxDummyTextSource::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString SvxDummyTextSource::CalcFieldValue( const SvxFieldItem&, sal_uInt16, sal_uInt16, Color*&, Color*& )
{
return XubString();
}
commit 25b7cb4a43d1e9ee6208089002e0db71764be175
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 14 21:44:52 2011 +0000
fix some warnings
diff --git a/binfilter/bf_svx/source/unoedit/svx_unotext.cxx b/binfilter/bf_svx/source/unoedit/svx_unotext.cxx
index be5733d..a0ae16e 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unotext.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unotext.cxx
@@ -2060,32 +2060,32 @@ void SvxDummyTextSource::SetNotifyHdl( const Link& )
{
}
-LanguageType SvxDummyTextSource::GetLanguage( USHORT nPara, USHORT nIndex ) const
+LanguageType SvxDummyTextSource::GetLanguage( USHORT /*nPara*/, USHORT /*nIndex*/ ) const
{
return LANGUAGE_DONTKNOW;
}
-USHORT SvxDummyTextSource::GetFieldCount( USHORT nPara ) const
+USHORT SvxDummyTextSource::GetFieldCount( USHORT /*nPara*/ ) const
{
return 0;
}
-EFieldInfo SvxDummyTextSource::GetFieldInfo( USHORT nPara, USHORT nField ) const
+EFieldInfo SvxDummyTextSource::GetFieldInfo( USHORT /*nPara*/, USHORT /*nField*/ ) const
{
return EFieldInfo();
}
-EBulletInfo SvxDummyTextSource::GetBulletInfo( USHORT nPara ) const
+EBulletInfo SvxDummyTextSource::GetBulletInfo( USHORT /*nPara*/ ) const
{
return EBulletInfo();
}
-Rectangle SvxDummyTextSource::GetCharBounds( USHORT nPara, USHORT nIndex ) const
+Rectangle SvxDummyTextSource::GetCharBounds( USHORT /*nPara*/, USHORT /*nIndex*/ ) const
{
return Rectangle();
}
-Rectangle SvxDummyTextSource::GetParaBounds( USHORT nPara ) const
+Rectangle SvxDummyTextSource::GetParaBounds( USHORT /*nPara*/ ) const
{
return Rectangle();
}
@@ -2100,42 +2100,42 @@ OutputDevice* SvxDummyTextSource::GetRefDevice() const
return NULL;
}
-sal_Bool SvxDummyTextSource::GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const
+sal_Bool SvxDummyTextSource::GetIndexAtPoint( const Point&, USHORT& /*nPara*/, USHORT& /*nIndex*/ ) const
{
return sal_False;
}
-sal_Bool SvxDummyTextSource::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const
+sal_Bool SvxDummyTextSource::GetWordIndices( USHORT /*nPara*/, USHORT /*nIndex*/, USHORT& /*nStart*/, USHORT& /*nEnd*/ ) const
{
return sal_False;
}
-sal_Bool SvxDummyTextSource::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const
+sal_Bool SvxDummyTextSource::GetAttributeRun( USHORT& /*nStartIndex*/, USHORT& /*nEndIndex*/, USHORT /*nPara*/, USHORT /*nIndex*/ ) const
{
return sal_False;
}
-USHORT SvxDummyTextSource::GetLineCount( USHORT nPara ) const
+USHORT SvxDummyTextSource::GetLineCount( USHORT /*nPara*/ ) const
{
return 0;
}
-USHORT SvxDummyTextSource::GetLineLen( USHORT nPara, USHORT nLine ) const
+USHORT SvxDummyTextSource::GetLineLen( USHORT /*nPara*/, USHORT /*nLine*/ ) const
{
return 0;
}
-sal_Bool SvxDummyTextSource::QuickFormatDoc( BOOL bFull )
+sal_Bool SvxDummyTextSource::QuickFormatDoc( BOOL /*bFull*/ )
{
return sal_False;
}
-USHORT SvxDummyTextSource::GetDepth( USHORT nPara ) const
+USHORT SvxDummyTextSource::GetDepth( USHORT /*nPara*/ ) const
{
return 0;
}
-sal_Bool SvxDummyTextSource::SetDepth( USHORT nPara, USHORT nNewDepth )
+sal_Bool SvxDummyTextSource::SetDepth( USHORT /*nPara*/, USHORT nNewDepth )
{
return nNewDepth == 0 ? sal_True : sal_False;
}
More information about the Libreoffice-commits
mailing list