download.lst | 4 ++-- libcdr/ExternalPackage_libcdr.mk | 8 ++++---- libcdr/ExternalProject_libcdr.mk | 1 + libcdr/UnpackedTarball_cdr.mk | 6 ------ libcdr/libcdr-0.0.13.patch | 12 ------------ starmath/source/smres.src | 4 ++-- svx/source/svdraw/svdundo.cxx | 2 +- 7 files changed, 10 insertions(+), 27 deletions(-)
New commits: commit bd05db796bffc5ad84f5bd6f5ecc0ca808c890ec Author: Joren De Cuyper <joren.libreoff...@telenet.be> Date: Tue May 21 20:17:15 2013 +0200 fdo#62483 missing default button in format -> aligment dialog at math The default button was missing because the dialog was to small (it "fell off"). Also the default button was placed a bit to far from the help button IMHO. Change-Id: I05a079cacf6e5ac73861aff4a7dab7a455f3f181 Reviewed-on: https://gerrit.libreoffice.org/3995 Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org> Tested-by: Fridrich Strba <fridr...@documentfoundation.org> diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 4836fbd..33ade5e 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -874,7 +874,7 @@ ModalDialog RID_ALIGNDIALOG OutputSize = TRUE ; SVLook = TRUE ; HelpId = CMD_SID_ALIGN ; - Size = MAP_APPFONT ( 139 , 66 ) ; + Size = MAP_APPFONT ( 139 , 80 ) ; Text [ en-US ] = "Alignment" ; RadioButton 1 { @@ -931,7 +931,7 @@ ModalDialog RID_ALIGNDIALOG { HelpID = "starmath:PushButton:RID_ALIGNDIALOG:1"; TabStop = TRUE ; - Pos = MAP_APPFONT ( 83 , 69 ) ; + Pos = MAP_APPFONT ( 83 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Default" ; }; commit c50c7f7449429f277d9772fa77087f6e6afca96c Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Fri May 17 14:29:43 2013 +0200 Make libcdr build a little bit less verbose (cherry picked from commit 4c3ad94c70f98f5062bf96a6f1339992b7ec2bd1) Conflicts: libcdr/ExternalProject_libcdr.mk Change-Id: I8e70cd72e8c7934b2a04fbe6b9ed5f662c494960 Reviewed-on: https://gerrit.libreoffice.org/3943 Reviewed-by: David Tardon <dtar...@redhat.com> Tested-by: David Tardon <dtar...@redhat.com> diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index d7e7693..56378ab 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -73,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --without-docs \ --disable-debug \ --disable-werror \ + --disable-weffc \ $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ commit 6d5f3411ed66d9a447c9fb234b8422b9e38c4bc6 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Fri May 17 14:29:27 2013 +0200 Uploading new libcdr 0.0.14 (cherry picked from commit 0f28a2a5e29499b62074dad4442fafa57858677d) Conflicts: download.lst libcdr/UnpackedTarball_libcdr.mk libcdr/libcdr-0.0.13.patch Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72 Reviewed-on: https://gerrit.libreoffice.org/3942 Reviewed-by: David Tardon <dtar...@redhat.com> Tested-by: David Tardon <dtar...@redhat.com> diff --git a/download.lst b/download.lst index 657a418..aa1f98c 100644 --- a/download.lst +++ b/download.lst @@ -1,5 +1,5 @@ -CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00 -export CDR_TARBALL := libcdr-0.0.13.tar.bz2 +CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112 +export CDR_TARBALL := libcdr-0.0.14.tar.bz2 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 VISIO_MD5SUM := 4e9a029d8390a1707eb49a1a918797ff diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index d032e8f..b163eed 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -10,10 +10,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,cdr)) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\ - src/lib/libcdr.h \ - src/lib/CDRDocument.h \ - src/lib/CDRStringVector.h \ - src/lib/CMXDocument.h \ + inc/libcdr/libcdr.h \ + inc/libcdr/CDRDocument.h \ + inc/libcdr/CDRStringVector.h \ + inc/libcdr/CMXDocument.h \ )) $(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr)) diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index a4a427d..be1e7d7 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr)) $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,cdr,\ - libcdr/libcdr-0.0.13.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libcdr/libcdr-0.0.13.patch b/libcdr/libcdr-0.0.13.patch deleted file mode 100644 index 29b2b28..0000000 --- a/libcdr/libcdr-0.0.13.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/lib/CDRParser.cpp -+++ b/src/lib/CDRParser.cpp -@@ -32,6 +32,9 @@ - #include <string.h> - #include <sstream> - #include <set> -+#ifndef BOOST_ALL_NO_LIB -+#define BOOST_ALL_NO_LIB 1 -+#endif - #include <boost/property_tree/json_parser.hpp> - #include <boost/property_tree/ptree.hpp> - #include <boost/spirit/include/classic.hpp> commit 91651be74026e11f4ffa188fd2e04dde7c5779c0 Author: Michael Stahl <mst...@redhat.com> Date: Fri May 17 13:23:34 2013 +0200 fdo#62965: fix crash in Edit Contour dialog The pObjList is 0, so use pObj's GetModel() which should be the same. (regression from 115054fef08998c56cba8f14472df1d15007f635) Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de (cherry picked from commit 71f990d286c603b3bf220c8d93af69f04a45dd7a) Reviewed-on: https://gerrit.libreoffice.org/3936 Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org> Tested-by: Fridrich Strba <fridr...@documentfoundation.org> diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index c1e4b4d..a68bf1f 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -714,7 +714,7 @@ SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect) nOrdNum=pObj->GetOrdNum(); } - m_pListener = new ObjListListener(*this, *pObj, *pObjList->GetModel()); + m_pListener = new ObjListListener(*this, *pObj, *pObj->GetModel()); } SdrUndoObjList::~SdrUndoObjList()
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits