[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - libexttextcat/exttextcat-memcpy.patch.1 libexttextcat/UnpackedTarball_exttextcat.mk
libexttextcat/UnpackedTarball_exttextcat.mk |1 + libexttextcat/exttextcat-memcpy.patch.1 | 16 2 files changed, 17 insertions(+) New commits: commit b82577140f0bbb63e127caae7779adb04bd9c099 Author: Michael Stahl mst...@redhat.com Date: Thu Jul 4 23:12:53 2013 +0200 libexttextcat: fix overlapping memcpy (cherry picked from commit 3bde0af3a8fd09defd47465d4b62541350cecc1c) Conflicts: libexttextcat/UnpackedTarball_exttextcat.mk Change-Id: I3225043560a3c0e02345bc4e8a8d0f9cca2e3cd0 Reviewed-on: https://gerrit.libreoffice.org/4730 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/libexttextcat/UnpackedTarball_exttextcat.mk b/libexttextcat/UnpackedTarball_exttextcat.mk index c6fa03c..a96b02b 100644 --- a/libexttextcat/UnpackedTarball_exttextcat.mk +++ b/libexttextcat/UnpackedTarball_exttextcat.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL) $(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\ libexttextcat/android.patch \ libexttextcat/unkown.patch.1 \ + libexttextcat/exttextcat-memcpy.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/libexttextcat/exttextcat-memcpy.patch.1 b/libexttextcat/exttextcat-memcpy.patch.1 new file mode 100644 index 000..b3e399a --- /dev/null +++ b/libexttextcat/exttextcat-memcpy.patch.1 @@ -0,0 +1,16 @@ +fix overlapped memcpy in heapextract + +--- a/src/fingerprint.c 2013-07-04 22:53:25.674741538 +0200 b/src/fingerprint.c2013-07-04 22:54:09.009741166 +0200 +@@ -254,7 +254,10 @@ + p = (t-heap[0]); + + memcpy(item, p, sizeof(entry_t)); +-memcpy((t-heap[0]), (t-heap[t-size - 1]), sizeof(entry_t)); ++if (t-size 1) ++{ ++memcpy((t-heap[0]), (t-heap[t-size - 1]), sizeof(entry_t)); ++} + + siftdown(t, t-size, 0); + t-size--; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk
postprocess/CustomTarget_signing.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 35917a5a5332df758fb60ea8978bdf5cf5460d03 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jul 5 06:59:52 2013 +0200 Missing slash that prevents windows signing Change-Id: I7c84e861f45643a0e66504d10b5d76b2dbb6f629 diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index bf9aa0c..fa0130b 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -27,7 +27,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \ ifeq ($(COM),MSC) ifneq ($(ENABLE_DBGUTIL),TRUE) $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ - -e $(SRCDIR)/postprocess/signing/no_signing.txt + -e $(SRCDIR)/postprocess/signing/no_signing.txt \ -l $(subst .done,_log.txt,$@) \ $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sysui/Package_osxicons.mk
sysui/Package_osxicons.mk | 49 ++ 1 file changed, 24 insertions(+), 25 deletions(-) New commits: commit fec68441e79dbd042381f882c4f9814f637013ac Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jul 4 04:42:05 2013 -0500 fdo#66100 : fix icons associations on MacOSX Change-Id: Idbce5516f1cc59b8d1cc39ee0a0db2aad90e8074 Reviewed-on: https://gerrit.libreoffice.org/4714 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-on: https://gerrit.libreoffice.org/4725 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Joren De Cuyper joren.libreoff...@telenet.be diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk index ed84e10..6f8ca5f 100644 --- a/sysui/Package_osxicons.mk +++ b/sysui/Package_osxicons.mk @@ -7,35 +7,34 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop)) +$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop/icons)) $(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTDIR))) $(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\ -icons/text.icns \ -icons/oasis-text.icns \ -icons/spreadsheet.icns \ -icons/oasis-spreadsheet.icns \ -icons/presentation.icns \ -icons/oasis-presentation.icns \ -icons/drawing.icns \ -icons/oasis-drawing.icns \ -icons/master-document.icns \ -icons/oasis-master-document.icns \ -icons/formula.icns \ -icons/oasis-formula.icns \ -icons/text-template.icns \ -icons/oasis-text-template.icns \ -icons/spreadsheet-template.icns \ -icons/oasis-spreadsheet-template.icns \ -icons/presentation-template.icns \ -icons/oasis-presentation-template.icns \ -icons/drawing-template.icns \ -icons/oasis-drawing-template.icns \ -icons/oasis-database.icns \ -icons/extension.icns \ -icons/main.icns \ - macosx/Info.plist \ +text.icns \ +oasis-text.icns \ +spreadsheet.icns \ +oasis-spreadsheet.icns \ +presentation.icns \ +oasis-presentation.icns \ +drawing.icns \ +oasis-drawing.icns \ +master-document.icns \ +oasis-master-document.icns \ +formula.icns \ +oasis-formula.icns \ +text-template.icns \ +oasis-text-template.icns \ +spreadsheet-template.icns \ +oasis-spreadsheet-template.icns \ +presentation-template.icns \ +oasis-presentation-template.icns \ +drawing-template.icns \ +oasis-drawing-template.icns \ +oasis-database.icns \ +extension.icns \ +main.icns \ )) # vim: set ts=4 sw=4 et: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Manpower Recruitment from Vietnam
Your email client cannot read this email. To view it online, please go here: http://mailczar247.info/display.php?M=289105C=0ecebf2bf8d67483a7be1ab70713a4aeS=8L=8N=1 To stop receiving these emails:http://mailczar247.info/unsubscribe.php?M=289105C=0ecebf2bf8d67483a7be1ab70713a4aeL=8N=8 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - linguistic/source
linguistic/source/dicimp.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 4d1774b3631e4ac93b544c42bd33cb4058a16392 Author: Michael Stahl mst...@redhat.com Date: Fri Jul 5 00:07:43 2013 +0200 fdo#66420: fix user dictionaries on Windows 28300209604ee1bb8e5050322b29e95a07f679d8 added yet another silly temp file wrapper class, and introduced 2 bugs: the file descriptor is not closed before renaming it which fails with ERROR_SHARING_VIOLATION on Win32, and (as a consequence of that) another attempt to save the dictionary during shutdown fails because SimpleFileAccess cannot be created and this is not checked. Change-Id: I7bd3f5d349ed550440a93fe71e3791c9919de3af (cherry picked from commit d68de5195605bd9236851e0714dd9b03b0f5f3be) Reviewed-on: https://gerrit.libreoffice.org/4729 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 083f4c5..5af73a8 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -393,7 +393,10 @@ struct TmpDictionary { try { -mxAccess-kill(maTmpURL); +if (mxAccess.is()) +{ +mxAccess-kill(maTmpURL); +} } catch (const uno::Exception ) { } } @@ -492,6 +495,8 @@ sal_uLong DictionaryNeo::saveEntries(const OUString rURL) break; } +pStream.reset(); // fdo#66420 close streams so Win32 can move the file +xStream.clear(); nErr = aTmpDictionary.renameTmpToURL(); //If we are migrating from an older version, then on first successful ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - postprocess/CustomTarget_signing.mk
postprocess/CustomTarget_signing.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 03c0f9976dc1c77973658aa02db2823bfc9a09a1 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jul 5 06:59:52 2013 +0200 Missing slash that prevents windows signing Change-Id: I7c84e861f45643a0e66504d10b5d76b2dbb6f629 (cherry picked from commit 35917a5a5332df758fb60ea8978bdf5cf5460d03) Reviewed-on: https://gerrit.libreoffice.org/4731 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index bf9aa0c..fa0130b 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -27,7 +27,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \ ifeq ($(COM),MSC) ifneq ($(ENABLE_DBGUTIL),TRUE) $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ - -e $(SRCDIR)/postprocess/signing/no_signing.txt + -e $(SRCDIR)/postprocess/signing/no_signing.txt \ -l $(subst .done,_log.txt,$@) \ $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - offapi/com vcl/source
offapi/com/sun/star/document/XDocumentRecovery.idl |2 +- offapi/com/sun/star/drawing/AccessibleGraphicShape.idl |4 ++-- offapi/com/sun/star/text/AccessibleEndnoteView.idl |2 +- vcl/source/window/menu.cxx |4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 9a556a1f355ef828ff326b00cf5c28a10f1d6bb5 Author: Julien Nabet serval2...@yahoo.fr Date: Fri Jul 5 07:26:45 2013 +0200 Fix some idl descriptions Change-Id: I983ba19bebceb4f38ca51f8c60204c91b78bc965 diff --git a/offapi/com/sun/star/document/XDocumentRecovery.idl b/offapi/com/sun/star/document/XDocumentRecovery.idl index 60dc2be..a18e8dd 100644 --- a/offapi/com/sun/star/document/XDocumentRecovery.idl +++ b/offapi/com/sun/star/document/XDocumentRecovery.idl @@ -85,7 +85,7 @@ interface XDocumentRecovery Instead, the implementation is responsible to do so, if required./p pA default implementation of this method could simply delegate this call to -::com::sun::star::frame:::XLoadable::load(), followed by +::com::sun::star::frame::XLoadable::load(), followed by com::sun::star::frame::XModel::attachResource()./p @param SourceLocation diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl index 880583f..9dfd88c 100644 --- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl +++ b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl @@ -60,8 +60,8 @@ service AccessibleGraphicShape the time being this interface does not provide information that is not available through the AccessibleShape service: the size returned by the -::com::sun::star::accessibility::XAccessibleImage::getWidth() and -::com::sun::star::accessibility::XAccessibleImage::getHeight() + ::com::sun::star::accessibility::XAccessibleImage::getAccessibleImageWidth() and + ::com::sun::star::accessibility::XAccessibleImage::getAccessibleImageHeight() functions is the same as that returned by the ::com::sun::star::accessibility::XAccessibleComponent::getSize() function; the description returned by diff --git a/offapi/com/sun/star/text/AccessibleEndnoteView.idl b/offapi/com/sun/star/text/AccessibleEndnoteView.idl index f019eba..86ea0b0 100644 --- a/offapi/com/sun/star/text/AccessibleEndnoteView.idl +++ b/offapi/com/sun/star/text/AccessibleEndnoteView.idl @@ -65,7 +65,7 @@ service AccessibleEndnoteView pThe logical order of paragraph and table fragments is never changed. liThe role is -::com::sun::star::accessibility::AccessibleRole::ENDNOTE +::com::sun::star::accessibility::AccessibleRole::END_NOTE liThe name is endnote (or the equivalent term in application's language) with a number appended. liThe description is endnote (or the equivalent term commit f53bebb800ac35ee948640e57bcfff3ca59fd833 Author: Julien Nabet serval2...@yahoo.fr Date: Thu Jul 4 22:37:44 2013 +0200 Remove !! Change-Id: I14bc066fa6383bf33260d65a99a1036fde62b108 diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 7bf3c16..ac9c206 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1915,7 +1915,7 @@ void Menu::SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ) nDeltaAngle += 3600; pData-nItemImageAngle = nAngle10; -if( nDeltaAngle !!pData-aImage ) +if( nDeltaAngle pData-aImage ) pData-aImage = ImplRotImage( pData-aImage, nDeltaAngle ); } } @@ -1942,7 +1942,7 @@ void Menu::SetItemImageMirrorMode( sal_uInt16 nItemId, sal_Bool bMirror ) ) { pData-bMirrorMode = bMirror ? true : false; -if( !!pData-aImage ) +if( pData-aImage ) pData-aImage = ImplMirrorImage( pData-aImage ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/menu.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2e0d945a6cc2b0e1d8296344648dea32237d3e26 Author: Julien Nabet serval2...@yahoo.fr Date: Fri Jul 5 07:44:13 2013 +0200 Oups, Revert Remove !! This reverts commit f53bebb800ac35ee948640e57bcfff3ca59fd833. diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index ac9c206..7bf3c16 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1915,7 +1915,7 @@ void Menu::SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ) nDeltaAngle += 3600; pData-nItemImageAngle = nAngle10; -if( nDeltaAngle pData-aImage ) +if( nDeltaAngle !!pData-aImage ) pData-aImage = ImplRotImage( pData-aImage, nDeltaAngle ); } } @@ -1942,7 +1942,7 @@ void Menu::SetItemImageMirrorMode( sal_uInt16 nItemId, sal_Bool bMirror ) ) { pData-bMirrorMode = bMirror ? true : false; -if( pData-aImage ) +if( !!pData-aImage ) pData-aImage = ImplMirrorImage( pData-aImage ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building LO 4.0.4.2 on illumos based OS
Hi Michael, would be a great idea the tinderbox setup. I will send you the link of the XStream Desktop iso as soon as we have it out. BTW, can you help me with this? I really don't know what problem is thismust be something about gnu ld, but I had more experience with Sun ld. Gabriele. On Thursday, 2013-07-04 at 09:32, Gabriele Bulfon wrote: Hi, after long building LO 4.1.0.1 on illumos based OS, I reached this error: [build LNK] Executable/unopkg.bin /usr/gnu/bin/ld: /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/LinkTarget/Executable/unopkg.bin: hidden symbol `main' in/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/CObject/desktop/source/pkgchk/unopkg/unopkg_main.o is referenced byDSO /usr/gnu/bin/ld: final link failed: Bad value collect2: ld returned 1 exit status Any idea? Gabriele. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - postprocess/CustomTarget_signing.mk
postprocess/CustomTarget_signing.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6adf85fed07895335e9acaaadaa991e8408dd6f0 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jul 5 06:59:52 2013 +0200 Missing slash that prevents windows signing Change-Id: I7c84e861f45643a0e66504d10b5d76b2dbb6f629 (cherry picked from commit 35917a5a5332df758fb60ea8978bdf5cf5460d03) Reviewed-on: https://gerrit.libreoffice.org/4731 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com (cherry picked from commit 03c0f9976dc1c77973658aa02db2823bfc9a09a1) Reviewed-on: https://gerrit.libreoffice.org/4732 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Miklos Vajna vmik...@suse.cz Reviewed-by: Miklos Vajna vmik...@suse.cz diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index bf9aa0c..fa0130b 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -27,7 +27,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \ ifeq ($(COM),MSC) ifneq ($(ENABLE_DBGUTIL),TRUE) $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ - -e $(SRCDIR)/postprocess/signing/no_signing.txt + -e $(SRCDIR)/postprocess/signing/no_signing.txt \ -l $(subst .done,_log.txt,$@) \ $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 47/fc3a3278a7aac0ba2d8f47eb10a83c0a5f40c7
47/fc3a3278a7aac0ba2d8f47eb10a83c0a5f40c7 |1 + 1 file changed, 1 insertion(+) New commits: commit b1f80c9419ab7c71dbd2338801e5dadf70425ab9 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 08:54:02 2013 +0100 Notes added by 'git notes add' diff --git a/47/fc3a3278a7aac0ba2d8f47eb10a83c0a5f40c7 b/47/fc3a3278a7aac0ba2d8f47eb10a83c0a5f40c7 new file mode 100644 index 000..1308ca8 --- /dev/null +++ b/47/fc3a3278a7aac0ba2d8f47eb10a83c0a5f40c7 @@ -0,0 +1 @@ +merged as: 613036b5a13d24eec395d32a0b5e9bfeb1197c14 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/uiconfig uui/source
cui/uiconfig/ui/colorpage.ui | 28 ++-- uui/source/fltdlg.src|2 +- 2 files changed, 23 insertions(+), 7 deletions(-) New commits: commit 613036b5a13d24eec395d32a0b5e9bfeb1197c14 Author: Herbert Dürr h...@apache.org Date: Thu Jul 4 14:50:22 2013 + Resolves: #i55152# the listbox in the filter selection dialog should be sorted (cherry picked from commit 47fc3a3278a7aac0ba2d8f47eb10a83c0a5f40c7) Change-Id: I07215bb62dbedcb2d9baa0fd6d66a3ebe30f540e diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src index a64b65b..3379f8c 100644 --- a/uui/source/fltdlg.src +++ b/uui/source/fltdlg.src @@ -45,7 +45,7 @@ ModalDialog DLG_FILTER_SELECT Pos = MAP_APPFONT ( 6 , 19 ) ; Size= MAP_APPFONT ( 182 , 175 ) ; TabStop = TRUE ; -Sort= FALSE ; +Sort= TRUE ; AutoHScroll = TRUE; }; commit 77de9a5ec5f234120a967fc003cd018e803e1afd Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 4 21:17:17 2013 +0100 tweak so buttons don't take on height of the combined extra load/save widgets Change-Id: Idc294a90f97cf1ae70109a04ad9963fe1e867f78 diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index 4a16e76..3481d58 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- + !-- interface-requires LibreOffice 1.0 -- object class=GtkAdjustment id=adjustment1 property name=upper100/property property name=step_increment1/property @@ -204,15 +205,15 @@ property name=halignend/property property name=entry_text_column0/property property name=id_column1/property -items - item translatable=yesRGB/item - item translatable=yesCMYK/item -/items child internal-child=accessible object class=AtkObject id=modellb-atkobject property name=AtkObject::accessible-name translatable=yesColor Mode/property /object /child +items + item translatable=yesRGB/item + item translatable=yesCMYK/item +/items /object packing property name=left_attach1/property @@ -559,6 +560,7 @@ property name=tooltip_markup translatable=yesLoad Color List/property property name=tooltip_text translatable=yesLoad Color List/property property name=haligncenter/property +property name=valignend/property property name=hexpandTrue/property property name=imageimage1/property /object @@ -578,6 +580,7 @@ property name=tooltip_markup translatable=yesSave Color List/property property name=tooltip_text translatable=yesSave Color List/property property name=haligncenter/property +property name=valignend/property property name=hexpandTrue/property property name=imageimage2/property /object @@ -588,19 +591,32 @@ property name=height1/property /packing /child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position4/property +property name=secondaryTrue/property + /packing +/child +child + object class=GtkGrid id=grid5 +property name=visibleTrue/property +property name=can_focusFalse/property child object class=GtkCheckButton id=embed property name=label translatable=yesEmbed/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property +property name=valignstart/property property name=xalign0/property property name=draw_indicatorTrue/property /object
[Libreoffice-commits] core.git: oox/source
oox/source/docprop/docprophandler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a0939a7b9293e1c1b179ede96f1a3a76ef0c884d Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 5 09:53:57 2013 +0200 fixup nanosecond precision Change-Id: Ia33b811d56fe5ad5e7e844b3e1c1c25ece0b5396 diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 85df37d..92a7d49 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -154,7 +154,7 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString aChar } } -return util::DateTime( (sal_uInt16)( aOslDTime.NanoSeconds / 1e7 ), aOslDTime.Seconds, aOslDTime.Minutes, aOslDTime.Hours, aOslDTime.Day, aOslDTime.Month, aOslDTime.Year ); +return util::DateTime( aOslDTime.NanoSeconds, aOslDTime.Seconds, aOslDTime.Minutes, aOslDTime.Hours, aOslDTime.Day, aOslDTime.Month, aOslDTime.Year ); } // ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |1 - source/text/shared/01/05210300.xhp |4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit 4732bf3f42cdd828dab4389641a5dbf3f0436362 Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 5 10:38:23 2013 +0200 forgot to update HID_AREA_GRADIENT - ui/gradientpage/GradientPage Change-Id: Ib3b62a1bec9ba1f577687b8bcd62ce12f8b65467 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 650c340..80565dd 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -740,7 +740,6 @@ HID_APP_WIN,33128, HID_AP_INSERT_DB_SEL,54849, HID_AREA_AREA,33798, HID_AREA_BITMAP,33800, -HID_AREA_GRADIENT,33801, HID_AREA_SHADOW,33805, HID_AREA_TRANSPARENCE,33806, HID_AUTH_FIELD_ADDRESS,54882, diff --git a/source/text/shared/01/05210300.xhp b/source/text/shared/01/05210300.xhp index a599e4b..31fd3cf 100644 --- a/source/text/shared/01/05210300.xhp +++ b/source/text/shared/01/05210300.xhp @@ -28,9 +28,9 @@ /meta body section id=farbverlaeufe -bookmark xml-lang=en-US branch=hid/CUI_HID_AREA_GRADIENT id=bm_id3149991 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/gradientpage/GradientPage id=bm_id3149991 localize=false/ paragraph xml-lang=en-US id=hd_id3145356 role=heading level=1 l10n=U oldref=1link href=text/shared/01/05210300.xhp name=GradientsGradients/link/paragraph - paragraph xml-lang=en-US id=par_id3154812 role=paragraph l10n=U oldref=2ahelp hid=HID_AREA_GRADIENTSet the properties of a gradient, or save and load gradient lists./ahelp/paragraph + paragraph xml-lang=en-US id=par_id3154812 role=paragraph l10n=U oldref=2ahelp hid=cui/ui/gradientpage/GradientPageSet the properties of a gradient, or save and load gradient lists./ahelp/paragraph /section section id=howtoget embed href=text/shared/00/00040502.xhp#verlauf/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 38ca96beac15a4addae559b7d0ee1f6a5c5d Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 5 10:38:23 2013 +0200 Updated core Project: help 4732bf3f42cdd828dab4389641a5dbf3f0436362 diff --git a/helpcontent2 b/helpcontent2 index f877066..4732bf3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f877066126875abff13f7f8f1e08a2b621eccc8a +Subproject commit 4732bf3f42cdd828dab4389641a5dbf3f0436362 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] module svl: all String and some bool and related clean-up
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/4733 to look at the new patch set (#2). Change subject: module svl: all String and some bool and related clean-up .. module svl: all String and some bool and related clean-up Change-Id: I36eb559fa58dbe75384b7119c788af0048813aed --- M chart2/source/tools/NumberFormatterWrapper.cxx M cui/source/options/optupdt.cxx M editeng/source/editeng/editundo.cxx M editeng/source/editeng/editundo.hxx M editeng/source/editeng/impedit4.cxx M framework/source/fwe/helper/undomanagerhelper.cxx M include/editeng/editund2.hxx M include/sfx2/app.hxx M include/sfx2/objsh.hxx M include/sfx2/viewfrm.hxx M include/svl/inethist.hxx M include/svl/itemprop.hxx M include/svl/ondemand.hxx M include/svl/srchitem.hxx M include/svl/style.hxx M include/svl/svdde.hxx M include/svl/undo.hxx M include/svl/zforlist.hxx M include/svx/e3dundo.hxx M include/svx/sdrundomanager.hxx M include/svx/svdundo.hxx M reportdesign/source/ui/report/ReportController.cxx M sc/inc/patattr.hxx M sc/inc/stlpool.hxx M sc/inc/stlsheet.hxx M sc/inc/undorangename.hxx M sc/inc/zforauto.hxx M sc/source/core/data/docpool.cxx M sc/source/core/data/dpcache.cxx M sc/source/core/data/dputil.cxx M sc/source/core/data/patattr.cxx M sc/source/core/data/stlpool.cxx M sc/source/core/data/stlsheet.cxx M sc/source/core/data/table4.cxx M sc/source/core/data/table6.cxx M sc/source/core/data/validat.cxx M sc/source/core/tool/rangeseq.cxx M sc/source/core/tool/zforauto.cxx M sc/source/filter/excel/xestyle.cxx M sc/source/filter/rtf/eeimpars.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx M sc/source/filter/xml/xmlcelli.cxx M sc/source/ui/docshell/docsh4.cxx M sc/source/ui/formdlg/formula.cxx M sc/source/ui/inc/docsh.hxx M sc/source/ui/inc/undobase.hxx M sc/source/ui/inc/undoblk.hxx M sc/source/ui/inc/undocell.hxx M sc/source/ui/inc/undodat.hxx M sc/source/ui/inc/undodraw.hxx M sc/source/ui/inc/undostyl.hxx M sc/source/ui/inc/undotab.hxx M sc/source/ui/miscdlgs/autofmt.cxx M sc/source/ui/miscdlgs/filldlg.cxx M sc/source/ui/undo/undobase.cxx M sc/source/ui/undo/undoblk.cxx M sc/source/ui/undo/undoblk2.cxx M sc/source/ui/undo/undoblk3.cxx M sc/source/ui/undo/undocell.cxx M sc/source/ui/undo/undodat.cxx M sc/source/ui/undo/undodraw.cxx M sc/source/ui/undo/undorangename.cxx M sc/source/ui/undo/undostyl.cxx M sc/source/ui/undo/undotab.cxx M sc/source/ui/unoobj/chart2uno.cxx M sc/source/ui/unoobj/pageuno.cxx M sc/source/ui/view/cellsh1.cxx M sc/source/ui/view/tabvwsha.cxx M sc/source/ui/view/viewfun2.cxx M sd/inc/stlpool.hxx M sd/inc/stlsheet.hxx M sd/inc/undo/undomanager.hxx M sd/source/core/stlfamily.cxx M sd/source/core/stlpool.cxx M sd/source/core/stlsheet.cxx M sd/source/core/undo/undomanager.cxx M sd/source/ui/func/fuhhconv.cxx M sd/source/ui/func/sdundogr.cxx M sd/source/ui/inc/sdundogr.hxx M sfx2/source/appl/appdde.cxx M sfx2/source/appl/lnkbase2.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/dialog/mgetempl.cxx M sfx2/source/dialog/styledlg.cxx M starmath/source/document.cxx M svl/source/fsstor/fsstorage.cxx M svl/source/items/itemprop.cxx M svl/source/items/macitem.cxx M svl/source/items/style.cxx M svl/source/misc/inethist.cxx M svl/source/numbers/zforlist.cxx M svl/source/numbers/zformat.cxx M svl/source/numbers/zforscan.cxx M svl/source/svdde/ddecli.cxx M svl/source/svdde/ddedata.cxx M svl/source/svdde/ddesvr.cxx M svl/source/undo/undo.cxx M svl/unx/source/svdde/ddedummy.cxx M svtools/source/control/fmtfield.cxx M svtools/source/svhtml/htmlout.cxx M svtools/source/uno/unoiface.cxx M svx/source/dialog/srchdlg.cxx M svx/source/engine3d/e3dundo.cxx M svx/source/fmcomp/gridcell.cxx M svx/source/items/numfmtsh.cxx M svx/source/svdraw/sdrundomanager.cxx M svx/source/svdraw/svdundo.cxx M svx/source/table/tableundo.cxx M svx/source/table/tableundo.hxx M sw/inc/IDocumentUndoRedo.hxx M sw/inc/docsh.hxx M sw/inc/docstyle.hxx M sw/inc/tblafmt.hxx M sw/inc/undobj.hxx M sw/source/core/doc/tblafmt.cxx M sw/source/core/fields/fldbas.cxx M sw/source/core/fields/usrfld.cxx M sw/source/core/inc/SwUndoFmt.hxx M sw/source/core/inc/UndoManager.hxx M sw/source/core/table/swtable.cxx M sw/source/core/text/EnhancedPDFExportHelper.cxx M sw/source/core/undo/SwUndoFmt.cxx M sw/source/core/undo/docundo.cxx M sw/source/core/undo/undobj.cxx M sw/source/ui/app/docsh2.cxx M sw/source/ui/app/docstyle.cxx M sw/source/ui/dbui/dbinsdlg.cxx M sw/source/ui/table/tautofmt.cxx M sw/source/ui/uiview/viewsrch.cxx M sw/source/ui/utlui/numfmtlb.cxx M uui/source/iahndl-ssl.cxx M vcl/source/edit/textund2.hxx M vcl/source/edit/textundo.cxx M vcl/source/edit/textundo.hxx 135 files changed, 1,715 insertions(+), 1,775 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/4733/2 -- To view, visit https://gerrit.libreoffice.org/4733 To
[Libreoffice-commits] core.git: icon-themes/human icon-themes/oxygen include/toolkit offapi/com offapi/UnoApi_offapi.mk qadevOOo/objdsc scp2/source swext/mediawiki toolkit/AllLangResTarget_tk.mk toolk
dev/null |binary include/toolkit/helper/servicenames.hxx |2 offapi/UnoApi_offapi.mk |3 offapi/com/sun/star/awt/UnoControlThrobber.idl | 48 -- offapi/com/sun/star/awt/UnoControlThrobberModel.idl | 45 -- offapi/com/sun/star/awt/WindowDescriptor.idl |1 offapi/com/sun/star/awt/XThrobber.idl | 44 -- qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControl.csv | 36 - qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControlModel.csv | 29 - scp2/source/ooo/file_resource_ooo.scp |2 swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java | 10 toolkit/AllLangResTarget_tk.mk | 39 -- toolkit/Library_tk.mk |2 toolkit/Module_toolkit.mk |1 toolkit/qa/unoapi/knownissues.xcl | 11 toolkit/qa/unoapi/toolkit.sce |2 toolkit/source/awt/vclxtoolkit.cxx |9 toolkit/source/awt/xthrobber.cxx | 106 - toolkit/source/awt/xthrobber.hrc | 27 - toolkit/source/awt/xthrobber.src | 96 toolkit/source/controls/tkthrobber.cxx | 195 -- toolkit/source/helper/registerservices.cxx |5 toolkit/source/helper/servicenames.cxx |2 toolkit/util/tk.component |8 24 files changed, 6 insertions(+), 717 deletions(-) New commits: commit 680608b15dd158f9ad4ceae328abb10b5185a27b Author: Ariel Constenla-Haile arie...@apache.org Date: Thu Dec 20 03:56:07 2012 + Related: #i121513# Remove deprecated UnoControlThrobberModel (cherry picked from commit 5569d97f06a0299e41b91ca248bf7eaa038b1f21) Conflicts: icon-themes/human/toolkit/source/awt/spinner03-grey_01.png icon-themes/human/toolkit/source/awt/spinner03-grey_02.png icon-themes/human/toolkit/source/awt/spinner03-grey_03.png icon-themes/human/toolkit/source/awt/spinner03-grey_04.png icon-themes/human/toolkit/source/awt/spinner03-grey_05.png icon-themes/human/toolkit/source/awt/spinner03-grey_06.png icon-themes/human/toolkit/source/awt/spinner03-grey_07.png icon-themes/human/toolkit/source/awt/spinner03-grey_08.png icon-themes/human/toolkit/source/awt/spinner03-grey_09.png icon-themes/human/toolkit/source/awt/spinner03-grey_10.png icon-themes/human/toolkit/source/awt/spinner03-grey_11.png icon-themes/human/toolkit/source/awt/spinner03-grey_12.png offapi/com/sun/star/awt/UnoControlThrobber.idl offapi/com/sun/star/awt/UnoControlThrobberModel.idl offapi/com/sun/star/awt/XThrobber.idl offapi/com/sun/star/awt/makefile.mk offapi/type_reference/typelibrary_history.txt offapi/type_reference/types.rdb rat-excludes swext/mediawiki/help/component.txt swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java swext/mediawiki/src/description.xml toolkit/AllLangResTarget_tk.mk toolkit/inc/toolkit/helper/servicenames.hxx toolkit/source/awt/vclxtoolkit.cxx toolkit/source/awt/xthrobber.cxx toolkit/source/awt/xthrobber.hrc toolkit/source/awt/xthrobber.src toolkit/source/controls/tkthrobber.cxx toolkit/source/helper/registerservices.cxx toolkit/source/helper/servicenames.cxx toolkit/src2xml/src.lst toolkit/util/toolkit.xml Change-Id: Ic415a96fe6ba7040a3b03fd562f997d2df1516d6 diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_01.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_01.png deleted file mode 100644 index 2c6b693..000 Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_01.png and /dev/null differ diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_02.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_02.png deleted file mode 100644 index 4662ddf..000 Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_02.png and
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 55/69d97f06a0299e41b91ca248bf7eaa038b1f21
55/69d97f06a0299e41b91ca248bf7eaa038b1f21 |1 + 1 file changed, 1 insertion(+) New commits: commit 868c0c1fba6b4499d95aff6b5fa88752829de7c4 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 10:05:36 2013 +0100 Notes added by 'git notes add' diff --git a/55/69d97f06a0299e41b91ca248bf7eaa038b1f21 b/55/69d97f06a0299e41b91ca248bf7eaa038b1f21 new file mode 100644 index 000..8bb3645 --- /dev/null +++ b/55/69d97f06a0299e41b91ca248bf7eaa038b1f21 @@ -0,0 +1 @@ +merged as: 680608b15dd158f9ad4ceae328abb10b5185a27b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/toolkit offapi/com offapi/UnoApi_offapi.mk qadevOOo/objdsc toolkit/Library_tk.mk toolkit/qa toolkit/source toolkit/util
include/toolkit/helper/servicenames.hxx |2 offapi/UnoApi_offapi.mk |3 offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl | 48 -- offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl | 47 -- offapi/com/sun/star/awt/WindowDescriptor.idl |1 offapi/com/sun/star/awt/XSimpleAnimation.idl | 45 -- qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControl.csv | 36 - qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel.csv | 29 - toolkit/Library_tk.mk |2 toolkit/qa/unoapi/knownissues.xcl | 11 toolkit/qa/unoapi/toolkit.sce |2 toolkit/source/awt/vclxtoolkit.cxx | 11 toolkit/source/awt/xsimpleanimation.cxx | 142 --- toolkit/source/controls/tksimpleanimation.cxx | 183 -- toolkit/source/helper/registerservices.cxx |5 toolkit/source/helper/servicenames.cxx |2 toolkit/util/tk.component |8 17 files changed, 1 insertion(+), 576 deletions(-) New commits: commit 303096c50c850b05a158a1a429c9fd5d0251a892 Author: Ariel Constenla-Haile arie...@apache.org Date: Thu Dec 20 03:56:35 2012 + Related: #i121514# Remove deprecated UnoControlSimpleAnimation (cherry picked from commit 514bb6777e001d02dbd9be63fc7a6187560aad63) Conflicts: offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl offapi/com/sun/star/awt/XSimpleAnimation.idl offapi/com/sun/star/awt/makefile.mk offapi/type_reference/typelibrary_history.txt offapi/type_reference/types.rdb toolkit/inc/toolkit/helper/servicenames.hxx toolkit/source/awt/vclxtoolkit.cxx toolkit/source/awt/xsimpleanimation.cxx toolkit/source/controls/tksimpleanimation.cxx toolkit/source/helper/registerservices.cxx toolkit/source/helper/servicenames.cxx toolkit/util/toolkit.xml Change-Id: If7f8de62713e28434e28975026cf8e5c66c831aa diff --git a/include/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx index 32b964a..fffdc16 100644 --- a/include/toolkit/helper/servicenames.hxx +++ b/include/toolkit/helper/servicenames.hxx @@ -97,8 +97,6 @@ extern const sal_Char szServiceName_DefaultGridColumnModel[]; extern const sal_Char szServiceName_GridColumn[]; extern const sal_Char szServiceName_SortableGridDataModel[]; -extern const sal_Char szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[]; -extern const sal_Char szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[]; extern const sal_Char szServiceName_AnimatedImagesControl[]; extern const sal_Char szServiceName_AnimatedImagesControlModel[]; extern const sal_Char szServiceName_SpinningProgressControlModel[]; diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index ad51c73..c743345 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -573,8 +573,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ UnoControlRoadmapModel \ UnoControlScrollBar \ UnoControlScrollBarModel \ - UnoControlSimpleAnimation \ - UnoControlSimpleAnimationModel \ UnoControlSpinButton \ UnoControlSpinButtonModel \ UnoControlTimeField \ @@ -1853,7 +1851,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\ XRequestCallback \ XReschedule \ XScrollBar \ - XSimpleAnimation \ XSimpleTabController \ XSpinField \ XSpinListener \ diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl deleted file mode 100644 index 94bcf2f..000 --- a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 51/4bb6777e001d02dbd9be63fc7a6187560aad63
51/4bb6777e001d02dbd9be63fc7a6187560aad63 |1 + 1 file changed, 1 insertion(+) New commits: commit 688316e3420ae235503615493d918243d69e8ef5 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 10:34:01 2013 +0100 Notes added by 'git notes add' diff --git a/51/4bb6777e001d02dbd9be63fc7a6187560aad63 b/51/4bb6777e001d02dbd9be63fc7a6187560aad63 new file mode 100644 index 000..d3fe696 --- /dev/null +++ b/51/4bb6777e001d02dbd9be63fc7a6187560aad63 @@ -0,0 +1 @@ +merged as: 303096c50c850b05a158a1a429c9fd5d0251a892 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 48/c6a4e849baaff4da51275f75ee4ae04fdabbdf
48/c6a4e849baaff4da51275f75ee4ae04fdabbdf |1 + 1 file changed, 1 insertion(+) New commits: commit d35b2c8947fdb1aea1505e4f8f9180d8796ff3be Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 10:39:43 2013 +0100 Notes added by 'git notes add' diff --git a/48/c6a4e849baaff4da51275f75ee4ae04fdabbdf b/48/c6a4e849baaff4da51275f75ee4ae04fdabbdf new file mode 100644 index 000..1d869e5 --- /dev/null +++ b/48/c6a4e849baaff4da51275f75ee4ae04fdabbdf @@ -0,0 +1 @@ +prefer: 28327c28ced32f181ed9b5c4921fd844e549980d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo39001.rtf | 22 ++ sw/qa/extras/rtfimport/rtfimport.cxx |8 writerfilter/source/rtftok/rtfdocumentimpl.cxx | 12 +++- 3 files changed, 37 insertions(+), 5 deletions(-) New commits: commit 4108f285207ed4a60c8876a8206bc5f2d7f05620 Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 5 11:37:24 2013 +0200 fdo#39001 RTF import: fix fake empty page at the end of the doc In case we have a \sect, there was no \sbknone (so it counts as a page break as well) and there is nothing after it, we should not make extra efforts to make that have some effect, but adding at least one empty paragraph to that new page. Change-Id: Ibcbecabcb590ed34ef96a97698e4ab8f638d3483 diff --git a/sw/qa/extras/rtfimport/data/fdo39001.rtf b/sw/qa/extras/rtfimport/data/fdo39001.rtf new file mode 100644 index 000..939b21d --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo39001.rtf @@ -0,0 +1,22 @@ +{\rtf1 \ansi +{\*\generator Apache XML Graphics RTF Library;} +\fet0 \ftnbj \paperw11905 \paperh16837 \margt2267 \margb1133 \margl1417 \margr1417 \headery2267 \footery1984 \itap0 +\sectd +{\li0 \f3 \b0 \ql \ri0 \fs24 \cf1 \i0 +{\f3 \strike0 \ul0 \b0 \sa0 \sb0 \fs24 \cf1 \i0 +FIRST PAGE +\par +} +}\sect \sbkpage +{\li0 \f3 \b0 \ql \ri0 \fs24 \cf1 \i0 +{\f3 \strike0 \ul0 \b0 \sa0 \sb0 \fs24 \cf1 \i0 +NEXT PAGE +\par +} +} +{\li0 \f3 \sbkpage \b0 \ql \sect \ri0 \fs24 \cf1 \i0 +{\f3 \strike0 \ul0 \b0 \sa0 \sb0 \fs24 \cf1 \i0 +LAST PAGE +\par +} +}\sect } diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 6b628c3..b22e729 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -150,6 +150,7 @@ public: void testFdo66040(); void testN823675(); void testFdo47802(); +void testFdo39001(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -285,6 +286,7 @@ void Test::run() {fdo66040.rtf, Test::testFdo66040}, {n823675.rtf, Test::testN823675}, {fdo47802.rtf, Test::testFdo47802}, +{fdo39001.rtf, Test::testFdo39001}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -1387,6 +1389,12 @@ void Test::testFdo47802() CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws-getCount()); } +void Test::testFdo39001() +{ +// Document was of 4 pages, \sect at the end of the doc wasn't ignored. +CPPUNIT_ASSERT_EQUAL(3, getPages()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 96bfce6..56d8a1b 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -505,8 +505,11 @@ void RTFDocumentImpl::sectBreak(bool bFinal = false) { SAL_INFO(writerfilter, OSL_THIS_FUNC : final? bFinal , needed? m_bNeedSect); bool bNeedSect = m_bNeedSect; -// If there is no paragraph in this section, then insert a dummy one, as required by Writer -if (m_bNeedPar) +RTFValue::Pointer_t pBreak = m_aStates.top().aSectionSprms.find(NS_sprm::LN_SBkc); +bool bContinuous = pBreak.get() pBreak-getInt() == 0; +// If there is no paragraph in this section, then insert a dummy one, as required by Writer, +// unless this is the end of the doc, we had nothing since the last section break and this is not a continuous one. +if (m_bNeedPar !(bFinal !m_bNeedSect !bContinuous)) dispatchSymbol(RTF_PAR); // It's allowed to not have a non-table paragraph at the end of an RTF doc, add it now if required. if (m_bNeedFinalPar bFinal) @@ -525,9 +528,8 @@ void RTFDocumentImpl::sectBreak(bool bFinal = false) // last control word in the document is a section break itself. if (!bNeedSect || !m_bHadSect) { -RTFValue::Pointer_t pBreak = m_aStates.top().aSectionSprms.find(NS_sprm::LN_SBkc); -// In case the last section is a continous one, we don't need to output a section break. -if (bFinal pBreak.get() !pBreak-getInt()) +// In case the last section is a continuous one, we don't need to output a section break. +if (bFinal bContinuous) m_aStates.top().aSectionSprms.erase(NS_sprm::LN_SBkc); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - basic/source include/osl include/tools oox/source package/source sal/osl sdext/source ucb/source
basic/source/runtime/methods.cxx |2 +- include/osl/time.h| 10 +- include/tools/date.hxx|1 + oox/source/docprop/docprophandler.cxx |2 +- package/source/zipapi/ZipOutputStream.cxx | 17 +++-- sal/osl/unx/time.c| 13 + sal/osl/w32/time.c|8 sdext/source/presenter/PresenterToolBar.cxx |2 +- ucb/source/ucp/webdav-neon/DateTimeHelper.cxx |4 ++-- ucb/source/ucp/webdav/DateTimeHelper.cxx |4 ++-- 10 files changed, 37 insertions(+), 26 deletions(-) New commits: commit 4d220882b46d5f8edd4d09e5f66722cd296a092e Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 5 12:16:34 2013 +0200 hair splitting on years in dates in ZIP structure Change-Id: I9d7a6436e3df75eff592d19dcaca0f655ebf2160 diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index 7b2ae4f..22cc0b3 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -450,12 +450,25 @@ sal_uInt32 ZipOutputStream::getCurrentDosTime( ) osl_getSystemTime ( aTimeValue ); osl_getDateTimeFromTimeValue( aTimeValue, aDateTime); +// at year 2108, there is an overflow +// - some decision needs to be made +// how to handle the ZIP file format (just overflow?) + +// if the current system time is before 1980, +// then the time traveller will have to make a decision +// how to handle the ZIP file format before it is invented +// (just underflow?) + +assert(aDateTime.Year 1980 aDateTime.Year 2108); + sal_uInt32 nYear = static_cast sal_uInt32 (aDateTime.Year); -if (nYear1980) +if (nYear=1980) nYear-=1980; -else if (nYear80) +else if (nYear=80) +{ nYear-=80; +} sal_uInt32 nResult = static_cast sal_uInt32( ( ( ( aDateTime.Day) + ( 32 * (aDateTime.Month)) + ( 512 * nYear ) ) 16) | commit 6e82772db5ade43fc9f4f7181303264d2748d2a1 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 5 12:14:46 2013 +0200 TODO note for future *internal* API change Signed year so that ~all our date types have about the same capacities. Change-Id: Iab8a66bee0eb22ffd04608c345302218094e53a7 diff --git a/include/tools/date.hxx b/include/tools/date.hxx index 5b451a3..87ba277 100644 --- a/include/tools/date.hxx +++ b/include/tools/date.hxx @@ -27,6 +27,7 @@ class ResId; enum DayOfWeek { MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY }; +// TODO FIXME: make it handle signed year? class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Date { private: commit fa6ce5a6e8c35430977857477fc09f6a03698e63 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 5 12:13:36 2013 +0200 API change: osl/time.h take const pointers where appropriate Should be backwards-compatible... Change-Id: I6b04bec2c032ff8c57a1b5192b2d3962dcc96c84 diff --git a/include/osl/time.h b/include/osl/time.h index 6bb48f2..484adb0 100644 --- a/include/osl/time.h +++ b/include/osl/time.h @@ -111,7 +111,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getSystemTime( @return sal_False if any error occurs else sal_True. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( -TimeValue* pTimeVal, oslDateTime* pDateTime ); +const TimeValue* pTimeVal, oslDateTime* pDateTime ); /** Get the GMT from a oslDateTime and fill a TimeValue @@ -121,7 +121,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( @return sal_False if any error occurs else sal_True. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getTimeValueFromDateTime( -oslDateTime* pDateTime, TimeValue* pTimeVal ); +const oslDateTime* pDateTime, TimeValue* pTimeVal ); /** Convert GMT to local time @@ -131,7 +131,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getTimeValueFromDateTime( @return sal_False if any error occurs else sal_True. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( -TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal ); +const TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal ); /** Convert local time to GMT @@ -141,7 +141,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( @return sal_False if any error occurs else sal_True. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( -TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal ); +const TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal ); /** Get the value of the global timer diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c index d038f46..24947b1 100644 --- a/sal/osl/unx/time.c +++ b/sal/osl/unx/time.c @@ -92,7 +92,7 @@ sal_Bool SAL_CALL
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-31'
Tag 'suse-3.6-31' created by Andras Timar ati...@suse.com at 2013-07-05 11:30 -0700 suse-3.6-31 Changes since suse-3.6-12: Fridrich Å trba (2): Branch libreoffice-3-6-5 Version 3.6.5.2, tag libreoffice-3.6.5.2 Petr Mladek (1): Merge tag 'libreoffice-3.6.5.2' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-31'
Tag 'suse-3.6-31' created by Andras Timar ati...@suse.com at 2013-07-05 11:30 -0700 suse-3.6-31 Changes since suse-3.6-12: Fridrich Å trba (2): Branch libreoffice-3-6-5 Version 3.6.5.2, tag libreoffice-3.6.5.2 Petr Mladek (1): Merge tag 'libreoffice-3.6.5.2' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-31'
Tag 'suse-3.6-31' created by Andras Timar ati...@suse.com at 2013-07-05 11:30 -0700 suse-3.6-31 Changes since suse-3.6-12: Andras Timar (3): updated pt-PT spelling dictionary fdo#56130 update Galician dictionary pack Update pt-PT dictionary Fridrich Å trba (2): Branch libreoffice-3-6-5 Version 3.6.5.2, tag libreoffice-3.6.5.2 Lior Kaplan (1): Update Hebrew dictionary to one created with Hspell 1.2 (taken from Fedora 17 64bit) Olivier Hallot (1): Fix for fdo#53520, Portuguese spelling files Petr Mladek (1): Merge tag 'libreoffice-3.6.5.2' into suse-3.6 --- dictionaries/pt_PT/description.xml |2 dictionaries/pt_PT/pt_PT.dic | 257 - 2 files changed, 144 insertions(+), 115 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-31'
Tag 'suse-3.6-31' created by Andras Timar ati...@suse.com at 2013-07-05 11:30 -0700 suse-3.6-31 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-31'
Tag 'suse-3.6-31' created by Andras Timar ati...@suse.com at 2013-07-05 11:30 -0700 suse-3.6-31 Changes since suse-3.6-30-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - basic/source oox/source
basic/source/runtime/methods.cxx |2 +- oox/source/docprop/docprophandler.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit f8734b5fe4ca94ba0928b82b21faa0b54f363772 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 5 09:53:57 2013 +0200 fixup nanosecond precision oox/source/docprop/docprophandler.cxx: DateTime used to take centiseconds, now it is nanoseconds. basic/source/runtime/methods.cxx: This was broken before... Time used to take centiseconds, so the nanoseconds should have been *divided* by 10^7 for conversion. Now Time takes straight nanoseconds, so no conversion necessary. Change-Id: Ia33b811d56fe5ad5e7e844b3e1c1c25ece0b5396 Reviewed-on: https://gerrit.libreoffice.org/4734 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 2fd3eb5..4a94763 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3094,7 +3094,7 @@ RTLFUNC(FileDateTime) oslDateTime aDT; osl_getDateTimeFromTimeValue( aTimeVal, aDT ); -aTime = Time( aDT.Hours, aDT.Minutes, aDT.Seconds, 1000*aDT.NanoSeconds ); +aTime = Time( aDT.Hours, aDT.Minutes, aDT.Seconds, aDT.NanoSeconds ); aDate = Date( aDT.Day, aDT.Month, aDT.Year ); } diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 08cfda0..974e5ab 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -153,7 +153,7 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString aChar } } -return util::DateTime( (sal_uInt16)( aOslDTime.NanoSeconds / 1e7 ), aOslDTime.Seconds, aOslDTime.Minutes, aOslDTime.Hours, aOslDTime.Day, aOslDTime.Month, aOslDTime.Year ); +return util::DateTime( aOslDTime.NanoSeconds, aOslDTime.Seconds, aOslDTime.Minutes, aOslDTime.Hours, aOslDTime.Day, aOslDTime.Month, aOslDTime.Year ); } // ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - i18nlangtag/source include/i18nlangtag include/xmloff svtools/source xmloff/source
i18nlangtag/source/isolang/isolang.cxx |1 + include/i18nlangtag/lang.h |1 + include/xmloff/xmltoken.hxx|5 + svtools/source/misc/langtab.src|1 + xmloff/source/core/xmltoken.cxx|5 + 5 files changed, 13 insertions(+) New commits: commit 93f53e400da509bc21ab78fe2ce79d73c82771ae Author: Eike Rathke er...@redhat.com Date: Fri Jul 5 12:41:21 2013 +0200 added Ngäbere_Panama [gym-PA] to language list, fdo#66602 Change-Id: I4592f868c4d17ece745db39b604aa0b75181ca27 diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index a27331f..a581b3e 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -516,6 +516,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_UDMURT,udm, RU }, { LANGUAGE_USER_CORNISH, kw, UK }, { LANGUAGE_USER_SAMI_PITE_SWEDEN, sje, SE }, +{ LANGUAGE_USER_NGAEBERE, gym, PA }, { LANGUAGE_MULTIPLE, mul,}, // multiple languages, many languages are used { LANGUAGE_UNDETERMINED, und,}, // undetermined language, language cannot be identified { LANGUAGE_NONE, zxx,}, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index c2281cb..a970bdb 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -559,6 +559,7 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_TIBETAN_INDIA 0x8051 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_TIBETAN)) */ #define LANGUAGE_USER_CORNISH 0x0688 #define LANGUAGE_USER_SAMI_PITE_SWEDEN 0x843B /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_SAMI_NORTHERN_NORWAY)) */ +#define LANGUAGE_USER_NGAEBERE 0x0689 #define LANGUAGE_USER_PRIV_JOKER0xFFEB /* privateuse * (sic! bad! nasty!), primary 0x3eb, sub 0x3f */ #define LANGUAGE_USER_PRIV_COMMENT 0xFFEC /* privateuse x-comment, primary 0x3ec, sub 0x3f */ diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index 15abc14..5c177e9 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -365,6 +365,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE Tibetan (India) ; LANGUAGE_USER_TIBETAN_INDIA ; ; Cornish ; LANGUAGE_USER_CORNISH ; ; Sami, Pite (Sweden) ; LANGUAGE_USER_SAMI_PITE_SWEDEN ; ; + Ngäbere ; LANGUAGE_USER_NGAEBERE ; ; }; }; commit 9f1c9edb7a914aa03a6236000aa45189a38bddf9 Author: Eike Rathke er...@redhat.com Date: Tue Jul 2 21:32:18 2013 +0200 added rfc-language-tag* tokens Change-Id: Ifef5ebf638863f4b0fa6f985ad2e84359b75b708 diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 651732e2..a47dedd 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3203,6 +3203,11 @@ namespace xmloff { namespace token { XML_ERROR_STANDARD_WEIGHT, // errorbar standard deviation error weight +// erAck: 2013-07-02 BCP 47 language tags +XML_RFC_LANGUAGE_TAG, +XML_RFC_LANGUAGE_TAG_ASIAN, +XML_RFC_LANGUAGE_TAG_COMPLEX, + XML_TOKEN_END }; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 5004a4c..07934bb 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3204,6 +3204,11 @@ namespace xmloff { namespace token { TOKEN( std-weight, XML_ERROR_STANDARD_WEIGHT ), +// erAck: 2013-07-02 BCP 47 language tags +TOKEN( rfc-language-tag, XML_RFC_LANGUAGE_TAG ), +TOKEN( rfc-language-tag-asian,XML_RFC_LANGUAGE_TAG_ASIAN ), +TOKEN( rfc-language-tag-complex, XML_RFC_LANGUAGE_TAG_COMPLEX ), + #if OSL_DEBUG_LEVEL 0 { 0, NULL, NULL, XML_TOKEN_END } #else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Impress Remote Protocol
Hello all, I've been working on the iOS app and I'm wondering if it's better for users to actually see the first slide before click on the start presentation button? Here is a screen shot of what I've implemented for now, that is, once paired, users will be brought to this page and on the top, users can have a quick preview (first slide for ex) of what will be displayed on the PC. That way users are sure about what will be displayed. [image: Images intégrées 2] For now, the server end will not send previews until either the user hits the start presentation button, or the PC side starts it. Besides, we can actually start sending these previews once we are paired can't we? At least for the first several slides, so that users don't need to wait for the previews transmission when they start the presentation. Did I miss something here? Let me know what you think ;) Cheers, Siqi 2013/6/16 Artur Dryomov artur.dryo...@gmail.com Hi All again, If everybody is against the more high-level version of the protocol and you vote for the plain text one — so be it, then. I read reviews at the Google Play page — only English and Russian ones because we still don’t know who rules the developer account. It seems like all features were mentioned at the wiki page. Other things are application-related. Feel free to post messages with ideas or edit the wiki page anyway! Regards, Artur. -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- iOS Simulator Screen shot Jul 5, 2013, 12.49.20 PM.png___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LO 4.0.4.2 on illumos based OS
Hi Gabriele, On Fri, 2013-07-05 at 08:14 +0200, Gabriele Bulfon wrote: Hi Michael, would be a great idea the tinderbox setup. I will send you the link of the XStream Desktop iso as soon as we have it out. Wonderful. BTW, can you help me with this? I really don't know what problem is thismust be something about gnu ld, but I had more experience with Sun ld. ... [build LNK] Executable/unopkg.bin /usr/gnu/bin/ld: /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/LinkTarget/Executable/unopkg.bin: hidden symbol `main' in /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/CObject/desktop/source/pkgchk/unopkg/unopkg_main.o is referenced by DSO /usr/gnu/bin/ld: final link failed: Bad value collect2: ld returned 1 exit status Looks like a mis-interaction with some visibility markup - though clearly getting more output would be good: cd desktop make gives a more verbose make. Try something like the attached; if that works we should get it into master and -4-1 :-) HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot diff --git a/include/sal/main.h b/include/sal/main.h index 634b57c..d5c227c 100644 --- a/include/sal/main.h +++ b/include/sal/main.h @@ -43,7 +43,7 @@ SAL_DLLPUBLIC void SAL_CALL sal_detail_deinitialize(); #else #define SAL_MAIN_WITH_ARGS_IMPL \ -int SAL_CALL main(int argc, char ** argv) \ +int SAL_DLLPUBLIC SAL_CALL main(int argc, char ** argv) \ { \ int ret; \ sal_detail_initialize(argc, argv); \ @@ -53,7 +53,7 @@ int SAL_CALL main(int argc, char ** argv) \ } #define SAL_MAIN_IMPL \ -int SAL_CALL main(int argc, char ** argv) \ +int SAL_DLLPUBLIC SAL_CALL main(int argc, char ** argv) \ { \ int ret; \ sal_detail_initialize(argc, argv); \ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libexttextcat.git: ChangeLog configure.ac src/exttextcat-version.h src/win32_config.h
ChangeLog|5 + configure.ac |2 +- src/exttextcat-version.h |4 ++-- src/win32_config.h |4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) New commits: commit 4a399ee01951f86d55bdbb9ec31917a8074ba971 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 12:27:21 2013 +0100 bump release diff --git a/ChangeLog b/ChangeLog index 14728a9..4940a5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 05 2013 Caolán McNamara (caol...@redhat.com) + * bump release + + overlapping memcpy + + allow old spelling of TEXTCAT_RESULT_UNKOWN. + Wed May 29 2013 Caolán McNamara (caol...@redhat.com) * merge in Giulio's work and bump release + Updated libexttextcat.vapi. diff --git a/configure.ac b/configure.ac index 1625f6b..39917ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m4_define([exttextcat_version_major],[3]) m4_define([exttextcat_version_minor],[4]) -m4_define([exttextcat_version_micro],[1]) +m4_define([exttextcat_version_micro],[2]) m4_define([exttextcat_version],[exttextcat_version_major.exttextcat_version_minor.exttextcat_version_micro]) AC_PREREQ([2.68]) diff --git a/src/exttextcat-version.h b/src/exttextcat-version.h index 25ca683..a370b6f 100644 --- a/src/exttextcat-version.h +++ b/src/exttextcat-version.h @@ -1,9 +1,9 @@ #ifndef EXTTEXTCAT_VERSION_H #define EXTTEXTCAT_VERSION_H -#define EXTTEXTCAT_VERSION 3.4.1 +#define EXTTEXTCAT_VERSION 3.4.2 #define EXTTEXTCAT_VERSION_MAJOR 3 #define EXTTEXTCAT_VERSION_MINOR 4 -#define EXTTEXTCAT_VERSION_MICRO 1 +#define EXTTEXTCAT_VERSION_MICRO 2 #endif diff --git a/src/win32_config.h b/src/win32_config.h index 3129773..26cdef3 100644 --- a/src/win32_config.h +++ b/src/win32_config.h @@ -57,7 +57,7 @@ #define PACKAGE_NAME libexttextcat /* Define to the full name and version of this package. */ -#define PACKAGE_STRING libexttextcat 3.0.1 +#define PACKAGE_STRING libexttextcat 3.4.2 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME libexttextcat @@ -72,6 +72,6 @@ #define TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define VERSION 3.4.1 +#define VERSION 3.4.2 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libexttextcat.git: configure.ac src/exttextcat-version.h src/win32_config.h
configure.ac |2 +- src/exttextcat-version.h |4 ++-- src/win32_config.h |4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 92fdaac5dd3158570f42b55a2c8a39d4cc63dc4e Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 12:37:44 2013 +0100 I hate git tag diff --git a/configure.ac b/configure.ac index 39917ed..a412a42 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m4_define([exttextcat_version_major],[3]) m4_define([exttextcat_version_minor],[4]) -m4_define([exttextcat_version_micro],[2]) +m4_define([exttextcat_version_micro],[3]) m4_define([exttextcat_version],[exttextcat_version_major.exttextcat_version_minor.exttextcat_version_micro]) AC_PREREQ([2.68]) diff --git a/src/exttextcat-version.h b/src/exttextcat-version.h index a370b6f..a54fe26 100644 --- a/src/exttextcat-version.h +++ b/src/exttextcat-version.h @@ -1,9 +1,9 @@ #ifndef EXTTEXTCAT_VERSION_H #define EXTTEXTCAT_VERSION_H -#define EXTTEXTCAT_VERSION 3.4.2 +#define EXTTEXTCAT_VERSION 3.4.3 #define EXTTEXTCAT_VERSION_MAJOR 3 #define EXTTEXTCAT_VERSION_MINOR 4 -#define EXTTEXTCAT_VERSION_MICRO 2 +#define EXTTEXTCAT_VERSION_MICRO 3 #endif diff --git a/src/win32_config.h b/src/win32_config.h index 26cdef3..7a70af8 100644 --- a/src/win32_config.h +++ b/src/win32_config.h @@ -57,7 +57,7 @@ #define PACKAGE_NAME libexttextcat /* Define to the full name and version of this package. */ -#define PACKAGE_STRING libexttextcat 3.4.2 +#define PACKAGE_STRING libexttextcat 3.4.3 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME libexttextcat @@ -72,6 +72,6 @@ #define TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define VERSION 3.4.2 +#define VERSION 3.4.3 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libexttextcat.git: Changes to 'refs/tags/v3.4.3'
Tag 'v3.4.3' created by Caolán McNamara caol...@redhat.com at 2013-07-05 12:38 -0700 bump release Changes since v3.4.1-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/objdsc
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv |1 - 1 file changed, 1 deletion(-) New commits: commit 6be6700edb3b704d62d8b331ba95f227617c57d3 Author: Michael Stahl mst...@redhat.com Date: Fri Jul 5 13:36:23 2013 +0200 temporarily disable failing chart2 ChXDiagram RegressionCurves test Change-Id: I29d79338fb1af00337176c11bfd984ce26c37df6 diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv index 6fa7833..8976f4a 100644 --- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv +++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv @@ -73,7 +73,6 @@ ChXDiagram;com::sun::star::chart::ChartStatistics;PercentageError ChXDiagram;com::sun::star::chart::ChartStatistics;ErrorMargin ChXDiagram;com::sun::star::chart::ChartStatistics;ErrorIndicator -ChXDiagram;com::sun::star::chart::ChartStatistics;RegressionCurves ChXDiagram;com::sun::star::chart::X3DDisplay;getWall() ChXDiagram;com::sun::star::chart::X3DDisplay;getFloor() ChXDiagram;com::sun::star::chart::StackableDiagram;Percent ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst libexttextcat/android.patch libexttextcat/exttextcat-memcpy.patch.1 libexttextcat/UnpackedTarball_exttextcat.mk
download.lst|2 +- libexttextcat/UnpackedTarball_exttextcat.mk |5 - libexttextcat/android.patch | 20 libexttextcat/exttextcat-memcpy.patch.1 | 16 4 files changed, 1 insertion(+), 42 deletions(-) New commits: commit 54d9022c39cf6a6cd8610a49dd767583ef2ff444 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 12:51:24 2013 +0100 bump libexttextcat Change-Id: If6a89aa46a4252e2652062288f19173267daf03a diff --git a/download.lst b/download.lst index 9d73b8d..e5b5704 100644 --- a/download.lst +++ b/download.lst @@ -56,7 +56,7 @@ export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.z export JPEG_TARBALL := a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_TARBALL := 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz -export LIBEXTTEXTCAT_TARBALL := dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 +export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz export LIBXML_TARBALL := 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz diff --git a/libexttextcat/UnpackedTarball_exttextcat.mk b/libexttextcat/UnpackedTarball_exttextcat.mk index 1bf53fb..9a272b5 100644 --- a/libexttextcat/UnpackedTarball_exttextcat.mk +++ b/libexttextcat/UnpackedTarball_exttextcat.mk @@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,exttextcat)) $(eval $(call gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\ - libexttextcat/android.patch \ - libexttextcat/exttextcat-memcpy.patch.1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libexttextcat/android.patch b/libexttextcat/android.patch deleted file mode 100644 index 467caba..000 --- a/libexttextcat/android.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libexttextcat-3.4.0/config.sub -+++ misc/build/libexttextcat-3.4.0/config.sub -@@ -120,7 +120,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) -@@ -1250,7 +1250,7 @@ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ --| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/libexttextcat/exttextcat-memcpy.patch.1 b/libexttextcat/exttextcat-memcpy.patch.1 deleted file mode 100644 index b3e399a..000 --- a/libexttextcat/exttextcat-memcpy.patch.1 +++ /dev/null @@ -1,16 +0,0 @@ -fix overlapped memcpy in heapextract - a/src/fingerprint.c 2013-07-04 22:53:25.674741538 +0200 -+++ b/src/fingerprint.c2013-07-04 22:54:09.009741166 +0200 -@@ -254,7 +254,10 @@ - p = (t-heap[0]); - - memcpy(item, p, sizeof(entry_t)); --memcpy((t-heap[0]), (t-heap[t-size - 1]), sizeof(entry_t)); -+if (t-size 1) -+{ -+memcpy((t-heap[0]), (t-heap[t-size - 1]), sizeof(entry_t)); -+} - - siftdown(t, t-size, 0); - t-size--; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e0/45f9900cdf2eadeeb6b1dd4a9adf40ca2069e9
e0/45f9900cdf2eadeeb6b1dd4a9adf40ca2069e9 |1 + 1 file changed, 1 insertion(+) New commits: commit c64c81b84e2f000a3130778a8566b8e27faa0516 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 12:58:02 2013 +0100 Notes added by 'git notes add' diff --git a/e0/45f9900cdf2eadeeb6b1dd4a9adf40ca2069e9 b/e0/45f9900cdf2eadeeb6b1dd4a9adf40ca2069e9 new file mode 100644 index 000..00b55a3 --- /dev/null +++ b/e0/45f9900cdf2eadeeb6b1dd4a9adf40ca2069e9 @@ -0,0 +1 @@ +ignore: branding ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Common place for math algorithms like gauss elimination (gauss.hxx)
Hi, For polynomial regression curve calculation I used gauss elimination which is already used in basegfx [1]. As this is a basegfx private file I copied it to chart2 temporary (as I did not yet know if it is useful to me in the time of exploration) but now I want to find a common home for this file so both basegfx and chart2 can use it. Where is the usual place for such math algorithms? Should I put it into sal module or is there a better place? Regards, Tomaž [1] http://cgit.freedesktop.org/libreoffice/core/tree/basegfx/source/workbench/gauss.hxx ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4f/9ac2af7157786ee6fba46551bd6782730d8b55
4f/9ac2af7157786ee6fba46551bd6782730d8b55 |1 + 1 file changed, 1 insertion(+) New commits: commit f251d6bfc1214f70d60a1eae7da2f635d72e0d07 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 13:57:50 2013 +0100 Notes added by 'git notes add' diff --git a/4f/9ac2af7157786ee6fba46551bd6782730d8b55 b/4f/9ac2af7157786ee6fba46551bd6782730d8b55 new file mode 100644 index 000..d576cb3 --- /dev/null +++ b/4f/9ac2af7157786ee6fba46551bd6782730d8b55 @@ -0,0 +1 @@ +merged as: c61c5a240314f1899a2160a97e00e2108104e4bd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8d/4d9f11b6c205407136d5feb9668c748b9794e1
8d/4d9f11b6c205407136d5feb9668c748b9794e1 |1 + 1 file changed, 1 insertion(+) New commits: commit 486bc027dba43330415c0c04e01a544bba6f4410 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 14:02:23 2013 +0100 Notes added by 'git notes add' diff --git a/8d/4d9f11b6c205407136d5feb9668c748b9794e1 b/8d/4d9f11b6c205407136d5feb9668c748b9794e1 new file mode 100644 index 000..a2885e5 --- /dev/null +++ b/8d/4d9f11b6c205407136d5feb9668c748b9794e1 @@ -0,0 +1 @@ +merged as: 1d13a96bf567ce83b9db2f65eaf1e717757c1a44 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.hxx| 189 ++-- writerfilter/source/rtftok/rtflistener.hxx| 203 ++ writerfilter/source/rtftok/rtfskipdestination.cxx |4 writerfilter/source/rtftok/rtfskipdestination.hxx |6 writerfilter/source/rtftok/rtftokenizer.cxx |5 writerfilter/source/rtftok/rtftokenizer.hxx |9 6 files changed, 240 insertions(+), 176 deletions(-) New commits: commit 8bbe32f26a5cf26311ab803b4bf2d32aac93c24d Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 5 12:56:02 2013 +0200 RTF import: extract RTFListener out of RTFDocumentImpl Change-Id: I735f6a3148ece6f28644c5433180482f8cc1323f diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 0d77b6e..5c39af1 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -24,149 +24,12 @@ #include rtftok/RTFDocument.hxx #include rtfreferencetable.hxx #include rtfsprm.hxx +#include rtflistener.hxx class SvStream; namespace writerfilter { namespace rtftok { -enum RTFInternalState -{ -INTERNAL_NORMAL, -INTERNAL_BIN, -INTERNAL_HEX -}; - -// Note that this is not a 1:1 mapping between destination control -// words, e.g. RTF_PICT gets mapped to DESTINATION_PICT or -// DESTINATION_SHAPEPROPERTYVALUEPICT, etc. -enum RTFDestinationState -{ -DESTINATION_NORMAL, -DESTINATION_SKIP, -DESTINATION_FONTTABLE, -DESTINATION_FONTENTRY, -DESTINATION_COLORTABLE, -DESTINATION_STYLESHEET, -DESTINATION_STYLEENTRY, -DESTINATION_FIELD, -DESTINATION_FIELDINSTRUCTION, -DESTINATION_FIELDRESULT, -DESTINATION_LISTTABLE, -DESTINATION_LISTPICTURE, -DESTINATION_LISTENTRY, -DESTINATION_LISTOVERRIDETABLE, -DESTINATION_LISTOVERRIDEENTRY, -DESTINATION_LISTLEVEL, -DESTINATION_LEVELTEXT, -DESTINATION_LEVELNUMBERS, -DESTINATION_SHPPICT, -DESTINATION_PICT, -DESTINATION_PICPROP, -DESTINATION_SHAPEPROPERTY, -DESTINATION_SHAPEPROPERTYNAME, -DESTINATION_SHAPEPROPERTYVALUE, -DESTINATION_SHAPE, -DESTINATION_SHAPEINSTRUCTION, -DESTINATION_SHAPEPROPERTYVALUEPICT, -DESTINATION_NESTEDTABLEPROPERTIES, -DESTINATION_FOOTNOTE, -DESTINATION_BOOKMARKSTART, -DESTINATION_BOOKMARKEND, -DESTINATION_REVISIONTABLE, -DESTINATION_REVISIONENTRY, -DESTINATION_SHAPETEXT, -DESTINATION_FORMFIELD, -DESTINATION_FORMFIELDNAME, -DESTINATION_FORMFIELDLIST, -DESTINATION_DATAFIELD, -DESTINATION_INFO, -DESTINATION_CREATIONTIME, -DESTINATION_REVISIONTIME, -DESTINATION_PRINTTIME, -DESTINATION_AUTHOR, -DESTINATION_KEYWORDS, -DESTINATION_OPERATOR, -DESTINATION_COMPANY, -DESTINATION_COMMENT, -DESTINATION_OBJECT, -DESTINATION_OBJDATA, -DESTINATION_RESULT, -DESTINATION_ANNOTATIONDATE, -DESTINATION_ANNOTATIONAUTHOR, -DESTINATION_FALT, -DESTINATION_FLYMAINCONTENT, -DESTINATION_DRAWINGOBJECT, -DESTINATION_PARAGRAPHNUMBERING, -DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE, -DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER, -DESTINATION_TITLE, -DESTINATION_SUBJECT, -DESTINATION_DOCCOMM, -DESTINATION_ATNID, -DESTINATION_MOMATH, -DESTINATION_MR, -DESTINATION_MF, -DESTINATION_MFPR, -DESTINATION_MCTRLPR, -DESTINATION_MNUM, -DESTINATION_MDEN, -DESTINATION_MACC, -DESTINATION_MACCPR, -DESTINATION_MCHR, -DESTINATION_MPOS, -DESTINATION_MVERTJC, -DESTINATION_MSTRIKEH, -DESTINATION_MDEGHIDE, -DESTINATION_ME, -DESTINATION_MBAR, -DESTINATION_MBARPR, -DESTINATION_MD, -DESTINATION_MDPR, -DESTINATION_MBEGCHR, -DESTINATION_MSEPCHR, -DESTINATION_MENDCHR, -DESTINATION_MFUNC, -DESTINATION_MFUNCPR, -DESTINATION_MFNAME, -DESTINATION_MLIMLOW, -DESTINATION_MLIMLOWPR, -DESTINATION_MLIM, -DESTINATION_MM, -DESTINATION_MMPR, -DESTINATION_MMR, -DESTINATION_MNARY, -DESTINATION_MNARYPR, -DESTINATION_MSUB, -
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 17/b9c8d605cddf49adbbd0237a1e863fe7fd12e0
17/b9c8d605cddf49adbbd0237a1e863fe7fd12e0 |1 + 1 file changed, 1 insertion(+) New commits: commit 312b142b61de8a3843908b261f22092fbfc08b0e Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 14:28:30 2013 +0100 Notes added by 'git notes add' diff --git a/17/b9c8d605cddf49adbbd0237a1e863fe7fd12e0 b/17/b9c8d605cddf49adbbd0237a1e863fe7fd12e0 new file mode 100644 index 000..d12f95f --- /dev/null +++ b/17/b9c8d605cddf49adbbd0237a1e863fe7fd12e0 @@ -0,0 +1 @@ +prefer: 622ce4681dbcddfdd5cbcd95ebbf1f14e93489ed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRPath.cpp | 111 1 file changed, 77 insertions(+), 34 deletions(-) New commits: commit e5e26505e64487a1d292b3d59960456ee766830c Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jul 5 15:35:51 2013 +0200 Decompose Splines into a sequence of cubic beziers diff --git a/src/lib/CDRPath.cpp b/src/lib/CDRPath.cpp index 2d3e0b5..7f88933 100644 --- a/src/lib/CDRPath.cpp +++ b/src/lib/CDRPath.cpp @@ -28,6 +28,7 @@ */ #include math.h +#include map #include CDRPath.h #include CDRTypes.h @@ -126,6 +127,7 @@ public: CDRPathElement *clone(); private: std::vectorstd::pairdouble, double m_points; + unsigned knot(unsigned i) const; }; class CDRArcToElement : public CDRPathElement @@ -265,56 +267,97 @@ libcdr::CDRPathElement *libcdr::CDRQuadraticBezierToElement::clone() return new CDRQuadraticBezierToElement(m_x1, m_y1, m_x, m_y); } +#define CDR_SPLINE_DEGREE 3 + +unsigned libcdr::CDRSplineToElement::knot(unsigned i) const +{ + /* Emulates knot vector of an uniform B-Spline of degree 3 */ + if (i CDR_SPLINE_DEGREE) +return 0; + if (i m_points.size()) +return (unsigned)(m_points.size() - CDR_SPLINE_DEGREE); + else +return i - CDR_SPLINE_DEGREE; +} + void libcdr::CDRSplineToElement::writeOut(WPXPropertyListVector vec) const { WPXPropertyList node; -#if 0 node.insert(libwpg:path-action, M); node.insert(svg:x, m_points[0].first); node.insert(svg:y, m_points[0].second); vec.append(node); - for (unsigned j = 0; j m_points.size(); ++j) + /* Decomposition of a spline of 3rd degree into Bezier segments + * adapted from the algorithm DecomposeCurve (Les Piegl, Wayne Tiller: + * The NURBS Book, 2nd Edition, 1997 + */ + + unsigned m = m_points.size() + CDR_SPLINE_DEGREE + 1; + unsigned a = CDR_SPLINE_DEGREE; + unsigned b = CDR_SPLINE_DEGREE + 1; + std::vector std::pairdouble, double Qw(CDR_SPLINE_DEGREE+1), NextQw(CDR_SPLINE_DEGREE+1); + unsigned i = 0; + for (; i = CDR_SPLINE_DEGREE; i++) +Qw[i] = m_points[i]; + while (b m) { +i = b; +while (b m knot(b+1) == knot(b)) + b++; +unsigned mult = b - i + 1; +if (mult CDR_SPLINE_DEGREE) +{ + double numer = (double)(knot(b) - knot(a)); + unsigned j = CDR_SPLINE_DEGREE; + std::mapunsigned, double alphas; + for (; j mult; j--) +alphas[j-mult-1] = numer/double(knot(a+j)-knot(a)); + unsigned r = CDR_SPLINE_DEGREE - mult; + for (j=1; j=r; j++) + { +unsigned save = r - j; +unsigned s = mult+j; +for (unsigned k = CDR_SPLINE_DEGREE; k=s; k--) +{ + double alpha = alphas[k-s]; + Qw[k].first = alpha*Qw[k].first + (1.0-alpha)*Qw[k-1].first; + Qw[k].second = alpha*Qw[k].second + (1.0-alpha)*Qw[k-1].second; +} +if (b m) +{ + NextQw[save].first = Qw[CDR_SPLINE_DEGREE].first; + NextQw[save].second = Qw[CDR_SPLINE_DEGREE].second; +} + } +} +// Pass the segment to the path + node.clear(); -node.insert(libwpg:path-action, L); -node.insert(svg:x, m_points[j].first); -node.insert(svg:y, m_points[j].second); +node.insert(libwpg:path-action, C); +node.insert(svg:x1, Qw[1].first); +node.insert(svg:y1, Qw[1].second); +node.insert(svg:x2, Qw[2].first); +node.insert(svg:y2, Qw[2].second); +node.insert(svg:x, Qw[3].first); +node.insert(svg:y, Qw[3].second); + vec.append(node); - } - node.clear(); - node.insert(libwpg:path-action, M); - node.insert(svg:x, m_points[0].first); - node.insert(svg:y, m_points[0].second); - vec.append(node); -#endif - for (unsigned i = 1; i m_points.size()-1; i++) - { -node.clear(); -node.insert(libwpg:path-action, Q); -node.insert(svg:x1, m_points[i].first); -node.insert(svg:y1, m_points[i].second); -if (i m_points.size() - 2) -{ - node.insert(svg:x, (m_points[i].first+m_points[i+1].first)/2.0); - node.insert(svg:y, (m_points[i].second+m_points[i+1].second)/2.0); -} -else +std::swap(Qw, NextQw); + +if (b m) { - node.insert(svg:x, m_points[i+1].first); - node.insert(svg:y, m_points[i+1].second); + for (i=CDR_SPLINE_DEGREE-mult; i = CDR_SPLINE_DEGREE; i++) + { +Qw[i].first = m_points[b-CDR_SPLINE_DEGREE+i].first; +Qw[i].second = m_points[b-CDR_SPLINE_DEGREE+i].second; + } + a = b; + b++; } -vec.append(node); } - - // For the while, just move to the end point - node.clear(); - node.insert(libwpg:path-action, L); - node.insert(svg:x, m_points.back().first); - node.insert(svg:y, m_points.back().second); - vec.append(node); } void libcdr::CDRSplineToElement::transform(const CDRTransforms trafos) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc' - firebird/ExternalPackage_firebird.mk firebird/ExternalProject_firebird.mk firebird/firebird-cygwin-msvc.patch.1 firebird/UnpackedTarbal
firebird/ExternalPackage_firebird.mk |5 firebird/ExternalProject_firebird.mk | 10 firebird/UnpackedTarball_firebird.mk |5 firebird/firebird-cygwin-msvc.patch.1 | 1242 ++ 4 files changed, 1258 insertions(+), 4 deletions(-) New commits: commit 98824cb62ddfc247971b3fe444067f88e00ebb93 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 5 14:30:45 2013 +0100 Patch Firebird to build on cygwin/msvc. Change-Id: I56669eb98cdd3c6fab756898664751c349e8988e diff --git a/firebird/ExternalPackage_firebird.mk b/firebird/ExternalPackage_firebird.mk index 0a003d6..844678a 100644 --- a/firebird/ExternalPackage_firebird.mk +++ b/firebird/ExternalPackage_firebird.mk @@ -41,8 +41,13 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) $(eval $(call gb_ExternalPackage_set_outdir,firebird,$(INSTDIR))) +ifeq ($(OS)-$(COM),WNT-MSC) +$(eval $(call gb_ExternalPackage_add_file,firebird,ifbembed.dll,gen/firebird/bin/ifbembed.dll)) +$(eval $(call gb_ExternalPackage_add_file,firebird,ifbembed.lib,gen/firebird/bin/ifbembed.lib)) +else $(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) $(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5)) $(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so,gen/firebird/lib/libfbembed.so)) +endif # vim: set noet sw=4 ts=4: diff --git a/firebird/ExternalProject_firebird.mk b/firebird/ExternalProject_firebird.mk index ca28dbb..8853eca 100644 --- a/firebird/ExternalProject_firebird.mk +++ b/firebird/ExternalProject_firebird.mk @@ -33,14 +33,17 @@ $(call gb_ExternalProject_get_state_target,firebird,build): $(call gb_ExternalProject_run,build,\ unset MAKEFLAGS \ export PKG_CONFIG= \ -export CXXFLAGS=-L$(OUTDIR)/lib \ +export CXXFLAGS= \ $(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter NO,$(SYSTEM_ICU)), \ -I$(call gb_UnpackedTarball_get_dir,icu)/source \ -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ - ,$(ICU_CPPFLAGS)) \ -export LD_LIBRARY_PATH=$(OUTDIR)/lib \ + ,$(ICU_CPPFLAGS)) \ + -L$(OUTDIR)/lib \ + -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ +export LD_LIBRARY_PATH=$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ +export PATH=$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib) \ ./configure \ --without-editline \ --disable-superserver \ @@ -50,5 +53,4 @@ $(call gb_ExternalProject_get_state_target,firebird,build): $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(MAKE) firebird_embedded \ ) - # vim: set noet sw=4 ts=4: diff --git a/firebird/UnpackedTarball_firebird.mk b/firebird/UnpackedTarball_firebird.mk index 6ecc5fe..b37cebb 100644 --- a/firebird/UnpackedTarball_firebird.mk +++ b/firebird/UnpackedTarball_firebird.mk @@ -15,4 +15,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ firebird/firebird-icu.patch.1 \ )) +ifeq ($(OS)-$(COM),WNT-MSC) +$(eval $(call gb_UnpackedTarball_add_patches,firebird,\ + firebird/firebird-cygwin-msvc.patch.1 \ +)) +endif # vim: set noet sw=4 ts=4: diff --git a/firebird/firebird-cygwin-msvc.patch.1 b/firebird/firebird-cygwin-msvc.patch.1 new file mode 100644 index 000..4a2b714 --- /dev/null +++ b/firebird/firebird-cygwin-msvc.patch.1 @@ -0,0 +1,1242 @@ +diff -u firebird/builds/posix/make.defaults firebird/builds/posix/make.defaults +--- firebird/builds/posix/make.defaults2013-07-03 16:23:44.804062000 +0100 firebird/builds/posix/make.defaults2013-07-05 12:30:01.607151400 +0100 +@@ -49,7 +49,11 @@ + + FIREBIRD=$(GEN_ROOT)/firebird + INTERBASE=$(FIREBIRD) ++ifeq (@PLATFORM@,win32) ++FIREBIRD_LOCK=$(shell cygpath -w $(shell cd $(FIREBIRD); pwd) ) ++else + FIREBIRD_LOCK=$(shell cd $(FIREBIRD); pwd) ++endif + + export INTERBASE + export FIREBIRD +@@ -135,7 +139,11 @@ + CD= cd + CAT= cat + AR= ar @AR_OPTIONS@ crsu ++ifeq (@PLATFORM@,win32) ++LN= cp ++else + LN= @LN_S@ ++endif + RANLIB= @RANLIB@ + BTYACC=$(ROOT)/extern/btyacc/btyacc + +@@ -152,16 +160,28 @@ + STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS) $(CXXFLAGS) + + LINK_LIBS = @LIBS@ ++ifeq
[Libreoffice-commits] core.git: offapi/type_reference
offapi/type_reference/offapi.rdb |binary 1 file changed New commits: commit 78cd1a35171436b1c28361ee011b1c5ff4e4716e Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 5 14:44:45 2013 +0100 update reference rdb for removed deprecated idls offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl offapi/com/sun/star/awt/XSimpleAnimation.idl offapi/com/sun/star/awt/UnoControlThrobber.idl offapi/com/sun/star/awt/UnoControlThrobberModel.idl offapi/com/sun/star/awt/XThrobber.idl Change-Id: Id15bcda4258a5e46ff307b252d9b980e84da3152 diff --git a/offapi/type_reference/offapi.rdb b/offapi/type_reference/offapi.rdb index 9bba5b0..06daf3b 100644 Binary files a/offapi/type_reference/offapi.rdb and b/offapi/type_reference/offapi.rdb differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRPath.cpp | 24 ++-- 1 file changed, 22 insertions(+), 2 deletions(-) New commits: commit 8dadbeb2385227a5066beeacf1c48c5121b31a5d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jul 5 16:04:13 2013 +0200 Code for visual debugging of splines diff --git a/src/lib/CDRPath.cpp b/src/lib/CDRPath.cpp index 7f88933..c9e86db 100644 --- a/src/lib/CDRPath.cpp +++ b/src/lib/CDRPath.cpp @@ -36,6 +36,10 @@ #define M_PI 3.14159265358979323846 #endif +#ifndef DEBUG_SPLINES +#define DEBUG_SPLINES 0 +#endif + namespace libcdr { @@ -276,14 +280,30 @@ unsigned libcdr::CDRSplineToElement::knot(unsigned i) const return 0; if (i m_points.size()) return (unsigned)(m_points.size() - CDR_SPLINE_DEGREE); - else -return i - CDR_SPLINE_DEGREE; + return i - CDR_SPLINE_DEGREE; } void libcdr::CDRSplineToElement::writeOut(WPXPropertyListVector vec) const { WPXPropertyList node; +#if DEBUG_SPLINES + /* Code for visual debugging of the spline decomposition */ + + node.insert(libwpg:path-action, M); + node.insert(svg:x, m_points[0].first); + node.insert(svg:y, m_points[0].second); + vec.append(node); + + for (unsigned j = 0; j m_points.size(); ++j) + { +node.insert(libwpg:path-action, L); +node.insert(svg:x, m_points[j].first); +node.insert(svg:y, m_points[j].second); +vec.append(node); + } +#endif + node.insert(libwpg:path-action, M); node.insert(svg:x, m_points[0].first); node.insert(svg:y, m_points[0].second); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - basic/source oox/source
basic/source/runtime/methods.cxx |2 +- oox/source/docprop/docprophandler.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 4e1ea9d8f7bf86f26e1dd91283b98e87a0bd3ab5 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 5 09:53:57 2013 +0200 fixup nanosecond precision oox/source/docprop/docprophandler.cxx: DateTime used to take centiseconds, now it is nanoseconds. basic/source/runtime/methods.cxx: This was broken before... Time used to take centiseconds, so the nanoseconds should have been *divided* by 10^7 for conversion. Now Time takes straight nanoseconds, so no conversion necessary. Change-Id: Ia33b811d56fe5ad5e7e844b3e1c1c25ece0b5396 Reviewed-on: https://gerrit.libreoffice.org/4734 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com (cherry picked from commit f8734b5fe4ca94ba0928b82b21faa0b54f363772) Reviewed-on: https://gerrit.libreoffice.org/4739 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 2fd3eb5..4a94763 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3094,7 +3094,7 @@ RTLFUNC(FileDateTime) oslDateTime aDT; osl_getDateTimeFromTimeValue( aTimeVal, aDT ); -aTime = Time( aDT.Hours, aDT.Minutes, aDT.Seconds, 1000*aDT.NanoSeconds ); +aTime = Time( aDT.Hours, aDT.Minutes, aDT.Seconds, aDT.NanoSeconds ); aDate = Date( aDT.Day, aDT.Month, aDT.Year ); } diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 08cfda0..974e5ab 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -153,7 +153,7 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString aChar } } -return util::DateTime( (sal_uInt16)( aOslDTime.NanoSeconds / 1e7 ), aOslDTime.Seconds, aOslDTime.Minutes, aOslDTime.Hours, aOslDTime.Day, aOslDTime.Month, aOslDTime.Year ); +return util::DateTime( aOslDTime.NanoSeconds, aOslDTime.Seconds, aOslDTime.Minutes, aOslDTime.Hours, aOslDTime.Day, aOslDTime.Month, aOslDTime.Year ); } // ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 untracea...@nurfuerspam.de changed: What|Removed |Added Depends on||52226 --- Comment #42 from untracea...@nurfuerspam.de --- I'd like to nominate bug 52226: losing images when working with docx without extra backup of the files can have pretty bad consequences. (This bug exists since 3.5.3 but is still present in 4.1.0.1. I hope this is the right MAB.) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on|52226 | --- Comment #43 from Michael Meeks michael.me...@novell.com --- Please don't add a known MAB to more than one version - otherwise it is impossible to see critical new bugs in 4.1. The image issue is a deeply annoying long-standing design issue that needs some funding for the several man weeks it takes to fix. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - officecfg/registry sd/source sd/xml test/user-template
officecfg/registry/schema/org/openoffice/Office/Impress.xcs| 11 +-- sd/source/core/sdpage.cxx | 31 +- sd/xml/layoutlist.xml |4 - test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml |8 ++ 4 files changed, 31 insertions(+), 23 deletions(-) New commits: commit d5a552ee01d491e85b76dbb9c373a019ce18a06a Author: Vishv Brahmbhatt vishvbrahmbhat...@gmail.com Date: Fri Jul 5 19:25:28 2013 +0530 Working version of XML parser from configuration file path Added some changes in the getRootElement and new layoutlist.xml is added for unit-test module. XML parser works perfectly in the installation,only the failure of unit-test is left to be solved. Some refactoring related to layoutlist.xml will be updated soon. Change-Id: If7ed3af40e9b6df26e20881728181eb6c82936d8 diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index fcb0e74..61c7cab1 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -468,20 +468,19 @@ labelList of files containing object effects/label /info value oor:separator=;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml/value + /prop prop oor:name=LayoutListFiles oor:type=oor:string-list oor:nillable=false -!-- OldPath: -- -!-- OldLocation: -- -!-- UIHints: List of files containing object effects -- info desc -Contains a list of layout type.It contains +Contains a list of layout type.It contains properties of presobj like their Position, -Height and Width +Height and Width.Values are put through +macro expansion, so, vnd.sun.star.expand prefix +is allowed. /desc labelList of files containing list of layouts/label /info value oor:separator=;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/layoutlist.xml/value - /prop /prop prop oor:name=PreviewNewEffects oor:type=xs:boolean oor:nillable=false !-- OldPath: -- diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 1bcda69..96961a0 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -66,6 +66,7 @@ #include unotools/streamwrap.hxx #include rtl/uri.hxx #include unotools/ucbstreamhelper.hxx +#include osl/file.h #include ../ui/inc/DrawDocShell.hxx #include Outliner.hxx @@ -1192,12 +1193,11 @@ static const LayoutDescriptor GetLayoutDescriptor( AutoLayout eLayout ) //to get the root element of the xml file ReferenceXElement getRootElement() { -rtl::OUString filepath=/home/vishv/layoutlist.xml; const Referencecss::uno::XComponentContext xContext(comphelper_getProcessComponentContext()); Reference XMultiServiceFactory xServiceFactory(xContext-getServiceManager(), UNO_QUERY_THROW ); Reference util::XMacroExpander xMacroExpander =util::theMacroExpander::get(xContext); Reference XMultiServiceFactory xConfigProvider =configuration::theDefaultProvider::get( xContext ); - // read path to transition effects files from config + Any propValue = uno::makeAny( beans::PropertyValue( nodepath, -1, @@ -1208,31 +1208,32 @@ ReferenceXElement getRootElement() xConfigProvider-createInstanceWithArguments( com.sun.star.configuration.ConfigurationAccess, SequenceAny( propValue, 1 ) ), UNO_QUERY_THROW ); -uno::Sequence OUString aFiles; +Sequence rtl::OUString aFiles; xNameAccess-getByName( LayoutListFiles ) = aFiles; - +rtl::OUString aURL; for( sal_Int32 i=0; iaFiles.getLength(); ++i ) { -OUString aURL = aFiles[i]; +aURL = aFiles[i]; if( aURL.startsWith( EXPAND_PROTOCOL ) ) { // cut protocol -OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) ); +rtl::OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) ); // decode uric class chars aMacro = rtl::Uri::decode( aMacro, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); // expand macro string aURL = xMacroExpander-expandMacros( aMacro ); } -SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL, STREAM_READ ); -::utl::OInputStreamWrapper* isw=new ::utl::OInputStreamWrapper( pIStm); -ReferenceXInputStream xIs(isw); - -rtl::OUString sServName = rtl::OUString::createFromAscii(com.sun.star.xml.dom.DocumentBuilder); -ReferenceXDocumentBuilder xDb( xServiceFactory-createInstance(sServName), UNO_QUERY); -const ReferenceXDocument
Unit-Test Fail Error[GSOC: Slide Layout Extendibility]
Hi, I am working on Slide Layout Extendibility project for GSOC. As for one of my initial task,I had to set up XML file and parser which reads information from that XML file.So as of now the parser is working perfectly and even compilation works perfectly.But the unit test fails.I have been stuck on this error for last 4 days and it seems that,there is a bug in the unit-test process(for XML configuration files in Impress). And I am sharing this problem as per the advice of my mentor Thorsten(Please refer to my commit Error links at the end): (1) So for setting up the configuration path of layoutlist.xml ,I have made an entry of LayoutListFiles,similar to that of EffectFiles in Impress.xcs:457. (2) The code processing of XML is similar to that in core/sd/source/core/CustomAnimationPreset.cxx:300. (3) After using xNameAccess-getByName( LayoutListFiles ) = aFiles and expandMacros() function.The configuration file-path * vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/layoutlist.xml * expands to * /home/vishv/Libre_Git/core/solver/unxlngx6/installation/opt/program/../share/config/soffice.cfg/simpress/layoutlist.xml * for installation process. But for Unit-Test ,it expands to * /home/vishv/Libre_Git/core/solver/unxlngx6/unittest/install/share/config/soffice.cfg/simpress/layoutlist.xml *. I am using the above generated string in *parseURI(string filepath)* to get DOM structure and then traverse through XML for information. (4)So in-spite of unit-test errors, XML parser works perfectly,because correct path goes into the parseURI() in the installation process(i.e .install/program/simpress works well without any crashes). (5)The problem here is that path generated for unit-test check is wrong: Correct path should be: * /home/vishv/Libre_Git/core/solver/unxlngx6/unittest/install/../user/share/config/soffice.cfg/simpress/layoutlist.xml * , because at this place a new layoutlist.xml is generated after packaging. But the wrong path generated as stated above is :* /home/vishv/Libre_Git/core/solver/unxlngx6/unittest/install/share/config/soffice.cfg/simpress/layoutlist.xml * It leads to errors (i.e failed to load external entity at filepath... ) Also this scenario happens for the current configuration effects.xml file as well. It would be great ,if someone can guide in correcting the unit-test path and indeed removing the error.Also please correct me,if I am wrong in my observations. Here are the links of my commits and Errors for Reference: Error: Error-Link http://pastebin.com/PPUuXXQt feature/gsoc-impresslayout: Commit2http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/gsoc-impresslayoutid=e2a23779c42a4b252706794dd7e89e975804c50e Commit3http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/gsoc-impresslayoutid=d5a552ee01d491e85b76dbb9c373a019ce18a06a Thanks and Regards, Vishv Brahmbhatt ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/time.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b440845b9f04fdf498caf3bcdcc52ffc8c489639 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 5 17:55:30 2013 +0200 janitorial / stylistic Change-Id: I8e7c1e63ff04220e530662d9a6e142f4f0e7247f diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c index 24947b1..38e8f36 100644 --- a/sal/osl/unx/time.c +++ b/sal/osl/unx/time.c @@ -205,13 +205,13 @@ sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( const TimeValue* pSystemTimeVa #if defined(STRUCT_TM_HAS_GMTOFF) /* members of struct tm are corrected by mktime */ -bias = 0 - pLocalTime-tm_gmtoff; +bias = -pLocalTime-tm_gmtoff; #elif defined(HAS_ALTZONE) /* check if daylight saving time is in effect */ bias = pLocalTime-tm_isdst 0 ? altzone : timezone; #else -/* exspect daylight saving time to be one hour */ +/* expect daylight saving time to be one hour */ bias = pLocalTime-tm_isdst 0 ? timezone - 3600 : timezone; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |1 writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 + writerfilter/source/rtftok/rtflookahead.cxx| 130 + writerfilter/source/rtftok/rtflookahead.hxx| 56 ++ writerfilter/source/rtftok/rtftokenizer.cxx|9 + writerfilter/source/rtftok/rtftokenizer.hxx|2 6 files changed, 204 insertions(+), 3 deletions(-) New commits: commit 05f0859afba779ce28d24e3195d8266d616259d1 Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 5 17:38:12 2013 +0200 writerfilter: add RTFLookahead to be able to look ahead during import Change-Id: I1da765373c352c8a2aa486fe6210b16bf492728c diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 1993590..4fab4aa 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -79,6 +79,7 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/rtftok/rtfcontrolwords \ writerfilter/source/rtftok/rtfdocumentfactory \ writerfilter/source/rtftok/rtfdocumentimpl \ + writerfilter/source/rtftok/rtflookahead \ writerfilter/source/rtftok/rtfreferenceproperties \ writerfilter/source/rtftok/rtfreferencetable \ writerfilter/source/rtftok/rtfsdrimport \ diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 56d8a1b..73d06c4 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -49,6 +49,7 @@ #include rtfsdrimport.hxx #include rtftokenizer.hxx +#include rtflookahead.hxx #include rtfcharsets.hxx #include rtfreferenceproperties.hxx #include rtfskipdestination.hxx @@ -1679,8 +1680,12 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) m_aStates.top().bInBackground = true; break; case RTF_SHPGRP: -m_aStates.top().nDestinationState = DESTINATION_SHAPEGROUP; -m_aStates.top().bInShapeGroup = true; +{ +RTFLookahead aLookahead(Strm(), m_pTokenizer-getGroupStart()); +SAL_WARN_IF(!aLookahead.hasTable(), writerfilter, no table in groupshape, should create it!); +m_aStates.top().nDestinationState = DESTINATION_SHAPEGROUP; +m_aStates.top().bInShapeGroup = true; +} break; default: SAL_INFO(writerfilter, TODO handle destination ' lcl_RtfToString(nKeyword) '); diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx new file mode 100644 index 000..0338efd --- /dev/null +++ b/writerfilter/source/rtftok/rtflookahead.cxx @@ -0,0 +1,130 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include boost/shared_ptr.hpp + +#include com/sun/star/task/XStatusIndicator.hpp +#include tools/stream.hxx + +#include rtflookahead.hxx + +using namespace com::sun::star; + +namespace writerfilter { +namespace rtftok { + +RTFLookahead::RTFLookahead(SvStream rStream, sal_Size nGroupStart) +: m_rStream(rStream), +m_bHasTable(false) +{ +sal_Size nPos = m_rStream.Tell(); +m_rStream.Seek(nGroupStart); +uno::Referencetask::XStatusIndicator xStatusIndicator; +m_pTokenizer.reset(new RTFTokenizer(*this, m_rStream, xStatusIndicator)); +m_pTokenizer-resolveParse(); +m_rStream.Seek(nPos); +} + +RTFLookahead::~RTFLookahead() +{ +} + +int RTFLookahead::dispatchDestination(RTFKeyword /*nKeyword*/) +{ +return 0; +} + +int RTFLookahead::dispatchFlag(RTFKeyword nKeyword) +{ +if (nKeyword == RTF_INTBL) +m_bHasTable = true; +return 0; +} + +int RTFLookahead::dispatchSymbol(RTFKeyword /*nKeyword*/) +{ +return 0; +} + +int RTFLookahead::dispatchToggle(RTFKeyword /*nKeyword*/, bool /*bParam*/, int /*nParam*/) +{ +return 0; +} + +int RTFLookahead::dispatchValue(RTFKeyword /*nKeyword*/, int /*nParam*/) +{ +return 0; +} + +int RTFLookahead::resolveChars(char ch) +{ +while(!m_rStream.IsEof() (ch != '{' ch != '}' ch != '\\')) +m_rStream ch; +if (!m_rStream.IsEof()) +m_rStream.SeekRel(-1); +return 0; +} + +int RTFLookahead::pushState() +{ +m_pTokenizer-pushGroup(); +return 0; +} + +int RTFLookahead::popState() +{ +m_pTokenizer-popGroup(); +return 0; +} + +RTFDestinationState RTFLookahead::getDestinationState() +{ +return DESTINATION_NORMAL; +} + +void RTFLookahead::setDestinationState(RTFDestinationState /*nDestinationState*/) +{ +} + +RTFInternalState RTFLookahead::getInternalState() +{ +
[Libreoffice-commits] core.git: 3 commits - framework/inc framework/source include/vcl vcl/source
framework/inc/uielement/addonstoolbarwrapper.hxx|7 framework/source/fwe/classes/addonsoptions.cxx | 213 +++- framework/source/layoutmanager/toolbarlayoutmanager.cxx | 10 framework/source/uielement/addonstoolbarmanager.cxx |6 framework/source/uielement/addonstoolbarwrapper.cxx | 23 + include/vcl/toolbox.hxx |1 vcl/source/window/toolbox2.cxx | 13 7 files changed, 152 insertions(+), 121 deletions(-) New commits: commit 67feb571330ec4b9eaff7791b27219b62d4c2f6a Author: Michael Meeks michael.me...@suse.com Date: Fri Jul 5 16:44:19 2013 +0100 fdo#66524 - defer population of AddOns toolbar icons until they are shown. Some addons eg. LibreLogo are almost never shown, so avoid their startup cost. Change-Id: Ibbc072dd740eca6a97aeff918ae0a5c105278acf diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx index 34d80ae..c5a8173 100644 --- a/framework/inc/uielement/addonstoolbarwrapper.hxx +++ b/framework/inc/uielement/addonstoolbarwrapper.hxx @@ -45,13 +45,14 @@ class AddonsToolBarWrapper : public UIElementWrapperBase // XUIElement virtual ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException); - //- -// protected methods - //- +// cf. ToolbarLayoutManager +void populateImages(); + private: com::sun::star::uno::Reference com::sun::star::uno::XComponentContext m_xContext; com::sun::star::uno::Reference com::sun::star::lang::XComponent m_xToolBarManager; com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence com::sun::star::beans::PropertyValue m_aConfigData; +bool m_bCreatedImages; }; } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 670c2a4..4abdbc9 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -18,6 +18,7 @@ */ #include toolbarlayoutmanager.hxx +#include uielement/addonstoolbarwrapper.hxx #include helpers.hxx #include services.h #include services/layoutmanager.hxx @@ -442,6 +443,7 @@ bool ToolbarLayoutManager::requestToolbar( const OUString rResourceURL ) bMustCallCreate = true; bool bCreateOrShowToolbar( aRequestedToolbar.m_bVisible !aRequestedToolbar.m_bMasterHide ); + uno::Reference awt::XWindow2 xContainerWindow( m_xContainerWindow, uno::UNO_QUERY ); if ( xContainerWindow.is() aRequestedToolbar.m_bFloating ) bCreateOrShowToolbar = bool( xContainerWindow-isActive()); @@ -569,6 +571,14 @@ bool ToolbarLayoutManager::showToolbar( const OUString rResourceURL ) SolarMutexGuard aGuard; Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement ); + +// Addons appear to need to be populated at start, but we don't +// want to populate them with (scaled) images until later. +AddonsToolBarWrapper *pAddOns; +pAddOns = dynamic_castAddonsToolBarWrapper *( aUIElement.m_xUIElement.get()); +if (pAddOns) +pAddOns-populateImages(); + if ( pWindow ) { if ( !aUIElement.m_bFloating ) diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 8168326..24e002e 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -205,7 +205,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence Sequence PropertyValue if ( m_bDisposed ) return; -sal_uInt16nId( 1 ); +sal_uInt16 nId( 1 ); RemoveControllers(); @@ -262,9 +262,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence Sequence PropertyValue m_pToolBar-InsertItem( nId, aTitle ); -Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols ); -if ( !!aImage ) -m_pToolBar-SetItemImage( nId, aImage ); +// don't setup images yet, AddonsToolbarWrapper::populateImages does that. // Create TbRuntimeItemData to hold additional information we will need in the future AddonsParams* pRuntimeItemData = new AddonsParams; diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 92cfa0f..3c71c18 100644 ---
Re: OConnection.cxx patch
Ok, here I go with the license statement: All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. You can name it under Gabriele Bulfon (gabriele.bul...@sonicle.com), affiliation Sonicle S.r.l. Thanks, Gabriele. -- Da: Lionel Elie Mamane A: Gabriele Bulfon Cc: libreoffice@lists.freedesktop.org Data: 5 luglio 2013 9.20.34 CEST Oggetto: Re: OConnection.cxx patch On Thu, Jul 04, 2013 at 08:44:52AM +0200, Gabriele Bulfon wrote: I had to patch this file to build without errors: --- libreoffice-4.1.0.1/connectivity/source/drivers/odbcbase/OConnection.cxx Thu Jul 4 08:33:42 2013 +++ libreoffice-4.1.0.1/connectivity/source/drivers/odbcbase/OConnection.cxx Thu Jul 4 08:34:55 2013 @@ -417,7 +417,7 @@ checkDisposed(OConnection_BASE::rBHelper.bDisposed); -sal_Int32 nValueLen; +SQLINTEGER nValueLen; This change makes sense. Thank you for your contribution. However, before I can use it, could you please confirm that you allow us to use it under the MPLv2/LGPLv3+ dual license? I don't find your name on the list of people that have already agreed to that https://wiki.documentfoundation.org/Development/Developers It is customary to do a general statement that covers all your past, present and future contributions; see https://wiki.documentfoundation.org/Development/Developers#Example_Statement and https://wiki.documentfoundation.org/Development/Developers#Where_do_I_send_the_Statement.3F Also, please send your patches as attachments, to avoid your mail user agent (email program) to change spacing, do word wrapping, etc, which makes the patch harder to read, and makes the patch program fail to use it automatically. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - cui/source dbaccess/source extensions/source include/svtools include/svx sd/source sfx2/source starmath/inc starmath/source svtools/source svx/AllLangResTar
cui/source/dialogs/gallery.src| 22 - cui/source/inc/gallery.hrc|1 dbaccess/source/ui/control/dbtreelistbox.cxx |1 dbaccess/source/ui/control/tabletree.cxx |1 dbaccess/source/ui/control/tabletree.hrc | 31 - dbaccess/source/ui/control/tabletree.src | 18 dbaccess/source/ui/inc/dbu_resource.hrc |9 dbaccess/source/ui/querydesign/query.src | 15 dbaccess/source/ui/tabledesign/table.src |5 extensions/source/bibliography/bib.hrc|1 extensions/source/bibliography/sections.hrc |6 extensions/source/bibliography/sections.src | 21 - include/svtools/sores.hxx |3 include/svx/dialogs.hrc |3 sd/source/ui/app/menuids_tmpl.src | 65 --- sd/source/ui/app/popup.src| 46 -- sd/source/ui/inc/res_bmp.hrc |3 sfx2/source/doc/doc.hrc |5 sfx2/source/doc/doc.src | 30 - starmath/inc/starmath.hrc |1 starmath/source/smres.src | 42 -- svtools/source/dialogs/so3res.src | 23 - svx/AllLangResTarget_svx.mk |2 svx/AllLangResTarget_textconversiondlgs.mk|2 svx/source/mnuctrls/mnuctrls.src | 71 --- svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src | 197 -- svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src | 15 svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc | 42 -- sw/AllLangResTarget_sw.mk |2 sw/inc/chrdlg.hrc |2 sw/inc/dbui.hrc |1 sw/source/ui/app/mn.src | 16 sw/source/ui/chrdlg/chardlg.src | 46 -- sw/source/ui/chrdlg/drpcps.src| 47 -- sw/source/ui/dbui/dbui.src| 34 - sw/source/ui/inc/popup.hrc|1 36 files changed, 15 insertions(+), 815 deletions(-) New commits: commit f42daec5c72c78e40150cbf0f0d01f38db556264 Author: Thomas Arnhold tho...@arnhold.org Date: Fri Jul 5 15:10:33 2013 +0200 cleanup src files Those items are unused. Change-Id: If4fce0f91309d2ca09cbb636d4a5d9f86f38eb9a diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index 033370d..93505da 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -24,28 +24,6 @@ #define MASKCOLOR MaskColor = Color { Red = 0x ; Green = 0x ; Blue = 0x ; }; -TabDialog RID_SVXTABDLG_GALLERY -{ -OutputSize = TRUE ; -SVLook = TRUE ; -Text [ en-US ] = Properties of ; -Moveable = TRUE ; -TabControl 1 -{ -OutputSize = TRUE ; -PageList = -{ -PageItem -{ -Identifier = RID_SVXTABPAGE_GALLERY_GENERAL ; -Text [ en-US ] = General ; -}; -}; -}; -}; - -/**/ - TabDialog RID_SVXTABDLG_GALLERYTHEME { OutputSize = TRUE ; diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc index 3612ed8..c9e8ed7 100644 --- a/cui/source/inc/gallery.hrc +++ b/cui/source/inc/gallery.hrc @@ -19,7 +19,6 @@ #include cuires.hrc // Gallery TabDialogs/TabPages -#define RID_SVXTABDLG_GALLERY (RID_CUI_GALLERY_START ) #define RID_SVXTABDLG_GALLERYTHEME (RID_CUI_GALLERY_START + 2) #define RID_SVXDLG_GALLERY_TITLE(RID_CUI_GALLERY_START + 82) diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index b0d5e15..d5c8816 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -32,7 +32,6 @@ #include cppuhelper/implbase1.hxx #include cppuhelper/interfacecontainer.hxx #include vcl/help.hxx -#include tabletree.hrc #include dbaccess/IController.hxx #include framework/actiontriggerhelper.hxx #include
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - python/python-solver-before-std.patch svx/source
python/python-solver-before-std.patch | 25 +--- svx/source/sidebar/area/AreaPropertyPanel.cxx | 74 +- 2 files changed, 66 insertions(+), 33 deletions(-) New commits: commit 7f983cd3d05ef168f9e828a14307c0d53475c86d Author: Armin Le Grand a...@apache.org Date: Fri Jul 5 18:02:32 2013 + i122676 Call Execute only once to create only one Undo-ction diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 97ccb1e..a18d8248 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -315,8 +315,11 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) mpLbFillAttr-Clear(); SfxObjectShell* pSh = SfxObjectShell::Current(); const XFillStyleItem aXFillStyleItem(eXFS); -GetBindings()-GetDispatcher()-Execute(SID_ATTR_FILL_STYLE, SFX_CALLMODE_RECORD, aXFillStyleItem, 0L); +// #122676# Do no longer trigger two Execute calls, one for SID_ATTR_FILL_STYLE +// and one for setting the fill attribute itself, but add two SfxPoolItems to the +// call to get just one action at the SdrObject and to create only one Undo action, too. +// Checked that this works in all apps. switch( eXFS ) { case XFILL_NONE: @@ -325,6 +328,10 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) mpToolBoxColor-Hide(); mpLbFillType-Selected(); mpLbFillAttr-Disable(); + +// #122676# need to call a single SID_ATTR_FILL_STYLE change +GetBindings()-GetDispatcher()-Execute( +SID_ATTR_FILL_STYLE, SFX_CALLMODE_RECORD, aXFillStyleItem, 0L); break; } case XFILL_SOLID: @@ -334,7 +341,10 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) const String aTmpStr; const Color aColor = maLastColor; const XFillColorItem aXFillColorItem( aTmpStr, aColor ); -GetBindings()-GetDispatcher()-Execute(SID_ATTR_FILL_COLOR, SFX_CALLMODE_RECORD, aXFillColorItem, 0L); + +// #122676# change FillStyle and Color in one call +GetBindings()-GetDispatcher()-Execute( +SID_ATTR_FILL_COLOR, SFX_CALLMODE_RECORD, aXFillColorItem, aXFillStyleItem, 0L); break; } case XFILL_GRADIENT: @@ -362,7 +372,10 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) { const XGradient aGradient = aItem.GetGradientList()-GetGradient(mnLastPosGradient)-GetGradient(); const XFillGradientItem aXFillGradientItem(mpLbFillAttr-GetEntry(mnLastPosGradient), aGradient); - GetBindings()-GetDispatcher()-Execute(SID_ATTR_FILL_GRADIENT, SFX_CALLMODE_RECORD, aXFillGradientItem, 0L); + +// #122676# change FillStyle and Gradient in one call +GetBindings()-GetDispatcher()-Execute( +SID_ATTR_FILL_GRADIENT, SFX_CALLMODE_RECORD, aXFillGradientItem, aXFillStyleItem, 0L); mpLbFillAttr-SelectEntryPos(mnLastPosGradient); } } @@ -398,7 +411,10 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) { const XHatch aHatch = aItem.GetHatchList()-GetHatch(mnLastPosHatch)-GetHatch(); const XFillHatchItem aXFillHatchItem(mpLbFillAttr-GetSelectEntry(), aHatch); - GetBindings()-GetDispatcher()-Execute(SID_ATTR_FILL_HATCH, SFX_CALLMODE_RECORD, aXFillHatchItem, 0L); + +// #122676# change FillStyle and Hatch in one call +GetBindings()-GetDispatcher()-Execute( +SID_ATTR_FILL_HATCH, SFX_CALLMODE_RECORD, aXFillHatchItem, aXFillStyleItem, 0L); mpLbFillAttr-SelectEntryPos(mnLastPosHatch); } } @@ -434,7 +450,10 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) { const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()-GetBitmap(mnLastPosBitmap); const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr-GetSelectEntry(), pXBitmapEntry-GetGraphicObject()); - GetBindings()-GetDispatcher()-Execute(SID_ATTR_FILL_BITMAP, SFX_CALLMODE_RECORD, aXFillBitmapItem, 0L); + +// #122676# change FillStyle and Bitmap in one call +
Re: Building LO 4.0.4.2 on illumos based OS
Hi Gabriele, On Fri, 2013-07-05 at 08:14 +0200, Gabriele Bulfon wrote: Hi Michael, would be a great idea the tinderbox setup. I will send you the link of the XStream Desktop iso as soon as we have it out. Wonderful. BTW, can you help me with this? I really don't know what problem is thismust be something about gnu ld, but I had more experience with Sun ld. ... [build LNK] Executable/unopkg.bin /usr/gnu/bin/ld: /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/LinkTarget/Executable/unopkg.bin: hidden symbol`main' in/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/CObject/desktop/source/pkgchk/unopkg/unopkg_main.o isreferenced byDSO /usr/gnu/bin/ld: final link failed: Bad value collect2: ld returned 1 exit status Looks like a mis-interaction with some visibility markup - though clearly getting more output would be good: cd desktop make gives a more verbose make. Try something like the attached; if that works we should get it into master and -4-1 :-) HTH, Michael. -- michael.me...@suse.com Here is what I got after applying your patch (causing a lot of rebuilding of previous code). Later I will send you the output of the detail you aksed: [build LNK] Library/libunopkgapp.so [build C ] desktop/source/pkgchk/unopkg/unopkg_main.c [build LNK] Executable/unopkg.bin /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `PR_Now' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSMessage_Create' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `CERT_DecodeCertFromPackage' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSSignedData_AddCertificate' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSSignerInfo_IncludeCerts' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSEncoder_Finish' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSMessage_Destroy' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSSignedData_AddSignerInfo' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSSignerInfo_AddSigningTime' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSEncoder_Start' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_NoDB_Init' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `HASH_Begin' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `HASH_End' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSSignedData_Create' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSMessage_GetContentInfo' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSSignedData_GetContentInfo' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSSignerInfo_Create' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSContentInfo_SetContent_SignedData' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `HASH_Update' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `NSS_CMSSignedData_SetDigestValue' /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/solver/unxsogi.pro/lib/libvcllo.so: undefined reference to `HASH_Create'
[Libreoffice-commits] core.git: include/sal
include/sal/log-areas.dox |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6a17dc24a40824aef91ae640ab712e4db8d8eb77 Author: Thomas Arnhold tho...@arnhold.org Date: Fri Jul 5 20:45:29 2013 +0200 log-areas: add framework Change-Id: I05ed93cdfe62c133afc15a27c953abd5395e811f diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 4e0d8ab..dc217c6 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -147,7 +147,8 @@ certain functionality. @section framework -@li @c fwk - framework +@li @c framework +@li @c fwk - framework (abbreviation) @li @c fwk.desktop @li @c fwk.dispatch @li @c fwk.session ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag
i18nlangtag/source/languagetag/languagetag.cxx | 38 + include/i18nlangtag/languagetag.hxx|9 + 2 files changed, 47 insertions(+) New commits: commit 4467a4a6280306770107488b4a97c4d496c95a43 Author: Eike Rathke er...@redhat.com Date: Fri Jul 5 21:01:35 2013 +0200 added convenience ctor for ODF import Change-Id: I80fc2d531b612d9e2e94fc4f5efcca594e35a561 diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 68c3aeb..f0333b8 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -206,6 +206,44 @@ LanguageTag::LanguageTag( LanguageType nLanguage ) } +LanguageTag::LanguageTag( const OUString rBcp47, const OUString rLanguage, + const OUString rScript, const OUString rCountry ) +: +maBcp47( rBcp47), +mpImplLangtag( NULL), +mnLangID( LANGUAGE_DONTKNOW), +meIsValid( DECISION_DONTKNOW), +meIsIsoLocale( DECISION_DONTKNOW), +meIsIsoODF( DECISION_DONTKNOW), +meIsLiblangtagNeeded( DECISION_DONTKNOW), +mbSystemLocale( rBcp47.isEmpty() rLanguage.isEmpty()), +mbInitializedBcp47( !rBcp47.isEmpty()), +mbInitializedLocale( false), +mbInitializedLangID( false), +mbCachedLanguage( false), +mbCachedScript( false), +mbCachedCountry( false), +mbIsFallback( false) +{ +if (!mbSystemLocale !mbInitializedBcp47) +{ +if (rScript.isEmpty()) +{ +maLocale = lang::Locale( rLanguage, rCountry, ); +mbInitializedLocale = true; +} +else +{ +if (rCountry.isEmpty()) +maBcp47 = rLanguage + - + rScript; +else +maBcp47 = rLanguage + - + rScript + - + rCountry; +mbInitializedBcp47 = true; +} +} +} + + LanguageTag::LanguageTag( const OUString rLanguage, const OUString rCountry ) : maLocale( rLanguage, rCountry, ), diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx index 15ca4ec..1a9f499 100644 --- a/include/i18nlangtag/languagetag.hxx +++ b/include/i18nlangtag/languagetag.hxx @@ -53,6 +53,15 @@ public: /** Init LanguageTag with LanguageType MS-LangID. */ explicit LanguageTag( LanguageType nLanguage ); +/** Init LanguageTag with either BCP 47 language tag (precedence if not +empty), or a combination of language, script and country. + +This is a convenience ctor to be used in ODF import where these are +distinct attributes. + */ +explicit LanguageTag( const OUString rBcp47, const OUString rLanguage, + const OUString rScript, const OUString rCountry ); + /** Init LanguageTag with language and country strings. This is a convenience ctor for places that so far use only language and ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] module svl: all String and some bool and related clean-up
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/4733 to look at the new patch set (#3). Change subject: module svl: all String and some bool and related clean-up .. module svl: all String and some bool and related clean-up Change-Id: I36eb559fa58dbe75384b7119c788af0048813aed --- M chart2/source/tools/NumberFormatterWrapper.cxx M cui/source/options/optupdt.cxx M editeng/source/editeng/editundo.cxx M editeng/source/editeng/editundo.hxx M editeng/source/editeng/impedit4.cxx M framework/source/fwe/helper/undomanagerhelper.cxx M include/editeng/editund2.hxx M include/sfx2/app.hxx M include/sfx2/objsh.hxx M include/sfx2/viewfrm.hxx M include/svl/inethist.hxx M include/svl/itemprop.hxx M include/svl/ondemand.hxx M include/svl/srchitem.hxx M include/svl/style.hxx M include/svl/svdde.hxx M include/svl/undo.hxx M include/svl/zforlist.hxx M include/svx/e3dundo.hxx M include/svx/sdrundomanager.hxx M include/svx/svdundo.hxx M reportdesign/source/ui/report/ReportController.cxx M sc/inc/patattr.hxx M sc/inc/stlpool.hxx M sc/inc/stlsheet.hxx M sc/inc/undorangename.hxx M sc/inc/zforauto.hxx M sc/source/core/data/docpool.cxx M sc/source/core/data/dpcache.cxx M sc/source/core/data/dputil.cxx M sc/source/core/data/patattr.cxx M sc/source/core/data/stlpool.cxx M sc/source/core/data/stlsheet.cxx M sc/source/core/data/table4.cxx M sc/source/core/data/table6.cxx M sc/source/core/data/validat.cxx M sc/source/core/tool/rangeseq.cxx M sc/source/core/tool/zforauto.cxx M sc/source/filter/excel/xestyle.cxx M sc/source/filter/rtf/eeimpars.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx M sc/source/filter/xml/xmlcelli.cxx M sc/source/ui/docshell/docsh4.cxx M sc/source/ui/formdlg/formula.cxx M sc/source/ui/inc/docsh.hxx M sc/source/ui/inc/undobase.hxx M sc/source/ui/inc/undoblk.hxx M sc/source/ui/inc/undocell.hxx M sc/source/ui/inc/undodat.hxx M sc/source/ui/inc/undodraw.hxx M sc/source/ui/inc/undostyl.hxx M sc/source/ui/inc/undotab.hxx M sc/source/ui/miscdlgs/autofmt.cxx M sc/source/ui/miscdlgs/filldlg.cxx M sc/source/ui/undo/undobase.cxx M sc/source/ui/undo/undoblk.cxx M sc/source/ui/undo/undoblk2.cxx M sc/source/ui/undo/undoblk3.cxx M sc/source/ui/undo/undocell.cxx M sc/source/ui/undo/undodat.cxx M sc/source/ui/undo/undodraw.cxx M sc/source/ui/undo/undorangename.cxx M sc/source/ui/undo/undostyl.cxx M sc/source/ui/undo/undotab.cxx M sc/source/ui/unoobj/chart2uno.cxx M sc/source/ui/unoobj/pageuno.cxx M sc/source/ui/view/cellsh1.cxx M sc/source/ui/view/tabvwsha.cxx M sc/source/ui/view/viewfun2.cxx M sd/inc/stlpool.hxx M sd/inc/stlsheet.hxx M sd/inc/undo/undomanager.hxx M sd/source/core/stlfamily.cxx M sd/source/core/stlpool.cxx M sd/source/core/stlsheet.cxx M sd/source/core/undo/undomanager.cxx M sd/source/ui/func/fuhhconv.cxx M sd/source/ui/func/sdundogr.cxx M sd/source/ui/inc/sdundogr.hxx M sfx2/source/appl/appdde.cxx M sfx2/source/appl/lnkbase2.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/dialog/mgetempl.cxx M sfx2/source/dialog/styledlg.cxx M starmath/source/document.cxx M svl/source/fsstor/fsstorage.cxx M svl/source/items/itemprop.cxx M svl/source/items/macitem.cxx M svl/source/items/style.cxx M svl/source/misc/inethist.cxx M svl/source/numbers/zforlist.cxx M svl/source/numbers/zformat.cxx M svl/source/numbers/zforscan.cxx M svl/source/svdde/ddecli.cxx M svl/source/svdde/ddedata.cxx M svl/source/svdde/ddesvr.cxx M svl/source/undo/undo.cxx M svl/unx/source/svdde/ddedummy.cxx M svtools/source/control/fmtfield.cxx M svtools/source/svhtml/htmlout.cxx M svtools/source/uno/unoiface.cxx M svx/source/dialog/srchdlg.cxx M svx/source/engine3d/e3dundo.cxx M svx/source/fmcomp/gridcell.cxx M svx/source/items/numfmtsh.cxx M svx/source/svdraw/sdrundomanager.cxx M svx/source/svdraw/svdundo.cxx M svx/source/table/tableundo.cxx M svx/source/table/tableundo.hxx M sw/inc/IDocumentUndoRedo.hxx M sw/inc/docsh.hxx M sw/inc/docstyle.hxx M sw/inc/tblafmt.hxx M sw/inc/undobj.hxx M sw/source/core/doc/tblafmt.cxx M sw/source/core/fields/fldbas.cxx M sw/source/core/fields/usrfld.cxx M sw/source/core/inc/SwUndoFmt.hxx M sw/source/core/inc/UndoManager.hxx M sw/source/core/table/swtable.cxx M sw/source/core/text/EnhancedPDFExportHelper.cxx M sw/source/core/undo/SwUndoFmt.cxx M sw/source/core/undo/docundo.cxx M sw/source/core/undo/undobj.cxx M sw/source/ui/app/docsh2.cxx M sw/source/ui/app/docstyle.cxx M sw/source/ui/dbui/dbinsdlg.cxx M sw/source/ui/table/tautofmt.cxx M sw/source/ui/uiview/viewsrch.cxx M sw/source/ui/utlui/numfmtlb.cxx M uui/source/iahndl-ssl.cxx M vcl/source/edit/textund2.hxx M vcl/source/edit/textundo.cxx M vcl/source/edit/textundo.hxx 135 files changed, 1,725 insertions(+), 1,785 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/4733/3 -- To view, visit https://gerrit.libreoffice.org/4733 To
[Libreoffice-commits] core.git: ios/iosremote
dev/null |binary 1 file changed New commits: commit 42744c9b888e7db2fbe4b96b97f56c32e0a410d9 Author: siqi m...@siqi.fr Date: Fri Jul 5 21:33:24 2013 +0200 slideshow control pad Change-Id: Ie82e10fcdfc495ac19a34be85249480540e88d1d diff --git a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 536adb2..000 Binary files a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal
include/sal/main.h |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0ffab9363d527d55b12b9b09d7136ca1c9d171e0 Author: Michael Meeks michael.me...@suse.com Date: Fri Jul 5 20:39:30 2013 +0100 force 'main' to always be DLLPUBLIC. Change-Id: I2a69edfda5e98645fe55ac2367875786a8140ea4 diff --git a/include/sal/main.h b/include/sal/main.h index 634b57c..d5c227c 100644 --- a/include/sal/main.h +++ b/include/sal/main.h @@ -43,7 +43,7 @@ SAL_DLLPUBLIC void SAL_CALL sal_detail_deinitialize(); #else #define SAL_MAIN_WITH_ARGS_IMPL \ -int SAL_CALL main(int argc, char ** argv) \ +int SAL_DLLPUBLIC SAL_CALL main(int argc, char ** argv) \ { \ int ret; \ sal_detail_initialize(argc, argv); \ @@ -53,7 +53,7 @@ int SAL_CALL main(int argc, char ** argv) \ } #define SAL_MAIN_IMPL \ -int SAL_CALL main(int argc, char ** argv) \ +int SAL_DLLPUBLIC SAL_CALL main(int argc, char ** argv) \ { \ int ret; \ sal_detail_initialize(argc, argv); \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source sw/source
connectivity/source/drivers/odbcbase/OConnection.cxx |2 +- sw/source/filter/html/swhtml.cxx |6 +++--- sw/source/filter/html/swhtml.hxx |2 +- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 12b7ba60b746031f2bbef59758270cc0281f4dab Author: Gabriele Bulfon gabriele.bul...@sonicle.com Date: Fri Jul 5 21:27:12 2013 +0200 use proper SQLINTEGER type (fixes build on Illumos) Change-Id: I85296600195dd5d74d2a112ce6cfef7f276535ab diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx index dfe22be..9e04bba 100644 --- a/connectivity/source/drivers/odbcbase/OConnection.cxx +++ b/connectivity/source/drivers/odbcbase/OConnection.cxx @@ -417,7 +417,7 @@ OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeExcepti checkDisposed(OConnection_BASE::rBHelper.bDisposed); -sal_Int32 nValueLen; +SQLINTEGER nValueLen; char pCat[1024]; OTools::ThrowException(this, N3SQLGetConnectAttr(m_aConnectionHandle,SQL_ATTR_CURRENT_CATALOG,(SDB_ODBC_CHAR*)pCat,(sizeof pCat)-1,nValueLen), commit b3f41543851e9985c6c7ba133c32753c9bc732c1 Author: Michael Stahl mst...@redhat.com Date: Fri Jul 5 15:04:50 2013 +0200 SwHTMLParser: avoid a spurious ~SwindexReg assert The pPam that is passed to SwHTMLParser would be reinitialized by SwReader::Read anyway. Can be reproduced with bugdoc from fdo#65935. Change-Id: I3b7dcc9c83d9d2eac05ee6ec38909dea7350d245 diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index cf572e9..76a2d17 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -237,7 +237,7 @@ sal_uLong HTMLReader::Read( SwDoc rDoc, const String rBaseURL, SwPaM rPam, co -SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM rCrsr, SvStream rIn, +SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM rCrsr, SvStream rIn, const String rPath, const String rBaseURL, int bReadNewDoc, @@ -305,7 +305,8 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM rCrsr, SvStream rIn, eScriptLang = HTML_SL_UNKNOWN; bAnyStarBasic = sal_True; -pPam = new SwPaM( *rCrsr.GetPoint() ); +rCrsr.DeleteMark(); +pPam = rCrsr; // re-use existing cursor: avoids spurious ~SwIndexReg assert memset( aAttrTab, 0, sizeof( _HTMLAttrTable )); // Die Font-Groessen 1-7 aus der INI-Datei lesen @@ -453,7 +454,6 @@ SwHTMLParser::~SwHTMLParser() aSetAttrTab.clear(); } -delete pPam; delete pCSS1Parser; delete pNumRuleInfo; DeleteFormImpl(); diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index d3e0ab4..a8db7b8 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -894,7 +894,7 @@ protected: public: -SwHTMLParser( SwDoc* pD, const SwPaM rCrsr, SvStream rIn, +SwHTMLParser( SwDoc* pD, SwPaM rCrsr, SvStream rIn, const String rFileName, const String rBaseURL, int bReadNewDoc = sal_True, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source
connectivity/source/drivers/odbcbase/OConnection.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d398166a937b494da7e7b198d2a00d20393a106 Author: Gabriele Bulfon gabriele.bul...@sonicle.com Date: Fri Jul 5 21:27:12 2013 +0200 use proper SQLINTEGER type (fixes build on Illumos) Change-Id: I85296600195dd5d74d2a112ce6cfef7f276535ab (cherry picked from commit 12b7ba60b746031f2bbef59758270cc0281f4dab) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx index dfe22be..9e04bba 100644 --- a/connectivity/source/drivers/odbcbase/OConnection.cxx +++ b/connectivity/source/drivers/odbcbase/OConnection.cxx @@ -417,7 +417,7 @@ OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeExcepti checkDisposed(OConnection_BASE::rBHelper.bDisposed); -sal_Int32 nValueLen; +SQLINTEGER nValueLen; char pCat[1024]; OTools::ThrowException(this, N3SQLGetConnectAttr(m_aConnectionHandle,SQL_ATTR_CURRENT_CATALOG,(SDB_ODBC_CHAR*)pCat,(sizeof pCat)-1,nValueLen), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal
include/sal/main.h |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 40026a2fcd88851e18f701a10c3cddc87b549476 Author: Michael Stahl mst...@redhat.com Date: Fri Jul 5 22:41:00 2013 +0200 SAL_DLLPUBLIC is for sal library, use SAL_DLLPUBLIC_EXPORT ... ... instead (which will hopefully fix the Windows build). Change-Id: I56448e61dffb7529e3b80a52ebc06a923b5fa044 diff --git a/include/sal/main.h b/include/sal/main.h index d5c227c..6abf588 100644 --- a/include/sal/main.h +++ b/include/sal/main.h @@ -43,7 +43,7 @@ SAL_DLLPUBLIC void SAL_CALL sal_detail_deinitialize(); #else #define SAL_MAIN_WITH_ARGS_IMPL \ -int SAL_DLLPUBLIC SAL_CALL main(int argc, char ** argv) \ +int SAL_DLLPUBLIC_EXPORT SAL_CALL main(int argc, char ** argv) \ { \ int ret; \ sal_detail_initialize(argc, argv); \ @@ -53,7 +53,7 @@ int SAL_DLLPUBLIC SAL_CALL main(int argc, char ** argv) \ } #define SAL_MAIN_IMPL \ -int SAL_DLLPUBLIC SAL_CALL main(int argc, char ** argv) \ +int SAL_DLLPUBLIC_EXPORT SAL_CALL main(int argc, char ** argv) \ { \ int ret; \ sal_detail_initialize(argc, argv); \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] module svl: all String and some bool and related clean-up
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/4733 to look at the new patch set (#4). Change subject: module svl: all String and some bool and related clean-up .. module svl: all String and some bool and related clean-up Change-Id: I36eb559fa58dbe75384b7119c788af0048813aed --- M chart2/source/tools/NumberFormatterWrapper.cxx M cui/source/options/optupdt.cxx M editeng/source/editeng/editundo.cxx M editeng/source/editeng/editundo.hxx M editeng/source/editeng/impedit4.cxx M framework/source/fwe/helper/undomanagerhelper.cxx M include/editeng/editund2.hxx M include/sfx2/app.hxx M include/sfx2/objsh.hxx M include/sfx2/viewfrm.hxx M include/svl/inethist.hxx M include/svl/itemprop.hxx M include/svl/ondemand.hxx M include/svl/srchitem.hxx M include/svl/style.hxx M include/svl/svdde.hxx M include/svl/undo.hxx M include/svl/zforlist.hxx M include/svx/e3dundo.hxx M include/svx/sdrundomanager.hxx M include/svx/svdundo.hxx M reportdesign/source/ui/report/ReportController.cxx M sc/inc/patattr.hxx M sc/inc/stlpool.hxx M sc/inc/stlsheet.hxx M sc/inc/undorangename.hxx M sc/inc/zforauto.hxx M sc/source/core/data/docpool.cxx M sc/source/core/data/dpcache.cxx M sc/source/core/data/dputil.cxx M sc/source/core/data/patattr.cxx M sc/source/core/data/stlpool.cxx M sc/source/core/data/stlsheet.cxx M sc/source/core/data/table4.cxx M sc/source/core/data/table6.cxx M sc/source/core/data/validat.cxx M sc/source/core/tool/rangeseq.cxx M sc/source/core/tool/zforauto.cxx M sc/source/filter/excel/xestyle.cxx M sc/source/filter/rtf/eeimpars.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx M sc/source/filter/xml/xmlcelli.cxx M sc/source/ui/docshell/docsh4.cxx M sc/source/ui/formdlg/formula.cxx M sc/source/ui/inc/docsh.hxx M sc/source/ui/inc/undobase.hxx M sc/source/ui/inc/undoblk.hxx M sc/source/ui/inc/undocell.hxx M sc/source/ui/inc/undodat.hxx M sc/source/ui/inc/undodraw.hxx M sc/source/ui/inc/undostyl.hxx M sc/source/ui/inc/undotab.hxx M sc/source/ui/miscdlgs/autofmt.cxx M sc/source/ui/miscdlgs/filldlg.cxx M sc/source/ui/undo/undobase.cxx M sc/source/ui/undo/undoblk.cxx M sc/source/ui/undo/undoblk2.cxx M sc/source/ui/undo/undoblk3.cxx M sc/source/ui/undo/undocell.cxx M sc/source/ui/undo/undodat.cxx M sc/source/ui/undo/undodraw.cxx M sc/source/ui/undo/undorangename.cxx M sc/source/ui/undo/undostyl.cxx M sc/source/ui/undo/undotab.cxx M sc/source/ui/unoobj/chart2uno.cxx M sc/source/ui/unoobj/pageuno.cxx M sc/source/ui/view/cellsh1.cxx M sc/source/ui/view/tabvwsha.cxx M sc/source/ui/view/viewfun2.cxx M sd/inc/stlpool.hxx M sd/inc/stlsheet.hxx M sd/inc/undo/undomanager.hxx M sd/source/core/stlfamily.cxx M sd/source/core/stlpool.cxx M sd/source/core/stlsheet.cxx M sd/source/core/undo/undomanager.cxx M sd/source/ui/func/fuhhconv.cxx M sd/source/ui/func/sdundogr.cxx M sd/source/ui/inc/sdundogr.hxx M sfx2/source/appl/appdde.cxx M sfx2/source/appl/lnkbase2.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/dialog/mgetempl.cxx M sfx2/source/dialog/styledlg.cxx M starmath/source/document.cxx M svl/source/fsstor/fsstorage.cxx M svl/source/items/itemprop.cxx M svl/source/items/macitem.cxx M svl/source/items/style.cxx M svl/source/misc/inethist.cxx M svl/source/numbers/zforlist.cxx M svl/source/numbers/zformat.cxx M svl/source/numbers/zforscan.cxx M svl/source/svdde/ddecli.cxx M svl/source/svdde/ddedata.cxx M svl/source/svdde/ddesvr.cxx M svl/source/undo/undo.cxx M svl/unx/source/svdde/ddedummy.cxx M svtools/source/control/fmtfield.cxx M svtools/source/svhtml/htmlout.cxx M svtools/source/uno/unoiface.cxx M svx/source/dialog/srchdlg.cxx M svx/source/engine3d/e3dundo.cxx M svx/source/fmcomp/gridcell.cxx M svx/source/items/numfmtsh.cxx M svx/source/svdraw/sdrundomanager.cxx M svx/source/svdraw/svdundo.cxx M svx/source/table/tableundo.cxx M svx/source/table/tableundo.hxx M sw/inc/IDocumentUndoRedo.hxx M sw/inc/docsh.hxx M sw/inc/docstyle.hxx M sw/inc/tblafmt.hxx M sw/inc/undobj.hxx M sw/source/core/doc/tblafmt.cxx M sw/source/core/fields/fldbas.cxx M sw/source/core/fields/usrfld.cxx M sw/source/core/inc/SwUndoFmt.hxx M sw/source/core/inc/UndoManager.hxx M sw/source/core/table/swtable.cxx M sw/source/core/text/EnhancedPDFExportHelper.cxx M sw/source/core/undo/SwUndoFmt.cxx M sw/source/core/undo/docundo.cxx M sw/source/core/undo/undobj.cxx M sw/source/ui/app/docsh2.cxx M sw/source/ui/app/docstyle.cxx M sw/source/ui/dbui/dbinsdlg.cxx M sw/source/ui/table/tautofmt.cxx M sw/source/ui/uiview/viewsrch.cxx M sw/source/ui/utlui/numfmtlb.cxx M uui/source/iahndl-ssl.cxx M vcl/source/edit/textund2.hxx M vcl/source/edit/textundo.cxx M vcl/source/edit/textundo.hxx 135 files changed, 1,729 insertions(+), 1,789 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/4733/4 -- To view, visit https://gerrit.libreoffice.org/4733 To
[Libreoffice-commits] core.git: starmath/source
starmath/source/smdetect.cxx | 42 -- 1 file changed, 24 insertions(+), 18 deletions(-) New commits: commit 05530423d3cff1391769192a62ae470500978ee6 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Fri Jul 5 12:03:01 2013 -0300 Solve one more issue of fdo#59642 The old MathML XML style could begin just with math. So this commit fixes that. This commits also fixes some documents that have the BOM marker at begin of file. Thanks a lot to Bjoern, Caolan and Eike! Change-Id: Ia2c3b51556e615c1e68e5e8aab4f883124c6adca Reviewed-on: https://gerrit.libreoffice.org/4742 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index d82fa03..a0fc6ec 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -309,30 +309,36 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence PropertyValue lDescriptor } else { -const sal_uInt16 nSize = 5; +// 200 should be enough for the XML +// version, encoding and !DOCTYPE +// stuff I hope? +const sal_uInt16 nSize = 200; sal_Char aBuffer[nSize+1]; aBuffer[nSize] = 0; pStrm-Seek( STREAM_SEEK_TO_BEGIN ); + pStrm-StartReadingUnicodeText(RTL_TEXTENCODING_DONTKNOW); // avoid BOM marker sal_uLong nBytesRead = pStrm-Read( aBuffer, nSize ); -if (nBytesRead == nSize) +if (nBytesRead = 6) { -if (0 == strncmp( ?xml,aBuffer,nSize)) +bool bIsMathType = false; +if (0 == strncmp( ?xml, aBuffer, 5)) { -// 200 should be enough for the XML -// version, encoding and !DOCTYPE -// stuff I hope? -sal_Char aBuffer2[200]; -nBytesRead = pStrm-Read( aBuffer2, sizeof(aBuffer2) - 1); -aBuffer2[nBytesRead] = 0; -if (strstr( aBuffer2, math ) || -strstr( aBuffer2, math ) || -strstr( aBuffer2, math:math )) -{ -static const sal_Char sFltrNm_2[] = MATHML_XML; -static const sal_Char sTypeNm_2[] = math_MathML_XML_Math; -aFilterName.AssignAscii( sFltrNm_2 ); -aTypeName.AssignAscii( sTypeNm_2 ); -} +if (strstr( aBuffer, math ) || +strstr( aBuffer, math ) || +strstr( aBuffer, math:math )) +bIsMathType = true; +} +// this is the old math tag to MathML in the beginning of the XML file +else if (0 == strncmp( math , aBuffer, 6) || + 0 == strncmp( math , aBuffer, 7) || + 0 == strncmp( math:math , aBuffer, 12)) +bIsMathType = true; + +if (bIsMathType){ +static const sal_Char sFltrNm_2[] = MATHML_XML; +static const sal_Char sTypeNm_2[] = math_MathML_XML_Math; +aFilterName.AssignAscii( sFltrNm_2 ); +aTypeName.AssignAscii( sTypeNm_2 ); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a15f297841f9d980fe71256484b0978b35b972f Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Fri Jul 5 13:23:40 2013 +0200 give configure a chance to tell the user what perl-modules are missing Change-Id: Ibd8cff5ca7d2e2807ef195601c996457e70d6d49 Reviewed-on: https://gerrit.libreoffice.org/4740 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com diff --git a/configure.ac b/configure.ac index fdca180..a48fcd7 100644 --- a/configure.ac +++ b/configure.ac @@ -4717,7 +4717,7 @@ AC_MSG_CHECKING([for required Perl modules]) if `$PERL -e 'use Archive::Zip; use Cwd; use Digest::MD5'/dev/null 21`; then AC_MSG_RESULT([all modules found]) else -AC_MSG_ERROR([Failed to find some modules]) +AC_MSG_RESULT([failed to find some modules]) # Find out which modules are missing. missing_perl_modules= if ! `$PERL -e 'use Archive::Zip;'/dev/null 21`; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/SvxColorChildWindow.hxx |9 +-- include/svx/fmsrcimp.hxx| 83 +--- include/svx/msdffdef.hxx| 36 +++ include/svx/sderitm.hxx |6 +- include/svx/sdshitm.hxx |6 +- include/svx/sdshtitm.hxx|6 +- include/svx/sdtcfitm.hxx|6 +- include/svx/sphere3d.hxx| 13 ++--- include/svx/svdcrtv.hxx | 36 +++ include/svx/sxcgitm.hxx |8 +-- include/svx/sxmfsitm.hxx|4 - include/svx/sxmoitm.hxx |4 - include/svx/sxmsitm.hxx |6 +- include/svx/sxmsuitm.hxx|2 include/svx/sxonitm.hxx |7 +-- include/svx/sxraitm.hxx |6 +- include/svx/sxroaitm.hxx|6 +- include/svx/sxrooitm.hxx|6 +- include/svx/sxsaitm.hxx |6 +- 19 files changed, 123 insertions(+), 133 deletions(-) New commits: commit 06c5c7f0d353ffc6c7012a9827f82d5c60499049 Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Fri Jul 5 20:02:19 2013 +0200 Translate German comments, fix some WS Change-Id: I5dcf6a911275e9fcb07d21b810591237a0f1ab9f Reviewed-on: https://gerrit.libreoffice.org/4747 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com diff --git a/include/svx/SvxColorChildWindow.hxx b/include/svx/SvxColorChildWindow.hxx index 0b9b320..0964511 100644 --- a/include/svx/SvxColorChildWindow.hxx +++ b/include/svx/SvxColorChildWindow.hxx @@ -21,12 +21,9 @@ #include sfx2/childwin.hxx #include svx/svxdllapi.h -/* -|* -|* Ableitung vom SfxChildWindow als Behaelter fuer Controller -|* -\/ - +/** + * Child of SfxChildWindow as a container for Controller + */ class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow { public: diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index 6fc1a2a..ea32ce0 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -38,10 +38,9 @@ #include deque -// === -// = class FmSearchThread -// === - +/** + * class FmSearchThread + */ class FmSearchEngine; class FmSearchThread : public ::osl::Thread { @@ -56,16 +55,15 @@ public: void setTerminationHandler(Link aHdl) { m_aTerminationHdl = aHdl; } }; -// === -// = struct FmSearchProgress - the owner of SearchEngine receives this structure for status updates -// = (at the end of the search) -// === - +/** + * struct FmSearchProgress - the owner of SearchEngine receives this structure for status updates + * (at the end of the search) + */ struct FmSearchProgress { enum STATE { STATE_PROGRESS, STATE_PROGRESS_COUNTING, STATE_CANCELED, STATE_SUCCESSFULL, STATE_NOTHINGFOUND, STATE_ERROR }; -// (move to new record; progress during counting of records; cancelled; record found; nothing found; -// any non-processable error) +// (move to new record; progress during counting of records; cancelled; record found; nothing found; +// any non-processable error) STATE aSearchState; // current record - always valid (e.g. of interest for continuing search in case of cancellation) @@ -79,11 +77,10 @@ struct FmSearchProgress sal_Int32 nFieldIndex; }; -// === -// = class FmRecordCountListener - utility class for FmSearchEngine, listens at a certain cursor and provides -// =the differences in RecordCount -// === - +/** + * class FmRecordCountListener - utility class for FmSearchEngine, listens at a certain cursor and provides + * the differences in RecordCount + */ class FmRecordCountListener : public ::cppu::WeakImplHelper1 ::com::sun::star::beans::XPropertyChangeListener { // attribute @@ -97,16 +94,16 @@ public: // methods public: FmRecordCountListener(const ::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet dbcCursor); -// the set has to support the sdb::ResultSet service +// the set has to support the sdb::ResultSet service virtual ~FmRecordCountListener(); // DECLARE_UNO3_AGG_DEFAULTS(FmPropertyListener, UsrObject); // virtual sal_Bool
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - hsqldb/makefile.mk hsqldb/patches
hsqldb/makefile.mk |5 hsqldb/patches/i103528.patch | 11 hsqldb/patches/i104901.patch | 27 -- hsqldb/patches/i121754.patch | 493 +++ hsqldb/patches/i96823.patch | 94 hsqldb/patches/i97032.patch | 10 6 files changed, 494 insertions(+), 146 deletions(-) New commits: commit 8b38aea281e230b1a40e6a09c6fb92c9d60c2997 Author: Andrea Pescetti pesce...@apache.org Date: Fri Jul 5 23:16:24 2013 + #i121754# Patch HSQLDB to align it to version 1.8.0.11, enable building on Java 7 diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 7c674ee..f66eb36 100644 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -49,10 +49,7 @@ CONVERTFILES=build$/build.xml \ src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \ src$/org$/hsqldb$/Library.java -PATCH_FILES=patches$/i96823.patch \ -patches$/i97032.patch \ -patches$/i103528.patch \ -patches$/i104901.patch +PATCH_FILES=patches$/i121754.patch .IF $(JAVACISGCJ)==yes JAVA_HOME= diff --git a/hsqldb/patches/i103528.patch b/hsqldb/patches/i103528.patch deleted file mode 100644 index 3cc7d2f..000 --- a/hsqldb/patches/i103528.patch +++ /dev/null @@ -1,11 +0,0 @@ misc/hsqldb/src/org/hsqldb/Library.java -+++ misc/build/hsqldb/src/org/hsqldb/Library.java -@@ -1957,7 +1957,7 @@ - functionMap.put(bitand, bitand); - functionMap.put(bitlength, bitLength); - functionMap.put(bitor, bitor); --functionMap.put(bitxor, bitor); -+functionMap.put(bitxor, bitxor); - functionMap.put(character, character); - functionMap.put(concat, concat); - functionMap.put(cot, cot); diff --git a/hsqldb/patches/i104901.patch b/hsqldb/patches/i104901.patch deleted file mode 100644 index a38773f..000 --- a/hsqldb/patches/i104901.patch +++ /dev/null @@ -1,27 +0,0 @@ misc/hsqldb/src/org/hsqldb/Table.java 2007-10-19 23:59:07.0 +0200 -+++ misc/build/hsqldb/src/org/hsqldb/Table.java2009-09-11 13:45:42.939231519 +0200 -@@ -149,10 +149,10 @@ - Constraint[] constraintList; // constrainst for the table - HsqlArrayList[] triggerLists; // array of trigger lists - private int[] colTypes; // fredt - types of columns --private int[] colSizes; // fredt - copy of SIZE values for columns -+int[] colSizes; // fredt - copy of SIZE values for columns - private int[] colScales; // fredt - copy of SCALE values for columns - private boolean[] colNullable;// fredt - modified copy of isNullable() values --private Expression[] colDefaults; // fredt - expressions of DEFAULT values -+Expression[]colDefaults; // fredt - expressions of DEFAULT values - private int[]defaultColumnMap;// fred - holding 0,1,2,3,... - private boolean hasDefaultValues;//fredt - shortcut for above - boolean sqlEnforceSize; // inherited from the database - misc/hsqldb/src/org/hsqldb/TableWorks.java 2007-01-14 06:48:16.0 +0100 -+++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java 2009-09-11 13:47:50.328667463 +0200 -@@ -670,7 +670,8 @@ - // default expressions can change - oldCol.setType(newCol); - oldCol.setDefaultExpression(newCol.getDefaultExpression()); --table.setColumnTypeVars(colIndex); -+ table.colSizes[colIndex]= oldCol.getSize(); -+table.colDefaults[colIndex] = oldCol.getDefaultExpression(); - table.resetDefaultsFlag(); - - return; diff --git a/hsqldb/patches/i121754.patch b/hsqldb/patches/i121754.patch new file mode 100644 index 000..33a1ac3 --- /dev/null +++ b/hsqldb/patches/i121754.patch @@ -0,0 +1,493 @@ +diff -urbwB ext_sources/hsqldb/build/build.xml ext_sources/hsqldb_1_8_0_11/build/build.xml +--- misc/hsqldb/build/build.xml2008-06-01 23:56:57.0 +0200 misc/build/hsqldb/build/build.xml 2013-07-05 23:25:40.0 +0200 +@@ -1,6 +1,6 @@ + ?xml version=1.0? +-!-- author fr...@users.sourceforge.net 2001 - 2008 -- +-!-- additional targets by unsa...@users.sourceforge.net 2004 - 2008 -- ++!-- author fr...@users.sourceforge.net 2001 - 2009 -- ++!-- additional targets by unsa...@users.sourceforge.net 2004 - 2009 -- + + project name=hsqldb default=help basedir=../ +!-- This loads properties in the same exact way as if you ran +@@ -14,10 +14,10 @@ + Do not address questions about property file(s) to the + hsqldb community. -- +property file='build/build.properties'/ +- property name=hsqldb.version value=1.8.0.10/ ++ property name=hsqldb.version value=1.8.0.11/ + +tstamp +-
Minutes of the ESC call 2013-07-04
* Attending: Ahmad, Lionel, Eike, Petr, Caolan, Cloph, Andras, Astron, Thorsten, Michael S. * New Action items: + further improve date API for RC3 (Eike/Michael S.) * Pending Action items: + get remaining GOSC guys introduced on the QA list (Cedric) + update visible bugzilla versions to hide ~all legacy versions (Joel) + get windows build-bot setup (Kendy/Thorsten) * Release Engineering update (Petr/Cloph) + 3.6.7 rc2 schedule + next monday: July 8th is the deadline for rc2 + should be the very last release ... + 4.1.0 rc2 status + mirror push ongoing, with fix for signing on windows + 4.1.0 rc3 schedule + should be the very last release ... + on july 15th, triple review needed * Spreadsheet announcement / performance work + http://blog.documentfoundation.org/2013/07/03/amd-joins-the-document-foundation-advisory-board-to-accelerate-libreoffice/ + laying foundations for further SIMD/UMA/openCL speedups in Calc + ongoing work towards 4.2 by Kohei et al. * UX input (Astron) + looking into side panel for 4.1 + otherwise all set for 4.1, svg reader regressed in master for about box background * date API (Lionel/Michael S./Eike) + attempt incremental improvement on top of 4.1 api change + if possible in time for 4.1, to avoid changing again in 4.2 AI + eike/mst to work on a fix towards rc3 * UI conversion (Caolan) + dialogs converted to new glade UI to date: 275 * Open 4.2 MAB + 0/0 + https://bugs.freedesktop.org/show_bug.cgi?id=65675 * Open 4.1 MAB + 7 (of 48) older 2/42 4/39 5/37 7/32 3/26 3/23 4/17 3/16 3/16 15% + https://bugs.freedesktop.org/showdependencytree.cgi?id=60270hide_resolved=1 * Open 4.0 MAB + 12 (of 134) older 12/133 12/132 16/132 14/130 16/129 16/128 18/129 9% 9% 9% 12%11%13%14%13% + https://bugs.freedesktop.org/showdependencytree.cgi?id=54157hide_resolved=1 * 3.6 most annoying bugs ... + 60 (of 241) older 57/238 63/237 65/236 68/235 67/232 69/231 71/229 25% 24%27%28%29%30%31%32% + https://bugs.freedesktop.org/showdependencytree.cgi?id=6hide_resolved=1 * Bibisected bugs open: whiteboard 'bibsected' + 36 (of 122) older 38/119 37/114 39/114 41/112 36/105 35/100 36/100 30/90 28/88 http://bit.ly/VQfF3Q * all bugs tagged with 'regression' + 294(-3) bugs open of 1697(+27) total * ~Component count net * Writer - 94 (-5) Spreadsheet - 27 (+3) Presentation - 27 (-2) Crashes - 23 (-3) Libreoffice - 26 (+0) Database - 25 (+1) Drawing - 18 (-2) Borders - 14 (+0) Migration - 3 (+0) BASIC - 2 (+0) + https://bugs.freedesktop.org/buglist.cgi?keywords=regression%2C%20keywords_type=allwordsresolution=---query_format=advancedproduct=LibreOfficelist_id=36764 + Migration: https://bugs.freedesktop.org/showdependencytree.cgi?id=43489hide_resolved=1 -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - framework/source
framework/source/uielement/popuptoolbarcontroller.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit be9ff0830ba1f8b3c782aa269c78657d264e48a9 Author: Ariel Constenla-Haile arie...@apache.org Date: Sat Jul 6 04:01:21 2013 + i122678 - Workaround for dynamic cast runtime bug diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index cb19d84..5e160d4 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -305,8 +305,8 @@ NewToolbarController::execute( sal_Int16 /*KeyModifier*/ ) { // TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu MenuConfiguration::Attributes* pMenuAttributes( 0 ); -VCLXPopupMenu* pTkPopupMenu = dynamic_cast VCLXPopupMenu * ( -VCLXMenu::GetImplementation( m_xPopupMenu ) ); +VCLXPopupMenu* pTkPopupMenu = +( VCLXPopupMenu * ) VCLXMenu::GetImplementation( m_xPopupMenu ); vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); PopupMenu* pVCLPopupMenu = dynamic_cast PopupMenu * ( pTkPopupMenu-GetMenu() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] Idea for the bugzilla wish list
is querying the version field with one full number or one decimal (or two?) easily. So [4] [*] or [3] [6] Anyways, I guess there must be some sort of wish list ? ;) Cheers, Cor -- - Cor Nouws - http://nl.libreoffice.org - The Document Foundation Membership Committee Member ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [GSOC] iOS Impress remote control
Hello all, This summer I will be working on an iOS application which allows users to control their slide shows right from their iOS devices. A complete proposal and estimated timetable is availableherehttp://www.google-melange.com/gsoc/proposal/review/google/gsoc2013/liusiqi43/1 . Currently I've implemented back-end communication functionalities like connections managements, command interpreter/transmitter, servers management etc. Besides, I've also started iPhone UI designimplementation. (you can find GUI mockups herehttp://siqi43.wordpress.com/2013/07/05/first-set-of-remote-control-gui-mock-ups/). The code is available at libreoffice/ios/iosremote on the master branch. Back-end code is in the Communication folder. The build is based on iOS5.0 and tested on iPhone simulator and my old iPad1 :P. I'm relatively new to iOS development so I will absolutely need to learn more about iOS programming practices. Please feel free to take a look at the code and let me know where I can do better. The current implementation is not yet fully functional. It can add/remove servers, handle connections and respond correctly to connection error, pairing with Impress and start a presentation. I am now working on the presentation control pad now so hopefully it can be functional before next week. I will let you know once it's ready for more tests. Finally, you can follow my progress on this feed: http://siqi43.wordpress.com/category/gsoc-2013/feed or contact me on IRC (nickname: siqi) All the best! Siqi -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Idea for the bugzilla wish list
On Fri, Jul 05, 2013 at 07:44:04AM +0200, Cor Nouws wrote: is querying the version field with one full number or one decimal (or two?) easily. So [4] [*] or [3] [6] Anyways, I guess there must be some sort of wish list ? ;) You can matches the regular expression in the Custom Search section. Note that http://regex.info/blog/2006-09-15/247 applies. Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Reported issues show the tendency to be more user questions ? BSA related ?
Hi, On Mon, Jul 01, 2013 at 04:59:15PM +0200, Bjoern Michaelsen wrote: I dont think so -- esp. it would not reduce the workload of those involved. What one might entertain is the idea to add a you seem to be filing a support request, have you considered to use ask.libreoffice.org, which is likely the better place and will result in a quicker answer?. ... or even better: have a confused -- talk to us here button in the top right corner of all BSA pages which opens a webchat to #libreoffice-qa -- this might also help community growth and is the same we did for developers with https://bugs.freedesktop.org/show_bug.cgi?id=56515. Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Minutes of the ESC call 2013-07-04
* Attending: Ahmad, Lionel, Eike, Petr, Caolan, Cloph, Andras, Astron, Thorsten, Michael S. * New Action items: + further improve date API for RC3 (Eike/Michael S.) * Pending Action items: + get remaining GOSC guys introduced on the QA list (Cedric) + update visible bugzilla versions to hide ~all legacy versions (Joel) + get windows build-bot setup (Kendy/Thorsten) * Release Engineering update (Petr/Cloph) + 3.6.7 rc2 schedule + next monday: July 8th is the deadline for rc2 + should be the very last release ... + 4.1.0 rc2 status + mirror push ongoing, with fix for signing on windows + 4.1.0 rc3 schedule + should be the very last release ... + on july 15th, triple review needed * Spreadsheet announcement / performance work + http://blog.documentfoundation.org/2013/07/03/amd-joins-the-document-foundation-advisory-board-to-accelerate-libreoffice/ + laying foundations for further SIMD/UMA/openCL speedups in Calc + ongoing work towards 4.2 by Kohei et al. * UX input (Astron) + looking into side panel for 4.1 + otherwise all set for 4.1, svg reader regressed in master for about box background * date API (Lionel/Michael S./Eike) + attempt incremental improvement on top of 4.1 api change + if possible in time for 4.1, to avoid changing again in 4.2 AI + eike/mst to work on a fix towards rc3 * UI conversion (Caolan) + dialogs converted to new glade UI to date: 275 * Open 4.2 MAB + 0/0 + https://bugs.freedesktop.org/show_bug.cgi?id=65675 * Open 4.1 MAB + 7 (of 48) older 2/42 4/39 5/37 7/32 3/26 3/23 4/17 3/16 3/16 15% + https://bugs.freedesktop.org/showdependencytree.cgi?id=60270hide_resolved=1 * Open 4.0 MAB + 12 (of 134) older 12/133 12/132 16/132 14/130 16/129 16/128 18/129 9% 9% 9% 12%11%13%14%13% + https://bugs.freedesktop.org/showdependencytree.cgi?id=54157hide_resolved=1 * 3.6 most annoying bugs ... + 60 (of 241) older 57/238 63/237 65/236 68/235 67/232 69/231 71/229 25% 24%27%28%29%30%31%32% + https://bugs.freedesktop.org/showdependencytree.cgi?id=6hide_resolved=1 * Bibisected bugs open: whiteboard 'bibsected' + 36 (of 122) older 38/119 37/114 39/114 41/112 36/105 35/100 36/100 30/90 28/88 http://bit.ly/VQfF3Q * all bugs tagged with 'regression' + 294(-3) bugs open of 1697(+27) total * ~Component count net * Writer - 94 (-5) Spreadsheet - 27 (+3) Presentation - 27 (-2) Crashes - 23 (-3) Libreoffice - 26 (+0) Database - 25 (+1) Drawing - 18 (-2) Borders - 14 (+0) Migration - 3 (+0) BASIC - 2 (+0) + https://bugs.freedesktop.org/buglist.cgi?keywords=regression%2C%20keywords_type=allwordsresolution=---query_format=advancedproduct=LibreOfficelist_id=36764 + Migration: https://bugs.freedesktop.org/showdependencytree.cgi?id=43489hide_resolved=1 -- Thorsten signature.asc Description: Digital signature ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 55764] EDITING: Cut and paste from FF/Chrome causes import options pop up
https://bugs.freedesktop.org/show_bug.cgi?id=55764 --- Comment #4 from Tim Lloyd tim.ll...@gmx.com --- confirmed on Fedora 19 with LO4.0.4.2 and Firefox NOT reproducible on Windows 7 with LO portable 4.0.1.2 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66487] Export PDF/A chrashes LibreOffice
https://bugs.freedesktop.org/show_bug.cgi?id=66487 tommy27 ba...@quipo.it changed: What|Removed |Added CC||ba...@quipo.it --- Comment #8 from tommy27 ba...@quipo.it --- no crash with test file using LibO 4.0.4.2 on Win7 Pro 64bit -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66100] 4.1RC1 App Icon of LibreOffice is a default App Icon
https://bugs.freedesktop.org/show_bug.cgi?id=66100 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|target:4.1.1 target:4.2.0 |target:4.1.0 target:4.2.0 --- Comment #14 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Norbert Thiebaud committed a patch related to this issue. It has been pushed to libreoffice-4-1-0: http://cgit.freedesktop.org/libreoffice/core/commit/?id=fec68441e79dbd042381f882c4f9814f637013ach=libreoffice-4-1-0 fdo#66100 : fix icons associations on MacOSX It will be available already in LibreOffice 4.1.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 64980] ordered list with subbullets does an unexpected indentation to the left when moving text
https://bugs.freedesktop.org/show_bug.cgi?id=64980 tommy27 ba...@quipo.it changed: What|Removed |Added Status|NEEDINFO|NEW CC||ba...@quipo.it Summary|: Ordered list with |ordered list with |subbullets does an |subbullets does an |unexpected indentation to |unexpected indentation to |the left when moving text |the left when moving text -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65174] VIEWING: Calc does not retain user-specified cell height after save
https://bugs.freedesktop.org/show_bug.cgi?id=65174 --- Comment #2 from Tim Lloyd tim.ll...@gmx.com --- Problem not reproducible either on: Fedora 19 LO4.0.4.2 Windows 7 LO Portable 4.0.1.2 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66588] Save of sheet in CSV format cuts off formulae
https://bugs.freedesktop.org/show_bug.cgi?id=66588 rob...@prino.org changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|NOTABUG |--- Ever confirmed|0 |1 --- Comment #2 from rob...@prino.org --- I'm sorry to say, but this is a bug. A formula is not data and should NEVER EVER EVER be truncated to the width of the resulting data, take for example a 42 character complex =IF() one that result in a one-character result. Truncate it to 1 character and the saved-in-CSV format sheet no longer bears any resemblance to the original one. Reopened, THIS IS A BUG, no matter how you try to weasel your way out of telling it isn't! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66609] FILESAVE: second and subsequent lines of indented list item not indented in XHTML export
https://bugs.freedesktop.org/show_bug.cgi?id=66609 --- Comment #1 from callow.m...@artspark.co.jp --- Created attachment 82063 -- https://bugs.freedesktop.org/attachment.cgi?id=82063action=edit Brief .odt whose xhtml export shows the problem -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66609] New: FILESAVE: second and subsequent lines of indented list item not indented in XHTML export
https://bugs.freedesktop.org/show_bug.cgi?id=66609 Priority: medium Bug ID: 66609 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: second and subsequent lines of indented list item not indented in XHTML export Severity: normal Classification: Unclassified OS: All Reporter: callow.m...@artspark.co.jp Hardware: Other Status: UNCONFIRMED Version: unspecified Component: Writer Product: LibreOffice The short .odt file I will attach contains a single section with a bullet list. Two of the items in the list is long and wrap to multiple lines. In an exported XHTML version (File-Export then choose xhtml), the second and subsequent lines of those items are aligned on the margin with the bullet instead of being indented and aligned with the first line as in the original document. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 50090] Office 2007 files created in LibO not readable on Windows Mobile
https://bugs.freedesktop.org/show_bug.cgi?id=50090 ga...@tenbit.pl changed: What|Removed |Added Version|3.5.3 release |4.0.4.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 50090] Office 2007 files created in LibO not readable on Windows Mobile
https://bugs.freedesktop.org/show_bug.cgi?id=50090 --- Comment #3 from ga...@tenbit.pl --- Still does not work in LO 4.0.4, THX Thomas. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66100] 4.1RC1 App Icon of LibreOffice is a default App Icon
https://bugs.freedesktop.org/show_bug.cgi?id=66100 --- Comment #15 from mi...@filmsi.net --- Great work, guys. Thanks! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66601] [Formatting] Index: wrong Table of Contents.
https://bugs.freedesktop.org/show_bug.cgi?id=66601 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |INVALID CC||c...@nouenoff.nl --- Comment #1 from Cor Nouws c...@nouenoff.nl --- Hi Maximiliano, Thanks for writing your report. The problem however is that you have many empy paragraphs that have a heading style (Heading 1 etc.) applied. Because of the link via Tools Outline Numbereing, those appear in the index :) You may also look at the Navigator (F5) - nice way to look at the applied heading paragraph styles HTH, Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66601] [Formatting] Index: wrong Table of Contents.
https://bugs.freedesktop.org/show_bug.cgi?id=66601 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|RESOLVED|CLOSED --- Comment #2 from Cor Nouws c...@nouenoff.nl --- . -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66611] New: Opening file through UNO API is extremely slow
https://bugs.freedesktop.org/show_bug.cgi?id=66611 Priority: medium Bug ID: 66611 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Opening file through UNO API is extremely slow Severity: critical Classification: Unclassified OS: Windows (All) Reporter: giorgio.migliac...@lettergen.com Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.0.4.2 release Component: Writer Product: LibreOffice When opening (even very simple) documents in LibreOffice 4.0.4.2 through the UNO API you need to wait about 10 minutes before the file is finally open. Opening these same files in LibreOffice 4.0.2.2 (also UNO API) only takes some seconds. We experienced this same issue with LibreOffice 3.6.0 branch, but not with 3.5.x branch, nor with previous 4.0.x releases. Launching LibreOffice itself through UNO takes the same amount of time, some seconds. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66588] Save of sheet in CSV format cuts off formulae
https://bugs.freedesktop.org/show_bug.cgi?id=66588 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|REOPENED|NEW CC||c...@nouenoff.nl --- Comment #3 from Cor Nouws c...@nouenoff.nl --- (In reply to comment #2) I'm sorry to say, but this is a bug. A formula is not data csv is text, so there is no distiction in whatever content. Reopened, THIS IS A BUG, no matter how you try to weasel your way out of telling it isn't! Hmm, thought we could try to be more polite here ;) I don't know your use case, Robert, but probably there are better ways to get to where you want? Cheers, Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66609] FILESAVE: second and subsequent lines of indented list item not indented in XHTML export
https://bugs.freedesktop.org/show_bug.cgi?id=66609 Thomas van der Meulen pje...@hotmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=65765 Ever confirmed|0 |1 --- Comment #2 from Thomas van der Meulen pje...@hotmail.com --- Thank you for your bug report, I can reproduce this bug running LibreOffice ersion: 4.1.0.2.0 Build ID: 103a942746cfe346e87daab62acbd4268c38097on Mac osx 10.8.4. I can see that the first 1 is replaced with a 0 and that the line that is wraped to multiple lines is moved back. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 37341] Goal Seek hangs indefinitely for too many calculation steps (Formula Cell $F$110)
https://bugs.freedesktop.org/show_bug.cgi?id=37341 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |winfrieddonkers@libreoffice |desktop.org |.org --- Comment #16 from Winfried Donkers winfrieddonk...@libreoffice.org --- I confirm problem -as described in comment 3 and comment 4 - still exists on master. I will look into the code and see if i can find the cause and a fix. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65765] [META] 4.1 RC Triage Contest Tracker
https://bugs.freedesktop.org/show_bug.cgi?id=65765 Thomas van der Meulen pje...@hotmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=66609 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66603] FORMULA HYPERLINK
https://bugs.freedesktop.org/show_bug.cgi?id=66603 --- Comment #1 from Thomas van der Meulen pje...@hotmail.com --- *** Bug 66604 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65765] [META] 4.1 RC Triage Contest Tracker
https://bugs.freedesktop.org/show_bug.cgi?id=65765 Thomas van der Meulen pje...@hotmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=66604 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66604] FORMULA HYPERLINK
https://bugs.freedesktop.org/show_bug.cgi?id=66604 Thomas van der Meulen pje...@hotmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=65765 --- Comment #1 from Thomas van der Meulen pje...@hotmail.com --- *** This bug has been marked as a duplicate of bug 66603 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs