INTEGRATION: CWS sb88 (1.6.10); FILE MERGED

2008/06/03 15:29:49 sb 1.6.10.1: #i89553 applied patch by cmc

configmgr/source/inc/oslstream.hxx

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: oslstream.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -84,39 +84,6 @@ namespace configmgr
         virtual void        SAL_CALL    closeInput() throw(stario::NotConnectedException, staruno::RuntimeException);
     };
 
-// -----------------------------------------------------------------------------
-    /// BufferedFileInputStream - buffered implementation of XInputStream on an osl::File
-    class BufferedFileInputStream: public InputStreamWrapper_Base
-    {
-        BufferedInputFile   m_aFile;
-
-    public:
-        BufferedFileInputStream(rtl::OUString const & aFileURL);
-        virtual ~BufferedFileInputStream();
-
-    // stario::XInputStream
-        virtual sal_Int32   SAL_CALL
-            readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-                throw(stario::NotConnectedException, stario::BufferSizeExceededException,
-                        stario::IOException,  staruno::RuntimeException);
-
-        virtual sal_Int32   SAL_CALL
-            readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-                throw(stario::NotConnectedException, stario::BufferSizeExceededException,
-                        stario::IOException,staruno::RuntimeException);
-
-        virtual void        SAL_CALL
-            skipBytes(sal_Int32 nBytesToSkip)
-                throw(stario::NotConnectedException, stario::BufferSizeExceededException,
-                        stario::IOException,staruno::RuntimeException);
-
-        virtual sal_Int32   SAL_CALL    available()
-            throw(stario::NotConnectedException, stario::IOException, staruno::RuntimeException);
-
-        virtual void        SAL_CALL    closeInput()
-            throw(stario::NotConnectedException, stario::IOException, staruno::RuntimeException);
-    };
-
 // -----------------------------------------------------------------------------
     typedef ::cppu::WeakImplHelper1<stario::XOutputStream> OutputStreamWrapper_Base;
 

configmgr/source/inc/request.hxx

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: request.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -104,12 +104,8 @@ namespace configmgr
             Name getTemplateName()      const { return m_aTemplateName; }
             Name getComponentName()     const { return m_aComponentName; }
 
-            static RequestOptions getOptions()
-            { return RequestOptions::forAllLocales(); }
         };
 
-        inline ComponentRequest getComponentRequest(TemplateRequest const & _aTR)
-        { return ComponentRequest(_aTR.getComponentName(), _aTR.getOptions()); }
 // ---------------------------------------------------------------------------
 
         class UpdateRequest

configmgr/source/inc/treechangefactory.hxx

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: treechangefactory.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -54,39 +54,6 @@ namespace configmgr
     public:
         typedef rtl::OUString Name;
     public:
-    //= ValueChanges ============================================================
-        std::auto_ptr<ValueChange> createValueChange(
-                                        Name const& _aName,
-                                        node::Attributes _aAttrs,
-                                        ValueChange::Mode _eMode,
-                                        uno::Any const& _aNewValue,
-                                        uno::Any const& _aOldValue = uno::Any()
-                                        );
-
-        //-----------------------------------------------
-        std::auto_ptr<ValueChange> createValueChange(
-                                        ValueNode const& _aNewValue,
-                                        bool _bWasDefault
-                                        );
-
-        //-----------------------------------------------
-        std::auto_ptr<ValueChange> createValueChange(
-                                        uno::Any const& _aNewValue,
-                                        ValueNode const& _aOldValue
-                                        );
-
-        //-----------------------------------------------
-        std::auto_ptr<ValueChange> createValueChange(
-                                        ValueChange::SetToDefault,
-                                        ValueNode const& _aOldValue
-                                        );
-
-    //= SubtreeChanges ============================================================
-        std::auto_ptr<SubtreeChange> createGroupNodeChange(
-                                        Name const& _aName,
-                                        node::Attributes _aAttrs,
-                                        bool _bToDefault = false);
-
         //-----------------------------------------------
         std::auto_ptr<SubtreeChange> createSetNodeChange(
                                         Name const& _aName,