diff options
Diffstat (limited to 'sdext')
26 files changed, 80 insertions, 78 deletions
diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index 152f0b0102e9..0ab276fe5c2b 100755 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -38,7 +38,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : $(PRJ)$/util$/makefile.pmk # set in minimizer.pmk -#EXTENSIONNAME:=PresentationMinimizer EXTENSION_ZIPNAME:=presentation-minimizer .IF "$(ENABLE_MINIMIZER)" != "YES" diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index 2ca0296b999c..4a560f93ead2 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -132,8 +132,6 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, const Sequence< PropertyValue >& rArguments ) throw( RuntimeException ) { - sal_Int64 nFileSizeSource = 0; - sal_Int64 nFileSizeDest = 0; if ( mxController.is() && ( rURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.SunPresentationMinimizer:" ) == 0 ) ) { @@ -141,6 +139,8 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, { try { + sal_Int64 nFileSizeSource = 0; + sal_Int64 nFileSizeDest = 0; mpOptimizerDialog = new OptimizerDialog( mxMSF, mxFrame, this ); mpOptimizerDialog->execute(); diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx index 9c96fb0e65e2..669132de7cba 100644 --- a/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/sdext/source/minimizer/pppoptimizertoken.cxx @@ -32,9 +32,16 @@ #include "pppoptimizertoken.hxx" #include <osl/mutex.hxx> #include <sal/macros.h> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <string.h> +struct THash +{ + size_t operator()( const char* s ) const + { + return rtl_str_hashCode(s); + } +}; struct TCheck { bool operator()( const char* s1, const char* s2 ) const @@ -42,7 +49,7 @@ struct TCheck return strcmp( s1, s2 ) == 0; } }; -typedef std::hash_map< const char*, PPPOptimizerTokenEnum, std::hash<const char*>, TCheck> TypeNameHashMap; +typedef boost::unordered_map< const char*, PPPOptimizerTokenEnum, THash, TCheck> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 996f2a792387..64c58ed58e74 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -634,7 +634,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& if( pTrailer && pTrailer->m_pDict ) { // search document checksum entry - std::hash_map< rtl::OString, + boost::unordered_map< rtl::OString, pdfparse::PDFEntry*, rtl::OStringHash >::iterator chk; chk = pTrailer->m_pDict->m_aMap.find( "DocChecksum" ); @@ -651,7 +651,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } // search for AdditionalStreams entry - std::hash_map< rtl::OString, + boost::unordered_map< rtl::OString, pdfparse::PDFEntry*, rtl::OStringHash >::iterator add_stream; add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index 50e982557d01..05727eb94f9a 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -39,7 +39,7 @@ #include <com/sun/star/rendering/XColorSpace.hpp> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> // virtual resolution of the PDF OutputDev in dpi #define PDFI_OUTDEV_RESOLUTION 7200 @@ -49,7 +49,7 @@ namespace com { namespace sun { namespace star { namespace task namespace pdfi { - typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap; + typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap; typedef sal_Int32 ImageId; /// What to do with a polygon. values can be ORed together diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index 6dae97c309b7..fe3e911437ee 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -34,7 +34,7 @@ #include <rtl/string.hxx> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace pdfparse { @@ -189,7 +189,7 @@ struct PDFArray : public PDFContainer struct PDFDict : public PDFContainer { - typedef std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash> Map; + typedef boost::unordered_map<rtl::OString,PDFEntry*,rtl::OStringHash> Map; Map m_aMap; PDFDict() {} diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 9a9f8eb90eb0..a763fcb1e079 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -48,7 +48,11 @@ #include <stdio.h> -using namespace rtl; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringHash; +using ::rtl::OStringBuffer; + namespace pdfparse { @@ -486,7 +490,7 @@ void PDFDict::insertValue( const OString& rName, PDFEntry* pValue ) if( ! pValue ) eraseValue( rName ); - std::hash_map<OString,PDFEntry*,OStringHash>::iterator it = m_aMap.find( rName ); + boost::unordered_map<OString,PDFEntry*,OStringHash>::iterator it = m_aMap.find( rName ); if( it == m_aMap.end() ) { // new name/value, pair, append it @@ -580,7 +584,7 @@ unsigned int PDFStream::getDictLength( const PDFContainer* pContainer ) const if( ! m_pDict ) return 0; // find /Length entry, can either be a direct or indirect number object - std::hash_map<OString,PDFEntry*,OStringHash>::const_iterator it = + boost::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it = m_pDict->m_aMap.find( "Length" ); if( it == m_pDict->m_aMap.end() ) return 0; @@ -635,7 +639,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const return false; } // is there a filter entry ? - std::hash_map<OString,PDFEntry*,OStringHash>::const_iterator it = + boost::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it = m_pStream->m_pDict->m_aMap.find( "Filter" ); if( it != m_pStream->m_pDict->m_aMap.end() ) { diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index bf930d21c701..6baf0d953fce 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -38,7 +38,6 @@ #include "pdfparse.hxx" // workaround windows compiler: do not include multi_pass.hpp -//#include <boost/spirit.hpp> #include <boost/spirit/include/classic_core.hpp> #include <boost/spirit/include/classic_utility.hpp> #include <boost/spirit/include/classic_error_handling.hpp> @@ -58,9 +57,11 @@ #endif using namespace boost::spirit; -using namespace rtl; using namespace pdfparse; +using ::rtl::OString; +using ::rtl::OStringBuffer; + class StringEmitContext : public EmitContext { OStringBuffer m_aBuf; diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx index 2059e836bfae..1143d122bb11 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -34,10 +34,10 @@ namespace pdfi { -SaxAttrList::SaxAttrList( const std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& rMap ) +SaxAttrList::SaxAttrList( const boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& rMap ) { m_aAttributes.reserve(rMap.size()); - for( std::hash_map< rtl::OUString, + for( boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rMap.begin(); it != rMap.end(); ++it ) @@ -92,7 +92,7 @@ rtl::OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw( rtl::OUString SAL_CALL SaxAttrList::getValueByName(const ::rtl::OUString& i_rName) throw() { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); + boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : rtl::OUString(); } diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index 5e01ef18896a..6a2279762925 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -31,7 +31,7 @@ #include <rtl/ustring.hxx> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/util/XCloneable.hpp> @@ -53,11 +53,11 @@ namespace pdfi : m_aName( i_rName ), m_aValue( i_rValue ) {} }; std::vector< AttrEntry > m_aAttributes; - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash > m_aIndexMap; + boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > m_aIndexMap; public: SaxAttrList() {} - SaxAttrList( const std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& ); + SaxAttrList( const boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& ); SaxAttrList( const SaxAttrList& ); virtual ~SaxAttrList(); diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 021872d6dd4a..7b1d28d108a3 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -147,7 +147,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi } catch( Exception& ) { - OSL_ASSERT( "OModule::writeComponentInfos: something went wrong while creating the keys!" ); + OSL_FAIL( "OModule::writeComponentInfos: something went wrong while creating the keys!" ); return sal_False; } ++pComponents; diff --git a/sdext/source/pdfimport/test/makefile.mk b/sdext/source/pdfimport/test/makefile.mk index d0b05912d22e..b6f60d52e7fc 100755 --- a/sdext/source/pdfimport/test/makefile.mk +++ b/sdext/source/pdfimport/test/makefile.mk @@ -68,7 +68,6 @@ SHL1STDLIBS=\ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPUNITLIB) \ - $(TESTSHL2LIB) \ $(ZLIB3RDLIB) \ $(CPPULIB) \ $(SALLIB) @@ -102,7 +101,6 @@ APP1STDLIBS=\ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPUNITLIB) \ - $(TESTSHL2LIB) \ $(ZLIB3RDLIB) \ $(CPPULIB) \ $(SALLIB) @@ -131,7 +129,6 @@ APP2STDLIBS=\ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPUNITLIB) \ - $(TESTSHL2LIB) \ $(ZLIB3RDLIB) \ $(CPPULIB) \ $(SALLIB) @@ -162,5 +159,3 @@ APP2STDLIBS=\ @echo ---------------------------------------------------------- testshl2 -forward $(BIN)$/ $(SHL1TARGETN) $(TOUCH) $@ - -#ALLTAR : $(MISC)$/pdfi_unittest_succeeded diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx index e871e36809d2..e14ca69b6381 100644 --- a/sdext/source/pdfimport/test/pdfunzip.cxx +++ b/sdext/source/pdfimport/test/pdfunzip.cxx @@ -39,9 +39,13 @@ #include "pdfparse.hxx" -using namespace rtl; using namespace pdfparse; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringBuffer; +using ::rtl::OStringToOUString; + void printHelp( const char* pExe ) { fprintf( stdout, @@ -307,7 +311,7 @@ int write_addStreams( const char* pInFile, const char* pOutFile, PDFFile* pPDFFi if( pTrailer && pTrailer->m_pDict ) { // search for AdditionalStreams entry - std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator add_stream; + boost::unordered_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator add_stream; add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); if( add_stream != pTrailer->m_pDict->m_aMap.end() ) { @@ -334,7 +338,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF if( ! pDict ) continue; - std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator map_it = + boost::unordered_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator map_it = pDict->m_aMap.find( "Type" ); if( map_it == pDict->m_aMap.end() ) continue; diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 7426974b3cca..7a4b7b5edae7 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -69,7 +69,7 @@ #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace ::pdfparse; @@ -445,11 +445,11 @@ namespace { } - typedef std::hash_map<sal_Int32,FontAttributes> IdToFontMap; - typedef std::hash_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; + typedef boost::unordered_map<sal_Int32,FontAttributes> IdToFontMap; + typedef boost::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; - typedef std::hash_map<sal_Int32,GraphicsContext> IdToGCMap; - typedef std::hash_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap; + typedef boost::unordered_map<sal_Int32,GraphicsContext> IdToGCMap; + typedef boost::unordered_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap; typedef std::vector<GraphicsContext> GraphicsContextStack; diff --git a/sdext/source/pdfimport/tree/imagecontainer.hxx b/sdext/source/pdfimport/tree/imagecontainer.hxx index c22b7ace6034..525c31d570ce 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.hxx +++ b/sdext/source/pdfimport/tree/imagecontainer.hxx @@ -37,7 +37,7 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace pdfi { diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index a42e8704178f..37b090beb163 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -47,7 +47,7 @@ #include <boost/shared_ptr.hpp> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "imagecontainer.hxx" #include "pdfihelper.hxx" @@ -203,11 +203,11 @@ namespace pdfi void setupImage(ImageId nImage); - typedef std::hash_map<sal_Int32,FontAttributes> IdToFontMap; - typedef std::hash_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; + typedef boost::unordered_map<sal_Int32,FontAttributes> IdToFontMap; + typedef boost::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; - typedef std::hash_map<sal_Int32,GraphicsContext> IdToGCMap; - typedef std::hash_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap; + typedef boost::unordered_map<sal_Int32,GraphicsContext> IdToGCMap; + typedef boost::unordered_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap; typedef std::vector<GraphicsContext> GraphicsContextStack; diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx index d2658ad5681b..c4068def4307 100644 --- a/sdext/source/pdfimport/tree/style.cxx +++ b/sdext/source/pdfimport/tree/style.cxx @@ -37,9 +37,11 @@ #include <algorithm> -using namespace rtl; using namespace pdfi; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; + #define USTR(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) StyleContainer::StyleContainer() : @@ -60,7 +62,7 @@ sal_Int32 StyleContainer::impl_getStyleId( const Style& rStyle, bool bSubStyle ) for( unsigned int n = 0; n < rStyle.SubStyles.size(); ++n ) aSearchStyle.SubStyles.push_back( impl_getStyleId( *rStyle.SubStyles[n], true ) ); - std::hash_map< HashedStyle, sal_Int32, StyleHash >::iterator it = + boost::unordered_map< HashedStyle, sal_Int32, StyleHash >::iterator it = m_aStyleToId.find( aSearchStyle ); if( it != m_aStyleToId.end() ) @@ -98,7 +100,7 @@ sal_Int32 StyleContainer::getStandardStyleId( const rtl::OString& rName ) const PropertyMap* StyleContainer::getProperties( sal_Int32 nStyleId ) const { - std::hash_map< sal_Int32, HashedStyle >::const_iterator it = + boost::unordered_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId ); return it != m_aIdToStyle.end() ? &(it->second.Properties) : NULL; } @@ -106,7 +108,7 @@ const PropertyMap* StyleContainer::getProperties( sal_Int32 nStyleId ) const sal_Int32 StyleContainer::setProperties( sal_Int32 nStyleId, const PropertyMap& rNewProps ) { sal_Int32 nRet = -1; - std::hash_map< sal_Int32, HashedStyle >::iterator it = + boost::unordered_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.find( nStyleId ); if( it != m_aIdToStyle.end() ) { @@ -134,7 +136,7 @@ sal_Int32 StyleContainer::setProperties( sal_Int32 nStyleId, const PropertyMap& aSearchStyle.IsSubStyle = it->second.IsSubStyle; // find out whether this new style already exists - std::hash_map< HashedStyle, sal_Int32, StyleHash >::iterator new_it = + boost::unordered_map< HashedStyle, sal_Int32, StyleHash >::iterator new_it = m_aStyleToId.find( aSearchStyle ); if( new_it != m_aStyleToId.end() ) { @@ -160,7 +162,7 @@ OUString StyleContainer::getStyleName( sal_Int32 nStyle ) const { OUStringBuffer aRet( 64 ); - std::hash_map< sal_Int32, HashedStyle >::const_iterator style_it = + boost::unordered_map< sal_Int32, HashedStyle >::const_iterator style_it = m_aIdToStyle.find( nStyle ); if( style_it != m_aIdToStyle.end() ) { @@ -197,7 +199,7 @@ void StyleContainer::impl_emitStyle( sal_Int32 nStyleId, EmitContext& rContext, ElementTreeVisitor& rContainedElemVisitor ) { - std::hash_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId ); + boost::unordered_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId ); if( it != m_aIdToStyle.end() ) { const HashedStyle& rStyle = it->second; @@ -208,7 +210,7 @@ void StyleContainer::impl_emitStyle( sal_Int32 nStyleId, for( unsigned int n = 0; n < rStyle.SubStyles.size(); ++n ) impl_emitStyle( rStyle.SubStyles[n], rContext, rContainedElemVisitor ); - if( rStyle.Contents ) + if( rStyle.Contents.getLength() ) rContext.rEmitter.write( rStyle.Contents ); if( rStyle.ContainedElement ) rStyle.ContainedElement->visitedBy( rContainedElemVisitor, @@ -221,7 +223,7 @@ void StyleContainer::emit( EmitContext& rContext, ElementTreeVisitor& rContainedElemVisitor ) { std::vector< sal_Int32 > aMasterPageSection, aAutomaticStyleSection, aOfficeStyleSection; - for( std::hash_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.begin(); + for( boost::unordered_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.begin(); it != m_aIdToStyle.end(); ++it ) { if( ! it->second.IsSubStyle ) diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx index 8b79bfaa89ce..17ee2e210661 100644 --- a/sdext/source/pdfimport/tree/style.hxx +++ b/sdext/source/pdfimport/tree/style.hxx @@ -30,7 +30,7 @@ #define INCLUDED_PDFI_STYLE_HXX #include "pdfihelper.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <rtl/ustring.hxx> #include <rtl/string.hxx> @@ -133,16 +133,16 @@ namespace pdfi friend struct StyleIdNameSort; struct StyleIdNameSort { - const std::hash_map< sal_Int32, HashedStyle >* m_pMap; + const boost::unordered_map< sal_Int32, HashedStyle >* m_pMap; - StyleIdNameSort( const std::hash_map< sal_Int32, HashedStyle >* pMap ) : + StyleIdNameSort( const boost::unordered_map< sal_Int32, HashedStyle >* pMap ) : m_pMap(pMap) {} bool operator()( sal_Int32 nLeft, sal_Int32 nRight ) { - const std::hash_map< sal_Int32, HashedStyle >::const_iterator left_it = + const boost::unordered_map< sal_Int32, HashedStyle >::const_iterator left_it = m_pMap->find( nLeft ); - const std::hash_map< sal_Int32, HashedStyle >::const_iterator right_it = + const boost::unordered_map< sal_Int32, HashedStyle >::const_iterator right_it = m_pMap->find( nRight ); if( left_it == m_pMap->end() ) return false; @@ -154,8 +154,8 @@ namespace pdfi }; sal_Int32 m_nNextId; - std::hash_map< sal_Int32, HashedStyle > m_aIdToStyle; - std::hash_map< HashedStyle, sal_Int32, StyleHash > m_aStyleToId; + boost::unordered_map< sal_Int32, HashedStyle > m_aIdToStyle; + boost::unordered_map< HashedStyle, sal_Int32, StyleHash > m_aStyleToId; void impl_emitStyle( sal_Int32 nStyleId, EmitContext& rContext, diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 3d761a10d284..393012bbcf64 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -69,7 +69,7 @@ #include <boost/scoped_ptr.hpp> #include <boost/scoped_array.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <string.h> #ifdef WNT #include <stdlib.h> @@ -148,7 +148,7 @@ enum parseKey { class Parser { - typedef std::hash_map< sal_Int64, + typedef boost::unordered_map< sal_Int64, FontAttributes > FontMapType; const uno::Reference<uno::XComponentContext> m_xContext; diff --git a/sdext/source/pdfimport/xpdftest/makefile.mk b/sdext/source/pdfimport/xpdftest/makefile.mk index 9ebd9160fe38..23cc79be17af 100644 --- a/sdext/source/pdfimport/xpdftest/makefile.mk +++ b/sdext/source/pdfimport/xpdftest/makefile.mk @@ -44,8 +44,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : target.mk -#ALLTAR : $(MISC)$/test_0_succeeded $(MISC)$/test_1_succeeded - $(MISC)$/test_0_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_0_out.def text_0_out.def testinput.pdf $(BIN)$/xpdfimport -f $(MISC)$/binary_0_out testinput.pdf > $(MISC)$/text_0_out diff --strip-trailing-cr $(MISC)$/binary_0_out binary_0_out.def diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 829ada5c155d..5868b6be9825 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -658,7 +658,7 @@ void PDFOutDev::updateFont(GfxState *state) Ref* pID = gfxFont->getID(); // TODO(Q3): Portability problem long long fontID = (long long)pID->gen << 32 | (long long)pID->num; - std::hash_map< long long, FontAttributes >::const_iterator it = + boost::unordered_map< long long, FontAttributes >::const_iterator it = m_aFontMap.find( fontID ); if( it == m_aFontMap.end() ) { diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 79c9f1b4d163..5b672068c997 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -58,7 +58,7 @@ #pragma warning(pop) #endif -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> class GfxPath; @@ -147,7 +147,7 @@ namespace pdfi { // not owned by this class PDFDoc* m_pDoc; - mutable std::hash_map< long long, + mutable boost::unordered_map< long long, FontAttributes > m_aFontMap; UnicodeMap* m_pUtf8Map; diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx index 26011cc08c64..470c5faccbaf 100644 --- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx @@ -30,7 +30,6 @@ ************************************************************************/ #include "pdfioutdev_gpl.hxx" -//#include "SecurityHandler.h" #ifdef WNT # include <io.h> # include <fcntl.h> /*_O_BINARY*/ diff --git a/sdext/source/presenter/PresenterPaneAnimator.cxx b/sdext/source/presenter/PresenterPaneAnimator.cxx index ecf7989bf5b2..f3864045b768 100644 --- a/sdext/source/presenter/PresenterPaneAnimator.cxx +++ b/sdext/source/presenter/PresenterPaneAnimator.cxx @@ -210,7 +210,7 @@ namespace { void CreateSubstitution (const Reference<rendering::XSpriteCanvas>& rxCanvas); void ThawPanes (void); void Restore (void); - ::boost::shared_ptr<PresenterSprite> GetSubstitution (void); + ::boost::shared_ptr<PresenterSprite> GetSubstitution (void) const; css::geometry::RealRectangle2D GetOriginalBoundingBox (void) const; css::geometry::RealRectangle2D GetCurrentBoundingBox (void) const; void MovePanes ( @@ -1133,8 +1133,7 @@ void PaneGroup::Restore (void) - -::boost::shared_ptr<PresenterSprite> PaneGroup::GetSubstitution (void) +::boost::shared_ptr<PresenterSprite> PaneGroup::GetSubstitution (void) const { return mpSubstitution; } diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index b4b35c8fe666..2c7918e735f8 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ref.hxx> #include <boost/scoped_ptr.hpp> diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index a72df145cb42..6fe1db1886e2 100755 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -138,9 +138,6 @@ COMPONENT_FILES= \ $(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs \ $(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu -#COMPONENT_MERGED_XCU= \ -# $(FIND_XCU)$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu - COMPONENT_BITMAPS= \ $(ZIP1DIR)$/bitmaps$/BorderTop.png \ $(ZIP1DIR)$/bitmaps$/BorderTopLeft.png \ @@ -262,9 +259,6 @@ ZIP1DEPS= \ $(COMPONENT_LIBRARY) \ $(COMPONENT_HELP) -# $(COMPONENT_MERGED_XCU) \ - - LINKNAME:=help XHPLINKSRC:=$(ZIP1DIR)/help @@ -371,7 +365,7 @@ PHONYDESC=.PHONY $(DESCRIPTION) $(PHONYDESC) : $$(@:f) @-$(MKDIRHIER) $(@:d) @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk - $(TYPE) description.tmp | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ + $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ .ELSE ivo: |