summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore/unosrch.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-09-27 08:40:30 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-09-27 08:40:30 +0000
commit4d0faca34627cdd53ef8560770e789854b2ea141 (patch)
tree00a08b4d460c60fa4c45fe77ecbcd92fe0ff9506 /sw/source/core/unocore/unosrch.cxx
parentae470792eb258f9bc906ffe994ac668d6ecb4ed6 (diff)
INTEGRATION: CWS swwarnings (1.15.222); FILE MERGED
2007/06/29 13:06:20 os 1.15.222.4: merge errors fixed 2007/06/28 11:54:44 os 1.15.222.3: RESYNC: (1.15-1.16); FILE MERGED 2007/03/16 14:11:56 tl 1.15.222.2: #i69287# warning-free code 2007/03/15 15:51:20 tl 1.15.222.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/core/unocore/unosrch.cxx')
-rw-r--r--sw/source/core/unocore/unosrch.cxx21
1 files changed, 10 insertions, 11 deletions
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 357f06764eca..9e88eaea762c 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: unosrch.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: ihi $ $Date: 2007-06-05 17:36:33 $
+ * last change: $Author: hr $ $Date: 2007-09-27 09:40:30 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -466,10 +466,9 @@ sal_Bool SwSearchProperties_Impl::HasAttributes() const
-----------------------------------------------------------------------*/
SwXTextSearch::SwXTextSearch() :
- _pMap(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_SEARCH)),
pSearchProperties( new SwSearchProperties_Impl),
pReplaceProperties( new SwSearchProperties_Impl),
- bIsValueSearch(sal_True),
+ _pMap(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_SEARCH)),
bAll(sal_False),
bWord(sal_False),
bBack(sal_False),
@@ -480,7 +479,8 @@ SwXTextSearch::SwXTextSearch() :
bLevRelax(sal_False),
nLevExchange(2),
nLevAdd(2),
- nLevRemove(2)
+ nLevRemove(2),
+ bIsValueSearch(sal_True)
{
}
/*-- 14.12.98 13:07:12 ---------------------------------------------------
@@ -509,7 +509,7 @@ sal_Int64 SAL_CALL SwXTextSearch::getSomething( const uno::Sequence< sal_Int8 >&
&& 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
{
- return (sal_Int64)this;
+ return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >(this) );
}
return 0;
}
@@ -585,7 +585,6 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A
case WID_SIMILARITY_EXCHANGE: aValue >>= nLevExchange; break;
case WID_SIMILARITY_ADD: aValue >>= nLevAdd; break;
case WID_SIMILARITY_REMOVE : aValue >>= nLevRemove;break;
- break;
};
}
else
@@ -634,28 +633,28 @@ SET_UINT16:
/*-- 14.12.98 13:07:13---------------------------------------------------
-----------------------------------------------------------------------*/
-void SwXTextSearch::addPropertyChangeListener(const OUString& PropertyName, const uno::Reference< beans::XPropertyChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
+void SwXTextSearch::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented")
}
/*-- 14.12.98 13:07:13---------------------------------------------------
-----------------------------------------------------------------------*/
-void SwXTextSearch::removePropertyChangeListener(const OUString& PropertyName, const uno::Reference< beans::XPropertyChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
+void SwXTextSearch::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException )
{
DBG_WARNING("not implemented")
}
/*-- 14.12.98 13:07:14---------------------------------------------------
-----------------------------------------------------------------------*/
-void SwXTextSearch::addVetoableChangeListener(const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
+void SwXTextSearch::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException )
{
DBG_WARNING("not implemented")
}
/*-- 14.12.98 13:07:14---------------------------------------------------
-----------------------------------------------------------------------*/
-void SwXTextSearch::removeVetoableChangeListener(const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
+void SwXTextSearch::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException )
{
DBG_WARNING("not implemented")
}