Merge remote-tracking branch 'origin/libreoffice-3-4'

Conflicts:
	connectivity/qa/makefile.mk
	sfx2/source/appl/appdata.cxx
	sfx2/source/appl/appinit.cxx
	sfx2/source/inc/appdata.hxx
	sysui/desktop/productversion.mk
	xmloff/source/forms/elementimport.cxx

connectivity/qa/makefile.mk

@@ -35,9 +35,8 @@ PACKAGE = complex/connectivity
 
 #----- compile .java files -----------------------------------------
 
-JAVAFILES       :=  $(shell @$(FIND) complex -name "*.java")
-
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JAVAFILES       :=  $(shell @$(FIND) complex -name "*.java")
 
 .IF "$(SYSTEM_HSQLDB)" == "YES"
 EXTRAJARFILES = $(HSQLDB_JAR)

editeng/source/rtf/rtfitem.cxx

@@ -1431,25 +1431,41 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
         case RTF_CLBRDRT:       // Cell top border
             {
                 if( bTableDef )
+                {
+                    if (nBorderTyp != 0)
+                        SetBorderLine( nBorderTyp, aAttr, aBrd );
                     nBorderTyp = RTF_BRDRT;
+                }
                 break;
             }
         case RTF_CLBRDRB:       // Cell bottom border
             {
                 if( bTableDef )
+                {
+                    if (nBorderTyp != 0)
+                        SetBorderLine( nBorderTyp, aAttr, aBrd );
                     nBorderTyp = RTF_BRDRB;
+                }
                 break;
             }
         case RTF_CLBRDRL:       // Cell left border
             {
                 if( bTableDef )
+                {
+                    if (nBorderTyp != 0)
+                        SetBorderLine( nBorderTyp, aAttr, aBrd );
                     nBorderTyp = RTF_BRDRL;
+                }
                 break;
             }
         case RTF_CLBRDRR:       // Cell right border
             {
                 if( bTableDef )
+                {
+                    if (nBorderTyp != 0)
+                        SetBorderLine( nBorderTyp, aAttr, aBrd );
                     nBorderTyp = RTF_BRDRR;
+                }
                 break;
             }
 

sysui/desktop/productversion.mk

@@ -69,5 +69,5 @@ PRODUCTNAME.oxygenoffice = OxygenOffice
 PRODUCTVERSION.oxygenoffice = $(PRODUCTVERSION)
 PRODUCTVERSIONSHORT.oxygenoffice = $(PRODUCTVERSIONSHORT)
 PKGVERSION.oxygenoffice = $(PKGVERSION)
-UNIXFILENAME.oxygenoffice = $(PRODUCTNAME.oxygenoffice:l)
+UNIXFILENAME.oxygenoffice = $(PRODUCTNAME.oxygenoffice:l)$(PRODUCTVERSION.oxygenoffice)
 ICONPREFIX.oxygenoffice = $(UNIXFILENAME.oxygenoffice:s/.//g)

xmloff/source/forms/elementimport.cxx

@@ -889,7 +889,7 @@ namespace xmloff
                         if (!bRetrievedValues)
                         {
                             getValuePropertyNames(m_eElementType, nClassId, pCurrentValueProperty, pValueProperty);
-                            ENSURE_OR_BREAK( pValueProperty, "OControlImport::StartElement: illegal value property names!" );
+                            ENSURE_OR_BREAK( pCurrentValueProperty || pValueProperty, "OControlImport::StartElement: illegal value property names!" );
                             bRetrievedValues = sal_True;
                         }
                         ENSURE_OR_BREAK((PROPID_VALUE != aValueProps->Handle) || pValueProperty,