[Libreoffice-commits] .: 2 commits - connectivity/source moz/makefile.mk moz/patches
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx |4 +-
moz/makefile.mk|1
moz/patches/seamonkey-1.1.14.source-typeof.patch | 18
++
3 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 437fe5a11f68d1848c49121394f16f09611b
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 21 09:31:34 2012 +0100
Work around g++ -std=c++0x rejecting typeof keyword
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 7f926e5..4146f41 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -88,6 +88,7 @@ PATCH_FILES = \
patches/nss-linux3.patch \
patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
patches/clang_missing_this_pointers.patch \
+patches/seamonkey-1.1.14.source-typeof.patch
# This file is needed for the W32 build when BUILD_MOZAB is set
# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
diff --git a/moz/patches/seamonkey-1.1.14.source-typeof.patch
b/moz/patches/seamonkey-1.1.14.source-typeof.patch
new file mode 100644
index 000..632e155
--- /dev/null
+++ b/moz/patches/seamonkey-1.1.14.source-typeof.patch
@@ -0,0 +1,18 @@
+--- misc/mozilla/xpcom/base/nscore.h 2006-08-24 23:46:32.0 +0200
misc/build/mozilla/xpcom/base/nscore.h 2012-02-21 09:22:51.136057997
+0100
+@@ -211,9 +211,14 @@
+ * when http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11893 is fixed.
+ */
+
++// At least g++ (GCC) 4.6.2 20111027 (Red Hat 4.6.2-1) with -std=c++0x no
++// longer recognizes typeof as a (GCC extension) keyword (an alternative fix
++// might be to check the GCC version, as the bug mentioned above is reportedly
++// fixed in GCC 4.4.3, see
++// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9381#c15):
+ #ifdef __GNUC__
+ #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \
+- typeof(class::func) name
++ __typeof__(class::func) name
+ #else
+ #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \
+ ret (NS_STDCALL class::*name) args
commit bc19ce46dd313aecf4a74981814c79bc703dd995
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 21 09:30:29 2012 +0100
Typo nsResult - nsresult
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 4fbb10b..aff3e07 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -48,8 +48,8 @@ namespace connectivity { namespace mozab {
//
namespace
{
-typedef NS_STDCALL_FUNCPROTO(nsResult, CardPropertyGetter, nsIAbCard,
GetFirstName, (PRUnichar**));
-typedef NS_STDCALL_FUNCPROTO(nsResult, CardPropertySetter, nsIAbCard,
SetFirstName, (const PRUnichar*));
+typedef NS_STDCALL_FUNCPROTO(nsresult, CardPropertyGetter, nsIAbCard,
GetFirstName, (PRUnichar**));
+typedef NS_STDCALL_FUNCPROTO(nsresult, CardPropertySetter, nsIAbCard,
SetFirstName, (const PRUnichar*));
struct CardPropertyData
{
const sal_Char* pLDAPAttributeList;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/prj
officecfg/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9945de1a086bfd597971339700645b451ed36e7e Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 21 09:42:03 2012 +0100 Revert WaE: add missing sal and cppunit dependencies causing tinderbox failure This reverts commit 8c67428341d42ada42f9186bbfe3d6f25a0edaef, which had been obsoleted by e69b8a758061c695b4daa9029f58a1cd7f715ef6 disabled officecfg unittest due to dependencies problems. diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst index 2f05a62..f4a9142 100644 --- a/officecfg/prj/build.lst +++ b/officecfg/prj/build.lst @@ -1,2 +1,2 @@ -oc officecfg :TRANSLATIONS:translations soltools solenv LIBXSLT:libxslt sal CPPUNIT:cppunit NULL +oc officecfg :TRANSLATIONS:translations soltools solenv LIBXSLT:libxslt NULL oc officecfg\prj nmake - all oc_prj NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cairo/cairo cairo/cairo-1.10.2-oldfontconfig.patch
cairo/cairo-1.10.2-oldfontconfig.patch | 11 +++
cairo/cairo/makefile.mk|5 +++--
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit b5f727d3954e21fd742ad3b2da8f4d77cbd87c1f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Feb 20 23:34:21 2012 -0800
Fix build of generic unix vcl plugin with older fontconfig
diff --git a/cairo/cairo-1.10.2-oldfontconfig.patch
b/cairo/cairo-1.10.2-oldfontconfig.patch
new file mode 100644
index 000..d19258a
--- /dev/null
+++ b/cairo/cairo-1.10.2-oldfontconfig.patch
@@ -0,0 +1,11 @@
+--- misc/cairo-1.10.2/configure2012-02-20 23:25:52.0 -0800
misc/build/cairo-1.10.2/configure 2012-02-20 11:53:05.0 -0800
+@@ -29672,7 +29672,7 @@
+ fi
+
+
+-FONTCONFIG_MIN_VERSION=2.2.95
++FONTCONFIG_MIN_VERSION=2.2.3
+
# Check whether
--enable-fc was given.
+ if test ${enable_fc+set} = set; then :
+ enableval=$enable_fc; enable_fc=$enableval
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 1c06c74..8f2a359 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -49,7 +49,8 @@ TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
PATCH_FILES=\
..$/cairo-1.10.2.patch \
-..$/cairo.dlsym.lcdfilter.patch
+..$/cairo.dlsym.lcdfilter.patch \
+..$/cairo-1.10.2-oldfontconfig.patch
.IF $(OS)$(COM) == WNTMSC
PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch
@@ -189,7 +190,7 @@ CONFIGURE_FLAGS+=--disable-valgrind
.IF $(OS)==IOS
CONFIGURE_FLAGS+=--disable-ft
.ELSE
-CONFIGURE_FLAGS+=--enable-ft
+CONFIGURE_FLAGS+=--enable-ft --enable-fc
.ENDIF
.IF $(OS)==IOS || $(OS)==ANDROID
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/qa
android/qa/desktop/Makefile |1 - android/qa/sc/Makefile |1 - 2 files changed, 2 deletions(-) New commits: commit 0a7058b48a5ce51f7be99f10fc0363859c41a7aa Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Feb 21 11:03:02 2012 +0200 xcr has been merged diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 14f5368..f09cdb2 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -161,7 +161,6 @@ copy-stuff: buildrcs utllo \ vbahelperlo \ vcllo \ - xcrlo \ xml2 \ xmlreader \ xstor \ diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 81b8251..48f590c 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -108,7 +108,6 @@ copy-stuff: utllo \ vbahelperlo \ vcllo \ - xcrlo \ xml2 \ xmlreader \ xstor \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in scp2/source solenv/gbuild vcl/inc vcl/null vcl/unx
configure.in |2 +- scp2/source/ooo/common_brand.scp |2 +- scp2/source/ooo/file_library_ooo.scp | 12 ++-- scp2/source/ooo/file_ooo.scp |2 +- scp2/source/ooo/file_resource_ooo.scp |2 +- scp2/source/ooo/module_hidden_ooo.scp |2 +- solenv/gbuild/gbuild.mk |2 +- vcl/inc/svsys.h |2 +- vcl/null/printerinfomanager.cxx |2 +- vcl/unx/generic/plugadapt/salplug.cxx |4 ++-- vcl/unx/generic/printer/ppdparser.cxx |2 +- 11 files changed, 17 insertions(+), 17 deletions(-) New commits: commit e125c8fa82beca36791e1bdeae116824f4bc7a7b Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Tue Feb 21 11:29:42 2012 +0100 Put HEADLESS definition under LIBO namespace tml reminds us that use a generic and potentially clash-prone word like HEADLESS as preprocessor defintion is pretty lame. He suggests to put it under the already used LIBO namespace. To sum it up let's do a s/HEADLESS/LIBO_HEADLESS/g. diff --git a/configure.in b/configure.in index 0d320e7..303b5c8 100644 --- a/configure.in +++ b/configure.in @@ -8106,7 +8106,7 @@ AC_SUBST(ENABLE_KDE4) ENABLE_HEADLESS= if test x$enable_headless = xyes; then ENABLE_HEADLESS=TRUE -SCPDEFS=$SCPDEFS -DHEADLESS +SCPDEFS=$SCPDEFS -DLIBO_HEADLESS R=headless fi AC_SUBST(ENABLE_HEADLESS) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 301d63d..789f826 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -522,7 +522,7 @@ File gid_Brand_File_Bin_Soffice #endif End -#if defined(UNX) !defined(QUARTZ) !defined(HEADLESS) +#if defined(UNX) !defined(QUARTZ) !defined(LIBO_HEADLESS) File gid_Brand_File_Bin_Spadmin BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5bfe685..59aa150 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -548,7 +548,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) -#ifndef HEADLESS +#ifndef LIBO_HEADLESS #ifndef SYSTEM_CAIRO @@ -934,7 +934,7 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif -#if defined(UNX) ! defined(QUARTZ) ! defined(HEADLESS) +#if defined(UNX) ! defined(QUARTZ) ! defined(LIBO_HEADLESS) File gid_File_Lib_Desktop_Detector Name = LIBNAME(desktop_detector); LIB_FILE_BODY; @@ -1160,7 +1160,7 @@ End STD_LIB_FILE( gid_File_Lib_Sot, sot ) -#if defined(UNX) !defined(QUARTZ) !defined(HEADLESS) +#if defined(UNX) !defined(QUARTZ) !defined(LIBO_HEADLESS) File gid_File_Lib_Spa Name = LIBNAME(spa); @@ -1178,11 +1178,11 @@ File gid_File_Lib_Spell Dir = SCP2_OOO_BIN_DIR; End -#if !defined HEADLESS +#if !defined LIBO_HEADLESS STD_LIB_FILE( gid_File_Lib_Spl, spl) #endif -#if defined UNX !defined MACOSX !defined HEADLESS +#if defined UNX !defined MACOSX !defined LIBO_HEADLESS STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx) #endif @@ -1703,7 +1703,7 @@ File gid_File_Lib_Libcroco End #endif -#if ! defined HEADLESS +#if ! defined LIBO_HEADLESS #if ! defined SYSTEM_PANGO File gid_File_Lib_Libpango LIB_FILE_BODY; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index c181a0f..3fd19c5 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -223,7 +223,7 @@ File gid_File_Bin_Senddoc #endif End -#if defined(UNX) !defined(QUARTZ) !defined(HEADLESS) +#if defined(UNX) !defined(QUARTZ) !defined(LIBO_HEADLESS) File gid_File_Bin_Spadmin_Bin BIN_FILE_BODY; diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 05353f1..2f26dd7 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -76,7 +76,7 @@ STD_RES_FILE( gid_File_Res_Sd, sd ) STD_RES_FILE( gid_File_Res_Sfx, sfx ) -#if defined(UNX) !defined(QUARTZ) !defined(HEADLESS) +#if defined(UNX) !defined(QUARTZ) !defined(LIBO_HEADLESS) STD_RES_FILE( gid_File_Res_Spa, spa ) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 90ec4ea..5636523 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -689,7 +689,7 @@ Module gid_Module_Root_Files_7 gid_File_Mozilla_Runtime); End -#ifndef HEADLESS +#ifndef LIBO_HEADLESS Module gid_Module_Root_Files_Images PackageInfo = packinfo_office.txt; ParentID = gid_Module_Root; diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 26eecbc..005d81b 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -238,7 +238,7 @@ gb_GLOBALDEFS += -DENABLE_GRAPHITE endif
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - connectivity/source forms/source
connectivity/source/commontools/FValue.cxx |4 -
forms/source/component/ListBox.cxx | 70 +++--
forms/source/component/ListBox.hxx | 11
3 files changed, 69 insertions(+), 16 deletions(-)
New commits:
commit 10e26364d33150a1f43bcc32a690a9523d792936
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Feb 16 13:24:58 2012 +0100
fdo#46163 convert bound values to bound column's type
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index d982e50..7d3b72b 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -326,7 +326,7 @@ namespace frm
// propagate
if ( m_eListSourceType == ListSourceType_VALUELIST )
{
-m_aBoundValues = m_aListSourceValues;
+setBoundValues(m_aListSourceValues);
}
else
{
@@ -556,7 +556,7 @@ namespace frm
OSL_FAIL(OListBoxModel::read : invalid (means unknown) version
!);
ValueList().swap(m_aListSourceValues);
m_aBoundColumn = (sal_Int16)0;
-ValueList().swap(m_aBoundValues);
+clearBoundValues();
m_eListSourceType = ListSourceType_VALUELIST;
m_aDefaultSelectSeq.realloc(0);
defaultCommonProperties();
@@ -674,7 +674,7 @@ namespace frm
// outta here if we don't have all pre-requisites
if ( !xConnection.is() || !sListSource.getLength() )
{
-ValueList().swap(m_aBoundValues);
+clearBoundValues();
return;
}
@@ -925,7 +925,7 @@ namespace frm
m_nNULLPos = 0;
}
-m_aBoundValues = aValueList;
+setBoundValues(aValueList);
setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny(
lcl_convertToStringSequence( aDisplayList ) ) );
}
@@ -949,7 +949,7 @@ namespace frm
{
if ( m_eListSourceType != ListSourceType_VALUELIST )
{
-ValueList().swap(m_aBoundValues);
+clearBoundValues();
m_nNULLPos = -1;
m_nBoundColumnType = DataType::SQLNULL;
@@ -961,19 +961,63 @@ namespace frm
}
//--
+void OListBoxModel::setBoundValues(const ValueList l)
+{
+m_aConvertedBoundValues.clear();
+m_aBoundValues = l;
+}
+
+
//--
+void OListBoxModel::clearBoundValues()
+{
+ValueList().swap(m_aConvertedBoundValues);
+ValueList().swap(m_aBoundValues);
+}
+
+
//--
+void OListBoxModel::convertBoundValues(const sal_Int32 nFieldType) const
+{
+m_aConvertedBoundValues.resize(m_aBoundValues.size());
+ValueList::const_iterator src = m_aBoundValues.begin();
+const ValueList::const_iterator end = m_aBoundValues.end();
+ValueList::iterator dst = m_aConvertedBoundValues.begin();
+for (; src != end; ++src, ++dst )
+{
+*dst = *src;
+dst-setTypeKind(nFieldType);
+}
+m_nConvertedBoundValuesType = nFieldType;
+OSL_ENSURE(dst == m_aConvertedBoundValues.end(),
OListBoxModel::convertBoundValues expected to have overwritten all of
m_aConvertedBoundValues, but did not.);
+}
+
//--
+sal_Int32 OListBoxModel::getValueType() const
+{
+return impl_hasBoundComponent() ? m_nBoundColumnType : getFieldType();
+}
+
//--
ValueList OListBoxModel::impl_getValues() const
{
+const sal_Int32 nFieldType = getValueType();
+
+if ( !m_aConvertedBoundValues.empty() m_nConvertedBoundValuesType
== nFieldType )
+return m_aConvertedBoundValues;
+
if ( !m_aBoundValues.empty() )
-return m_aBoundValues;
+{
+convertBoundValues(nFieldType);
+return m_aConvertedBoundValues;
+}
Sequence ::rtl::OUString aStringItems( getStringItemList() );
ValueList aValues( aStringItems.getLength() );
-::std::copy(
-aStringItems.getConstArray(),
-aStringItems.getConstArray() + aStringItems.getLength(),
-aValues.begin()
-);
-
+ValueList::iterator dst = aValues.begin();
+const ::rtl::OUString *src (aStringItems.getConstArray());
+const ::rtl::OUString * const end = src + aStringItems.getLength();
+for (; src end; ++src, ++dst )
+{
+*dst = *src;
+dst-setTypeKind(nFieldType);
+}
[Libreoffice-commits] .: 4 commits - config_host.mk.in configure.in connectivity/inc RepositoryFixes.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/Module_sc.mk solenv/
RepositoryFixes.mk|4 ++ config_host.mk.in |1 configure.in |6 ++- connectivity/inc/connectivity/sqlparse.hxx|2 + sc/CppunitTest_sc_cellrangeobj.mk |2 - sc/CppunitTest_sc_datapilottableobj.mk|2 - sc/Module_sc.mk |3 + solenv/gbuild/CppunitTest.mk | 17 solenv/gbuild/LinkTarget.mk |2 + solenv/gbuild/Module.mk | 12 -- solenv/gbuild/extensions/post_DisableIosUnitchecks.mk | 35 -- solenv/gbuild/gbuild.mk |4 ++ solenv/gbuild/platform/IOS_ARM_GCC.mk | 16 +--- sw/CppunitTest_sw_layout_test.mk |2 - sw/CppunitTest_sw_macros_test.mk |2 - 15 files changed, 42 insertions(+), 68 deletions(-) New commits: commit 136f53f58e89b13e4d89571fef25b8ba6679e6b4 Author: Tor Lillqvist t...@iki.fi Date: Tue Feb 21 14:09:03 2012 +0200 More clever way to filter out component files for libs not built I.e. BASIC stuff for iOS and database connectivity stuff when using --disable-database-connectivity. All of this quite experimental so far, using the latter will break your build. diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 530aa9a..a559777 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -91,8 +91,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_cellrangesbase,\ )) $(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\ -$(if $(filter-out $(OS),IOS), \ - basic/util/sb) \ + basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 9b21db0..b1e54b0 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -90,8 +90,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilotfieldobj,\ )) $(eval $(call gb_CppunitTest_add_components,sc_datapilotfieldobj,\ -$(if $(filter-out $(OS),IOS), \ - basic/util/sb) \ +basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 9e06aec..1ac9893 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -90,12 +90,10 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilottableobj,\ )) $(eval $(call gb_CppunitTest_add_components,sc_datapilottableobj,\ -$(if $(filter-out $(OS),IOS), \ - basic/util/sb) \ + basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ -$(if $(filter-out $(OS),IOS), \ - dbaccess/util/dba) \ +dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ forms/util/frm \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 8a4a3cc..32f7d47 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -87,15 +87,13 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\ )) $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ -$(if $(filter-out $(OS),IOS), \ - basic/util/sb) \ +basic/util/sb \ chart2/source/controller/chartcontroller \ chart2/source/tools/charttools \ chart2/source/model/chartmodel \ comphelper/util/comphelp \ configmgr/source/configmgr \ -$(if $(filter-out $(OS),IOS), \ - dbaccess/util/dba) \ +dbaccess/util/dba \ eventattacher/source/evtatt \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index e4065bd..acaf76b 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -178,8 +178,21 @@ $(call gb_CppunitTest_get_target,$(1)) : \ endef +# Given a list of component files, filter out those corresponding +# to libraries not built in this configuration. +define gb_CppunitTest__filter_not_built_components +$(filter-out \ + $(if $(filter $(OS),IOS), \ + basic/util/sb \ + sw/util/vbaswobj \ + scripting/source/basprov/basprov \ + scripting/util/scriptframe) \ + $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),, \ + dbaccess/util/dba),$(1)) +endef + define gb_CppunitTest_add_components -$(foreach component,$(2),$(call gb_CppunitTest_add_component,$(1),$(component))) +$(foreach component,$(call
[Libreoffice-commits] .: basic/source
basic/source/comp/io.cxx |2 ++
basic/source/comp/scanner.cxx |5 +++--
basic/source/comp/token.cxx |9 +
basic/source/inc/scanner.hxx |1 +
4 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 634b211632847dcb04b31f478296e5e6d732ac73
Author: Noel Power noel.po...@novell.com
Date: Tue Feb 21 12:22:32 2012 +
allow keyword Append to be used as a variable. bnc#745930
statements like
Dim AppEnd As Integer
will generate compiler errors because Append is a special symbol/keyword in
libreoffice basic. This restriction though is too strict because 'Append' is
only such a keyword when used within the 'Open' statement ( where it refers to
one of the possible values for a paramater ).
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index df02a4e..efd34f2 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -178,6 +178,7 @@ void SbiParser::Input()
void SbiParser::Open()
{
+bInStatement = true;
SbiExpression aFileName( this );
SbiToken eTok;
TestToken( FOR );
@@ -273,6 +274,7 @@ void SbiParser::Open()
aGen.Gen( _OPEN, nMode, nFlags );
delete pLen;
delete pChan;
+bInStatement = false;
}
// NAME file AS file
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 872bdd7..a664e57 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -53,9 +53,10 @@ SbiScanner::SbiScanner( const ::rtl::OUString rBuf,
StarBASIC* p ) : aBuf( rBuf
bSymbol =
bCompatible =
bVBASupportOn =
-bPrevLineExtentsComment = sal_False;
+bInStatement =
+bPrevLineExtentsComment = false;
bHash=
-bErrors = sal_True;
+bErrors = true;
}
SbiScanner::~SbiScanner()
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 63c9867..0ed6636 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -401,6 +401,15 @@ special:
return eCurTok = SYMBOL;
else if( tp-t == TEXT )
return eCurTok = SYMBOL;
+// maybe we can expand this for other statements that have parameters
+// that are keywords ( and those keywords are only used within such
+// statements )
+// what's happening here is that if we come across 'append' ( and we are
+// not in the middle of parsing a special statement ( like 'Open')
+// we just treat keyword 'append' as a normal 'SYMBOL'.
+// Also we accept Dim APPEND
+else if ( ( !bInStatement || eCurTok == DIM ) tp-t == APPEND )
+return eCurTok = SYMBOL;
// #i92642: Special LINE token handling - SbiParser::Line()
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index 926706c..9e33f7a 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -73,6 +73,7 @@ protected:
bool bVBASupportOn; // sal_True: OPTION VBASupport 1
otherwise default False
bool bPrevLineExtentsComment; // sal_True: Previous line is comment
and ends on ... _
+bool bInStatement;
void GenError( SbError );
public:
SbiScanner( const ::rtl::OUString, StarBASIC* = NULL );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in m4/mingw.m4
configure.in | 12 +++
m4/mingw.m4 | 90 ---
2 files changed, 62 insertions(+), 40 deletions(-)
New commits:
commit 0c128345eaa94686b67039346b7ce20ef43ab024
Author: David Tardon dtar...@redhat.com
Date: Tue Feb 21 13:41:37 2012 +0100
reintroduce hardcoded dll names as defaults
diff --git a/configure.in b/configure.in
index 12ce546..c099579 100644
--- a/configure.in
+++ b/configure.in
@@ -5651,7 +5651,7 @@ if test $with_system_expat = yes; then
[AC_MSG_ERROR(expat.h not found. install expat)], [])
AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
[AC_MSG_RESULT(expat library not found or functional.)], [])
-libo_ADD_MINGW_EXTERNAL_DLLS([libexpat],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libexpat],[MINGW_EXTERNAL_DLLS],[libexpat-1.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_EXPAT=NO
@@ -5843,7 +5843,7 @@ if test $with_system_libxml = yes; then
AC_MSG_ERROR([xsltproc is required])
fi
-libo_ADD_MINGW_EXTERNAL_DLLS([libxslt],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libxslt],[MINGW_EXTERNAL_DLLS],[libxslt-1.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXSLT=NO
@@ -5893,7 +5893,7 @@ if test $with_system_libxml = yes; then
AC_MSG_ERROR([xmllint is required])
fi
-libo_ADD_MINGW_EXTERNAL_DLLS([libxml2],[MINGW_EXTERNAL_DLLS])
+libo_ADD_MINGW_EXTERNAL_DLLS([libxml2],[MINGW_EXTERNAL_DLLS],[zlib1.dll
libxml2-2.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXML=NO
@@ -6694,7 +6694,7 @@ if test $with_system_curl = yes; then
;;
esac
-libo_ADD_MINGW_EXTERNAL_DLLS([libcurl],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libcurl],[MINGW_EXTERNAL_DLLS],[libintl-8.dll
libidn-11.dll libnspr4.dll nssutil3.dll libplc4.dll libplds4.dll nss3.dll
ssl3.dll libgpg-error-0.dll libgcrypt-11.dll libssh2-1.dll libcurl-4.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_CURL=NO
@@ -7599,7 +7599,7 @@ if test $with_system_hunspell = yes; then
HUNSPELL_LIBS=-lhunspell
fi
AC_LANG_POP([C++])
-libo_ADD_MINGW_EXTERNAL_DLLS([libhunspell],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libhunspell],[MINGW_EXTERNAL_DLLS],[libhunspell-1.3-0.dll])
else
AC_MSG_RESULT([internal])
SYSTEM_HUNSPELL=NO
@@ -9794,7 +9794,7 @@ if test $enable_cairo_canvas = yes -a
$with_system_cairo = yes; then
AC_LANG_POP([C])
fi
fi
-libo_ADD_MINGW_EXTERNAL_DLLS([libcairo],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libcairo],[MINGW_EXTERNAL_DLLS],[libfontconfig-1.dll
libfreetype-6.dll libpixman-1-0.dll libpng15-15.dll libcairo-2.dll])
else
AC_MSG_RESULT([no])
commit 743a56fcce564c461c4ad86ad55edb069cc764bc
Author: David Tardon dtar...@redhat.com
Date: Tue Feb 21 13:37:53 2012 +0100
allow to pass default dll list
diff --git a/m4/mingw.m4 b/m4/mingw.m4
index 952b2ed..35d638c 100644
--- a/m4/mingw.m4
+++ b/m4/mingw.m4
@@ -1,36 +1,25 @@
-# libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude])
+#
libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude],[?default-value])
# uses: CC, SED, WITH_MINGW
#
AC_DEFUN([libo_FIND_MINGW_EXTERNAL_DLLS],
[if test $WITH_MINGW = yes -a -n $CC; then
_libo_mingw_libdir=`$CC -print-sysroot`/mingw/lib
-for _libo_mingw_lib in $1; do
-_libo_mingw_lib=$_libo_mingw_libdir/$_libo_mingw_lib.la
-_libo_mingw_find_dll([$_libo_mingw_lib],[$3],[_libo_mingw_new_dll])
-if test -n $_libo_mingw_new_dll; then
-_libo_mingw_new_dlls=$_libo_mingw_new_dll
-fi
-
-
_libo_mingw_get_libtool_var([dependency_libs],[$_libo_mingw_lib],[_libo_mingw_dep_libs])
-for _libo_mingw_dep_lib in $_libo_mingw_dep_libs; do
-if test ${_libo_mingw_dep_lib%.la} != $_libo_mingw_dep_lib;
then
-_libo_mingw_new_dll=''
-
_libo_mingw_find_dll([$_libo_mingw_dep_lib],[$3],[_libo_mingw_new_dll])
-if test -n $_libo_mingw_new_dll; then
-_libo_mingw_new_dlls=$_libo_mingw_new_dlls
$_libo_mingw_new_dll
-fi
-fi
-done
-$2=$_libo_mingw_new_dlls
-done
+_libo_mingw_found_la=
+_libo_mingw_test_la([$1],[_libo_mingw_found_la],[$_libo_mingw_libdir])
+if test $_libo_mingw_found_la = yes; then
+_libo_mingw_find_dlls([$1],[$2],[$3],[$_libo_mingw_libdir])
+else
+# no .la files found, use defaults
+$2=$4
+fi
fi[]dnl
]) # libo_FIND_MINGW_EXTERNAL_DLLS
-# libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable])
+# libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable],[?default-value])
# uses: CC, SED, WITH_MINGW
#
AC_DEFUN([libo_ADD_MINGW_EXTERNAL_DLLS],
[Libreoffice-commits] .: extensions/Module_extensions.mk forms/Module_forms.mk sc/source svx/Library_svxcore.mk svx/Library_svx.mk svx/Package_inc.mk sw/Library_sw.mk
extensions/Module_extensions.mk | 17 +++--- forms/Module_forms.mk|2 sc/source/ui/docshell/docsh8.cxx |6 -- svx/Library_svx.mk | 25 +--- svx/Library_svxcore.mk | 109 --- svx/Package_inc.mk |2 sw/Library_sw.mk | 21 --- 7 files changed, 102 insertions(+), 80 deletions(-) New commits: commit 84c8559820ba33c1ac4e7a8ce5412cf5534b954c Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Tue Feb 21 12:49:09 2012 +0100 Fix most of the build with --disable-database-connectivity diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 7faa693..d0490ea 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -29,21 +29,26 @@ $(eval $(call gb_Module_Module,extensions)) $(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_abp \ - AllLangResTarget_bib \ - AllLangResTarget_dbp \ - AllLangResTarget_pcr \ AllLangResTarget_scn \ AllLangResTarget_upd \ Library_abp \ - Library_bib \ - Library_dbp \ Library_log \ - Library_pcr \ Library_res \ Library_scn \ +)) + +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,extensions,\ + AllLangResTarget_bib \ + AllLangResTarget_dbp \ + AllLangResTarget_pcr \ + Library_bib \ + Library_dbp \ + Library_pcr \ Package_bib \ Package_pcr \ )) +endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extensions,\ diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk index 6f14722..4f5e99e 100644 --- a/forms/Module_forms.mk +++ b/forms/Module_forms.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_Module,forms)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,forms,\ AllLangResTarget_frm \ Library_frm \ @@ -38,5 +39,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\ JunitTest_forms_unoapi \ JunitTest_forms_complex \ )) +endif # vim: set noet sw=4 ts=4: diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 96e3c63..d0e5890 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -26,10 +26,7 @@ * / - - - -// INCLUDE --- +#ifndef DISABLE_DBCONNECTIVITY #include stdio.h #include tools/urlobj.hxx @@ -1166,5 +1163,6 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString rFullFileName, CharSet e return nErr; } +#endif // !DISABLE_DBCONNECTIVITY /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 97db17f..a545c40 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -147,16 +147,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/txenctab \ svx/source/dialog/wrapfield \ svx/source/engine3d/float3d \ -svx/source/fmcomp/dbaobjectex \ -svx/source/form/databaselocationinput \ -svx/source/form/dbcharsethelper \ -svx/source/form/filtnav \ -svx/source/form/fmobjfac \ -svx/source/form/fmPropBrw \ -svx/source/form/fmsrccfg \ -svx/source/form/fmsrcimp \ -svx/source/form/tabwin \ -svx/source/form/tbxform \ svx/source/items/algitem \ svx/source/items/hlnkitem \ svx/source/items/numfmtsh \ @@ -213,6 +203,21 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/unogallery/unogalthemeprovider \ )) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Library_use_external,svx,icuuc)) +svx/source/fmcomp/dbaobjectex \ +svx/source/form/databaselocationinput \ +svx/source/form/dbcharsethelper \ +svx/source/form/filtnav \ +svx/source/form/fmobjfac \ +svx/source/form/fmPropBrw \ +svx/source/form/fmsrccfg \ +svx/source/form/fmsrcimp \ +svx/source/form/tabwin \ +svx/source/form/tbxform \ +)) +endif + ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportunx \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 508622f..a4e6424 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -123,58 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/engine3d/view3d \ svx/source/engine3d/view3d1 \ svx/source/engine3d/viewpt3d2 \ -svx/source/fmcomp/dbaexchange \ -svx/source/fmcomp/fmgridcl \ -svx/source/fmcomp/fmgridif \ -svx/source/fmcomp/gridcell \ -svx/source/fmcomp/gridcols \ -svx/source/fmcomp/gridctrl \ -svx/source/fmcomp/trace \ -svx/source/fmcomp/xmlexchg \ -
[Libreoffice-commits] .: 5 commits - cui/source l10ntools/inc l10ntools/source sd/qa sfx2/inc sfx2/source svx/inc svx/source test/inc test/source unusedcode.easy vcl/inc vcl/source vcl/unx
cui/source/options/optinet2.cxx| 39 -
l10ntools/inc/export.hxx |1
l10ntools/source/merge.cxx | 10
sd/qa/unit/filters-test.cxx|6 ++---
sfx2/inc/sfx2/mnuitem.hxx |2 -
sfx2/source/menu/mnuitem.cxx |5 +++-
sfx2/source/menu/thessubmenu.cxx |7 +++--
sfx2/source/menu/thessubmenu.hxx |2 -
svx/inc/svx/grafctrl.hxx |6 ++---
svx/inc/svx/lboxctrl.hxx |2 -
svx/inc/svx/tbcontrl.hxx |3 +-
svx/source/tbxctrls/grafctrl.cxx |5 +++-
svx/source/tbxctrls/lboxctrl.cxx |6 +++--
svx/source/tbxctrls/tbcontrl.cxx |6 -
test/inc/test/sheet/xspreadsheets2.hxx |1
test/source/sheet/xspreadsheets2.cxx |4 +++
unusedcode.easy|4 ---
vcl/inc/vcl/menu.hxx |2 -
vcl/source/window/menu.cxx |5
vcl/unx/generic/printer/ppdparser.cxx |6 ++---
20 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit 548b28a947c38454b570e42fc65997f3055924f5
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 21 11:46:35 2012 +
WaE: unused variable
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 361ce96..c42edd7 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -284,15 +284,15 @@ void SvxProxyTabPage::ReadConfigData_Impl()
}
}
-catch(container::NoSuchElementException ) {
+catch (const container::NoSuchElementException) {
OSL_TRACE( SvxProxyTabPage::ReadConfigData_Impl:
NoSuchElementException caught );
}
-catch(com::sun::star::lang::WrappedTargetException ) {
+catch (const com::sun::star::lang::WrappedTargetException ) {
OSL_TRACE( SvxProxyTabPage::ReadConfigData_Impl:
WrappedTargetException caught );
}
-catch(RuntimeException ) {
+catch (const RuntimeException ) {
OSL_TRACE( SvxProxyTabPage::ReadConfigData_Impl: RuntimeException
caught );
}
@@ -342,16 +342,16 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl()
aNoProxyForED.SetText( aStringValue );
}
}
-catch(beans::UnknownPropertyException )
+catch (const beans::UnknownPropertyException )
{
OSL_TRACE( SvxProxyTabPage::RestoreConfigDefaults_Impl:
UnknownPropertyException caught );
}
-catch(com::sun::star::lang::WrappedTargetException ) {
+catch (const com::sun::star::lang::WrappedTargetException ) {
OSL_TRACE( SvxProxyTabPage::RestoreConfigDefaults_Impl:
WrappedTargetException caught );
}
-catch(RuntimeException )
+catch (const RuntimeException )
{
OSL_TRACE( SvxProxyTabPage::RestoreConfigDefaults_Impl:
RuntimeException caught );
}
@@ -376,16 +376,16 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl()
xChangesBatch-commitChanges();
}
-catch(beans::UnknownPropertyException )
+catch (const beans::UnknownPropertyException )
{
OSL_TRACE( SvxProxyTabPage::RestoreConfigDefaults_Impl:
UnknownPropertyException caught );
}
-catch(com::sun::star::lang::WrappedTargetException ) {
+catch (const com::sun::star::lang::WrappedTargetException ) {
OSL_TRACE( SvxProxyTabPage::RestoreConfigDefaults_Impl:
WrappedTargetException caught );
}
-catch(RuntimeException )
+catch (const RuntimeException )
{
OSL_TRACE( SvxProxyTabPage::RestoreConfigDefaults_Impl:
RuntimeException caught );
}
@@ -481,23 +481,23 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet )
xChangesBatch-commitChanges();
}
-catch(com::sun::star::lang::IllegalArgumentException ) {
+catch (const com::sun::star::lang::IllegalArgumentException ) {
OSL_TRACE( SvxProxyTabPage::FillItemSet: IllegalArgumentException
caught );
}
-catch(beans::UnknownPropertyException ) {
+catch (const beans::UnknownPropertyException ) {
OSL_TRACE( SvxProxyTabPage::FillItemSet: UnknownPropertyException
caught );
}
-catch(beans::PropertyVetoException ) {
+catch (const beans::PropertyVetoException ) {
OSL_TRACE( SvxProxyTabPage::FillItemSet: PropertyVetoException
caught );
}
-catch(com::sun::star::lang::WrappedTargetException ) {
+catch (const com::sun::star::lang::WrappedTargetException ) {
OSL_TRACE( SvxProxyTabPage::FillItemSet: WrappedTargetException
caught );
}
-catch(RuntimeException ) {
+catch (const RuntimeException ) {
OSL_TRACE( SvxProxyTabPage::FillItemSet: RuntimeException caught );
}
@@ -748,7 +748,7 @@ IMPL_LINK( SvxSecurityTabPage, SavePasswordHdl, void*,
EMPTYARG )
}
}
}
-catch( Exception )
+catch (const Exception)
{
maSavePasswordsCB.Check(
[Libreoffice-commits] .: 2 commits - cui/source svx/Library_svx.mk
cui/source/options/optinet2.cxx |2 +-
svx/Library_svx.mk |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 46cf18fdf137d68ff42d6e037a1285a37c65c07f
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 21 14:45:05 2012 +
catch by reference
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index c42edd7..9df4772 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -284,7 +284,7 @@ void SvxProxyTabPage::ReadConfigData_Impl()
}
}
-catch (const container::NoSuchElementException) {
+catch (const container::NoSuchElementException) {
OSL_TRACE( SvxProxyTabPage::ReadConfigData_Impl:
NoSuchElementException caught );
}
commit 776be2f2a3874126f745bcf03052b0c437666473
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 21 14:44:19 2012 +
make this weird-ass DBCONNECTIVITY foo build
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index a545c40..248ab21 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -204,7 +204,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_external,svx,icuuc))
+$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/fmcomp/dbaobjectex \
svx/source/form/databaselocationinput \
svx/source/form/dbcharsethelper \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source svx/Library_svx.mk
cui/source/options/optinet2.cxx |2 +-
svx/Library_svx.mk |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 46cf18fdf137d68ff42d6e037a1285a37c65c07f
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 21 14:45:05 2012 +
catch by reference
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index c42edd7..9df4772 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -284,7 +284,7 @@ void SvxProxyTabPage::ReadConfigData_Impl()
}
}
-catch (const container::NoSuchElementException) {
+catch (const container::NoSuchElementException) {
OSL_TRACE( SvxProxyTabPage::ReadConfigData_Impl:
NoSuchElementException caught );
}
commit 776be2f2a3874126f745bcf03052b0c437666473
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 21 14:44:19 2012 +
make this weird-ass DBCONNECTIVITY foo build
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index a545c40..248ab21 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -204,7 +204,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_external,svx,icuuc))
+$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/fmcomp/dbaobjectex \
svx/source/form/databaselocationinput \
svx/source/form/dbcharsethelper \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: reportdesign/source sc/source svx/inc svx/source sw/source
reportdesign/source/ui/misc/toolboxcontroller.cxx |4
sc/source/ui/app/scdll.cxx|2
sc/source/ui/view/formatsh.cxx|2
svx/inc/svx/tbcontrl.hxx | 29 ++---
svx/source/tbxctrls/tbcontrl.cxx | 115 +-
sw/source/ui/app/swmodule.cxx |6 -
sw/source/ui/inc/basesh.hxx |5
sw/source/ui/shells/basesh.cxx| 12 +-
8 files changed, 102 insertions(+), 73 deletions(-)
New commits:
commit 836d98646203e0d9d3916571ed55d6572c2cb3dc
Author: Winfried Donkers o...@dci-electronics.nl
Date: Tue Feb 21 14:50:04 2012 +
fdo#44611 writer: paragraph background color picker with split button
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx
b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index bee4a39..74e670a 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -197,7 +197,7 @@ void SAL_CALL OToolboxController::initialize( const
Sequence Any _rArguments
{
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(.uno:FontColor)),sal_True));
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(.uno:Color)),sal_True));
-m_pToolbarController = TToolbarHelper::createFromQuery(new
SvxFontColorExtToolBoxControl/*SvxFontColorToolBoxControl*/(m_nSlotId =
SID_ATTR_CHAR_COLOR2,m_nToolBoxId,*pToolBox));
+m_pToolbarController = TToolbarHelper::createFromQuery(new
SvxColorExtToolBoxControl(m_nSlotId =
SID_ATTR_CHAR_COLOR2,m_nToolBoxId,*pToolBox));
}
else
{
@@ -268,7 +268,7 @@ void SAL_CALL OToolboxController::statusChanged( const
FeatureStateEvent Event
::Color aGcc3WorkaroundTemporary( nColor);
SvxColorItem aColorItem(aGcc3WorkaroundTemporary,1);
if ( SID_ATTR_CHAR_COLOR2 == m_nSlotId )
-
static_castSvxFontColorExtToolBoxControl*(m_pToolbarController.get())-StateChanged(m_nSlotId,Event.IsEnabled
? SFX_ITEM_SET : SFX_ITEM_DISABLED,aColorItem);
+
static_castSvxColorExtToolBoxControl*(m_pToolbarController.get())-StateChanged(m_nSlotId,Event.IsEnabled
? SFX_ITEM_SET : SFX_ITEM_DISABLED,aColorItem);
else
static_castSvxColorToolBoxControl*(m_pToolbarController.get())-StateChanged(m_nSlotId,Event.IsEnabled
? SFX_ITEM_SET : SFX_ITEM_DISABLED,aColorItem);
}
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 4675a2e..cb98122 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -204,7 +204,7 @@ void ScDLL::Init()
SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT,
pMod);
// SvxFontHeightToolBoxControl
::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR,
pMod);
-SvxFontColorExtToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR,
pMod);
+SvxColorExtToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR,
pMod);
SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER,
pMod);
SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE,
pMod);
SvxFrameLineColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR,
pMod);
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index bbb44ae..8a91f36 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1453,10 +1453,10 @@ void ScFormatShell::ExecuteAttr( SfxRequest rReq )
case SID_BACKGROUND_COLOR:
{
// SID_BACKGROUND_COLOR without arguments - set
background to last used color
+
SvxBrushItemaBrushItem( (const SvxBrushItem)
pTabViewShell-GetSelectionPattern()-
GetItem( ATTR_BACKGROUND ) );
-
aBrushItem.SetColor( pTabViewShell-GetBackgroundColor()
);
pTabViewShell-ApplyAttr( aBrushItem );
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
old mode 100755
new mode 100644
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index e0f0bdd..35806e5 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -65,23 +65,23 @@
from DocShell: presently none
in future: color palette
-class SvxFontColorExtToolBoxControl
+class SvxColorExtToolBoxControl
---
-for font color
Item type: SvxColorItem
-
[Libreoffice-commits] .: tools/inc tools/source
tools/inc/tools/fsys.hxx| 37 ---
tools/source/fsys/comdep.hxx|2 -
tools/source/fsys/dirent.cxx| 64
tools/source/fsys/wntmsc.cxx|1
tools/source/stream/strmunx.cxx |1
tools/source/stream/strmwnt.cxx |1
6 files changed, 106 deletions(-)
New commits:
commit 4cd2af27cbedc0f59f5a8a3f0a7c27b158b42fce
Author: Elton Chung el...@layerjet.com
Date: Tue Feb 21 00:39:36 2012 +0800
fdo#44993: Remove obsolete FSysRedirector
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 42ddcab..33ac3cb 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -422,43 +422,6 @@ public:
DirEntry operator []( size_t nIndex ) const;
};
-//
-
-/** FSysRedirector is an abstract base class for a hook to redirect
-mirrored directory trees.
-
-POne instance of a subclass can be instanciated and registered
-using the method FSysRedirector::Register(FSysRedirector*).
- */
-
-class FSysRedirector
-{
-static FSysRedirector* _pRedirector;
-static sal_Bool _bEnabled;
-
-public:
-//---
-/** This method is to be used to redirect a file system path.
-
-PIt will not redirect while redirection is disabled.
-
-PIt may block while another thread is accessing the redirector
-or another thread has disabled redirections.
-
-@param String rPathBR
-This inout-argument accepts a file:-URL even as a native
-file system path name to redirect in 'rPath'. It returns the
-redirected (modified) path too, which can be of both formats
-too.
-
-@return sal_BoolBR
-sal_True, if the path is redirected
-sal_False, if the path is not redirected (unchanged)
- */
-static void DoRedirect( String rPath );
-};
-
-
#if defined(DBG_UTIL)
void FSysTest();
#endif
diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx
index 193041b..3a56549 100644
--- a/tools/source/fsys/comdep.hxx
+++ b/tools/source/fsys/comdep.hxx
@@ -76,8 +76,6 @@ struct DirReader_Impl
bReady ( sal_False ),
bInUse( sal_False )
{
-// Redirection
-FSysRedirector::DoRedirect( aPath );
// nur den String der Memer-Var nehmen!
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 3018cf4..1a60e0c 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -128,62 +128,6 @@ int Sys2SolarError_Impl( int nSysErr )
//
-FSysRedirector* FSysRedirector::_pRedirector = 0;
-sal_Bool FSysRedirector::_bEnabled = sal_True;
-#ifdef UNX
-sal_Bool bInRedirection = sal_True;
-#else
-sal_Bool bInRedirection = sal_False;
-#endif
-static osl::Mutex* pRedirectMutex = 0;
-
-//
-void FSysRedirector::DoRedirect( String rPath )
-{
-String aURL(rPath);
-
-// if redirection is disabled or not even registered do nothing
-if ( !_bEnabled || !pRedirectMutex )
-return;
-
-// redirect only removable or remote volumes
-if (!IsRedirectable_Impl(rtl::OUStringToOString(aURL,
osl_getThreadTextEncoding(
-return;
-
-// Redirection is acessible only by one thread per time
-// dont move the guard behind the bInRedirection check!!!
-// think of nested calls (when called from callback)
-osl::MutexGuard aGuard( pRedirectMutex );
-
-// if already in redirection, dont redirect
-if ( bInRedirection )
-return;
-
-// dont redirect on nested calls
-bInRedirection = sal_True;
-
-// convert to URL
-#ifndef UNX
-for ( sal_Unicode *p = (sal_Unicode*)aURL.GetBuffer(); *p; ++p )
-if ( '\\' == *p ) *p = '/';
-else if ( ':' == *p ) *p = '|';
-#endif
-
-aURL.Insert( String(file:///, osl_getThreadTextEncoding()), 0 );
-
-// do redirection
-if ( !_pRedirector )
-{
-pRedirectMutex = new osl::Mutex;
-_pRedirector = new FSysRedirector;
-}
-
-bInRedirection = sal_False;
-return;
-}
-
-//
-
class DirEntryStack
{
private:
@@ -966,7 +910,6 @@ sal_Bool DirEntry::First()
FSysFailOnErrorImpl();
StringaUniPathName( GetPath().GetFull() );
-FSysRedirector::DoRedirect( aUniPathName );
rtl::OString aPathName(rtl::OUStringToOString(aUniPathName,
osl_getThreadTextEncoding()));
[Libreoffice-commits] .: vcl/headless vcl/unx
vcl/headless/headlessinst.cxx |8 +++-
vcl/unx/generic/plugadapt/salplug.cxx |4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit bc7b349ea262995d4599cda686d39af15a1e7aa6
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date: Tue Feb 21 14:55:10 2012 +0100
headless: more work in vcl
Provide HeadlessSalSystem::ShowNativeDialog() instead of having
it if-zeroed.
Then remove LIBO_HEADLESS ifdefery from unx/generic/plugadapt/salplug.cxx
which we are not building anymore.
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index bde892f..439de86 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -49,22 +49,20 @@ HeadlessSalInstance::~HeadlessSalInstance()
}
class HeadlessSalSystem : public SvpSalSystem {
-#if 0
public:
-AndroidSalSystem() : SvpSalSystem() {}
-virtual ~AndroidSalSystem() {}
+HeadlessSalSystem() : SvpSalSystem() {}
+virtual ~HeadlessSalSystem() {}
virtual int ShowNativeDialog( const rtl::OUString rTitle,
const rtl::OUString rMessage,
const std::list rtl::OUString rButtons,
int nDefButton )
{
(void)rButtons; (void)nDefButton;
-__android_log_print(ANDROID_LOG_INFO, LibreOffice - dialog '%s':
'%s',
+::fprintf(stdout, LibreOffice - dialog '%s': '%s',
rtl::OUStringToOString(rTitle,
RTL_TEXTENCODING_ASCII_US).getStr(),
rtl::OUStringToOString(rMessage,
RTL_TEXTENCODING_ASCII_US).getStr());
return 0;
}
-#endif
};
SalSystem *HeadlessSalInstance::CreateSalSystem()
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 1ce60de..1d9a5ba 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -53,7 +53,7 @@ static oslModule pCloseModule = NULL;
static SalInstance* tryInstance( const OUString rModuleBase, bool bForce =
false )
{
SalInstance* pInst = NULL;
-#if !defined(ANDROID) || !defined(LIBO_HEADLESS)
+#if !defined(ANDROID)
// Disable gtk3 plugin load except in experimental mode for now.
if( !bForce
rModuleBase.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( gtk3 ) )
@@ -129,7 +129,7 @@ static SalInstance* tryInstance( const OUString
rModuleBase, bool bForce = fals
return pInst;
}
-#if !defined(ANDROID) || !defined(LIBO_HEADLESS)
+#if !defined(ANDROID)
static DesktopType get_desktop_environment()
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/Library_vbaobj.mk sc/source
sc/Library_vbaobj.mk |1
sc/source/ui/vba/vbacomment.cxx |1
sc/source/ui/vba/vbacommentshape.cxx | 43
sc/source/ui/vba/vbacommentshape.hxx | 46 ---
4 files changed, 91 deletions(-)
New commits:
commit 57d95b35be6b6a5741d4769525ae15a1240c9d9d
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 21 15:05:39 2012 +
WaE: C4610: class 'ScVbaCommentShape' can never be instantiated
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 60beaf3..6a6b80d 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
sc/source/ui/vba/vbacharttitle \
sc/source/ui/vba/vbacomment \
sc/source/ui/vba/vbacomments \
-sc/source/ui/vba/vbacommentshape \
sc/source/ui/vba/vbacondition \
sc/source/ui/vba/vbadialog \
sc/source/ui/vba/vbadialogs \
diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx
index 402d9e9..bfb5d62 100644
--- a/sc/source/ui/vba/vbacomment.cxx
+++ b/sc/source/ui/vba/vbacomment.cxx
@@ -50,7 +50,6 @@
#include vbahelper/vbashape.hxx
#include vbaglobals.hxx
#include vbacomments.hxx
-#include vbacommentshape.hxx
using namespace ::ooo::vba;
using namespace ::com::sun::star;
diff --git a/sc/source/ui/vba/vbacommentshape.cxx
b/sc/source/ui/vba/vbacommentshape.cxx
deleted file mode 100644
index 1c942d6..000
--- a/sc/source/ui/vba/vbacommentshape.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2009, 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include vbacommentshape.hxx
-
-using namespace com::sun::star;
-using namespace ooo::vba;
-
-void SAL_CALL ScVbaCommentShape::Delete() throw (uno::RuntimeException)
-{
-if ( m_xComment.is() )
-{
-m_xComment-Delete();
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/vba/vbacommentshape.hxx
b/sc/source/ui/vba/vbacommentshape.hxx
deleted file mode 100644
index 76adc99..000
--- a/sc/source/ui/vba/vbacommentshape.hxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2009, 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef SC_VBA_COMMENTSHAPE_HXX
-#define SC_VBA_COMMENTSHAPE_HXX
-
-#include ooo/vba/excel/XComment.hpp
-#include vbahelper/vbashape.hxx
-
-class ScVbaCommentShape : public ScVbaShape
-{
-css::uno::Reference ooo::vba::excel::XComment m_xComment;
-
-public:
-// Methods
-virtual void SAL_CALL
[Libreoffice-commits] .: 2 commits - basegfx/test
basegfx/test/basegfx2d.cxx | 116 +++--
1 file changed, 20 insertions(+), 96 deletions(-)
New commits:
commit 5dde19c453bce729879601161f52a3185b44f195
Author: Michael Meeks michael.me...@suse.com
Date: Tue Feb 21 15:27:42 2012 +
remove redundant/empty setup/tear-down methods from unit tests
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 325d0bd..26ec7d3 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -291,14 +291,6 @@ class b2drange : public CppUnit::TestFixture
{
private:
public:
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
void check()
{
CPPUNIT_ASSERT_MESSAGE(simple range rounding from double to integer,
@@ -318,12 +310,6 @@ class b2dpolyrange : public CppUnit::TestFixture
{
private:
public:
-void setUp()
-{}
-
-void tearDown()
-{}
-
void check()
{
B2DPolyRange aRange;
@@ -734,15 +720,6 @@ public:
class b2dpoint : public CppUnit::TestFixture
{
public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
// insert your test code here.
// this is only demonstration code
void EmptyMethod()
@@ -763,15 +740,6 @@ public:
class b2dpolygon : public CppUnit::TestFixture
{
public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
// insert your test code here.
void testBasics()
{
@@ -838,15 +806,6 @@ public:
class b2dpolygontools : public CppUnit::TestFixture
{
public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
// insert your test code here.
// this is only demonstration code
void testIsRectangle()
@@ -927,15 +886,6 @@ public:
class b2dpolypolygon : public CppUnit::TestFixture
{
public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
// insert your test code here.
void EmptyMethod()
{
@@ -953,15 +903,6 @@ public:
class b1Xrange : public CppUnit::TestFixture
{
public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
templateclass Type void implCheck()
{
// test interval axioms
@@ -1028,15 +969,6 @@ public:
class b1ibox : public CppUnit::TestFixture
{
public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
void TestBox()
{
// test axioms - markedly different from proper mathematical
@@ -1096,15 +1028,6 @@ public:
class b2Xrange : public CppUnit::TestFixture
{
public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
templateclass Type void implCheck()
{
// cohen sutherland clipping
@@ -1145,15 +1068,6 @@ public:
class b2ibox : public CppUnit::TestFixture
{
public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
void TestBox()
{
// cohen sutherland clipping
@@ -1187,15 +1101,6 @@ public:
class b2dtuple : public CppUnit::TestFixture
{
public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
// insert your test code here.
// this is only demonstration code
void EmptyMethod()
@@ -1235,16 +1140,6 @@ public:
maCyan(0,1,1)
{}
-
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
// insert your test code here.
void hslTest()
{
commit 49e5d3f0e39ffaa4a76ebf4e15da92840578288b
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Tue Feb 21 15:24:10 2012 +
Add unit test for B2DRange's fround
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index d6e26a8..325d0bd 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -49,6 +49,7 @@
#include basegfx/range/b1drange.hxx
#include basegfx/range/b1irange.hxx
#include basegfx/range/b1ibox.hxx
+#include basegfx/range/b2drange.hxx
#include basegfx/range/b2dpolyrange.hxx
#include basegfx/numeric/ftools.hxx
#include basegfx/color/bcolor.hxx
@@ -286,6 +287,33 @@ public:
SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dsvgdimpex
+class b2drange : public CppUnit::TestFixture
+{
+private:
+public:
+void setUp()
+{
+}
+
+void tearDown()
+{
+}
+
+void check()
+{
+CPPUNIT_ASSERT_MESSAGE(simple range rounding from double to integer,
+ fround(B2DRange(1.2, 2.3, 3.5, 4.8)) ==
B2IRange(1, 2, 4, 5));
+}
+
+// Change the following lines only, if you add, remove or rename
+
[Libreoffice-commits] .: 5 commits - sw/source
sw/source/core/layout/flylay.cxx | 134 ++-
sw/source/core/layout/hffrm.cxx | 42 ++--
sw/source/core/layout/newfrm.cxx | 56 +++-
3 files changed, 111 insertions(+), 121 deletions(-)
New commits:
commit 561c30b331f48e8e5ba5ee78d43ab011549dc6c4
Author: David Vogt david.v...@adfinis-sygroup.ch
Date: Tue Feb 21 15:47:14 2012 +0100
Correct spelling and fix trailing whitespace
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 1d44594..09bafcd 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -114,7 +114,7 @@ TYPEINIT1(SwFlyFreeFrm,SwFlyFrm);
|* Description notifies the background (all CntntFrms that currently
|* are overlapping. Additionally, the window is also directly
|* invalidated (especially where there are no overlapping CntntFrms)
-|* This also takes into account the CntntFrms within other Flys.
+|* This also takes CntntFrms within other Flys into account.
|*
|*/
@@ -290,10 +290,10 @@ bool SwFlyFreeFrm::HasEnvironmentAutoSize() const
void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize rSz )
{
-// It's probably time now to take appropriate measures if the Fly
-// doesn't fit into it's surrounding.
-// First, the Fly gives up it's position. Then it's formatted first.
-// Only if it still doesn't fit after giving up the position, the
+// It's probably time now to take appropriate measures, if the Fly
+// doesn't fit into its surrounding.
+// First, the Fly gives up its position, then it's formatted.
+// Only if it still doesn't fit after giving up its position, the
// width or height are given up as well. The frame will be squeezed
// as much as needed.
@@ -340,8 +340,6 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize rSz )
const SwFmtHoriOrient rH = GetFmt()-GetHoriOrient();
// Left-aligned ones may not be moved to the left when they
// are avoiding another one.
-// TODO comment-translator: what left-aligned things are they
-// talking about here?
if( rH.GetHoriOrient() == text::HoriOrientation::LEFT )
Frm().Pos().X() = nOld;
else
@@ -353,11 +351,11 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize rSz )
bValidSize = sal_False;
else
{
-// If we reach this place, the Frm protrudes into forbidden
+// If we reach this branch, the Frm protrudes into forbidden
// sections, and correcting the position is neither allowed
// nor possible nor required.
-// With Flys that have OLE objects as lower, we make sure that
+// For Flys with OLE objects as lower, we make sure that
// we always resize proportionally
Size aOldSize( Frm().SSize() );
@@ -445,9 +443,8 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize rSz )
}
}
-// Now change the Frm; with columns, put the new values into the
-// attributes, because there may occur pretty bad oscillations
-// otherwise.
+// Now change the Frm; for columns, we put the new values into the
attributes,
+// otherwise we'll end up with unwanted side-effects
const long nPrtHeightDiff = Frm().Height() - Prt().Height();
const long nPrtWidthDiff = Frm().Width() - Prt().Width();
Frm().Height( aFrmRect.Height() );
@@ -725,8 +722,7 @@ void SwPageFrm::RemoveFlyFromPage( SwFlyFrm *pToRemove )
// Don't delete collections just yet. This will happen at the end of the
// action in the RemoveSuperfluous of the page, kicked off by a method of
// the same name in the root.
-// The FlyColl might be gone already, because the page's dtor is currently
-// running.
+// The FlyColl might be gone already, because the page's dtor is being
executed.
if ( pSortedObjs )
{
pSortedObjs-Remove( *pToRemove );
@@ -776,8 +772,7 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm
*pDest )
-DisposeAccessibleFrm( pToMove, sal_True );
}
-// The FlyColl might be gone already, because the page's dtor is currently
-// running.
+// The FlyColl might be gone already, because the page's dtor is being
executed.
if ( pSortedObjs )
{
pSortedObjs-Remove( *pToMove );
@@ -946,7 +941,7 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt
)
}
else
{
-// if we received a Fly, we use that one. Otherwise, create a new
+// If we received a Fly, we use that one. Otherwise, create a new
// one using the Format.
if ( pFly )
[Libreoffice-commits] .: sw/source
sw/source/core/layout/flylay.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5f06a2b734941a79983ecf8476b412bf6ce5e9e8
Author: Michael Meeks michael.me...@suse.com
Date: Tue Feb 21 16:01:00 2012 +
flylay - add back ';' removed in error
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 09bafcd..b2a9296 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -519,7 +519,7 @@ void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const
SfxPoolItem *pNew )
if( RES_ATTRSET_CHG == nWhich SFX_ITEM_SET ==
((SwAttrSetChg*)pNew)-GetChgSet()-GetItemState( RES_ANCHOR,
sal_False,
(const SfxPoolItem**)pAnch ))
-// GetItemState sets the anchor pointer!
+; // GetItemState sets the anchor pointer!
else if( RES_ANCHOR == nWhich )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 59 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 13 +
2 files changed, 71 insertions(+), 1 deletion(-)
New commits:
commit fa9e867a342a37d84f02f7e801962761cc1d2b6f
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Feb 21 16:40:57 2012 +0100
implement import of RTF_DOB{X,Y}{MARGIN,PAGE}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9bc8caf..806b43f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1985,8 +1985,31 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_POSXR: m_aStates.top().aFrame.nHoriAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_right; break;
case RTF_DPLINE:
-
m_aStates.top().aDrawingObject.xShape.set(getModelFactory()-createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.LineShape))),
uno::UNO_QUERY);
-
m_aStates.top().aDrawingObject.xPropertySet.set(m_aStates.top().aDrawingObject.xShape,
uno::UNO_QUERY);
+{
+
m_aStates.top().aDrawingObject.xShape.set(getModelFactory()-createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.LineShape))),
uno::UNO_QUERY);
+
m_aStates.top().aDrawingObject.xPropertySet.set(m_aStates.top().aDrawingObject.xShape,
uno::UNO_QUERY);
+std::vectorbeans::PropertyValue rPendingProperties =
m_aStates.top().aDrawingObject.aPendingProperties;
+for (std::vectorbeans::PropertyValue::iterator i =
rPendingProperties.begin(); i != rPendingProperties.end(); ++i)
+
m_aStates.top().aDrawingObject.xPropertySet-setPropertyValue(i-Name,
i-Value);
+}
+break;
+case RTF_DOBXMARGIN:
+case RTF_DOBYMARGIN:
+{
+beans::PropertyValue aPropertyValue;
+aPropertyValue.Name =
OUString(RTL_CONSTASCII_USTRINGPARAM((nKeyword == RTF_DOBXMARGIN ?
HoriOrientRelation : VertOrientRelation)));
+aPropertyValue.Value =
text::RelOrientation::PAGE_PRINT_AREA;
+
m_aStates.top().aDrawingObject.aPendingProperties.push_back(aPropertyValue);
+}
+break;
+case RTF_DOBXPAGE:
+case RTF_DOBYPAGE:
+{
+beans::PropertyValue aPropertyValue;
+aPropertyValue.Name =
OUString(RTL_CONSTASCII_USTRINGPARAM((nKeyword == RTF_DOBXPAGE ?
HoriOrientRelation : VertOrientRelation)));
+aPropertyValue.Value = text::RelOrientation::PAGE_FRAME;
+
m_aStates.top().aDrawingObject.aPendingProperties.push_back(aPropertyValue);
+}
break;
default:
SAL_INFO(writerfilter, OSL_THIS_FUNC : TODO handle flag '
lcl_RtfToString(nKeyword) ');
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index d5cdedc..a6c0995 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -187,6 +187,7 @@ namespace writerfilter {
public:
uno::Referencedrawing::XShape xShape;
uno::Referencebeans::XPropertySet xPropertySet;
+std::vectorbeans::PropertyValue aPendingProperties;
};
/// Stores the properties of a picture.
commit bbef8b4a93ff840fa6306cc6e41e1e2dd3e6c8fa
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Feb 21 15:15:08 2012 +0100
implement import of RTF_DPLINE
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4c39947..9bc8caf 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1291,6 +1291,9 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
// This destination should be ignored by readers that support
nested tables.
m_aStates.top().nDestinationState = DESTINATION_SKIP;
break;
+case RTF_DO:
+m_aStates.top().nDestinationState = DESTINATION_DRAWINGOBJECT;
+break;
default:
SAL_INFO(writerfilter, OSL_THIS_FUNC : TODO handle
destination ' lcl_RtfToString(nKeyword) ');
// Make sure we skip destinations (even without \*) till we don't
handle them
@@ -1981,6 +1984,10 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_POSXL: m_aStates.top().aFrame.nHoriAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_left; break;
case RTF_POSXR: m_aStates.top().aFrame.nHoriAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_right; break;
+case RTF_DPLINE:
+
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in extensions/source set_soenv.in
configure.in | 20
extensions/source/nsplugin/source/makefile.mk |4
extensions/source/nsplugin/source/npshell.cxx |5 -
set_soenv.in |1 +
4 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit 2ec27f4b250781956aedc27a3a1b304d9e72e2ec
Author: Rene Engelhard r...@debian.org
Date: Tue Feb 21 18:07:34 2012 +0100
build also with older npapi
(merge from e6d0daefbdb8367384d8e5c217f65118bd8dc565)
Signed-off-by: Rene Engelhard r...@debian.org
diff --git a/configure.in b/configure.in
index 26a500a..94b6de9 100644
--- a/configure.in
+++ b/configure.in
@@ -6095,6 +6095,7 @@ AC_SUBST(NSS_LIBS)
dnl ===
dnl Check for system mozilla headers
dnl ===
+HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=
AC_MSG_CHECKING([which mozilla headers to use])
if test $with_system_mozilla_headers = yes; then
AC_MSG_RESULT([external])
@@ -6109,12 +6110,31 @@ if test $with_system_mozilla_headers = yes; then
if test x$LOCATED != xyes; then
AC_MSG_ERROR([npapi.h header file not found])
fi
+
+AC_LANG_PUSH([C])
+save_CFLAGS=$CFLAGS
+CFLAGS=$CFLAGS $MOZILLA_HEADERS_CFLAGS
+AC_MSG_CHECKING([for NPP_GetMIMEDescription return type])
+AC_COMPILE_IFELSE(
+[AC_LANG_SOURCE([[
+#define XP_UNIX
+#include npapi.h
+const char* NPP_GetMIMEDescription(void) { return foo; }
+]])],
+[AC_MSG_RESULT([const char*])],
+[
+AC_MSG_RESULT([char*])
+HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=TRUE
+])
+CFLAGS=$save_CFLAGS
+AC_LANG_POP([C])
else
AC_MSG_RESULT([internal])
SYSTEM_MOZILLA_HEADERS=NO
fi
AC_SUBST(MOZILLA_HEADERS_CFLAGS)
AC_SUBST(SYSTEM_MOZILLA_HEADERS)
+AC_SUBST(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION)
dnl ===
dnl Check for system sane
diff --git a/extensions/source/nsplugin/source/makefile.mk
b/extensions/source/nsplugin/source/makefile.mk
index 5b74764..7d302b5 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -42,6 +42,10 @@ INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
INCPRE=$(SOLARINCDIR)$/npsdk
.ENDIF
+.IF $(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION) TRUE
+CXXFLAGS += -DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1
+.ENDIF
+
.IF $(GUI)==UNX
# not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
diff --git a/extensions/source/nsplugin/source/npshell.cxx
b/extensions/source/nsplugin/source/npshell.cxx
index e25326f..be8ea84 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -361,7 +361,10 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII
:odp:OpenDocument Presentation;
MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII :otp:OpenDocument
Presentation Template;
MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII :odf:OpenDocument Formula; );
-const char*
+#ifndef HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION
+const
+#endif
+char*
NPP_GetMIMEDescription(void)
{
debug_fprintf(NSP_LOG_APPEND, print by Netscape Plugin,
NPP_GetMIMEDescription:%s.\n, pMimeTypes);
diff --git a/set_soenv.in b/set_soenv.in
index 817693e..3dc9cfa 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1777,6 +1777,7 @@ ToFile( HAVE_GCC_VISIBILITY_FEATURE,
ToFile( HAVE_GCC_VISIBILITY_BROKEN,
@HAVE_GCC_VISIBILITY_BROKEN@, e );
ToFile( HAVE_LD_HASH_STYLE,@HAVE_LD_HASH_STYLE@,e );
+ToFile(
HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION,@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@,e
);
ToFile( WITH_LINKER_HASH_STYLE,@WITH_LINKER_HASH_STYLE@,e );
ToFile( HAVE_LD_BSYMBOLIC_FUNCTIONS,
@HAVE_LD_BSYMBOLIC_FUNCTIONS@,e );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 43eefa11eb1d025b7967e75574f07603f6ac8a96
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Feb 21 13:43:04 2012 +0100
pythonloader.uno.so, libpyuno and pyuno are duplicates for linkoo too
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 5c15611..97ae2e3 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -136,7 +136,7 @@ my %replaceable = (
my @search_dirs = ( 'lib', 'bin', 'class' );
-my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm',
'libsqlite3', 'libnssutil3' );
+my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm',
'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno' );
sub sniff_target($)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/qa
sc/qa/unit/data/ods/passwordOld.ods|binary
sc/qa/unit/subsequent_filters-test.cxx | 27 ++-
2 files changed, 22 insertions(+), 5 deletions(-)
New commits:
commit adb293f84d2f7e50ecc8b37ce439fd75c42ad84c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Feb 21 09:30:26 2012 +0100
add test case for old password algorithm, related fdo#45171
(cherry picked from 8f82bccf26d14d3ad4a64739edd9ba23c124b8ad)
Signed-off-by: Rene Engelhard r...@debian.org
diff --git a/sc/qa/unit/data/ods/passwordOld.ods
b/sc/qa/unit/data/ods/passwordOld.ods
new file mode 100644
index 000..eee9ede
Binary files /dev/null and b/sc/qa/unit/data/ods/passwordOld.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 9916584..3b46a91 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -171,7 +171,9 @@ public:
void testBugFixesXLSX();
//misc tests unrelated to the import filters
-void testPassword();
+void testPasswordNew();
+void testPasswordOld();
+
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testRangeName);
@@ -185,7 +187,8 @@ public:
//disable testPassword on MacOSX due to problems with libsqlite3
//also crashes on DragonFly due to problems with nss/nspr headers
#if !defined(MACOSX) !defined(DRAGONFLY)
-CPPUNIT_TEST(testPassword);
+CPPUNIT_TEST(testPasswordOld);
+CPPUNIT_TEST(testPasswordNew);
#endif
#if TEST_BUG_FILES
@@ -196,6 +199,7 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
+void testPassword_Impl(const rtl::OUString rFileNameBase);
uno::Referenceuno::XInterface m_xCalcComponent;
::rtl::OUString m_aBaseString;
};
@@ -544,15 +548,13 @@ void ScFiltersTest::testBugFixesXLSX()
xDocSh-DoClose();
}
-void ScFiltersTest::testPassword()
+void ScFiltersTest::testPassword_Impl(const rtl::OUString aFileNameBase)
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(password.));
rtl::OUString aFileExtension(aFileFormats[0].pName,
strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
rtl::OUString aFilterName(aFileFormats[0].pFilterName,
strlen(aFileFormats[0].pFilterName), RTL_TEXTENCODING_UTF8) ;
rtl::OUString aFileName;
createFileURL(aFileNameBase, aFileExtension, aFileName);
rtl::OUString aFilterType(aFileFormats[0].pTypeName,
strlen(aFileFormats[0].pTypeName), RTL_TEXTENCODING_UTF8);
-std::cout aFileFormats[0].pName Test std::endl;
sal_uInt32 nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
SfxFilter* aFilter = new SfxFilter(
@@ -577,6 +579,21 @@ void ScFiltersTest::testPassword()
ScDocument* pDoc = xDocSh-GetDocument();
CPPUNIT_ASSERT_MESSAGE(No Document, pDoc); //remove with first test
xDocSh-DoClose();
+
+}
+
+void ScFiltersTest::testPasswordNew()
+{
+//tests opening a file with new password algorithm
+const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(password.));
+testPassword_Impl(aFileNameBase);
+}
+
+void ScFiltersTest::testPasswordOld()
+{
+//tests opening a file with old password algorithm
+const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(passwordOld.));
+testPassword_Impl(aFileNameBase);
}
ScFiltersTest::ScFiltersTest()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 24 commits - basegfx/source connectivity/source dbaccess/source desktop/source framework/source hwpfilter/source l10ntools/source sal/osl sal/workben scripting/source sc/sourc
basegfx/source/polygon/b2dpolypolygoncutter.cxx
| 24 --
connectivity/source/drivers/postgresql/pq_tools.cxx
|3 -
dbaccess/source/filter/xml/xmlStyleImport.cxx
|4 -
desktop/source/deployment/gui/dp_gui_updatedialog.cxx
|2
framework/source/helper/titlebarupdate.cxx
|2
framework/source/layoutmanager/uielement.cxx
|4 -
framework/source/uielement/statusbarmanager.cxx
| 17 ++-
framework/source/uielement/toolbarsmenucontroller.cxx
|2
hwpfilter/source/hwpreader.cxx
|5 --
l10ntools/source/export.cxx
|6 --
l10ntools/source/help/HelpLinker.cxx
|1
sal/osl/unx/module.c
|3 -
sal/workben/clipboardwben/testcopy/cbcpytest.cxx
|1
sc/source/core/data/dptabres.cxx
|7 --
sc/source/filter/excel/excform.cxx
|4 -
scripting/source/provider/ScriptImpl.hxx
|7 +-
scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
|2
scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
|9 +--
scripting/source/runtimemgr/ScriptRuntimeManager.hxx
| 11 ++--
scripting/source/runtimemgr/StorageBridge.hxx
|7 +-
scripting/source/runtimemgr/StorageBridgeFactory.hxx
|3 -
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
|2
sdext/source/presenter/PresenterPaneBorderPainter.cxx
|2
svtools/source/control/toolbarmenu.cxx
| 16 +-
testtools/source/performance/ubtest.cxx
|1
tools/source/fsys/dirent.cxx
|1
ucb/source/ucp/webdav/LockSequence.cxx
|2
vcl/win/source/window/salframe.cxx
|5 --
xmerge/source/activesync/XMergeFilter.cpp
|2
29 files changed, 37 insertions(+), 118 deletions(-)
New commits:
commit 41e8fe179f10f224433b26daba105ee92c661ac4
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 21 20:47:54 2012 +0100
WaE: remove variable scope
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 00c5a0c..56aed72 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -862,11 +862,12 @@ void fillAttnum2attnameMap(
::rtl::OString extractSingleTableFromSelect( const OStringVector vec )
{
rtl::OString ret;
-size_t token = 0;
if( 0 == rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
vec[0].pData-buffer, vec[0].pData-length, select , 6 , 6 ) )
{
+size_t token = 0;
+
for( token = 1; token vec.size() ; token ++ )
{
if( 0 == rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
commit a3bf3451a9c7859848d02bc56a616df3f9adf0a4
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 21 20:42:17 2012 +0100
WaE: arrayIndexOutOfBounds
diff --git a/testtools/source/performance/ubtest.cxx
b/testtools/source/performance/ubtest.cxx
index 87394c2..a8ca0e0 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -1121,7 +1121,6 @@ sal_Int32 TestImpl::run( const Sequence OUString
rArgs )
aArgs[6].pData,
aArgs[7].pData,
aArgs[8].pData,
-aArgs[9].pData,
};
out( \n executing: \uno );
commit 9d5bcff31cfc511bfead51ee1a743300c520b243
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 21 20:32:24 2012 +0100
WaE: unreadVariable
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index b88080b..ea41a7e 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -55,7 +55,6 @@ static sal_Bool getModulePathFromAddress(void * address,
rtl_String ** path) {
/* Bah, we do want to use dladdr here also on iOS, I think? */
#if !defined(NO_DL_FUNCTIONS) || defined(IOS)
#if defined(AIX)
-int i;
int size = 4 * 1024;
char *buf, *filename=NULL;
struct ld_info *lp;
@@ -63,7 +62,7 @@ static sal_Bool getModulePathFromAddress(void * address,
[Libreoffice-commits] .: cppuhelper/inc cppu/inc registry/inc store/inc
cppu/inc/com/sun/star/uno/Any.h |4 ++--
cppu/inc/com/sun/star/uno/Reference.h|4 ++--
cppu/inc/com/sun/star/uno/Sequence.h |2 +-
cppu/inc/cppu/Shield.hxx |4 ++--
cppu/inc/typelib/typedescription.h | 12 ++--
cppu/inc/uno/any2.h |2 +-
cppu/inc/uno/environment.h |2 +-
cppu/inc/uno/environment.hxx |2 +-
cppu/inc/uno/mapping.hxx |4 ++--
cppuhelper/inc/cppuhelper/access_control.hxx |2 +-
registry/inc/registry/reflread.hxx |5 ++---
registry/inc/registry/reflwrit.hxx |2 +-
registry/inc/registry/registry.h |2 +-
registry/inc/registry/registry.hxx |2 +-
store/inc/store/store.h |2 +-
15 files changed, 25 insertions(+), 26 deletions(-)
New commits:
commit b1073d9fa264139333704f82553ade9979e2ca24
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 21 23:16:31 2012 +0100
WaE: silence some documentation errors
diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h
index f5f2f72..18ef5a5 100644
--- a/cppu/inc/com/sun/star/uno/Any.h
+++ b/cppu/inc/com/sun/star/uno/Any.h
@@ -126,7 +126,7 @@ public:
{ return * reinterpret_cast const Type * ( pType ); }
/** Gets the type of the set value.
-@return the UNacquired type description reference of the set value
+@return the unacquired type description reference of the set value
*/
inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const
SAL_THROW(())
{ return pType; }
@@ -134,7 +134,7 @@ public:
/** Gets the type description of the set value. Provides ownership of the
type description!
Call an explicit typelib_typedescription_release() to release
afterwards.
-@param a pointer to type description pointer
+@param ppTypeDescr a pointer to type description pointer
*/
inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription **
ppTypeDescr ) const SAL_THROW(())
{ ::typelib_typedescriptionreference_getDescription( ppTypeDescr,
pType ); }
diff --git a/cppu/inc/com/sun/star/uno/Reference.h
b/cppu/inc/com/sun/star/uno/Reference.h
index 7e75a65..50c7b77 100644
--- a/cppu/inc/com/sun/star/uno/Reference.h
+++ b/cppu/inc/com/sun/star/uno/Reference.h
@@ -105,14 +105,14 @@ public:
/** Equality operator: compares two interfaces
Checks if both references are null or refer to the same object.
-@param rRef another interface
+@param pInterface another interface
@return true if both references are null or refer to the same object,
false otherwise
*/
inline sal_Bool SAL_CALL operator == ( XInterface * pInterface ) const
SAL_THROW(());
/** Unequality operator: compares two interfaces
Checks if both references are null or refer to the same object.
-@param rRef another interface
+@param pInterface another interface
@return false if both references are null or refer to the same object,
true otherwise
*/
inline sal_Bool SAL_CALL operator != ( XInterface * pInterface ) const
SAL_THROW(());
diff --git a/cppu/inc/com/sun/star/uno/Sequence.h
b/cppu/inc/com/sun/star/uno/Sequence.h
index f12b7c1..380bcb7 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.h
+++ b/cppu/inc/com/sun/star/uno/Sequence.h
@@ -115,7 +115,7 @@ public:
/** Constructor: Creates a copy of given elements.
-@param pElement an array of elements
+@param pElements an array of elements
@param len length of array
*/
inline Sequence( const E * pElements, sal_Int32 len );
diff --git a/cppu/inc/cppu/Shield.hxx b/cppu/inc/cppu/Shield.hxx
index 1e7221a..f425399 100644
--- a/cppu/inc/cppu/Shield.hxx
+++ b/cppu/inc/cppu/Shield.hxx
@@ -67,7 +67,7 @@ namespace cppu
/** Maps an any from the current to the thread-safe Environment, fills the
passed any.
@param any the any to be mapped
-@param the target any
+@param res the target any
@since UDK 3.2.7
*/
inline void shieldAny(cssu::Any const any, cssu::Any * res)
@@ -79,7 +79,7 @@ namespace cppu
/** Maps an any from the thread-safe Environment to the current one, fills
the passed any.
@param any the any to be mapped
-@param the target any
+@param res the target any
@since UDK 3.2.7
*/
inline void unshieldAny(cssu::Any const any, cssu::Any * res)
diff --git a/cppu/inc/typelib/typedescription.h
b/cppu/inc/typelib/typedescription.h
index 6494e7c..783e3ec 100644
--- a/cppu/inc/typelib/typedescription.h
+++ b/cppu/inc/typelib/typedescription.h
@@ -587,7 +587,7 @@ CPPU_DLLPUBLIC void SAL_CALL
typelib_typedescription_newUnion(
@param ppRet inout enum type description
@param pTypeName
[Libreoffice-commits] .: vcl/aqua vcl/source vcl/unx
vcl/aqua/source/app/salinst.cxx|3 ---
vcl/aqua/source/window/salmenu.cxx |2 +-
vcl/source/app/svdata.cxx | 14 --
vcl/source/window/winproc.cxx | 12 ++--
vcl/unx/gtk/window/gtkframe.cxx| 11 ---
5 files changed, 3 insertions(+), 39 deletions(-)
New commits:
commit 936ebcfa4b44a90bdc8789ce7556f1ba3599375c
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Tue Feb 21 13:06:11 2012 +1030
EasyHack fdo#46258 Removal of VCL testtool support (-enableautomation
option)
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index adae096..7a01b0b 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -206,9 +206,6 @@ static void initNSApp()
selector:
@selector(applicationWillResignActive:)
name: @AppleRemoteWillResignActive
object: nil ];
-
-if( ImplGetSVData()-mbIsTestTool )
-[NSApp activateIgnoringOtherApps: YES];
}
sal_Bool ImplSVMainHook( int * pnInit )
diff --git a/vcl/aqua/source/window/salmenu.cxx
b/vcl/aqua/source/window/salmenu.cxx
index 23d0180..f358e47 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -542,7 +542,7 @@ sal_Bool AquaSalMenu::VisibleMenuBar()
static const char *pExperimental = getenv (AQUA_NATIVE_MENUS);
-if ( ImplGetSVData()-mbIsTestTool || (pExperimental
!strcasecmp(pExperimental, FALSE)) )
+if ( pExperimental !strcasecmp(pExperimental, FALSE) )
return sal_False;
// End of experimental code enable/disable part
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 84b2df0..3cd 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -121,20 +121,6 @@ void ImplInitSVData()
pImplSVData-maHelpData.mbAutoHelpId = sal_True;
pImplSVData-maNWFData.maMenuBarHighlightTextColor = Color(
COL_TRANSPARENT );
-// find out whether we are running in the testtool
-// in this case we need some special workarounds
-sal_uInt32 nArgs = osl_getCommandArgCount();
-for( sal_uInt32 i = 0; i nArgs; i++ )
-{
-rtl::OUString aArg;
-osl_getCommandArg( i, aArg.pData );
-if( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( -enableautomation
) ) )
-{
-pImplSVData-mbIsTestTool = true;
-break;
-}
-}
-
// mark default layout border as unitialized
pImplSVData-maAppData.mnDefaultLayoutBorder = -1;
}
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index a306fa5..504b753 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1851,15 +1851,11 @@ static void ImplHandleGetFocus( Window* pWindow )
// do not blink when they receive focus
if ( !pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId )
{
-bool bCallDirect = ImplGetSVData()-mbIsTestTool;
pWindow-ImplGetWindowImpl()-mpFrameData-mbStartFocusState =
!pWindow-ImplGetWindowImpl()-mpFrameData-mbHasFocus;
-if( ! bCallDirect )
-Application::PostUserEvent(
pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId, LINK( pWindow, Window,
ImplAsyncFocusHdl ) );
+Application::PostUserEvent(
pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId, LINK( pWindow, Window,
ImplAsyncFocusHdl ) );
Window* pFocusWin =
pWindow-ImplGetWindowImpl()-mpFrameData-mpFocusWin;
if ( pFocusWin pFocusWin-ImplGetWindowImpl()-mpCursor )
pFocusWin-ImplGetWindowImpl()-mpCursor-ImplShow();
-if( bCallDirect )
-pWindow-ImplAsyncFocusHdl( NULL );
}
}
@@ -1892,19 +1888,15 @@ static void ImplHandleLoseFocus( Window* pWindow )
// execute Focus-Events after a delay, such that SystemChildWindows
// do not flicker when they receive focus
-bool bCallDirect = ImplGetSVData()-mbIsTestTool;
if ( !pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId )
{
pWindow-ImplGetWindowImpl()-mpFrameData-mbStartFocusState =
!pWindow-ImplGetWindowImpl()-mpFrameData-mbHasFocus;
-if( ! bCallDirect )
-Application::PostUserEvent(
pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId, LINK( pWindow, Window,
ImplAsyncFocusHdl ) );
+Application::PostUserEvent(
pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId, LINK( pWindow, Window,
ImplAsyncFocusHdl ) );
}
Window* pFocusWin = pWindow-ImplGetWindowImpl()-mpFrameData-mpFocusWin;
if ( pFocusWin pFocusWin-ImplGetWindowImpl()-mpCursor )
pFocusWin-ImplGetWindowImpl()-mpCursor-ImplHide();
-if( bCallDirect )
-pWindow-ImplAsyncFocusHdl( NULL );
}
// ---
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 7f4db68..7384a73 100644
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source
scp2/source/python/file_python.scp |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit c60d9e048137c9effa2b48acdee72e56a88ec263 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Feb 6 15:51:52 2012 +0100 Revert Mac OS X uses .dylib and not .so for python modules. This reverts commit b53a86a5676d5bcb88ed6e3ac524a3560e713c22. Conflicts: scp2/source/python/file_python.scp I assume that the file *shall* be named .so on Mac OS X after all, and that it actually being named .dylib was a mistake introduced with a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe and reverted with 0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290. Signed-off-by: Thorsten Behrens tbehr...@suse.com diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index cdcd744..194394d 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -284,14 +284,10 @@ End #ifdef UNX +// pyuno.so even on Mac OS X, because it is a python module File gid_File_Pyuno LIB_FILE_BODY; -#ifdef MACOSX -// note: Mac OS X use .dylib, even for python modules -Name = pyuno.dylib; -#else Name = pyuno.so; -#endif Dir = gid_Brand_Dir_Program; Styles = (PACKED); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - cppuhelper/inc sal/inc svx/inc svx/source sw/source unusedcode.easy vcl/aqua vcl/headless vcl/inc vcl/source vcl/unx vcl/win
cppuhelper/inc/cppuhelper/propshlp.hxx |6 +- cppuhelper/inc/cppuhelper/unourl.hxx |4 - sal/inc/osl/pipe_decl.hxx|2 sal/inc/osl/security_decl.hxx|2 sal/inc/osl/semaphor.hxx |2 sal/inc/osl/socket_decl.hxx |6 +- sal/inc/rtl/strbuf.hxx | 18 +++--- sal/inc/rtl/string.hxx |2 sal/inc/rtl/ustring.hxx |2 svx/inc/svx/insctrl.hxx |2 svx/inc/svx/ruler.hxx|1 svx/inc/svx/selctrl.hxx |2 svx/inc/svx/xmlsecctrl.hxx |1 svx/source/dialog/svxruler.cxx | 12 svx/source/stbctrls/insctrl.cxx | 12 svx/source/stbctrls/selctrl.cxx | 20 --- svx/source/stbctrls/xmlsecctrl.cxx |5 - sw/source/core/text/txtfly.cxx | 77 --- sw/source/core/text/txtfly.hxx |8 -- unusedcode.easy |7 -- vcl/aqua/source/gdi/salnativewidgets.cxx | 18 -- vcl/headless/svpinst.cxx | 23 vcl/inc/aqua/salgdi.h|3 - vcl/inc/headless/svpinst.hxx |1 vcl/inc/ios/salgdi.h |3 - vcl/inc/salgdi.hxx | 12 vcl/inc/unx/gtk/gtkgdi.hxx |3 - vcl/inc/win/salgdi.h |3 - vcl/source/gdi/salgdilayout.cxx | 17 - vcl/source/gdi/salnativewidgets-none.cxx | 22 --- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 21 --- vcl/unx/kde/salnativewidgets-kde.cxx | 27 - vcl/unx/kde4/KDESalGraphics.hxx | 12 vcl/win/source/gdi/salnativewidgets-luna.cxx | 22 --- 34 files changed, 22 insertions(+), 356 deletions(-) New commits: commit 22e96521da9614c07b75452dc27014aca079fbf1 Author: Thomas Arnhold tho...@arnhold.org Date: Wed Feb 22 00:50:56 2012 +0100 WaE: silence some documentation errors diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx index 4b01126..1ed2f60 100644 --- a/cppuhelper/inc/cppuhelper/propshlp.hxx +++ b/cppuhelper/inc/cppuhelper/propshlp.hxx @@ -78,7 +78,7 @@ public: is getCount() -1, than it must be an indexed acces to the property array. @param pPropName is an out parameter filled with property name of the property with the handle nHandle. May be NULL. - @param rAttributes is an out parameter filled with attributes of the property with the + @param pAttributes is an out parameter filled with attributes of the property with the handle nHandle. May be NULL. @return True, if the handle exist, otherwise false. */ @@ -160,7 +160,7 @@ public: Otherwise it is a linear search through the array. @param pPropName is an out parameter filled with property name of the property with the handle nHandle. May be NULL. - @param rAttributes is an out parameter filled with attributes of the property with the + @param pAttributes is an out parameter filled with attributes of the property with the handle nHandle. May be NULL. @return True, if the handle exist, otherwise false. */ @@ -274,7 +274,7 @@ public: /** Insert an element in the container specified with the key. The position is not specified. @param rKey the id of the container. - @param rxIFacethe added interface. It is allowed to insert null or + @param r the added interface. It is allowed to insert null or the same pointer more than once. @return the new count of elements in the container. */ diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx index 37801e3..3e3a615 100644 --- a/cppuhelper/inc/cppuhelper/unourl.hxx +++ b/cppuhelper/inc/cppuhelper/unourl.hxx @@ -88,7 +88,7 @@ public: /** Test whether the parameters contain a key. @param -A (case insensitive) key. +rKey A (case insensitive) key. @return True if the parameters contain a matching key/value pair. @@ -98,7 +98,7 @@ public: /** Return the parameter value for a key. @param -A (case insensitive) key. +rKey A (case insensitive) key. @return The (case sensitive) value associated with the given key, or an empty diff --git a/sal/inc/osl/pipe_decl.hxx b/sal/inc/osl/pipe_decl.hxx index b361440..084a61b 100644 --- a/sal/inc/osl/pipe_decl.hxx +++ b/sal/inc/osl/pipe_decl.hxx @@ -185,7 +185,7 @@ public: /**
Has the time come to get rid of the delivering of public headers?
Has the time come to get rid of the delivering step for public headers? I.e. for a header MODULE/BAR.hxx, instead of having it in MODULE/inc/MODULE/BAR.hxx and then copying it to solver/INPATH/inc/MODULE/BAR.hxx as part of the make of MODULE, it could be directly in a new top-level inc directory, in inc/MODULE/BAR.hxx all the time. (Obviously -I$(SRC_ROOT)/inc would have to be added to the compilation flags.) Now with OneGit, there shouldn't be any technical reason not do do this. It would also speed up the build a little bit. Am I missing something, or can I JFDI? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: WaE: add missing sal and cppunit dependencies causing tinderbox failure
On Mon, 2012-02-20 at 21:24 +0100, Stephan Bergmann wrote: On Mon, 2012-02-20 at 17:23 +0100, Stephan Bergmann wrote: WaE: add missing sal and cppunit dependencies causing tinderbox failure ... Yes, as you say - it was for the unit test that was failing to compile without sal / cppunit :-) What puzzled me was the WaE prefix. Ah - I always read 'WaE' as Warnings and Errors ;-) but if you suggest it means Warnings -as- Errors ;-) then that'd be wrong I guess. :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Remove unused methods from PDFI
Hi, On 20 February 2012 11:00, Michael Meeks michael.me...@suse.com wrote: On Sat, 2012-02-18 at 21:18 +, Kate Goss wrote: Quick question - Can anyone point me to list of supported browsers for the bug submission assistant? I don't believe we have one :-) but I would say - whatever makes most sense, ie. forget IE6, and anything else old that causes significant grief complexity ;-) There is little point in doing lots of heavy lifting for ancient browsers with small market share I think. Does that help ? Yes - thanks for that. I'll use that as a rule of thumb. Kate Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
The new global -DHEADLESS should be namespaced surely?
Do we really want to use a generic and potentially clash-prone word like HEADLESS? Isn't the normal software engineering practise to use some package-specific prefix for global C-level identifiers like this? We already have -DLIBO_WERROR to indicate when --enable-werror is in force, and -DLIBO_MERGELIBS for --enable-mergelibs. Thus I suggest using -DLIBO_HEADLESS for this instead. Sure, I know perfectly well that we have since forever a set of short non-namespaced identifiers defined for each compilation. Like -DUNX, -DLINUX, -DWNT, -DPRODUCT etc. But those are mistakes from long back in history, we don't need to repeat it in new development. Ideally we should prefix those old ones too, or get rid of them to the extent possible; for instance many of the OS- or architecture-specific defines presumably can be replaced by compiler-defined predefined macros instead. Like _WIN32 instead of WNT, as both MinGW and MSVC define _WIN32 when compiling for 32- and 64-bit Windows. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: The new global -DHEADLESS should be namespaced surely?
Hello, Il 21/02/2012 09:27, Tor Lillqvist ha scritto: Do we really want to use a generic and potentially clash-prone word like HEADLESS? Isn't the normal software engineering practise to use some package-specific prefix for global C-level identifiers like this? We already have -DLIBO_WERROR to indicate when --enable-werror is in force, and -DLIBO_MERGELIBS for --enable-mergelibs. Thus I suggest using -DLIBO_HEADLESS for this instead. Makes sense to me, will post a patch. thanks -- Riccardo Magliocchetti ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: WaE: add missing sal and cppunit dependencies causing tinderbox failure
On 02/21/2012 09:21 AM, Michael Meeks wrote: On Mon, 2012-02-20 at 21:24 +0100, Stephan Bergmann wrote: On Mon, 2012-02-20 at 17:23 +0100, Stephan Bergmann wrote: WaE: add missing sal and cppunit dependencies causing tinderbox failure ... Yes, as you say - it was for the unit test that was failing to compile without sal / cppunit :-) What puzzled me was the WaE prefix. Ah - I always read 'WaE' as Warnings and Errors ;-) but if you suggest it means Warnings -as- Errors ;-) then that'd be wrong I guess. Yes, I always took it to mean the latter. Anyway, reverted the commit now, as it is obsolete and only addressed the symptoms rather than the cause. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
WaE prefix in git commit comment (was: WaE: add missing sal and cppunit dependencies causing tinderbox failure)
I thinki it was Caolán that started using the WaE: prefix in git commits, and when I asked him what it means indeed it is Warnings are Errors. As I have understood it the intent is that commits that fix warnings (which are treated as errors if --enable-werror is used) use the WaE: prefix. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [EasyHack] #44681 port to CLucene from java/Lucene
Great to hear that it works that it will make it into master :-). Any thoughts on this one: 3) When creating the CLucene FileReader (HelpIndexer.cxx), the path is converted to plain ASCII, that's probably dangerous. There is probably a way to work around this, but I haven't gotten around to it yet. Is that a problem? On 20-02-12, Caolán McNamara caol...@redhat.com wrote: On Sun, 2012-02-19 at 18:49 +0100, Gert van Valkenhoef wrote: Thanks again for the help. Attached a new series of patches (cumulative with the previously sent ones and Caolan's), in which (I think) all the Java invocations have been removed in favor of using the C++ components: Attached is an additional patch to stick together the code to date with internal clucene and the missing link to use the OUString ctor that takes UCS-4 strings. So with this applied additionally you should now be able to type stuff help's search and see a list of results, so vital bit apparently works :-) I'll integrate all of this to master in the next day or two. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Disappearing graphics in Write: where to look (bug 33393)
Hi Cor, all, On 2012-02-20 at 17:11 +0100, Cor Nouws wrote: Having a well formed, and reproducible bug report would be rather useful :-) Yes, I think we realise that :-) Therefore I added some comments on how I can reliably reproduce (more opening the doc and doing some random work for some time, but it will lose the images). However I failed to see any comments from devs that tried to follow my advise and what it did for them ;-p So - I have already spent some 4 hours, or more, trying to fix this one. The Autosave executes nearly the same code path as Save As; but there is something different happening - at some stage, the ID's get invalidated (both during Save As, as well as during Autosave), but in the Save As case, they are re-created, while during the Autosave, they are still the old ones - leading to loss of the images. I dropped the ball at that stage did not find where exactly the ID's are recreated in the Save As case. Should the above ring any bell to someone wants to step in, just set the Autosave to 1 minute, open the document from the bug, and wait one minute; and you'll lose the images :-( Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LibreOffice on Windows
On February 17, 2012 at 11:22 AM Tor Lillqvist t...@iki.fi wrote: Projects like this have to battle the embrace, extend, extinguish philosophy of commercial interests. What makes you think only commercial entities have that philosophy? As far as I know Linux, also embraces and extends POSIX, for instance, and has more or less managed to extinguish quite many competing POSIX operating systems at least in the desktop market space. What makes you think I thought that? Merely mentioning one does not mean I ignore similar aspects in other ventures/projects/etc. I was just being specific due to the context of the conversation. Please try to avoid making assumptions about my thinking, thanks. I'll gladly return the favor. No need IMO to ask that of a person on the list, anyway. I will happily explain my positions in private email. Randall (Randy) Arnold Developer and Enthusiast Advocate http://texrat.net +18177396806___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Changes toward bug #39468
In order to commit and run git diff, I had to fix some trailing whitespace in unrelated files. The only files in the git diff digest which are actually changed are those in core/comphelper. *Completed translation of the core/comphelper directory and subs. -Tom diff --git a/clucene/configs/_clucene-config-generic.h b/clucene/configs/_clucene-config-generic.h index afea55c..e887108 100644 --- a/clucene/configs/_clucene-config-generic.h +++ b/clucene/configs/_clucene-config-generic.h @@ -1,7 +1,7 @@ #ifndef _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H #define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1 - -/* src/shared/CLucene/_clucene-config.h. + +/* src/shared/CLucene/_clucene-config.h. * Generated automatically at end of cmake. * These are internal definitions, and this file does not need to be distributed */ @@ -10,16 +10,16 @@ /* #undef _CL_HAVE_FUNCTION__VSNWPRINTF */ /* #undef _CL_HAVE_FUNCTION__SNWPRINTF */ #define _CL_HAVE_FUNCTION_WCSCASECMP -#define _CL_HAVE_FUNCTION_WCSCAT 1 -#define _CL_HAVE_FUNCTION_WCSCHR 1 -#define _CL_HAVE_FUNCTION_WCSCMP 1 -#define _CL_HAVE_FUNCTION_WCSCPY 1 -#define _CL_HAVE_FUNCTION_WCSCSPN 1 +#define _CL_HAVE_FUNCTION_WCSCAT 1 +#define _CL_HAVE_FUNCTION_WCSCHR 1 +#define _CL_HAVE_FUNCTION_WCSCMP 1 +#define _CL_HAVE_FUNCTION_WCSCPY 1 +#define _CL_HAVE_FUNCTION_WCSCSPN 1 /* #undef _CL_HAVE_FUNCTION_WCSICMP */ -#define _CL_HAVE_FUNCTION_WCSLEN 1 -#define _CL_HAVE_FUNCTION_WCSNCMP 1 -#define _CL_HAVE_FUNCTION_WCSNCPY 1 -#define _CL_HAVE_FUNCTION_WCSSTR 1 +#define _CL_HAVE_FUNCTION_WCSLEN 1 +#define _CL_HAVE_FUNCTION_WCSNCMP 1 +#define _CL_HAVE_FUNCTION_WCSNCPY 1 +#define _CL_HAVE_FUNCTION_WCSSTR 1 #define _CL_HAVE_FUNCTION_WCSTOD 1 #define _CL_HAVE_FUNCTION_WCSDUP 1 #define _CL_HAVE_FUNCTION_WCSTOLL 1 @@ -29,9 +29,9 @@ /* #undef _CL_HAVE_FUNCTION_LLTOA */ /* #undef _CL_HAVE_FUNCTION_LLTOW */ -#define _CL_HAVE_FUNCTION_PRINTF 1 -#define _CL_HAVE_FUNCTION_SNPRINTF 1 -#define _CL_HAVE_FUNCTION_MMAP 1 +#define _CL_HAVE_FUNCTION_PRINTF 1 +#define _CL_HAVE_FUNCTION_SNPRINTF 1 +#define _CL_HAVE_FUNCTION_MMAP 1 /* #undef _CL_HAVE_FUNCTION_STRLWR */ #define _CL_HAVE_FUNCTION_STRTOLL 1 /* #undef _CL_HAVE_FUNCTION_STRUPR */ @@ -80,7 +80,7 @@ /* #undef _CL_HAVE_NO_FLOAT_BYTE */ /* Define if recursive pthread mutexes are available */ -#define _CL_HAVE_PTHREAD_MUTEX_RECURSIVE 1 +#define _CL_HAVE_PTHREAD_MUTEX_RECURSIVE 1 /** define if you would like to force clucene to use the internal * character functions. diff --git a/clucene/configs/clucene-config-generic.h b/clucene/configs/clucene-config-generic.h index 4dc8390..6b985db 100644 --- a/clucene/configs/clucene-config-generic.h +++ b/clucene/configs/clucene-config-generic.h @@ -1,36 +1,36 @@ #ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H #define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 - -/* src/shared/CLucene/clucene-config.h. + +/* src/shared/CLucene/clucene-config.h. * Generated automatically at end of cmake. */ /* CMake will look for these headers: */ #define _CL_HAVE_STRING_H 1 -#define _CL_HAVE_MEMORY_H 1 -#define _CL_HAVE_UNISTD_H 1 +#define _CL_HAVE_MEMORY_H 1 +#define _CL_HAVE_UNISTD_H 1 /* #undef _CL_HAVE_IO_H */ /* #undef _CL_HAVE_DIRECT_H */ -#define _CL_HAVE_DIRENT_H 1 +#define _CL_HAVE_DIRENT_H 1 #define _CL_HAVE_SYS_DIR_H /* #undef _CL_HAVE_SYS_NDIR_H */ -#define _CL_HAVE_ERRNO_H 1 -#define _CL_HAVE_WCHAR_H 1 -#define _CL_HAVE_WCTYPE_H -#define _CL_HAVE_CTYPE_H 1 +#define _CL_HAVE_ERRNO_H 1 +#define _CL_HAVE_WCHAR_H 1 +#define _CL_HAVE_WCTYPE_H +#define _CL_HAVE_CTYPE_H 1 /* #undef _CL_HAVE_WINDOWS_H */ /* #undef _CL_HAVE_WINDEF_H */ -#define _CL_HAVE_SYS_TYPES_H 1 +#define _CL_HAVE_SYS_TYPES_H 1 /* #undef _CL_HAVE_DLFCN_H */ -#define _CL_HAVE_EXT_HASH_MAP 1 +#define _CL_HAVE_EXT_HASH_MAP 1 /* #undef _CL_HAVE_EXT_HASH_SET */ -#define _CL_HAVE_TR1_UNORDERED_MAP 1 -#define _CL_HAVE_TR1_UNORDERED_SET 1 +#define _CL_HAVE_TR1_UNORDERED_MAP 1 +#define _CL_HAVE_TR1_UNORDERED_SET 1 #define _CL_HAVE_HASH_MAP #define _CL_HAVE_HASH_SET /* #undef _CL_HAVE_NDIR_H */ -#define _CL_HAVE_SYS_STAT_H 1 -#define _CL_HAVE_SYS_TIMEB_H 1 +#define _CL_HAVE_SYS_STAT_H 1 +#define _CL_HAVE_SYS_TIMEB_H 1 #define _CL_HAVE_SYS_TIME_H 1 /* #undef _CL_HAVE_TCHAR_H */ #define _CL_HAVE_SYS_MMAN_H 1 @@ -61,7 +61,7 @@ typedef wchar_t TCHAR; /* #undef LUCENE_DISABLE_HASHING */ /* Define if you have POSIX threads libraries and header files. */ -#define _CL_HAVE_PTHREAD 1 +#define _CL_HAVE_PTHREAD 1 /* Define if you have Win32 threads libraries and header files. */ /* #undef _CL_HAVE_WIN32_THREADS */ @@ -79,7 +79,7 @@ typedef wchar_t TCHAR; #define _CL_HASH_SET unordered_set /* define if the compiler implements namespaces */ -#define _CL_HAVE_NAMESPACES +#define _CL_HAVE_NAMESPACES /* Defined if the snprintf overflow test fails */ /* #undef _CL_HAVE_SNPRINTF_BUG */ @@ -101,9 +101,9 @@ typedef wchar_t TCHAR; /* Define to
Re: Building LibreOffice on Windows
We have 233000 lines of makefile code using a mix of dmake and gmake. Good luck converting that to cmake. On 2012-02-20 09:52, Josh Heidenreich wrote: Hi, Okay so it might be nuts, but has anyone tried creating a native VS solution/projects, which ruins inside the ide? Could one be created cmake style perhaps? Josh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License Statement
Hello All All my contributions to LibreOffice are licensed under the terms of the MPL / LGPLv3+. Best Regards Stefan Heinemann -- Web: senseless.codedump.ch Jabber/XMPP: stefa...@jabber.ccc.de signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
MinGW-Port: Problems with UnoUrlResolver
Hello List, I have a working Qt/C++ application connecting to the office using ::cppu::bootstrap(). After porting this application to MinGW, I got a BootstrapException saying unexpected UNO exception caught: component context fails to supply service com.sun.star.bridge.UnoUrlResolver of type com.sun.star.bridge.XUnoUrlResolver. Going down to the basics I compiled the example office_connect.cxx under MinGW and got the error message Couldn't instantiate com.sun.star.bridge.UnoUrlResolver service. I have the feeling that some information is missing, but I don't know how to submit it. All environmental variables known to me don't help. Is there anybody who can give me a hint what I should do? I'm using the MinGW-LibreOffice from the daily-build-service (2012-02-20); the MinGW itself is the cross tool chain from SuSE 12.1. Thanks, Helmar___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: MinGW-Port: Problems with UnoUrlResolver
I'm using the MinGW-LibreOffice from the daily-build-service (2012-02-20); the MinGW itself is the cross tool chain from SuSE 12.1. I *think* it would be better to just use a normal stable (MSVC-built) LibreOffice version, not the experimental MinGW build. I hope it doesn't matter that *your* code is built using MinGW. (But I might be wrong. In that case, try using MSVC instead.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][3-5] fix for fdo#46332, crash while opening xls file
Markus Mohrhard píše v Út 21. 02. 2012 v 03:27 +0100: Hey, this patch ([1]) fixes the crash while opening the test document. The file contains 5 empty categories while we assume that all categories are non empty which results in a crash in chart2/source/tools/ExplicitCategoriesProvider.cxx:364 This patch just skips all empty categories. I checked the file and it looks exactly the same in Excel and I have no idea why the file contains 5 empty categories. I think that this patch is safe and simple and we should push it to 3-5. Looks reasonable, fixes the crash. The document really looks the same in Excel. Well, It uses another style for X-axis labels but it seems to be unrelated = pushed to 3-5 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=065cdf07791b2de4c6ab580084d21d2b5020ca98 Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [REVIEW-3-5] fdo#40665 use CJKAnalyzer for ko, zh-CN, and zh-TW, too
Just marking the thread [PUSHED] :-) On 2012-02-17 at 21:12 +, Michael Meeks wrote: On Fri, 2012-02-17 at 21:49 +0100, Andras Timar wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=7636d37f8f9c53d694c4fe38581f3b495d53670e Caolán suggested this fix in the CLucene thread. I tried it, and indeed, it solved fdo#40665 (free text search did not work in Chinese help). Makes sense, cherry picked to 3-5 :-) Thanks, Michael. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Put HEADLESS definition under LIBO namespace
Hello, tml reminds us that use a generic and potentially clash-prone word like HEADLESS as preprocessor defintion is pretty lame. He suggests to put it under the already used LIBO namespace. To sum it up let's do a s/HEADLESS/LIBO_HEADLESS/g. This has been done manually fixing the occurencies of HEADLESS reported by `git grep HEADLESS`. Please review -- Riccardo Magliocchetti From a21986dca34b43df49f6c5e36543d991934028fb Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Tue, 21 Feb 2012 11:29:42 +0100 Subject: [PATCH] Put HEADLESS definition under LIBO namespace tml reminds us that use a generic and potentially clash-prone word like HEADLESS as preprocessor defintion is pretty lame. He suggests to put it under the already used LIBO namespace. To sum it up let's do a s/HEADLESS/LIBO_HEADLESS/g. --- configure.in |2 +- scp2/source/ooo/common_brand.scp |2 +- scp2/source/ooo/file_library_ooo.scp | 12 ++-- scp2/source/ooo/file_ooo.scp |2 +- scp2/source/ooo/file_resource_ooo.scp |2 +- scp2/source/ooo/module_hidden_ooo.scp |2 +- solenv/gbuild/gbuild.mk |2 +- vcl/inc/svsys.h |2 +- vcl/null/printerinfomanager.cxx |2 +- vcl/unx/generic/plugadapt/salplug.cxx |4 ++-- vcl/unx/generic/printer/ppdparser.cxx |2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in index 0d320e7..303b5c8 100644 --- a/configure.in +++ b/configure.in @@ -8106,7 +8106,7 @@ AC_SUBST(ENABLE_KDE4) ENABLE_HEADLESS= if test x$enable_headless = xyes; then ENABLE_HEADLESS=TRUE -SCPDEFS=$SCPDEFS -DHEADLESS +SCPDEFS=$SCPDEFS -DLIBO_HEADLESS R=headless fi AC_SUBST(ENABLE_HEADLESS) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 301d63d..789f826 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -522,7 +522,7 @@ File gid_Brand_File_Bin_Soffice #endif End -#if defined(UNX) !defined(QUARTZ) !defined(HEADLESS) +#if defined(UNX) !defined(QUARTZ) !defined(LIBO_HEADLESS) File gid_Brand_File_Bin_Spadmin BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5bfe685..59aa150 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -548,7 +548,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) -#ifndef HEADLESS +#ifndef LIBO_HEADLESS #ifndef SYSTEM_CAIRO @@ -934,7 +934,7 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif -#if defined(UNX) ! defined(QUARTZ) ! defined(HEADLESS) +#if defined(UNX) ! defined(QUARTZ) ! defined(LIBO_HEADLESS) File gid_File_Lib_Desktop_Detector Name = LIBNAME(desktop_detector); LIB_FILE_BODY; @@ -1160,7 +1160,7 @@ End STD_LIB_FILE( gid_File_Lib_Sot, sot ) -#if defined(UNX) !defined(QUARTZ) !defined(HEADLESS) +#if defined(UNX) !defined(QUARTZ) !defined(LIBO_HEADLESS) File gid_File_Lib_Spa Name = LIBNAME(spa); @@ -1178,11 +1178,11 @@ File gid_File_Lib_Spell Dir = SCP2_OOO_BIN_DIR; End -#if !defined HEADLESS +#if !defined LIBO_HEADLESS STD_LIB_FILE( gid_File_Lib_Spl, spl) #endif -#if defined UNX !defined MACOSX !defined HEADLESS +#if defined UNX !defined MACOSX !defined LIBO_HEADLESS STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx) #endif @@ -1703,7 +1703,7 @@ File gid_File_Lib_Libcroco End #endif -#if ! defined HEADLESS +#if ! defined LIBO_HEADLESS #if ! defined SYSTEM_PANGO File gid_File_Lib_Libpango LIB_FILE_BODY; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index c181a0f..3fd19c5 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -223,7 +223,7 @@ File gid_File_Bin_Senddoc #endif End -#if defined(UNX) !defined(QUARTZ) !defined(HEADLESS) +#if defined(UNX) !defined(QUARTZ) !defined(LIBO_HEADLESS) File gid_File_Bin_Spadmin_Bin BIN_FILE_BODY; diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 05353f1..2f26dd7 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -76,7 +76,7 @@ STD_RES_FILE( gid_File_Res_Sd, sd ) STD_RES_FILE( gid_File_Res_Sfx, sfx ) -#if defined(UNX) !defined(QUARTZ) !defined(HEADLESS) +#if defined(UNX) !defined(QUARTZ) !defined(LIBO_HEADLESS) STD_RES_FILE( gid_File_Res_Spa, spa ) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 90ec4ea..56365232 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -689,7 +689,7 @@ Module gid_Module_Root_Files_7
Re: MinGW-Port: Problems with UnoUrlResolver
Am Dienstag, 21. Februar 2012, 12:29:58 schrieb Tor Lillqvist: I'm using the MinGW-LibreOffice from the daily-build-service (2012-02-20); the MinGW itself is the cross tool chain from SuSE 12.1. I *think* it would be better to just use a normal stable (MSVC-built) LibreOffice version, not the experimental MinGW build. I hope it doesn't matter that *your* code is built using MinGW. (But I might be wrong. In that case, try using MSVC instead.) --tml I would love to use the MSVC version - however my application is based on some essential MinGW parts, and until now I have not found a way to link my application against the MSVC-DLLs coming with the LibreOffice SDK. But maybe someone can give me a hint... Helmar___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] desktop: Don't call setIniFilename() for LIBO_HEADLESS
Hello,
mmeeks suggests we don't want setIniFilename(), who am i to disagree? :)
For now avoid to catch uno exceptions, will probably change opinion when
i'll see them.
thanks
--
Riccardo Magliocchetti
From a08e56e1d0db3a48cad8c7566370410b6287 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date: Tue, 21 Feb 2012 11:45:00 +0100
Subject: [PATCH] desktop: Don't call setIniFilename() for LIBO_HEADLESS
mmeeks suggests we don't want setIniFilename(), who am i to disagree? :)
---
desktop/source/app/sofficemain.cxx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 5ec3dd4..a6cf30e 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -43,7 +43,7 @@ int SVMain();
extern C int DESKTOP_DLLPUBLIC soffice_main()
{
-#ifdef ANDROID
+#if defined(ANDROID) || defined(LIBO_HEADLESS)
try {
rtl::Bootstrap::setIniFilename(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///assets/program/lofficerc)));
--
1.7.5.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Has the time come to get rid of the delivering of public headers?
Hi Tor, On Tue, 2012-02-21 at 10:02 +0200, Tor Lillqvist wrote: solver/INPATH/inc/MODULE/BAR.hxx as part of the make of MODULE, it could be directly in a new top-level inc directory, in inc/MODULE/BAR.hxx all the time. (Obviously -I$(SRC_ROOT)/inc would have to be added to the compilation flags.) I wonder how bad the alternative of adding -I$S/svx/inc -I$S/vcl/inc etc. etc. is for command-line length ? Now with OneGit, there shouldn't be any technical reason not do do this. It would also speed up the build a little bit. Am I missing something, or can I JFDI? I'd prefer to get the MPL/LGPLv3+ on AL2 re-licensing done first, if possible - it's marginally more unpleasant if lots of files moved around; say a few months' time ? All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED] Put HEADLESS definition under LIBO namespace
Thanks, pushed to master. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: MinGW-Port: Problems with UnoUrlResolver
I would love to use the MSVC version - however my application is based on some essential MinGW parts, and until now I have not found a way to link my application against the MSVC-DLLs coming with the LibreOffice SDK. Hmm, ah, yes silly me, the joys of mixing compilers when using C++ APIs. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Has the time come to get rid of the delivering of public headers?
I wonder how bad the alternative of adding -I$S/svx/inc -I$S/vcl/inc etc. etc. is for command-line length ? Probably not a problem considering that we compile just one file at a time anyway. But might it not be the case that we in some cases (or often even) have non-public headers in MODULE/inc (which are not delivered)? So this might then unintentionally make such headers public. If it matters... say a few months' time ? OK. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH v2] desktop: Don't call setIniFilename() for LIBO_HEADLESS
Il 21/02/2012 11:54, Riccardo Magliocchetti ha scritto:
Hello,
mmeeks suggests we don't want setIniFilename(), who am i to disagree? :)
For now avoid to catch uno exceptions, will probably change opinion when
i'll see them.
thanks
Hey, this time with one that does actually compile.
thanks,
--
Riccardo Magliocchetti
From 9346e7f0edbc8e6b6fe9483b82337e61edeee70a Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date: Tue, 21 Feb 2012 11:45:00 +0100
Subject: [PATCH] desktop: Don't call setIniFilename() for LIBO_HEADLESS
mmeeks suggests we don't want setIniFilename(), who am i to disagree? :)
---
desktop/source/app/sofficemain.cxx |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 5ec3dd4..76562a3 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -43,8 +43,10 @@ int SVMain();
extern C int DESKTOP_DLLPUBLIC soffice_main()
{
-#ifdef ANDROID
+#if defined(ANDROID) || defined(LIBO_HEADLESS)
+#if defined(ANDROID)
try {
+#endif
rtl::Bootstrap::setIniFilename(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///assets/program/lofficerc)));
#endif
--
1.7.5.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] convert svxrtf.hxx in editeng module from table.hxx to std::map
Hi
Thanks, that was just the suggestion I needed! Converted patch to use
boost:ptr_map.
Regards, Noel Grandin
On 2012-02-20 17:17, Ivan Timofeev wrote:
On 20.02.2012 19:12, Noel Grandin wrote:
The error was sourced several levels down in the boost stuff, and the
originating point was everywhere I tried to assign into ptr_map.
I think it had something to with the copyability of the Font class.
Did you try to use 'insert(key, value)' instead of the [] operator?
Ivan
diff --git a/editeng/inc/editeng/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx
index c79f2bd..4d255da 100644
--- a/editeng/inc/editeng/svxrtf.hxx
+++ b/editeng/inc/editeng/svxrtf.hxx
@@ -29,7 +29,6 @@
#ifndef _SVXRTF_HXX
#define _SVXRTF_HXX
-#include tools/table.hxx
#include tools/string.hxx
#include svl/itemset.hxx
#include svtools/parrtf.hxx
@@ -39,6 +38,8 @@
#include deque
#include utility
#include vector
+#include boost/ptr_container/ptr_map.hpp
+
class Font;
class Color;
class Graphic;
@@ -85,8 +86,8 @@ public:
typedef Color* ColorPtr;
typedef std::deque ColorPtr SvxRTFColorTbl;
-DECLARE_TABLE( SvxRTFFontTbl, Font* )
-DECLARE_TABLE( SvxRTFStyleTbl, SvxRTFStyleType* )
+typedef boost::ptr_mapshort, Font SvxRTFFontTbl;
+typedef boost::ptr_mapsal_uInt16, SvxRTFStyleType SvxRTFStyleTbl;
typedef SvxRTFItemStackType* SvxRTFItemStackTypePtr;
SV_DECL_PTRARR_DEL( SvxRTFItemStackList, SvxRTFItemStackTypePtr, 1 )
diff --git a/editeng/source/editeng/eertfpar.cxx
b/editeng/source/editeng/eertfpar.cxx
index d508716..4e7254f 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -371,10 +371,11 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType
rSet )
if ( rSet.StyleNo() pImpEditEngine-GetStyleSheetPool()
pImpEditEngine-GetStatus().DoImportRTFStyleSheets() )
{
-SvxRTFStyleType* pS = GetStyleTbl().Get( rSet.StyleNo() );
-DBG_ASSERT( pS, Template not defined in RTF! );
-if ( pS )
+SvxRTFStyleTbl::iterator it = GetStyleTbl().find( rSet.StyleNo() );
+DBG_ASSERT( it != GetStyleTbl().end(), Template not defined in RTF!
);
+if ( it != GetStyleTbl().end() )
{
+SvxRTFStyleType* pS = it-second;
pImpEditEngine-SetStyleSheet( EditSelection( aStartPaM, aEndPaM
), (SfxStyleSheet*)pImpEditEngine-GetStyleSheetPool()-Find( pS-sName,
SFX_STYLE_FAMILY_ALL ) );
nOutlLevel = pS-nOutlineNo;
}
@@ -433,11 +434,17 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType
rSet )
SvxRTFStyleType* EditRTFParser::FindStyleSheet( const XubString rName )
{
-SvxRTFStyleType* pS = GetStyleTbl().First();
-while ( pS ( pS-sName != rName ) )
-pS = GetStyleTbl().Next();
+SvxRTFStyleTbl aTable = GetStyleTbl();
+SvxRTFStyleTbl::iterator it = aTable.begin();
+while ( it != aTable.end() )
+{
+SvxRTFStyleType* pS = it-second;
+if ( pS-sName == rName )
+return pS;
+++it;
+}
-return pS;
+return NULL;
}
SfxStyleSheet* EditRTFParser::CreateStyleSheet( SvxRTFStyleType* pRTFStyle )
@@ -451,9 +458,13 @@ SfxStyleSheet* EditRTFParser::CreateStyleSheet(
SvxRTFStyleType* pRTFStyle )
String aParent;
if ( pRTFStyle-nBasedOn )
{
-SvxRTFStyleType* pS = GetStyleTbl().Get( pRTFStyle-nBasedOn );
-if ( pS ( pS !=pRTFStyle ) )
-aParent = pS-sName;
+SvxRTFStyleTbl::iterator it = GetStyleTbl().find( pRTFStyle-nBasedOn
);
+if ( it != GetStyleTbl().end())
+{
+SvxRTFStyleType* pS = it-second;
+if ( pS ( pS !=pRTFStyle ) )
+aParent = pS-sName;
+}
}
pStyle = (SfxStyleSheet*) pImpEditEngine-GetStyleSheetPool()-Make(
aName, SFX_STYLE_FAMILY_PARA );
@@ -484,12 +495,10 @@ void EditRTFParser::CreateStyleSheets()
// the SvxRTFParser haa now created the template...
if ( pImpEditEngine-GetStyleSheetPool()
pImpEditEngine-GetStatus().DoImportRTFStyleSheets() )
{
-SvxRTFStyleType* pRTFStyle = GetStyleTbl().First();
-while ( pRTFStyle )
+for (SvxRTFStyleTbl::iterator it = GetStyleTbl().begin(); it !=
GetStyleTbl().end(); ++it)
{
+SvxRTFStyleType* pRTFStyle = it-second;
CreateStyleSheet( pRTFStyle );
-
-pRTFStyle = GetStyleTbl().Next();
}
}
}
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 8b9d93c..165c3c3 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -77,7 +77,6 @@ SvxRTFParser::SvxRTFParser( SfxItemPool rPool, SvStream rIn,
int bReadNewDoc )
: SvRTFParser( rIn, 5 ),
rStrm(rIn),
-aFontTbl( 16, 4 ),
pInsPos( 0 ),
pAttrPool( rPool ),
m_xDocProps( i_xDocProps ),
@@ -119,10 +118,6 @@ SvxRTFParser::~SvxRTFParser()
{
if( !aColorTbl.empty() )
ClearColorTbl();
-if( aFontTbl.Count() )
-
Re: windows / cygwin - unable to start build
Hi Walter On Thu, 2012-02-16 at 11:42 +0100, walter wrote: I have installed the last version of Cygwin: [...] Please see logs AT http://pastebin.com/u/walterLO if gcc -DHAVE_CONFIG_H -I. -I. -I. -I. -I. -I./unix/cygwin -I./unix -I./unix/cygwin/gnu -I./unix/cygwin -I./unix -g -O2 -MT unix/runargv.o -MD -MP -MF $depbase.Tpo -c -o unix/runargv.o unix/runargv.c; \ then mv -f $depbase.Tpo $depbase.Po; else rm -f $depbase.Tpo; exit 1; fi unix/runargv.c:128:23: fatal error: process.h: No such file or directory compilation terminated. make[4]: *** [unix/runargv.o] Error 1 make[4]: Leaving directory `/cygdrive/c/libo/dmake' make[3]: *** [all-recursive] Error 1 I noticed your post when I just now was searching to see if someone else had the same problem ( which I just encountered ). It seems that later versions ( no idea of what versions this relates to ) of cygwin have changed the location ( and content ) of process.h. Please try this temporary solution ( see attached patch ), it will get you over the hump at least. I will try to botch together some fix in dmake to detect and rectify this situation Noel diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c index 4e87862..9fd52c9 100644 --- a/dmake/unix/runargv.c +++ b/dmake/unix/runargv.c @@ -125,7 +125,7 @@ _finished_child(pid, status) [unix/runargv] handles the finished child. If #endif #if __CYGWIN__ ENABLE_SPAWN -# include process.h +# include cygwin/process.h #endif #ifdef __EMX__ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Building with --disable-database-connectivity
Hello, git master (from yesterday) does not compile for me with --disable-database-connectivity, attached a patch that tries to fix the easy stuff. Is it ok to disable the form stuff, is this only base related? Then there is svx faling in tail_build: http://pastebin.com/HbD64M2V Do you think, should i add ifdefery to .[ch]xx or just try to don't build the stuff requiring db? I find --disable-database-connectivity interesting because i'd like to build a base-less libreoffice. thanks -- Riccardo Magliocchetti diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 7faa693..d0490ea 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -29,21 +29,26 @@ $(eval $(call gb_Module_Module,extensions)) $(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_abp \ - AllLangResTarget_bib \ - AllLangResTarget_dbp \ - AllLangResTarget_pcr \ AllLangResTarget_scn \ AllLangResTarget_upd \ Library_abp \ - Library_bib \ - Library_dbp \ Library_log \ - Library_pcr \ Library_res \ Library_scn \ +)) + +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,extensions,\ + AllLangResTarget_bib \ + AllLangResTarget_dbp \ + AllLangResTarget_pcr \ + Library_bib \ + Library_dbp \ + Library_pcr \ Package_bib \ Package_pcr \ )) +endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extensions,\ diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk index 6f14722..15bbbd3 100644 --- a/forms/Module_forms.mk +++ b/forms/Module_forms.mk @@ -26,8 +26,10 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. + $(eval $(call gb_Module_Module,forms)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,forms,\ AllLangResTarget_frm \ Library_frm \ @@ -39,4 +41,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\ JunitTest_forms_complex \ )) +endif + # vim: set noet sw=4 ts=4: ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Disappearing graphics in Write: where to look (bug 33393)
On Tue, 2012-02-21 at 10:36 +0100, Jan Holesovsky wrote: So - I have already spent some 4 hours, or more, trying to fix this one. I spent a little time too ;-) cf. my comments in the bug. IMHO the lifecycle of images is highly non-intuitive there, I have high hopes that Thorsten will find the snafu, ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-5] patch for later cygwins that have a different locaton for process.h
There is a real sucky problem that will especially affect new Windows libreoffice developers, namely *real* early there is a big fat build failure. I came across this as I completely started from scratch creating a build environment [*] ( as I managed to bork my windows xp installation ) Attached is a patch, probably there is a better way to do this but I don't really have a clue about autoconf/configure type stuff and this fix was the easiest for me. It would be great to get this into 3.5 branch and this is what we specifically point windows people to ( on the list and irc anyway ). Note: I didn't attach the generated ( but still under git ) configure a my autoconf is 1.68 and the previous version used to produce configure was 1.62. I guess it's not so bad I shouldn't push to master anyway right? Noel [*] btw this was a great opportunity to check out the instructions at http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies which I found to be spot on. Ok I have some experience building libreoffice on windows and I used the non-free compiler but really I found those instructions quite good and accurate diff --git a/dmake/configure.in b/dmake/configure.in index c196413..d82c889 100755 --- a/dmake/configure.in +++ b/dmake/configure.in @@ -189,7 +189,7 @@ dnl Initialize libtool dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h) +AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h cygwin/process.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c index 4e87862..bd961a7 100644 --- a/dmake/unix/runargv.c +++ b/dmake/unix/runargv.c @@ -125,6 +125,9 @@ _finished_child(pid, status) [unix/runargv] handles the finished child. If #endif #if __CYGWIN__ ENABLE_SPAWN +#if HAVE_CYGWIN_PROCESS_H +# include cygwin/process.h +#else # include process.h #endif ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building with --disable-database-connectivity
Hi Tor, Il 21/02/2012 12:38, Tor Lillqvist ha scritto: git master (from yesterday) does not compile for me with --disable-database-connectivity, It's experimental, don't try to use it. (It's mainly for non-desktop OSes where it probably makes less sense to provide such functionality. And actually I mostly just got tired of seeing the Android and iOS compilations spend long times in connectivity and dbaccess compiling stuff that most probably aren't wanted on those platforms, and thought I would check how simple it would be to bypass it for now.) I share your very same sentiments with my --headless work, no need for db stuff here. So I'd try to find some time to play with this even if it is experimental. thanks -- Riccardo Magliocchetti ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building with --disable-database-connectivity
I share your very same sentiments with my --headless work, no need for db stuff here. So I'd try to find some time to play with this even if it is experimental. OK. But I am just hacking on it so don't try to work on it right now;) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED:3-5] fdo#46163 database form listbox only for VARCHAR
Lionel Elie Mamane píše v Čt 16. 02. 2012 v 13:57 +0100: Just reported and fixed fdo#46163. A list box is a control that is supposed to match two sets of data: An entry in the list content property is matched to the corresponding entry in the list entries property (yeah, that's rather confusing naming...). The list entries entry is shown to the user, but the list content entry is stored in the database. The bug: This matching works only if the column is of type VARCHAR. Even CHAR does not work, and in particular integer types do not work; integer types are a common case: store a reference number in the database, but show the user a nice textual description. To understand how stupid this sounds to the user, note that VARCHAR is the type of variable-length strings and CHAR the type of fixed-length strings, not a single character (unless the length is 1, obviously). Sounds crazy :-) Attached patch 0003-fdo-46163-convert-bound-values-to-bound-column-s-typ.patch makes sure the values are converted to the right type before being compared to the value in the database. Looks sane = pushed http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=b5f33bb8fa14afa17c4694d587215cab4756aa1f Attached patch 0001-ORowSetValue-setTypeKind-correctly-convert-to-C-LOB-.patch avoids a crash under some conditions that can be triggered after application of other patch: instead of assuming the ORowSetValue already contains an Any, construct one if necessary. Note that the other cases already do type conversion nicely, e.g. string to int or 8-bit int to 32-bit int. To be honest, I am not 100% sure that I understand everything. Anyway, the patch does sensible things. I did not find any logical or technical problem. It made my test document working better = I have pushed it to the 3-5 branch: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=b5f33bb8fa14afa17c4694d587215cab4756aa1f BTW: I had troubles to create the test document. The description was not clear. I expected that I will not see the values One,Two,Three,Four at all. I saw them even without the patch. Though, with your patch, the first entry was selected when opened in the non-design view. Also I was able to go through the entries one by one via the forward and back buttons. This does not work without the patch. It might be better if you attach a simple test document instead of describing complex steps how to create it. Anyway, you do great work. Thanks for all your patches. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building with --disable-database-connectivity
Hi Tor, Il 21/02/2012 12:57, Tor Lillqvist ha scritto: I share your very same sentiments with my --headless work, no need for db stuff here. So I'd try to find some time to play with this even if it is experimental. OK. But I am just hacking on it so don't try to work on it right now;) --tml Cool, seen the commit in master, anyway that's what i've done this morning, feel free to reuse it if you want. thanks -- Riccardo Magliocchetti From a18dfb581eac66cc9638d9a810985d1a0991de5e Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Tue, 21 Feb 2012 12:49:09 +0100 Subject: [PATCH] Fix most of the build with --disable-database-connectivity --- extensions/Module_extensions.mk | 17 -- forms/Module_forms.mk |2 + sc/Library_sc.mk|7 ++- svx/Library_svx.mk | 25 + svx/Library_svxcore.mk | 109 -- svx/Package_inc.mk |2 + sw/Library_sw.mk| 21 +--- 7 files changed, 106 insertions(+), 77 deletions(-) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 7faa693..d0490ea 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -29,21 +29,26 @@ $(eval $(call gb_Module_Module,extensions)) $(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_abp \ - AllLangResTarget_bib \ - AllLangResTarget_dbp \ - AllLangResTarget_pcr \ AllLangResTarget_scn \ AllLangResTarget_upd \ Library_abp \ - Library_bib \ - Library_dbp \ Library_log \ - Library_pcr \ Library_res \ Library_scn \ +)) + +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,extensions,\ + AllLangResTarget_bib \ + AllLangResTarget_dbp \ + AllLangResTarget_pcr \ + Library_bib \ + Library_dbp \ + Library_pcr \ Package_bib \ Package_pcr \ )) +endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extensions,\ diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk index 6f14722..4f5e99e 100644 --- a/forms/Module_forms.mk +++ b/forms/Module_forms.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_Module,forms)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,forms,\ AllLangResTarget_frm \ Library_frm \ @@ -38,5 +39,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\ JunitTest_forms_unoapi \ JunitTest_forms_complex \ )) +endif # vim: set noet sw=4 ts=4: diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 351386d..9f27a6e 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -338,7 +338,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/docshell/docsh5 \ sc/source/ui/docshell/docsh6 \ sc/source/ui/docshell/docsh7 \ - sc/source/ui/docshell/docsh8 \ sc/source/ui/docshell/editable \ sc/source/ui/docshell/externalrefmgr \ sc/source/ui/docshell/impex \ @@ -551,6 +550,12 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/view/waitoff \ )) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Library_add_exception_objects,sc,\ + sc/source/ui/docshell/docsh8 \ +)) +endif + $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc)) $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 97db17f..a545c40 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -147,16 +147,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/txenctab \ svx/source/dialog/wrapfield \ svx/source/engine3d/float3d \ -svx/source/fmcomp/dbaobjectex \ -svx/source/form/databaselocationinput \ -svx/source/form/dbcharsethelper \ -svx/source/form/filtnav \ -svx/source/form/fmobjfac \ -svx/source/form/fmPropBrw \ -svx/source/form/fmsrccfg \ -svx/source/form/fmsrcimp \ -svx/source/form/tabwin \ -svx/source/form/tbxform \ svx/source/items/algitem \ svx/source/items/hlnkitem \ svx/source/items/numfmtsh \ @@ -213,6 +203,21 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/unogallery/unogalthemeprovider \ )) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Library_use_external,svx,icuuc)) +svx/source/fmcomp/dbaobjectex \ +svx/source/form/databaselocationinput \ +svx/source/form/dbcharsethelper \ +svx/source/form/filtnav \ +svx/source/form/fmobjfac \ +svx/source/form/fmPropBrw \ +svx/source/form/fmsrccfg \ +svx/source/form/fmsrcimp \ +svx/source/form/tabwin \ +svx/source/form/tbxform \ +)) +endif + ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportunx \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 508622f..a4e6424 100644 --- a/svx/Library_svxcore.mk
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #192 from Timur gti...@gmail.com 2012-02-21 05:13:53 PST --- @ Orwel, Michael Meeks: There is already a bug for Advanced printing capabilities of comments in Writer [PRINTING] at https://bugs.freedesktop.org/show_bug.cgi?id=36815. It's one of my favorites. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
[NAK] Re: [REVIEW 3-5] fdo#39006 Layout loop fixed
On 08/02/12 20:40, Cedric Bosdonnat wrote: Hi all, I just fixed a nasty layout loop. Could someone review and cherry-pick this commit to 3-5 branch? http://cgit.freedesktop.org/libreoffice/core/commit/?id=2a22e664811e10ca58ec66ba8fd10b1a6185c178 FYI, I tested the change also with the bug report mentioned in the removed comment... I really have the impression that forcing to restart the layout from a destructor is useless/silly. hi Cedric, unfortunately it seems that there are actually documents where the branch that you removed changes the layout; i've listed some that i've found in the bug. thus i think it's not a good idea to put the fix into 3.5, it doesn't seem to be a regression anyway... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED:3-5] fdo#46163 database form listbox only for VARCHAR
On Tue, Feb 21, 2012 at 01:03:09PM +0100, Petr Mladek wrote:
Lionel Elie Mamane píše v Čt 16. 02. 2012 v 13:57 +0100:
Just reported and fixed fdo#46163. A list box is a control that is
supposed to match two sets of data:
An entry in the list content property is matched to the
corresponding entry in the list entries property (yeah, that's
rather confusing naming...). The list entries entry is shown to the
user, but the list content entry is stored in the database.
Attached patch
0003-fdo-46163-convert-bound-values-to-bound-column-s-typ.patch
makes sure the values are converted to the right type before being
compared to the value in the database.
Looks sane = pushed
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=b5f33bb8fa14afa17c4694d587215cab4756aa1f
Attached patch
0001-ORowSetValue-setTypeKind-correctly-convert-to-C-LOB-.patch
avoids a crash under some conditions that can be triggered after
application of other patch: instead of assuming the ORowSetValue
already contains an Any, construct one if necessary. Note that the
other cases already do type conversion nicely, e.g. string to int or
8-bit int to 32-bit int.
To be honest, I am not 100% sure that I understand everything.
ORowSetValue is used to store in-memory a database value, as a
tagged union (a struct of an union (m_aValue) and a int field
(m_eTypeKind) whose value says which member of the union to use), plus
some other information. Some types are stored directly in the union,
but others are allocated dynamically and a pointer to it is stored in
m_aValue.m_pValue. Of these types, some are stored as (a pointer to) a
::com::sun::star::uno::Any.
It is also used for the list content entries of a listbox, with type
tag VARCHAR (strings).
Now, 0003-fdo-46163-convert-bound-values-to-bound-column-s-typ.patch
introduces a conversion from these strings to the datatype of the
underlying column, e.g. INTEGER (32bit integer), by calling
setTypeKind(INTEGER). In this case, setTypeKind in turn calls
geInt32(), which calls ::rtl::OUString::toInt32, i.e. parses the
string as a number in base 10.
Now, if the column is of type CLOB instead? setTypeKind(CLOB) is
called, which used to call getAny():
::com::sun::star::uno::Any getAny() const {
return*(::com::sun::star::uno::Any*)m_aValue.m_pValue; }
But in this case, m_aValue.m_pValue contains an OUString, not an Any,
so this leads to a crash or garbage data.
This patch changes it to calling makeAny() instead of getAny(), which
will cleanly do:
Any rValue
OSL_ENSURE(m_aValue.m_pString,Value is null!);
rValue = (::rtl::OUString)m_aValue.m_pString;
return rValue;
That is, sticking the OUString in an Any, which setTypeKind will then
assign (via operator=(const Any)) to a newly allocated Any and stick
the pointer to that in m_pValue.
Anyway, the patch does sensible things. I did not find any logical
or technical problem. It made my test document working better = I
have pushed it to
the 3-5 branch:
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=b5f33bb8fa14afa17c4694d587215cab4756aa1f
Great, thanks.
It might be better if you attach a simple test document instead of
describing complex steps how to create it.
Yes, good point. I will in future.
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Timur gti...@gmail.com changed: What|Removed |Added Depends on||39006 --- Comment #193 from Timur gti...@gmail.com 2012-02-21 05:33:21 PST --- I don't know why https://bugs.freedesktop.org/show_bug.cgi?id=39006 was not here, but now, it is: FILEOPEN: LibreOffice hangs with 100% CPU usage on specific .doc file. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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: [PATCH][PUSHED] LibreOffice 3.6.0alpha built on clang
Julien, On pc Debian x86-64, I've got this kind of errors : /home/julien/compile- libreoffice/libo/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx:51:23: error: ISO C++ forbids declaration of 'typeof' with no type [-fpermissive] Could you try this patch and see if it fixes the error? It was an issue with gcc not recognising typeof, but __typeof__. I tested it on both gcc and clang this time. Regards, Wei Ming 0001-Connectivity-use-__typeof__-instead-of-NS_STDCALL_PR.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Building with --disable-database-connectivity
Hmm, I am not sure. I still think it might be too early to start trying to use --disable-database-connectivity for normal OSes. (Even if building for headless). But what the heck, pushed it anyway, with a slight modification: instead of introducing conditionals in Library_sc.mk to bypass just one source file, I bypass its contents with #ifndef DISABLE_DBCONNECTIVITY. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][PUSHED] LibreOffice 3.6.0alpha built on clang
On 02/21/2012 02:36 PM, Khoo Wei Ming wrote: On pc Debian x86-64, I've got this kind of errors : /home/julien/compile- libreoffice/libo/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx:51:23: error: ISO C++ forbids declaration of 'typeof' with no type [-fpermissive] Could you try this patch and see if it fixes the error? It was an issue with gcc not recognising typeof, but __typeof__. I tested it on both gcc and clang this time. Ah, I already fixed that problem on master this morning. Please see there. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||43932 --- Comment #194 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-02-21 05:44:37 PST --- Add Bug 43932 - PRINTING: Paper tray setting not accepted from File - Print..., broken important basic function. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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: [PUSHED] Building with --disable-database-connectivity
Hi Tor, Il 21/02/2012 14:38, Tor Lillqvist ha scritto: Hmm, I am not sure. I still think it might be too early to start trying to use --disable-database-connectivity for normal OSes. (Even if building for headless). But what the heck, pushed it anyway, with a slight modification: instead of introducing conditionals in Library_sc.mk to bypass just one source file, I bypass its contents with #ifndef DISABLE_DBCONNECTIVITY. Cool! thanks a lot! Will rebase my stuff on top of master and see if i can proceed further. -- Riccardo Magliocchetti ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] headless: more work in vcl
Hello,
provide HeadlessSalSystem::ShowNativeDialog() instead of having
it if-zeroed.
Then remove LIBO_HEADLESS ifdefery from
unx/generic/plugadapt/salplug.cxx which we are not building anymore.
Please review
--
Riccardo Magliocchetti
From dbf94f72ab9bcf472e59daf4229ade6eb9f5d584 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date: Tue, 21 Feb 2012 14:55:10 +0100
Subject: [PATCH] headless: more work in vcl
Provide HeadlessSalSystem::ShowNativeDialog() instead of having
it if-zeroed.
Then remove LIBO_HEADLESS ifdefery from unx/generic/plugadapt/salplug.cxx
which we are not building anymore.
---
vcl/headless/headlessinst.cxx |8 +++-
vcl/unx/generic/plugadapt/salplug.cxx |4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index bde892f..439de86 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -49,22 +49,20 @@ HeadlessSalInstance::~HeadlessSalInstance()
}
class HeadlessSalSystem : public SvpSalSystem {
-#if 0
public:
-AndroidSalSystem() : SvpSalSystem() {}
-virtual ~AndroidSalSystem() {}
+HeadlessSalSystem() : SvpSalSystem() {}
+virtual ~HeadlessSalSystem() {}
virtual int ShowNativeDialog( const rtl::OUString rTitle,
const rtl::OUString rMessage,
const std::list rtl::OUString rButtons,
int nDefButton )
{
(void)rButtons; (void)nDefButton;
-__android_log_print(ANDROID_LOG_INFO, LibreOffice - dialog '%s': '%s',
+::fprintf(stdout, LibreOffice - dialog '%s': '%s',
rtl::OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
rtl::OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
return 0;
}
-#endif
};
SalSystem *HeadlessSalInstance::CreateSalSystem()
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 1ce60de..1d9a5ba 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -53,7 +53,7 @@ static oslModule pCloseModule = NULL;
static SalInstance* tryInstance( const OUString rModuleBase, bool bForce = false )
{
SalInstance* pInst = NULL;
-#if !defined(ANDROID) || !defined(LIBO_HEADLESS)
+#if !defined(ANDROID)
// Disable gtk3 plugin load except in experimental mode for now.
if( !bForce
rModuleBase.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( gtk3 ) )
@@ -129,7 +129,7 @@ static SalInstance* tryInstance( const OUString rModuleBase, bool bForce = fals
return pInst;
}
-#if !defined(ANDROID) || !defined(LIBO_HEADLESS)
+#if !defined(ANDROID)
static DesktopType get_desktop_environment()
{
--
1.7.5.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] x11 / cairo-less build try #3
Hello Michael, first of all thanks for pushing the stuff to master :) Il 17/02/2012 17:52, Michael Meeks ha scritto: Fair enough. I suspect that for the native-dialog implementation in headlessinst.cxx we want to go for an fprintf with some parse-able syntax to the console, and then return. The salplug changes probably are not needed anymore, the #if 0 in tests are asserts that does not look regressions i've introduced. Ah yes - quite right; it'd be nice if you can revert them in your next patch. patch sent to the list Now that everything builds at runtime it fails at runtime, looking around cli_ure/source/climaker/climaker_app.cxx:476 does not show something obvious, any hint? Um; cli_ure shouldn't fail - it is some random mono / .net stuff that shouldn't be on the startup path. $ ./soffice.bin terminate called after throwing an instance of 'com::sun::star::loader::CannotActivateFactoryException' Aborted (core dumped) ... Nice - IMHO this is all a bit silly - the 'main' has no wrapper 'catch' around it, so if we get an un-caught exception we bomb out in a very unpleasant way for no particularly good reason. If you poke at desktop/source/app/sofficemain.cxx you'll see some #ifdef ANDROID-ness that adds a try / catch around 'main'. In theory there is an unoexceptionwrapper that can be put around this stuff with some magic, but ... I'll try to dig a bit more before poking the list again :) Hopefully that'll show you which shared library or random other component registration that you're missing [ though you really don't want the setIniFilename piece there ]. done in git master thanks a lot -- Riccardo Magliocchetti ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED:3-5] SQL parser bugs
Lionel Elie Mamane píše v Pá 17. 02. 2012 v 07:35 +0100: Attached patches fix two SQL parser bugs: fdo#46206 - SQL: INSERT accepts only VALUES, not arbitrary SELECT query fdo#46198 - SQL: NULL not accepted in place of column name in SELECT statement I was not able to test it easily. If I understand it correctly, it accepts some more SQL expressions to be passed to the SQL engine. The change looks reasonable = pushed to the 3-5 branch: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=3a61c9f1c51893b242ccf5bb20163b72721a2bf0 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=02dc763291630f7cb4cd9342e8937f3abb92dbc2 (And might gain us a LibO user as a transferee from OpenOffice, see http://stackoverflow.com/questions/4770466/sql-dialect-in-openoffice-base) Great to see this. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW] add test case for old password algorithm, fdo#45171
Hey,
normally I would not ask if we could add a test case to the 3-5 branch
but fdo#45171 seems to be a distro build problem and I hope that we
can prevent this problem in the 3-5 branch with this test case. If the
maintainer is executing subsequenttest after the build he will
immediately know if his build suffers from the same symptom and can
decide if he will investigate it or if he is happy with it.
The patch is safe and just uses a different file, but the idea is the
same as with the old testPassword case.
Regards,
Markus
From e3fc0e94f6244e8e5f8ac026ad18184f4f274d8b Mon Sep 17 00:00:00 2001
From: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue, 21 Feb 2012 15:12:51 +0100
Subject: [PATCH] add test case for old password algorithm, related fdo#45171
---
sc/qa/unit/subsequent_filters-test.cxx | 22 ++
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 9916584..101b981 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -171,7 +171,8 @@ public:
void testBugFixesXLSX();
//misc tests unrelated to the import filters
-void testPassword();
+void testPasswordNew();
+void testPasswordOld();
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testRangeName);
@@ -185,7 +186,8 @@ public:
//disable testPassword on MacOSX due to problems with libsqlite3
//also crashes on DragonFly due to problems with nss/nspr headers
#if !defined(MACOSX) !defined(DRAGONFLY)
-CPPUNIT_TEST(testPassword);
+CPPUNIT_TEST(testPasswordNew);
+CPPUNIT_TEST(testPasswordOld);
#endif
#if TEST_BUG_FILES
@@ -196,6 +198,7 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
+void testPassword_Impl(const rtl::OUString aFileNameBase);
uno::Referenceuno::XInterface m_xCalcComponent;
::rtl::OUString m_aBaseString;
};
@@ -544,9 +547,8 @@ void ScFiltersTest::testBugFixesXLSX()
xDocSh-DoClose();
}
-void ScFiltersTest::testPassword()
+void ScFiltersTest::testPassword_Impl(const rtl::OUString aFileNameBase)
{
-const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(password.));
rtl::OUString aFileExtension(aFileFormats[0].pName, strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
rtl::OUString aFilterName(aFileFormats[0].pFilterName, strlen(aFileFormats[0].pFilterName), RTL_TEXTENCODING_UTF8) ;
rtl::OUString aFileName;
@@ -579,6 +581,18 @@ void ScFiltersTest::testPassword()
xDocSh-DoClose();
}
+void ScFiltersTest::testPasswordNew()
+{
+const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(password.));
+testPassword_Impl(aFileNameBase);
+}
+
+void ScFiltersTest::testPasswordOld()
+{
+const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(passwordOld.));
+testPassword_Impl(aFileNameBase);
+}
+
ScFiltersTest::ScFiltersTest()
: m_aBaseString(RTL_CONSTASCII_USTRINGPARAM(/sc/qa/unit/data))
{
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Has the time come to get rid of the delivering of public headers?
Hi Tor, On Tuesday, 2012-02-21 10:02:50 +0200, Tor Lillqvist wrote: Has the time come to get rid of the delivering step for public headers? I.e. for a header MODULE/BAR.hxx, instead of having it in MODULE/inc/MODULE/BAR.hxx and then copying it to solver/INPATH/inc/MODULE/BAR.hxx as part of the make of MODULE, it could be directly in a new top-level inc directory, in inc/MODULE/BAR.hxx all the time. (Obviously -I$(SRC_ROOT)/inc would have to be added to the compilation flags.) I see no technical reason against it, but I wouldn't like it because then the headers belonging to a module wouldn't be located in the module anymore. Actions performed on a module would need to take that additional inc path into account, for example grep, module local tags and ID databases, and maybe more. Doxygen? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpbCS9x95UCH.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Has the time come to get rid of the delivering of public headers?
Maybe we need a new directory for exported header files. $MODULE/exported Well, isn't that what $MODULE/inc is *supposed* to be? Are there many cases where also private headers (which don't get delivered) are in $MODULE/inc ? I honestly don't know; on one hand I am a pessimist and assume there are, but on the other hand I don't want to be pessimistic... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: UI question regarding SfxToolBoxControls
Hi there, On Tue, 2012-02-21 at 08:52 +0100, Winfried Donkers wrote: Presently, the last used colour is stored within the control (mLastColor) and in the shell (e.g. ScFormatShell, SwTextShell) where the execute function is. Riight - that doesn't seem so optimal :-) I would like to obtain the last used colour from the control when the execute function is called. When a user wants to use the last used colour, the execute funtion is called with the SlotId, but without other arguments. OK - makes sense. So presumably we could add arguments to the SfxRequest that gets passed in there with the last color selected ? Does anyone know if and how the control can be addressed from the execute function (with the SlotId as key)? I can then add a simple GetLastColor() method to the control and remove all redundant lastusedColor stuff within the shell. Might it not be better to pass the color into the code via the SfxRequest's Attrs ? #0 ScFormatShell::ExecuteAttr (this=0x8ace6e0, rReq=...) at /data/opt/libreoffice/master/sc/source/ui/view/formatsh.cxx:1421 #1 0xae7aadb0 in SfxStubScFormatShellExecuteAttr (pShell=0x8ace6e0, rReq=...) at /data/opt/libreoffice/master/workdir/unxlngi6.pro/SdiTarget/sc/sdi/scslots.hxx:5469 #2 0xb683094b in ?? () from /data/opt/OOInstall/program/libmergedlo.so #3 0xb682bb25 in ?? () from /data/opt/OOInstall/program/libmergedlo.so #4 0xb6840e12 in ?? () from /data/opt/OOInstall/program/libmergedlo.so #5 0xb68413ef in ?? () from /data/opt/OOInstall/program/libmergedlo.so #6 0xb693da13 in SfxToolBoxControl::Dispatch(rtl::OUString const, com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue) () from /data/opt/OOInstall/program/libmergedlo.so #7 0xb6e6caa1 in SvxFontColorExtToolBoxControl::Select(unsigned char) () from /data/opt/OOInstall/program/libmergedlo.so #8 0xb693b6a8 in SfxToolBoxControl::Select(unsigned short) () from /data/opt/OOInstall/program/libmergedlo.so Looks like you could add svx/source/tbxctrls/tbcontrl.cxx some magic into the SfxToolboxControl::Dispatch's arguments, though I suspect you'd need to tweak the scslots.sdi file for that ID as well - it's not a piece I'm horribly familiar with, but hopefully tracing through another id that passes more parameters might do. Does that help ? :-) hopefully having got one done, the rest will follow ... Thanks for tackling this! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo44611 writer paragraph background color picker with split button
On Mon, 2012-02-20 at 17:45 +0100, Winfried Donkers wrote: Attached patch addresses the first fix for fdo45671, the rest will follow one by one. Nice :-) This patch is a bit more elaborate than I expect the rest to be as I prepared the code for the patches to follow, i.e. for the split buttons that I will be adding. Fair enough. I have renamed class SvxFontColorExtToolBoxControl to SvxColorExtToolBoxControl as the class now handles not only font and font background, but also cell background and paragraph background ( and will handle borders too, I think). The working principle is the same as used for fdo34425. Looks good to me, of course hopefully we can improve the color issue you identified in your other mail, but it's a good start. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-5] patch for later cygwins that have a different locaton for process.h
On 21/02/12 11:50, Noel Power wrote: There is a real sucky problem that will especially affect new Windows libreoffice developers, namely *real* early there is a big fat build failure. I came across this as I completely started from scratch creating a build environment [*] ( as I managed to bork my windows xp installation ) Attached is a patch, probably there is a better way to do this but I don't really have a clue about autoconf/configure type stuff and this fix was the easiest for me. It would be great to get this into 3.5 branch and this is what we specifically point windows people to ( on the list and irc anyway ). Note: I didn't attach the generated ( but still under git ) configure a my autoconf is 1.68 and the previous version used to produce configure was 1.62. I guess it's not so bad I shouldn't push to master anyway right? Noel [*] btw this was a great opportunity to check out the instructions at http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies which I found to be spot on. Ok I have some experience building libreoffice on windows and I used the non-free compiler but really I found those instructions quite good and accurate ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice oops, seems I deleted a line sometime between compiling and generating the patch Noel diff --git a/dmake/configure.in b/dmake/configure.in index c196413..d82c889 100755 --- a/dmake/configure.in +++ b/dmake/configure.in @@ -189,7 +189,7 @@ dnl Initialize libtool dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h) +AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h cygwin/process.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c index 4e87862..cc78560 100644 --- a/dmake/unix/runargv.c +++ b/dmake/unix/runargv.c @@ -125,8 +125,12 @@ _finished_child(pid, status) [unix/runargv] handles the finished child. If #endif #if __CYGWIN__ ENABLE_SPAWN +#if HAVE_CYGWIN_PROCESS_H +# include cygwin/process.h +#else # include process.h #endif +#endif #ifdef __EMX__ # include process.h ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] headless: more work in vcl
On Tue, 2012-02-21 at 15:00 +0100, Riccardo Magliocchetti wrote: provide HeadlessSalSystem::ShowNativeDialog() instead of having it if-zeroed. Pushed - good to see that cleaned up :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] x11 / cairo-less build try #3
On Mon, 2012-02-20 at 09:21 +0100, Stephan Bergmann wrote: Nice - IMHO this is all a bit silly - the 'main' has no wrapper 'catch' around it, so if we get an un-caught exception we bomb out in a very unpleasant way for no particularly good reason. ... Stephan - is there a reason why we would not catch and print something helpful (a native dialog?) on unhandled exceptions around master ? ... In my experience, such exceptions typically indicate a programming error (either in actual program code, or in the way the bits of the program are combined into an installation set). And for programmers, it is often more helpful to see the direct consequences of such error than some helpful mediation on LO's part (like the infamous The user language cannot be determined message, typically caused by some problem that has zero to do with any locale data, only leading devs to start searching in the wrong direction). Haha :-) indeed, however a pathalogical, silent abort, without even an auto-save, or any message from the exception is rather unfortunate too ;-) So - what would the dis-advantages be of having an un-conditional catch wrapper around main that builds a useful string from the exception's contents (which while English, is usually more useful than an unexplained failure) ? Of course, we wouldn't necessarily need a native dialog for that - but from a bug reporting perspective - a bug with -some- pointers is more useful than a bland it fails to launch thing, presumably. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translated german comments in sw/source/core/layout/
Started from the other end, patch 22 and 21 are pushed to master. Nice! Attached are my reviewed patches (don't have commit access :-( ). It's my first review, hopefully I did everything right. I also replaced the bits that seemed like too literal translation with. And an extra kudos for translating spaltiger Bereichsfrischling. That's just unfathomable to me ^^. Just asking: Is there a specific reason to highlight negations with capital letters (e.g. NOT)? Cheers, Philipp 0001-Translated-german-code-comments-to-english.patch Description: Binary data 0002-Correct-some-spelling-errors-and-trailing-whitespace.patch Description: Binary data 0003-Translated-german-code-comments-to-english.patch Description: Binary data 0004-flylay-german-comments-translated.patch Description: Binary data 0005-Correct-spelling-and-fix-trailing-whitespace.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
R: [REVIEW 3-5] patch for later cygwins that have a different location for process.h
Hi, read this before apply the patch, file moved back (?) http://www.mail-archive.com/cygwin@cygwin.com/msg120501.html http://www.mail-archive.com/cygwin@cygwin.com/msg120501.html Best, walter Da: libreoffice-bounces+w.guerrieri=ranocchilab@lists.freedesktop.org [mailto:libreoffice-bounces+w.guerrieri=ranocchilab@lists.freedesktop.or g] Per conto di Noel Power Inviato: martedì 21 febbraio 2012 16:00 A: noel.po...@suse.com Cc: LibreOffice dev Oggetto: Re: [REVIEW 3-5] patch for later cygwins that have a different locaton for process.h On 21/02/12 11:50, Noel Power wrote: There is a real sucky problem that will especially affect new Windows libreoffice developers, namely *real* early there is a big fat build failure. I came across this as I completely started from scratch creating a build environment [*] ( as I managed to bork my windows xp installation ) Attached is a patch, probably there is a better way to do this but I don't really have a clue about autoconf/configure type stuff and this fix was the easiest for me. It would be great to get this into 3.5 branch and this is what we specifically point windows people to ( on the list and irc anyway ). Note: I didn't attach the generated ( but still under git ) configure a my autoconf is 1.68 and the previous version used to produce configure was 1.62. I guess it's not so bad I shouldn't push to master anyway right? Noel [*] btw this was a great opportunity to check out the instructions at http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies which I found to be spot on. Ok I have some experience building libreoffice on windows and I used the non-free compiler but really I found those instructions quite good and accurate ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice oops, seems I deleted a line sometime between compiling and generating the patch Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Has the time come to get rid of the delivering of public headers?
On 21/02/12 15:41, Tor Lillqvist wrote: Maybe we need a new directory for exported header files. $MODULE/exported Well, isn't that what $MODULE/inc is *supposed* to be? Are there many cases where also private headers (which don't get delivered) are in $MODULE/inc ? I honestly don't know; on one hand I am a pessimist and assume there are, but on the other hand I don't want to be pessimistic... currently the prevailing pattern is that $MODULE/inc/$MODULE contains the public headers, while headers directly in $MODULE/inc are private to the module. (in modules that still use deliver it's even worse and sometimes a complete mess...) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED 3-5] patch for later cygwins that have a different locaton for process.h
On Tue, 2012-02-21 at 11:50 +, Noel Power wrote: There is a real sucky problem that will especially affect new Windows libreoffice developers, namely *real* early there is a big fat build failure. Cool - thanks for fixing this :-) Note: I didn't attach the generated ( but still under git ) configure a my autoconf is 1.68 and the previous version used to produce configure was 1.62. I guess it's not so bad I shouldn't push to master anyway right? Easier to push to master then cherry-pick, but since I pushed to -3-5 perhaps you could pick the other way around ;-) [*] btw this was a great opportunity to check out the instructions at http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies which I found to be spot on. Good news; perhaps our pessimism about windows building is slowly becoming an anachronism (with your nice patch anyhow ;-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: MinGW-Port: Problems with UnoUrlResolver
Hi Helmar,
On Tue, 2012-02-21 at 11:53 +0100, Helmar Spangenberg wrote:
I would love to use the MSVC version - however my application is based
on some essential MinGW parts, and until now I have not found a way to
link my application against the MSVC-DLLs coming with the LibreOffice
SDK.
Ho hum; so - in -theory- ;-) the SAL APIs are all in-line C++ wrappers
around a native STDCALL C API (for libsal), so assuming you use just the
sal/ code it could ('in theory') with my limited understanding of these
things, etc. etc. work. But I'm clearly an optimist ;-)
What were your linking errors ?
Failing that, I forget if the MINGW cross-compile works well and runs
even without UNO remote-control in the picture :-) did you find the
snapshots worked adequately on Windows ? Then of course, to go deeper
I'd try running the uno bridge tests (which lurk somewhere) on that
version to be reasonably sure that UNO is working well.
Sorry it's a bit of a pain ...
HTH,
Michael.
--
michael.me...@suse.com , Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translated german comments in sw/source/core/layout/
On 21/02/12 16:09, Philipp Weissenbacher wrote: Started from the other end, patch 22 and 21 are pushed to master. Nice! Attached are my reviewed patches (don't have commit access :-( ). It's my first review, hopefully I did everything right. I also replaced the bits that seemed like too literal translation with. And an extra kudos for translating spaltiger Bereichsfrischling. That's just unfathomable to me ^^. Yeah, there were quite a few interesting words around :) Just asking: Is there a specific reason to highlight negations with capital letters (e.g. NOT)? Not really. It is mainly a habit of mine because I sometimes overread such things when tired or in a hurry and thus interpret them totally wrong. You may of course use normal case if you think it's better that way :) -- Dave -- Adfinis SyGroup AG David Vogt, Software Engineer / Project Manager Keltenstrasse 98 | CH-3018 Bern Tel. 031 381 70 47 | Direct 031 550 31 12 signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add basegfx::fround to unittest (was: basegfx::fround and friends seems needed in windows build)
On Tue, 2012-02-21 at 21:24 +0700, Korrawit Pruegsanusak wrote: Now I attach a patch for reviewing. Lovely - pushed it :-) OK, I have to confess that I've shamelessly copy-n'-pasted the whole things from the adjacent ones, and made some modifications on top of it. There is a certain amount of copy/paste that is sadly necessary to use cppunit - some of it is hidden by macros at least - I dropped all the empty setup/teardown methods in there in a subsequent commit though. If it's ok, I could push it to master. Drat, I just did that for you :-) Thanks again, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translated german comments in sw/source/core/layout/
Just asking: Is there a specific reason to highlight negations with capital letters (e.g. NOT)? Not really. It is mainly a habit of mine because I sometimes overread such things when tired or in a hurry and thus interpret them totally wrong. You may of course use normal case if you think it's better that way :) No, no, I like that! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Translated german comments in sw/source/core/layout/
Hi Philipp, First - thanks for helping with the patch review load, that's much appreciated. On Tue, 2012-02-21 at 16:09 +0100, Philipp Weissenbacher wrote: Attached are my reviewed patches (don't have commit access :-( ). Can you create a bug following this flow: http://www.freedesktop.org/wiki/AccountRequests And mail me the bug# and we'll get you setup :-) David - I guess you'll prolly want to git format-patch -50 HEAD any of your work you want to keep, rewind your master: git reset --hard HEAD~50 and then git pull -r before re-applying anything you have locally :-) otherwise the changes may twist up the git pull -r rebase. Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-5] patch for later cygwins that have a different locaton for process.h
Michael Meeks píše v Út 21. 02. 2012 v 15:12 +: On Tue, 2012-02-21 at 11:50 +, Noel Power wrote: There is a real sucky problem that will especially affect new Windows libreoffice developers, namely *real* early there is a big fat build failure. Cool - thanks for fixing this :-) Note: I didn't attach the generated ( but still under git ) configure a my autoconf is 1.68 and the previous version used to produce configure was 1.62. I guess it's not so bad I shouldn't push to master anyway right? Easier to push to master then cherry-pick, but since I pushed to -3-5 perhaps you could pick the other way around ;-) I have pushed a better version into master (including the missing #endif and the necessary changes in configure/config.h.in, see http://cgit.freedesktop.org/libreoffice/core/commit/?id=ad7f850e829a4be91725b6b7086f6a871a84bae5 I have pushed it also to the 3-5 branch, see http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=307240b753adc4d0892098bdab4b96de08a90517 Heh, the change in dmake/configre is huge because I used autoconf-2.63 instead of the archaic autoconf-2.61. I see that these huge changes happened in the history as well. Also 2.63 is used on the Linux host providing official builds, so we should be on the safe side. I am going to look if we could get rid of configure in master git and generate it using autogen.sh like the top level ones. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] add basegfx::fround to unittest (was: basegfx::fround and friends seems needed in windows build)
Hello Michael, On Tue, Feb 21, 2012 at 22:28, Michael Meeks michael.me...@suse.com wrote: Drat, I just did that for you :-) Thanks for this :) Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
ODF 1.1 and 1.2
Gents, It looks like users compatibility experience problems between LibreOffice and MSO due to different speeds at which ODF 1.1 and 1.2 formats are implemented in both packages. A fellow supporter has complained in Brussels at the European Commission. Before he reacts he likes to have some facts on the table. Can we help him (and us) by confirming when / what ODF version has been implemented in LibreOffice. Thx -- Luc Castermans mailto:luc.casterm...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] x11 / cairo-less build try #3
On 02/21/2012 04:07 PM, Michael Meeks wrote: On Mon, 2012-02-20 at 09:21 +0100, Stephan Bergmann wrote: Nice - IMHO this is all a bit silly - the 'main' has no wrapper 'catch' around it, so if we get an un-caught exception we bomb out in a very unpleasant way for no particularly good reason. ... Stephan - is there a reason why we would not catch and print something helpful (a native dialog?) on unhandled exceptions around master ? ... In my experience, such exceptions typically indicate a programming error (either in actual program code, or in the way the bits of the program are combined into an installation set). And for programmers, it is often more helpful to see the direct consequences of such error than some helpful mediation on LO's part (like the infamous The user language cannot be determined message, typically caused by some problem that has zero to do with any locale data, only leading devs to start searching in the wrong direction). Haha :-) indeed, however a pathalogical, silent abort, without even an auto-save, or any message from the exception is rather unfortunate too ;-) This should not be a silent abort, without even an auto-save anyway---at least not in production builds where the sal signal handler machinery should catch the abort. (No idea what the current status is, which configurations lead to which behaviour wrt. that signal handler.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Remove unused methods from PDFI
Kate Goss wrote: On Sat, 2012-02-18 at 21:18 +, Kate Goss wrote: Quick question - Can anyone point me to list of supported browsers for the bug submission assistant? I didn't find a list of target browser Loic designed this for, but looking into http://wiki.documentfoundation.org/Bug_Submission_Assistant#Metrics there's an interesting way to get browser stats via this query: https://bugassistant.libreoffice.org/buglist.cgi?query_format=advancedfield0-0-0=status_whiteboardbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=UNCONFIRMEDtype0-0-0=substringvalue0-0-0=BSA , since most submissions have this Browser: ... line in the initial text - so we at least know which browsers *did* work. ;) Cheers, -- Thorsten pgpt47vJhbv8p.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] convert svxrtf.hxx in editeng module from table.hxx to std::map
On 21.02.2012 15:09, Noel Grandin wrote: Thanks, that was just the suggestion I needed! Converted patch to use boost:ptr_map. Great! Pushed, thanks for it. Could you prepare your future patches using 'git format-patch', please? Best Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Has the time come to get rid of the delivering of public headers?
On 02/21/2012 03:39 PM, Michael Stahl wrote: would need to try that out on Windows, but my guess is that even if it doesn't blow out command line length limits (which could be worked around with a response file) it'll make the Windows build a lot slower because compiler has to try out all include paths (well statistically half of them but that is bad enough) for every included files, and those file accesses take forever on Windows. Just want to add that response files can be a pain when you want to debug a build problem. So IMO the fewer places we use them the better. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: MinGW-Port: Problems with UnoUrlResolver
On 02/21/2012 04:15 PM, Michael Meeks wrote:
On Tue, 2012-02-21 at 11:53 +0100, Helmar Spangenberg wrote:
I would love to use the MSVC version - however my application is based
on some essential MinGW parts, and until now I have not found a way to
link my application against the MSVC-DLLs coming with the LibreOffice
SDK.
Ho hum; so - in -theory- ;-) the SAL APIs are all in-line C++ wrappers
around a native STDCALL C API (for libsal), so assuming you use just the
sal/ code it could ('in theory') with my limited understanding of these
things, etc. etc. work. But I'm clearly an optimist ;-)
The problem here appears not be C-based sal but C++-based cppuhelper
(using ::cppu::bootstrap()), which will only work if cppuhelper and
client code are compiled with the same compiler (either both MSVC or
both GCC).
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
