From cb2c215b0d2e7a76724c9ee8379842e3a7a56646 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 23 Feb 2010 23:42:02 -0500 Subject: calctabcolor: Added a new property "TabColor" to css.sheet.Spreadsheet service. --- offapi/com/sun/star/sheet/Spreadsheet.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/offapi/com/sun/star/sheet/Spreadsheet.idl b/offapi/com/sun/star/sheet/Spreadsheet.idl index 58dedc835..d37ab880a 100644 --- a/offapi/com/sun/star/sheet/Spreadsheet.idl +++ b/offapi/com/sun/star/sheet/Spreadsheet.idl @@ -99,6 +99,8 @@ #include #endif +#include + //============================================================================= module com { module sun { module star { module sheet { @@ -267,6 +269,9 @@ service Spreadsheet */ [optional, property] boolean AutomaticPrintArea; + /** specifies the color of the sheet tab, if any. + */ + [optional, property] com::sun::star::util::Color TabColor; }; //============================================================================= -- cgit v1.2.3 From a305f87e3ebff19767327910f1fc37e510c30bd4 Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Wed, 3 Mar 2010 14:27:29 +0100 Subject: cbosdo03: Fixed issue 109772. Backported go-oo patch to the CWS --- offapi/com/sun/star/style/NumberingType.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/offapi/com/sun/star/style/NumberingType.idl b/offapi/com/sun/star/style/NumberingType.idl index e7c593555..0e7fe337d 100644 --- a/offapi/com/sun/star/style/NumberingType.idl +++ b/offapi/com/sun/star/style/NumberingType.idl @@ -124,6 +124,7 @@ published constants NumberingType //------------------------------------------------------------------------- /** Numbering for Chinese lower case number + as "一,二,三..." */ const short NUMBER_LOWER_ZH = 15; @@ -139,11 +140,13 @@ published constants NumberingType //------------------------------------------------------------------------- /** Bullet for Chinese Tian Gan + as "甲,乙,丙..." */ const short TIAN_GAN_ZH = 18; //------------------------------------------------------------------------- /** Bullet for Chinese Di Zi + as "子,丑,寅..." */ const short DI_ZI_ZH = 19; @@ -174,36 +177,43 @@ published constants NumberingType //------------------------------------------------------------------------- /** Numbering for Korean upper case number + as "壹,貳,參..." */ const short NUMBER_UPPER_KO = 25; //------------------------------------------------------------------------- /** Numbering for Korean hangul number + as "일,이,삼..." */ const short NUMBER_HANGUL_KO = 26; //------------------------------------------------------------------------- /** Bullet for Korean Hangul Jamo + as "ㄱ,ㄴ,ㄷ..." */ const short HANGUL_JAMO_KO = 27; //------------------------------------------------------------------------- /** Bullet for Korean Hangul Syllable + as "가,나,다..." */ const short HANGUL_SYLLABLE_KO = 28; //------------------------------------------------------------------------- /** Bullet for Korean Hangul Circled Jamo + as "㉠,㉡,㉢..." */ const short HANGUL_CIRCLED_JAMO_KO = 29; //------------------------------------------------------------------------- /** Bullet for Korean Hangul Circled Syllable + as "㉮,㉯,㉰..." */ const short HANGUL_CIRCLED_SYLLABLE_KO = 30; //------------------------------------------------------------------------- /** Numbering in Arabic alphabet letters + as "أ,ب,ت..." @since OOo 1.1.2 */ -- cgit v1.2.3 From d498fd15dd026466e3a5987b0e5f1a39f69a4f6c Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Wed, 3 Mar 2010 16:36:43 +0100 Subject: #109634# password to modify dialog --- .../sun/star/task/DocumentMSPasswordRequest2.idl | 68 ++++++++++++++++++++++ .../com/sun/star/task/DocumentPasswordRequest2.idl | 67 +++++++++++++++++++++ offapi/com/sun/star/task/makefile.mk | 2 + 3 files changed, 137 insertions(+) create mode 100755 offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl create mode 100755 offapi/com/sun/star/task/DocumentPasswordRequest2.idl mode change 100644 => 100755 offapi/com/sun/star/task/makefile.mk diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl new file mode 100755 index 000000000..abd3b08fa --- /dev/null +++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl @@ -0,0 +1,68 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright IBM Corporation 2009. + * Copyright 2009 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: DocumentMSPasswordRequest.idl,v $ + * $Revision: 1.0 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_task_DocumentMSPasswordRequest2_idl__ +#define __com_sun_star_task_DocumentMSPasswordRequest2_idl__ + +#include + + +//============================================================================= + +module com { module sun { module star { module task { + +//============================================================================= +/** this request specifies if a password for opening or modifying of an encrypted Microsoft Office document is requested. + +

