[Libreoffice-commits] .: 8 commits - RepositoryExternal.mk unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jul 26 04:39:07 PDT 2011
RepositoryExternal.mk | 49 ++++++++++++++++++++++++----
unusedcode.easy | 87 +++++++++++++++++++++++++-------------------------
2 files changed, 87 insertions(+), 49 deletions(-)
New commits:
commit 66bd5158860dd505191b4e9e94b91fa7cfddd04e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 26 01:13:19 2011 +0100
strip down unused old-style string methods
diff --git a/unusedcode.easy b/unusedcode.easy
index 911c392..743cca5 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1444,15 +1444,6 @@ StgEntry::GetTime(StgEntryTime) const
StgEntry::SetTime(StgEntryTime, int*)
StgHeader::SetClassId(ClsId const&)
StorageStream::ValidateMode(unsigned short, StgDirEntry*) const
-String::CompareIgnoreCaseToAscii(unsigned short const*, unsigned short) const
-String::CompareTo(unsigned short const*, unsigned short) const
-String::Equals(unsigned short const*) const
-String::EqualsIgnoreCaseAscii(unsigned short const*, unsigned short, unsigned short) const
-String::Insert(unsigned short const*, unsigned short)
-String::Match(unsigned short const*) const
-String::SearchAndReplace(unsigned short const*, String const&, unsigned short)
-String::SearchAndReplaceAll(unsigned short const*, String const&)
-SvBaseEventDescriptor::mapEventIDToName(unsigned short) const
SvBasicPropertyDataControl::GetData()
SvBasicPropertyDataControl::GetName() const
SvBasicPropertyDataControl::GetProperty() const
commit a6d1a077a7a5189ed974d4364e87e640eefd6d7f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 26 00:30:20 2011 +0100
callcatcher: ditch various unused write methods
diff --git a/unusedcode.easy b/unusedcode.easy
index 84500dd..911c392 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,8 @@
(anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&)
(anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&)
Application::PostUserEvent(unsigned long, void*)
+B3dTransformationSet::GetScale()
+B3dTransformationSet::GetTranslate()
BasicError::BasicError()
BasicIDEDLL::Exit()
BasicIDEShell::LinkStubAccelSelectHdl(void*, void*)
@@ -210,6 +212,8 @@ DffPropSet::SetPropertyValue(unsigned int, unsigned int) const
Dialog::Dialog(Window*, ResId const&)
Dialog::ImplCenterDialog()
Dialog::IsStartedModal() const
+DicEntry::DicEntry()
+Dir::ImpSetSort(__va_list_tag*, int)
DirEntry::GetDevice() const
DirEntry::GetPathStyle()
DlgEdObj::LinkStubOnCreate(void*, void*)
@@ -334,6 +338,7 @@ GalleryExplorer::InsertSdrObj(unsigned long, FmFormModel&)
GalleryTheme::ImplRead()
GlobalEventConfig::EstablishFrameCallback(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&)
GlobalEventConfig_Impl::getEvents()
+GlyphCache::AddFontPath(String const&)
GradientLB::GradientLB(Window*, long, unsigned char)
GraphCtrl::GetStringFromDouble(double const&)
GraphCtrl::GraphCtrl(Window*, long)
@@ -380,6 +385,7 @@ HttpRequest::GetStatus()
HttpRequest::~HttpRequest()
IMapWindow::GetSdrObj(IMapObject const*) const
INetURLObject::hasPassword() const
+IceSalSession::handleOldX11SaveYourself(SalFrame*)
IconChoiceDialog::RemoveResetButton()
IconChoiceDialog::RemoveTabPage(unsigned short)
ImageAryData::ImageAryData()
@@ -395,6 +401,8 @@ ImpDefaultMapper::ImpDefaultMapper(com::sun::star::uno::Reference<com::sun::star
ImpEditEngine::ImplFillTextMarkingVector(com::sun::star::lang::Locale const&, std::vector<EEngineData::TextMarkingClass, std::allocator<EEngineData::TextMarkingClass> >&, String const&, unsigned short, unsigned short) const
ImpEditEngine::Repeat(EditView*)
ImpEditView::CalcSelectedRegion()
+ImpFileDialog::RemoveAllFilter()
+ImpFileDialog::RemoveFilter(String const&)
ImpLabelList::ImplFirst()
ImpLabelList::ImplNext()
ImpSdrHdcMerk::ImpSdrHdcMerk(OutputDevice const&, unsigned short, bool)
@@ -497,8 +505,6 @@ LongCurrencyFormatter::SetEmptyValue()
LotAttrCache::ENTRY::ENTRY(ScPatternAttr const&)
LotAttrCol::Clear()
LwpBulletStyleMgr::GetSectionName(LwpPara*)
-LwpBulletStyleMgr::OutputBulletListHeader(IXFStream*, unsigned char, rtl::OUString const&, short, unsigned char)
-LwpBulletStyleMgr::OutputBulletListTail(IXFStream*, unsigned short)
LwpCHBlkMarker::ProcessPageNumber(XFContentContainer*, unsigned char)
LwpCellLayout::GetLeaderChar()
LwpChangeMgr::ConvertFribContent(XFContentContainer*, LwpFrib*)
@@ -553,6 +559,8 @@ MSFilterTracer::StartElement(rtl::OUString const&, com::sun::star::uno::Referenc
MachineSettings::CopyData()
MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>)
MaskSet::MaskSet(SvxBmpMask*, long)
+Matrix3d::Inverse() const
+Matrix3d::Matrix3d()
Menu::ConvertPoint(Point&, Window*) const
Menu::GetAccessibleDescription(unsigned short) const
Menu::GetDisplayItemId(long) const
@@ -1219,7 +1227,6 @@ SfxMacroStatement::SfxMacroStatement(String const&)
SfxMacroStatement::SfxMacroStatement(String const&, SfxSlot const&, unsigned char, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
SfxMailModel::GetCount() const
SfxMailModel::MakeValueList(std::vector<String*, std::allocator<String*> >*, String&)
-SfxMedium::Cancel_Impl()
SfxMedium::Exists(unsigned char)
SfxMedium::GetCharset()
SfxMedium::GetDataAvailableLink() const
@@ -1281,6 +1288,7 @@ SfxPopupWindow::LinkStubDelete(void*, void*)
SfxPopupWindow::RemoveStatusListener(rtl::OUString const&)
SfxPopupWindow::SfxPopupWindow(unsigned short, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, Window*, ResId const&)
SfxPopupWindow::UpdateStatus(rtl::OUString const&)
+SfxPreviewBase_Impl::SfxPreviewBase_Impl(Window*)
SfxPreviewWin::SfxPreviewWin(Window*, ResId const&, SfxObjectShellLock&)
SfxProgress::GetWaitMode() const
SfxProgress::Lock()
@@ -1714,6 +1722,30 @@ SvtModuleOptions::GetFactoryWindowAttributes(SvtModuleOptions::EFactory) const
SvtModuleOptions::GetFeatures() const
SvtModuleOptions::GetModuleName(SvtModuleOptions::EFactory) const
SvtModuleOptions::SetFactoryWindowAttributes(SvtModuleOptions::EFactory, rtl::OUString const&)
+SvtOptionsDrawinglayer_Impl::SetMaximumPaperBottomMargin(unsigned int)
+SvtOptionsDrawinglayer_Impl::SetMaximumPaperHeight(unsigned int)
+SvtOptionsDrawinglayer_Impl::SetMaximumPaperLeftMargin(unsigned int)
+SvtOptionsDrawinglayer_Impl::SetMaximumPaperRightMargin(unsigned int)
+SvtOptionsDrawinglayer_Impl::SetMaximumPaperTopMargin(unsigned int)
+SvtOptionsDrawinglayer_Impl::SetMaximumPaperWidth(unsigned int)
+SvtOptionsDrawinglayer_Impl::SetOverlayBuffer(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_Calc(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_DrawImpress(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_Writer(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetPaintBuffer(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetPaintBuffer_Calc(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetPaintBuffer_DrawImpress(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetPaintBuffer_Writer(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetQuadratic3DRenderLimit(unsigned int)
+SvtOptionsDrawinglayer_Impl::SetQuadraticFormControlRenderLimit(unsigned int)
+SvtOptionsDrawinglayer_Impl::SetRenderDecoratedTextDirect(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetRenderSimpleTextDirect(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetSelectionMaximumLuminancePercent(unsigned short)
+SvtOptionsDrawinglayer_Impl::SetSnapHorVerLinesToDiscrete(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetSolidDragCreate(unsigned char)
+SvtOptionsDrawinglayer_Impl::SetStripeColorA(Color)
+SvtOptionsDrawinglayer_Impl::SetStripeColorB(Color)
+SvtOptionsDrawinglayer_Impl::SetStripeLength(unsigned short)
SvtPathOptions::GetPath(SvtPathOptions::Pathes) const
SvtPathOptions::IsPathReadonly(SvtPathOptions::Pathes) const
SvtPathOptions::SetPath(SvtPathOptions::Pathes, String const&)
@@ -1816,6 +1848,9 @@ SvxHyperlinkTabPageBase::FileExists(INetURLObject const&)
SvxIMapDlg::GetTargetList() const
SvxIconChoiceCtrlEntry::LockPos(unsigned char)
SvxIconChoiceCtrlEntry::SetMoved(unsigned char)
+SvxIconChoiceCtrl_Impl::CalcScrollOffsets(Point const&, long&, long&, unsigned char, unsigned short)
+SvxIconChoiceCtrl_Impl::GetNextSelectedEntry(unsigned long&) const
+SvxIconChoiceCtrl_Impl::ShowDDIcon(SvxIconChoiceCtrlEntry*, Point const&)
SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx&, long)
SvxImportMSVBasic::Import(String const&, String const&, unsigned char, unsigned char)
SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&)
@@ -2565,6 +2600,7 @@ basegfx::B3DHomMatrix::normalize()
basegfx::B3DHomMatrix::shearXZ(double, double)
basegfx::B3DHomMatrix::shearYZ(double, double)
basegfx::B3DHomMatrix::trace() const
+basegfx::B3DHomMatrix::transpose()
basegfx::B3DHomPoint::implHomogenize()
basegfx::B3DPolyPolygon::insert(unsigned int, basegfx::B3DPolyPolygon const&)
basegfx::B3DPolyPolygon::insert(unsigned int, basegfx::B3DPolygon const&, unsigned int)
@@ -2715,9 +2751,6 @@ binfilter::CharPosArray::Insert(binfilter::CharPosArray const*, unsigned short,
binfilter::CharPosArray::Replace(int const&, unsigned short)
binfilter::CharPosArray::Replace(int const*, unsigned short, unsigned short)
binfilter::CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
-binfilter::ChartModel::CleanupOld3DStorage()
-binfilter::ChartModel::PrepareAxisStorage()
-binfilter::ChartModel::PrepareOld3DStorage()
binfilter::ContainerSorter::DoSort(unsigned long, unsigned long) const
binfilter::DbgName_CntBoolItem()
binfilter::DbgName_CntEnumItem()
@@ -2727,7 +2760,6 @@ binfilter::DbgName_SfxFrameSetDescriptor()
binfilter::DbgName_SfxStringListItem()
binfilter::DbgName_SvxMacroItem()
binfilter::Dictionary::~Dictionary()
-binfilter::E3dScene::CreateLightObjectsFromLightGroup()
binfilter::EECharAttribArray::Insert(binfilter::EECharAttrib const&, unsigned short)
binfilter::EECharAttribArray::Insert(binfilter::EECharAttribArray const*, unsigned short, unsigned short, unsigned short)
binfilter::EECharAttribArray::Remove(unsigned short, unsigned short)
@@ -2838,6 +2870,7 @@ binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const*, unsigned short)
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccessArr const*, unsigned short, unsigned short)
binfilter::SdrUnoControlAccessArr::Remove(binfilter::SdrUnoControlAccess* const&, unsigned short)
+binfilter::SfxConfigManagerImExport_Impl::Export(SotStorage*, SotStorage*)
binfilter::SfxDocumentInfo::SavePropertySet(binfilter::SvStorage*) const
binfilter::SfxHintPoster::LinkStubDoEvent_Impl(void*, void*)
binfilter::SfxItemModifyArr_Impl::Insert(binfilter::SfxItemModifyArr_Impl const*, unsigned short, unsigned short, unsigned short)
@@ -2979,20 +3012,6 @@ binfilter::Sw3Bytes::Insert(binfilter::Sw3Bytes const*, unsigned short, unsigned
binfilter::Sw3Bytes::Replace(unsigned char const&, unsigned short)
binfilter::Sw3Bytes::Replace(unsigned char const*, unsigned short, unsigned short)
binfilter::Sw3Bytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
-binfilter::Sw3Io::GetStorage()
-binfilter::Sw3Io::SaveStyles()
-binfilter::Sw3IoImp::CollectMarks(binfilter::SwPaM*, unsigned char)
-binfilter::Sw3IoImp::CollectRedlines(binfilter::SwPaM*, unsigned char)
-binfilter::Sw3IoImp::CollectTblLineBoxFmts40()
-binfilter::Sw3IoImp::InsertHiddenDrawObjs()
-binfilter::Sw3IoImp::OutField(binfilter::SwFmtFld const&)
-binfilter::Sw3IoImp::OutNumRules(unsigned char)
-binfilter::Sw3IoImp::OutPageDescs(unsigned char)
-binfilter::Sw3IoImp::OutRecordSizesPos(unsigned long)
-binfilter::Sw3IoImp::OutULong(SvStream&, unsigned int)
-binfilter::Sw3IoImp::RemoveHiddenDrawObjs()
-binfilter::Sw3IoImp::SaveDocContents(binfilter::SwPaM&, String const*)
-binfilter::Sw3IoImp::SaveStyleSheets(unsigned char)
binfilter::Sw3Marks::GetPos(binfilter::Sw3Mark const*) const
binfilter::Sw3Marks::Remove(binfilter::Sw3Mark*)
binfilter::Sw3NumRuleInfos::DeleteAndDestroy(unsigned short, unsigned short)
@@ -3821,6 +3840,9 @@ linguistic::GetTextEncoding(short)
linguistic::IsLower(String const&, unsigned short, unsigned short, short)
linguistic::LangSeqToLocaleSeq(com::sun::star::uno::Sequence<short> const&)
linguistic::MergeProposals(com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives>&, com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives>&)
+linguistic::PropertyHelper_Spelling::GetMaxNumberOfSuggestions() const
+linguistic::PropertyHelper_Spelling::RemoveAsPropListener()
+linguistic::PropertyHelper_Spelling::~PropertyHelper_Spelling()
linguistic::SearchFileInPaths(String const&, com::sun::star::uno::Sequence<rtl::OUString> const&)
linguistic::SpellAlternatives::SpellAlternatives(rtl::OUString const&, short, short, rtl::OUString const&)
linguistic::StripTrailingChars(rtl::OUString&, unsigned short)
@@ -4303,6 +4325,8 @@ svx::DialControl::GetModifyHdl() const
svx::DialControl::SetModifyHdl(Link const&)
svx::DocRecovery::PluginProgress::getPlugWindow()
svx::DocRecovery::RecoveryDialog::impl_refreshDocList()
+svx::FeatureSlotTranslation::getControllerFeatureURLForSlotId(int)
+svx::FeatureSlotTranslation::isFeatureURL(rtl::OUString const&)
svx::FontWorkGalleryDialog::changeText(SdrTextObj*)
svx::FormControllerHelper::moveLeft() const
svx::FormControllerHelper::moveRight() const
@@ -4553,19 +4577,7 @@ writerfilter::dmapper::SectionPropertyMap::GetPageStyleName(bool)
writerfilter::dmapper::SectionPropertyMap::SetPageStyleName(bool, rtl::OUString const&)
writerfilter::dmapper::StyleSheetTable::resolveSprmProps(writerfilter::Sprm&)
writerfilter::doctok::WW8DocumentImpl::fc2cp(writerfilter::doctok::Fc const&) const
-writerfilter::doctok::WW8StructBase::getBit(unsigned int, unsigned short) const
-writerfilter::doctok::WW8StructBase::getNibble(unsigned int, unsigned short) const
-writerfilter::doctok::WW8Sttbf::getExtraData(unsigned int)
-writerfilter::doctok::WW8StyleSheet::calcSize()
-writerfilter::doctok::WW8sprmPChgTabsPapx::calcSize()
-writerfilter::doctok::WW8sprmTCellBottomColor::calcSize()
-writerfilter::doctok::WW8sprmTCellLeftColor::calcSize()
-writerfilter::doctok::WW8sprmTCellRightColor::calcSize()
-writerfilter::doctok::WW8sprmTCellShadow::calcSize()
-writerfilter::doctok::WW8sprmTCellShd::calcSize()
-writerfilter::doctok::WW8sprmTCellTopColor::calcSize()
-writerfilter::doctok::WW8sprmTDefTableShd::calcSize()
-writerfilter::doctok::WW8sprmTGridLineProps::calcSize()
+writerfilter::doctok::WW8Sttbf::getExtraOffset(unsigned int) const
writerfilter::doctoktest::ScannerTestService_supportsService(rtl::OUString const&)
writerfilter::ooxml::OOXMLFastContextHandler::getResourceString() const
writerfilter::ooxmltest::ScannerTestService_supportsService(rtl::OUString const&)
commit 286bbbaea7f8fc3640318735f65478a9d265269e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 22:46:41 2011 +0100
callcatcher: ditch unused methods
diff --git a/unusedcode.easy b/unusedcode.easy
index f105a9d..84500dd 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -4303,8 +4303,6 @@ svx::DialControl::GetModifyHdl() const
svx::DialControl::SetModifyHdl(Link const&)
svx::DocRecovery::PluginProgress::getPlugWindow()
svx::DocRecovery::RecoveryDialog::impl_refreshDocList()
-svx::FeatureSlotTranslation::getControllerFeatureURLForSlotId(int)
-svx::FeatureSlotTranslation::isFeatureURL(rtl::OUString const&)
svx::FontWorkGalleryDialog::changeText(SdrTextObj*)
svx::FormControllerHelper::moveLeft() const
svx::FormControllerHelper::moveRight() const
commit 5bf0eb6ba7a41965eb3fb080a0d7a1288f4bc7a9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 22:24:27 2011 +0100
add fontconfig and freetype to get configured flags
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6b1007e..ee65d9e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -302,6 +302,23 @@ endef
endif # SYSTEM_CAIRO
+define gb_LinkTarget__use_freetype
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(FREETYPE_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
+
+endef
+
+define gb_LinkTarget__use_fontconfig
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(FONTCONFIG_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
+
+endef
ifeq ($(SYSTEM_GRAPHITE),YES)
commit 42bc39e99a98b1b8e83d280d96b27909b5fa2d3a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 22:10:33 2011 +0100
keep it consistent and add a blank line before all endef
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 311bafa..6b1007e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -46,6 +46,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(call gb_LinkTarget_add_libs,$(1),\
$(CPPUNIT_LIBS) \
)
+
endef
else
@@ -58,6 +59,7 @@ define gb_LinkTarget__use_cppunit
$(call gb_LinkTarget_add_linked_libs,$(1),\
cppunit \
)
+
endef
endif
@@ -69,6 +71,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_ZLIB \
)
$(call gb_LinkTarget_add_libs,$(1),-lz)
+
endef
else # !SYSTEM_ZLIB
@@ -81,6 +84,7 @@ define gb_LinkTarget__use_zlib
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
zlib \
)
+
endef
endif # SYSTEM_ZLIB
@@ -93,6 +97,7 @@ $(call gb_LinkTarget_add_libs,$(1),-ljpeg)
$(call gb_LinkTarget_set_ldflags,$(1),\
$$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
)
+
endef
else # !SYSTEM_JPEG
@@ -105,6 +110,7 @@ define gb_LinkTarget__use_jpeg
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
jpeglib \
)
+
endef
endif # SYSTEM_JPEG
@@ -120,6 +126,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
)
$(call gb_LinkTarget_add_libs,$(1),-lexpat)
+
endef
else # !SYSTEM_EXPAT
@@ -142,6 +149,7 @@ $(call gb_LinkTarget_add_linked_static_libs,$(1),\
$(2) \
expat_xmltok \
)
+
endef
endif # SYSTEM_EXPAT
@@ -149,10 +157,12 @@ endif # SYSTEM_EXPAT
# now define 2 wrappers that select which internal static library to use...
define gb_LinkTarget__use_expat_utf8
$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse)
+
endef
define gb_LinkTarget__use_expat_utf16
$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse)
+
endef
@@ -167,6 +177,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(LIBXML_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(LIBXML_LIBS))
+
endef
else # !SYSTEM_LIBXML
@@ -179,6 +190,7 @@ define gb_LinkTarget__use_libxml2
$(call gb_LinkTarget_add_linked_libs,$(1),\
xml2 \
)
+
endef
endif # SYSTEM_LIBXML
@@ -192,6 +204,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(LIBXSLT_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(LIBXSLT_LIBS))
+
endef
else # !SYSTEM_LIBXSLT
@@ -204,6 +217,7 @@ define gb_LinkTarget__use_libxslt
$(call gb_LinkTarget_add_linked_libs,$(1),\
xslt \
)
+
endef
endif # SYSTEM_LIBXSLT
@@ -220,6 +234,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(REDLAND_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(REDLAND_LIBS))
+
endef
else # !SYSTEM_REDLAND
@@ -232,6 +247,7 @@ define gb_LinkTarget__use_librdf
$(call gb_LinkTarget_add_linked_libs,$(1),\
rdf \
)
+
endef
endif # SYSTEM_REDLAND
@@ -247,6 +263,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(CAIRO_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS))
+
endef
else # !SYSTEM_CAIRO
@@ -294,6 +311,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(GRAPHITE_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS))
+
endef
else # !SYSTEM_GRAPHITE
@@ -305,6 +323,7 @@ define gb_LinkTarget__use_graphite
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
graphite2_off \
)
+
endef
endif # SYSTEM_GRAPHITE
@@ -317,9 +336,11 @@ $(call gb_LinkTarget_add_libs,$(1),-licui18n)
endef
define gb_LinkTarget__use_icule
$(call gb_LinkTarget_add_libs,$(1),-licule)
+
endef
define gb_LinkTarget__use_icuuc
$(call gb_LinkTarget_add_libs,$(1),-licuuc)
+
endef
else # !SYSTEM_ICU
@@ -339,11 +360,13 @@ define gb_LinkTarget__use_icule
$(call gb_LinkTarget_add_linked_libs,$(1),\
icule \
)
+
endef
define gb_LinkTarget__use_icuuc
$(call gb_LinkTarget_add_linked_libs,$(1),\
icuuc \
)
+
endef
endif # SYSTEM_ICU
@@ -357,6 +380,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(OPENSSL_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
+
endef
else # !SYSTEM_OPENSSL
@@ -391,6 +415,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
)
endif
endif
+
endef
endif # SYSTEM_OPENSSL
commit f6fcb784d2177ff211c8060dfccc9e462c70400b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 22:04:06 2011 +0100
nothing links to stlport anymore
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6e7025f..311bafa 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -288,7 +288,6 @@ endif # SYSTEM_CAIRO
ifeq ($(SYSTEM_GRAPHITE),YES)
-#check for building with stlport, but graphite was not built with stlport
define gb_LinkTarget__use_graphite
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
commit 9f4af206b0a2c43f1bac60d884ac900a67d811ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 21:50:34 2011 +0100
apparently need a blank line between endif and endef
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index eda6b16..6e7025f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -280,6 +280,7 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\
)
endif
endif
+
endef
endif # SYSTEM_CAIRO
commit a6ac82fedf9b59ea49d6e645cf192198f6e90739
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 21:37:51 2011 +0100
USE_SYSTEM_STL and ADAPT_EXT_STL are gone now
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a4d29a8..eda6b16 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -289,11 +289,6 @@ ifeq ($(SYSTEM_GRAPHITE),YES)
#check for building with stlport, but graphite was not built with stlport
define gb_LinkTarget__use_graphite
-ifneq ($(USE_SYSTEM_STL),YES)
-$(call gb_LinkTarget_add_defs,$(1),\
- -DADAPT_EXT_STL \
-)
-endif
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(GRAPHITE_CFLAGS) \
More information about the Libreoffice-commits
mailing list