[Libreoffice-commits] .: 5 commits - .gitattributes sdext/source

[Bjoern Michaelsen]

 .gitattributes                                |    1 +
 sdext/source/pdfimport/inc/pdfihelper.hxx     |    2 ++
 sdext/source/pdfimport/test/tests.cxx         |    2 ++
 sdext/source/pdfimport/tree/pdfiprocessor.hxx |    3 ++-
 4 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 3aeeb0147d38c20291b0e076fbfee3be5f35356b
Merge: 7c5d68a... 9d58c0e...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Jul 24 19:22:59 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit 7c5d68ae42b4144a9b844b50f9889be9fbb07e2a
Merge: 0443d1c... 04f358b...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Jul 21 18:34:50 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit 0443d1c2d189004cbd93fee3b5be1206311b4975
Merge: f54a3d9... b4c8f51...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Jun 19 12:55:08 2011 +0200

    Merge branch 'master' into feature/gnumake4

diff --cc sdext/source/pdfimport/inc/pdfihelper.hxx
index 87c3f21,111ebcc..34646eb
mode 100755,100644..100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
diff --cc sdext/source/pdfimport/test/tests.cxx
index f7236a8,9c5c609..244ddea
mode 100755,100644..100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
diff --cc sdext/source/pdfimport/tree/pdfiprocessor.hxx
index a394a7c,61c8d40..a388ff2
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@@ -49,9 -48,10 +50,9 @@@
  
  #include <boost/shared_ptr.hpp>
  #include <list>
- #include <hash_map>
+ #include <boost/unordered_map.hpp>
  
  #include "imagecontainer.hxx"
 -#include "pdfihelper.hxx"
  #include "contentsink.hxx"
  #include "treevisitorfactory.hxx"
  #include "genericelements.hxx"
commit f54a3d9ceb6bcdead419ec0abfcea6540567473b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jun 18 14:12:16 2011 +0200

    fixing rebase errors

diff --git a/.gitattributes b/.gitattributes
new file mode 120000
index 0000000..f18402b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file
commit 1f75381e17b6a74e5f2340357e36b76205971375
Author: Mathias Bauer <mba at openoffice.org>
Date:   Tue Mar 1 21:09:50 2011 +0100

    CWS gnumake4: reimplement basegfx_s hack for new build system [hg:c943ed591aff]

diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx
index f7865eb..87c3f21 100755
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -28,6 +28,8 @@
 #ifndef INCLUDED_PDFI_HELPER_HXX
 #define INCLUDED_PDFI_HELPER_HXX
 
+#define BASEGFX_STATICLIBRARY
+
 #include "contentsink.hxx"
 
 #include <rtl/ustring.hxx>
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index b44dda9..f7236a8 100755
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -28,6 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sdext.hxx"
 
+#define BASEGFX_STATICLIBRARY
+
 #ifdef SYSTEM_ZLIB
 #include "zlib.h"
 #else
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 37865a0..a394a7c 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -28,6 +28,8 @@
 #ifndef INCLUDED_PDFI_PROCESSOR_HXX
 #define INCLUDED_PDFI_PROCESSOR_HXX
 
+#include "pdfihelper.hxx"
+
 #include <com/sun/star/util/XStringMapping.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
@@ -50,7 +52,6 @@
 #include <hash_map>
 
 #include "imagecontainer.hxx"
-#include "pdfihelper.hxx"
 #include "contentsink.hxx"
 #include "treevisitorfactory.hxx"
 #include "genericelements.hxx"