sb111: merged in DEV300_m71

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();

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 --------------------------------------------------------------------

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<

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. */

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()

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

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 )

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());

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,6 +386,16 @@ inline bool hasFloatingChild(Window *pWindow)
             }
             else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
             {
+                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 )

extensions/source/update/feed/makefile.mk

@@ -43,13 +43,8 @@ ENABLE_EXCEPTIONS=TRUE
 # no "lib" prefix
 DLLPRE =
 
-.IF "$(SYSTEM_ZLIB)" == "YES"
-CFLAGS+=-DSYSTEM_ZLIB
-.ENDIF
-
 # --- Files ---
 
-
 SLOFILES=\
     $(SLO)$/updatefeed.obj \
 
@@ -61,8 +56,7 @@ SHL1IMPLIB=i$(SHL1TARGET)
 SHL1STDLIBS=    \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
-    $(SALLIB) \
-    $(ZLIB3RDLIB)
+    $(SALLIB)
 
 SHL1VERSIONMAP=..$/exports.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def

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 );
                     }

lingucomponent/prj/build.lst

-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

setup_native/prj/build.lst

-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

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

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

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,12 +197,12 @@ public class Finalizer
                                 CurUnoDialog.getCurFrame());
                     }
                     CurUnoDialog.xDialog.endExecute();
-                }
-            }
                     CurDBMetaData.oSQLQueryComposer = null;
                     CurDBMetaData = null;
                     CurUnoDialog = null;
                 }
+            }
+        }
         catch (IllegalArgumentException e)
         {
             e.printStackTrace();

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);
+            }
         }
     }
 

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

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
+            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;
     }
 }

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();

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();
+        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 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)