[Libreoffice-commits] core.git: 2 commits - sal/inc sdext/CppunitTest_pdfimport.mk sdext/Executable_pdf2xml.mk sdext/Executable_pdfunzip.mk sdext/Library_pdfimport.mk sdext/source vcl/Library_vcl.mk vcl/source

Thorsten Behrens tbehrens at suse.com
Wed Mar 20 16:55:30 PDT 2013


 sal/inc/sal/log-areas.dox                      |    1 
 sdext/CppunitTest_pdfimport.mk                 |    4 
 sdext/Executable_pdf2xml.mk                    |    1 
 sdext/Executable_pdfunzip.mk                   |    1 
 sdext/Library_pdfimport.mk                     |    1 
 sdext/source/pdfimport/pdfparse/pdfentries.cxx |   43 +-
 sdext/source/pdfimport/pdfparse/pdfparse.cxx   |   78 ++--
 sdext/source/pdfimport/tree/pdfiprocessor.cxx  |  416 -------------------------
 sdext/source/pdfimport/tree/pdfiprocessor.hxx  |    8 
 vcl/Library_vcl.mk                             |    1 
 vcl/source/components/factory.cxx              |   10 
 vcl/source/components/stringmirror.cxx         |  115 ------
 12 files changed, 75 insertions(+), 604 deletions(-)

New commits:
commit ff140bb6b8b109f14c270ff059f0b8d71dab5d6c
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Thu Mar 21 00:37:28 2013 +0100

    Remove StringMirror UNO service.
    
    This was a kludge from back in the day when pdfimport was an
    extension and could not link against office libs.
    
    While at it, fix mirror method to handle unicode surrogates
    correctly.
    
    Change-Id: I3582a7870efdfea50446d3604a185025b1d5a196

diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index 89a068c..2ec1990 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -43,6 +43,8 @@ $(eval $(call gb_CppunitTest_use_externals,sdext_pdfimport,\
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\
+    basegfx \
+    vcl \
     comphelper \
     cppu \
     cppuhelper \
@@ -56,8 +58,6 @@ $(eval $(call gb_CppunitTest_use_static_libraries,sdext_pdfimport,\
     pdfimport_s \
 ))
 
-$(eval $(call gb_CppunitTest_use_library_objects,sdext_pdfimport,basegfx))
-
 $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\
     sdext/source/pdfimport/test/tests \
 ))
diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index 1c4927c..b50db4d 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Executable_set_include,pdf2xml,\
 
 $(eval $(call gb_Executable_use_libraries,pdf2xml,\
     basegfx \
+    vcl \
     comphelper \
     cppu \
     cppuhelper \
diff --git a/sdext/Executable_pdfunzip.mk b/sdext/Executable_pdfunzip.mk
index 27c2fab..bf571e5 100644
--- a/sdext/Executable_pdfunzip.mk
+++ b/sdext/Executable_pdfunzip.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Executable_set_include,pdfunzip,\
 
 $(eval $(call gb_Executable_use_libraries,pdfunzip,\
     basegfx \
+    vcl \
     cppu \
     cppuhelper \
     sal \
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index 260a39c..3f8f5fe 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,pdfimport,\
 
 $(eval $(call gb_Library_use_libraries,pdfimport,\
     basegfx \
+    vcl \
     cppu \
     cppuhelper \
     sal \
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 9f55a22..df25543 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -38,6 +38,7 @@
 #include <basegfx/range/b2irange.hxx>
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <vcl/svapp.hxx>
 
 #include <com/sun/star/rendering/XVolatileBitmap.hpp>
 #include <com/sun/star/geometry/RealSize2D.hpp>
@@ -76,8 +77,7 @@ namespace pdfi
     m_nNextZOrder( 1 ),
     m_bIsWhiteSpaceInLine( false ),
     m_xStatusIndicator( xStat ),
-    m_bHaveTextOnDocLevel(false),
-    m_bMirrorMapperTried(false)
+    m_bHaveTextOnDocLevel(false)
 {
     FontAttributes aDefFont;
     aDefFont.familyName = "Helvetica";
@@ -1009,413 +1009,21 @@ void PDFIProcessor::sortElements( Element* pEle, bool bDeep )
         }
 
 // helper method: get a mirrored string
-rtl::OUString PDFIProcessor::mirrorString( const rtl::OUString& i_rString )
+rtl::OUString PDFIProcessor::mirrorString( const rtl::OUString& i_rString ) const
 {
-    if( ! m_xMirrorMapper.is() && ! m_bMirrorMapperTried )
-    {
-        m_bMirrorMapperTried = true;
-        uno::Reference< lang::XMultiComponentFactory > xMSF(  m_xContext->getServiceManager(), uno::UNO_SET_THROW );
-        uno::Reference < uno::XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString("com.sun.star.awt.StringMirror"), m_xContext);
-        m_xMirrorMapper = uno::Reference< util::XStringMapping >( xInterface, uno::UNO_QUERY );
-        #if OSL_DEBUG_LEVEL > 1
-        if( m_xMirrorMapper.is() )
-            fprintf( stderr, "using mirror mapper service\n" );
-        #endif
-    }
-    if( m_xMirrorMapper.is() )
-    {
-        uno::Sequence< rtl::OUString > aSeq( 1 );
-        aSeq.getArray()[0] = i_rString;
-        m_xMirrorMapper->mapStrings( aSeq );
-        return  aSeq[0];
-    }
+    const sal_Int32 nLen = i_rString.getLength();
+    rtl::OUStringBuffer aMirror( nLen );
 
-    prepareMirrorMap();
-    sal_Int32 nLen = i_rString.getLength();
-    rtl::OUStringBuffer aRet( nLen );
-    for(int i = nLen - 1; i >= 0; i--)
+    sal_Int32 i = 0;
+    while(i < nLen)
     {
-        sal_Unicode cChar = i_rString[ i ];
-        aRet.append( m_aMirrorMap[cChar] );
-    }
-    return aRet.makeStringAndClear();
-}
+        // read one code point
+        const sal_uInt32 nCodePoint = i_rString.iterateCodePoints( &i );
 
-void PDFIProcessor::prepareMirrorMap()
-{
-    if( m_aMirrorMap.empty() )
-    {
-        #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "falling back to static mirror list\n" );
-        #endif
-
-        m_aMirrorMap.reserve( 0x10000 );
-        for( int i = 0; i < 0x10000; i++ )
-            m_aMirrorMap.push_back( sal_Unicode(i) );
-
-        m_aMirrorMap[ 0x0028 ] = 0x0029; // LEFT PARENTHESIS
-        m_aMirrorMap[ 0x0029 ] = 0x0028; // RIGHT PARENTHESIS
-        m_aMirrorMap[ 0x003C ] = 0x003E; // LESS-THAN SIGN
-        m_aMirrorMap[ 0x003E ] = 0x003C; // GREATER-THAN SIGN
-        m_aMirrorMap[ 0x005B ] = 0x005D; // LEFT SQUARE BRACKET
-        m_aMirrorMap[ 0x005D ] = 0x005B; // RIGHT SQUARE BRACKET
-        m_aMirrorMap[ 0x007B ] = 0x007D; // LEFT CURLY BRACKET
-        m_aMirrorMap[ 0x007D ] = 0x007B; // RIGHT CURLY BRACKET
-        m_aMirrorMap[ 0x00AB ] = 0x00BB; // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-        m_aMirrorMap[ 0x00BB ] = 0x00AB; // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-        m_aMirrorMap[ 0x0F3A ] = 0x0F3B; // TIBETAN MARK GUG RTAGS GYON
-        m_aMirrorMap[ 0x0F3B ] = 0x0F3A; // TIBETAN MARK GUG RTAGS GYAS
-        m_aMirrorMap[ 0x0F3C ] = 0x0F3D; // TIBETAN MARK ANG KHANG GYON
-        m_aMirrorMap[ 0x0F3D ] = 0x0F3C; // TIBETAN MARK ANG KHANG GYAS
-        m_aMirrorMap[ 0x169B ] = 0x169C; // OGHAM FEATHER MARK
-        m_aMirrorMap[ 0x169C ] = 0x169B; // OGHAM REVERSED FEATHER MARK
-        m_aMirrorMap[ 0x2039 ] = 0x203A; // SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-        m_aMirrorMap[ 0x203A ] = 0x2039; // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-        m_aMirrorMap[ 0x2045 ] = 0x2046; // LEFT SQUARE BRACKET WITH QUILL
-        m_aMirrorMap[ 0x2046 ] = 0x2045; // RIGHT SQUARE BRACKET WITH QUILL
-        m_aMirrorMap[ 0x207D ] = 0x207E; // SUPERSCRIPT LEFT PARENTHESIS
-        m_aMirrorMap[ 0x207E ] = 0x207D; // SUPERSCRIPT RIGHT PARENTHESIS
-        m_aMirrorMap[ 0x208D ] = 0x208E; // SUBSCRIPT LEFT PARENTHESIS
-        m_aMirrorMap[ 0x208E ] = 0x208D; // SUBSCRIPT RIGHT PARENTHESIS
-        m_aMirrorMap[ 0x2208 ] = 0x220B; // ELEMENT OF
-        m_aMirrorMap[ 0x2209 ] = 0x220C; // NOT AN ELEMENT OF
-        m_aMirrorMap[ 0x220A ] = 0x220D; // SMALL ELEMENT OF
-        m_aMirrorMap[ 0x220B ] = 0x2208; // CONTAINS AS MEMBER
-        m_aMirrorMap[ 0x220C ] = 0x2209; // DOES NOT CONTAIN AS MEMBER
-        m_aMirrorMap[ 0x220D ] = 0x220A; // SMALL CONTAINS AS MEMBER
-        m_aMirrorMap[ 0x2215 ] = 0x29F5; // DIVISION SLASH
-        m_aMirrorMap[ 0x223C ] = 0x223D; // TILDE OPERATOR
-        m_aMirrorMap[ 0x223D ] = 0x223C; // REVERSED TILDE
-        m_aMirrorMap[ 0x2243 ] = 0x22CD; // ASYMPTOTICALLY EQUAL TO
-        m_aMirrorMap[ 0x2252 ] = 0x2253; // APPROXIMATELY EQUAL TO OR THE IMAGE OF
-        m_aMirrorMap[ 0x2253 ] = 0x2252; // IMAGE OF OR APPROXIMATELY EQUAL TO
-        m_aMirrorMap[ 0x2254 ] = 0x2255; // COLON EQUALS
-        m_aMirrorMap[ 0x2255 ] = 0x2254; // EQUALS COLON
-        m_aMirrorMap[ 0x2264 ] = 0x2265; // LESS-THAN OR EQUAL TO
-        m_aMirrorMap[ 0x2265 ] = 0x2264; // GREATER-THAN OR EQUAL TO
-        m_aMirrorMap[ 0x2266 ] = 0x2267; // LESS-THAN OVER EQUAL TO
-        m_aMirrorMap[ 0x2267 ] = 0x2266; // GREATER-THAN OVER EQUAL TO
-        m_aMirrorMap[ 0x2268 ] = 0x2269; // [BEST FIT] LESS-THAN BUT NOT EQUAL TO
-        m_aMirrorMap[ 0x2269 ] = 0x2268; // [BEST FIT] GREATER-THAN BUT NOT EQUAL TO
-        m_aMirrorMap[ 0x226A ] = 0x226B; // MUCH LESS-THAN
-        m_aMirrorMap[ 0x226B ] = 0x226A; // MUCH GREATER-THAN
-        m_aMirrorMap[ 0x226E ] = 0x226F; // [BEST FIT] NOT LESS-THAN
-        m_aMirrorMap[ 0x226F ] = 0x226E; // [BEST FIT] NOT GREATER-THAN
-        m_aMirrorMap[ 0x2270 ] = 0x2271; // [BEST FIT] NEITHER LESS-THAN NOR EQUAL TO
-        m_aMirrorMap[ 0x2271 ] = 0x2270; // [BEST FIT] NEITHER GREATER-THAN NOR EQUAL TO
-        m_aMirrorMap[ 0x2272 ] = 0x2273; // [BEST FIT] LESS-THAN OR EQUIVALENT TO
-        m_aMirrorMap[ 0x2273 ] = 0x2272; // [BEST FIT] GREATER-THAN OR EQUIVALENT TO
-        m_aMirrorMap[ 0x2274 ] = 0x2275; // [BEST FIT] NEITHER LESS-THAN NOR EQUIVALENT TO
-        m_aMirrorMap[ 0x2275 ] = 0x2274; // [BEST FIT] NEITHER GREATER-THAN NOR EQUIVALENT TO
-        m_aMirrorMap[ 0x2276 ] = 0x2277; // LESS-THAN OR GREATER-THAN
-        m_aMirrorMap[ 0x2277 ] = 0x2276; // GREATER-THAN OR LESS-THAN
-        m_aMirrorMap[ 0x2278 ] = 0x2279; // [BEST FIT] NEITHER LESS-THAN NOR GREATER-THAN
-        m_aMirrorMap[ 0x2279 ] = 0x2278; // [BEST FIT] NEITHER GREATER-THAN NOR LESS-THAN
-        m_aMirrorMap[ 0x227A ] = 0x227B; // PRECEDES
-        m_aMirrorMap[ 0x227B ] = 0x227A; // SUCCEEDS
-        m_aMirrorMap[ 0x227C ] = 0x227D; // PRECEDES OR EQUAL TO
-        m_aMirrorMap[ 0x227D ] = 0x227C; // SUCCEEDS OR EQUAL TO
-        m_aMirrorMap[ 0x227E ] = 0x227F; // [BEST FIT] PRECEDES OR EQUIVALENT TO
-        m_aMirrorMap[ 0x227F ] = 0x227E; // [BEST FIT] SUCCEEDS OR EQUIVALENT TO
-        m_aMirrorMap[ 0x2280 ] = 0x2281; // [BEST FIT] DOES NOT PRECEDE
-        m_aMirrorMap[ 0x2281 ] = 0x2280; // [BEST FIT] DOES NOT SUCCEED
-        m_aMirrorMap[ 0x2282 ] = 0x2283; // SUBSET OF
-        m_aMirrorMap[ 0x2283 ] = 0x2282; // SUPERSET OF
-        m_aMirrorMap[ 0x2284 ] = 0x2285; // [BEST FIT] NOT A SUBSET OF
-        m_aMirrorMap[ 0x2285 ] = 0x2284; // [BEST FIT] NOT A SUPERSET OF
-        m_aMirrorMap[ 0x2286 ] = 0x2287; // SUBSET OF OR EQUAL TO
-        m_aMirrorMap[ 0x2287 ] = 0x2286; // SUPERSET OF OR EQUAL TO
-        m_aMirrorMap[ 0x2288 ] = 0x2289; // [BEST FIT] NEITHER A SUBSET OF NOR EQUAL TO
-        m_aMirrorMap[ 0x2289 ] = 0x2288; // [BEST FIT] NEITHER A SUPERSET OF NOR EQUAL TO
-        m_aMirrorMap[ 0x228A ] = 0x228B; // [BEST FIT] SUBSET OF WITH NOT EQUAL TO
-        m_aMirrorMap[ 0x228B ] = 0x228A; // [BEST FIT] SUPERSET OF WITH NOT EQUAL TO
-        m_aMirrorMap[ 0x228F ] = 0x2290; // SQUARE IMAGE OF
-        m_aMirrorMap[ 0x2290 ] = 0x228F; // SQUARE ORIGINAL OF
-        m_aMirrorMap[ 0x2291 ] = 0x2292; // SQUARE IMAGE OF OR EQUAL TO
-        m_aMirrorMap[ 0x2292 ] = 0x2291; // SQUARE ORIGINAL OF OR EQUAL TO
-        m_aMirrorMap[ 0x2298 ] = 0x29B8; // CIRCLED DIVISION SLASH
-        m_aMirrorMap[ 0x22A2 ] = 0x22A3; // RIGHT TACK
-        m_aMirrorMap[ 0x22A3 ] = 0x22A2; // LEFT TACK
-        m_aMirrorMap[ 0x22A6 ] = 0x2ADE; // ASSERTION
-        m_aMirrorMap[ 0x22A8 ] = 0x2AE4; // TRUE
-        m_aMirrorMap[ 0x22A9 ] = 0x2AE3; // FORCES
-        m_aMirrorMap[ 0x22AB ] = 0x2AE5; // DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE
-        m_aMirrorMap[ 0x22B0 ] = 0x22B1; // PRECEDES UNDER RELATION
-        m_aMirrorMap[ 0x22B1 ] = 0x22B0; // SUCCEEDS UNDER RELATION
-        m_aMirrorMap[ 0x22B2 ] = 0x22B3; // NORMAL SUBGROUP OF
-        m_aMirrorMap[ 0x22B3 ] = 0x22B2; // CONTAINS AS NORMAL SUBGROUP
-        m_aMirrorMap[ 0x22B4 ] = 0x22B5; // NORMAL SUBGROUP OF OR EQUAL TO
-        m_aMirrorMap[ 0x22B5 ] = 0x22B4; // CONTAINS AS NORMAL SUBGROUP OR EQUAL TO
-        m_aMirrorMap[ 0x22B6 ] = 0x22B7; // ORIGINAL OF
-        m_aMirrorMap[ 0x22B7 ] = 0x22B6; // IMAGE OF
-        m_aMirrorMap[ 0x22C9 ] = 0x22CA; // LEFT NORMAL FACTOR SEMIDIRECT PRODUCT
-        m_aMirrorMap[ 0x22CA ] = 0x22C9; // RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT
-        m_aMirrorMap[ 0x22CB ] = 0x22CC; // LEFT SEMIDIRECT PRODUCT
-        m_aMirrorMap[ 0x22CC ] = 0x22CB; // RIGHT SEMIDIRECT PRODUCT
-        m_aMirrorMap[ 0x22CD ] = 0x2243; // REVERSED TILDE EQUALS
-        m_aMirrorMap[ 0x22D0 ] = 0x22D1; // DOUBLE SUBSET
-        m_aMirrorMap[ 0x22D1 ] = 0x22D0; // DOUBLE SUPERSET
-        m_aMirrorMap[ 0x22D6 ] = 0x22D7; // LESS-THAN WITH DOT
-        m_aMirrorMap[ 0x22D7 ] = 0x22D6; // GREATER-THAN WITH DOT
-        m_aMirrorMap[ 0x22D8 ] = 0x22D9; // VERY MUCH LESS-THAN
-        m_aMirrorMap[ 0x22D9 ] = 0x22D8; // VERY MUCH GREATER-THAN
-        m_aMirrorMap[ 0x22DA ] = 0x22DB; // LESS-THAN EQUAL TO OR GREATER-THAN
-        m_aMirrorMap[ 0x22DB ] = 0x22DA; // GREATER-THAN EQUAL TO OR LESS-THAN
-        m_aMirrorMap[ 0x22DC ] = 0x22DD; // EQUAL TO OR LESS-THAN
-        m_aMirrorMap[ 0x22DD ] = 0x22DC; // EQUAL TO OR GREATER-THAN
-        m_aMirrorMap[ 0x22DE ] = 0x22DF; // EQUAL TO OR PRECEDES
-        m_aMirrorMap[ 0x22DF ] = 0x22DE; // EQUAL TO OR SUCCEEDS
-        m_aMirrorMap[ 0x22E0 ] = 0x22E1; // [BEST FIT] DOES NOT PRECEDE OR EQUAL
-        m_aMirrorMap[ 0x22E1 ] = 0x22E0; // [BEST FIT] DOES NOT SUCCEED OR EQUAL
-        m_aMirrorMap[ 0x22E2 ] = 0x22E3; // [BEST FIT] NOT SQUARE IMAGE OF OR EQUAL TO
-        m_aMirrorMap[ 0x22E3 ] = 0x22E2; // [BEST FIT] NOT SQUARE ORIGINAL OF OR EQUAL TO
-        m_aMirrorMap[ 0x22E4 ] = 0x22E5; // [BEST FIT] SQUARE IMAGE OF OR NOT EQUAL TO
-        m_aMirrorMap[ 0x22E5 ] = 0x22E4; // [BEST FIT] SQUARE ORIGINAL OF OR NOT EQUAL TO
-        m_aMirrorMap[ 0x22E6 ] = 0x22E7; // [BEST FIT] LESS-THAN BUT NOT EQUIVALENT TO
-        m_aMirrorMap[ 0x22E7 ] = 0x22E6; // [BEST FIT] GREATER-THAN BUT NOT EQUIVALENT TO
-        m_aMirrorMap[ 0x22E8 ] = 0x22E9; // [BEST FIT] PRECEDES BUT NOT EQUIVALENT TO
-        m_aMirrorMap[ 0x22E9 ] = 0x22E8; // [BEST FIT] SUCCEEDS BUT NOT EQUIVALENT TO
-        m_aMirrorMap[ 0x22EA ] = 0x22EB; // [BEST FIT] NOT NORMAL SUBGROUP OF
-        m_aMirrorMap[ 0x22EB ] = 0x22EA; // [BEST FIT] DOES NOT CONTAIN AS NORMAL SUBGROUP
-        m_aMirrorMap[ 0x22EC ] = 0x22ED; // [BEST FIT] NOT NORMAL SUBGROUP OF OR EQUAL TO
-        m_aMirrorMap[ 0x22ED ] = 0x22EC; // [BEST FIT] DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL
-        m_aMirrorMap[ 0x22F0 ] = 0x22F1; // UP RIGHT DIAGONAL ELLIPSIS
-        m_aMirrorMap[ 0x22F1 ] = 0x22F0; // DOWN RIGHT DIAGONAL ELLIPSIS
-        m_aMirrorMap[ 0x22F2 ] = 0x22FA; // ELEMENT OF WITH LONG HORIZONTAL STROKE
-        m_aMirrorMap[ 0x22F3 ] = 0x22FB; // ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
-        m_aMirrorMap[ 0x22F4 ] = 0x22FC; // SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
-        m_aMirrorMap[ 0x22F6 ] = 0x22FD; // ELEMENT OF WITH OVERBAR
-        m_aMirrorMap[ 0x22F7 ] = 0x22FE; // SMALL ELEMENT OF WITH OVERBAR
-        m_aMirrorMap[ 0x22FA ] = 0x22F2; // CONTAINS WITH LONG HORIZONTAL STROKE
-        m_aMirrorMap[ 0x22FB ] = 0x22F3; // CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
-        m_aMirrorMap[ 0x22FC ] = 0x22F4; // SMALL CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
-        m_aMirrorMap[ 0x22FD ] = 0x22F6; // CONTAINS WITH OVERBAR
-        m_aMirrorMap[ 0x22FE ] = 0x22F7; // SMALL CONTAINS WITH OVERBAR
-        m_aMirrorMap[ 0x2308 ] = 0x2309; // LEFT CEILING
-        m_aMirrorMap[ 0x2309 ] = 0x2308; // RIGHT CEILING
-        m_aMirrorMap[ 0x230A ] = 0x230B; // LEFT FLOOR
-        m_aMirrorMap[ 0x230B ] = 0x230A; // RIGHT FLOOR
-        m_aMirrorMap[ 0x2329 ] = 0x232A; // LEFT-POINTING ANGLE BRACKET
-        m_aMirrorMap[ 0x232A ] = 0x2329; // RIGHT-POINTING ANGLE BRACKET
-        m_aMirrorMap[ 0x2768 ] = 0x2769; // MEDIUM LEFT PARENTHESIS ORNAMENT
-        m_aMirrorMap[ 0x2769 ] = 0x2768; // MEDIUM RIGHT PARENTHESIS ORNAMENT
-        m_aMirrorMap[ 0x276A ] = 0x276B; // MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT
-        m_aMirrorMap[ 0x276B ] = 0x276A; // MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT
-        m_aMirrorMap[ 0x276C ] = 0x276D; // MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT
-        m_aMirrorMap[ 0x276D ] = 0x276C; // MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT
-        m_aMirrorMap[ 0x276E ] = 0x276F; // HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT
-        m_aMirrorMap[ 0x276F ] = 0x276E; // HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT
-        m_aMirrorMap[ 0x2770 ] = 0x2771; // HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT
-        m_aMirrorMap[ 0x2771 ] = 0x2770; // HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT
-        m_aMirrorMap[ 0x2772 ] = 0x2773; // LIGHT LEFT TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0x2773 ] = 0x2772; // LIGHT RIGHT TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0x2774 ] = 0x2775; // MEDIUM LEFT CURLY BRACKET ORNAMENT
-        m_aMirrorMap[ 0x2775 ] = 0x2774; // MEDIUM RIGHT CURLY BRACKET ORNAMENT
-        m_aMirrorMap[ 0x27C3 ] = 0x27C4; // OPEN SUBSET
-        m_aMirrorMap[ 0x27C4 ] = 0x27C3; // OPEN SUPERSET
-        m_aMirrorMap[ 0x27C5 ] = 0x27C6; // LEFT S-SHAPED BAG DELIMITER
-        m_aMirrorMap[ 0x27C6 ] = 0x27C5; // RIGHT S-SHAPED BAG DELIMITER
-        m_aMirrorMap[ 0x27C8 ] = 0x27C9; // REVERSE SOLIDUS PRECEDING SUBSET
-        m_aMirrorMap[ 0x27C9 ] = 0x27C8; // SUPERSET PRECEDING SOLIDUS
-        m_aMirrorMap[ 0x27D5 ] = 0x27D6; // LEFT OUTER JOIN
-        m_aMirrorMap[ 0x27D6 ] = 0x27D5; // RIGHT OUTER JOIN
-        m_aMirrorMap[ 0x27DD ] = 0x27DE; // LONG RIGHT TACK
-        m_aMirrorMap[ 0x27DE ] = 0x27DD; // LONG LEFT TACK
-        m_aMirrorMap[ 0x27E2 ] = 0x27E3; // WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK
-        m_aMirrorMap[ 0x27E3 ] = 0x27E2; // WHITE CONCAVE-SIDED DIAMOND WITH RIGHTWARDS TICK
-        m_aMirrorMap[ 0x27E4 ] = 0x27E5; // WHITE SQUARE WITH LEFTWARDS TICK
-        m_aMirrorMap[ 0x27E5 ] = 0x27E4; // WHITE SQUARE WITH RIGHTWARDS TICK
-        m_aMirrorMap[ 0x27E6 ] = 0x27E7; // MATHEMATICAL LEFT WHITE SQUARE BRACKET
-        m_aMirrorMap[ 0x27E7 ] = 0x27E6; // MATHEMATICAL RIGHT WHITE SQUARE BRACKET
-        m_aMirrorMap[ 0x27E8 ] = 0x27E9; // MATHEMATICAL LEFT ANGLE BRACKET
-        m_aMirrorMap[ 0x27E9 ] = 0x27E8; // MATHEMATICAL RIGHT ANGLE BRACKET
-        m_aMirrorMap[ 0x27EA ] = 0x27EB; // MATHEMATICAL LEFT DOUBLE ANGLE BRACKET
-        m_aMirrorMap[ 0x27EB ] = 0x27EA; // MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
-        m_aMirrorMap[ 0x27EC ] = 0x27ED; // MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0x27ED ] = 0x27EC; // MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0x27EE ] = 0x27EF; // MATHEMATICAL LEFT FLATTENED PARENTHESIS
-        m_aMirrorMap[ 0x27EF ] = 0x27EE; // MATHEMATICAL RIGHT FLATTENED PARENTHESIS
-        m_aMirrorMap[ 0x2983 ] = 0x2984; // LEFT WHITE CURLY BRACKET
-        m_aMirrorMap[ 0x2984 ] = 0x2983; // RIGHT WHITE CURLY BRACKET
-        m_aMirrorMap[ 0x2985 ] = 0x2986; // LEFT WHITE PARENTHESIS
-        m_aMirrorMap[ 0x2986 ] = 0x2985; // RIGHT WHITE PARENTHESIS
-        m_aMirrorMap[ 0x2987 ] = 0x2988; // Z NOTATION LEFT IMAGE BRACKET
-        m_aMirrorMap[ 0x2988 ] = 0x2987; // Z NOTATION RIGHT IMAGE BRACKET
-        m_aMirrorMap[ 0x2989 ] = 0x298A; // Z NOTATION LEFT BINDING BRACKET
-        m_aMirrorMap[ 0x298A ] = 0x2989; // Z NOTATION RIGHT BINDING BRACKET
-        m_aMirrorMap[ 0x298B ] = 0x298C; // LEFT SQUARE BRACKET WITH UNDERBAR
-        m_aMirrorMap[ 0x298C ] = 0x298B; // RIGHT SQUARE BRACKET WITH UNDERBAR
-        m_aMirrorMap[ 0x298D ] = 0x2990; // LEFT SQUARE BRACKET WITH TICK IN TOP CORNER
-        m_aMirrorMap[ 0x298E ] = 0x298F; // RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
-        m_aMirrorMap[ 0x298F ] = 0x298E; // LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
-        m_aMirrorMap[ 0x2990 ] = 0x298D; // RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER
-        m_aMirrorMap[ 0x2991 ] = 0x2992; // LEFT ANGLE BRACKET WITH DOT
-        m_aMirrorMap[ 0x2992 ] = 0x2991; // RIGHT ANGLE BRACKET WITH DOT
-        m_aMirrorMap[ 0x2993 ] = 0x2994; // LEFT ARC LESS-THAN BRACKET
-        m_aMirrorMap[ 0x2994 ] = 0x2993; // RIGHT ARC GREATER-THAN BRACKET
-        m_aMirrorMap[ 0x2995 ] = 0x2996; // DOUBLE LEFT ARC GREATER-THAN BRACKET
-        m_aMirrorMap[ 0x2996 ] = 0x2995; // DOUBLE RIGHT ARC LESS-THAN BRACKET
-        m_aMirrorMap[ 0x2997 ] = 0x2998; // LEFT BLACK TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0x2998 ] = 0x2997; // RIGHT BLACK TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0x29B8 ] = 0x2298; // CIRCLED REVERSE SOLIDUS
-        m_aMirrorMap[ 0x29C0 ] = 0x29C1; // CIRCLED LESS-THAN
-        m_aMirrorMap[ 0x29C1 ] = 0x29C0; // CIRCLED GREATER-THAN
-        m_aMirrorMap[ 0x29C4 ] = 0x29C5; // SQUARED RISING DIAGONAL SLASH
-        m_aMirrorMap[ 0x29C5 ] = 0x29C4; // SQUARED FALLING DIAGONAL SLASH
-        m_aMirrorMap[ 0x29CF ] = 0x29D0; // LEFT TRIANGLE BESIDE VERTICAL BAR
-        m_aMirrorMap[ 0x29D0 ] = 0x29CF; // VERTICAL BAR BESIDE RIGHT TRIANGLE
-        m_aMirrorMap[ 0x29D1 ] = 0x29D2; // BOWTIE WITH LEFT HALF BLACK
-        m_aMirrorMap[ 0x29D2 ] = 0x29D1; // BOWTIE WITH RIGHT HALF BLACK
-        m_aMirrorMap[ 0x29D4 ] = 0x29D5; // TIMES WITH LEFT HALF BLACK
-        m_aMirrorMap[ 0x29D5 ] = 0x29D4; // TIMES WITH RIGHT HALF BLACK
-        m_aMirrorMap[ 0x29D8 ] = 0x29D9; // LEFT WIGGLY FENCE
-        m_aMirrorMap[ 0x29D9 ] = 0x29D8; // RIGHT WIGGLY FENCE
-        m_aMirrorMap[ 0x29DA ] = 0x29DB; // LEFT DOUBLE WIGGLY FENCE
-        m_aMirrorMap[ 0x29DB ] = 0x29DA; // RIGHT DOUBLE WIGGLY FENCE
-        m_aMirrorMap[ 0x29F5 ] = 0x2215; // REVERSE SOLIDUS OPERATOR
-        m_aMirrorMap[ 0x29F8 ] = 0x29F9; // BIG SOLIDUS
-        m_aMirrorMap[ 0x29F9 ] = 0x29F8; // BIG REVERSE SOLIDUS
-        m_aMirrorMap[ 0x29FC ] = 0x29FD; // LEFT-POINTING CURVED ANGLE BRACKET
-        m_aMirrorMap[ 0x29FD ] = 0x29FC; // RIGHT-POINTING CURVED ANGLE BRACKET
-        m_aMirrorMap[ 0x2A2B ] = 0x2A2C; // MINUS SIGN WITH FALLING DOTS
-        m_aMirrorMap[ 0x2A2C ] = 0x2A2B; // MINUS SIGN WITH RISING DOTS
-        m_aMirrorMap[ 0x2A2D ] = 0x2A2E; // PLUS SIGN IN LEFT HALF CIRCLE
-        m_aMirrorMap[ 0x2A2E ] = 0x2A2D; // PLUS SIGN IN RIGHT HALF CIRCLE
-        m_aMirrorMap[ 0x2A34 ] = 0x2A35; // MULTIPLICATION SIGN IN LEFT HALF CIRCLE
-        m_aMirrorMap[ 0x2A35 ] = 0x2A34; // MULTIPLICATION SIGN IN RIGHT HALF CIRCLE
-        m_aMirrorMap[ 0x2A3C ] = 0x2A3D; // INTERIOR PRODUCT
-        m_aMirrorMap[ 0x2A3D ] = 0x2A3C; // RIGHTHAND INTERIOR PRODUCT
-        m_aMirrorMap[ 0x2A64 ] = 0x2A65; // Z NOTATION DOMAIN ANTIRESTRICTION
-        m_aMirrorMap[ 0x2A65 ] = 0x2A64; // Z NOTATION RANGE ANTIRESTRICTION
-        m_aMirrorMap[ 0x2A79 ] = 0x2A7A; // LESS-THAN WITH CIRCLE INSIDE
-        m_aMirrorMap[ 0x2A7A ] = 0x2A79; // GREATER-THAN WITH CIRCLE INSIDE
-        m_aMirrorMap[ 0x2A7D ] = 0x2A7E; // LESS-THAN OR SLANTED EQUAL TO
-        m_aMirrorMap[ 0x2A7E ] = 0x2A7D; // GREATER-THAN OR SLANTED EQUAL TO
-        m_aMirrorMap[ 0x2A7F ] = 0x2A80; // LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE
-        m_aMirrorMap[ 0x2A80 ] = 0x2A7F; // GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE
-        m_aMirrorMap[ 0x2A81 ] = 0x2A82; // LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE
-        m_aMirrorMap[ 0x2A82 ] = 0x2A81; // GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE
-        m_aMirrorMap[ 0x2A83 ] = 0x2A84; // LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT
-        m_aMirrorMap[ 0x2A84 ] = 0x2A83; // GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT
-        m_aMirrorMap[ 0x2A8B ] = 0x2A8C; // LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN
-        m_aMirrorMap[ 0x2A8C ] = 0x2A8B; // GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN
-        m_aMirrorMap[ 0x2A91 ] = 0x2A92; // LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL
-        m_aMirrorMap[ 0x2A92 ] = 0x2A91; // GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL
-        m_aMirrorMap[ 0x2A93 ] = 0x2A94; // LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL
-        m_aMirrorMap[ 0x2A94 ] = 0x2A93; // GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL
-        m_aMirrorMap[ 0x2A95 ] = 0x2A96; // SLANTED EQUAL TO OR LESS-THAN
-        m_aMirrorMap[ 0x2A96 ] = 0x2A95; // SLANTED EQUAL TO OR GREATER-THAN
-        m_aMirrorMap[ 0x2A97 ] = 0x2A98; // SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE
-        m_aMirrorMap[ 0x2A98 ] = 0x2A97; // SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE
-        m_aMirrorMap[ 0x2A99 ] = 0x2A9A; // DOUBLE-LINE EQUAL TO OR LESS-THAN
-        m_aMirrorMap[ 0x2A9A ] = 0x2A99; // DOUBLE-LINE EQUAL TO OR GREATER-THAN
-        m_aMirrorMap[ 0x2A9B ] = 0x2A9C; // DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN
-        m_aMirrorMap[ 0x2A9C ] = 0x2A9B; // DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN
-        m_aMirrorMap[ 0x2AA1 ] = 0x2AA2; // DOUBLE NESTED LESS-THAN
-        m_aMirrorMap[ 0x2AA2 ] = 0x2AA1; // DOUBLE NESTED GREATER-THAN
-        m_aMirrorMap[ 0x2AA6 ] = 0x2AA7; // LESS-THAN CLOSED BY CURVE
-        m_aMirrorMap[ 0x2AA7 ] = 0x2AA6; // GREATER-THAN CLOSED BY CURVE
-        m_aMirrorMap[ 0x2AA8 ] = 0x2AA9; // LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL
-        m_aMirrorMap[ 0x2AA9 ] = 0x2AA8; // GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL
-        m_aMirrorMap[ 0x2AAA ] = 0x2AAB; // SMALLER THAN
-        m_aMirrorMap[ 0x2AAB ] = 0x2AAA; // LARGER THAN
-        m_aMirrorMap[ 0x2AAC ] = 0x2AAD; // SMALLER THAN OR EQUAL TO
-        m_aMirrorMap[ 0x2AAD ] = 0x2AAC; // LARGER THAN OR EQUAL TO
-        m_aMirrorMap[ 0x2AAF ] = 0x2AB0; // PRECEDES ABOVE SINGLE-LINE EQUALS SIGN
-        m_aMirrorMap[ 0x2AB0 ] = 0x2AAF; // SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN
-        m_aMirrorMap[ 0x2AB3 ] = 0x2AB4; // PRECEDES ABOVE EQUALS SIGN
-        m_aMirrorMap[ 0x2AB4 ] = 0x2AB3; // SUCCEEDS ABOVE EQUALS SIGN
-        m_aMirrorMap[ 0x2ABB ] = 0x2ABC; // DOUBLE PRECEDES
-        m_aMirrorMap[ 0x2ABC ] = 0x2ABB; // DOUBLE SUCCEEDS
-        m_aMirrorMap[ 0x2ABD ] = 0x2ABE; // SUBSET WITH DOT
-        m_aMirrorMap[ 0x2ABE ] = 0x2ABD; // SUPERSET WITH DOT
-        m_aMirrorMap[ 0x2ABF ] = 0x2AC0; // SUBSET WITH PLUS SIGN BELOW
-        m_aMirrorMap[ 0x2AC0 ] = 0x2ABF; // SUPERSET WITH PLUS SIGN BELOW
-        m_aMirrorMap[ 0x2AC1 ] = 0x2AC2; // SUBSET WITH MULTIPLICATION SIGN BELOW
-        m_aMirrorMap[ 0x2AC2 ] = 0x2AC1; // SUPERSET WITH MULTIPLICATION SIGN BELOW
-        m_aMirrorMap[ 0x2AC3 ] = 0x2AC4; // SUBSET OF OR EQUAL TO WITH DOT ABOVE
-        m_aMirrorMap[ 0x2AC4 ] = 0x2AC3; // SUPERSET OF OR EQUAL TO WITH DOT ABOVE
-        m_aMirrorMap[ 0x2AC5 ] = 0x2AC6; // SUBSET OF ABOVE EQUALS SIGN
-        m_aMirrorMap[ 0x2AC6 ] = 0x2AC5; // SUPERSET OF ABOVE EQUALS SIGN
-        m_aMirrorMap[ 0x2ACD ] = 0x2ACE; // SQUARE LEFT OPEN BOX OPERATOR
-        m_aMirrorMap[ 0x2ACE ] = 0x2ACD; // SQUARE RIGHT OPEN BOX OPERATOR
-        m_aMirrorMap[ 0x2ACF ] = 0x2AD0; // CLOSED SUBSET
-        m_aMirrorMap[ 0x2AD0 ] = 0x2ACF; // CLOSED SUPERSET
-        m_aMirrorMap[ 0x2AD1 ] = 0x2AD2; // CLOSED SUBSET OR EQUAL TO
-        m_aMirrorMap[ 0x2AD2 ] = 0x2AD1; // CLOSED SUPERSET OR EQUAL TO
-        m_aMirrorMap[ 0x2AD3 ] = 0x2AD4; // SUBSET ABOVE SUPERSET
-        m_aMirrorMap[ 0x2AD4 ] = 0x2AD3; // SUPERSET ABOVE SUBSET
-        m_aMirrorMap[ 0x2AD5 ] = 0x2AD6; // SUBSET ABOVE SUBSET
-        m_aMirrorMap[ 0x2AD6 ] = 0x2AD5; // SUPERSET ABOVE SUPERSET
-        m_aMirrorMap[ 0x2ADE ] = 0x22A6; // SHORT LEFT TACK
-        m_aMirrorMap[ 0x2AE3 ] = 0x22A9; // DOUBLE VERTICAL BAR LEFT TURNSTILE
-        m_aMirrorMap[ 0x2AE4 ] = 0x22A8; // VERTICAL BAR DOUBLE LEFT TURNSTILE
-        m_aMirrorMap[ 0x2AE5 ] = 0x22AB; // DOUBLE VERTICAL BAR DOUBLE LEFT TURNSTILE
-        m_aMirrorMap[ 0x2AEC ] = 0x2AED; // DOUBLE STROKE NOT SIGN
-        m_aMirrorMap[ 0x2AED ] = 0x2AEC; // REVERSED DOUBLE STROKE NOT SIGN
-        m_aMirrorMap[ 0x2AF7 ] = 0x2AF8; // TRIPLE NESTED LESS-THAN
-        m_aMirrorMap[ 0x2AF8 ] = 0x2AF7; // TRIPLE NESTED GREATER-THAN
-        m_aMirrorMap[ 0x2AF9 ] = 0x2AFA; // DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO
-        m_aMirrorMap[ 0x2AFA ] = 0x2AF9; // DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO
-        m_aMirrorMap[ 0x2E02 ] = 0x2E03; // LEFT SUBSTITUTION BRACKET
-        m_aMirrorMap[ 0x2E03 ] = 0x2E02; // RIGHT SUBSTITUTION BRACKET
-        m_aMirrorMap[ 0x2E04 ] = 0x2E05; // LEFT DOTTED SUBSTITUTION BRACKET
-        m_aMirrorMap[ 0x2E05 ] = 0x2E04; // RIGHT DOTTED SUBSTITUTION BRACKET
-        m_aMirrorMap[ 0x2E09 ] = 0x2E0A; // LEFT TRANSPOSITION BRACKET
-        m_aMirrorMap[ 0x2E0A ] = 0x2E09; // RIGHT TRANSPOSITION BRACKET
-        m_aMirrorMap[ 0x2E0C ] = 0x2E0D; // LEFT RAISED OMISSION BRACKET
-        m_aMirrorMap[ 0x2E0D ] = 0x2E0C; // RIGHT RAISED OMISSION BRACKET
-        m_aMirrorMap[ 0x2E1C ] = 0x2E1D; // LEFT LOW PARAPHRASE BRACKET
-        m_aMirrorMap[ 0x2E1D ] = 0x2E1C; // RIGHT LOW PARAPHRASE BRACKET
-        m_aMirrorMap[ 0x2E20 ] = 0x2E21; // LEFT VERTICAL BAR WITH QUILL
-        m_aMirrorMap[ 0x2E21 ] = 0x2E20; // RIGHT VERTICAL BAR WITH QUILL
-        m_aMirrorMap[ 0x2E22 ] = 0x2E23; // TOP LEFT HALF BRACKET
-        m_aMirrorMap[ 0x2E23 ] = 0x2E22; // TOP RIGHT HALF BRACKET
-        m_aMirrorMap[ 0x2E24 ] = 0x2E25; // BOTTOM LEFT HALF BRACKET
-        m_aMirrorMap[ 0x2E25 ] = 0x2E24; // BOTTOM RIGHT HALF BRACKET
-        m_aMirrorMap[ 0x2E26 ] = 0x2E27; // LEFT SIDEWAYS U BRACKET
-        m_aMirrorMap[ 0x2E27 ] = 0x2E26; // RIGHT SIDEWAYS U BRACKET
-        m_aMirrorMap[ 0x2E28 ] = 0x2E29; // LEFT DOUBLE PARENTHESIS
-        m_aMirrorMap[ 0x2E29 ] = 0x2E28; // RIGHT DOUBLE PARENTHESIS
-        m_aMirrorMap[ 0x3008 ] = 0x3009; // LEFT ANGLE BRACKET
-        m_aMirrorMap[ 0x3009 ] = 0x3008; // RIGHT ANGLE BRACKET
-        m_aMirrorMap[ 0x300A ] = 0x300B; // LEFT DOUBLE ANGLE BRACKET
-        m_aMirrorMap[ 0x300B ] = 0x300A; // RIGHT DOUBLE ANGLE BRACKET
-        m_aMirrorMap[ 0x300C ] = 0x300D; // [BEST FIT] LEFT CORNER BRACKET
-        m_aMirrorMap[ 0x300D ] = 0x300C; // [BEST FIT] RIGHT CORNER BRACKET
-        m_aMirrorMap[ 0x300E ] = 0x300F; // [BEST FIT] LEFT WHITE CORNER BRACKET
-        m_aMirrorMap[ 0x300F ] = 0x300E; // [BEST FIT] RIGHT WHITE CORNER BRACKET
-        m_aMirrorMap[ 0x3010 ] = 0x3011; // LEFT BLACK LENTICULAR BRACKET
-        m_aMirrorMap[ 0x3011 ] = 0x3010; // RIGHT BLACK LENTICULAR BRACKET
-        m_aMirrorMap[ 0x3014 ] = 0x3015; // LEFT TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0x3015 ] = 0x3014; // RIGHT TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0x3016 ] = 0x3017; // LEFT WHITE LENTICULAR BRACKET
-        m_aMirrorMap[ 0x3017 ] = 0x3016; // RIGHT WHITE LENTICULAR BRACKET
-        m_aMirrorMap[ 0x3018 ] = 0x3019; // LEFT WHITE TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0x3019 ] = 0x3018; // RIGHT WHITE TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0x301A ] = 0x301B; // LEFT WHITE SQUARE BRACKET
-        m_aMirrorMap[ 0x301B ] = 0x301A; // RIGHT WHITE SQUARE BRACKET
-        m_aMirrorMap[ 0xFE59 ] = 0xFE5A; // SMALL LEFT PARENTHESIS
-        m_aMirrorMap[ 0xFE5A ] = 0xFE59; // SMALL RIGHT PARENTHESIS
-        m_aMirrorMap[ 0xFE5B ] = 0xFE5C; // SMALL LEFT CURLY BRACKET
-        m_aMirrorMap[ 0xFE5C ] = 0xFE5B; // SMALL RIGHT CURLY BRACKET
-        m_aMirrorMap[ 0xFE5D ] = 0xFE5E; // SMALL LEFT TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0xFE5E ] = 0xFE5D; // SMALL RIGHT TORTOISE SHELL BRACKET
-        m_aMirrorMap[ 0xFE64 ] = 0xFE65; // SMALL LESS-THAN SIGN
-        m_aMirrorMap[ 0xFE65 ] = 0xFE64; // SMALL GREATER-THAN SIGN
-        m_aMirrorMap[ 0xFF08 ] = 0xFF09; // FULLWIDTH LEFT PARENTHESIS
-        m_aMirrorMap[ 0xFF09 ] = 0xFF08; // FULLWIDTH RIGHT PARENTHESIS
-        m_aMirrorMap[ 0xFF1C ] = 0xFF1E; // FULLWIDTH LESS-THAN SIGN
-        m_aMirrorMap[ 0xFF1E ] = 0xFF1C; // FULLWIDTH GREATER-THAN SIGN
-        m_aMirrorMap[ 0xFF3B ] = 0xFF3D; // FULLWIDTH LEFT SQUARE BRACKET
-        m_aMirrorMap[ 0xFF3D ] = 0xFF3B; // FULLWIDTH RIGHT SQUARE BRACKET
-        m_aMirrorMap[ 0xFF5B ] = 0xFF5D; // FULLWIDTH LEFT CURLY BRACKET
-        m_aMirrorMap[ 0xFF5D ] = 0xFF5B; // FULLWIDTH RIGHT CURLY BRACKET
-        m_aMirrorMap[ 0xFF5F ] = 0xFF60; // FULLWIDTH LEFT WHITE PARENTHESIS
-        m_aMirrorMap[ 0xFF60 ] = 0xFF5F; // FULLWIDTH RIGHT WHITE PARENTHESIS
-        m_aMirrorMap[ 0xFF62 ] = 0xFF63; // [BEST FIT] HALFWIDTH LEFT CORNER BRACKET
-        m_aMirrorMap[ 0xFF63 ] = 0xFF62; // [BEST FIT] HALFWIDTH RIGHT CORNER BRACKET
+        // and append it mirrored
+        aMirror.appendUtf32( GetMirroredChar(nCodePoint) );
     }
+    return aMirror.makeStringAndClear();
 }
 
 }
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index e86ccfe..bd792bc 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -99,10 +99,9 @@ namespace pdfi
 
         void sortElements( Element* pElement, bool bDeep = false );
 
-        rtl::OUString mirrorString( const rtl::OUString& i_rInString );
+        rtl::OUString mirrorString( const rtl::OUString& i_rInString ) const;
 
     private:
-        void prepareMirrorMap();
         void processGlyphLine();
         void processGlyph(   double       fPreAvarageSpaceValue,
                              CharGlyph&   rGlyph,
@@ -233,11 +232,6 @@ namespace pdfi
                                            m_xStatusIndicator;
 
         bool                               m_bHaveTextOnDocLevel;
-        std::vector< sal_Unicode >         m_aMirrorMap;
-        com::sun::star::uno::Reference<
-            com::sun::star::util::XStringMapping >
-                                           m_xMirrorMapper;
-        bool                               m_bMirrorMapperTried;
     };
     class CharGlyph
     {
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b176fd5..71f8da8 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -133,7 +133,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/components/dtranscomp \
     vcl/source/components/factory \
     vcl/source/components/fontident \
-    vcl/source/components/stringmirror \
     vcl/source/control/button \
     vcl/source/control/combobox \
     vcl/source/control/ctrl \
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index eb7c05b..9fefd4b 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -41,10 +41,6 @@ extern Sequence< OUString > SAL_CALL FontIdentificator_getSupportedServiceNames(
 extern OUString SAL_CALL FontIdentificator_getImplementationName();
 extern Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Reference< XMultiServiceFactory > & );
 
-extern Sequence< OUString > SAL_CALL StringMirror_getSupportedServiceNames();
-extern OUString SAL_CALL StringMirror_getImplementationName();
-extern Reference< XInterface > SAL_CALL StringMirror_createInstance( const Reference< XMultiServiceFactory > & );
-
 extern OUString SAL_CALL Clipboard_getImplementationName();
 extern Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory( const Reference< XMultiServiceFactory > & );
 
@@ -86,12 +82,6 @@ extern "C" {
                     xMgr, vcl::FontIdentificator_getImplementationName(), vcl::FontIdentificator_createInstance,
                     vcl::FontIdentificator_getSupportedServiceNames() );
             }
-            else if( vcl::StringMirror_getImplementationName().equalsAscii( pImplementationName ) )
-            {
-                xFactory = ::cppu::createSingleFactory(
-                    xMgr, vcl::StringMirror_getImplementationName(), vcl::StringMirror_createInstance,
-                    vcl::StringMirror_getSupportedServiceNames() );
-            }
             else if( vcl::Clipboard_getImplementationName().equalsAscii( pImplementationName ) )
             {
                 xFactory = vcl::Clipboard_createFactory( xMgr );
diff --git a/vcl/source/components/stringmirror.cxx b/vcl/source/components/stringmirror.cxx
deleted file mode 100644
index 2c10976..0000000
--- a/vcl/source/components/stringmirror.cxx
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/util/XStringMapping.hpp"
-
-#include "cppuhelper/implbase2.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "vcl/svapp.hxx"
-
-using ::rtl::OUString;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
-
-// -----------------------------------------------------------------------
-
-namespace vcl
-{
-
-class StringMirror : public ::cppu::WeakAggImplHelper2< XStringMapping, XServiceInfo >
-{
-public:
-    StringMirror()
-    {}
-
-    virtual ~StringMirror()
-    {}
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException);
-    virtual ::sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException);
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException);
-
-    // XStringMapping
-    virtual sal_Bool SAL_CALL mapStrings( Sequence< OUString >& io_rStrings ) throw (RuntimeException)
-    {
-        sal_Int32 nItems = io_rStrings.getLength();
-        for( sal_Int32 n = 0; n < nItems; n++ )
-        {
-            rtl::OUString& rStr( io_rStrings.getArray()[n] );
-
-            sal_Int32 nLen = rStr.getLength();
-            rtl::OUStringBuffer aMirror( nLen );
-            for(sal_Int32 i = nLen - 1; i >= 0; i--)
-            {
-                sal_Unicode cChar = rStr[ i ];
-                aMirror.append(sal_Unicode(GetMirroredChar(cChar)));
-            }
-            rStr = aMirror.makeStringAndClear();
-        }
-        return sal_True;
-    }
-};
-
-Sequence< OUString > StringMirror_getSupportedServiceNames()
-{
-    static OUString aServiceName( "com.sun.star.awt.StringMirror" );
-    static Sequence< OUString > aServiceNames( &aServiceName, 1 );
-    return aServiceNames;
-}
-
-OUString StringMirror_getImplementationName()
-{
-    return OUString( "vcl::StringMirror" );
-}
-
-Reference< XInterface > SAL_CALL StringMirror_createInstance( const Reference< XMultiServiceFactory >&  )
-{
-    return static_cast< ::cppu::OWeakObject * >( new StringMirror );
-}
-
-
-// XServiceInfo
-OUString SAL_CALL StringMirror::getImplementationName() throw (RuntimeException)
-{
-    return StringMirror_getImplementationName();
-}
-
-sal_Bool SAL_CALL StringMirror::supportsService( const OUString& i_rServiceName ) throw (RuntimeException)
-{
-    Sequence< OUString > aSN( StringMirror_getSupportedServiceNames() );
-    for( sal_Int32 nService = 0; nService < aSN.getLength(); nService++ )
-    {
-        if( aSN[nService] == i_rServiceName )
-            return sal_True;
-    }
-    return sal_False;
-}
-
-Sequence< OUString > SAL_CALL StringMirror::getSupportedServiceNames() throw (RuntimeException)
-{
-    return StringMirror_getSupportedServiceNames();
-}
-
-} // namespace vcl
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit dd0db92a174f6a4da1ada3de17cb869264be9342
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Wed Mar 20 23:47:45 2013 +0100

    Kill fprintf in sdext in favour of SAL_LOG
    
    Change-Id: I2253c1a4d90ab348764cd8863b8aaf2036a254de

diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 9cf9855..3bb316f 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -141,6 +141,7 @@ certain functionality.
 
 @li @c sdext.minimizer
 @li @c sdext.pdfimport
+ at li @c sdext.pdfimport.pdfparse
 @li @c sdext.presenter
 
 @section sfx2
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 44fc327..4ce7804 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -1316,12 +1316,12 @@ PDFFileImplData* PDFFile::impl_getData() const
                     PDFString* pStr = dynamic_cast<PDFString*>(pArr->m_aSubElements[0]);
                     if( pStr )
                         m_pData->m_aDocID = pStr->getFilteredString();
-                    #if OSL_DEBUG_LEVEL > 1
-                    fprintf( stderr, "DocId is <" );
+#if OSL_DEBUG_LEVEL > 1
+                    OUString aTmp;
                     for( int i = 0; i < m_pData->m_aDocID.getLength(); i++ )
-                        fprintf( stderr, "%.2x", (unsigned int)sal_uInt8(m_pData->m_aDocID.getStr()[i]) );
-                    fprintf( stderr, ">\n" );
-                    #endif
+                        aTmp += OUString::number((unsigned int)sal_uInt8(m_pData->m_aDocID.getStr()[i]), 16);
+                    SAL_INFO("sdext.pdfimport.pdfparse", "DocId is <" << OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr() << ">");
+#endif
                 }
             }
             // search Encrypt entry
