Repository.mk
| 4
android/Bootstrap/Makefile.shared
| 6
android/experimental/LibreOffice4Android/Makefile
| 15
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
| 34 +
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java
| 33 -
android/qa/desktop/Makefile
| 16
chart2/Library_chartcontroller.mk
| 3
chart2/Library_chartcore.mk
| 230 ++++++++++
chart2/Library_chartmodel.mk
| 115 -----
chart2/Library_charttools.mk
| 127 -----
chart2/Library_chartview.mk
| 115 -----
chart2/Module_chart2.mk
| 4
ios/qa/sc/Makefile
| 2
linguistic/source/lngsvcmgr.cxx
| 8
sal/android/lo-bootstrap.c
| 6
scp2/source/ooo/file_library_ooo.scp
| 4
scp2/source/ooo/module_hidden_ooo.scp
| 4
17 files changed, 312 insertions(+), 414 deletions(-)
New commits:
commit f1d1986a97aa9812dd045f6864a61964b7b9301a
Author: Michael Meeks <michael.me...@suse.com>
Date: Mon Aug 6 10:31:21 2012 +0100
android: linguistic should cope with a missing extension manager
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index f3c4fe5..8bae333 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -58,7 +58,6 @@ copy-stuff:
jvmaccessgcc3 \
jvmfwk \
libotouchlo \
- lnglo \
lnthlo \
lo-bootstrap \
localebe1.uno \
@@ -241,4 +240,4 @@ build-ant: copy-stuff properties
run:
# /data/local/tmp/sample-document.odt
- adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input
/assets/test1.odt
+ adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input
/assets/test1.odt -e lo-main-delay 20
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index b2f57d1..84d8f81 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -116,7 +116,6 @@ copy-stuff: buildrcs
jvmaccessgcc3 \
jvmfwk \
libotouchlo \
- lnglo \
introspection.uno \
lnthlo \
localebe1.uno \
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 6dc2d69..0a5de43 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -491,8 +491,12 @@ LngSvcMgr::LngSvcMgr()
// request to be notified if an extension has been added/removed
uno::Reference<uno::XComponentContext>
xContext(comphelper::getProcessComponentContext());
- uno::Reference<deployment::XExtensionManager> xExtensionManager(
- deployment::ExtensionManager::get(xContext));
+ uno::Reference<deployment::XExtensionManager> xExtensionManager;
+ try {
+ xExtensionManager = deployment::ExtensionManager::get(xContext);
+ } catch ( const deployment::DeploymentException & ) {
+ SAL_WARN( "linguistic", "no extension manager - should fire on mobile
only" );
+ }
if (xExtensionManager.is())
{
xMB = uno::Reference<util::XModifyBroadcaster>(xExtensionManager,
uno::UNO_QUERY_THROW);
commit 5f09718dba16ac7eb8f0917051f1ea532940a788
Author: Michael Meeks <michael.me...@suse.com>
Date: Fri Aug 3 21:07:43 2012 +0100
android: fewer exceptions, and more debug output on null renderables
cleanup some library mentions
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 577cf38..f3c4fe5 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -21,11 +21,9 @@ copy-stuff:
#
for F in $(strip \
analysislo \
- avmedialo \
basebmplo \
basegfxlo \
bootstrap.uno \
- canvastoolslo \
chartcontrollerlo \
chartcorelo \
comphelpgcc3 \
@@ -34,7 +32,6 @@ copy-stuff:
datelo \
dbaxmllo \
dbtoolslo \
- drawinglayerlo \
embobj \
evtattlo \
expwrap.uno \
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index 487fc7e..e883bb1 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -279,6 +279,12 @@ public class DocumentLoader
// Use dummySmallDevice with no scale of offset just to find out
// the paper size of this page.
Log.i( TAG , "Render( " + Integer.toString( number ) + " )");
+
+ if (renderable == null) {
+ Log.i( TAG , "no renderable");
+ return null;
+ }
+
PropertyValue renderProps[] = new PropertyValue[3];
renderProps[0] = new PropertyValue();
renderProps[0].Name = "IsPrinter";
@@ -356,13 +362,18 @@ public class DocumentLoader
return null;
}
-
+
ByteBuffer renderPage(int number, int width , int height)
{
try {
// Use dummySmallDevice with no scale of offset just to find out
// the paper size of this page.
+ if (renderable == null) {
+ Log.i( TAG , "no renderable to render page ( " +
Integer.toString(number) + " )" );
+ return null;
+ }
+
PropertyValue renderProps[] = new PropertyValue[3];
renderProps[0] = new PropertyValue();
renderProps[0].Name = "IsPrinter";
@@ -686,7 +697,8 @@ public class DocumentLoader
doc = componentLoader.loadComponentFromURL(url, "_blank", 0,
loadProps);
publishProgress( new Integer( 33 ));
long t1 = System.currentTimeMillis();
- Log.i(TAG, "Loading took " + ((t1-t0)-timingOverhead) + " ms");
+ Log.i(TAG, "Loading took " + ((t1-t0)-timingOverhead) + " ms
=> " +
+ (doc == null ? "null" : "have") + "document");
Object toolkitService = mcf.createInstanceWithContext
("com.sun.star.awt.Toolkit", context);
@@ -711,10 +723,18 @@ public class DocumentLoader
renderProps[2].Name = "View";
renderProps[2].Value = new MyXController();
- t0 = System.currentTimeMillis();
- pageCount = renderable.getRendererCount(doc, renderProps);
- t1 = System.currentTimeMillis();
- Log.i(TAG, "getRendererCount: " + pageCount + ", took " +
((t1-t0)-timingOverhead) + " ms");
+ if (renderable != null)
+ {
+ t0 = System.currentTimeMillis();
+ pageCount = renderable.getRendererCount(doc, renderProps);
+ t1 = System.currentTimeMillis();
+ Log.i(TAG, "getRendererCount: " + pageCount + ", took " +
((t1-t0)-timingOverhead) + " ms");
+ }
+ else
+ {
+ pageCount = 1; // hack
+ Log.i(TAG, "no / null renderable interface!");
+ }
}
catch (Exception e) {
e.printStackTrace(System.err);
@@ -726,7 +746,7 @@ public class DocumentLoader
protected void onProgressUpdate(Integer progress){
progressView.setProgress( progress.intValue() );
}
-
+
protected void onPostExecute(Integer result){
Log.i(TAG, "onPostExecute: " + result);
if (result == -1)
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java
index bbf0db4..50fc6cb 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java
@@ -71,33 +71,38 @@ public class FileUtilities {
private static final String getExtension(String filename)
{
- int nExt = filename.lastIndexOf('.');
- if (nExt < 0)
- return "";
- return filename.substring(nExt);
+ if (filename == null)
+ return "";
+ int nExt = filename.lastIndexOf('.');
+ if (nExt < 0)
+ return "";
+ return filename.substring(nExt);
}
private static final int lookupExtension(String filename)
{
- String extn = getExtension (filename);
- if (!mExtnMap.containsKey(extn))
- return UNKNOWN;
- return mExtnMap.get (extn);
+ String extn = getExtension (filename);
+ if (!mExtnMap.containsKey(extn))
+ return UNKNOWN;
+ return mExtnMap.get (extn);
}
static int getType(String filename)
{
- int type = lookupExtension (filename);
- android.util.Log.d("debug", "extn : " + filename + " -> " + type);
- return type;
+ int type = lookupExtension (filename);
+ android.util.Log.d("debug", "extn : " + filename + " -> " + type);
+ return type;
}
// Filter by mode, and/or in future by filename/wildcard
static private boolean doAccept(String filename, int byMode, String
byFilename)
{
android.util.Log.d("debug", "doAccept : " + filename + " mode " + byMode +
" byFilename " + byFilename);
- if (byMode == ALL && byFilename == ""){
- if( filename.startsWith(".")){//ignore hidden files
+ if (filename == null)
+ return false;
+
+ if (byMode == ALL && byFilename == "") {
+ if( filename.startsWith(".")) {//ignore hidden files
return false;
}
return true;
@@ -105,7 +110,7 @@ public class FileUtilities {
// check extension
if (byMode != ALL) {
if (mExtnMap.get (getExtension (filename)) != byMode)
- return false;
+ return false;
}
if (byFilename != "") {
// FIXME return false on a non-match
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 2c87ac9..b2f57d1 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -93,14 +93,11 @@ copy-stuff: buildrcs
#
for F in $(strip \
analysislo \
- avmedialo \
basebmplo \
basegfxlo \
bootstrap.uno \
- canvastoolslo \
comphelpgcc3 \
cppcanvaslo \
- drawinglayerlo \
embobj \
expwrap.uno \
fileacc \
commit 69207d1f69ea258b95f456e494657dfdc7c22f13
Author: Michael Meeks <michael.me...@suse.com>
Date: Fri Aug 3 20:25:35 2012 +0100
android: expose dummy JNI gnustl patching method for x86
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index e764879..8301af6 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1408,9 +1408,9 @@ patch_libgnustl_shared(void)
sizeof(expected_method_before_r7_code),
&replacement_method_before_arm);
}
+#endif // not X86
// static native void patch_libgnustl_shared();
-
__attribute__ ((visibility("default")))
void
Java_org_libreoffice_android_Bootstrap_patch_1libgnustl_1shared(JNIEnv* env,
@@ -1419,11 +1419,11 @@
Java_org_libreoffice_android_Bootstrap_patch_1libgnustl_1shared(JNIEnv* env,
(void) env;
(void) clazz;
+#ifndef X86
patch_libgnustl_shared();
+#endif
}
-#endif // not X86
-
#define UNPACK_TREE "/assets/unpack"
static int
commit d10065ea3a45ef27f2d29ee75c3a51b1fd253431
Author: Michael Meeks <michael.me...@suse.com>
Date: Fri Aug 3 17:39:56 2012 +0100
merge pointlessly fragmented chart2 libraries, leaving controller split.
diff --git a/Repository.mk b/Repository.mk
index e012879..8e8df07 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -245,9 +245,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basegfx \
calc \
chartcontroller \
- chartmodel \
- charttools \
- chartview \
+ chartcore \
cppcanvas \
ctl \
cui \
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 6daef13..d593676 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -51,3 +51,9 @@ uninstall:
clean: properties
$(ANT) clean
rm -rf assets $(SODEST) $(OBJLOCAL)
+
+# If you reinstall an app several times, even if you uninstall it
+# between, disk space seems to leak that won't get recycled until you
+# stop and start...
+stop-start-cycle:
+ $(ANDROID_SDK_HOME)/platform-tools/adb shell stop &&
$(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 9e6b239..577cf38 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -21,14 +21,21 @@ copy-stuff:
#
for F in $(strip \
analysislo \
+ avmedialo \
basebmplo \
basegfxlo \
bootstrap.uno \
+ canvastoolslo \
+ chartcontrollerlo \
+ chartcorelo \
comphelpgcc3 \
+ cppcanvaslo \
ctllo \
datelo \
dbaxmllo \
dbtoolslo \
+ drawinglayerlo \
+ embobj \
evtattlo \
expwrap.uno \
fastsax.uno \
@@ -39,6 +46,7 @@ copy-stuff:
fsstorage.uno \
gcc3_uno \
hwplo \
+ hyphenlo \
i18nisolang1gcc3 \
i18npool.uno \
i18nutilgcc3 \
@@ -53,9 +61,13 @@ copy-stuff:
jvmaccessgcc3 \
jvmfwk \
libotouchlo \
+ lnglo \
+ lnthlo \
lo-bootstrap \
localebe1.uno \
localedata_en \
+ localedata_es \
+ localedata_euro \
localedata_others \
lwpftlo \
mergedlo \
@@ -66,17 +78,21 @@ copy-stuff:
reg \
saxlo \
sclo \
+ sclo \
scdlo \
scfiltlo \
+ sdlo \
sddlo \
smdlo \
sotlo \
+ spelllo \
stocservices.uno \
store \
svgfilterlo \
svllo \
swdlo \
swlo \
+ swdlo \
t602filterlo \
textinstream.uno \
tllo \
@@ -99,6 +115,7 @@ copy-stuff:
xmlfdlo \
xmlreader \
xmlsecurity \
+ xoflo \
xslt \
xstor \
); do \
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index ca4ddc6..2c87ac9 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -168,9 +168,7 @@ copy-stuff: buildrcs
scfiltlo \
\
chartcontrollerlo \
- chartviewlo \
- chartmodello \
- charttoolslo \
+ chartcorelo \
); do \
$(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
done
@@ -230,11 +228,3 @@ run:
$(ANDROID_SDK_HOME)/platform-tools/adb push cmdline
$(APP_DATA_PATH)/cmdline
$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-delay 20 -e lo-main-indirect-cmdline
"$(APP_DATA_PATH)/cmdline"
# add -e lo-strace yes # if you want that
-
-# If you reinstall an app several times, even if you uninstall it
-# between, disk space seems to leak that won't get recycled until you
-# stop and start...
-stop-start-cycle:
- $(ANDROID_SDK_HOME)/platform-tools/adb shell stop &&
$(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10
-
-
diff --git a/chart2/Library_chartcontroller.mk
b/chart2/Library_chartcontroller.mk
index b42c0e8..bd18379 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -45,8 +45,7 @@ $(eval $(call gb_Library_use_sdk_api,chartcontroller))
$(eval $(call gb_Library_use_libraries,chartcontroller,\
basegfx \
- charttools \
- chartview \
+ chartcore \
comphelper \
cppu \
cppuhelper \
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
new file mode 100644
index 0000000..c34bdb1
--- /dev/null
+++ b/chart2/Library_chartcore.mk
@@ -0,0 +1,230 @@
+# -*- 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_Library_Library,chartcore))
+
+$(eval $(call gb_Library_set_include,chartcore,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/chart2/source/model/inc \
+ -I$(SRCDIR)/chart2/source/view/inc \
+ -I$(SRCDIR)/chart2/source/inc \
+))
+
+# not ideal - we should use a single core define ideally
+$(eval $(call gb_Library_add_defs,chartcore,\
+ -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
+ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
+))
+
+$(eval $(call gb_Library_use_sdk_api,chartcore))
+
+$(eval $(call gb_Library_use_libraries,chartcore,\
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ fwe \
+ i18nisolang1 \
+ sal \
+ sfx \
+ svl \
+ svt \
+ svxcore \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+# view pieces ...
+$(eval $(call
gb_Library_set_componentfile,chartcore,chart2/source/view/chartview))
+$(eval $(call gb_Library_add_exception_objects,chartcore,\
+ chart2/source/view/axes/DateHelper \
+ chart2/source/view/axes/DateScaling \
+ chart2/source/view/axes/MinimumAndMaximumSupplier \
+ chart2/source/view/axes/ScaleAutomatism \
+ chart2/source/view/axes/Tickmarks \
+ chart2/source/view/axes/Tickmarks_Dates \
+ chart2/source/view/axes/Tickmarks_Equidistant \
+ chart2/source/view/axes/VAxisBase \
+ chart2/source/view/axes/VAxisOrGridBase \
+ chart2/source/view/axes/VAxisProperties \
+ chart2/source/view/axes/VCartesianAxis \
+ chart2/source/view/axes/VCartesianCoordinateSystem \
+ chart2/source/view/axes/VCartesianGrid \
+ chart2/source/view/axes/VCoordinateSystem \
+ chart2/source/view/axes/VPolarAngleAxis \
+ chart2/source/view/axes/VPolarAxis \
+ chart2/source/view/axes/VPolarCoordinateSystem \
+ chart2/source/view/axes/VPolarGrid \
+ chart2/source/view/axes/VPolarRadiusAxis \
+ chart2/source/view/charttypes/AreaChart \
+ chart2/source/view/charttypes/BarChart \
+ chart2/source/view/charttypes/BarPositionHelper \
+ chart2/source/view/charttypes/BubbleChart \
+ chart2/source/view/charttypes/CandleStickChart \
+ chart2/source/view/charttypes/CategoryPositionHelper \
+ chart2/source/view/charttypes/PieChart \
+ chart2/source/view/charttypes/Splines \
+ chart2/source/view/charttypes/VSeriesPlotter \
+ chart2/source/view/diagram/VDiagram \
+ chart2/source/view/main/ChartItemPool \
+ chart2/source/view/main/ChartView \
+ chart2/source/view/main/Clipping \
+ chart2/source/view/main/DataPointSymbolSupplier \
+ chart2/source/view/main/DrawModelWrapper \
+ chart2/source/view/main/LabelPositionHelper \
+ chart2/source/view/main/Linear3DTransformation \
+ chart2/source/view/main/PlotterBase \
+ chart2/source/view/main/PlottingPositionHelper \
+ chart2/source/view/main/PolarLabelPositionHelper \
+ chart2/source/view/main/PropertyMapper \
+ chart2/source/view/main/_serviceregistration_view \
+ chart2/source/view/main/ShapeFactory \
+ chart2/source/view/main/Stripe \
+ chart2/source/view/main/VDataSeries \
+ chart2/source/view/main/VLegend \
+ chart2/source/view/main/VLegendSymbolFactory \
+ chart2/source/view/main/VLineProperties \
+ chart2/source/view/main/VPolarTransformation \
+ chart2/source/view/main/VTitle \
+))
+
+# model pieces ...
+$(eval $(call
gb_Library_set_componentfile,chartcore,chart2/source/model/chartmodel))
+$(eval $(call gb_Library_add_exception_objects,chartcore,\
+ chart2/source/model/filter/XMLFilter \
+ chart2/source/model/main/Axis \
+ chart2/source/model/main/BaseCoordinateSystem \
+ chart2/source/model/main/CartesianCoordinateSystem \
+ chart2/source/model/main/ChartModel \
+ chart2/source/model/main/ChartModel_Persistence \
+ chart2/source/model/main/DataPoint \
+ chart2/source/model/main/DataPointProperties \
+ chart2/source/model/main/DataSeries \
+ chart2/source/model/main/DataSeriesProperties \
+ chart2/source/model/main/Diagram \
+ chart2/source/model/main/FormattedString \
+ chart2/source/model/main/GridProperties \
+ chart2/source/model/main/Legend \
+ chart2/source/model/main/PageBackground \
+ chart2/source/model/main/PolarCoordinateSystem \
+ chart2/source/model/main/_serviceregistration_model \
+ chart2/source/model/main/StockBar \
+ chart2/source/model/main/Title \
+ chart2/source/model/main/UndoManager \
+ chart2/source/model/main/Wall \
+ chart2/source/model/template/AreaChartType \
+ chart2/source/model/template/AreaChartTypeTemplate \
+ chart2/source/model/template/BarChartType \
+ chart2/source/model/template/BarChartTypeTemplate \
+ chart2/source/model/template/BubbleChartType \
+ chart2/source/model/template/BubbleChartTypeTemplate \
+ chart2/source/model/template/BubbleDataInterpreter \
+ chart2/source/model/template/CandleStickChartType \
+ chart2/source/model/template/ChartType \
+ chart2/source/model/template/ChartTypeManager \
+ chart2/source/model/template/ChartTypeTemplate \
+ chart2/source/model/template/ColumnChartType \
+ chart2/source/model/template/ColumnLineChartTypeTemplate \
+ chart2/source/model/template/ColumnLineDataInterpreter \
+ chart2/source/model/template/DataInterpreter \
+ chart2/source/model/template/FilledNetChartType \
+ chart2/source/model/template/LineChartType \
+ chart2/source/model/template/LineChartTypeTemplate \
+ chart2/source/model/template/NetChartType \
+ chart2/source/model/template/NetChartTypeTemplate \
+ chart2/source/model/template/PieChartType \
+ chart2/source/model/template/PieChartTypeTemplate \
+ chart2/source/model/template/ScatterChartType \
+ chart2/source/model/template/ScatterChartTypeTemplate \
+ chart2/source/model/template/_serviceregistration_charttypes \
+ chart2/source/model/template/StockChartTypeTemplate \
+ chart2/source/model/template/StockDataInterpreter \
+ chart2/source/model/template/XYDataInterpreter \
+))
+
+# tools pieces
+$(eval $(call
gb_Library_set_componentfile,chartcore,chart2/source/tools/charttools))
+$(eval $(call gb_Library_add_exception_objects,chartcore,\
+ chart2/source/tools/AxisHelper \
+ chart2/source/tools/BaseGFXHelper \
+ chart2/source/tools/CachedDataSequence \
+ chart2/source/tools/CharacterProperties \
+ chart2/source/tools/ChartDebugTrace \
+ chart2/source/tools/ChartModelHelper \
+ chart2/source/tools/ChartTypeHelper \
+ chart2/source/tools/ChartViewHelper \
+ chart2/source/tools/ColorPerPointHelper \
+ chart2/source/tools/CommonConverters \
+ chart2/source/tools/ConfigColorScheme \
+ chart2/source/tools/ControllerLockGuard \
+ chart2/source/tools/DataSeriesHelper \
+ chart2/source/tools/DataSource \
+ chart2/source/tools/DataSourceHelper \
+ chart2/source/tools/DiagramHelper \
+ chart2/source/tools/ErrorBar \
+ chart2/source/tools/ExplicitCategoriesProvider \
+ chart2/source/tools/ExponentialRegressionCurveCalculator \
+ chart2/source/tools/FillProperties \
+ chart2/source/tools/FormattedStringHelper \
+ chart2/source/tools/ImplOPropertySet \
+ chart2/source/tools/InternalData \
+ chart2/source/tools/InternalDataProvider \
+ chart2/source/tools/LabeledDataSequence \
+ chart2/source/tools/LegendHelper \
+ chart2/source/tools/LifeTime \
+ chart2/source/tools/LinearRegressionCurveCalculator \
+ chart2/source/tools/LineProperties \
+ chart2/source/tools/LogarithmicRegressionCurveCalculator \
+ chart2/source/tools/MeanValueRegressionCurveCalculator \
+ chart2/source/tools/MediaDescriptorHelper \
+ chart2/source/tools/ModifyListenerCallBack \
+ chart2/source/tools/ModifyListenerHelper \
+ chart2/source/tools/MutexContainer \
+ chart2/source/tools/NameContainer \
+ chart2/source/tools/NumberFormatterWrapper \
+ chart2/source/tools/ObjectIdentifier \
+ chart2/source/tools/OPropertySet \
+ chart2/source/tools/PotentialRegressionCurveCalculator \
+ chart2/source/tools/PropertyHelper \
+ chart2/source/tools/RangeHighlighter \
+ chart2/source/tools/ReferenceSizeProvider \
+ chart2/source/tools/RegressionCurveCalculator \
+ chart2/source/tools/RegressionCurveHelper \
+ chart2/source/tools/RegressionCurveModel \
+ chart2/source/tools/RegressionEquation \
+ chart2/source/tools/RelativePositionHelper \
+ chart2/source/tools/RelativeSizeHelper \
+ chart2/source/tools/ResId \
+ chart2/source/tools/ResourceManager \
+ chart2/source/tools/Scaling \
+ chart2/source/tools/SceneProperties \
+ chart2/source/tools/_serviceregistration_tools \
+ chart2/source/tools/StatisticsHelper \
+ chart2/source/tools/ThreeDHelper \
+ chart2/source/tools/TitleHelper \
+ chart2/source/tools/TrueGuard \
+ chart2/source/tools/UncachedDataSequence \
+ chart2/source/tools/UserDefinedProperties \
+ chart2/source/tools/WeakListenerAdapter \
+ chart2/source/tools/WrappedDefaultProperty \
+ chart2/source/tools/WrappedDirectStateProperty \
+ chart2/source/tools/WrappedIgnoreProperty \
+ chart2/source/tools/WrappedProperty \
+ chart2/source/tools/WrappedPropertySet \
+ chart2/source/tools/XMLRangeHelper \
+))
+
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
deleted file mode 100644
index b421324..0000000
--- a/chart2/Library_chartmodel.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Library_Library,chartmodel))
-
-$(eval $(call gb_Library_set_include,chartmodel,\
- $$(INCLUDE) \
- -I$(SRCDIR)/chart2/source/model/inc \
- -I$(SRCDIR)/chart2/source/inc \
-))
-
-$(eval $(call gb_Library_use_sdk_api,chartmodel))
-
-# TODO: is this still necessary?
-# (from chart2/source/model/template/makefile.mk)
-# # i26518 the gcc-3.0.4 requires to enhance the template-depth
-# # this seems to be a compiler issue, so we recommend not to use 3.0.x anymore
-# .IF "$(COM)"=="GCC"
-# CFLAGS+=-ftemplate-depth-128
-# .ENDIF
-
-$(eval $(call gb_Library_use_libraries,chartmodel,\
- charttools \
- comphelper \
- cppu \
- cppuhelper \
- fwe \
- sal \
- svl \
- svt \
- ucbhelper \
- utl \
- vcl \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call
gb_Library_set_componentfile,chartmodel,chart2/source/model/chartmodel))
-
-$(eval $(call gb_Library_add_exception_objects,chartmodel,\
- chart2/source/model/filter/XMLFilter \
- chart2/source/model/main/Axis \
- chart2/source/model/main/BaseCoordinateSystem \
- chart2/source/model/main/CartesianCoordinateSystem \
- chart2/source/model/main/ChartModel \
- chart2/source/model/main/ChartModel_Persistence \
- chart2/source/model/main/DataPoint \
- chart2/source/model/main/DataPointProperties \
- chart2/source/model/main/DataSeries \
- chart2/source/model/main/DataSeriesProperties \
- chart2/source/model/main/Diagram \
- chart2/source/model/main/FormattedString \
- chart2/source/model/main/GridProperties \
- chart2/source/model/main/Legend \
- chart2/source/model/main/PageBackground \
- chart2/source/model/main/PolarCoordinateSystem \
- chart2/source/model/main/_serviceregistration_model \
- chart2/source/model/main/StockBar \
- chart2/source/model/main/Title \
- chart2/source/model/main/UndoManager \
- chart2/source/model/main/Wall \
- chart2/source/model/template/AreaChartType \
- chart2/source/model/template/AreaChartTypeTemplate \
- chart2/source/model/template/BarChartType \
- chart2/source/model/template/BarChartTypeTemplate \
- chart2/source/model/template/BubbleChartType \
- chart2/source/model/template/BubbleChartTypeTemplate \
- chart2/source/model/template/BubbleDataInterpreter \
- chart2/source/model/template/CandleStickChartType \
- chart2/source/model/template/ChartType \
- chart2/source/model/template/ChartTypeManager \
- chart2/source/model/template/ChartTypeTemplate \
- chart2/source/model/template/ColumnChartType \
- chart2/source/model/template/ColumnLineChartTypeTemplate \
- chart2/source/model/template/ColumnLineDataInterpreter \
- chart2/source/model/template/DataInterpreter \
- chart2/source/model/template/FilledNetChartType \
- chart2/source/model/template/LineChartType \
- chart2/source/model/template/LineChartTypeTemplate \
- chart2/source/model/template/NetChartType \
- chart2/source/model/template/NetChartTypeTemplate \
- chart2/source/model/template/PieChartType \
- chart2/source/model/template/PieChartTypeTemplate \
- chart2/source/model/template/ScatterChartType \
- chart2/source/model/template/ScatterChartTypeTemplate \
- chart2/source/model/template/_serviceregistration_charttypes \
- chart2/source/model/template/StockChartTypeTemplate \
- chart2/source/model/template/StockDataInterpreter \
- chart2/source/model/template/XYDataInterpreter \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
deleted file mode 100644
index 2e4eb6b..0000000
--- a/chart2/Library_charttools.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Library_Library,charttools))
-
-$(eval $(call gb_Library_set_include,charttools,\
- $$(INCLUDE) \
- -I$(SRCDIR)/chart2/source/inc \
-))
-
-$(eval $(call gb_Library_add_defs,charttools,\
- -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
-))
-
-$(eval $(call gb_Library_use_sdk_api,charttools))
-
-$(eval $(call gb_Library_use_libraries,charttools,\
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- i18nisolang1 \
- sal \
- svl \
- tl \
- utl \
- vcl \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call
gb_Library_set_componentfile,charttools,chart2/source/tools/charttools))
-
-$(eval $(call gb_Library_add_exception_objects,charttools,\
- chart2/source/tools/AxisHelper \
- chart2/source/tools/BaseGFXHelper \
- chart2/source/tools/CachedDataSequence \
- chart2/source/tools/CharacterProperties \
- chart2/source/tools/ChartDebugTrace \
- chart2/source/tools/ChartModelHelper \
- chart2/source/tools/ChartTypeHelper \
- chart2/source/tools/ChartViewHelper \
- chart2/source/tools/ColorPerPointHelper \
- chart2/source/tools/CommonConverters \
- chart2/source/tools/ConfigColorScheme \
- chart2/source/tools/ControllerLockGuard \
- chart2/source/tools/DataSeriesHelper \
- chart2/source/tools/DataSource \
- chart2/source/tools/DataSourceHelper \
- chart2/source/tools/DiagramHelper \
- chart2/source/tools/ErrorBar \
- chart2/source/tools/ExplicitCategoriesProvider \
- chart2/source/tools/ExponentialRegressionCurveCalculator \
- chart2/source/tools/FillProperties \
- chart2/source/tools/FormattedStringHelper \
- chart2/source/tools/ImplOPropertySet \
- chart2/source/tools/InternalData \
- chart2/source/tools/InternalDataProvider \
- chart2/source/tools/LabeledDataSequence \
- chart2/source/tools/LegendHelper \
- chart2/source/tools/LifeTime \
- chart2/source/tools/LinearRegressionCurveCalculator \
- chart2/source/tools/LineProperties \
- chart2/source/tools/LogarithmicRegressionCurveCalculator \
- chart2/source/tools/MeanValueRegressionCurveCalculator \
- chart2/source/tools/MediaDescriptorHelper \
- chart2/source/tools/ModifyListenerCallBack \
- chart2/source/tools/ModifyListenerHelper \
- chart2/source/tools/MutexContainer \
- chart2/source/tools/NameContainer \
- chart2/source/tools/NumberFormatterWrapper \
- chart2/source/tools/ObjectIdentifier \
- chart2/source/tools/OPropertySet \
- chart2/source/tools/PotentialRegressionCurveCalculator \
- chart2/source/tools/PropertyHelper \
- chart2/source/tools/RangeHighlighter \
- chart2/source/tools/ReferenceSizeProvider \
- chart2/source/tools/RegressionCurveCalculator \
- chart2/source/tools/RegressionCurveHelper \
- chart2/source/tools/RegressionCurveModel \
- chart2/source/tools/RegressionEquation \
- chart2/source/tools/RelativePositionHelper \
- chart2/source/tools/RelativeSizeHelper \
- chart2/source/tools/ResId \
- chart2/source/tools/ResourceManager \
- chart2/source/tools/Scaling \
- chart2/source/tools/SceneProperties \
- chart2/source/tools/_serviceregistration_tools \
- chart2/source/tools/StatisticsHelper \
- chart2/source/tools/ThreeDHelper \
- chart2/source/tools/TitleHelper \
- chart2/source/tools/TrueGuard \
- chart2/source/tools/UncachedDataSequence \
- chart2/source/tools/UserDefinedProperties \
- chart2/source/tools/WeakListenerAdapter \
- chart2/source/tools/WrappedDefaultProperty \
- chart2/source/tools/WrappedDirectStateProperty \
- chart2/source/tools/WrappedIgnoreProperty \
- chart2/source/tools/WrappedProperty \
- chart2/source/tools/WrappedPropertySet \
- chart2/source/tools/XMLRangeHelper \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
deleted file mode 100644
index 83ea331..0000000
--- a/chart2/Library_chartview.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Library_Library,chartview))
-
-$(eval $(call gb_Library_set_include,chartview,\
- $$(INCLUDE) \
- -I$(SRCDIR)/chart2/source/view/inc \
- -I$(SRCDIR)/chart2/source/inc \
-))
-
-$(eval $(call gb_Library_add_defs,chartview,\
- -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
-))
-
-$(eval $(call gb_Library_use_sdk_api,chartview))
-
-$(eval $(call gb_Library_use_libraries,chartview,\
- basegfx \
- charttools \
- comphelper \
- cppu \
- cppuhelper \
- editeng \
- sal \
- sfx \
- svl \
- svt \
- svxcore \
- tl \
- utl \
- vcl \
- drawinglayer \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call
gb_Library_set_componentfile,chartview,chart2/source/view/chartview))
-
-$(eval $(call gb_Library_add_exception_objects,chartview,\
- chart2/source/view/axes/DateHelper \
- chart2/source/view/axes/DateScaling \
- chart2/source/view/axes/MinimumAndMaximumSupplier \
- chart2/source/view/axes/ScaleAutomatism \
- chart2/source/view/axes/Tickmarks \
- chart2/source/view/axes/Tickmarks_Dates \
- chart2/source/view/axes/Tickmarks_Equidistant \
- chart2/source/view/axes/VAxisBase \
- chart2/source/view/axes/VAxisOrGridBase \
- chart2/source/view/axes/VAxisProperties \
- chart2/source/view/axes/VCartesianAxis \
- chart2/source/view/axes/VCartesianCoordinateSystem \
- chart2/source/view/axes/VCartesianGrid \
- chart2/source/view/axes/VCoordinateSystem \
- chart2/source/view/axes/VPolarAngleAxis \
- chart2/source/view/axes/VPolarAxis \
- chart2/source/view/axes/VPolarCoordinateSystem \
- chart2/source/view/axes/VPolarGrid \
- chart2/source/view/axes/VPolarRadiusAxis \
- chart2/source/view/charttypes/AreaChart \
- chart2/source/view/charttypes/BarChart \
- chart2/source/view/charttypes/BarPositionHelper \
- chart2/source/view/charttypes/BubbleChart \
- chart2/source/view/charttypes/CandleStickChart \
- chart2/source/view/charttypes/CategoryPositionHelper \
- chart2/source/view/charttypes/PieChart \
- chart2/source/view/charttypes/Splines \
- chart2/source/view/charttypes/VSeriesPlotter \
- chart2/source/view/diagram/VDiagram \
- chart2/source/view/main/ChartItemPool \
- chart2/source/view/main/ChartView \
- chart2/source/view/main/Clipping \
- chart2/source/view/main/DataPointSymbolSupplier \
- chart2/source/view/main/DrawModelWrapper \
- chart2/source/view/main/LabelPositionHelper \
- chart2/source/view/main/Linear3DTransformation \
- chart2/source/view/main/PlotterBase \
- chart2/source/view/main/PlottingPositionHelper \
- chart2/source/view/main/PolarLabelPositionHelper \
- chart2/source/view/main/PropertyMapper \
- chart2/source/view/main/_serviceregistration_view \
- chart2/source/view/main/ShapeFactory \
- chart2/source/view/main/Stripe \
- chart2/source/view/main/VDataSeries \
- chart2/source/view/main/VLegend \
- chart2/source/view/main/VLegendSymbolFactory \
- chart2/source/view/main/VLineProperties \
- chart2/source/view/main/VPolarTransformation \
- chart2/source/view/main/VTitle \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index b8b2a4f..19a7dbc 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Module_Module,chart2))
$(eval $(call gb_Module_add_targets,chart2,\
AllLangResTarget_chartcontroller \
Library_chartcontroller \
- Library_chartmodel \
- Library_charttools \
- Library_chartview \
+ Library_chartcore \
Package_uiconfig \
))
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index cab1650..4174214 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -71,7 +71,7 @@ stuff:
cp $(OUTDIR)/bin/udkapi.rdb $(OUTDIR)/bin/types.rdb
$(OUTDIR)/xml/ure/services.rdb $(APPDIR)
#
# a bunch of .component files
- for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx
ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml
configmgr/source/configmgr basic/util/sb
chart2/source/controller/chartcontroller chart2/source/tools/charttools
chart2/source/model/chartmodel comphelper/util/comphelp
eventattacher/source/evtatt fileaccess/source/fileacc
filter/source/config/cache/filterconfig1 oox/util/oox
package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap
sax/source/fastparser/fastsax sc/util/sc sc/util/scfilt
scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot
svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl
unoxml/source/rdf/unordf; do \
+ for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx
ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml
configmgr/source/configmgr basic/util/sb
chart2/source/controller/chartcontroller chart2/source/tools/chartcore
comphelper/util/comphelp eventattacher/source/evtatt fileaccess/source/fileacc
filter/source/config/cache/filterconfig1 oox/util/oox
package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap
sax/source/fastparser/fastsax sc/util/sc sc/util/scfilt
scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot
svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl
unoxml/source/rdf/unordf; do \
mkdir -p $(APPDIR)/ComponentTarget/`dirname $$F`; \
cp $(WORKDIR)/ComponentTarget/$$F.component
$(APPDIR)/ComponentTarget/$$F.component; \
done
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 0594120..8d4967c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -107,9 +107,7 @@ File gid_File_Lib_Ldapbe2
End
STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
-STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
-STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
+STD_LIB_FILE(gid_File_Lib_Chartcore, chartcore)
#if defined _MSC_VER
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 8c64871..c0b3495 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -198,10 +198,8 @@ Module gid_Module_Root_Files_4
gid_File_Filter_Itg,
gid_File_Filter_Iti,
gid_File_Lib_Bib,
- gid_File_Lib_Chartmodel,
- gid_File_Lib_Chartview,
+ gid_File_Lib_Chartcore,
gid_File_Lib_Chartcontroller,
- gid_File_Lib_Charttools,
gid_File_Lib_Ctl,
gid_File_Lib_Cui,
gid_File_Lib_Sdbt,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
