diff options
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/prj/build.lst | 4 | ||||
| -rw-r--r-- | sdext/source/pdfimport/makefile.mk | 6 | ||||
| -rwxr-xr-x | sdext/source/pdfimport/wrapper/wrapper.cxx | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst index ade4e8267b40..e4e7e90e64a1 100644 --- a/sdext/prj/build.lst +++ b/sdext/prj/build.lst @@ -7,10 +7,12 @@ dx sdext\source\minimizer\registry\data\org\openoffice\Office\UI nmake - all s dx sdext\source\minimizer\registry\data\org\openoffice\Office nmake - all sdext_minimizer_rdooo NULL dx sdext\source\presenter nmake - all sdext_presenter sdext_inc NULL dx sdext\inc nmake - all sdext_inc NULL +dx sdext\source\pdfimport\xpdfwrapper nmake - all dx_xpdfwrap NULL +dx sdext\source\pdfimport\xpdftest nmake - all dx_parsetest dx_xpdfwrap NULL dx sdext\source\pdfimport\wrapper nmake - all sdext_pdfwrap sdext_inc NULL dx sdext\source\pdfimport\misc nmake - all sdext_misc sdext_inc NULL dx sdext\source\pdfimport\odf nmake - all sdext_odf sdext_inc NULL dx sdext\source\pdfimport\pdfparse nmake - all sdext_pdfparse sdext_inc NULL dx sdext\source\pdfimport\sax nmake - all sdext_sax sdext_inc NULL dx sdext\source\pdfimport\tree nmake - all sdext_tree sdext_inc NULL -dx sdext\source\pdfimport nmake - all sdext_pdfi sdext_pdfwrap sdext_misc sdext_odf sdext_pdfparse sdext_sax sdext_tree sdext_inc NULL +dx sdext\source\pdfimport nmake - all sdext_pdfi sdext_pdfwrap sdext_misc sdext_odf sdext_pdfparse sdext_sax sdext_tree sdext_inc dx_xpdfwrap NULL diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index 8c53d497aa70..df11c43ce9d4 100644 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.4.1 $ # # This file is part of OpenOffice.org. # @@ -107,7 +107,7 @@ COMPONENT_XCU= \ $(EXTENSIONDIR)$/pdf_types.xcu CONVERTER_FILE= \ - $(EXTENSIONDIR)$/xpdfimport$(EXECPOST) \ + $(EXTENSIONDIR)$/xpdfimport$(EXECPOST) COMPONENT_DIALOGS= \ $(EXTENSIONDIR)$/basic$/Module1.xba \ @@ -131,7 +131,7 @@ EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_HELP) make .INCLUDE : target.mk .INCLUDE : extension_post.mk -$(CONVERTER_FILE) : $(SOLARBINDIR)$/$$(@:f) +$(CONVERTER_FILE) : $(BIN)$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index e343d501f760..d048f80a096c 100755 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -8,7 +8,7 @@ * * $RCSfile: wrapper.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.4.1 $ * * This file is part of OpenOffice.org. * @@ -799,7 +799,7 @@ oslFileError readLine( oslFileHandle pFile, ::rtl::OStringBuffer& line ) // skip garbage \r \n at start of line while( osl_File_E_None == (nRes=osl_readFile(pFile, &aChar, 1, &nBytesRead)) && nBytesRead == 1 && - (aChar == '\n' || aChar == '\r') ); + (aChar == '\n' || aChar == '\r') ) ; if( aChar != '\n' && aChar != '\r' ) line.append( aChar ); |