@@ -1378,15 +1378,16 @@ PDFFileImplData* PDFFile::impl_getData() const
                                 OString aEnt = pString->getFilteredString();
                                 if( aEnt.getLength() == 32 )
                                     memcpy( m_pData->m_aOEntry, aEnt.getStr(), 32 );
-                                #if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
                                 else
                                 {
-                                    fprintf( stderr, "O entry has length %d, should be 32 <", (int)aEnt.getLength() );
+                                    OUString aTmp;
                                     for( int i = 0; i < aEnt.getLength(); i++ )
-                                        fprintf( stderr, " %.2X", (unsigned int)sal_uInt8(aEnt.getStr()[i]) );
-                                    fprintf( stderr, ">\n" );
+                                        aTmp += " " + OUString::number((unsigned int)sal_uInt8(aEnt.getStr()[i]), 16);
+                                    SAL_WARN("sdext.pdfimport.pdfparse",
+                                             "O entry has length " << (int)aEnt.getLength() << ", should be 32 <" << OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr() << ">" );
                                 }
-                                #endif
+#endif
                             }
                         }
                         if( u_ent != pDict->m_aMap.end() )
@@ -1397,15 +1398,16 @@ PDFFileImplData* PDFFile::impl_getData() const
                                 OString aEnt = pString->getFilteredString();
                                 if( aEnt.getLength() == 32 )
                                     memcpy( m_pData->m_aUEntry, aEnt.getStr(), 32 );
