[Libreoffice-commits] .: sc/source
sc/source/ui/view/cellsh.cxx | 84 +++
sc/source/ui/view/cellsh1.cxx | 90 --
sc/source/ui/view/cellsh2.cxx | 43 ++--
sc/source/ui/view/cellsh4.cxx | 16 +++
4 files changed, 116 insertions(+), 117 deletions(-)
New commits:
commit fefa76cf3f9e60fb5e2607f37f42c4dc9f0858ae
Author: Winfried Donkers o...@dci-electronics.nl
Date: Thu Nov 17 07:27:37 2011 +0100
german comments translated to english On branch master Changes to be
committed: modified: sc/source/ui/view/cellsh.cxx modified:
sc/source/ui/view/cellsh1.cxx modified: sc/source/ui/view/cellsh2.cxx modified:
sc/source/ui/view/cellsh4.cxx
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 531ac70..ac2bdcc 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -137,59 +137,59 @@ void ScCellShell::GetBlockState( SfxItemSet rSet )
while ( nWhich )
{
sal_Bool bDisable = false;
-sal_Bool bNeedEdit = sal_True; // muss Selektion editierbar sein?
+sal_Bool bNeedEdit = sal_True; // need selection be editable?
switch ( nWhich )
{
-case FID_FILL_TO_BOTTOM:// Fuellen oben/unten
-case FID_FILL_TO_TOP: // mind. 2 Zeilen markiert?
+case FID_FILL_TO_BOTTOM:// fill to top / bottom
+case FID_FILL_TO_TOP: // are at least 2 rows marked?
bDisable = (!bSimpleArea) || (nRow1 == nRow2);
if ( !bDisable bEditable )
-{ // Matrix nicht zerreissen
+{ // do not damage matrix
if ( nWhich == FID_FILL_TO_BOTTOM )
bDisable = pDoc-HasSelectedBlockMatrixFragment(
-nCol1, nRow1, nCol2, nRow1, rMark );// erste
Zeile
+nCol1, nRow1, nCol2, nRow1, rMark );// first
row
else
bDisable = pDoc-HasSelectedBlockMatrixFragment(
-nCol1, nRow2, nCol2, nRow2, rMark );// letzte
Zeile
+nCol1, nRow2, nCol2, nRow2, rMark );// last row
}
break;
-case FID_FILL_TO_RIGHT: // Fuellen links/rechts
-case FID_FILL_TO_LEFT: // mind. 2 Spalten markiert?
+case FID_FILL_TO_RIGHT: // fill to left / right
+case FID_FILL_TO_LEFT: // are at least 2 columns marked?
bDisable = (!bSimpleArea) || (nCol1 == nCol2);
if ( !bDisable bEditable )
{ // Matrix nicht zerreissen
if ( nWhich == FID_FILL_TO_RIGHT )
bDisable = pDoc-HasSelectedBlockMatrixFragment(
-nCol1, nRow1, nCol1, nRow2, rMark );// erste
Spalte
+nCol1, nRow1, nCol1, nRow2, rMark );// first
column
else
bDisable = pDoc-HasSelectedBlockMatrixFragment(
-nCol2, nRow1, nCol2, nRow2, rMark );// letzte
Spalte
+nCol2, nRow1, nCol2, nRow2, rMark );// last
column
}
break;
-case FID_FILL_SERIES: // Block fuellen
-case SID_OPENDLG_TABOP: // Mehrfachoperationen, mind. 2 Zellen
markiert?
+case FID_FILL_SERIES: // fill block
+case SID_OPENDLG_TABOP: // multiple-cell operations, are at
least 2 cells marked?
if (pDoc-GetChangeTrack()!=NULL nWhich ==SID_OPENDLG_TABOP)
bDisable = sal_True;
else
bDisable = (!bSimpleArea) || (nCol1 == nCol2 nRow1 ==
nRow2);
if ( !bDisable bEditable nWhich == FID_FILL_SERIES )
-{ // Matrix nicht zerreissen
+{ // do not damage matrix
bDisable = pDoc-HasSelectedBlockMatrixFragment(
-nCol1, nRow1, nCol2, nRow1, rMark ) // erste Zeile
+nCol1, nRow1, nCol2, nRow1, rMark ) // first
row
|| pDoc-HasSelectedBlockMatrixFragment(
-nCol1, nRow2, nCol2, nRow2, rMark ) // letzte Zeile
+nCol1, nRow2, nCol2, nRow2, rMark ) // last row
|| pDoc-HasSelectedBlockMatrixFragment(
-nCol1, nRow1, nCol1, nRow2, rMark ) // erste Spalte
+nCol1, nRow1, nCol1, nRow2, rMark ) // first
column
|| pDoc-HasSelectedBlockMatrixFragment(
-nCol2, nRow1, nCol2, nRow2, rMark );// letzte
Spalte
+nCol2, nRow1, nCol2, nRow2, rMark );// last
column
}
[Libreoffice-commits] .: patches/dev300
patches/dev300/apply |3 --
patches/dev300/gcj-32bit-runtime-path.diff | 33 -
2 files changed, 36 deletions(-)
New commits:
commit dd5b3aad28f19f2e2402b1cfebd6ea2ea6afaea6
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Nov 17 11:25:42 2011 +0100
gcj-32bit-runtime-path.diff is obsolete as per original author (doko)
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0af2244..697760c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -173,8 +173,6 @@ desktop-application-octet-stream-mime-type.diff, i#73301,
flr
# FIXME: temporarily disabled as this causes a race condition in calc's cell
format dialog.
#vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
-# check real help path defined in registry instead of the $(instpath)/help
-sfx-check-real-help-path.diff, i#81139, pmladek
svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
goodies-eps-filter-unix.diff, n#200053, rodo
@@ -368,7 +366,6 @@ win32-gw-send-mail.diff, i#34264, n#418407, tml
SectionOwner = rengelha
debian-default-cairo-disable.diff
-gcj-32bit-runtime-path.diff, i#64888, mklose
# read variables from /etc/libreoffice/sofficerc, since
/usr/lib/libreoffice/sofficerc
# just refers to it
oosplash-etc-libreoffice-sofficerc.diff
diff --git a/patches/dev300/gcj-32bit-runtime-path.diff
b/patches/dev300/gcj-32bit-runtime-path.diff
deleted file mode 100644
index f071092..000
--- a/patches/dev300/gcj-32bit-runtime-path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx~ 2006-09-04
20:24:48.710718000 +0200
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 2006-09-04
20:37:56.620718000 +0200
-@@ -37,6 +37,11 @@
- #include osl/thread.h
- #include gnujre.hxx
- #include util.hxx
-+extern C
-+{
-+#include sys/utsname.h
-+#include string.h
-+}
-
- using namespace rtl;
- using namespace std;
-@@ -153,7 +158,18 @@
- return false;
-
- if (!m_sJavaHome.getLength())
-+#if defined (__linux__) defined (__i386__)
-+{
-+ struct utsname uts;
-+ uname(uts);
-+ if(!strcmp(x86_64,uts.machine))
-+ m_sJavaHome =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///usr/lib32));
-+ else
-+ m_sJavaHome =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///usr/lib));
-+}
-+#else
- m_sJavaHome =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///usr/lib));
-+#endif
-
- // init m_sRuntimeLibrary
- OSL_ASSERT(m_sHome.getLength());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |9 --
solenv/bin/modules/installer/windows/msiglobal.pm | 88 --
2 files changed, 97 deletions(-)
New commits:
commit e75175625e1152651d993fec358599625e704e22
Author: Andras Timar ati...@suse.com
Date: Thu Nov 17 12:07:09 2011 +0100
remove setup.exe and setup.ini from Windows installdir
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 6f3ec4a..b3db464 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2249,23 +2249,14 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
installer::windows::msiglobal::rename_msi_database_in_installset($defaultlanguage,
$installdir, $allvariableshashref);
if ( $allvariableshashref-{'ADDLANGUAGEINDATABASENAME'} ) {
installer::windows::msiglobal::add_language_to_msi_database($defaultlanguage,
$installdir, $allvariableshashref); }
-
-installer::logger::print_message( ... generating setup.ini ...\n
);
-
-if ( ! $allvariableshashref-{'NOLOADERREQUIRED'} ) {
installer::windows::msiglobal::create_setup_ini($languagesarrayref,
$defaultlanguage, $installdir, $allvariableshashref); }
}
# Analyzing the ScpActions and copying the files into the installation
set
-# At least the loader.exe
installer::logger::print_message( ... copying files into installation
set ...\n );
installer::worker::put_scpactions_into_installset($installdir);
-# ... copying the setup.exe
-
-
installer::windows::msiglobal::copy_windows_installer_files_into_installset($installdir,
$includepatharrayref, $allvariableshashref);
-
# ... copying MergeModules into installation set
if ( ! $installer::globals::fix_number_of_cab_files ) {
installer::windows::msiglobal::copy_merge_modules_into_installset($installdir);
}
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 082afb2..d6793f4 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1334,61 +1334,6 @@ sub include_windows_lineends
}
}
-##
-# Generation the file setup.ini, that is used by the loader setup.exe.
-##
-
-sub create_setup_ini
-{
-my ($languagesarray, $defaultlanguage, $installdir, $allvariableshashref)
= @_;
-
-installer::logger::include_header_into_logfile(Creating setup.ini);
-
-my $setupinifilename = $installdir . $installer::globals::separator .
setup.ini;
-
-my @setupinifile = ();
-my $setupinifile = \@setupinifile;
-
-my $line = \[setup\]\n;
-push(@setupinifile, $line);
-
-put_databasename_into_setupini($setupinifile, $allvariableshashref);
-put_msiversion_into_setupini($setupinifile);
-put_productname_into_setupini($setupinifile, $allvariableshashref);
-put_productcode_into_setupini($setupinifile);
-put_productversion_into_setupini($setupinifile);
-put_upgradekey_into_setupini($setupinifile);
-
-$line = \[languages\]\n;
-push(@setupinifile, $line);
-
-put_languagecount_into_setupini($setupinifile, $languagesarray);
-put_defaultlanguage_into_setupini($setupinifile, $defaultlanguage);
-
-if ( $#{$languagesarray} 0 ) # writing the transforms information
-{
-my $counter = 1;
-
-for ( my $i = 0; $i = $#{$languagesarray}; $i++ )
-{
-if ( ${$languagesarray}[$i] eq $defaultlanguage ) { next; }
-
-put_transforms_into_setupini($setupinifile,
${$languagesarray}[$i], $counter);
-$counter++;
-}
-}
-
-if ( $installer::globals::iswin $installer::globals::plat =~ /cygwin/i)
# Windows line ends only for Cygwin
-{
-include_windows_lineends($setupinifile);
-}
-
-installer::files::save_file($setupinifilename, $setupinifile);
-
-$infoline = Generated file $setupinifilename !\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-
#
# Copying the files defined as ScpActions into the
# installation set.
@@ -1421,39 +1366,6 @@ sub copy_scpactions_into_installset
}
#
-# Copying the files for the Windows installer into the
-# installation set (setup.exe).
-#
-
-sub copy_windows_installer_files_into_installset
-{
-my ($installdir, $includepatharrayref, $allvariables) = @_;
-
-installer::logger::include_header_into_logfile(Copying Windows installer
files into installation set);
-
-@copyfile = ();
-push(@copyfile, loader2.exe);
-
-if ( $allvariables-{'NOLOADERREQUIRED'} )
[Libreoffice-commits] .: 10 commits - bridges/test configmgr/prj configmgr/source cppcanvas/source cppuhelper/qa cppuhelper/source cppunit/android.patch io/source pyuno/source remotebridges/source sal
bridges/test/java_uno/acquire/makefile.mk |2
bridges/test/java_uno/equals/makefile.mk |2
bridges/test/java_uno/nativethreadpool/makefile.mk |4 -
configmgr/prj/d.lst|6 -
configmgr/source/makefile.mk |2
cppcanvas/source/uno/makefile.mk |2
cppuhelper/qa/propertysetmixin/makefile.mk |2
cppuhelper/source/shlib.cxx|9 ++
cppunit/android.patch | 18 +
io/source/TextInputStream/makefile.mk |2
io/source/TextOutputStream/makefile.mk |2
io/source/acceptor/makefile.mk |2
io/source/connector/makefile.mk|2
io/source/stm/makefile.mk |2
pyuno/source/loader/makefile.mk|2
remotebridges/source/unourl_resolver/makefile.mk |2
sal/osl/android/Makefile | 58 +---
sal/osl/android/jni/lo-bootstrap.c | 75 ++---
sal/osl/android/jni/lo-bootstrap.h |5 +
sal/osl/unx/module.c | 12 +++
sal/osl/unx/process_impl.cxx |8 ++
sdext/source/pdfimport/makefile.mk |2
sdext/source/presenter/makefile.mk |2
solenv/inc/unxandr.mk |4 +
stoc/source/corereflection/makefile.mk |2
stoc/source/inspect/makefile.mk|2
stoc/source/invocation/makefile.mk |2
stoc/source/invocation_adapterfactory/makefile.mk |2
stoc/source/javaloader/makefile.mk |2
stoc/source/javavm/makefile.mk |2
stoc/source/namingservice/makefile.mk |2
stoc/source/proxy_factory/makefile.mk |2
stoc/test/registry_tdprovider/makefile.mk |2
stoc/test/tdmanager/makefile.mk|2
stoc/util/makefile.mk |4 -
testtools/source/bridgetest/cli/makefile.mk|2
testtools/source/bridgetest/makefile.mk|6 -
testtools/source/performance/makefile.mk |4 -
ucb/source/ucp/expand/makefile.mk |2
ucb/source/ucp/ext/makefile.mk |2
ucb/source/ucp/tdoc/makefile.mk|2
41 files changed, 193 insertions(+), 76 deletions(-)
New commits:
commit 480a380a7284d5d59f39aad15fd1a299ba704a2f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 17 15:16:30 2011 +0200
Look for libboostrap.uno.so and not bootstrap.uno.so on Android
Not sure if we need to be more generic here, and always add a lib
prefix if not present. Or do the changes to the makefilery take care
of it, so that for other UNO components than bootstrap, the name as
stored wherever it is stored does contain the lib prefix we are
forces to use on Android?
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 9414e34..8bce73d 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -464,7 +464,14 @@ Reference XInterface SAL_CALL
loadSharedLibComponentFactory(
SAL_THROW( (loader::CannotActivateFactoryException) )
{
#ifndef IOS
-OUString aModulePath( makeComponentPath( rLibName, rPath ) );
+OUString sLibName(rLibName);
+
+#ifdef ANDROID
+if ( rLibName.equals( OUSTR(bootstrap.uno SAL_DLLEXTENSION) ) )
+sLibName = OUSTR(libbootstrap.uno SAL_DLLEXTENSION);
+#endif
+
+OUString aModulePath( makeComponentPath( sLibName, rPath ) );
if (! checkAccessPath( aModulePath ))
{
throw loader::CannotActivateFactoryException(
commit f95c3e0ee255ecb56879c3c8ae7ba185fae861ab
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 17 15:16:10 2011 +0200
Look for lo_main() and not main() on Android
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 003e136..b795bbc 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -130,8 +130,16 @@ oslProcessError SAL_CALL
osl_bootstrap_getExecutableFile_Impl (
{
oslProcessError result = osl_Process_E_NotFound;
+#ifdef ANDROID
+/* On Android we want the address of the lo_main() function, as
+ * that is what corresponds to main() in LibreOffice programs on
+ * normal desktop OSes.
+ */
+void * addr = dlsym (RTLD_DEFAULT, lo_main);
+#else
/* Determine address of main() function. */
void * addr = dlsym (RTLD_DEFAULT, main);
+#endif
if (addr != 0)
{
/* Determine module URL. */
commit 21c0c69ddf128f748bd2c294cb1a348a797bb70f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 17 15:15:14 2011 +0200
Use lo_dladdr() on Android
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
[Libreoffice-commits] .: patches/dev300
patches/dev300/apply|3 ++- patches/dev300/vcl-permit-global-shortcuts.diff |1 + 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit f5c9ac6229d3ec756bda5f49d51168687978 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Nov 17 14:26:09 2011 +0100 add warning to vcl-permit-global-shortcuts.diff diff --git a/patches/dev300/apply b/patches/dev300/apply index 697760c..ee2f3d5 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -215,7 +215,8 @@ sfx2-privateprotectedpublic.diff #optional-outplace-ole.diff, i#98970, thorsten # let ctrl-keycode stuff pass dlg keyboard handling, to permit # global application-wide shortcuts also in open dialogs -vcl-permit-global-shortcuts.diff, i#105676, thorsten +# disabled for now because of sideeffects (see comments in i#105676), would need investigation before upstreaming +#vcl-permit-global-shortcuts.diff, i#105676, thorsten # unresolved Base64 Java classes base64.diff, i#100620, hmth diff --git a/patches/dev300/vcl-permit-global-shortcuts.diff b/patches/dev300/vcl-permit-global-shortcuts.diff index a34e55f..f970873 100644 --- a/patches/dev300/vcl-permit-global-shortcuts.diff +++ b/patches/dev300/vcl-permit-global-shortcuts.diff @@ -1,3 +1,4 @@ +# disabled for now because of sideeffects (see comments in i#105676), would need investigation before upstreaming --- vcl/source/window/dlgctrl.cxx |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/unx/module.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3e596b7fc61e7c016cfe10eb100f733a63ac2870
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 17 15:56:41 2011 +0200
Missing semicolon
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index b79dfbc..952449d 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -99,7 +99,7 @@ static sal_Bool getModulePathFromAddress(void * address,
rtl_String ** path) {
int (*lo_dladdr)(void *, Dl_info *) = dlsym(RTLD_DEFAULT, lo_dladdr);
result = (*lo_dladdr)(address, dl_info);
#else
-result = dladdr(address, dl_info)
+result = dladdr(address, dl_info);
#endif
if (result != 0)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 555a66329271846c7a7391317f0167f133e0c5d6
Author: Andras Timar ati...@suse.com
Date: Thu Nov 17 15:59:17 2011 +0100
don't create download (nsis) install sets on Windows
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index b3db464..ae4b751 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1869,6 +1869,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
{
my $create_download = 0;
if ( $$downloadname ne ) { $create_download = 1; }
+if ( $installer::globals::iswindowsbuild ) { $create_download = 0;
}
if (( $is_success ) ( $create_download ) (
$ENV{'ENABLE_DOWNLOADSETS'} ))
{
my $downloaddir =
installer::download::create_download_sets($finalinstalldir,
$includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref,
$languagesarrayref);
@@ -2349,6 +2350,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if ( $is_success ) {
installer::followme::save_followme_info($finalinstalldir, $includepatharrayref,
$allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref,
$current_install_number, $loggingdir, $installlogdir); }
if ( $$downloadname ne ) { $create_download = 1; }
+if ( $installer::globals::iswindowsbuild ) { $create_download = 0; }
if (( $is_success ) ( $create_download ) (
$ENV{'ENABLE_DOWNLOADSETS'} ))
{
my $downloaddir =
installer::download::create_download_sets($finalinstalldir,
$includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref,
$languagesarrayref);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - bridges/inc bridges/source sal/osl testtools/com testtools/source
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx |3 ++-
bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk|2 +-
sal/osl/android/Makefile |7 ---
testtools/com/sun/star/comp/bridge/makefile.mk |5 -
testtools/source/bridgetest/idl/makefile.mk |5 -
testtools/source/bridgetest/makefile.mk | 13 +
6 files changed, 12 insertions(+), 23 deletions(-)
New commits:
commit 6f55d5eaec48212f24bd19b351ddedac3059eb8b
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 17 17:40:49 2011 +0200
Do build stuff here also when cross-compiling (but don't run)
diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk
b/testtools/com/sun/star/comp/bridge/makefile.mk
index 0a6b9a8..7083f23 100644
--- a/testtools/com/sun/star/comp/bridge/makefile.mk
+++ b/testtools/com/sun/star/comp/bridge/makefile.mk
@@ -34,11 +34,6 @@ TARGET=com_sun_star_comp_bridge
.INCLUDE : settings.mk
-.IF $(CROSS_COMPILING)==YES
-all:
-@echo Nothing done when cross-compiling
-.ENDIF
-
# --
.IF $(SOLAR_JAVA) !=
diff --git a/testtools/source/bridgetest/idl/makefile.mk
b/testtools/source/bridgetest/idl/makefile.mk
index dce276e..8b17273 100644
--- a/testtools/source/bridgetest/idl/makefile.mk
+++ b/testtools/source/bridgetest/idl/makefile.mk
@@ -31,11 +31,6 @@ TARGET := bridgetest_idl
.INCLUDE: settings.mk
-.IF $(CROSS_COMPILING)==YES
-all:
-@echo Nothing done when cross-compiling
-.ENDIF
-
.INCLUDE: target.mk
.IF $(L10N_framework)==
diff --git a/testtools/source/bridgetest/makefile.mk
b/testtools/source/bridgetest/makefile.mk
index 6481abc..8d2f21b 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -36,11 +36,6 @@ LIBTARGET=NO
.INCLUDE: settings.mk
-.IF $(CROSS_COMPILING)==YES
-all:
-@echo Nothing done when cross-compiling
-.ENDIF
-
.IF $(L10N_framework)==
DLLPRE = # no leading lib on .so files
@@ -141,6 +136,7 @@ ALLTAR: \
runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
$(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
+.IF $(CROSS_COMPILING)!=YES
.IF $(COM)$(OS)$(CPU) == GCCMACOSXP
@echo Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me.
.ELSE
@@ -149,6 +145,7 @@ runtest : $(DLLDEST)$/uno_types.rdb
$(DLLDEST)$/uno_services.rdb makefile.mk \
-s com.sun.star.test.bridge.BridgeTest -- \
com.sun.star.test.bridge.CppTestObject
.ENDIF
+.ENDIF
$(DLLDEST)/services.rdb :
$(COPY) $(SOLARXMLDIR)/ure/services.rdb $@
commit 5057892990b310d59d25b161ee54273951afaa91
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 17 17:36:24 2011 +0200
Fix unintentional glitch
diff --git a/testtools/source/bridgetest/makefile.mk
b/testtools/source/bridgetest/makefile.mk
index a798b50..6481abc 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -79,7 +79,7 @@ LIB1TARGET=$(SLB)$/cppobj.lib
LIB1OBJFILES= \
$(SLO)$/cppobj.obj $(SLO)$/currentcontextchecker.obj $(SLO)$/multi.obj
-SHL1TARGET =
$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)cppobj.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)cppobj.uno
SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
@@ -98,7 +98,7 @@ LIB2OBJFILES= \
$(SLO)$/currentcontextchecker.obj \
$(SLO)$/multi.obj
-SHL2TARGET =
$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)bridgetest.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)bridgetest.uno
SHL2STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
@@ -109,7 +109,7 @@ SHL2DEF=$(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET)
SHL2VERSIONMAP = $(SOLARENV)/src/component.map
-SHL3TARGET =
$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)constructors.uno
+SHL3TARGET = $(ENFORCEDSHLPREFIX)constructors.uno
SHL3OBJS = $(SLO)$/constructors.obj
SHL3STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
SHL3VERSIONMAP = $(SOLARENV)/src/component.map
commit e55ab1e6de1bcf854bcc05ba5e91009dcce507bd
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 17 16:23:11 2011 +0200
Add the gcc3_uno library
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index ac28f1b..d60618a 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -31,11 +31,12 @@ all:
#
# Then libs and UNO components that the tests from other modules need.
#
- -for F in uno_cppu \
- uno_salhelpergcc3 \
- uno_cppuhelpergcc3 \
+ -for F in gcc3_uno \
reg \
store \
+ uno_cppu \
+ uno_salhelpergcc3 \
+ uno_cppuhelpergcc3 \
xmlreader \
bootstrap.uno; do \
test -f $(OUTDIR)/lib/lib$${F}.so cp
[Libreoffice-commits] .: i18npool/prj pyuno/prj testtools/prj vcl/prj
i18npool/prj/build.lst |2 +- pyuno/prj/build.lst |2 +- testtools/prj/build.lst |2 +- vcl/prj/build.lst |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit c81bdf3bcdb81886719a24d4df1f19dcf0256ffe Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 17 17:57:23 2011 +0200 Do build cpputools also for non-DESKTOP OSes, needed for bridgetest diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst index e95a27a..002516f 100644 --- a/i18npool/prj/build.lst +++ b/i18npool/prj/build.lst @@ -1,2 +1,2 @@ -inp i18npool: bridges sax stoc comphelper CPPUNIT:cppunit ICU:icu i18nutil regexp DESKTOP:cpputools LIBXSLT:libxslt udkapi ure unotest NULL +inp i18npool: bridges sax stoc comphelper CPPUNIT:cppunit ICU:icu i18nutil regexp cpputools LIBXSLT:libxslt udkapi ure unotest NULL inp i18npool\prj nmake - all inp_prj NULL diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst index e6e0914..a7c1c5b 100644 --- a/pyuno/prj/build.lst +++ b/pyuno/prj/build.lst @@ -1,4 +1,4 @@ -bgpu pyuno : stoc DESKTOP:cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL +bgpu pyuno : stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL pupyuno usr1 - all br_mkout NULL pupyuno\zipcore nmake - all pu_zipcore NULL pupyuno\source\module nmake - all pu_module NULL diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst index bd4bc2f..0b8f340 100644 --- a/testtools/prj/build.lst +++ b/testtools/prj/build.lst @@ -1,4 +1,4 @@ -tt testtools : DESKTOP:cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi ure LIBXSLT:libxslt NULL +tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi ure LIBXSLT:libxslt NULL tt testtools\inc nmake - all tt_inc NULL tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_inc NULL tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst index 29b3a40..4b0ece6 100644 --- a/vcl/prj/build.lst +++ b/vcl/prj/build.lst @@ -1,4 +1,4 @@ -vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc DESKTOP:cpputools svl LIBXSLT:libxslt CAIRO:cairo NULL +vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc cpputools svl LIBXSLT:libxslt CAIRO:cairo NULL vc vcl usr1- all vc_mkout NULL vc vcl\prj nmake - all vc_prj NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 3aec127f4db9b9f5beb6289a9177e6c21891c762
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Nov 17 17:18:54 2011 +0100
Related i#44806: Fix crash in dmapper when importing FILENAME fields
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e6e9ad0..a7f047c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2569,9 +2569,10 @@ void DomainMapper_Impl::CloseFieldCommand()
case FIELD_FILENAME:
{
sal_Int32 nNumberingTypeIndex =
pContext-GetCommand().indexOf(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\\p)));
-xFieldProperties-setPropertyValue(
-rPropNameSupplier.GetName(PROP_FILE_FORMAT),
-uno::makeAny( nNumberingTypeIndex 0 ?
text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME ));
+if (xFieldProperties.is())
+xFieldProperties-setPropertyValue(
+
rPropNameSupplier.GetName(PROP_FILE_FORMAT),
+uno::makeAny( nNumberingTypeIndex 0 ?
text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME ));
}
break;
case FIELD_FILESIZE : break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gtk3' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/workben
sal/workben/clipboardwben/testpaste/cbptest.cxx |1 -
sal/workben/clipboardwben/testviewer/cbvtest.cxx |1 -
2 files changed, 2 deletions(-)
New commits:
commit 9a7b77ae2365d568369b1628fcbfb027ca0cf89f
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Fri Nov 18 00:36:00 2011 +0700
cppcheck: unread variables
These variables are set, but unused.
diff --git a/sal/workben/clipboardwben/testpaste/cbptest.cxx
b/sal/workben/clipboardwben/testpaste/cbptest.cxx
index 73507d9..eb9cb71 100644
--- a/sal/workben/clipboardwben/testpaste/cbptest.cxx
+++ b/sal/workben/clipboardwben/testpaste/cbptest.cxx
@@ -270,7 +270,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM
wParam, LPARAM lParam)
{
case WM_COMMAND:
wmId= LOWORD(wParam);
-int wmEvent = HIWORD(wParam);
// Menüauswahlen analysieren:
switch( wmId )
{
diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx
b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
index 6cf74c5..b4ac1d5 100644
--- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx
+++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
@@ -217,7 +217,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM
wParam, LPARAM lParam)
case WM_COMMAND:
wmId= LOWORD(wParam);
-int wmEvent = HIWORD(wParam);
// Menüauswahlen analysieren:
switch( wmId )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source sw/source
sc/source/ui/miscdlgs/retypepassdlg.src |2 +-
sc/source/ui/src/scstring.src |4 ++--
sw/source/ui/chrdlg/chrdlg.src |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 538c8cfc3f1df95cde6789f52a120c8de0a75511
Author: Lior Kaplan kaplanl...@gmail.com
Date: Thu Nov 17 19:04:13 2011 +0200
Remove double space in strings (looks bad in pootle)
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src
b/sc/source/ui/miscdlgs/retypepassdlg.src
index 0c9f11e..714f1fe 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.src
@@ -61,7 +61,7 @@ ModalDialog RID_SCDLG_RETYPEPASS
WordBreak = TRUE ;
-Text [ en-US ] = The document you are about to export has one or more
protected items with password that cannot be exported. Please re-type your
password to be able to export your document. ;
+Text [ en-US ] = The document you are about to export has one or more
protected items with password that cannot be exported. Please re-type your
password to be able to export your document. ;
};
FixedLine FL_DOCUMENT
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index c70d902..c770dfe 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -817,10 +817,10 @@ String SCSTR_WARN_ME_IN_FUTURE_CHECK
String SCSTR_DDEDOC_NOT_LOADED
{
-Text [ en-US ] = The following DDE source could not be updated possibly
because the source document was not open. Please launch the source document
and try again. ;
+Text [ en-US ] = The following DDE source could not be updated possibly
because the source document was not open. Please launch the source document and
try again. ;
};
String SCSTR_EXTDOC_NOT_LOADED
{
-Text [ en-US ] = The following external file could not be loaded. Data
linked from this file did not get updated. ;
+Text [ en-US ] = The following external file could not be loaded. Data
linked from this file did not get updated. ;
};
diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src
index b3c8ff6..7e3bac8 100644
--- a/sw/source/ui/chrdlg/chrdlg.src
+++ b/sw/source/ui/chrdlg/chrdlg.src
@@ -42,7 +42,7 @@ InfoBox MSG_ILLEGAL_PAGENUM
{
BUTTONS = WB_OK ;
DEFBUTTON = WB_DEF_OK ;
-Message [ en-US ] = Page numbers cannot be applied to the current page.
Even numbers can be used on left pages, odd numbers on right pages. ;
+Message [ en-US ] = Page numbers cannot be applied to the current page.
Even numbers can be used on left pages, odd numbers on right pages. ;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/bastyp/calc.cxx |3 +--
sw/source/core/crsr/crsrsh.cxx |7 ++-
sw/source/core/doc/docedt.cxx | 12
sw/source/core/doc/docfld.cxx |6 ++
sw/source/core/doc/docfmt.cxx |2 +-
sw/source/core/doc/docnew.cxx | 11 +++
sw/source/core/doc/docredln.cxx |2 +-
sw/source/core/docnode/ndtbl.cxx|2 +-
sw/source/core/docnode/node.cxx |3 +--
sw/source/core/frmedt/fefly1.cxx|3 +--
sw/source/core/layout/atrfrm.cxx| 13 +
sw/source/core/layout/calcmove.cxx |6 ++
sw/source/core/layout/fly.cxx |3 +--
sw/source/core/layout/ssfrm.cxx |3 +--
sw/source/core/text/itradj.cxx |3 +--
sw/source/core/text/itrform2.cxx|7 ++-
sw/source/core/text/porlay.cxx |6 ++
sw/source/core/text/txtdrop.cxx |3 +--
sw/source/core/txtnode/fmtatr2.cxx |2 +-
sw/source/core/txtnode/ndtxt.cxx|3 +--
sw/source/core/unocore/unoframe.cxx |3 +--
sw/source/core/unocore/unosett.cxx |2 +-
sw/source/core/unocore/unotbl.cxx |3 +--
sw/source/filter/ascii/parasc.cxx |3 +--
sw/source/filter/html/htmlplug.cxx |6 ++
sw/source/filter/ww1/fltshell.cxx |6 ++
sw/source/filter/ww8/ww8par.cxx |6 ++
sw/source/filter/ww8/ww8par2.cxx|5 ++---
sw/source/ui/app/applab.cxx |4 +---
sw/source/ui/dbui/dbinsdlg.cxx |3 +--
sw/source/ui/dialog/uiregionsw.cxx |6 ++
sw/source/ui/dochdl/swdtflvr.cxx|3 +--
sw/source/ui/docvw/edtwin.cxx | 19 +++
sw/source/ui/envelp/labprt.cxx |3 +--
sw/source/ui/ribbar/inputwin.cxx|3 +--
sw/source/ui/table/tautofmt.cxx |2 +-
sw/source/ui/uiview/formatclipboard.cxx | 23 +--
sw/source/ui/uiview/pview.cxx |3 +--
sw/source/ui/uiview/viewdraw.cxx|3 +--
sw/source/ui/uno/SwXFilterOptions.cxx |3 +--
sw/source/ui/utlui/glbltree.cxx |3 +--
sw/source/ui/utlui/initui.cxx |3 +--
sw/source/ui/utlui/numfmtlb.cxx |3 +--
43 files changed, 76 insertions(+), 142 deletions(-)
New commits:
commit 3616dfb094089589b5c9082fc96702ad1155045f
Author: Ivan Timofeev timofeev@gmail.com
Date: Thu Nov 17 22:13:42 2011 +0400
redundant if not-null checks on delete
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index ecee9a2..78ee52c 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1626,8 +1626,7 @@ SwHash::SwHash( const String rStr ) :
SwHash::~SwHash()
{
-if( pNext )
-delete pNext;
+delete pNext;
}
void DeleteHashTable( SwHash **ppHashTable, sal_uInt16 nCount )
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index f402e02..7f859ed 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -120,11 +120,8 @@ void CheckRange( SwCursor* pCurCrsr )
* Bereich gehoert !
*/
pTmp = (SwPaM*)pTmp-GetNext();
-if( pTmpDel )
-{
-delete pTmpDel; // hebe alten Bereich auf
-pTmpDel = 0;
-}
+delete pTmpDel; // hebe alten Bereich auf
+pTmpDel = 0;
}
}
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 3f15e8c..b4c8e07 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -691,11 +691,8 @@ _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore(
const SwNodeIndex rInsIdx
_SaveRedlEndPosForRestore::~_SaveRedlEndPosForRestore()
{
-if( pSavArr )
-{
-delete pSavArr;
-delete pSavIdx;
-}
+delete pSavArr;
+delete pSavIdx;
}
void _SaveRedlEndPosForRestore::_Restore()
@@ -1236,8 +1233,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange rRange,
SwNodeIndex rPos,
GetIDocumentUndoRedo().AppendUndo(pUndo);
}
-if( pSaveInsPos )
-delete pSaveInsPos;
+delete pSaveInsPos;
if( bUpdateFtn )
{
@@ -2500,7 +2496,7 @@ SetRedlineMode( eOld );
// in die Autokorrektur
void SwDoc::SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew )
{
-if( pACEWord pNew != pACEWord )
+if( pNew != pACEWord )
delete pACEWord;
pACEWord = pNew;
}
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 3a81493..e5cd57e 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -673,8 +673,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
}
}
-if( pCalc )
-delete pCalc;
+delete pCalc;
}
void SwDoc::UpdatePageFlds( SfxPoolItem* pMsgHnt )
@@ -2210,8 +2209,7 @@ void SwDocUpdtFld::MakeFldList( SwDoc rDoc, int bAll,
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_allocator.hxx |2 +- connectivity/source/drivers/postgresql/pq_array.cxx |2 +- connectivity/source/drivers/postgresql/pq_array.hxx |2 +- connectivity/source/drivers/postgresql/pq_baseresultset.cxx |2 +- connectivity/source/drivers/postgresql/pq_baseresultset.hxx |2 +- connectivity/source/drivers/postgresql/pq_common.hxx|2 +- connectivity/source/drivers/postgresql/pq_connection.cxx|2 +- connectivity/source/drivers/postgresql/pq_connection.hxx|2 +- connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +- connectivity/source/drivers/postgresql/pq_databasemetadata.hxx |2 +- connectivity/source/drivers/postgresql/pq_driver.cxx|2 +- connectivity/source/drivers/postgresql/pq_driver.hxx|2 +- connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx |2 +- connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx |2 +- connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |2 +- connectivity/source/drivers/postgresql/pq_preparedstatement.hxx |2 +- connectivity/source/drivers/postgresql/pq_resultset.cxx |2 +- connectivity/source/drivers/postgresql/pq_resultset.hxx |2 +- connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |2 +- connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx |2 +- connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx |2 +- connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx |2 +- connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx |2 +- connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx |2 +- connectivity/source/drivers/postgresql/pq_statement.cxx |2 +- connectivity/source/drivers/postgresql/pq_statement.hxx |2 +- connectivity/source/drivers/postgresql/pq_statics.cxx |2 +- connectivity/source/drivers/postgresql/pq_statics.hxx |2 +- connectivity/source/drivers/postgresql/pq_tools.cxx |2 +- connectivity/source/drivers/postgresql/pq_tools.hxx |2 +- connectivity/source/drivers/postgresql/pq_updateableresultset.cxx |2 +- connectivity/source/drivers/postgresql/pq_updateableresultset.hxx |2 +- connectivity/source/drivers/postgresql/pq_xbase.cxx |2 +- connectivity/source/drivers/postgresql/pq_xbase.hxx |2 +- connectivity/source/drivers/postgresql/pq_xcolumn.cxx |2 +- connectivity/source/drivers/postgresql/pq_xcolumn.hxx |2 +- connectivity/source/drivers/postgresql/pq_xcolumns.cxx |2 +- connectivity/source/drivers/postgresql/pq_xcolumns.hxx |2 +- connectivity/source/drivers/postgresql/pq_xcontainer.cxx|2 +- connectivity/source/drivers/postgresql/pq_xcontainer.hxx|2 +- connectivity/source/drivers/postgresql/pq_xindex.cxx|2 +- connectivity/source/drivers/postgresql/pq_xindex.hxx|2 +- connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx |2 +- connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx |2 +- connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx |2 +- connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx |2 +- connectivity/source/drivers/postgresql/pq_xindexes.cxx |2 +- connectivity/source/drivers/postgresql/pq_xindexes.hxx |2 +- connectivity/source/drivers/postgresql/pq_xkey.cxx |2 +- connectivity/source/drivers/postgresql/pq_xkey.hxx |2 +- connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx|2 +- connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx|2 +- connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx |2 +- connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx |2 +- connectivity/source/drivers/postgresql/pq_xkeys.cxx |2 +- connectivity/source/drivers/postgresql/pq_xkeys.hxx |2 +- connectivity/source/drivers/postgresql/pq_xtable.cxx|2 +- connectivity/source/drivers/postgresql/pq_xtable.hxx|2 +- connectivity/source/drivers/postgresql/pq_xtables.cxx |2 +-
[Libreoffice-commits] .: configure.in connectivity/source set_soenv.in
configure.in | 52 ---
connectivity/source/drivers/postgresql/makefile.mk | 28 ++
connectivity/source/drivers/postgresql/pq_driver.hxx |8 --
set_soenv.in |2
4 files changed, 54 insertions(+), 36 deletions(-)
New commits:
commit 7bab4645ce08e9cb41b38a983c57a514358b71ec
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Nov 17 23:17:21 2011 +0100
Implement --with-sytem-postgreql and --with-libq-path; cleanup unused
#define
diff --git a/configure.in b/configure.in
index a628175..995 100644
--- a/configure.in
+++ b/configure.in
@@ -1090,7 +1090,8 @@ AC_ARG_WITH(lucene-analyzers-jar,
AC_ARG_WITH(system-mysql,
AS_HELP_STRING([--with-system-mysql],
[Use MySQL libraries already on system, for building the MySQL
Connector/LibreOffice
- extension. Requires MYSQLCONFIG to point to the mysql_config
executable.]),,
+ extension. If the the mysql_config executable is not in PATH, use
MYSQLCONFIG to
+ point to it.]),,
[with_system_mysql=$with_system_libs])
AC_ARG_WITH(libmysql-path,
@@ -1108,6 +1109,22 @@ AC_ARG_WITH(system-mysql-cppconn,
[Use MySQL C++ Connector libraries already on system.]),,
[with_system_mysql_cppconn=$with_system_libs])
+AC_ARG_WITH(system-postgresql,
+AS_HELP_STRING([--with-system-postgresql],
+[Use PostgreSQL libraries already on system, for building the
PostgreSQL-SDBC
+ extension. If pg_config is not in PATH, use PGCONFIG to point to
it.]),,
+[with_system_postgresql=$with_system_libs])
+
+AC_ARG_WITH(libpq-path,
+AS_HELP_STRING([--with-libpq-path],
+[Use this PostgreSQL C interface (libpq) installation for building
+ the PostgreSQL-SDBC extension.])
+[
+ Usage: --with-libpq-path=absolute path to
+ your libq installation
+],
+,)
+
AC_ARG_WITH(system-hsqldb,
AS_HELP_STRING([--with-system-hsqldb],
[Use hsqldb already on system.]),,
@@ -5218,7 +5235,7 @@ if test $ENABLE_MYSQLC = YES; then
dnl ===
dnl Check for system MySQL
dnl ===
-AC_MSG_CHECKING([for mysql pre-requisites])
+AC_MSG_CHECKING([for MySQL prerequisites])
if test $with_system_mysql = yes; then
AC_MSG_RESULT([external MySQL])
SYSTEM_MYSQL=YES
@@ -5365,23 +5382,44 @@ dnl Check for PostgreSQL stuff
dnl ===
if test x$enable_ext_postgresql_sdbc = xyes; then
-AC_PATH_PROG(PGCONFIG, pg_config)
-if test -z $PGCONFIG; then
-AC_MSG_ERROR([pg_config needed])
+AC_MSG_CHECKING([for PostgreSQL prerequisites])
+if test $with_system_postgresql = yes; then
+AC_MSG_RESULT([external PostgreSQL])
+SYSTEM_POSTGRESQL=YES
+AC_PATH_PROG(PGCONFIG, pg_config)
+if test -z $PGCONFIG; then
+ AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH])
+fi
+POSTGRESQL_INC=-I$(pg_config --includedir)
+POSTGRESQL_LIB=-L$(pg_config --libdir) -lpq
+else
+SYSTEM_POSTGRESQL=NO
+if test -n $with_libpq_path; then
+AC_MSG_RESULT([external libpq])
+POSTGRESQL_LIB=-L${with_libpq_path}/lib/ -lpq
+POSTGRESQL_INC=-I${with_libpq_path}/include/
+else
+AC_MSG_ERROR([not given. Please specify either
--with-system-postgresql or --with-libpq-path])
+fi
fi
+AC_MSG_CHECKING([for PostgreSQL C interface])
save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
save_LIBS=$LIBS
-CFLAGS=-I`pg_config --includedir`
+CPPFLAGS=${POSTGRESQL_INC}
+LIBS=${POSTGRESQL_LIB}
AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])],
[])
AC_CHECK_LIB(pq, PQconnectdbParams, [],
[AC_MSG_ERROR(libpq not found or too old. Need = 9.0)], [])
CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
LIBS=$save_LIBS
BUILD_POSTGRESQL_SDBC=YES
-SYSTEM_POSTGRESQL=YES # only option atm :-)
fi
AC_SUBST(BUILD_POSTGRESQL_SDBC)
AC_SUBST(SYSTEM_POSTGRESQL)
+AC_SUBST(POSTGRESQL_INC)
+AC_SUBST(POSTGRESQL_LIB)
dnl ===
dnl Check for system beanshell
diff --git a/connectivity/source/drivers/postgresql/makefile.mk
b/connectivity/source/drivers/postgresql/makefile.mk
index 8c8c022..8b02689 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -39,9 +39,6 @@ NO_DEFAULT_STL=TRUE
.IF $(BUILD_POSTGRESQL_SDBC) == YES
-.IF $(SYSTEM_POSTGRESQL) != YES
-.INCLUDE : $(SOLARINCDIR)$/postgresql/postgresql-version.mk
-.ENDIF
[Libreoffice-commits] .: 7 commits - basctl/Library_basctl.mk basctl/sdi basctl/source basctl/uiconfig officecfg/registry sfx2/inc sfx2/sdi
basctl/Library_basctl.mk |1
basctl/sdi/baside.sdi |5
basctl/source/basicide/baside2.cxx|5
basctl/source/basicide/baside2.hxx| 11 +
basctl/source/basicide/baside2b.cxx | 100
++
basctl/source/basicide/basides1.cxx | 41
basctl/source/basicide/linenumberwindow.cxx | 94
+
basctl/source/basicide/linenumberwindow.hxx | 32
+++
basctl/source/inc/basidesh.hxx|1
basctl/uiconfig/basicide/menubar/menubar.xml |1
officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |6
sfx2/inc/sfx2/sfxsids.hrc |3
sfx2/sdi/sfx.sdi | 24 ++
13 files changed, 290 insertions(+), 34 deletions(-)
New commits:
commit ae78e3e913f39e2cc6d2b6f83f38c2ea225ab53e
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Nov 17 18:38:37 2011 -0600
fix issue with unsupported typedef on Mac
diff --git a/basctl/source/basicide/linenumberwindow.cxx
b/basctl/source/basicide/linenumberwindow.cxx
index deba85d..fb7bed6 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -30,12 +30,12 @@ void LineNumberWindow::Paint( const Rectangle )
GetParent()-Resize();
- ulong windowHeight = GetOutputSize().Height();
- ulong nLineHeight = GetTextHeight();
+ int windowHeight = GetOutputSize().Height();
+ int nLineHeight = GetTextHeight();
- ulong startY = txtView-GetStartDocPos().Y();
- ulong nStartLine = startY / nLineHeight + 1;
- ulong nEndLine = (startY + windowHeight) / nLineHeight + 1;
+ int startY = txtView-GetStartDocPos().Y();
+ int nStartLine = startY / nLineHeight + 1;
+ int nEndLine = (startY + windowHeight) / nLineHeight + 1;
if(txtEngine-GetParagraphCount() + 1 nEndLine)
nEndLine = txtEngine-GetParagraphCount() + 1;
@@ -43,7 +43,7 @@ void LineNumberWindow::Paint( const Rectangle )
nWidth = String::CreateFromInt64(nEndLine).Len() * 10;
sal_Int64 y = (nStartLine - 1) * nLineHeight;
- for(ulong i = nStartLine; i = nEndLine; ++i, y += nLineHeight)
+ for(int i = nStartLine; i = nEndLine; ++i, y += nLineHeight)
DrawText(Point(0, y - nCurYOffset), String::CreateFromInt64(i));
}
@@ -88,7 +88,7 @@ bool LineNumberWindow::SyncYOffset()
return true;
}
-ulong LineNumberWindow::GetWidth()
+int LineNumberWindow::GetWidth()
{
return (nWidth 20 ? 20 : nWidth);
}
diff --git a/basctl/source/basicide/linenumberwindow.hxx
b/basctl/source/basicide/linenumberwindow.hxx
index fd30171..b94fae9 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -9,7 +9,7 @@ class LineNumberWindow : public Window
{
private:
ModulWindow* pModulWindow;
- ulong nWidth;
+ int nWidth;
long nCurYOffset;
virtual void DataChanged(DataChangedEvent const rDCEvt);
@@ -26,7 +26,7 @@ public:
bool SyncYOffset();
long GetCurYOffset();
- ulong GetWidth();
+ int GetWidth();
};
#endif // BASICIDE_LINENUMBERWINDOW_HXX
commit cc09ce22e9404e7aa6c8b27dbe675a447a95eb05
Author: August Sodora aug...@gmail.com
Date: Thu Nov 17 00:42:15 2011 -0500
Removed unused includes
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index a80e9e4..1fb174a 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -29,44 +29,38 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include precompiled_basctl.hxx
-#include vector
#define _BASIC_TEXTPORTIONS
-#include basic/sbdef.hxx
-#include ide_pch.hxx
+#include helpid.hrc
+#include baside2.hrc
-#include tools/urlobj.hxx
-#include unotools/charclass.hxx
-#include svl/urihelper.hxx
-#include basic/sbx.hxx
+#include baside2.hxx
+#include basobj.hxx
+#include brkdlg.hxx
+#include iderdll.hxx
+#include iderdll2.hxx
+#include objdlg.hxx
+
+#include basic/sbmeth.hxx
+#include basic/sbuno.hxx
+#include com/sun/star/script/XLibraryContainer2.hpp
+#include comphelper/processfactory.hxx
+#include comphelper/string.hxx
+#include sfx2/dispatch.hxx
+#include sfx2/viewfrm.hxx
+#include vcl/msgbox.hxx
#include vcl/sound.hxx
+#include svl/urihelper.hxx
#include svtools/xtextedt.hxx
#include svtools/txtattr.hxx
#include svtools/textwindowpeer.hxx
-#include basic/sbuno.hxx
-
-#include helpid.hrc
-#include baside2.hrc
-#include baside2.hxx
-#include brkdlg.hxx
-#include objdlg.hxx
-#include basobj.hxx
-#include iderdll.hxx
-#include iderdll2.hxx
#include vcl/taskpanelist.hxx
#include vcl/help.hxx
-
#include unotools/sourceviewconfig.hxx
[Libreoffice-commits] .: 2 commits - basctl/source
basctl/source/basicide/basides1.cxx |1
basctl/source/basicide/basidesh.cxx |9 ++
basctl/source/basicide/linenumberwindow.cxx | 106 +++-
basctl/source/basicide/linenumberwindow.hxx | 25 +++---
4 files changed, 82 insertions(+), 59 deletions(-)
New commits:
commit 6e6546a5f7fb30ab35dc52e148a20b9d6d3d70b8
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Nov 17 21:49:06 2011 -0600
calculate the width based on the font + general clean-up
diff --git a/basctl/source/basicide/linenumberwindow.cxx
b/basctl/source/basicide/linenumberwindow.cxx
index fb7bed6..f8f566d 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -5,90 +5,102 @@
#include svtools/textview.hxx
LineNumberWindow::LineNumberWindow( Window* pParent, ModulWindow* pModulWin ) :
- Window( pParent, WB_BORDER ),
- pModulWindow(pModulWin),
- nWidth(1),
- nCurYOffset(0)
+Window( pParent, WB_BORDER ),
+m_pModulWindow(pModulWin),
+m_nCurYOffset(0)
{
- SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetFieldColor()));
+SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetFieldColor()));
+m_nBaseWidth = GetTextWidth(String('8'));
+m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2;;
}
LineNumberWindow::~LineNumberWindow() { }
void LineNumberWindow::Paint( const Rectangle )
{
- if(SyncYOffset())
-return;
+if(SyncYOffset())
+return;
- ExtTextEngine* txtEngine = pModulWindow-GetEditEngine();
- if(!txtEngine)
-return;
+ExtTextEngine* txtEngine = m_pModulWindow-GetEditEngine();
+if(!txtEngine)
+return;
- TextView* txtView = pModulWindow-GetEditView();
- if(!txtView)
-return;
+TextView* txtView = m_pModulWindow-GetEditView();
+if(!txtView)
+return;
- GetParent()-Resize();
+GetParent()-Resize();
- int windowHeight = GetOutputSize().Height();
- int nLineHeight = GetTextHeight();
+int windowHeight = GetOutputSize().Height();
+int nLineHeight = GetTextHeight();
- int startY = txtView-GetStartDocPos().Y();
- int nStartLine = startY / nLineHeight + 1;
- int nEndLine = (startY + windowHeight) / nLineHeight + 1;
+int startY = txtView-GetStartDocPos().Y();
+int nStartLine = startY / nLineHeight + 1;
+int nEndLine = (startY + windowHeight) / nLineHeight + 1;
- if(txtEngine-GetParagraphCount() + 1 nEndLine)
-nEndLine = txtEngine-GetParagraphCount() + 1;
+if(txtEngine-GetParagraphCount() + 1 (unsigned int)nEndLine)
+nEndLine = txtEngine-GetParagraphCount() + 1;
- nWidth = String::CreateFromInt64(nEndLine).Len() * 10;
+// FIXME: it would be best if we could get notified of a font change
+// rather than doing that re-calculation at each Paint event
+m_nBaseWidth = GetTextWidth(String('8'));
- sal_Int64 y = (nStartLine - 1) * nLineHeight;
- for(int i = nStartLine; i = nEndLine; ++i, y += nLineHeight)
-DrawText(Point(0, y - nCurYOffset), String::CreateFromInt64(i));
+// reserve enough for 3 sigit minimum, with a bit to spare for confort
+m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2;
+int i = (nEndLine + 1) / 1000;
+while(i)
+{
+i /= 10;
+m_nWidth += m_nBaseWidth;
+}
+
+sal_Int64 y = (nStartLine - 1) * nLineHeight;
+for(int i = nStartLine; i = nEndLine; ++i, y += nLineHeight)
+DrawText(Point(0, y - m_nCurYOffset), String::CreateFromInt32(i));
}
void LineNumberWindow::DataChanged(DataChangedEvent const rDCEvt)
{
- Window::DataChanged(rDCEvt);
- if (rDCEvt.GetType() == DATACHANGED_SETTINGS
- (rDCEvt.GetFlags() SETTINGS_STYLE) != 0)
- {
-Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
-if (aColor != rDCEvt.GetOldSettings()-GetStyleSettings().GetFieldColor())
+Window::DataChanged(rDCEvt);
+if (rDCEvt.GetType() == DATACHANGED_SETTINGS
+ (rDCEvt.GetFlags() SETTINGS_STYLE) != 0)
{
- SetBackground(Wallpaper(aColor));
- Invalidate();
+Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
+if (aColor !=
rDCEvt.GetOldSettings()-GetStyleSettings().GetFieldColor())
+{
+SetBackground(Wallpaper(aColor));
+Invalidate();
+}
}
- }
}
void LineNumberWindow::DoScroll(long nHorzScroll, long nVertScroll)
{
- nCurYOffset -= nVertScroll;
- Window::Scroll(nHorzScroll, nVertScroll);
+m_nCurYOffset -= nVertScroll;
+Window::Scroll(nHorzScroll, nVertScroll);
}
long LineNumberWindow::GetCurYOffset()
{
- return nCurYOffset;
+return m_nCurYOffset;
}
bool LineNumberWindow::SyncYOffset()
{
- TextView* pView = pModulWindow-GetEditView();
- if (!pView)
-return false;
+TextView* pView = m_pModulWindow-GetEditView();
+if (!pView)
+return false;
- long nViewYOffset = pView-GetStartDocPos().Y();
- if (nCurYOffset == nViewYOffset)
-return
[Libreoffice-commits] .: basic/source
basic/source/comp/scanner.cxx | 13 +
1 file changed, 1 insertion(+), 12 deletions(-)
New commits:
commit f3098a52b93fe25af34e7edd5104c4e47370cfac
Author: August Sodora aug...@gmail.com
Date: Thu Nov 17 23:06:47 2011 -0500
Removed unused headers
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 91f4a04..4305e8a 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -30,19 +30,8 @@
#include precompiled_basic.hxx
#include sbcomp.hxx
-#include stdio.h
-#include string.h
-#include ctype.h
-#if defined UNX
-#include stdlib.h
-#else
-#include math.h // atof()
-#endif
-#include rtl/math.hxx
-#include vcl/svapp.hxx
-#include unotools/charclass.hxx
-#include runtime.hxx
+#include vcl/svapp.hxx
SbiScanner::SbiScanner( const ::rtl::OUString rBuf, StarBASIC* p ) : aBuf(
rBuf )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/qa basic/source
basic/qa/cppunit/test_scanner.cxx | 50 ++
basic/source/comp/scanner.cxx | 22 +++-
2 files changed, 65 insertions(+), 7 deletions(-)
New commits:
commit c8f0503a1b2ab399468125288803d16802064c94
Author: August Sodora aug...@gmail.com
Date: Fri Nov 18 01:20:36 2011 -0500
Cleanup GetSuffixType in basic scanner
diff --git a/basic/qa/cppunit/test_scanner.cxx
b/basic/qa/cppunit/test_scanner.cxx
index 25f5147..dd46b7a 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -36,6 +36,7 @@ namespace
void testGoto();
void testExclamation();
void testNumbers();
+void testDataType();
// Adds code needed to register the test suite
CPPUNIT_TEST_SUITE(ScannerTest);
@@ -48,6 +49,7 @@ namespace
CPPUNIT_TEST(testGoto);
CPPUNIT_TEST(testExclamation);
CPPUNIT_TEST(testNumbers);
+CPPUNIT_TEST(testDataType);
// End of test suite definition
CPPUNIT_TEST_SUITE_END();
@@ -564,6 +566,54 @@ namespace
CPPUNIT_ASSERT(symbols[1].text == cr);
}
+ void ScannerTest::testDataType()
+ {
+const rtl::OUString source1(RTL_CONSTASCII_USTRINGPARAM(asdf%));
+const rtl::OUString source2(RTL_CONSTASCII_USTRINGPARAM(asdf));
+const rtl::OUString source3(RTL_CONSTASCII_USTRINGPARAM(asdf!));
+const rtl::OUString source4(RTL_CONSTASCII_USTRINGPARAM(asdf#));
+const rtl::OUString source5(RTL_CONSTASCII_USTRINGPARAM(asdf@));
+const rtl::OUString source6(RTL_CONSTASCII_USTRINGPARAM(asdf$));
+const rtl::OUString source7(RTL_CONSTASCII_USTRINGPARAM(asdf ));
+
+std::vectorSymbol symbols;
+
+symbols = getSymbols(source1);
+CPPUNIT_ASSERT(symbols.size() == 2);
+CPPUNIT_ASSERT(symbols[0].type == SbxINTEGER);
+CPPUNIT_ASSERT(symbols[1].text == cr);
+
+symbols = getSymbols(source2);
+CPPUNIT_ASSERT(symbols.size() == 2);
+CPPUNIT_ASSERT(symbols[0].type == SbxLONG);
+CPPUNIT_ASSERT(symbols[1].text == cr);
+
+symbols = getSymbols(source3);
+CPPUNIT_ASSERT(symbols.size() == 2);
+CPPUNIT_ASSERT(symbols[0].type == SbxSINGLE);
+CPPUNIT_ASSERT(symbols[1].text == cr);
+
+symbols = getSymbols(source4);
+CPPUNIT_ASSERT(symbols.size() == 2);
+CPPUNIT_ASSERT(symbols[0].type == SbxDOUBLE);
+CPPUNIT_ASSERT(symbols[1].text == cr);
+
+symbols = getSymbols(source5);
+CPPUNIT_ASSERT(symbols.size() == 2);
+CPPUNIT_ASSERT(symbols[0].type == SbxCURRENCY);
+CPPUNIT_ASSERT(symbols[1].text == cr);
+
+symbols = getSymbols(source6);
+CPPUNIT_ASSERT(symbols.size() == 2);
+CPPUNIT_ASSERT(symbols[0].type == SbxSTRING);
+CPPUNIT_ASSERT(symbols[1].text == cr);
+
+symbols = getSymbols(source7);
+CPPUNIT_ASSERT(symbols.size() == 2);
+CPPUNIT_ASSERT(symbols[0].type == SbxVARIANT);
+CPPUNIT_ASSERT(symbols[1].text == cr);
+ }
+
// Put the test suite in the registry
CPPUNIT_TEST_SUITE_REGISTRATION(ScannerTest);
} // namespace
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 4305e8a..3c2ec97 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -125,17 +125,25 @@ sal_Bool SbiScanner::DoesColonFollow()
}
// test for legal suffix
-
static SbxDataType GetSuffixType( sal_Unicode c )
{
-static String aSuffixesStr = String::CreateFromAscii( %!#@ $ );
-if( c )
+switch (c)
{
-sal_uInt32 n = aSuffixesStr.Search( c );
-if( STRING_NOTFOUND != n c != ' ' )
-return SbxDataType( (sal_uInt16) n + SbxINTEGER );
+case '%':
+return SbxDataType(SbxINTEGER);
+case '':
+return SbxDataType(SbxLONG);
+case '!':
+return SbxDataType(SbxSINGLE);
+case '#':
+return SbxDataType(SbxDOUBLE);
+case '@':
+return SbxDataType(SbxCURRENCY);
+case '$':
+return SbxDataType(SbxSTRING);
+default:
+return SbxDataType(SbxVARIANT);
}
-return SbxVARIANT;
}
// reading the next symbol into the variables aSym, nVal and eType
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/comp/scanner.cxx | 53 +-
basic/source/inc/scanner.hxx | 34 +-
2 files changed, 44 insertions(+), 43 deletions(-)
New commits:
commit 2edba1241274cc5eec1c9a5c440a15f8bda62aa6
Author: August Sodora aug...@gmail.com
Date: Fri Nov 18 01:53:30 2011 -0500
sal_Bool to bool
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 3c2ec97..5d1f36b 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -80,14 +80,14 @@ void SbiScanner::GenError( SbError code )
{
if( GetSbData()-bBlockCompilerError )
{
-bAbort = sal_True;
+bAbort = true;
return;
}
if( !bError bErrors )
{
-sal_Bool bRes = sal_True;
+bool bRes = true;
// report only one error per statement
-bError = sal_True;
+bError = true;
if( pBasic )
{
// in case of EXPECTED or UNEXPECTED it always refers
@@ -114,14 +114,15 @@ void SbiScanner::GenError( SbError code )
// used by SbiTokenizer::MayBeLabel() to detect a label
-
-sal_Bool SbiScanner::DoesColonFollow()
+bool SbiScanner::DoesColonFollow()
{
if( pLine *pLine == ':' )
{
-pLine++; nCol++; return sal_True;
+pLine++; nCol++;
+return true;
}
-else return sal_False;
+else
+return false;
}
// test for legal suffix
@@ -160,19 +161,19 @@ inline bool lclIsWhitespace( sal_Unicode cChar )
} // namespace
-sal_Bool SbiScanner::NextSym()
+bool SbiScanner::NextSym()
{
// memorize for the EOLN-case
sal_uInt16 nOldLine = nLine;
sal_uInt16 nOldCol1 = nCol1;
sal_uInt16 nOldCol2 = nCol2;
sal_Unicode buf[ BUF_SIZE ], *p = buf;
-bHash = sal_False;
+bHash = false;
eScanType = SbxVARIANT;
aSym = ::rtl::OUString();
bSymbol =
-bNumber = bSpaces = sal_False;
+bNumber = bSpaces = false;
// read in line?
if( !pLine )
@@ -180,7 +181,7 @@ sal_Bool SbiScanner::NextSym()
sal_Int32 n = nBufPos;
sal_Int32 nLen = aBuf.getLength();
if( nBufPos = nLen )
-return sal_False;
+return false;
const sal_Unicode* p2 = aBuf.getStr();
p2 += n;
while( ( n nLen ) ( *p2 != '\n' ) ( *p2 != '\r' ) )
@@ -206,7 +207,7 @@ sal_Bool SbiScanner::NextSym()
while( lclIsWhitespace( *pLine ) )
-pLine++, nCol++, bSpaces = sal_True;
+pLine++, nCol++, bSpaces = true;
nCol1 = nCol;
@@ -221,7 +222,7 @@ sal_Bool SbiScanner::NextSym()
{
pLine++;
nCol++;
-bHash = sal_True;
+bHash = true;
}
// copy character if symbol
@@ -231,7 +232,7 @@ sal_Bool SbiScanner::NextSym()
if( *pLine == '_' !*(pLine+1) )
{ pLine++;
goto eoln; }
-bSymbol = sal_True;
+bSymbol = true;
short n = nCol;
for ( ; (BasicSimpleCharClass::isAlphaNumeric( *pLine, bCompatible )
|| ( *pLine == '_' ) ); pLine++ )
nCol++;
@@ -296,13 +297,13 @@ sal_Bool SbiScanner::NextSym()
short ndig = 0;
short ncdig = 0;
eScanType = SbxDOUBLE;
-sal_Bool bBufOverflow = sal_False;
+bool bBufOverflow = false;
while( strchr( 0123456789.DEde, *pLine ) *pLine )
{
// from 4.1.1996: buffer full? - go on scanning empty
if( (p-buf) == (BUF_SIZE-1) )
{
-bBufOverflow = sal_True;
+bBufOverflow = true;
pLine++, nCol++;
continue;
}
@@ -337,7 +338,7 @@ sal_Bool SbiScanner::NextSym()
if (!exp) ndig++;
}
*p = 0;
-aSym = p; bNumber = sal_True;
+aSym = p; bNumber = true;
if( comma 1 || exp 1 )
{ aError = '.';
@@ -390,10 +391,10 @@ sal_Bool SbiScanner::NextSym()
aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM());
return SYMBOL;
}
-bNumber = sal_True;
+bNumber = true;
long l = 0;
int i;
-sal_Bool bBufOverflow = sal_False;
+bool bBufOverflow = false;
while( BasicSimpleCharClass::isAlphaNumeric( *pLine 0xFF,
bCompatible ) )
{
sal_Unicode ch = sal::static_int_cast sal_Unicode (
@@ -401,7 +402,7 @@ sal_Bool SbiScanner::NextSym()
pLine++; nCol++;
// from 4.1.1996: buffer full, go on scanning empty
if( (p-buf) == (BUF_SIZE-1) )
-bBufOverflow = sal_True;
+bBufOverflow = true;
else if( String( cmp ).Search( ch ) != STRING_NOTFOUND )
//else if( strchr( cmp, ch ) )
*p++ = ch;
@@ -434,7 +435,7 @@ sal_Bool SbiScanner::NextSym()
{
sal_Unicode cSep = *pLine;
if( cSep == '[' )
-bSymbol = sal_True,
Re: [Libreoffice] [PATCH/REVIEW-3-4] Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5)
On 11/11/2011 12:01 PM, Stephan Bergmann wrote: On 11/11/2011 11:12 AM, Cor Nouws wrote: Is included in the patch, that when a encrypted document is opened in 3.4.n and saved again, people are informed about the change in encryption? No. I see. When you modify and save an encrypted document, you are not asked for the password again, So to the user that does not appear like a save afresh as an encrypted document (in which case I would consider it plausible that the document is silently saved with the 3.4 encryption mechanism) but more like a plain update existing stored document. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] help asked/offered for bug 36555
Hello all, This bug (MS Access databases cannot be opened since LibO 3.4) is a serious problem for several cpmpanies that migrated from MS Office to LibO (including the company I work for). Comment 11 from Alex Thurgood gives a possible cause, but: -I am not familiar with the make system of LibO; -I am not sure is this can be tested on a Linux machine (I can't build a Windows version of LibO, I use openSUSE Linux); -I am still a newbie with hacking in LibO. However, I want to help wherever I can with this problem. Is there anyting I can do to (help) solve the bug, preferably with guidance from an expert? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] help asked/offered for bug 36555
Hi If you want to help, you need to get your hands on a Windows machine to test builds on. Preferably something with lots of cores and a reasonable amount of memory (4G or more) because the windows build is quite slow. Here are some links to help you get started with setting up a Windows machine: http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies http://wiki.documentfoundation.org/Development/Native_Build http://wiki.documentfoundation.org/Development/BuildingOnWindowsWithCygwinAndMSVCExpress Regards, Noel Grandin Winfried Donkers wrote: Hello all, This bug (MS Access databases cannot be opened since LibO 3.4) is a serious problem for several cpmpanies that migrated from MS Office to LibO (including the company I work for). Comment 11 from Alex Thurgood gives a possible cause, but: -I am not familiar with the make system of LibO; -I am not sure is this can be tested on a Linux machine (I can't build a Windows version of LibO, I use openSUSE Linux); -I am still a newbie with hacking in LibO. However, I want to help wherever I can with this problem. Is there anyting I can do to (help) solve the bug, preferably with guidance from an expert? Winfried ___ 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
Re: [Libreoffice] [PATCH] fix for fdo#40831 - Writer will crash when searching text with using regular expressions
Hi Michael, On Wed, 2011-11-16 at 16:20 +0100, Michael Stahl wrote: now i remember: this bug is exactly the one i fixed in OOo in CWS sw34bf04 (issue i102333). the fix is not merged in libreoffice-3-4, but is in master (230fcf4a456636bb466f72834cd57238621d206d), but LO master still crashes while an Apache OOo 3.4 build does not crash... i will investigate what went wrong there; Cedric, any idea what changes could have broken it again? No, I have no idea what could have broken that again. i am currently not sure if your patch is the right fix; i would assume that the cursor that points to the removed node should have been moved away from it by ... something. Well, Tomofumi's patch looks like on more safety check in that couldn't harm. I'ld go for pushing his (second) patch. Regards, -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] need some explaination on formatclipboard.[hc]xx
Hi Maxime, On Wed, 2011-11-16 at 18:50 +0100, Maxime de Roucy wrote: I would like to understand how writer format paintbrush. I think it bug on some case and I would like to write a patch, but I am new at libreoffice developpement. I managed to locate via gdb the format paintbrush classe in formatclipboard.hxx. I understand basically how it work but it would be easier if someone could explain me what is the SfxItemSet : m_pItemSet and m_pTableItemSet. An SfxItemSet is a set of properties. This is used to store all the formatting properties all over LibreOffice. You can find a gdb function to see what is inside an SfxItemSet here (dump_pSfxItemSet): http://cgit.freedesktop.org/libreoffice/build/tree/scratch/writer/gdbinit-cbosdo I hope this helps, -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] Improving the QA and Release for 3.5
On 16/11/11 19:59, Petr Mladek wrote: I am surprised that anyone still uses it. The following two bugs makes me feel that it does not work for LO-3.4 and master: testtool should work ( afaik ) on 3.4 ( I thought I fixed it there ), of course there may be some tests that somehow now don't work due to some other error or maintenance creep. On Master it is still broken, some effort is needed to make it work, I don't believe the effort is worth it AFAIK, developers does not like it. My understanding of the problems is summarized at http://wiki.documentfoundation.org/QA/Testing/Using_Testtool#IMPORTANT:_Obsoleted_by_Unit_tests_and_Subsequenttests +1 ;-) Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PostgreSQL-SDBC in LO: build system help
Hi Lionel, On Wed, Nov 16, 2011 at 4:22 PM, Lionel Elie Mamane lio...@mamane.lu wrote: I'd like some help from a LO build system expert to make postgresql-sdbc well-behaved in this other and build-related respects: attache a patch that make building it conditional. few questions/remarks (mostly on the form, rather than on substance... I only glanced at the commits) Is there a reason why did you not push it as a feature branch on our own git ? 5a2b8cba519bb9d34d3a28a51adcda334147096f: Humm, not sure you can do that, but even if you could, removing SISSL is not a good idea since that is what allow that code to be merged in libreoffice (which is MPL/LGPLv3+) nitpick: f1127d15dfa2cf03cb4a0c79bc2ddf332b8d6093 and later: @@ -1,42 +1,42 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; eval:(c-set-style bsd); tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ please don't do that. I have a style set to what works for me, it is no nice to try to force another on me. (note that I'm actually fine with the bsd-style you picked there... but that is not the point) that tagline line was meant to force only the 'mandatory part' : no tabs and indent of 4. Norbert From 401a9fe32c707b066dc8ab084b13cb3bc845a225 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud nthieb...@gmail.com Date: Thu, 17 Nov 2011 03:18:49 -0600 Subject: [PATCH] make postgresql-sdbc connectivity optional --- configure.in | 34 +--- connectivity/source/drivers/postgresql/makefile.mk |5 +++ set_soenv.in |1 + 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index d586b46..e75548b 100644 --- a/configure.in +++ b/configure.in @@ -359,6 +359,11 @@ AC_ARG_ENABLE(ext-pdfimport, [Disable the PDF Import extension.]) ) +AC_ARG_ENABLE(ext-postgresql-sdbc, +AS_HELP_STRING([--enable-ext-postgresql-sdbc], +[Enable the build of the PostgreSQL sdbc extension.]) +) + AC_ARG_ENABLE(ext-presenter-console, AS_HELP_STRING([--disable-ext-presenter-console], [Disable the Presenter Console extension.]) @@ -5358,19 +5363,24 @@ fi dnl === dnl Check for PostgreSQL stuff dnl === -AC_PATH_PROG(PGCONFIG, pg_config) -if test -z $PGCONFIG; then -AC_MSG_ERROR([pg_config needed]) -fi -save_CFLAGS=$CFLAGS -save_LIBS=$LIBS -CFLAGS=-I`pg_config --includedir` -AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], []) -AC_CHECK_LIB(pq, PQconnectdbParams, [], -[AC_MSG_ERROR(libpq not found or too old. Need = 9.0)], []) -CFLAGS=$save_CFLAGS -LIBS=$save_LIBS -SYSTEM_POSTGRESQL=YES # only option atm :-) + +if test x$enable_ext_postgresql_sdbc = xyes; then +AC_PATH_PROG(PGCONFIG, pg_config) +if test -z $PGCONFIG; then +AC_MSG_ERROR([pg_config needed]) +fi +save_CFLAGS=$CFLAGS +save_LIBS=$LIBS +CFLAGS=-I`pg_config --includedir` +AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], []) +AC_CHECK_LIB(pq, PQconnectdbParams, [], +[AC_MSG_ERROR(libpq not found or too old. Need = 9.0)], []) +CFLAGS=$save_CFLAGS +LIBS=$save_LIBS +BUILD_POSTGRESQL_SDBC=YES +SYSTEM_POSTGRESQL=YES # only option atm :-) +fi +AC_SUBST(BUILD_POSTGRESQL_SDBC) AC_SUBST(SYSTEM_POSTGRESQL) dnl === diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 43b4d5d..8c8c022 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -36,6 +36,9 @@ NO_DEFAULT_STL=TRUE # --- Settings - .INCLUDE : settings.mk + +.IF $(BUILD_POSTGRESQL_SDBC) == YES + .IF $(SYSTEM_POSTGRESQL) != YES .INCLUDE : $(SOLARINCDIR)$/postgresql/postgresql-version.mk .ENDIF @@ -145,6 +148,8 @@ SLOFILES= $(LIB1OBJFILES) $(LIB2OBJFILES) DRIVERNAME=postgresql-sdbc-$(PQ_SDBC_VERSION).oxt ALLTAR : $(DLLDEST)$/$(DRIVERNAME) +.ENDIF # BUILD_POSTGRESQL_SDBC + # --- Targets -- .INCLUDE : target.mk diff --git a/set_soenv.in b/set_soenv.in index 8538419..78bc704 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -2002,6 +2002,7 @@ ToFile( XINERAMA_LINK, @XINERAMA_LINK@,e ); ToFile( SYSTEM_REDLAND,@SYSTEM_REDLAND@, e ); ToFile( REDLAND_CFLAGS,@REDLAND_CFLAGS@, e ); ToFile( REDLAND_LIBS, @REDLAND_LIBS@, e ); +ToFile( BUILD_POSTGRESQL_SDBC, @BUILD_POSTGRESQL_SDBC@, e ); ToFile( SYSTEM_POSTGRESQL, @SYSTEM_POSTGRESQL@, e ); ToFile( SYSTEM_HUNSPELL, @SYSTEM_HUNSPELL@, e ); ToFile( HUNSPELL_CFLAGS, @HUNSPELL_CFLAGS@, e );
Re: [Libreoffice] [PUSHED][PATCH] Word count dialog modeless
On Thu, 2011-11-03 at 23:09 +0100, Jean-Baptiste Faure wrote: - I do not know if it possible to make the window resizable, in order do not mask the text area Should put resizability aside for the moment. That's a long-standing general problem with nearly all our dialogs which needs a some general work to give a generic solution. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] help asked/offered for bug 36555
This bug (MS Access databases cannot be opened since LibO 3.4) is a serious problem for several cpmpanies that migrated from MS Office to LibO (including the company I work for). Comment 11 from Alex Thurgood gives a possible cause, but: -I am not familiar with the make system of LibO; -I am not sure is this can be tested on a Linux machine (I can't build a Windows version of LibO, I use openSUSE Linux); -I am still a newbie with hacking in LibO. However, I want to help wherever I can with this problem. Is there anyting I can do to (help) solve the bug, preferably with guidance from an expert? If you want to help, you need to get your hands on a Windows machine to test builds on. Preferably something with lots of cores and a reasonable amount of memory (4G or more) because the windows build is quite slow. Sorry, I don't have a Windows machine available with lots of cores and memory. Neither do we have MSVC++. I'll have to wait till someone who does have such a machine (and time) picks up the bug... Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] help asked/offered for bug 36555
Hi You don't need to pay for MSVC - there is a free Express version available (I'm using it). And if your machine is slower, it just means it'll take a little longer to give feedback. Even an older Windows-XP machine will do fine for this purpose. Really, there are not that many LibreOffice developers around. Your bug won't get priority unless either (a) you step in and at least help with running test, or (b) your company pays SUSE/Redhat to allocate one of their developers to it. -- Noel Grandin Winfried Donkers wrote: Sorry, I don't have a Windows machine available with lots of cores and memory. Neither do we have MSVC++. I'll have to wait till someone who does have such a machine (and time) picks up the bug. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] [PATCH] translated comments from german to english
On 17/11/11 06:45, Winfried Donkers wrote: Some more translated files. This and subsequent contributions submitted under LGPL3+ / MPL. PUSHED with some minor changes, I just tweaked some spelling and rephrased something here and there as I scanned the translations, since I don't speak German I have no idea how accurate the translations are :-) but they seemed to make mostly sense to me :-))) thanks again!! Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEWED] Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5)
Hi Stephan, On Fri, 2011-11-11 at 10:50 +0100, Stephan Bergmann wrote: http://pkgs.fedoraproject.org/gitweb/?p=libreoffice.git;a=blob;f=Backport-reading-AES-encrypted-ODF-1.2-documents.patch;h=e6c722598ab05464f09787355b621cbb0aa07c49;hb=e7a803540d408adab3d55fb2ae051ac4be599a72 is a patch (actually, four separate patches for the components, lib-core, lib-gui, and ure repos) to backport support for reading (but not writing) AES-encrypted ODF 1.2 documents to libreoffice-3-4. Lovely ! :-) I finally got to review it. If people are happy with the linked patch: fine. If people would prefer a cherry-picking approach, I could post a list of relevant commits So - I think we don't have the resource to do much more than this. Clearly we are going to want some to ask for some QA focus in 3.4.next around document encryption [ particularly interacting with signed documents from 3.5 ]. (technically, I produced the patch in a different way, more or less applying mav60 to libreoffice-3-4 directly, so do not have that list handy). (And if there are objections against including this in the 3.4 code line at all, that would of course be fine as well.) Sorry for the delay; of course it is a big diff - in particular the rampant header movement is particularly unhelpful for being able to actually read what changed ;-) The removal of the XMemoryStream stuff is interesting too, I assume that is made redundant by some other seekable caching / fallback means. The property name defines clean up is nice but not needed. Anyhow - assuming it has been tested thoroughly (and I assume so since it's mostly 3.5 code being back-ported), and assuming we get some heavy QA for the next 3.4.x release in this area - I think we should get it in. The user experience regression of not being able to open newly encrypted documents - and with such an hideous error message (that we get without this fix) is just too bad :-) Out of interest - has Fedora shipped this yet ? and what was the feedback like ? 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: [Libreoffice] [PUSHED, partial] Remove NULL checks from delete
On Wed, 2011-11-16 at 21:05 -0500, Andrew Douglas Pitonyak wrote: I would feel safer if pointers were set to NULL (or nullptr if we support C++11) since it is not safe to delete a pointer twice. ?, convert all delete to e.g. DELETEZ, i.e. delete foo, foo = NULL ? Wouldn't be a fan of that, c++ is the language that it is, need to live with that and not try and make it something that it isn't. Setting a pointer to NULL after deleting the contents of the pointer is safe so that if you go to delete it again it is not a problem. Sure, it would be somewhat safer for some minority of cases. However the DELETEZ macro looks hyper-ugly in the code and makes it less readable. Hopefully we mostly delete things in destructors - where DELETEZ is a waste of time - we can have our (sadly) custom allocator wipe or invalidate the memory post delete in a single line of code if we want to (actually we should prolly do that as an easy-hack if it is not there already ;-). If we have a bug whereby something is deleted in-the code without being re-assigned, and where NULL is a valid value, then we could fix those with a DELETEZ construct, but - finding those places (that don't already have a subsequent assignment) is prolly more exciting :-) In theory some code analysis framework could help find those guys. Does that give more detail ? Anyhow, thanks for your nice code cleanup ! it's nice to see. 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: [Libreoffice] [Libreoffice-qa] [REVIEWED] Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5)
On Thu, 2011-11-17 at 10:10 +, Michael Meeks wrote: Out of interest - has Fedora shipped this yet ? and what was the feedback like ? It's in rawhide, i.e. will-be-F17, so its out there in our development series with no obvious cockups yet, but no massive testing yet in production series. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] ReleaseNotes wiki page function
Hi Olivier, This basically comes down to: who is Lboccia in the wiki ? On Wed, 2011-11-16 at 20:55 -0200, Olivier Hallot wrote: I see in the 3.5 features page the following (http://wiki.documentfoundation.org/ReleaseNotes/3.5 ): :-) Hide default extensions: default extensions can be hidden in the extension window. See attached image. This looks like another addition by Lboccia - it'd be good to unwind who that is. They seem to have added a number of features that don't exist (along with some that do). I suspect some confusion as to the role of the page: which is clearly not speaking features into being ;-) Bug 39748 - [EasyHack] Cleanup extensions list ? Has this bug been solved? No - but it'd be great if you're on it :-) hopefully the code pointers are helpful there. Wrt. cleaning up the 3.5 features page I did some more dung-out: This: * Blocks gallery: :Each user could create a block from a group of objects and to share it with other users through the DocumentFoundation server. In such a way, there will be the possibility to have a big online clipart gallery directly available in Libreoffice. Blocks will be collected in galleries and they can be simply inserted in other designs. Doesn't exist either AFAICS, and is clearly highly aspirational. The document comparison stuff looks like a (nice) UI mockup as well, that shouldn't be there (already removed). Other examples are: http://wiki.documentfoundation.org/index.php?title=ReleaseNotes/3.5diff=prevoldid=36752 Are these two accurate: http://wiki.documentfoundation.org/index.php?title=ReleaseNotes/3.5diff=prevoldid=34990 http://wiki.documentfoundation.org/index.php?title=ReleaseNotes/3.5diff=prevoldid=34987 Or just wish-list items ? :-) So - I think there was just some confusion about the function of the page (sadly). I've clarified the rubric at the top to make it clearer (I hope): that it refers to new features that really exist already. Hopefully the text is also improved so it reflects reality again. It is sad however to have pointed people at this page and not noticed this inaccuracy for a while; still - our official release notes should be accurate now, and there are more features missing from that page. 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: [Libreoffice] help asked/offered for bug 36555
Le 17/11/11 09:11, Winfried Donkers a écrit : Hi Winfried, Comment 11 from Alex Thurgood gives a possible cause, but: What we need is for someone to test it with a recent daily build on Windows from master, because it might already be fixed. Only then is it worthwhile investigating further. I don't recall that you could ever read MDB files from within OOo/LO on Linux (or Mac for that matter). There was a vague attempt to integrate MDB read capabilities into OOo, but I thought that faded out and certainly never got integrated into the main branch (unless some Linux distros did it ?). Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] License statement: Canonical
Hi all, for reference: All contributions past and present made to LibreOffice from Canonical are available under the terms the MPL / LGPLv3+. Until further notice, future contributions made to LibreOffice from Canonical are available under the terms the MPL / LGPLv3+. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Hide default extensions: default extensions can be hidden in the extension window. See attached image
On Wed, 2011-11-16 at 20:55 -0200, Olivier Hallot wrote: Hi I see in the 3.5 features page the following (http://wiki.documentfoundation.org/ReleaseNotes/3.5 ): Hide default extensions: default extensions can be hidden in the extension window. See attached image. is this Bug 39748 - [EasyHack] Cleanup extensions list ? Looks like it, yeah. Has this bug been solved? No. Someone, probably well meaning, seems to have added some wish-list items rather than actually implemented items http://wiki.documentfoundation.org/index.php?title=ReleaseNotes/3.5diff=prevoldid=37195 removed now again. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] PostgreSQL-SDBC in LO: licensing
On Thu, Nov 17, 2011 at 03:22:33AM -0600, Norbert Thiebaud wrote:
On Wed, Nov 16, 2011 at 4:22 PM, Lionel Elie Mamane lio...@mamane.lu wrote:
postgresql-sdbc
few questions/remarks (mostly on the form, rather than on substance...
I only glanced at the commits)
5a2b8cba519bb9d34d3a28a51adcda334147096f:
Humm, not sure you can do that,
Sure I can: the code being *dual*-licensed means anybody legitly
getting a copy of the code can *choose* between obeying the LGPLv2.1
*OR* obeying the SISSL. I chose LGPLv2.1.
but even if you could, removing SISSL is not a good idea since that
is what allow that code to be merged in libreoffice (which is
MPL/LGPLv3+)
I understand you are saying that the SISSL allows us to relicense the
code under MPL/LGPLv3+; I'm not sure I agree. Could you please explain
why you think that is?
In particular, by (re)distributing the SISSL-covered code under
MPL/LGPLv3+, we allow downstream users to not obey the standards
body clause of the SISSL. And we are not allowed to allow others to
not obey that clause of the SISSL.
My intention/understanding is that mixing LO and postgresql-sdbc is
allowed because:
- LGPLv2.1 (covering postgresql-sdbc) allows to link nearly any code
against postgresql-sdbc.
- LGPLv3 (covering LO) allows to link nearly any code with it.
As to LO code that gets #include'd in postgresql-sdbc, it is
allowed under section 3 of the LGPLv3; we just have to state that
postgresql-sdbc is included with LO, and distribute a copy of the
LGPLv3 and of the GPL with LO.
People wanting to fork LO under the MPL and not under the LGPLv3(+)
may or may not have to forsake including postgresql-sdbc, I'm not
sure. A cursory glance at the MPL suggests it would be allowed.
nitpick: f1127d15dfa2cf03cb4a0c79bc2ddf332b8d6093 and later:
@@ -1,42 +1,42 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
+/* -*- Mode: C++; eval:(c-set-style bsd); tab-width: 4;
indent-tabs-mode: nil; c-basic-offset: 4 -*- */
please don't do that. I have a style set to what works for me, it is
no nice to try to force another on me.
that tagline line was meant to force only the 'mandatory part' : no
tabs and indent of 4.
Do you mean that you intend to write code in another style within the
same file? To me it seems bad practise to mix *different* styles
within the same file.
If not, well, the default emacs style (modified by tab-width=4,
indent-tabs-mode:nil and c-basic-offset: 4) does *not* match the style
of the existing code in that file, so it makes it harder than it has
to be to make modifications in that file: indentation is not a simple
matter of pressing the tab key, one has to do it manually for *every*
{} block. Why would we want to inconvenience contributors so?
The default emacs style would lead to:
if ( blah )
{
code;
}
I picked bsd because it matches the style that was already there, not
out of any personal taste.
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH/REVIEW-3-4] Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5)
On 11/11/11 10:50, Stephan Bergmann wrote: With LO 3.5 by default using (new in ODF 1.2) AES encryption for password-protected documents (instead of Blowfish as used in older versions), people still using LO 3.4 would be unable to open such documents. (And what's really ugly, all they would get is an incomprehensible error box Format error discovered in the file in sub-document styles.xml at 1,0 (row,col).) http://pkgs.fedoraproject.org/gitweb/?p=libreoffice.git;a=blob;f=Backport-reading-AES-encrypted-ODF-1.2-documents.patch;h=e6c722598ab05464f09787355b621cbb0aa07c49;hb=e7a803540d408adab3d55fb2ae051ac4be599a72 is a patch (actually, four separate patches for the components, lib-core, lib-gui, and ure repos) to backport support for reading (but not writing) AES-encrypted ODF 1.2 documents to libreoffice-3-4. It is effectively all of CWS mav60 plus one additional typo fix, minus the writing support from mav60, and as such is quite large. usually i would be concerned about integrating a patch of this size into 3.4, but i think there are significant interop benefits in this case, so i am all for it. also, the CWS mav60 is already integrated in AOOo, so it will be part of their 3.4 release (whenever that is...). An alternative might be to cherry-pick the relevant commits from master into libreoffice-3-4, but that would have the drawback that it would cause later LO 3.4.y to write password-protected ODF documents using AES which earlier LO 3.4.x could no longer open---something that might not be desirable for a micro update. Plus, the number of commits that would need to be picked would be quite large, too (the individual commits of mav60 are quite intertwined). If people are happy with the linked patch: fine. If people would prefer a cherry-picking approach, I could post a list of relevant commits (technically, I produced the patch in a different way, more or less applying mav60 to libreoffice-3-4 directly, so do not have that list handy). (And if there are objections against including this in the 3.4 code line at all, that would of course be fine as well.) actually i'd prefer something that is ~close to the whole thing, because we don't have the original author around, and i guess there is probably a risk of missing some inter-dependencies when cherry-picking. regards, michael PS: just let me add a lament that the ManifestImport class also follows the ridiculous pattern of having dozens of constant string instance members... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PostgreSQL-SDBC in LO: licensing
On Thu, Nov 17, 2011 at 5:05 AM, Lionel Elie Mamane lio...@mamane.lu wrote:
On Thu, Nov 17, 2011 at 03:22:33AM -0600, Norbert Thiebaud wrote:
On Wed, Nov 16, 2011 at 4:22 PM, Lionel Elie Mamane lio...@mamane.lu wrote:
postgresql-sdbc
few questions/remarks (mostly on the form, rather than on substance...
I only glanced at the commits)
5a2b8cba519bb9d34d3a28a51adcda334147096f:
Humm, not sure you can do that,
Sure I can: the code being *dual*-licensed means anybody legitly
getting a copy of the code can *choose* between obeying the LGPLv2.1
*OR* obeying the SISSL. I chose LGPLv2.1.
And that is a problem, because that is not compatible with the project license.
but even if you could, removing SISSL is not a good idea since that
is what allow that code to be merged in libreoffice (which is
MPL/LGPLv3+)
I understand you are saying that the SISSL allows us to relicense the
code under MPL/LGPLv3+; I'm not sure I agree. Could you please explain
why you think that is?
In particular, by (re)distributing the SISSL-covered code under
MPL/LGPLv3+, we allow downstream users to not obey the standards
body clause of the SISSL. And we are not allowed to allow others to
not obey that clause of the SISSL.
The least of 2 'evils': we are LGPLv3+ + MPL that can't work at all with LGPLv2
OTOH SISSL explicitly permit integration under a bigger work with the
license of the bigger work, provided that SSIL is respected for the
piece
inserted. The 'obey standard' clause is weird, but irrelevant here
because the only thing it does is force copyleft, which we already
are.
Do you mean that you intend to write code in another style within the
same file? To me it seems bad practise to mix *different* styles
within the same file.
If not, well, the default emacs style (modified by tab-width=4,
indent-tabs-mode:nil and c-basic-offset: 4) does *not* match the style
of the existing code in that file, so it makes it harder than it has
to be to make modifications in that file: indentation is not a simple
matter of pressing the tab key, one has to do it manually for *every*
{} block. Why would we want to inconvenience contributors so?
The default emacs style would lead to:
The 'factory' default yes, but the 'the default'. my .emacs is set the
way I like it, and it behave the way I am accustomed to (I used a
customized ellemtel for instance)
The 'use the local style' recommendation is my responsibility to
enforce, selectively I might add.
If you want to set-up your emacs to use the built-in bsd style, please
by all means to so, but in your own .emacs
Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] [PATCH] translated comments from german to english
PUSHED with some minor changes, I just tweaked some spelling and rephrased something here and there as I scanned the translations, since I don't speak German I have no idea how accurate the translations are :-) but they seemed to make mostly sense to me :-))) As neither German nor English is my native language (being Dutch), any correction done by a native English speaker (you get my meaning) is likely to be an improvement:) thanks again!! You're welcome. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] [PATCH] Make the toolbars not popping-up randomly
On 16/11/11 19:12, Tim Hardeck wrote: Hi, [...] This change should also have no influence on the user configuration since these files are only relevant for the default settings. true, so pushed, hopefully the new defaults will help Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] help asked/offered for bug 36555
You don't need to pay for MSVC - there is a free Express version available (I'm using it). And if your machine is slower, it just means it'll take a little longer to give feedback. Even an older Windows-XP machine will do fine for this purpose. I will try to set up a Windows machine for building LibreOffice. It'll take some time, but when I succeed I will get back to you with feedback (or questions). Winfried Donkers ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] [REVIEWED] Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5)
On Thu, 2011-11-17 at 10:30 +, Caolán McNamara wrote: On Thu, 2011-11-17 at 10:10 +, Michael Meeks wrote: Out of interest - has Fedora shipped this yet ? and what was the feedback like ? It's in rawhide, i.e. will-be-F17, so its out there in our development series with no obvious cockups yet, but no massive testing yet in production series. Thanks, we get some good bug reports from rawhide I guess, so that is encouraging. Being of a lazy disposition, it'd be wonderful if you / Stephan could cherry-pick / merge the patch to libreoffice-3-4 :-) 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: [Libreoffice] help asked/offered for bug 36555
Hi Excellent. Feel free to ask for help if you get stuck setting it up. -- Noel Grandin Alexander Thurgood wrote: Le 17/11/11 09:11, Winfried Donkers a écrit : Hi Winfried, Comment 11 from Alex Thurgood gives a possible cause, but: What we need is for someone to test it with a recent daily build on Windows from master, because it might already be fixed. Only then is it worthwhile investigating further. I don't recall that you could ever read MDB files from within OOo/LO on Linux (or Mac for that matter). There was a vague attempt to integrate MDB read capabilities into OOo, but I thought that faded out and certainly never got integrated into the main branch (unless some Linux distros did it ?). Alex ___ 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
[Libreoffice] [PATCH] FDO #40505 - UI: HYPHENATION Right/Left arrow key reversed (keyboard)
Hi,
I did a small patch to fix
https://bugs.freedesktop.org/show_bug.cgi?id=40505
The patch fixes the issue with the reversed Right/Left arrow keys
without affecting
the Right/Left buttons in the dialog. It's a small fix were only to
lines of code is changed.
It's my first contribution to the source of LO so I hope I've done
everything correctly.
Please let me know otherwise.
Thanks,
Niklas Johansson
From cbfebdf8f18aa0e1a3c05f6c8b22715a0e1a3721 Mon Sep 17 00:00:00 2001
From: Niklas Johansson niklas@niklas-VirtualBox.(none)
Date: Mon, 7 Nov 2011 16:51:27 +0100
Subject: [PATCH] Fixed for bug 40505 UI: HYPHENATION Right/Left arrow key
reversed (keyboard)
SvxHyphenWordDialog::SelLeft() and SvxHyphenWordDialog::SelRight() was
reversed witch caused the arrowkeys to be reversed in the hyphenation
dialog.
---
cui/source/dialogs/hyphen.cxx |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 1b9b63b..da10e83 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -640,13 +640,13 @@ void SvxHyphenWordDialog::SetWindowTitle( LanguageType
nLang )
void SvxHyphenWordDialog::SelLeft()
{
-m_pImpl-SelRight_Impl();
+m_pImpl-SelLeft_Impl();
}
void SvxHyphenWordDialog::SelRight()
{
-m_pImpl-SelLeft_Impl();
+m_pImpl-SelRight_Impl();
}
--
1.7.5.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] [REVIEWED] Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5)
On 11/17/2011 12:42 PM, Michael Meeks wrote: On Thu, 2011-11-17 at 10:30 +, Caolán McNamara wrote: On Thu, 2011-11-17 at 10:10 +, Michael Meeks wrote: Out of interest - has Fedora shipped this yet ? and what was the feedback like ? It's in rawhide, i.e. will-be-F17, so its out there in our development series with no obvious cockups yet, but no massive testing yet in production series. Thanks, we get some good bug reports from rawhide I guess, so that is encouraging. Being of a lazy disposition, it'd be wonderful if you / Stephan could cherry-pick / merge the patch to libreoffice-3-4 :-) Yes, I can do the inclusion into -3-4. AFAIU, Michael Stahl was also just looking at the patch, will wait until he gives a green light, too. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] help asked/offered for bug 36555
Just to remind what said Jan, there's the url http://dev-builds.libreoffice.org/daily/ where daily builds can be found. About Windows, Voreppe and Windows_2008R2/ have something to test. Now if there's a backtrace, we won't have symbols to help (will we ?). -- View this message in context: http://nabble.documentfoundation.org/help-asked-offered-for-bug-36555-tp3515065p3515706.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PostgreSQL-SDBC in LO: licensing
On Thu, Nov 17, 2011 at 05:33:48AM -0600, Norbert Thiebaud wrote: On Thu, Nov 17, 2011 at 5:05 AM, Lionel Elie Mamane lio...@mamane.lu wrote: On Thu, Nov 17, 2011 at 03:22:33AM -0600, Norbert Thiebaud wrote: On Wed, Nov 16, 2011 at 4:22 PM, Lionel Elie Mamane lio...@mamane.lu wrote: postgresql-sdbc few questions/remarks (mostly on the form, rather than on substance... I only glanced at the commits) 5a2b8cba519bb9d34d3a28a51adcda334147096f: Humm, not sure you can do that, Sure I can: the code being *dual*-licensed means anybody legitly getting a copy of the code can *choose* between obeying the LGPLv2.1 *OR* obeying the SISSL. I chose LGPLv2.1. And that is a problem, because that is not compatible with the project license. Obviously, if it is useful or necessary to include the code in LO, I agree to keep SISSL. I just didn't think it is. but even if you could, removing SISSL is not a good idea since that is what allow that code to be merged in libreoffice (which is MPL/LGPLv3+) I understand you are saying that the SISSL allows us to relicense the code under MPL/LGPLv3+; I'm not sure I agree. Could you please explain why you think that is? In particular, by (re)distributing the SISSL-covered code under MPL/LGPLv3+, we allow downstream users to not obey the standards body clause of the SISSL. And we are not allowed to allow others to not obey that clause of the SISSL. The least of 2 'evils': we are LGPLv3+ + MPL that can't work at all with LGPLv2 It can, in so far that postgresql-sdbc is compiled as a 'stand-alone' .so file, and LO dlopen()s it (or more generally links to it). That's allowed under both postgresql-sdbc's LGPLv2.1 and LO's LGPLv3. I expect it is also allowed under LO's MPL (section 3.7). OTOH SISSL explicitly permit integration under a bigger work with the license of the bigger work, provided that SSIL is respected for the piece inserted. Ah, clause 3.7, you are right, that would work. Postgresql-sdbc stays under SISSL, LO under LGPLv3+/MPL and they are allowed to be combined. The SISSL just allows it unconditionally (with even the 'obey standard' clause applying only to postgresql-sdbc, not the whole), LO's LGPLv3+ because it is a separate library and LO's MPL unconditionally. We still have to be cautious *not* to copy/paste code between LO and postgresql-sdbc, because of the different licenses. I feel we don't gain anything of substance by keeping the SISSL, and I'm not very strongly opposed to it. If, as a project, LibreOffice prefers to keep SISSL licensing on that code, I'll agree to it. Do you mean that you intend to write code in another style within the same file? To me it seems bad practise to mix *different* styles within the same file. If not, well, the default emacs style (...) does *not* match the style of the existing code in that file, (...) The 'factory' default yes, but the 'the default'. my .emacs is set the way I like it, and it behave the way I am accustomed to (I used a customized ellemtel for instance) If you want to set-up your emacs to use the built-in bsd style, please by all means to so, but in your own .emacs My .emacs applies to *all* C(++) code I open, not only to LO, so that's IMHO not the right approach. What you are saying is that every contributor should change their .emacs to match the style in LO? From where I stand, the purpose of the modeline is to make contributor's like easier, that they open the file, start hacking, and emacs will (as far as possible) automatically apply the right indentation. And what if I want to hack on emacs itself, or Linux, or any other C(++) project that has different style guidelines? I have to change my .emacs every time I switch from the one to the other? (Or have in my .emacs functions linux-style, libreoffice-style, emacs-style that I need to *manually* call every time I open a file from one of these projects to modify it...) To me it seems like gratuitously making contributor's life more complicated. All this being said, I don't think this is worth the time to discuss it, so OK, I'll remove that (and most probably in future at some point slip up and commit code indented in the wrong style). Or how about this: eval:(if (fboundp 'libreoffice-c-set-style) (libreoffice-c-set-style)) This allows each and every person to set their libreoffice-specific C(++) indentation styles in their .emacs without impacting the rest of their C(++) editing work. It has a *big*, *big* disadvantage, that is that the first time one opens a file with that in the modeline, one gets a warning about unsafe value in local variable list; so *every* emacs-using LO contributor is annoyed at least once until he/she marks that expression as safe :-( -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-ux-advise] ReleaseNotes wiki page function
Hello Michael, On Thu, Nov 17, 2011 at 17:37, Michael Meeks michael.me...@suse.com wrote: Are these two accurate: http://wiki.documentfoundation.org/index.php?title=ReleaseNotes/3.5diff=prevoldid=34990 http://wiki.documentfoundation.org/index.php?title=ReleaseNotes/3.5diff=prevoldid=34987 Or just wish-list items ? :-) IMHO there are both wish-list. I cannot reproduce them. So, I've just removed them from the wiki. But if someone thinks they're real, feel free to revert my edit. Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] help asked/offered for bug 36555
On Thu, 2011-11-17 at 12:00 +0200, Noel Grandin wrote: or (b) your company pays SUSE/Redhat to allocate one of their developers to it. Heh ;-) Of course, there is also Canonical, Lanedo, and any number of other S/W consulting firms that could help out. But - of course you're right; the basic way to get things fixed is to fix them yourself, and we're eager to help self-motivated problem fixers with code pointers, tips, build help etc. etc. So - indeed, the first step is to get a build. After you have that, resurrecting the old mdbtools CWS / patch set would be a good idea. The -real- reason we havn't shipped mdbtools in anger is that it is not reliable / good at write support. If we are not writing into the database - we need to migrate it to something else on load. If we are migrating it to something else, we want to run hundreds of miles up-hill rather than migrate tens of thousands of users to using hsqldb in anger. So we're blocked on getting a nice sqlite backend in-tree that we're confident enough in to replace hsqldb, such that we can resurrect the mdbtool stuff so that ... ;-) so it is rather a linked problem. OTOH - it'd be great to have help with any part of that you like. 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: [Libreoffice] [PATCH] Make the toolbars not popping-up randomly
Hi Tim, Great feature; lets see what the UX advise guys have to say about it. Prolly they'll want to play with the next dev build. Also - the toolbar / framework code doing excessive serialisation to disk of the toolbar state is rather irritating; it causes grief with Groupwise embedding LibreOffice (on windows via OLE2) since as they turn the toolbars off, this is saved as the default setting for this; not really sure what to do about that - but being able to turn that serialisation off per-window would be a rather useful feature [ if you're near there ;-]. All the best, Michael. On Wed, 2011-11-16 at 20:12 +0100, Tim Hardeck wrote: Undocked, context sensitive toolbars often tend to overlay important parts of the document. With this patch these toolbars should be docked to the bottom to prevent the document from being moved each time the toolbar is displayed. Furthermore the findbar setting was changed to make sure that it stays on top of the other toolbars at the bottom. After working with these files I would suggest to consolidate them if possible. Like one global default file for all applications, since many toolbars are shared and evenly treated. For every application and the dialogs which really need a special default configuration only the difference to the global one is stored and not parts of it. In this case for example I could have moved the tableobjectbar with one instead of eight changes to the bottom. This change should also have no influence on the user configuration since these files are only relevant for the default settings. So what do you think? Tim ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] need some explaination on formatclipboard.[hc]xx
Hello Le jeudi 17 novembre 2011 à 09:31 +0100, Cedric Bosdonnat a écrit : An SfxItemSet is a set of properties. This is used to store all the formatting properties all over LibreOffice. You can find a gdb function to see what is inside an SfxItemSet here (dump_pSfxItemSet): http://cgit.freedesktop.org/libreoffice/build/tree/scratch/writer/gdbinit-cbosdo I hope this helps, Thanks a lot for your help ! I found the bug on the content.xml file (problem with style:text-properties in style of paragraph family that aren't well handle) I will try to patch the code, but for the moment I will fill a bug report. Thank you again -- Maxime de Roucy Groupe LINAGORA - OSSA 80 rue Roque de Fillol 92800 PUTEAUX Tel. : 0 810 251 251 signature.asc Description: This is a digitally signed message part ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PostgreSQL-SDBC in LO: licensing
On Thu, Nov 17, 2011 at 7:33 AM, Lionel Elie Mamane lio...@mamane.lu wrote: I feel we don't gain anything of substance by keeping the SISSL, and I'm not very strongly opposed to it. If, as a project, LibreOffice prefers to keep SISSL licensing on that code, I'll agree to it. hey, don't get me wrong... I _like_ GPL. If it was up to me I would not even bother with MPL at all... I was just concerned with the compatibility of LGPLv2 with LGPLv3+MPL. and since there is some intent to try to get to some kind of uniform LGPLv3/MPL compatibility... a LGPLv2 only piece did not sound like progress toward that goal. Michael apparently seems ok with dropping SISSL, and he is the biggest proponent of MPL... so if that is good for him and it is the fact that LGPLv2 is not at issue here (wrt with the integation in the 'whole) I don't care that much (actually that make the head smaller, which is a plus :-) ) My .emacs applies to *all* C(++) code I open, not only to LO, so that's IMHO not the right approach. for example, http://www.emacswiki.org/ProjectSettings If you put all that in the variable-line, the only recourse I have to override is to patch emacs to make it ignore it :-( Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] minutes of tech. steering call ...
* Present: + Eike, Bjoern, Andras, Michael, Tor, Norbert, Stephan, Caolan, Kohei, Michael S, Thorsten, Lionel, Mitch * Completed Action Items + add easy hack to kill PRODUCT in favour of DBG_UTIL (Bjoern) + ask wrt. hacking php to improve easy-hacks presentation (Bjoern) + reply to Peter's RFC wrt. tail_build (Norbert) * Pending Action Items + default to TM safe (non-TDF) branding (Thorsten) + enable on-line updates for QA in cross-compiled dailies [in progress] (Kendy) + [in progress] extract 64bit build hardware from firewall (Kendy) + come up with a list of QA heros for next meeting [in progress] (Rainer) + ask Christian wrt. Mac / PPC (Fridrich) + add unexpected mingw regressions to MingW 'most-annoying' (Rainer) + send ssh keys for Linux build machine access to Fridrich (Caolan) + [in progress] concrete debug proposal for the public list (Stephan) * Release Engineering update (Petr) + updated the schedule for 3.4.5 and 3.5.0 as decided on the last meeting. See the announce at http://lists.freedesktop.org/archives/libreoffice/2011-November/020724.html + IMPORTANT: deadline for beta0 is less than two weeks from now + finally have daily builds for Windows at http://dev-builds.libreoffice.org/daily/Voreppe_Win32_Tinderbox/master/ http://dev-builds.libreoffice.org/daily/Windows_2008R2/master/ but not sure how often the build is broken + is nervous by the still opened blocker https://bugs.freedesktop.org/show_bug.cgi?id=42227 + Radek on it. * Python / Wizards code / merge (Bjoern) + some minor problem blocking it AA: + merge for 3.5 strip old versions and await user testing (Bjoern) * Easy Hacks - poke at them ... (Bjoern) + some easy hacks need owner / caretakers triage: http://wiki.documentfoundation.org/Development/Easy_Hacks_by_required_Skill * Lionel Elie Mamane + been hacking on Base + fixing things that annoy him + shepherding the postgresql driver in for 3.5 * new MSI packaging (Andras) + hack-week project to make single MSI with all langs VC++ restribs + merged to master and ready to go for 3.5 AA: + add details to 3.5 release page (Andras) + some cleanups still required; help-pack testing etc. + drops NSIS requirement + default to it for 3.5 ... * consistent tinderbox naming scheme (Thorsten, Norbert) + Pedro Lino suggested that + names turning up in other scripts + seems that it might make it easier for the QA guys, if the names began with the target platform, followed by an identifier, so that the structure of dev-builds.libreoffice.org/daily is clearer. Rainer? + helps users find the right downloads from dev-tools domain too + problems of specificity: Win2008r2 eg. ? + platform=os-version-arch@id_free-form-user-friendly-info eg. MacOSX-10.6.0-Intel@25_no_moz_no_binfilter AA: + tinderbox owners should change names Thorsten to prune server (All) * Meeting Timing + doodle poll confirms current time = sticking with that. * Cool stuff: + Android + proceeding slowly but surely + can package lots of libs into an Android pkg + more and more unit tests running: sal fine eg. + onto the C++ UNO bridge. + lots of strange restrictions on package production and unpacking, lots to investigate + nothing useful for end-users yet. + Layout code (Caolan) + latest of 19 other people's attempts + stripped existing obsolete bits from the code + OptimalSize hooks are there from previous attempts + hapless Word-Count dialog victim being tackled + prototyping bits on top of that: + XML reader etc. after that + .src file conversion to a 'fixed' layout ? + no layout inference. + python uno scripting (Lionel) + named structure member initialization + remaining 'build' patches (Bjoern) + finally getting merged or killed, 20 down to 10 * Cross-compiling MSIs building (Mitch) + knee-deep in re-factoring build / make_installer perl code + to create helpful utility functions for msi creation -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] unable to pass tests ...
Hiya LO List, I've finally gotten a new build completed, but I'm unable to pass a couple of tests. Unfortunately, I think the tests aren't even able to run, but I don't currently know how to step into this. Can anyone give me a pointer, given the attached test output? Many thanks, Kevin $ cd [...]/libreoffice/sc/ $ make check [ build CUT ] sc_filters_test make[1]: Entering directory `[...]/libreoffice/sc' R=/home/kevin/devel S=$R/libreoffice O=$S/solver/unxlngx6.pro W=$S/workdir/unxlngx6.pro mkdir -p $W/CppunitTest/ (LD_LIBRARY_PATH=$O/lib:$O/lib/sqlite STAR_RESOURCEPATH=$O/bin/ $O/bin/cppunit/cppunittester $W/LinkTarget/CppunitTest/libtest_sc_filters_test.so --headless --protector unoexceptionprotector.so unoexceptionprotector -env:CONFIGURATION_LAYERS=xcsxcu:file://$O/xml/registry module:file://$O/xml/registry/spool -env:UNO_TYPES= file://$O/bin/udkapi.rdb file://$O/bin/types.rdb -env:UNO_SERVICES=file://$O/xml/ure/services.rdb file://$W/ComponentTarget/basic/util/sb.component file://$W/ComponentTarget/comphelper/util/comphelp.component file://$W/ComponentTarget/dbaccess/util/dba.component file://$W/ComponentTarget/fileaccess/source/fileacc.component file://$W/ComponentTarget/filter/source/config/cache/filterconfig1.component file://$W/ComponentTarget/forms/util/frm.component file://$W/ComponentTarget/framework/util/fwk.component file://$W/ComponentTarget/i18npool/util/i18npool.component file://$W/ComponentTarget/oox/util/oox.component file://$W/ComponentTarget/package/source/xstor/xstor.component file://$W/ComponentTarget/package/util/package2.component file://$W/ComponentTarget/sax/source/expatwrap/expwrap.component file://$W/ComponentTarget/sax/source/fastparser/fastsax.component file://$W/ComponentTarget/sc/util/sc.component file://$W/ComponentTarget/sc/util/scfilt.component file://$W/ComponentTarget/sfx2/util/sfx.component file://$W/ComponentTarget/sot/util/sot.component file://$W/ComponentTarget/toolkit/util/tk.component file://$W/ComponentTarget/unotools/util/utl.component file://$W/ComponentTarget/unoxml/source/rdf/unordf.component file://$W/ComponentTarget/unoxml/source/service/unoxml.component file://$W/ComponentTarget/xmlsecurity/util/xsec_fw.component file://$W/ComponentTarget/xmlsecurity/util/xmlsecurity.component file://$W/ComponentTarget/xmlsecurity/util/xsec_xmlsec.component file://$O/xml/configmgr.component file://$O/xml/ucb1.component file://$O/xml/ucpfile1.component file://$O/xml/ucptdoc1.component -env:URE_INTERNAL_LIB_DIR=file://$O/lib -env:LO_LIB_DIR=file://$O/lib $W/CppunitTest/sc_filters_test.test.log 21 || (cat $W/CppunitTest/sc_filters_test.test.log echo; echo Error: a unit test failed, please do one of:; echo; echo export DEBUGCPPUNIT=TRUE# for exception catching; echo export GDBCPPUNITTRACE=\gdb --args\ # for interactive debugging; echo export VALGRIND=memcheck# for memory checking ; echo and retry. false)) ##Failure Location unknown## : Error Test name: ScFiltersTest::testCVEs setUp() failed - An uncaught exception of type com.sun.star.registry.InvalidRegistryException - file://[...]/libreoffice/workdir/unxlngx6.pro/ComponentTarget/uno xml/source/rdf/unordf.component: component has empty uri attribute ##Failure Location unknown## : Error Test name: ScFiltersTest::testCVEs tearDown() failed - An uncaught exception of type com.sun.star.uno.RuntimeException - unsatisfied query for interface of type com.sun.star.lang.XComponent! ##Failure Location unknown## : Error Test name: ScFiltersTest::testRangeName setUp() failed - An uncaught exception of type com.sun.star.registry.InvalidRegistryException - file://[...]/libreoffice/workdir/unxlngx6.pro/ComponentTarget/uno xml/source/rdf/unordf.component: component has empty uri attribute ##Failure Location unknown## : Error Test name: ScFiltersTest::testRangeName tearDown() failed - An uncaught exception of type com.sun.star.uno.RuntimeException - unsatisfied query for interface of type com.sun.star.lang.XComponent! ##Failure Location unknown## : Error Test name: ScFiltersTest::testContent setUp() failed - An uncaught exception of type com.sun.star.registry.InvalidRegistryException - file://[...]/libreoffice/workdir/unxlngx6.pro/ComponentTarget/uno xml/source/rdf/unordf.component: component has empty uri attribute ##Failure Location unknown## : Error Test name: ScFiltersTest::testContent tearDown() failed - An uncaught exception of type com.sun.star.uno.RuntimeException - unsatisfied query for interface of type com.sun.star.lang.XComponent! ##Failure Location unknown## : Error Test name: ScFiltersTest::testFunctions setUp() failed - An uncaught exception of type com.sun.star.registry.InvalidRegistryException - file://[...]/libreoffice/workdir/unxlngx6.pro/ComponentTarget/uno xml/source/rdf/unordf.component: component has empty uri attribute ##Failure Location unknown## : Error Test name:
Re: [Libreoffice] [Patch] Unreachable code ?
Hi Muthu,
On Wed, 2011-11-16 at 17:34 +0530, Muthu Subramanian K wrote:
I have attached a trivial code removal with this mail.
I read the code, (since pUndoSet is set to null in the very constructor,
I guess this if() would never get executed), but, I could have missed
something here - hence the need for review.
Looks like that was explicitly added in:
commit 493855a92f443535abca8fed0f04ac7c4668a85d
Author: Pascal Junck pju...@openoffice.org
Date: Wed Nov 3 10:06:38 2004 +
INTEGRATION: CWS aw019 (1.14.140); FILE MERGED
2004/09/28 15:53:27 aw 1.14.140.1: #i11190#
Are you certain it is not needed ? then again, an in-line delete rather
than the if(){} etc. might be good.
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: [Libreoffice] Unable to build moz
On 11/16/2011 05:23 PM, Marc-André Laverdière wrote: My autogen options now are: --with-num-cpus=4 --with-system-libs --with-system-headers --with-system-dicts --enable-lto Maybe --enable-lto is not a good idea. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #23 from Michael Meeks michael.me...@novell.com 2011-11-17 08:21:14 PST --- Orwel - it is quite a well known issue that people are trying to find funding to fix; whether it is a 'most annoying' bug, as a non-blocker, non-regression I don't know. Then again we have no tracker for most important features. Either way, you'd want to file a bug for this I think. Also the feature freeze is in ~2 weeks, so you're a bit late for 3.5 :-) -- 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: [Libreoffice] unable to pass tests ...
On 11/17/2011 05:16 PM, Kevin Hunter wrote:
- file://[...]/libreoffice/workdir/unxlngx6.pro/ComponentTarget/uno
xml/source/rdf/unordf.component: component has empty uri attribute
Looks like you fell victim to the component file mess (where last round
of mess there was that a make clean in one module can corrupt
component files from other modules). Please try a global
find */${INPATH?}/ -name \*.component -exec rm {} \;
followed by a global make check again.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Enabling symbols on 3.4.4
Hi Julien, On Mon, 2011-11-14 at 14:08 -0800, julien2412 wrote: I reproduced the fdo#32957 on 3.4.4 (Debian SID packages) but I don't reproduce it with master. Great :-) Since it crashes, I thought by installing libreoffice-dbg, I would have symbols automatically but it's not the case. Is there an option to use ? Ho hum; I wonder if you need to also update the libreoffice package itself ? it is important those two are in step. The goal of all this is to know what commit in master has fixed the pb to propose to cherry-pick for 3.4.5. It is odd the debug package doesn't have symbols, but they are quite big IIRC. 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: [Libreoffice] Unable to build moz
On Thu, 2011-11-17 at 17:17 +0100, Stephan Bergmann wrote: --with-system-dicts --enable-lto Maybe --enable-lto is not a good idea. Yep - highly experimental; which reminds me ... Jan - are you still stuck on compiling LibreOffice with LTO ? did we get to a point past the toolchain issues to a nice LibreOffice issue ? :-) 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: [Libreoffice] unable to pass tests ...
Hi Kevin, On Thu, 2011-11-17 at 11:16 -0500, Kevin Hunter wrote: I've finally gotten a new build completed, but I'm unable to pass a couple of tests. Unfortunately, I think the tests aren't even able to run, but I don't currently know how to step into this. Can anyone give me a pointer, given the attached test output? Ah - it looks like you're a victim of the .component file syntax change; you need to do something like: find */unxlngi6.pro solver workdir -name '*.component' # | xargs rm -f or moral equivalent; and re-build. Failing that; the output shows you how to debug this stuff: Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export GDBCPPUNITTRACE=gdb --args # for interactive debugging export VALGRIND=memcheck# for memory checking and retry. But I think it's just your component .rdb being busted :-) 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: [Libreoffice] [Patch] Unreachable code ?
On 17/11/11 17:18, Michael Meeks wrote:
Hi Muthu,
On Wed, 2011-11-16 at 17:34 +0530, Muthu Subramanian K wrote:
I have attached a trivial code removal with this mail.
I read the code, (since pUndoSet is set to null in the very constructor,
I guess this if() would never get executed), but, I could have missed
something here - hence the need for review.
Looks like that was explicitly added in:
commit 493855a92f443535abca8fed0f04ac7c4668a85d
Author: Pascal Junck pju...@openoffice.org
Date: Wed Nov 3 10:06:38 2004 +
INTEGRATION: CWS aw019 (1.14.140); FILE MERGED
2004/09/28 15:53:27 aw 1.14.140.1: #i11190#
Are you certain it is not needed ? then again, an in-line delete rather
than the if(){} etc. might be good.
no idea if it is needed, but how about replacing pUndoSet with a smart
pointer like boost::scoped_ptr?
then the next line would become 'pUndoSet.reset(new ...)', if pUndoSet
is not null it will be deleted automatically, and you can get rid of the
delete in the destructor as well.
Muthu, please take a look at:
http://www.boost.org/doc/libs/1_46_0/libs/smart_ptr/scoped_ptr.htm
regards,
michael
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] unable to pass tests ...
At 11:22am -0500 Thu, 17 Nov 2011, Stephan Bergmann wrote:
On 11/17/2011 05:16 PM, Kevin Hunter wrote:
- file://[...]/libreoffice/workdir/unxlngx6.pro/ComponentTarget/uno
xml/source/rdf/unordf.component: component has empty uri attribute
Looks like you fell victim to the component file mess (where last round
of mess there was that a make clean in one module can corrupt
component files from other modules). Please try a global
find */${INPATH?}/ -name \*.component -exec rm {} \;
followed by a global make check again.
Thank you both. Weird that I started from a 'make distclean' last night
... but now the build fails on the tests I've just written, which is
much more expected.
Thank you,
Kevin
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] Improving the QA and Release for 3.5
Is it worth salvaging the tests? Sorry for being so pushy about this topic but I would be super happy to have the basic module contain only language-related functionality :) August Sodora aug...@gmail.com (201) 280-8138 On Thu, Nov 17, 2011 at 4:19 AM, Noel Power nopo...@suse.com wrote: On 16/11/11 19:59, Petr Mladek wrote: I am surprised that anyone still uses it. The following two bugs makes me feel that it does not work for LO-3.4 and master: testtool should work ( afaik ) on 3.4 ( I thought I fixed it there ), of course there may be some tests that somehow now don't work due to some other error or maintenance creep. On Master it is still broken, some effort is needed to make it work, I don't believe the effort is worth it AFAIK, developers does not like it. My understanding of the problems is summarized at http://wiki.documentfoundation.org/QA/Testing/Using_Testtool#IMPORTANT:_Obsoleted_by_Unit_tests_and_Subsequenttests +1 ;-) Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] xmllint problem validating using ODF RelaxNG
Hi Dag Daniel, On Wed, 2011-11-16 at 14:43 +0100, Dag Wieers wrote: There is a (known) problem when using xmllint with the ODF RelaxNG schema, that causes xmllint to fail with error message: Unimplemented block at relaxng.c:8948 Hopefully we're not doing validation in LibreOffice on load/save - but this is more of an xmllint feature, so we don't need to update our internal libxml2. Which reminds me - Daniel, we've inherited a number of 'interesting' patches from OO.o on top of libxml2 and libxmlsec which are in git here: http://cgit.freedesktop.org/libreoffice/core/tree/libxml2 http://cgit.freedesktop.org/libreoffice/core/tree/libxmlsec (not a well formed report I'm afraid, and some are prolly uninteresting pragmatic nasties for internal compilation); We're using libxml2-2.7.6 and xmlsec1-1.2.4 - prolly somewhat out of date due to the validation cost of updating them. Thanks to Daniel for the excellent support :-) And thanks for your heads up nice to have Daniel on the CC of a mail again, it's been a while (somehow) :-) 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: [Libreoffice] uno discoverability
Hi Stephan, On Wed, 2011-11-16 at 14:16 +0100, Stephan Bergmann wrote: throw FooException(Failure loading file '%S' code %d, ... This (as well as cooking something up using OSL_FORMAT) would have the disadvantage that it potentially converts data from UTF-16 to char (%S) and then from char to UTF-16 (as UNO Exception's Message is of type rtl::OUString). True - but by the time we throw an exception, efficiency already goes to hell in a hand-cart (as it were) ;-) we start straining mind and limb to find unwind info records, infer types, understand what is on the stack and how to clean it up etc. An extra allocation or two isn't going to hurt. It seems like all attempts at true improvement in this area always collide with rtl::OUString being neither UTF-8 (i.e., layout compatible with plain char) nor wchar_t (at least on Linux etc.; and using GCC's -fshort-wchar would not help, as it breaks binary compatibility with libstdc++). Yep; although getting the most-common cases of having slower, but easy-to-use, and small-object-code helpers for printf exceptions would be really helpful IMHO :-) We'll probably wait until either all relevant compilers support C++11's new character types, or we incompatibly change rtl::OUString to UTF-8 (whatever happens first). Which would be wonderful :-) I'm cheering that on. Having said that - if we go with gcc for cross-compile to Windows too, does that help us ? For types.rdb, my vision is to either use an XML format or, IMO even better, a new .idl format that is (a) less verbose (why the heck all those ; in there, etc.?) and (b) does not rely on a preprocessor. Then, a types.rdb could effectively be just one large .idl file. Great. Of course, types.rdb being huge and empty would be fine if we didn't load and read it at startup a lot ;-) IIRC one use-case there was the lack of in-lined property Name/Value struct - any conversions, so: pArg.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( foo )); pArg.Value = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( baa )); Is nice efficient, and in-line-able; until that pArg ends up inside an Any itself - at which point we suck in types.rdb, start loading type data, inferring C++ structure offsets, and so on - just to allocate and construct the local Any (which I assume we could do in-line at compile time). Then again - perhaps we use introspection for something else more serious on startup, or perhaps I'm out of date on this. Do you have a feel for whether it is just a few silly cases like this that we could work around ? or if there is some deep reason that types.rdb should be necessary at startup ? 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: [Libreoffice] minutes of tech. steering call ...
On Thu, Nov 17, 2011 at 9:42 AM, Michael Meeks michael.me...@suse.com wrote: * consistent tinderbox naming scheme (Thorsten, Norbert) + Pedro Lino suggested that + names turning up in other scripts + seems that it might make it easier for the QA guys, if the names began with the target platform, followed by an identifier, so that the structure of dev-builds.libreoffice.org/daily is clearer. Rainer? + helps users find the right downloads from dev-tools domain too + problems of specificity: Win2008r2 eg. ? + platform=os-version-arch@id_free-form-user-friendly-info eg. MacOSX-10.6.0-Intel@25_no_moz_no_binfilter AA: + tinderbox owners should change names Thorsten to prune server (All) Please see https://wiki.documentfoundation.org/Development/Tinderbox ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] UPDATE: Swedish spelling dictionary v1.48
I've updated the Swedish spelling dictionary. It is available at http://code.google.com/p/dsso/. The latest version is 1.48 http://code.google.com/p/dsso/downloads/detail?name=ooo_swedish_dict_1.48.oxtcan=2q= This is an important update since it contains a lot of corrections and words containing digits are now treated correctly. Please include this version in the next instead of version 1.46. The extension containing the dictionary should also be updated: http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan Perhaps I could get permission to update the extension directly? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED, partial] Remove NULL checks from delete
I have played with manual solving of this problem today... :-) There are
the more interesting examples:
- else if(pUserMarker)
+ else
{
delete pUserMarker;
pUserMarker = 0L;
}
and
- if( GetPageNum() 0 pCntntAnchor )
+ if( GetPageNum() 0 )
{
delete pCntntAnchor;
Actually, catching these with regexp-search is hard...
17.11.2011 14:16, Michael Meeks пишет:
If we have a bug whereby something is deleted in-the code without being
re-assigned, and where NULL is a valid value, then we could fix those
with a DELETEZ construct, but - finding those places (that don't already
have a subsequent assignment) is prolly more exciting :-) In theory some
code analysis framework could help find those guys.
I am agree. I think, it is better to find the problematic places by
searching in the syntax-tree rather than in the source files.
Cheers,
Ivan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] iOS and convert to PDF
Is it possible that I don't need module tail_build? Anyway, that leads to my next question. How do I build an Xcode project that works like the project you show in your July blog post? Do I just add all the .a files from core/solver/unxiosr.pro/lib to the project? Is there an example project I can download from somewhere? I don't see it in the LO folder anywhere. I see what you're referring to in the vcl module. I see there's a custom UIApplication subclass and an app delegate and a bunch of other iOS code and most of it seems to be objective-C++. But I don't see main(). Thanks, Brian -- View this message in context: http://nabble.documentfoundation.org/iOS-and-convert-to-PDF-tp3498093p3516724.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Fix for fdo#42178
16.11.2011 21:27, Ivan Timofeev пишет: Can not reproduce crash with removed lines. Oh, what a terrible formulation! I mean, Can not reproduce crash, even without the mentioned lines of code. So, should I commit this removal? Best Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Build fail in binfilter on Ubuntu 11.10
Hi all, I'm still getting build failure on Ubuntu 11.10 in binfilter while attempting to compile the following : Making:libbf_wrapperlo.so ../../../unxlngi6.pro/lib/libbf_sdlib.a(sd_sdlib.o): In function `binfilter::SdDrawDocShell::ClassFactory()': /home/alex/LODEV/core/clone/binfilter/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx:72: undefined reference to `SotFactory::PutSuperClass(SotFactory const*)' ../../../unxlngi6.pro/lib/libbf_sdlib.a(sd_sdlib.o): In function `binfilter::SdGraphicDocShell::ClassFactory()': /home/alex/LODEV/core/clone/binfilter/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx:79: undefined reference to `SotFactory::PutSuperClass(SotFactory const*)' ../../../unxlngi6.pro/lib/libbf_ysch.a(sch_schlib.o): In function `binfilter::SchChartDocShell::ClassFactory()': /home/alex/LODEV/core/clone/binfilter/binfilter/bf_sch/source/ui/app/sch_schlib.cxx:56: undefined reference to `SotFactory::PutSuperClass(SotFactory const*)' ../../../unxlngi6.pro/lib/libbf_ysm.a(starmath_smlib.o): In function `binfilter::SmDocShell::ClassFactory()': /home/alex/LODEV/core/clone/binfilter/binfilter/bf_starmath/source/starmath_smlib.cxx:56: undefined reference to `SotFactory::PutSuperClass(SotFactory const*)' ../../../unxlngi6.pro/lib/libbf_swlib.a(sw_swlib.o): In function `binfilter::SwDocShell::ClassFactory()': /home/alex/LODEV/core/clone/binfilter/binfilter/bf_sw/source/ui/app/sw_swlib.cxx:75: undefined reference to `SotFactory::PutSuperClass(SotFactory const*)' ../../../unxlngi6.pro/lib/libbf_swlib.a(sw_swlib.o):/home/alex/LODEV/core/clone/binfilter/binfilter/bf_sw/source/ui/app/sw_swlib.cxx:88: more undefined references to `SotFactory::PutSuperClass(SotFactory const*)' follow collect2: ld returned 1 exit status dmake: Error code 1, while making '../../../unxlngi6.pro/lib/libbf_wrapperlo.so' If I disable the binfilter compilation, the build completes. This is with the latest pulls from master, and even after a make clean. Since I can build the binfilter module on Mac, I'm assuming this is Ubuntu 11.10 specific ?? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] help asked/offered for bug 36555
Le 17/11/2011 10:43, Alexander Thurgood a écrit : I tested this on the master daily build from 26/11/2011 built by 2008R2 and can confirm that the bug is still there. I added my comments to the bug report. This bug was introduced somewhere just after the branching off of the 3.4 tree, the 3.3.x versions still work with Access files. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] removing testtool it's ilk ...
On Thu, 2011-11-17 at 12:18 -0500, August Sodora wrote: Is it worth salvaging the tests? Sorry for being so pushy about this topic but I would be super happy to have the basic module contain only language-related functionality :) Oh - I think the general consensus is that it is almost certainly not worth salvaging them; particularly since they run so confoundedly slowly, the failures are hard to turn into concrete error reports, and UI changes cause them to break anyway. But we should prolly make a more formal decision about them really - and either remove them entirely in one clean sweep, or keep the hooks; what do you plan to remove ? 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: [Libreoffice] UPDATE: Swedish spelling dictionary v1.48
Hi Göran, 2011/11/17 Göran Andersson goran.anders...@init.se: I've updated the Swedish spelling dictionary. It is available at http://code.google.com/p/dsso/. The latest version is 1.48 http://code.google.com/p/dsso/downloads/detail?name=ooo_swedish_dict_1.48.oxtcan=2q= This is an important update since it contains a lot of corrections and words containing digits are now treated correctly. Please include this version in the next instead of version 1.46. Thanks for the update, I pushed it to git. The extension containing the dictionary should also be updated: http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan Perhaps I could get permission to update the extension directly? You should contact Johan, the current owner of extension. See: http://extensions.libreoffice.org/author/jetten Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] removing testtool it's ilk ...
Hi *, On Thu, Nov 17, 2011 at 8:31 PM, Michael Meeks michael.me...@suse.com wrote: On Thu, 2011-11-17 at 12:18 -0500, August Sodora wrote: Is it worth salvaging the tests? Sorry for being so pushy about this topic but I would be super happy to have the basic module contain only language-related functionality :) Oh - I think the general consensus is that it is almost certainly not worth salvaging them; particularly since they run so confoundedly slowly, the failures are hard to turn into concrete error reports, and UI changes cause them to break anyway. Just FYI - at apache someone rewrote testtool as a java component that could be hooked up to junit http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/20.mbox/%3COF691F571D.57F97321-ON4825794A.0009600B-4825794A.000DDABD%40cn.ibm.com%3E FromZhe Liu liu...@cn.ibm.com Subject Anybody interested in TestTool? I wrote a Java lib to replace it. DateWed, 16 Nov 2011 02:29:09 GMT No idea whether that one would reuse the existing scripts or not (doubt that there is a conversion for it). ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Issues important for Japanese users
On 17/11/11 16:58, Kohei Yoshida wrote: Just briefly, before responding to your mail in length, is his/her presentation going to be available somewhere after the conference? I guess so, but not sure about the time-frame and wanted to dump it quickly while I was still able to synthesize my notes. Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] iOS and convert to PDF
Tor, I did a git pull to update my source and I get a different failure, although of the same kind. This fails: from /Users/brians/develop/libreOffice2/core/solver/unxiosr.pro/inc/sal/main.h:48, from /Users/brians/develop/libreOffice2/core/cpputools/source/regsingleton/regsingleton.cxx:32: because regsingleton.cxx is being compiled as C++ but it includes sal/main.h, which has Objective-C in it. I assume that this changed somehow in the last few days because I wasn't seeing this failure before. Is the iOS build simply broken because no one is using it? Is there a tag or branch I should be using that is more likely to work? Thanks, Brian -- View this message in context: http://nabble.documentfoundation.org/iOS-and-convert-to-PDF-tp3498093p3517017.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Enabling symbols on 3.4.4
Thank you Michael for your help on IRC. I haven't understood you meant I had to check that libreoffice version and libreoffice-dbg version had to be exactly the same version. I attached a bt on the bugtracker : https://bugs.freedesktop.org/attachment.cgi?id=53634 -- View this message in context: http://nabble.documentfoundation.org/Enabling-symbols-on-3-4-4-tp3508119p3517143.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH/REVIEW-3-4] Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5)
Hi Stephan, Stephan Bergmann wrote (17-11-11 09:02) On 11/11/2011 11:12 AM, Cor Nouws wrote: Is included in the patch, that when a encrypted document is opened in 3.4.n and saved again, people are informed about the change in encryption? No. I see. When you modify and save an encrypted document, you are not asked for the password again, So to the user that does not appear like a save afresh as an encrypted document (in which case I would consider it plausible that the document is silently saved with the 3.4 encryption mechanism) but more like a plain update existing stored document. Thanks for this clarification. Even better this way. (I was already thinking of a clear message for the release notes, but that's superfluous now.) Cheers, -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Make the toolbars not popping-up randomly
Hi Tim, Tim Hardeck wrote (17-11-11 17:07) On 11/17/2011 04:00 PM, Cor Nouws wrote: Tim Hardeck wrote (16-11-11 20:12) With this patch these toolbars should be docked to the bottom to prevent the document from being moved each time the toolbar is displayed. Could you please explain a bit further? Who should dock the toolbars to the bottom? Or is that a condition for the toolbars to have the show/hide behaviour ? I have changed the default behavior of these mentioned toolbars, like the one that appears when you click on a table in Writer, to be shown at the bottom. If you want to check how it looks just run ctrl + f which will open the findbar at the bottom. Yes, I recognise that. Unlike a new toolbar at the top the document center will not move that's why we decided to show them a the bottom. Since this does only affect the default configuration users with existing Libreoffice configurations wouldn't be influenced. They would have to dock the bars on their own to the bottom or reset this particular configuration. Ah, now I see. (Re-reading your initial post shows it too - but after some technical thoughts regarding the organisation fo the configuration - which me made skip some text). I'm glad with your solution. Thanks - for further explaining too. -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PostgreSQL-SDBC in LO: build system help
On Thu, Nov 17, 2011 at 03:22:33AM -0600, Norbert Thiebaud wrote: On Wed, Nov 16, 2011 at 4:22 PM, Lionel Elie Mamane lio...@mamane.lu wrote: I'd like some help from a LO build system expert to make postgresql-sdbc well-behaved in this other and build-related respects: attache a patch that make building it conditional. Thanks; this being applied, I have pushed to master. However, the makefile.mk does not work at all; dmake in that directory seems to compute dependencies, but not do anything else. That bug was definitely not introduced by your patch, it must be a difference in the dmake setup between master and libreoffice-3-4 (that makefile.mk worked alright in libreoffice-3-4). Any pointer / clue? On Thu, Nov 17, 2011 at 01:35:25AM +0100, Fridrich Strba wrote: I can give you a hand with this next week. Is it enough? Unless someone else picks it up first, it will have to do :) -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PostgreSQL-SDBC in LO: build system help
On Thu, Nov 17, 2011 at 5:21 PM, Lionel Elie Mamane lio...@mamane.lu wrote: On Thu, Nov 17, 2011 at 03:22:33AM -0600, Norbert Thiebaud wrote: On Wed, Nov 16, 2011 at 4:22 PM, Lionel Elie Mamane lio...@mamane.lu wrote: I'd like some help from a LO build system expert to make postgresql-sdbc well-behaved in this other and build-related respects: attache a patch that make building it conditional. Thanks; this being applied, I have pushed to master. However, the makefile.mk does not work at all; dmake in that directory seems to compute dependencies, but not do anything else. That bug was definitely not introduced by your patch, it must be a difference in the dmake setup between master and libreoffice-3-4 (that makefile.mk worked alright in libreoffice-3-4). Any pointer / clue? I'm on anther branch right now... but you can verbose=t build in the module (or possibly a with the dmake directly) that should print the command line that dmake is executing... that may give a clue... next is to dig in solenv/inc/* to look at the different thing the makefile include and try to figure out what is going on. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Opportunità per imprese e privati
Soluzione Prestiti, un mondo di opportunità finanziarie per privati e aziende. Novità: Esdebitazione agricola Prestiti per le aziende agricole in stato d'insolvenza. Assistenza alle aziende in crisi Per visitare il sito clicca qui Hai ricevuto questo messaggio in riscontro ad una richiesta di contatto pervenuta da te o da chi ha accesso alla tua casella. Per non ricevere in futuro news di speciale prestiti clicca qui ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Unable to build moz
That was the culprit! Marc-André LAVERDIÈRE Perseverance must finish its work so that you may be mature and complete, not lacking anything. -James 1:4 http://asimplediscipleslife.blogspot.com/ mlaverd.theunixplace.com On Thu, Nov 17, 2011 at 11:30 AM, Michael Meeks michael.me...@suse.comwrote: On Thu, 2011-11-17 at 17:17 +0100, Stephan Bergmann wrote: --with-system-dicts --enable-lto Maybe --enable-lto is not a good idea. Yep - highly experimental; which reminds me ... Jan - are you still stuck on compiling LibreOffice with LTO ? did we get to a point past the toolchain issues to a nice LibreOffice issue ? :-) 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 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] memory leaks found with valgrind
Hello,
I was a little curious about valgrind so I ran it against soffice and
found a few memory leaks. The two that I looked at are very minor but
I figured I'd try them to start with. The attached patch corrects the
first and the second I had difficulty understanding.
The first is caused by not calling XFreeGC when the splash screen closes:
==11027== 160 bytes in 1 blocks are definitely lost in loss record 7 of 8
==11027==at 0x4A06031: malloc (vg_replace_malloc.c:236)
==11027==by 0x3FA0A215EB: XCreateGC (CrGC.c:75)
==11027==by 0x406480: splash_create_window (splashx.c:555)
==11027==by 0x406E44: splash_create (splashx.c:781)
==11027==by 0x4088D3: sal_main_with_args (start.c:850)
==11027==by 0x408755: main (start.c:789)
So hooray we save 160 bytes. The second initially makes me think that
a matching XCloseDisplay is missing but I'm not sure why the call that
is already there isn't getting called if the first leak was fixed:
==11027== 124 bytes in 1 blocks are definitely lost in loss record 6 of 8
==11027==at 0x4A06031: malloc (vg_replace_malloc.c:236)
==11027==by 0x3FA060BD79: get_peer_sock_name (xcb_auth.c:259)
==11027==by 0x3FA060BE45: _xcb_get_auth_info (xcb_auth.c:302)
==11027==by 0x3FA060B84E: xcb_connect_to_display_with_auth_info
(xcb_util.c:424)
==11027==by 0x3FA0A4CBC9: _XConnectXCB (xcb_disp.c:92)
==11027==by 0x3FA0A34BAA: XOpenDisplay (OpenDis.c:166)
==11027==by 0x406008: splash_create_window (splashx.c:503)
==11027==by 0x406E44: splash_create (splashx.c:781)
==11027==by 0x4088D3: sal_main_with_args (start.c:850)
==11027==by 0x408755: main (start.c:789)
August Sodora
aug...@gmail.com
(201) 280-8138
From 4e067b1297c7fbab8ca90ca8747efe2a39b55793 Mon Sep 17 00:00:00 2001
From: August Sodora aug...@gmail.com
Date: Thu, 17 Nov 2011 21:06:16 -0500
Subject: [PATCH] Valgrind: fixed memory leak
---
desktop/unx/source/splashx.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 0c7024d..3d3981d 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -744,6 +744,12 @@ void splash_destroy(struct splash* splash)
{
if(splash-display)
{
+if(splash-gc)
+{
+XFreeGC(splash-display, splash-gc);
+splash-gc = NULL;
+}
+
XCloseDisplay( splash-display );
splash-display = NULL;
png_destroy_read_struct( (splash-png_ptr), (splash-info_ptr), NULL );
--
1.7.4.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] memory leaks found with valgrind
I always forget [PATCH]
August Sodora
aug...@gmail.com
(201) 280-8138
On Thu, Nov 17, 2011 at 9:12 PM, August Sodora aug...@gmail.com wrote:
Hello,
I was a little curious about valgrind so I ran it against soffice and
found a few memory leaks. The two that I looked at are very minor but
I figured I'd try them to start with. The attached patch corrects the
first and the second I had difficulty understanding.
The first is caused by not calling XFreeGC when the splash screen closes:
==11027== 160 bytes in 1 blocks are definitely lost in loss record 7 of 8
==11027== at 0x4A06031: malloc (vg_replace_malloc.c:236)
==11027== by 0x3FA0A215EB: XCreateGC (CrGC.c:75)
==11027== by 0x406480: splash_create_window (splashx.c:555)
==11027== by 0x406E44: splash_create (splashx.c:781)
==11027== by 0x4088D3: sal_main_with_args (start.c:850)
==11027== by 0x408755: main (start.c:789)
So hooray we save 160 bytes. The second initially makes me think that
a matching XCloseDisplay is missing but I'm not sure why the call that
is already there isn't getting called if the first leak was fixed:
==11027== 124 bytes in 1 blocks are definitely lost in loss record 6 of 8
==11027== at 0x4A06031: malloc (vg_replace_malloc.c:236)
==11027== by 0x3FA060BD79: get_peer_sock_name (xcb_auth.c:259)
==11027== by 0x3FA060BE45: _xcb_get_auth_info (xcb_auth.c:302)
==11027== by 0x3FA060B84E: xcb_connect_to_display_with_auth_info
(xcb_util.c:424)
==11027== by 0x3FA0A4CBC9: _XConnectXCB (xcb_disp.c:92)
==11027== by 0x3FA0A34BAA: XOpenDisplay (OpenDis.c:166)
==11027== by 0x406008: splash_create_window (splashx.c:503)
==11027== by 0x406E44: splash_create (splashx.c:781)
==11027== by 0x4088D3: sal_main_with_args (start.c:850)
==11027== by 0x408755: main (start.c:789)
August Sodora
aug...@gmail.com
(201) 280-8138
From 4e067b1297c7fbab8ca90ca8747efe2a39b55793 Mon Sep 17 00:00:00 2001
From: August Sodora aug...@gmail.com
Date: Thu, 17 Nov 2011 21:06:16 -0500
Subject: [PATCH] Valgrind: fixed memory leak
---
desktop/unx/source/splashx.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 0c7024d..3d3981d 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -744,6 +744,12 @@ void splash_destroy(struct splash* splash)
{
if(splash-display)
{
+if(splash-gc)
+{
+XFreeGC(splash-display, splash-gc);
+splash-gc = NULL;
+}
+
XCloseDisplay( splash-display );
splash-display = NULL;
png_destroy_read_struct( (splash-png_ptr), (splash-info_ptr), NULL );
--
1.7.4.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] iOS and convert to PDF
Is it possible that I don't need module tail_build? tail_build is a meta-module that actually builds most of the modules that have been migrated over to the new gnu make based build system. It includes all the business logic of Calc, Writer etc, so sure, stuff from it will be needed. Anyway, that leads to my next question. How do I build an Xcode project that works like the project you show in your July blog post? Ah, yes. I faked it from Xcode's point of view: I created one of the simple sample projects that Xcode offers, called it cppunittester, built it, and then replaced the actual executable inside with the totally unrelated sal_cppunittester_all (IIRC) executable built in LibreOffice. I.e. I Xcode did not do any compilation of LibreOffice code at all, I just used it to run such code in the simulator (or upload to and run on a device) and debug. Worked fine;) Note that the unit tester I ran does not have any GUI. Do I just add all the .a files from core/solver/unxiosr.pro/lib to the project? That would probably be possible, yes. Not all .a files, but the ones relevant for what the app in question does. I see what you're referring to in the vcl module. I see there's a custom UIApplication subclass and an app delegate and a bunch of other iOS code and most of it seems to be objective-C++. But I don't see main(). main() comes from the somewhat mysterious SAL_MAIN_IMPL etc macros in sal/inc/sal/main.h. In the cppunit case, the SAL_IMPLEMENT_MAIN macro is called in sal/cppunittester/cppunittester.cxx. (Don't look too closely at the iOS code in vcl yet, that is just some rough ideas, a start that has never been actually tried yet. Look at the Mac code in vcl, that at least works. (The iOS code is based on the Mac one.) The actual sequence how LibreOffice starts and gets its message / event loop going is a bit complex. It might suffer from organic evolution and over-engineering over time. Or maybe it really has to be like this. hard to say. Anyway, it is useful to compile at least sal, desktop and the stuff in vcl/aqua with debugging, and then on a Mac step through in the debugger (gdb, or I guess Xcode) what happens when then soffice.bin process starts. (Or on Linux, but there the sequence is a bit simpler; I assume what will be used on iOS matches better how it happens on the Mac.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] removing testtool it's ilk ...
Hmm, this is about the program called testtool, not the module testtools (note trailing s), right? In the latter, at least the bridgetest part is certainly useful when porting LO to new architectures. I remember running stuff from there when attempting the port to 64-bit Windows, and will soon start doing it for Android. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] removing testtool it's ilk ...
Hmm, this is about the program called testtool, not the module testtools (note trailing s), right? In the latter, at least the bridgetest part is certainly useful when porting LO to new architectures. I remember running stuff from there when attempting the port to 64-bit Windows, and will soon start doing it for Android. Yes, you are correct, some of those modules that I mentioned aren't actually part of the testtool program and shouldn't be removed :) August Sodora aug...@gmail.com (201) 280-8138 On Fri, Nov 18, 2011 at 1:08 AM, Tor Lillqvist t...@iki.fi wrote: Hmm, this is about the program called testtool, not the module testtools (note trailing s), right? In the latter, at least the bridgetest part is certainly useful when porting LO to new architectures. I remember running stuff from there when attempting the port to 64-bit Windows, and will soon start doing it for Android. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] [Libreoffice] Improving the QA and Release for 3.5
On 16/11/11 19:59, Petr Mladek wrote: I am surprised that anyone still uses it. The following two bugs makes me feel that it does not work for LO-3.4 and master: testtool should work ( afaik ) on 3.4 ( I thought I fixed it there ), of course there may be some tests that somehow now don't work due to some other error or maintenance creep. On Master it is still broken, some effort is needed to make it work, I don't believe the effort is worth it AFAIK, developers does not like it. My understanding of the problems is summarized at http://wiki.documentfoundation.org/QA/Testing/Using_Testtool#IMPORTANT:_Obsoleted_by_Unit_tests_and_Subsequenttests +1 ;-) Noel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [REVIEWED] Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5)
Hi Stephan, On Fri, 2011-11-11 at 10:50 +0100, Stephan Bergmann wrote: http://pkgs.fedoraproject.org/gitweb/?p=libreoffice.git;a=blob;f=Backport-reading-AES-encrypted-ODF-1.2-documents.patch;h=e6c722598ab05464f09787355b621cbb0aa07c49;hb=e7a803540d408adab3d55fb2ae051ac4be599a72 is a patch (actually, four separate patches for the components, lib-core, lib-gui, and ure repos) to backport support for reading (but not writing) AES-encrypted ODF 1.2 documents to libreoffice-3-4. Lovely ! :-) I finally got to review it. If people are happy with the linked patch: fine. If people would prefer a cherry-picking approach, I could post a list of relevant commits So - I think we don't have the resource to do much more than this. Clearly we are going to want some to ask for some QA focus in 3.4.next around document encryption [ particularly interacting with signed documents from 3.5 ]. (technically, I produced the patch in a different way, more or less applying mav60 to libreoffice-3-4 directly, so do not have that list handy). (And if there are objections against including this in the 3.4 code line at all, that would of course be fine as well.) Sorry for the delay; of course it is a big diff - in particular the rampant header movement is particularly unhelpful for being able to actually read what changed ;-) The removal of the XMemoryStream stuff is interesting too, I assume that is made redundant by some other seekable caching / fallback means. The property name defines clean up is nice but not needed. Anyhow - assuming it has been tested thoroughly (and I assume so since it's mostly 3.5 code being back-ported), and assuming we get some heavy QA for the next 3.4.x release in this area - I think we should get it in. The user experience regression of not being able to open newly encrypted documents - and with such an hideous error message (that we get without this fix) is just too bad :-) Out of interest - has Fedora shipped this yet ? and what was the feedback like ? Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [REVIEWED] Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO 3.5)
On Thu, 2011-11-17 at 10:10 +, Michael Meeks wrote: Out of interest - has Fedora shipped this yet ? and what was the feedback like ? It's in rawhide, i.e. will-be-F17, so its out there in our development series with no obvious cockups yet, but no massive testing yet in production series. C. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [Libreoffice] [PATCH] Make the toolbars not popping-up randomly
Hi Tim, Tim Hardeck wrote (17-11-11 17:07) On 11/17/2011 04:00 PM, Cor Nouws wrote: Tim Hardeck wrote (16-11-11 20:12) With this patch these toolbars should be docked to the bottom to prevent the document from being moved each time the toolbar is displayed. Could you please explain a bit further? Who should dock the toolbars to the bottom? Or is that a condition for the toolbars to have the show/hide behaviour ? I have changed the default behavior of these mentioned toolbars, like the one that appears when you click on a table in Writer, to be shown at the bottom. If you want to check how it looks just run ctrl + f which will open the findbar at the bottom. Yes, I recognise that. Unlike a new toolbar at the top the document center will not move that's why we decided to show them a the bottom. Since this does only affect the default configuration users with existing Libreoffice configurations wouldn't be influenced. They would have to dock the bars on their own to the bottom or reset this particular configuration. Ah, now I see. (Re-reading your initial post shows it too - but after some technical thoughts regarding the organisation fo the configuration - which me made skip some text). I'm glad with your solution. Thanks - for further explaining too. -- - Cor - http://nl.libreoffice.org ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Test Structure in Litmus
Hi Rimas, On Thu, Nov 17, 2011 at 11:06:43AM +0200, Rimas Kudelis wrote: + many QA people do not know English; they might be discouraged to do the biggest group of functional tests + non-intuitive solution; people need to follow an ugly rule defined somewhere I think it may be possible to extend Litmus to allow restricting testruns by locale, and leave English as the only possible locale to run functional tests on. That would still be a workaround though... Yes. In the context of our testing method, the English mentioned here can be actually Any language. But I suspect it will be easier than Option 2 to design and implement in Litmus code :) So by this method, we will have: - L10n Test Run for all locales in which each test case canbe considered as fully tested only if it has been run in all locales. - Functional Test Run for any of the locales in which each test case canbe considered as fully tested if only it has been run in any of the locales. But as Petr mentioned the option 1 may discourage, at least to some extent, people who does not know English. Besides option 1 brings us back to the style of testrun dividing. So for the choice of workaround, I prefer option 2. 2. Remove the locale setting in the run tests dialog and ignore it as we suggest to ignore the build id. Note that the l10n tests are duplicated in the subgroups: Advantages: + easy to implement + close to what we have now + the l10n tests are localized without hacking Litmus server code + allows to create extra l10n test case for a particular language (is it an advantage? creates a mess?) Disadvantages: + it might be hard to maintain the l10n tests because you need to monitor changes in the en group + people will see l10n test cases also for another languages + it will be hard to see how many l10n test cases were finished in the various localizations; you would need to enter the run tests dialog with different setting Just found an alternative way is Reporting - test runs can show it more easily. Instead of percentage of finishing, detailed execution record of each test case in group/subgroups are summarized there. This is indeed very close to what we have now and could be considered as a possible temporary workaround. It doesn't sound nice in the long-term though. 3. Do some more changes in Litmus (suggested by Rimas): a) add extra checkbox into the test case edit dialog (os somewhere); it will mark the test case as language specific or language independent b) count the statistic of finished test cases according to the check box; locale will be ignored for language-independent tests; c) allow to transparently localize test cases = you will see different text in different locales (can be done later) d) show statistic of finished l10n tests per locale on a single page (can be done later) Advantages: + clear solution + it is on the way where we want to go, see http://wiki.documentfoundation.org/Litmus_TODO + will help to keep l10n tests in sync Disadvantages: + needs hacking in litmus (developer and time) My opinion: --- I very like the 3rd proposal (created by Rimas). I think that it is worth to spend some time with hacking Litmus. We will profit from this in the future a lot. Rimas, what do you think about it? Would you have time and appetite to look into it? I of course agree that it's the cleanest solution. But I'm not sure how much time and skill I'll have to implement this. In any case, I think I'll try to at least add that checkbox rather sooner than later, that would be a good start already. :) Rimas, thanks a lot for doing them! :) I have one small question lingering on my mind though: is it better to add that checkbox to testcases or some higher hierarchical component (subgroup, group?) I'm quite sure a testcase makes most sense, but just want to check with you guys. IMHO, attach it to test case is the most safe way from the design's view, which gives us the most flexibility of expanding the system. But in UI level, subgroup maybe a better place because the test cases will be created by different people, some of whom may not notice the usage of the checkbox for each test case. Once the checkbox is checked in an inappropriate manner, it will be hard to manage and the test statistics is potentially calculated in a wrong(or tricky) way. Keeping the checkbox in a subgroup could be more controlable because of the stability of subgroups contents and structure. Test case authors would only need to put their new test cases in the correct subgroup like we are doing now and nothing else. A potential problem is if we will have mixed
[Libreoffice-bugs] [Bug 43007] Writer vanishes on opening document (no crash report, just dies) - FILEOPEN
https://bugs.freedesktop.org/show_bug.cgi?id=43007 --- Comment #3 from Walter Nicholls wal...@cornerstone.co.nz 2011-11-17 00:17:34 PST --- I have also now tried on my wife's computer - Ubuntu natty - Libreoffice 3.3.4: no crash. (Toshiba laptop, Intel graphics) So far only on my computer .. Asus M51S laptop, nvidia graphics) if that helps. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
