Skip to content

C
core
Kaydet (Commit) ad332997 authored tarafından Oliver Bolte's avatar Oliver Bolte
Dosyalara gözat
Seçenekler

CWS-TOOLING: integrate CWS cmcfixes49

üst af3de2fe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 297 deletions
sdext/prj/build.lst
Dosyayı görüntüle @ ad332997
......@@ -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
sdext/source/pdfimport/makefile.mk
Dosyayı görüntüle @ ad332997
......@@ -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) $< $@
......
sdext/source/pdfimport/wrapper/wrapper.cxx
Dosyayı görüntüle @ ad332997
......@@ -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 );
......
xpdf/makefile.mk
Dosyayı görüntüle @ ad332997
......@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.7 $
# $Revision: 1.7.4.1 $
#
# This file is part of OpenOffice.org.
#
......@@ -42,6 +42,12 @@ TARGET=xpdflib
.INCLUDE: settings.mk
.IF "$(SYSTEM_POPPLER)" == "YES"
dummy:
@echo "An already available installation of poppler should exist on your system."
@echo "Therefore xpdf provided here does not need to be built in addition."
.ENDIF
# --- Files --------------------------------------------------------
TARFILE_NAME=xpdf-3.02
......
xpdf/prj/build.lst
Dosyayı görüntüle @ ad332997
xp xpdf : solenv sal soltools NULL
xp xpdf nmake - all xp_xpdf NULL
xp xpdf\wrapper nmake - all xp_xpdfwrap xp_xpdf NULL
xp xpdf\test nmake - all xp_parsetest xp_xpdfwrap NULL
xpdf/prj/d.lst
Dosyayı görüntüle @ ad332997
mkdir: %_DEST%\inc%_EXT%\xpdf
..\%__SRC%\bin\xpdfimport.* %_DEST%\bin%_EXT%\xpdfimport.*
..\%__SRC%\bin\xpdfimport %_DEST%\bin%_EXT%\xpdfimport
..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\xpdf\*.h
..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
xpdf/test/makefile.mk
Dosyayı görüntüle @ ad332997
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.4 $
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
PRJ=..
PRJNAME=xpdf
TARGET=test
TARGETTYPE=CUI
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
#ALLTAR : $(MISC)$/test_0_succeeded $(MISC)$/test_1_succeeded
$(MISC)$/test_0_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_0_out.def text_0_out.def testinput.pdf
$(BIN)$/xpdfimport -f $(MISC)$/binary_0_out testinput.pdf > $(MISC)$/text_0_out
diff --strip-trailing-cr $(MISC)$/binary_0_out binary_0_out.def
diff --strip-trailing-cr $(MISC)$/text_0_out text_0_out.def
$(TOUCH) $@
$(MISC)$/test_1_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_1_out.def text_1_out.def book.pdf
$(BIN)$/xpdfimport -f $(MISC)$/binary_1_out book.pdf > $(MISC)$/text_1_out
diff --strip-trailing-cr $(MISC)$/binary_1_out binary_1_out.def
diff --strip-trailing-cr $(MISC)$/text_1_out text_1_out.def
$(TOUCH) $@
xpdf/test/text_0_out.def
Dosyayı görüntüle @ ad332997
This diff is collapsed.
xpdf/test/text_1_out.def
Dosyayı görüntüle @ ad332997
This diff is collapsed.
xpdf/wrapper/makefile.mk deleted 100644 → 0
Dosyayı görüntüle @ af3de2fe
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
PRJ=..
PRJNAME=xpdf
TARGET=xpdfimport
TARGETTYPE=CUI
ENABLE_EXCEPTIONS=TRUE
EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
# --- Files --------------------------------------------------------
UWINAPILIB:=
APP1TARGET=$(TARGET)
APP1LIBSALCPPRT=
APP1OBJS= \
$(OBJ)$/wrapper_gpl.obj $(OBJ)/pdfioutdev_gpl.obj
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
APP1STDLIBS+=-lxpdf -lfofi -lGoo -lgdi32 -ladvapi32
.ELSE
APP1STDLIBS+=xpdf.lib fofi.lib Goo.lib gdi32.lib advapi32.lib
.ENDIF
.ELSE
.IF "$(OS)" == "MACOSX" && "$(GUIBASE)"=="unx"
APP1STDLIBS+=-lobjc
.ENDIF
APP1STDLIBS+=-lxpdf -lfofi -lGoo
.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
xpdf/wrapper/pdfioutdev_gpl.cxx deleted 100644 → 0
Dosyayı görüntüle @ af3de2fe
This diff is collapsed.
xpdf/wrapper/pdfioutdev_gpl.hxx deleted 100644 → 0
Dosyayı görüntüle @ af3de2fe
This diff is collapsed.
xpdf/wrapper/wrapper_gpl.cxx deleted 100644 → 0
Dosyayı görüntüle @ af3de2fe
/*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: wrapper_gpl.cxx,v $
*
* $Revision: 1.3 $
*
* last change: $Author: obo $ $Date: 2008-05-28 12:09:39 $
*
* The Contents of this file are made available subject to
* the terms of GNU General Public License Version 2.
*
*
* GNU General Public License, version 2
* =============================================
* Copyright 2005 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
************************************************************************/
#include "pdfioutdev_gpl.hxx"
#include "SecurityHandler.h"
#ifdef WNT
# include <io.h>
# include <fcntl.h> /*_O_BINARY*/
#endif
static char ownerPassword[33] = "\001";
static char userPassword[33] = "\001";
static char outputFile[256] = "\001";
static char cfgFileName[256] = "";
FILE* g_binary_out=stderr;
static ArgDesc argDesc[] = {
{"-f", argString, outputFile, sizeof(outputFile),
"output file for binary streams"},
{"-opw", argString, ownerPassword, sizeof(ownerPassword),
"owner password (for encrypted files)"},
{"-upw", argString, userPassword, sizeof(userPassword),
"user password (for encrypted files)"},
{NULL, argString, NULL, 0, NULL }
};
int main(int argc, char **argv)
{
// parse args; initialize to defaults
if( !parseArgs(argDesc, &argc, argv) )
return 1;
if( argc < 2 )
return 1;
// read config file
globalParams = new GlobalParams(cfgFileName);
globalParams->setErrQuiet(gTrue);
globalParams->setupBaseFonts(NULL);
// PDFDoc takes over ownership for all strings below
GString* pFileName = new GString(argv[1]);
GString* pTempErrFileName = new GString("_err.pdf");
GString* pTempErrFileNamePath = new GString(argv[0]);
GString* pErrFileName = new GString(pTempErrFileNamePath,pTempErrFileName);
// check for password string(s)
GString* pOwnerPasswordStr(
ownerPassword[0] != '\001' ? new GString(ownerPassword)
: (GString *)NULL );
GString* pUserPasswordStr(
userPassword[0] != '\001' ? new GString(userPassword)
: (GString *)NULL );
if( outputFile[0] != '\001' )
g_binary_out = fopen(outputFile,"wb");
#ifdef WNT
// Win actually modifies output for O_TEXT file mode, so need to
// revert to binary here
_setmode( _fileno( g_binary_out ), _O_BINARY );
#endif
PDFDoc aDoc( pFileName,
pOwnerPasswordStr,
pUserPasswordStr );
PDFDoc aErrDoc( pErrFileName,
pOwnerPasswordStr,
pUserPasswordStr );
// Check various permissions.
if ( !aDoc.okToPrint() ||
!aDoc.okToChange()||
!aDoc.okToCopy()||
!aDoc.okToAddNotes()||
!aDoc.isOk()||
(userPassword[0] != '\001')||
(ownerPassword[0] != '\001')
)
{
pdfi::PDFOutDev* pOutDev( new pdfi::PDFOutDev(&aErrDoc) );
// tell receiver early - needed for proper progress calculation
pOutDev->setPageNum( aErrDoc.getNumPages() );
// virtual resolution of the PDF OutputDev in dpi
static const int PDFI_OUTDEV_RESOLUTION=7200;
// do the conversion
const int nPages = aErrDoc.getNumPages();
for( int i=1; i<=nPages; ++i )
{
aErrDoc.displayPage( pOutDev,
i,
PDFI_OUTDEV_RESOLUTION,
PDFI_OUTDEV_RESOLUTION,
0, gTrue, gTrue, gTrue );
aErrDoc.processLinks( pOutDev, i );
}
}
else
{
pdfi::PDFOutDev* pOutDev( new pdfi::PDFOutDev(&aDoc) );
// tell receiver early - needed for proper progress calculation
pOutDev->setPageNum( aDoc.getNumPages() );
// virtual resolution of the PDF OutputDev in dpi
static const int PDFI_OUTDEV_RESOLUTION=7200;
// do the conversion
const int nPages = aDoc.getNumPages();
for( int i=1; i<=nPages; ++i )
{
aDoc.displayPage( pOutDev,
i,
PDFI_OUTDEV_RESOLUTION,
PDFI_OUTDEV_RESOLUTION,
0, gTrue, gTrue, gTrue );
aDoc.processLinks( pOutDev, i );
}
}
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment