offapi/com/sun/star/sheet/Shape.idl | 2 +- solenv/doc/gbuild/solenv/gbuild/types.mk | 2 -- solenv/gbuild/LinkTarget.mk | 4 ---- vcl/Library_vcl.mk | 5 +++-- 4 files changed, 4 insertions(+), 9 deletions(-)
New commits: commit e6f76788df9e2b1b9e8e195bcea45ed6253e8492 Author: Herbert Dürr <[email protected]> Date: Thu Jan 9 10:01:41 2014 +0000 #i114728# remove the unused gb_Library_add_ldflags helper when the alternative is between - adding an add_ldflags helper and providing extensive docs about it and all other related gbuild macros - just using the already existing set_ldflags macro then that choice is easy... diff --git a/solenv/doc/gbuild/solenv/gbuild/types.mk b/solenv/doc/gbuild/solenv/gbuild/types.mk index 697f6d3..e17706d 100644 --- a/solenv/doc/gbuild/solenv/gbuild/types.mk +++ b/solenv/doc/gbuild/solenv/gbuild/types.mk @@ -122,8 +122,6 @@ namespace gb { namespace types void set_dll_target(Path dlltarget); /// Set additional flags for the link command. void set_ldflags(List<Path> ldflags); - /// Add additional flags for the link command. - void add_ldflags(List<Path> ldflags); }; /// A target that delivers headers of some kind. class DeliversHeaders diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 2e8e2d3..3dfd2df 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -448,10 +448,6 @@ define gb_LinkTarget_set_ldflags $(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2) endef -define gb_LinkTarget_add_ldflags -$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS:=$$(LDFLAGS) $(2) -endef - define gb_LinkTarget_add_linked_libs ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) commit c97da0955ecada6811e161b3e1ed81aafa1cc463 Author: Herbert Dürr <[email protected]> Date: Thu Jan 9 09:51:25 2014 +0000 #i114728# fix linking of quicktime framework on SDK!=10.7 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 761eaa2..1d3d963 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -510,13 +510,14 @@ ifeq ($(GUIBASE),aqua) $(eval $(call gb_Library_add_linked_libs,vcl,\ AppleRemote \ )) -$(eval $(call gb_Library_add_ldflags,vcl,\ +$(eval $(call gb_Library_set_ldflags,vcl,\ + $$(LDFLAGS) \ -framework Cocoa \ -framework Carbon \ -framework CoreFoundation \ )) ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7) -$(eval $(call gb_Library_add_ldflags,vcl, -framework QuickTime )) +$(eval $(call gb_Library_set_ldflags,vcl, $$(LDFLAGS) -framework QuickTime )) endif endif commit bbb0f24a32bada4224f913611db0a10a2ee1f303 Author: Tsutomu Uchino <[email protected]> Date: Thu Jan 9 08:30:57 2014 +0000 #i124001# remove readonly flag from Anchor property diff --git a/offapi/com/sun/star/sheet/Shape.idl b/offapi/com/sun/star/sheet/Shape.idl index 54dbd1a..8c06d9a 100644 --- a/offapi/com/sun/star/sheet/Shape.idl +++ b/offapi/com/sun/star/sheet/Shape.idl @@ -45,7 +45,7 @@ service Shape /** contains the object where this shape is anchored on. <p> Possible objects are XSpreadsheet and XCell.</p> */ - [readonly, property] com::sun::star::uno::XInterface Anchor; + [property] com::sun::star::uno::XInterface Anchor; //------------------------------------------------------------------------- /** contains the horizontal position of the object (1/100 mm). <p> The position is relative to the anchor object.</p>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
