[Libreoffice-commits] .: 3 commits - solenv/gbuild writerfilter/inc

[Tor Lillqvist]

 solenv/gbuild/platform/windows.mk               |    2 ++
 writerfilter/inc/resourcemodel/TableManager.hxx |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 2f059de8b77b12a806453e8f9156264762fe86cc
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Sep 6 16:07:46 2011 +0300

    Do generate debugging information with MSVC when gb_SYMBOL is on

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 795b42f..f51bce6 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -210,6 +210,8 @@ gb_CXXFLAGS+=-Zi
 endif
 
 ifeq ($(gb_SYMBOL),$(true))
+gb_CFLAGS+=-Zi
+gb_CXXFLAGS+=-Zi
 endif
 
 ifneq ($(gb_DEBUGLEVEL),0)
commit d2e2c50e60ab8de9b22ad7aa2906833a6c9d9ff2
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Sep 6 11:46:52 2011 +0300

    Make this easier to parse visually

diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index ba9a629..36a9b86 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -49,10 +49,10 @@ namespace writerfilter
 
 using namespace ::std;
 
-template <typename T, typename PropertiesPointer>
 /**
    Class to handle events generated by TableManager::resolveCurrentTable
  */
+template <typename T, typename PropertiesPointer>
 class TableDataHandler
 {
 public:
commit 3b881220a6f39c2890a20a15fb007958a432d9c2
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Sep 6 11:41:01 2011 +0300

    Do what I said in 8b23d5be319ed4bac5d855c127dcfe7c6d0dc32c
    
    Don't mark the template class TableDataHandler for DLL export/import
    either. It seems to break the MSVC build, and dropping the decoration
    fixed the problem.
    
    Odd that I didn't notice before now, or is it really over a month
    since I managed to build master last? That wouldn't be too surprising,
    I guess. But other people do claim the have built master with MSVC
    relatively recently. Or is it just that this templace class has only
    recently been used more than earlier? Or does the fact that I am still
    attempting a --enable-dbgutil build affect this? The world is full of
    little mysteries.

diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index a0525d1..ba9a629 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -53,7 +53,7 @@ template <typename T, typename PropertiesPointer>
 /**
    Class to handle events generated by TableManager::resolveCurrentTable
  */
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC TableDataHandler
+class TableDataHandler
 {
 public:
     typedef boost::shared_ptr<TableDataHandler> Pointer_t;