[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source
extensions/source/update/check/updatecheckjob.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 5e5c8d34ed480c62455e24347a5858ea3b84d48c
Author: Michael Meeks michael.me...@suse.com
Date: Wed Jun 5 13:03:22 2013 +0100
fdo#64962 - ignore exceptions from checking with the update service.
Change-Id: If627b303f8710b915dcbdcb899454631f607e217
Reviewed-on: https://gerrit.libreoffice.org/4164
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/extensions/source/update/check/updatecheckjob.cxx
b/extensions/source/update/check/updatecheckjob.cxx
index 2360daf..3593a38 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -133,11 +133,17 @@ void SAL_CALL InitUpdateCheckJobThread::run()
return;
}
-rtl::Reference UpdateCheck aController( UpdateCheck::get() );
-aController-initialize( m_xParameters, m_xContext );
-
-if ( m_bShowDialog )
-aController-showDialog( true );
+try {
+rtl::Reference UpdateCheck aController( UpdateCheck::get() );
+aController-initialize( m_xParameters, m_xContext );
+
+if ( m_bShowDialog )
+aController-showDialog( true );
+} catch (const uno::Exception e) {
+// fdo#64962 - don't bring the app down on some unexpected exception.
+OSL_TRACE( Caught init update exception: %s\n thread terminated.\n,
+OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() );
+}
}
void InitUpdateCheckJobThread::setTerminating() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source
extensions/source/propctrlr/propertycomposer.cxx |2 +-
extensions/source/propctrlr/propertycomposer.hxx |4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit da18b4c3fd9cb8fe0428e59c02fca527dece2e88
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu May 30 14:25:27 2013 +0200
setPropertyValue can throw PropertyVetoException
fixes abort in report design when entering e.g. invalid positions or size
for control
Change-Id: I38835ed79d5bee15c4d7b57ab6780050d250732a
Reviewed-on: https://gerrit.libreoffice.org/4096
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/extensions/source/propctrlr/propertycomposer.cxx
b/extensions/source/propctrlr/propertycomposer.cxx
index c80bdf7..0629d70 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -129,7 +129,7 @@ namespace pcr
}
//
-void SAL_CALL PropertyComposer::setPropertyValue( const ::rtl::OUString
_rPropertyName, const Any _rValue ) throw (UnknownPropertyException,
RuntimeException)
+void SAL_CALL PropertyComposer::setPropertyValue( const ::rtl::OUString
_rPropertyName, const Any _rValue ) throw (UnknownPropertyException,
RuntimeException, PropertyVetoException)
{
MethodGuard aGuard( *this );
::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(),
SetPropertyValue( _rPropertyName, _rValue ) );
diff --git a/extensions/source/propctrlr/propertycomposer.hxx
b/extensions/source/propctrlr/propertycomposer.hxx
index 68e4cee..0f9ac5f 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -27,6 +27,8 @@
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/inspection/XPropertyHandler.hpp
#include com/sun/star/lang/DisposedException.hpp
+#include com/sun/star/beans/UnknownPropertyException.hpp
+#include com/sun/star/beans/PropertyVetoException.hpp
#include cppuhelper/compbase2.hxx
#include comphelper/broadcasthelper.hxx
#include comphelper/listenernotification.hxx
@@ -78,7 +80,7 @@ namespace pcr
// XPropertyHandler overridables
virtual voidSAL_CALL inspect( const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
_rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const ::rtl::OUString _rPropertyName ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
-virtual voidSAL_CALL setPropertyValue(
const ::rtl::OUString _rPropertyName, const ::com::sun::star::uno::Any
_rValue ) throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
+virtual voidSAL_CALL setPropertyValue(
const ::rtl::OUString _rPropertyName, const ::com::sun::star::uno::Any
_rValue ) throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException,
::com::sun::star::beans::PropertyVetoException);
virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(
const ::rtl::OUString _rPropertyName, const ::com::sun::star::uno::Any
_rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(
const ::rtl::OUString _rPropertyName, const ::com::sun::star::uno::Any
_rPropertyValue, const ::com::sun::star::uno::Type _rControlValueType ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::beans::PropertyState
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source
extensions/source/nsplugin/source/nsplugin_oo.rc |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 3bc3e7d86b4f6368f30dde956d3757c795e3ce1b Author: Andras Timar ati...@suse.com Date: Thu May 2 08:58:05 2013 -0700 remove unsupported binfilter types from npsoplugin Change-Id: Ifb23e61b265697272e54df225719e006319e79af Reviewed-on: https://gerrit.libreoffice.org/3747 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc index ba09335..d294836 100644 --- a/extensions/source/nsplugin/source/nsplugin_oo.rc +++ b/extensions/source/nsplugin/source/nsplugin_oo.rc @@ -24,9 +24,9 @@ * for a copy of the LGPLv3 License. * / -#define ADDITIONAL_VERINFO1 VALUE FileExtents, sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0\ -VALUE FileOpenName, StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0 -#define ADDITIONAL_VERINFO2VALUE FileDescription, LibreOffice Plug-in handles all its documents VALUE ProductName, LibreOffice Plug-in VALUE MIMEType, application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template| +#define ADDITIONAL_VERINFO1 VALUE FileExtents, sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0\ +VALUE FileOpenName, StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0 +#define ADDITIONAL_VERINFO2VALUE FileDescription, LibreOffice Plug-in handles all its documents VALUE ProductName, LibreOffice Plug-in VALUE MIMEType, application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template| #define ADDITIONAL_VERINFO3 application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0 #define VERVARIANT 3 #define ORG_NAME npsoplugin.dll ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source extensions/WinResTarget_npsoplugin.mk
extensions/WinResTarget_npsoplugin.mk|5 + extensions/source/nsplugin/source/nsplugin_oo.rc |2 -- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 181e15716a159dc8a882042ce6c5123025167da7 Author: Andras Timar ati...@suse.com Date: Thu May 2 08:59:57 2013 -0700 remove defines from npsoplugin resource, that are defined elsewhere Change-Id: I745944202a25a348f36e79d28f03740a28b70eee Reviewed-on: https://gerrit.libreoffice.org/3748 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk index 9db0984..9da0038 100644 --- a/extensions/WinResTarget_npsoplugin.mk +++ b/extensions/WinResTarget_npsoplugin.mk @@ -30,6 +30,11 @@ $(eval $(call gb_WinResTarget_WinResTarget,npsoplugin/npsoplugin)) +$(eval $(call gb_WinResTarget_add_defs,npsoplugin/npsoplugin,\ +-DVERVARIANT=$(BUILD) \ +-DRES_APP_VENDOR=$(OOO_VENDOR) \ +)) + $(eval $(call gb_WinResTarget_set_rcfile,npsoplugin/npsoplugin,extensions/source/nsplugin/source/nsplugin_oo)) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc index d294836..6284abe 100644 --- a/extensions/source/nsplugin/source/nsplugin_oo.rc +++ b/extensions/source/nsplugin/source/nsplugin_oo.rc @@ -28,9 +28,7 @@ VALUE FileOpenName, StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0 #define ADDITIONAL_VERINFO2VALUE FileDescription, LibreOffice Plug-in handles all its documents VALUE ProductName, LibreOffice Plug-in VALUE MIMEType, application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template| #define ADDITIONAL_VERINFO3 application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0 -#define VERVARIANT 3 #define ORG_NAME npsoplugin.dll -#define RES_APP_VENDOR #define INTERNAL_NAME npsoplugin #include windows.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source
extensions/source/nsplugin/source/npshell.cxx | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 2205ca85457639ee8833f1d11d7a66fd4a00bbd3
Author: Andras Timar ati...@suse.com
Date: Thu May 2 09:34:34 2013 -0700
remove unsupported binfilter types from npsoplugin
Change-Id: Ifd12d4d1f4dab0a6bea4701d0a1b9ab4f3763ce7
Reviewed-on: https://gerrit.libreoffice.org/3749
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/extensions/source/nsplugin/source/npshell.cxx
b/extensions/source/nsplugin/source/npshell.cxx
index cba9139..133e00b 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -338,16 +338,7 @@ bool sendMsg( PLUGIN_MSG* pMsg, size_t len, int iEnsure)
extern C
{
-char* pMimeTypes = const_cast char* (
application/vnd.stardivision.calc:sdc:StarCalc 3.0 - 5.0;
-application/vnd.stardivision.chart:sds:StarChart 3.0 - 5.0;
-application/vnd.stardivision.draw:sda:StarDraw 3.0 - 5.0;
-application/vnd.stardivision.impress:sdd:StarImpress 3.0 - 5.0;
-application/vnd.stardivision.impress-packed:sdp:StarImpress-packed 3.0 - 5.0;
-application/vnd.stardivision.math:smf:StarMath 3.0 - 5.0;
-application/vnd.stardivision.writer:vor:StarWriter Template 3.0 - 5.0;
-application/vnd.stardivision.writer-global:sgl:StarWriter Global 3.0 - 5.0;
-application/vnd.staroffice.writer:sdw:StarWriter 3.0 - 5.0;
-application/msword:doc:MS Word document;
+char* pMimeTypes = const_cast char* ( application/msword:doc:MS Word
document;
application/msword:dot:MS Word document template;
application/vnd.ms-excel:xls:MS Excel spreadsheet;
application/vnd.ms-excel:xlt:MS Excel spreadsheet template;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source
extensions/source/macosx/spotlight/OOoSpotlightImporter.m | 27 +++---
1 file changed, 22 insertions(+), 5 deletions(-)
New commits:
commit 5cb823aa71981c1fb13872e67e74bf5027f46cd0
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 19 17:10:50 2013 +0200
Fix scan for central directory end signature in ODF in Spotlight importer
Once this was fixed it seems to work nicely. Add keywords in
File:Properties and they show up in Finder's Properties, and Spotlight
finds text from the document contents.
(cherry picked from commit b8da61acb2bb887a7335a5db82b8b5ae1e0fab69)
(cherry picked from commit 95e6a0885e65cc57b11719cc0658be9d8b78fba9)
Change-Id: I9adc65d1821d0920ce3a39d05697557c4303ff68
Reviewed-on: https://gerrit.libreoffice.org/2265
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
index 964b627..3a72d53 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
@@ -208,21 +208,38 @@ static bool areHeadersConsistent(const LocalFileHeader
*header, const CentralDir
static bool findCentralDirectoryEnd(NSFileHandle *file)
{
+// Assume the cdir end is in the last 1024 bytes
+// Scan backward from end of file for the end signature
+
[file seekToEndOfFile];
unsigned long long fileLength = [file offsetInFile];
-[file seekToFileOffset: 0];
-while ([file offsetInFile] fileLength)
+if (fileLength 10)
+return false;
+
+[file seekToFileOffset: (fileLength - 4)];
+
+unsigned long long limit;
+if (fileLength 1024)
+limit = fileLength - 1024;
+else
+limit = 0;
+
+unsigned long long offset;
+while ((offset = [file offsetInFile]) limit)
{
-unsigned long long offset = [file offsetInFile];
unsigned signature = readInt(file);
if (signature == CDIR_END_SIG)
{
-[file seekToFileOffset: (offset - 4)];
+// Seek back over the CDIR_END_SIG
+[file seekToFileOffset: offset];
return true;
}
else
-[file seekToFileOffset: (offset - 3)];
+{
+// Seek one byte back
+[file seekToFileOffset: (offset - 1)];
+}
}
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source
extensions/source/macosx/spotlight/main.m |1 +
1 file changed, 1 insertion(+)
New commits:
commit f68b89cbfd76e43a701f8457a3a97c87be74758a
Author: Tor Lillqvist t...@iki.fi
Date: Mon Feb 18 21:42:00 2013 +0200
Make sure MetadataImporterPluginFactory has external linkage
Otherwise, in a LO built with hidden visibility (as gcc terminology,
not ELF, Mac OS X does not use ELF), Spotlight won't be able to use
our importer.
(cherry picked from commit 7c6b42851bc0a94f6aa8c3e28892d1ab4b297c25)
Change-Id: Ie19082f9f14e4cc75ae6f7583031b929b7b75330
Reviewed-on: https://gerrit.libreoffice.org/2247
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/extensions/source/macosx/spotlight/main.m
b/extensions/source/macosx/spotlight/main.m
index 491adc1..3016a8a 100644
--- a/extensions/source/macosx/spotlight/main.m
+++ b/extensions/source/macosx/spotlight/main.m
@@ -212,6 +212,7 @@ ULONG MetadataImporterPluginRelease(void *thisInstance)
//
-
//Implementation of the factory function for this type.
//
+__attribute__ ((visibility(default)))
void *
MetadataImporterPluginFactory(CFAllocatorRef allocator, CFUUIDRef typeID)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source
extensions/source/update/feed/updatefeed.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e6ec8e83bad7d04f9f7b503626b87af75c052deb
Author: Petr Mladek pmla...@suse.cz
Date: Mon Feb 18 11:03:12 2013 +0100
avoid space in the version of the update information provider
LO-4.0.0.3 sends 4.0 .0.3 to the server.
Change-Id: I2cda062778ac3632f89eb5c0d1cc85e57d8d1870
Reviewed-on: https://gerrit.libreoffice.org/2228
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz
diff --git a/extensions/source/update/feed/updatefeed.cxx
b/extensions/source/update/feed/updatefeed.cxx
index c2dfa99..0789bdc 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -358,7 +358,6 @@ UpdateInformationProvider::UpdateInformationProvider(
UNISTRING(org.openoffice.Setup/Product),
UNISTRING(ooSetupExtension)) = extension;
if (!extension.isEmpty()) {
-buf.append(sal_Unicode(' '));
buf.append(extension);
}
rtl::OUString product(buf.makeStringAndClear());
@@ -377,6 +376,8 @@ UpdateInformationProvider::UpdateInformationProvider(
i += product.getLength();
}
+SAL_INFO(extensions.update, UpdateUserAgent: aUserAgent);
+
m_aRequestHeaderList[0].Name = UNISTRING(Accept-Language);
m_aRequestHeaderList[0].Value = getConfigurationItem(
xConfigurationProvider, UNISTRING(org.openoffice.Setup/L10N),
UNISTRING(ooLocale) );
if( !aUserAgent.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extensions/source
extensions/source/abpilot/typeselectionpage.cxx | 25 +--- 1 file changed, 10 insertions(+), 15 deletions(-) New commits: commit d68310c185886c6755849640d568c4597456282e Author: David Ostrovsky da...@ostrovsky.org Date: Mon Feb 4 19:46:32 2013 +0100 fdo#57417: remove LDAP choice from non windows platform Change-Id: I0557a7c9cf0d18fbe5620ef8869bb83d0a6a7904 Reviewed-on: https://gerrit.libreoffice.org/1983 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com Reviewed-on: https://gerrit.libreoffice.org/2022 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 6ce6280..e5295e1 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -67,13 +67,12 @@ namespace abp // On Linux: // - EVOLUTION, EVOLUTION_GROUPWISE, EVOLUTION_LDAP (if applicable) // - MORK (via mork driver, which is built unconditionally) -// - THUNDERBIRD (via mork driver?, which is built unconditionally) // - KAB (if applicable) -// - LDAP (via mork driver?, which is built unconditionally) // - OTHER // // On Mac OS X: // - MACAB (if applicable) +// - MORK (via mork driver, which is built unconditionally) // - OTHER // // On Windows: @@ -81,22 +80,18 @@ namespace abp // if WITH_MOZILLA) // - OTHER -bool bWithMozilla = false, bWindows = false; -bool bHaveEvolution = false, bHaveKab = false; +bool bWithMozilla = false; +bool bHaveEvolution = false; +bool bHaveKab = false; bool bHaveMacab = false; +bool bWithMork = false; #if defined WNT - #if defined WITH_MOZILLA bWithMozilla = true; #endif -bWindows = true; - #else - -#if !defined MACOSX -bWithMozilla = true; -#endif +bWithMork = true; Reference XDriverAccess xManager(_pParent-getORB()-createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sdbc.DriverManager))), UNO_QUERY); @@ -139,13 +134,13 @@ namespace abp m_aAllTypes.push_back( ButtonItem( m_aEvolution, AST_EVOLUTION, bHaveEvolution ) ); m_aAllTypes.push_back( ButtonItem( m_aEvolutionGroupwise, AST_EVOLUTION_GROUPWISE, bHaveEvolution ) ); m_aAllTypes.push_back( ButtonItem( m_aEvolutionLdap, AST_EVOLUTION_LDAP, bHaveEvolution ) ); -m_aAllTypes.push_back( ButtonItem( m_aMORK, AST_MORK, bWithMozilla ) ); -m_aAllTypes.push_back( ButtonItem( m_aThunderbird, AST_THUNDERBIRD, bWithMozilla ) ); +m_aAllTypes.push_back( ButtonItem( m_aMORK, AST_MORK, bWithMozilla || bWithMork) ); +m_aAllTypes.push_back( ButtonItem( m_aThunderbird, AST_THUNDERBIRD, bWithMozilla || bWithMork) ); m_aAllTypes.push_back( ButtonItem( m_aKab, AST_KAB, bHaveKab ) ); m_aAllTypes.push_back( ButtonItem( m_aMacab, AST_MACAB, bHaveMacab ) ); m_aAllTypes.push_back( ButtonItem( m_aLDAP, AST_LDAP, bWithMozilla ) ); -m_aAllTypes.push_back( ButtonItem( m_aOutlook, AST_OUTLOOK, bWithMozilla bWindows ) ); -m_aAllTypes.push_back( ButtonItem( m_aOE, AST_OE, bWithMozilla bWindows ) ); +m_aAllTypes.push_back( ButtonItem( m_aOutlook, AST_OUTLOOK, bWithMozilla ) ); +m_aAllTypes.push_back( ButtonItem( m_aOE, AST_OE, bWithMozilla ) ); m_aAllTypes.push_back( ButtonItem( m_aOther, AST_OTHER, true ) ); Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