-                                #if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
                                 else
                                 {
-                                    fprintf( stderr, "U entry has length %d, should be 32 <", (int)aEnt.getLength() );
+                                    OUString aTmp;
                                     for( int i = 0; i < aEnt.getLength(); i++ )
-                                        fprintf( stderr, " %.2X", (unsigned int)sal_uInt8(aEnt.getStr()[i]) );
-                                    fprintf( stderr, ">\n" );
+                                        aTmp += " " + OUString::number((unsigned int)sal_uInt8(aEnt.getStr()[i]), 16);
+                                    SAL_WARN("sdext.pdfimport.pdfparse",
+                                             "U entry has length " << (int)aEnt.getLength() << ", should be 32 <" << OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr() << ">" );
                                 }
-                                #endif
+#endif
                             }
                         }
                         if( r_ent != pDict->m_aMap.end() )
@@ -1419,15 +1421,10 @@ PDFFileImplData* PDFFile::impl_getData() const
                             PDFNumber* pNum = dynamic_cast<PDFNumber*>(p_ent->second);
                             if( pNum )
                                 m_pData->m_nPEntry = static_cast<sal_uInt32>(static_cast<sal_Int32>(pNum->m_fValue));
-                        #if OSL_DEBUG_LEVEL > 1
-                            fprintf( stderr, "p entry is %" SAL_PRIxUINT32 "\n", m_pData->m_nPEntry );
-                        #endif
+                            SAL_INFO("sdext.pdfimport.pdfparse", "p entry is " << m_pData->m_nPEntry );
                         }
