configure.ac | 89 +++++-------------------
svl/source/items/IndexedStyleSheets.cxx | 9 +-
writerperfect/CppunitTest_writerperfect_draw.mk | 3
3 files changed, 32 insertions(+), 69 deletions(-)
New commits:
commit 33ae095d92246cd2c74c30c9e070a8e0241926db
Author: David Tardon <dtar...@redhat.com>
Date: Sun Nov 13 15:03:03 2016 +0100
add missing dependency
Change-Id: I72696c82d9a96709746060ae18bd497da8715d35
diff --git a/svl/source/items/IndexedStyleSheets.cxx
b/svl/source/items/IndexedStyleSheets.cxx
index 260ae10..fa68f49 100644
--- a/svl/source/items/IndexedStyleSheets.cxx
+++ b/svl/source/items/IndexedStyleSheets.cxx
@@ -53,7 +53,6 @@ IndexedStyleSheets::IndexedStyleSheets()
}
;}
-
void
IndexedStyleSheets::Register(const SfxStyleSheetBase& style, unsigned pos)
{
@@ -91,6 +90,7 @@ IndexedStyleSheets::GetNumberOfStyleSheets() const
void
IndexedStyleSheets::AddStyleSheet(const rtl::Reference< SfxStyleSheetBase >&
style)
{
+ assert(!style->GetName().isEmpty());
if (!HasStyleSheet(style)) {
mStyleSheets.push_back(style);
// since we just added an element to the vector, we can safely do -1
as it will always be >= 1
@@ -101,6 +101,7 @@ IndexedStyleSheets::AddStyleSheet(const rtl::Reference<
SfxStyleSheetBase >& sty
bool
IndexedStyleSheets::RemoveStyleSheet(const rtl::Reference< SfxStyleSheetBase
>& style)
{
+ assert(!style->GetName().isEmpty());
rtl::OUString styleName = style->GetName();
std::vector<unsigned> positions = FindPositionsByName(styleName);
bool found = false;
@@ -200,6 +201,7 @@ void
IndexedStyleSheets::Clear(StyleSheetDisposer& disposer)
{
for (VectorType::iterator it = mStyleSheets.begin(); it !=
mStyleSheets.end(); ++it) {
+ assert(!(*it)->GetName().isEmpty());
disposer.Dispose(*it);
}
mStyleSheets.clear();
@@ -207,7 +209,10 @@ IndexedStyleSheets::Clear(StyleSheetDisposer& disposer)
}
IndexedStyleSheets::~IndexedStyleSheets()
-{;}
+{
+ for (const auto& rStyleSheet : mStyleSheets)
+ assert(!rStyleSheet->GetName().isEmpty());
+}
bool
IndexedStyleSheets::HasStyleSheet(const rtl::Reference< SfxStyleSheetBase >&
style) const
diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk
b/writerperfect/CppunitTest_writerperfect_draw.mk
index 442fef4..24f7ce4 100644
--- a/writerperfect/CppunitTest_writerperfect_draw.mk
+++ b/writerperfect/CppunitTest_writerperfect_draw.mk
@@ -42,4 +42,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,writerperfect_draw,\
writerperfect/qa/unit/WpftDrawFilterTest \
))
+$(call gb_CppunitTest_get_target,writerperfect_draw): \
+ $(call gb_AllLangResTarget_get_target,sd)
+
# vim: set noet sw=4 ts=4:
commit a64958ab631a81feda8a42807b17fda6cb29147e
Author: David Tardon <dtar...@redhat.com>
Date: Sat Nov 12 10:25:40 2016 +0100
move all tests for DLP libs to one place
Change-Id: Icbce7f5512c0c205f44db520f337ce9520d228d5
diff --git a/configure.ac b/configure.ac
index 1c1c87f..a5ffd99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7840,7 +7840,7 @@ fi
AC_SUBST([ENABLE_EOT])
dnl ===================================================================
-dnl Check for system librevenge
+dnl Check for DLP libs
dnl ===================================================================
AS_IF([test "$COM" = "MSC"],
[librevenge_libdir="${WORKDIR}/LinkTarget/Library"],
@@ -7848,66 +7848,46 @@ AS_IF([test "$COM" = "MSC"],
)
libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >=
0.0.1],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir}
-lrevenge-0.0"])
-dnl ===================================================================
-dnl Check for system libe-book
-dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
+libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.1])
-dnl ===================================================================
-dnl Check for system libetonyek
-dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
+AS_IF([test "$COM" = "MSC"],
+ [libwpd_libdir="${WORKDIR}/LinkTarget/Library"],
+ [libwpd_libdir="${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs"]
+)
+libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${libwpd_libdir}
-lwpd-0.10"])
-dnl ===================================================================
-dnl Check for system libfreehand
-dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
+libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
-dnl ===================================================================
-dnl Check for system libodfgen
-dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.1])
+libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.4])
+
+libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
-dnl ===================================================================
-dnl Check for system libcdr
-dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
-dnl ===================================================================
-dnl Check for system libmspub
-dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
-dnl ===================================================================
-dnl Check for system libmwaw
-dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.8])
-dnl ===================================================================
-dnl Check for system libpagemaker
-dnl ===================================================================
+libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
+libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
+
+libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
+
+libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
+libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
+
+libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
+
libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
-dnl ===================================================================
-dnl Check for system libzmf
-dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0])
-dnl ===================================================================
-dnl Check for system libstaroffice
-dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0])
libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.2])
dnl ===================================================================
-dnl Check for system libvisio
-dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
-
-dnl ===================================================================
dnl Check for system libcmis
dnl ===================================================================
# libcmis requires curl and we can't build curl for iOS
@@ -7920,15 +7900,6 @@ fi
AC_SUBST(ENABLE_CMIS)
dnl ===================================================================
-dnl Check for system libwpd
-dnl ===================================================================
-AS_IF([test "$COM" = "MSC"],
- [libwpd_libdir="${WORKDIR}/LinkTarget/Library"],
- [libwpd_libdir="${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs"]
-)
-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${libwpd_libdir}
-lwpd-0.10"])
-
-dnl ===================================================================
dnl Check for system lcms2
dnl ===================================================================
if test "$with_system_lcms2" = "yes"; then
@@ -7980,22 +7951,6 @@ AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
AC_SUBST([SYSTEM_FREETYPE])
-dnl ===================================================================
-dnl Check for system libabw
-dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
-
-dnl ===================================================================
-dnl Check for system libwps
-dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.4])
-
-dnl ===================================================================
-dnl Check for system libwpg
-dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
-
# ===================================================================
# Check for system libxslt
# to prevent incompatibilities between internal libxml2 and external libxslt,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
