diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-01 11:55:47 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-01 12:21:00 +0200 |
| commit | 59c0f8f452a538308a9d4098cdc8319b884c3c81 (patch) | |
| tree | 6272bb19d30661acdc9995f8a18ce11e9f2fe6b0 /io | |
| parent | b3b76d1abb5ab9af33ce559872c2e1c45ecdbbd0 (diff) | |
| parent | 464a3a271cd4b97573e87d15a38b3f4cad727daf (diff) | |
merge origin/master
Diffstat (limited to 'io')
| -rw-r--r-- | io/README | 3 | ||||
| -rw-r--r-- | io/test/stm/datatest.cxx | 4 | ||||
| -rw-r--r-- | io/test/stm/pumptest.cxx | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/io/README b/io/README new file mode 100644 index 000000000000..229153f04c1c --- /dev/null +++ b/io/README @@ -0,0 +1,3 @@ +Simple IO wrapper UNO components + + diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index 47b77697500e..4504403a4231 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -668,8 +668,8 @@ public: private: - void OObjectStreamTest::testObject( const Reference <XObjectOutputStream > &rOut, - const Reference <XObjectInputStream> &rIn ); + void testObject( const Reference <XObjectOutputStream > &rOut, + const Reference <XObjectInputStream> &rIn ); private: }; diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx index c1bb3a37972f..3f60c4c91597 100644 --- a/io/test/stm/pumptest.cxx +++ b/io/test/stm/pumptest.cxx @@ -380,7 +380,7 @@ void OPumpTest::testTerminate( const Reference< XInterface > &r ) ERROR_ASSERT( t.m_pTestListener->m_bStarted , "should have been started already" ); ERROR_ASSERT( t.m_pTestListener->m_bTerminated , "should be terminiated already" ); // terminte leads to an error, that is no surprise, in fact - // one can't tell wether the error occurs because of the terminate + // one can't tell whether the error occurs because of the terminate // call or for some other reason ! // ERROR_ASSERT( ! t.m_pTestListener->m_bError, "unexpected error" ); ERROR_ASSERT( t.m_pTestListener->m_bClosed, "should be closed already" ); |