-                        #if OSL_DEBUG_LEVEL > 1
-                        fprintf( stderr, "Encryption dict: sec handler: %s, version = %d, revision = %d, key length = %d\n",
-                                 pFilter ? OUStringToOString( pFilter->getFilteredName(), RTL_TEXTENCODING_UTF8 ).getStr() : "<unknown>",
-                                 (int)m_pData->m_nAlgoVersion, (int)m_pData->m_nStandardRevision, (int)m_pData->m_nKeyLength );
-                        #endif
+
+                        SAL_INFO("sdext.pdfimport.pdfparse", "Encryption dict: sec handler: " << (pFilter ? OUStringToOString( pFilter->getFilteredName(), RTL_TEXTENCODING_UTF8 ).getStr() : "<unknown>") << ", version = " << (int)m_pData->m_nAlgoVersion << ", revision = " << (int)m_pData->m_nStandardRevision << ", key length = " << m_pData->m_nKeyLength );
                         break;
                     }
                 }
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 272702d..1e8a97e 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -553,32 +553,27 @@ PDFEntry* PDFReader::read( const char* pBuffer, unsigned int nLen )
 
     try
     {
-        #if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
         boost::spirit::parse_info<const char*> aInfo =
-        #endif
+#endif
             boost::spirit::parse( pBuffer,
                                   pBuffer+nLen,
                                   aGrammar,
                                   boost::spirit::space_p );
-        #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "parseinfo: stop = %p (buff=%p, offset = %d), hit = %s, full = %s, length = %d\n",
-                 aInfo.stop, pBuffer, aInfo.stop - pBuffer,
-                 aInfo.hit ? "true" : "false",
-                 aInfo.full ? "true" : "false",
-                 (int)aInfo.length );
-        #endif
+#if OSL_DEBUG_LEVEL > 1
+        SAL_INFO("sdext.pdfimport.pdfparse", "parseinfo: stop = " << aInfo.stop << " (buff=" << pBuffer << ", offset = " << aInfo.stop - pBuffer << "), hit = " << aInfo.hit ? "true" : "false" << ", full = " << aInfo.full ? "true" : "false" << ", length = " << (int)aInfo.length );
+#endif
     }
     catch( const parser_error<const char*, const char*>& rError )
     {
-        #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "parse error: %s at buffer pos %u\nobject stack:\n",
-                 rError.descriptor, rError.where - pBuffer );
-        unsigned int nElem = aGrammar.m_aObjectStack.size();
+#if OSL_DEBUG_LEVEL > 1
+        OUString aTmp;
+        unsigned int nElem = aGrammar.m_aObjectStack.size()
         for( unsigned int i = 0; i < nElem; i++ )