+ It is supported by InteractionHandler service, and can + be used to interact for a document password. Continuations for using with + the mentioned service are Abort and Approve. +

+ + @see com::sun::star::task::PasswordRequest + @see com::sun::star::task::DocumentMSPasswordRequest + + @since OOo 3.3 +*/ +exception DocumentMSPasswordRequest2 : DocumentMSPasswordRequest +{ + //------------------------------------------------------------------------- + /** specifies if the requested password is for opening a document or for mofiying it. + */ + boolean IsRequestPasswordToModify; + +}; + +//============================================================================= + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/task/DocumentPasswordRequest2.idl b/offapi/com/sun/star/task/DocumentPasswordRequest2.idl new file mode 100755 index 000000000..a9500133e --- /dev/null +++ b/offapi/com/sun/star/task/DocumentPasswordRequest2.idl @@ -0,0 +1,67 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: DocumentPasswordRequest.idl,v $ + * $Revision: 1.8 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_task_DocumentPasswordRequest2_idl__ +#define __com_sun_star_task_DocumentPasswordRequest2_idl__ + +#include + + +//============================================================================= + +module com { module sun { module star { module task { + +//============================================================================= +/** this request specifies if a password for opening or modifying a document is requested. + +

+ It is supported by InteractionHandler service, and can + be used to interact for a document password. Continuations for using with + the mentioned service are Abort and Approve. +

+ + @see com::sun::star::task::PasswordRequest + @see com::sun::star::task::DocumentPasswordRequest + + @since OOo 3.3 +*/ +exception DocumentPasswordRequest2 : DocumentPasswordRequest +{ + //------------------------------------------------------------------------- + /** specifies if the requested password is for opening a document or for mofiying it. + */ + boolean IsRequestPasswordToModify; + +}; + +//============================================================================= + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk old mode 100644 new mode 100755 index d77b1d602..4dccb585f --- a/offapi/com/sun/star/task/makefile.mk +++ b/offapi/com/sun/star/task/makefile.mk @@ -47,7 +47,9 @@ IDLFILES=\ DocumentMacroConfirmationRequest.idl\ DocumentMacroConfirmationRequest2.idl\ DocumentPasswordRequest.idl\ + DocumentPasswordRequest2.idl\ DocumentMSPasswordRequest.idl\ + DocumentMSPasswordRequest2.idl\ ErrorCodeRequest.idl\ ErrorCodeIOException.idl\ FutureDocumentVersionProductUpdateRequest.idl\ -- cgit v1.2.3 From 67a6d16f3411e8346a19e808d8142e0dc5990456 Mon Sep 17 00:00:00 2001 From: Daniel Rentz Date: Thu, 4 Mar 2010 11:59:48 +0100 Subject: tl78: #i109779# move new functionality to comphelper::MediaDescriptor --- offapi/com/sun/star/document/MediaDescriptor.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl index 49c9cf285..6d0d1c2c1 100644 --- a/offapi/com/sun/star/document/MediaDescriptor.idl +++ b/offapi/com/sun/star/document/MediaDescriptor.idl @@ -140,6 +140,11 @@ published service MediaDescriptor for a special component type. Format of that depends from real type of adressed component.

+ +

+ For extensibility, it is recommended to use values of type + sequence with this property. +

*/ [optional,property] any ComponentData; -- cgit v1.2.3 From 93a2446535001682dac3bea7a0961592213bf6de Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Tue, 30 Mar 2010 16:47:18 +0200 Subject: tl78: #i110383# support password to modify --- offapi/com/sun/star/task/XInteractionPassword2.idl | 80 ++++++++++++++++++++++ offapi/com/sun/star/task/makefile.mk | 1 + 2 files changed, 81 insertions(+) create mode 100644 offapi/com/sun/star/task/XInteractionPassword2.idl diff --git a/offapi/com/sun/star/task/XInteractionPassword2.idl b/offapi/com/sun/star/task/XInteractionPassword2.idl new file mode 100644 index 000000000..97bd6aff5 --- /dev/null +++ b/offapi/com/sun/star/task/XInteractionPassword2.idl @@ -0,0 +1,80 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XInteractionPassword.idl,v $ + * $Revision: 1.8 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_task_XInteractionPassword2_idl__ +#define __com_sun_star_task_XInteractionPassword2_idl__ + +#ifndef __com_sun_star_task_XInteractionPassword_idl__ +#include +#endif + +//============================================================================= + +module com { module sun { module star { module task { + +//============================================================================= +/** A continuation to get a password from interaction helper, extends + XInteractionPassword with possibility to provide password + to modify. + + @since OOo 3.3 +*/ +published interface XInteractionPassword2 : ::com::sun::star::task::XInteractionPassword +{ + //------------------------------------------------------------------------- + /** stores "password to modify" to the continuation. + */ + void setPasswordToModify( [in] string aPasswd ); + + //------------------------------------------------------------------------- + /** gets "password to modify" from the continuation. + */ + string getPasswordToModify(); + + //------------------------------------------------------------------------- + /** stores "recommend readonly" to the continuation. It specifies whether + the document should be loaded readonly per default. + */ + void setRecommendReadOnly( [in] boolean bReadOnly ); + + //------------------------------------------------------------------------- + /** gets "recommend readonly" from the continuation. It specifies whether + the document should be loaded readonly per default. + */ + boolean getRecommendReadOnly(); + + +}; + +//============================================================================= + +}; }; }; }; + +#endif + diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk index 7166fb6ff..4b58d9ae1 100755 --- a/offapi/com/sun/star/task/makefile.mk +++ b/offapi/com/sun/star/task/makefile.mk @@ -68,6 +68,7 @@ IDLFILES=\ XInteractionAskLater.idl\ XInteractionDisapprove.idl\ XInteractionPassword.idl\ + XInteractionPassword2.idl\ XJob.idl\ XJobExecutor.idl\ XJobListener.idl\ -- cgit v1.2.3 From 4948e05672dec3008f2931fc8c39c95d1ff9edab Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Tue, 18 May 2010 14:05:20 +0200 Subject: systemlibc: migrate systemlibc to hg; try again from scratch --- idlc/source/preproc/getopt.c | 94 ----------------------------------------- idlc/source/preproc/makefile.mk | 1 - idlc/source/preproc/nlist.c | 3 -- idlc/source/preproc/unix.c | 6 +-- 4 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 idlc/source/preproc/getopt.c diff --git a/idlc/source/preproc/getopt.c b/idlc/source/preproc/getopt.c deleted file mode 100644 index a8ee22a88..000000000 --- a/idlc/source/preproc/getopt.c +++ /dev/null @@ -1,94 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include -#include - -#define EPR fprintf(stderr, -#define ERR(str, chr) if(opterr) { EPR "%s%c\n", str, chr); } - -int opterr = 1; -int optind = 1; -int optopt; -char *optarg; - -int - cppgetopt(int argc, char *const argv[], const char *opts) -{ - static int sp = 1; - register int c; - register char *cp; - - if (sp == 1) - { - if (optind >= argc || - argv[optind][0] != '-' || argv[optind][1] == '\0') - return -1; - else - if (strcmp(argv[optind], "--") == 0) - { - optind++; - return -1; - } - } - optopt = c = argv[optind][sp]; - if (c == ':' || (cp = strchr(opts, c)) == 0) - { - ERR(": illegal option -- ", c); - if (argv[optind][++sp] == '\0') - { - optind++; - sp = 1; - } - return '?'; - } - if (*++cp == ':') - { - if (argv[optind][sp + 1] != '\0') - optarg = &argv[optind++][sp + 1]; - else - if (++optind >= argc) - { - ERR(": option requires an argument -- ", c); - sp = 1; - return '?'; - } - else - optarg = argv[optind++]; - sp = 1; - } - else - { - if (argv[optind][++sp] == '\0') - { - sp = 1; - optind++; - } - optarg = 0; - } - return c; -} diff --git a/idlc/source/preproc/makefile.mk b/idlc/source/preproc/makefile.mk index 7347f815a..f65f37e94 100644 --- a/idlc/source/preproc/makefile.mk +++ b/idlc/source/preproc/makefile.mk @@ -43,7 +43,6 @@ LIBSALCPPRT=$(0) OBJFILES= \ $(OBJ)$/cpp.obj \ $(OBJ)$/eval.obj \ - $(OBJ)$/getopt.obj \ $(OBJ)$/include.obj \ $(OBJ)$/lex.obj \ $(OBJ)$/macro.obj \ diff --git a/idlc/source/preproc/nlist.c b/idlc/source/preproc/nlist.c index e1b3089e7..1fde3ce43 100644 --- a/idlc/source/preproc/nlist.c +++ b/idlc/source/preproc/nlist.c @@ -29,9 +29,6 @@ #include #include "cpp.h" -extern int cppgetopt(int, char *const *, const char *); -extern char *optarg; -extern int optind; extern int Cplusplus; Nlist *kwdefined; char wd[128]; diff --git a/idlc/source/preproc/unix.c b/idlc/source/preproc/unix.c index fae43597f..215161ec9 100644 --- a/idlc/source/preproc/unix.c +++ b/idlc/source/preproc/unix.c @@ -39,9 +39,7 @@ #include "cpp.h" -extern int cppgetopt(int, char *const *, const char *); -extern char *optarg, rcsid[]; -extern int optind; +extern char rcsid[]; int Pflag = 0; /* print no line information */ int Iflag = 0; /* print includes */ @@ -62,7 +60,7 @@ void Tokenrow tr; setup_kwtab(); - while ((c = cppgetopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1) + while ((c = getopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1) switch (c) { case 'N': -- cgit v1.2.3 From 643a817432cab9fb925b80fbc036e2a05b44eb5d Mon Sep 17 00:00:00 2001 From: Daniel Rentz Date: Fri, 21 May 2010 16:46:32 +0200 Subject: dr76: #i103453# import visual area for embedded documents --- offapi/com/sun/star/embed/XVisualObject.idl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/offapi/com/sun/star/embed/XVisualObject.idl b/offapi/com/sun/star/embed/XVisualObject.idl index f71a78675..bd64941d9 100644 --- a/offapi/com/sun/star/embed/XVisualObject.idl +++ b/offapi/com/sun/star/embed/XVisualObject.idl @@ -71,13 +71,13 @@ interface XVisualObject: ::com::sun::star::uno::XInterface

@param nAspect - the aspect specifying the form of object representation - can take values from Aspects constant set + the aspect specifying the form of object representation. + Can take values from Aspects constant set. @param aSize the new size of the visual area - @thrown ::com::sun::star::lang::IllegalArgumentException + @throws ::com::sun::star::lang::IllegalArgumentException one of arguments is illegal @throws ::com::sun::star::embed::WrongStateException @@ -101,13 +101,13 @@ interface XVisualObject: ::com::sun::star::uno::XInterface

@param nAspect - the aspect specifying the form of object representation - can take values from Aspects constant set + the aspect specifying the form of object representation. + Can take values from Aspects constant set. @return the size of visual area - @thrown ::com::sun::star::lang::IllegalArgumentException + @throws ::com::sun::star::lang::IllegalArgumentException one of arguments is illegal @throws ::com::sun::star::embed::WrongStateException @@ -127,7 +127,8 @@ interface XVisualObject: ::com::sun::star::uno::XInterface

@param nAspect - the aspect the representation is requested for + the aspect the representation is requested for. + Can take values from Aspects constant set. @return the visual representation of the object in the default format and @@ -153,7 +154,8 @@ interface XVisualObject: ::com::sun::star::uno::XInterface /** retrieves map mode the object communicates in. @param nAspect - the aspect the map mode is requested for + the aspect the map mode is requested for. + Can take values from Aspects constant set. @return the map mode the object communicates in, it can take values from -- cgit v1.2.3 From c5943fbb614d23909c9714fcd77f4298081a58e9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 24 May 2010 11:01:58 +0100 Subject: cmcfixes75: #i111795# check write return value --- idlc/source/preproc/tokens.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/idlc/source/preproc/tokens.c b/idlc/source/preproc/tokens.c index e1cabf438..b8dbd45c5 100644 --- a/idlc/source/preproc/tokens.c +++ b/idlc/source/preproc/tokens.c @@ -474,7 +474,8 @@ void if (wbp >= &wbuf[OBS]) { - write(1, wbuf, OBS); + if (write(1, wbuf, OBS) != OBS) + error(ERROR, "short write!"); if (wbp > &wbuf[OBS]) memcpy(wbuf, wbuf + OBS, wbp - &wbuf[OBS]); wbp -= OBS; @@ -490,7 +491,8 @@ void { if (wbp > wbuf) { - write(1, wbuf, wbp - wbuf); + if (write(1, wbuf, wbp - wbuf) != wbp - wbuf) + error(ERROR, "short write!"); wbp = wbuf; } } -- cgit v1.2.3 From 8829f8979787c370af363ffba6027f4807e00cf8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 24 May 2010 14:50:22 +0100 Subject: cmcfixes75: #i111803# array out of bounds --- bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index ae0fb9de1..21d583c63 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -552,7 +552,7 @@ extern "C" void privateSnippetExecutor( ... ) "mr %0, 1\n\t" : "=r" (sp) : ); - volatile long nRegReturn[0]; + volatile long nRegReturn[1]; typelib_TypeClass aType = cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, sp, (sal_Int64*)nRegReturn); -- cgit v1.2.3 From fda3e5e9cec650caf76705512495bf9f95031be7 Mon Sep 17 00:00:00 2001 From: tono Date: Mon, 31 May 2010 21:53:32 +0900 Subject: i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 --- sal/systools/win32/uwinapi/DllMain.cpp | 9 ++++----- sal/systools/win32/uwinapi/sntprintf.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sal/systools/win32/uwinapi/DllMain.cpp b/sal/systools/win32/uwinapi/DllMain.cpp index 4f39cfdd8..789604853 100644 --- a/sal/systools/win32/uwinapi/DllMain.cpp +++ b/sal/systools/win32/uwinapi/DllMain.cpp @@ -223,14 +223,13 @@ extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID ) { case DLL_PROCESS_ATTACH: UWINAPI_BaseAddress = hModule; +#ifdef __MINGW32__ + return TRUE; +#else return DisableThreadLibraryCalls( hModule ); +#endif default: return TRUE; } } - - - - - diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c index fa0d96e64..a256812ad 100644 --- a/sal/systools/win32/uwinapi/sntprintf.c +++ b/sal/systools/win32/uwinapi/sntprintf.c @@ -10,7 +10,7 @@ #pragma warning(disable:4273) // inconsistent dll linkage #endif -#if _MSC_VER < 1300 +#if (defined(_MSC_VER) && (_MSC_VER < 1300)) || (defined(__MINGW32_VERSION) && ((__MINGW32_MAJOR_VERSION < 3)||((__MINGW32_MAJOR_VERSION == 3)&&(__MINGW32_MINOR_VERSION < 18)))) /* The non-debug versions of _vscprintf/_scprintf are just calls to _vsprintf/_sprintf with string buffer pointer set to NULL, -- cgit v1.2.3 From fb773244f3dd879c13bb420443f38781178e5e6a Mon Sep 17 00:00:00 2001 From: Thomas Benisch Date: Fri, 4 Jun 2010 20:08:33 +0200 Subject: calc55: #i112084# All charts in a Calc document are loaded when saving the document --- javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java index f096d6dfd..0f18ac781 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java @@ -836,7 +836,6 @@ XMultiPropertySet * @return The value of the property. */ protected Object getPropertyValue(Property property) - throws com.sun.star.lang.WrappedTargetException { Object ret= null; try @@ -853,9 +852,13 @@ XMultiPropertySet ret= propField.get(this); } } - catch(java.lang.Exception e) + catch(java.lang.NoSuchFieldException e) + { + throw new java.lang.RuntimeException(e); + } + catch(java.lang.IllegalAccessException e) { - throw new WrappedTargetException("PropertySet.setPropertyValue_NoBroadcast", this, e); + throw new java.lang.RuntimeException(e); } return ret; } @@ -1001,7 +1004,7 @@ XMultiPropertySet { value= getPropertyValue(prop); } - catch(WrappedTargetException e) + catch(Exception e) { continue; } -- cgit v1.2.3 From b3414a5ba8e8ae9a65160cfafa8c29d80426bd8b Mon Sep 17 00:00:00 2001 From: "Eike Rathke [er]" Date: Mon, 7 Jun 2010 16:27:28 +0200 Subject: calc55: #i40309# #i31656# #i103458# improved accuracy of Bessel functions; patch from --- .../com/sun/star/sheet/NoConvergenceException.idl | 52 ++++++++++++++++++++++ offapi/com/sun/star/sheet/makefile.mk | 1 + 2 files changed, 53 insertions(+) create mode 100644 offapi/com/sun/star/sheet/NoConvergenceException.idl diff --git a/offapi/com/sun/star/sheet/NoConvergenceException.idl b/offapi/com/sun/star/sheet/NoConvergenceException.idl new file mode 100644 index 000000000..f846ec9aa --- /dev/null +++ b/offapi/com/sun/star/sheet/NoConvergenceException.idl @@ -0,0 +1,52 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_sheet_NoConvergenceException_idl__ +#define __com_sun_star_sheet_NoConvergenceException_idl__ + +#ifndef __com_sun_star_uno_Exception_idl__ +#include +#endif + +//============================================================================= + +module com { module sun { module star { module sheet { + +//============================================================================= + +/** Thrown by a Calc Add-In function this exception indicates the + function's algorithm did not converge to a meaningful result. + + @since OOo 3.3 + */ +exception NoConvergenceException : ::com::sun::star::uno::Exception{}; + +//============================================================================= +}; }; }; }; +//============================================================================= + +#endif diff --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk index dc1935ba2..016378178 100644 --- a/offapi/com/sun/star/sheet/makefile.mk +++ b/offapi/com/sun/star/sheet/makefile.mk @@ -164,6 +164,7 @@ IDLFILES=\ NamedRangeFlag.idl\ NamedRanges.idl\ NamedRangesEnumeration.idl\ + NoConvergenceException.idl\ PasteOperation.idl\ RangeSelectionArguments.idl\ RangeSelectionEvent.idl\ -- cgit v1.2.3 From 6578462927a5b234170b66888c65f2a6d95e94e4 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 10 Jun 2010 23:31:31 +0200 Subject: locales33a: #i111019# fixed locale parser/composer for three-letter language codes --- sal/inc/rtl/locale.h | 8 ++++---- sal/osl/unx/nlsupport.c | 15 ++++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/sal/inc/rtl/locale.h b/sal/inc/rtl/locale.h index aaab61770..5306da225 100644 --- a/sal/inc/rtl/locale.h +++ b/sal/inc/rtl/locale.h @@ -49,7 +49,7 @@ extern "C" { typedef struct _rtl_Locale { /** - Lowercase two-letter ISO-639 code. + Lowercase two-letter ISO 639-1 or three-letter ISO 639-3 code. */ rtl_uString * Language; /** @@ -72,7 +72,7 @@ typedef struct _rtl_Locale /** Register a locale from language, country and variant. - @param language lowercase two-letter ISO-639 code. + @param language lowercase two-letter ISO 639-1 or three-letter ISO 639-3 code. @param country uppercase two-letter ISO-3166 code. May be null. @param variant vendor and browser specific code. May be null. */ @@ -95,7 +95,7 @@ rtl_Locale * SAL_CALL rtl_locale_getDefault(); Sets the default. Normally set once at the beginning of applet or application, then never reset. setDefault does not reset the host locale. - @param language lowercase two-letter ISO-639 code. + @param language lowercase two-letter ISO 639-1 or three-letter ISO 639-3 code. @param country uppercase two-letter ISO-3166 code. @param variant vendor and browser specific code. See class description. */ @@ -103,7 +103,7 @@ void SAL_CALL rtl_locale_setDefault( const sal_Unicode * language, const sal_Uni /** Getter for programmatic name of field, - an lowercased two-letter ISO-639 code. + a lowercased two-letter ISO 639-1 or three-letter ISO 639-3 code. @see #getDisplayLanguage */ rtl_uString * SAL_CALL rtl_locale_getLanguage( rtl_Locale * This ); diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c index f6d0b4a16..3cce0e6b0 100644 --- a/sal/osl/unx/nlsupport.c +++ b/sal/osl/unx/nlsupport.c @@ -105,7 +105,8 @@ _pair_search (const char *key, const _pair *base, unsigned int member ) static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n ) { /* check if a valid locale is specified */ - if( pLocale && pLocale->Language && (pLocale->Language->length == 2) ) + if( pLocale && pLocale->Language && + (pLocale->Language->length == 2 || pLocale->Language->length == 3) ) { size_t offset = 0; @@ -193,16 +194,20 @@ static rtl_Locale * _parse_locale( const char * locale ) rtl_Locale * ret; + /* language is a two or three letter code */ + if( (len > 3 && '_' == locale[3]) || (len == 3 && '_' != locale[2]) ) + offset = 3; + /* convert language code to unicode */ - rtl_string2UString( &pLanguage, locale, 2, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS ); + rtl_string2UString( &pLanguage, locale, offset, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS ); OSL_ASSERT(pLanguage != NULL); /* convert country code to unicode */ - if( len >= 5 && '_' == locale[2] ) + if( len >= offset+3 && '_' == locale[offset] ) { - rtl_string2UString( &pCountry, locale + 3, 2, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS ); + rtl_string2UString( &pCountry, locale + offset + 1, 2, RTL_TEXTENCODING_ASCII_US, OSTRING_TO_OUSTRING_CVTFLAGS ); OSL_ASSERT(pCountry != NULL); - offset = 5; + offset += 3; } /* convert variant code to unicode - do not rely on "." as delimiter */ -- cgit v1.2.3 From 10e963d38679429d8ce67b05a9cddd2e5260f03d Mon Sep 17 00:00:00 2001 From: Daniel Rentz Date: Tue, 15 Jun 2010 20:02:53 +0200 Subject: mib16: contributed bugfixes and various new symbols in VBA compatibility implementation --- offapi/com/sun/star/sheet/FunctionAccess.idl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/offapi/com/sun/star/sheet/FunctionAccess.idl b/offapi/com/sun/star/sheet/FunctionAccess.idl index 041849682..2112f5064 100644 --- a/offapi/com/sun/star/sheet/FunctionAccess.idl +++ b/offapi/com/sun/star/sheet/FunctionAccess.idl @@ -58,6 +58,32 @@ published service FunctionAccess /** provides calculating the result of a spreadsheet function. */ interface com::sun::star::sheet::XFunctionAccess; + + //------------------------------------------------------------------------- + + /** specifies whether the function call is performed as array function + call. + +

