[Libreoffice-commits] .: binfilter/bf_svx
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jan 14 09:12:30 PST 2011
binfilter/bf_svx/source/unoedit/svx_unofield.cxx | 41 +++++++++--------------
binfilter/bf_svx/source/unoedit/svx_unotext2.cxx | 27 ++++++++-------
2 files changed, 32 insertions(+), 36 deletions(-)
New commits:
commit a2a21792060e7ee4ef46a2bd99cdbaf638473999
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 14 17:12:26 2011 +0000
WaE, throw out some warnings
diff --git a/binfilter/bf_svx/source/unoedit/svx_unofield.cxx b/binfilter/bf_svx/source/unoedit/svx_unofield.cxx
index f8f3099..54e5143 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unofield.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unofield.cxx
@@ -92,13 +92,13 @@ SfxItemPropertyMap* ImplGetFieldItemPropertyMap( sal_Int32 mnId )
{ MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 },
{ MAP_CHAR_LEN("IsDate"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 },
{ MAP_CHAR_LEN("NumberFormat"), WID_INT32, &::getCppuType((const sal_Int16*)0), 0, 0 },
- {0,0}
+ {0,0,0,0,0,0}
};
static SfxItemPropertyMap aDateTimeFieldPropertyMap_Impl[] =
{
{ MAP_CHAR_LEN("IsDate"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 },
- {0,0}
+ {0,0,0,0,0,0}
};
static SfxItemPropertyMap aUrlFieldPropertyMap_Impl[] =
@@ -108,12 +108,12 @@ SfxItemPropertyMap* ImplGetFieldItemPropertyMap( sal_Int32 mnId )
{ MAP_CHAR_LEN("Representation"), WID_STRING1, &::getCppuType((const OUString*)0), 0, 0 },
{ MAP_CHAR_LEN("TargetFrame"), WID_STRING2, &::getCppuType((const OUString*)0), 0, 0 },
{ MAP_CHAR_LEN("URL"), WID_STRING3, &::getCppuType((const OUString*)0), 0, 0 },
- {0,0}
+ {0,0,0,0,0,0}
};
static SfxItemPropertyMap aEmptyPropertyMap_Impl[] =
{
- {0,0}
+ {0,0,0,0,0,0}
};
static SfxItemPropertyMap aExtFileFieldPropertyMap_Impl[] =
@@ -121,7 +121,7 @@ SfxItemPropertyMap* ImplGetFieldItemPropertyMap( sal_Int32 mnId )
{ MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 },
{ MAP_CHAR_LEN("FileFormat"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 },
{ MAP_CHAR_LEN("CurrentPresentation"), WID_STRING1,&::getCppuType((const OUString*)0), 0, 0 },
- {0,0}
+ {0,0,0,0,0,0}
};
static SfxItemPropertyMap aAuthorFieldPropertyMap_Impl[] =
@@ -131,13 +131,13 @@ SfxItemPropertyMap* ImplGetFieldItemPropertyMap( sal_Int32 mnId )
{ MAP_CHAR_LEN("Content"), WID_STRING2,&::getCppuType((const OUString*)0), 0, 0 },
{ MAP_CHAR_LEN("AuthorFormat"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 },
{ MAP_CHAR_LEN("FullName"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 },
- {0,0}
+ {0,0,0,0,0,0}
};
static SfxItemPropertyMap aMeasureFieldPropertyMap_Impl[] =
{
{ MAP_CHAR_LEN("Kind"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 },
- {0,0}
+ {0,0,0,0,0,0}
};
switch( mnId )
@@ -165,12 +165,7 @@ SfxItemPropertyMap* ImplGetFieldItemPropertyMap( sal_Int32 mnId )
}
}
-static SfxItemPropertyMap aEmptyPropertyMap_Impl[] =
-{
- {0,0}
-};
-
-static sal_Char* aFieldItemNameMap_Impl[] =
+static const sal_Char* aFieldItemNameMap_Impl[] =
{
"Date",
"URL",
@@ -261,8 +256,8 @@ UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextField );
SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw()
: OComponentHelper( getMutex() ),
mpPropSet(NULL),
- mpImpl( new SvxUnoFieldData_Impl ),
- mnServiceId(nServiceId)
+ mnServiceId(nServiceId),
+ mpImpl( new SvxUnoFieldData_Impl )
{
mpPropSet = new SfxItemPropertySet( ImplGetFieldItemPropertyMap(mnServiceId) );
@@ -316,8 +311,8 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, co
: OComponentHelper( getMutex() ),
mxAnchor( xAnchor ),
mpPropSet(NULL),
- mpImpl( new SvxUnoFieldData_Impl ),
- mnServiceId(ID_UNKNOWN)
+ mnServiceId(ID_UNKNOWN),
+ mpImpl( new SvxUnoFieldData_Impl )
{
DBG_ASSERT(pData, "pFieldData == NULL! [CL]" );
@@ -371,7 +366,7 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, co
mpImpl->msString2 = ((SvxAuthorField*)pData)->GetFormatted();
mpImpl->mnInt16 = ((SvxAuthorField*)pData)->GetFormat();
mpImpl->mbBoolean1 = ((SvxAuthorField*)pData)->GetType() == SVXAUTHORTYPE_FIX;
- mpImpl->mbBoolean2 = ((SvxAuthorField*)pData)->GetType() != SVXAUTHORFORMAT_SHORTNAME;
+ mpImpl->mbBoolean2 = ((SvxAuthorField*)pData)->GetFormat() != SVXAUTHORFORMAT_SHORTNAME;
break;
case ID_MEASUREFIELD:
@@ -410,8 +405,6 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
}
else
{
- Time aTime;
-
if( mnServiceId != ID_TIMEFIELD && mnServiceId != ID_DATEFIELD )
{
Time aTime( setTime( mpImpl->maDateTime ) );
@@ -743,10 +736,10 @@ uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyNam
return aValue;
}
-void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SvxUnoTextField::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SvxUnoTextField::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SvxUnoTextField::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxUnoTextField::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxUnoTextField::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SvxUnoTextField::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
// OComponentHelper
void SvxUnoTextField::disposing()
diff --git a/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx b/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx
index a969e91..032541c 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx
@@ -102,20 +102,22 @@ uno::Reference< text::XText > xDummyText;
uno::Sequence< uno::Type > SvxUnoTextContent::maTypeSequence;
SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw()
-: SvxUnoTextRangeBase(rText),rParentText(rText),
- aDisposeListeners(aDisposeContainerMutex),
- nParagraph(nPara),
- bDisposing( sal_False )
+ : SvxUnoTextRangeBase(rText)
+ , nParagraph(nPara)
+ , rParentText(rText)
+ , aDisposeListeners(aDisposeContainerMutex)
+ , bDisposing( sal_False )
{
xParentText = const_cast<SvxUnoTextBase*>(&rText);
SetSelection( ESelection( nParagraph,0, nParagraph, GetEditSource()->GetTextForwarder()->GetTextLen( nParagraph ) ) );
}
SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextContent& rContent ) throw()
-: SvxUnoTextRangeBase(rContent),
- aDisposeListeners(aDisposeContainerMutex),
- rParentText(rContent.rParentText),
- bDisposing( sal_False )
+ : SvxUnoTextRangeBase(rContent)
+ , cppu::OWeakAggObject()
+ , rParentText(rContent.rParentText)
+ , aDisposeListeners(aDisposeContainerMutex)
+ , bDisposing( sal_False )
{
xParentText = rContent.xParentText;
nParagraph = rContent.nParagraph;
@@ -207,7 +209,7 @@ uno::Reference< text::XText > SAL_CALL SvxUnoTextContent::getText()
}
// text::XTextContent
-void SAL_CALL SvxUnoTextContent::attach( const uno::Reference< text::XTextRange >& xTextRange )
+void SAL_CALL SvxUnoTextContent::attach( const uno::Reference< text::XTextRange >& /*xTextRange*/ )
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
}
@@ -404,7 +406,7 @@ uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement()
uno::Reference< text::XTextRange > xRange;
- SvxTextForwarder* pForwarder = rParentText.GetEditSource()->GetTextForwarder();
+ /*SvxTextForwarder* pForwarder =*/ rParentText.GetEditSource()->GetTextForwarder();
SvxUnoTextRange* pRange = new SvxUnoTextRange( rParentText, sal_True );
xRange = pRange;
@@ -428,8 +430,9 @@ SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw()
}
SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextCursor& rCursor ) throw()
-: SvxUnoTextRangeBase(rCursor),
- xParentText(rCursor.xParentText)
+ : SvxUnoTextRangeBase(rCursor)
+ , cppu::OWeakAggObject()
+ , xParentText(rCursor.xParentText)
{
}
More information about the Libreoffice-commits
mailing list