applied_patches/0029-speed-configmgr-misc.diff

   1 diff -u -r ../configmgr.pristine/source/backend/binaryreader.cxx ../configmgr/source/backend/binaryreader.cxx
   2 --- configmgr/source/backend/binaryreader.cxx
   3 +++ configmgr/source/backend/binaryreader.cxx
   4 @@ -532,10 +532,10 @@
   5
   6                 // --------------------------------------------------------------------------
   7
   8 -        inline uno::Reference<io::XDataInputStream> BinaryReader::getDataInputStream()
   9 +        inline BinaryReader_Impl * BinaryReader::getDataInputStream()
  10                 {
  11              OSL_ENSURE(m_xDataInputStream.is(),"Binary Cache: Reader was not opened - no input stream");
  12 -            return m_xDataInputStream;
  13 +            return static_cast<BinaryReader_Impl *>(m_xDataInputStream.get());
  14                 }
  15
  16                 // --------------------------------------------------------------------------
  17
  18
  19 diff -u -r ../configmgr.pristine/source/backend/binaryreader.hxx ../configmgr/source/backend/binaryreader.hxx
  20 --- configmgr/source/backend/binaryreader.hxx
  21 +++ configmgr/source/backend/binaryreader.hxx
  22 @@ -48,6 +48,7 @@
  23                 namespace uno  = css::uno;
  24                 namespace lang = css::lang;
  25                 // -----------------------------------------------------------------------------
  26 +        class BinaryReader_Impl;
  27                 class BinaryReader
  28                 {
  29                         rtl::OUString m_sFileURL;
  30 @@ -75,7 +76,7 @@
  31                         void read(uno::Sequence< rtl::OUString > &_aValue)  SAL_THROW( (io::IOException, uno::RuntimeException) );
  32
  33                 private:
  34 -                       inline uno::Reference<io::XDataInputStream> getDataInputStream();
  35 +                       inline BinaryReader_Impl * getDataInputStream();
  36                 };
  37                 // --------------------------------------------------------------------------
  38
  39
  40
  41 diff -u -r ../configmgr.pristine/source/tree/cmtree.cxx ../configmgr/source/tree/cmtree.cxx
  42 --- configmgr/source/tree/cmtree.cxx
  43 +++ configmgr/source/tree/cmtree.cxx
  44 @@ -65,13 +65,11 @@
  45
  46  // ------------------------ ChildListSet implementations ------------------------
  47      ChildListSet::ChildListSet(ChildListSet const& aSet, treeop::DeepChildCopy)
  48 -        : m_aChildList(0)
  49 +        : m_aChildList(aSet.m_aChildList.size())
  50         {
  51 -        for (size_t i = 0; i < aSet.m_aChildList.size(); i++)
  52 -        {
  53 -                       m_aChildList.insert(m_aChildList.end(),
  54 -                                aSet.m_aChildList[i]->clone().release());
  55 -        }
  56 +        int len = aSet.m_aChildList.size();
  57 +        for (int i = 0; i < len; i++)
  58 +            m_aChildList[i] = aSet.m_aChildList[i]->clone().release();
  59         }
  60         ChildListSet::~ChildListSet()
  61         {