[Libreoffice-commits] .: Branch 'feature/gnumake2.1' - 2 commits - starmath/inc starmath/Library_sm.mk sw/Library_sw.mk sw/source

[Norbert Thiebaud]

 starmath/Library_sm.mk          |    2 +-
 starmath/inc/applicat.hxx       |   26 --------------------------
 sw/Library_sw.mk                |    7 +++++++
 sw/source/core/text/xmldump.cxx |    3 +++
 4 files changed, 11 insertions(+), 27 deletions(-)

New commits:
commit a28c6333aaa9b6448510d0a17cb2584096717ff1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Jan 19 12:48:53 2011 -0600

    fix debug gmake build for sw

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index ed7c53c..365da3c 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -726,8 +726,15 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 	sw/source/core/except/dbgloop \
 	sw/source/core/layout/dbg_lay \
 	sw/source/core/text/txtio \
+	sw/source/core/text/xmldump \
 ))
 
+ifneq (gb_DEBUGLEVEL,0)
+$(eval $(call gb_Library_add_linked_libs,sw,\
+	xml2 \
+))
+endif
+
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_linked_libs,sw,\
 	dl \
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index f655e98..2fe9ac4 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -36,6 +36,7 @@
 
 
 
+#if OSL_DEBUG_LEVEL > 0
 class XmlPortionDumper:public SwPortionHandler
 {
   private:
@@ -311,3 +312,5 @@ void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
     if ( HasFollow() )
         xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%p", GetFollow() );
 }
+
+#endif /* OSL_DEBUG_LEVEL > 0 */
commit fc11dd75627d81c08f9b6b8751d28a9ee18ad2bd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Jan 19 12:48:06 2011 -0600

    fix starmath build define, and remove the obsolete dep on _DLL_

diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 18d2f98..6a4c5eb 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,sm,\
 
 $(eval $(call gb_Library_set_defs,sm,\
         $$(DEFS) \
-        -DSC_DLLIMPLEMENTATION \
+        -DSMDLL \
         -DSC_INFO_OSVERSION=\"$(OS)\" \
 ))
 
diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx
index e232906..8044ad9 100644
--- a/starmath/inc/applicat.hxx
+++ b/starmath/inc/applicat.hxx
@@ -67,32 +67,6 @@ public:
 
 #endif
 
-#ifndef _DLL_
-class SmDLL;
-
-class SmApplicat: public SfxApplication
-{
-protected:
-    SvxErrorHandler     *pSvxErrorHandler;
-
-    virtual void	OpenClients();
-
-    // initialization / deinitialization
-    virtual void	Init();
-    virtual void        Exit();
-
-public:
-    void Main();
-
-    SmApplicat() :
-        SfxApplication("iso")
-    {
-    }
-
-};
-
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */