[Libreoffice-commits] .: 2 commits - cppuhelper/source officecfg/registry
cppuhelper/source/propertysetmixin.cxx |7 ++-
officecfg/registry/data/org/openoffice/Setup.xcu |2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit a28b4c1e3e5855c208c9d940de8e922de33eb129
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Nov 29 15:54:30 2012 +0100
Do not override the message of an underlying PropertyVetoException
Change-Id: I9c1026ad87f3031f1c56066ab24d23d3a6d8782b
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/cppuhelper/source/propertysetmixin.cxx
b/cppuhelper/source/propertysetmixin.cxx
index babad63..c3c30fb 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -625,7 +625,12 @@ void PropertySetMixinImpl::Impl::setProperty(
css::beans::PropertyAttribute::CONSTRAINED)
!= 0))
{
-throw css::beans::PropertyVetoException(Invalid + name, object);
+css::beans::PropertyVetoException exc;
+e.TargetException = exc;
+if (exc.Message.isEmpty() )
+throw css::beans::PropertyVetoException(Invalid + name,
object);
+else
+throw exc;
} else {
throw css::lang::WrappedTargetException(
e.Message, object, e.TargetException);
commit 1c1d3b6727af2b937d83cc63a94b00f51bb0dff8
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 30 10:38:43 2012 +0100
Do not migrate old (per-user/shared) script provider extensions
... for BeanShell and Javascript, which have been changed from bundled
extensions to plain
code parts a while ago already; but just in case...
Change-Id: I92f25a9607f8cdf7ec6c90ee615281317d1ec6e4
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu
b/officecfg/registry/data/org/openoffice/Setup.xcu
index da0c62e..c1fa23f 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -798,6 +798,8 @@
!-- arguably, dropping PDFImport extensions should be
conditional on having in-core PDF import actually
built
and installed --
+
itcom.sun.star.script.provider.ScriptProviderForBeanShell/it
+
itcom.sun.star.script.provider.ScriptProviderForJavaScript/it
itcom.sun.star.script.provider.ScriptProviderForPython/it
/value
/prop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppuhelper/source svl/inc
cppuhelper/source/defaultbootstrap.cxx |9 +
svl/inc/svl/cntwids.hrc|4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit faef84abca7860227730351d7d1cd4e3c4b6e0e5
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Nov 12 16:36:39 2012 +0200
Do stay backward-compatible also in 4.0 and later for now
Change-Id: Ie8f2de8f11f8fec3a9f014bbcc46a506dfb3058d
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index ccf7447..f27d82c 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1100,9 +1100,10 @@ void ServiceManager::insert(css::uno::Any const
aElement)
// implement XServiceInfo); the old OServiceManager::insert
// (stoc/source/servicemanager/servicemanager.cxx) silently did not add such
// broken factories to its m_ImplementationNameMap, so ignore them here for
-// backwards compatibility of live-insertion of extensions, too (can go again
-// for incompatible LO 4):
-#if SUPD 400
+// backwards compatibility of live-insertion of extensions, too.
+
+// (The plan was that this warning would go away (and we would do the
+// throw instead) for the incompatible LO 4, but we changed our mind):
css::uno::Reference css::lang::XSingleComponentFactory legacy;
if ((aElement = legacy) legacy.is()) {
SAL_WARN(
@@ -1110,7 +,7 @@ void ServiceManager::insert(css::uno::Any const
aElement)
Ignored XSingleComponentFactory not implementing XServiceInfo);
return;
}
-#endif
+
throw css::lang::IllegalArgumentException(
Bad insert element, static_cast cppu::OWeakObject * (this), 0);
}
commit 66ae7df4726ac4a959d77ce258ad1c323f254b9f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Nov 12 16:31:54 2012 +0200
Fix misleading comments
Change-Id: Id85c063c7a5a44c3c71e4eee04342fdb1a38f487
diff --git a/svl/inc/svl/cntwids.hrc b/svl/inc/svl/cntwids.hrc
index 55fdaf1..5900c22 100644
--- a/svl/inc/svl/cntwids.hrc
+++ b/svl/inc/svl/cntwids.hrc
@@ -106,7 +106,7 @@
#define WID_STORE_MSGS_TIMELIMIT(WID_CHAOS_START + 124)
//
-// WID's added after SO 4.0 release ( SUPD 364 )
+// WIDs added after SO 4.0 release
//
// PROP BOXALL
@@ -184,7 +184,7 @@
#define WID_HTTP_COOKIE (WID_CHAOS_START + 231)
//
-// WID's added after SO 5.0 release ( SUPD 505 )
+// WIDs added after SO 5.0 release
//
// PROP FOLDER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppuhelper/source toolkit/source
cppuhelper/source/shlib.cxx| 11 ---
toolkit/source/awt/vclxtoolkit.cxx | 20 +++-
2 files changed, 27 insertions(+), 4 deletions(-)
New commits:
commit bd24ac7cb585392d42c113e3547c3074ca3f745c
Author: Tor Lillqvist t...@iki.fi
Date: Thu Oct 4 07:08:51 2012 +0300
Link directly to CreateWindow (in svtools) when DISABLE_DYNLOADING
Change-Id: Iaf1f6c0fc76b97b1cfca63edfb91d5a39988c8c0
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 827b360..4ee9041 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -499,12 +499,14 @@ VCLXToolkit::~VCLXToolkit()
void SAL_CALL VCLXToolkit::disposing()
{
+#ifndef DISABLE_DYNLOADING
if ( hSvToolsLib )
{
osl_unloadModule( hSvToolsLib );
hSvToolsLib = NULL;
fnSvtCreateWindow = NULL;
}
+#endif
{
osl::Guard osl::Mutex aGuard( getInitMutex() );
@@ -1036,8 +1038,16 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow**
ppNewComp,
return pNewWindow;
}
+#ifndef DISABLE_DYNLOADING
+
extern C { static void SAL_CALL thisModule() {} }
+#else
+
+extern C Window* SAL_CALL CreateWindow( VCLXWindow** ppNewComp, const
::com::sun::star::awt::WindowDescriptor* pDescriptor, Window* pParent, WinBits
nWinBits );
+
+#endif
+
css::uno::Reference css::awt::XWindowPeer VCLXToolkit::ImplCreateWindow(
const css::awt::WindowDescriptor rDescriptor,
WinBits nForceWinBits )
@@ -1070,8 +1080,13 @@ css::uno::Reference css::awt::XWindowPeer
VCLXToolkit::ImplCreateWindow(
// (do this _before_ creating it on our own: The old mechanism (extended
toolkit in SvTools) did it this way,
// and we need to stay compatible)
// try to load the lib
-if ( !fnSvtCreateWindow !hSvToolsLib )
+if ( !fnSvtCreateWindow
+#ifndef DISABLE_DYNLOADING
+ !hSvToolsLib
+#endif
+ )
{
+#ifndef DISABLE_DYNLOADING
::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
#ifdef LIBO_MERGELIBS
merged,
@@ -1086,6 +1101,9 @@ css::uno::Reference css::awt::XWindowPeer
VCLXToolkit::ImplCreateWindow(
::rtl::OUString aFunctionName( CreateWindow );
fnSvtCreateWindow = (FN_SvtCreateWindow)osl_getFunctionSymbol(
hSvToolsLib, aFunctionName.pData );
}
+#else
+fnSvtCreateWindow = CreateWindow;
+#endif
}
// ask the SvTool creation function
if ( fnSvtCreateWindow )
commit 0c1553a86e837b7538dc0f80316ed0798747756b
Author: Tor Lillqvist t...@iki.fi
Date: Thu Oct 4 07:08:02 2012 +0300
Disable-dynloading updates to component list
Change-Id: Idf092958e46a2ad9d56541c90c5a2beb44baff48
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index f783f87..b89fc5b 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -462,11 +462,13 @@ extern C
extern void * reflection_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * sfx_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * svl_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
+extern void * tk_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
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 * 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 );
extern void * xstor_component_getFactory( const sal_Char * pImplName, void
* pServiceManager, void * pRegistryKey );
}
#endif
@@ -525,24 +527,27 @@ Reference XInterface SAL_CALL
loadSharedLibComponentFactory(
oslGenericFunction pSym = NULL;
#ifdef DISABLE_DYNLOADING
+
// First test library names that aren't app-specific.
static lib_to_component_mapping non_app_specific_map[] = {
{ bootstrap.uno SAL_DLLEXTENSION, bootstrap_component_getFactory },
{ bootstrap.uno.a, bootstrap_component_getFactory },
{ configmgr.uno.a, configmgr_component_getFactory },
-{ expwrap.uno.a, expwrap_component_getFactory },
-{ fastsax.uno.a, fastsax_component_getFactory },
-{
[Libreoffice-commits] .: 2 commits - cppuhelper/source desktop/inc desktop/source offapi/com
cppuhelper/source/defaultbootstrap.cxx | 26 -
desktop/inc/app.hxx|1
desktop/source/app/app.cxx | 219 +++--
desktop/source/app/check_ext_deps.cxx | 38 +-
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |2
desktop/source/deployment/inc/dp_misc.h|6
desktop/source/deployment/manager/dp_extensionmanager.cxx | 10
desktop/source/deployment/manager/dp_extensionmanager.hxx |2
desktop/source/deployment/manager/dp_manager.cxx |4
desktop/source/deployment/manager/dp_manager.h |1
desktop/source/deployment/misc/dp_misc.cxx |5
desktop/source/pkgchk/unopkg/unopkg_app.cxx|4
offapi/com/sun/star/deployment/XExtensionManager.idl |4
offapi/com/sun/star/deployment/XPackageManager.idl |4
14 files changed, 194 insertions(+), 132 deletions(-)
New commits:
commit 1b40fbe41459a2231870af94a06263d89af554a6
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 24 16:45:20 2012 +0200
fdo#53968 etc.: Fix more doesn't start after upgrade problems
* fdo#53968 revealed that multiple soffice.bin instances can run removeTree
in
parallel. Therefore, demoted failures from exceptions to SAL_WARNs. (And
keeping fingers crossed.)
* a8cdce148c76c93c5d41820610d6e6ac175e03a7 fdo#53655: Ignore failure to
remove
directories (as happens on Windows XP) was due to a forgotten
osl::Directory::close before calling osl::Directory::remove after all.
* UserInstallations have been seen in the wild where no extensions were
installed per-user (any longer), but user/uno_packages/cache/registry/
com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
contained data nevertheless. To reliably clean out any old junk,
refreshBundledExtensionsDir has been extended to cleanExtensionsCache
which in
tandem with an extended Desktop::SynchronizeExtensionRepositories now
cleanly
re-installs all bundled, shared, and per-user extensions after a LO
upgrade.
Change-Id: Ic6b5b6c1945d76eb3a65b6cd4512a657b7a835a0
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 22866ef..be2c552 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -199,6 +199,7 @@ class Desktop : public Application
sal_Boolm_bMinimized;
sal_Boolm_bInvisible;
+boolm_bCleanedExtensionCache;
boolm_bServicesRegistered;
sal_uInt16 m_nAppEvents;
BootstrapError m_aBootstrapError;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2d424ea..e107c48 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -152,77 +152,81 @@ namespace {
void removeTree(OUString const url) {
osl::Directory dir(url);
-switch (dir.open()) {
+osl::FileBase::RC rc = dir.open();
+switch (rc) {
case osl::FileBase::E_None:
break;
case osl::FileBase::E_NOENT:
return; //TODO: SAL_WARN if recursive
default:
-throw css::uno::RuntimeException(
-cannot open directory + url,
-css::uno::Reference css::uno::XInterface ());
+SAL_WARN(desktop, cannot open directory url : +rc);
+return;
}
for (;;) {
osl::DirectoryItem i;
-osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
+rc = dir.getNextItem(i, SAL_MAX_UINT32);
if (rc == osl::FileBase::E_NOENT) {
break;
}
if (rc != osl::FileBase::E_None) {
-throw css::uno::RuntimeException(
-(cannot iterate directory + url + :
- + OUString::valueOf(static_cast sal_Int32 (rc))),
-css::uno::Reference css::uno::XInterface ());
+SAL_WARN(
+desktop,cannot iterate directory url : +rc);
+break;
}
osl::FileStatus stat(
osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileURL);
rc = i.getFileStatus(stat);
if (rc != osl::FileBase::E_None) {
-throw css::uno::RuntimeException(
-(cannot stat in directory + url + :
- + OUString::valueOf(static_cast sal_Int32 (rc))),
-css::uno::Reference css::uno::XInterface ());
+SAL_WARN(
+desktop, cannot stat in directory url : +rc);
+continue;
}
if (stat.getFileType() == osl::FileStatus::Directory) { //TODO:
symlinks
removeTree(stat.getFileURL());
} else {
rc =
[Libreoffice-commits] .: 2 commits - cppuhelper/source
cppuhelper/source/defaultbootstrap.cxx | 26 +++---
1 file changed, 11 insertions(+), 15 deletions(-)
New commits:
commit 5fd78feebe220f848c4a0d3beeb1ef0f04bbae6f
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jun 1 10:10:07 2012 +0200
Revert bootstrapping should elide duplicate .rdb paths in the
configuration
This reverts commit b162aec6254ab535cc5eb990b249f46aa8e79153, which
increased
code complexity for no benefit (the dubious scenario it was introduced for
concerned duplicate service rdbs rather than type rdbs, anyway).
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index dd7aeaf..1f119c9 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -2157,7 +2157,6 @@ css::uno::Reference css::registry::XSimpleRegistry
createTypeRegistry(
css::uno::Reference css::registry::XRegistryKey ()),
css::uno::UNO_QUERY_THROW);
css::uno::Reference css::registry::XSimpleRegistry reg;
-std::vectorrtl::OUString loaded;
for (sal_Int32 i = 0; i != -1;) {
rtl::OUString uri(uris.getToken(0, ' ', i));
if (uri.isEmpty()) {
@@ -2166,13 +2165,9 @@ css::uno::Reference css::registry::XSimpleRegistry
createTypeRegistry(
bool optional;
bool directory;
decodeRdbUri(uri, optional, directory);
-if (::std::find (loaded.begin(), loaded.end(), uri) == loaded.end())
-{
-reg = directory
-? readTypeRdbDirectory(uri, optional, reg, simpleRegs,
nestedRegs)
-: readTypeRdbFile(uri, optional, reg, simpleRegs, nestedRegs);
-loaded.push_back(uri);
-}
+reg = directory
+? readTypeRdbDirectory(uri, optional, reg, simpleRegs, nestedRegs)
+: readTypeRdbFile(uri, optional, reg, simpleRegs, nestedRegs);
}
return reg;
}
commit 0951b76a00edd1cd89b8acf86c785d56fc776351
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jun 1 10:09:18 2012 +0200
Add virtual for consistency
Change-Id: I8ecc2edde553edbd80ca04e2f3d541c31f516211
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index 55a4f09..dd7aeaf 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -648,27 +648,28 @@ public:
css::uno::Reference css::uno::XComponentContext const Context)
throw (css::uno::Exception, css::uno::RuntimeException);
-css::uno::Type SAL_CALL getElementType() throw
(css::uno::RuntimeException);
+virtual css::uno::Type SAL_CALL getElementType()
+throw (css::uno::RuntimeException);
-sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);
+virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);
-css::uno::Reference css::container::XEnumeration SAL_CALL
+virtual css::uno::Reference css::container::XEnumeration SAL_CALL
createEnumeration() throw (css::uno::RuntimeException);
-sal_Bool SAL_CALL has(css::uno::Any const aElement)
+virtual sal_Bool SAL_CALL has(css::uno::Any const aElement)
throw (css::uno::RuntimeException);
-void SAL_CALL insert(css::uno::Any const aElement)
+virtual void SAL_CALL insert(css::uno::Any const aElement)
throw (
css::lang::IllegalArgumentException,
css::container::ElementExistException, css::uno::RuntimeException);
-void SAL_CALL remove(css::uno::Any const aElement)
+virtual void SAL_CALL remove(css::uno::Any const aElement)
throw (
css::lang::IllegalArgumentException,
css::container::NoSuchElementException,
css::uno::RuntimeException);
-css::uno::Reference css::container::XEnumeration SAL_CALL
+virtual css::uno::Reference css::container::XEnumeration SAL_CALL
createContentEnumeration(rtl::OUString const aServiceName)
throw (css::uno::RuntimeException);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppuhelper/source store/source
cppuhelper/source/defaultbootstrap.cxx |2 +-
store/source/makefile.mk |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f5a414d242f3b3bce19de4905d7b5dce9792b66c
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 24 10:41:58 2012 +0100
WaE: simple minded MSVC2008 thinks s could be used uninitialized
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index f156ce1..f948586 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1370,7 +1370,7 @@ rtl::OUString ServiceManager::readLegacyRdbString(
{
RegistryKey subkey;
RegValueType t;
-sal_uInt32 s;
+sal_uInt32 s(0);
if (key.openKey(path, subkey) != REG_NO_ERROR
|| subkey.getValueInfo(rtl::OUString(), t, s) != REG_NO_ERROR
|| t != RG_VALUETYPE_STRING
commit a0d6c5dd9bf359d8428f26701acb6b2036b4417c
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 24 10:21:48 2012 +0100
WaE: MSVC2008 C4530 exception handler without unwind semantics
diff --git a/store/source/makefile.mk b/store/source/makefile.mk
index c7ae53d..4263a57 100644
--- a/store/source/makefile.mk
+++ b/store/source/makefile.mk
@@ -29,6 +29,7 @@ PRJ=..
PRJNAME=store
TARGET=store
+ENABLE_EXCEPTIONS=TRUE
# --- Settings ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
