From 1cad5e7b131a1896a8dcbd98504bb3ba3e373904 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 23 Jun 2011 00:45:09 +0100 Subject: use OString::equalsL --- sdext/source/pdfimport/pdfparse/pdfentries.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sdext/source') diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 1512fc3803e2..c286b44fe329 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -477,7 +477,7 @@ bool PDFContainer::emitSubElements( EmitContext& rWriteContext ) const if( rWriteContext.m_bDecrypt ) { const PDFName* pName = dynamic_cast(m_aSubElements[i]); - if( pName && pName->m_aName.equals( rtl::OString("Encrypt") ) ) + if (pName && pName->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("Encrypt"))) { i++; continue; @@ -714,7 +714,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const } // is the (first) filter FlateDecode ? - if( pFilter && pFilter->m_aName.equals( "FlateDecode" ) ) + if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode"))) { bIsDeflated = true; } @@ -869,7 +869,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const if( it != pClone->m_pStream->m_pDict->m_aMap.end() ) { PDFName* pFilter = dynamic_cast(it->second); - if( pFilter && pFilter->m_aName.equals( "FlateDecode" ) ) + if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode"))) pClone->m_pStream->m_pDict->eraseValue( "Filter" ); else { @@ -877,7 +877,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const if( pArray && ! pArray->m_aSubElements.empty() ) { pFilter = dynamic_cast(pArray->m_aSubElements.front()); - if( pFilter && pFilter->m_aName.equals( "FlateDecode" ) ) + if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode"))) { delete pFilter; pArray->m_aSubElements.erase( pArray->m_aSubElements.begin() ); -- cgit From 04630d410958cab609c9e4a5c52b1fdbdc98ff65 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 10 Jul 2011 20:21:07 +0200 Subject: hotfix to include localizations of Presenter screen extension --- sdext/source/presenter/makefile.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'sdext/source') diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 3c93866a731b..1a3c052f8095 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -370,6 +370,13 @@ $(DESCRIPTION) $(PHONYDESC) : $$(@:f) @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ +ALLTAR: $(MISC)/../bin/presenter-screen.oxt +# hotfix to missing localizations +.IF "$(WITH_LANG)"!="" + $(COPY) $(ZIP1DIR)_in/merge/org/openoffice/Office/extension/PresenterScreen.xcu $(ZIP1DIR)/registry/data/org/openoffice/Office/extension/ + cd $(ZIP1DIR);zip -r -u ../../bin/presenter-screen.oxt registry/data/org/openoffice/Office/extension/PresenterScreen.xcu +.ENDIF + .ELSE ivo: $(ECHO) -- cgit From 33c4a94bdfd9cbf8ebd61c0320d7cc9a67676200 Mon Sep 17 00:00:00 2001 From: Matus Kukan Date: Sun, 3 Jul 2011 14:04:55 +0200 Subject: Remove component_getImplementationEnvironment --- sdext/source/minimizer/pppoptimizeruno.cxx | 8 -------- sdext/source/pdfimport/services.cxx | 6 ------ sdext/source/presenter/PresenterComponent.cxx | 12 ------------ 3 files changed, 26 deletions(-) (limited to 'sdext/source') diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index b99e4ced8d67..3998ce2d9fb3 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.cxx @@ -44,14 +44,6 @@ using namespace ::com::sun::star::registry; extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) - { - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - - // ------------------------------------------------------------------------- - sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) { if (pRegistryKey) diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 90f9e6eb6aeb..b158e4433500 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -83,12 +83,6 @@ namespace } } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - namespace { typedef Reference< XInterface > (SAL_CALL * ComponentFactory)( const Reference< XComponentContext >& ); diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index f4b109d2d326..d59a5b5dd0b4 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -119,18 +119,6 @@ extern "C" return g_moduleCount.canUnload( &g_moduleCount , pTime ); } - - - - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) - { - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - - - - sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { -- cgit From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 19 Jul 2011 08:54:07 +0100 Subject: poppler 0.17.0 changed its api for no some reason or other --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 +++++++ 2 files changed, 11 insertions(+) (limited to 'sdext/source') diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 5868b6be9825..cf28922d2e7d 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -489,7 +489,11 @@ void PDFOutDev::endPage() printf("endPage\n"); } +#if POPPLER_CHECK_VERSION(0, 17, 0) +void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog) +#else void PDFOutDev::processLink(Link* link, Catalog*) +#endif { assert(link); diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 5b672068c997..2a35fb7faaae 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -65,7 +65,10 @@ class GfxPath; class GfxFont; class PDFDoc; #ifndef SYSTEM_POPPLER +#define POPPLER_CHECK_VERSION(major,minor,micro) (0) typedef GString GooString; +#else +#include #endif namespace pdfi @@ -194,8 +197,12 @@ namespace pdfi // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); + #if POPPLER_CHECK_VERSION(0, 17, 0) + virtual void processLink(AnnotLink *link, Catalog *catalog); + #else //----- link borders virtual void processLink(Link *link, Catalog *catalog); + #endif //----- save/restore graphics state virtual void saveState(GfxState *state); -- cgit