[Libreoffice-commits] .: 2 commits - sw/inc sw/qa

[David Tardon]

 sw/inc/charfmt.hxx     |    2 +-
 sw/qa/core/makefile.mk |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 63e6d351de7d70a057ded052e4e584e0c60b9957
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jan 16 18:35:04 2011 +0100

    dbglevel=2 build uses libxml2

diff --git a/sw/qa/core/makefile.mk b/sw/qa/core/makefile.mk
index 0d180a5..7fbd456 100644
--- a/sw/qa/core/makefile.mk
+++ b/sw/qa/core/makefile.mk
@@ -94,6 +94,10 @@ SHL2STDLIBS+= \
     $(AVMEDIALIB) \
     $(CPPUNITLIB)
 
+.IF "$(DBG_LEVEL)">="2"
+SHL2STDLIBS += $(LIBXML_LIBS)
+.ENDIF
+
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
 SHL2VERSIONMAP = export.map
commit 0efaac2a1cc834059c50b7161f33f2bce2b2b15e
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jan 16 09:34:57 2011 +0100

    make public
    
    Breaks build with debug libstdc++ because linker cannot find typeinfo
    for SwCharFmt when linking libmsword.

diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index 8c78ee6..d37db27 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -30,7 +30,7 @@
 
 #include <format.hxx>
 
-class SwCharFmt : public SwFmt
+class SW_DLLPUBLIC SwCharFmt : public SwFmt
 {
     friend class SwDoc;
     friend class SwTxtFmtColl;