summaryrefslogtreecommitdiff
path: root/sdext/source/pdfimport/test
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:08:13 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:08:13 +0200
commit3bb01d6eda13bf1b4a538a24707605153fe4e37e (patch)
tree65089ad2a2c6268e4c4ffc753ae2374bd2169089 /sdext/source/pdfimport/test
parent1dd3ecc26716372f4e0aeb7578acfd997f125a61 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 8ad61991552caa3f97cc10dc468ce722f2a7217a (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:04 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 4e3b67b32df4df0f1afe0abe0c0dc9a56829986c Author: Andras Timar <atimar@suse.com> Date: Sun May 29 21:38:41 2011 +0200 l10n: add br, et, and tr to NLPSolver + fixes to fr and nb nlpsolver/locale/NLPSolverCommon_bg.properties | 22 +++++++++++++++ nlpsolver/locale/NLPSolverCommon_et.properties | 22 +++++++++++++++ nlpsolver/locale/NLPSolverCommon_nb.properties | 2 +- nlpsolver/locale/NLPSolverCommon_tr.properties | 22 +++++++++++++++ .../locale/NLPSolverStatusDialog_bg.properties | 28 ++++++++++++++++++++ .../locale/NLPSolverStatusDialog_et.properties | 28 ++++++++++++++++++++ .../locale/NLPSolverStatusDialog_fr.properties | 4 +- .../locale/NLPSolverStatusDialog_tr.properties | 28 ++++++++++++++++++++ 8 files changed, 153 insertions(+), 3 deletions(-)
Notes
split repo tag: extensions_libreoffice-3.3.3.1 split repo tag: extensions_libreoffice-3.3.4.1
Diffstat (limited to 'sdext/source/pdfimport/test')
-rwxr-xr-xsdext/source/pdfimport/test/export.map2
-rw-r--r--sdext/source/pdfimport/test/outputwrap.hxx8
-rw-r--r--sdext/source/pdfimport/test/pdf2xml.cxx2
-rw-r--r--sdext/source/pdfimport/test/pdfunzip.cxx50
-rw-r--r--sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml60
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml60
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml1160
-rw-r--r--sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml60
-rw-r--r--sdext/source/pdfimport/test/tests.cxx2
14 files changed, 3602 insertions, 3602 deletions
diff --git a/sdext/source/pdfimport/test/export.map b/sdext/source/pdfimport/test/export.map
index 7321bbca16ad..f313c44bd7ad 100755
--- a/sdext/source/pdfimport/test/export.map
+++ b/sdext/source/pdfimport/test/export.map
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx
index 148ee739e7d7..5da34d5f9f80 100644
--- a/sdext/source/pdfimport/test/outputwrap.hxx
+++ b/sdext/source/pdfimport/test/outputwrap.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
namespace pdfi
{
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper1<
com::sun::star::io::XOutputStream > OutputWrapBase;
class OutputWrap : private cppu::BaseMutex, public OutputWrapBase
@@ -47,7 +47,7 @@ typedef ::cppu::WeakComponentImplHelper1<
public:
- explicit OutputWrap( const rtl::OUString& rURL ) : OutputWrapBase(m_aMutex), maFile(rURL)
+ explicit OutputWrap( const rtl::OUString& rURL ) : OutputWrapBase(m_aMutex), maFile(rURL)
{
maFile.open(osl_File_OpenFlag_Create|OpenFlag_Write);
}
@@ -70,6 +70,6 @@ typedef ::cppu::WeakComponentImplHelper1<
};
}
#endif
-
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx
index a8278ccf2267..2bf0ecbb6b1c 100644
--- a/sdext/source/pdfimport/test/pdf2xml.cxx
+++ b/sdext/source/pdfimport/test/pdf2xml.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index e871e36809d2..606b91295888 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -68,13 +68,13 @@ class FileEmitContext : public EmitContext
oslFileHandle m_aHandle;
oslFileHandle m_aReadHandle;
unsigned int m_nReadLen;
-
+
void openReadFile( const char* pOrigName );
-
+
public:
FileEmitContext( const char* pFileName, const char* pOrigName, const PDFContainer* pTop );
virtual ~FileEmitContext();
-
+
virtual bool write( const void* pBuf, unsigned int nLen ) throw();
virtual unsigned int getCurPos() throw();
virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw();
@@ -94,7 +94,7 @@ FileEmitContext::FileEmitContext( const char* pFileName, const char* pOrigName,
fprintf( stderr, "filename conversion \"%s\" failed\n", pFileName );
return;
}
-
+
if( osl_openFile( aURL.pData, &m_aHandle, osl_File_OpenFlag_Write ) == osl_File_E_None )
{
if( osl_setFileSize( m_aHandle, 0 ) != osl_File_E_None )
@@ -111,7 +111,7 @@ FileEmitContext::FileEmitContext( const char* pFileName, const char* pOrigName,
return;
}
m_bDeflate = true;
-
+
openReadFile( pOrigName );
}
@@ -132,20 +132,20 @@ void FileEmitContext::openReadFile( const char* pInFile )
fprintf( stderr, "filename conversion \"%s\" failed\n", pInFile );
return;
}
-
+
if( osl_openFile( aURL.pData, &m_aReadHandle, osl_File_OpenFlag_Read ) != osl_File_E_None )
{
fprintf( stderr, "could not open %s\n", pInFile );
return;
}
-
+
if( osl_setFilePos( m_aReadHandle, osl_Pos_End, 0 ) != osl_File_E_None )
{
fprintf( stderr, "could not seek to end of %s\n", pInFile );
osl_closeFile( m_aReadHandle );
return;
}
-
+
sal_uInt64 nFileSize = 0;
if( osl_getFilePos( m_aReadHandle, &nFileSize ) != osl_File_E_None )
{
@@ -153,7 +153,7 @@ void FileEmitContext::openReadFile( const char* pInFile )
osl_closeFile( m_aReadHandle );
return;
}
-
+
m_nReadLen = static_cast<unsigned int>(nFileSize);
}
@@ -161,7 +161,7 @@ bool FileEmitContext::write( const void* pBuf, unsigned int nLen ) throw()
{
if( ! m_aHandle )
return false;
-
+
sal_uInt64 nWrite = static_cast<sal_uInt64>(nLen);
sal_uInt64 nWritten = 0;
return (osl_writeFile( m_aHandle, pBuf, nWrite, &nWritten ) == osl_File_E_None)
@@ -183,7 +183,7 @@ bool FileEmitContext::copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen
{
if( nOrigOffset + nLen > m_nReadLen )
return false;
-
+
if( osl_setFilePos( m_aReadHandle, osl_Pos_Absolut, nOrigOffset ) != osl_File_E_None )
{
fprintf( stderr, "could not seek to offset %u\n", nOrigOffset );
@@ -209,7 +209,7 @@ unsigned int FileEmitContext::readOrigBytes( unsigned int nOrigOffset, unsigned
{
if( nOrigOffset + nLen > m_nReadLen )
return 0;
-
+
if( osl_setFilePos( m_aReadHandle, osl_Pos_Absolut, nOrigOffset ) != osl_File_E_None )
{
fprintf( stderr, "could not seek to offset %u\n", nOrigOffset );
@@ -225,7 +225,7 @@ typedef int(*PDFFileHdl)(const char*, const char*, PDFFile*);
int handleFile( const char* pInFile, const char* pOutFile, const char* pPassword, PDFFileHdl pHdl )
{
-
+
PDFReader aParser;
int nRet = 0;
PDFEntry* pEntry = aParser.read( pInFile );
@@ -333,18 +333,18 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF
PDFDict* pDict = dynamic_cast<PDFDict*>(pObj->m_pObject);
if( ! pDict )
continue;
-
+
std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator map_it =
pDict->m_aMap.find( "Type" );
if( map_it == pDict->m_aMap.end() )
continue;
-
+
PDFName* pName = dynamic_cast<PDFName*>(map_it->second);
if( ! pName )
continue;
if( ! pName->m_aName.equals( "FontDescriptor" ) )
continue;
-
+
// the font name will be helpful, also there must be one in
// a font descriptor
map_it = pDict->m_aMap.find( "FontName" );
@@ -352,9 +352,9 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF
continue;
pName = dynamic_cast<PDFName*>(map_it->second);
if( ! pName )
- continue;
+ continue;
rtl::OString aFontName( pName->m_aName );
-
+
PDFObjectRef* pStreamRef = 0;
const char* pFileType = NULL;
// we have a font descriptor, try for a type 1 font
@@ -377,14 +377,14 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF
pFileType = "ttf";
}
}
-
+
if( ! pStreamRef )
continue;
-
+
PDFObject* pStream = i_pPDFFile->findObject( pStreamRef );
if( ! pStream )
continue;
-
+
rtl::OStringBuffer aOutStream( i_pOutFile );
aOutStream.append( "_font_" );
aOutStream.append( sal_Int32(pStreamRef->m_nNumber) );
@@ -440,7 +440,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
const char* pPassword = NULL;
OStringBuffer aOutFile( 256 );
PDFFileHdl aHdl = write_unzipFile;
-
+
for( int nArg = 1; nArg < argc; nArg++ )
{
if( argv[nArg][0] == '-' )
@@ -493,7 +493,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
s_aEmitObjects.push_back( std::pair<sal_Int32,sal_Int32>(nObject,nGeneration) );
}
}
- }
+ }
else
{
fprintf( stderr, "unrecognized option \"%s\"\n",
@@ -533,7 +533,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
return 11;
}
}
-
+
return handleFile( pInFile, pOutFile, pPassword, aHdl );
}
diff --git a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml
index f864c4dfb01a..8c3704cb0b4e 100644
--- a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml
+++ b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml
@@ -43,73 +43,73 @@ UDYKMTAwIDQwCjI1NQr/////////////////////////////////////////////////////////////
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -119,24 +119,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -150,19 +150,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -171,33 +171,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -208,7 +208,7 @@ u
l
a
r
-
+
m
o
m
@@ -216,36 +216,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -257,40 +257,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -302,17 +302,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -320,32 +320,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -359,19 +359,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -380,15 +380,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -396,63 +396,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -466,44 +466,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -512,38 +512,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -551,10 +551,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -569,35 +569,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -605,10 +605,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -618,18 +618,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -637,7 +637,7 @@ u
n
d
.
-
+
S
u
d
@@ -646,18 +646,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -672,12 +672,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -687,37 +687,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -729,7 +729,7 @@ a
r
e
d
-
+
b
e
t
@@ -737,15 +737,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -756,14 +756,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -779,53 +779,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -835,19 +835,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -857,19 +857,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -883,19 +883,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -904,11 +904,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -917,7 +917,7 @@ e
n
l
y
-
+
s
t
i
@@ -928,16 +928,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -947,36 +947,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -988,45 +988,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -1034,24 +1034,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -1059,26 +1059,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1093,11 +1093,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -1105,39 +1105,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -1145,7 +1145,7 @@ u
g
h
t
-
+
p
r
e
@@ -1154,7 +1154,7 @@ s
i
n
g
-
+
h
i
m
@@ -1162,12 +1162,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -1175,16 +1175,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1199,15 +1199,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -1215,7 +1215,7 @@ s
e
l
f
-
+
i
n
v
@@ -1225,33 +1225,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -1260,18 +1260,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -1279,14 +1279,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1303,76 +1303,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -1381,7 +1381,7 @@ h
e
s
.
-
+
S
u
d
@@ -1390,7 +1390,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1403,29 +1403,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -1436,7 +1436,7 @@ a
b
l
e
-
+
s
q
u
@@ -1444,20 +1444,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -1465,25 +1465,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -1491,7 +1491,7 @@ h
t
'
s
-
+
b
r
e
@@ -1499,7 +1499,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1513,74 +1513,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -1589,7 +1589,7 @@ s
i
n
g
-
+
h
i
m
@@ -1597,16 +1597,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1619,83 +1619,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
@@ -1711,73 +1711,73 @@ e
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -1787,24 +1787,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1818,19 +1818,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -1839,33 +1839,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -1876,7 +1876,7 @@ u
l
a
r
-
+
m
o
m
@@ -1884,36 +1884,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1925,40 +1925,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -1970,17 +1970,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -1988,32 +1988,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2027,19 +2027,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -2048,15 +2048,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -2064,63 +2064,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2134,44 +2134,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -2180,38 +2180,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -2219,10 +2219,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2237,35 +2237,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -2273,10 +2273,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -2286,18 +2286,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -2305,7 +2305,7 @@ u
n
d
.
-
+
S
u
d
@@ -2314,18 +2314,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2340,12 +2340,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -2355,37 +2355,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -2397,7 +2397,7 @@ a
r
e
d
-
+
b
e
t
@@ -2405,15 +2405,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -2424,14 +2424,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2447,53 +2447,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -2503,19 +2503,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -2525,19 +2525,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2551,19 +2551,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -2572,11 +2572,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -2585,7 +2585,7 @@ e
n
l
y
-
+
s
t
i
@@ -2596,16 +2596,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -2615,36 +2615,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2656,45 +2656,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -2702,24 +2702,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -2727,26 +2727,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2761,11 +2761,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -2773,39 +2773,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -2813,7 +2813,7 @@ u
g
h
t
-
+
p
r
e
@@ -2822,7 +2822,7 @@ s
i
n
g
-
+
h
i
m
@@ -2830,12 +2830,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -2843,16 +2843,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2867,15 +2867,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -2883,7 +2883,7 @@ s
e
l
f
-
+
i
n
v
@@ -2893,33 +2893,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -2928,18 +2928,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -2947,14 +2947,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2971,76 +2971,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -3049,7 +3049,7 @@ h
e
s
.
-
+
S
u
d
@@ -3058,7 +3058,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3071,29 +3071,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -3104,7 +3104,7 @@ a
b
l
e
-
+
s
q
u
@@ -3112,20 +3112,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -3133,25 +3133,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -3159,7 +3159,7 @@ h
t
'
s
-
+
b
r
e
@@ -3167,7 +3167,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3181,74 +3181,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -3257,7 +3257,7 @@ s
i
n
g
-
+
h
i
m
@@ -3265,16 +3265,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3287,83 +3287,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
diff --git a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml
index 6d777866ee33..68ab55f1fb65 100644
--- a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml
+++ b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml
@@ -43,73 +43,73 @@ UDYKMTAwIDQwCjI1NQr/////////////////////////////////////////////////////////////
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -119,24 +119,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -150,19 +150,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -171,33 +171,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -208,7 +208,7 @@ u
l
a
r
-
+
m
o
m
@@ -216,36 +216,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -257,40 +257,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -302,17 +302,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -320,32 +320,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -359,19 +359,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -380,15 +380,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -396,63 +396,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -466,44 +466,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -512,38 +512,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -551,10 +551,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -569,35 +569,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -605,10 +605,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -618,18 +618,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -637,7 +637,7 @@ u
n
d
.
-
+
S
u
d
@@ -646,18 +646,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -672,12 +672,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -687,37 +687,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -729,7 +729,7 @@ a
r
e
d
-
+
b
e
t
@@ -737,15 +737,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -756,14 +756,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -779,53 +779,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -835,19 +835,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -857,19 +857,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -883,19 +883,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -904,11 +904,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -917,7 +917,7 @@ e
n
l
y
-
+
s
t
i
@@ -928,16 +928,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -947,36 +947,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -988,45 +988,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -1034,24 +1034,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -1059,26 +1059,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1093,11 +1093,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -1105,39 +1105,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -1145,7 +1145,7 @@ u
g
h
t
-
+
p
r
e
@@ -1154,7 +1154,7 @@ s
i
n
g
-
+
h
i
m
@@ -1162,12 +1162,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -1175,16 +1175,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1199,15 +1199,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -1215,7 +1215,7 @@ s
e
l
f
-
+
i
n
v
@@ -1225,33 +1225,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -1260,18 +1260,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -1279,14 +1279,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1303,76 +1303,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -1381,7 +1381,7 @@ h
e
s
.
-
+
S
u
d
@@ -1390,7 +1390,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1403,29 +1403,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -1436,7 +1436,7 @@ a
b
l
e
-
+
s
q
u
@@ -1444,20 +1444,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -1465,25 +1465,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -1491,7 +1491,7 @@ h
t
'
s
-
+
b
r
e
@@ -1499,7 +1499,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1513,74 +1513,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -1589,7 +1589,7 @@ s
i
n
g
-
+
h
i
m
@@ -1597,16 +1597,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1619,83 +1619,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
@@ -1711,73 +1711,73 @@ e
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -1787,24 +1787,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1818,19 +1818,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -1839,33 +1839,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -1876,7 +1876,7 @@ u
l
a
r
-
+
m
o
m
@@ -1884,36 +1884,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1925,40 +1925,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -1970,17 +1970,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -1988,32 +1988,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2027,19 +2027,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -2048,15 +2048,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -2064,63 +2064,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2134,44 +2134,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -2180,38 +2180,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -2219,10 +2219,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2237,35 +2237,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -2273,10 +2273,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -2286,18 +2286,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -2305,7 +2305,7 @@ u
n
d
.
-
+
S
u
d
@@ -2314,18 +2314,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2340,12 +2340,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -2355,37 +2355,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -2397,7 +2397,7 @@ a
r
e
d
-
+
b
e
t
@@ -2405,15 +2405,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -2424,14 +2424,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2447,53 +2447,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -2503,19 +2503,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -2525,19 +2525,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2551,19 +2551,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -2572,11 +2572,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -2585,7 +2585,7 @@ e
n
l
y
-
+
s
t
i
@@ -2596,16 +2596,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -2615,36 +2615,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2656,45 +2656,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -2702,24 +2702,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -2727,26 +2727,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2761,11 +2761,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -2773,39 +2773,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -2813,7 +2813,7 @@ u
g
h
t
-
+
p
r
e
@@ -2822,7 +2822,7 @@ s
i
n
g
-
+
h
i
m
@@ -2830,12 +2830,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -2843,16 +2843,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2867,15 +2867,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -2883,7 +2883,7 @@ s
e
l
f
-
+
i
n
v
@@ -2893,33 +2893,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -2928,18 +2928,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -2947,14 +2947,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2971,76 +2971,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -3049,7 +3049,7 @@ h
e
s
.
-
+
S
u
d
@@ -3058,7 +3058,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3071,29 +3071,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -3104,7 +3104,7 @@ a
b
l
e
-
+
s
q
u
@@ -3112,20 +3112,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -3133,25 +3133,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -3159,7 +3159,7 @@ h
t
'
s
-
+
b
r
e
@@ -3167,7 +3167,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3181,74 +3181,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -3257,7 +3257,7 @@ s
i
n
g
-
+
h
i
m
@@ -3265,16 +3265,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3287,83 +3287,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
diff --git a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml
index 8b773553d793..254f591c0e2f 100644
--- a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml
+++ b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml
@@ -43,7 +43,7 @@ UDYKMTAwIDQwCjI1NQr/////////////////////////////////////////////////////////////
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
</text:span>
</text:p>
</draw:text-box>
@@ -52,7 +52,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
</text:span>
</text:p>
</draw:text-box>
@@ -61,7 +61,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same
</text:span>
</text:p>
</draw:text-box>
@@ -70,7 +70,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
</text:span>
</text:p>
</draw:text-box>
@@ -79,7 +79,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to
</text:span>
</text:p>
</draw:text-box>
@@ -88,7 +88,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
</text:span>
</text:p>
</draw:text-box>
@@ -97,7 +97,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
</text:span>
</text:p>
</draw:text-box>
@@ -106,7 +106,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
</text:span>
</text:p>
</draw:text-box>
@@ -115,7 +115,7 @@ falling over the trash can lying in the middle of the sidewalk. He tried to nerv
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
</text:span>
</text:p>
</draw:text-box>
@@ -124,7 +124,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming
</text:span>
</text:p>
</draw:text-box>
@@ -133,7 +133,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall
</text:span>
</text:p>
</draw:text-box>
@@ -142,7 +142,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was
</text:span>
</text:p>
</draw:text-box>
@@ -151,7 +151,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
</text:span>
</text:p>
</draw:text-box>
@@ -160,7 +160,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
</text:span>
</text:p>
</draw:text-box>
@@ -169,7 +169,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
</text:span>
</text:p>
</draw:text-box>
@@ -187,7 +187,7 @@ more into the wall, into the dark, away from his enemy. Would this door save his
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
</text:span>
</text:p>
</draw:text-box>
@@ -196,7 +196,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
</text:span>
</text:p>
</draw:text-box>
@@ -205,7 +205,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same
</text:span>
</text:p>
</draw:text-box>
@@ -214,7 +214,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
</text:span>
</text:p>
</draw:text-box>
@@ -223,7 +223,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to
</text:span>
</text:p>
</draw:text-box>
@@ -232,7 +232,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
</text:span>
</text:p>
</draw:text-box>
@@ -241,7 +241,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
</text:span>
</text:p>
</draw:text-box>
@@ -250,7 +250,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
</text:span>
</text:p>
</draw:text-box>
@@ -259,7 +259,7 @@ falling over the trash can lying in the middle of the sidewalk. He tried to nerv
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
</text:span>
</text:p>
</draw:text-box>
@@ -268,7 +268,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming
</text:span>
</text:p>
</draw:text-box>
@@ -277,7 +277,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall
</text:span>
</text:p>
</draw:text-box>
@@ -286,7 +286,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was
</text:span>
</text:p>
</draw:text-box>
@@ -295,7 +295,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
</text:span>
</text:p>
</draw:text-box>
@@ -304,7 +304,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
</text:span>
</text:p>
</draw:text-box>
@@ -313,7 +313,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
</text:span>
</text:p>
</draw:text-box>
diff --git a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml
index da1251864b43..c86473047278 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml
@@ -36,73 +36,73 @@
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -112,24 +112,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -143,19 +143,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -164,33 +164,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -201,7 +201,7 @@ u
l
a
r
-
+
m
o
m
@@ -209,36 +209,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -250,40 +250,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -295,17 +295,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -313,32 +313,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -352,19 +352,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -373,15 +373,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -389,63 +389,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -459,44 +459,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -505,38 +505,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -544,10 +544,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -562,35 +562,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -598,10 +598,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -611,18 +611,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -630,7 +630,7 @@ u
n
d
.
-
+
S
u
d
@@ -639,18 +639,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -665,12 +665,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -680,37 +680,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -722,7 +722,7 @@ a
r
e
d
-
+
b
e
t
@@ -730,15 +730,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -749,14 +749,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -772,53 +772,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -828,19 +828,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -850,19 +850,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -876,19 +876,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -897,11 +897,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -910,7 +910,7 @@ e
n
l
y
-
+
s
t
i
@@ -921,16 +921,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -940,36 +940,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -981,45 +981,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -1027,24 +1027,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -1052,26 +1052,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1086,11 +1086,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -1098,39 +1098,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -1138,7 +1138,7 @@ u
g
h
t
-
+
p
r
e
@@ -1147,7 +1147,7 @@ s
i
n
g
-
+
h
i
m
@@ -1155,12 +1155,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -1168,16 +1168,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1192,15 +1192,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -1208,7 +1208,7 @@ s
e
l
f
-
+
i
n
v
@@ -1218,33 +1218,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -1253,18 +1253,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -1272,14 +1272,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1296,76 +1296,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -1374,7 +1374,7 @@ h
e
s
.
-
+
S
u
d
@@ -1383,7 +1383,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1396,29 +1396,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -1429,7 +1429,7 @@ a
b
l
e
-
+
s
q
u
@@ -1437,20 +1437,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -1458,25 +1458,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -1484,7 +1484,7 @@ h
t
'
s
-
+
b
r
e
@@ -1492,7 +1492,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1506,74 +1506,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -1582,7 +1582,7 @@ s
i
n
g
-
+
h
i
m
@@ -1590,16 +1590,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1612,83 +1612,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
@@ -1704,73 +1704,73 @@ e
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -1780,24 +1780,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1811,19 +1811,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -1832,33 +1832,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -1869,7 +1869,7 @@ u
l
a
r
-
+
m
o
m
@@ -1877,36 +1877,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1918,40 +1918,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -1963,17 +1963,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -1981,32 +1981,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2020,19 +2020,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -2041,15 +2041,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -2057,63 +2057,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2127,44 +2127,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -2173,38 +2173,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -2212,10 +2212,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2230,35 +2230,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -2266,10 +2266,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -2279,18 +2279,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -2298,7 +2298,7 @@ u
n
d
.
-
+
S
u
d
@@ -2307,18 +2307,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2333,12 +2333,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -2348,37 +2348,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -2390,7 +2390,7 @@ a
r
e
d
-
+
b
e
t
@@ -2398,15 +2398,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -2417,14 +2417,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2440,53 +2440,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -2496,19 +2496,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -2518,19 +2518,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2544,19 +2544,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -2565,11 +2565,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -2578,7 +2578,7 @@ e
n
l
y
-
+
s
t
i
@@ -2589,16 +2589,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -2608,36 +2608,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2649,45 +2649,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -2695,24 +2695,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -2720,26 +2720,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2754,11 +2754,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -2766,39 +2766,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -2806,7 +2806,7 @@ u
g
h
t
-
+
p
r
e
@@ -2815,7 +2815,7 @@ s
i
n
g
-
+
h
i
m
@@ -2823,12 +2823,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -2836,16 +2836,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2860,15 +2860,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -2876,7 +2876,7 @@ s
e
l
f
-
+
i
n
v
@@ -2886,33 +2886,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -2921,18 +2921,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -2940,14 +2940,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2964,76 +2964,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -3042,7 +3042,7 @@ h
e
s
.
-
+
S
u
d
@@ -3051,7 +3051,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3064,29 +3064,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -3097,7 +3097,7 @@ a
b
l
e
-
+
s
q
u
@@ -3105,20 +3105,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -3126,25 +3126,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -3152,7 +3152,7 @@ h
t
'
s
-
+
b
r
e
@@ -3160,7 +3160,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3174,74 +3174,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -3250,7 +3250,7 @@ s
i
n
g
-
+
h
i
m
@@ -3258,16 +3258,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3280,83 +3280,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
diff --git a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml
index a57b2bc750de..eb0bedc3fd69 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml
@@ -36,73 +36,73 @@
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -112,24 +112,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -143,19 +143,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -164,33 +164,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -201,7 +201,7 @@ u
l
a
r
-
+
m
o
m
@@ -209,36 +209,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -250,40 +250,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -295,17 +295,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -313,32 +313,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -352,19 +352,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -373,15 +373,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -389,63 +389,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -459,44 +459,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -505,38 +505,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -544,10 +544,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -562,35 +562,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -598,10 +598,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -611,18 +611,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -630,7 +630,7 @@ u
n
d
.
-
+
S
u
d
@@ -639,18 +639,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -665,12 +665,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -680,37 +680,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -722,7 +722,7 @@ a
r
e
d
-
+
b
e
t
@@ -730,15 +730,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -749,14 +749,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -772,53 +772,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -828,19 +828,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -850,19 +850,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -876,19 +876,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -897,11 +897,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -910,7 +910,7 @@ e
n
l
y
-
+
s
t
i
@@ -921,16 +921,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -940,36 +940,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -981,45 +981,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -1027,24 +1027,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -1052,26 +1052,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1086,11 +1086,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -1098,39 +1098,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -1138,7 +1138,7 @@ u
g
h
t
-
+
p
r
e
@@ -1147,7 +1147,7 @@ s
i
n
g
-
+
h
i
m
@@ -1155,12 +1155,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -1168,16 +1168,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1192,15 +1192,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -1208,7 +1208,7 @@ s
e
l
f
-
+
i
n
v
@@ -1218,33 +1218,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -1253,18 +1253,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -1272,14 +1272,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1296,76 +1296,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -1374,7 +1374,7 @@ h
e
s
.
-
+
S
u
d
@@ -1383,7 +1383,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1396,29 +1396,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -1429,7 +1429,7 @@ a
b
l
e
-
+
s
q
u
@@ -1437,20 +1437,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -1458,25 +1458,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -1484,7 +1484,7 @@ h
t
'
s
-
+
b
r
e
@@ -1492,7 +1492,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1506,74 +1506,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -1582,7 +1582,7 @@ s
i
n
g
-
+
h
i
m
@@ -1590,16 +1590,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1612,83 +1612,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
@@ -1704,73 +1704,73 @@ e
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -1780,24 +1780,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1811,19 +1811,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -1832,33 +1832,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -1869,7 +1869,7 @@ u
l
a
r
-
+
m
o
m
@@ -1877,36 +1877,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1918,40 +1918,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -1963,17 +1963,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -1981,32 +1981,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2020,19 +2020,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -2041,15 +2041,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -2057,63 +2057,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2127,44 +2127,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -2173,38 +2173,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -2212,10 +2212,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2230,35 +2230,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -2266,10 +2266,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -2279,18 +2279,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -2298,7 +2298,7 @@ u
n
d
.
-
+
S
u
d
@@ -2307,18 +2307,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2333,12 +2333,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -2348,37 +2348,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -2390,7 +2390,7 @@ a
r
e
d
-
+
b
e
t
@@ -2398,15 +2398,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -2417,14 +2417,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2440,53 +2440,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -2496,19 +2496,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -2518,19 +2518,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2544,19 +2544,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -2565,11 +2565,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -2578,7 +2578,7 @@ e
n
l
y
-
+
s
t
i
@@ -2589,16 +2589,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -2608,36 +2608,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2649,45 +2649,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -2695,24 +2695,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -2720,26 +2720,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2754,11 +2754,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -2766,39 +2766,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -2806,7 +2806,7 @@ u
g
h
t
-
+
p
r
e
@@ -2815,7 +2815,7 @@ s
i
n
g
-
+
h
i
m
@@ -2823,12 +2823,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -2836,16 +2836,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2860,15 +2860,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -2876,7 +2876,7 @@ s
e
l
f
-
+
i
n
v
@@ -2886,33 +2886,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -2921,18 +2921,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -2940,14 +2940,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2964,76 +2964,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -3042,7 +3042,7 @@ h
e
s
.
-
+
S
u
d
@@ -3051,7 +3051,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3064,29 +3064,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -3097,7 +3097,7 @@ a
b
l
e
-
+
s
q
u
@@ -3105,20 +3105,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -3126,25 +3126,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -3152,7 +3152,7 @@ h
t
'
s
-
+
b
r
e
@@ -3160,7 +3160,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3174,74 +3174,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -3250,7 +3250,7 @@ s
i
n
g
-
+
h
i
m
@@ -3258,16 +3258,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3280,83 +3280,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
diff --git a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml
index 955b81b73a36..75d8958f3a92 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml
@@ -36,7 +36,7 @@
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
</text:span>
</text:p>
</draw:text-box>
@@ -45,7 +45,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
</text:span>
</text:p>
</draw:text-box>
@@ -54,7 +54,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same
</text:span>
</text:p>
</draw:text-box>
@@ -63,7 +63,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
</text:span>
</text:p>
</draw:text-box>
@@ -72,7 +72,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to
</text:span>
</text:p>
</draw:text-box>
@@ -81,7 +81,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
</text:span>
</text:p>
</draw:text-box>
@@ -90,7 +90,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
</text:span>
</text:p>
</draw:text-box>
@@ -99,7 +99,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
</text:span>
</text:p>
</draw:text-box>
@@ -108,7 +108,7 @@ falling over the trash can lying in the middle of the sidewalk. He tried to nerv
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
</text:span>
</text:p>
</draw:text-box>
@@ -117,7 +117,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming
</text:span>
</text:p>
</draw:text-box>
@@ -126,7 +126,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall
</text:span>
</text:p>
</draw:text-box>
@@ -135,7 +135,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was
</text:span>
</text:p>
</draw:text-box>
@@ -144,7 +144,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
</text:span>
</text:p>
</draw:text-box>
@@ -153,7 +153,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
</text:span>
</text:p>
</draw:text-box>
@@ -162,7 +162,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
</text:span>
</text:p>
</draw:text-box>
@@ -180,7 +180,7 @@ more into the wall, into the dark, away from his enemy. Would this door save his
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
</text:span>
</text:p>
</draw:text-box>
@@ -189,7 +189,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
</text:span>
</text:p>
</draw:text-box>
@@ -198,7 +198,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same
</text:span>
</text:p>
</draw:text-box>
@@ -207,7 +207,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
</text:span>
</text:p>
</draw:text-box>
@@ -216,7 +216,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to
</text:span>
</text:p>
</draw:text-box>
@@ -225,7 +225,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
</text:span>
</text:p>
</draw:text-box>
@@ -234,7 +234,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
</text:span>
</text:p>
</draw:text-box>
@@ -243,7 +243,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
</text:span>
</text:p>
</draw:text-box>
@@ -252,7 +252,7 @@ falling over the trash can lying in the middle of the sidewalk. He tried to nerv
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
</text:span>
</text:p>
</draw:text-box>
@@ -261,7 +261,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming
</text:span>
</text:p>
</draw:text-box>
@@ -270,7 +270,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall
</text:span>
</text:p>
</draw:text-box>
@@ -279,7 +279,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was
</text:span>
</text:p>
</draw:text-box>
@@ -288,7 +288,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
</text:span>
</text:p>
</draw:text-box>
@@ -297,7 +297,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
</text:span>
</text:p>
</draw:text-box>
@@ -306,7 +306,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
</text:span>
</text:p>
</draw:text-box>
diff --git a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml
index 01cdab8eaf68..afb83c75e754 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml
@@ -36,73 +36,73 @@
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -112,24 +112,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -143,19 +143,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -164,33 +164,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -201,7 +201,7 @@ u
l
a
r
-
+
m
o
m
@@ -209,36 +209,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -250,40 +250,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -295,17 +295,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -313,32 +313,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -352,19 +352,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -373,15 +373,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -389,63 +389,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -459,44 +459,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -505,38 +505,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -544,10 +544,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -562,35 +562,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -598,10 +598,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -611,18 +611,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -630,7 +630,7 @@ u
n
d
.
-
+
S
u
d
@@ -639,18 +639,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -665,12 +665,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -680,37 +680,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -722,7 +722,7 @@ a
r
e
d
-
+
b
e
t
@@ -730,15 +730,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -749,14 +749,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -772,53 +772,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -828,19 +828,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -850,19 +850,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -876,19 +876,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -897,11 +897,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -910,7 +910,7 @@ e
n
l
y
-
+
s
t
i
@@ -921,16 +921,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -940,36 +940,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -981,45 +981,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -1027,24 +1027,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -1052,26 +1052,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1086,11 +1086,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -1098,39 +1098,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -1138,7 +1138,7 @@ u
g
h
t
-
+
p
r
e
@@ -1147,7 +1147,7 @@ s
i
n
g
-
+
h
i
m
@@ -1155,12 +1155,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -1168,16 +1168,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1192,15 +1192,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -1208,7 +1208,7 @@ s
e
l
f
-
+
i
n
v
@@ -1218,33 +1218,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -1253,18 +1253,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -1272,14 +1272,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1296,76 +1296,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -1374,7 +1374,7 @@ h
e
s
.
-
+
S
u
d
@@ -1383,7 +1383,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1396,29 +1396,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -1429,7 +1429,7 @@ a
b
l
e
-
+
s
q
u
@@ -1437,20 +1437,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -1458,25 +1458,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -1484,7 +1484,7 @@ h
t
'
s
-
+
b
r
e
@@ -1492,7 +1492,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1506,74 +1506,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -1582,7 +1582,7 @@ s
i
n
g
-
+
h
i
m
@@ -1590,16 +1590,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1612,83 +1612,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
@@ -1704,73 +1704,73 @@ e
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -1780,24 +1780,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1811,19 +1811,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -1832,33 +1832,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -1869,7 +1869,7 @@ u
l
a
r
-
+
m
o
m
@@ -1877,36 +1877,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1918,40 +1918,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -1963,17 +1963,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -1981,32 +1981,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2020,19 +2020,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -2041,15 +2041,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -2057,63 +2057,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2127,44 +2127,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -2173,38 +2173,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -2212,10 +2212,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2230,35 +2230,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -2266,10 +2266,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -2279,18 +2279,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -2298,7 +2298,7 @@ u
n
d
.
-
+
S
u
d
@@ -2307,18 +2307,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2333,12 +2333,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -2348,37 +2348,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -2390,7 +2390,7 @@ a
r
e
d
-
+
b
e
t
@@ -2398,15 +2398,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -2417,14 +2417,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2440,53 +2440,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -2496,19 +2496,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -2518,19 +2518,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2551,19 +2551,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -2572,11 +2572,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -2585,7 +2585,7 @@ e
n
l
y
-
+
s
t
i
@@ -2596,16 +2596,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -2615,36 +2615,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2656,45 +2656,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -2702,24 +2702,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -2727,26 +2727,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2761,11 +2761,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -2773,39 +2773,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -2813,7 +2813,7 @@ u
g
h
t
-
+
p
r
e
@@ -2822,7 +2822,7 @@ s
i
n
g
-
+
h
i
m
@@ -2830,12 +2830,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -2843,16 +2843,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2867,15 +2867,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -2883,7 +2883,7 @@ s
e
l
f
-
+
i
n
v
@@ -2893,33 +2893,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -2928,18 +2928,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -2947,14 +2947,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2971,76 +2971,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -3049,7 +3049,7 @@ h
e
s
.
-
+
S
u
d
@@ -3058,7 +3058,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3071,29 +3071,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -3104,7 +3104,7 @@ a
b
l
e
-
+
s
q
u
@@ -3112,20 +3112,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -3133,25 +3133,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -3159,7 +3159,7 @@ h
t
'
s
-
+
b
r
e
@@ -3167,7 +3167,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3181,74 +3181,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -3257,7 +3257,7 @@ s
i
n
g
-
+
h
i
m
@@ -3265,16 +3265,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3287,83 +3287,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
diff --git a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml
index b4e9bfdc2468..b24a1ed4df12 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml
@@ -36,73 +36,73 @@
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -112,24 +112,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -143,19 +143,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -164,33 +164,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -201,7 +201,7 @@ u
l
a
r
-
+
m
o
m
@@ -209,36 +209,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -250,40 +250,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -295,17 +295,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -313,32 +313,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -352,19 +352,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -373,15 +373,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -389,63 +389,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -459,44 +459,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -505,38 +505,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -544,10 +544,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -562,35 +562,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -598,10 +598,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -611,18 +611,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -630,7 +630,7 @@ u
n
d
.
-
+
S
u
d
@@ -639,18 +639,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -665,12 +665,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -680,37 +680,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -722,7 +722,7 @@ a
r
e
d
-
+
b
e
t
@@ -730,15 +730,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -749,14 +749,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -772,53 +772,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -828,19 +828,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -850,19 +850,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -876,19 +876,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -897,11 +897,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -910,7 +910,7 @@ e
n
l
y
-
+
s
t
i
@@ -921,16 +921,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -940,36 +940,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -981,45 +981,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -1027,24 +1027,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -1052,26 +1052,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1086,11 +1086,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -1098,39 +1098,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -1138,7 +1138,7 @@ u
g
h
t
-
+
p
r
e
@@ -1147,7 +1147,7 @@ s
i
n
g
-
+
h
i
m
@@ -1155,12 +1155,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -1168,16 +1168,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1192,15 +1192,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -1208,7 +1208,7 @@ s
e
l
f
-
+
i
n
v
@@ -1218,33 +1218,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -1253,18 +1253,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -1272,14 +1272,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1296,76 +1296,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -1374,7 +1374,7 @@ h
e
s
.
-
+
S
u
d
@@ -1383,7 +1383,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1396,29 +1396,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -1429,7 +1429,7 @@ a
b
l
e
-
+
s
q
u
@@ -1437,20 +1437,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -1458,25 +1458,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -1484,7 +1484,7 @@ h
t
'
s
-
+
b
r
e
@@ -1492,7 +1492,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1506,74 +1506,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -1582,7 +1582,7 @@ s
i
n
g
-
+
h
i
m
@@ -1590,16 +1590,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1612,83 +1612,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
@@ -1704,73 +1704,73 @@ e
<text:span text:style-name="text7" >
H
e
-
+
h
e
a
r
d
-
+
q
u
i
e
t
-
+
s
t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
.
-
+
T
h
a
t
-
+
d
i
d
n
'
t
-
+
b
o
d
e
-
+
w
e
l
l
.
-
+
W
h
o
-
+
c
o
u
l
d
-
+
b
e
-
+
f
o
l
@@ -1780,24 +1780,24 @@ w
i
n
g
-
+
h
i
m
-
+
t
h
i
s
-
+
l
a
t
e
-
+
a
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1811,19 +1811,19 @@ i
g
h
t
-
+
a
n
d
-
+
i
n
-
+
t
h
i
s
-
+
d
e
a
@@ -1832,33 +1832,33 @@ b
e
a
t
-
+
p
a
r
t
-
+
o
f
-
+
t
o
w
n
?
-
+
A
n
d
-
+
a
t
-
+
t
h
i
s
-
+
p
a
r
@@ -1869,7 +1869,7 @@ u
l
a
r
-
+
m
o
m
@@ -1877,36 +1877,36 @@ e
n
t
,
-
+
j
u
s
t
-
+
a
f
t
e
r
-
+
h
e
-
+
p
u
l
l
e
d
-
+
o
f
f
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -1918,40 +1918,40 @@ e
b
i
g
-
+
t
i
m
e
-
+
a
n
d
-
+
w
a
s
-
+
m
a
k
i
n
g
-
+
o
f
f
-
+
w
i
t
h
-
+
t
h
e
-
+
g
r
e
@@ -1963,17 +1963,17 @@ c
k
s
.
-
+
W
a
s
-
+
t
h
e
r
e
-
+
a
n
o
@@ -1981,32 +1981,32 @@ t
h
e
r
-
+
c
r
o
o
k
-
+
w
h
o
'
d
-
+
h
a
d
-
+
t
h
e
-
+
s
a
m
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2020,19 +2020,19 @@ d
e
a
,
-
+
a
n
d
-
+
w
a
s
-
+
n
o
w
-
+
w
a
t
@@ -2041,15 +2041,15 @@ h
i
n
g
-
+
h
i
m
-
+
a
n
d
-
+
w
a
i
@@ -2057,63 +2057,63 @@ t
i
n
g
-
+
f
o
r
-
+
a
-
+
c
h
a
n
c
e
-
+
t
o
-
+
g
r
a
b
-
+
t
h
e
-
+
f
r
u
i
t
-
+
o
f
-
+
h
i
s
-
+
l
a
b
o
r
?
-
+
O
r
-
+
d
i
d
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2127,44 +2127,44 @@ t
e
p
s
-
+
b
e
h
i
n
d
-
+
h
i
m
-
+
m
e
a
n
-
+
t
h
a
t
-
+
o
n
e
-
+
o
f
-
+
m
a
n
y
-
+
l
a
w
-
+
o
f
f
@@ -2173,38 +2173,38 @@ c
e
r
s
-
+
i
n
-
+
t
o
w
n
-
+
w
a
s
-
+
o
n
-
+
t
o
-
+
h
i
m
-
+
a
n
d
-
+
j
u
s
t
-
+
w
a
i
@@ -2212,10 +2212,10 @@ t
i
n
g
-
+
t
o
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2230,35 +2230,35 @@ u
n
c
e
-
+
a
n
d
-
+
s
n
a
p
-
+
t
h
o
s
e
-
+
c
u
f
f
s
-
+
o
n
-
+
h
i
s
-
+
w
r
i
@@ -2266,10 +2266,10 @@ s
t
s
?
-
+
H
e
-
+
n
e
r
@@ -2279,18 +2279,18 @@ u
s
l
y
-
+
l
o
o
k
e
d
-
+
a
l
l
-
+
a
r
o
@@ -2298,7 +2298,7 @@ u
n
d
.
-
+
S
u
d
@@ -2307,18 +2307,18 @@ e
n
l
y
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2333,12 +2333,12 @@ l
e
y
.
-
+
L
i
k
e
-
+
l
i
g
@@ -2348,37 +2348,37 @@ n
i
n
g
-
+
h
e
-
+
d
a
r
t
e
d
-
+
o
f
f
-
+
t
o
-
+
t
h
e
-
+
l
e
f
t
-
+
a
n
d
-
+
d
i
s
@@ -2390,7 +2390,7 @@ a
r
e
d
-
+
b
e
t
@@ -2398,15 +2398,15 @@ w
e
e
n
-
+
t
h
e
-
+
t
w
o
-
+
w
a
r
@@ -2417,14 +2417,14 @@ u
s
e
s
-
+
a
l
m
o
s
t
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2440,53 +2440,53 @@ l
i
n
g
-
+
o
v
e
r
-
+
t
h
e
-
+
t
r
a
s
h
-
+
c
a
n
-
+
l
y
i
n
g
-
+
i
n
-
+
t
h
e
-
+
m
i
d
d
l
e
-
+
o
f
-
+
t
h
e
-
+
s
i
d
@@ -2496,19 +2496,19 @@ a
l
k
.
-
+
H
e
-
+
t
r
i
e
d
-
+
t
o
-
+
n
e
r
@@ -2518,19 +2518,19 @@ u
s
l
y
-
+
t
a
p
-
+
h
i
s
-
+
w
a
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2551,19 +2551,19 @@ l
o
n
g
-
+
i
n
-
+
t
h
e
-
+
i
n
k
y
-
+
d
a
r
@@ -2572,11 +2572,11 @@ n
e
s
s
-
+
a
n
d
-
+
s
u
d
@@ -2585,7 +2585,7 @@ e
n
l
y
-
+
s
t
i
@@ -2596,16 +2596,16 @@ n
e
d
:
-
+
i
t
-
+
w
a
s
-
+
a
-
+
d
e
a
@@ -2615,36 +2615,36 @@ e
n
d
,
-
+
h
e
-
+
w
o
u
l
d
-
+
h
a
v
e
-
+
t
o
-
+
g
o
-
+
b
a
c
k
-
+
t
h
e
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2656,45 +2656,45 @@ e
w
a
y
-
+
h
e
-
+
h
a
d
-
+
c
o
m
e
.
-
+
T
h
e
-
+
s
t
e
p
s
-
+
g
o
t
-
+
l
o
u
d
e
r
-
+
a
n
d
-
+
l
o
u
@@ -2702,24 +2702,24 @@ d
e
r
,
-
+
h
e
-
+
s
a
w
-
+
t
h
e
-
+
b
l
a
c
k
-
+
o
u
t
@@ -2727,26 +2727,26 @@ l
i
n
e
-
+
o
f
-
+
a
-
+
f
i
g
u
r
e
-
+
c
o
m
i
n
g
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2761,11 +2761,11 @@ o
u
n
d
-
+
t
h
e
-
+
c
o
r
@@ -2773,39 +2773,39 @@ n
e
r
.
-
+
I
s
-
+
t
h
i
s
-
+
t
h
e
-
+
e
n
d
-
+
o
f
-
+
t
h
e
-
+
l
i
n
e
?
-
+
h
e
-
+
t
h
o
@@ -2813,7 +2813,7 @@ u
g
h
t
-
+
p
r
e
@@ -2822,7 +2822,7 @@ s
i
n
g
-
+
h
i
m
@@ -2830,12 +2830,12 @@ s
e
l
f
-
+
b
a
c
k
-
+
a
g
a
@@ -2843,16 +2843,16 @@ i
n
s
t
-
+
t
h
e
-
+
w
a
l
l
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2867,15 +2867,15 @@ y
i
n
g
-
+
t
o
-
+
m
a
k
e
-
+
h
i
m
@@ -2883,7 +2883,7 @@ s
e
l
f
-
+
i
n
v
@@ -2893,33 +2893,33 @@ i
b
l
e
-
+
i
n
-
+
t
h
e
-
+
d
a
r
k
,
-
+
w
a
s
-
+
a
l
l
-
+
t
h
a
t
-
+
p
l
a
@@ -2928,18 +2928,18 @@ n
i
n
g
-
+
a
n
d
-
+
e
n
e
r
g
y
-
+
w
a
s
@@ -2947,14 +2947,14 @@ t
e
d
?
-
+
H
e
-
+
w
a
s
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -2971,76 +2971,76 @@ p
i
n
g
-
+
w
i
t
h
-
+
s
w
e
a
t
-
+
n
o
w
,
-
+
c
o
l
d
-
+
a
n
d
-
+
w
e
t
,
-
+
h
e
-
+
c
o
u
l
d
-
+
s
m
e
l
l
-
+
t
h
e
-
+
f
e
a
r
-
+
c
o
m
i
n
g
-
+
o
f
f
-
+
h
i
s
-
+
c
l
o
@@ -3049,7 +3049,7 @@ h
e
s
.
-
+
S
u
d
@@ -3058,7 +3058,7 @@ e
n
l
y
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3071,29 +3071,29 @@ n
e
x
t
-
+
t
o
-
+
h
i
m
,
-
+
w
i
t
h
-
+
a
-
+
b
a
r
e
l
y
-
+
n
o
t
@@ -3104,7 +3104,7 @@ a
b
l
e
-
+
s
q
u
@@ -3112,20 +3112,20 @@ e
a
k
,
-
+
a
-
+
d
o
o
r
-
+
s
w
u
n
g
-
+
q
u
i
@@ -3133,25 +3133,25 @@ e
t
l
y
-
+
t
o
-
+
a
n
d
-
+
f
r
o
-
+
i
n
-
+
t
h
e
-
+
n
i
g
@@ -3159,7 +3159,7 @@ h
t
'
s
-
+
b
r
e
@@ -3167,7 +3167,7 @@ e
z
e
.
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3181,74 +3181,74 @@ o
u
l
d
-
+
t
h
i
s
-
+
b
e
-
+
t
h
e
-
+
h
a
v
e
n
-
+
h
e
'
d
-
+
p
r
a
y
e
d
-
+
f
o
r
?
-
+
S
l
o
w
l
y
-
+
h
e
-
+
s
l
i
d
-
+
t
o
w
a
r
d
-
+
t
h
e
-
+
d
o
o
r
,
-
+
p
r
e
@@ -3257,7 +3257,7 @@ s
i
n
g
-
+
h
i
m
@@ -3265,16 +3265,16 @@ s
e
l
f
-
+
m
o
r
e
-
+
a
n
d
-
+
</text:span>
</text:p>
</draw:text-box>
@@ -3287,83 +3287,83 @@ m
o
r
e
-
+
i
n
t
o
-
+
t
h
e
-
+
w
a
l
l
,
-
+
i
n
t
o
-
+
t
h
e
-
+
d
a
r
k
,
-
+
a
w
a
y
-
+
f
r
o
m
-
+
h
i
s
-
+
e
n
e
m
y
.
-
+
W
o
u
l
d
-
+
t
h
i
s
-
+
d
o
o
r
-
+
s
a
v
e
-
+
h
i
s
-
+
h
i
d
diff --git a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml
index 2b68f12e6bb5..fda03d3589de 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml
@@ -36,7 +36,7 @@
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
</text:span>
</text:p>
</draw:text-box>
@@ -45,7 +45,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
</text:span>
</text:p>
</draw:text-box>
@@ -54,7 +54,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same
</text:span>
</text:p>
</draw:text-box>
@@ -63,7 +63,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
</text:span>
</text:p>
</draw:text-box>
@@ -72,7 +72,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to
</text:span>
</text:p>
</draw:text-box>
@@ -81,7 +81,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
</text:span>
</text:p>
</draw:text-box>
@@ -90,7 +90,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
</text:span>
</text:p>
</draw:text-box>
@@ -99,7 +99,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
</text:span>
</text:p>
</draw:text-box>
@@ -108,7 +108,7 @@ falling over the trash can lying in the middle of the sidewalk. He tried to nerv
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
</text:span>
</text:p>
</draw:text-box>
@@ -117,7 +117,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming
</text:span>
</text:p>
</draw:text-box>
@@ -126,7 +126,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall
</text:span>
</text:p>
</draw:text-box>
@@ -135,7 +135,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was
</text:span>
</text:p>
</draw:text-box>
@@ -144,7 +144,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
</text:span>
</text:p>
</draw:text-box>
@@ -153,7 +153,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
</text:span>
</text:p>
</draw:text-box>
@@ -162,7 +162,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
</text:span>
</text:p>
</draw:text-box>
@@ -180,7 +180,7 @@ more into the wall, into the dark, away from his enemy. Would this door save his
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
</text:span>
</text:p>
</draw:text-box>
@@ -189,7 +189,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
</text:span>
</text:p>
</draw:text-box>
@@ -198,7 +198,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same
</text:span>
</text:p>
</draw:text-box>
@@ -207,7 +207,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
</text:span>
</text:p>
</draw:text-box>
@@ -216,7 +216,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to
</text:span>
</text:p>
</draw:text-box>
@@ -225,7 +225,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
</text:span>
</text:p>
</draw:text-box>
@@ -234,7 +234,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
</text:span>
</text:p>
</draw:text-box>
@@ -243,7 +243,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
</text:span>
</text:p>
</draw:text-box>
@@ -259,7 +259,7 @@ UDYKMTAwIDQwCjI1NQr/////////////////////////////////////////////////////////////
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
</text:span>
</text:p>
</draw:text-box>
@@ -268,7 +268,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming
</text:span>
</text:p>
</draw:text-box>
@@ -277,7 +277,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall
</text:span>
</text:p>
</draw:text-box>
@@ -286,7 +286,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was
</text:span>
</text:p>
</draw:text-box>
@@ -295,7 +295,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
</text:span>
</text:p>
</draw:text-box>
@@ -304,7 +304,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
</text:span>
</text:p>
</draw:text-box>
@@ -313,7 +313,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
<draw:text-box >
<text:p >
<text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
</text:span>
</text:p>
</draw:text-box>
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 63cdaa88466a..cccff7dc441e 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite