[Libreoffice-commits] core.git: 8 commits - basebmp/CppunitTest_basebmp.mk ios/experimental Repository.mk sal/CppunitTest_sal_rtl_strings.mk sal/CppunitTest_sal_rtl_textenc.mk sal/CppunitTest_sal_rtl_uri.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_subsequent_export_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/Library_sc.mk solenv/gbuild sw/Library_sw.mk
Tor Lillqvist
tml at iki.fi
Mon Apr 15 11:39:07 PDT 2013
Repository.mk | 3 -
basebmp/CppunitTest_basebmp.mk | 6 --
ios/experimental/LibreOffice/LibreOffice/AppDelegate.m | 33 +++++++++++++-
ios/experimental/LibreOffice/LibreOffice/View.m | 22 ++++++++-
ios/experimental/LibreOffice/LibreOffice/ViewController.m | 4 +
ios/experimental/LibreOffice/LibreOffice/lo.mm | 27 ++---------
sal/CppunitTest_sal_rtl_strings.mk | 3 -
sal/CppunitTest_sal_rtl_textenc.mk | 3 -
sal/CppunitTest_sal_rtl_uri.mk | 4 -
sc/CppunitTest_sc_filters_test.mk | 3 -
sc/CppunitTest_sc_subsequent_export_test.mk | 5 --
sc/CppunitTest_sc_subsequent_filters_test.mk | 5 --
sc/Library_sc.mk | 3 -
solenv/gbuild/Module.mk | 15 ++++++
solenv/gbuild/platform/IOS_ARM_GCC.mk | 7 ++
sw/Library_sw.mk | 3 -
16 files changed, 90 insertions(+), 56 deletions(-)
New commits:
commit 0b2eae62f1ccaad1c963d2637aafaa1ce9062455
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Apr 15 21:15:10 2013 +0300
No need for Android, iOS or CROSS_COMPILING conditionals for unit tests
We don't run unit tests when cross-compiling anyway and since
d4ea8c6b7ee32dfbe1525cae45ad44d411052c33 the corresponding .mk files
aren't even read by Make.
Change-Id: Icbee9ad51841d515a551e67708d9594358ce7e71
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index ff20ac0..9f55ba1 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -16,15 +16,9 @@ $(eval $(call gb_CppunitTest_set_include,basebmp_cpputest,\
$(eval $(call gb_CppunitTest_use_external,basebmp_cpputest,boost_headers))
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_CppunitTest_use_static_libraries,basebmp_cpputest,\
- basebmp \
-))
-else
$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
basebmp \
))
-endif
$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
basegfx \
diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk
index 1d56ecd..b522cbe 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -48,10 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\
))
# The test uses O(U)String capabilities that dlopen this lib
-ifneq ($(OS),ANDROID)
-# Except that on Android we don't build it separately
$(call gb_CppunitTest_get_target,sal_rtl_strings) : \
$(call gb_Library_get_target,sal_textenc)
-endif
# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_textenc.mk b/sal/CppunitTest_sal_rtl_textenc.mk
index 40167a2..e9b0c99 100644
--- a/sal/CppunitTest_sal_rtl_textenc.mk
+++ b/sal/CppunitTest_sal_rtl_textenc.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_textenc,\
))
# The test uses O(U)String capabilities that dlopen this lib
-ifneq ($(OS),ANDROID)
-# Except that on Android we don't build it separately
$(call gb_CppunitTest_get_target,sal_rtl_textenc) : \
$(call gb_Library_get_target,sal_textenc)
-endif
# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk
index 65b6713..3e457b0 100644
--- a/sal/CppunitTest_sal_rtl_uri.mk
+++ b/sal/CppunitTest_sal_rtl_uri.mk
@@ -26,11 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\
))
# The test uses O(U)String capabilities that dlopen this lib
-ifneq ($(OS),ANDROID)
-# Except that on Android we don't build it separately
$(call gb_CppunitTest_get_target,sal_rtl_uri) : \
$(call gb_Library_get_target,sal_textenc)
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 521b6e0..8a2a1c7 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -76,9 +76,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
utl \
vcl \
xo \
- $(if $(filter $(OS),ANDROID), \
- lo-bootstrap \
- ) \
$(gb_UWINAPI) \
))
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 56fd35d..e5791b5 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -70,9 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \
utl \
vcl \
xo \
- $(if $(filter $(OS),ANDROID), \
- lo-bootstrap \
- ) \
$(gb_UWINAPI) \
))
@@ -133,12 +130,10 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
xmlsecurity/util/xsec_xmlsec.windows \
))
else
-ifneq ($(filter-out IOS ANDROID,$(OS)),) #FIXME: get nss&xmlsec building
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
xmlsecurity/util/xsec_xmlsec \
))
endif
-endif
$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_export_test))
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index f6ea862..b0c99c8 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -70,9 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
utl \
vcl \
xo \
- $(if $(filter $(OS),ANDROID), \
- lo-bootstrap \
- ) \
$(gb_UWINAPI) \
))
@@ -134,12 +131,10 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xsec_xmlsec.windows \
))
else
-ifneq ($(filter-out IOS ANDROID,$(OS)),) #FIXME: get nss&xmlsec building
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xsec_xmlsec \
))
endif
-endif
$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
commit ca3392e833ef932664e236eafddeff874eb95d70
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Apr 15 21:05:49 2013 +0300
Use -D_GLIBCXX_DEBUG here, too, in a dbgutil build
Change-Id: Ie07ad3b9bd2d3f95db5be8a98866aaa088b4c79f
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 78ba92d..555fb78 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -75,6 +75,13 @@ gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
gb_COMPILERDEFS += \
-DBOOST_DETAIL_NO_CONTAINER_FWD
+# enable debug STL
+ifeq ($(gb_ENABLE_DBGUTIL),$(true))
+gb_COMPILERDEFS += \
+ -D_GLIBCXX_DEBUG \
+
+endif
+
gb_LinkTarget_LDFLAGS := $(SOLARLIB) \
#man ld says: obsolete -Wl,-multiply_defined,suppress \
commit d4ea8c6b7ee32dfbe1525cae45ad44d411052c33
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Apr 15 21:02:11 2013 +0300
We don't do unit testing when cross-compiling for now
Define the functions that adds the various check targets as empty when
cross-compiling. Avoids the needs for corresponding conditionals in
.mk files in modules.
Change-Id: Ia577e12204b516dc169a8500b4745aac4d7c24e2
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index e451563..176bbec 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -212,6 +212,19 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
endef
+ifeq ($(CROSS_COMPILING),YES)
+
+define gb_Module_add_check_target
+endef
+
+define gb_Module_add_slowcheck_target
+endef
+
+define gb_Module_add_subsequentcheck_target
+endef
+
+else
+
define gb_Module_add_check_target
$(call gb_Module__read_targetfile,$(1),$(2),check target)
@@ -236,6 +249,8 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
endef
+endif
+
define gb_Module_add_moduledir
include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk
$(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
commit accbef530149aef4fd11df51da1d8144371b62da
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Apr 15 20:57:32 2013 +0300
No vbahelper library if DISABLE_SCRIPTING
Change-Id: Ice3656e828cf74d319c8a9c2d16dcdcdce9891d6
diff --git a/Repository.mk b/Repository.mk
index 4b2c1f0..4a7e184 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -385,7 +385,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
textconversiondlgs \
textfd \
updatecheckui \
- vbahelper \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ vbahelper) \
vclplug_gen \
vclplug_gtk \
vclplug_gtk3 \
commit c5ff2b39f25664994c8b085580b467389e935a7a
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Apr 15 20:56:48 2013 +0300
No vbahelper library if DISABLE_SCRIPTING
Change-Id: Ie5ea03493659eb467e61a6985016e3f43f450136
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 5b82620..5631f55 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -88,7 +88,8 @@ $(eval $(call gb_Library_use_libraries,sc,\
tl \
ucbhelper \
utl \
- vbahelper \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ vbahelper) \
vcl \
xo \
$(gb_UWINAPI) \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index de51354..4d35d69 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -66,7 +66,8 @@ $(eval $(call gb_Library_use_libraries,sw,\
tl \
ucbhelper \
utl \
- vbahelper \
+ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ vbahelper) \
vcl \
xmlreader \
xo \
commit cfe512ac7bdbc79603ca5ffe89980d6a0489e0ca
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Apr 15 18:29:36 2013 +0300
Start hacking on handling orientation changes
Change-Id: I94cfdc1b334539399faff29c046185bbbf698d23
diff --git a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
index a12585b..2285f04 100644
--- a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
+++ b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
@@ -26,6 +26,17 @@ static View *theView;
(void) launchOptions;
CGRect bounds = [[UIScreen mainScreen] bounds];
+
+ NSLog(@"mainScreen bounds: %dx%d@(%d,%d)",
+ (int) bounds.size.width, (int) bounds.size.height,
+ (int) bounds.origin.x, (int) bounds.origin.y);
+
+ CGRect applicationFrame = [[UIScreen mainScreen] applicationFrame];
+
+ NSLog(@"mainScreen applicationFrame: %dx%d@(%d,%d)",
+ (int) applicationFrame.size.width, (int) applicationFrame.size.height,
+ (int) applicationFrame.origin.x, (int) applicationFrame.origin.y);
+
self.window = [[UIWindow alloc] initWithFrame:bounds];
self.window.backgroundColor = [UIColor whiteColor];
@@ -51,7 +62,10 @@ static View *theView;
[self.window addGestureRecognizer: tapRecognizer];
- lo_set_view_size(bounds.size.width, bounds.size.height);
+ if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]))
+ lo_set_view_size(applicationFrame.size.height, applicationFrame.size.width);
+ else
+ lo_set_view_size(applicationFrame.size.width, applicationFrame.size.height);
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidHide:) name:UIKeyboardDidHideNotification object:nil];
@@ -110,6 +124,23 @@ static View *theView;
(void) application;
}
+- (void)application:(UIApplication *)application didChangeStatusBarFrame:(CGRect)oldStatusBarFrame
+{
+ (void) application;
+ (void) oldStatusBarFrame;
+
+ CGRect applicationFrame = [[UIScreen mainScreen] applicationFrame];
+ NSLog(@"New applicationFrame: %dx%d@(%d,%d)",
+ (int) applicationFrame.size.width, (int) applicationFrame.size.height,
+ (int) applicationFrame.origin.x, (int) applicationFrame.origin.y);
+ NSLog(@"statusBarOrientation: %d", [[UIApplication sharedApplication] statusBarOrientation]);
+
+ if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]))
+ lo_set_view_size(applicationFrame.size.height, applicationFrame.size.width);
+ else
+ lo_set_view_size(applicationFrame.size.width, applicationFrame.size.height);
+}
+
- (void)keyboardWillShow:(NSNotification *)note
{
NSDictionary *info = [note userInfo];
diff --git a/ios/experimental/LibreOffice/LibreOffice/View.m b/ios/experimental/LibreOffice/LibreOffice/View.m
index 2dd4ab8..4308392 100644
--- a/ios/experimental/LibreOffice/LibreOffice/View.m
+++ b/ios/experimental/LibreOffice/LibreOffice/View.m
@@ -20,8 +20,26 @@
CGContextRef context = UIGraphicsGetCurrentContext();
CGContextSaveGState(context);
- CGContextTranslateCTM(context, 0, self.frame.size.height);
- CGContextScaleCTM(context, 1, -1);
+
+ switch ([[UIApplication sharedApplication] statusBarOrientation]) {
+ case UIInterfaceOrientationPortrait:
+ CGContextTranslateCTM(context, 0, self.frame.size.height);
+ CGContextScaleCTM(context, 1, -1);
+ break;
+ case UIInterfaceOrientationLandscapeLeft:
+ CGContextTranslateCTM(context, self.frame.size.width, self.frame.size.height);
+ CGContextRotateCTM(context, M_PI/2);
+ CGContextScaleCTM(context, -1, 1);
+ break;
+ case UIInterfaceOrientationLandscapeRight:
+ CGContextRotateCTM(context, -M_PI/2);
+ CGContextScaleCTM(context, -1, 1);
+ break;
+ case UIInterfaceOrientationPortraitUpsideDown:
+ CGContextTranslateCTM(context, self.frame.size.width, 0);
+ CGContextScaleCTM(context, -1, 1);
+ break;
+ }
lo_render_windows(context, rect);
CGContextRestoreGState(context);
diff --git a/ios/experimental/LibreOffice/LibreOffice/ViewController.m b/ios/experimental/LibreOffice/LibreOffice/ViewController.m
index 8a44526..58da5db 100644
--- a/ios/experimental/LibreOffice/LibreOffice/ViewController.m
+++ b/ios/experimental/LibreOffice/LibreOffice/ViewController.m
@@ -9,6 +9,10 @@
#import "ViewController.h"
+#include <osl/detail/ios-bootstrap.h>
+
+#import "lo.h"
+
@implementation ViewController
- (void)viewDidLoad
commit c02f96f0bb2ae3bb9c9cb91fff40d3435260c155
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Apr 15 01:09:29 2013 +0300
Bin unneeded #includes and usings
Change-Id: I93102156c4713191c8ad49da9b9d2eda5be722e8
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index cd7f748..11ecaa3 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -12,30 +12,9 @@
#import <UIKit/UIKit.h>
#include <postmac.h>
-#include <comphelper/processfactory.hxx>
-#include <cppuhelper/bootstrap.hxx>
#include <osl/detail/ios-bootstrap.h>
#include <osl/process.h>
-#include <com/sun/star/awt/XDevice.hpp>
-#include <com/sun/star/awt/XToolkitExperimental.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/bridge/XUnoUrlResolver.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/view/XRenderable.hpp>
-
-#include <vcl/svapp.hxx>
-
-using namespace com::sun::star;
-
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-
extern "C" {
extern void * analysis_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * animcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
commit efef1c690f68e2c81e611825113f04422dd9b61c
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Apr 15 00:28:15 2013 +0300
Add components needed by spreadsheet documents
Change-Id: I191bc093def5d2965b463dcff9e1289901064ce8
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 5c791f7..cd7f748 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -37,9 +37,11 @@ using ::rtl::OUString;
using ::rtl::OUStringToOString;
extern "C" {
+ extern void * analysis_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * animcore_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * avmedia_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * dba_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+ extern void * date_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * dbaxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * evtatt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * fileacc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -54,6 +56,7 @@ extern "C" {
extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+ extern void * pricing_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * sc_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * scd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * scfilt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -84,9 +87,11 @@ const lib_to_component_mapping *
lo_get_libmap(void)
{
static lib_to_component_mapping map[] = {
+ { "libanalysislo.a", analysis_component_getFactory },
{ "libanimcorelo.a", animcore_component_getFactory },
{ "libavmedialo.a", avmedia_component_getFactory },
{ "libdbalo.a", dba_component_getFactory },
+ { "libdatelo.a", date_component_getFactory },
{ "libdbaxmllo.a", dbaxml_component_getFactory },
{ "libevtattlo.a", evtatt_component_getFactory },
{ "libfileacc.a", fileacc_component_getFactory },
@@ -101,6 +106,7 @@ lo_get_libmap(void)
{ "liblnthlo.a", lnth_component_getFactory },
{ "liblwpftlo.a", lotuswordpro_component_getFactory },
{ "libooxlo.a", oox_component_getFactory },
+ { "libpricinglo.a", pricing_component_getFactory },
{ "libscdlo.a", scd_component_getFactory },
{ "libscfiltlo.a", scfilt_component_getFactory },
{ "libsclo.a", sc_component_getFactory },
More information about the Libreoffice-commits
mailing list