diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:48 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:48 +0200 |
| commit | b6212a4a950d9091aaad62022216e8aaaa074965 (patch) | |
| tree | ed81e5f1845d4bb2dcb73e4da0c3b73d247ef0e9 | |
| parent | f5e719d38e855484905b8f761a6779788b589546 (diff) | |
| parent | e12af87ff5f4a0d7b10133a9b3ddc114765607d6 (diff) | |
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
| -rwxr-xr-x | connectivity/qa/makefile.mk | 3 | ||||
| -rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 16 | ||||
| -rwxr-xr-x | sysui/desktop/productversion.mk | 2 | ||||
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 2 |
4 files changed, 19 insertions, 4 deletions
diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk index c087ab98bd7d..3081a751f07b 100755 --- a/connectivity/qa/makefile.mk +++ b/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) diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 7f94d5a721e4..d97c05b3d67f 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/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; } diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 9c0eafb7922e..2e581d0f5107 100755 --- a/sysui/desktop/productversion.mk +++ b/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) diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 3f26ebc05cd4..1b23c59282b0 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/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, |