[Libreoffice-commits] core.git: 6 commits - basic/source configure.ac cppuhelper/source desktop/Library_deployment.mk desktop/Module_desktop.mk desktop/source postprocess/Rdb_services.mk sfx2/source
Tor Lillqvist
tml at iki.fi
Wed Mar 27 15:21:50 PDT 2013
basic/source/uno/namecont.cxx | 4 ++++
configure.ac | 5 ++---
cppuhelper/source/shlib.cxx | 16 +++++++++++-----
desktop/Library_deployment.mk | 5 +----
desktop/Module_desktop.mk | 2 +-
desktop/source/deployment/dp_persmap.cxx | 8 ++++----
postprocess/Rdb_services.mk | 2 +-
sfx2/source/appl/app.cxx | 13 ++++++++++++-
8 files changed, 36 insertions(+), 19 deletions(-)
New commits:
commit 159edc43135bd02f6d507424c3b0546c2e03851f
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Mar 28 00:17:24 2013 +0200
Bypass extension scanning unless HAVE_FEATURE_EXTENSIONS
Change-Id: I6ada96fc5cea895b967387c10814a7003e1e492b
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 1f1031e..8f663de 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
@@ -1258,6 +1260,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
void SfxLibraryContainer::implScanExtensions( void )
{
+#if HAVE_FEATURE_EXTENSIONS
ScriptExtensionIterator aScriptIt;
OUString aLibURL;
@@ -1297,6 +1300,7 @@ void SfxLibraryContainer::implScanExtensions( void )
const bool bReadOnly = false;
Reference< XNameAccess > xLib = createLibraryLink( aLibName, aIndexFileURL, bReadOnly );
}
+#endif
}
// Handle maLibInfoFileURL and maStorageURL correctly
commit 5ef3e4ca5ba9725178481bdd066564340a51a3cc
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Mar 28 00:16:21 2013 +0200
Do support the deployment component unconditionally, and add ucpexpand1
Change-Id: I8a3749be43efc77317f7f10c7fd6eadaf79f99c7
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 1ffa615..9a741d5 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -445,9 +445,7 @@ extern "C"
extern void * bootstrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * configmgr_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * comphelp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-#if HAVE_FEATURE_EXTENSIONS
extern void * deployment_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-#endif
extern void * expwrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * fastsax_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * filterconfig1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -462,6 +460,7 @@ extern "C"
extern void * stocservices_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * i18npool_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * ucb_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
+ extern void * ucpexpand1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * ucpfile_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * utl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * vcl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -546,6 +545,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
{ "liblocalebe1.uno.a", localebe1_component_getFactory },
{ "libreflection.uno.a", reflection_component_getFactory },
{ "libstocservices.uno.a", stocservices_component_getFactory },
+ { "libucpexpand1.uno.a", ucpexpand1_component_getFactory },
#else
{ "configmgr.uno.a", configmgr_component_getFactory },
{ "expwrap.uno.a", expwrap_component_getFactory },
@@ -555,11 +555,10 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
{ "localebe1.uno.a", localebe1_component_getFactory },
{ "reflection.uno.a", reflection_component_getFactory },
{ "stocservices.uno.a", stocservices_component_getFactory },
+ { "ucpexpand1.uno.a", ucpexpand1_component_getFactory },
#endif
{ "libcomphelp" CPPU_STRINGIFY(CPPU_ENV) ".a", comphelp_component_getFactory },
-#if HAVE_FEATURE_EXTENSIONS
{ "libdeployment.a", deployment_component_getFactory },
-#endif
{ "libfilterconfiglo.a", filterconfig1_component_getFactory },
{ "libfwklo.a", fwk_component_getFactory },
{ "libpackage2.a", package2_component_getFactory },
commit aeb1c38c8c6dd2b092102c5f6ee5749f5b6c15cb
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Mar 28 00:13:55 2013 +0200
Do disable extensions for Android, too
I started running into mysterious trouble when some code still thought it
should be looking for extensions, although (perhaps) other code was not
willing to support such, or something. Some confusion caused by my recent
changes to make the conditional support of features more fine-grained.
Change-Id: I61758cb06054ceb038d200bc95615b5b85ed0f7b
diff --git a/configure.ac b/configure.ac
index 970ae68..5fef541 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2150,9 +2150,8 @@ fi
AC_SUBST(DISABLE_DBCONNECTIVITY)
if test -z "$enable_extensions"; then
- # For iOS disable extensions unless specifically overridden with
- # --enable-extensions.
- if test $_os != iOS; then
+ # For iOS and Android disable extensions unless specifically overridden with --enable-extensions.
+ if test $_os != iOS -a $_os != Android; then
enable_extensions=yes
fi
fi
commit 0cd2accbd4cb044bf67b75e5271aa7f39628349c
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Mar 27 20:33:10 2013 +0200
Put some help-related code behind #if HAVE_FEATURE_HELP
Change-Id: I586921111d06030f3bc6d2cac2cea97a44f28a71
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 2e0018e..2f90400 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#if defined UNX
#include <limits.h>
#else // UNX
@@ -127,7 +129,10 @@ SfxApplication* SfxApplication::pApp = NULL;
#ifndef DISABLE_SCRIPTING
static BasicDLL* pBasic = NULL;
#endif
+
+#if HAVE_FEATURE_HELP
static SfxHelp* pSfxHelp = NULL;
+#endif
namespace
{
@@ -162,7 +167,7 @@ SfxApplication* SfxApplication::GetOrCreate()
::framework::SetDockingWindowCreator( SfxDockingWindowFactory );
::framework::SetIsDockingWindowVisible( IsDockingWindowVisible );
::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel );
-
+#if HAVE_FEATURE_HELP
Application::SetHelp( pSfxHelp );
if ( SvtHelpOptions().IsHelpTips() )
Help::EnableQuickHelp();
@@ -172,6 +177,7 @@ SfxApplication* SfxApplication::GetOrCreate()
Help::EnableBalloonHelp();
else
Help::DisableBalloonHelp();
+#endif
}
return pApp;
}
@@ -206,7 +212,9 @@ SfxApplication::SfxApplication()
(void)bOk;
#endif
+#if HAVE_FEATURE_HELP
pSfxHelp = new SfxHelp;
+#endif
#ifndef DISABLE_SCRIPTING
pBasic = new BasicDLL;
@@ -223,11 +231,14 @@ SfxApplication::~SfxApplication()
SfxModule::DestroyModules_Impl();
+#if HAVE_FEATURE_HELP
delete pSfxHelp;
Application::SetHelp( NULL );
+#endif
// delete global options
SvtViewOptions::ReleaseOptions();
+
#ifndef DISABLE_SCRIPTING
delete pBasic;
#endif
commit a1f2f8636dd3b4b75bb24833bb42734a5f7c6c37
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Mar 27 20:06:46 2013 +0200
WaE: comparison is always true due to limited range of data type
Change-Id: I74d9025b37966d0a0fa1e2c0cd5cac4778f8384e
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 05cd002..aab7631 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -79,8 +79,8 @@ static OString encodeString( const OString& rStr)
// short circuit for the simple non-encoded case
while( --i >= 0)
{
- const sal_Char c = *(pChar++);
- if( (0x00 <= c) && (c <= 0x0F))
+ const unsigned char c = (unsigned char) *(pChar++);
+ if( c <= 0x0F )
break;
if( c == '%')
break;
@@ -93,8 +93,8 @@ static OString encodeString( const OString& rStr)
aEncStr.append( pChar - (nLen-i), nLen - i);
while( --i >= 0)
{
- sal_Char c = *(pChar++);
- if( (0x00 <= c) && (c <= 0x0F))
+ unsigned char c = (unsigned char) *(pChar++);
+ if( c <= 0x0F )
{
aEncStr.append( '%');
c += (c <= 0x09) ? '0' : 'A'-10;
commit 3fcf0008d382b3f8677b02adfb3b01914d1123dc
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Mar 27 19:33:54 2013 +0200
Need deployment component too when HAVE_FEATURE_EXTENSIONS
Don't look just at DESKTOP or not when deciding whether to compile that stuff.
Change-Id: Ic9961ba27eb4a1e9360c67dd844c9243f1eff00e
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 6678e25..1ffa615 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
#include "osl/diagnose.h"
#include "osl/file.hxx"
@@ -352,11 +353,11 @@ Reference< XInterface > invokeComponentFactory(
// It seems that the only UNO components that have
// component_getImplementationEnvironment functions are the JDBC
// and ADO (whatever that is) database connectivity thingies
- // neither of which make sense on iOS (which is the only platform
- // for which DISABLE_DYNLOADING is intended, really). So we can
- // simoly bypass the getLibEnv() stuff and don't need to wonder
- // how to find out what function to call at this point if
- // statically linked.
+ // neither of which make sense on iOS and Android (which are the
+ // only platforms for which DISABLE_DYNLOADING is intended,
+ // really). So we can simply bypass the getLibEnv() stuff and
+ // don't need to wonder how to find out what function to call at
+ // this point if statically linked.
aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
#else
getLibEnv(lib, &env, &aEnvTypeName, currentEnv, rImplName, rPrefix);
@@ -444,6 +445,9 @@ extern "C"
extern void * bootstrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * configmgr_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * comphelp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
+#if HAVE_FEATURE_EXTENSIONS
+ extern void * deployment_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
+#endif
extern void * expwrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * fastsax_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * filterconfig1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -553,6 +557,9 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
{ "stocservices.uno.a", stocservices_component_getFactory },
#endif
{ "libcomphelp" CPPU_STRINGIFY(CPPU_ENV) ".a", comphelp_component_getFactory },
+#if HAVE_FEATURE_EXTENSIONS
+ { "libdeployment.a", deployment_component_getFactory },
+#endif
{ "libfilterconfiglo.a", filterconfig1_component_getFactory },
{ "libfwklo.a", fwk_component_getFactory },
{ "libpackage2.a", package2_component_getFactory },
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index a025674..b378562 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/
$(eval $(call gb_Library_add_exception_objects,deployment,\
desktop/source/deployment/dp_log \
+ desktop/source/deployment/dp_persmap \
desktop/source/deployment/dp_services \
desktop/source/deployment/dp_xml \
desktop/source/deployment/manager/dp_activepackages \
@@ -91,10 +92,6 @@ $(eval $(call gb_Library_use_libraries,deployment,\
helplinker \
))
-$(eval $(call gb_Library_add_exception_objects,deployment,\
- desktop/source/deployment/dp_persmap \
-))
-
endif
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index a05cceb..73bd229 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
AllLangResTarget_deploymentgui \
AllLangResTarget_dkt \
Library_deployment \
+ Library_deploymentgui \
Library_deploymentmisc \
Library_offacc \
Library_sofficeapp \
@@ -51,7 +52,6 @@ endif
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
Executable_unopkg.bin \
- Library_deploymentgui \
Library_migrationoo2 \
Library_migrationoo3 \
Library_unopkgapp \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 805a1e8..62103a0 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Rdb_add_components,services,\
configmgr/source/configmgr \
cppcanvas/source/uno/mtfrenderer \
cui/util/cui \
+ desktop/source/deployment/deployment \
drawinglayer/drawinglayer \
dtrans/util/mcnttype \
embeddedobj/util/embobj \
@@ -269,7 +270,6 @@ endif # DBCONNECTIVITY
ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Rdb_add_components,services,\
- desktop/source/deployment/deployment \
desktop/source/deployment/gui/deploymentgui \
desktop/source/migration/services/migrationoo2 \
desktop/source/migration/services/migrationoo3 \
More information about the Libreoffice-commits
mailing list