#92075# - Adaptions for new (stricter) Solaris Compiler.

4 files changed, 106 insertions, 106 deletions

diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 5780f72d7478..a196bbf33167 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hierarchycontent.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: sb $ $Date: 2001-08-29 13:37:57 $
+ *  last change: $Author: kso $ $Date: 2001-09-12 10:03:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -602,18 +602,18 @@ uno::Any SAL_CALL HierarchyContent::execute(
         // Remove own and all children's persistent data.
         if ( !removeData() )
         {
-            ucbhelper::cancelCommandExecution(
-                star::ucb::IOErrorCode_CANT_WRITE,
-                uno::Sequence< uno::Any >(
-                    &uno::makeAny(
+            uno::Any aProps
+                = uno::makeAny(
                          beans::PropertyValue(
                              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                                "Uri")),
                              -1,
                              uno::makeAny(m_xIdentifier->
                                               getContentIdentifier()),
-                             beans::PropertyState_DIRECT_VALUE)),
-                    1),
+                             beans::PropertyState_DIRECT_VALUE));
+            ucbhelper::cancelCommandExecution(
+                star::ucb::IOErrorCode_CANT_WRITE,
+                uno::Sequence< uno::Any >(&aProps, 1),
                 Environment,
                 rtl::OUString::createFromAscii(
                     "Cannot remove persistent data!" ),
@@ -1533,18 +1533,18 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
         {
             if ( !storeData() )
             {
-                ucbhelper::cancelCommandExecution(
-                    star::ucb::IOErrorCode_CANT_WRITE,
-                    uno::Sequence< uno::Any >(
-                        &uno::makeAny(
+                uno::Any aProps
+                    = uno::makeAny(
                              beans::PropertyValue(
                                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                      "Uri")),
                                  -1,
                                  uno::makeAny(m_xIdentifier->
                                                   getContentIdentifier()),
-                                 beans::PropertyState_DIRECT_VALUE)),
-                        1),
+                                 beans::PropertyState_DIRECT_VALUE));
+                ucbhelper::cancelCommandExecution(
+                    star::ucb::IOErrorCode_CANT_WRITE,
+                    uno::Sequence< uno::Any >(&aProps, 1),
                     xEnv,
                     rtl::OUString::createFromAscii(
                         "Cannot store persistent data!" ),
@@ -1684,17 +1684,17 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
 
     if ( !storeData() )
     {
-        ucbhelper::cancelCommandExecution(
-            star::ucb::IOErrorCode_CANT_WRITE,
-            uno::Sequence< uno::Any >(
-                &uno::makeAny(beans::PropertyValue(
+        uno::Any aProps
+            = uno::makeAny(beans::PropertyValue(
                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                                     "Uri")),
                                   -1,
                                   uno::makeAny(m_xIdentifier->
                                                    getContentIdentifier()),
-                                  beans::PropertyState_DIRECT_VALUE)),
-                1),
+                                  beans::PropertyState_DIRECT_VALUE));
+        ucbhelper::cancelCommandExecution(
+            star::ucb::IOErrorCode_CANT_WRITE,
+            uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
             rtl::OUString::createFromAscii( "Cannot store persistent data!" ),
             this );
@@ -1817,16 +1817,16 @@ void HierarchyContent::transfer(
         if ( aId.compareTo(
                 rInfo.SourceURL, rInfo.SourceURL.getLength() ) == 0 )
         {
-            ucbhelper::cancelCommandExecution(
-                star::ucb::IOErrorCode_RECURSIVE,
-                uno::Sequence< uno::Any >(
-                    &uno::makeAny(beans::PropertyValue(
+            uno::Any aProps
+                = uno::makeAny(beans::PropertyValue(
                                       rtl::OUString(
                                           RTL_CONSTASCII_USTRINGPARAM("Uri")),
                                       -1,
                                       uno::makeAny(rInfo.SourceURL),
-                                      beans::PropertyState_DIRECT_VALUE)),
-                    1),
+                                      beans::PropertyState_DIRECT_VALUE));
+            ucbhelper::cancelCommandExecution(
+                star::ucb::IOErrorCode_RECURSIVE,
+                uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
                 rtl::OUString::createFromAscii(
                     "Target is equal to or is a child of source!" ),
@@ -1858,16 +1858,16 @@ void HierarchyContent::transfer(
 
     if ( !xSource.is() )
     {
-        ucbhelper::cancelCommandExecution(
-            star::ucb::IOErrorCode_CANT_READ,
-            uno::Sequence< uno::Any >(
-                &uno::makeAny(beans::PropertyValue(
+        uno::Any aProps
+            = uno::makeAny(beans::PropertyValue(
                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                       "Uri")),
                                   -1,
                                   uno::makeAny(xId->getContentIdentifier()),
-                                  beans::PropertyState_DIRECT_VALUE)),
-                1),
+                                  beans::PropertyState_DIRECT_VALUE));
+        ucbhelper::cancelCommandExecution(
+            star::ucb::IOErrorCode_CANT_READ,
+            uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
             rtl::OUString::createFromAscii(
                 "Cannot instanciate source object!" ),
@@ -1893,16 +1893,16 @@ void HierarchyContent::transfer(
             createNewContent( aInfo ).get() );
     if ( !xTarget.is() )
     {
-        ucbhelper::cancelCommandExecution(
-            star::ucb::IOErrorCode_CANT_CREATE,
-            uno::Sequence< uno::Any >(
-                &uno::makeAny(beans::PropertyValue(
+        uno::Any aProps
+            = uno::makeAny(beans::PropertyValue(
                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                       "Folder")),
                                   -1,
                                   uno::makeAny(aId),
-                                  beans::PropertyState_DIRECT_VALUE)),
-                1),
+                                  beans::PropertyState_DIRECT_VALUE));
+        ucbhelper::cancelCommandExecution(
+            star::ucb::IOErrorCode_CANT_CREATE,
+            uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
             rtl::OUString::createFromAscii(
                 "XContentCreator::createNewContent failed!" ),
@@ -2025,10 +2025,8 @@ void HierarchyContent::transfer(
         // Remove all persistent data of source and its children.
         if ( !xSource->removeData() )
         {
-            ucbhelper::cancelCommandExecution(
-                star::ucb::IOErrorCode_CANT_WRITE,
-                uno::Sequence< uno::Any >(
-                    &uno::makeAny(
+            uno::Any aProps
+                = uno::makeAny(
                          beans::PropertyValue(
                              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                                "Uri")),
@@ -2036,8 +2034,10 @@ void HierarchyContent::transfer(
                              uno::makeAny(
                                  xSource->m_xIdentifier->
                                               getContentIdentifier()),
-                             beans::PropertyState_DIRECT_VALUE)),
-                    1),
+                             beans::PropertyState_DIRECT_VALUE));
+            ucbhelper::cancelCommandExecution(
+                star::ucb::IOErrorCode_CANT_WRITE,
+                uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
                 rtl::OUString::createFromAscii(
                     "Cannot remove persistent data of source object!" ),
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 7e57436f88ca..16e5e0a00b1b 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pkgcontent.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: sb $ $Date: 2001-08-29 13:38:57 $
+ *  last change: $Author: kso $ $Date: 2001-09-12 10:03:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -650,18 +650,18 @@ uno::Any SAL_CALL Content::execute(
         // Remove own and all children's persistent data.
         if ( !removeData() )
         {
-            ucbhelper::cancelCommandExecution(
-                star::ucb::IOErrorCode_CANT_WRITE,
-                uno::Sequence< uno::Any >(
-                    &uno::makeAny(
+            uno::Any aProps
+                = uno::makeAny(
                          beans::PropertyValue(
                              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                                "Uri")),
                              -1,
                              uno::makeAny(m_xIdentifier->
                                               getContentIdentifier()),
-                             beans::PropertyState_DIRECT_VALUE)),
-                    1),
+                             beans::PropertyState_DIRECT_VALUE));
+            ucbhelper::cancelCommandExecution(
+                star::ucb::IOErrorCode_CANT_WRITE,
+                uno::Sequence< uno::Any >(&aProps, 1),
                 Environment,
                 rtl::OUString::createFromAscii(
                     "Cannot remove persistent data!" ),
@@ -1548,18 +1548,18 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         {
             if ( !storeData( uno::Reference< io::XInputStream >() ) )
             {
-                ucbhelper::cancelCommandExecution(
-                    star::ucb::IOErrorCode_CANT_WRITE,
-                    uno::Sequence< uno::Any >(
-                        &uno::makeAny(
+                uno::Any aProps
+                    = uno::makeAny(
                              beans::PropertyValue(
                                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                                    "Uri")),
                                  -1,
                                  uno::makeAny(m_xIdentifier->
                                                   getContentIdentifier()),
-                                 beans::PropertyState_DIRECT_VALUE)),
-                        1),
+                                 beans::PropertyState_DIRECT_VALUE));
+                ucbhelper::cancelCommandExecution(
+                    star::ucb::IOErrorCode_CANT_WRITE,
+                    uno::Sequence< uno::Any >(&aProps, 1),
                     xEnv,
                     rtl::OUString::createFromAscii(
                         "Cannot store persistent data!" ),
@@ -1621,18 +1621,18 @@ uno::Any Content::open(
             if ( !xIn.is() )
             {
                 // No interaction if we are not persistent!
-                ucbhelper::cancelCommandExecution(
-                    star::ucb::IOErrorCode_CANT_READ,
-                    uno::Sequence< uno::Any >(
-                        &uno::makeAny(
+                uno::Any aProps
+                    = uno::makeAny(
                              beans::PropertyValue(
                                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                                    "Uri")),
                                  -1,
                                  uno::makeAny(m_xIdentifier->
                                                   getContentIdentifier()),
-                                 beans::PropertyState_DIRECT_VALUE)),
-                        1),
+                                 beans::PropertyState_DIRECT_VALUE));
+                ucbhelper::cancelCommandExecution(
+                    star::ucb::IOErrorCode_CANT_READ,
+                    uno::Sequence< uno::Any >(&aProps, 1),
                     m_eState == PERSISTENT
                         ? xEnv
                         : uno::Reference< star::ucb::XCommandEnvironment >(),
@@ -1681,18 +1681,18 @@ uno::Any Content::open(
                 if ( !xIn.is() )
                 {
                     // No interaction if we are not persistent!
-                    ucbhelper::cancelCommandExecution(
-                        star::ucb::IOErrorCode_CANT_READ,
-                        uno::Sequence< uno::Any >(
-                            &uno::makeAny(
+                    uno::Any aProps
+                        = uno::makeAny(
                                  beans::PropertyValue(
                                      rtl::OUString(
                                          RTL_CONSTASCII_USTRINGPARAM("Uri")),
                                      -1,
                                      uno::makeAny(m_xIdentifier->
                                                       getContentIdentifier()),
-                                     beans::PropertyState_DIRECT_VALUE)),
-                            1),
+                                     beans::PropertyState_DIRECT_VALUE));
+                    ucbhelper::cancelCommandExecution(
+                        star::ucb::IOErrorCode_CANT_READ,
+                        uno::Sequence< uno::Any >(&aProps, 1),
                         m_eState == PERSISTENT
                             ? xEnv
                             : uno::Reference<
@@ -1853,17 +1853,17 @@ void Content::insert(
 
     if ( !storeData( xStream ) )
     {
-        ucbhelper::cancelCommandExecution(
-            star::ucb::IOErrorCode_CANT_WRITE,
-            uno::Sequence< uno::Any >(
-                &uno::makeAny(beans::PropertyValue(
+        uno::Any aProps
+            = uno::makeAny(beans::PropertyValue(
                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                                     "Uri")),
                                   -1,
                                   uno::makeAny(m_xIdentifier->
                                                    getContentIdentifier()),
-                                  beans::PropertyState_DIRECT_VALUE)),
-                1),
+                                  beans::PropertyState_DIRECT_VALUE));
+        ucbhelper::cancelCommandExecution(
+            star::ucb::IOErrorCode_CANT_WRITE,
+            uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
             rtl::OUString::createFromAscii( "Cannot store persistent data!" ),
             this );
@@ -1974,16 +1974,16 @@ void Content::transfer(
         if ( aId.compareTo(
                 rInfo.SourceURL, rInfo.SourceURL.getLength() ) == 0 )
         {
-            ucbhelper::cancelCommandExecution(
-                star::ucb::IOErrorCode_RECURSIVE,
-                uno::Sequence< uno::Any >(
-                    &uno::makeAny(beans::PropertyValue(
+            uno::Any aProps
+                = uno::makeAny(beans::PropertyValue(
                                       rtl::OUString(
                                           RTL_CONSTASCII_USTRINGPARAM("Uri")),
                                       -1,
                                       uno::makeAny(rInfo.SourceURL),
-                                      beans::PropertyState_DIRECT_VALUE)),
-                    1),
+                                      beans::PropertyState_DIRECT_VALUE));
+            ucbhelper::cancelCommandExecution(
+                star::ucb::IOErrorCode_RECURSIVE,
+                uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
                 rtl::OUString::createFromAscii(
                     "Target is equal to or is a child of source!" ),
@@ -2015,16 +2015,16 @@ void Content::transfer(
 
     if ( !xSource.is() )
     {
-        ucbhelper::cancelCommandExecution(
-            star::ucb::IOErrorCode_CANT_READ,
-            uno::Sequence< uno::Any >(
-                &uno::makeAny(beans::PropertyValue(
+        uno::Any aProps
+            = uno::makeAny(beans::PropertyValue(
                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                                     "Uri")),
                                   -1,
                                   uno::makeAny(xId->getContentIdentifier()),
-                                  beans::PropertyState_DIRECT_VALUE)),
-                1),
+                                  beans::PropertyState_DIRECT_VALUE));
+        ucbhelper::cancelCommandExecution(
+            star::ucb::IOErrorCode_CANT_READ,
+            uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
             rtl::OUString::createFromAscii(
                 "Cannot instanciate source object!" ),
@@ -2049,16 +2049,16 @@ void Content::transfer(
         = static_cast< Content * >( createNewContent( aInfo ).get() );
     if ( !xTarget.is() )
     {
-        ucbhelper::cancelCommandExecution(
-            star::ucb::IOErrorCode_CANT_CREATE,
-            uno::Sequence< uno::Any >(
-                &uno::makeAny(beans::PropertyValue(
+        uno::Any aProps
+            = uno::makeAny(beans::PropertyValue(
                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                                     "Folder")),
                                   -1,
                                   uno::makeAny(aId),
-                                  beans::PropertyState_DIRECT_VALUE)),
-                1),
+                                  beans::PropertyState_DIRECT_VALUE));
+        ucbhelper::cancelCommandExecution(
+            star::ucb::IOErrorCode_CANT_CREATE,
+            uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
             rtl::OUString::createFromAscii(
                 "XContentCreator::createNewContent failed!" ),
@@ -2210,10 +2210,8 @@ void Content::transfer(
         // Remove all persistent data of source and its children.
         if ( !xSource->removeData() )
         {
-            ucbhelper::cancelCommandExecution(
-                star::ucb::IOErrorCode_CANT_WRITE,
-                uno::Sequence< uno::Any >(
-                    &uno::makeAny(
+            uno::Any aProps
+                = uno::makeAny(
                          beans::PropertyValue(
                              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                                "Uri")),
@@ -2221,8 +2219,10 @@ void Content::transfer(
                              uno::makeAny(
                                  xSource->m_xIdentifier->
                                               getContentIdentifier()),
-                             beans::PropertyState_DIRECT_VALUE)),
-                    1),
+                             beans::PropertyState_DIRECT_VALUE));
+            ucbhelper::cancelCommandExecution(
+                star::ucb::IOErrorCode_CANT_WRITE,
+                uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
                 rtl::OUString::createFromAscii(
                     "Cannot remove persistent data of source object!" ),
diff --git a/ucb/source/ucp/webdav/NeonInputStream.cxx b/ucb/source/ucp/webdav/NeonInputStream.cxx
index 3ca9b3333df6..83a59efc9602 100644
--- a/ucb/source/ucp/webdav/NeonInputStream.cxx
+++ b/ucb/source/ucp/webdav/NeonInputStream.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: NeonInputStream.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: kso $ $Date: 2001-03-08 12:52:12 $
+ *  last change: $Author: kso $ $Date: 2001-09-12 10:03:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -181,7 +181,7 @@ void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip )
 // -------------------------------------------------------------------
 sal_Int32 SAL_CALL NeonInputStream::available(  )
         throw( ::com::sun::star::io::NotConnectedException,
-               ::com::sun::star::io::BufferSizeExceededException,
+               ::com::sun::star::io::IOException,
                ::com::sun::star::uno::RuntimeException )
 {
     return mLen - mPos;
diff --git a/ucb/source/ucp/webdav/NeonInputStream.hxx b/ucb/source/ucp/webdav/NeonInputStream.hxx
index 4a88fa80fc2b..2fcbce8f3e4c 100644
--- a/ucb/source/ucp/webdav/NeonInputStream.hxx
+++ b/ucb/source/ucp/webdav/NeonInputStream.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: NeonInputStream.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kso $ $Date: 2001-06-25 08:51:54 $
+ *  last change: $Author: kso $ $Date: 2001-09-12 10:03:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -142,7 +142,7 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream,
 
     virtual sal_Int32 SAL_CALL available( void )
                 throw( ::com::sun::star::io::NotConnectedException,
-                          ::com::sun::star::io::BufferSizeExceededException,
+                          ::com::sun::star::io::IOException,
                           ::com::sun::star::uno::RuntimeException );
 
     virtual void SAL_CALL closeInput( void )