If set to , the result of the function call will be + calculated similar to array formulas in a spreadsheet document. The + return value of the function call will usually be a sequence of + sequences containing the values of the resulting array. Example: If the + function ABS is called for a 3x2 cell range, the result will be a 3x2 + array containing the absolute values of the numbers contained in the + specified cell range.

+ +

If set to , the result of the function call will be + calculated similar to simple cell formulas in a spreadsheet document. + The return value of the function call will usually be a single value. + Of course, some functions always return an array, for example the + MUNIT function.

+ +

For compatibility with older versions, the default value of this + property is .

+ + @since OOo 3.3 + */ + [optional, property] boolean IsArrayFunction; }; -- cgit v1.2.3 From 7e408c02d5cd94b7363403ef8b6f2c186c13718e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 16 Jun 2010 19:57:33 +0200 Subject: CWS systemlibc: #i69033#: some fixes for Windows --- idlc/source/preproc/makefile.mk | 4 ++++ idlc/source/preproc/unix.c | 1 + 2 files changed, 5 insertions(+) diff --git a/idlc/source/preproc/makefile.mk b/idlc/source/preproc/makefile.mk index f65f37e94..b87d60d0d 100644 --- a/idlc/source/preproc/makefile.mk +++ b/idlc/source/preproc/makefile.mk @@ -63,6 +63,10 @@ APP1OBJS=$(OBJ)$/cpp.obj APP1LIBS= $(LB)$/idlcpp.lib +.IF "$(GUI)" == "WNT" +APP1STDLIBS=gnu_getopt.lib +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/idlc/source/preproc/unix.c b/idlc/source/preproc/unix.c index 215161ec9..922b2a320 100644 --- a/idlc/source/preproc/unix.c +++ b/idlc/source/preproc/unix.c @@ -33,6 +33,7 @@ #if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__)) #include #include +#include #else #include #endif -- cgit v1.2.3 From f223e9d9b7a2c9ec1438c83de32bc9616fce6c18 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 17 Jun 2010 10:13:12 +0200 Subject: CWS systemlibc: #i69033#: some fixes for mingw --- idlc/source/preproc/makefile.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/idlc/source/preproc/makefile.mk b/idlc/source/preproc/makefile.mk index b87d60d0d..e6aa457e8 100644 --- a/idlc/source/preproc/makefile.mk +++ b/idlc/source/preproc/makefile.mk @@ -63,9 +63,11 @@ APP1OBJS=$(OBJ)$/cpp.obj APP1LIBS= $(LB)$/idlcpp.lib +.IF "$(HAVE_GETOPT)" != "YES" .IF "$(GUI)" == "WNT" APP1STDLIBS=gnu_getopt.lib .ENDIF +.ENDIF # --- Targets ------------------------------------------------------ -- cgit v1.2.3