[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 540 commits - accessibility/source android/Bootstrap android/source avmedia/source basctl/source basegfx/source basic/source bin/check-icon-sizes.py bin/find-duplicated-files.py bin/get-bugzilla-attachments-by-mimetype bridges/Module_bridges.mk canvas/source chart2/Library_chartcontroller.mk chart2/qa chart2/source chart2/uiconfig cli_ure/source comphelper/CppunitTest_comphelper_variadictemplates_test.mk comphelper/Module_comphelper.mk comphelper/qa comphelper/source compilerplugins/clang config_host.mk.in configmgr/CppunitTest_configmgr_unit.mk configmgr/qa configure.ac connectivity/source cppuhelper/source cui/source dbaccess/qa dbaccess/source desktop/CppunitTest_desktop_lib.mk desktop/inc desktop/qa desktop/source desktop/unx distro-configs/LibreOfficeEmscripten.conf download.lst drawinglayer/source editeng/source extensions/source external/apache-commons external/expat external/icu external/libwps filter/Confi guration_filter.mk filter/qa filter/source forms/source formula/source fpicker/source framework/inc framework/source helpcontent2 hwpfilter/source i18npool/inc i18npool/source icon-themes/breeze icon-themes/classic icon-themes/crystal icon-themes/elementary icon-themes/galaxy icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/README icon-themes/sifr icon-themes/tango icon-themes/tango_testing idlc/source idl/inc idl/source include/canvas include/comphelper include/connectivity include/editeng include/filter include/formula include/LibreOfficeKit include/linguistic include/oox include/osl include/sal include/sax include/sfx2 include/svl include/svtools include/svx include/tools include/ucbhelper include/unotools include/vbahelper include/vcl include/xmloff instsetoo_native/util ios/CustomTarget_TiledLibreOffice_app.mk io/source libreofficekit/Library_libreofficekitgtk.mk libreofficekit/qa libreofficekit/source linguistic/inc linguistic/source lotuswordpro/source Makefile.fetch offapi/com officecfg/registry oox/CppunitTest_oox_vba_encryption.mk oox/inc oox/Module_oox.mk oox/qa oox/source opencl/source package/source postprocess/Rdb_services.mk pyuno/source qadevOOo/objdsc qadevOOo/tests readlicense_oo/license registry/source RepositoryExternal.mk sal/osl sal/qa sax/source scaddins/source sccomp/source sc/inc sc/qa sc/source sc/uiconfig sc/util sc/workben sd/CppunitTest_sd_import_tests.mk sdext/source sd/inc sd/qa sd/source sd/uiconfig sfx2/source slideshow/source solenv/bin solenv/gbuild sot/source starmath/inc starmath/source store/source svl/source svtools/source svx/Library_svxcore.mk svx/sdi svx/source swext/Extension_wiki-publisher.mk swext/Jar_mediawiki.mk swext/mediawiki sw/inc sw/qa sw/source sw/uiconfig sysui/desktop toolkit/source tools/qa tools/source ucbhelper/source ucb/source unotools/source vbahelper/source vcl/android vcl/generic vcl/headless vcl/inc vcl/ios vcl/Library_vcl.mk vcl/opengl vcl/osx vcl/quartz vcl/source vcl/test vcl/unx vcl/win vcl/workben wizards/com wizards/source writerfilter/source writerperfect/inc writerperfect/qa writerperfect/source xmloff/inc xmloff/Library_xo.mk xmloff/source xmlsecurity/source
Rene Engelhard
rene at debian.org
Sat Oct 10 09:34:01 PDT 2015
Rebased ref, commits from common ancestor:
commit 34433196114f91af7216fe03823d2d0e920750bd
Author: Rene Engelhard <rene at debian.org>
Date: Sat Oct 10 17:30:27 2015 +0200
add "GODSON64" aka mips64 to the JAVAINTERPRETER 64bit check
Change-Id: I20aa0e6cea6626efb5f507a6dbbfb7e6149029ce
diff --git a/configure.ac b/configure.ac
index dc6def3..fd9c755 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6829,7 +6829,7 @@ if test "$ENABLE_JAVA" != ""; then
JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"`
elif test "$cross_compiling" != "yes"; then
case $CPUNAME in
- AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64)
+ AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64|GODSON64)
if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then
AC_MSG_WARN([You are building 64-bit binaries but the JDK $JAVAINTERPRETER is 32-bit])
AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK])
commit 82cf6c67373290c65523431e845d00c67f08be42
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Oct 10 16:54:43 2015 +0200
also update line panel for axis, related tdf#94933
Change-Id: Ie280fa01dbe25287d01b7f36d152ee55ce5dbe07
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 0cae040..1bb4bfc 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -136,7 +136,10 @@ ChartLinePanel::ChartLinePanel(vcl::Window* pParent,
mbModelValid(true),
maLineColorWrapper(mxModel, getColorToolBoxControl(mpTBColor.get()), "LineColor")
{
- std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE, OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND, OBJECTTYPE_DATA_CURVE, OBJECTTYPE_DATA_AVERAGE_LINE};
+ std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE, OBJECTTYPE_DIAGRAM,
+ OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND, OBJECTTYPE_DATA_CURVE,
+ OBJECTTYPE_DATA_AVERAGE_LINE,
+ OBJECTTYPE_AXIS};
mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
Initialize();
}
commit 3ddad211de9c6a87ccf328ae6bcbd1f6b9e65e6b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Oct 10 16:44:51 2015 +0200
also update line panel for average and trend line, tdf#94933
Change-Id: I7ab991e94005665809ec52b8d4310209eb6ef75b
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index ba756d1..0cae040 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -136,7 +136,7 @@ ChartLinePanel::ChartLinePanel(vcl::Window* pParent,
mbModelValid(true),
maLineColorWrapper(mxModel, getColorToolBoxControl(mpTBColor.get()), "LineColor")
{
- std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE, OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND};
+ std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE, OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND, OBJECTTYPE_DATA_CURVE, OBJECTTYPE_DATA_AVERAGE_LINE};
mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
Initialize();
}
commit 5f73eae61e137b04afa805c8b50713006179a014
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Oct 10 16:21:29 2015 +0200
we need to take the SolarMutex when we change the UI
Change-Id: I6347a1466038afd625cf59ae2ee87cb4e2014aa0
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index ccde794..ba756d1 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -20,6 +20,7 @@
#include <svx/tbcontrl.hxx>
#include <sfx2/sidebar/SidebarToolBox.hxx>
+#include <vcl/svapp.hxx>
#include <com/sun/star/view/XSelectionSupplier.hpp>
@@ -178,6 +179,7 @@ void ChartLinePanel::updateData()
if (!mbUpdate || !mbModelValid)
return;
+ SolarMutexGuard aGuard;
css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel);
if (!xPropSet.is())
return;
commit 14237c1678167da725fee079532c4669264d697f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Oct 10 15:23:05 2015 +0200
use trendline context for trendlines, tdf#94931, tdf#94934
Change-Id: I0cb9cdec33924e560b24744cc78d632025a189fc
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 754bc07..d6674cf 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -336,6 +336,9 @@ OUString ChartController::GetContextName()
case OBJECTTYPE_DIAGRAM:
if (xChartType->getChartType() == "com.sun.star.chart2.PieChartType")
return OUString("ChartElements");
+ case OBJECTTYPE_DATA_CURVE:
+ case OBJECTTYPE_DATA_AVERAGE_LINE:
+ return OUString("Trendline");
default:
break;
}
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index ecfd7d3..d933003 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -1312,6 +1312,7 @@
Chart, ErrorBar, visible ;
Chart, Axis, visible ;
Chart, Grid, visible ;
+ Chart, Trendline, visible ;
</value>
</prop>
<prop oor:name="ImplementationURL" oor:type="xs:string">
commit 3a03ee49e7cced375decefd336294632180414e4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 10 12:52:58 2015 +0100
afl-eventtesting: there is no focused/active window in headless mode
so close all open frames, not just the active one
and send events to the first discovered visible window and not the focus
window
Change-Id: I7339bc6743cd3106ceddea049136796121819eb3
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 79b3c86..a3b436d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1282,23 +1282,32 @@ unsigned int persist_cnt;
//the application post start-up for ui-testing
void Desktop::CloseFrameAndReopen(Reference<XDesktop2> xDesktop)
{
- Reference<css::frame::XFrame> xFrame = xDesktop->getActiveFrame();
- Reference<css::frame::XDispatchProvider> xProvider(xFrame, css::uno::UNO_QUERY);
+ css::uno::Reference<css::container::XIndexAccess> xTaskContainer(
+ xDesktop->getFrames(), css::uno::UNO_QUERY_THROW);
+ sal_Int32 c = xTaskContainer->getCount();
+ for (sal_Int32 i = 0; i < c; ++i)
+ {
+ css::uno::Reference< css::frame::XFrame > xFrame;
+ xTaskContainer->getByIndex(i) >>= xFrame;
+ if (!xFrame.is())
+ continue;
+ Reference<css::frame::XDispatchProvider> xProvider(xFrame, css::uno::UNO_QUERY);
- css::uno::Reference<css::frame::XController > xController = xFrame->getController();
- css::uno::Reference<css::frame::XModel> xModel = xController->getModel();
- css::uno::Reference< css::util::XModifiable > xModifiable(xModel, css::uno::UNO_QUERY);
- xModifiable->setModified(false);
+ css::uno::Reference<css::frame::XController > xController = xFrame->getController();
+ css::uno::Reference<css::frame::XModel> xModel = xController->getModel();
+ css::uno::Reference< css::util::XModifiable > xModifiable(xModel, css::uno::UNO_QUERY);
+ xModifiable->setModified(false);
- css::util::URL aCommand;
- aCommand.Complete = ".uno:CloseDoc";
+ css::util::URL aCommand;
+ aCommand.Complete = ".uno:CloseDoc";
- css::uno::Reference<css::uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
- Reference< css::util::XURLTransformer > xParser = css::util::URLTransformer::create(xContext);
- xParser->parseStrict(aCommand);
+ css::uno::Reference<css::uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
+ Reference< css::util::XURLTransformer > xParser = css::util::URLTransformer::create(xContext);
+ xParser->parseStrict(aCommand);
- css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aCommand, OUString(), 0);
- xDispatch->dispatch(aCommand, css::uno::Sequence< css::beans::PropertyValue >());
+ css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aCommand, OUString(), 0);
+ xDispatch->dispatch(aCommand, css::uno::Sequence< css::beans::PropertyValue >());
+ }
OpenDefault();
}
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index a583307..1d92469 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -347,9 +347,16 @@ namespace
{
bool InjectKeyEvent(SvStream& rStream)
{
- VclPtr<vcl::Window> xWin(Application::GetFocusWindow());
- if (!xWin)
- xWin.reset(Application::GetActiveTopWindow());
+ if (Application::AnyInput())
+ return false;
+
+ VclPtr<vcl::Window> xWin(Application::GetFirstTopLevelWindow());
+ while (xWin)
+ {
+ if (xWin->IsVisible())
+ break;
+ xWin.reset(Application::GetNextTopLevelWindow(xWin));
+ }
if (!xWin)
return false;
commit b78d4c6503ff47177316685aae79cb5eaf55e33a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 10 12:27:32 2015 +0100
valgrind: zero padding bytes
uninitialized memory warnings on --convert-to pdf
of ooo115771-3.doc
Change-Id: I2dac6fe29d23d6e25c2f1d1511886d8b585e498c
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 171d910..ac999a6 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2631,8 +2631,10 @@ GlyphData *GetTTRawGlyphData(TrueTypeFont *ttf, sal_uInt32 glyphID)
if (length > 0) {
const sal_uInt8* srcptr = glyf + ttf->goffsets[glyphID];
- d->ptr = static_cast<sal_uInt8*>(malloc((length + 1) & ~1)); assert(d->ptr != 0);
- memcpy( d->ptr, srcptr, length );
+ const size_t nChunkLen = ((length + 1) & ~1);
+ d->ptr = static_cast<sal_uInt8*>(malloc(nChunkLen)); assert(d->ptr != 0);
+ memcpy(d->ptr, srcptr, length);
+ memset(d->ptr + length, 0, nChunkLen - length);
d->compflag = (GetInt16( srcptr, 0, 1 ) < 0);
} else {
d->ptr = 0;
commit f99743efece35bf1024a833ad0220a723b33256e
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date: Sat Oct 10 00:29:21 2015 -0500
Updated core
Project: help a52136a62f56c0ed327eeaa547098134a4f2fca8
“Selects to” → “Select to”
I think those awkward “selects to [do something]” were actually intended
to be “elects to [do something]”. But I changed those occurrences to
read “[You] Select [in order] to [effect a change in something]” instead.
Change-Id: I4aa6bca614023f0b9a5413208bcdbe113babef4e
diff --git a/helpcontent2 b/helpcontent2
index 5953644..a52136a 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 595364469b3f741b355c4d1193e711aa9063d33e
+Subproject commit a52136a62f56c0ed327eeaa547098134a4f2fca8
commit 2db1e3447298f2b25287ff6ad4c5dda1e675f5e3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Oct 10 01:24:23 2015 +0200
fix gnumeric import
Change-Id: I65e4d4df9b75304096ec51e07f5985023ad3071c
diff --git a/filter/source/config/fragments/filters/calc_Gnumeric.xcu b/filter/source/config/fragments/filters/calc_Gnumeric.xcu
index 4210615..cc350fd 100644
--- a/filter/source/config/fragments/filters/calc_Gnumeric.xcu
+++ b/filter/source/config/fragments/filters/calc_Gnumeric.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="Gnumeric Spreadsheet" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
+ <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"/>
<prop oor:name="UserData"/>
diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx
index 8c84a5d..7273df5 100644
--- a/sc/source/filter/orcus/filterdetect.cxx
+++ b/sc/source/filter/orcus/filterdetect.cxx
@@ -102,7 +102,7 @@ OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue>
}
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_oox_sc_OrcusFormatDetect_get_implementation(::com::sun::star::uno::XComponentContext* ,
+com_sun_star_comp_sc_OrcusFormatDetect_get_implementation(::com::sun::star::uno::XComponentContext* ,
::com::sun::star::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new OrcusFormatDetect());
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index b3fd054..524bd34 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1153,6 +1153,14 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
else
bRet = true;
}
+ else if (aFltName == "Gnumeric Spreadsheet")
+ {
+ ScOrcusFilters* pOrcus = ScFormatFilter::Get().GetOrcusFilters();
+ if (!pOrcus)
+ return false;
+
+ bRet = pOrcus->importGnumeric(aDocument, rMedium);
+ }
else if (aFltName == pFilterAscii)
{
SfxItemSet* pSet = rMedium.GetItemSet();
diff --git a/sc/util/scfilt.component b/sc/util/scfilt.component
index 0df939f..5528935 100644
--- a/sc/util/scfilt.component
+++ b/sc/util/scfilt.component
@@ -28,7 +28,7 @@
constructor="com_sun_star_comp_oox_xls_FormulaParser_get_implementation">
<service name="com.sun.star.sheet.FilterFormulaParser"/>
</implementation>
- <implementation name="com.sun.star.comp.sc.OrcusFormatDetect"
+ <implementation name="com.sun.star.comp.sc.OrcusFilterDetect"
constructor="com_sun_star_comp_sc_OrcusFormatDetect_get_implementation">
<service name="com.sun.star.frame.ExtendedTypeDetection"/>
</implementation>
commit f1e6e9e7ff739993f8a92cf268112f8be9769cbc
Author: Douglas Mencken <dougmencken at gmail.com>
Date: Thu Oct 1 12:06:58 2015 -0400
fix build by moving python-related includes below others
This fixes build errors like "macro (...) passed 2 arguments, but takes just 1"
The reason is a conflict between tolower() etc. as a set of functions from <ios>
and a hacky fix in Python's include pyport.h which tries to undefine tolower()
and then redefine it
Change-Id: I82e5ac19b70912d09d5e3a34c93eddc08cec9260
Reviewed-on: https://gerrit.libreoffice.org/19082
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 9e9274ab..8bd95f5 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -22,8 +22,6 @@
#include <algorithm>
#include <cassert>
-#include "pyuno_impl.hxx"
-
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -45,6 +43,8 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
+#include "pyuno_impl.hxx"
+
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
using com::sun::star::uno::XInterface;
diff --git a/pyuno/source/module/pyuno_struct.cxx b/pyuno/source/module/pyuno_struct.cxx
index b341386..b407426 100644
--- a/pyuno/source/module/pyuno_struct.cxx
+++ b/pyuno/source/module/pyuno_struct.cxx
@@ -22,8 +22,6 @@
#include <algorithm>
#include <cassert>
-#include "pyuno_impl.hxx"
-
#include <rtl/strbuf.hxx>
#include <osl/diagnose.h>
@@ -32,6 +30,8 @@
#include <com/sun/star/beans/XMaterialHolder.hpp>
+#include "pyuno_impl.hxx"
+
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
using com::sun::star::uno::XInterface;
commit e695f173ccd3cd6c01c7191b98bb452fd387eb6d
Author: Albert Thuswaldner <albert.thuswaldner at gmail.com>
Date: Fri Oct 9 19:59:49 2015 +0200
tdf#39468 translated german comments in test.cxx
Change-Id: Ie40fdafe89d2feed45306b50a358a02b077ceb52
Reviewed-on: https://gerrit.libreoffice.org/19287
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx
index f6b32ad..6da55df 100644
--- a/sc/workben/test.cxx
+++ b/sc/workben/test.cxx
@@ -46,7 +46,7 @@
#include <stardiv/one/sheet/scdata.hxx>
#include <stardiv/one/sheet/scattr.hxx>
-//! das muss als Konstante in irgendeine idl-Datei!!!!
+//! this needs be in some IDL file as a constant !!!!
#define TEXTCONTROLCHAR_PARAGRAPH_BREAK 0
class MyFixedText : public FixedText
@@ -194,7 +194,7 @@ MyWindow::MyWindow( vcl::Window *pParent ) :
aCountField.SetValue(1);
aCountButton.SetPosSizePixel( Point(10,40), Size(100,30) );
- aCountButton.SetText("hochzaehlen");
+ aCountButton.SetText("increment");
aTimeText.SetPosSizePixel( Point(10,80), Size(100,20) );
@@ -211,10 +211,10 @@ MyWindow::MyWindow( vcl::Window *pParent ) :
aBlaButton.SetText("Bla");
aTabButton.SetPosSizePixel( Point(10,310), Size(100,30) );
- aTabButton.SetText("Tabellen");
+ aTabButton.SetText("sheets");
aViewButton.SetPosSizePixel( Point(10,360), Size(100,30) );
- aViewButton.SetText("Pfui");
+ aViewButton.SetText("Ugh");
aCountButton.SetClickHdl(LINK(this, MyWindow, CountHdl));
aTextButton.SetClickHdl(LINK(this, MyWindow, TextHdl));
@@ -239,7 +239,7 @@ MyWindow::MyWindow( vcl::Window *pParent ) :
XSpreadsheetDocumentRef lcl_GetDocument()
{
XServiceManagerRef xProv = getGlobalServiceManager();
- OSL_ENSURE( xProv.is(), "Kein ServiceManager!" );
+ OSL_ENSURE( xProv.is(), "no ServiceManager!" );
XServiceRegistryRef xReg = (XServiceRegistry*)xProv->queryInterface(XServiceRegistry::getSmartUik());
if ( !xReg )
@@ -254,8 +254,8 @@ XSpreadsheetDocumentRef lcl_GetDocument()
xSSI->newInstance()->queryInterface( XModelCollection::getSmartUik() );
sal_uInt16 nCount = aCollRef->getCount();
- XSpreadsheetDocumentRef xModel; // Calc-Model
- for (sal_uInt16 nMod=0; nMod<nCount && !xModel; nMod++) // Calc-Doc suchen
+ XSpreadsheetDocumentRef xModel; // calc model
+ for (sal_uInt16 nMod=0; nMod<nCount && !xModel; nMod++) // search calc doc
{
XModelRef aRef = aCollRef->getItemByIndex( nMod );
if ( aRef )
@@ -271,9 +271,9 @@ XSpreadsheetDocumentRef lcl_GetDocument()
XInterfaceRef lcl_GetView()
{
XInterfaceRef xView;
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (xDoc)
- xView = xDoc->getDDELinks(); //! temporaer zum Testen !!!!!!!!!
+ xView = xDoc->getDDELinks(); //! temporary for test !!!!!!!!!
return xView;
}
@@ -322,24 +322,24 @@ void lcl_SetText( const XTextRef& xText )
XParagraphCursorRef xPara = (XParagraphCursor*)
xCursor->queryInterface(XParagraphCursor::getSmartUik());
- if (!xPos.is() || !xControl.is() || !xPara.is()) return; // PropertySet kann fehlen
+ if (!xPos.is() || !xControl.is() || !xPara.is()) return; // PropertySet can be missing
- xText->setText(L"bla fasel");
+ xText->setText(L"bla babbel");
xCursor->gotoEnd(false);
xControl->insertControlCharacter( TEXTCONTROLCHAR_PARAGRAPH_BREAK );
xPos->collapseToEnd();
- xPos->setText(L"s\xFClz"); // zweiter Absatz
+ xPos->setText(L"s\xFClz"); // second paragraph
xCursor->gotoStart(false);
xPara->gotoEndOfParagraph(false);
- xCursor->goLeft(5, true); // letzte 5 Zeichen im 1. Absatz
+ xCursor->goLeft(5, true); // last 5 characters in the first paragraph
if (xProp.is())
xProp->setPropertyValue(L"Bold", UsrAny((sal_Bool)true));
}
void lcl_DoCount()
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (xDoc)
{
XActionLockableRef xLock = (XActionLockable*)
@@ -347,7 +347,7 @@ void lcl_DoCount()
XCalculateRef xCalc = (XCalculate*)
xDoc->queryInterface(XCalculate::getSmartUik());
if (xLock)
- xLock->addActionLock(); // nicht zwischendurch painten
+ xLock->addActionLock(); // don't paint in between
if (xCalc)
xCalc->setAutomaticCalculation(false);
@@ -363,8 +363,7 @@ void lcl_DoCount()
XCellRef xCell = xDoc->getCell(aPos);
if ( xCell )
{
- // Wert der Zelle um 1 hochzaehlen
-
+ // increment value in cell by 1
double fVal = xCell->getValue();
fVal += 1.0;
xCell->setValue( fVal );
@@ -391,7 +390,7 @@ void lcl_GlobalCell()
void lcl_Annotations( FixedText& aTimeText )
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (xDoc)
{
CellAddress aPos;
@@ -455,7 +454,7 @@ void lcl_Annotations( FixedText& aTimeText )
void lcl_Cursor( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (xDoc)
{
XActionLockableRef xLock = (XActionLockable*)
@@ -489,11 +488,11 @@ void lcl_Cursor( FixedText& aTimeText )
xColl = xCC->getRanges();
if ( xColl )
{
- // XText ist drin, wenn's ne einzelne Zelle ist
+ // XText is there, if it's a single cell
xText = (XText*)xColl->queryInterface(XText::getSmartUik());
if ( xText )
{
- xText->setText(L"fasel");
+ xText->setText(L"babbel");
}
}
@@ -559,7 +558,7 @@ void lcl_Cursor( FixedText& aTimeText )
}
}
- // XIndexAccess gibts nur wenn's mehrere sind (??!??!)
+ // XIndexAccess, only if there are several (??! ??!)
XIndexAccessRef xIndex = (XIndexAccess*)
xColl->queryInterface(XIndexAccess::getSmartUik());
if ( xIndex )
@@ -581,7 +580,7 @@ void lcl_Cursor( FixedText& aTimeText )
void lcl_Cells( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (xDoc)
{
long nCount = 0;
@@ -635,7 +634,7 @@ void lcl_Cells( FixedText& aTimeText )
void lcl_Sheet( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -707,7 +706,7 @@ void lcl_Sheet( FixedText& aTimeText )
void lcl_Names( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XNamedRangesRef xNames = xDoc->getNamedRanges();
if (!xNames) return;
@@ -731,7 +730,7 @@ void lcl_Names( FixedText& aTimeText )
void lcl_Sheets( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -742,7 +741,7 @@ void lcl_Sheets( FixedText& aTimeText )
void lcl_Goal( FixedText& aTimeText )
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XGoalSeekRef xGoal = (XGoalSeek*)xDoc->queryInterface(XGoalSeek::getSmartUik());
if (!xGoal) return;
@@ -773,8 +772,8 @@ void lcl_Goal( FixedText& aTimeText )
void lcl_TabOp( FixedText& aTimeText )
{
- // Mehrfachoperation auf Tabelle2
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ // Multiple operations on sheet2
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XCellRangeRef xRange;
@@ -795,7 +794,7 @@ void lcl_TabOp( FixedText& aTimeText )
aFormulaRange.StartRow = 5;
aFormulaRange.EndColumn = 2;
aFormulaRange.EndRow = 6;
- aColumnCell.Sheet = 0; // nicht benutzt
+ aColumnCell.Sheet = 0; // not used
aColumnCell.Column = 0;
aColumnCell.Row = 0;
aRowCell.Sheet = 1; // c5
@@ -822,7 +821,7 @@ void lcl_TabOp( FixedText& aTimeText )
aColumnCell.Sheet = 1; // b16
aColumnCell.Column = 1;
aColumnCell.Row = 15;
- aRowCell.Sheet = 0; // nicht benutzt
+ aRowCell.Sheet = 0; // not used
aRowCell.Column = 0;
aRowCell.Row = 0;
nMode = TABLEOP_COLUMN;
@@ -880,7 +879,7 @@ void lcl_Fill( FixedText& aTimeText )
void lcl_Audi( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -899,7 +898,7 @@ void lcl_Audi( FixedText& aTimeText )
void lcl_Consoli( FixedText& aTimeText )
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XConsolidationRef xCons = (XConsolidation*)xDoc->queryInterface(XConsolidation::getSmartUik());
if (!xCons) return;
@@ -924,12 +923,12 @@ void lcl_Sort( FixedText& aTimeText )
Sequence<SortField> aFields = xDesc->getSortFields();
if (aFields.getLen())
{
- // 1.Feld umkehren
+ // reverse first field
SortField* pAry = aFields.getArray();
if (!pAry) return;
pAry[0].Ascending = !pAry[0].Ascending;
}
- else // neue Sequence, 1. Spalte aufsteigend
+ else // new sequence, 1st column in ascending order
{
aFields = Sequence<SortField>(1);
SortField* pAry = aFields.getArray();
@@ -971,7 +970,7 @@ void lcl_Filter( FixedText& aTimeText )
XFilterableRef xFilter = (XFilterable*)xSelInt->queryInterface(XFilterable::getSmartUik());
if (!xFilter) return;
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
CellRangeAddress aAddress;
aAddress.Sheet = 3;
@@ -988,10 +987,10 @@ void lcl_Filter( FixedText& aTimeText )
XTableFilterDescriptorRef xDesc = xSource->createAdvancedFilter(xFilter);
if (!xDesc)
{
- aTimeText.SetText("kein Filter");
+ aTimeText.SetText("no filter");
return;
}
- aTimeText.SetText("Filter gefunden");
+ aTimeText.SetText("filter found");
xFilter->filter(xDesc);
}
@@ -1034,7 +1033,7 @@ void lcl_Outline( FixedText& aTimeText )
{
static sal_Bool bOutline = false;
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -1066,19 +1065,19 @@ void lcl_Bla( FixedText& aTimeText )
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XActionLockableRef xLock = (XActionLockable*)xDoc->queryInterface(XActionLockable::getSmartUik());
if (!xLock) return;
xLock->addActionLock();
xLock->addActionLock();
- sal_uInt16 nCount = xLock->resetActionLocks(); // sollte 2 sein
+ sal_uInt16 nCount = xLock->resetActionLocks(); // should be 2
String aBla = nCount;
xLock->setActionLocks(nCount);
xLock->removeActionLock();
xLock->removeActionLock();
- aBla += '/'; aBla += xLock->resetActionLocks(); // sollte 0 sein
+ aBla += '/'; aBla += xLock->resetActionLocks(); // should be 0
aTimeText.SetText(aBla);
}
@@ -1140,7 +1139,7 @@ void lcl_CellCursor( FixedText& aTimeText )
void lcl_Notes( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -1156,7 +1155,7 @@ void lcl_Notes( FixedText& aTimeText )
aPos.Column = 0;
aPos.Row = 0;
aPos.Sheet = 0;
- xNotes->addAnnotation( L"neu", aPos );
+ xNotes->addAnnotation( L"new", aPos );
sal_uLong nCount = xNIndex->getCount();
for (sal_uLong i=0; i<nCount; i++)
@@ -1175,7 +1174,7 @@ void lcl_Notes( FixedText& aTimeText )
void lcl_Scenario( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -1231,7 +1230,7 @@ void lcl_Formula( FixedText& aTimeText )
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
CellAddress aPos;
aPos.Sheet = 0;
@@ -1253,7 +1252,7 @@ void lcl_DBRange( FixedText& aTimeText ) // 23
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XDatabaseRangesRef xDBs = xDoc->getDatabaseRanges();
if (!xDBs) return;
@@ -1354,7 +1353,7 @@ void lcl_CellAttrib( FixedText& aTimeText ) // 26
void lcl_Styles( FixedText& aTimeText ) // 27
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XStyleFamiliesRef xFamilies = xDoc->getStyleFamilies();
if (!xFamilies) return;
@@ -1364,7 +1363,7 @@ void lcl_Styles( FixedText& aTimeText ) // 27
long nCount = xFamily->getCount();
aTimeText.SetText(nCount);
- XStyleRef xStyle = xFamily->getStyleByName(L"rot");
+ XStyleRef xStyle = xFamily->getStyleByName(L"red");
if (!xStyle) return;
// XPropertySetRef xProp = (XPropertySet*)xStyle->queryInterface(XPropertySet::getSmartUik());
// if (!xProp) return;
@@ -1382,14 +1381,14 @@ void lcl_Styles( FixedText& aTimeText ) // 27
aAny.setUINT32(0xffff00);
xProp->setPropertyValue(L"BackgroundColor", aAny);
- xFamily->removeStyle( L"rot" );
+ xFamily->removeStyle( L"red" );
}
void lcl_PageStyle( FixedText& aTimeText ) // 28
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XStyleFamiliesRef xFamilies = xDoc->getStyleFamilies();
if (!xFamilies) return;
@@ -1403,7 +1402,7 @@ void lcl_PageStyle( FixedText& aTimeText ) // 28
UsrAny aAny;
aAny = xProp->getPropertyValue(L"RightPageHeaderContent");
- // geht nicht:
+ // does not work:
// if ( !XHeaderFooterContent_getReflection()->equals(*aAny.getReflection()) )
// return;
@@ -1458,7 +1457,7 @@ void lcl_AutoForm( FixedText& aTimeText ) // 29
void lcl_Pivot( FixedText& aTimeText ) // 30
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
@@ -1621,7 +1620,7 @@ IMPL_LINK_NOARG(MyWindow, TextHdl)
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (xDoc)
{
sal_uInt16 nTab = 0;
@@ -1662,7 +1661,7 @@ IMPL_LINK_NOARG(MyWindow, BlaHdl)
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (xDoc)
{
CellAddress aPos;
@@ -1686,7 +1685,7 @@ IMPL_LINK_NOARG(MyWindow, BlaHdl)
if ( xCursor && xType )
{
- // letztes Feld loeschen
+ // delete last field
XIndexAccessRef xIndex = (XIndexAccess*)
xType->queryInterface(XIndexAccess::getSmartUik());
if (xIndex)
@@ -1708,7 +1707,7 @@ IMPL_LINK_NOARG(MyWindow, BlaHdl)
xProp->getPropertyValue(L"URL") ),
CHARSET_SYSTEM );
}
- if ( i+1 == nCount ) // letztes
+ if ( i+1 == nCount ) // last
{
XTextFieldRef xField = (XTextField*)xInt->
queryInterface(XTextField::getSmartUik());
@@ -1733,7 +1732,7 @@ IMPL_LINK_NOARG(MyWindow, TabHdl)
{
String aResult;
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
if (xDoc)
{
XSpreadsheetsRef xSheets = xDoc->getSheets();
@@ -1822,7 +1821,7 @@ void lcl_FillCells(XCellCollectionRef xColl)
IMPL_LINK_NOARG(MyWindow, ViewHdl)
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model
XInterfaceRef xInt = lcl_GetView();
if (!xInt) return 0;
XDocumentViewRef xView = (XDocumentView*)xInt->queryInterface(XDocumentView::getSmartUik());
@@ -1881,12 +1880,12 @@ IMPL_LINK_NOARG(MyWindow, ViewHdl)
XActionLockableRef xLock = (XActionLockable*)
xDoc->queryInterface(XActionLockable::getSmartUik());
if (xLock)
- xLock->addActionLock(); // nicht zwischendurch painten
+ xLock->addActionLock(); // don't paint in between
// lcl_FillCells(xColl);
if (xLock)
- xLock->removeActionLock(); // nicht zwischendurch painten
+ xLock->removeActionLock(); // don't paint in between
XStarCalcViewRef xCalc = (XStarCalcView*)xInt->queryInterface(XStarCalcView::getSmartUik());
if (!xCalc) return 0;
commit a41a4a22f1a7e82ab64f28b71f5ce6acc1c04921
Author: Rene Engelhard <rene at debian.org>
Date: Fri Oct 9 20:58:55 2015 +0200
remove now unneeded apache-commons libs
Change-Id: Ida7a5f5db5bba8d03bf31de760a908cee9a514e4
diff --git a/Makefile.fetch b/Makefile.fetch
index 44d8aad..2a97d99 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -104,9 +104,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
@date >> $(fetch_LOGFILE)
$(foreach item, \
$(call fetch_Optional,ABW,ABW_TARBALL) \
- $(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_CODEC_TARBALL) \
- $(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_HTTPCLIENT_TARBALL) \
- $(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_LANG_TARBALL) \
$(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_LOGGING_TARBALL) \
$(call fetch_Optional,APR,APR_TARBALL) \
$(call fetch_Optional,APR,APR_UTIL_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e0e3a39..c6bfa12 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3640,21 +3640,6 @@ endif
ifneq ($(SYSTEM_APACHE_COMMONS),)
-define gb_Jar__use_commons-codec
-$(call gb_Jar_use_system_jar,$(1),$(COMMONS_CODEC_JAR))
-endef
-gb_ExternalProject__use_commons-codec :=
-
-define gb_Jar__use_commons-httpclient
-$(call gb_Jar_use_system_jar,$(1),$(COMMONS_HTTPCLIENT_JAR))
-endef
-gb_ExternalProject__use_commons-httpclient :=
-
-define gb_Jar__use_commons-lang
-$(call gb_Jar_usadd_linked_libse_system_jar,$(1),$(COMMONS_LANG_JAR))
-endef
-gb_ExternalProject__use_commons-lang :=
-
define gb_Jar__use_commons-logging
$(call gb_Jar_use_system_jar,$(1),$(COMMONS_LOGGING_JAR))
endef
@@ -3667,41 +3652,6 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
commons-logging-$(COMMONS_LOGGING_VERSION) \
))
endif
-$(eval $(call gb_Helper_register_jars,OXT,\
- $(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9,commons-codec-1.6) \
- commons-httpclient-3.1 \
- $(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4) \
-))
-
-define gb_Jar__use_commons-codec
-$(call gb_Jar_use_external_project,$(1),apache_commons_codec)
-$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_codec)\
-$(if $(filter TRUE,$(HAVE_JAVA6)),/dist/commons-codec-1.9.jar,/dist/commons-codec-1.6.jar),\
-$(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9.jar,commons-codec-1.6.jar)\
-)
-endef
-define gb_ExternalProject__use_commons-codec
-$(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec)
-endef
-
-define gb_Jar__use_commons-httpclient
-$(call gb_Jar_use_external_project,$(1),apache_commons_httpclient)
-$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar,commons-httpclient-3.1.jar)
-endef
-define gb_ExternalProject__use_commons-httpclient
-$(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient)
-endef
-
-define gb_Jar__use_commons-lang
-$(call gb_Jar_use_external_project,$(1),apache_commons_lang)
-$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_lang)\
-$(if $(filter TRUE,$(HAVE_JAVA6)),/target/commons-lang3-3.3.1.jar,/dist/commons-lang-2.4.jar),\
-$(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar)\
-)
-endef
-define gb_ExternalProject__use_commons-lang
-$(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang)
-endef
define gb_Jar__use_commons-logging
$(call gb_Jar_use_external_project,$(1),apache_commons_logging)
diff --git a/config_host.mk.in b/config_host.mk.in
index 3d171e1..7789313 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -64,9 +64,6 @@ export CMIS_LIBS=$(gb_SPACE)@CMIS_LIBS@
export COLLADA2GLTF_CFLAGS=$(gb_SPACE)@COLLADA2GLTF_CFLAGS@
export COLLADA2GLTF_LIBS=$(gb_SPACE)@COLLADA2GLTF_LIBS@
export COM=@COM@
-export COMMONS_CODEC_JAR=@COMMONS_CODEC_JAR@
-export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@
-export COMMONS_LANG_JAR=@COMMONS_LANG_JAR@
export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@
export COMMONS_LOGGING_VERSION=@COMMONS_LOGGING_VERSION@
export COMPATH=@COMPATH@
diff --git a/configure.ac b/configure.ac
index 2ced1ed..dc6def3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10829,84 +10829,24 @@ AC_SUBST(LIBSERIALIZER_JAR)
# this has to be here because both the Wiki Publisher and the SRB use
# commons-logging
COMMONS_LOGGING_VERSION=1.2
-if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
+if test "$ENABLE_REPORTBUILDER" = "TRUE"; then
AC_MSG_CHECKING([which Apache commons-* libs to use])
if test "$with_system_apache_commons" = "yes"; then
SYSTEM_APACHE_COMMONS=TRUE
AC_MSG_RESULT([external])
- if test "$ENABLE_MEDIAWIKI" = "TRUE"; then
- if test -z $COMMONS_CODEC_JAR; then
- _commons_codec_path=""
- if test "$HAVE_JAVA6" = "TRUE"; then
- _commons_codec_path="/usr/share/java/commons-codec-1.9.jar"
- else
- _commons_codec_path="/usr/share/java/commons-codec-1.6.jar"
- fi
- AC_CHECK_FILE($_commons_codec_path,
- [ COMMONS_CODEC_JAR=$_commons_codec_path ],
- [
- AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
- [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
- [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
- )
- ]
- )
- else
- AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
- [AC_MSG_ERROR(commons-codec.jar not found.)], [])
- fi
-
- if test -z $COMMONS_LANG_JAR; then
- _commons_lang_path=""
- if test "$HAVE_JAVA6" = "TRUE"; then
- _commons_lang_path="/usr/share/java/commons-lang3-3.3.1-src.tar.gz"
- else
- _commons_lang_path="/usr/share/java/commons-lang-2.4.jar"
- fi
- AC_CHECK_FILE($_commons_lang_path,
- [ COMMONS_LANG_JAR=$commons_lang_path ],
- [
- AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
- [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
- [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
- )
- ]
- )
- else
- AC_CHECK_FILE($COMMONS_LANG_JAR, [],
- [AC_MSG_ERROR(commons-lang.jar not found.)], [])
- fi
-
- if test -z $COMMONS_HTTPCLIENT_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar,
- [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ],
- [
- AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar,
- [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ],
- [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)]
- )
- ]
- )
- else
- AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
- [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
- fi
- fi
- if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
- if test -z $COMMONS_LOGGING_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar,
- [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar ],
- [
- AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
- [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
- [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
- )
- ]
- )
- else
- AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
- [AC_MSG_ERROR(commons-logging.jar not found.)], [])
- fi
+ if test -z $COMMONS_LOGGING_JAR; then
+ AC_CHECK_FILE(/usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar,
+ [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar ],
+ [
+ AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
+ [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
+ [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
+ )
+ ]
+ )
+ else
+ AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
+ [AC_MSG_ERROR(commons-logging.jar not found.)], [])
fi
else
AC_MSG_RESULT([internal])
@@ -10915,9 +10855,6 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
fi
fi
AC_SUBST(SYSTEM_APACHE_COMMONS)
-AC_SUBST(COMMONS_CODEC_JAR)
-AC_SUBST(COMMONS_LANG_JAR)
-AC_SUBST(COMMONS_HTTPCLIENT_JAR)
AC_SUBST(COMMONS_LOGGING_JAR)
AC_SUBST(COMMONS_LOGGING_VERSION)
diff --git a/download.lst b/download.lst
index 6862cbf..c6eca20 100644
--- a/download.lst
+++ b/download.lst
@@ -1,14 +1,5 @@
export ABW_MD5SUM := 7a3815b506d064313ba309617b6f5a0b
export ABW_TARBALL := libabw-0.1.1.tar.bz2
-export APACHE_COMMONS_CODEC_TARBALL := $(if $(filter TRUE,$(HAVE_JAVA6))\
- ,048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip\
- ,2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz\
-)
-export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-export APACHE_COMMONS_LANG_TARBALL := $(if $(filter TRUE,$(HAVE_JAVA6))\
- ,8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz\
- ,625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz\
-)
export APACHE_COMMONS_LOGGING_MD5SUM := ce977548f1cbf46918e93cd38ac35163
export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
export APR_MD5SUM := eff9d741b0999a9bbab96862dd2a2a3d
diff --git a/external/apache-commons/ExternalProject_apache_commons_codec.mk b/external/apache-commons/ExternalProject_apache_commons_codec.mk
deleted file mode 100644
index aedda04..0000000
--- a/external/apache-commons/ExternalProject_apache_commons_codec.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec))
-
-$(eval $(call gb_ExternalProject_register_targets,apache_commons_codec,\
- build \
-))
-
-$(call gb_ExternalProject_get_state_target,apache_commons_codec,build) :
- $(call gb_ExternalProject_run,build,\
- ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
- $(ICECREAM_RUN) "$(ANT)" \
- -q \
- -f build.xml \
- -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
- $(if $(filter yes,$(JAVACISGCJ))\
- ,-Dbuild.compiler=gcj \
- ,$(if $(filter TRUE,$(HAVE_JAVA6)) \
- ,-Dcompile.source=1.6 -Dcompile.target=1.6 \
- ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) \
- ) \
- ) \
- $(if $(filter TRUE,$(HAVE_JAVA6)) \
- ,$(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \
- ,$(if $(debug),-Dbuild.debug="on") \
- ) \
- jar \
- )
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk
deleted file mode 100644
index c2cec42..0000000
--- a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient))
-
-$(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-codec))
-$(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-logging))
-
-$(eval $(call gb_ExternalProject_register_targets,apache_commons_httpclient,\
- build \
-))
-
-$(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) :
- $(call gb_ExternalProject_run,build,\
- ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
- $(ICECREAM_RUN) "$(ANT)" \
- -q \
- -f build.xml \
- -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
- -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-$(COMMONS_LOGGING_VERSION).jar" \
- $(if $(filter TRUE,$(HAVE_JAVA6))\
- ,-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar" \
- ,-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar" \
- ) \
- $(if $(filter yes,$(JAVACISGCJ))\
- ,-Dbuild.compiler=gcj \
- ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
- -Dant.build.javac.target=$(JAVA_TARGET_VER) \
- ) \
- $(if $(debug),-Dbuild.debug="on") \
- dist \
- )
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/ExternalProject_apache_commons_lang.mk b/external/apache-commons/ExternalProject_apache_commons_lang.mk
deleted file mode 100644
index c180a89..0000000
--- a/external/apache-commons/ExternalProject_apache_commons_lang.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang))
-
-$(eval $(call gb_ExternalProject_register_targets,apache_commons_lang,\
- build \
-))
-
-$(call gb_ExternalProject_get_state_target,apache_commons_lang,build) :
- $(call gb_ExternalProject_run,build,\
- ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
- $(ICECREAM_RUN) "$(ANT)" \
- -q \
- -f build.xml \
- -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
- $(if $(filter yes,$(JAVACISGCJ))\
- ,-Dbuild.compiler=gcj \
- ,$(if $(filter TRUE,$(HAVE_JAVA6)) \
- ,-Dcompile.source=1.6 -Dcompile.target=1.6 \
- ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) \
- ) \
- ) \
- $(if $(filter TRUE,$(HAVE_JAVA6)) \
- ,$(if $(debug),-Dcompile.debug="true") \
- ,$(if $(debug),-Dbuild.debug="on") \
- ) \
- jar \
- )
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/Module_apache-commons.mk b/external/apache-commons/Module_apache-commons.mk
index 1dcac4d..45aabe2 100644
--- a/external/apache-commons/Module_apache-commons.mk
+++ b/external/apache-commons/Module_apache-commons.mk
@@ -11,13 +11,7 @@ $(eval $(call gb_Module_Module,apache-commons))
$(eval $(call gb_Module_add_targets,apache-commons,\
ExternalPackage_apache_commons_logging \
- ExternalProject_apache_commons_codec \
- ExternalProject_apache_commons_httpclient \
- ExternalProject_apache_commons_lang \
ExternalProject_apache_commons_logging \
- UnpackedTarball_apache_commons_codec \
- UnpackedTarball_apache_commons_httpclient \
- UnpackedTarball_apache_commons_lang \
UnpackedTarball_apache_commons_logging \
))
diff --git a/external/apache-commons/README b/external/apache-commons/README
index 0ab7b63..18944ac 100644
--- a/external/apache-commons/README
+++ b/external/apache-commons/README
@@ -1 +1 @@
-Java libraries; used for logging and http/https access in Extensions, from [http://commons.apache.org/]
+Java library; used for logging in Extensions, from [http://commons.apache.org/]
diff --git a/external/apache-commons/UnpackedTarball_apache_commons_codec.mk b/external/apache-commons/UnpackedTarball_apache_commons_codec.mk
deleted file mode 100644
index 5e55c1f..0000000
--- a/external/apache-commons/UnpackedTarball_apache_commons_codec.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_codec))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_codec,$(APACHE_COMMONS_CODEC_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_set_patchlevel,apache_commons_codec,3))
-
-$(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_codec,\
- build.xml \
-))
-
-$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_codec,\
- external/apache-commons/patches/codec.patch \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk b/external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
deleted file mode 100644
index 23d995f..0000000
--- a/external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_httpclient))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_httpclient,$(APACHE_COMMONS_HTTPCLIENT_TARBALL),,apache-commons))
-
-$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_httpclient,\
- external/apache-commons/patches/httpclient.patch \
- external/apache-commons/patches/httpclient_no_javadoc.patch \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/UnpackedTarball_apache_commons_lang.mk b/external/apache-commons/UnpackedTarball_apache_commons_lang.mk
deleted file mode 100644
index 7d227ac..0000000
--- a/external/apache-commons/UnpackedTarball_apache_commons_lang.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_lang))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_lang,$(APACHE_COMMONS_LANG_TARBALL),,apache-commons))
-
-$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_lang,\
- $(if $(filter TRUE,$(HAVE_JAVA6)) \
- ,external/apache-commons/patches/lang.patch \
- ) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/patches/codec.patch b/external/apache-commons/patches/codec.patch
deleted file mode 100644
index 7a9b489..0000000
--- a/external/apache-commons/patches/codec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/build/commons-codec-1.6-src/build.xml-old 2012-05-05 22:12:32.000000000 -0500
-+++ misc/build/commons-codec-1.6-src/build.xml 2012-05-05 22:16:00.000000000 -0500
-@@ -96,7 +96,6 @@
- </target>
- <target name="dist" depends="compile, javadoc" description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
-- <copy file="${basedir}/LICENSE.txt" todir="${dist.home}"/>
- <copy file="${basedir}/NOTICE.txt" todir="${dist.home}"/>
- <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
- <antcall target="jar"/>
-@@ -104,8 +103,7 @@
- <target name="jar" depends="compile" description="Create jar">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${build.home}/classes/META-INF"/>
-- <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-- <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
-+ <copy file="${basedir}/NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
- <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes">
- <manifest>
- <attribute name="Specification-Title" value="Commons Codec"/>
diff --git a/external/apache-commons/patches/httpclient.patch b/external/apache-commons/patches/httpclient.patch
deleted file mode 100644
index a64384f..0000000
--- a/external/apache-commons/patches/httpclient.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java 2012-05-07 12:37:50.000000000 -0500
-@@ -38,7 +38,7 @@
- /**
- * Establishes a tunneled HTTP connection via the CONNECT method.
- *
-- * @author Ortwin Gl???ck
-+ * @author Ortwin Glueck
- * @author dIon Gillard
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
- * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
-diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java
---- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java 2012-05-07 12:37:50.000000000 -0500
-@@ -48,7 +48,7 @@
- * @author <a href="mailto:rwaldhoff at apache.org">Rodney Waldhoff</a>
- * @author Sean C. Sullivan
- * @author <a href="mailto:dion at apache.org">dIon Gillard</a>
-- * @author Ortwin Gl?ck
-+ * @author Ortwin Glueck
- * @author <a href="mailto:becke at u.washington.edu">Michael Becke</a>
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
- * @author Sam Maloney
-diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java
---- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java 2012-05-07 12:37:50.000000000 -0500
-@@ -33,7 +33,7 @@
- /**
- * Signals that an error has occurred.
- *
-- * @author Ortwin Gl?ck
-+ * @author Ortwin Glueck
- * @version $Revision: 480424 $ $Date: 2006-11-29 06:56:49 +0100 (Wed, 29 Nov 2006) $
- * @since 3.0
- */
-diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java
---- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java 2012-05-07 12:37:50.000000000 -0500
-@@ -3,7 +3,7 @@
- /**
- * Signals that the response content was larger than anticipated.
- *
-- * @author Ortwin Glück
-+ * @author Ortwin Glueck
- */
- public class HttpContentTooLargeException extends HttpException {
- private int maxlen;
-diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java
---- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java 2012-05-07 12:37:50.000000000 -0500
-@@ -37,7 +37,7 @@
- /**
- * Logs all data read to the wire LOG.
- *
-- * @author Ortwin Gl�ck
-+ * @author Ortwin Glueck
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
- * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
- *
-diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java
---- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java 2012-05-07 12:37:50.000000000 -0500
-@@ -46,7 +46,7 @@
- * @author <a href="mailto:remm at apache.org">Remy Maucherat</a>
- * @author Rodney Waldhoff
- * @author <a href="mailto:jsdever at apache.org">Jeff Dever</a>
-- * @author Ortwin Gl?ck
-+ * @author Ortwin Glueck
- * @author Sean C. Sullivan
- * @author <a href="mailto:adrian at ephox.com">Adrian Sutton</a>
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
-diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java
---- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java 2012-05-07 12:37:50.000000000 -0500
-@@ -67,7 +67,7 @@
- * @author <a href="mailto:remm at apache.org">Remy Maucherat</a>
- * @author Rodney Waldhoff
- * @author <a href="mailto:jsdever at apache.org">Jeff Dever</a>
-- * @author Ortwin Gl?ck
-+ * @author Ortwin Glueck
- * @author Sean C. Sullivan
- * @author <a href="mailto:adrian at ephox.com">Adrian Sutton</a>
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
-diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java
---- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java 2012-05-07 12:37:50.000000000 -0500
-@@ -62,7 +62,7 @@
- * @author <a href="mailto:remm at apache.org">Remy Maucherat</a>
- * @author Rodney Waldhoff
- * @author <a href="mailto:jsdever at apache.org">Jeff Dever</a>
-- * @author Ortwin Gl�ck
-+ * @author Ortwin Glueck
- * @author Sean C. Sullivan
- * @author <a href="mailto:adrian at ephox.com">Adrian Sutton</a>
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
-diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java
---- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java 2012-05-07 12:37:50.000000000 -0500
-@@ -43,7 +43,7 @@
- * @author <a href="mailto:remm at apache.org">Remy Maucherat</a>
- * @author Rodney Waldhoff
- * @author <a href="mailto:jsdever at apache.org">Jeff Dever</a>
-- * @author Ortwin Gl???ck
-+ * @author Ortwin Glueck
- * @author Sean C. Sullivan
- * @author <a href="mailto:adrian at ephox.com">Adrian Sutton</a>
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
-diff -ru misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java
---- misc/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java 2012-05-07 12:34:01.000000000 -0500
-+++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java 2012-05-07 12:37:50.000000000 -0500
-@@ -62,7 +62,7 @@
- * @author <a href="mailto:remm at apache.org">Remy Maucherat</a>
- * @author <a href="mailto:dsale at us.britannica.com">Doug Sale</a>
- * @author <a href="mailto:jsdever at apache.org">Jeff Dever</a>
-- * @author Ortwin Gl???ck
-+ * @author Ortwin Glueck
- * @author <a href="mailto:mbowler at GargoyleSoftware.com">Mike Bowler</a>
- * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
- *
diff --git a/external/apache-commons/patches/httpclient_no_javadoc.patch b/external/apache-commons/patches/httpclient_no_javadoc.patch
deleted file mode 100644
index a9bd95d..0000000
--- a/external/apache-commons/patches/httpclient_no_javadoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/commons-httpclient-3.1/build.xml 2007-08-18 11:02:14.000000000 +0200
-+++ misc/build/commons-httpclient-3.1/build.xml 2012-07-09 09:59:21.364830700 +0200
-@@ -142,7 +142,7 @@
-
- <!-- ========== Targets: "External" Targets =============================== -->
-
-- <target name="dist" depends="compile,doc"
-+ <target name="dist" depends="compile"
- description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
- <copy file="LICENSE.txt" todir="${dist.home}"/>
diff --git a/external/apache-commons/patches/lang.patch b/external/apache-commons/patches/lang.patch
deleted file mode 100644
index 3e5d442..0000000
--- a/external/apache-commons/patches/lang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/commons-lang3-src/default.properties 2014-03-15 13:47:48.000000000 +0100
-+++ misc/build/commons-lang3-src/default.properties 2014-10-30 17:57:53.000000000 +0100
-@@ -60,7 +60,7 @@
- test.home = src/test/java
-
- # Should Java compilations set the 'debug' compiler option?
--compile.debug = true
-+compile.debug = false
-
- # Should Java compilations set the 'deprecation' compiler option?
- compile.deprecation = true
commit 8f2db5dc927df9b0d8c38eec76a4232c9ff4ca8f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Oct 9 21:15:53 2015 +0200
don't put the checkbox into the HBox, tdf#94870
Change-Id: I28f4895814d9fc419274de5681efa535e815f822
diff --git a/chart2/uiconfig/ui/sidebarelements.ui b/chart2/uiconfig/ui/sidebarelements.ui
index e844314..b1cf7de 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -92,30 +92,29 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_legend">
+ <property name="label" translatable="yes">Show Legend</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkBox" id="box_legend">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="checkbutton_legend">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="placement_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -127,7 +126,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -146,14 +145,13 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
commit 33972dea7d8849842929060be8f970e090077e4c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Thu Oct 8 19:14:35 2015 +0200
correctly dispose the chart sidebar when leaving chart, tdf#94292
This is a much better approach than my old one that tried to use the
correct XModel with the chart sidebar. Now everytime we leave the chart
edit mdoe we destroy the chart sidebar panels and recreate them when we
go back to chart edit mode.
As a result we no longer need to have worry that much about using the
correct ChartModel and about the lifecycle of the ChartModel.
Change-Id: Ie85ad82968e20a81f059d4bd930a83a70da35fc9
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 8b16543..754bc07 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -807,8 +807,6 @@ void SAL_CALL ChartController::dispose()
throw(uno::RuntimeException, std::exception)
{
m_bDisposed = true;
- mpSelectionChangeHandler->selectionChanged(css::lang::EventObject());
- mpSelectionChangeHandler->Disconnect();
if (getModel().is())
{
@@ -819,6 +817,8 @@ void SAL_CALL ChartController::dispose()
sfx2::sidebar::SidebarController::unregisterSidebarForFrame(pSidebar, this);
}
}
+ mpSelectionChangeHandler->selectionChanged(css::lang::EventObject());
+ mpSelectionChangeHandler->Disconnect();
try
{
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index 0c88901..64bc26e 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -160,6 +160,8 @@ public:
void updateModel(css::uno::Reference<css::frame::XModel> xModel);
+ void disposeDecks(css::uno::Reference<css::frame::XController> xController);
+
private:
VclPtr<Deck> mpCurrentDeck;
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 5764394..896b06d 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -174,6 +174,7 @@ void SidebarController::registerSidebarForFrame(SidebarController* pController,
void SidebarController::unregisterSidebarForFrame(SidebarController* pController, css::uno::Reference<css::frame::XController> xController)
{
+ pController->disposeDecks(xController);
css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
css::ui::ContextChangeEventMultiplexer::get(
::comphelper::getProcessComponentContext()));
@@ -183,22 +184,16 @@ void SidebarController::unregisterSidebarForFrame(SidebarController* pController
xController);
}
-void SAL_CALL SidebarController::disposing()
+void SidebarController::disposeDecks(css::uno::Reference<css::frame::XController> xController)
{
- mpCloseIndicator.disposeAndClear();
-
- maFocusManager.Clear();
- mpTabBar.disposeAndClear();
-
-
- // clear decks
+ // clear decks
ResourceManager::DeckContextDescriptorContainer aDecks;
mpResourceManager->GetMatchingDecks (
aDecks,
GetCurrentContext(),
IsDocumentReadOnly(),
- mxFrame->getController());
+ xController);
for (ResourceManager::DeckContextDescriptorContainer::const_iterator
iDeck(aDecks.begin()), iEnd(aDecks.end());
@@ -206,9 +201,25 @@ void SAL_CALL SidebarController::disposing()
{
const DeckDescriptor* deckDesc = mpResourceManager->GetDeckDescriptor(iDeck->msId);
VclPtr<Deck> aDeck = deckDesc->mpDeck;
+ if (aDeck == mpCurrentDeck)
+ {
+ mpCurrentDeck.clear();
+ maFocusManager.Clear();
+ }
if (aDeck)
+ {
aDeck.disposeAndClear();
+ mpResourceManager->SetDeckToDescriptor(iDeck->msId, VclPtr<Deck>());
+ }
}
+}
+
+void SAL_CALL SidebarController::disposing()
+{
+ mpCloseIndicator.disposeAndClear();
+
+ maFocusManager.Clear();
+ mpTabBar.disposeAndClear();
uno::Reference<css::frame::XController> xController = mxFrame->getController();
if (!xController.is())
commit c129a415ad0998b1544aed756316ed869148ef7b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Oct 6 19:24:26 2015 +0200
no need for using rtl::OUString in core code
Change-Id: I6fc8a928374de48910395685b500ba95e8621d39
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index f05a166..5764394 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -57,7 +57,6 @@
using namespace css;
using namespace css::uno;
-using ::rtl::OUString;
namespace
{
commit bfa0c4c9986c87135ef19190ad260999cc1e43fc
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Oct 6 12:24:17 2015 +0200
remove whitespace
Change-Id: I6390f16a6c2346c4c903a34d702277b931bc0079
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 39f8185..54928df0 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -99,8 +99,6 @@ DrawModelWrapper* getDrawModelWrapper(css::uno::Reference<css::frame::XModel> xM
XGradient getXGradientForName(css::uno::Reference<css::frame::XModel> xModel,
const OUString& rName)
{
-
-
try
{
ViewElementListProvider aProvider = getViewElementListProvider(xModel);
commit 0ea449d37cf60186ded1372ac0de96c6bac955cd
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Oct 3 16:30:16 2015 +0200
remove whitespace
Change-Id: I02541a12c893038f090a8e2847b6882669a967df
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 0d1faf0c..b0ac3e345 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -175,11 +175,8 @@ protected:
void SetTransparency(sal_uInt16 nVal);
};
-
} } // end of namespace svx::sidebar
-
-
#endif // INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 48069490a1623f43455401ef0c74a2b19237be56
Author: Albert Thuswaldner <albert.thuswaldner at gmail.com>
Date: Fri Oct 9 18:24:39 2015 +0200
tdf#39468 translated german comments in styledlg.cxx
Change-Id: Ib6ad2fff04dbbcdb3d5f527d0a23c771409dc6e3
Reviewed-on: https://gerrit.libreoffice.org/19285
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index bb5ced1..bbcd544 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -69,7 +69,7 @@ ScStyleDlg::ScStyleDlg( vcl::Window* pParent,
OSL_ENSURE(pFact, "Dialog creation failed!");
switch ( nRscId )
{
- case RID_SCDLG_STYLES_PAR: // Zellformatvorlagen
+ case RID_SCDLG_STYLES_PAR: // cell format styles
{
SvtCJKOptions aCJKOptions;
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!");
@@ -102,7 +102,7 @@ ScStyleDlg::ScStyleDlg( vcl::Window* pParent,
}
break;
- case RID_SCDLG_STYLES_PAGE: // Seitenvorlagen
+ case RID_SCDLG_STYLES_PAGE: // page styles
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");
@@ -135,7 +135,7 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
const SfxPoolItem* pInfoItem
= pDocSh->GetItem( SID_ATTR_NUMBERFORMAT_INFO );
- OSL_ENSURE( pInfoItem, "NumberInfoItem nicht gefunden!" );
+ OSL_ENSURE( pInfoItem, "NumberInfoItem not found!" );
aSet.Put (SvxNumberInfoItem( static_cast<const SvxNumberInfoItem&>(*pInfoItem) ) );
rTabPage.PageCreated(aSet);
@@ -145,7 +145,7 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
const SfxPoolItem* pInfoItem
= pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST );
- OSL_ENSURE( pInfoItem, "FontListItem nicht gefunden!" );
+ OSL_ENSURE( pInfoItem, "FontListItem not found!" );
aSet.Put (SvxFontListItem(static_cast<const SvxFontListItem&>(*pInfoItem).GetFontList(), SID_ATTR_CHAR_FONTLIST));
rTabPage.PageCreated(aSet);
commit adf8def2b09c0276f0ce836b58d7a3aa722eee15
Author: Rosemary <rosemaryseb8 at gmail.com>
Date: Fri Oct 9 13:18:59 2015 +0200
remove redundant code
- Use the existing createHexStringFromDigit()
to export hex digits as strings
- The parameters offset and stream name
are not required
Change-Id: If9aab7816efb81655c40a11743e8951ab0b26e1d
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index fae6e80..6252165 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -72,23 +72,40 @@ void exportUTF16String(SvStream& rStrm, const OUString& rString)
}
}
-void exportHexString(SvStream& rStrm, const sal_uInt8 nByte)
+bool isWorkbook(css::uno::Reference<css::uno::XInterface> xInterface)
+{
+ css::uno::Reference<ooo::vba::excel::XWorkbook> xWorkbook(xInterface, css::uno::UNO_QUERY);
+ return xWorkbook.is();
+}
+
+OUString createHexStringFromDigit(sal_uInt8 nDigit)
+{
+ OUString aString = OUString::number( nDigit, 16 );
+ if(aString.getLength() == 1)
+ aString = OUString::number(0) + aString;
+ return aString.toAsciiUpperCase();
+}
+
+OUString createGuidStringFromInt(sal_uInt8 nGuid[16])
{
- sal_uInt8 nNibble = (nByte & 0xF0) >> 4;
- for(sal_uInt8 i = 0; i < 2; i++)
+ OUStringBuffer aBuffer;
+ aBuffer.append('{');
+ for(size_t i = 0; i < 16; ++i)
{
- if(nNibble > 9)
- rStrm.WriteUInt8(nNibble + 55);
- else
- rStrm.WriteUInt8(nNibble + 48);
- nNibble = nByte & 0xF;
+ aBuffer.append(createHexStringFromDigit(nGuid[i]));
+ if(i == 3|| i == 5 || i == 7 || i == 9 )
+ aBuffer.append('-');
}
+ aBuffer.append('}');
+ OUString aString = aBuffer.makeStringAndClear();
+ return aString.toAsciiUpperCase();
}
-bool isWorkbook(css::uno::Reference<css::uno::XInterface> xInterface)
+OUString generateGUIDString()
{
- css::uno::Reference<ooo::vba::excel::XWorkbook> xWorkbook(xInterface, css::uno::UNO_QUERY);
- return xWorkbook.is();
+ sal_uInt8 nGuid[16];
+ rtl_createUuid(nGuid, NULL, true);
+ return createGuidStringFromInt(nGuid);
}
}
@@ -372,7 +389,6 @@ VBAEncryption::VBAEncryption(const sal_uInt8* pData, const sal_uInt16 length, Sv
{
if (!pSeed)
{
- // mnSeed = 0xBE;
std::random_device rd;
std::mt19937 gen(rd());
std::uniform_int_distribution<> dis(0, 255);
@@ -382,13 +398,13 @@ VBAEncryption::VBAEncryption(const sal_uInt8* pData, const sal_uInt16 length, Sv
void VBAEncryption::writeSeed()
{
- exportHexString(mrEncryptedData, mnSeed);
+ exportString(mrEncryptedData, createHexStringFromDigit(mnSeed));
}
void VBAEncryption::writeVersionEnc()
{
mnVersionEnc = mnSeed ^ mnVersion;
- exportHexString(mrEncryptedData, mnVersionEnc);
+ exportString(mrEncryptedData, createHexStringFromDigit(mnVersionEnc));
}
sal_uInt8 VBAEncryption::calculateProjKey(const OUString& rProjectKey)
@@ -408,7 +424,7 @@ sal_uInt8 VBAEncryption::calculateProjKey(const OUString& rProjectKey)
void VBAEncryption::writeProjKeyEnc()
{
sal_uInt8 nProjKeyEnc = mnSeed ^ mnProjKey;
- exportHexString(mrEncryptedData, nProjKeyEnc);
+ exportString(mrEncryptedData, createHexStringFromDigit(nProjKeyEnc));
mnUnencryptedByte1 = mnProjKey;
mnEncryptedByte1 = nProjKeyEnc; // ProjKeyEnc
mnEncryptedByte2 = mnVersionEnc; // VersionEnc
@@ -421,7 +437,7 @@ void VBAEncryption::writeIgnoredEnc()
{
sal_uInt8 nTempValue = 0xBE; // Any value can be assigned here
sal_uInt8 nByteEnc = nTempValue ^ (mnEncryptedByte2 + mnUnencryptedByte1);
- exportHexString(mrEncryptedData, nByteEnc);
+ exportString(mrEncryptedData, createHexStringFromDigit(nByteEnc));
mnEncryptedByte2 = mnEncryptedByte1;
mnEncryptedByte1 = nByteEnc;
mnUnencryptedByte1 = nTempValue;
@@ -435,7 +451,7 @@ void VBAEncryption::writeDataLengthEnc()
{
sal_uInt8 nByte = temp & 0xFF;
sal_uInt8 nByteEnc = nByte ^ (mnEncryptedByte2 + mnUnencryptedByte1);
- exportHexString(mrEncryptedData, nByteEnc);
+ exportString(mrEncryptedData, createHexStringFromDigit(nByteEnc));
mnEncryptedByte2 = mnEncryptedByte1;
mnEncryptedByte1 = nByteEnc;
mnUnencryptedByte1 = nByte;
@@ -448,7 +464,7 @@ void VBAEncryption::writeDataEnc()
for(sal_Int16 i = 0; i < mnLength; i++)
{
sal_uInt8 nByteEnc = mpData[i] ^ (mnEncryptedByte2 + mnUnencryptedByte1);
- exportHexString(mrEncryptedData, nByteEnc);
+ exportString(mrEncryptedData, createHexStringFromDigit(nByteEnc));
mnEncryptedByte2 = mnEncryptedByte1;
mnEncryptedByte1 = nByteEnc;
mnUnencryptedByte1 = mpData[i];
@@ -672,11 +688,11 @@ void writeMODULEDOCSTRING(SvStream& rStrm)
}
// section 2.3.4.2.3.2.5
-void writeMODULEOFFSET(SvStream& rStrm, sal_uInt32 offset)
+void writeMODULEOFFSET(SvStream& rStrm)
{
rStrm.WriteUInt16(0x0031); // id
rStrm.WriteUInt32(0x00000004); // sizeOfTextOffset
- rStrm.WriteUInt32(offset); // TextOffset
+ rStrm.WriteUInt32(0x00000000); // TextOffset
}
// section 2.3.4.2.3.2.6
@@ -706,13 +722,13 @@ void writeMODULETYPE(SvStream& rStrm, const sal_uInt16 type)
}
// section 2.3.4.2.3.2
-void writePROJECTMODULE(SvStream& rStrm, const OUString& name, const OUString& streamName, sal_uInt32 offset, const sal_uInt16 type)
+void writePROJECTMODULE(SvStream& rStrm, const OUString& name, const sal_uInt16 type)
{
writeMODULENAME(rStrm, name);
writeMODULENAMEUNICODE(rStrm, name);
- writeMODULESTREAMNAME(rStrm, streamName);
+ writeMODULESTREAMNAME(rStrm, name);
writeMODULEDOCSTRING(rStrm);
- writeMODULEOFFSET(rStrm, offset);
+ writeMODULEOFFSET(rStrm);
writeMODULEHELPCONTEXT(rStrm);
writeMODULECOOKIE(rStrm);
writeMODULETYPE(rStrm, type);
@@ -739,7 +755,7 @@ void writePROJECTMODULES(SvStream& rStrm, css::uno::Reference<css::container::XN
{
const OUString& rModuleName = aElementNames[rLibrayMap[i]];
css::script::ModuleInfo aModuleInfo = xModuleInfo->getModuleInfo(rModuleName);
- writePROJECTMODULE(rStrm, rModuleName, rModuleName, 0x00000000, aModuleInfo.ModuleType);
+ writePROJECTMODULE(rStrm, rModuleName, aModuleInfo.ModuleType);
}
}
@@ -825,36 +841,6 @@ void exportVBAProjectStream(SvStream& rStrm)
rStrm.WriteUInt16(0x0000); // Undefined
}
-OUString createHexStringFromDigit(sal_uInt8 nDigit)
-{
- OUString aString = OUString::number( nDigit, 16 );
- if(aString.getLength() == 1)
- aString = OUString::number(0) + aString;
- return aString.toAsciiUpperCase();
-}
-
-OUString createGuidStringFromInt(sal_uInt8 nGuid[16])
-{
- OUStringBuffer aBuffer;
- aBuffer.append('{');
- for(size_t i = 0; i < 16; ++i)
- {
- aBuffer.append(createHexStringFromDigit(nGuid[i]));
- if(i == 3|| i == 5 || i == 7 || i == 9 )
- aBuffer.append('-');
- }
- aBuffer.append('}');
- OUString aString = aBuffer.makeStringAndClear();
- return aString.toAsciiUpperCase();
-}
-
-OUString generateGUIDString()
-{
- sal_uInt8 nGuid[16];
- rtl_createUuid(nGuid, NULL, true);
- return createGuidStringFromInt(nGuid);
-}
-
// section 2.3.1 PROJECT Stream
void exportPROJECTStream(SvStream& rStrm, css::uno::Reference<css::container::XNameContainer> xNameContainer,
const OUString& projectName, const std::vector<sal_Int32>& rLibraryMap)
commit 3bd12cb580c77d3d8f9b1147192644fd6a955885
Author: Rosemary <rosemaryseb8 at gmail.com>
Date: Fri Oct 9 13:12:50 2015 +0200
correct creation of hex string from digit
Change-Id: I891a2a0b3e2194892bd4629c22b823902d18adc2
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index ca0db6c..fae6e80 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -829,7 +829,7 @@ OUString createHexStringFromDigit(sal_uInt8 nDigit)
{
OUString aString = OUString::number( nDigit, 16 );
if(aString.getLength() == 1)
- aString = aString + OUString::number(0);
+ aString = OUString::number(0) + aString;
return aString.toAsciiUpperCase();
}
commit bb0c5f767a1e124c1ca24f783676f91749b73e80
Author: Rosemary <rosemaryseb8 at gmail.com>
Date: Fri Oct 9 13:10:36 2015 +0200
Convert hex string to upper case
Change-Id: I5ccdfc62a8fd3521b6c4ee0029e70b41aaf4542e
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index b8c5e84..ca0db6c 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -830,7 +830,7 @@ OUString createHexStringFromDigit(sal_uInt8 nDigit)
OUString aString = OUString::number( nDigit, 16 );
if(aString.getLength() == 1)
aString = aString + OUString::number(0);
- return aString;
+ return aString.toAsciiUpperCase();
}
OUString createGuidStringFromInt(sal_uInt8 nGuid[16])
commit 53ce26978f72d75516a1a91652a2ad96c223ad7c
Author: Eike Rathke <erack at redhat.com>
Date: Fri Oct 9 18:28:13 2015 +0200
Revert "Resolves: tdf#94869 propagate error when obtaining a scalar double value"
This reverts commit 934e47958c78d1184beaaefdf3baefd3eecbea05.
Calculating with NaN cries for even more problems..
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 69d13cb..e8a3b1d 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -821,7 +821,7 @@ double ScInterpreter::PopDouble()
}
else
SetError( errUnknownStackVariable);
- return CreateDoubleError( nGlobalError);
+ return 0.0;
}
svl::SharedString ScInterpreter::PopString()
@@ -1925,10 +1925,7 @@ bool ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
double ScInterpreter::GetDoubleFromMatrix(const ScMatrixRef& pMat)
{
if (!pMat)
- {
- SetError( errParameterExpected);
- return CreateDoubleError( nGlobalError);
- }
+ return 0.0;
if ( !pJumpMatrix )
return pMat->GetDouble( 0 );
@@ -1941,7 +1938,7 @@ double ScInterpreter::GetDoubleFromMatrix(const ScMatrixRef& pMat)
return pMat->GetDouble( nC, nR);
SetError( errNoValue);
- return CreateDoubleError( nGlobalError);
+ return 0.0;
}
double ScInterpreter::GetDouble()
@@ -1975,6 +1972,8 @@ double ScInterpreter::GetDouble()
aCell.assign(*pDok, aAdr);
nVal = GetCellValue(aAdr, aCell);
}
+ else
+ nVal = 0.0;
}
break;
case svExternalSingleRef:
@@ -2003,6 +2002,7 @@ double ScInterpreter::GetDouble()
break;
case svError:
PopError();
+ nVal = 0.0;
break;
case svEmptyCell:
case svMissing:
@@ -2012,16 +2012,8 @@ double ScInterpreter::GetDouble()
default:
PopError();
SetError( errIllegalParameter);
+ nVal = 0.0;
}
-
- // Propagate error also as double error, so matrix operations where one
- // operand is a scalar get that propagated if there is no specific
- // nGlobalError check, and when the matrix is pushed the error is cleared
- // because the matrix is assumed to hold double errors at the corresponding
- // positions. See PushMatrix().
- if (nGlobalError)
- nVal = CreateDoubleError( nGlobalError);
-
if ( nFuncFmtType == nCurFmtType )
nFuncFmtIndex = nCurFmtIndex;
return nVal;
commit d2a07cd3214af27c5af601992e3c4a1a6e3b3dad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 9 16:35:33 2015 +0100
crashtestig: infinite recurse in ooo32833-1.sxc
integralPhi is called with nan(0xfffff000001f6)
which recurses through rtl_math_erfc->rtl_math_erf->rtl_math_erfc
until we run out of stack
Change-Id: Iab8a22fb23686d22d151f2508dbeb44ab47a76b7
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index ab9efe9..3f04e4d 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1599,7 +1599,10 @@ void ScInterpreter::ScLogNormDist( int nMinParamCount ) //expanded, see #i100119
void ScInterpreter::ScStdNormDist()
{
- PushDouble(integralPhi(GetDouble()));
+ double fVal = GetDouble();
+ if (!rtl::math::isNan(fVal))
+ fVal = integralPhi(fVal);
+ PushDouble(fVal);
}
void ScInterpreter::ScStdNormDist_MS()
commit 6f70f1c04dbe8c1b11227781b20b50e5b10c93d6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 9 16:35:19 2015 +0100
afl-eventtesting: we want to allow dialogs in ui-testing mode
Change-Id: Ibd7f88734492c4336e8a92ebbf9c70afdb7b3b5c
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index b321eef..c41880e 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -97,9 +97,9 @@ void Desktop::RegisterServices(Reference< XComponentContext > const & context)
// interpret command line arguments
CommandLineArgs& rCmdLine = GetCommandLineArgs();
- // Headless mode for FAT Office
- bool bHeadlessMode = rCmdLine.IsHeadless();
- if ( bHeadlessMode )
+ // Headless mode for FAT Office, auto cancels any dialogs that popup
+ bool bHeadlessMode = rCmdLine.IsHeadless() && !rCmdLine.IsEventTesting();
+ if (bHeadlessMode)
Application::EnableHeadlessMode(false);
// read accept string from configuration
commit aadda5d17f6e422da143ea774f759bfc5f629c5b
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Oct 9 17:51:50 2015 +0200
xmloff: fix ODF import of gradient draw:angle attribute a bit
ODF 1.2 part 3, 18.3.1 angle, says "An angle, as defined in §4.1 of
[SVG]" and "If no unit identifier is specified, the value is assumed to
be in degrees."
Unfortunately OOo could only read and write 10th of degree here.
See also https://issues.oasis-open.org/browse/OFFICE-3774
As the first step towards fixing that, implement the import for
draw:angle values with an angle unit identifier, but leave the import
as-is if the angle identifier is missing.
Change-Id: Ib88d417c03998ebcfc569b01492f0e1f851bbc85
diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx
index 3c451a0..9626c10 100644
--- a/include/sax/tools/converter.hxx
+++ b/include/sax/tools/converter.hxx
@@ -139,6 +139,12 @@ public:
/** convert string to double number (using ::rtl::math) without unit conversion */
static bool convertDouble(double& rValue, const OUString& rString);
+ /** convert number, 10th of degrees with range [0..3600] to SVG angle */
+ static void convertAngle(OUStringBuffer& rBuffer, sal_Int16 nAngle);
+
+ /** convert SVG angle to number, 10th of degrees with range [0..3600] */
+ static bool convertAngle(sal_Int16& rAngle, OUString const& rString);
+
/** convert double to ISO "duration" string; negative durations allowed */
static void convertDuration(OUStringBuffer& rBuffer,
const double fTime);
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index a223c4c..ef3ebe5 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -640,6 +640,62 @@ bool Converter::convertDouble(double& rValue, const OUString& rString)
return ( eStatus == rtl_math_ConversionStatus_Ok );
}
+/** convert number, 10th of degrees with range [0..3600] to SVG angle */
+void Converter::convertAngle(OUStringBuffer& rBuffer, sal_Int16 const nAngle)
+{
+#if 1
+ // wrong, but backward compatible with OOo/LO < 4.4
+ ::sax::Converter::convertNumber(rBuffer, nAngle);
+#else
+ // maybe in the future... (see other convertAngle)
+ double fAngle(double(nAngle) / 10.0);
+ ::sax::Converter::convertDouble(rBuffer, fAngle);
+ rBuffer.append("deg");
+#endif
+}
+
+/** convert SVG angle to number, 10th of degrees with range [0..3600] */
+bool Converter::convertAngle(sal_Int16& rAngle, OUString const& rString)
+{
+ // ODF 1.1 leaves it undefined what the number means, but ODF 1.2 says it's
+ // degrees, while OOo has historically used 10th of degrees :(
+ // So import degrees when we see the "deg" suffix but continue with 10th of
+ // degrees for now for the sake of existing OOo/LO documents, until the
+ // new versions that can read "deg" suffix are widely deployed and we can
+ // start to write the "deg" suffix.
+ sal_Int32 nValue(0);
+ double fValue(0.0);
+ bool bRet = ::sax::Converter::convertDouble(fValue, rString);
+ if (-1 != rString.indexOf("deg"))
+ {
+ nValue = fValue * 10.0;
+ }
+ else if (-1 != rString.indexOf("grad"))
+ {
+ nValue = (fValue * 9.0 / 10.0) * 10.0;
+ }
+ else if (-1 != rString.indexOf("rad"))
+ {
+ nValue = (fValue * 180.0 / M_PI) * 10.0;
+ }
+ else // no explicit unit
+ {
+ nValue = fValue; // wrong, but backward compatible with OOo/LO < 4.4
+ }
+ // limit to valid range [0..3600]
+ nValue = nValue % 3600;
+ if (nValue < 0)
+ {
+ nValue += 3600;
+ }
+ assert(0 <= nValue && nValue <= 3600);
+ if (bRet)
+ {
+ rAngle = sal::static_int_cast<sal_Int16>(nValue);
+ }
+ return bRet;
+}
+
/** convert double to ISO "duration" string; negative durations allowed */
void Converter::convertDuration(OUStringBuffer& rBuffer,
const double fTime)
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index 238f133..6058e8e 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -76,8 +76,10 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
desktop/source/deployment/deployment \
embeddedobj/util/embobj \
filter/source/config/cache/filterconfig1 \
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list