[Libreoffice-commits] core.git: 3 commits - lcms2/ExternalPackage_lcms2.mk RepositoryExternal.mk solenv/gbuild unotools/source unusedcode.easy
Matúš Kukan
matus.kukan at gmail.com
Mon Sep 9 23:17:42 PDT 2013
RepositoryExternal.mk | 5 -
lcms2/ExternalPackage_lcms2.mk | 2
solenv/gbuild/ExternalPackage.mk | 5 +
unotools/source/config/xmlaccelcfg.cxx | 140 ---------------------------------
unusedcode.easy | 2
5 files changed, 6 insertions(+), 148 deletions(-)
New commits:
commit 1ea33a8cfc5bc51d0cf83989702b8be82cf52c49
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Sep 10 01:04:39 2013 +0200
fix lcms2 library in solver
This commit repairs broken link liblcms2.so -> liblcms2.so.2.0.4 as
liblcms2.so -> liblcms2.so.2.
Change-Id: Idccd65bba5cec822d285859f609e222c84f2fad9
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index d132619..395be9a 100644
--- a/lcms2/ExternalPackage_lcms2.mk
+++ b/lcms2/ExternalPackage_lcms2.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if $(MSVC_USE_DEBUG_R
$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
endif
else
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so))
+$(eval $(call gb_ExternalPackage_add_symbolic_link,lcms2,lib/liblcms2.so,liblcms2.so.2))
$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4))
endif
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 7ec30cb..9d6a52c 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -102,6 +102,11 @@ $(foreach file,$(2),$(call gb_ExternalProject_mark_generated_file,$(1),$(file)))
endef
+define gb_ExternalPackage_add_symbolic_link
+$(call gb_Package_add_symbolic_link,$(1),$(2),$(3))
+
+endef
+
# Add a file
#
# See gb_Package_add_file for details.
commit be4d2cdc23c20a11a195cab8fb6a45312a814341
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Sep 9 17:11:03 2013 +0200
unusedcode: remove AttributeListImpl
Change-Id: I9c3c0d742bc2941fcf40ad69bfb744a57b3e7be6
diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index 719cbf7..bd598d2 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.cxx
@@ -35,146 +35,6 @@ using namespace com::sun::star::xml::sax;
#define ATTRIBUTE_MODIFIER "modifier"
#define ATTRIBUTE_URL "url"
-namespace {
-
-struct AttributeListImpl_impl;
-class AttributeListImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList >
-{
-protected:
- ~AttributeListImpl();
-
-public:
- AttributeListImpl();
- AttributeListImpl( const AttributeListImpl & );
-
-public:
- virtual sal_Int16 SAL_CALL getLength(void) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getValueByName(const OUString& aName) throw (::com::sun::star::uno::RuntimeException);
-
-public:
- void addAttribute( const OUString &sName , const OUString &sType , const OUString &sValue );
-
-private:
- struct AttributeListImpl_impl *m_pImpl;
-};
-
-struct TagAttribute
-{
- TagAttribute(){}
- TagAttribute( const OUString &aName, const OUString &aType , const OUString &aValue )
- {
- sName = aName;
- sType = aType;
- sValue = aValue;
- }
-
- OUString sName;
- OUString sType;
- OUString sValue;
-};
-
-struct AttributeListImpl_impl
-{
- AttributeListImpl_impl()
- {
- // performance improvement during adding
- vecAttribute.reserve(20);
- }
- ::std::vector<struct TagAttribute> vecAttribute;
-};
-
-
-
-sal_Int16 SAL_CALL AttributeListImpl::getLength(void) throw (RuntimeException)
-{
- return sal::static_int_cast< sal_Int16 >(m_pImpl->vecAttribute.size());
-}
-
-
-AttributeListImpl::AttributeListImpl( const AttributeListImpl &r ) :
- cppu::WeakImplHelper1<com::sun::star::xml::sax::XAttributeList>(r)
-{
- m_pImpl = new AttributeListImpl_impl;
- *m_pImpl = *(r.m_pImpl);
-}
-
-OUString AttributeListImpl::getNameByIndex(sal_Int16 i) throw (RuntimeException)
-{
- if( i < sal::static_int_cast<sal_Int16>(m_pImpl->vecAttribute.size()) ) {
- return m_pImpl->vecAttribute[i].sName;
- }
- return OUString();
-}
-
-
-OUString AttributeListImpl::getTypeByIndex(sal_Int16 i) throw (RuntimeException)
-{
- if( i < sal::static_int_cast<sal_Int16>(m_pImpl->vecAttribute.size()) ) {
- return m_pImpl->vecAttribute[i].sType;
- }
- return OUString();
-}
-
-OUString AttributeListImpl::getValueByIndex(sal_Int16 i) throw (RuntimeException)
-{
- if( i < sal::static_int_cast<sal_Int16>(m_pImpl->vecAttribute.size()) ) {
- return m_pImpl->vecAttribute[i].sValue;
- }
- return OUString();
-
-}
-
-OUString AttributeListImpl::getTypeByName( const OUString& sName ) throw (RuntimeException)
-{
- ::std::vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
-
- for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) {
- if( (*ii).sName == sName ) {
- return (*ii).sType;
- }
- }
- return OUString();
-}
-
-OUString AttributeListImpl::getValueByName(const OUString& sName) throw (RuntimeException)
-{
- ::std::vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
-
- for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) {
- if( (*ii).sName == sName ) {
- return (*ii).sValue;
- }
- }
- return OUString();
-}
-
-
-AttributeListImpl::AttributeListImpl()
-{
- m_pImpl = new AttributeListImpl_impl;
-}
-
-
-
-AttributeListImpl::~AttributeListImpl()
-{
- delete m_pImpl;
-}
-
-
-void AttributeListImpl::addAttribute( const OUString &sName ,
- const OUString &sType ,
- const OUString &sValue )
-{
- m_pImpl->vecAttribute.push_back( TagAttribute( sName , sType , sValue ) );
-}
-
-} // anonymous namespace
-
Any SAL_CALL OReadAccelatorDocumentHandler::queryInterface( const Type & rType ) throw( RuntimeException )
{
Any a = ::cppu::queryInterface( rType ,(static_cast< XDocumentHandler* >(this)));
diff --git a/unusedcode.easy b/unusedcode.easy
index 676f777..de647fb 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,3 @@
-(anonymous namespace)::AttributeListImpl::AttributeListImpl()
-(anonymous namespace)::AttributeListImpl::addAttribute(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
(anonymous namespace)::Coverage::test_start(rtl::OUString)
(anonymous namespace)::StringToken::toInt32(int&) const
(anonymous namespace)::StringTokenizer::StringTokenizer(rtl::OUString const&, unsigned short)
commit 18ac4a1bc7925712cc63ccb692cf854a040261c6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Jul 17 15:27:32 2013 +0200
we do not register static libraries anymore
Change-Id: I5831080411f6a759f5ebd8fbac840b8fb40be878
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0217196..f8d3f0f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -667,11 +667,6 @@ gb_ExternalProject__use_libatomic_ops :=
else # !SYSTEM_LIBATOMIC_OPS
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- libatomic-ops-7.2d \
-))
-
-
define gb_LinkTarget__use_libatomic_ops
$(call gb_LinkTarget_set_include,$(1),\
$(LIBATOMIC_OPS_CFLAGS) \
More information about the Libreoffice-commits
mailing list