sb118: merged in DEV300_m71

22 files changed, 120 insertions, 482 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 765dc115fa11..219cf03dfe88 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -64,14 +64,6 @@ protected:
 
     virtual ~AccessibleGridControl();
 
-    /** sets the XAccessible which created the context
-
-        <p>To be called only once, and only if in the ctor NULL was passed.</p>
-    */
-    void    setCreator(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator
-    );
-
     /** Cleans up members. */
     using AccessibleGridControlBase::disposing;
     virtual void SAL_CALL disposing();
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
index f164e7576247..1c1a3aee2804 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
@@ -197,12 +197,6 @@ protected:
     inline sal_Bool isRowBar() const;
     /** @return  <TRUE/>, if the objects is a header bar for columns. */
     inline sal_Bool isColumnBar() const;
-
-    /** @attention  This method requires locked mutex's and a living object.
-        @throws <type>IndexOutOfBoundsException</type>
-        If the specified row/column index (depending on type) is invalid. */
-    void ensureIsValidHeaderIndex( sal_Int32 nIndex )
-        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
 };
 
 // inlines --------------------------------------------------------------------
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
index c3465c6c32fb..c71bfd5eb65f 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
@@ -211,13 +211,6 @@ protected:
 
 
     //// internal helper methods ------------------------------------------------
-        /** Returns the specified row or column. Uses one of the parameters,
-        depending on object type.
-        @attention  This method requires locked mutex's and a living object.
-        @return  The XAccessible interface of the specified column/row. */
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible >
-    implGetChild( sal_Int32 nRow, sal_uInt16 nColumnPos );
     ///** @attention  This method requires a locked mutex.
     //    @return  The XAccessibleTable interface of the specified header bar. */
     ::com::sun::star::uno::Reference<
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
index aa9eb061f147..79c294952acf 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -198,14 +198,6 @@ protected:
         @return  The child index of the specified cell address. */
     sal_Int32 implGetChildIndex( sal_Int32 nRow, sal_Int32 nColumn ) const;
 
-    /** @attention  This method requires locked mutex's and a living object.
-        @return  <TRUE/>, if the specified row is selected. */
-    sal_Bool implIsRowSelected( sal_Int32 nRow ) const;
-
-    /** @attention  This method requires locked mutex's and a living object.
-        @return  The count of selected rows. */
-    sal_Int32 implGetSelectedRowCount() const;
-
     /** Fills a sequence with sorted indexes of completely selected rows.
         @attention  This method requires locked mutex's and a living object.
         @param rSeq  Out-parameter that takes the sorted row index list. */
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index fd24a3f27aa1..4671f3284110 100755
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -90,15 +90,6 @@ AccessibleGridControl::AccessibleGridControl(
     m_pImpl.reset( new AccessibleGridControl_Impl() );
     m_pImpl->m_aCreator = _rxCreator;
 }
-// -----------------------------------------------------------------------------
-void AccessibleGridControl::setCreator( const Reference< XAccessible >& _rxCreator )
-{
-#if OSL_DEBUG_LEVEL > 0
-    Reference< XAccessible > xCreator = (Reference< XAccessible >)m_pImpl->m_aCreator;
-    DBG_ASSERT( !xCreator.is(), "accessibility/extended/AccessibleGridControl::setCreator: creator already set!" );
-#endif
-    m_pImpl->m_aCreator = _rxCreator;
-}
 
 // -----------------------------------------------------------------------------
 AccessibleGridControl::~AccessibleGridControl()
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index d8cc7a11d202..a5a2be4049dc 100755
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -304,15 +304,6 @@ Reference< XAccessible > AccessibleGridControlHeader::implGetChild(
     return xChild;
 }
 
-void AccessibleGridControlHeader::ensureIsValidHeaderIndex( sal_Int32 nIndex )
-    throw ( lang::IndexOutOfBoundsException )
-{
-    if( isRowBar() )
-        ensureIsValidRow( nIndex );
-    else
-        ensureIsValidColumn( nIndex );
-}
-
 // ============================================================================
 
 } // namespace accessibility
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index ba6c229e2dc5..3b51c986b8b1 100755
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -297,7 +297,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount()
     TCSolarGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getOslMutex() );
     ensureIsAlive();
-   // return isRowBar() ? implGetSelectedRowCount() : implGetSelectedColumnCount();
     return 0;
 }
 //To Do - not implemented yet
@@ -309,9 +308,6 @@ AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChild
     ::osl::MutexGuard aGuard( getOslMutex() );
     ensureIsAlive();
     (void)nSelectedChildIndex;
-    // method may throw lang::IndexOutOfBoundsException
-    //sal_Int32 nIndex = implGetChildIndexFromSelectedIndex( nSelectedChildIndex );
-    //return implGetChild( nIndex, implToVCLColumnPos( nIndex ) );
     return NULL;
 }
 //To Do - not implemented yet
@@ -371,14 +367,6 @@ Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen()
     return m_aTable.calcTableRect();
 }
 // internal helper methods ----------------------------------------------------
-
-Reference< XAccessible > AccessibleGridControlTable::implGetChild(
-        sal_Int32 nRow, sal_uInt16 nColumnPos )
-{
-    (void)nRow;
-    (void)nColumnPos;
-    return NULL;
-}
 //To Do - not implemented yet
 //sal_Int32 AccessibleGridControlTable::implGetChildIndexFromSelectedIndex(
 //        sal_Int32 nSelectedChildIndex )
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index bc266f10f323..76584bf4b965 100755
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -263,16 +263,6 @@ sal_Int32 AccessibleGridControlTableBase::implGetChildIndex(
     return nRow * m_aTable.GetColumnCount() + nColumn;
 }
 
-sal_Bool AccessibleGridControlTableBase::implIsRowSelected( sal_Int32 nRow ) const
-{
-    return m_aTable.IsRowSelected( nRow );
-}
-
-sal_Int32 AccessibleGridControlTableBase::implGetSelectedRowCount() const
-{
-    return m_aTable.GetSelectedRowCount();
-}
-
 void AccessibleGridControlTableBase::implGetSelectedRows( Sequence< sal_Int32 >& rSeq )
 {
     rSeq = comphelper::containerToSequence(m_aTable.GetSelectedRows());
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 60e4f416dc3c..e1e8eae2ac78 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -74,6 +74,7 @@
 #include <vcl/combobox.hxx>
 #include <accessibility/extended/AccessibleGridControl.hxx>
 #include <svtools/accessibletable.hxx>
+#include "vcl/popupmenuwindow.hxx"
 
 #include <floatingwindowaccessible.hxx>
 
@@ -385,7 +386,17 @@ inline bool hasFloatingChild(Window *pWindow)
             }
             else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
             {
-                xContext = new FloatingWindowAccessible( _pXWindow );
+                PopupMenuFloatingWindow* pChild = dynamic_cast<PopupMenuFloatingWindow*>(
+                    pWindow->GetAccessibleChildWindow(0));
+                if ( pChild && pChild->IsPopupMenu() )
+                {
+                    // Get the accessible context from the child window.
+                    Reference<XAccessible> xAccessible = pChild->CreateAccessible();
+                    if (xAccessible.is())
+                        xContext = xAccessible->getAccessibleContext();
+                }
+                else
+                    xContext = new FloatingWindowAccessible( _pXWindow );
             }
             else if ( nType == WINDOW_HELPTEXTWINDOW )
             {
diff --git a/extensions/source/update/feed/makefile.mk b/extensions/source/update/feed/makefile.mk
index 933194f032c9..c3a667a6a9b3 100644
--- a/extensions/source/update/feed/makefile.mk
+++ b/extensions/source/update/feed/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -43,27 +43,20 @@ ENABLE_EXCEPTIONS=TRUE
 # no "lib" prefix
 DLLPRE =
 
-.IF "$(SYSTEM_ZLIB)" == "YES"
-CFLAGS+=-DSYSTEM_ZLIB
-.ENDIF
-
 # --- Files ---
 
-
 SLOFILES=\
     $(SLO)$/updatefeed.obj \
-        
+
 SHL1NOCHECK=TRUE
-SHL1TARGET=$(TARGET).uno   
+SHL1TARGET=$(TARGET).uno
 SHL1OBJS=$(SLOFILES)
 
 SHL1IMPLIB=i$(SHL1TARGET)
 SHL1STDLIBS=    \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
-    $(SALLIB) \
-    $(ZLIB3RDLIB)
-        
+
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index bed6bed85bc3..8d33e63b5770 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_extensions.hxx"
 
 #include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -44,26 +44,16 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/task/XPasswordContainer.hpp>
-#include "com/sun/star/task/NoMasterException.hpp"
-#include "com/sun/star/ucb/AuthenticationRequest.hpp"
-#ifndef _COM_SUN_STAR_UCB_XCOMMMANDENVIRONMENT_HPP_
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_XWEBDAVCOMMMANDENVIRONMENT_HPP_
 #include <com/sun/star/ucb/XWebDAVCommandEnvironment.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_XCOMMMANDPROCESSOR2_HPP_
 #include <com/sun/star/ucb/XCommandProcessor2.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_XCONTENTIDNETIFIERFACTORY_HPP_
 #include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
-#endif
 #include <com/sun/star/ucb/XContentProvider.hpp>
 #include "com/sun/star/ucb/XInteractionSupplyAuthentication.hpp"
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/task/PasswordContainerInteractionHandler.hpp>
 #include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
 #include <com/sun/star/xml/xpath/XXPathAPI.hpp>
 
@@ -74,14 +64,6 @@
 #include <osl/process.h>
 #include <osl/conditn.hxx>
 
-#ifndef _ZLIB_H
-#ifdef SYSTEM_ZLIB
-#include "zlib.h"
-#else
-#include "zlib/zlib.h"
-#endif
-#endif
-
 namespace beans = com::sun::star::beans ;
 namespace container = com::sun::star::container ;
 namespace deployment = com::sun::star::deployment ;
@@ -161,154 +143,11 @@ public:
 
 //------------------------------------------------------------------------------
 
-class InflateInputStream : public ::cppu::WeakImplHelper1< io::XInputStream >
-{
-    uno::Reference< io::XInputStream > m_xStream;
-
-    uno::Sequence < sal_Int8 > m_aBuffer;
-    sal_Int32 m_nOffset;
-    bool m_bRead;
-
-    rtl::OUString m_aContentEncoding;
-
-    void readIntoMemory();
-
-public:
-    InflateInputStream(const uno::Reference< io::XInputStream >& rxStream,const rtl::OUString& rContentEncoding) :
-        m_xStream(rxStream), m_nOffset(0), m_bRead(false), m_aContentEncoding(rContentEncoding) {};
-
-    virtual sal_Int32 SAL_CALL readBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL readSomeBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
-        { readIntoMemory(); return readBytes(aData, nMaxBytesToRead ); };
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
-        {
-            readIntoMemory();
-            if( m_nOffset + nBytesToSkip < m_aBuffer.getLength() )
-                m_nOffset += nBytesToSkip;
-            else
-                m_nOffset = m_aBuffer.getLength();
-        };
-    virtual sal_Int32 SAL_CALL available()
-        throw (io::NotConnectedException, io::IOException, uno::RuntimeException)
-        {   readIntoMemory(); return m_aBuffer.getLength() - m_nOffset; };
-    virtual void SAL_CALL closeInput( )
-        throw (io::NotConnectedException, io::IOException, uno::RuntimeException)
-        { m_xStream->closeInput(); };
-};
-
-
-sal_Int32 SAL_CALL
-InflateInputStream::readBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
-{
-    readIntoMemory();
-    sal_Int32 nAvailable = available();
-    sal_Int32 nBytesToCopy =  nAvailable < nBytesToRead ? nAvailable : nBytesToRead;
-    if( nBytesToCopy > 0 )
-    {
-        aData.realloc(nBytesToCopy);
-        rtl_copyMemory(aData.getArray(), m_aBuffer.getConstArray() + m_nOffset, nBytesToCopy);
-        m_nOffset += nBytesToCopy;
-    }
-
-    return nBytesToCopy;
-};
-
-void InflateInputStream::readIntoMemory()
-{
-    if( !m_bRead && m_xStream.is() )
-    {
-        const sal_Int32 nBytesRequested = 4096;
-
-        uno::Sequence < sal_Int8 > aTempBuffer(nBytesRequested);
-        uno::Sequence < sal_Int8 > aCompressedBuffer;
-        sal_Int32 nBytesRead;
-
-        m_bRead = true;
-
-        do
-        {
-            nBytesRead = m_xStream->readBytes(aTempBuffer, nBytesRequested);
-
-            if( nBytesRead > 0 )
-            {
-                sal_Int32 nOffset = aCompressedBuffer.getLength();
-                aCompressedBuffer.realloc( nOffset + nBytesRead );
-
-                rtl_copyMemory(aCompressedBuffer.getArray() + nOffset, aTempBuffer.getConstArray(), nBytesRead);
-            }
-        }
-        while( nBytesRead == nBytesRequested );
-
-        z_stream *pStream = new z_stream;
-        /* memset to 0 to set zalloc/opaque etc */
-        rtl_zeroMemory (pStream, sizeof(*pStream));
-
-        int windowSize = 15;
-        int headerOffset = 0;
-
-        if( m_aContentEncoding.equalsAscii("gzip") )
-        {
-            sal_uInt8 magic[2];
-            magic[0] = *((sal_uInt8 *) aCompressedBuffer.getConstArray());
-            magic[1] = *((sal_uInt8 *) aCompressedBuffer.getConstArray() + 1);
-
-            if( (magic[0] == 0x1f) && (magic[1] == 0x8b) )
-            {
-                windowSize = -14;
-                headerOffset = 10;
-            }
-        }
-
-        pStream->next_in = (unsigned char *) aCompressedBuffer.getConstArray();
-        pStream->avail_in = aCompressedBuffer.getLength();
-
-        pStream->next_in += headerOffset;
-        pStream->avail_in -= headerOffset;
-
-        if( Z_OK == inflateInit2(pStream, windowSize) )
-        {
-            int result;
-
-            do
-            {
-                sal_Int32 nOffset = m_aBuffer.getLength();
-                m_aBuffer.realloc(nOffset + 4096);
-
-                pStream->next_out  = reinterpret_cast < unsigned char* > ( m_aBuffer.getArray() + nOffset );
-                pStream->avail_out = 4096;
-
-                result = ::inflate(pStream, Z_FINISH);
-
-                if( result ==  Z_STREAM_END )
-                    break;
-
-            } while( result ==  Z_BUF_ERROR );
-
-            inflateEnd(pStream);
-            m_aBuffer.realloc(pStream->total_out);
-
-        }
-
-        if (pStream != NULL)
-        {
-            delete pStream;
-            pStream = NULL;
-        }
-    }
-}
-
-//------------------------------------------------------------------------------
-
 class UpdateInformationProvider :
-    public ::cppu::WeakImplHelper5< deployment::XUpdateInformationProvider,
+    public ::cppu::WeakImplHelper4< deployment::XUpdateInformationProvider,
                                     ucb::XCommandEnvironment,
                                     ucb::XWebDAVCommandEnvironment,
-                                    lang::XServiceInfo,
-                                    task::XInteractionHandler >
+                                    lang::XServiceInfo >
 {
 public:
     static uno::Reference< uno::XInterface > createInstance(const uno::Reference<uno::XComponentContext>& xContext);
@@ -360,10 +199,6 @@ public:
     virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
         throw (uno::RuntimeException);
 
-    // XInteractionHandler
-    virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& rRequest )
-        throw( uno::RuntimeException );
-
 protected:
 
     virtual ~UpdateInformationProvider();
@@ -375,8 +210,6 @@ private:
     void storeCommandInfo( sal_Int32 nCommandId,
         uno::Reference< ucb::XCommandProcessor > const & rxCommandProcessor);
 
-    bool initPasswordContainer( uno::Reference< task::XPasswordContainer > * pContainer );
-
     UpdateInformationProvider(const uno::Reference<uno::XComponentContext>& xContext,
                               const uno::Reference< ucb::XContentIdentifierFactory >& xContentIdFactory,
                               const uno::Reference< ucb::XContentProvider >& xContentProvider,
@@ -394,6 +227,7 @@ private:
 
     uno::Reference< ucb::XCommandProcessor > m_xCommandProcessor;
     uno::Reference< task::XInteractionHandler > m_xInteractionHandler;
+    uno::Reference< task::XInteractionHandler > m_xPwContainerInteractionHandler;
 
     osl::Mutex m_aMutex;
     osl::Condition m_bCancelled;
@@ -504,7 +338,7 @@ UpdateInformationProvider::UpdateInformationProvider(
     const uno::Reference< xml::xpath::XXPathAPI >& xXPathAPI
 ) : m_xContext(xContext), m_xContentIdFactory(xContentIdFactory),
     m_xContentProvider(xContentProvider), m_xDocumentBuilder(xDocumentBuilder),
-    m_xXPathAPI(xXPathAPI), m_aRequestHeaderList(2)
+    m_xXPathAPI(xXPathAPI), m_aRequestHeaderList(1)
 {
     uno::Reference< lang::XMultiComponentFactory > xServiceManager(xContext->getServiceManager());
     if( !xServiceManager.is() )
@@ -581,14 +415,11 @@ UpdateInformationProvider::UpdateInformationProvider(
 
     m_aRequestHeaderList[0].Name = UNISTRING("Accept-Language");
     m_aRequestHeaderList[0].Value = getConfigurationItem( xConfigurationProvider, UNISTRING("org.openoffice.Setup/L10N"), UNISTRING("ooLocale") );
-    m_aRequestHeaderList[1].Name = UNISTRING("Accept-Encoding");
-    m_aRequestHeaderList[1].Value = uno::makeAny( UNISTRING("gzip,deflate") );
-
     if( aUserAgent.getLength() > 0 )
     {
-        m_aRequestHeaderList.realloc(3);
-        m_aRequestHeaderList[2].Name = UNISTRING("User-Agent");
-        m_aRequestHeaderList[2].Value = uno::makeAny(aUserAgent);
+        m_aRequestHeaderList.realloc(2);
+        m_aRequestHeaderList[1].Name = UNISTRING("User-Agent");
+        m_aRequestHeaderList[1].Value = uno::makeAny(aUserAgent);
     }
 }
 
@@ -663,33 +494,6 @@ UpdateInformationProvider::storeCommandInfo(
 
 //------------------------------------------------------------------------------
 
-bool UpdateInformationProvider::initPasswordContainer( uno::Reference< task::XPasswordContainer > * pContainer )
-{
-    OSL_ENSURE( pContainer, "specification violation" );
-
-    if ( !pContainer->is() )
-    {
-        uno::Reference<uno::XComponentContext> xContext(m_xContext);
-
-        if( !xContext.is() )
-            throw uno::RuntimeException( UNISTRING( "UpdateInformationProvider: empty component context" ), *this );
-
-        uno::Reference< lang::XMultiComponentFactory > xServiceManager(xContext->getServiceManager());
-
-        if( !xServiceManager.is() )
-            throw uno::RuntimeException( UNISTRING( "UpdateInformationProvider: unable to obtain service manager from component context" ), *this );
-
-        *pContainer = uno::Reference< task::XPasswordContainer >(
-            xServiceManager->createInstanceWithContext( UNISTRING( "com.sun.star.task.PasswordContainer" ), xContext ),
-            uno::UNO_QUERY);
-    }
-
-    OSL_ENSURE(pContainer->is(), "unexpected situation");
-    return pContainer->is();
-}
-
-//------------------------------------------------------------------------------
-
 uno::Reference< io::XInputStream >
 UpdateInformationProvider::load(const rtl::OUString& rURL)
 {
@@ -729,43 +533,13 @@ UpdateInformationProvider::load(const rtl::OUString& rURL)
 
         throw;
     }
-
-    uno::Sequence< beans::Property > aProps( 1 );
-    aProps[0].Name = UNISTRING( "Content-Encoding" );
-
-    aCommand.Name = UNISTRING("getPropertyValues");
-    aCommand.Argument = uno::makeAny( aProps );
-
-    sal_Bool bCompressed = sal_False;
-    rtl::OUString aContentEncoding;
-
-    try
-    {
-        uno::Any aResult = xCommandProcessor->execute(aCommand, 0,
-            static_cast < XCommandEnvironment *> (this));
-        uno::Reference< sdbc::XRow > xPropList( aResult, uno::UNO_QUERY );
-        if ( xPropList.is() ) {
-            aContentEncoding = xPropList->getString(1);
-            if( aContentEncoding.equalsAscii("gzip") ||  aContentEncoding.equalsAscii("deflate"))
-                bCompressed = sal_True;
-        }
-    }
-    catch( const uno::Exception &e )
-    {
-        OSL_TRACE( "Caught exception: %s\n",
-            rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() );
-    }
-
     storeCommandInfo(0, uno::Reference< ucb::XCommandProcessor > ());
 
     uno::Reference< ucb::XCommandProcessor2 > xCommandProcessor2(xCommandProcessor, uno::UNO_QUERY);
     if( xCommandProcessor2.is() )
         xCommandProcessor2->releaseCommandIdentifier(nCommandId);
 
-    if ( bCompressed )
-        return INPUT_STREAM( new InflateInputStream( aSink->getInputStream(), aContentEncoding ) );
-    else
-        return INPUT_STREAM(aSink->getInputStream());
+    return INPUT_STREAM(aSink->getInputStream());
 }
 
 //------------------------------------------------------------------------------
@@ -976,7 +750,26 @@ UpdateInformationProvider::getInteractionHandler()
     if ( m_xInteractionHandler.is() )
         return m_xInteractionHandler;
     else
-        return this;
+    {
+        try
+        {
+            // Supply an interaction handler that uses the password container
+            // service to obtain credentials without displaying a password gui.
+
+            if ( !m_xPwContainerInteractionHandler.is() )
+                m_xPwContainerInteractionHandler
+                    = task::PasswordContainerInteractionHandler::create(
+                        m_xContext );
+        }
+        catch ( uno::RuntimeException const & )
+        {
+            throw;
+        }
+        catch ( uno::Exception const & )
+        {
+        }
+        return m_xPwContainerInteractionHandler;
+    }
 }
 //------------------------------------------------------------------------------
 
@@ -1026,101 +819,6 @@ UpdateInformationProvider::supportsService( rtl::OUString const & serviceName )
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
-
-void SAL_CALL UpdateInformationProvider::handle( uno::Reference< task::XInteractionRequest > const & rRequest)
-    throw (uno::RuntimeException)
-{
-    uno::Any aAnyRequest( rRequest->getRequest() );
-    ucb::AuthenticationRequest aAuthenticationRequest;
-
-    if ( aAnyRequest >>= aAuthenticationRequest )
-    {
-        uno::Sequence< uno::Reference< task::XInteractionContinuation > > xContinuations = rRequest->getContinuations();
-        uno::Reference< task::XInteractionHandler > xIH;
-        uno::Reference< ucb::XInteractionSupplyAuthentication > xSupplyAuthentication;
-        uno::Reference< task::XPasswordContainer > xContainer;
-
-        for ( sal_Int32 i = 0; i < xContinuations.getLength(); ++i )
-        {
-            xSupplyAuthentication = uno::Reference< ucb::XInteractionSupplyAuthentication >(
-                                                            xContinuations[i], uno::UNO_QUERY );
-            if ( xSupplyAuthentication.is() )
-                break;
-        }
-
-        // xContainer works with userName passwdSequences pairs:
-        if ( xSupplyAuthentication.is() &&
-             aAuthenticationRequest.HasUserName &&
-             aAuthenticationRequest.HasPassword &&
-             initPasswordContainer( &xContainer ) )
-        {
-            xIH = getInteractionHandler();
-            try
-            {
-                if ( aAuthenticationRequest.UserName.getLength() == 0 )
-                {
-                    task::UrlRecord aRec( xContainer->find( aAuthenticationRequest.ServerName, xIH ) );
-                    if ( aRec.UserList.getLength() != 0 )
-                    {
-                        if ( xSupplyAuthentication->canSetUserName() )
-                            xSupplyAuthentication->setUserName( aRec.UserList[0].UserName.getStr() );
-                        if ( xSupplyAuthentication->canSetPassword() )
-                        {
-                            OSL_ENSURE( aRec.UserList[0].Passwords.getLength() != 0, "empty password list" );
-                            xSupplyAuthentication->setPassword( aRec.UserList[0].Passwords[0].getStr() );
-                        }
-                        if ( aRec.UserList[0].Passwords.getLength() > 1 )
-                        {
-                            if ( aAuthenticationRequest.HasRealm )
-                            {
-                                if ( xSupplyAuthentication->canSetRealm() )
-                                    xSupplyAuthentication->setRealm( aRec.UserList[0].Passwords[1].getStr() );
-                            }
-                            else if ( xSupplyAuthentication->canSetAccount() )
-                                xSupplyAuthentication->setAccount( aRec.UserList[0].Passwords[1].getStr() );
-                        }
-                        xSupplyAuthentication->select();
-                        return;
-                    }
-                }
-                else
-                {
-                    task::UrlRecord aRec(xContainer->findForName( aAuthenticationRequest.ServerName,
-                                                                  aAuthenticationRequest.UserName,
-                                                                  xIH));
-                    if ( aRec.UserList.getLength() != 0 )
-                    {
-                        OSL_ENSURE( aRec.UserList[0].Passwords.getLength() != 0, "empty password list" );
-                        if ( !aAuthenticationRequest.HasPassword ||
-                             ( aAuthenticationRequest.Password != aRec.UserList[0].Passwords[0] ) )
-                        {
-                            if ( xSupplyAuthentication->canSetUserName() )
-                                xSupplyAuthentication->setUserName( aRec.UserList[0].UserName.getStr() );
-                            if ( xSupplyAuthentication->canSetPassword() )
-                                xSupplyAuthentication->setPassword(aRec.UserList[0].Passwords[0].getStr());
-                            if ( aRec.UserList[0].Passwords.getLength() > 1 )
-                            {
-                                if ( aAuthenticationRequest.HasRealm )
-                                {
-                                    if ( xSupplyAuthentication->canSetRealm() )
-                                        xSupplyAuthentication->setRealm(aRec.UserList[0].Passwords[1].getStr());
-                                }
-                                else if ( xSupplyAuthentication->canSetAccount() )
-                                    xSupplyAuthentication->setAccount(aRec.UserList[0].Passwords[1].getStr());
-                            }
-                            xSupplyAuthentication->select();
-                            return;
-                        }
-                    }
-                }
-            }
-            catch (task::NoMasterException const &)
-            {} // user did not enter master password
-        }
-    }
-}
-
 } // anonymous namespace
 
 //------------------------------------------------------------------------------
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 3add838333b9..77a108f300f9 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -583,7 +583,7 @@ void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyCha
 
                     // as m_aSaveValue (which is used by commitControlValueToDbColumn) is format dependent we have
                     // to recalc it, which is done by translateDbColumnToControlValue
-                    if ( m_xColumn.is() && m_xAggregateFastSet.is() )
+                    if ( m_xColumn.is() && m_xAggregateFastSet.is() && !m_xCursor->isBeforeFirst() && !m_xCursor->isAfterLast())
                     {
                         setControlValue( translateDbColumnToControlValue(), eOther );
                     }
diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst
index 65e8459bea3f..138e5858f70e 100644
--- a/lingucomponent/prj/build.lst
+++ b/lingucomponent/prj/build.lst
@@ -1,4 +1,4 @@
-lc  lingucomponent  :      linguistic libtextcat svl hyphen HUNSPELL:hunspell NULL
+lc  lingucomponent  :      linguistic libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell NULL
 lc	lingucomponent								usr1	-	all	lc_mkout NULL
 lc  lingucomponent\inc                                      nmake   -   all lc_inc NULL
 lc  lingucomponent\source\lingutil                          nmake   -   all lc_util lc_inc NULL
diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst
index ad7d365c30de..df7b02484039 100644
--- a/setup_native/prj/build.lst
+++ b/setup_native/prj/build.lst
@@ -1,4 +1,4 @@
-pk	setup_native	:	l10n transex3 soltools sal xml2cmp NULL
+pk	setup_native	:	l10n l10ntools soltools sal xml2cmp NULL
 pk  setup_native                                          usr1    - all  sn_mkout NULL
 pk  setup_native\scripts\source                           nmake   -  u   sn_source NULL
 pk  setup_native\scripts                                  nmake   -  u   sn_scripts sn_source.u NULL
diff --git a/setup_native/source/java/javaversion.dat b/setup_native/source/java/javaversion.dat
index 7ff47b499e45..6a18f1641eab 100755
--- a/setup_native/source/java/javaversion.dat
+++ b/setup_native/source/java/javaversion.dat
@@ -30,30 +30,30 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 17
-WINDOWSJAVAVERSION=Java 6 Update 17
+JAVAVERSION=Java 6 Update 18
+WINDOWSJAVAVERSION=Java 6 Update 18
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u17-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_17
+WINDOWSJAVAFILENAME=jre-6u18-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_18
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u17-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u18-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_17-fcs
+LINUXJAVANAME=jre-1.6.0_18-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u17-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u18-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_17_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_17_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_17_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_18_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_18_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_18_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_17_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_17_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_17_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_18_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_18_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_18_x86.tar.gz
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt
diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
index 7ff47b499e45..6a18f1641eab 100644
--- a/setup_native/source/java/javaversion2.dat
+++ b/setup_native/source/java/javaversion2.dat
@@ -30,30 +30,30 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 17
-WINDOWSJAVAVERSION=Java 6 Update 17
+JAVAVERSION=Java 6 Update 18
+WINDOWSJAVAVERSION=Java 6 Update 18
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u17-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_17
+WINDOWSJAVAFILENAME=jre-6u18-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_18
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u17-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u18-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_17-fcs
+LINUXJAVANAME=jre-1.6.0_18-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u17-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u18-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_17_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_17_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_17_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_18_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_18_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_18_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_17_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_17_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_17_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_18_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_18_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_18_x86.tar.gz
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt
diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java
index 7079b1109742..0a7f0a42aec8 100644
--- a/wizards/com/sun/star/wizards/query/Finalizer.java
+++ b/wizards/com/sun/star/wizards/query/Finalizer.java
@@ -31,6 +31,7 @@ package com.sun.star.wizards.query;
 
 import com.sun.star.wizards.common.*;
 import com.sun.star.awt.XRadioButton;
+import com.sun.star.awt.XTextComponent;
 import com.sun.star.wizards.db.*;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.XComponent;
@@ -44,7 +45,7 @@ public class Finalizer
     private QueryWizard CurUnoDialog;
     private String resQuery;
     private Object m_aTxtSummary;
-    private Object m_aTxtTitle;
+    private XTextComponent m_aTxtTitle;
     private XRadioButton xRadioDisplayQuery;
     private XRadioButton xRadioModifyQuery;
     private QuerySummary CurDBMetaData;
@@ -75,7 +76,7 @@ public class Finalizer
                 {
                     new Integer(8), reslblQueryTitle, new Integer(95), new Integer(27), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(52)
                 });
-        m_aTxtTitle = CurUnoDialog.insertTextField("txtQueryTitle", 0, null, new String[]
+        m_aTxtTitle = CurUnoDialog.insertTextField("txtQueryTitle", "changeTitle", this, new String[]
                 {
                     "Height", "HelpURL", "PositionX", "PositionY", "Step", "TabIndex", "Width"
                 },
@@ -128,6 +129,11 @@ public class Finalizer
                 });
     }
 
+    public void changeTitle()
+    {
+        final String TitleName = m_aTxtTitle.getText();
+        CurUnoDialog.enableFinishButton(!"".equals(TitleName));
+    }
     /* TODO: The title textbox always has to be updated when
     a new Table has been selected if it is clear that the user has not made any input meanwhile
      */
@@ -191,11 +197,11 @@ public class Finalizer
                                 CurUnoDialog.getCurFrame());
                     }
                     CurUnoDialog.xDialog.endExecute();
+                    CurDBMetaData.oSQLQueryComposer = null;
+                    CurDBMetaData = null;
+                    CurUnoDialog = null;
                 }
             }
-            CurDBMetaData.oSQLQueryComposer = null;
-            CurDBMetaData = null;
-            CurUnoDialog = null;
         }
         catch (IllegalArgumentException e)
         {
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index dcbb920e4b0d..14fe9c4757a9 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -298,6 +298,10 @@ public class QueryWizard extends WizardDialog
         if ((switchToStep(ncurStep, SOSUMMARY_PAGE)) || (ncurStep == SOSUMMARY_PAGE))
         {
             components = CurFinalizer.finish();
+            if ( components == null )
+            {
+                setControlProperty("btnWizardFinish", "Enabled", false);
+            }
         }
     }
 
diff --git a/wizards/com/sun/star/wizards/report/IReportDocument.java b/wizards/com/sun/star/wizards/report/IReportDocument.java
index af8476f5c3e9..e94f93bf9d2e 100644
--- a/wizards/com/sun/star/wizards/report/IReportDocument.java
+++ b/wizards/com/sun/star/wizards/report/IReportDocument.java
@@ -204,7 +204,7 @@ public interface IReportDocument
      * @param Name
      * @param OpenMode
      */
-    public void store(String Name, int OpenMode);
+    public void store(String Name, int OpenMode) throws com.sun.star.uno.Exception;
 
     /**
      * The current report is added to the DB View under the given name
diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
index 8c0df7c36c5c..9ffb89b768f5 100644
--- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java
+++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
@@ -244,8 +244,9 @@ public class ReportFinalizer
 
     public void changeReportTitle()
     {
-        String TitleName = xTitleTextBox.getText();
+        final String TitleName = xTitleTextBox.getText();
         CurReportDocument.liveupdate_updateReportTitle(TitleName);
+        CurUnoDialog.enableFinishButton(!"".equals(TitleName));
     }
 
     public int getReportOpenMode()
@@ -272,18 +273,25 @@ public class ReportFinalizer
     public boolean finish()
     {
         StoreName = getStoreName();
-        if (CurReportDocument.getRecordParser().getReportDocuments().hasByHierarchicalName(StoreName))
+        if (!CurReportDocument.getRecordParser().getReportDocuments().hasByHierarchicalName(StoreName))
         {
-            String sMsgReportDocumentNameDuplicate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 76);
-            String sShowMsgReportNameisDuplicate = JavaTools.replaceSubString(sMsgReportDocumentNameDuplicate, StoreName, "%REPORTNAME");
-            /* int iMsg = */ CurUnoDialog.showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sShowMsgReportNameisDuplicate);
-            return false;
-        }
-        else
-        {
-            CurReportDocument.store(StoreName, getReportOpenMode());
-            ReportWizard.bCloseDocument = false;
-            return true;
+            try
+            {
+                CurReportDocument.store(StoreName, getReportOpenMode());
+                ReportWizard.bCloseDocument = false;
+                return true;
+            }
+            catch(Exception e)
+            {
+                CurUnoDialog.showMessageBox("ErrorBox", VclWindowPeerAttribute.OK,e.getLocalizedMessage() );
+                CurUnoDialog.enableFinishButton(false);
+                return false;
+            }
         }