-        {
-            fprintf( stderr, "   %s\n", typeid( *(aGrammar.m_aObjectStack[i]) ).name() );
-        }
-        #endif
+            aTmp += "   " + OUString(typeid( *(aGrammar.m_aObjectStack[i]) ).name());
+
+        SAL_WARN("sdext.pdfimport.pdfparse", "parse error: " << rError.descriptor << " at buffer pos " << rError.where - pBuffer << ", object stack: " << OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr());
+#endif
     }
 
     PDFEntry* pRet = NULL;
@@ -588,10 +583,10 @@ PDFEntry* PDFReader::read( const char* pBuffer, unsigned int nLen )
         pRet = aGrammar.m_aObjectStack.back();
         aGrammar.m_aObjectStack.pop_back();
     }
-    #if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
     else if( nEntries > 1 )
-        fprintf( stderr, "error got %u stack objects in parse\n", nEntries );
-    #endif
+        SAL_WARN("sdext.pdfimport.pdfparse", "error got " << nEntries << " stack objects in parse" );
+#endif
 
     return pRet;
 }
@@ -634,32 +629,31 @@ PDFEntry* PDFReader::read( const char* pFileName )
 
     try
     {
-        #if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
         boost::spirit::parse_info< file_iterator<> > aInfo =
-        #endif
+#endif
             boost::spirit::parse( file_start,
                                   file_end,
                                   aGrammar,
                                   boost::spirit::space_p );
-        #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "parseinfo: stop at offset = %ld, hit = %s, full = %s, length = %lu\n",
-                 aInfo.stop - file_start,
-                 aInfo.hit ? "true" : "false",
-                 aInfo.full ? "true" : "false",
-                 aInfo.length );
-        #endif
+#if OSL_DEBUG_LEVEL > 1
+        SAL_INFO("sdext.pdfimport.pdfparse", "parseinfo: stop at offset = " << aInfo.stop - file_start << ", hit = " << (aInfo.hit ? "true" : "false") << ", full = " << (aInfo.full ? "true" : "false") << ", length = " << aInfo.length);
+#endif
     }
     catch( const parser_error< const char*, file_iterator<> >& rError )
     {
-        #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "parse error: %s at buffer pos %lu\nobject stack:\n",
-                 rError.descriptor, rError.where - file_start );
-        size_t nElem = aGrammar.m_aObjectStack.size();
-        for( size_t i = 0; i < nElem; ++i )
+#if OSL_DEBUG_LEVEL > 1
+        OUString aTmp;
+        unsigned int nElem = aGrammar.m_aObjectStack.size();
+        for( unsigned int i = 0; i < nElem; i++ )
         {
-            fprintf( stderr, "   %s\n", typeid( *(aGrammar.m_aObjectStack[i]) ).name() );
+            aTmp += "   ";
+            aTmp += OUString(typeid( *(aGrammar.m_aObjectStack[i]) ).name(),
+                             strlen(typeid( *(aGrammar.m_aObjectStack[i]) ).name()),
+                             RTL_TEXTENCODING_ASCII_US);
         }
