diff options
-rw-r--r-- | UnoControls/source/base/basecontrol.cxx | 2 | ||||
-rw-r--r-- | extensions/test/stm/datatest.cxx | 17 | ||||
-rw-r--r-- | extensions/workben/testcomponent.cxx | 4 | ||||
-rw-r--r-- | io/test/stm/datatest.cxx | 18 | ||||
-rw-r--r-- | io/test/testcomponent.cxx | 4 | ||||
-rw-r--r-- | sax/test/saxdemo.cxx | 4 | ||||
-rw-r--r-- | sax/test/testcomponent.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/svxerr.src | 4 | ||||
-rw-r--r-- | udkapi/com/sun/star/beans/XFastPropertySet.idl | 2 |
9 files changed, 23 insertions, 36 deletions
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index 37e5c893ba5a..b95f9d761123 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -367,7 +367,6 @@ void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToo addWindowListener( this ); } - // PosSize_POSSIZE defined in <stardiv/uno/awt/window.hxx> m_xPeerWindow->setPosSize( m_nX, m_nY, m_nWidth, m_nHeight, PosSize::POSSIZE ); m_xPeerWindow->setEnable( m_bEnable ); m_xPeerWindow->setVisible( m_bVisible && !m_bInDesignMode ); @@ -461,7 +460,6 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX , sal_Int16 nFlags ) throw( RuntimeException ) { // - change size and position of window and save the values - // - "nFlags" declared in <stardiv/uno/awt/window.hxx> ("#define PosSize_X .....") // Ready for multithreading MutexGuard aGuard( m_aMutex ); diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx index ce910869d185..8764c341160c 100644 --- a/extensions/test/stm/datatest.cxx +++ b/extensions/test/stm/datatest.cxx @@ -24,14 +24,11 @@ #include <smart/com/sun/star/io/XActiveDataSource.hxx> #include <smart/com/sun/star/io/XConnectable.hxx> #include <smart/com/sun/star/io/XMarkableStream.hxx> - #include <smart/com/sun/star/lang/XServiceInfo.hxx> - #include <smart/com/sun/star/beans/XPropertySet.hxx> #include <usr/services.hxx> #include <usr/factoryhlp.hxx> - #include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE #include <usr/weak.hxx> // OWeakObject @@ -47,14 +44,12 @@ using namespace usr; #define DATASTREAM_TEST_MAX_HANDLE 1 -/**** -* The following test class tests XDataInputStream and XDataOutputStream at equal terms, -* so when errors occur, it may be in either one implementation. -* The class also uses stardiv.uno.io.pipe. If problems occur, make sure to run also the -* pipe test routines ( test.com.sun.star.io.pipe ). -* -* -*****/ +/* + * The following test class tests XDataInputStream and XDataOutputStream at equal terms, + * so when errors occur, it may be in either one implementation. + * The class also uses com.sun.star.io.Pipe. If problems occur, make sure to run also the + * pipe test routines ( test.com.sun.star.io.Pipe ). + */ class ODataStreamTest : public XSimpleTest, diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 0dd0645c0e18..3e1cb25bd664 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -21,9 +21,9 @@ //------------------------------------------------------ // testcomponent - Loads a service and its testcomponent from dlls performs a test. // Expands the dll-names depending on the actual environment. -// Example : testcomponent stardiv.uno.io.Pipe stm +// Example : testcomponent com.sun.star.io.Pipe stm // -// Therefor the testcode must exist in teststm and the testservice must be named test.stardiv.uno.io.Pipe +// Therefor the testcode must exist in teststm and the testservice must be named test.com.sun.star.io.Pipe // #include <stdio.h> diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index 00eb8857db21..d7063dec0f4f 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <com/sun/star/test/XSimpleTest.hpp> @@ -29,13 +28,10 @@ #include <com/sun/star/io/XConnectable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> - #include <com/sun/star/lang/IllegalArgumentException.hpp> - #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/factory.hxx> - #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> @@ -58,14 +54,12 @@ using namespace ::com::sun::star::beans; #define DATASTREAM_TEST_MAX_HANDLE 1 -/**** -* The following test class tests XDataInputStream and XDataOutputStream at equal terms, -* so when errors occur, it may be in either one implementation. -* The class also uses stardiv.uno.io.pipe. If problems occur, make sure to run also the -* pipe test routines ( test.com.sun.star.io.pipe ). -* -* -*****/ +/* + * The following test class tests XDataInputStream and XDataOutputStream at equal terms, + * so when errors occur, it may be in either one implementation. + * The class also uses com.sun.star.io.pipe. If problems occur, make sure to run also the + * pipe test routines ( test.com.sun.star.io.pipe ). + */ class ODataStreamTest : public WeakImplHelper1< XSimpleTest > diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx index 9780266014ab..e0a63c5d4173 100644 --- a/io/test/testcomponent.cxx +++ b/io/test/testcomponent.cxx @@ -21,9 +21,9 @@ //------------------------------------------------------ // testcomponent - Loads a service and its testcomponent from dlls performs a test. // Expands the dll-names depending on the actual environment. -// Example : testcomponent stardiv.uno.io.Pipe stm +// Example : testcomponent com.sun.star.io.Pipe stm // -// Therefor the testcode must exist in teststm and the testservice must be named test.stardiv.uno.io.Pipe +// Therefor the testcode must exist in teststm and the testservice must be named test.com.sun.star.io.Pipe // #include <stdio.h> diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx index 486752081668..3910bbf56dea 100644 --- a/sax/test/saxdemo.cxx +++ b/sax/test/saxdemo.cxx @@ -20,9 +20,9 @@ //------------------------------------------------------ // testcomponent - Loads a service and its testcomponent from dlls performs a test. // Expands the dll-names depending on the actual environment. -// Example : testcomponent stardiv.uno.io.Pipe stm +// Example : testcomponent com.sun.star.io.Pipe stm // -// Therefor the testcode must exist in teststm and the testservice must be named test.stardiv.uno.io.Pipe +// Therefor the testcode must exist in teststm and the testservice must be named test.com.sun.star.uno.io.Pipe // #include <stdio.h> diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx index b81e07d1ef81..f8ef724e063d 100644 --- a/sax/test/testcomponent.cxx +++ b/sax/test/testcomponent.cxx @@ -20,9 +20,9 @@ //------------------------------------------------------ // testcomponent - Loads a service and its testcomponent from dlls performs a test. // Expands the dll-names depending on the actual environment. -// Example : testcomponent stardiv.uno.io.Pipe stm +// Example : testcomponent com.sun.star.io.Pipe stm // -// Therefor the testcode must exist in teststm and the testservice must be named test.stardiv.uno.io.Pipe +// Therefor the testcode must exist in teststm and the testservice must be named com.sun.star.io.Pipe // #include <stdio.h> diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src index 79a9e6539740..90a0b8ca9a6f 100644 --- a/svx/source/items/svxerr.src +++ b/svx/source/items/svxerr.src @@ -91,11 +91,11 @@ Resource RID_SVXERRCODE }; String (ERRCODE_SVX_FORMS_NOIOSERVICES | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK { - Text [ en-US ] = "The form layer wasn't loaded as the required IO-services (stardiv.uno.io.*) could not be instantiated."; + Text [ en-US ] = "The form layer wasn't loaded as the required IO-services (com.sun.star.io.*) could not be instantiated."; }; String (ERRCODE_SVX_FORMS_NOIOSERVICES | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK { - Text [ en-US ] = "The form layer wasn't written as the required IO services (stardiv.uno.io.*) could not be instantiated."; + Text [ en-US ] = "The form layer wasn't written as the required IO services (com.sun.star.io.*) could not be instantiated."; }; String (ERRCODE_SVX_FORMS_READWRITEFAILED | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK { diff --git a/udkapi/com/sun/star/beans/XFastPropertySet.idl b/udkapi/com/sun/star/beans/XFastPropertySet.idl index e6e1cb137246..f41997c2d237 100644 --- a/udkapi/com/sun/star/beans/XFastPropertySet.idl +++ b/udkapi/com/sun/star/beans/XFastPropertySet.idl @@ -63,7 +63,7 @@ published interface XFastPropertySet: com::sun::star::uno::XInterface if the new value cannot be converted to the type of the underlying property by an identity or widening conversion. - @throws stardiv::uno::lang::WrappedTargetException + @throws com::sun::star::lang::WrappedTargetException if the implementation has an internal reason for the exception. In this case the original exception is wrapped into this com::sun::star::lang::WrappedTargetException. |