+        String sMsgReportDocumentNameDuplicate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 76);
+        String sShowMsgReportNameisDuplicate = JavaTools.replaceSubString(sMsgReportDocumentNameDuplicate, StoreName, "%REPORTNAME");
+        /* int iMsg = */ CurUnoDialog.showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sShowMsgReportNameisDuplicate);
+        CurUnoDialog.enableFinishButton(false);
+        return false;
     }
 }
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 3d79c5d2d8ac..6e0091b52ef5 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -480,7 +480,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
         return m_aDoc.xMSFDoc;
     }
 
-    public void store(String _sName, int _nOpenMode)
+    public void store(String _sName, int _nOpenMode) throws com.sun.star.uno.Exception
     {
         getDoc().createReportForm(ReportWizard.SOREPORTFORMNAME);
         // int nOpenMode = getReportOpenMode();
diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
index dad827841e96..2972e8153787 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
@@ -37,7 +37,7 @@ import com.sun.star.wizards.report.*;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XNameAccess;
+import com.sun.star.container.XHierarchicalNameContainer;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
@@ -340,7 +340,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    public void store(String Name, int OpenMode)
+    public void store(String Name, int OpenMode) throws com.sun.star.uno.Exception
     {
         // throw new UnsupportedOperationException("Not supported yet.");
         // getReportBuilderLayouter().store(Name);
@@ -351,27 +351,14 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
             return;
         }
 
-        try
-        {
-            final XNameAccess aNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, m_aReportDocument);
-            final String[] aNames = aNameAccess.getElementNames();
-
-//            m_xReportDefinition.storeToStorage(m_xReportDefinition.getDocumentStorage(), m_xReportDefinition.getArgs());
-
-            final XCommandProcessor xProcessor = (XCommandProcessor) UnoRuntime.queryInterface(XCommandProcessor.class, m_aDocumentDefinition);
-            com.sun.star.ucb.Command aCommand = new com.sun.star.ucb.Command();
-            aCommand.Name = "storeOwn";
+        final XCommandProcessor xProcessor = UnoRuntime.queryInterface(XCommandProcessor.class, m_aDocumentDefinition);
+        final com.sun.star.ucb.Command aCommand = new com.sun.star.ucb.Command();
+        aCommand.Name = "storeOwn";
 
-            final Object aObj2 = xProcessor.execute(aCommand, xProcessor.createCommandIdentifier(), null);
+        final Object aObj2 = xProcessor.execute(aCommand, xProcessor.createCommandIdentifier(), null);
 
-            final XNameContainer aNameContainer = (XNameContainer) UnoRuntime.queryInterface(XNameContainer.class, m_aReportDocument);
-//             aNameContainer.insertByName(Name, m_xReportDefinition);
-            aNameContainer.insertByName(Name, m_aDocumentDefinition);
-        }
-        catch (Exception e)
-        {
-            int dummy = 0;
-        }
+        final XHierarchicalNameContainer aNameContainer = UnoRuntime.queryInterface(XHierarchicalNameContainer.class, m_aReportDocument);
+        aNameContainer.insertByHierarchicalName(Name, m_aDocumentDefinition);
     }
 
     public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, Vector GroupFieldVector, ArrayList ReportPath, int iSelCount)