summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-01-20 12:02:50 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-01-20 12:14:46 +0100
commitd92ac0dfbf5fd5a82176feb43d471f10a12e889b (patch)
tree4a6ee91e30044b3f64aa6108815b06015a2e6fdb /sal
parent46ce4f561dafeaab614e83653cba646885e8fd17 (diff)
Remove obsolete suppressOslDebugMessage.
Diffstat (limited to 'sal')
-rw-r--r--sal/qa/osl/file/osl_File.cxx8
-rw-r--r--sal/qa/osl/file/test_cpy_wrt_file.cxx12
2 files changed, 0 insertions, 20 deletions
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 02ca76f165c7..4d0f4af3e21d 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -5098,11 +5098,6 @@ namespace osl_DirectoryItem
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::getFileStatus, "osl_DirectoryItem" );
}// namespace osl_DirectoryItem
-//Use to deliberately silence warnings for a deliberate error
-extern "C" void SAL_CALL suppressOslDebugMessage( const sal_Char *, sal_Int32, const sal_Char * )
-{
-}
-
//------------------------------------------------------------------------
// Beginning of the test cases for Directory class
//------------------------------------------------------------------------
@@ -5582,10 +5577,7 @@ namespace osl_Directory
void getNextItem_002( )
{
::osl::Directory testDirectory( aTmpName3 ); //constructor
- //deliberate error, suppress run-time warning
- pfunc_osl_printDetailedDebugMessage pOldDebugMessageFunc = osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage );
nError1 = testDirectory.getNextItem( rItem );
- osl_setDetailedDebugMessageFunc( pOldDebugMessageFunc );
CPPUNIT_ASSERT_MESSAGE( "test for getNextItem function: retrive an item in a directory which is not opened, also test for nHint's default value.",
( ::osl::FileBase::E_INVAL == nError1 ) );
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index 161f0a4b3f38..1e404059c95d 100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -46,11 +46,6 @@ using ::rtl::OUString;
using ::rtl::OUStringToOString;
using ::rtl::OString;
-//Use to silence OSL_ warnings for a deliberate error
-extern "C" void SAL_CALL suppressOslDebugMessage2( const sal_Char *, sal_Int32, const sal_Char * )
-{
-}
-
class test_osl_writeFile : public CppUnit::TestFixture
{
public:
@@ -72,11 +67,6 @@ public:
sErrorMsg += "' would exist!";
CPPUNIT_ASSERT_MESSAGE(sErrorMsg.getStr(), err == FileBase::E_EXIST);
- //deliberate errors, suppress run-time warning for operations on
- //un-opened File
- pfunc_osl_printDetailedDebugMessage pOldDebugMessageFunc =
- osl_setDetailedDebugMessageFunc( &suppressOslDebugMessage2 );
-
char buffer[1];
sal_uInt64 written = 0;
err = tmp_file.write((void*)buffer, sizeof(buffer), written);
@@ -88,8 +78,6 @@ public:
err = tmp_file.close();
CPPUNIT_ASSERT_MESSAGE("close on unconnected file should fail", err != FileBase::E_None);
- osl_setDetailedDebugMessageFunc( pOldDebugMessageFunc );
-
err = ::osl::File::remove(aTmpFile);
CPPUNIT_ASSERT_MESSAGE("temp file should have existed", err == FileBase::E_None);
}