[Libreoffice-commits] .: sd/source
sd/source/filter/sdpptwrp.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 261e9c71f9d4a12865bba7e7226ffe363aa1460b Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 10:11:26 2012 +0300 More glitches Change-Id: I700eced69bd6b6f9f5a15fd871159de38ac36287 diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index c11c958..72baaf4 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -119,7 +119,7 @@ sal_Bool SdPPTFilter::Import() ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()-GetUserData() ); if ( pLibrary ) { -ImportPPTPointer PPTImport = reinterpret_cast ImportPPT ( pLibrary-getFunctionSymbol( ImportPPT ) ); +ImportPPTPointer PPTImport = reinterpret_cast ImportPPTPointer ( pLibrary-getFunctionSymbol( ImportPPT ) ); if ( PPTImport ) bRet = PPTImport( mrDocument, *pDocStream, *pStorage, mrMedium ); @@ -157,7 +157,7 @@ sal_Bool SdPPTFilter::Export() { SotStorageRefxStorRef = new SotStorage( mrMedium.GetOutStream(), sal_False ); #ifndef DISABLE_DYNLOADING -ExportPPTPointer PPTExport = reinterpret_castExportPPT(pLibrary-getFunctionSymbol( ExportPPT )); +ExportPPTPointer PPTExport = reinterpret_castExportPPTPointer(pLibrary-getFunctionSymbol( ExportPPT )); #else ExportPPTPointer PPTExport = ExportPPT; #endif @@ -209,7 +209,7 @@ void SdPPTFilter::PreSaveBasic() ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()-GetUserData() ); if( pLibrary ) { -SaveVBAPointer pSaveVBA= reinterpret_castSaveVBA(pLibrary-getFunctionSymbol( SaveVBA )); +SaveVBAPointer pSaveVBA= reinterpret_castSaveVBAPointer(pLibrary-getFunctionSymbol( SaveVBA )); if( pSaveVBA ) { pSaveVBA( (SfxObjectShell) mrDocShell, pBas ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android-single-dso' - jvmfwk/source
jvmfwk/source/framework.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0230c2efcf309a83edaa4d51701f2f0afda736ae Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 10:33:46 2012 +0300 Move the #ifndef DISABLE_DYNLOADING a bit earlier Change-Id: I1777d6304b2ebb218c0f85c778f1a66d05c4f454 diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 2bb8f77..e75b11f 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -387,11 +387,11 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti jfw::VendorSettings aVendorSettings; rtl::OUString sLibPath = aVendorSettings.getPluginLibrary(aInfo.getVendor()); +#ifndef DISABLE_DYNLOADING osl::Module modulePlugin(sLibPath); if ( ! modulePlugin) return JFW_E_NO_PLUGIN; -#ifndef DISABLE_DYNLOADING rtl::OUString sFunctionName( RTL_CONSTASCII_USTRINGPARAM(jfw_plugin_startJavaVirtualMachine)); jfw_plugin_startJavaVirtualMachine_ptr pFunc = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: jvmfwk/source
jvmfwk/source/framework.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c56600dfbeaf687f249e4fb641044595892b4ebc Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 10:33:46 2012 +0300 Move the #ifndef DISABLE_DYNLOADING a bit earlier Change-Id: I1777d6304b2ebb218c0f85c778f1a66d05c4f454 diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 2f1760a..4694bf6 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -387,11 +387,11 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti jfw::VendorSettings aVendorSettings; rtl::OUString sLibPath = aVendorSettings.getPluginLibrary(aInfo.getVendor()); +#ifndef DISABLE_DYNLOADING osl::Module modulePlugin(sLibPath); if ( ! modulePlugin) return JFW_E_NO_PLUGIN; -#ifndef DISABLE_DYNLOADING rtl::OUString sFunctionName( RTL_CONSTASCII_USTRINGPARAM(jfw_plugin_startJavaVirtualMachine)); jfw_plugin_startJavaVirtualMachine_ptr pFunc = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: bundled saxon considered harmful
Hi, On Sat, Oct 06, 2012 at 01:18:04PM +0200, Alex Thurgood wrote: Le 03/10/2012 10:40, David Tardon a écrit : Hi David, These changes wouldn't happen to cause the build to fail in binfilter by any chance, coz I'm seeing this now in tail_build : No, for two reasons: 1. it does not touch sax at all 2. it is not in master yet D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/android-single-dso' - javaunohelper/source
javaunohelper/source/javaunohelper.cxx | 22 -- 1 file changed, 20 insertions(+), 2 deletions(-) New commits: commit 25e4c784a97e9c34c74cfe36bb3d83735562d358 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 10:49:22 2012 +0300 DISABLE_DYNLOADING tentative fix Change-Id: Ic23dcc0b45a90e845fc4fba1861bcee03354da01 diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index a36cf58..374b638 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -63,6 +63,13 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( OUString aLibName( pJLibName ); pJEnv-ReleaseStringChars( jLibName, pJLibName); +#ifdef DISABLE_DYNLOADING +(void) jSMgr; +(void) jRegKey; +(void) loader; + +fprintf(stderr, Hmm, %s called for %s\n, __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr()); +#else oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (lib) { @@ -123,7 +130,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( } } } - +#endif return bRet == sal_False? JNI_FALSE : JNI_TRUE; } @@ -138,6 +145,16 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( jobject jSMgr, jobject jRegKey, jobject loader ) { const jchar* pJLibName = pJEnv-GetStringChars(jLibName, NULL); + +#ifdef DISABLE_DYNLOADING +(void) jImplName; +(void) jSMgr; +(void) jRegKey; +(void) loader; + +fprintf(stderr, Hmm, %s called for %s\n, __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr()); +#endif + OUString aLibName( pJLibName ); pJEnv-ReleaseStringChars( jLibName, pJLibName); @@ -145,6 +162,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( jobject joSLL_cpp = 0; +#ifndef DISABLE_DYNLOADING oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (lib) { @@ -219,7 +237,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( } } } - +#endif return joSLL_cpp; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: javaunohelper/source
javaunohelper/source/javaunohelper.cxx | 22 -- 1 file changed, 20 insertions(+), 2 deletions(-) New commits: commit 74db703172baa3b2c7e3a77b54260a340777d266 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 10:49:22 2012 +0300 DISABLE_DYNLOADING tentative fix Change-Id: Ic23dcc0b45a90e845fc4fba1861bcee03354da01 diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index a36cf58..374b638 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -63,6 +63,13 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( OUString aLibName( pJLibName ); pJEnv-ReleaseStringChars( jLibName, pJLibName); +#ifdef DISABLE_DYNLOADING +(void) jSMgr; +(void) jRegKey; +(void) loader; + +fprintf(stderr, Hmm, %s called for %s\n, __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr()); +#else oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (lib) { @@ -123,7 +130,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( } } } - +#endif return bRet == sal_False? JNI_FALSE : JNI_TRUE; } @@ -138,6 +145,16 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( jobject jSMgr, jobject jRegKey, jobject loader ) { const jchar* pJLibName = pJEnv-GetStringChars(jLibName, NULL); + +#ifdef DISABLE_DYNLOADING +(void) jImplName; +(void) jSMgr; +(void) jRegKey; +(void) loader; + +fprintf(stderr, Hmm, %s called for %s\n, __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr()); +#endif + OUString aLibName( pJLibName ); pJEnv-ReleaseStringChars( jLibName, pJLibName); @@ -145,6 +162,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( jobject joSLL_cpp = 0; +#ifndef DISABLE_DYNLOADING oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (lib) { @@ -219,7 +237,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( } } } - +#endif return joSLL_cpp; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: postprocess/packcomponents
postprocess/packcomponents/makefile.mk |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit dc83d895f50169cc2bc525c5db176179d0dbcd4c Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:06:02 2012 +0300 Bypass ODBC here, too Change-Id: Ie9a49e9521741038a06dc46a1bd9072088e3bf6b diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 7ebbc85..b2b2296 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -145,10 +145,15 @@ my_components += \ component/connectivity/source/dbtools/dbtools \ component/connectivity/source/drivers/flat/flat \ component/connectivity/source/drivers/mysql/mysql \ -component/connectivity/source/drivers/odbc/odbc \ component/connectivity/source/manager/sdbc2 \ component/shell/source/backends/localebe/localebe1 \ +.IF $(OS) != ANDROID $(OS) != IOS +my_components += \ +component/connectivity/source/drivers/odbc/odbc \ + +.ENDIF + .ENDIF .IF $(BUILD_TYPE) != $(BUILD_TYPE:s/DESKTOP//) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android-single-dso' - postprocess/packcomponents
postprocess/packcomponents/makefile.mk |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 733f4a631c389053fe10ace09523b35ebea11eb9 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:06:02 2012 +0300 Bypass ODBC here, too Change-Id: Ie9a49e9521741038a06dc46a1bd9072088e3bf6b diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index a40841a..40fd602 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -145,10 +145,15 @@ my_components += \ component/connectivity/source/dbtools/dbtools \ component/connectivity/source/drivers/flat/flat \ component/connectivity/source/drivers/mysql/mysql \ -component/connectivity/source/drivers/odbc/odbc \ component/connectivity/source/manager/sdbc2 \ component/shell/source/backends/localebe/localebe1 \ +.IF $(OS) != ANDROID $(OS) != IOS +my_components += \ +component/connectivity/source/drivers/odbc/odbc \ + +.ENDIF + .ENDIF .IF $(BUILD_TYPE) != $(BUILD_TYPE:s/DESKTOP//) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android-single-dso' - vcl/generic
vcl/generic/print/genprnpsp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 700396bb6990fd71b501734443dab2d29f231627 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:10:41 2012 +0300 Android printing is completely different anyway, surely Change-Id: Ib58300148bbf248150f514bb3c59d863388eaa0b diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 6525f96..0a4bcd8 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -107,7 +107,7 @@ static rtl::OUString getPdfDir( const PrinterInfo rInfo ) static void getPaLib() { -#if defined( UNX ) !( defined( QUARTZ ) || defined( IOS ) ) +#if defined( UNX ) !( defined( QUARTZ ) || defined( IOS ) || defined( ANDROID ) ) if( ! driverLib ) { OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/generic
vcl/generic/print/genprnpsp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8f850a0ca530fae57c1b0354752fc14e6ebff092 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:10:41 2012 +0300 Android printing is completely different anyway, surely Change-Id: Ib58300148bbf248150f514bb3c59d863388eaa0b diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 6525f96..0a4bcd8 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -107,7 +107,7 @@ static rtl::OUString getPdfDir( const PrinterInfo rInfo ) static void getPaLib() { -#if defined( UNX ) !( defined( QUARTZ ) || defined( IOS ) ) +#if defined( UNX ) !( defined( QUARTZ ) || defined( IOS ) || defined( ANDROID ) ) if( ! driverLib ) { OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android-single-dso' - vcl/generic
vcl/generic/print/genprnpsp.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 8b07b70ce48dab0f48de3c190af0427757aaa3be Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:14:37 2012 +0300 WaE: 'driverLib' defined but not used Change-Id: If4853650958df9e425c936ead16ea11c976c5657 diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 0a4bcd8..3b00625 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -77,7 +77,9 @@ using ::rtl::OUStringToOString; * static helpers */ +#if defined( UNX ) !( defined( QUARTZ ) || defined( IOS ) || defined( ANDROID ) ) static oslModule driverLib = NULL; +#endif extern C { typedef int(*setupFunction)(PrinterInfo); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/generic
vcl/generic/print/genprnpsp.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 3d16094619cdf29cd96a014572244462a219f304 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:14:37 2012 +0300 WaE: 'driverLib' defined but not used Change-Id: If4853650958df9e425c936ead16ea11c976c5657 diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 0a4bcd8..3b00625 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -77,7 +77,9 @@ using ::rtl::OUStringToOString; * static helpers */ +#if defined( UNX ) !( defined( QUARTZ ) || defined( IOS ) || defined( ANDROID ) ) static oslModule driverLib = NULL; +#endif extern C { typedef int(*setupFunction)(PrinterInfo); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android-single-dso' - toolkit/source
toolkit/source/helper/accessibilityclient.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit a9c0b33acf5aaa7816b0763449338c20060ff861 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:23:59 2012 +0300 WaE: 's_hAccessibleImplementationModule' defined but not used Change-Id: I700f66cbc3ddb01d723b9a50709b4b1d5ab66405 diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index f4a5087..761f625 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -60,7 +60,9 @@ namespace toolkit #ifdef UNLOAD_ON_LAST_CLIENT_DYING static oslInterlockedCount s_nAccessibilityClients = 0; #endif // UNLOAD_ON_LAST_CLIENT_DYING +#ifndef DISABLE_DYNLOADING static oslModule s_hAccessibleImplementationModule = NULL; +#endif static GetStandardAccComponentFactory s_pAccessibleFactoryFunc = NULL; static ::rtl::Reference IAccessibleFactorys_pFactory; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/source
toolkit/source/helper/accessibilityclient.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit e87e2fd386a1848939aad755ed7dc2b3829a2008 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:23:59 2012 +0300 WaE: 's_hAccessibleImplementationModule' defined but not used Change-Id: I700f66cbc3ddb01d723b9a50709b4b1d5ab66405 diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index 4a1cb99..3119ba6 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -51,7 +51,9 @@ namespace toolkit #ifdef UNLOAD_ON_LAST_CLIENT_DYING static oslInterlockedCount s_nAccessibilityClients = 0; #endif // UNLOAD_ON_LAST_CLIENT_DYING +#ifndef DISABLE_DYNLOADING static oslModule s_hAccessibleImplementationModule = NULL; +#endif static GetStandardAccComponentFactory s_pAccessibleFactoryFunc = NULL; static ::rtl::Reference IAccessibleFactorys_pFactory; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android-single-dso' - svtools/source
svtools/source/misc/svtaccessiblefactory.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit ec908a3f34ee81adde31f4e41618cfa146781cf8 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:29:28 2012 +0300 WaE: 's_hAccessibleImplementationModule' defined but not used Change-Id: I8caf2951876d47873b325f306515ec840692b856 diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 4a88dfb..d3af78a 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -58,7 +58,9 @@ namespace svt #ifdef UNLOAD_ON_LAST_CLIENT_DYING static oslInterlockedCount s_nAccessibleFactoryAccesss = 0; #endif // UNLOAD_ON_LAST_CLIENT_DYING +#ifndef DISABLE_DYNLOADING static oslModule s_hAccessibleImplementationModule = NULL; +#endif static GetSvtAccessibilityComponentFactory s_pAccessibleFactoryFunc = NULL; static ::rtl::Reference IAccessibleFactorys_pFactory; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/misc/svtaccessiblefactory.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 7da6319de0038e5751cf7c8f9f8bca7e1813bb63 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:29:28 2012 +0300 WaE: 's_hAccessibleImplementationModule' defined but not used Change-Id: I8caf2951876d47873b325f306515ec840692b856 diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 013e946..587c4d5 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -58,7 +58,9 @@ namespace svt #ifdef UNLOAD_ON_LAST_CLIENT_DYING static oslInterlockedCount s_nAccessibleFactoryAccesss = 0; #endif // UNLOAD_ON_LAST_CLIENT_DYING +#ifndef DISABLE_DYNLOADING static oslModule s_hAccessibleImplementationModule = NULL; +#endif static GetSvtAccessibilityComponentFactory s_pAccessibleFactoryFunc = NULL; static ::rtl::Reference IAccessibleFactorys_pFactory; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: bundled saxon considered harmful
Le 07/10/2012 09:55, David Tardon a écrit : Hi David, No, for two reasons: 1. it does not touch sax at all 2. it is not in master yet Ah, ok, thanks for the info. Well, I did a complete complete git pull, make clean, rebuild and got through to the end on Linux, will have to check on my Mac later. Sorry about the noise. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix build.pl deps
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/826 -- To view, visit https://gerrit.libreoffice.org/826 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia532558eb25c3745f9d43303358b785994f389fe Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix libwpd with VS2012
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/821 -- To view, visit https://gerrit.libreoffice.org/821 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2df9ab344bb2a934f6408a394280c01563d0c9b8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] mergelibs works on windows now
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/817 -- To view, visit https://gerrit.libreoffice.org/817 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I536921b4734a50b90aa0007ebf2120306ce497a0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add cppuhelper to sw tests
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/822 -- To view, visit https://gerrit.libreoffice.org/822 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie50c7adf5bd4ba1b18a8deb3e708bcf83a2777af Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] prevent libmerged warning spam
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/816 -- To view, visit https://gerrit.libreoffice.org/816 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ee74175d3dc08318461dfe08ebd10b12ce8d814 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix mergedlib on windows
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/814 -- To view, visit https://gerrit.libreoffice.org/814 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I30ee99fe2a2e92c69ebfcef9af5ff1bb27ec114b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] download rebase if needed for all sdk versions
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/824 -- To view, visit https://gerrit.libreoffice.org/824 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1417d243c94438c36158b0d5f873fa939b7d7642 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix libcdr with VS2012
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/825 -- To view, visit https://gerrit.libreoffice.org/825 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9943dce422bd43b826baeaccaeb494d87077 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix libwpd for vs90
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/823 -- To view, visit https://gerrit.libreoffice.org/823 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia8a21cd512ac425207eb31a194db9f4c9b10fee4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] only add win8 lib path for win8 sdk
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/813 -- To view, visit https://gerrit.libreoffice.org/813 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b30e5e0a8f961df1070f4ceb0e330558ab16335 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add needed libraries to textconv_dict
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/815 -- To view, visit https://gerrit.libreoffice.org/815 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic0f55385c34bb253a1f452335ebcd3bba92ca9fa Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add aditional targets to clean and distclean
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/810 -- To view, visit https://gerrit.libreoffice.org/810 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7539b88936370cc6bc01edf2c2755343e0113b6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add needed libraries to sfx2_metadatatable
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/820 -- To view, visit https://gerrit.libreoffice.org/820 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83aaa7170f59f89e4f1e7715295edceca3a9bef4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix ccache with MSVC
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/809 -- To view, visit https://gerrit.libreoffice.org/809 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0721a8d0aa584051d1e16b327c3cd1352eedf253 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add support for libmerged on Windows
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/807 -- To view, visit https://gerrit.libreoffice.org/807 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05d1c557967000be2fb7128b43d6e8c6005a7892 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix liborcus build with VS2012
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/808 -- To view, visit https://gerrit.libreoffice.org/808 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98248b2fe45da32fc0f478aee55b6939825112f7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] prevent ccache from being doubled with MSVC
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/812 -- To view, visit https://gerrit.libreoffice.org/812 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idb2fd2a115c5e32d3e894d70c0e86730b38e73e9 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix for openssl with MSVC when ccache is enabled
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/811 -- To view, visit https://gerrit.libreoffice.org/811 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93deea3a80178f51fff9a23328df7a67f308e052 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add needed libraries to scui
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/818 -- To view, visit https://gerrit.libreoffice.org/818 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6ef50bbb28c4d16154f8e673a4f3b3a1cef5cd5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix msm_path detection
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/806 -- To view, visit https://gerrit.libreoffice.org/806 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id507a3483a126f4a04dcb9be287c12a3eae5429c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix dbghelp.dll download again
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/805 -- To view, visit https://gerrit.libreoffice.org/805 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5992023a946301809b9708d9df29dd9cc1500b53 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix msm suport for VS2012
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/804 -- To view, visit https://gerrit.libreoffice.org/804 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc816de83eb48163671948ecc84e7653f2b4ec13 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Win8 SDK no longer ships rebase.exe
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/802 -- To view, visit https://gerrit.libreoffice.org/802 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c4280ee53411f4914be8ebd4f41d1c1cec1ba97 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] work-around really weird bug in VS2012
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/800 -- To view, visit https://gerrit.libreoffice.org/800 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7092bbcbddec179c62c2817b069f757863ca5982 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] convert uno_bridge to new syntax
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/799 -- To view, visit https://gerrit.libreoffice.org/799 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac5e9a860f7ef68104c4cfc19abe686b754190af Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] use downloaded rebase.exe with Win8 SDK
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/803 -- To view, visit https://gerrit.libreoffice.org/803 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7cb49e9c992ba3bd8cc69e7e492f82a493d7053 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix chart2 build with VS2012
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/798 -- To view, visit https://gerrit.libreoffice.org/798 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieae76bfd0a3f9612c0bb573029912d5c6efa6add Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix path for make_installer.pl
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/801 -- To view, visit https://gerrit.libreoffice.org/801 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac0ca81edaada999c774cdf8169f07fa98278cc6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix connectivity build with Win8 SDK
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/793 -- To view, visit https://gerrit.libreoffice.org/793 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id2308748f1301a1e1ccc68838c6a65b36a5ee008 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix sd build with VC2012
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/797 -- To view, visit https://gerrit.libreoffice.org/797 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1356570e27a065e419281fcd9d667c60658773e6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix shell build with Win8 SDK
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/792 -- To view, visit https://gerrit.libreoffice.org/792 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I19d39f26732772f274e6c8fd76326c50fd73baa3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix extensions build with Win8 SDK
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/791 -- To view, visit https://gerrit.libreoffice.org/791 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c38722c98300f419e6129b46c89b68f46ce4173 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix cli_ure build with Win8 SDK
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/788 -- To view, visit https://gerrit.libreoffice.org/788 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4842d848234a5dc21085a3fd0aa0a79c58c71e8c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] prefer newer versions of Visual Studio
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/783 -- To view, visit https://gerrit.libreoffice.org/783 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6744460db43f66c91ad8e033f59612457acd66ee Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] silence vd2 warning due to excessive output
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/795 -- To view, visit https://gerrit.libreoffice.org/795 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib86a5406c28560d766ecb48cb8f74ac9f9b43c4d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] convert cli_ure/source/native to new syntax
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/794 -- To view, visit https://gerrit.libreoffice.org/794 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7dbb065c8b1b2fef85e6e7f42ef80991102785e0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix python build with VC2012
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/787 -- To view, visit https://gerrit.libreoffice.org/787 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibaec87c929889f0038b44aac1e07e2552adc5cc5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix sw build with VC2012
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/796 -- To view, visit https://gerrit.libreoffice.org/796 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ba38baa26de2082a21d681efff2f5881092fad7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/android-single-dso' - sfx2/source
sfx2/source/appl/app.cxx | 33 - sfx2/source/appl/appserv.cxx |7 ++- 2 files changed, 30 insertions(+), 10 deletions(-) New commits: commit 0519ca23058947f349942105edce579ea2178639 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:50:10 2012 +0300 DISABLE_DYNLOADING fixes and minor cleanup Change-Id: I08ce3523f259b1ace7c2a1a58b091b43a44a7d92 diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 3aa48ab..a4ffed8 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -468,17 +468,22 @@ void SfxApplication::Invalidate( sal_uInt16 nId ) Invalidate_Impl( pFrame-GetBindings(), nId ); } -#define DOSTRING( x ) #x -#define STRING( x ) DOSTRING( x ) - #ifndef DISABLE_SCRIPTING +#ifndef DISABLE_DYNLOADING + typedef long (SAL_CALL *basicide_handle_basic_error)(void*); -typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, sal_Bool, rtl_uString*); typedef void* (SAL_CALL *basicide_macro_organizer)(sal_Int16); extern C { static void SAL_CALL thisModule() {} } +#else + +extern C long basicide_handle_basic_error(void*); +extern C void *basicide_macro_organizer(sal_Int16); + +#endif + #endif IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) @@ -487,6 +492,8 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) (void) pStarBasic; return 0; #else + +#ifndef DISABLE_DYNLOADING // get basctl dllname static ::rtl::OUString aLibName( SVLIBRARY( basctl ) ); @@ -501,7 +508,14 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) // call basicide_handle_basic_error in basctl long nRet = pSymbol ? pSymbol( pStarBasic ) : 0; +#else + +long nRet = basicide_handle_basic_error( pStarBasic ); + +#endif + return nRet; + #endif } @@ -586,6 +600,8 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) #ifdef DISABLE_SCRIPTING (void) nTabId; #else + +#ifndef DISABLE_DYNLOADING // get basctl dllname static ::rtl::OUString aLibName( SVLIBRARY( basctl ) ); @@ -597,8 +613,15 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) ::rtl::OUString aSymbol( basicide_macro_organizer ); basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); -// call basicide_choose_macro in basctl +// call basicide_macro_organizer in basctl pSymbol( nTabId ); + +#else + +basicide_macro_organizer( nTabId ); + +#endif + #endif } diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 08d0352..450da3e 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -836,14 +836,11 @@ void SfxApplication::MiscState_Impl(SfxItemSet rSet) #ifndef DISABLE_SCRIPTING +#ifndef DISABLE_DYNLOADING + typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, rtl_uString*); typedef void (SAL_CALL *basicide_macro_organizer)( sal_Int16 ); -#define DOSTRING( x ) #x -#define STRING( x ) DOSTRING( x ) - -#ifndef DISABLE_DYNLOADING - extern C { static void SAL_CALL thisModule() {} } #else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/appl/app.cxx | 33 - sfx2/source/appl/appserv.cxx |7 ++- 2 files changed, 30 insertions(+), 10 deletions(-) New commits: commit 5c02bb0f022ae6f51ccc07452901ad45a9a243e9 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 11:50:10 2012 +0300 DISABLE_DYNLOADING fixes and minor cleanup Change-Id: I08ce3523f259b1ace7c2a1a58b091b43a44a7d92 diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 3aa48ab..a4ffed8 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -468,17 +468,22 @@ void SfxApplication::Invalidate( sal_uInt16 nId ) Invalidate_Impl( pFrame-GetBindings(), nId ); } -#define DOSTRING( x ) #x -#define STRING( x ) DOSTRING( x ) - #ifndef DISABLE_SCRIPTING +#ifndef DISABLE_DYNLOADING + typedef long (SAL_CALL *basicide_handle_basic_error)(void*); -typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, sal_Bool, rtl_uString*); typedef void* (SAL_CALL *basicide_macro_organizer)(sal_Int16); extern C { static void SAL_CALL thisModule() {} } +#else + +extern C long basicide_handle_basic_error(void*); +extern C void *basicide_macro_organizer(sal_Int16); + +#endif + #endif IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) @@ -487,6 +492,8 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) (void) pStarBasic; return 0; #else + +#ifndef DISABLE_DYNLOADING // get basctl dllname static ::rtl::OUString aLibName( SVLIBRARY( basctl ) ); @@ -501,7 +508,14 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) // call basicide_handle_basic_error in basctl long nRet = pSymbol ? pSymbol( pStarBasic ) : 0; +#else + +long nRet = basicide_handle_basic_error( pStarBasic ); + +#endif + return nRet; + #endif } @@ -586,6 +600,8 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) #ifdef DISABLE_SCRIPTING (void) nTabId; #else + +#ifndef DISABLE_DYNLOADING // get basctl dllname static ::rtl::OUString aLibName( SVLIBRARY( basctl ) ); @@ -597,8 +613,15 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) ::rtl::OUString aSymbol( basicide_macro_organizer ); basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); -// call basicide_choose_macro in basctl +// call basicide_macro_organizer in basctl pSymbol( nTabId ); + +#else + +basicide_macro_organizer( nTabId ); + +#endif + #endif } diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 08d0352..450da3e 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -836,14 +836,11 @@ void SfxApplication::MiscState_Impl(SfxItemSet rSet) #ifndef DISABLE_SCRIPTING +#ifndef DISABLE_DYNLOADING + typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, rtl_uString*); typedef void (SAL_CALL *basicide_macro_organizer)( sal_Int16 ); -#define DOSTRING( x ) #x -#define STRING( x ) DOSTRING( x ) - -#ifndef DISABLE_DYNLOADING - extern C { static void SAL_CALL thisModule() {} } #else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Forums Proposal
Hi, On Sat, Oct 06, 2012 at 06:42:42PM -0400, Marc Paré wrote: Le 2012-10-06 17:20, Bjoern Michaelsen a écrit : On Sat, Oct 06, 2012 at 04:26:18PM -0400, Marc Paré wrote: No sure if we were talking about empty hall, I am hoping to help fill them. :-) Yes, just like a night club opening with fewer floors in the early evening, so that they are not that empty -- and open more floors later. ;) Sorry, doesn't work for me. If the place is too full with noise, I can't hear myself think and I go elsewhere where people like me congregate ... in this case the AOO forums. _If_ the place is too full with noise, we will quickly be able to split out forums. My suggestion is just not to do that earlier. ;) Do you think we will have some 3-5 regulars in a templates forum? If not, I would postpone separating those out until such a group condesates and asks for it. Well, I would rather give it a try, we do have a template site that we should be supporting with a forums. This would give us a chance to get more traction right from the start. I dont believe that a separate forum gives you more traction, if you do not have 3-5 regulars in it -- rather the opposite. As both closing forums and underpopulated/abandoned forums are demotivational and unhelpful, I am stand by my opinion that not having one at the start is better. Once 3-5 regulars for that topic are around and ask for it, we can add that forum -- which is motivating as it suggests growth and gives the forum a better kickstart (esp. since we can make an announcement for the start of that forum on its own then). All in all I can't say I agree on your approach to forums. You seem to expect the brunt of all activity on a forums to come from the participants. More of a let's wait for them to come approach. Hence, the lets start with few categories and break out later. This is more of a passive approach to running a forums I, however, think that a good categorization of a forums will have a better appeal to our users and with good moderation will fill. I also think that we should not only moderate, but also create buzz on our forums. Moderators are not only there to help direct traffic (un-obtrusively) but also create buzz and discussion. If moderators sign up for the job, then they should commit to grow their forums and make them attractive for user appeal. If a forum has become silent, then it would be up to the forums admins to sit and determine the actions to market and help popularize it. This is more of an aggressive approach to growing a forums. You currently have 5 forum coordinators, which is a very good size to start off (a bigger group will only lead to more communication overhead). If you want to actively vitalize the forums, you should not start with much more than ~2 forums per coordinator, otherwise you stretch yourself too thin. As you grow the team, win more regulars, admins and coordinators, you can easily add categories. You will do anyway -- no matter what initial categorization you setup. Thus the _initial_ categorization is important to be optimized to generate growth in the first 2-3 month, it should not be the 'final' or 'perfect' categorization for a huge board system (because the first is the precondition for the second). You should also make sure to empower those joining you as forum regulars and coordinators and there is no easier way to archive that than by letting them take part of the growth by creating 'their' additional forum. Linus Torvalds said on 2004-10-25: Nobody should start to undertake a large project. You start with a small trivial project, and you should never expect it to get large. If you do, you'll just overdesign and generally think it is more important than it likely is at that stage. Or worse, you might be scared away by the sheer size of the work you envision. So start small, and think about the details. Don't think about some big picture and fancy design. If it doesn't solve some fairly immediate need, it's almost certainly over-designed. And don't expect people to jump in and help you. That's not how these things work. You need to get something half-way useful first, and then others will say hey, that almost works for me, and they'll get involved in the project. ^- THAT is critical advise here. We should also keep in mind that some of our long-time users are on the AOO forums being helped and the categorization there seems to work quite well. You only need to look at their numbers to realize that common sense categorization works[1] and where new forums appear these are more of a targeted and deliberate choice (as in the case of the US marketing forums, this is more of a concerted group effort from the part of the whole TDF/LibreOffice team). The best way to involve them then is to invite them to take part in the organic growth of the forums. The best way to do that, is to start with a small and minimal set of forums, be open to change and
[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source
l10ntools/source/export2.cxx | 12 +++- l10ntools/source/helpex.cxx | 28 l10ntools/source/lngex.cxx | 15 ++- 3 files changed, 29 insertions(+), 26 deletions(-) New commits: commit f9e4d3bfe8eedd49afc2d2161f47a8825a02eec8 Author: Zolnai Tamás zolnaitamas2...@gmail.com Date: Sun Oct 7 11:42:37 2012 +0200 Make Export::handleArguments method safer -Check wheather input and output file are given -Return with empty HandledArgs when input is invalid -Delete plus conditions from helpex and lngex Change-Id: I418b1ecaab5f0c78197845448ab062aa5d3ba4de diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index e2be3f3..64a5b1b 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -94,6 +94,7 @@ rtl::OString Export::sForcedLanguages; bool Export::handleArguments( int argc, char * argv[], HandledArgs o_aHandledArgs) { +o_aHandledArgs = HandledArgs(); if ( argc = 1 ) { return false; @@ -169,7 +170,16 @@ bool Export::handleArguments( } } } -return true; +if( !o_aHandledArgs.m_sInputFile.isEmpty() +!o_aHandledArgs.m_sOutputFile.isEmpty() ) +{ +return true; +} +else +{ +o_aHandledArgs = HandledArgs(); +return false; +} } void Export::writeUsage(const OString rName, const OString rFileType) diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index 574987e..8dca205 100644 --- a/l10ntools/source/helpex.cxx +++ b/l10ntools/source/helpex.cxx @@ -39,24 +39,20 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { //sal_uInt32 startfull = Export::startMessure(); bool hasNoError = true; -if ( !aArgs.m_sOutputFile.isEmpty() ){ -HelpParser aParser( aArgs.m_sInputFile ); - -if ( aArgs.m_bMergeMode ) -{ -//sal_uInt64 startreadloc = Export::startMessure(); -MergeDataFile aMergeDataFile( aArgs.m_sMergeSrc, aArgs.m_sInputFile, false ); - -hasNoError = aParser.Merge( aArgs.m_sMergeSrc, aArgs.m_sOutputFile , Export::sLanguages , aMergeDataFile ); -} -else -hasNoError = -aParser.CreateSDF( -aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot, -aArgs.m_sInputFile, new XMLFile( OUString('0') ), help ); +HelpParser aParser( aArgs.m_sInputFile ); +if ( aArgs.m_bMergeMode ) +{ +//sal_uInt64 startreadloc = Export::startMessure(); +MergeDataFile aMergeDataFile( aArgs.m_sMergeSrc, aArgs.m_sInputFile, false ); +hasNoError = aParser.Merge( aArgs.m_sMergeSrc, aArgs.m_sOutputFile , Export::sLanguages , aMergeDataFile ); } else -std::cerr helpex ERROR: Wrong input parameters!\n; +{ +hasNoError = +aParser.CreateSDF( +aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot, +aArgs.m_sInputFile, new XMLFile( OUString('0') ), help ); +} if( hasNoError ) return 0; diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index 706ab26..eb5 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -34,15 +34,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { return 1; } -if (!aArgs.m_sOutputFile.isEmpty()) -{ -LngParser aParser( aArgs.m_sInputFile, true ); -if ( aArgs.m_bMergeMode ) -aParser.Merge(aArgs.m_sMergeSrc, aArgs.m_sOutputFile); -else -aParser.CreateSDF( -aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot ); -} +LngParser aParser( aArgs.m_sInputFile, true ); +if ( aArgs.m_bMergeMode ) +aParser.Merge(aArgs.m_sMergeSrc, aArgs.m_sOutputFile); +else +aParser.CreateSDF( +aArgs.m_sOutputFile, aArgs.m_sPrj, aArgs.m_sPrjRoot ); return 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Fix fdo#47669: also check if we started the tag before endin...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/831 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/831/1 Fix fdo#47669: also check if we started the tag before ending it The problem is we created imbalance end tag /w:hyperlink which shouldn't be there. So, place a check before inserting end tag should help. Inspired by (read: copied from) c1c2688912e769dfd7654e11e87dae380a8ce1eb ;) Change-Id: Ic933f6da44c788cba48bb2fe6fa29658985310b6 --- A sw/qa/extras/ooxmlexport/data/fdo47669.docx M sw/qa/extras/ooxmlexport/ooxmlexport.cxx M sw/source/filter/ww8/docxattributeoutput.cxx 3 files changed, 21 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/831 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic933f6da44c788cba48bb2fe6fa29658985310b6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] cppcheck: unreadVariable
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/832 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/832/1 cppcheck: unreadVariable Defined the aStr within the #ifdef block where it is used. Change-Id: I2878d2db002411783e814b0ecf02e2a030d2d6d4 --- M writerfilter/source/ooxml/OOXMLFastHelper.hxx 1 file changed, 4 insertions(+), 5 deletions(-) -- To view, visit https://gerrit.libreoffice.org/832 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2878d2db002411783e814b0ecf02e2a030d2d6d4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] cppcheck: clarifyCalculation
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/833 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/833/1 cppcheck: clarifyCalculation Use () to clarify the order of the operator + minor formatting Change-Id: I3dfa6566758d30bd76bed478089a0937ade24f89 --- M desktop/win32/source/guistdio/guistdio.inc M sw/source/core/layout/flowfrm.cxx 2 files changed, 3 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/833 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3dfa6566758d30bd76bed478089a0937ade24f89 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Minutes of the ESC call 2012-10-04
On Fri, Oct 05, 2012 at 05:58:02PM +0200, Thorsten Behrens wrote: * distro/suse/suse-3.6 branch: input appreciated (Kendy/Michael) + lionel: already 2000 tags, who cares about some more + resolution: check this in, tags and all + clean legacy tags at end of support life if a problem. I didn't think of one point during the talk: The tags should not be too generic. Ideally, for example if they all start with a SuSE prefix, that's perfect. The idea is that you should not get into the way of another distro doing the same thing. I'd be unhappy with tags such as libreoffice-3.6.0.2-5, because that could be the fifth packaging revision of libreoffice 3.6.0.2, for _any_ distribution. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sfx2/source
sfx2/source/doc/docfile.cxx |1 + sfx2/source/doc/doctemplates.cxx |3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 1f79b55bcabe2a627573e711a04d413d478c5882 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Oct 7 17:09:36 2012 +0200 Some cppcheck cleaning Change-Id: I9ce4af18d1cdbf694093309a026fd6c738590b82 diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 9c199ad..995be9c 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -325,6 +325,7 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) : bIsStorage( false ), bUseInteractionHandler( true ), bAllowDefaultIntHdl( false ), +bDisposeStorage( false ), bStorageBasedOnInStream( false ), m_bSalvageMode( false ), m_bVersionsAlreadyLoaded( false ), diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 76a4f5d..e1f1986 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -618,12 +618,11 @@ void SfxDocTplService_Impl::getDirList() sal_Bool SfxDocTplService_Impl::needsUpdate() { OUString aPropName( PROPERTY_NEEDSUPDATE ); -sal_Bool bHasProperty = sal_False; sal_Bool bNeedsUpdate = sal_True; Any aValue; // Get the template dir list -bHasProperty = getProperty( maRootContent, aPropName, aValue ); +sal_Bool bHasProperty = getProperty( maRootContent, aPropName, aValue ); if ( bHasProperty ) aValue = bNeedsUpdate; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source unusedcode.easy
connectivity/source/drivers/mork/MColumnAlias.cxx | 12 connectivity/source/drivers/mork/MColumnAlias.hxx |1 connectivity/source/drivers/mork/MNSProfileDiscover.cxx | 42 connectivity/source/drivers/mork/MNSProfileDiscover.hxx |4 - unusedcode.easy |5 - 5 files changed, 64 deletions(-) New commits: commit 378b578f9c33f35093c47090ff0271990346be93 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Oct 7 17:29:39 2012 +0200 Remove unused mork methods Change-Id: I2d9c02145bf332ecfc0e2493bc697d61259c9d16 diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx index c833787..624b5ab 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.cxx +++ b/connectivity/source/drivers/mork/MColumnAlias.cxx @@ -137,16 +137,4 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference ::com::su return pos-second.programmaticAsciiName; } -//-- -bool OColumnAlias::isColumnSearchable( const ::rtl::OUString _alias ) const -{ -::rtl::OString sProgrammatic = getProgrammaticNameOrFallbackToUTF8Alias( _alias ); - -return ( !sProgrammatic.equals( HomeCountry ) - !sProgrammatic.equals( WorkCountry ) -); -// for those, we know that they're not searchable in the Mozilla/LDAP implementation. -// There might be more ... -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index 3b713ae..45f6f78 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -67,7 +67,6 @@ namespace connectivity inline AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); } inline AliasMap::const_iterator end() const { return m_aAliasMap.end(); } -bool isColumnSearchable( const ::rtl::OUString _alias ) const; private: void initialize( const ::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory _rxORB ); diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx index 014e17c..9c7521c 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx @@ -158,30 +158,6 @@ namespace connectivity return m_Product.mProfileList[profileName]-getProfilePath(); } -::sal_Int32 ProfileAccess::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException) -{ -sal_Int32 index=product; -ProductStruct m_Product = m_ProductProfileList[index]; -return static_cast ::sal_Int32 (m_Product.mProfileList.size()); -} -::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence ::rtl::OUString list ) throw (::com::sun::star::uno::RuntimeException) -{ -sal_Int32 index=product; -ProductStruct m_Product = m_ProductProfileList[index]; - list.realloc(static_castsal_Int32(m_Product.mProfileList.size())); -sal_Int32 i=0; -for(ProfileList::iterator itor=m_Product.mProfileList.begin(); -itor != m_Product.mProfileList.end(); -++itor) -{ -ProfileStruct * aProfile = (*itor).second; -list[i] = aProfile-getProfileName(); -i++; -} - -return static_cast ::sal_Int32 (m_Product.mProfileList.size()); -} - ::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; @@ -199,24 +175,6 @@ namespace connectivity ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second; return aProfile-getProfileName(); } -::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString profileName ) throw (::com::sun::star::uno::RuntimeException) -{ -(void)product; /* avoid warning about unused parameter */ -(void)profileName; /* avoid warning about unused parameter */ -return sal_True; -} - -::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString profileName ) throw (::com::sun::star::uno::RuntimeException) -{ -sal_Int32 index=product; -ProductStruct m_Product =
[Libreoffice-commits] .: cli_ure/CliLibrary_cli_basetypes.mk cli_ure/CliNativeLibrary_cli_cppuhelper.mk cli_ure/CliUnoApi_cli_uretypes.mk cli_ure/CustomTarget_cli_ure_assemblies.mk solenv/gbuild
cli_ure/CliLibrary_cli_basetypes.mk|4 cli_ure/CliNativeLibrary_cli_cppuhelper.mk |2 +- cli_ure/CliUnoApi_cli_uretypes.mk |2 ++ cli_ure/CustomTarget_cli_ure_assemblies.mk |2 +- solenv/gbuild/CliLibrary.mk| 10 ++ 5 files changed, 18 insertions(+), 2 deletions(-) New commits: commit 3fc40953c635185f8bcd1b58a1d68d28526558d4 Author: Peter Foley pefol...@verizon.net Date: Sun Sep 23 09:59:37 2012 -0400 fix gbuildized cli_ure Change-Id: I3e02afbd1b75641bdc90443e7c07018c113a971a diff --git a/cli_ure/CliLibrary_cli_basetypes.mk b/cli_ure/CliLibrary_cli_basetypes.mk index 2d7b937..2dcc2e1 100644 --- a/cli_ure/CliLibrary_cli_basetypes.mk +++ b/cli_ure/CliLibrary_cli_basetypes.mk @@ -32,4 +32,8 @@ $(eval $(call gb_CliLibrary_add_generated_csfiles,cli_basetypes,\ CustomTarget/cli_ure/source/basetypes/assembly \ )) +$(eval $(call gb_CliLibrary_use_package,cli_basetypes,\ + cli_ure_cliuno \ +)) + # vim: set noet sw=4 ts=4: diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk index 8372f93..dfc52ba 100644 --- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk +++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk @@ -15,7 +15,7 @@ $(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper_nat $(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config)) -$(eval $(call gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/clinuo.snk)) +$(eval $(call gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/cliuno.snk)) $(eval $(call gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION))) diff --git a/cli_ure/CliUnoApi_cli_uretypes.mk b/cli_ure/CliUnoApi_cli_uretypes.mk index 5748523..78de63a 100644 --- a/cli_ure/CliUnoApi_cli_uretypes.mk +++ b/cli_ure/CliUnoApi_cli_uretypes.mk @@ -21,4 +21,6 @@ $(eval $(call gb_CliUnoApi_set_policy,cli_uretypes,$(CLI_URETYPES_POLICY_ASSEMBL $(eval $(call gb_CliUnoApi_wrap_api,cli_uretypes,udkapi)) +$(call gb_CliUnoApiTarget_get_target,cli_uretypes) :| $(call gb_Library_get_target,bootstrap) + # vim: set noet sw=4 ts=4: diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk index da66178..2adeae8 100644 --- a/cli_ure/CustomTarget_cli_ure_assemblies.mk +++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk @@ -10,7 +10,7 @@ cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST)) # FIXME move this to configure.in ? -cli_ure_CCNUMVER = $(shell $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk) +cli_ure_CCNUMVER = $(shell PATH='$(PATH)' $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk) cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) '=' 0013) include $(SRCDIR)/cli_ure/version/version.txt diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 9cf6bd5..30a3c25 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -81,6 +81,11 @@ $(call gb_CliLibraryTarget_get_target,$(1)) : $(call gb_CliLibrary_get_target,$( endef +define gb_CliLibraryTarget_use_package +$(call gb_CliLibraryTarget_get_target,$(1)) :| $(call gb_Package_get_target,$(strip $(2))) + +endef + define gb_CliLibraryTarget_use_assemblies $(foreach assembly,$(2),$(call gb_CliLibraryTarget_use_assembly,$(1),$(assembly))) @@ -146,6 +151,11 @@ $(call gb_CliAssembly_set_configfile,$(1),$(2)) endef +define gb_CliLibrary_use_package +$(call gb_CliLibraryTarget_use_package,$(1),$(2)) + +endef + define gb_CliLibrary_set_keyfile $(call gb_CliAssembly_set_keyfile,$(1),$(2)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fix gbuildized cli_ure
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/819 -- To view, visit https://gerrit.libreoffice.org/819 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e02afbd1b75641bdc90443e7c07018c113a971a Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: dictionaries/pt_PT
dictionaries/pt_PT/description.xml |5 dictionaries/pt_PT/pt_PT.dic | 246 - 2 files changed, 136 insertions(+), 115 deletions(-) New commits: commit adb6d7f7a1d6f1d6e9b67e5626b32506c27b0612 Author: Andras Timar ati...@suse.com Date: Sun Oct 7 18:35:26 2012 +0200 updated pt-PT spelling dictionary Change-Id: I8a1762590470e1ab0022ec94f195cdd20c0c2777 diff --git a/dictionaries/pt_PT/description.xml b/dictionaries/pt_PT/description.xml index e165360..18b5238 100644 --- a/dictionaries/pt_PT/description.xml +++ b/dictionaries/pt_PT/description.xml @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? description xmlns=http://openoffice.org/extensions/description/2006; xmlns:d=http://openoffice.org/extensions/description/2006; xmlns:xlink=http://www.w3.org/1999/xlink; -version value=12.7.1.1 / +version value=12.10.1.1 / + identifier value=Natura.OOo3.pt-PT-dictionary / display-name name lang=en-USEuropean Portuguese spelling dictionary, hyphenation rules, and thesaurus/name @@ -10,6 +11,6 @@ OpenOffice.org-minimal-version value=3.0 d:name=OpenOffice.org 3.0 / /dependencies publisher -name xlink:href=http://maracuja.homeip.net/software/dict; lang=en-USMaracujá/name +name xlink:href=http://natura.di.uminho.pt/wiki/doku.php?id=dicionarios:main; lang=enNatura/name /publisher /description diff --git a/dictionaries/pt_PT/pt_PT.dic b/dictionaries/pt_PT/pt_PT.dic index 4880ab2..4ca5141 100644 --- a/dictionaries/pt_PT/pt_PT.dic +++ b/dictionaries/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 43831 + 43851 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -593,6 +593,7 @@ adotar/XYPLRn [PREAO90=adoptar,CAT=v,T=inf,TR=t] adotivo/fp [PREAO90=adoptivo,CAT=adj,N=s,G=m] adorar/XYPLcDv [CAT=v,T=inf,TR=t] adorativo [CAT=adj,N=s,G=m] +adorável/m[CAT=adj,N=s,G=_] adormecer/XYPLRMD [CAT=v,T=inf,TR=t] adormentar/XYPLD [CAT=v,T=inf,TR=t] adornar/XYPL [CAT=v,T=inf,TR=t] @@ -869,7 +870,7 @@ agostiniano/fp [CAT=adj,N=s,G=m] agourar/XYPL [CAT=v,T=inf,TR=_] agoureiro [CAT=a_nc,G=m,N=s] agourentar/XYPL[CAT=v,T=inf,TR=t] -agourento [CAT=adj,N=s,G=m] +agourento/p[CAT=adj,N=s,G=m] agouro/p [CAT=nc,G=m,N=s] agraciar/XYPLMv[CAT=v,T=inf,TR=t] agradar/XYLSv [CAT=v,T=inf,TR=i] @@ -1799,7 +1800,7 @@ anemizante/p [CAT=adj,N=s,G=_] anemizar/XYPLn [CAT=v,T=inf,TR=t] anemómetro/p [CAT=nc,G=m,N=s] anémona-do-mar[CAT=nc,G=f,N=s] -anémona [CAT=nc,G=f,N=s] +anémona/p [CAT=nc,G=f,N=s] anencefalia[CAT=nc,G=f,N=s] anencefálico/pf [CAT=adj,N=s,G=m] anencéfalo/p [CAT=adj,N=s,G=m] @@ -1849,6 +1850,7 @@ anglo-saxónico/fp[CAT=adj,N=s,G=m] angola [CAT=a_nc,G=m,N=s] angolano/fp[CAT=a_nc,G=m,N=s] angolense/p[CAT=a_nc,N=s,G=_] +angorá[CAT=nc,G=_,N=s] angra [CAT=nc,G=f,N=s] angrense/p [CAT=a_nc,N=s,G=_] anguiforme/p [CAT=adj,N=s,G=_] @@ -4005,7 +4007,7 @@ baciloterapia [CAT=nc,G=f,N=s] bacinete/p [CAT=nc,G=m,N=s] bacio/p[CAT=nc,G=m,N=s] bacoco/pfG [CAT=a_nc,G=m,N=s] -baço/p[CAT=a_nc,G=m,N=s] +baço/pf [CAT=a_nc,G=m,N=s] baconiano [CAT=adj,N=s,G=m] baconismo/p[CAT=nc,G=m,N=s] bacoquismo/p [CAT=nc,G=m,N=s] @@ -4023,7 +4025,7 @@ bacteriose[CAT=nc,G=f,N=s] baculÃfero[CAT=adj,N=s,G=m] baculiforme/p [CAT=adj,N=s,G=_] baculino [CAT=adj,N=s,G=m] -báculo[CAT=nc,G=m,N=s] +báculo/p [CAT=nc,G=m,N=s] badalada [CAT=nc,G=f,N=s] badala [CAT=nc,G=f,N=s] badalão [CAT=nc,G=m,N=s] @@ -4033,15 +4035,16 @@ badaleiro/f [CAT=nc,G=m,N=s] badalejar/XYL [CAT=v,T=inf,TR=i] badalhoca [CAT=nc,G=f,N=s] badalo/p [CAT=nc,G=m,N=s] -badameco [CAT=nc,G=m,N=s] +badameco/fp[CAT=nc,G=m,N=s] badanal[CAT=nc,G=m,N=s] -badana [CAT=nc,G=f,N=s] +badana/p [CAT=nc,G=f,N=s] badanar/XYL[CAT=v,T=inf,TR=i] bafar/XYL [CAT=v,T=inf,TR=i] bafejante/p[CAT=adj,N=s,G=_] bafejar/XYPLDn [CAT=v,T=inf,TR=_] bafejo [CAT=nc,G=m,N=s] -bafiento [CAT=adj,N=s,G=m] +bafiento/fp[CAT=adj,N=s,G=m] +bafio [CAT=nc,G=m,N=s] bafo [CAT=nc,G=m,N=s] baforada [CAT=nc,G=f,N=s] baforar/XYL[CAT=v,T=inf,TR=i] @@ -4181,7 +4184,7 @@ bambaleante/p [CAT=adj,N=s,G=m] bambalear/ZYLn [CAT=v,T=inf,TR=i] bambaleio [CAT=nc,G=m,N=s] bambino/p [CAT=nc,G=m,N=s] -bambo [CAT=adj,N=s,G=m] +bambo/fp [CAT=adj,N=s,G=m] bambolim [CAT=nc,G=m,N=s] bambolina [CAT=nc,G=f,N=s] bambual[CAT=nc,G=m,N=s] @@ -5042,7 +5045,7 @@ bochecha/p[CAT=nc,G=f,N=s] bochechão [CAT=nc,G=m,N=s] bochechar/XYPL [CAT=v,T=inf,TR=_] bochecho/p [CAT=nc,G=m,N=s] -bochechudo [CAT=nc,G=m,N=s] +bochechudo/pf [CAT=nc,G=m,N=s] boche/p[CAT=nc,G=m,N=s] bócio [CAT=nc,G=m,N=s]
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - dictionaries/pt_PT
dictionaries/pt_PT/description.xml |5 dictionaries/pt_PT/pt_PT.dic | 246 - 2 files changed, 136 insertions(+), 115 deletions(-) New commits: commit 60bb7c8b156b0fa52689e1b343409c8d9792da21 Author: Andras Timar ati...@suse.com Date: Sun Oct 7 18:35:26 2012 +0200 updated pt-PT spelling dictionary Change-Id: I8a1762590470e1ab0022ec94f195cdd20c0c2777 diff --git a/dictionaries/pt_PT/description.xml b/dictionaries/pt_PT/description.xml index e165360..18b5238 100644 --- a/dictionaries/pt_PT/description.xml +++ b/dictionaries/pt_PT/description.xml @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? description xmlns=http://openoffice.org/extensions/description/2006; xmlns:d=http://openoffice.org/extensions/description/2006; xmlns:xlink=http://www.w3.org/1999/xlink; -version value=12.7.1.1 / +version value=12.10.1.1 / + identifier value=Natura.OOo3.pt-PT-dictionary / display-name name lang=en-USEuropean Portuguese spelling dictionary, hyphenation rules, and thesaurus/name @@ -10,6 +11,6 @@ OpenOffice.org-minimal-version value=3.0 d:name=OpenOffice.org 3.0 / /dependencies publisher -name xlink:href=http://maracuja.homeip.net/software/dict; lang=en-USMaracujá/name +name xlink:href=http://natura.di.uminho.pt/wiki/doku.php?id=dicionarios:main; lang=enNatura/name /publisher /description diff --git a/dictionaries/pt_PT/pt_PT.dic b/dictionaries/pt_PT/pt_PT.dic index 4880ab2..4ca5141 100644 --- a/dictionaries/pt_PT/pt_PT.dic +++ b/dictionaries/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 43831 + 43851 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -593,6 +593,7 @@ adotar/XYPLRn [PREAO90=adoptar,CAT=v,T=inf,TR=t] adotivo/fp [PREAO90=adoptivo,CAT=adj,N=s,G=m] adorar/XYPLcDv [CAT=v,T=inf,TR=t] adorativo [CAT=adj,N=s,G=m] +adorável/m[CAT=adj,N=s,G=_] adormecer/XYPLRMD [CAT=v,T=inf,TR=t] adormentar/XYPLD [CAT=v,T=inf,TR=t] adornar/XYPL [CAT=v,T=inf,TR=t] @@ -869,7 +870,7 @@ agostiniano/fp [CAT=adj,N=s,G=m] agourar/XYPL [CAT=v,T=inf,TR=_] agoureiro [CAT=a_nc,G=m,N=s] agourentar/XYPL[CAT=v,T=inf,TR=t] -agourento [CAT=adj,N=s,G=m] +agourento/p[CAT=adj,N=s,G=m] agouro/p [CAT=nc,G=m,N=s] agraciar/XYPLMv[CAT=v,T=inf,TR=t] agradar/XYLSv [CAT=v,T=inf,TR=i] @@ -1799,7 +1800,7 @@ anemizante/p [CAT=adj,N=s,G=_] anemizar/XYPLn [CAT=v,T=inf,TR=t] anemómetro/p [CAT=nc,G=m,N=s] anémona-do-mar[CAT=nc,G=f,N=s] -anémona [CAT=nc,G=f,N=s] +anémona/p [CAT=nc,G=f,N=s] anencefalia[CAT=nc,G=f,N=s] anencefálico/pf [CAT=adj,N=s,G=m] anencéfalo/p [CAT=adj,N=s,G=m] @@ -1849,6 +1850,7 @@ anglo-saxónico/fp[CAT=adj,N=s,G=m] angola [CAT=a_nc,G=m,N=s] angolano/fp[CAT=a_nc,G=m,N=s] angolense/p[CAT=a_nc,N=s,G=_] +angorá[CAT=nc,G=_,N=s] angra [CAT=nc,G=f,N=s] angrense/p [CAT=a_nc,N=s,G=_] anguiforme/p [CAT=adj,N=s,G=_] @@ -4005,7 +4007,7 @@ baciloterapia [CAT=nc,G=f,N=s] bacinete/p [CAT=nc,G=m,N=s] bacio/p[CAT=nc,G=m,N=s] bacoco/pfG [CAT=a_nc,G=m,N=s] -baço/p[CAT=a_nc,G=m,N=s] +baço/pf [CAT=a_nc,G=m,N=s] baconiano [CAT=adj,N=s,G=m] baconismo/p[CAT=nc,G=m,N=s] bacoquismo/p [CAT=nc,G=m,N=s] @@ -4023,7 +4025,7 @@ bacteriose[CAT=nc,G=f,N=s] baculÃfero[CAT=adj,N=s,G=m] baculiforme/p [CAT=adj,N=s,G=_] baculino [CAT=adj,N=s,G=m] -báculo[CAT=nc,G=m,N=s] +báculo/p [CAT=nc,G=m,N=s] badalada [CAT=nc,G=f,N=s] badala [CAT=nc,G=f,N=s] badalão [CAT=nc,G=m,N=s] @@ -4033,15 +4035,16 @@ badaleiro/f [CAT=nc,G=m,N=s] badalejar/XYL [CAT=v,T=inf,TR=i] badalhoca [CAT=nc,G=f,N=s] badalo/p [CAT=nc,G=m,N=s] -badameco [CAT=nc,G=m,N=s] +badameco/fp[CAT=nc,G=m,N=s] badanal[CAT=nc,G=m,N=s] -badana [CAT=nc,G=f,N=s] +badana/p [CAT=nc,G=f,N=s] badanar/XYL[CAT=v,T=inf,TR=i] bafar/XYL [CAT=v,T=inf,TR=i] bafejante/p[CAT=adj,N=s,G=_] bafejar/XYPLDn [CAT=v,T=inf,TR=_] bafejo [CAT=nc,G=m,N=s] -bafiento [CAT=adj,N=s,G=m] +bafiento/fp[CAT=adj,N=s,G=m] +bafio [CAT=nc,G=m,N=s] bafo [CAT=nc,G=m,N=s] baforada [CAT=nc,G=f,N=s] baforar/XYL[CAT=v,T=inf,TR=i] @@ -4181,7 +4184,7 @@ bambaleante/p [CAT=adj,N=s,G=m] bambalear/ZYLn [CAT=v,T=inf,TR=i] bambaleio [CAT=nc,G=m,N=s] bambino/p [CAT=nc,G=m,N=s] -bambo [CAT=adj,N=s,G=m] +bambo/fp [CAT=adj,N=s,G=m] bambolim [CAT=nc,G=m,N=s] bambolina [CAT=nc,G=f,N=s] bambual[CAT=nc,G=m,N=s] @@ -5042,7 +5045,7 @@ bochecha/p[CAT=nc,G=f,N=s] bochechão [CAT=nc,G=m,N=s] bochechar/XYPL [CAT=v,T=inf,TR=_] bochecho/p [CAT=nc,G=m,N=s] -bochechudo [CAT=nc,G=m,N=s] +bochechudo/pf [CAT=nc,G=m,N=s] boche/p[CAT=nc,G=m,N=s] bócio [CAT=nc,G=m,N=s]
Re: Forums Proposal
On Sat, Oct 6, 2012 at 7:23 AM, Marc Paré m...@marcpare.com wrote: * move the list to a forum (there would be a short transitional period where the mailing list/forums would exist together and then the mailing list would be closed. OR if by 'the list' you mean the dev mailing list... then that option is a no starter. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cli_ure/CliLibrary_cli_basetypes.mk cli_ure/CliUnoApi_cli_uretypes.mk cli_ure/CustomTarget_cli_ure_assemblies.mk solenv/gbuild
cli_ure/CliLibrary_cli_basetypes.mk|4 cli_ure/CliUnoApi_cli_uretypes.mk |2 -- cli_ure/CustomTarget_cli_ure_assemblies.mk |2 +- solenv/gbuild/CliLibrary.mk| 10 -- 4 files changed, 1 insertion(+), 17 deletions(-) New commits: commit 68d6252312a75627c51f1da45f8e01fedf0f3c60 Author: David Tardon dtar...@redhat.com Date: Sun Oct 7 20:00:38 2012 +0200 most of this is not necessary anymore This reverts commit 3fc40953c635185f8bcd1b58a1d68d28526558d4. Change-Id: I6d11212cc260e03e5c83a0e7be93ed66e1ab452f diff --git a/cli_ure/CliLibrary_cli_basetypes.mk b/cli_ure/CliLibrary_cli_basetypes.mk index 2dcc2e1..2d7b937 100644 --- a/cli_ure/CliLibrary_cli_basetypes.mk +++ b/cli_ure/CliLibrary_cli_basetypes.mk @@ -32,8 +32,4 @@ $(eval $(call gb_CliLibrary_add_generated_csfiles,cli_basetypes,\ CustomTarget/cli_ure/source/basetypes/assembly \ )) -$(eval $(call gb_CliLibrary_use_package,cli_basetypes,\ - cli_ure_cliuno \ -)) - # vim: set noet sw=4 ts=4: diff --git a/cli_ure/CliUnoApi_cli_uretypes.mk b/cli_ure/CliUnoApi_cli_uretypes.mk index 78de63a..5748523 100644 --- a/cli_ure/CliUnoApi_cli_uretypes.mk +++ b/cli_ure/CliUnoApi_cli_uretypes.mk @@ -21,6 +21,4 @@ $(eval $(call gb_CliUnoApi_set_policy,cli_uretypes,$(CLI_URETYPES_POLICY_ASSEMBL $(eval $(call gb_CliUnoApi_wrap_api,cli_uretypes,udkapi)) -$(call gb_CliUnoApiTarget_get_target,cli_uretypes) :| $(call gb_Library_get_target,bootstrap) - # vim: set noet sw=4 ts=4: diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk index 2adeae8..da66178 100644 --- a/cli_ure/CustomTarget_cli_ure_assemblies.mk +++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk @@ -10,7 +10,7 @@ cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST)) # FIXME move this to configure.in ? -cli_ure_CCNUMVER = $(shell PATH='$(PATH)' $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk) +cli_ure_CCNUMVER = $(shell $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk) cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) '=' 0013) include $(SRCDIR)/cli_ure/version/version.txt diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 30a3c25..9cf6bd5 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -81,11 +81,6 @@ $(call gb_CliLibraryTarget_get_target,$(1)) : $(call gb_CliLibrary_get_target,$( endef -define gb_CliLibraryTarget_use_package -$(call gb_CliLibraryTarget_get_target,$(1)) :| $(call gb_Package_get_target,$(strip $(2))) - -endef - define gb_CliLibraryTarget_use_assemblies $(foreach assembly,$(2),$(call gb_CliLibraryTarget_use_assembly,$(1),$(assembly))) @@ -151,11 +146,6 @@ $(call gb_CliAssembly_set_configfile,$(1),$(2)) endef -define gb_CliLibrary_use_package -$(call gb_CliLibraryTarget_use_package,$(1),$(2)) - -endef - define gb_CliLibrary_set_keyfile $(call gb_CliAssembly_set_keyfile,$(1),$(2)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Broken dmake
Hello, I recently reinstalled a different Linux distro on my system. Using the same repo that I had before, I made a make clean, autogen.sh, and then trying to run make I get these errors: dmake: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.14' not found (required by dmake) So, first question: is this a LO-hacked dmake that is broken that I need to rebuild? If so, how do I do it? Regards, Marc-André LAVERDIÈRE Perseverance must finish its work so that you may be mature and complete, not lacking anything. -James 1:4 http://asimplediscipleslife.blogspot.com/ mlaverd.theunixplace.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/Package_uiconfig.mk
sw/Package_uiconfig.mk |1 + 1 file changed, 1 insertion(+) New commits: commit ccb65352599dc2cc0b561d01ac12a513705d936d Author: Ivan Timofeev timofeev@gmail.com Date: Sun Oct 7 22:25:58 2012 +0400 fdo#55567: add findbar.xml back to makefile regression from e125d95ba4a4905fa36ba8f4bed0c2dafd37ce13 Change-Id: I0deeb042c60d3f7d556286a0956bb4866e1c203b diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk index 150b3ae..18eb908 100644 --- a/sw/Package_uiconfig.mk +++ b/sw/Package_uiconfig.mk @@ -194,6 +194,7 @@ $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolb $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawingobjectbar.xml,swriter/toolbar/drawingobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml,swriter/toolbar/drawtextobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml,swriter/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/findbar.xml,swriter/toolbar/findbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/flowchartshapes.xml,swriter/toolbar/flowchartshapes.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml,swriter/toolbar/fontworkobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkshapetype.xml,swriter/toolbar/fontworkshapetype.xml)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 55567, which changed state. Bug 55567 Summary: UI: Find Bar incomplete, empty, input pane is missing https://bugs.freedesktop.org/show_bug.cgi?id=55567 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Forums Proposal
Hi Norbert, Le 2012-10-07 12:57, Norbert Thiebaud a écrit : On Sat, Oct 6, 2012 at 7:23 AM, Marc Parém...@marcpare.com wrote: * move the list to a forum (there would be a short transitional period where the mailing list/forums would exist together and then the mailing list would be closed. OR if by 'the list' you mean the dev mailing list... then that option is a no starter. Norbert Thanks for your input. Cheers, Marc -- Marc Paré m...@marcpare.com http://www.parEntreprise.com parEntreprise.com Supports OpenDocument Formats (ODF) parEntreprise.com Supports http://www.LibreOffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] More ::rtl::OUString to OUString in basctl
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/834 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/834/1 More ::rtl::OUString to OUString in basctl Change-Id: Ie27a55e933462c644f315d0123978082054d79af --- M basctl/source/basicide/bastype3.cxx M basctl/source/basicide/bastypes.cxx M basctl/source/basicide/brkdlg.cxx M basctl/source/basicide/iderdll.cxx 4 files changed, 41 insertions(+), 42 deletions(-) -- To view, visit https://gerrit.libreoffice.org/834 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie27a55e933462c644f315d0123978082054d79af Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Horst hom...@yahoo.com changed: What|Removed |Added Depends on||54514 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #133 from Horst hom...@yahoo.com --- Adding minor bug 54514 Old icons in Print Preview. Not critical but not beautiful -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Horst hom...@yahoo.com changed: What|Removed |Added Depends on||55367 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #134 from Horst hom...@yahoo.com --- Add minor bug 55367 wrong convertion factor for tspm in function CONVERT_ADD. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] ::rtl::OUString to OUString in basctl
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/835 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/835/1 ::rtl::OUString to OUString in basctl Change-Id: If6a53fd69f8a99bafc7fc324911132dd51e67266 --- M basctl/source/basicide/linenumberwindow.cxx M basctl/source/basicide/localizationmgr.cxx 2 files changed, 117 insertions(+), 117 deletions(-) -- To view, visit https://gerrit.libreoffice.org/835 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If6a53fd69f8a99bafc7fc324911132dd51e67266 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
master build broken ?
Hi all, Since yesterday I can't build the master. Build seems to loop endless at this stage: [build MOD] sw [build LNK] CppunitTest/libtest_sc_ucalc.so [build CUT] sw_macros_test [build CUT] sw_subsequent_ooxmlexport [build CUT] sw_subsequent_ooxmlimport [build CUT] sw_subsequent_ww8export [build CUT] sw_subsequent_ww8import [build CUT] sw_subsequent_rtfexport [build CUT] sw_filters_test [build CUT] sc_ucalc [build LNK] CppunitTest/libtest_sc_rangelst_test.so [build SLC] sw [build LNK] Library/vbaobj.uno.so [build LNK] Library/libscuilo.so [build SLC] tail_end [build SLC] loaded modules: MathMLDTD Mesa UnoControls accessibility afms animations apache_commons apple_remote autodoc avmedia basctl basebmp basegfx basic bean binaryurp bluez_bluetooth bridges canvas chart2 cli_ure clucene codemaker comphelper configmgr connectivity cosv cppcanvas cppu cppuhelper cpputools cui dbaccess desktop dictionaries drawinglayer dtrans editeng embeddedobj embedserv eventattacher extensions extras fileaccess filter forms formula fpicker framework helpcompiler hsqldb hwpfilter i18npool i18nutil idl idlc io javaunohelper jfreereport jurt jvmaccess jvmfwk l10ntools libcdr libcmis libmspub liborcus libvisio libwpd libwpg libwps lingucomponent linguistic lotuswordpro mdds more_fonts nlpsolver np_sdk o3tl offapi officecfg oovbaapi oox package padmin psprint_config pyuno rdbmaker readlicense_oo regexp registry remotebridges reportbuilder reportdesign ridljar rsc salhelper sane sax saxon sc scaddins sccomp scp2 scripting sd sdext sfx2 shell slideshow smoketest sot starmath stoc store svl svtools svx sw swext tail_end test testtools tomcat toolkit tools touch translations tubes twain ucb ucbhelper ucpp udkapi udm unixODBC unodevtools unoil unotest unotools unoxml ure uui vbahelper vcl vigra wizards writerfilter writerperfect x11_extensions xmerge xmlhelp xmloff xmlreader xmlscript xmlsecurity xsltml Any hint ? Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Some OUString and RTL_CONST refactoring
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/836 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/836/1 Some OUString and RTL_CONST refactoring Change-Id: I27709f12ef6e3448ed457bd0e9f2056979ba0291 --- M basctl/source/basicide/brkdlg.cxx M basctl/source/basicide/macrodlg.cxx M basctl/source/basicide/moduldl2.cxx 3 files changed, 92 insertions(+), 94 deletions(-) -- To view, visit https://gerrit.libreoffice.org/836 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27709f12ef6e3448ed457bd0e9f2056979ba0291 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/core/docnode/ndtbl.cxx | 51 ++- 1 file changed, 24 insertions(+), 27 deletions(-) New commits: commit 314f92b0da54085499ea06e7ee53bef4b27181db Author: Michael Stahl mst...@redhat.com Date: Thu Oct 4 19:17:56 2012 +0200 rhbz#820283, fdo#55462: sw: better fix for DOCX table import crash: The fix in 6d2e09db4a677068095b0bebd08fbbb96620d60c is completely bogus. Only vertically merged boxes result in dummy boxes with negative span, while horizontally merged boxes result in different numbers of boxes per line. So instead of inserting boxes, adjust the width of the last box in rows that are missing boxes, such that all lines have the same width. (cherry picked from commit 4113d9664c60d004474dfc1cffbcd7dc50fa6dc4) Conflicts: sw/source/core/docnode/ndtbl.cxx Change-Id: I4e90e852b314bf6f7885bde7b450dab7c668469e Reviewed-on: https://gerrit.libreoffice.org/764 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index ea1f4e4..0b97807 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1261,6 +1261,29 @@ SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange rRange) return pResult; } +static void +lcl_SetTableBoxWidths2(SwTable rTable, size_t const nMaxBoxes, +SwTableBoxFmt rBoxFmt, SwDoc rDoc) +{ +// rhbz#820283, fdo#55462: set default box widths so table width is covered +SwTableLines rLines = rTable.GetTabLines(); +for (size_t nTmpLine = 0; nTmpLine rLines.Count(); ++nTmpLine) +{ +SwTableBoxes rBoxes = rLines[nTmpLine]-GetTabBoxes(); +size_t const nMissing = nMaxBoxes - rBoxes.size(); +if (nMissing) +{ +// default width for box at the end of an incomplete line +SwTableBoxFmt *const pNewFmt = rDoc.MakeTableBoxFmt(); +pNewFmt-SetFmtAttr( SwFmtFrmSize(ATT_VAR_SIZE, +(USHRT_MAX / nMaxBoxes) * (nMissing + 1)) ); +pNewFmt-Add(rBoxes.back()); +} +} +// default width for all boxes not at the end of an incomplete line +rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, USHRT_MAX / nMaxBoxes)); +} + SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t rTableNodes, SwTableFmt* pTblFmt, SwTableLineFmt* pLineFmt, @@ -1372,33 +1395,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t rTableNodes, nMaxBoxes = nBoxes; } -// die Tabelle ausgleichen, leere Sections einfuegen -sal_uInt16 n; - -if( !aPosArr.empty() ) -{ -SwTableLines rLns = pTable-GetTabLines(); -sal_uInt16 nLastPos = 0; -for( n = 0; n aPosArr.size(); ++n ) -{ -SwTableBoxFmt *pNewFmt = pDoc-MakeTableBoxFmt(); -pNewFmt-SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, -aPosArr[ n ] - nLastPos )); -for( sal_uInt16 nLines2 = 0; nLines2 rLns.Count(); ++nLines2 ) -//JP 24.06.98: hier muss ein Add erfolgen, da das BoxFormat -// von der rufenden Methode noch gebraucht wird! -pNewFmt-Add( rLns[ nLines2 ]-GetTabBoxes()[ n ] ); - -nLastPos = aPosArr[ n ]; -} - -// damit die Tabelle die richtige Groesse bekommt, im BoxFormat die -// Groesse nach oben transportieren. -OSL_ENSURE( !pBoxFmt-GetDepends(), wer ist in dem Format noch angemeldet ); -pBoxFmt-SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nLastPos )); -} -else -pBoxFmt-SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX / nMaxBoxes )); +lcl_SetTableBoxWidths2(*pTable, nMaxBoxes, *pBoxFmt, *pDoc); // das wars doch wohl ?? return pTblNd; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sfx2/source unotools/inc unotools/source
sfx2/source/appl/childwin.cxx |2 - unotools/inc/unotools/viewoptions.hxx |7 + unotools/source/config/viewoptions.cxx | 40 +++-- 3 files changed, 41 insertions(+), 8 deletions(-) New commits: commit a4cdd39b154cfc0c7cb9912f8d31b59dec3e5e60 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Oct 5 15:00:39 2012 +0200 fdo#46071: Do not hide windows based on nil Visible property This appears to be messy: The /org.openoffice.Office.Views/WindowType configuration group template has both a nilable bool Visible property and a UserData/Data string property that encodes various things like geometry---but also visibility---in a string. Now, likely due to the problem that has meanwhile been fixed through f3f79cc9e6c265baf48955d53f7e888205e0b3e0 Resolves fdo#46074: Fix Partial::contains for paths that go past a leaf node, some registrymodification.xcu files in the wild contain such WindowType entries in default state, without a UserData/Data string and with a nil Visible property. The way SfxChildWindow::InitializeChildWinFactory_Impl and SvtViewOptions::IsVisible are implemented, they will always lead to an invisible window for such broken registrymodification.xcu data (as IsVisible unhelpfully returns false for a nil value, and InitializeChildWinFactory_Impl uses that value when there is no UserData/Data string). For the Math formula editor window (ID 30378) this means that it can disappear from the UI completely, as there appears to be no UI trigger for the user to show it in case it is hidden. The fix is to introdue SvtViewOptions::HasVisible (which only returns true if the property is not nil) and change InitializeChidlWinFactory_Impl to only use the value of IsVisible() if HasVisible() returns true. This makes the code even more baroque, but this is a rather central, generic piece of code for all sorts of windows, so I do not want to break any other uses by e.g. changing IsVisible to return true for a nil property. Change-Id: Iae40075a7116a8aabd2d25aa9334709522e23d8f (cherry picked from commit 9db74c6133ede2a28af077fd563398176ff0d858) Reviewed-on: https://gerrit.libreoffice.org/773 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index a698002..13afd10 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -365,7 +365,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin // load configuration SvtViewOptions aWinOpt( E_WINDOW, String::CreateFromInt32( nId ) ); -if ( aWinOpt.Exists() ) +if ( aWinOpt.Exists() aWinOpt.HasVisible() ) rInfo.bVisible = aWinOpt.IsVisible(); // set state from configuration. Can be overwritten by UserData, see below ::com::sun::star::uno::Sequence ::com::sun::star::beans::NamedValue aSeq = aWinOpt.GetUserData(); diff --git a/unotools/inc/unotools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx index 34c0059..faad441 100644 --- a/unotools/inc/unotools/viewoptions.hxx +++ b/unotools/inc/unotools/viewoptions.hxx @@ -264,6 +264,13 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options sal_Bool IsVisible ( ) const; void SetVisible( sal_Bool bState ); +/** Return true if the Visible property actually has a non-nil value + +(IsVisible will somewhat arbitrarily return false if the property is +nil.) +*/ +bool HasVisible() const; + /*-//** @short use it to set/get the extended user data (consisting of a set of named scalar values) @descr It's supported for ALL types! diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 112ffbb..a327c77 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -283,6 +283,8 @@ class SvtViewOptionsBase_Impl { //- public: +enum State { STATE_NONE, STATE_FALSE, STATE_TRUE }; + SvtViewOptionsBase_Impl ( const ::rtl::OUString sList); virtual ~SvtViewOptionsBase_Impl ( ); sal_BoolExists ( const ::rtl::OUStringsName); @@ -296,7
[PUSHED] Change in core[libreoffice-3-6]: rhbz#820283, fdo#55462: sw: better fix for DOCX table import...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/764 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/764 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e90e852b314bf6f7885bde7b450dab7c668469e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Beanshell and Javascript extensions not registered in master build
Hi all, I tried building master today with the following switches : ./autogen.sh --enable-binfilter --enable-extra-template --enable-extra-sample --enable-ext-scripting-beanshell --enable-ext-scripting-javascript --enable-ext-mysql-connector --with-system-mysql --enable-symbols --enable-debug --enable-dbgutil then make, followed by make dev-install. Neither the beanshell or javascript extensions were present even though the build completed successfully. I searched for corresponding OXT files in the build directories, but no joy. Any ideas ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#55367 CALC FUNCTION CONVERT_ADD wrong conversion factor for tspm
Hello, I confirmed the fdo#55367 (CALC FUNCTION CONVERT_ADD wrong convertion factor for tspm). I proposed a straightforward patch but since I found another wrong conversion value (tsp), I just wonder if I missed something (perhaps the algo which use the values is wrong). Then I checked with gal (gallon US : 1 gal = 3.785411784 Litres) and the algo seems ok. So except if I missed another thing, I can commit and push on master + I'll try to spend some time to check other conversion values. Julien -- View this message in context: http://nabble.documentfoundation.org/PATCH-fdo-55367-CALC-FUNCTION-CONVERT-ADD-wrong-conversion-factor-for-tspm-tp4011932.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Broken dmake
On Sun, Oct 7, 2012 at 1:26 PM, Marc-André Laverdière marcandre.laverdi...@gmail.com wrote: Hello, I recently reinstalled a different Linux distro on my system. Using the same repo that I had before, I made a make clean, autogen.sh, and then trying to run make I get these errors: dmake: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.14' not found (required by dmake) So, first question: is this a LO-hacked dmake that is broken that I need to rebuild? If so, how do I do it? dmake is usually our internal dmake... it is not so much that it is 'hacked' but rather that most distro do not carry dmake to force a rebuild of dmake in your SRCDIR (your core repo) rm dmake/dmake ./bootstrap Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: libwpd/ExternalProject_libwpd.mk
libwpd/ExternalProject_libwpd.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b5ce0607f0e8cb08180fb3598d8501ae5f465c21 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sun Oct 7 23:51:30 2012 +0200 Fix libwpd with VS2010 Change-Id: I058d673552280616adaaf1b71036ee89ba34bb13 diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index e8547ea..4d1ea61 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libwpd,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ -msbuild.exe libwpd.vcxproj \ +msbuild.exe libwpd.vcxproj /p:Configuration=Release \ touch $@ else $(call gb_ExternalProject_get_state_target,libwpd,build) : ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/submodules' - g
g |1 + 1 file changed, 1 insertion(+) New commits: commit 08809105050203730776edb74c5e604851c7890f Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 2 13:29:01 2012 -0500 missing fi in ./g Change-Id: Ic763d7cd73c2a3df8e5d5146eaf795188d8c79d1 diff --git a/g b/g index f70cac1..aa53015 100755 --- a/g +++ b/g @@ -147,6 +147,7 @@ local repo if [ -n $repo ] ; then cp -r ${repo?} ${module?}/. fi + fi done } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-ux-advise] widget layout, ux love...
On Fri, 2012-10-05 at 15:51 -0500, Adolfo Jayme Barrientos wrote: I guess we should follow the GNOME HIG’s recommendations for dialogs http://developer.gnome.org/hig-book/3.2/design-window.html.en Sounds perfectly reasonable, added that link now to the wiki page under guidelines. I'd be very appreciate if someone would take a sample dialog, e.g. the zoom dialog in cui/uiconfig/ui/zoomdialog.ui and apply those rules to it. — except for the OK/Cancel button order, which should continue as is today for Windows users—… Yeah, button order should be a per-platform thing. I haven't gotten around to implement that yet, but VclButtonBox in vcl/source/window/layout.cxx should be tweaked to sort its children in the platform-preferred ok/cancal/help order. Querying a Window with GetType() and ordering by WINDOW_OKBUTTON, WINDOW_CANCELBUTTON, WINDOW_HELPBUTTON etc. should get someone most of the way towards that. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove more unused methods
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/837 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/837/1 Remove more unused methods Change-Id: I5c6bb319458b1ce60cedfe0e2b0f5eaa8ba55e9d Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M svtools/source/config/toolpanelopt.cxx M unusedcode.easy 2 files changed, 0 insertions(+), 31 deletions(-) -- To view, visit https://gerrit.libreoffice.org/837 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c6bb319458b1ce60cedfe0e2b0f5eaa8ba55e9d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: master build broken ?
Le 07/10/2012 21:53, Jean-Baptiste Faure a écrit : Hi all, Since yesterday I can't build the master. Build seems to loop endless at this stage: Sorry, forgot to add some infos: my system is Ubuntu 12.04 x86_64 and my last build of the master without problem was Friday Best regards. JBF [build MOD] sw [build LNK] CppunitTest/libtest_sc_ucalc.so [build CUT] sw_macros_test [build CUT] sw_subsequent_ooxmlexport [build CUT] sw_subsequent_ooxmlimport [build CUT] sw_subsequent_ww8export [build CUT] sw_subsequent_ww8import [build CUT] sw_subsequent_rtfexport [build CUT] sw_filters_test [build CUT] sc_ucalc [build LNK] CppunitTest/libtest_sc_rangelst_test.so [build SLC] sw [build LNK] Library/vbaobj.uno.so [build LNK] Library/libscuilo.so [build SLC] tail_end [build SLC] loaded modules: MathMLDTD Mesa UnoControls accessibility afms animations apache_commons apple_remote autodoc avmedia basctl basebmp basegfx basic bean binaryurp bluez_bluetooth bridges canvas chart2 cli_ure clucene codemaker comphelper configmgr connectivity cosv cppcanvas cppu cppuhelper cpputools cui dbaccess desktop dictionaries drawinglayer dtrans editeng embeddedobj embedserv eventattacher extensions extras fileaccess filter forms formula fpicker framework helpcompiler hsqldb hwpfilter i18npool i18nutil idl idlc io javaunohelper jfreereport jurt jvmaccess jvmfwk l10ntools libcdr libcmis libmspub liborcus libvisio libwpd libwpg libwps lingucomponent linguistic lotuswordpro mdds more_fonts nlpsolver np_sdk o3tl offapi officecfg oovbaapi oox package padmin psprint_config pyuno rdbmaker readlicense_oo regexp registry remotebridges reportbuilder reportdesign ridljar rsc salhelper sane sax saxon sc scaddins sccomp scp2 scripting sd sdext sfx2 shell slideshow smoketest sot starmath stoc store svl svtools svx sw swext tail_end test testtools tomcat toolkit tools touch translations tubes twain ucb ucbhelper ucpp udkapi udm unixODBC unodevtools unoil unotest unotools unoxml ure uui vbahelper vcl vigra wizards writerfilter writerperfect x11_extensions xmerge xmlhelp xmloff xmlreader xmlscript xmlsecurity xsltml Any hint ? Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||49277 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #135 from Joel Madero jmadero@gmail.com --- nominating fdo#49277 https://bugs.freedesktop.org/show_bug.cgi?id=49277 Could potentially cause a huge headache for a user trying to make a professional quality presentation. Error only shows when you close a document and reopen it -- making chance of accidentally showing poor quality work quite high. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/android-single-dso' - 2 commits - sc/source sd/source sw/source
sc/source/filter/excel/excimp8.cxx |2 sc/source/filter/excel/xiescher.cxx |6 -- sc/source/filter/excel/xltoolbar.cxx | 76 +-- sc/source/filter/excel/xltoolbar.hxx | 36 ++-- sd/source/filter/ppt/pptin.cxx |7 -- sw/source/filter/ww8/wrtw8esh.cxx|8 -- sw/source/filter/ww8/ww8toolbar.cxx | 98 +-- sw/source/filter/ww8/ww8toolbar.hxx | 60 ++--- 8 files changed, 136 insertions(+), 157 deletions(-) New commits: commit d2eedfa8cf55e2e9e8d9325405a5c463c90994bf Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 23:14:05 2012 +0300 Deduplicate CTB, TBC and CTBWrapper (for disable-dynloading) Change-Id: I0e9895ca59fa75958107df2cbf4348214df52664 diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 3dbc3cf..d15f7bb 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -343,7 +343,7 @@ void ImportExcel8::ReadBasic( void ) SvStorageStreamRef xXCB = xRootStrg-OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( XCB ) ), STREAM_STD_READ | STREAM_NOCREATE ); if ( xXCB.Is()|| SVSTREAM_OK == xXCB-GetError() ) { -CTBWrapper wrapper; +ScCTBWrapper wrapper; if ( wrapper.Read( *xXCB ) ) { #if OSL_DEBUG_LEVEL 1 diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index b8fd753..f582ab8 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -94,17 +94,17 @@ CTBS::CTBS() : bSignature(0), bVersion(0), reserved1(0), reserved2(0), reserved3 { } -CTB::CTB() : nViews( 0 ), ectbid(0) +ScCTB::ScCTB() : nViews( 0 ), ectbid(0) { } -CTB::CTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0) +ScCTB::ScCTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0) { } -bool CTB::Read( SvStream rS ) +bool ScCTB::Read( SvStream rS ) { -OSL_TRACE(CTB::Read() stream pos 0x%x, rS.Tell() ); +OSL_TRACE(ScCTB::Read() stream pos 0x%x, rS.Tell() ); nOffSet = rS.Tell(); tb.Read( rS ); for ( sal_uInt16 index = 0; index nViews; ++index ) @@ -117,17 +117,17 @@ bool CTB::Read( SvStream rS ) for ( sal_Int16 index = 0; index tb.getcCL(); ++index ) { -TBC aTBC; +ScTBC aTBC; aTBC.Read( rS ); rTBC.push_back( aTBC ); } return true; } -void CTB::Print( FILE* fp ) +void ScCTB::Print( FILE* fp ) { Indent a; -indent_printf( fp, [ 0x%x ] CTB -- dump\n, nOffSet ); +indent_printf( fp, [ 0x%x ] ScCTB -- dump\n, nOffSet ); indent_printf( fp, nViews 0x%x\n, nViews); tb.Print( fp ); @@ -141,25 +141,25 @@ void CTB::Print( FILE* fp ) it-Print( fp ); } indent_printf( fp, ectbid 0x%x\n, ectbid); -std::vectorTBC::iterator it_end = rTBC.end(); +std::vectorScTBC::iterator it_end = rTBC.end(); counter = 0; -for ( std::vectorTBC::iterator it = rTBC.begin(); it != it_end; ++it ) +for ( std::vectorScTBC::iterator it = rTBC.begin(); it != it_end; ++it ) { -indent_printf( fp, TBC [%d]\n, counter++); +indent_printf( fp, ScTBC [%d]\n, counter++); Indent c; it-Print( fp ); } } -bool CTB::IsMenuToolbar() +bool ScCTB::IsMenuToolbar() { return tb.IsMenuToolbar(); } -bool CTB::ImportMenuTB( CTBWrapper rWrapper, const css::uno::Reference css::container::XIndexContainer xMenuDesc, CustomToolBarImportHelper helper ) +bool ScCTB::ImportMenuTB( ScCTBWrapper rWrapper, const css::uno::Reference css::container::XIndexContainer xMenuDesc, CustomToolBarImportHelper helper ) { sal_Int32 index = 0; -for ( std::vector TBC ::iterator it = rTBC.begin(); it != rTBC.end(); ++it, ++index ) +for ( std::vector ScTBC ::iterator it = rTBC.begin(); it != rTBC.end(); ++it, ++index ) { if ( !it-ImportToolBarControl( rWrapper, xMenuDesc, helper, IsMenuToolbar() ) ) return false; @@ -167,7 +167,7 @@ bool CTB::ImportMenuTB( CTBWrapper rWrapper, const css::uno::Reference css::co return true; } -bool CTB::ImportCustomToolBar( CTBWrapper rWrapper, CustomToolBarImportHelper helper ) +bool ScCTB::ImportCustomToolBar( ScCTBWrapper rWrapper, CustomToolBarImportHelper helper ) { static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( private:resource/toolbar/custom_ ) ); @@ -186,7 +186,7 @@ bool CTB::ImportCustomToolBar( CTBWrapper rWrapper, CustomToolBarImportHelper xProps-setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UIName) ), uno::makeAny( name.getString() ) ); rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); -for ( std::vector TBC ::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) +for ( std::vector ScTBC ::iterator it =
[Libreoffice-commits] .: sc/source sw/source
sc/source/filter/excel/excimp8.cxx |2 sc/source/filter/excel/xltoolbar.cxx | 76 +-- sc/source/filter/excel/xltoolbar.hxx | 36 ++-- sw/source/filter/ww8/ww8toolbar.cxx | 98 +-- sw/source/filter/ww8/ww8toolbar.hxx | 60 ++--- 5 files changed, 136 insertions(+), 136 deletions(-) New commits: commit d650d404c006ffcbb47d6871e2eab6fc4d764c40 Author: Tor Lillqvist t...@iki.fi Date: Sun Oct 7 23:14:05 2012 +0300 Deduplicate CTB, TBC and CTBWrapper (for disable-dynloading) Change-Id: I0e9895ca59fa75958107df2cbf4348214df52664 diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 416b3da..d0a4a7e 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -343,7 +343,7 @@ void ImportExcel8::ReadBasic( void ) SvStorageStreamRef xXCB = xRootStrg-OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( XCB ) ), STREAM_STD_READ | STREAM_NOCREATE ); if ( xXCB.Is()|| SVSTREAM_OK == xXCB-GetError() ) { -CTBWrapper wrapper; +ScCTBWrapper wrapper; if ( wrapper.Read( *xXCB ) ) { #if OSL_DEBUG_LEVEL 1 diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index b8fd753..f582ab8 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -94,17 +94,17 @@ CTBS::CTBS() : bSignature(0), bVersion(0), reserved1(0), reserved2(0), reserved3 { } -CTB::CTB() : nViews( 0 ), ectbid(0) +ScCTB::ScCTB() : nViews( 0 ), ectbid(0) { } -CTB::CTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0) +ScCTB::ScCTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0) { } -bool CTB::Read( SvStream rS ) +bool ScCTB::Read( SvStream rS ) { -OSL_TRACE(CTB::Read() stream pos 0x%x, rS.Tell() ); +OSL_TRACE(ScCTB::Read() stream pos 0x%x, rS.Tell() ); nOffSet = rS.Tell(); tb.Read( rS ); for ( sal_uInt16 index = 0; index nViews; ++index ) @@ -117,17 +117,17 @@ bool CTB::Read( SvStream rS ) for ( sal_Int16 index = 0; index tb.getcCL(); ++index ) { -TBC aTBC; +ScTBC aTBC; aTBC.Read( rS ); rTBC.push_back( aTBC ); } return true; } -void CTB::Print( FILE* fp ) +void ScCTB::Print( FILE* fp ) { Indent a; -indent_printf( fp, [ 0x%x ] CTB -- dump\n, nOffSet ); +indent_printf( fp, [ 0x%x ] ScCTB -- dump\n, nOffSet ); indent_printf( fp, nViews 0x%x\n, nViews); tb.Print( fp ); @@ -141,25 +141,25 @@ void CTB::Print( FILE* fp ) it-Print( fp ); } indent_printf( fp, ectbid 0x%x\n, ectbid); -std::vectorTBC::iterator it_end = rTBC.end(); +std::vectorScTBC::iterator it_end = rTBC.end(); counter = 0; -for ( std::vectorTBC::iterator it = rTBC.begin(); it != it_end; ++it ) +for ( std::vectorScTBC::iterator it = rTBC.begin(); it != it_end; ++it ) { -indent_printf( fp, TBC [%d]\n, counter++); +indent_printf( fp, ScTBC [%d]\n, counter++); Indent c; it-Print( fp ); } } -bool CTB::IsMenuToolbar() +bool ScCTB::IsMenuToolbar() { return tb.IsMenuToolbar(); } -bool CTB::ImportMenuTB( CTBWrapper rWrapper, const css::uno::Reference css::container::XIndexContainer xMenuDesc, CustomToolBarImportHelper helper ) +bool ScCTB::ImportMenuTB( ScCTBWrapper rWrapper, const css::uno::Reference css::container::XIndexContainer xMenuDesc, CustomToolBarImportHelper helper ) { sal_Int32 index = 0; -for ( std::vector TBC ::iterator it = rTBC.begin(); it != rTBC.end(); ++it, ++index ) +for ( std::vector ScTBC ::iterator it = rTBC.begin(); it != rTBC.end(); ++it, ++index ) { if ( !it-ImportToolBarControl( rWrapper, xMenuDesc, helper, IsMenuToolbar() ) ) return false; @@ -167,7 +167,7 @@ bool CTB::ImportMenuTB( CTBWrapper rWrapper, const css::uno::Reference css::co return true; } -bool CTB::ImportCustomToolBar( CTBWrapper rWrapper, CustomToolBarImportHelper helper ) +bool ScCTB::ImportCustomToolBar( ScCTBWrapper rWrapper, CustomToolBarImportHelper helper ) { static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( private:resource/toolbar/custom_ ) ); @@ -186,7 +186,7 @@ bool CTB::ImportCustomToolBar( CTBWrapper rWrapper, CustomToolBarImportHelper xProps-setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UIName) ), uno::makeAny( name.getString() ) ); rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); -for ( std::vector TBC ::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) +for ( std::vector ScTBC ::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) { if ( !it-ImportToolBarControl( rWrapper, xIndexContainer, helper, IsMenuToolbar() ) )
[Libreoffice-commits] .: svtools/source
svtools/source/control/ctrlbox.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa30508fd3b2224e76e1ac7c150df9040518e7aa Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Oct 8 07:33:09 2012 +0200 Fix svtools with Visual Studio 2010 Change-Id: I445173e8f469c409801d803ef22cb499935ba19b diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 9b82dd9..fc99145 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -832,7 +832,7 @@ sal_uInt16 LineListBox::InsertEntry( const XubString rStr, sal_uInt16 nPos ) if ( nPos pLineList-size() ) { ImpLineList::iterator it = pLineList-begin(); ::std::advance( it, nPos ); -pLineList-insert( it, NULL ); +pLineList-insert( it, reinterpret_castImpLineListData *(NULL) ); } else { pLineList-push_back( NULL ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/sdi sc/source
sc/inc/sc.hrc |4 ++ sc/sdi/chartsh.sdi| 11 ++- sc/sdi/scalc.sdi | 34 --- sc/source/ui/drawfunc/chartsh.cxx | 55 +- sc/source/ui/drawfunc/objdraw.src |6 sc/source/ui/inc/chartsh.hxx |3 +- 6 files changed, 98 insertions(+), 15 deletions(-) New commits: commit cbb0babb679338ddc9910bbdb2676128d0c236f7 Author: Tomaž Vajngerl qui...@gmail.com Date: Mon Oct 8 07:43:59 2012 +0200 fdo#30944 Add popup menu function to charts to export them as a graphic Add popup menu function Export as Graphic to charts to export the chart as a graphic. Currently it works only with raster formats like PNG and JPG but not with vector formats like SVG. Change-Id: Ieeda21ff971f2ad31bab2248e8b509883b5cbcd0 diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index e47ee57..efec7ab 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -529,6 +529,9 @@ #define SID_NEW_SLOTS (SID_KEYFUNC_END) #define SID_NEW_TABLENAME (SID_NEW_SLOTS+1) + +#define SID_EXPORT_AS_GRAPHIC (SID_NEW_SLOTS+2) + #define FID_MERGE_TOGGLE(SID_NEW_SLOTS+10) #define SID_ATTR_ROWHEADERS (SID_NEW_SLOTS+11) #define SID_ATTR_COLHEADERS (SID_NEW_SLOTS+12) @@ -1126,4 +1129,3 @@ #define RID_SCPAGE_DEFAULTS (SC_OOO_BUILD_START + 10) #endif - diff --git a/sc/sdi/chartsh.sdi b/sc/sdi/chartsh.sdi index c050a7c..ce00043 100644 --- a/sc/sdi/chartsh.sdi +++ b/sc/sdi/chartsh.sdi @@ -16,7 +16,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // === +interface ChartSelection +{ +SID_EXPORT_AS_GRAPHIC +[ +ExecMethod = ExecuteExportAsGraphic; +StateMethod = GetExportAsGraphicState; +] +} + shell ScChartShell : ScDrawShell { +import ChartSelection; } diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 5b9cda6..14fb8cc 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * / -//-- + SfxVoidItem AcceptChanges FID_CHG_ACCEPT () [ @@ -2919,10 +2919,10 @@ SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER Synchron; /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, +AccelConfig = FALSE, +MenuConfig = FALSE, +StatusBarConfig = FALSE, +ToolBoxConfig = FALSE, GroupId = GID_OPTIONS; ] @@ -8342,3 +8342,27 @@ SfxVoidItem EnterString SID_ENTER_STRING ToolBoxConfig = FALSE, GroupId = GID_INTERN; ] + +SfxVoidItem ExportAsGraphic SID_EXPORT_AS_GRAPHIC +() +[ +/* flags: */ +AutoUpdate = FALSE, +Cachable = Cachable, +FastCall = FALSE, +HasCoreId = FALSE, +HasDialog = FALSE, +ReadOnlyDoc = TRUE, +Toggle = FALSE, +Container = FALSE, +RecordAbsolute = FALSE, +RecordPerSet; +Synchron; + +/* config: */ +AccelConfig = TRUE, +MenuConfig = TRUE, +StatusBarConfig = FALSE, +ToolBoxConfig = TRUE, +GroupId = GID_CHART; +] diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 4140633..251fa5d 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -17,8 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include editeng/eeitem.hxx -#include svx/fontwork.hxx +#include svx/svdoole2.hxx +#include svx/svdobj.hxx +#include svx/graphichelper.hxx + #include svl/srchitem.hxx #include sfx2/app.hxx #include sfx2/objface.hxx @@ -34,15 +36,13 @@ #include docpool.hxx #include drawview.hxx #include scresid.hxx -#include svx/svdobj.hxx #define ScChartShell #include scslots.hxx - SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell, ScResId(SCSTR_CHARTSHELL) ) { -SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, +SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, ScResId(RID_DRAW_OBJECTBAR) ); SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_CHART) ); } @@ -52,14 +52,55 @@ TYPEINIT1( ScChartShell, ScDrawShell ); ScChartShell::ScChartShell(ScViewData* pData) : ScDrawShell(pData) { -SetHelpId(HID_SCSHELL_CHARTSH); -SetName(rtl::OUString(ChartObject)); +SetHelpId( HID_SCSHELL_CHARTSH ); +SetName( OUString(ChartObject) ); } ScChartShell::~ScChartShell() { } +void ScChartShell::GetExportAsGraphicState( SfxItemSet rSet ) +{ +ScDrawView* pView = GetViewData()-GetScDrawView(); +const SdrMarkList rMarkList = pView-GetMarkedObjectList(); +bool bEnable = false; +if( rMarkList.GetMarkCount() == 1