[Libreoffice-commits] .: Branch 'feature/gnumake4' - 10 commits - mysqlc/prj mysqlc/source reportbuilder/util sdext/prj sdext/source swext/prj
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Thu Jul 21 10:03:54 PDT 2011
mysqlc/prj/build.lst | 2 +-
mysqlc/source/exports.dxp | 1 -
mysqlc/source/makefile.mk | 4 ----
mysqlc/source/mysqlc.map | 1 -
mysqlc/source/mysqlc_services.cxx | 11 -----------
reportbuilder/util/makefile.mk | 4 ----
sdext/prj/build.lst | 2 +-
sdext/source/minimizer/pppoptimizeruno.cxx | 8 --------
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 8 ++++----
sdext/source/pdfimport/services.cxx | 6 ------
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 9 ++++++++-
sdext/source/presenter/PresenterComponent.cxx | 12 ------------
sdext/source/presenter/makefile.mk | 7 +++++++
swext/prj/build.lst | 2 +-
15 files changed, 26 insertions(+), 55 deletions(-)
New commits:
commit 7c5d68ae42b4144a9b844b50f9889be9fbb07e2a
Merge: 0443d1c... 04f358b...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:34:50 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 04f358b2cc68d6a164c5273e88fe82440389758c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 19 08:54:07 2011 +0100
poppler 0.17.0 changed its api for no some reason or other
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index f7741b4..5022dd5 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 3ac0f49..0fd43c5 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 <glib/poppler-features.h>
#endif
namespace pdfi
@@ -193,9 +196,13 @@ namespace pdfi
// Convert between device and user coordinates.
// 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);
commit 27f20412f121d85937ccae81fdb50e8b2e440052
Author: Matus Kukan <matus.kukan at gmail.com>
Date: Sun Jul 3 14:04:55 2011 +0200
Remove component_getImplementationEnvironment
diff --git a/mysqlc/source/exports.dxp b/mysqlc/source/exports.dxp
index 9630d7e..51703a0 100644
--- a/mysqlc/source/exports.dxp
+++ b/mysqlc/source/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
component_writeInfo
component_getFactory
diff --git a/mysqlc/source/mysqlc.map b/mysqlc/source/mysqlc.map
index f4ed78b..7c6d93f 100644
--- a/mysqlc/source/mysqlc.map
+++ b/mysqlc/source/mysqlc.map
@@ -1,6 +1,5 @@
UDK_3_0_0 {
global:
- component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
local:
diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx
index 962dee1..1633dfe 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -110,17 +110,6 @@ struct ProviderRequest
/* }}} */
-/* {{{ component_getImplementationEnvironment -I- */
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char **ppEnvTypeName,
- uno_Environment ** /* ppEnv */
- )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-/* }}} */
-
-
/* {{{ component_writeInfo -I- */
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void * /* pServiceManager */, void * pRegistryKey)
{
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index 6ee571b..b131f15 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 37f90c9..59721ce 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 f2a78c5..a4ecf64 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 )
{
commit 2fdd60dc1782048cefc748f18ea4eed1464f6333
Author: Andras Timar <atimar at suse.com>
Date: Sun Jul 10 20:21:07 2011 +0200
hotfix to include localizations of Presenter screen extension
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 3c93866..1a3c052 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)
commit 56c3aed0ea66036a82a2cd1b17699aeff567e50d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jul 1 15:39:23 2011 +0300
Goodbye to CWS_WORK_STAMP
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
old mode 100755
new mode 100644
index 8ffa8e1..9af646c
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -45,11 +45,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
#---- extension version
EXTENSION_VERSION_BASE=$(MYSQLC_VERSION_MAJOR).$(MYSQLC_VERSION_MINOR).$(MYSQLC_VERSION_MICRO)
-.IF ( "$(CWS_WORK_STAMP)" == "" ) || ( "$(UPDATER)" == "YES" )
EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-.ELSE
- EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP)
-.ENDIF
#---- extension title package name
.IF "$(MYSQLC_STATUS)" == "final"
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 21e30f4..d78cfa6 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -30,11 +30,7 @@ PRJNAME=reportbuilder
TARGET=rpt
EXTENSION_VERSION_BASE=1.2.1
-.IF "$(CWS_WORK_STAMP)" == ""
EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-.ELSE
- EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP)
-.ENDIF
# --- Settings ----------------------------------
.INCLUDE : makefile.pmk
commit 23e14654809917825fbdaf0a5b1547980f544a84
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 23 00:45:09 2011 +0100
use OString::equalsL
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 6b11fc7..3a6611a 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<PDFName*>(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<PDFName*>(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<PDFName*>(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() );
commit 03110df100f802b651e53a542e42b52b15c12689
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon May 30 18:05:18 2011 +0200
ause130: #i117218# change .idl handling to gnu make
diff --git a/mysqlc/prj/build.lst b/mysqlc/prj/build.lst
index 636c487..3cbb4e6 100644
--- a/mysqlc/prj/build.lst
+++ b/mysqlc/prj/build.lst
@@ -1,3 +1,3 @@
-mc mysqlc : solenv MYSQLCPPCONN:mysqlcppconn offuh cppu soltools cppuhelper readlicense_oo NULL
+mc mysqlc : solenv MYSQLCPPCONN:mysqlcppconn offapi cppu soltools cppuhelper readlicense_oo NULL
ch mysqlc usr1 - all mc_mkout NULL
mc mysqlc\source nmake - all mc_source NULL
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst
index 5c621d5..4c1be7a 100644
--- a/sdext/prj/build.lst
+++ b/sdext/prj/build.lst
@@ -1,4 +1,4 @@
-dx sdext : TRANSLATIONS:translations offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt xmlhelp NULL
+dx sdext : TRANSLATIONS:translations offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt xmlhelp NULL
dx sdext usr1 - all sdext_mkout NULL
dx sdext\prj get - all sdext_prj NULL
dx sdext\source\minimizer nmake - all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_inc NULL
commit 14adb425a52c00cc6ce8545642843bd75db2e7b9
Merge: 5f2b058... 8406973...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 17 13:02:08 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit 5f2b058f1e962098b4fac714c5a4423d6a45c0c1
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 01:15:59 2011 +0300
Use DESKTOP and NATIVE where appropriate
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index 34e56e5..0bac744 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,4 +1,4 @@
-swext swext : officecfg TRANSLATIONS:translations l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL
+swext swext : officecfg TRANSLATIONS:translations DESKTOP:l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL
swext swext usr1 - all swext_mkout NULL
swext swext\mediawiki\help nmake - all swext_mwhelp NULL
swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom nmake - all swext_mwschema NULL
commit 8406973362c2bd086f363169abc8d58883fc5ab9
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jun 14 16:53:24 2011 +0200
Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1)
More information about the Libreoffice-commits
mailing list