[Libreoffice-commits] .: Branch 'feature/gnumake4' - 189 commits - apache-commons/java apache-commons/prj ct2n/ConvertTextToNumber-1.3.2-no-license.patch ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch ct2n/delzip ct2n/makefile.mk ct2n/prj .gitignore jfreereport/java jfreereport/patches jfreereport/prj languagetool/JLanguageTool-1.0.0.patch languagetool/makefile.mk languagetool/prj migrationanalysis/src mysqlc/prj mysqlc/source nlpsolver/locale nlpsolver/makefile.mk nlpsolver/nlpsolver-0.9.patch nlpsolver/prj reportbuilder/java reportbuilder/prj reportbuilder/registry reportbuilder/util sdext/inc sdext/prj sdext/source swext/mediawiki swext/prj tomcat/makefile.mk tomcat/prj xpdf/prj
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Mon Jun 20 01:03:42 PDT 2011
.gitignore | 18
apache-commons/java/codec/makefile.mk | 7
apache-commons/java/httpclient/makefile.mk | 9
apache-commons/java/lang/makefile.mk | 7
apache-commons/java/logging/makefile.mk | 3
apache-commons/prj/d.lst | 8
ct2n/ConvertTextToNumber-1.3.2-no-license.patch | 16
ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch | 104 ++++
ct2n/delzip | 2
ct2n/makefile.mk | 70 +++
ct2n/prj/build.lst | 3
ct2n/prj/d.lst | 1
jfreereport/java/flute/makefile.mk | 2
jfreereport/java/jfreereport/makefile.mk | 2
jfreereport/java/libbase/makefile.mk | 32 -
jfreereport/java/libfonts/makefile.mk | 24 -
jfreereport/java/libformula/makefile.mk | 2
jfreereport/java/liblayout/makefile.mk | 2
jfreereport/java/libloader/makefile.mk | 26 -
jfreereport/java/librepository/makefile.mk | 26 -
jfreereport/java/libserializer/makefile.mk | 2
jfreereport/java/libxml/makefile.mk | 2
jfreereport/java/sac/makefile.mk | 2
jfreereport/patches/common_build.patch | 28 +
jfreereport/patches/libbase-1.1.6-deprecated.patch | 11
jfreereport/patches/libfonts-1.1.6-deprecated.patch | 11
jfreereport/patches/libloader-1.1.6-deprecated.patch | 11
jfreereport/patches/librepository-1.1.6-deprecated.patch | 11
jfreereport/prj/d.lst | 4
languagetool/JLanguageTool-1.0.0.patch | 137 ++++++
languagetool/makefile.mk | 63 ++
languagetool/prj/build.lst | 3
languagetool/prj/d.lst | 1
migrationanalysis/src/msokill/StdAfx.cpp | 3
migrationanalysis/src/msokill/StdAfx.h | 3
migrationanalysis/src/msokill/makefile.mk | 1
migrationanalysis/src/msokill/msokill.cpp | 2
migrationanalysis/src/wizard/res_defines.h | 3
mysqlc/prj/d.lst | 2
mysqlc/source/description.xml | 6
mysqlc/source/makefile.mk | 21
mysqlc/source/mysqlc.xml | 2
mysqlc/source/mysqlc_connection.cxx | 22 -
mysqlc/source/mysqlc_connection.hxx | 9
mysqlc/source/mysqlc_databasemetadata.cxx | 42 -
mysqlc/source/mysqlc_databasemetadata.hxx | 17
mysqlc/source/mysqlc_driver.cxx | 23 -
mysqlc/source/mysqlc_driver.hxx | 9
mysqlc/source/mysqlc_general.cxx | 15
mysqlc/source/mysqlc_general.hxx | 13
mysqlc/source/mysqlc_preparedstatement.cxx | 17
mysqlc/source/mysqlc_preparedstatement.hxx | 19
mysqlc/source/mysqlc_propertyids.cxx | 9
mysqlc/source/mysqlc_propertyids.hxx | 2
mysqlc/source/mysqlc_resultset.cxx | 19
mysqlc/source/mysqlc_resultset.hxx | 55 --
mysqlc/source/mysqlc_resultsetmetadata.cxx | 6
mysqlc/source/mysqlc_resultsetmetadata.hxx | 20
mysqlc/source/mysqlc_services.cxx | 9
mysqlc/source/mysqlc_statement.cxx | 7
mysqlc/source/mysqlc_statement.hxx | 5
mysqlc/source/mysqlc_subcomponent.hxx | 18
mysqlc/source/mysqlc_types.cxx | 7
mysqlc/source/mysqlc_types.hxx | 7
mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu | 3
nlpsolver/locale/NLPSolverCommon_ast.properties | 22 +
nlpsolver/locale/NLPSolverCommon_ca.properties | 22 +
nlpsolver/locale/NLPSolverCommon_de.properties | 22 +
nlpsolver/locale/NLPSolverCommon_en_GB.properties | 22 +
nlpsolver/locale/NLPSolverCommon_es.properties | 22 +
nlpsolver/locale/NLPSolverCommon_et.properties | 22 +
nlpsolver/locale/NLPSolverCommon_fa.properties | 22 +
nlpsolver/locale/NLPSolverCommon_fi.properties | 22 +
nlpsolver/locale/NLPSolverCommon_fr.properties | 22 +
nlpsolver/locale/NLPSolverCommon_gl.properties | 22 +
nlpsolver/locale/NLPSolverCommon_hu.properties | 22 +
nlpsolver/locale/NLPSolverCommon_it.properties | 22 +
nlpsolver/locale/NLPSolverCommon_ja.properties | 22 +
nlpsolver/locale/NLPSolverCommon_ko.properties | 22 +
nlpsolver/locale/NLPSolverCommon_nb.properties | 22 +
nlpsolver/locale/NLPSolverCommon_nl.properties | 22 +
nlpsolver/locale/NLPSolverCommon_pt_BR.properties | 22 +
nlpsolver/locale/NLPSolverCommon_ro.properties | 22 +
nlpsolver/locale/NLPSolverCommon_ru.properties | 22 +
nlpsolver/locale/NLPSolverCommon_sk.properties | 22 +
nlpsolver/locale/NLPSolverCommon_sl.properties | 24 +
nlpsolver/locale/NLPSolverCommon_tr.properties | 22 +
nlpsolver/locale/NLPSolverCommon_zh_CN.properties | 22 +
nlpsolver/locale/NLPSolverCommon_zh_TW.properties | 22 +
nlpsolver/locale/NLPSolverStatusDialog_ast.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_ca.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_de.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_en_GB.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_es.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_et.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_fa.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_fi.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_fr.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_gl.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_hu.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_is.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_it.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_ja.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_ko.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_nb.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_nl.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_pt_BR.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_ro.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_ru.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_sk.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_sl.properties | 31 +
nlpsolver/locale/NLPSolverStatusDialog_tr.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_zh_CN.properties | 28 +
nlpsolver/locale/NLPSolverStatusDialog_zh_TW.properties | 28 +
nlpsolver/makefile.mk | 68 +++
nlpsolver/nlpsolver-0.9.patch | 62 ++
nlpsolver/prj/build.lst | 3
nlpsolver/prj/d.lst | 1
reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java | 4
reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk | 2
reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java | 1
reportbuilder/java/com/sun/star/report/pentaho/makefile.mk | 2
reportbuilder/java/com/sun/star/report/util/makefile.mk | 2
reportbuilder/prj/d.lst | 14
reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu | 6
reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs | 2
reportbuilder/util/description.xml | 6
reportbuilder/util/makefile.mk | 6
sdext/inc/pch/precompiled_sdext.cxx | 2
sdext/inc/pch/precompiled_sdext.hxx | 2
sdext/prj/build.lst | 2
sdext/prj/d.lst | 23 -
sdext/source/minimizer/configurationaccess.cxx | 6
sdext/source/minimizer/configurationaccess.hxx | 2
sdext/source/minimizer/description.xml | 7
sdext/source/minimizer/fileopendialog.cxx | 5
sdext/source/minimizer/fileopendialog.hxx | 2
sdext/source/minimizer/graphiccollector.cxx | 10
sdext/source/minimizer/graphiccollector.hxx | 3
sdext/source/minimizer/impoptimizer.cxx | 22 -
sdext/source/minimizer/impoptimizer.hxx | 5
sdext/source/minimizer/informationdialog.cxx | 43 +-
sdext/source/minimizer/informationdialog.hxx | 3
sdext/source/minimizer/makefile.mk | 9
sdext/source/minimizer/optimizationstats.cxx | 3
sdext/source/minimizer/optimizationstats.hxx | 3
sdext/source/minimizer/optimizerdialog.cxx | 57 +-
sdext/source/minimizer/optimizerdialog.hxx | 7
sdext/source/minimizer/optimizerdialogcontrols.cxx | 30 -
sdext/source/minimizer/pagecollector.cxx | 12
sdext/source/minimizer/pagecollector.hxx | 3
sdext/source/minimizer/pppoptimizer.cxx | 7
sdext/source/minimizer/pppoptimizer.hxx | 3
sdext/source/minimizer/pppoptimizerdialog.cxx | 21
sdext/source/minimizer/pppoptimizerdialog.hxx | 5
sdext/source/minimizer/pppoptimizertoken.cxx | 17
sdext/source/minimizer/pppoptimizertoken.hxx | 3
sdext/source/minimizer/pppoptimizeruno.cxx | 13
sdext/source/minimizer/unodialog.cxx | 52 --
sdext/source/minimizer/unodialog.hxx | 9
sdext/source/pdfimport/config/description.xml | 7
sdext/source/pdfimport/filterdet.cxx | 59 --
sdext/source/pdfimport/filterdet.hxx | 2
sdext/source/pdfimport/inc/contentsink.hxx | 2
sdext/source/pdfimport/inc/odfemitter.hxx | 3
sdext/source/pdfimport/inc/pdfihelper.hxx | 7
sdext/source/pdfimport/inc/pdfparse.hxx | 9
sdext/source/pdfimport/inc/saxemitter.hxx | 3
sdext/source/pdfimport/inc/treevisitorfactory.hxx | 2
sdext/source/pdfimport/inc/wrapper.hxx | 3
sdext/source/pdfimport/inc/xmlemitter.hxx | 2
sdext/source/pdfimport/makefile.mk | 3
sdext/source/pdfimport/misc/pdfihelper.cxx | 2
sdext/source/pdfimport/misc/pwdinteract.cxx | 3
sdext/source/pdfimport/odf/odfemitter.cxx | 3
sdext/source/pdfimport/pdfiadaptor.cxx | 21
sdext/source/pdfimport/pdfiadaptor.hxx | 3
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 18
sdext/source/pdfimport/pdfparse/pdfparse.cxx | 13
sdext/source/pdfimport/sax/emitcontext.cxx | 7
sdext/source/pdfimport/sax/emitcontext.hxx | 2
sdext/source/pdfimport/sax/saxattrlist.cxx | 8
sdext/source/pdfimport/sax/saxattrlist.hxx | 9
sdext/source/pdfimport/services.cxx | 10
sdext/source/pdfimport/test/makefile.mk | 5
sdext/source/pdfimport/test/outputwrap.hxx | 5
sdext/source/pdfimport/test/pdf2xml.cxx | 3
sdext/source/pdfimport/test/pdfunzip.cxx | 12
sdext/source/pdfimport/test/tests.cxx | 29 -
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 52 --
sdext/source/pdfimport/tree/drawtreevisiting.hxx | 3
sdext/source/pdfimport/tree/genericelements.cxx | 7
sdext/source/pdfimport/tree/genericelements.hxx | 3
sdext/source/pdfimport/tree/imagecontainer.cxx | 7
sdext/source/pdfimport/tree/imagecontainer.hxx | 4
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 11
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 33 -
sdext/source/pdfimport/tree/style.cxx | 25 -
sdext/source/pdfimport/tree/style.hxx | 17
sdext/source/pdfimport/tree/treevisiting.hxx | 3
sdext/source/pdfimport/tree/treevisitorfactory.cxx | 2
sdext/source/pdfimport/tree/writertreevisiting.cxx | 15
sdext/source/pdfimport/tree/writertreevisiting.hxx | 3
sdext/source/pdfimport/wrapper/hash.cxx | 214 ----------
sdext/source/pdfimport/wrapper/makefile.mk | 6
sdext/source/pdfimport/wrapper/wrapper.cxx | 24 -
sdext/source/pdfimport/xpdftest/makefile.mk | 2
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 25 -
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6
sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 7
sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx | 3
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 9
sdext/source/presenter/PresenterAccessibility.cxx | 26 -
sdext/source/presenter/PresenterAccessibility.hxx | 3
sdext/source/presenter/PresenterAnimation.cxx | 3
sdext/source/presenter/PresenterAnimation.hxx | 3
sdext/source/presenter/PresenterAnimator.cxx | 7
sdext/source/presenter/PresenterAnimator.hxx | 3
sdext/source/presenter/PresenterBitmapContainer.cxx | 3
sdext/source/presenter/PresenterBitmapContainer.hxx | 3
sdext/source/presenter/PresenterButton.cxx | 5
sdext/source/presenter/PresenterButton.hxx | 3
sdext/source/presenter/PresenterCanvasHelper.cxx | 3
sdext/source/presenter/PresenterCanvasHelper.hxx | 3
sdext/source/presenter/PresenterClock.cxx | 70 +--
sdext/source/presenter/PresenterClock.hxx | 3
sdext/source/presenter/PresenterComponent.cxx | 7
sdext/source/presenter/PresenterComponent.hxx | 3
sdext/source/presenter/PresenterConfigurationAccess.cxx | 2
sdext/source/presenter/PresenterConfigurationAccess.hxx | 3
sdext/source/presenter/PresenterController.cxx | 8
sdext/source/presenter/PresenterController.hxx | 3
sdext/source/presenter/PresenterCurrentSlideObserver.cxx | 3
sdext/source/presenter/PresenterCurrentSlideObserver.hxx | 7
sdext/source/presenter/PresenterExtensionIdentifier.txx | 2
sdext/source/presenter/PresenterFrameworkObserver.cxx | 3
sdext/source/presenter/PresenterFrameworkObserver.hxx | 3
sdext/source/presenter/PresenterGeometryHelper.cxx | 3
sdext/source/presenter/PresenterGeometryHelper.hxx | 3
sdext/source/presenter/PresenterHelpView.cxx | 4
sdext/source/presenter/PresenterHelpView.hxx | 3
sdext/source/presenter/PresenterHelper.cxx | 23 -
sdext/source/presenter/PresenterHelper.hxx | 3
sdext/source/presenter/PresenterNotesView.cxx | 3
sdext/source/presenter/PresenterNotesView.hxx | 3
sdext/source/presenter/PresenterPaintManager.cxx | 3
sdext/source/presenter/PresenterPaintManager.hxx | 3
sdext/source/presenter/PresenterPane.cxx | 5
sdext/source/presenter/PresenterPane.hxx | 3
sdext/source/presenter/PresenterPaneAnimator.cxx | 8
sdext/source/presenter/PresenterPaneAnimator.hxx | 3
sdext/source/presenter/PresenterPaneBase.cxx | 19
sdext/source/presenter/PresenterPaneBase.hxx | 3
sdext/source/presenter/PresenterPaneBorderManager.cxx | 13
sdext/source/presenter/PresenterPaneBorderManager.hxx | 2
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 15
sdext/source/presenter/PresenterPaneBorderPainter.hxx | 3
sdext/source/presenter/PresenterPaneContainer.cxx | 5
sdext/source/presenter/PresenterPaneContainer.hxx | 3
sdext/source/presenter/PresenterPaneFactory.cxx | 19
sdext/source/presenter/PresenterPaneFactory.hxx | 3
sdext/source/presenter/PresenterProtocolHandler.cxx | 3
sdext/source/presenter/PresenterProtocolHandler.hxx | 5
sdext/source/presenter/PresenterScreen.cxx | 43 +-
sdext/source/presenter/PresenterScreen.hxx | 3
sdext/source/presenter/PresenterScrollBar.cxx | 7
sdext/source/presenter/PresenterScrollBar.hxx | 3
sdext/source/presenter/PresenterSlidePreview.cxx | 12
sdext/source/presenter/PresenterSlidePreview.hxx | 3
sdext/source/presenter/PresenterSlideShowView.cxx | 11
sdext/source/presenter/PresenterSlideShowView.hxx | 3
sdext/source/presenter/PresenterSlideSorter.cxx | 13
sdext/source/presenter/PresenterSlideSorter.hxx | 3
sdext/source/presenter/PresenterSprite.cxx | 3
sdext/source/presenter/PresenterSprite.hxx | 3
sdext/source/presenter/PresenterSpritePane.cxx | 5
sdext/source/presenter/PresenterSpritePane.hxx | 3
sdext/source/presenter/PresenterTextView.cxx | 11
sdext/source/presenter/PresenterTextView.hxx | 3
sdext/source/presenter/PresenterTheme.cxx | 13
sdext/source/presenter/PresenterTheme.hxx | 3
sdext/source/presenter/PresenterTimer.cxx | 5
sdext/source/presenter/PresenterTimer.hxx | 3
sdext/source/presenter/PresenterToolBar.cxx | 21
sdext/source/presenter/PresenterToolBar.hxx | 3
sdext/source/presenter/PresenterUIPainter.cxx | 3
sdext/source/presenter/PresenterUIPainter.hxx | 3
sdext/source/presenter/PresenterViewFactory.cxx | 3
sdext/source/presenter/PresenterViewFactory.hxx | 3
sdext/source/presenter/PresenterWindowManager.cxx | 11
sdext/source/presenter/PresenterWindowManager.hxx | 3
sdext/source/presenter/description.xml | 7
sdext/source/presenter/makefile.mk | 48 --
swext/mediawiki/build.xml | 10
swext/mediawiki/src/description.xml | 5
swext/mediawiki/src/makefile.mk | 18
swext/prj/build.lst | 2
swext/prj/d.lst | 7
tomcat/makefile.mk | 6
tomcat/prj/d.lst | 2
xpdf/prj/d.lst | 10
301 files changed, 2981 insertions(+), 1267 deletions(-)
New commits:
commit 0443d1c2d189004cbd93fee3b5be1206311b4975
Merge: f54a3d9... b4c8f51...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jun 19 12:55:08 2011 +0200
Merge branch 'master' into feature/gnumake4
diff --cc sdext/source/pdfimport/inc/pdfihelper.hxx
index 87c3f21,111ebcc..34646eb
mode 100755,100644..100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
diff --cc sdext/source/pdfimport/test/tests.cxx
index f7236a8,9c5c609..244ddea
mode 100755,100644..100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
diff --cc sdext/source/pdfimport/tree/pdfiprocessor.hxx
index a394a7c,61c8d40..a388ff2
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@@ -49,9 -48,10 +50,9 @@@
#include <boost/shared_ptr.hpp>
#include <list>
- #include <hash_map>
+ #include <boost/unordered_map.hpp>
#include "imagecontainer.hxx"
-#include "pdfihelper.hxx"
#include "contentsink.hxx"
#include "treevisitorfactory.hxx"
#include "genericelements.hxx"
commit b4c8f512d7cefb6afe747a7a8a681db0e181d907
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 11 00:15:15 2011 +0100
createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index cd2e558..8eb4268 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -88,7 +88,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassi
{
Reference< XComponentContext > xContext( m_rEmitContext.m_xContext, uno::UNO_SET_THROW );
Reference< XMultiComponentFactory > xMSF( xContext->getServiceManager(), uno::UNO_SET_THROW );
- Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.i18n.CharacterClassification"), xContext);
+ Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification")), xContext);
mxCharClass = uno::Reference< i18n::XCharacterClassification >( xInterface, uno::UNO_QUERY );
}
return mxCharClass;
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 217e26a..47f0def 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -1055,7 +1055,7 @@ rtl::OUString PDFIProcessor::mirrorString( const rtl::OUString& i_rString )
{
m_bMirrorMapperTried = true;
uno::Reference< lang::XMultiComponentFactory > xMSF( m_xContext->getServiceManager(), uno::UNO_SET_THROW );
- uno::Reference < uno::XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.awt.StringMirror"), m_xContext);
+ uno::Reference < uno::XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("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() )
commit f3a2418c42208b76fcab9c88931824d6433379a7
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Mon Jun 13 03:40:24 2011 +0200
silence warnings in jfreereport
don't attempt to copy nonexisting file
don't use deprecated version of function
also get rid of unnecessary path-delimiter escapes in affected makefiles
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
index cdc5015..2c5fc51 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRJ=..$/..
+PRJ=../..
PRJNAME=jfreereport
TARGET=libbase
@@ -33,7 +33,7 @@ TARGET=libbase
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
+.INCLUDE : $(PRJ)/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
@@ -43,7 +43,7 @@ TARFILE_MD5=eeb2c7ddf0d302fba4bfc6e97eac9624
#TARFILE_ROOTDIR=$(TARGET)
TARFILE_IS_FLAT=true
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBBASE_VERSION)-deprecated.patch
CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
@@ -65,27 +65,27 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(L10N_framework)"==""
.INCLUDE : tg_ext.mk
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBBASE_VERSION).jar
+ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBBASE_VERSION).jar
+
+$(PACKAGE_DIR)/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBBASE_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy
-$(PACKAGE_DIR)$/$(TARGET).patch :
- @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
- ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBBASE_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
- $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
-
# XCLASSPATH/CLASSPATH does not work and we only can give lib once. But
# the build.xmls fortunately take *.jar out of lib so we can copy our
# commons-logging.jar here - yes, even in the system-apache commons case.
# Sucks.
-$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)$/commons-logging.jar
+$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)/commons-logging.jar
-$(CLASSDIR)$/commons-logging.jar :
+$(CLASSDIR)/commons-logging.jar :
.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
- $(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging.jar
+ $(COPY) $(SOLARBINDIR)/commons-logging-1.1.1.jar $(CLASSDIR)/commons-logging.jar
.ELSE
- $(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)$/commons-logging.jar
+ $(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)/commons-logging.jar
.ENDIF
-$(CLASSDIR)$/$(TARGET)-$(LIBBASE_VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
- $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBBASE_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBBASE_VERSION).jar
+$(CLASSDIR)/$(TARGET)-$(LIBBASE_VERSION).jar : $(CLASSDIR)/commons-logging.jar $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBBASE_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBBASE_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index 594562d..cffe2a9 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRJ=..$/..
+PRJ=../..
PRJNAME=jfreereport
TARGET=libfonts
@@ -34,7 +34,7 @@ TARGET=libfonts
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
+.INCLUDE : $(PRJ)/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
@@ -42,7 +42,7 @@ TARGET=libfonts
TARFILE_NAME=$(TARGET)-$(LIBFONTS_VERSION)
TARFILE_IS_FLAT=true
TARFILE_MD5=3bdf40c0d199af31923e900d082ca2dd
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBFONTS_VERSION)-deprecated.patch
CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
@@ -63,15 +63,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar
+ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar
-$(PACKAGE_DIR)$/$(TARGET).patch :
- @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
- ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFONTS_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
- $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
-
-$(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
- $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBFONTS_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar
+$(PACKAGE_DIR)/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFONTS_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy
+
+$(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBFONTS_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index 356295b..c0741e3 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRJ=..$/..
+PRJ=../..
PRJNAME=jfreereport
TARGET=libloader
@@ -34,7 +34,7 @@ TARGET=libloader
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
+.INCLUDE : $(PRJ)/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
@@ -42,7 +42,7 @@ TARGET=libloader
TARFILE_NAME=$(TARGET)-$(LIBLOADER_VERSION)
TARFILE_IS_FLAT=true
TARFILE_MD5=97b2d4dba862397f446b217e2b623e71
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBLOADER_VERSION)-deprecated.patch
CONVERTFILES=common_build.xml
.IF "$(L10N_framework)"==""
@@ -64,15 +64,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBLOADER_VERSION).jar
+ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBLOADER_VERSION).jar
+
+$(PACKAGE_DIR)/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBLOADER_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy
+
+$(CLASSDIR)/$(TARGET)-$(LIBLOADER_VERSION).jar : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBLOADER_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBLOADER_VERSION).jar
-$(PACKAGE_DIR)$/$(TARGET).patch :
- @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
- ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBLOADER_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
- $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
-
-$(CLASSDIR)$/$(TARGET)-$(LIBLOADER_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
- $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBLOADER_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBLOADER_VERSION).jar
-
.ENDIF
.ENDIF
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index 38b091e..617572c 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRJ=..$/..
+PRJ=../..
PRJNAME=jfreereport
TARGET=librepository
@@ -34,7 +34,7 @@ TARGET=librepository
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
+.INCLUDE : $(PRJ)/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
@@ -42,7 +42,7 @@ TARGET=librepository
TARFILE_NAME=$(TARGET)-$(LIBREPOSITORY_VERSION)
TARFILE_IS_FLAT=true
TARFILE_MD5=8ce2fcd72becf06c41f7201d15373ed9
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBREPOSITORY_VERSION)-deprecated.patch
CONVERTFILES=common_build.xml
.IF "$(L10N_framework)"==""
@@ -64,15 +64,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar
+ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBREPOSITORY_VERSION).jar
+
+$(PACKAGE_DIR)/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBREPOSITORY_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy
+
+$(CLASSDIR)/$(TARGET)-$(LIBREPOSITORY_VERSION).jar : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBREPOSITORY_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBREPOSITORY_VERSION).jar
-$(PACKAGE_DIR)$/$(TARGET).patch :
- @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
- ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBREPOSITORY_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
- $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
-
-$(CLASSDIR)$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
- $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar
-
.ENDIF
.ENDIF
diff --git a/jfreereport/patches/common_build.patch b/jfreereport/patches/common_build.patch
index 7cdc7f8..2bc5459 100755
--- a/jfreereport/patches/common_build.patch
+++ b/jfreereport/patches/common_build.patch
@@ -39,7 +39,7 @@
<javac destdir="${classes.dir}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
-@@ -1082,27 +1082,32 @@
+@@ -1082,27 +1087,32 @@
duplicate copying of resources from src tree (handled by compile.src_copy
if jar.include.source is set.
====================================================================-->
@@ -92,3 +92,11 @@
<!--=======================================================================
+@@ -1167,7 +1177,6 @@
+ <target name="generate.manifest" depends="init,set-build.id">
+ <delete file="${dist.manifest.file}" />
+ <touch file="${dist.manifest.file}" />
+- <copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" />
+
+ <manifest file="${dist.manifest.file}" mode="update">
+ <attribute name="Implementation-Title" value="${impl.title}" />
diff --git a/jfreereport/patches/libbase-1.1.6-deprecated.patch b/jfreereport/patches/libbase-1.1.6-deprecated.patch
new file mode 100644
index 0000000..da28c30
--- /dev/null
+++ b/jfreereport/patches/libbase-1.1.6-deprecated.patch
@@ -0,0 +1,11 @@
+--- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2010-04-27 15:58:44.000000000 +0200
++++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2011-06-13 01:28:14.000000000 +0200
+@@ -48,7 +48,7 @@
+ */
+ public ModuleInitializeException(final String s, final Exception e)
+ {
+- super(s, e);
++ super(s, (Throwable) e);
+ }
+
+ /**
diff --git a/jfreereport/patches/libfonts-1.1.6-deprecated.patch b/jfreereport/patches/libfonts-1.1.6-deprecated.patch
new file mode 100644
index 0000000..eb2ab8c
--- /dev/null
+++ b/jfreereport/patches/libfonts-1.1.6-deprecated.patch
@@ -0,0 +1,11 @@
+--- misc/libfonts-1.1.6/source/org/pentaho/reporting/libraries/fonts/FontException.java 2010-04-27 16:09:00.000000000 +0200
++++ misc/build/libfonts-1.1.6/source/org/pentaho/reporting/libraries/fonts/FontException.java 2011-06-13 02:04:51.000000000 +0200
+@@ -39,7 +39,7 @@
+ */
+ public FontException(final String message, final Exception ex)
+ {
+- super(message, ex);
++ super(message, (Throwable) ex);
+ }
+
+ /**
diff --git a/jfreereport/patches/libloader-1.1.6-deprecated.patch b/jfreereport/patches/libloader-1.1.6-deprecated.patch
new file mode 100644
index 0000000..c098906
--- /dev/null
+++ b/jfreereport/patches/libloader-1.1.6-deprecated.patch
@@ -0,0 +1,11 @@
+--- misc/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2010-04-27 16:07:00.000000000 +0200
++++ misc/build/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2011-06-13 02:00:46.000000000 +0200
+@@ -42,7 +42,7 @@
+ */
+ public ResourceException(final String message, final Exception ex)
+ {
+- super(message, ex);
++ super(message, (Throwable) ex);
+ }
+
+ /**
diff --git a/jfreereport/patches/librepository-1.1.6-deprecated.patch b/jfreereport/patches/librepository-1.1.6-deprecated.patch
new file mode 100644
index 0000000..a266efc
--- /dev/null
+++ b/jfreereport/patches/librepository-1.1.6-deprecated.patch
@@ -0,0 +1,11 @@
+--- misc/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/ContentIOException.java 2010-04-27 16:04:50.000000000 +0200
++++ misc/build/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/ContentIOException.java 2011-06-13 01:44:35.000000000 +0200
+@@ -43,7 +43,7 @@
+ */
+ public ContentIOException(final String message, final Exception ex)
+ {
+- super(message, ex);
++ super(message, (Throwable) ex);
+ }
+
+ /**
commit a3e75ff235b3cd41f5887a72cd8c95a37bfbbdb0
Merge: 2aaa7ba... a22d8e9...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jun 6 12:53:09 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit 2aaa7ba2f4c614dab0502cf612381f4341a8375e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 3 13:26:06 2011 +0300
Drop %_EXT% which was always empty
diff --git a/apache-commons/prj/d.lst b/apache-commons/prj/d.lst
index 21f6e01..03eec2a 100644
--- a/apache-commons/prj/d.lst
+++ b/apache-commons/prj/d.lst
@@ -1,5 +1,5 @@
-..\%__SRC%\class\commons-logging-1.1.1-SNAPSHOT.jar %_DEST%\bin%_EXT%\commons-logging-1.1.1.jar
-..\%__SRC%\class\commons-codec-1.3.jar %_DEST%\bin%_EXT%\commons-codec-1.3.jar
-..\%__SRC%\class\commons-httpclient.jar %_DEST%\bin%_EXT%\commons-httpclient-3.1.jar
-..\%__SRC%\class\commons-lang-2.3.jar %_DEST%\bin%_EXT%\commons-lang-2.3.jar
+..\%__SRC%\class\commons-logging-1.1.1-SNAPSHOT.jar %_DEST%\bin\commons-logging-1.1.1.jar
+..\%__SRC%\class\commons-codec-1.3.jar %_DEST%\bin\commons-codec-1.3.jar
+..\%__SRC%\class\commons-httpclient.jar %_DEST%\bin\commons-httpclient-3.1.jar
+..\%__SRC%\class\commons-lang-2.3.jar %_DEST%\bin\commons-lang-2.3.jar
diff --git a/ct2n/prj/d.lst b/ct2n/prj/d.lst
index 7d146c1..bb394d5 100644
--- a/ct2n/prj/d.lst
+++ b/ct2n/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\bin\ConvertTextToNumber*.oxt %_DEST%\bin%_EXT%\*
+..\%__SRC%\bin\ConvertTextToNumber*.oxt %_DEST%\bin\*
diff --git a/jfreereport/prj/d.lst b/jfreereport/prj/d.lst
index 2527cc6..0947079 100644
--- a/jfreereport/prj/d.lst
+++ b/jfreereport/prj/d.lst
@@ -1,2 +1,2 @@
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\version.mk %_DEST%\bin%_EXT%\jfreereport_version.mk
+..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
+..\version.mk %_DEST%\bin\jfreereport_version.mk
diff --git a/languagetool/prj/d.lst b/languagetool/prj/d.lst
index b3c00b3..cdbabc3 100644
--- a/languagetool/prj/d.lst
+++ b/languagetool/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\JLanguageTool*\dist\LanguageTool.oxt %_DEST%\bin%_EXT%\
+..\%__SRC%\misc\build\JLanguageTool*\dist\LanguageTool.oxt %_DEST%\bin\
diff --git a/mysqlc/prj/d.lst b/mysqlc/prj/d.lst
index dc6ba44..a173c35 100644
--- a/mysqlc/prj/d.lst
+++ b/mysqlc/prj/d.lst
@@ -1,4 +1,4 @@
# Extensions
-..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
+..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
diff --git a/nlpsolver/prj/d.lst b/nlpsolver/prj/d.lst
index 0e8c137..5e5215f 100644
--- a/nlpsolver/prj/d.lst
+++ b/nlpsolver/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\nlpsolver-0.9/dist\NLPSolver.oxt %_DEST%\bin%_EXT%\NLPSolver.oxt
+..\%__SRC%\misc\build\nlpsolver-0.9/dist\NLPSolver.oxt %_DEST%\bin\NLPSolver.oxt
diff --git a/reportbuilder/prj/d.lst b/reportbuilder/prj/d.lst
index b9d46b5..9015e97 100644
--- a/reportbuilder/prj/d.lst
+++ b/reportbuilder/prj/d.lst
@@ -1,12 +1,12 @@
# Extensions
-..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
+..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
# License
-mkdir: %_DEST%\bin%_EXT%\reportbuilder
+mkdir: %_DEST%\bin\reportbuilder
-..\license\license_en-US.txt %_DEST%\bin%_EXT%\reportbuilder\license_en-US.txt
-..\license\license_en-US.html %_DEST%\bin%_EXT%\reportbuilder\license_en-US.html
-..\license\readme_en-US.html %_DEST%\bin%_EXT%\reportbuilder\readme_en-US.html
-..\license\readme_en-US.txt %_DEST%\bin%_EXT%\reportbuilder\readme_en-US.txt
-..\license\THIRDPARTYREADMELICENSE.html %_DEST%\bin%_EXT%\reportbuilder\THIRDPARTYREADMELICENSE.html
+..\license\license_en-US.txt %_DEST%\bin\reportbuilder\license_en-US.txt
+..\license\license_en-US.html %_DEST%\bin\reportbuilder\license_en-US.html
+..\license\readme_en-US.html %_DEST%\bin\reportbuilder\readme_en-US.html
+..\license\readme_en-US.txt %_DEST%\bin\reportbuilder\readme_en-US.txt
+..\license\THIRDPARTYREADMELICENSE.html %_DEST%\bin\reportbuilder\THIRDPARTYREADMELICENSE.html
diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst
index fbf4dbf..cd0f725 100644
--- a/sdext/prj/d.lst
+++ b/sdext/prj/d.lst
@@ -1,13 +1,13 @@
-mkdir: %_DEST%\bin%_EXT%\minimizer
-mkdir: %_DEST%\bin%_EXT%\presenter
-mkdir: %_DEST%\bin%_EXT%\pdfimport
-..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\presentation-minimizer.oxt
-..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter-screen.oxt
-..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport.oxt
-..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
-..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
-..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
-..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\presentation-minimizer.oxt
-..\%__SRC%\bin\presentation_minimizer_develop.zip %_DEST%\bin%_EXT%\minimizer\presentation_minimizer_develop.zip
-..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
-..\%__SRC%\bin\presenter-screen_develop.zip %_DEST%\bin%_EXT%\presenter\presenter-screen_develop.zip
+mkdir: %_DEST%\bin\minimizer
+mkdir: %_DEST%\bin\presenter
+mkdir: %_DEST%\bin\pdfimport
+..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin\presentation-minimizer.oxt
+..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin\presenter-screen.oxt
+..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin\pdfimport.oxt
+..\%__SRC%\bin\pdf2xml.* %_DEST%\bin\pdf2xml.*
+..\%__SRC%\bin\pdfunzip.* %_DEST%\bin\pdfunzip.*
+..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin\pdfimport\pdfimport.oxt
+..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin\minimizer\presentation-minimizer.oxt
+..\%__SRC%\bin\presentation_minimizer_develop.zip %_DEST%\bin\minimizer\presentation_minimizer_develop.zip
+..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin\presenter\presenter-screen.oxt
+..\%__SRC%\bin\presenter-screen_develop.zip %_DEST%\bin\presenter\presenter-screen_develop.zip
diff --git a/swext/prj/d.lst b/swext/prj/d.lst
index 0624f50..7f7ff29 100644
--- a/swext/prj/d.lst
+++ b/swext/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\bin%_EXT%\swext
-..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\swext\wiki-publisher.oxt
-..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\wiki-publisher.oxt
-..\%__SRC%\bin\mediawiki_develop.zip %_DEST%\bin%_EXT%\swext\mediawiki_develop.zip
+mkdir: %_DEST%\bin\swext
+..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin\swext\wiki-publisher.oxt
+..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin\wiki-publisher.oxt
+..\%__SRC%\bin\mediawiki_develop.zip %_DEST%\bin\swext\mediawiki_develop.zip
diff --git a/tomcat/prj/d.lst b/tomcat/prj/d.lst
index 825601e..41530ac 100644
--- a/tomcat/prj/d.lst
+++ b/tomcat/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\jakarta-tomcat-5.0.30-src\jakarta-servletapi-5\jsr154\dist\lib\servlet-api.jar %_DEST%\bin%_EXT%\servlet-api.jar
+..\%__SRC%\misc\build\jakarta-tomcat-5.0.30-src\jakarta-servletapi-5\jsr154\dist\lib\servlet-api.jar %_DEST%\bin\servlet-api.jar
diff --git a/xpdf/prj/d.lst b/xpdf/prj/d.lst
index a4fa741..efcb7ea 100644
--- a/xpdf/prj/d.lst
+++ b/xpdf/prj/d.lst
@@ -1,5 +1,5 @@
-mkdir: %_DEST%\inc%_EXT%\xpdf
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\xpdf\*.h
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
+mkdir: %_DEST%\inc\xpdf
+..\%__SRC%\inc\*.h %_DEST%\inc\xpdf\*.h
+..\%__SRC%\lib\lib*.a %_DEST%\lib
+..\%__SRC%\lib\*.lib %_DEST%\lib
+..\%__SRC%\bin\*.dll %_DEST%\bin
commit efe830f7eec097131e9ceda946aa97e3808f5b7e
Merge: 0f9a1a5... 6a4c042...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon May 30 13:12:13 2011 +0200
Merge commit 'libreoffice-3.4.0.2'
commit 6a4c042b8548e028940ba3f312009ef31f7041cb
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 24 19:29:11 2011 +0200
Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)
commit 0f9a1a572fe35f47992f9a2baa54031d8396b459
Merge: ce398bb... 71a8bc6...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue May 24 15:03:17 2011 +0200
Merge remote-tracking branch 'origin/integration/dev300_m106'
commit 5d566f6786666eb19b35e1db1b332fbef4ed74cd
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri May 20 09:22:24 2011 +0200
Removed GNUism in makefile
The --preserve=timestamps is a gnu cp extension, and thus not
available on all our platforms. Replaced by equivalent tar hack.
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
(cherry picked from commit a22d8e9fbecfe6f2febdf4f85892f00e48ad0b79)
Signed-off-by: Andras Timar <timar74 at gmail.com>
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen at gmail.com>
diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk
index ec7a063..a7d0996 100644
--- a/nlpsolver/makefile.mk
+++ b/nlpsolver/makefile.mk
@@ -46,7 +46,7 @@ PATCH_FILES=nlpsolver-0.9.patch
ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
-CONFIGURE_ACTION=cp -rv --preserve=timestamps ../../../../locale src/
+CONFIGURE_ACTION=(cd ../../../../locale && $(GNUTAR) -cf - .) | (cd src/ && $(GNUTAR) xf -)
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
commit ce398bb7b925293652be5e296cfd4266f9526688
Author: Matus Kukan <matus.kukan at gmail.com>
Date: Fri May 20 19:06:49 2011 +0200
replace res/commandimagelist with cmd in extensions
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
index 03b7f17..05fbe0a 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
@@ -257,7 +257,7 @@
</prop>
</node>
- <!-- U will find corresponding icons in default_images/res/commandimagelist. -->
+ <!-- U will find corresponding icons in default_images/cmd. -->
<!-- The name has no .uno: prefix but lc_ or lch_ or sc_ or sch_ -->
<node oor:name=".uno:EditShapeMenu" oor:op="replace">
commit a22d8e9fbecfe6f2febdf4f85892f00e48ad0b79
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri May 20 09:22:24 2011 +0200
Removed GNUism in makefile
The --preserve=timestamps is a gnu cp extension, and thus not
available on all our platforms. Replaced by equivalent tar hack.
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk
index ec7a063..a7d0996 100644
--- a/nlpsolver/makefile.mk
+++ b/nlpsolver/makefile.mk
@@ -46,7 +46,7 @@ PATCH_FILES=nlpsolver-0.9.patch
ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
-CONFIGURE_ACTION=cp -rv --preserve=timestamps ../../../../locale src/
+CONFIGURE_ACTION=(cd ../../../../locale && $(GNUTAR) -cf - .) | (cd src/ && $(GNUTAR) xf -)
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
commit 6619c124d21bfab4cca0c058581fa03af8f67f3b
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri May 20 09:22:24 2011 +0200
Removed GNUism in makefile
The --preserve=timestamps is a gnu cp extension, and thus not
available on all our platforms. Replaced by equivalent tar hack.
diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk
index ec7a063..a7d0996 100644
--- a/nlpsolver/makefile.mk
+++ b/nlpsolver/makefile.mk
@@ -46,7 +46,7 @@ PATCH_FILES=nlpsolver-0.9.patch
ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
-CONFIGURE_ACTION=cp -rv --preserve=timestamps ../../../../locale src/
+CONFIGURE_ACTION=(cd ../../../../locale && $(GNUTAR) -cf - .) | (cd src/ && $(GNUTAR) xf -)
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
commit b956d096a4b787953f5c799d8b5b26a6a77bccf9
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:39:01 2011 +0300
Add the wntgcc directories
diff --git a/.gitignore b/.gitignore
index 788a396..441f779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@
/*/unxlng??.pro
/*/wntmsc???
/*/wntmsc???.pro
+/*/wntgcc?
+/*/wntgcc?.pro
/*/unxmac??.pro
/*/unxmac??
/*/unxios?
commit 95237e0f724eae7d35b83ddfe125388c5090d41e
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:34:03 2011 +0300
Add the unxios and unxand directories
diff --git a/.gitignore b/.gitignore
index de98410..788a396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@
/*/wntmsc???.pro
/*/unxmac??.pro
/*/unxmac??
+/*/unxios?
+/*/unxios?.pro
+/*/unxand?
+/*/unxand?.pro
commit 8a0117299b7ba23efc9eaba537196a63353229da
Author: Christian Dywan <christian.dywan at lanedo.com>
Date: Wed May 18 16:06:05 2011 +0200
Unify Display Grid/ Grid Visible andother menu items
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
index e47219b..03b7f17 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
@@ -385,7 +385,7 @@
</node>
<node oor:name=".uno:SnapLinesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Guides</value>
+ <value xml:lang="en-US">~Snap Lines</value>
</prop>
</node>
<node oor:name=".uno:ObjectResize" oor:op="replace">
commit b71580497320ae41bad9b4a572a1af7e9ec55dcf
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 20:49:44 2011 +0200
Branch libreoffice-3-4-0
This is 'libreoffice-3-4-0' - the stable branch for the 3.4.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch.
If you want to build something cool, unstable, and risky, use master.
commit 58219e347335be9ddcadda7941a857ca6e2b52df
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 19:55:30 2011 +0200
Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1)
commit e711e7d6ada71767cbca782e0b38e4368fcb760e
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 10 20:01:38 2011 +0200
Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5)
commit c56c31e701f7d0e8f321f256b0bd6e12cfd3c8c3
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 20:01:34 2011 +0200
Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4)
commit a3fc894c314b342c2ad748b4271dd103c04de0cf
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Apr 30 07:28:26 2011 -0700
Ignore .gitattributes
diff --git a/.gitignore b/.gitignore
index e9cb034..de98410 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
# backup and temporary files
*~
.*.sw[op]
+.gitattributes
# the build directories
/*/unxlng??
commit 65ffc45d37306dbb48058fb6cec70567d41a9208
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 8 16:54:49 2011 +0200
fix jfreereport build with ant-1.6.5
diff --git a/jfreereport/patches/common_build.patch b/jfreereport/patches/common_build.patch
index 3d5330b..7cdc7f8 100755
--- a/jfreereport/patches/common_build.patch
+++ b/jfreereport/patches/common_build.patch
@@ -1,5 +1,23 @@
--- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100
+++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100
+@@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE
+ <property name="project.revision" value="${Implementation-Version}" description="Sets the version number of the project based on the Implementation-Version found in the manifest file (if one is supplied and nothing is specified in the build.properties)" />
+ <fail message="A project revision number has not been determined!">
+ <condition>
+- <matches string="${project.revision}" pattern="\$\{.*\}" />
++ <contains string="${project.revision}" substring="\$\{" />
+ </condition>
+ </fail>
+
+@@ -270,7 +270,7 @@ TYPICAL TARGET SEQUENCE
+ <property name="impl.title" value="${Implementation-Title}" description="Sets the title of the project based on the Implementation-Title found in the manifest file (if one is supplied and nothing is specified in the build.properties)" />
+ <fail message="A project title has not been determined!">
+ <condition>
+- <matches string="${impl.title}" pattern="\$\{.*\}" />
++ <contains string="${impl.title}" substring="\$\{" />
+ </condition>
+ </fail>
+
@@ -497,7 +497,7 @@
Sets a property build.id to the either "development" or the svn revision
if in release mode
commit 633019c1cac16a3f75fa9a2eda9ba3fbf388909a
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 26 17:09:09 2011 +0200
Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3)
commit d933b2a6f56f450f4b21c3a6a0d083258b3a7d1d
Author: Kayo Hamid <kayo.hamid at gekkolinux.com.br>
Date: Fri Apr 22 23:41:55 2011 -0400
inefficient emptiness check
diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx
index ae1a639..e286737 100644
--- a/sdext/source/minimizer/pagecollector.cxx
+++ b/sdext/source/minimizer/pagecollector.cxx
@@ -96,7 +96,7 @@ void PageCollector::CollectNonCustomShowPages( const com::sun::star::uno::Refere
{
std::vector< Reference< XDrawPage > > vUsedPageList;
PageCollector::CollectCustomShowPages( rxModel, rCustomShowName, vUsedPageList );
- if ( vUsedPageList.size() )
+ if ( !vUsedPageList.empty() )
{
Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW );
Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW );
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 806f24a..217e26a 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -221,7 +221,7 @@ sal_Int32 PDFIProcessor::getFontId( const FontAttributes& rAttr ) const
// line diagnose block - start
void PDFIProcessor::processGlyphLine()
{
- if( m_GlyphsList.size()<1 )
+ if( m_GlyphsList.empty() )
return;
double fPreAvarageSpaceValue= 0.0;
@@ -317,7 +317,7 @@ void PDFIProcessor::processGlyphLine()
ParagraphElement* pPara= NULL ;
FrameElement* pFrame= NULL ;
- if(m_GlyphsList.size()>0)
+ if(!m_GlyphsList.empty())
{
pFrame = m_pElFactory->createFrameElement( m_GlyphsList[0].getCurElement(), getGCId( getTransformGlyphContext( m_GlyphsList[0])) );
pFrame->ZOrder = m_nNextZOrder++;
@@ -401,7 +401,7 @@ void PDFIProcessor::processGlyphLine()
}
- if(m_GlyphsList.size()>1)
+ if(!m_GlyphsList.empty())
processGlyph( 0,
m_GlyphsList[m_GlyphsList.size()-1],
pPara,
commit 3e23fd215251d3efb2699cc294800cdc3c7868bc
Author: Andras Timar <atimar at novell.com>
Date: Sun Apr 24 22:33:24 2011 +0200
add/update NLPSolver translations from Pootle
diff --git a/nlpsolver/locale/NLPSolverCommon_et.properties b/nlpsolver/locale/NLPSolverCommon_et.properties
new file mode 100644
index 0000000..49a4bdf
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverCommon_et.properties
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=Mittenegatiivsete muutujate eeldamine
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=S\u00FClemi suurus
+NLPSolverCommon.Properties.LibrarySize=Teegi suurus
+NLPSolverCommon.Properties.LearningCycles=\u00D5ppimists\u00FCklite arv
+NLPSolverCommon.Properties.GuessVariableRange=Muutujapiiride oletamine
+NLPSolverCommon.Properties.VariableRangeThreshold=Muutujapiiride l\u00E4vi (oletamisel)
+NLPSolverCommon.Properties.UseACRComparator=ACR komparaatori kasutamine (BCH asemel)
+NLPSolverCommon.Properties.UseRandomStartingPoint=Juhusliku alguspunkti kasutamine
+NLPSolverCommon.Properties.StagnationLimit=Seisakuraja
+NLPSolverCommon.Properties.Tolerance=Seisakutolerants
+NLPSolverCommon.Properties.EnhancedSolverStatus=Lahendaja t\u00E4iendatud oleku kuvamine
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE t\u00F5en\u00E4osus)
+NLPSolverCommon.Properties.DEFactor=DE: skaleerimistegur (0-1,2)
+NLPSolverCommon.Properties.DECR=DE: ristumist\u00F5en\u00E4osus (0-1)
+NLPSolverCommon.Properties.PSC1=PS: kognitiivsuskonstant
+NLPSolverCommon.Properties.PSC2=PS: sotsiaalkonstant
+NLPSolverCommon.Properties.PSWeight=PS: ahenemiskoefitsient
+NLPSolverCommon.Properties.PSCL=PS: mutatsioonit\u00F5en\u00E4osus (0-0,005)
diff --git a/nlpsolver/locale/NLPSolverCommon_tr.properties b/nlpsolver/locale/NLPSolverCommon_tr.properties
new file mode 100644
index 0000000..87d2929
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverCommon_tr.properties
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=Negatif olmayan De\u011Fi\u015Fkenleri Varsay
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=Y\u0131\u011F\u0131n\u0131n Boyutu
+NLPSolverCommon.Properties.LibrarySize=K\u00FCt\u00FCphanenin Boyutu
+NLPSolverCommon.Properties.LearningCycles=\u00D6\u011Frenme Evreleri
+NLPSolverCommon.Properties.GuessVariableRange=De\u011Fi\u015Fken \u00D6l\u00E7\u00FCs\u00FC Tahmini
+NLPSolverCommon.Properties.VariableRangeThreshold=De\u011Fi\u015Fken \u00D6l\u00E7\u00FCs\u00FC S\u0131n\u0131r\u0131 (tahmin ediyorken)
+NLPSolverCommon.Properties.UseACRComparator=ACR Kar\u015F\u0131la\u015Ft\u0131r\u0131c\u0131s\u0131n\u0131 kullan (BCH'nin yerine)
+NLPSolverCommon.Properties.UseRandomStartingPoint=Rasgele ba\u015Flama noktas\u0131 kullan
+NLPSolverCommon.Properties.StagnationLimit=Durgunluk S\u0131n\u0131r\u0131
+NLPSolverCommon.Properties.Tolerance=Durgunluk Tolerans\u0131
+NLPSolverCommon.Properties.EnhancedSolverStatus=Geli\u015Ftirilmi\u015F \u00E7\u00F6z\u00FCc\u00FC durumunu g\u00F6ster
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=Arac\u0131 Ge\u00E7i\u015F Oran\u0131 (DE Olas\u0131l\u0131\u011F\u0131)
+NLPSolverCommon.Properties.DEFactor=DE: \u00D6l\u00E7\u00FCleme Fakt\u00F6r\u00FC (0-1.2)
+NLPSolverCommon.Properties.DECR=DE: A\u015Fma Olas\u0131l\u0131\u011F\u0131 (0-1)
+NLPSolverCommon.Properties.PSC1=PS: Bili\u015Fsel Sabit
+NLPSolverCommon.Properties.PSC2=PS: Sosyal Sabit
+NLPSolverCommon.Properties.PSWeight=PS: \u0130n\u015Fa Fakt\u00F6r\u00FC
+NLPSolverCommon.Properties.PSCL=PS: T\u00FCrde\u011Fi\u015Fim Olas\u0131l\u0131\u011F\u0131 (0-0.005)
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_et.properties b/nlpsolver/locale/NLPSolverStatusDialog_et.properties
new file mode 100644
index 0000000..ffc1e7a
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverStatusDialog_et.properties
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=Lahendaja olek
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=Praegune lahendus:
+NLPSolverStatusDialog.Controls.lblIteration=Iteratsioon:
+NLPSolverStatusDialog.Controls.lblStagnation=Seisak:
+NLPSolverStatusDialog.Controls.lblRuntime=T\u00F6\u00F6 kestus:
+NLPSolverStatusDialog.Controls.btnStop=Peata
+NLPSolverStatusDialog.Controls.btnOK=Sobib
+NLPSolverStatusDialog.Controls.btnContinue=J\u00E4tka
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=Saavutati iteratsioonide maksimaalne arv.
+NLPSolverStatusDialog.Message.StopStagnation=Protsess peatati seisaku t\u00F5ttu.
+NLPSolverStatusDialog.Message.StopUser=Kasutaja katkestas protsessi.
+NLPSolverStatusDialog.Message.CurrentIteration=Protsess peatati %d. iteratsioonil %d-st.
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=nanosekundit
+NLPSolverStatusDialog.Time.Microseconds=mikrosekundit
+NLPSolverStatusDialog.Time.Milliseconds=millisekundit
+NLPSolverStatusDialog.Time.Second=sekund
+NLPSolverStatusDialog.Time.Seconds=sekundit
+NLPSolverStatusDialog.Time.Minute=minut
+NLPSolverStatusDialog.Time.Minutes=minutit
+NLPSolverStatusDialog.Time.Hour=tund
+NLPSolverStatusDialog.Time.Hours=tundi
+NLPSolverStatusDialog.Time.Day=p\u00E4ev
+NLPSolverStatusDialog.Time.Days=p\u00E4eva
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_fr.properties b/nlpsolver/locale/NLPSolverStatusDialog_fr.properties
index de6c1a9..bdd7028 100644
--- a/nlpsolver/locale/NLPSolverStatusDialog_fr.properties
+++ b/nlpsolver/locale/NLPSolverStatusDialog_fr.properties
@@ -2,7 +2,7 @@
#Dialog
NLPSolverStatusDialog.Dialog.Caption=\u00C9tat du solveur
#Controls
-NLPSolverStatusDialog.Controls.lblSolution=Solution actuelle :
+NLPSolverStatusDialog.Controls.lblSolution=Solution actuelle :
NLPSolverStatusDialog.Controls.lblIteration=It\u00E9ration :
NLPSolverStatusDialog.Controls.lblStagnation=Stagnation :
NLPSolverStatusDialog.Controls.lblRuntime=Dur\u00E9e d'ex\u00E9cution :
@@ -17,7 +17,7 @@ NLPSolverStatusDialog.Message.CurrentIteration=Processus arr\u00EAt\u00E9 \u00E0
#Time formatting
NLPSolverStatusDialog.Time.Nanoseconds=Nanosecondes
NLPSolverStatusDialog.Time.Microseconds=Microsecondes
-NLPSolverStatusDialog.Time.Milliseconds=Millisecondes
+NLPSolverStatusDialog.Time.Milliseconds=Millisecondes
NLPSolverStatusDialog.Time.Second=Seconde
NLPSolverStatusDialog.Time.Seconds=Secondes
NLPSolverStatusDialog.Time.Minute=Minute
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_tr.properties b/nlpsolver/locale/NLPSolverStatusDialog_tr.properties
new file mode 100644
index 0000000..1570c06
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverStatusDialog_tr.properties
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=\u00C7\u00F6z\u00FCmleyici Durumu
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=Ge\u00E7erli \u00C7\u00F6z\u00FCm:
+NLPSolverStatusDialog.Controls.lblIteration=Tekrarlama:
+NLPSolverStatusDialog.Controls.lblStagnation=Durgunluk:
+NLPSolverStatusDialog.Controls.lblRuntime=\u00C7al\u0131\u015Fma zaman\u0131
+NLPSolverStatusDialog.Controls.btnStop=Dur
+NLPSolverStatusDialog.Controls.btnOK=Tamam
+NLPSolverStatusDialog.Controls.btnContinue=Devam Et
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=En fazla yinelemeye ula\u015F\u0131ld\u0131.
+NLPSolverStatusDialog.Message.StopStagnation=Durgunluk nedeniyle i\u015Flem durduruldu.
+NLPSolverStatusDialog.Message.StopUser=Kullan\u0131c\u0131 m\u00FCdahalesi nedeniyle i\u015Flem durduruldu.
+NLPSolverStatusDialog.Message.CurrentIteration=\u0130\u015Flem %d %d yinelemede durduruldu
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=Nanosaniye
+NLPSolverStatusDialog.Time.Microseconds=Mikrosaniyeler
+NLPSolverStatusDialog.Time.Milliseconds=Milisaniye
+NLPSolverStatusDialog.Time.Second=Saniye
+NLPSolverStatusDialog.Time.Seconds=Saniyeler
+NLPSolverStatusDialog.Time.Minute=Dakika
+NLPSolverStatusDialog.Time.Minutes=Dakika
+NLPSolverStatusDialog.Time.Hour=Saat
+NLPSolverStatusDialog.Time.Hours=Saat
+NLPSolverStatusDialog.Time.Day=G\u00FCn
+NLPSolverStatusDialog.Time.Days=G\u00FCn
commit 71a8bc6207269a0079d83d20fddb9038fb1db389
Merge: 2c5126e... 14551a3...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 22 15:08:10 2011 +0200
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
swext/mediawiki/build.xml
diff --cc swext/mediawiki/build.xml
index 37e2c66,d39331e..94ce827
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@@ -148,23 -149,24 +148,23 @@@
<target name="development-package" depends="jar, init">
<delete file="${dist}/${target}_develop.zip"/>
<zip destfile="${dist}/${target}_develop.zip">
- <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}" includes="description.xml" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes"/>
- <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" excludes="**/ProtocolHandler.xcu,**/Paths.xcu" casesensitive="yes"/>
+ <zipfileset dir="${dist}" includes="${target}.jar" casesensitive="yes" filemode="664" dirmode="775"/>
+ <zipfileset dir="${out}/misc/${target}" includes="description.xml" casesensitive="yes" filemode="664" dirmode="775"/>
+ <zipfileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes" filemode="664" dirmode="775"/>
+ <zipfileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
+ <zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
+ <zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" excludes="**/ProtocolHandler.xcu,**/Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
<!-- FIXME: currently the build xcu files can not be used since the tag containing x-default attribute is thrown away, issue 99378
- <fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
+ <fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
-->
- <fileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
- <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
- <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
- <zipfileset dir="${out}/misc/${target}/help" includes="component.txt" casesensitive="yes" prefix="help"/>
- <zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/>
- <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
- <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
- <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
+ <zipfileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
+ <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl" filemode="664" dirmode="775"/>
+ <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott" filemode="664" dirmode="775"/>
+ <zipfileset dir="${out}/misc/${target}/help" includes="component.txt" casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
+ <zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
+ <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor" filemode="664" dirmode="775"/>
+ <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml" filemode="664" dirmode="775"/>
- <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license" filemode="664" dirmode="775"/>
+ <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license" filemode="664" dirmode="775"/>
</zip>
</target>
commit a841eeba0a002cc237d0814104a518d0c47e8f1a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Apr 20 14:31:20 2011 +0200
Easyhack: Add visibility markup to all component_get* functions
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index 60c8ab3..6ee571b 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
- void SAL_CALL component_getImplementationEnvironment(
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -87,7 +87,7 @@ extern "C"
// -------------------------------------------------------------------------
- void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
OUString aImplName( OUString::createFromAscii( pImplName ) );
void* pRet = 0;
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index eaedf0b..37f90c9 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -83,7 +83,7 @@ namespace
}
}
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -155,7 +155,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi
return sal_True;
}
-extern "C" void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName, void* /*pServiceManager*/, void* /*pRegistryKey*/ )
{
::rtl::OUString sImplementationName( ::rtl::OUString::createFromAscii( pImplementationName ) );
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index b4dc2d9..f2a78c5 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -122,7 +122,7 @@ extern "C"
- void SAL_CALL component_getImplementationEnvironment(
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -140,7 +140,7 @@ extern "C"
- void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries);
commit 2c5126e34e64b1e184a36f950b58e91efd2de5cb
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 19 18:58:46 2011 +0200
Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2)
commit 90de903b28cb1884042be0eae3f8a55458c5bc29
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 12 20:35:51 2011 +0100
duplicate NULLs
diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
index 91f44b7..714d926 100644
--- a/ct2n/prj/build.lst
+++ b/ct2n/prj/build.lst
@@ -1,3 +1,3 @@
-ct2n ct2n : solenv NULL NULL
+ct2n ct2n : solenv NULL
ct2n ct2n usr1 - all ct2n_mkout NULL
ct2n ct2n nmake - all ct2n_ct2n NULL
commit 1855be9ac34a970d0149dd57a384ff1b9eee7909
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Apr 11 17:52:53 2011 +0200
Version 3.3.99.1, tag libreoffice-3.3.99.1 (3.4.0-beta1)
commit 7a07bc72f0642dfa09be29ccc0e4c7970a6ce330
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 8 16:54:49 2011 +0200
fix jfreereport build with ant-1.6.5
diff --git a/jfreereport/patches/common_build.patch b/jfreereport/patches/common_build.patch
index 3d5330b..7cdc7f8 100755
--- a/jfreereport/patches/common_build.patch
+++ b/jfreereport/patches/common_build.patch
@@ -1,5 +1,23 @@
--- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100
+++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100
+@@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE
+ <property name="project.revision" value="${Implementation-Version}" description="Sets the version number of the project based on the Implementation-Version found in the manifest file (if one is supplied and nothing is specified in the build.properties)" />
+ <fail message="A project revision number has not been determined!">
+ <condition>
+- <matches string="${project.revision}" pattern="\$\{.*\}" />
++ <contains string="${project.revision}" substring="\$\{" />
+ </condition>
+ </fail>
+
+@@ -270,7 +270,7 @@ TYPICAL TARGET SEQUENCE
+ <property name="impl.title" value="${Implementation-Title}" description="Sets the title of the project based on the Implementation-Title found in the manifest file (if one is supplied and nothing is specified in the build.properties)" />
+ <fail message="A project title has not been determined!">
+ <condition>
+- <matches string="${impl.title}" pattern="\$\{.*\}" />
++ <contains string="${impl.title}" substring="\$\{" />
+ </condition>
+ </fail>
+
@@ -497,7 +497,7 @@
Sets a property build.id to the either "development" or the svn revision
if in release mode
commit 215f4bf366de8d5f2aedd738d1eb503da036ccc6
Merge: 9b1c95c... 060bbe2...
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Apr 6 19:25:24 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit 060bbe2cb29dbd6731c9e7838434b562e5f6fec6
Merge: 1458e11... c1dd3ce...
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 5 17:34:42 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
commit 9b1c95c059375e624b9c2ac7d60de5d173fe7047
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 1 15:26:09 2011 +0200
LibreOffice-3.5 development started in master
Branch "libreoffice-3-4" has been created. Further changes in master
will be used for LibreOffice-3.5 release.
commit 1458e11ea1f4096464bbfed5155dd8d3909c5e1d
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 1 15:13:14 2011 +0200
Branch libreoffice-3-4
This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases
+ only bug fixes are allowed
+ no approval needed during beta phase (two weeks after branch)
+ 1 approval needed during rc phase and for bugfix releases
+ 2 approvals with different/no affiliation needed for late features
+ regularly merged into master by a selected person when living
Please watch http://wiki.documentfoundation.org/ReleasePlan
and read announces on libreoffice at lists.freedesktop.org
If you want to build something cool, unstable, and risky, use master.
commit 8f256b8efb5b01f48b0ae409473a5201727bc3d1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 31 14:02:31 2011 +0100
fix merge error
diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index c25bd99..0e4d28b 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -51,7 +51,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
index eed5a62..cdc5015 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -51,7 +51,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index a14bc88..594562d 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
index 3cc3453..33ff65f 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index 5aecdf3..356295b 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -51,7 +51,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index afe3a21..38b091e 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -51,7 +51,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
index cabca08..d5ee7cc 100644
--- a/jfreereport/java/libserializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
index 9719703..1ae17a1 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk
index 4dc9b06..899fc25 100644
--- a/jfreereport/java/sac/makefile.mk
+++ b/jfreereport/java/sac/makefile.mk
@@ -60,7 +60,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
commit f8c4e8338833534f515633885485ef2c4f737de6
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Mar 30 20:47:34 2011 +0200
ct2n-build.diff: allow to build the CT2N extension (fate#307906)
diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-license.patch b/ct2n/ConvertTextToNumber-1.3.2-no-license.patch
new file mode 100644
index 0000000..1d8b805
--- /dev/null
+++ b/ct2n/ConvertTextToNumber-1.3.2-no-license.patch
@@ -0,0 +1,16 @@
+diff -purN misc/description.xml misc/build/description.xml
+--- misc/description.xml 2009-02-03 00:07:30.000000000 +0100
++++ misc/build/description.xml 2010-03-05 21:38:48.000000000 +0100
+@@ -5,12 +5,4 @@
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <identifier value="nl.nouenoff.ct2n"/>
+ <version value="1.3.2"/>
+- <!-- <dependencies>
+-
+- </dependencies> -->
+- <registration>
+- <simple-license accept-by="admin" default-license-id="ID0" suppress-on-update="true" >
+- <license-text xlink:href="registration/COPYING" lang="en" license-id="ID0" />
+- </simple-license>
+- </registration>
+ </description>
diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch b/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch
new file mode 100644
index 0000000..e764b55
--- /dev/null
+++ b/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch
@@ -0,0 +1,104 @@
+diff -purN misc/Office/UI/BaseWindowState.xcu misc/build/Office/UI/BaseWindowState.xcu
+--- misc/Office/UI/BaseWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/BaseWindowState.xcu 2010-03-05 21:36:37.000000000 +0100
+@@ -9,6 +9,9 @@
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/BasicIDEWindowState.xcu misc/build/Office/UI/BasicIDEWindowState.xcu
+--- misc/Office/UI/BasicIDEWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/BasicIDEWindowState.xcu 2010-03-05 21:36:46.000000000 +0100
+@@ -9,6 +9,9 @@
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/CalcWindowState.xcu misc/build/Office/UI/CalcWindowState.xcu
+--- misc/Office/UI/CalcWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/CalcWindowState.xcu 2010-03-05 21:36:32.000000000 +0100
+@@ -9,6 +9,9 @@
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/DrawWindowState.xcu misc/build/Office/UI/DrawWindowState.xcu
+--- misc/Office/UI/DrawWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/DrawWindowState.xcu 2010-03-05 21:36:54.000000000 +0100
+@@ -9,6 +9,9 @@
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/ImpressWindowState.xcu misc/build/Office/UI/ImpressWindowState.xcu
+--- misc/Office/UI/ImpressWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/ImpressWindowState.xcu 2010-03-05 21:36:59.000000000 +0100
+@@ -9,6 +9,9 @@
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/MathWindowState.xcu misc/build/Office/UI/MathWindowState.xcu
+--- misc/Office/UI/MathWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/MathWindowState.xcu 2010-03-05 21:37:03.000000000 +0100
+@@ -9,6 +9,9 @@
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/StartModuleWindowState.xcu misc/build/Office/UI/StartModuleWindowState.xcu
+--- misc/Office/UI/StartModuleWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/StartModuleWindowState.xcu 2010-03-05 21:37:09.000000000 +0100
+@@ -9,6 +9,9 @@
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/WriterWindowState.xcu misc/build/Office/UI/WriterWindowState.xcu
+--- misc/Office/UI/WriterWindowState.xcu 2008-02-09 23:26:50.000000000 +0100
++++ misc/build/Office/UI/WriterWindowState.xcu 2010-03-05 21:37:17.000000000 +0100
+@@ -9,6 +9,9 @@
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
diff --git a/ct2n/delzip b/ct2n/delzip
new file mode 100644
index 0000000..00d6fa1
--- /dev/null
+++ b/ct2n/delzip
@@ -0,0 +1,2 @@
+*.orig
+so_*_ct2n
diff --git a/ct2n/makefile.mk b/ct2n/makefile.mk
new file mode 100644
index 0000000..62e7052
--- /dev/null
+++ b/ct2n/makefile.mk
@@ -0,0 +1,70 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.10 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=ct2n
+TARGET=ct2n
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_MD5=451ccf439a36a568653b024534669971
+TARFILE_NAME=ConvertTextToNumber-1.3.2
+TARFILE_ROOTDIR=.
+BUILD_DIR=.
+
+PATCH_FILES=\
+ ConvertTextToNumber-1.3.2-no-license.patch \
+ ConvertTextToNumber-1.3.2-no-visible-by-default.patch
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+CONFIGURE_FLAGS=
+BUILD_ACTION=
+
+ZIP1TARGET=ConvertTextToNumber
+ZIP1EXT=.oxt
+ZIP1FLAGS=-u -r
+ZIP1DIR=$(MISC)/build$/$(TARFILE_ROOTDIR)
+ZIP1LIST= * -x "*.orig" -x "so_*_ct2n"
+ZIP1DEPS=$(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : tg_ext.mk
+.INCLUDE : target.mk
+
+ZIP1TARGET : $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
new file mode 100644
index 0000000..91f44b7
--- /dev/null
+++ b/ct2n/prj/build.lst
@@ -0,0 +1,3 @@
+ct2n ct2n : solenv NULL NULL
+ct2n ct2n usr1 - all ct2n_mkout NULL
+ct2n ct2n nmake - all ct2n_ct2n NULL
diff --git a/ct2n/prj/d.lst b/ct2n/prj/d.lst
new file mode 100644
index 0000000..7d146c1
--- /dev/null
+++ b/ct2n/prj/d.lst
@@ -0,0 +1 @@
+..\%__SRC%\bin\ConvertTextToNumber*.oxt %_DEST%\bin%_EXT%\*
commit 3d0da385c70ca6ef24dafea01d68ce6ec83c8491
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Mar 30 12:32:50 2011 +0200
build-ant-1.6-swext.diff: allow to build MediaWiki ext. with ant 1.6 (i#90830)
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index 916abfb..37e2c66 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -130,10 +130,10 @@
<zip destfile="${dist}/${name}.${ext}">
<fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
<fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
- <file file="${commons-codec-jar}"/>
- <file file="${commons-httpclient-jar}"/>
- <file file="${commons-lang-jar}"/>
- <file file="${commons-logging-jar}"/>
+ <fileset file="${commons-codec-jar}" casesensitive="yes"/>
+ <fileset file="${commons-httpclient-jar}" casesensitive="yes"/>
+ <fileset file="${commons-lang-jar}" casesensitive="yes"/>
+ <fileset file="${commons-logging-jar}" casesensitive="yes"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
<zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>
commit 58f34938277570534753e33ef556c9188dc41b75
Author: Francisco Saito <saito at 4linux.com.br>
Date: Tue Mar 29 21:47:36 2011 +0100
drop bogus executable flag from idl/build/src and config files
diff --git a/tomcat/prj/build.lst b/tomcat/prj/build.lst
old mode 100755
new mode 100644
diff --git a/tomcat/prj/d.lst b/tomcat/prj/d.lst
old mode 100755
new mode 100644
commit e35645947c4a2c5e628b3eb5c8487b9ff6d3078f
Author: Francisco Saito <saito at 4linux.com.br>
Date: Tue Mar 29 21:43:57 2011 +0100
drop bogus executable flag from odf files
diff --git a/sdext/source/pdfimport/test/testinput.odp b/sdext/source/pdfimport/test/testinput.odp
old mode 100755
new mode 100644
commit 717d4d5ce57373525aa16b592fe9f248e3d8f7c2
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 29 17:32:13 2011 +0200
fix build with system jfreereport
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
index 9ba0c02..11501b1 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
@@ -32,12 +32,12 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
-.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
EXTRAJARFILES = $(LIBBASE_JAR) $(LIBFORMULA_JAR)
.ELSE
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
JARFILES += \
libbase-$(LIBBASE_VERSION).jar \
libformula-$(LIBFORMULA_VERSION).jar
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
index d309e1d..1f1aeb5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
@@ -33,13 +33,13 @@ PACKAGE = com$/sun$/star$/report$/pentaho
nodep=true
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
-.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
EXTRAJARFILES += $(FLUTE_JAR) $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR) $(LIBLOADER_JAR) $(SAC_JAR) $(LIBLAYOUT_JAR) $(LIBSERIALIZER_JAR) $(LIBFONTS_JAR) $(LIBFORMULA_JAR) $(LIBREPOSITORY_JAR)
.ELSE
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
JARFILES += \
flute-$(FLUTE_VERSION).jar \
libserializer-$(LIBSERIALIZER_VERSION).jar \
diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk
index 70e290e..6cc9a14 100644
--- a/reportbuilder/java/com/sun/star/report/util/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk
@@ -32,12 +32,12 @@ PACKAGE = com$/sun$/star$/report$/util
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
-.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
EXTRAJARFILES = $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR)
.ELSE
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
JARFILES += \
libbase-$(LIBBASE_VERSION).jar \
libxml-$(LIBXML_VERSION).jar \
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 9dcb8b4..21e30f4 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -38,7 +38,6 @@ EXTENSION_VERSION_BASE=1.2.1
# --- Settings ----------------------------------
.INCLUDE : makefile.pmk
-.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
.IF "$(L10N_framework)"==""
# ------------------------------------------------------------------
@@ -95,6 +94,7 @@ COMPONENT_EXTJARFILES = \
$(EXTENSIONDIR)$/reportbuilderwizard.jar
.IF "$(SYSTEM_JFREEREPORT)" != "YES"
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
COMPONENT_EXTJARFILES += \
$(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar \
$(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar \
commit 972e7a5bea34c8bffc3d87dfb28987659096f698
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 28 11:25:58 2011 +0100
use PartialWeakComponentImplHelperX for overloaded-virtual
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 076a535..d2a742b 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -68,7 +68,7 @@ using ::rtl::OUString;
namespace sdext { namespace presenter {
namespace {
- typedef ::cppu::WeakComponentImplHelper5 <
+ typedef ::cppu::PartialWeakComponentImplHelper5 <
cssa::XAccessible,
cssa::XAccessibleContext,
cssa::XAccessibleComponent,
@@ -112,7 +112,15 @@ public:
void UpdateStateSet (void);
-
+ //----- XComponent ---------------------------------------------------
+
+ virtual void SAL_CALL dispose()throw (cssu::RuntimeException)
+ { WeakComponentImplHelperBase::dispose(); }
+ virtual void SAL_CALL addEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException)
+ { WeakComponentImplHelperBase::addEventListener(xListener); }
+ virtual void SAL_CALL removeEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException)
+ { WeakComponentImplHelperBase::removeEventListener(xListener); }
+
//----- XAccessible -------------------------------------------------------
virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL
@@ -200,9 +208,6 @@ public:
const cssu::Reference<cssa::XAccessibleEventListener>& rxListener)
throw (cssu::RuntimeException);
- using PresenterAccessibleObjectInterfaceBase::addEventListener;
- using PresenterAccessibleObjectInterfaceBase::removeEventListener;
-
//----- XWindowListener ---------------------------------------------------
virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
commit 9c49bc794469eb2c7bd6ff668470b244e621cadc
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Mar 23 19:50:53 2011 +0100
set build depencencies against the new "translations" module
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst
index 2604633..5c621d5 100644
--- a/sdext/prj/build.lst
+++ b/sdext/prj/build.lst
@@ -1,4 +1,4 @@
-dx sdext : L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt xmlhelp NULL
+dx sdext : TRANSLATIONS:translations offuh 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
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index e00d2a4..34e56e5 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,4 +1,4 @@
-swext swext : officecfg L10N:l10n l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL
+swext swext : officecfg TRANSLATIONS:translations 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 55766ef7d528bd66996db1b833816efe13db670b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 25 09:09:41 2011 +0000
two NULLS in build.lst
diff --git a/nlpsolver/prj/build.lst b/nlpsolver/prj/build.lst
index f0bec54..15554e7 100644
--- a/nlpsolver/prj/build.lst
+++ b/nlpsolver/prj/build.lst
@@ -1,3 +1,3 @@
-nlpsolver nlpsolver : javaunohelper unoil jurt NULL NULL
+nlpsolver nlpsolver : javaunohelper unoil jurt NULL
nlpsolver nlpsolver usr1 - all nlpsolver_mkout NULL
nlpsolver nlpsolver nmake - all nlpsolver_nlpsolver NULL
commit 54567b9622b4790700b52dba868945dcc9f9f086
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 23 20:02:01 2011 +0000
hash_map -> unordered_map
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 4665c51..6b11fc7 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -864,7 +864,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const
if( bDeflate && rWriteContext.m_bDeflate )
{
// delete flatedecode filter
- std::hash_map<OString,PDFEntry*,OStringHash>::const_iterator it =
+ boost::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it =
pClone->m_pStream->m_pDict->m_aMap.find( "Filter" );
if( it != pClone->m_pStream->m_pDict->m_aMap.end() )
{
commit 1dc1e72f738e02f6025c0b619ca6947b367f4a26
Merge: ec4883a... dff4613...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Mar 23 16:58:56 2011 +0100
Merge commit 'ooo/DEV300_m103'
Conflicts:
jfreereport/java/flute/makefile.mk
jfreereport/java/libbase/makefile.mk
jfreereport/java/libfonts/makefile.mk
jfreereport/java/libformula/makefile.mk
jfreereport/java/libloader/makefile.mk
jfreereport/java/librepository/makefile.mk
jfreereport/java/libserializer/makefile.mk
jfreereport/java/libxml/makefile.mk
jfreereport/java/sac/makefile.mk
mysqlc/source/mysqlc_connection.cxx
mysqlc/source/mysqlc_connection.hxx
mysqlc/source/mysqlc_databasemetadata.cxx
mysqlc/source/mysqlc_databasemetadata.hxx
mysqlc/source/mysqlc_driver.cxx
mysqlc/source/mysqlc_driver.hxx
mysqlc/source/mysqlc_general.hxx
mysqlc/source/mysqlc_preparedstatement.hxx
mysqlc/source/mysqlc_resultsetmetadata.hxx
mysqlc/source/mysqlc_statement.hxx
sdext/source/minimizer/impoptimizer.cxx
sdext/source/pdfimport/config/description.xml
sdext/source/pdfimport/tree/drawtreevisiting.cxx
sdext/source/presenter/PresenterWindowManager.cxx
swext/prj/build.lst
diff --cc jfreereport/java/flute/makefile.mk
index ffe668c,413b951..c25bd99
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@@ -49,9 -49,9 +49,9 @@@ CONVERTFILES=common_build.xm
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --cc jfreereport/java/libbase/makefile.mk
index 15197e0,bcbe1e6..eed5a62
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@@ -48,9 -49,9 +49,9 @@@ CONVERTFILES=common_build.xm
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --cc jfreereport/java/libfonts/makefile.mk
index cd2ff34,2c7e60e..a14bc88
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@@ -48,9 -48,9 +48,9 @@@ CONVERTFILES=common_build.xm
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --cc jfreereport/java/libformula/makefile.mk
index 28fcf99,195130d..3cc3453
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@@ -50,9 -48,9 +48,9 @@@ CONVERTFILES=common_build.xm
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
diff --cc jfreereport/java/libloader/makefile.mk
index cfb5955,bb1b6f2..5aecdf3
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@@ -48,9 -49,9 +49,9 @@@ CONVERTFILES=common_build.xm
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --cc jfreereport/java/librepository/makefile.mk
index d39daa1,37da075..afe3a21
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@@ -48,9 -49,9 +49,9 @@@ CONVERTFILES=common_build.xm
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --cc jfreereport/java/libserializer/makefile.mk
index 05cf850,170d3fa..cabca08
--- a/jfreereport/java/libserializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@@ -48,9 -48,9 +48,9 @@@ CONVERTFILES=common_build.xm
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --cc jfreereport/java/libxml/makefile.mk
index 17109ee,356d05f..9719703
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@@ -48,9 -48,9 +48,9 @@@ CONVERTFILES=common_build.xm
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --cc jfreereport/java/sac/makefile.mk
index a0dafe9,01d6186..4dc9b06
--- a/jfreereport/java/sac/makefile.mk
+++ b/jfreereport/java/sac/makefile.mk
@@@ -58,9 -58,9 +58,9 @@@ ADDITIONAL_FILES=build.xm
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) all
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --cc reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
index 124b4cd,265ea19..95a6679
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
@@@ -34,8 -34,8 +34,9 @@@ import java.util.HashMap
import java.util.Map;
import org.pentaho.reporting.libraries.resourceloader.ResourceData;
+ import org.pentaho.reporting.libraries.resourceloader.ResourceException;
import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
+import org.pentaho.reporting.libraries.resourceloader.ResourceException;
import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
import org.pentaho.reporting.libraries.resourceloader.ResourceLoader;
import org.pentaho.reporting.libraries.resourceloader.ResourceLoadingException;
diff --cc reportbuilder/util/description.xml
index a44fbdd,454656d..a44fbdd
mode 100755,100644..100644
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
diff --cc reportbuilder/util/makefile.mk
index 55ba88c,8106868..9dcb8b4
mode 100755,100644..100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
diff --cc sdext/source/minimizer/description.xml
index f10e8c2,a4f172d..f10e8c2
mode 100755,100644..100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
diff --cc sdext/source/minimizer/graphiccollector.cxx
index fffa1e8,78dc037..e5061ac
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@@ -71,10 -70,10 +71,10 @@@ const DeviceInfo& GraphicCollector::Get
return aDeviceInfo;
}
- void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, Reference< XGraphic >& rxGraphic, const GraphicSettings& rGraphicSettings, const GraphicCollector::GraphicUser& rUser )
+ void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, const GraphicSettings& rGraphicSettings, const GraphicCollector::GraphicUser& rUser )
{
const rtl::OUString aGraphicURL( rUser.maGraphicURL );
- const rtl::OUString sPackageURL( OUString::createFromAscii( "vnd.sun.star.GraphicObject:" ) );
+ const rtl::OUString sPackageURL( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.GraphicObject:") );
if ( rGraphicSettings.mbEmbedLinkedGraphics || ( !aGraphicURL.getLength() || aGraphicURL.match( sPackageURL, 0 ) ) )
{
diff --cc sdext/source/minimizer/impoptimizer.cxx
index 30edc80,8a3e600..d335216
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@@ -406,69 -409,87 +406,87 @@@ void CompressGraphics( ImpOptimizer& rO
rOptimizer.SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( nProgress ) ) );
rOptimizer.DispatchStatus();
- GraphicSettings aGraphicSettings( rGraphicSettings );
- aGraphicSettings.mbRemoveCropArea = aGraphicIter->mbRemoveCropArea;
-
- Reference< XPropertySet > xNewGraphicPropertySet( aGraphicIter->mxGraphic, UNO_QUERY_THROW );
- awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxMSF, aGraphicIter->mxGraphic ) );
- Reference< XGraphic > xNewGraphic( ImpCompressGraphic( rxMSF, aGraphicIter->mxGraphic, aGraphicIter->maLogicalSize, aGraphicIter->maGraphicCropLogic, aGraphicSettings ) );
- if ( xNewGraphic.is() )
+ if ( aGraphicIter->maUser.size() )
{
- // applying graphic to each user
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list