diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
| commit | d381760a0bdbc403426db365fcdd79c48805a1f9 (patch) | |
| tree | 969d1f2189bb9c5d73ea358016389539c1ef23c5 /sdext/source/pdfimport | |
| parent | e7e8d94bb6d31abc98bbeb4026481aa052f29278 (diff) | |
| parent | bbc5105d503634578685f235497b39965f528d1a (diff) | |
merge commit
Diffstat (limited to 'sdext/source/pdfimport')
| -rw-r--r-- | sdext/source/pdfimport/makefile.mk | 7 | ||||
| -rw-r--r-- | sdext/source/pdfimport/pdfparse/makefile.mk | 2 | ||||
| -rw-r--r-- | sdext/source/pdfimport/pdfparse/pdfparse.cxx | 12 |
3 files changed, 13 insertions, 8 deletions
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index d6cd4783454f..f8c6f71f0d3d 100644 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -39,6 +39,9 @@ ENABLE_EXCEPTIONS=TRUE MKDEPENDSOLVER:= .INCLUDE: settings.mk + +.IF "$(L10N_framework)"=="" + .INCLUDE: pdfisettings.pmk INCPRE=-I$(PRJ)$/source$/pdfimport$/inc @@ -132,7 +135,9 @@ COMPONENT_IMAGES=\ EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_HELP) $(COMPONENT_IMAGES) makefile.mk .INCLUDE : extension_pre.mk +.ENDIF # L10N_framework .INCLUDE : target.mk +.IF "$(L10N_framework)"=="" .INCLUDE : extension_post.mk $(CONVERTER_FILE) : $(BIN)$/$$(@:f) @@ -150,3 +155,5 @@ $(COMPONENT_HELP) : help$/$$(@:f) $(COMPONENT_IMAGES) : images$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +.ENDIF # L10N_framework + diff --git a/sdext/source/pdfimport/pdfparse/makefile.mk b/sdext/source/pdfimport/pdfparse/makefile.mk index 7249e52205eb..9cbb5f1b92fd 100644 --- a/sdext/source/pdfimport/pdfparse/makefile.mk +++ b/sdext/source/pdfimport/pdfparse/makefile.mk @@ -44,6 +44,8 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE CFLAGS+=-DSYSTEM_ZLIB .ENDIF +ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE + # --- Files -------------------------------------------------------- SLOFILES=\ diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index baaef9877270..c9b3b1522cc5 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -42,14 +42,10 @@ // workaround windows compiler: do not include multi_pass.hpp //#include <boost/spirit.hpp> -#include <boost/spirit/core.hpp> -#include <boost/spirit/utility.hpp> -#include <boost/spirit/error_handling.hpp> -#include <boost/spirit/iterator/file_iterator.hpp> -#if SPIRIT_VERSION >= 0x1800 -#define USE_ASSIGN_ACTOR -#include <boost/spirit/actor/assign_actor.hpp> -#endif +#include <boost/spirit/include/classic_core.hpp> +#include <boost/spirit/include/classic_utility.hpp> +#include <boost/spirit/include/classic_error_handling.hpp> +#include <boost/spirit/include/classic_file_iterator.hpp> #include <boost/bind.hpp> #include <string> |