-        #endif
+        SAL_WARN("sdext.pdfimport.pdfparse", "parse error: " << rError.descriptor << " at buffer pos " << rError.where - file_start << ", object stack: " << OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr());
+#endif
     }
 
     PDFEntry* pRet = NULL;
@@ -669,21 +663,21 @@ PDFEntry* PDFReader::read( const char* pFileName )
         pRet = aGrammar.m_aObjectStack.back();
         aGrammar.m_aObjectStack.pop_back();
     }
-    #if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
     else if( nEntries > 1 )
     {
-        fprintf( stderr, "error got %u stack objects in parse\n", nEntries );
+        SAL_WARN("sdext.pdfimport.pdfparse", "error got " << nEntries << " stack objects in parse");
         for( unsigned int i = 0; i < nEntries; i++ )
         {
-            fprintf( stderr, "%s\n", typeid(*aGrammar.m_aObjectStack[i]).name() );
+            SAL_WARN("sdext.pdfimport.pdfparse", typeid(*aGrammar.m_aObjectStack[i]).name());
             PDFObject* pObj = dynamic_cast<PDFObject*>(aGrammar.m_aObjectStack[i]);
             if( pObj )
-                fprintf( stderr, "   -> object %d generation %d\n", pObj->m_nNumber, pObj->m_nGeneration );
+                SAL_WARN("sdext.pdfimport.pdfparse", "   -> object " << pObj->m_nNumber << " generation " << pObj->m_nGeneration);
             else
-                fprintf( stderr, "(type %s)\n", typeid(*aGrammar.m_aObjectStack[i]).name() );
+                SAL_WARN("sdext.pdfimport.pdfparse", "(type " << typeid(*aGrammar.m_aObjectStack[i]).name() << ")");
         }
     }
-    #endif
+#endif
     return pRet;
 #endif // WIN32
 }


More information about the Libreoffice-commits mailing list