summaryrefslogtreecommitdiff
path: root/framework/inc/classes
diff options
context:
space:
mode:
Diffstat (limited to 'framework/inc/classes')
-rw-r--r--framework/inc/classes/checkediterator.hxx10
-rw-r--r--framework/inc/classes/filtercache.hxx83
-rw-r--r--framework/inc/classes/wildcard.hxx46
3 files changed, 5 insertions, 134 deletions
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index 637c5c6cb387..be73d210342f 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -100,8 +100,8 @@ class CheckedIterator
inline void initialize( const TContainer& rContainer )
{
// Check incoming parameter. We don't accept all!
- LOG_ASSERT2( &rContainer==NULL , "CheckedIterator::initialize()", "Invalid parameter detected!" )
- LOG_ASSERT2( m_eEndState!=E_UNKNOWN , "CheckedIterator::initialize()", "Instance already initialized! Don't do it again." )
+ SAL_WARN_IF( &rContainer==NULL, "fwk", "CheckedIterator::initialize(): Invalid parameter detected!" );
+ SAL_WARN_IF( m_eEndState!=E_UNKNOWN, "fwk", "CheckedIterator::initialize(): Instance already initialized! Don't do it again." );
if( m_eEndState == E_UNKNOWN )
{
@@ -187,7 +187,7 @@ class CheckedIterator
inline CheckedIterator& operator++()
{
// Warn programmer if he forget to initailize object!
- LOG_ASSERT2( m_pContainer==NULL, "CheckedIterator::operator++()", "Object not initialized!" )
+ SAL_WARN_IF( m_pContainer==NULL, "fwk", "CheckedIterator::operator++(): Object not initialized!" );
// Step to next element if any exist or set our end states.
switch( m_eEndState )
{
@@ -280,9 +280,9 @@ class CheckedIterator
inline typename TContainer::const_iterator getEntry()
{
// Warn programmer if he forget to initialize these object ...
- LOG_ASSERT2( m_pContainer==NULL, "CheckedIterator::getEntry()", "Object not initialized!" )
+ SAL_WARN_IF( m_pContainer==NULL, "fwk", "CheckedIterator::getEntry(): Object not initialized!" );
// or try to read a non existing element!
- LOG_ASSERT2( m_eEndState!=E_BEFOREEND, "CheckedIterator::getEntry()", "Wrong using of class detected!" )
+ SAL_WARN_IF( m_eEndState!=E_BEFOREEND, "fwk", "CheckedIterator::getEntry(): Wrong using of class detected!" );
return m_pPosition;
}
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index 63cc2169c9e1..7bc73132f1e6 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -314,89 +314,6 @@ class FilterCache : private ThreadHelpBase
sal_Bool validateAndRepairHandler();
//-------------------------------------------------------------------------------------------------------------
- // protected methods
- //-------------------------------------------------------------------------------------------------------------
-
- protected:
-
- //-------------------------------------------------------------------------------------------------------------
- // private methods
- //-------------------------------------------------------------------------------------------------------------
-
- private:
-
- //-------------------------------------------------------------------------------------------------------------
- // debug methods
- //-------------------------------------------------------------------------------------------------------------
-
- /*-****************************************************************************************************//**
- @short debug-method to check incoming parameter of some other mehods of this class
- @descr The following methods are used to check parameters for other methods
- of this class. The return value is used directly for an ASSERT(...).
-
- @seealso ASSERT in implementation!
-
- @param references to checking variables
- @return sal_False ,on invalid parameter
- @return sal_True ,otherwise
-
- @onerror -
- *//*-*****************************************************************************************************/
-
- #ifdef ENABLE_ASSERTIONS
-
- private:
-
- static sal_Bool implcp_searchType ( const OUString& sURL ,
- const OUString* pMediaType ,
- const OUString* pClipboardFormat ,
- const CheckedTypeIterator& aStartEntry ,
- const OUString& sResult );
- static sal_Bool implcp_searchFilterForType ( const OUString& sInternalTypeName ,
- const CheckedStringListIterator& aStartEntry ,
- const OUString& sResult );
- static sal_Bool implcp_searchDetectorForType ( const OUString& sInternalTypeName ,
- const CheckedStringListIterator& aStartEntry ,
- const OUString& sResult );
- static sal_Bool implcp_searchLoaderForType ( const OUString& sInternalTypeName ,
- const CheckedStringListIterator& aStartEntry ,
- const OUString& sResult );
- static sal_Bool implcp_searchContentHandlerForType ( const OUString& sInternalTypeName ,
- const CheckedStringListIterator& aStartEntry ,
- const OUString& sResult );
- static sal_Bool implcp_getTypeProperties ( const OUString& sName );
- static sal_Bool implcp_getFilterProperties ( const OUString& sName );
- static sal_Bool implcp_getDetectorProperties ( const OUString& sName );
- static sal_Bool implcp_getLoaderProperties ( const OUString& sName );
- static sal_Bool implcp_getContentHandlerProperties ( const OUString& sName );
- static sal_Bool implcp_getType ( const OUString& sName );
- static sal_Bool implcp_getFilter ( const OUString& sName );
- static sal_Bool implcp_getDetector ( const OUString& sName );
- static sal_Bool implcp_getLoader ( const OUString& sName );
- static sal_Bool implcp_getContentHandler ( const OUString& sName );
- static sal_Bool implcp_existsType ( const OUString& sName );
- static sal_Bool implcp_existsFilter ( const OUString& sName );
- static sal_Bool implcp_existsDetector ( const OUString& sName );
- static sal_Bool implcp_existsLoader ( const OUString& sName );
- static sal_Bool implcp_existsContentHandler ( const OUString& sName );
- static sal_Bool implcp_addFilter ( const OUString& sName ,
- const css::uno::Sequence< css::beans::PropertyValue >& lProperties );
- static sal_Bool implcp_replaceFilter ( const OUString& sName ,
- const css::uno::Sequence< css::beans::PropertyValue >& lProperties );
- static sal_Bool implcp_removeFilter ( const OUString& sName );
- static sal_Bool implcp_queryFilters ( const OUString& sQuery );
-
- #endif // #ifdef ENABLE_ASSERTIONS
-
- #ifdef ENABLE_COMPONENT_SELF_CHECK
-
- private:
-
- void impldbg_dumpCache();
-
- #endif // ENABLE_COMPONENT_SELF_CHECK
-
- //-------------------------------------------------------------------------------------------------------------
// private variables
//-------------------------------------------------------------------------------------------------------------
private:
diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
index 212d50294771..24cd0782cc50 100644
--- a/framework/inc/classes/wildcard.hxx
+++ b/framework/inc/classes/wildcard.hxx
@@ -100,52 +100,6 @@ class Wildcard
static sal_Bool match( const OUString& sText ,
const OUString& sPattern );
- //---------------------------------------------------------------------------------------------------------
- // debug and test methods
- //---------------------------------------------------------------------------------------------------------
-
- /*-****************************************************************************************************//**
- @short debug-methods to check incoming parameter of some other mehods of this class
- @descr The follow methods are used to check parameters for other methods
- of this class. The return value is used directly for an ASSERT(...).
- This mechanism is active in debug version only!
-
- @seealso FRAMEWORK_ASSERT in implementation!
-
- @param references to checking variables
- @return sal_False on invalid parameter
- @return sal_True otherwise
-
- @onerror -
- *//*-*****************************************************************************************************/
-
- #ifdef ENABLE_ASSERTIONS
-
- static sal_Bool impldbg_checkParameter_match( const OUString& sText ,
- const OUString& sPattern );
-
- #endif // #ifdef ENABLE_ASSERTIONS
-
- /*-****************************************************************************************************//**
- @short test implementation of match() with different examples
- @descr If TESTMODE activated, you cann call these method to start and log some special examples.
- Do this if you have changed the implementation of method match() to test it.
-
- @seealso -
-
- @param -
- @return -
-
- @onerror Error-conditions are written to file or show in a messagebox.
- Thhat depends from current setting of ASSERT_OUTPUTTYPE. (see debug.hxx for further information.)
- *//*-*****************************************************************************************************/
-
- #ifdef ENABLE_CLASSDEBUG
-
- void impldbg_testWildcard();
-
- #endif // #ifdef ENABLE_CLASSDEBUG
-
}; // class Wildcard
} // namespace framework
generated by cgit (git 2.34.1) at 2025-02-04 03:43:25 +0000