Re: 'make check' failure

[Noel Grandin]

On 2012-08-22 20:07, John Smith wrote:

Hi,


I just ran into this error when running 'make check'. Should I file a
bug report on that ?
It's better to be really sure - especially if you're running on master, 
these kinds of errors can be quite transient.

Just report them here.

To check
(1) run 'make check' again - the build process is not perfect, and 
sometimes it starts working again

(2) try running 'cd sc; make subsequentcheck'
(3) try running it under the debugger and getting a backtrace, then 
report back with the backtrace :-)





Regards,


John Smith



*

Failures that appeared during scenario execution:
  sc.ScAccessiblePageHeaderArea
1 of 96 tests failed
Job run took: 717865ms  [00:11:57]
Job -sce /usr/local/src/libreoffice/sc/qa/unoapi/sc.sce failed

No core dump at
/usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/user,
to create core dumps (and stack traces)
for crashed soffice instances, enable core dumps with:

ulimit -c unlimited

E
Time: 733.897
There was 1 failure:
1) test(org.openoffice.test.UnoApiTest)
java.lang.AssertionError
 at org.junit.Assert.fail(Assert.java:92)
 at org.junit.Assert.assertTrue(Assert.java:43)
 at org.junit.Assert.assertTrue(Assert.java:54)
 at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:38)
 at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
 at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
 at java.lang.reflect.Method.invoke(Method.java:601)
 at 
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:45)
 at 
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
 at 
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:42)
 at 
org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
 at 
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
 at 
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:30)
 at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:263)
 at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:68)
 at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:47)
 at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231)
 at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60)
 at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229)
 at org.junit.runners.ParentRunner.access$000(ParentRunner.java:50)
 at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:222)
 at org.junit.runners.ParentRunner.run(ParentRunner.java:300)
 at org.junit.runners.Suite.runChild(Suite.java:128)
 at org.junit.runners.Suite.runChild(Suite.java:24)
 at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231)
 at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60)
 at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229)
 at org.junit.runners.ParentRunner.access$000(ParentRunner.java:50)
 at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:222)
 at org.junit.runners.ParentRunner.run(ParentRunner.java:300)
 at org.junit.runner.JUnitCore.run(JUnitCore.java:157)
 at org.junit.runner.JUnitCore.run(JUnitCore.java:136)
 at org.junit.runner.JUnitCore.run(JUnitCore.java:117)
 at org.junit.runner.JUnitCore.runMain(JUnitCore.java:98)
 at org.junit.runner.JUnitCore.runMainAndExit(JUnitCore.java:53)
 at org.junit.runner.JUnitCore.main(JUnitCore.java:45)

FAILURES!!!
Tests run: 1,  Failures: 1

to rerun just this failed test without all others, run:

 make 
/usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/user

cd into the module dir to run the tests faster
Or to do interactive debugging, run two shells with (Linux only):

 make debugrun
 make gb_JunitTest_DEBUGRUN=T
/usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/done

make[2]: *** 
[/usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/done]
Error 1
make[2]: *** Waiting for unfinished jobs
make[2]: Leaving directory `/usr/local/src/libreoffice'
make[1]: *** [subsequentcheck] Error 2
make[1]: Leaving directory `/usr/local/src/libreoffice'
make: *** [check] Error 2
#
___
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

[PUSHED] installer: Remove unused -tab command-line option and TAB_ON...

[Gerrit]

>From Thomas Arnhold :

Thomas Arnhold has submitted this change and it was merged.

Change subject: installer: Remove unused -tab command-line option and TAB_ONLY 
flag.
..


installer: Remove unused -tab command-line option and TAB_ONLY flag.

Change-Id: Idcb8be8882db8f487ba9bda2ae8947ccd9d99712
---
M scp2/source/ooo/module_hidden_ooo.scp
M scp2/source/ooo/module_ooo.scp
M solenv/bin/modules/installer.pm
M solenv/bin/modules/installer/globals.pm
M solenv/bin/modules/installer/packagelist.pm
M solenv/bin/modules/installer/parameter.pm
M solenv/bin/modules/installer/scriptitems.pm
7 files changed, 2 insertions(+), 51 deletions(-)

Approvals:
  Thomas Arnhold: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/462
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idcb8be8882db8f487ba9bda2ae8947ccd9d99712
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Tim Retout 
Gerrit-Reviewer: Thomas Arnhold 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [HELP] fdo#44721 (nearly) infinite loop & memory consumption

[Lionel Elie Mamane]

On Wed, Jun 06, 2012 at 11:44:52PM +0200, Lionel Elie Mamane wrote:
> On Wed, Jun 06, 2012 at 07:35:58PM +0200, Thorsten Behrens wrote:
>> Michael Meeks wrote:

>>> A basegfx memory leak / crasher :-) Thorsten is prolly a good guy to
>>> have a look I guess.

>> Nah, more likely underflow / insufficient range checking, with the
>> large negatives coming in. Will have a look - a nice, ready-made
>> .odb with a single big button to press appreciated of course :)

> Err... Sorry for the noise, the bug seems to have disappeared.

Well, it has reappeared, with more narrow, but still quite large,
reproduction cases. Could you please have a look? I've attached videos
to the bug to show exactly what to do to reproduce it. Thanks.

This bug by now has two duplicates or near-duplicates :-(

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: scp2/source solenv/bin

[Libreoffice Gerrit user]

 scp2/source/ooo/module_hidden_ooo.scp   |1 
 scp2/source/ooo/module_ooo.scp  |1 
 solenv/bin/modules/installer.pm |5 ---
 solenv/bin/modules/installer/globals.pm |1 
 solenv/bin/modules/installer/packagelist.pm |7 +
 solenv/bin/modules/installer/parameter.pm   |2 -
 solenv/bin/modules/installer/scriptitems.pm |   36 
 7 files changed, 2 insertions(+), 51 deletions(-)

New commits:
commit dd7ddfc34e62b8f6351d970fdac2ef631b5175c2
Author: Tim Retout 
Date:   Wed Aug 22 21:34:47 2012 +0100

installer: Remove unused -tab command-line option and TAB_ONLY flag.

Change-Id: Idcb8be8882db8f487ba9bda2ae8947ccd9d99712
Reviewed-on: https://gerrit.libreoffice.org/462
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index c198050..a530774 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -290,7 +290,6 @@ End
 
 Module gid_Module_Root_Files_5
 PackageInfo = "packinfo_office.txt";
-TabPackageInfo = "packinfo_office_tab.txt";
ParentID = gid_Module_Root;
 InstallOrder = "40";
Name = "gid_Module_Root_Files_5";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 23196e2..c5c9c22 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -30,7 +30,6 @@
 Module gid_Module_Root
 Sortkey = "10";
 PackageInfo = "packinfo_office.txt";
-TabPackageInfo = "packinfo_office_tab.txt";
 InstallOrder = "20";
 MOD_NAME_DESC(MODULE_ROOT_OSL);
 XpdPackageName = "gid_Module_Root_Files_1";
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index ceafede..3820c70 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -398,11 +398,6 @@ sub main {
 $filesinproductarrayref = 
installer::scriptitems::remove_patchonlyfiles_from_Installset($filesinproductarrayref);
 }
 
-if (! $installer::globals::tab)
-{
-$filesinproductarrayref = 
installer::scriptitems::remove_tabonlyfiles_from_Installset($filesinproductarrayref);
-}
-
 installer::logger::print_message( "... analyzing scpactions ... \n" );
 
 my $scpactionsinproductarrayref = 
installer::setupscript::get_all_items_from_script($setupscriptref, "ScpAction");
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index af8d8dd..419a8e3 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -265,7 +265,6 @@ BEGIN
 $addchildprojects = 0;
 $languagepack = 0;
 $helppack = 0;
-$tab = 0;
 $patch = 0;
 $patchincludepath = "";
 $refresh_includepaths = 0;
diff --git a/solenv/bin/modules/installer/packagelist.pm 
b/solenv/bin/modules/installer/packagelist.pm
index 0612ecb..66b52e2 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -634,10 +634,7 @@ sub collectpackages
 my $onemodule;
 foreach $onemodule ( @{$allmodules} )
 {
-my $packageinfo = "PackageInfo";
-if (( $installer::globals::tab ) && ( $onemodule->{"TabPackageInfo"} 
)) { $packageinfo = "TabPackageInfo" }
-
-if ( $onemodule->{$packageinfo} )   # this is a package module!
+if ( $onemodule->{'PackageInfo'} )   # this is a package module!
 {
 my $modulegid = $onemodule->{'gid'};
 
@@ -658,7 +655,7 @@ sub collectpackages
 if ( exists($gid_analyzed{$modulegid}) ) { next; }
 $gid_analyzed{$modulegid} = 1;
 
-my $packinfofile = $onemodule->{$packageinfo};
+my $packinfofile = $onemodule->{'PackageInfo'};
 
 # The file with package information has to be found in path list
 my $fileref = 
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packinfofile,
 "" , 0);
diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index 7cbc28d..c749af7 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -133,7 +133,6 @@ sub getparameter
 elsif ($param eq "-format") { $installer::globals::packageformat = 
shift(@ARGV); }
 elsif ($param eq "-quiet") { $installer::globals::quiet = 1; }
 elsif ($param eq "-verbose") { $installer::globals::quiet = 0; }
-elsif ($param eq "-tab") { $installer::globals::tab = 1; }
 elsif ($param eq "-u") { $installer::globals::unpackpath = 
shift(@ARGV); }
 elsif ($param eq "-i") { $installer::globals::rootpath = shift(@ARGV); 
}
 elsif ($param eq "-dontcallepm") { $installer::globals::call_epm = 0; }
@@ -564,7 +563,6 @@ sub outputparameter
 if ((!($installer::globals::iswindowsbuild)) && ( 
$installer::globa

[Libreoffice-commits] .: Branch 'feature/gbuild_external' - 3 commits - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/ExternalLib.mk|3 ++-
 solenv/gbuild/UnpackedTarball.mk|   10 +-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 2d103e25c3814d88ddd4ac2227664bea845b42cb
Author: David Tardon 
Date:   Thu Aug 23 07:44:31 2012 +0200

trivial comment fix

Change-Id: If5eb15c5368f1808cf82d92c7e94e4a7205e4756

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index a0afee4..8d85e01 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -232,7 +232,7 @@ endef
 
 # Add several patches at once
 #
-# gb_UnpackedTarball_add_patch unpacked patch(es)
+# gb_UnpackedTarball_add_patches unpacked patch(es)
 define gb_UnpackedTarball_add_patches
 $(foreach patch,$(2),$(call gb_UnpackedTarball_add_patch,$(1),$(patch)))
 
@@ -255,7 +255,7 @@ endef
 #
 # The files are added into the specified subdir.
 #
-# gb_UnpackedTarball_add_file unpacked subdir file(s)
+# gb_UnpackedTarball_add_files unpacked subdir file(s)
 define gb_UnpackedTarball_add_files
 $(foreach file,$(3),$(call gb_UnpackedTarball_add_file,$(1),$(2)/$(notdir 
$(file)),$(file)))
 
commit f8f860eb744b9b306edf044fba84ffc8f238b2c1
Author: David Tardon 
Date:   Thu Aug 23 07:41:42 2012 +0200

fix modelines

Change-Id: Idc4b0a68d9d4bd4db6ad5a1bb12f4ea96f62b3d7

diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index cb8eb01..5ac3c14 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -1,5 +1,4 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
@@ -108,3 +107,5 @@ define gb_ExternalLib__command_autotools
+MAKEFLAGS=$(filterout r,$(MAKEFLAGS)) $(MAKE) -C $(call 
gb_ExternalLib_get_builddir,$(1))
+$(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1)) install
 endef
+
+# vim: set noet sw=4 ts=4:
commit 73745da5321c72700ecd41aae9cbf3a711841b27
Author: David Tardon 
Date:   Thu Aug 23 07:40:22 2012 +0200

fix errors (thanks Matúš)

Change-Id: Ib96ae3e5af979a1a45a1becbc535885c2ecd7221

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 744c8a1..a0afee4 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -33,7 +33,7 @@ $(GNUTAR) \
-x \
$(3) \
-C $(UNPACKED_DIR) \
-   --strip-components=$(UNPACKED_STRIP_COMPONENTS) \
+   $(STRIP_COMPONENTS)=$(UNPACKED_STRIP_COMPONENTS) \
-f $(UNPACKED_TARBALL)
 endef
 
@@ -84,10 +84,10 @@ $(call gb_UnpackedTarget_get_clean_target,%) :
 # gb_UnpackedTarget_UnpackedTarget target outdir strip-components?
 define gb_UnpackedTarget_UnpackedTarget
 $(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_DIR := $(2)
-$(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_TARBALL := 
$(TARFILE_LOCATION)/$(1)
+$(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_TARBALL := 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(1)
 $(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_STRIP_COMPONENTS := 
$(call gb_UnpackedTarget__get_strip_components,$(1),$(3))
 
-$(call gb_UnpackedTarget_get_target,$(1)) : $(TARFILE_LOCATION)/$(1)
+$(call gb_UnpackedTarget_get_target,$(1)) : 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(1)
 $(call gb_UnpackedTarget_get_target,$(1)) :| $(dir $(call 
gb_UnpackedTarget_get_target,$(1))).dir
 
 endef
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index e604d78..5fe282d 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -743,7 +743,7 @@ gb_ExtensionTarget_LICENSEFILE_DEFAULT := 
$(OUTDIR)/bin/osl/license.txt
 
 # UnpackedTarget class
 
-gb_UnpackedTarget_TARFILE_LOCATION := $(shell cygpath -m $(TARFILE_LOCATION))
+gb_UnpackedTarget_TARFILE_LOCATION := $(shell cygpath -u $(TARFILE_LOCATION))
 
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) 
PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" 
PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/dpobject.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 56dde463a1b6c4b6ae7424070f3f0e00644965dc
Author: Kohei Yoshida 
Date:   Thu Aug 23 01:15:46 2012 -0400

Removing a non-virtual destructor.

Change-Id: I1be79ef0e6b7d0626d057a6d52950301ea4dd169

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index a34272d..ce9b236 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -132,7 +132,6 @@ class DBConnector : public ScDPCache::DBConnector
 
 public:
 DBConnector(ScDPCache& rCache, const uno::Reference& 
xRowSet, const Date& rNullDate);
-~DBConnector();
 
 bool isValid() const;
 
@@ -154,10 +153,6 @@ DBConnector::DBConnector(ScDPCache& rCache, const 
uno::Reference&
 mxRow.set(mxRowSet, UNO_QUERY);
 }
 
-DBConnector::~DBConnector()
-{
-}
-
 bool DBConnector::isValid() const
 {
 return mxRowSet.is() && mxRow.is() && mxMetaData.is();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: gbuild support for external projects

[David Tardon]

Hi,

On Tue, Aug 21, 2012 at 02:04:14PM +0200, Matúš Kukan wrote:
> Hi David,
> 
> On 21 August 2012 09:00, David Tardon  wrote:
> > Hi all,
> >
> > I have created a new gbuild class UnpackedTarball that handles preparing
> > sources for external project: unpacking, patching and a bit more
> 
> Nice, I was considering asking about gbuildizing-external-libs status

Why do you think there had been any progress? :-) Actually I only
created this class because I needed it for converting extras, which uses
some external templates, fonts, etc. from OxygenOffice (the original way
to handle them was to unpack them over the source tree in ./download. I
will refrain from commenting on this.)

> 
> > As for the rest of the external modules, my current idea is to use
> > free-form makefile, like CustomTarget, for everything but preparation of
> > sources. That would match the current dmake makefiles pretty well, I
> > think...
> 
> Sounds fine, I am still not sure if I am going to take part in
> gbuildizing these.
> Maybe I will help with few.

Great. I have already marked external projects in
https://wiki.documentfoundation.org/Development/Build_System/Module_status
(most of the uncoverted ones, which is not surprising :-) I am
additionally going to mark the modules that are built purely by dmake
and maybe even add some notes about complexity of the makefile.

> 
> > The code lives on branch feature/gbuild_external. I am pretty confident
> > it will not break on Windows, but I will not mind testers :-) If there
> > are no violent objectives, I will merge it to master in 1-2 days.
> 
> This time I am not going to test it but I had a look.
> 
> You've changed cygpath -u $(TARFILE_LOCATION) to cygpath -m 
> $(TARFILE_LOCATION),
> that's wrong, moreover you have forgot to use
> gb_UnpackedTarget_TARFILE_LOCATION ?

Really? Oh, really. Crap. Fixed now.

> 
> Also seems that you don't use $(STRIP_COMPONENTS) defined in configure.

Right, I should have used that. Fixed.

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: REMINDER: Release 3.6.0-rc2 from libreoffice-3-6-1 branch

[ape]

Hi, Petr!

I watched today the latest builds for Windows:

The file "libreoffice-3-6~..._build_info.txt" wrote:
 checking the Version of Microsoft C/C++ Compiler... found compiler version
00153072 (MSVS 2008)
...

Files "soffice.bin.manifest"; "s{program's_name}.exe" (content - "Manifest")
say:
 http://nabble.documentfoundation.org/REMINDER-Release-3-6-0-rc2-from-libreoffice-3-6-1-branch-tp4002431p4003040.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

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/dpobject.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ace165680f07a118e0d5dcea3fc844fbdd3c6b23
Author: Kohei Yoshida 
Date:   Wed Aug 22 23:56:33 2012 -0400

We assume that this uno interface exists. No need to check it.

Change-Id: Iee2125204106c49e5b8670d9cba95f3dcf3571f8

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 4918b68..a34272d 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -175,8 +175,7 @@ bool DBConnector::next()
 
 void DBConnector::finish()
 {
-if (mxRowSet.is())
-mxRowSet->beforeFirst();
+mxRowSet->beforeFirst();
 }
 
 long DBConnector::getColumnCount() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

[Libreoffice Gerrit user]

 sc/qa/unit/ucalc.cxx |   63 +++
 1 file changed, 63 insertions(+)

New commits:
commit 198ccdf00ee2d9defa1114c4aba6ddcf83418237
Author: Kohei Yoshida 
Date:   Wed Aug 22 23:49:52 2012 -0400

New unit test for pivot table's case insensitive string comparison.

Change-Id: I31ddd3eedc5a93103ae7efd7ce8698e4dc247937

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ea545f6..63b3b00 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -170,6 +170,12 @@ public:
 void testPivotTableEmptyRows();
 void testPivotTableTextNumber();
 
+/**
+ * Test for checking that pivot table treats strings in a case insensitive
+ * manner.
+ */
+void testPivotTableCaseInsensitiveStrings();
+
 void testSheetCopy();
 void testSheetMove();
 void testExternalRef();
@@ -241,6 +247,7 @@ public:
 CPPUNIT_TEST(testPivotTableDateGrouping);
 CPPUNIT_TEST(testPivotTableEmptyRows);
 CPPUNIT_TEST(testPivotTableTextNumber);
+CPPUNIT_TEST(testPivotTableCaseInsensitiveStrings);
 CPPUNIT_TEST(testSheetCopy);
 CPPUNIT_TEST(testSheetMove);
 CPPUNIT_TEST(testExternalRef);
@@ -2918,6 +2925,62 @@ void Test::testPivotTableTextNumber()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testPivotTableCaseInsensitiveStrings()
+{
+m_pDoc->InsertTab(0, OUString("Data"));
+m_pDoc->InsertTab(1, OUString("Table"));
+
+// Raw data
+const char* aData[][2] = {
+{ "Name", "Value" },
+{ "A", "1" },
+{ "a", "2" },
+};
+
+// Dimension definition
+DPFieldDef aFields[] = {
+{ "Name", sheet::DataPilotFieldOrientation_ROW, 0 },
+{ "Value", sheet::DataPilotFieldOrientation_DATA, 
sheet::GeneralFunction_SUM },
+};
+
+ScAddress aPos(1,1,0);
+ScRange aDataRange = insertRangeData(m_pDoc, aPos, aData, 
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT_MESSAGE("failed to insert range data at correct position", 
aDataRange.aStart == aPos);
+
+ScDPObject* pDPObj = createDPFromRange(
+m_pDoc, aDataRange, aFields, SAL_N_ELEMENTS(aFields), false);
+
+ScDPCollection* pDPs = m_pDoc->GetDPCollection();
+bool bSuccess = pDPs->InsertNewTable(pDPObj);
+
+CPPUNIT_ASSERT_MESSAGE("failed to insert a new pivot table object into 
document.", bSuccess);
+CPPUNIT_ASSERT_MESSAGE("there should be only one data pilot table.",
+   pDPs->GetCount() == 1);
+pDPObj->SetName(pDPs->CreateNewName());
+
+ScRange aOutRange = refresh(pDPObj);
+
+{
+// Expected output table content.  0 = empty cell
+const char* aOutputCheck[][2] = {
+{ "Name", 0 },
+{ "A", "3" },
+{ "Total Result", "3" },
+};
+
+bSuccess = checkDPTableOutput<2>(m_pDoc, aOutRange, aOutputCheck, 
"Case insensitive strings");
+CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
+}
+
+pDPs->FreeTable(pDPObj);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be no more tables.", 
pDPs->GetCount(), static_cast(0));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("There shouldn't be any more cache stored.",
+   pDPs->GetSheetCaches().size(), 
static_cast(0));
+
+m_pDoc->DeleteTab(1);
+m_pDoc->DeleteTab(0);
+}
+
 void Test::testSheetCopy()
 {
 OUString aTabName("TestTab");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW 3-6] Fix for fdo#53929 - Case insensitive strings in pivot table

[Kohei Yoshida]

Hi there,

Another fix I'd like backported to 3-6 (and perhaps 3-6-1 if enough 
people feel comfortable) is this


https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=1afd1e5ca8872253c491af76c70397fb9e00f900

which fixes

https://bugs.freedesktop.org/show_bug.cgi?id=53929

This change IMO is pretty safe.

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/dpcache.cxx|4 ++--
 sc/source/core/data/dpitemdata.cxx |5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 1afd1e5ca8872253c491af76c70397fb9e00f900
Author: Kohei Yoshida 
Date:   Wed Aug 22 23:33:14 2012 -0400

fdo#53929: Pivot table uses case insensitive string comparison.

Change-Id: I65fa22ceeba37a15b70fe41b1dee26f1dde7d759

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index fa2b1ef..c94b542 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -195,7 +195,7 @@ struct EqualByValue : std::binary_function
 {
 bool operator() (const Bucket& left, const Bucket& right) const
 {
-return left.maValue == right.maValue;
+return left.maValue.IsCaseInsEqual(right.maValue);
 }
 };
 
@@ -251,7 +251,7 @@ void processBuckets(std::vector& aBuckets, 
ScDPCache::Field& rField)
 it->mnOrderIndex = nCurIndex;
 for (++it; it != itEnd; ++it)
 {
-if (aPrev != it->maValue)
+if (!aPrev.IsCaseInsEqual(it->maValue))
 ++nCurIndex;
 
 it->mnOrderIndex = nCurIndex;
diff --git a/sc/source/core/data/dpitemdata.cxx 
b/sc/source/core/data/dpitemdata.cxx
index 1641572..bb22894 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -210,8 +210,9 @@ bool ScDPItemData::IsCaseInsEqual(const ScDPItemData& r) 
const
 ;
 }
 
-if (mbStringInterned && r.mbStringInterned)
-return mpString == r.mpString;
+if (mbStringInterned && r.mbStringInterned && mpString == r.mpString)
+// Fast equality check for interned strings.
+return true;
 
 return ScGlobal::GetpTransliteration()->isEqual(GetString(), 
r.GetString());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/dpcache.hxx   |   22 +++-
 sc/source/core/data/dpcache.cxx  |  115 +---
 sc/source/core/data/dpobject.cxx |  183 ++-
 3 files changed, 205 insertions(+), 115 deletions(-)

New commits:
commit 44dcb37bf9339611559743f35a93dd674227b357
Author: Kohei Yoshida 
Date:   Wed Aug 22 23:10:45 2012 -0400

Abstract database connection from pivot cache to hide UNO API.

This is the first step toward unit-testing the initialization
code from the database source.

Change-Id: I1a7882ba443fd71d4210fb2e2caa195fb71dab92

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 68b1029..d68f348 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -43,12 +43,6 @@
 #include 
 #include 
 
-namespace com { namespace sun { namespace star {
-namespace sdbc {
-class XRowSet;
-}
-}}}
-
 struct ScQueryParam;
 class ScDPObject;
 class ScDPItemData;
@@ -102,6 +96,20 @@ public:
 Field();
 };
 
+/**
+ * Interface for connecting to database source.  Column index is 0-based.
+ */
+class DBConnector
+{
+public:
+virtual long getColumnCount() const = 0;
+virtual rtl::OUString getColumnLabel(long nCol) const = 0;
+virtual bool first() = 0;
+virtual bool next() = 0;
+virtual void finish() = 0;
+virtual void getValue(long nCol, ScDPItemData& rData, short& rNumType) 
const = 0;
+};
+
 private:
 
 ScDocument* mpDoc;
@@ -148,7 +156,7 @@ public:
 
 const ItemsType& GetDimMemberValues( SCCOL nDim ) const;
 bool InitFromDoc(ScDocument* pDoc, const ScRange& rRange);
-bool InitFromDataBase(const  ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XRowSet>& xRowSet, const Date& rNullDate);
+bool InitFromDataBase(DBConnector& rDB);
 
 SCROW  GetRowCount() const;
 SCROW  GetItemDataId( sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty ) 
const;
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index ff8fc6e..fa2b1ef 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -45,16 +45,8 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-
 #include 
 
-const double D_TIMEFACTOR = 86400.0;
-
 using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Exception;
@@ -165,85 +157,6 @@ void initFromCell(
 rData.SetEmpty();
 }
 
-void getItemValue(
-ScDPCache& rCache, ScDPItemData& rData, const Reference& xRow, 
sal_Int32 nType,
-long nCol, const Date& rNullDate, short& rNumType)
-{
-rNumType = NUMBERFORMAT_NUMBER;
-try
-{
-double fValue = 0.0;
-switch (nType)
-{
-case sdbc::DataType::BIT:
-case sdbc::DataType::BOOLEAN:
-{
-rNumType = NUMBERFORMAT_LOGICAL;
-fValue  = xRow->getBoolean(nCol) ? 1 : 0;
-rData.SetValue(fValue);
-break;
-}
-case sdbc::DataType::TINYINT:
-case sdbc::DataType::SMALLINT:
-case sdbc::DataType::INTEGER:
-case sdbc::DataType::BIGINT:
-case sdbc::DataType::FLOAT:
-case sdbc::DataType::REAL:
-case sdbc::DataType::DOUBLE:
-case sdbc::DataType::NUMERIC:
-case sdbc::DataType::DECIMAL:
-{
-//! do the conversion here?
-fValue = xRow->getDouble(nCol);
-rData.SetValue(fValue);
-break;
-}
-case sdbc::DataType::DATE:
-{
-rNumType = NUMBERFORMAT_DATE;
-
-util::Date aDate = xRow->getDate(nCol);
-fValue = Date(aDate.Day, aDate.Month, aDate.Year) - rNullDate;
-rData.SetValue(fValue);
-break;
-}
-case sdbc::DataType::TIME:
-{
-rNumType = NUMBERFORMAT_TIME;
-
-util::Time aTime = xRow->getTime(nCol);
-fValue = ( aTime.Hours * 3600 + aTime.Minutes * 60 +
-   aTime.Seconds + aTime.HundredthSeconds / 100.0 ) / 
D_TIMEFACTOR;
-rData.SetValue(fValue);
-break;
-}
-case sdbc::DataType::TIMESTAMP:
-{
-rNumType = NUMBERFORMAT_DATETIME;
-
-util::DateTime aStamp = xRow->getTimestamp(nCol);
-fValue = ( Date( aStamp.Day, aStamp.Month, aStamp.Year ) - 
rNullDate ) +
- ( aStamp.Hours * 3600 + aStamp.Minutes * 60 +
-   aStamp.Seconds + aStamp.HundredthSeconds / 100.0 ) 
/ D_TIMEFACTOR;
-rData.SetValue(fValue);
-break;
-}
-case sdbc::DataType::CHAR:
-case sdbc::DataType::VARCHAR:
-case sdbc::DataType::LONGVARCHAR:
-case sdbc::D

when reopen vertical style Presentation file got error

[huqitu du]

hi, everybody
when I use Presentaion make a vertical style file and save it and
reopen this file, the vertical text will be make one line what ever the
text much long, so how can I fix this problem , where the Presentaion code
make new line for vertical text.
you can open the aa.odp in the attachment.

thank's a lot.


aa.odp
Description: application/vnd.oasis.opendocument.presentation
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 53640, which changed state.

Bug 53640 Summary: PIVOTTABLE from Datasource (Base, Query) shows wrong results
https://bugs.freedesktop.org/show_bug.cgi?id=53640

   What|Old Value   |New Value

 Status|NEW |ASSIGNED
 Resolution||FIXED
 Status|ASSIGNED|RESOLVED

-- 
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

[Libreoffice-commits] .: sd/source

[Libreoffice Gerrit user]

 sd/source/ui/remotecontrol/BluetoothServer.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 585b3ebea4312dbfa86ad9f4a72f0014fe2eacec
Author: Andrzej J.R. Hunt 
Date:   Wed Aug 22 23:38:19 2012 +0200

Remove extended initializer list -- use memset for BDADDR_ANY.

Change-Id: Iea10ffdf6443a33c3dd6106b69c126945763b778

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 0bbedb4..556bc59 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -160,7 +160,8 @@ void BluetoothServer::execute()
 
 sockaddr_rc aAddr;
 aAddr.rc_family = AF_BLUETOOTH;
-aAddr.rc_bdaddr = {{0, 0, 0, 0, 0, 0}}; // BDADDR_ANY is broken
+// aAddr.rc_bdaddr = {{0, 0, 0, 0, 0, 0}}; // BDADDR_ANY is broken
+memset( &aAddr.rc_bdaddr, 0, sizeof( aAddr.rc_bdaddr ) );
 aAddr.rc_channel = 5;
 
 if ( bind( aSocket, (sockaddr*) &aAddr, sizeof(aAddr)) < 0 ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] installer: Remove unused -tab command-line option and TAB_ON...

[Gerrit]

>From Tim Retout :

Tim Retout has uploaded a new change for review.

Change subject: installer: Remove unused -tab command-line option and TAB_ONLY 
flag.
..

installer: Remove unused -tab command-line option and TAB_ONLY flag.

Change-Id: Idcb8be8882db8f487ba9bda2ae8947ccd9d99712
---
M scp2/source/ooo/module_hidden_ooo.scp
M scp2/source/ooo/module_ooo.scp
M solenv/bin/modules/installer.pm
M solenv/bin/modules/installer/globals.pm
M solenv/bin/modules/installer/packagelist.pm
M solenv/bin/modules/installer/parameter.pm
M solenv/bin/modules/installer/scriptitems.pm
7 files changed, 2 insertions(+), 51 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/462/1
--
To view, visit https://gerrit.libreoffice.org/462
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcb8be8882db8f487ba9bda2ae8947ccd9d99712
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Tim Retout 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Related fdo#53872: CRASH - opening database report

[Gerrit]

>From Julien Nabet :

Julien Nabet has uploaded a new change for review.

Change subject: Related fdo#53872: CRASH - opening database report
..

Related fdo#53872: CRASH - opening database report

Change-Id: Ib7fe1691f9114f38ae1551e2aa6c4bbf48096391
---
M reportdesign/source/filter/xml/xmlExport.cxx
1 file changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/463/1
--
To view, visit https://gerrit.libreoffice.org/463
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7fe1691f9114f38ae1551e2aa6c4bbf48096391
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/modules/installer/globals.pm   |1 -
 solenv/bin/modules/installer/parameter.pm |4 
 2 files changed, 5 deletions(-)

New commits:
commit 04fd2bf36e7100132f1ee555d9c84640baf1747b
Author: Tim Retout 
Date:   Wed Aug 22 20:53:49 2012 +0100

installer: Remove unused -javalanguage command-line option.

Change-Id: Ia6f52713dd3cf5ab7d5716c7b6a6f5c1440ed323

diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index d8afbe1..af8d8dd 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -245,7 +245,6 @@ BEGIN
 $lastcabfilename = "";
 
 $defaultlanguage = "";
-$javalanguagepath = "";
 $addlicensefile = 1;
 $addsystemintegration = 0;
 $makedownload = 1;
diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index c3469b7..7cbc28d 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -57,7 +57,6 @@ The following parameter are needed:
 -u: Path, in which zipfiles are unpacked (optional)
 -msitemplate: Source of the msi file templates (Windows compiler only)
 -msilanguage: Source of the msi file templates (Windows compiler only)
--javalanguage: Source of the Java language files (opt., non-Windows only)
 -buildid: Current BuildID (optional)
 -pro: Product version
 -format: Package format
@@ -141,7 +140,6 @@ sub getparameter
 elsif ($param eq "-msitemplate") { 
$installer::globals::idttemplatepath = shift(@ARGV); }
 elsif ($param eq "-msilanguage") { 
$installer::globals::idtlanguagepath = shift(@ARGV); }
 elsif ($param eq "-patchinc") { $installer::globals::patchincludepath 
= shift(@ARGV); }
-elsif ($param eq "-javalanguage") { 
$installer::globals::javalanguagepath = shift(@ARGV); }
 elsif ($param eq "-buildid") { $installer::globals::buildid = 
shift(@ARGV); }
 elsif ($param eq "-copyproject") { 
$installer::globals::is_copy_only_project = 1; }
 elsif ($param eq "-languagepack") { $installer::globals::languagepack 
= 1; }
@@ -565,8 +563,6 @@ sub outputparameter
 if ((!($installer::globals::idtlanguagepath eq "")) && 
(!($installer::globals::iswindowsbuild))) { push(@output, "msi language path 
will be ignored for non Windows builds!\n"); }
 if ((!($installer::globals::iswindowsbuild)) && ( 
$installer::globals::call_epm )) { push(@output, "Calling epm\n"); }
 if ((!($installer::globals::iswindowsbuild)) && 
(!($installer::globals::call_epm))) { push(@output, "Not calling epm\n"); }
-if (!($installer::globals::javalanguagepath eq "")) { push(@output, "Java 
language path: $installer::globals::javalanguagepath\n"); }
-if ((!($installer::globals::javalanguagepath eq "")) && 
($installer::globals::iswindowsbuild)) { push(@output, "Java language path will 
be ignored for Windows builds!\n"); }
 if ( $installer::globals::patchincludepath ) { push(@output, "Patch 
include path: $installer::globals::patchincludepath\n"); }
 if ( $installer::globals::tab ) { push(@output, "TAB version\n"); }
 if ( $installer::globals::strip ) { push(@output, "Stripping files\n"); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/modules/installer.pm  |2 
 solenv/bin/modules/installer/scpzipfiles.pm  |   50 +++--
 solenv/bin/modules/t/installer-scpzipfiles.t |   63 +++
 3 files changed, 72 insertions(+), 43 deletions(-)

New commits:
commit 46a977081c6f1886f8fff8457c85e6d426dcc20f
Author: Tim Retout 
Date:   Wed Aug 22 18:41:10 2012 +0100

installer: Use hashref for replace_all_ziplistvariables_in_rtffile

Also rewrite implementation of installer::scpzipfiles variable
replacement functions, and add test case.

Change-Id: Ic4548b9df8c50cbf2d3049052c637e859542a1e8

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 24e0c4e..ceafede 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1644,7 +1644,7 @@ sub main {
 {
 my $licensefilesource = 
installer::windows::idtglobal::get_rtflicensefilesource($onelanguage, 
$includepatharrayref_lang);
 my $licensefile = 
installer::files::read_file($licensefilesource);
-
installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, 
$allvariablesarrayref, $onelanguage, $loggingdir);
+
installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, 
$allvariableshashref);
 my $controltablename = $languageidtdir . 
$installer::globals::separator . "Control.idt";
 my $controltable = 
installer::files::read_file($controltablename);
 
installer::windows::idtglobal::add_licensefile_to_database($licensefile, 
$controltable);
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm 
b/solenv/bin/modules/installer/scpzipfiles.pm
index cb0e640..70283f2 100644
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ b/solenv/bin/modules/installer/scpzipfiles.pm
@@ -39,60 +39,26 @@ use installer::systemactions;
 
 sub replace_all_ziplistvariables_in_file
 {
-my ( $fileref, $variableshashref ) = @_;
+my ( $fileref, $variablesref ) = @_;
 
-for ( my $i = 0; $i <= $#{$fileref}; $i++ )
+for my $line ( @{$fileref} )
 {
-my $line = ${$fileref}[$i];
-
-if ( $line =~ /^.*\$\{\w+\}.*$/ )   # only occurrence of ${abc}
-{
-my $key;
-
-foreach $key (keys %{$variableshashref})
-{
-my $value = $variableshashref->{$key};
-$key = '${' . $key . '}';
-$line =~ s/\Q$key\E/$value/g;
-${$fileref}[$i] = $line;
-}
-}
+$line =~ s/\$\{(\w+)\}/$variablesref->{$1}/eg;
 }
 }
 
 

-# Replacing all zip list variables in rtf files. In rtf files
-# the brackets are masked.
+# Replacing all zip list variables in rtf files.
 

 
 sub replace_all_ziplistvariables_in_rtffile
 {
-my ( $fileref, $variablesref, $onelanguage, $loggingdir ) = @_;
+my ( $fileref, $variablesref ) = @_;
 
-for ( my $i = 0; $i <= $#{$fileref}; $i++ )
+for my $line ( @{$fileref} )
 {
-my $line = ${$fileref}[$i];
-
-if ( $line =~ /^.*\$\\\{\w+\\\}.*$/ )   # only occurrence of $\{abc\}
-{
-for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
-{
-my $variableline = ${$variablesref}[$j];
-
-my ($key, $value);
-
-if ( $variableline =~ /^\s*([\w-]+?)\s+(.*?)\s*$/ )
-{
-$key = $1;
-$value = $2;
-$key = '$\{' . $key . '\}';
-}
-
-$line =~ s/\Q$key\E/$value/g;
-
-${$fileref}[$i] = $line;
-}
-}
+# In rtf files the braces are backslash-escaped.
+$line =~ s/\$\\\{(\w+)\\\}/$variablesref->{$1}/eg;
 }
 }
 
diff --git a/solenv/bin/modules/t/installer-scpzipfiles.t 
b/solenv/bin/modules/t/installer-scpzipfiles.t
new file mode 100644
index 000..e98bfd0
--- /dev/null
+++ b/solenv/bin/modules/t/installer-scpzipfiles.t
@@ -0,0 +1,63 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2012 Tim Retout  (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the 

[Libreoffice-commits] .: sd/source

[Libreoffice Gerrit user]

 sd/source/ui/remotecontrol/BluetoothServer.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 89303460e906c2de0e424d8d44095a084565e379
Author: Andrzej J.R. Hunt 
Date:   Wed Aug 22 23:29:26 2012 +0200

Get rid of my no longer needed fprintfs.

Change-Id: Ic4878cb8c25e7a361d293968037430f7f956ddc1

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index bcff4ad..0bbedb4 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -58,7 +58,6 @@ void BluetoothServer::execute()
 GDBusConnection* aConnection = g_bus_get_sync( G_BUS_TYPE_SYSTEM, NULL, 
&aError );
 if ( aError )
 {
-fprintf( stderr, aError->message );
 g_error_free( aError );
 }
 
@@ -70,10 +69,9 @@ void BluetoothServer::execute()
 GVariant *aAdapterName = g_variant_get_child_value( aAdapter, 0 );
 if ( aError )
 {
-fprintf( stderr, aError->message );
 g_error_free( aError );
 }
-fprintf( stderr, (const char*) g_variant_get_string( aAdapterName, NULL ) 
);
+// fprintf( stderr, (const char*) g_variant_get_string( aAdapterName, NULL 
) );
 
 
 // GDBusObjectManager* aManager = g_dbus_object_manager_client_new_sync( 
aConnection,
@@ -94,7 +92,6 @@ void BluetoothServer::execute()
 G_DBUS_CALL_FLAGS_NONE, -1, NULL, &aError);
 if ( aError )
 {
-fprintf( stderr, aError->message );
 g_error_free( aError );
 }
 (void) aRecordHandle;
@@ -185,7 +182,7 @@ void BluetoothServer::execute()
 close( aSocket );
 return;
 } else {
-fprintf( stderr, "Accepted Bluetooth\n" );
+// fprintf( stderr, "Accepted Bluetooth\n" );
 
 Communicator* pCommunicator = new Communicator( new 
BufferedStreamSocket( bSocket) );
 mpCommunicators->push_back( pCommunicator );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-3-5]: fdo#51514: SwXBookmarks: only consider real bookmarks:

[Gerrit]

>From Michael Stahl :

Michael Stahl has uploaded a new change for review.

Change subject: fdo#51514: SwXBookmarks: only consider real bookmarks:
..

fdo#51514: SwXBookmarks: only consider real bookmarks:

Since CWS swrefactormarks2 the SwXBookmarks collection handles not only
bookmarks but at least cross-ref marks as well, which then bother users
when they show up in the Insert->Hyperlink dialog; remove non-bookmarks
again.
(regression from df6d312ca537402463e4eb0530f22b956600fc02)

Change-Id: I6a64ba8a43468dd3ce1569e944371d3ef71f8824
(cherry picked from commit 45be3ac8151d63ccb61879f876696704542a4ce7)
---
M sw/source/core/unocore/unocoll.cxx
1 file changed, 60 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/461/1
--
To view, visit https://gerrit.libreoffice.org/461
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a64ba8a43468dd3ce1569e944371d3ef71f8824
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Michael Stahl 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] remove unused module-description xml files

[Gerrit]

>From Matúš Kukan :

Matúš Kukan has submitted this change and it was merged.

Change subject: remove unused module-description xml files
..


remove unused module-description xml files

Change-Id: I531e47538f308ee43e0fe8d7db59f525e45942c3
---
D animations/source/animcore/animcore.xml
D basctl/util/basctl.xml
D sc/xml/AccessibleEditableTextPara_HeaderFooter.xml
D sc/xml/AccessibleEditableTextPara_PreviewCell.xml
D sc/xml/AccessibleEditableTextPara_PreviewNote.xml
D sc/xml/ScAccessibleCell.xml
D sc/xml/ScAccessibleCsvCell.xml
D sc/xml/ScAccessibleCsvGrid.xml
D sc/xml/ScAccessibleCsvRuler.xml
D sc/xml/ScAccessibleDocument.xml
D sc/xml/ScAccessibleDocumentPagePreview.xml
D sc/xml/ScAccessiblePageHeader.xml
D sc/xml/ScAccessiblePageHeaderArea.xml
D sc/xml/ScAccessiblePreviewCell.xml
D sc/xml/ScAccessiblePreviewHeaderCell.xml
D sc/xml/ScAccessiblePreviewTable.xml
D sc/xml/ScAccessibleSpreadsheet.xml
D sc/xml/ScAnnotationObj.xml
D sc/xml/ScAnnotationShapeObj.xml
D sc/xml/ScAnnotationsObj.xml
D sc/xml/ScAreaLinkObj.xml
D sc/xml/ScAreaLinksObj.xml
D sc/xml/ScAutoFormatFieldObj.xml
D sc/xml/ScAutoFormatObj.xml
D sc/xml/ScAutoFormatsObj.xml
D sc/xml/ScCellCursorObj.xml
D sc/xml/ScCellFieldObj.xml
D sc/xml/ScCellFieldsObj.xml
D sc/xml/ScCellFormatsEnumeration.xml
D sc/xml/ScCellFormatsObj.xml
D sc/xml/ScCellObj.xml
D sc/xml/ScCellRangeObj.xml
D sc/xml/ScCellRangesObj.xml
D sc/xml/ScCellSearchObj.xml
D sc/xml/ScCellTextCursor.xml
D sc/xml/ScCellsEnumeration.xml
D sc/xml/ScCellsObj.xml
D sc/xml/ScChartObj.xml
D sc/xml/ScChartsObj.xml
D sc/xml/ScConsolidationDescriptor.xml
D sc/xml/ScDDELinkObj.xml
D sc/xml/ScDDELinksObj.xml
D sc/xml/ScDataPilotFieldGroupItemObj.xml
D sc/xml/ScDataPilotFieldGroupObj.xml
D sc/xml/ScDataPilotFieldGroupsObj.xml
D sc/xml/ScDataPilotFieldObj.xml
D sc/xml/ScDataPilotFieldsObj.xml
D sc/xml/ScDataPilotItemObj.xml
D sc/xml/ScDataPilotItemsObj.xml
D sc/xml/ScDataPilotTableObj.xml
D sc/xml/ScDataPilotTablesObj.xml
D sc/xml/ScDatabaseRangeObj.xml
D sc/xml/ScDatabaseRangesObj.xml
D sc/xml/ScDocumentConfiguration.xml
D sc/xml/ScDrawPageObj.xml
D sc/xml/ScDrawPagesObj.xml
D sc/xml/ScFilterDescriptorBase.xml
D sc/xml/ScFunctionListObj.xml
D sc/xml/ScHeaderFieldObj.xml
D sc/xml/ScHeaderFieldsObj.xml
D sc/xml/ScHeaderFooterContentObj.xml
D sc/xml/ScHeaderFooterTextCursor.xml
D sc/xml/ScHeaderFooterTextObj.xml
D sc/xml/ScIndexEnumeration_CellAnnotationsEnumeration.xml
D sc/xml/ScIndexEnumeration_CellAreaLinksEnumeration.xml
D sc/xml/ScIndexEnumeration_DDELinksEnumeration.xml
D sc/xml/ScIndexEnumeration_DataPilotFieldsEnumeration.xml
D sc/xml/ScIndexEnumeration_DataPilotItemsEnumeration.xml
D sc/xml/ScIndexEnumeration_DataPilotTablesEnumeration.xml
D sc/xml/ScIndexEnumeration_DatabaseRangesEnumeration.xml
D sc/xml/ScIndexEnumeration_FunctionDescriptionEnumeration.xml
D sc/xml/ScIndexEnumeration_LabelRangesEnumeration.xml
D sc/xml/ScIndexEnumeration_NamedRangesEnumeration.xml
D sc/xml/ScIndexEnumeration_ScenariosEnumeration.xml
D sc/xml/ScIndexEnumeration_SheetCellRangesEnumeration.xml
D sc/xml/ScIndexEnumeration_SheetLinksEnumeration.xml
D sc/xml/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.xml
D sc/xml/ScIndexEnumeration_SpreadsheetsEnumeration.xml
D sc/xml/ScIndexEnumeration_SubTotalFieldsEnumeration.xml
D sc/xml/ScIndexEnumeration_TableAutoFormatEnumeration.xml
D sc/xml/ScIndexEnumeration_TableChartsEnumeration.xml
D sc/xml/ScIndexEnumeration_TableColumnsEnumeration.xml
D sc/xml/ScIndexEnumeration_TableConditionalEntryEnumeration.xml
D sc/xml/ScIndexEnumeration_TableRowsEnumeration.xml
D sc/xml/ScIndexEnumeration_TextFieldEnumeration.xml
D sc/xml/ScLabelRangeObj.xml
D sc/xml/ScLabelRangesObj.xml
D sc/xml/ScModelObj.xml
D sc/xml/ScNamedRangeObj.xml
D sc/xml/ScNamedRangesObj.xml
D sc/xml/ScPageObj.xml
D sc/xml/ScRecentFunctionsObj.xml
D sc/xml/ScScenariosObj.xml
D sc/xml/ScShapeObj.xml
D sc/xml/ScSheetLinkObj.xml
D sc/xml/ScSheetLinksObj.xml
D sc/xml/ScSpreadsheetSettings.xml
D sc/xml/ScSpreadsheetSettingsObj.xml
D sc/xml/ScStyleFamiliesObj.xml
D sc/xml/ScStyleFamilyObj.xml
D sc/xml/ScStyleObj.xml
D sc/xml/ScSubTotalDescriptorBase.xml
D sc/xml/ScSubTotalFieldObj.xml
D sc/xml/ScTabViewObj.xml
D sc/xml/ScTableColumnObj.xml
D sc/xml/ScTableColumnsObj.xml
D sc/xml/ScTableConditionalEntry.xml
D sc/xml/ScTableConditionalFormat.xml
D sc/xml/ScTableRowObj.xml
D sc/xml/ScTableRowsObj.xml
D sc/xml/ScTableSheetObj.xml
D sc/xml/ScTableSheetsObj.xml
D sc/xml/ScTableValidationObj.xml
D sc/xml/ScUniqueCellFormatsEnumeration.xml
D sc/xml/ScUniqueCellFormatsObj.xml
D sc/xml/ScViewPaneObj.xml
D sc/xml/ScXMLExport.xml
D sc/xml/ScXMLImport.xml
D sd/xml/AccessibleDrawDocumentView.xml
D sd/xml/AccessibleOutlineView.xml
D sd/xml/AccessiblePageShape.xml
D sd/xml/AccessiblePresentationGraphicShape.xml
D sd/xml/AccessiblePresentationOLEShape.xml
D sd/xml/AccessiblePresentationShape.xml
D sd/xml/AccessibleSlideView.xml
D sd/xml/AccessibleSlideViewObject.xml
D

[GSOC-UPDATE](22.08) Impress Remote

[Andrzej J. R. Hunt]

Hi everyone,

Bluetooth control on Linux is now working. I'll hopefully be able to 
take a look at Bluetooth on Windows tomorrow. (Any help with Bluetooth 
on mac, i.e. implementation/testing, would be appreciated, but it's 
probably worth waiting until I've tidied the code up a bit to make it 
clearer what exactly has to be platform dependent.)


The new code isn't particularly tidy yet, I'm still sorting out the 
details -- I've also had to somewhat hack my socket buffering to work 
with both osl and C sockets (previously I had a buffer wrapping the 
osl::StreamSocket) -- would it be appropriate to eventually incorporate 
bluetooth sockets into osl? (For Linux the changes would involve adding 
a new Bluetooth protocol to the enum, and making the addresses capable 
of representing bluetooth addresses -- the calls used are just the 
standard socket calls -- I don't know much about Windows or Mac yet. 
Control of other bluetooth functions is all separate from that and done 
via dbus.)


Cheers,

Andrzej
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[libreoffice-3-5]: SwTokenWindow::InsertAtSelection: fix STL assertion:

[Gerrit]

>From Michael Stahl :

Michael Stahl has uploaded a new change for review.

Change subject: SwTokenWindow::InsertAtSelection: fix STL assertion:
..

SwTokenWindow::InsertAtSelection: fix STL assertion:

 error: attempt to copy-construct an iterator from a singular iterator.
(regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cde)

Change-Id: Iab29f4c356ea1cb5ca0f687bcfc5e54f185fbba3
(cherry picked from commit c47505a4525c342694ba4196544715467c2bdb8e)
---
M sw/source/ui/index/cnttab.cxx
1 file changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/460/1
--
To view, visit https://gerrit.libreoffice.org/460
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab29f4c356ea1cb5ca0f687bcfc5e54f185fbba3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Michael Stahl 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[libreoffice-3-6]: fdo#51514: SwXBookmarks: only consider real bookmarks:

[Gerrit]

>From Michael Stahl :

Michael Stahl has uploaded a new change for review.

Change subject: fdo#51514: SwXBookmarks: only consider real bookmarks:
..

fdo#51514: SwXBookmarks: only consider real bookmarks:

Since CWS swrefactormarks2 the SwXBookmarks collection handles not only
bookmarks but at least cross-ref marks as well, which then bother users
when they show up in the Insert->Hyperlink dialog; remove non-bookmarks
again.
(regression from df6d312ca537402463e4eb0530f22b956600fc02)

Change-Id: I6a64ba8a43468dd3ce1569e944371d3ef71f8824
(cherry picked from commit 45be3ac8151d63ccb61879f876696704542a4ce7)
---
M sw/source/core/unocore/unocoll.cxx
1 file changed, 60 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/459/1
--
To view, visit https://gerrit.libreoffice.org/459
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a64ba8a43468dd3ce1569e944371d3ef71f8824
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[libreoffice-3-6]: SwTokenWindow::InsertAtSelection: fix STL assertion:

[Gerrit]

>From Michael Stahl :

Michael Stahl has uploaded a new change for review.

Change subject: SwTokenWindow::InsertAtSelection: fix STL assertion:
..

SwTokenWindow::InsertAtSelection: fix STL assertion:

 error: attempt to copy-construct an iterator from a singular iterator.
(regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cde)

Change-Id: Iab29f4c356ea1cb5ca0f687bcfc5e54f185fbba3
(cherry picked from commit c47505a4525c342694ba4196544715467c2bdb8e)
---
M sw/source/ui/index/cnttab.cxx
1 file changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/458/1
--
To view, visit https://gerrit.libreoffice.org/458
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab29f4c356ea1cb5ca0f687bcfc5e54f185fbba3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [GSOC-UDPATE](17.08) Impress Remote

[Andrzej J. R. Hunt]

On 08/22/2012 08:49 AM, Muthu Subramanian K wrote:

On 08/20/2012 05:00 PM, Michael Meeks wrote:

>  One issue is powering up bluetooth on Android: documentation insists
>  that you ask the user to switch on bluetooth: one option is to 
add an
>  item "Search for Bluetooth" devices on the selection screen which 
does
>  this, or alternatively to just ask the user every single time the 
app

>  is started.
I -imagine- that UX wise, enabling bluetooth during a pairing 
flow, and

disabling it again if we don't connect is perhaps the best plan from a
UX&  battery perspective ?



Yes, as far as I know, you have to ask the user to turn on Bluetooth. 
You could create an Intent to show the Settings page for the user to 
do it.


On the battery side: powering the radio down or going to lower power 
modes is handled by the lower stack, at least for the first round we 
shouldn't be too concerned about this, I guess (?)


It isn't strictly necessary to ask the user -- there is a 
BluetoothAdapter.enable() method which controls the power, without 
asking the user, although the documentation says that shouldn't be used 
without asking. It would however be possible to ask the user every time 
the app is started "Switch on Bluetooth to find Bluetooth devices?" 
along with a "Don't ask again" option to make that permanent? (And then 
the app can remember whether bluetooth was on beforehand, and switch it 
off again if necessary.)


(In my experience having bluetooth on doesn't cause considerable drain 
unless discoverable, so it seems like low power modes are automatic.)


Cheers,
Andrzej

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - sw/source

[Libreoffice Gerrit user]

 sw/source/core/unocore/unocoll.cxx |   74 ++---
 sw/source/ui/index/cnttab.cxx  |   10 ++---
 2 files changed, 64 insertions(+), 20 deletions(-)

New commits:
commit 45be3ac8151d63ccb61879f876696704542a4ce7
Author: Michael Stahl 
Date:   Wed Aug 22 23:04:34 2012 +0200

fdo#51514: SwXBookmarks: only consider real bookmarks:

Since CWS swrefactormarks2 the SwXBookmarks collection handles not only
bookmarks but at least cross-ref marks as well, which then bother users
when they show up in the Insert->Hyperlink dialog; remove non-bookmarks
again.
(regression from df6d312ca537402463e4eb0530f22b956600fc02)

Change-Id: I6a64ba8a43468dd3ce1569e944371d3ef71f8824

diff --git a/sw/source/core/unocore/unocoll.cxx 
b/sw/source/core/unocore/unocoll.cxx
index ba6570c..57ac3b5 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -86,6 +86,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
@@ -1643,7 +1644,20 @@ sal_Int32 SwXBookmarks::getCount(void)
 SolarMutexGuard aGuard;
 if(!IsValid())
 throw uno::RuntimeException();
-return GetDoc()->getIDocumentMarkAccess()->getBookmarksCount();
+
+sal_Int32 count(0);
+IDocumentMarkAccess* const pMarkAccess = 
GetDoc()->getIDocumentMarkAccess();
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess->getBookmarksBegin();
+ ppMark != pMarkAccess->getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+++count; // only count real bookmarks
+}
+}
+return count;
 }
 
 uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
@@ -1656,12 +1670,26 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
 if(nIndex < 0 || nIndex >= pMarkAccess->getBookmarksCount())
 throw IndexOutOfBoundsException();
 
-uno::Any aRet;
-::sw::mark::IMark* pBkmk = pMarkAccess->getBookmarksBegin()[nIndex].get();
-const uno::Reference< text::XTextContent > xRef =
-SwXBookmark::CreateXBookmark(*GetDoc(), *pBkmk);
-aRet <<= xRef;
-return aRet;
+sal_Int32 count(0);
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess->getBookmarksBegin();
+ ppMark != pMarkAccess->getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+if (count == nIndex)
+{
+uno::Any aRet;
+const uno::Reference< text::XTextContent > xRef =
+SwXBookmark::CreateXBookmark(*GetDoc(), **ppMark);
+aRet <<= xRef;
+return aRet;
+}
+++count; // only count real bookmarks
+}
+}
+throw IndexOutOfBoundsException();
 }
 
 uno::Any SwXBookmarks::getByName(const rtl::OUString& rName)
@@ -1690,13 +1718,19 @@ uno::Sequence< OUString > 
SwXBookmarks::getElementNames(void)
 if(!IsValid())
 throw uno::RuntimeException();
 
+::comphelper::SequenceAsVector< ::rtl::OUString > ret;
 IDocumentMarkAccess* const pMarkAccess = 
GetDoc()->getIDocumentMarkAccess();
-uno::Sequence aSeq(pMarkAccess->getBookmarksCount());
-sal_Int32 nCnt = 0;
-for(IDocumentMarkAccess::const_iterator_t ppMark = 
pMarkAccess->getBookmarksBegin();
-ppMark != pMarkAccess->getBookmarksEnd();)
-aSeq[nCnt++] = (*ppMark++)->GetName();
-return aSeq;
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess->getBookmarksBegin();
+ ppMark != pMarkAccess->getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+ret.push_back((*ppMark)->GetName()); // only add real bookmarks
+}
+}
+return ret.getAsConstList();
 }
 
 sal_Bool SwXBookmarks::hasByName(const OUString& rName)
@@ -1722,7 +1756,19 @@ sal_Bool SwXBookmarks::hasElements(void)
 SolarMutexGuard aGuard;
 if(!IsValid())
 throw uno::RuntimeException();
-return GetDoc()->getIDocumentMarkAccess()->getBookmarksCount() != 0;
+
+IDocumentMarkAccess* const pMarkAccess = 
GetDoc()->getIDocumentMarkAccess();
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess->getBookmarksBegin();
+ ppMark != pMarkAccess->getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+return true;
+}
+}
+return false;
 }
 
 SwXNumberingRulesCollection::SwXNumberingRulesCollection( SwDoc* _pDoc ) :
commit c47505a4525c342694ba4196544715467c2bdb8e
Author: Michael Stahl 
Date:   Wed Aug 22 21:45:27 2012 +0200

SwTokenWindow::InsertAtSelection: 

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/uiconfig

[Libreoffice Gerrit user]

 sw/uiconfig/sw/ui/20872.ui |1 +
 sw/uiconfig/sw/ui/20876.ui |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 15dcb4f124282aa341bf21e45e1b8528d1dd0022
Author: Caolán McNamara 
Date:   Wed Aug 22 21:42:24 2012 +0100

we need to set hexpand now that it's implemented to fill the dialog

Change-Id: Ib054f474a197c7cab6cd0d4b8ab650f4c78d1e79

diff --git a/sw/uiconfig/sw/ui/20872.ui b/sw/uiconfig/sw/ui/20872.ui
index 21d8538..d30d99b 100644
--- a/sw/uiconfig/sw/ui/20872.ui
+++ b/sw/uiconfig/sw/ui/20872.ui
@@ -100,6 +100,7 @@
 True
 False
 0
+True
 Numbering 
followed by
   
   
diff --git a/sw/uiconfig/sw/ui/20876.ui b/sw/uiconfig/sw/ui/20876.ui
index 5f06d72..3959035 100644
--- a/sw/uiconfig/sw/ui/20876.ui
+++ b/sw/uiconfig/sw/ui/20876.ui
@@ -76,6 +76,7 @@
 True
 False
 0
+True
 Paragraph Style
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sfx2/source sw/source vcl/inc vcl/source

[Libreoffice Gerrit user]

 sfx2/source/dialog/tabdlg.cxx   |   21 ++---
 sw/source/ui/misc/linenum.cxx   |   38 +++---
 sw/source/ui/misc/titlepage.cxx |   24 
 vcl/inc/vcl/builder.hxx |   34 +-
 vcl/source/window/builder.cxx   |8 
 5 files changed, 78 insertions(+), 47 deletions(-)

New commits:
commit 4c38e508206348a7923d042261c7a9cdeca4f98d
Author: Caolán McNamara 
Date:   Wed Aug 22 21:18:52 2012 +0100

get_by_name -> get and pretty up widget type casting

Like Noel G points out, it's not like there any other way to get
a widget other than "by_name"

Change-Id: Iefe2a16472e2916dbeba1ba3c0c115cc6416ab5b

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 4b3e06f..f66627a 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -524,8 +524,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const 
String* pUserButtonText,
 */
 
 {
-fprintf(stderr, "BUILDER is %p\n", m_pUIBuilder);
-m_pVBox = m_pUIBuilder ? 
static_cast(m_pUIBuilder->get_by_name("dialog-vbox1")) : NULL;
+m_pVBox = m_pUIBuilder ? m_pUIBuilder->get("dialog-vbox1") : NULL;
 m_bOwnsVBox = m_pVBox == NULL;
 if (m_bOwnsVBox)
 {
@@ -533,7 +532,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const 
String* pUserButtonText,
 m_pVBox->set_expand(true);
 }
 
-m_pTabCtrl = m_pUIBuilder ? 
static_cast(m_pUIBuilder->get_by_name(SAL_STRINGIFY(ID_TABCONTROL)))
 : NULL;
+m_pTabCtrl = m_pUIBuilder ? 
m_pUIBuilder->get(SAL_STRINGIFY(ID_TABCONTROL)) : NULL;
 m_bOwnsTabCtrl = m_pTabCtrl == NULL;
 if (m_bOwnsTabCtrl)
 {
@@ -541,42 +540,42 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const 
String* pUserButtonText,
 m_pTabCtrl->set_expand(true);
 }
 
-m_pActionArea = m_pUIBuilder ? 
static_cast(m_pUIBuilder->get_by_name("dialog-action_area1")) : 
NULL;
+m_pActionArea = m_pUIBuilder ? 
m_pUIBuilder->get("dialog-action_area1") : NULL;
 m_bOwnsActionArea = m_pActionArea == NULL;
 if (m_bOwnsActionArea)
 m_pActionArea = new VclHButtonBox(m_pVBox);
 
-m_pOKBtn = m_pUIBuilder ? 
static_cast(m_pUIBuilder->get_by_name("ok")) : NULL;
+m_pOKBtn = m_pUIBuilder ? m_pUIBuilder->get("ok") : NULL;
 m_bOwnsOKBtn = m_pOKBtn == NULL;
 if (m_bOwnsOKBtn)
 m_pOKBtn = new OKButton(m_pActionArea);
 
-m_pApplyBtn = m_pUIBuilder ? 
static_cast(m_pUIBuilder->get_by_name("apply")) : NULL;
+m_pApplyBtn = m_pUIBuilder ? m_pUIBuilder->get("apply") : NULL;
 m_bOwnsApplyBtn = m_pApplyBtn == NULL;
 if (m_bOwnsApplyBtn)
 m_pApplyBtn = NULL;
 
-m_pUserBtn = m_pUIBuilder ? 
static_cast(m_pUIBuilder->get_by_name("user")) : NULL;
+m_pUserBtn = m_pUIBuilder ? m_pUIBuilder->get("user") : NULL;
 m_bOwnsUserBtn = m_pUserBtn == NULL;
 if (m_bOwnsUserBtn)
 m_pUserBtn = pUserButtonText ? new PushButton(m_pActionArea) : NULL;
 
-m_pCancelBtn = m_pUIBuilder ? 
static_cast(m_pUIBuilder->get_by_name("cancel")) : NULL;
+m_pCancelBtn = m_pUIBuilder ? m_pUIBuilder->get("cancel") : 
NULL;
 m_bOwnsCancelBtn = m_pCancelBtn == NULL;
 if (m_bOwnsCancelBtn)
 m_pCancelBtn = new CancelButton(m_pActionArea);
 
-m_pHelpBtn = m_pUIBuilder ? 
static_cast(m_pUIBuilder->get_by_name("help")) : NULL;
+m_pHelpBtn = m_pUIBuilder ? m_pUIBuilder->get("help") : NULL;
 m_bOwnsHelpBtn = m_pHelpBtn == NULL;
 if (m_bOwnsHelpBtn)
 m_pHelpBtn = new HelpButton(m_pActionArea);
 
-m_pResetBtn = m_pUIBuilder ? 
static_cast(m_pUIBuilder->get_by_name("reset")) : NULL;
+m_pResetBtn = m_pUIBuilder ? m_pUIBuilder->get("reset") : NULL;
 m_bOwnsResetBtn = m_pResetBtn == NULL;
 if (m_bOwnsResetBtn)
 m_pResetBtn = new PushButton(m_pActionArea);
 
-m_pBaseFmtBtn = m_pUIBuilder ? 
static_cast(m_pUIBuilder->get_by_name("standard")) : NULL;
+m_pBaseFmtBtn = m_pUIBuilder ? m_pUIBuilder->get("standard") : 
NULL;
 m_bOwnsBaseFmtBtn = m_pBaseFmtBtn == NULL;
 if (m_bOwnsBaseFmtBtn)
 m_pBaseFmtBtn = new PushButton(m_pActionArea);
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index c28c631..45ceb9d 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -50,24 +50,24 @@
 #include 
 
 SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
-: SfxModalDialog( &pVw->GetViewFrame()->GetWindow(), 
rtl::OString("LineNumberingDialog"),
-rtl::OUString("modules/swriter/ui/linenumbering.ui") )
+: SfxModalDialog( &pVw->GetViewFrame()->GetWindow(), "LineNumberingDialog",
+"modules/swriter/ui/linenumbering.ui" )
 , pSh(pVw->GetWrtShellPtr())
 {
-m_pBodyContent = 
static_cast(m_pUIBuilder->get_by_name("content"));
-m_pDivIntervalFT = m_pUIBuilder->get_by_name("every");
-m_pDivIntervalNF = 
static_cast(m_pUIBuilder->get_by_name("linesspin"));

Re: License Statement

[Andras Timar]

2012/8/22 Dave Richards :
> I have contributed my first patch
>
> https://gerrit.libreoffice.org/#/c/457/
>

Thanks for the patch, I pushed it.

Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[master]: fpicker/source/office/iodlg.src.original

[Gerrit]

>From Andras Timar :

Andras Timar has submitted this change and it was merged.

Change subject: fpicker/source/office/iodlg.src.original
..


fpicker/source/office/iodlg.src.original

fpicker/source/office/iodlg.src.original

fpicker/source/office/iodlg.src.original

Change-Id: I5b2bf2a3900a729581d184931efdc98f39067813
---
M fpicker/source/office/iodlg.src
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/457
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b2bf2a3900a729581d184931efdc98f39067813
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Dave Richards 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: fpicker/source

[Libreoffice Gerrit user]

 fpicker/source/office/iodlg.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2cf1aac49bfcb986e1a87d4992c8e132ec9ba729
Author: Dave Richards 
Date:   Wed Aug 22 14:20:53 2012 -0400

fpicker/source/office/iodlg.src.original

fpicker/source/office/iodlg.src.original

fpicker/source/office/iodlg.src.original

Change-Id: I5b2bf2a3900a729581d184931efdc98f39067813
Reviewed-on: https://gerrit.libreoffice.org/457
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index f795421..4a25355 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -69,7 +69,7 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
 TabStop = FALSE ;
 Pos = MAP_APPFONT ( 59 , 6 ) ;
 Size = MAP_APPFONT( 12, 12 ) ;
-QuickHelpText [ en-US ] = "Create New Directory" ;
+QuickHelpText [ en-US ] = "Create New Folder" ;
 };
 MenuButton BTN_EXPLORERFILE_UP
 {
@@ -228,7 +228,7 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
 };
 String STR_DEFAULT_DIRECTORY
 {
-Text [ en-US ] = "Default Directory" ;
+Text [ en-US ] = "My Documents" ;
 };
 String STR_PLACES_TITLE
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: (great) widget layout progress

[Caolán McNamara]

On Wed, 2012-08-22 at 17:55 +0200, khagaroth wrote:
> How much work would it be to make this directly use gettext? I thought
> the long term goal was to switch from custom translation formats to
> gettext, so using yet another custom translation format for something
> like this seems a bit odd.

Timar had/has some plans around moving to using gettext directly
throughout LibO. But that doesn't exist right now, so rather than make
that a blocker on this I've stuffed in a simple solution. When (if?) we
move to gettext natively then it basically becomes fairly trivial to
directly use gettext especially as that knows about .ui files already
for extraction purposes and doesn't know about .src files.

So conversion to .ui is a bit of a help towards directly using gettext.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License Statement

[Dave Richards]

I have contributed my first patch

https://gerrit.libreoffice.org/#/c/457/

and am making a statement that * All of my past & future contributions to
LibreOffice may be licensed under the MPL/LGPLv3+ dual license.

*Real Name:  Dave Richards
Git Email:  flbeac...@gmail.com
IRC Nickname:  dave_largo

This first patch changes default US strings that are inconsistent and
confusing to end users.

1) Tooltip on the file picker indicates "Create New Directory", but the
next dialog indicates "Create new Folder"
2) The default shortcut reads "Default Directory" and should match what
appears in Tools > Options > LibreOffice > Paths where it's called "My
Documents".

Many inexperienced users do not use or understand the word "Directory".
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-6][REVIEW 3-6-1 2/3] Fix for fdo#53640 - Pivot table from database source

[Eike Rathke]

Hi,

On Wednesday, 2012-08-22 20:22:19 +0100, Michael Meeks wrote:

> On Wed, 2012-08-22 at 15:05 -0400, Kohei Yoshida wrote:
> > https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=f4ed9a5adbea3de88870ff4f5cb202bd606e0746
> > cherry-picked to 3-6 and preferably to 3-6-1 as well.  This fixes
> 
>   Looks sensible - I'm sure clang would have something to say about this
> sort of incrementing of dead variables ;-)

Michael cherry-picked that to 3-6 as
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=a28d9cad672739cbf8dc6cf1f9db7d0f8becfee1

which has my +1

> > Also, optionally I'd like
> > https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=88979ef6ffe7921200311513d6601f9c5d582a42
> > 
> > backported as well.  Leaving this code in would result in re-populating 
> > the pivot cache twice unnecessarily, which would degrade performance.
> 
>   I pushed that - though it looks more scary.

In 3-6 as
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=257a5fb833c2c03a3a82b19b9ab5a7cb3b5848ef

I can't say much about that without digging into cache/table refreshs
other than having to trust Kohei's judgement. +0.5? ;-)

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpmYB9ZTMP8G.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[master]: fpicker/source/office/iodlg.src.original

[Gerrit]

>From Dave Richards :

Dave Richards has uploaded a new change for review.

Change subject: fpicker/source/office/iodlg.src.original
..

fpicker/source/office/iodlg.src.original

fpicker/source/office/iodlg.src.original

fpicker/source/office/iodlg.src.original

Change-Id: I5b2bf2a3900a729581d184931efdc98f39067813
---
M fpicker/source/office/iodlg.src
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/457/1
--
To view, visit https://gerrit.libreoffice.org/457
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b2bf2a3900a729581d184931efdc98f39067813
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Dave Richards 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: svtools/source

[Libreoffice Gerrit user]

 svtools/source/misc/langtab.src |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 055751056187b2e15a7bfee84000c86b91c75d1e
Author: Andras Timar 
Date:   Wed Aug 22 21:31:07 2012 +0200

fdo#51911 add Moldovan (ro-MD) to language selection list

Change-Id: I916097048b6c8767745bcdd56430d5d2cc832e71

diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index f67f9de..bf44bbc 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -144,6 +144,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "Malayalam" ; LANGUAGE_MALAYALAM ; > ;
 < "Manipuri" ; LANGUAGE_MANIPURI ; > ;
 < "Marathi" ; LANGUAGE_MARATHI ; > ;
+< "Moldovan" ; LANGUAGE_ROMANIAN_MOLDOVA ; > ;
 < "Nepali (Nepal)" ; LANGUAGE_NEPALI ; > ;
 < "Nepali (India)" ; LANGUAGE_NEPALI_INDIA ; > ;
 < "Norwegian, Bokmål" ; LANGUAGE_NORWEGIAN_BOKMAL ; > ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED 3-6] Fix for fdo#53640 - Pivot table from database source

[Michael Meeks]

On Wed, 2012-08-22 at 15:05 -0400, Kohei Yoshida wrote:
> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=f4ed9a5adbea3de88870ff4f5cb202bd606e0746
> cherry-picked to 3-6 and preferably to 3-6-1 as well.  This fixes

Looks sensible - I'm sure clang would have something to say about this
sort of incrementing of dead variables ;-)

> Also, optionally I'd like
> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=88979ef6ffe7921200311513d6601f9c5d582a42
> 
> backported as well.  Leaving this code in would result in re-populating 
> the pivot cache twice unnecessarily, which would degrade performance.

I pushed that - though it looks more scary.

Even more scary to me is the lack of unit-test-age for this area;
though I suppose anything involving a database is a bit of a pain to
test.

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/dpcache.cxx|9 ++---
 sc/source/ui/docshell/dbdocfun.cxx |6 --
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 257a5fb833c2c03a3a82b19b9ab5a7cb3b5848ef
Author: Kohei Yoshida 
Date:   Wed Aug 22 14:55:34 2012 -0400

Don't clear the database data cache here.

This would result in the pivot cache being refreshed twice.  This block
of code was a leftover from the previous, non-cached version of pivot
table, and this logic no longer applies today.

In today's pivot table code, the cache gets refreshed first, then the
table gets refreshed afterward.  We should never clear the cache data
during table refresh.

Change-Id: Ida6fa1805463facf842cb9ea94f4c1afab716595
Signed-off-by: Michael Meeks 

diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index ee642c7..4cb5620 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1329,12 +1329,6 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, 
const ScDPObject* pNewOb
 }
 if ( pDestObj )
 {
-// create new database connection for "refresh"
-// (and re-read column entry collections)
-// so all changes take effect
-if ( pNewObj == pOldObj && pDestObj->IsImportData() )
-pDestObj->ClearTableData();
-
 pDestObj->ReloadGroupTableData();
 pDestObj->InvalidateData(); // before getting the 
new output area
 
commit a28d9cad672739cbf8dc6cf1f9db7d0f8becfee1
Author: Kohei Yoshida 
Date:   Wed Aug 22 14:25:01 2012 -0400

fdo#53640: Correctly cache source data coming from database backend.

It was due to a simple misplacement of nRow = 0.  Each record was
labeled row 0.  No wonder it screws up the result badly.

Change-Id: Ia94f42a62f98a9bd7c9d34df3606351bb487931b
Signed-off-by: Michael Meeks 

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 3299ba0..a11db55 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -461,24 +461,27 @@ bool ScDPCache::InitFromDataBase (const 
Reference& xRowSet, const
 Reference xRow(xRowSet, UNO_QUERY_THROW);
 
 std::vector aBuckets;
+ScDPItemData aData;
 for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol)
 {
 xRowSet->first();
-ScDPItemData aData;
 aBuckets.clear();
 Field& rField = maFields[nCol];
+SCROW nRow = 0;
 do
 {
-SCROW nRow = 0;
 short nFormatType = NUMBERFORMAT_UNDEFINED;
+aData.SetEmpty();
 getItemValue(*this, aData, xRow, aColTypes[nCol], nCol+1, 
rNullDate, nFormatType);
-aBuckets.push_back(Bucket(aData, 0, nRow++));
+aBuckets.push_back(Bucket(aData, 0, nRow));
 if (!aData.IsEmpty())
 {
 maEmptyRows.insert_back(nRow, nRow+1, false);
 SvNumberFormatter* pFormatter = mpDoc->GetFormatTable();
 rField.mnNumFormat = pFormatter ? 
pFormatter->GetStandardFormat(nFormatType) : 0;
 }
+
+++nRow;
 }
 while (xRowSet->next());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] Some cleanup for better localization

[Andras Timar]

2012/8/22  :
> Hi,
>
>   Working with localization tools I recognized some wrong codes, which
> prevent localization from perfect working. I solved some(see patch), but
> remained one which not so simply. In
> /help/helpcontent2/source/text/swriter/guide/using_hyphen.xhp at the 96.
> line, there is a localization component without id, exactly with id="". This
> is the only one in whole source, so it must be a mistake.

Pushed, many thanks. I also fixed the empty id in help (I wrote a
random string there, because IDs in help do not have special meaning).

Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: helpcontent2/source

[Libreoffice Gerrit user]

 helpcontent2/source/text/swriter/guide/using_hyphen.xhp |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 33af01c6d3ce7807be3e79a43f59329f1a300acc
Author: Andras Timar 
Date:   Wed Aug 22 21:15:53 2012 +0200

paragraph id was empty

Change-Id: I4f53e0cc5743841f5ab556242bf459875afcea80

diff --git a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp 
b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
index 488ee7d..8d265b9 100644
--- a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
@@ -93,7 +93,7 @@
   Manual Hyphenation
   You can insert a hyphen where you want on a line, or let 
$[officename] search for the words to hyphenate, and then offer a suggested 
hyphenation.
-  To 
Manually Hyphenate Single Words
+  To Manually Hyphenate Single Words
   To quickly insert a hyphen, click in the word where you want to add 
the hyphen, and then press Command
 
Ctrl+Hyphen(-).
   If you insert a manual hyphen in a word, the word is only 
hyphenated at the manual hyphen. No additional automatic hyphenation is applied 
for this word. A word with a manual hyphen will be hyphenated without regard to 
the settings on the Text Flow tab page.
@@ -114,4 +114,4 @@
   
   Text 
Flow

-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/source sw/source

[Libreoffice Gerrit user]

 svx/source/tbxctrls/tbcontrl.src   |2 +-
 sw/source/ui/dbui/mailmergechildwindow.src |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 678581c48351572620846390b37a156833b1bb7e
Author: Zolnai Tamás 
Date:   Wed Aug 22 16:18:35 2012 +0200

Some cleanup for better localization

First: localization tool can not recognize id because
of empty line between id and its definition
Second: same problem because of comment between type and id

Change-Id: If42af406fab252ccae0a6bbc478bab8130210b21

diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index a944544..85b9d43 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -58,8 +58,8 @@ String RID_SVXSTR_TRANSPARENT
 {
 Text [ en-US ] = "No Fill" ;
 };
-String RID_SVXSTR_FILLPATTERN
 
+String RID_SVXSTR_FILLPATTERN
 {
 Text [ en-US ] = "Pattern" ;
 };
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src 
b/sw/source/ui/dbui/mailmergechildwindow.src
index d74713c..304f695 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.src
+++ b/sw/source/ui/dbui/mailmergechildwindow.src
@@ -79,7 +79,7 @@ FloatingWindow DLG_MAILMERGECHILD\
 };
 
 //FloatingWindow DLG_MM_SENDMAILS
-ModelessDialog /*ModalDialog*/ DLG_MM_SENDMAILS
+ModelessDialog DLG_MM_SENDMAILS
 {
 OutputSize = TRUE ;
 SVLook = TRUE ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Some cleanup for better localization

[zolniatamas]

Hi,

  Working with localization tools I recognized some wrong codes,  
which prevent localization from perfect working. I solved some(see  
patch), but remained one which not so simply. In  
/help/helpcontent2/source/text/swriter/guide/using_hyphen.xhp at the  
96. line, there is a localization component without id, exactly with  
id="". This is the only one in whole source, so it must be a mistake.


Regards,
Zolnai Tamás>From 9da6db3d8f951550af4fa9206257b24be1d1ab87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= 
Date: Wed, 22 Aug 2012 16:18:35 +0200
Subject: [PATCH] Some cleanup for better localization

First: localization tool can not recognize id because 
of empty line between id and its definition 
Second: same problem because of comment between type and id

Change-Id: If42af406fab252ccae0a6bbc478bab8130210b21
---
 svx/source/tbxctrls/tbcontrl.src   |2 +-
 sw/source/ui/dbui/mailmergechildwindow.src |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index a944544..85b9d43 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -58,8 +58,8 @@ String RID_SVXSTR_TRANSPARENT
 {
 Text [ en-US ] = "No Fill" ;
 };
-String RID_SVXSTR_FILLPATTERN
 
+String RID_SVXSTR_FILLPATTERN
 {
 Text [ en-US ] = "Pattern" ;
 };
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/ui/dbui/mailmergechildwindow.src
index d74713c..304f695 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.src
+++ b/sw/source/ui/dbui/mailmergechildwindow.src
@@ -79,7 +79,7 @@ FloatingWindow DLG_MAILMERGECHILD\
 };
 
 //FloatingWindow DLG_MM_SENDMAILS
-ModelessDialog /*ModalDialog*/ DLG_MM_SENDMAILS
+ModelessDialog DLG_MM_SENDMAILS
 {
 OutputSize = TRUE ;
 SVLook = TRUE ;
-- 
1.7.7

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW 3-6][REVIEW 3-6-1] Fix for fdo#53640 - Pivot table from database source

[Kohei Yoshida]

Hi there,

I'd like

https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=f4ed9a5adbea3de88870ff4f5cb202bd606e0746

cherry-picked to 3-6 and preferably to 3-6-1 as well.  This fixes

https://bugs.freedesktop.org/show_bug.cgi?id=53640

It's a safe fix in that, the pivot table currently doesn't work at all 
when pulling data from database source.  So, it'd be near impossible to 
make it any worse.


Also, optionally I'd like

https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=88979ef6ffe7921200311513d6601f9c5d582a42

backported as well.  Leaving this code in would result in re-populating 
the pivot cache twice unnecessarily, which would degrade performance.


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/dpcache.cxx|9 ++---
 sc/source/ui/docshell/dbdocfun.cxx |6 --
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 88979ef6ffe7921200311513d6601f9c5d582a42
Author: Kohei Yoshida 
Date:   Wed Aug 22 14:55:34 2012 -0400

Don't clear the database data cache here.

This would result in the pivot cache being refreshed twice.  This block
of code was a leftover from the previous, non-cached version of pivot
table, and this logic no longer applies today.

In today's pivot table code, the cache gets refreshed first, then the
table gets refreshed afterward.  We should never clear the cache data
during table refresh.

Change-Id: Ida6fa1805463facf842cb9ea94f4c1afab716595

diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index ffcc59e..c5ac760 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1324,12 +1324,6 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, 
const ScDPObject* pNewOb
 }
 if ( pDestObj )
 {
-// create new database connection for "refresh"
-// (and re-read column entry collections)
-// so all changes take effect
-if ( pNewObj == pOldObj && pDestObj->IsImportData() )
-pDestObj->ClearTableData();
-
 pDestObj->ReloadGroupTableData();
 pDestObj->InvalidateData(); // before getting the 
new output area
 
commit f4ed9a5adbea3de88870ff4f5cb202bd606e0746
Author: Kohei Yoshida 
Date:   Wed Aug 22 14:25:01 2012 -0400

fdo#53640: Correctly cache source data coming from database backend.

It was due to a simple misplacement of nRow = 0.  Each record was
labeled row 0.  No wonder it screws up the result badly.

Change-Id: Ia94f42a62f98a9bd7c9d34df3606351bb487931b

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index d04adf1..ff8fc6e 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -461,24 +461,27 @@ bool ScDPCache::InitFromDataBase (const 
Reference& xRowSet, const
 Reference xRow(xRowSet, UNO_QUERY_THROW);
 
 std::vector aBuckets;
+ScDPItemData aData;
 for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol)
 {
 xRowSet->first();
-ScDPItemData aData;
 aBuckets.clear();
 Field& rField = maFields[nCol];
+SCROW nRow = 0;
 do
 {
-SCROW nRow = 0;
 short nFormatType = NUMBERFORMAT_UNDEFINED;
+aData.SetEmpty();
 getItemValue(*this, aData, xRow, aColTypes[nCol], nCol+1, 
rNullDate, nFormatType);
-aBuckets.push_back(Bucket(aData, 0, nRow++));
+aBuckets.push_back(Bucket(aData, 0, nRow));
 if (!aData.IsEmpty())
 {
 maEmptyRows.insert_back(nRow, nRow+1, false);
 SvNumberFormatter* pFormatter = mpDoc->GetFormatTable();
 rField.mnNumFormat = pFormatter ? 
pFormatter->GetStandardFormat(nFormatType) : 0;
 }
+
+++nRow;
 }
 while (xRowSet->next());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6][REVIEW 3-6-1 1/3] Fix for fdo#52451

[Eike Rathke]

Hi,

On Wednesday, 2012-08-22 09:52:46 -0400, Kohei Yoshida wrote:

> >>https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=ba03f2dc817c692fa8709391ec83d8e01a0f8b28
> >https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=84d1ff7be178ec3572710e092e85fe548ce3042b
> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=45b03c888042052a47cb79bc5a2837d04e115c5e

Cherry-picked and squashed into one
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=d632fa4d8fc6a42a58cb981865d6267d90951b69
(just that OUString(".*") had to be rtl::OUString(".*") instead)

Two more reviews needed for 3-6-1

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpGubaCrc7i6.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - filter/source officecfg/registry sfx2/source

[Libreoffice Gerrit user]

 filter/source/config/cache/constant.hxx
   |1 
 filter/source/config/cache/filtercache.cxx 
   |1 
 filter/source/config/fragments/filters/Text.xcu
   |1 
 filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu   
   |1 
 filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu 
   |1 
 filter/source/config/fragments/filters/Text__encoded_.xcu  
   |1 
 
filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
 |1 
 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu 
   |1 
 officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs  
   |3 +
 sfx2/source/bastyp/fltfnc.cxx  
   |   16 --
 10 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit d632fa4d8fc6a42a58cb981865d6267d90951b69
Author: Kohei Yoshida 
Date:   Tue Aug 21 21:53:52 2012 -0400

fdo#52451: Ensure that the extension for text is .txt from writer.

Added a preferred extension property to the filter which overwrites
one(s) given by the default file format type associated with it.

Normally this property is not used for the majority of the filters,
but for plain text filters, we need to use .txt when saving from
writer whereas we do .csv from calc.

(cherry picked from commit ba03f2dc817c692fa8709391ec83d8e01a0f8b28)
(cherry picked from commit 84d1ff7be178ec3572710e092e85fe548ce3042b)
(cherry picked from commit 45b03c888042052a47cb79bc5a2837d04e115c5e)

Squashed these 3 commits into 1.

Also needed rtl::OUString("*.") instead of OUString("*.") in
sfx2/source/bastyp/fltfnc.cxx

Change-Id: Ic6d769bc1180f88fd75f40909e5e054d45719178
Signed-off-by: Eike Rathke 

diff --git a/filter/source/config/cache/constant.hxx 
b/filter/source/config/cache/constant.hxx
index a6e28b5..0102b32 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -69,6 +69,7 @@
 #define  PROPNAME_USERDATA  "UserData"
 #define  PROPNAME_TEMPLATENAME  "TemplateName"
 #define  PROPNAME_FILEFORMATVERSION "FileFormatVersion"
+#define  PROPNAME_EXPORTEXTENSION   "ExportExtension"
 
 /** @short  used to identify a frame loader or detect service item
 property against the configuration API and can be used
diff --git a/filter/source/config/cache/filtercache.cxx 
b/filter/source/config/cache/filtercache.cxx
index e6e1e4f..220eeaa 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1825,6 +1825,7 @@ CacheItem FilterCache::impl_loadItem(const 
css::uno::Reference< css::container::
 aItem[PROPNAME_UICOMPONENT  ] = 
xItem->getByName(PROPNAME_UICOMPONENT  );
 aItem[PROPNAME_FILTERSERVICE] = 
xItem->getByName(PROPNAME_FILTERSERVICE);
 aItem[PROPNAME_DOCUMENTSERVICE  ] = 
xItem->getByName(PROPNAME_DOCUMENTSERVICE  );
+aItem[PROPNAME_EXPORTEXTENSION  ] = 
xItem->getByName(PROPNAME_EXPORTEXTENSION  );
 
 // special handling for flags! Convert it from a list of names 
to its
 // int representation ...
diff --git a/filter/source/config/fragments/filters/Text.xcu 
b/filter/source/config/fragments/filters/Text.xcu
index 4a703d3..4629f89 100644
--- a/filter/source/config/fragments/filters/Text.xcu
+++ b/filter/source/config/fragments/filters/Text.xcu
@@ -4,6 +4,7 @@
 
 TEXT
 0
+txt
 generic_Text
 
 com.sun.star.text.TextDocument
diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu 
b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
index 29ad18a..0332e3e 100644
--- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
@@ -4,6 +4,7 @@
 
 TEXT
 0
+txt
 generic_Text
 
 com.sun.star.text.WebDocument
diff --git 
a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu 
b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
index f15fe5a..498057c 100644
--- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
+++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
@@ -4,6 +4,7 @@
 
 
 0
+csv
 generic_Text
 
 com.sun.star.sheet.SpreadsheetDocument
diff --git a/filter/source/config/fragments/filters/Text__encoded_.xcu 
b/filter/source/config/fragments/filters/Text__encoded_.xcu
index a27c3c7..af05106 100644
--- a/filter/source/config/fragments/filters

License statement

[Ioan Radu]

All of my past & future contributions to LibreOffice may be licensed under
the MPL/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[libreoffice-3-6]: fdo#53888: svx: fix dependencies:

[Gerrit]

>From Michael Stahl :

Michael Stahl has uploaded a new change for review.

Change subject: fdo#53888: svx: fix dependencies:
..

fdo#53888: svx: fix dependencies:

It appears that since cd0046bca0691fdca45a030903b7cde3bfee544c,
2 tinderboxes fail on including the generated sqlbison.hxx;
it turns out one of the inclusions of that in svx is unnecessary and the
other is used to call a virtual function, which can apparently be done
without linking; just link svx to dbtools anyway, that should fix the
build.

Change-Id: I7f7b1c4e9561c4dd2b820b173d05bdd5d4c6ba6d
(cherry picked from commit 01089138cc76f5717244bd04f25a868602aeaab6)
---
M svx/Library_svx.mk
M svx/source/inc/filtnav.hxx
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/456/1
--
To view, visit https://gerrit.libreoffice.org/456
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f7b1c4e9561c4dd2b820b173d05bdd5d4c6ba6d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-6]: fdo#53888: fix YaccTarget/LexTarget dependencies:

[Gerrit]

>From Björn Michaelsen :

Björn Michaelsen has submitted this change and it was merged.

Change subject: fdo#53888: fix YaccTarget/LexTarget dependencies:
..


fdo#53888: fix YaccTarget/LexTarget dependencies:

These cannot be order only because if the source file is changed the
generated cxx file has to be recompiled as well.

Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379
(cherry picked from commit cd0046bca0691fdca45a030903b7cde3bfee544c)
---
M solenv/gbuild/LinkTarget.mk
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Björn Michaelsen: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/450
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Björn Michaelsen 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: android/sdremote sd/source

[Libreoffice Gerrit user]

 
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
 |  118 +-
 
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
 |   11 
 android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java 
   |2 
 
android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
|3 
 sd/source/ui/remotecontrol/BluetoothServer.cxx 
   |   94 +--
 sd/source/ui/remotecontrol/BluetoothServer.hxx 
   |8 
 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
   |   41 +++
 sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
   |   23 +
 sd/source/ui/remotecontrol/Communicator.cxx
   |   31 --
 sd/source/ui/remotecontrol/Receiver.cxx
   |2 
 sd/source/ui/remotecontrol/Server.cxx  
   |4 
 sd/source/ui/remotecontrol/Transmitter.cxx 
   |8 
 sd/source/ui/remotecontrol/Transmitter.hxx 
   |6 
 13 files changed, 230 insertions(+), 121 deletions(-)

New commits:
commit 1db66c2a1a8ad5a60c68b09ddacc1bb6e021299f
Author: Andrzej J.R. Hunt 
Date:   Wed Aug 22 12:44:42 2012 +0200

Bluetooth connection working (Linux).

Change-Id: Iac77c3ce0ab0ea7bda3105c58859888e55e64d2d

diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
 
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
index 6d37351..9880b8f 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
@@ -8,6 +8,8 @@
  */
 package org.libreoffice.impressremote.communication;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.net.Socket;
 import java.util.UUID;
 
@@ -15,6 +17,8 @@ import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
+import android.content.Intent;
+import android.support.v4.content.LocalBroadcastManager;
 
 /**
  * Standard Network client. Connects to a server using Sockets.
@@ -31,67 +35,77 @@ public class BluetoothClient extends Client {
 super(aContext);
 try {
 BluetoothAdapter aAdapter = BluetoothAdapter.getDefaultAdapter();
+System.out.println("Attemtping to connect to:" + bluetoothAddress);
 BluetoothDevice aDevice = aAdapter
 .getRemoteDevice(bluetoothAddress);
+aAdapter.cancelDiscovery();
 BluetoothSocket aSocket = aDevice
 .createRfcommSocketToServiceRecord(UUID
-
.fromString("1101--1000-8000-00805f9b34fb"));
+
.fromString("1101--1000-8000-00805F9B34FB"));
 aSocket.connect();
+//mSocket = aSocket;
+System.out.println("Connected");
+
+mInputStream = aSocket.getInputStream();
+mReader = new BufferedReader(new InputStreamReader(mInputStream,
+CHARSET));
+mOutputStream = aSocket.getOutputStream();
+
+//mOutputStream.write(20);
+//mOutputStream.write(20);
+//mOutputStream.write(20);
+//mOutputStream.flush();
+//System.out.println("reading");
+//while (true) {
+//System.out.println(mInputStream.read());
+//}
+String aTemp = mReader.readLine();
+System.out.println("SF:waited");
+if (!aTemp.equals("LO_SERVER_SERVER_PAIRED")) {
+return;
+}
+while (mReader.readLine().length() != 0) {
+// Get rid of extra lines
+}
+Intent aIntent = new Intent(
+CommunicationService.MSG_PAIRING_SUCCESSFUL);
+LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent);
+startListening();
+// Pairing.
+//Random aRandom = new Random();
+//String aPin = "" + (aRandom.nextInt(9000) + 1000);
+//while (aPin.length() < 4) {
+//aPin = "0" + aPin; // Add leading zeros if 
necessary
+//}
+//Intent aIntent = new Intent(
+//
CommunicationService.MSG_

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/LinkTarget.mk |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit f49be70f1859a2734e9516a5036adb2426939e68
Author: Michael Stahl 
Date:   Tue Aug 21 22:37:03 2012 +0200

fdo#53888: fix YaccTarget/LexTarget dependencies:

These cannot be order only because if the source file is changed the
generated cxx file has to be recompiled as well.

Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379
(cherry picked from commit cd0046bca0691fdca45a030903b7cde3bfee544c)
Reviewed-on: https://gerrit.libreoffice.org/450
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e4185a0..d9632e1 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -206,8 +206,10 @@ $(call gb_YaccTarget_get_target,%) : $(call 
gb_YaccTarget_get_source,$(SRCDIR),%
$(call gb_YaccTarget__command,$<,$*,$@,$(call 
gb_YaccTarget_get_header_target,$*),$(call gb_YaccTarget_get_grammar_target,$*))
 
 define gb_YaccTarget_YaccTarget
-$(call gb_YaccTarget_get_grammar_target,$(1)) :| $(call 
gb_YaccTarget_get_target,$(1))
-$(call gb_YaccTarget_get_header_target,$(1)) :| $(call 
gb_YaccTarget_get_target,$(1))
+$(call gb_YaccTarget_get_grammar_target,$(1)) : $(call 
gb_YaccTarget_get_target,$(1))
+   touch $$@
+$(call gb_YaccTarget_get_header_target,$(1)) : $(call 
gb_YaccTarget_get_target,$(1))
+   touch $$@
 
 endef
 
@@ -229,7 +231,8 @@ $(call gb_LexTarget_get_target,%) : $(call 
gb_LexTarget_get_source,$(SRCDIR),%)
 
 # gb_LexTarget_LexTarget(scanner-file)
 define gb_LexTarget_LexTarget
-$(call gb_LexTarget_get_scanner_target,$(1)) :| $(call 
gb_LexTarget_get_target,$(1))
+$(call gb_LexTarget_get_scanner_target,$(1)) : $(call 
gb_LexTarget_get_target,$(1))
+   touch $$@
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

'make check' failure

[John Smith]

Hi,


I just ran into this error when running 'make check'. Should I file a
bug report on that ?



Regards,


John Smith



*

Failures that appeared during scenario execution:
 sc.ScAccessiblePageHeaderArea
1 of 96 tests failed
Job run took: 717865ms  [00:11:57]
Job -sce /usr/local/src/libreoffice/sc/qa/unoapi/sc.sce failed

No core dump at
/usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/user,
to create core dumps (and stack traces)
for crashed soffice instances, enable core dumps with:

   ulimit -c unlimited

E
Time: 733.897
There was 1 failure:
1) test(org.openoffice.test.UnoApiTest)
java.lang.AssertionError
at org.junit.Assert.fail(Assert.java:92)
at org.junit.Assert.assertTrue(Assert.java:43)
at org.junit.Assert.assertTrue(Assert.java:54)
at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:38)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:601)
at 
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:45)
at 
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
at 
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:42)
at 
org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
at 
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
at 
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:30)
at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:263)
at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:68)
at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:47)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:50)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:222)
at org.junit.runners.ParentRunner.run(ParentRunner.java:300)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:24)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:50)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:222)
at org.junit.runners.ParentRunner.run(ParentRunner.java:300)
at org.junit.runner.JUnitCore.run(JUnitCore.java:157)
at org.junit.runner.JUnitCore.run(JUnitCore.java:136)
at org.junit.runner.JUnitCore.run(JUnitCore.java:117)
at org.junit.runner.JUnitCore.runMain(JUnitCore.java:98)
at org.junit.runner.JUnitCore.runMainAndExit(JUnitCore.java:53)
at org.junit.runner.JUnitCore.main(JUnitCore.java:45)

FAILURES!!!
Tests run: 1,  Failures: 1

to rerun just this failed test without all others, run:

make 
/usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/user

cd into the module dir to run the tests faster
Or to do interactive debugging, run two shells with (Linux only):

make debugrun
make gb_JunitTest_DEBUGRUN=T
/usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/done

make[2]: *** 
[/usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/done]
Error 1
make[2]: *** Waiting for unfinished jobs
make[2]: Leaving directory `/usr/local/src/libreoffice'
make[1]: *** [subsequentcheck] Error 2
make[1]: Leaving directory `/usr/local/src/libreoffice'
make: *** [check] Error 2
#
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: gettext (was: (great) widget layout progress)

[Andras Timar]

2012/8/22 Stephan Bergmann :
> On 08/22/2012 05:55 PM, khagaroth wrote:
>>
>> How much work would it be to make this directly use gettext? I thought
>> the long term goal was to switch from custom translation formats to
>> gettext, so using yet another custom translation format for something
>> like this seems a bit odd.
>
>
> Seeing gettext mentioned here:  What always bothered me about (what little,
> really, I know about) gettext, is that AFAIU it is based on the assumption
> that a single string S in input language A can always be mapped to the same
> string in output language B, even if S appears in multiple places in the
> source, with potentially different semantics (that just happen to all be
> representable by the same phrase S in language A, but not necessarily so in
> language B).
>

This is why msgctx (message context) was invented, it solved this
problem. In my opinion gettext has other disadvantages in LibreOffice,
such as we cannot use it for all localizable content easily (e.g.
help, Windows installer, etc.).

Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: android/prj Makefile.top postprocess/prj

[Libreoffice Gerrit user]

 Makefile.top  |3 +++
 android/prj/build.lst |2 +-
 postprocess/prj/build.lst |2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 9d73597289be9049e8300ff92980fdffbe4d7040
Author: Matúš Kukan 
Date:   Wed Aug 22 18:32:05 2012 +0200

another build integrating solution for android

..since it also needs stuff from postprocess.
In qa/desktop/Makefile, images_tango.zip is used.
If that's not needed, the module can be placed between postprocess
and packimages for now.

Change-Id: I9951cce0c8da0fc75fd8a7b1246f4083bd38f705

diff --git a/Makefile.top b/Makefile.top
index 979671f..54fa900 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -406,6 +406,9 @@ else
cd instsetoo_native && unset MAKEFLAGS && \
 $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
 endif
+ifeq ($(OS),ANDROID)
+   cd android && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
+endif
 
 cross-toolset: bootstrap fetch
cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
diff --git a/android/prj/build.lst b/android/prj/build.lst
index bac6f27..1a0c8c2 100644
--- a/android/prj/build.lst
+++ b/android/prj/build.lst
@@ -1,2 +1,2 @@
-an android :: tail_build NULL
+an android :: packimages postprocess NULL
 an android\prj nmake - all an_prj NULL
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 51a8035..819a19c 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk 
MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc 
DESKTOP:setup_native STLPORT:stlport sysui tail_build android NULL
+po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk 
MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc 
DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
 po postprocess usr1-   all 
po_mkout NULL
 po postprocess\checkxmlnmake   -   all po_checkxml NULL
 po postprocess\packconfig  nmake   -   all po_packconfig 
po_checkxml NULL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: gettext (was: (great) widget layout progress)

[khagaroth]

Not really, that's what msgctxt is for.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 46249, which changed state.

Bug 46249 Summary: CRASH when browse to HD root directory in FILEOPEN Template 
dialog
https://bugs.freedesktop.org/show_bug.cgi?id=46249

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|RESOLVED

-- 
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

License Statement

[Jung-uk Kim]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

All of my past & future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.

Jung-uk Kim
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlA1B9gACgkQmlay1b9qnVNZagCfQkC134x8yKSkWvKkN1+BMjQG
I28AoIH4zrUlkLXGSJU1uUGUQ8XDc5Ga
=21eK
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

gettext (was: (great) widget layout progress)

[Stephan Bergmann]

On 08/22/2012 05:55 PM, khagaroth wrote:

How much work would it be to make this directly use gettext? I thought
the long term goal was to switch from custom translation formats to
gettext, so using yet another custom translation format for something
like this seems a bit odd.


Seeing gettext mentioned here:  What always bothered me about (what 
little, really, I know about) gettext, is that AFAIU it is based on the 
assumption that a single string S in input language A can always be 
mapped to the same string in output language B, even if S appears in 
multiple places in the source, with potentially different semantics 
(that just happen to all be representable by the same phrase S in 
language A, but not necessarily so in language B).


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#53399 Word count is inconsistent and wrong with non-brea...

[Eike Rathke]

Hi Muhammad,

On Wednesday, 2012-08-22 14:54:18 +, Gerrit wrote:

> This change replaces lcl_IsSkippableWhitespace with a call to ICU's 
> u_isspace, which covers all Unicode separators.

Hmm.. in what context is SwScanner::NextWord() actually used? In other
than word count context skipping NBSP actually may be desired and now
would be broken.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpkIYFhTIPff.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-5]: fdo#46249: UCBContentHelper::GetTitle must not fail for void...

[Gerrit]

>From Michael Stahl :

Michael Stahl has submitted this change and it was merged.

Change subject: fdo#46249: UCBContentHelper::GetTitle must not fail for void 
property
..


fdo#46249: UCBContentHelper::GetTitle must not fail for void property

This was a regression introduced with 2af9040d38af7c7353855415dbea0134585058f3
"Cleaned up utl::UCBContentHelper."  GetSize exhibited the same problem and has
also been fixed.  IsYounger exhibits a similar problem, but has not been
addressed, as it is unclear what to return in case no dates can be compared; it
is only used in one place (handling SID_EDITDOC in
SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it appears,
only contents for which DateModified /does/ yield a non-void value are relevant.

(cherry picked from commit 27c7682e5e5859eb353443d6091143694a56bee8)

Conflicts:
unotools/source/ucbhelper/ucbhelper.cxx

Change-Id: I748745a1d7f361f8f91be87d7356983ee7261b1e
---
M unotools/inc/unotools/ucbhelper.hxx
M unotools/source/ucbhelper/ucbhelper.cxx
2 files changed, 21 insertions(+), 9 deletions(-)

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/452
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I748745a1d7f361f8f91be87d7356983ee7261b1e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Stephan Bergmann 
Gerrit-Reviewer: Michael Stahl 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-6]: fdo#46249: UCBContentHelper::GetTitle must not fail for void...

[Gerrit]

>From Michael Stahl :

Michael Stahl has submitted this change and it was merged.

Change subject: fdo#46249: UCBContentHelper::GetTitle must not fail for void 
property
..


fdo#46249: UCBContentHelper::GetTitle must not fail for void property

This was a regression introduced with 2af9040d38af7c7353855415dbea0134585058f3
"Cleaned up utl::UCBContentHelper."  GetSize exhibited the same problem and has
also been fixed.  IsYounger exhibits a similar problem, but has not been
addressed, as it is unclear what to return in case no dates can be compared; it
is only used in one place (handling SID_EDITDOC in
SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it appears,
only contents for which DateModified /does/ yield a non-void value are relevant.

Change-Id: Iff9f5e1ed6f45eede117713d64a265b98f6862b1
---
M unotools/inc/unotools/ucbhelper.hxx
M unotools/source/ucbhelper/ucbhelper.cxx
2 files changed, 15 insertions(+), 9 deletions(-)

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/449
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff9f5e1ed6f45eede117713d64a265b98f6862b1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: LibreOffice gerrit bot 
Gerrit-Reviewer: Michael Stahl 
Gerrit-Reviewer: Stephan Bergmann 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW-3-6] fdo#53399 Word count is inconsistent and wrong with non-brea...

[Michael Meeks]

Hi Muhammad,

Thanks for the great fix for a MAB - nice work ! :-)

On Wed, 2012-08-22 at 15:23 +, Gerrit wrote:
> fdo#53399 Word count is inconsistent and wrong with non-breaking space
> 
> This change replaces lcl_IsSkippableWhitespace with a call to ICU's
> u_isspace, which covers all Unicode separators. It also updates and
> fixes one of the SwScanner unit tests.

Hopefully there'll be no performance impact for word-counting of the
change :-) anyhow - correctness first.

It'd be great to have:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=3ba107606682b5e675127483a514f0e6580ecfd1

reviewed and cherry-picked by someone - Caolan ?

Thanks,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - unotools/inc unotools/source

[Libreoffice Gerrit user]

 unotools/inc/unotools/ucbhelper.hxx |7 +++
 unotools/source/ucbhelper/ucbhelper.cxx |   23 ++-
 2 files changed, 21 insertions(+), 9 deletions(-)

New commits:
commit fc08156b06c82a1a2b9d64b57caaf434485d4d3e
Author: Stephan Bergmann 
Date:   Wed Aug 22 09:11:23 2012 +0200

fdo#46249: UCBContentHelper::GetTitle must not fail for void property

This was a regression introduced with 
2af9040d38af7c7353855415dbea0134585058f3
"Cleaned up utl::UCBContentHelper."  GetSize exhibited the same problem and 
has
also been fixed.  IsYounger exhibits a similar problem, but has not been
addressed, as it is unclear what to return in case no dates can be 
compared; it
is only used in one place (handling SID_EDITDOC in
SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it 
appears,
only contents for which DateModified /does/ yield a non-void value are 
relevant.

(cherry picked from commit 27c7682e5e5859eb353443d6091143694a56bee8)

Conflicts:
unotools/source/ucbhelper/ucbhelper.cxx

Change-Id: I748745a1d7f361f8f91be87d7356983ee7261b1e
Reviewed-on: https://gerrit.libreoffice.org/452
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/unotools/inc/unotools/ucbhelper.hxx 
b/unotools/inc/unotools/ucbhelper.hxx
index 358d8e1..3ff576b 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -47,6 +47,10 @@ UNOTOOLS_DLLPUBLIC bool IsDocument(rtl::OUString const & 
url);
 
 UNOTOOLS_DLLPUBLIC bool IsFolder(rtl::OUString const & url);
 
+/// @param title must not be null
+/// @return true iff title has been set (i.e., if obtaining the "Title" 
property
+/// of the given content yields a non-void value without raising a
+/// non-RuntimeException; RuntimeExceptions are passed through)
 UNOTOOLS_DLLPUBLIC bool GetTitle(
 rtl::OUString const & url, rtl::OUString * title);
 
@@ -62,6 +66,9 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder(
 ucbhelper::Content & parent, rtl::OUString const & title,
 ucbhelper::Content & result, bool exclusive = false);
 
+/// @return the value of the "Size" property of the given content, or zero if
+/// obtaining the property yields a void value or raises a
+/// non-RuntimeException (RuntimeExceptions are passed through)
 UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(rtl::OUString const & url);
 
 UNOTOOLS_DLLPUBLIC bool IsYounger(
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx 
b/unotools/source/ucbhelper/ucbhelper.cxx
index daee93f..4747d5e 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -200,11 +200,10 @@ bool utl::UCBContentHelper::GetTitle(
 {
 assert(title != 0);
 try {
-*title = content(url).
-getPropertyValue(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"))).
-get();
-return true;
+return
+content(url).getPropertyValue(
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")))
+>>= *title;
 } catch (css::uno::RuntimeException const &) {
 throw;
 } catch (css::ucb::CommandAbortedException const &) {
@@ -341,10 +340,16 @@ bool utl::UCBContentHelper::MakeFolder(
 
 sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) {
 try {
-return
-content(url).getPropertyValue(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size"))).
-get();
+sal_Int64 n = 0;
+bool ok =
+(content(url).getPropertyValue(
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")))
+ >>= n);
+SAL_INFO_IF(
+!ok, "unotools",
+"UCBContentHelper::GetSize(" << url
+<< "): Size cannot be determined");
+return n;
 } catch (css::uno::RuntimeException const &) {
 throw;
 } catch (css::ucb::CommandAbortedException const &) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - unotools/inc unotools/source

[Libreoffice Gerrit user]

 unotools/inc/unotools/ucbhelper.hxx |7 +++
 unotools/source/ucbhelper/ucbhelper.cxx |   17 -
 2 files changed, 15 insertions(+), 9 deletions(-)

New commits:
commit 16a63f16699fd1383eb4bea6abfed9a98ed94838
Author: Stephan Bergmann 
Date:   Wed Aug 22 09:11:23 2012 +0200

fdo#46249: UCBContentHelper::GetTitle must not fail for void property

This was a regression introduced with 
2af9040d38af7c7353855415dbea0134585058f3
"Cleaned up utl::UCBContentHelper."  GetSize exhibited the same problem and 
has
also been fixed.  IsYounger exhibits a similar problem, but has not been
addressed, as it is unclear what to return in case no dates can be 
compared; it
is only used in one place (handling SID_EDITDOC in
SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it 
appears,
only contents for which DateModified /does/ yield a non-void value are 
relevant.

Change-Id: Iff9f5e1ed6f45eede117713d64a265b98f6862b1
Reviewed-on: https://gerrit.libreoffice.org/449
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/unotools/inc/unotools/ucbhelper.hxx 
b/unotools/inc/unotools/ucbhelper.hxx
index 358d8e1..3ff576b 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -47,6 +47,10 @@ UNOTOOLS_DLLPUBLIC bool IsDocument(rtl::OUString const & 
url);
 
 UNOTOOLS_DLLPUBLIC bool IsFolder(rtl::OUString const & url);
 
+/// @param title must not be null
+/// @return true iff title has been set (i.e., if obtaining the "Title" 
property
+/// of the given content yields a non-void value without raising a
+/// non-RuntimeException; RuntimeExceptions are passed through)
 UNOTOOLS_DLLPUBLIC bool GetTitle(
 rtl::OUString const & url, rtl::OUString * title);
 
@@ -62,6 +66,9 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder(
 ucbhelper::Content & parent, rtl::OUString const & title,
 ucbhelper::Content & result, bool exclusive = false);
 
+/// @return the value of the "Size" property of the given content, or zero if
+/// obtaining the property yields a void value or raises a
+/// non-RuntimeException (RuntimeExceptions are passed through)
 UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(rtl::OUString const & url);
 
 UNOTOOLS_DLLPUBLIC bool IsYounger(
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx 
b/unotools/source/ucbhelper/ucbhelper.cxx
index cbb9ee9..09203df 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -200,11 +200,7 @@ bool utl::UCBContentHelper::GetTitle(
 {
 assert(title != 0);
 try {
-*title = content(url).
-getPropertyValue(
-rtl::OUString("Title")).
-get();
-return true;
+return content(url).getPropertyValue(rtl::OUString("Title")) >>= 
*title;
 } catch (css::uno::RuntimeException const &) {
 throw;
 } catch (css::ucb::CommandAbortedException const &) {
@@ -337,10 +333,13 @@ bool utl::UCBContentHelper::MakeFolder(
 
 sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) {
 try {
-return
-content(url).getPropertyValue(
-rtl::OUString("Size")).
-get();
+sal_Int64 n = 0;
+bool ok = (content(url).getPropertyValue(rtl::OUString("Size")) >>= n);
+SAL_INFO_IF(
+!ok, "unotools",
+"UCBContentHelper::GetSize(" << url
+<< "): Size cannot be determined");
+return n;
 } catch (css::uno::RuntimeException const &) {
 throw;
 } catch (css::ucb::CommandAbortedException const &) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: (great) widget layout progress

[Michael Meeks]

On Wed, 2012-08-22 at 16:36 +0100, Caolán McNamara wrote:
> Planned something of that nature, in parallel with converter utility
> thing. i.e. have converter do the simplest conversion possible to a
> GtkGrid rather than guess/assign some layout.

Sounds sensible to me :-)

> Yeah, maybe's kendy's suggestion might be the way to go, make it a build
> time problem.

Would work nicely I think; presumably we need some make magic for these
guys anyway to install them in some clever way.

I wonder if creating a sub-class that you could derive from:

class FooDialog : agen::ui::FooDialog {
};

that had all the Widget *m_pWidget; fluff in it ? and a suitable
pre-canned constructor table that could be size optimised later ?

> a) I'm working on a windows install to make sure it doesn't fall over
> and die under windows immediately

Great :-)

> b) print dialog looks "busted", so some change has screwed that over.
> c) I need to stick my notes on the wiki

So we're nearly there - exciting times indeed :-)

> So, here's a nagging concern of my own, not big enough to bother me
> greatly, but I haven't measured the size of increase due to the xml .ui
> files vs the size of reduction of the binary resource format. I presume
> that the .ui format is bigger, though its possible that the
> trivially-simple xml format I'm using for just the translations that
> maps to the single always-there en-US .ui file vs the full resource copy
> of the binary scheme offsets that a bit.

IMHO binary hand-packed formats are always utterly worse than layering
generic compression on top of something which since we always read
linearly should be trivial.

Can we not whack the UI files into a single .zip file ? I suspect that
would make them substantially smaller (glade produces some quite verbose
XML element-wise IIRC). [ Perhaps with a first-check (like the
images.zip accesses) to a directory tree so people can prototype their
changes in a live build ].

Anyhow - it sounds like some impressive work,

Good stuff,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: (great) widget layout progress

[Michael Meeks]

Hi there,

On Wed, 2012-08-22 at 17:55 +0200, khagaroth wrote:
> How much work would it be to make this directly use gettext? I thought
> the long term goal was to switch from custom translation formats to
> gettext, so using yet another custom translation format for something
> like this seems a bit odd.

We had a prototype patch to use gettext on top of a key-id translation
(IIRC). Unfortunately, despite the apparent simplicity of the patch,
gettext started returning the most amazing results - perhaps some
threading issue or ...

I'd like to see some live/gettext integration working first ;-) clearly
for translators to be able to see the results of their work quickly
would be just wonderful - Andras is the expert here.

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: (great) widget layout progress

[khagaroth]

How much work would it be to make this directly use gettext? I thought
the long term goal was to switch from custom translation formats to
gettext, so using yet another custom translation format for something
like this seems a bit odd.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-6] missing "<<" in fdo#53655: removing extensions\bundled fails on Win XP

[Eike Rathke]

Hi Stephan,

On Tuesday, 2012-08-21 19:01:00 +0200, Stephan Bergmann wrote:

> Just noticed a missing "<<" in a SAL_WARN_IF in that commit,
> addressed on master now with 
> 
> "Typo."

Cherry-picked to 3-6
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=427529801dee122250e44d2311b34651db92bbdb

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpsbFSVpwlVo.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/source

[Libreoffice Gerrit user]

 desktop/source/app/app.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 427529801dee122250e44d2311b34651db92bbdb
Author: Stephan Bergmann 
Date:   Tue Aug 21 18:55:11 2012 +0200

Typo

Change-Id: I41fd1463b6432818ee36e7f90e920a5fd98c7106
(cherry picked from commit 1316cfe8a72f7c7bc2f5ad7644a2d4c54b77fc8b)

Signed-off-by: Eike Rathke 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d929787..55ebaca 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -194,7 +194,7 @@ void removeTree(OUString const & url) {
 osl::FileBase::RC rc = osl::Directory::remove(url);
 SAL_WARN_IF(
 rc != osl::FileBase::E_None, "desktop",
-"cannot remove directory " << url << ": " +rc);
+"cannot remove directory " << url << ": " << +rc);
 // at least on Windows XP removing some existing directories fails with
 // osl::FileBase::E_ACCESS because they are read-only; but keeping 
those
 // directories around should be harmless once they are empty
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: (great) widget layout progress

[Caolán McNamara]

On Tue, 2012-08-21 at 12:50 +0100, Michael Meeks wrote:
>   Do we have a "GtkFixed" style back-compat hack that will continue to
> nail widgets into their places, but do it in TWIPS such that we could do
> a one-shot conversion of everything and then iterate ? [ then let the
> designers re-work them incrementally ].

Planned something of that nature, in parallel with converter utility
thing. i.e. have converter do the simplest conversion possible to a
GtkGrid rather than guess/assign some layout.

> > [*] maybe the cast-happy syntax looks a bit vile.
>
> In my experience it is remarkably common for
> even programmers to tweak the XML and rename / loose widgets in such a
> way that the code crashes later ;-)

Yeah, maybe's kendy's suggestion might be the way to go, make it a build
time problem.

>   Anyhow - I'm rather excited about this - it looks insanely cool :-) are
> there any notable blockers stopping us getting it into master ?

a) I'm working on a windows install to make sure it doesn't fall over
and die under windows immediately
b) print dialog looks "busted", so some change has screwed that over.
c) I need to stick my notes on the wiki

So, here's a nagging concern of my own, not big enough to bother me
greatly, but I haven't measured the size of increase due to the xml .ui
files vs the size of reduction of the binary resource format. I presume
that the .ui format is bigger, though its possible that the
trivially-simple xml format I'm using for just the translations that
maps to the single always-there en-US .ui file vs the full resource copy
of the binary scheme offsets that a bit.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-6]: fdo#53887 ConvertLikeToken(): make escape character properly...

[Gerrit]

>From Andras Timar :

Andras Timar has submitted this change and it was merged.

Change subject: fdo#53887 ConvertLikeToken(): make escape character properly 
escape itself
..


fdo#53887 ConvertLikeToken(): make escape character properly escape itself

Change-Id: Ic2b79e78f95e298a08794fa11f227d76152244f5
---
M connectivity/source/parse/sqlbison.y
1 file changed, 25 insertions(+), 9 deletions(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/444
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2b79e78f95e298a08794fa11f227d76152244f5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-6]: fdo#46480 do not double-escape (e.g. date) literals as strin...

[Gerrit]

>From Andras Timar :

Andras Timar has submitted this change and it was merged.

Change subject: fdo#46480 do not double-escape (e.g. date) literals as strings
..


fdo#46480 do not double-escape (e.g. date) literals as strings

Change-Id: I50d3f1002468d41d5b5882de170699d44fe5223c
---
M dbaccess/source/ui/dlg/queryfilter.cxx
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/443
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I50d3f1002468d41d5b5882de170699d44fe5223c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/parse/sqlbison.y |   34 +-
 1 file changed, 25 insertions(+), 9 deletions(-)

New commits:
commit c90db23996c0580e9cd45db0230062a586fb8a53
Author: Lionel Elie Mamane 
Date:   Tue Aug 21 19:27:30 2012 +0200

fdo#53887 ConvertLikeToken(): make escape character properly escape itself

Change-Id: Ic2b79e78f95e298a08794fa11f227d76152244f5
Reviewed-on: https://gerrit.libreoffice.org/444
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index 54cc68e..00fb0b3 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4519,7 +4519,7 @@ const double fMilliSecondsPerDay = 8640.0;
 //--
 ::rtl::OUString ConvertLikeToken(const OSQLParseNode* pTokenNode, const 
OSQLParseNode* pEscapeNode, sal_Bool bInternational)
 {
-   ::rtl::OUStringBuffer aMatchStr;
+   ::rtl::OUStringBuffer aMatchStr(0);
if (pTokenNode->isToken())
{
sal_Unicode cEscape = 0;
@@ -4541,18 +4541,34 @@ const double fMilliSecondsPerDay = 8640.0;
sReplace.appendAscii("%_",2);
}
 
+   bool wasEscape = false;
for (sal_Int32 i = 0; i < nLen; i++)
{
const sal_Unicode c = aMatchStr[i];
-   if (c == sSearch[0] || c == sSearch[1])
+   // SQL standard requires the escape to be followed
+   // by a meta-character ('%', '_' or itself), else error
+   // We are more lenient here and let it escape anything.
+   // Especially since some databases (e.g. Microsoft SQL 
Server)
+   // have more meta-characters than the standard, such as 
e.g. '[' and ']'
+   if (wasEscape)
{
-   if (i > 0 && aMatchStr[i - 1] == cEscape)
-   continue;
-   else
-   {
-   const sal_Unicode cCharacter = 
sReplace[(c == sSearch[0] ? 0 : 1)];
-   aMatchStr[i] = cCharacter;
-   }
+   wasEscape=false;
+   continue;
+   }
+   if (c == cEscape)
+   {
+   wasEscape=true;
+   continue;
+   }
+   int match = -1;
+   if (c == sSearch[0])
+   match=0;
+   else if (c == sSearch[1])
+   match=1;
+
+   if (match != -1)
+   {
+   aMatchStr[i] = sReplace[match];
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/queryfilter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ada624c20b44bdc2bea751a6c2f6e47af0ae4f1
Author: Lionel Elie Mamane 
Date:   Tue Aug 21 17:23:34 2012 +0200

fdo#46480 do not double-escape (e.g. date) literals as strings

Change-Id: I50d3f1002468d41d5b5882de170699d44fe5223c
Reviewed-on: https://gerrit.libreoffice.org/443
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx 
b/dbaccess/source/ui/dlg/queryfilter.cxx
index 9d481ac..a639828 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -369,7 +369,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& 
_rField,const ListBox& _rCom
 _rFilter.Handle = GetOSQLPredicateType( _rComp.GetSelectEntry() );
 if ( SQLFilterOperator::SQLNULL != _rFilter.Handle && _rFilter.Handle != 
SQLFilterOperator::NOT_SQLNULL )
 {
-String sPredicateValue = m_aPredicateInput.getPredicateValue( 
_rValue.GetText(), getMatchingColumn( _rValue ), sal_True );
+String sPredicateValue = m_aPredicateInput.getPredicateValue( 
_rValue.GetText(), getMatchingColumn( _rValue ), sal_False );
 ::Replace_OS_PlaceHolder( sPredicateValue );
 _rFilter.Value <<= ::rtl::OUString(sPredicateValue);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#53399 Word count is inconsistent and wrong with non-brea...

[Gerrit]

>From Andras Timar :

Andras Timar has submitted this change and it was merged.

Change subject: fdo#53399 Word count is inconsistent and wrong with 
non-breaking space
..


fdo#53399 Word count is inconsistent and wrong with non-breaking space

This change replaces lcl_IsSkippableWhitespace with a call to ICU's u_isspace, 
which covers all Unicode separators. It also updates and fixes one of the 
SwScanner unit tests.

Bug details:
SwScanner::NextWord skips whitespace before calling into ICU's BreakIterator. 
The function used to identify whitespace (lcl_IsSkippableWhitespace) doesn't 
cover the full category of Unicode separators (code [Zs], 18 in total. See: 
http://www.fileformat.info/info/unicode/category/Zs/index.htm).

Since 0xA0 (no-break space) is not identified as whitespace and not skipped, we 
end up calling ICU starting at the position 0xA0, asking it to get us the 
boundary of the next word forward. ICU sees that it's called at the end of a 
word, and reverses the query direction to backward, and returns the word 
before. This causes NextWord to think we've hit the end of the string and call 
it a day, terminating word count for the rest of the line.

Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5
---
M sw/qa/core/swdoc-test.cxx
M sw/source/core/txtnode/txtedt.cxx
2 files changed, 11 insertions(+), 12 deletions(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/453
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Muhammad Haggag 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/qa sw/source

[Libreoffice Gerrit user]

 sw/qa/core/swdoc-test.cxx |   10 --
 sw/source/core/txtnode/txtedt.cxx |   13 +++--
 2 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 3ba107606682b5e675127483a514f0e6580ecfd1
Author: Muhammad Haggag 
Date:   Wed Aug 22 16:46:23 2012 +0200

fdo#53399 Word count is inconsistent and wrong with non-breaking space

This change replaces lcl_IsSkippableWhitespace with a call to ICU's 
u_isspace, which covers all Unicode separators. It also updates and fixes one 
of the SwScanner unit tests.

Bug details:
SwScanner::NextWord skips whitespace before calling into ICU's 
BreakIterator. The function used to identify whitespace 
(lcl_IsSkippableWhitespace) doesn't cover the full category of Unicode 
separators (code [Zs], 18 in total. See: 
http://www.fileformat.info/info/unicode/category/Zs/index.htm).

Since 0xA0 (no-break space) is not identified as whitespace and not 
skipped, we end up calling ICU starting at the position 0xA0, asking it to get 
us the boundary of the next word forward. ICU sees that it's called at the end 
of a word, and reverses the query direction to backward, and returns the word 
before. This causes NextWord to think we've hit the end of the string and call 
it a day, terminating word count for the rest of the line.

Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5
Reviewed-on: https://gerrit.libreoffice.org/453
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index a5df143..54a1cff 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -423,6 +423,7 @@ void SwDocTest::testSwScanner()
 }
 
 //See https://issues.apache.org/ooo/show_bug.cgi?id=89042
+//See https://bugs.freedesktop.org/show_bug.cgi?id=53399
 {
 SwDocStat aDocStat;
 
@@ -439,15 +440,20 @@ void SwDocTest::testSwScanner()
 CPPUNIT_ASSERT_MESSAGE("Should be 3", aDocStat.nWord == 3);
 
 const sal_Unicode aShouldBeFive[] = {
+// fr   e   n   c   h   space
 0x0046, 0x0072, 0x0065, 0x006E, 0x0063, 0x0068, 0x0020,
+// <<   nbsps   a   v   o   i
 0x00AB, 0x00A0, 0x0073, 0x0061, 0x0076, 0x006F, 0x0069,
-0x0072, 0x0020, 0x0063, 0x0061, 0x006C, 0x0063, 0x0075,
-0x006C, 0x0065, 0x0072, 0x00A0, 0x00BB
+// rnnbsp   c   a   l   c   u
+0x0072, 0x202f, 0x0063, 0x0061, 0x006C, 0x0063, 0x0075,
+// le   r   idspace >>
+0x006C, 0x0065, 0x0072, 0x3000, 0x00BB
 };
 
 m_pDoc->AppendTxtNode(*aPaM.GetPoint());
 m_pDoc->InsertString(aPaM, rtl::OUString(aShouldBeFive, 
SAL_N_ELEMENTS(aShouldBeFive)));
 pTxtNode = aPaM.GetNode()->GetTxtNode();
+aDocStat.Reset();
 pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive));
 CPPUNIT_ASSERT_MESSAGE("Should be 5", aDocStat.nWord == 5);
 }
diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index 66650ba..ca3b961 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -71,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -96,14 +97,6 @@ using namespace ::com::sun::star::smarttags;
 extern const SwTxtNode *pLinguNode;
 extern   SwTxtFrm  *pLinguFrm;
 
-bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh )
-{
-return 0x3000 == cCh ||
-   ' ' == cCh ||
-   '\t' == cCh ||
-   0x0a == cCh;
-}
-
 /*
  * This has basically the same function as SwScriptInfo::MaskHiddenRanges,
  * only for deleted redlines
@@ -731,7 +724,7 @@ sal_Bool SwScanner::NextWord()
 // skip non-letter characters:
 while ( nBegin < aText.getLength() )
 {
-if ( !lcl_IsSkippableWhiteSpace( aText[nBegin] ) )
+if ( !u_isspace( aText[nBegin] ) )
 {
 if ( !pLanguage )
 {
@@ -1877,7 +1870,7 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
 //do the count
 // all counts exclude hidden paras and hidden+redlined within para
 // definition of space/white chars in SwScanner (and BreakIter!)
-// uses both lcl_IsSkippableWhiteSpace and BreakIter getWordBoundary in 
SwScanner
+// uses both u_isspace and BreakIter getWordBoundary in SwScanner
 sal_uInt32 nTmpWords = 0;// count of all words
 sal_uInt32 nTmpAsianWords = 0;   //count of all Asian codepoints
 sal_uInt32 nTmpChars = 0;// count of all chars
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help Locating Base Code

[Joel Madero]

Thanks for letting me know it's Lionel :) I told Rafael yesterday in the
chat that just because I enjoy being angry (actually just enjoy a good
challenge) I'll probably assign myself another base bug in the coming weeks
and spend 20 hours to fix one line ;) now I know who to bug with every
minor question (just kidding!).

Best Regards,

Joel

On Wed, Aug 22, 2012 at 12:16 AM, Jan Holesovsky  wrote:

> Hi Joel,
>
> On 2012-08-21 at 11:10 -0700, Joel Madero wrote:
>
> > Thanks to everyone who helped me along the way. The code actually
> > ended up being in formcomponenthandler.cxx,
> > FormComponentPropertyHandler::impl_browseImage_nothrow.
>
> Great to hear; I hope I did not mislead you too much - that was the
> other occurrence of FILEOPEN_LINK_PREVIEW/CHECKBOX_LINK :-)
>
> > I think we need to start looking for a database expert, someone who
> > enjoys it and is willing to get into the grit of the crappy code. Any
> > takers ? ;)
>
> Oh - database expert, that's Lionel :-)  But of course, having more
> database experts would be great!
>
> > I'll get the patch done tonight after I clear all the other stuff I
> > was testing with, going to attempt gerritt for the first time.
>
> Looking forward to the patch!
>
> All the best,
> Kendy
>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] do not deliver these module-description xml files

[Gerrit]

>From Andras Timar :

Andras Timar has submitted this change and it was merged.

Change subject: do not deliver these module-description xml files
..


do not deliver these module-description xml files

Change-Id: Ife2f42b3a917ece10dc7ee9fcd83f1558084c4f1
---
M animations/Module_animations.mk
D animations/Package_xml.mk
M basctl/Package_xml.mk
M sc/Module_sc.mk
D sc/Package_xml.mk
M sd/Package_xml.mk
M store/Module_store.mk
D store/Package_xml.mk
M sw/Module_sw.mk
D sw/Package_xml.mk
M ucb/Module_ucb.mk
D ucb/Package_xml.mk
M uui/Module_uui.mk
D uui/Package_xml.mk
M xmlhelp/Package_xml.mk
15 files changed, 0 insertions(+), 345 deletions(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/454
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife2f42b3a917ece10dc7ee9fcd83f1558084c4f1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: animations/Module_animations.mk animations/Package_xml.mk basctl/Package_xml.mk sc/Module_sc.mk sc/Package_xml.mk sd/Package_xml.mk store/Module_store.mk store/Package_xml.mk

[Libreoffice Gerrit user]

 animations/Module_animations.mk |1 
 animations/Package_xml.mk   |   33 -
 basctl/Package_xml.mk   |1 
 sc/Module_sc.mk |1 
 sc/Package_xml.mk   |  142 
 sd/Package_xml.mk   |   28 ---
 store/Module_store.mk   |1 
 store/Package_xml.mk|   31 
 sw/Module_sw.mk |1 
 sw/Package_xml.mk   |   23 --
 ucb/Module_ucb.mk   |1 
 ucb/Package_xml.mk  |   46 
 uui/Module_uui.mk   |1 
 uui/Package_xml.mk  |   33 -
 xmlhelp/Package_xml.mk  |2 
 15 files changed, 345 deletions(-)

New commits:
commit daf23128482894e6efee21463c613bc857e15b5e
Author: Matúš Kukan 
Date:   Wed Aug 22 16:45:53 2012 +0200

do not deliver these module-description xml files

Change-Id: Ife2f42b3a917ece10dc7ee9fcd83f1558084c4f1
Reviewed-on: https://gerrit.libreoffice.org/454
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/animations/Module_animations.mk b/animations/Module_animations.mk
index 66789d5..fe7770a 100644
--- a/animations/Module_animations.mk
+++ b/animations/Module_animations.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_Module,animations))
 $(eval $(call gb_Module_add_targets,animations,\
 Library_animcore \
Package_inc \
-   Package_xml \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/animations/Package_xml.mk b/animations/Package_xml.mk
deleted file mode 100644
index c97bec0..000
--- a/animations/Package_xml.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-
-$(eval $(call 
gb_Package_Package,animations_xml,$(SRCDIR)/animations/source/animcore))
-
-$(eval $(call 
gb_Package_add_file,animations_xml,xml/animcore.xml,animcore.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basctl/Package_xml.mk b/basctl/Package_xml.mk
index f5dbf10..2acd529 100644
--- a/basctl/Package_xml.mk
+++ b/basctl/Package_xml.mk
@@ -28,7 +28,6 @@
 
 $(eval $(call gb_Package_Package,basctl_xml,$(SRCDIR)/basctl))
 
-$(eval $(call gb_Package_add_file,basctl_xml,xml/basctl.xml,util/basctl.xml))
 $(eval $(call 
gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/menubar/menubar.xml,uiconfig/basicide/menubar/menubar.xml))
 $(eval $(call 
gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/statusbar/statusbar.xml,uiconfig/basicide/statusbar/statusbar.xml))
 $(eval $(call 
gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/dialogbar.xml,uiconfig/basicide/toolbar/dialogbar.xml))
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index bf606df..dc63ff7 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sc,\
Library_scfilt \
Library_scui \
Package_uiconfig \
-   Package_xml \
 ))
 
 ifneq ($(DISABLE_SCRIPTING),TRUE)
diff --git a/sc/Package_xml.mk b/sc/Package_xml.mk
deleted file mode 100644
index e56ca17..000
--- a/sc/Package_xml.mk
+++ /dev/null
@@ -1,142 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Norbert Thiebaud  (C) 2010, All Rights Reserved.
-#
-#

Re: widget layout progress

[Caolán McNamara]

On Tue, 2012-08-21 at 10:38 +0200, Jan Holesovsky wrote:
> The thing that hit my eyes is the use of string identifiers to address
> the UI elements.  Could we (for the compilation purposes) generate .hxx
> files out of the .ui files that would allow to do something like:
> 
> m_pBodyContent = 
> modules::swriter::ui::linenumbering::content::get(m_pUIBuilder);

Yesss, that's possible I suppose, seeing as we already do that for the
configmgr.

> Another extremely minor question - why the "modules/" prefix?  Is that
> needed? - seems to just repeat on many places (mainly in help), so maybe
> we could avoid that?

So..., I'm currently installing the .ui into our preexisting uiconfig
dirs, and the "modules" in the file path already exist for e.g. toolbars
and so forth, e.g.
install/share/config/soffice.cfg/modules/swriter/menubar/menubar.xml

Then..., the gtk builder format doesn't really (AFAICS) have a direct
mapping to our help id idea, so rather than extend the format I reckon
that using the "path to the file + dialog id + widget id" as the helpid
is the easiest way to guarantee helpid uniqueness rather than having a
policy/set of tooling to enforce, say, dialog name uniqueness across the
code base and use just "dialogid:widgetid"

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: xmlhelp/source

[Libreoffice Gerrit user]

 xmlhelp/source/treeview/tvread.cxx |   83 +
 xmlhelp/source/treeview/tvread.hxx |4 +
 2 files changed, 80 insertions(+), 7 deletions(-)

New commits:
commit d9eec8f0f0b4ff397dedbfc2041c79c45af4d4a1
Author: Bence Babati 
Date:   Wed Aug 22 15:26:44 2012 +0200

embed extension's help tree into main help tree

Change-Id: Iddb3c542f50078b13c7d420b528aa704a5cb0767

diff --git a/xmlhelp/source/treeview/tvread.cxx 
b/xmlhelp/source/treeview/tvread.cxx
index 8357a3b..387ba14 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -75,6 +75,13 @@ namespace treeview {
 return children.back();
 }
 
+TVDom* newChild(TVDom* p)
+{
+children.push_back( p );
+p->parent = this;
+return children.back();
+}
+
 
 TVDom* getParent() const
 {
@@ -485,8 +492,6 @@ extern "C" void data_handler( void *userData,
 (*tvDom)->setTitle( s,len );
 }
 
-
-
 TVChildTarget::TVChildTarget( const ConfigData& configData,TVDom* tvDom )
 {
 Elements.resize( tvDom->children.size() );
@@ -494,10 +499,6 @@ TVChildTarget::TVChildTarget( const ConfigData& 
configData,TVDom* tvDom )
 Elements[i] = new TVRead( configData,tvDom->children[i] );
 }
 
-
-
-
-
 TVChildTarget::TVChildTarget( const Reference< XMultiServiceFactory >& xMSF )
 {
 ConfigData configData = init( xMSF );
@@ -534,8 +535,9 @@ TVChildTarget::TVChildTarget( const Reference< 
XMultiServiceFactory >& xMSF )
 
 XML_ParserFree( parser );
 delete[] s;
-}
 
+Check(pTVDom);
+}
 // now TVDom holds the relevant information
 
 Elements.resize( tvDom.children.size() );
@@ -548,7 +550,74 @@ TVChildTarget::~TVChildTarget()
 {
 }
 
+void TVChildTarget::Check(TVDom* tvDom)
+{
+unsigned i = 0;
+bool h = false;
+
+while((ichildren.size()-1) && (!h))
+{
+if (((tvDom->children[i])->application == 
(tvDom->children[tvDom->children.size()-1])->application) &&
+((tvDom->children[i])->id == 
(tvDom->children[tvDom->children.size()-1])->id))
+{
+TVDom* p = tvDom->children[tvDom->children.size()-1];
+
+for(unsigned k=0; kchildren.size(); ++k)
+if (!SearchAndInsert(p->children[k], tvDom->children[i]))  
 tvDom->children[i]->newChild(p->children[k]);
 
+tvDom->children.pop_back();
+h = true;
+}
+++i;
+}
+}
+
+bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
+{
+if (p->isLeaf()) return false;
+
+bool h = false;
+sal_Int32 max = 0;
+
+std::vector< TVDom* >::iterator max_It, i;
+max_It = tvDom->children.begin();
+
+sal_Int32 c_int;
+sal_Int32 p_int = p->id.toInt32();
+
+check this level in the tree
+for(i = tvDom->children.begin(); i!=tvDom->children.end(); ++i)
+if (!((*i)->isLeaf()) &&
+((*i)->id.getLength() == p->id.getLength()) &&
+(p->id.replaceAt((*i)->parent->id.getLength(), 
p->id.getLength()-(*i)->parent->id.getLength(), OUString("")) == 
(*i)->parent->id))  //prefix check
+{
+h = true;
+c_int = (*i)->id.toInt32();
+
+if (p_int==c_int)
+{
+(*(tvDom->children.insert(i+1, p)))->parent = tvDom;
+return true;
+}
+else if(c_int>max && c_int < p_int)
+{
+max = c_int;
+max_It = i+1;
+}
+}
+recursive call if necessary
+if (h) (*(tvDom->children.insert(max_It, p)))->parent = tvDom;
+else
+{
+i = tvDom->children.begin();
+while ((i!=tvDom->children.end()) && (!h))
+{
+h = SearchAndInsert(p, *i);
+++i;
+}
+}
+return h;
+}
 
 Any SAL_CALL
 TVChildTarget::getByName( const rtl::OUString& aName )
diff --git a/xmlhelp/source/treeview/tvread.hxx 
b/xmlhelp/source/treeview/tvread.hxx
index 48e22b2..2afcd10 100644
--- a/xmlhelp/source/treeview/tvread.hxx
+++ b/xmlhelp/source/treeview/tvread.hxx
@@ -319,6 +319,10 @@ namespace treeview {
 const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& xMSgr,
 rtl::OUString& instpath ) const;
 
+bool SearchAndInsert(TVDom* p, TVDom* tvDom);
+
+void Check(TVDom* tvDom);
+
 };  // end class TVChildTarget
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] remove unused module-description xml files

[Gerrit]

>From Matúš Kukan :

Matúš Kukan has uploaded a new change for review.

Change subject: remove unused module-description xml files
..

remove unused module-description xml files

Change-Id: I531e47538f308ee43e0fe8d7db59f525e45942c3
---
D animations/source/animcore/animcore.xml
D basctl/util/basctl.xml
D sc/xml/AccessibleEditableTextPara_HeaderFooter.xml
D sc/xml/AccessibleEditableTextPara_PreviewCell.xml
D sc/xml/AccessibleEditableTextPara_PreviewNote.xml
D sc/xml/ScAccessibleCell.xml
D sc/xml/ScAccessibleCsvCell.xml
D sc/xml/ScAccessibleCsvGrid.xml
D sc/xml/ScAccessibleCsvRuler.xml
D sc/xml/ScAccessibleDocument.xml
D sc/xml/ScAccessibleDocumentPagePreview.xml
D sc/xml/ScAccessiblePageHeader.xml
D sc/xml/ScAccessiblePageHeaderArea.xml
D sc/xml/ScAccessiblePreviewCell.xml
D sc/xml/ScAccessiblePreviewHeaderCell.xml
D sc/xml/ScAccessiblePreviewTable.xml
D sc/xml/ScAccessibleSpreadsheet.xml
D sc/xml/ScAnnotationObj.xml
D sc/xml/ScAnnotationShapeObj.xml
D sc/xml/ScAnnotationsObj.xml
D sc/xml/ScAreaLinkObj.xml
D sc/xml/ScAreaLinksObj.xml
D sc/xml/ScAutoFormatFieldObj.xml
D sc/xml/ScAutoFormatObj.xml
D sc/xml/ScAutoFormatsObj.xml
D sc/xml/ScCellCursorObj.xml
D sc/xml/ScCellFieldObj.xml
D sc/xml/ScCellFieldsObj.xml
D sc/xml/ScCellFormatsEnumeration.xml
D sc/xml/ScCellFormatsObj.xml
D sc/xml/ScCellObj.xml
D sc/xml/ScCellRangeObj.xml
D sc/xml/ScCellRangesObj.xml
D sc/xml/ScCellSearchObj.xml
D sc/xml/ScCellTextCursor.xml
D sc/xml/ScCellsEnumeration.xml
D sc/xml/ScCellsObj.xml
D sc/xml/ScChartObj.xml
D sc/xml/ScChartsObj.xml
D sc/xml/ScConsolidationDescriptor.xml
D sc/xml/ScDDELinkObj.xml
D sc/xml/ScDDELinksObj.xml
D sc/xml/ScDataPilotFieldGroupItemObj.xml
D sc/xml/ScDataPilotFieldGroupObj.xml
D sc/xml/ScDataPilotFieldGroupsObj.xml
D sc/xml/ScDataPilotFieldObj.xml
D sc/xml/ScDataPilotFieldsObj.xml
D sc/xml/ScDataPilotItemObj.xml
D sc/xml/ScDataPilotItemsObj.xml
D sc/xml/ScDataPilotTableObj.xml
D sc/xml/ScDataPilotTablesObj.xml
D sc/xml/ScDatabaseRangeObj.xml
D sc/xml/ScDatabaseRangesObj.xml
D sc/xml/ScDocumentConfiguration.xml
D sc/xml/ScDrawPageObj.xml
D sc/xml/ScDrawPagesObj.xml
D sc/xml/ScFilterDescriptorBase.xml
D sc/xml/ScFunctionListObj.xml
D sc/xml/ScHeaderFieldObj.xml
D sc/xml/ScHeaderFieldsObj.xml
D sc/xml/ScHeaderFooterContentObj.xml
D sc/xml/ScHeaderFooterTextCursor.xml
D sc/xml/ScHeaderFooterTextObj.xml
D sc/xml/ScIndexEnumeration_CellAnnotationsEnumeration.xml
D sc/xml/ScIndexEnumeration_CellAreaLinksEnumeration.xml
D sc/xml/ScIndexEnumeration_DDELinksEnumeration.xml
D sc/xml/ScIndexEnumeration_DataPilotFieldsEnumeration.xml
D sc/xml/ScIndexEnumeration_DataPilotItemsEnumeration.xml
D sc/xml/ScIndexEnumeration_DataPilotTablesEnumeration.xml
D sc/xml/ScIndexEnumeration_DatabaseRangesEnumeration.xml
D sc/xml/ScIndexEnumeration_FunctionDescriptionEnumeration.xml
D sc/xml/ScIndexEnumeration_LabelRangesEnumeration.xml
D sc/xml/ScIndexEnumeration_NamedRangesEnumeration.xml
D sc/xml/ScIndexEnumeration_ScenariosEnumeration.xml
D sc/xml/ScIndexEnumeration_SheetCellRangesEnumeration.xml
D sc/xml/ScIndexEnumeration_SheetLinksEnumeration.xml
D sc/xml/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.xml
D sc/xml/ScIndexEnumeration_SpreadsheetsEnumeration.xml
D sc/xml/ScIndexEnumeration_SubTotalFieldsEnumeration.xml
D sc/xml/ScIndexEnumeration_TableAutoFormatEnumeration.xml
D sc/xml/ScIndexEnumeration_TableChartsEnumeration.xml
D sc/xml/ScIndexEnumeration_TableColumnsEnumeration.xml
D sc/xml/ScIndexEnumeration_TableConditionalEntryEnumeration.xml
D sc/xml/ScIndexEnumeration_TableRowsEnumeration.xml
D sc/xml/ScIndexEnumeration_TextFieldEnumeration.xml
D sc/xml/ScLabelRangeObj.xml
D sc/xml/ScLabelRangesObj.xml
D sc/xml/ScModelObj.xml
D sc/xml/ScNamedRangeObj.xml
D sc/xml/ScNamedRangesObj.xml
D sc/xml/ScPageObj.xml
D sc/xml/ScRecentFunctionsObj.xml
D sc/xml/ScScenariosObj.xml
D sc/xml/ScShapeObj.xml
D sc/xml/ScSheetLinkObj.xml
D sc/xml/ScSheetLinksObj.xml
D sc/xml/ScSpreadsheetSettings.xml
D sc/xml/ScSpreadsheetSettingsObj.xml
D sc/xml/ScStyleFamiliesObj.xml
D sc/xml/ScStyleFamilyObj.xml
D sc/xml/ScStyleObj.xml
D sc/xml/ScSubTotalDescriptorBase.xml
D sc/xml/ScSubTotalFieldObj.xml
D sc/xml/ScTabViewObj.xml
D sc/xml/ScTableColumnObj.xml
D sc/xml/ScTableColumnsObj.xml
D sc/xml/ScTableConditionalEntry.xml
D sc/xml/ScTableConditionalFormat.xml
D sc/xml/ScTableRowObj.xml
D sc/xml/ScTableRowsObj.xml
D sc/xml/ScTableSheetObj.xml
D sc/xml/ScTableSheetsObj.xml
D sc/xml/ScTableValidationObj.xml
D sc/xml/ScUniqueCellFormatsEnumeration.xml
D sc/xml/ScUniqueCellFormatsObj.xml
D sc/xml/ScViewPaneObj.xml
D sc/xml/ScXMLExport.xml
D sc/xml/ScXMLImport.xml
D sd/xml/AccessibleDrawDocumentView.xml
D sd/xml/AccessibleOutlineView.xml
D sd/xml/AccessiblePageShape.xml
D sd/xml/AccessiblePresentationGraphicShape.xml
D sd/xml/AccessiblePresentationOLEShape.xml
D sd/xml/AccessiblePresentationShape.xml
D sd/xml/AccessibleSlideView.xml
D sd/xml/AccessibleSlideViewObject.xml
D sd/xml/

[PATCH] do not deliver these module-description xml files

[Gerrit]

>From Matúš Kukan :

Matúš Kukan has uploaded a new change for review.

Change subject: do not deliver these module-description xml files
..

do not deliver these module-description xml files

Change-Id: Ife2f42b3a917ece10dc7ee9fcd83f1558084c4f1
---
M animations/Module_animations.mk
D animations/Package_xml.mk
M basctl/Package_xml.mk
M sc/Module_sc.mk
D sc/Package_xml.mk
M sd/Package_xml.mk
M store/Module_store.mk
D store/Package_xml.mk
M sw/Module_sw.mk
D sw/Package_xml.mk
M ucb/Module_ucb.mk
D ucb/Package_xml.mk
M uui/Module_uui.mk
D uui/Package_xml.mk
M xmlhelp/Package_xml.mk
15 files changed, 0 insertions(+), 345 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/454/1
--
To view, visit https://gerrit.libreoffice.org/454
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife2f42b3a917ece10dc7ee9fcd83f1558084c4f1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: 'load' functions in cpp unittest - are they unused?

[Caolán McNamara]

On Tue, 2012-08-21 at 19:42 +0700, Korrawit Pruegsanusak wrote:
> sd/qa/unit/regression-test.cxx (line #80)
> sc/qa/unit/subsequent_filters-test.cxx (line #246)
> 
> which I think they are unused. Is it ok to remove both of them?
> 
> [1] 
> http://opengrok.libreoffice.org/search?q=load&project=core&defs=&refs=&path=-java+-idl+-osl+qa+cxx&hist=

I think they're pure virtuals so it'll fail to build with them
removed ?, could stub them I suppose, but they'd still exist.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#53399 Word count is inconsistent and wrong with non-brea...

[Gerrit]

>From Muhammad Haggag :

Muhammad Haggag has uploaded a new change for review.

Change subject: fdo#53399 Word count is inconsistent and wrong with 
non-breaking space
..

fdo#53399 Word count is inconsistent and wrong with non-breaking space

This change replaces lcl_IsSkippableWhitespace with a call to ICU's u_isspace, 
which covers all Unicode separators. It also updates and fixes one of the 
SwScanner unit tests.

Bug details:
SwScanner::NextWord skips whitespace before calling into ICU's BreakIterator. 
The function used to identify whitespace (lcl_IsSkippableWhitespace) doesn't 
cover the full category of Unicode separators (code [Zs], 18 in total. See: 
http://www.fileformat.info/info/unicode/category/Zs/index.htm).

Since 0xA0 (no-break space) is not identified as whitespace and not skipped, we 
end up calling ICU starting at the position 0xA0, asking it to get us the 
boundary of the next word forward. ICU sees that it's called at the end of a 
word, and reverses the query direction to backward, and returns the word 
before. This causes NextWord to think we've hit the end of the string and call 
it a day, terminating word count for the rest of the line.

Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5
---
M sw/qa/core/swdoc-test.cxx
M sw/source/core/txtnode/txtedt.cxx
2 files changed, 11 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/453/1
--
To view, visit https://gerrit.libreoffice.org/453
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Muhammad Haggag 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] libreoffice patch

[Andras Timar]

Pushed, many thanks.

Andras


2012/8/18 Ricardo Montania :
> Hello. First commit. :)
>
> EasyHacking, unused code. Any problem, please tell me.
>
> --
> Ricardo Montania Prado de Campos
> http://www.linuxafundo.com.br
>
>
>
>
> ___
> 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-commits] .: android/experimental

[Libreoffice Gerrit user]

 android/experimental/eagles051387/.classpath.in
  |   15 ---
 android/experimental/eagles051387/.gitignore   
  |1 
 android/experimental/eagles051387/.project 
  |   33 ---
 android/experimental/eagles051387/AndroidManifest.xml  
  |   23 -
 android/experimental/eagles051387/lint.xml 
  |3 
 android/experimental/eagles051387/proguard-project.txt 
  |   20 
 android/experimental/eagles051387/project.properties   
  |   14 ---
 android/experimental/eagles051387/res/layout/main.xml  
  |8 -
 android/experimental/eagles051387/res/layout/star_center_menu_list.xml 
  |6 -
 android/experimental/eagles051387/res/values/strings.xml   
  |9 --
 
android/experimental/eagles051387/src/org/libreoffice/experimental/eagles051387/Main_Menu.java
   |   17 
 
android/experimental/eagles051387/src/org/libreoffice/experimental/eagles051387/StartCenterMenu.java
 |   42 --
 dev/null   
  |binary
 13 files changed, 191 deletions(-)

New commits:
commit 438f5023c3f22b521974c6a1bb4d53b59255b724
Author: Tor Lillqvist 
Date:   Wed Aug 22 17:26:33 2012 +0300

Pining for the fjords

Change-Id: If0915cfc755031d2cb6a6e822f5682bb7ced71ad

diff --git a/android/experimental/eagles051387/.classpath.in 
b/android/experimental/eagles051387/.classpath.in
deleted file mode 100644
index 10e58d3..000
--- a/android/experimental/eagles051387/.classpath.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
diff --git a/android/experimental/eagles051387/.gitignore 
b/android/experimental/eagles051387/.gitignore
deleted file mode 100644
index cddd2a3..000
--- a/android/experimental/eagles051387/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.classpath
diff --git a/android/experimental/eagles051387/.project 
b/android/experimental/eagles051387/.project
deleted file mode 100644
index b3a56bf..000
--- a/android/experimental/eagles051387/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-   Experimental_Android_UI
-   
-   
-   
-   
-   
-   
com.android.ide.eclipse.adt.ResourceManagerBuilder
-   
-   
-   
-   
-   
com.android.ide.eclipse.adt.PreCompilerBuilder
-   
-   
-   
-   
-   org.eclipse.jdt.core.javabuilder
-   
-   
-   
-   
-   com.android.ide.eclipse.adt.ApkBuilder
-   
-   
-   
-   
-   
-   com.android.ide.eclipse.adt.AndroidNature
-   org.eclipse.jdt.core.javanature
-   
-
diff --git a/android/experimental/eagles051387/AndroidManifest.xml 
b/android/experimental/eagles051387/AndroidManifest.xml
deleted file mode 100644
index fa4abf9..000
--- a/android/experimental/eagles051387/AndroidManifest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-http://schemas.android.com/apk/res/android";
-package="org.libreoffice.experimentalUI.eagles051387"
-android:versionCode="1"
-android:versionName="1.0" >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/android/experimental/eagles051387/lint.xml 
b/android/experimental/eagles051387/lint.xml
deleted file mode 100644
index ee0eead..000
--- a/android/experimental/eagles051387/lint.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/android/experimental/eagles051387/proguard-project.txt 
b/android/experimental/eagles051387/proguard-project.txt
deleted file mode 100644
index f2fe155..000
--- a/android/experimental/eagles051387/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://

[Libreoffice-commits] .: 2 commits - android/CustomTarget_docloader.mk android/prj Makefile.top Module_tail_build.mk postprocess/prj

[Libreoffice Gerrit user]

 Makefile.top  |2 ++
 Module_tail_build.mk  |1 -
 android/CustomTarget_docloader.mk |9 +
 android/prj/build.lst |2 ++
 postprocess/prj/build.lst |2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 63088cd934881128d2928faae5486476af55db14
Author: Tor Lillqvist 
Date:   Wed Aug 22 16:58:15 2012 +0300

New attempt to have the "android" module built at a suitable time

Yes, I know that eventually what now is known as "tail_build" will be
all there is left. So by that time, by definition nothing can be built
"after tail_build". Will have to handle that then.

Change-Id: I47d228ca7156520db10630861ce52b015a7a169c

diff --git a/Makefile.top b/Makefile.top
index 071d37d..979671f 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -25,6 +25,8 @@ export GMAKE_OPTIONS:=-r
 endif
 endif
 
+# This list tells which modules are gbuild ones. It does *not* tell which 
modules to build. That is directed
+# by the module being mentioned in packimages/prj/build.lst, etc, recursively.
 gbuild_modules:= \
 MathMLDTD\
 Mesa\
diff --git a/android/CustomTarget_docloader.mk 
b/android/CustomTarget_docloader.mk
index 57266c5..9dfed32 100644
--- a/android/CustomTarget_docloader.mk
+++ b/android/CustomTarget_docloader.mk
@@ -10,14 +10,8 @@ $(eval $(call 
gb_CustomTarget_CustomTarget,android/docloader))
 
 docloader_DIR := $(call 
gb_CustomTarget_get_workdir,android/experimental/DocumentLoader)
 
-# Depending on the tail_end module hopefully means that all libraries and
-# other files that DocumentLoader needs from solver will have been built? Or
-# should we just move the stuff from
-# android/experimental/DocumentLoader/Makefile here, and depend on them
-# explicitly?
 $(call gb_CustomTarget_get_target,android/docloader) : \
-   $(docloader_DIR)/done \
-   $(call gb_Module_get_target,tail_end)
+   $(docloader_DIR)/done
 
 # We know that CustomTarget_sdremote.mk is included first, so sdremote_DIR is
 # defined.  We want that to be built completely first, so that we can
diff --git a/android/prj/build.lst b/android/prj/build.lst
new file mode 100644
index 000..bac6f27
--- /dev/null
+++ b/android/prj/build.lst
@@ -0,0 +1,2 @@
+an android :: tail_build NULL
+an android\prj nmake - all an_prj NULL
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 819a19c..51a8035 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk 
MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc 
DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
+po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk 
MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc 
DESKTOP:setup_native STLPORT:stlport sysui tail_build android NULL
 po postprocess usr1-   all 
po_mkout NULL
 po postprocess\checkxmlnmake   -   all po_checkxml NULL
 po postprocess\packconfig  nmake   -   all po_packconfig 
po_checkxml NULL
commit a6f73e53b640b311564c5a1843b1c2df574bdd43
Author: Tor Lillqvist 
Date:   Wed Aug 22 15:28:19 2012 +0300

Depend on the tail_end module instead

Change-Id: Icc0c17c66c6e5e2166a34e232acb69c0b434a44c

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 270d6ec..e06241e 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Module_Module,tail_end))
 
 $(eval $(call gb_Module_add_moduledirs,tail_end,\
 accessibility \
-   android \
 animations \
 apple_remote \
autodoc \
diff --git a/android/CustomTarget_docloader.mk 
b/android/CustomTarget_docloader.mk
index 326da49..57266c5 100644
--- a/android/CustomTarget_docloader.mk
+++ b/android/CustomTarget_docloader.mk
@@ -10,15 +10,14 @@ $(eval $(call 
gb_CustomTarget_CustomTarget,android/docloader))
 
 docloader_DIR := $(call 
gb_CustomTarget_get_workdir,android/experimental/DocumentLoader)
 
-# Depending on sw and sc modules hopefully means that all libraries and other
-# files from there (plus all those they depend on), that DocumentLoader needs
-# from solver will have been built? Or should we just move the stuff from
+# Depending on the tail_end module hopefully means that all libraries and
+# other files that DocumentLoader needs from solver will have been built? Or
+# should we just move the stuff from
 # android/experimental/DocumentLoader/Makefile here, and depend on them
 # explicitly?
 $(call gb_CustomTarget_get_target,android/docloader) : \
$(docloader_DIR)/done \
-   $(call gb_Module_get_target,sw) \
-   $(call gb_Module_get_target,sc)
+   $(call gb_Module_get_target,tail_end)
 
 # We kn

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #92 from Roman Eisele  2012-08-22 14:10:00 UTC ---
(In reply to comment #88)
> Supplement: bfoman has added bug 49102 -- "Writer: Incorrect numbering when
> cells are merged in the table", still waiting for confirmation. This is a LibO
> 3.5.x bug which went wrong in LibO 3.6.x ...

Obviously the weather is too hot in these days, it has totally evaporated my
knowledge of English grammar; sorry! Please read:

  This is a LibO 3.5. bug which _went_ _worse_ in LibO 3.6.x ...

And bug 49102 is confirmed now, of course.

-- 
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

[Libreoffice-commits] .: editeng/source

[Libreoffice Gerrit user]

 editeng/source/editeng/impedit3.cxx |   30 +-
 1 file changed, 17 insertions(+), 13 deletions(-)

New commits:
commit 4f177fbbab1619b9a2f9afa04d882c5fd415fcc0
Author: Caolán McNamara 
Date:   Wed Aug 22 14:38:50 2012 +0100

Resolves: rhbz#841092 don't crash on empty portions (a11y?)

Change-Id: Ibd08fa09370580bff12f19f867219098f0d4980e

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index a0aedb1..027302f 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2477,22 +2477,26 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* 
pParaPortion, sal_uInt16 nSt
 pTP->GetLen() = pTP->GetLen() + nNewChars;
 }
 
-// No HYPHENATOR portion is allowed to get stuck right at the end...
-DBG_ASSERT( pParaPortion->GetTextPortions().Count(), 
"RecalcTextPortions: Nothing left! ");
-sal_uInt16 nLastPortion = pParaPortion->GetTextPortions().Count() - 1;
-pTP = pParaPortion->GetTextPortions()[nLastPortion];
-if ( pTP->GetKind() == PORTIONKIND_HYPHENATOR )
+sal_uInt16 nPortionCount = pParaPortion->GetTextPortions().Count();
+assert( nPortionCount );
+if (nPortionCount)
 {
-// Discard portion; if possible, correct the ones before,
-// if the Hyphenator portion has swallowed one character...
-if ( nLastPortion && pTP->GetLen() )
+// No HYPHENATOR portion is allowed to get stuck right at the 
end...
+sal_uInt16 nLastPortion = nPortionCount - 1;
+pTP = pParaPortion->GetTextPortions()[nLastPortion];
+if ( pTP->GetKind() == PORTIONKIND_HYPHENATOR )
 {
-TextPortion* pPrev = 
pParaPortion->GetTextPortions()[nLastPortion - 1];
-DBG_ASSERT( pPrev->GetKind() == PORTIONKIND_TEXT, "Portion?!" 
);
-pPrev->SetLen( pPrev->GetLen() + pTP->GetLen() );
-pPrev->GetSize().Width() = (-1);
+// Discard portion; if possible, correct the ones before,
+// if the Hyphenator portion has swallowed one character...
+if ( nLastPortion && pTP->GetLen() )
+{
+TextPortion* pPrev = 
pParaPortion->GetTextPortions()[nLastPortion - 1];
+DBG_ASSERT( pPrev->GetKind() == PORTIONKIND_TEXT, 
"Portion?!" );
+pPrev->SetLen( pPrev->GetLen() + pTP->GetLen() );
+pPrev->GetSize().Width() = (-1);
+}
+pParaPortion->GetTextPortions().Remove( nLastPortion );
 }
-pParaPortion->GetTextPortions().Remove( nLastPortion );
 }
 }
 #if OSL_DEBUG_LEVEL > 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6][REVIEW 3-6-1] Fix for fdo#52451

[Kohei Yoshida]

On 08/22/2012 12:01 AM, Kohei Yoshida wrote:

On 08/21/2012 10:34 PM, Kohei Yoshida wrote:

Hi there,

I'd like

https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=ba03f2dc817c692fa8709391ec83d8e01a0f8b28



cherry-picked to 3-6 and 3-6-1 in order to fix

https://bugs.freedesktop.org/show_bug.cgi?id=52451


And this one too:

https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=84d1ff7be178ec3572710e092e85fe548ce3042b


And this one

https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=45b03c888042052a47cb79bc5a2837d04e115c5e

though this shouldn't be strictly necessary functionality-wise.  This is 
just a cleanup to keep things more consistent.


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: filter/source officecfg/registry sfx2/source

[Libreoffice Gerrit user]

 filter/source/config/cache/constant.hxx
   |2 +-
 filter/source/config/cache/filtercache.cxx 
   |2 +-
 filter/source/config/fragments/filters/Text.xcu
   |2 +-
 filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu   
   |2 +-
 filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu 
   |2 +-
 filter/source/config/fragments/filters/Text__encoded_.xcu  
   |2 +-
 
filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
 |2 +-
 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu 
   |2 +-
 officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs  
   |2 +-
 sfx2/source/bastyp/fltfnc.cxx  
   |3 ++-
 10 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 45b03c888042052a47cb79bc5a2837d04e115c5e
Author: Kohei Yoshida 
Date:   Wed Aug 22 09:46:57 2012 -0400

fdo#52451: Some name changes to be consistent with other prop names.

We use IMPORT EXPORT flags, so let's stick with the term 'Export' as
opposed to 'FileSave'.  Also, the file type's extensions are given
without the star-dot (*.), so let's strip that as well.

Change-Id: Ibde05058f7acb6ae149382009e78f3f10a71d543

diff --git a/filter/source/config/cache/constant.hxx 
b/filter/source/config/cache/constant.hxx
index 22d1074..7d27ffc 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -69,7 +69,7 @@
 #define  PROPNAME_USERDATA  "UserData"
 #define  PROPNAME_TEMPLATENAME  "TemplateName"
 #define  PROPNAME_FILEFORMATVERSION "FileFormatVersion"
-#define  PROPNAME_FILESAVEEXTENSION "FileSaveExtension"
+#define  PROPNAME_EXPORTEXTENSION   "ExportExtension"
 
 /** @short  used to identify a frame loader or detect service item
 property against the configuration API and can be used
diff --git a/filter/source/config/cache/filtercache.cxx 
b/filter/source/config/cache/filtercache.cxx
index 2a93c4f..e9dc2cf 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1834,7 +1834,7 @@ CacheItem FilterCache::impl_loadItem(const 
css::uno::Reference< css::container::
 aItem[PROPNAME_UICOMPONENT  ] = 
xItem->getByName(PROPNAME_UICOMPONENT  );
 aItem[PROPNAME_FILTERSERVICE] = 
xItem->getByName(PROPNAME_FILTERSERVICE);
 aItem[PROPNAME_DOCUMENTSERVICE  ] = 
xItem->getByName(PROPNAME_DOCUMENTSERVICE  );
-aItem[PROPNAME_FILESAVEEXTENSION] = 
xItem->getByName(PROPNAME_FILESAVEEXTENSION);
+aItem[PROPNAME_EXPORTEXTENSION  ] = 
xItem->getByName(PROPNAME_EXPORTEXTENSION  );
 
 // special handling for flags! Convert it from a list of names 
to its
 // int representation ...
diff --git a/filter/source/config/fragments/filters/Text.xcu 
b/filter/source/config/fragments/filters/Text.xcu
index 0da24d7..4629f89 100644
--- a/filter/source/config/fragments/filters/Text.xcu
+++ b/filter/source/config/fragments/filters/Text.xcu
@@ -4,7 +4,7 @@
 
 TEXT
 0
-*.txt
+txt
 generic_Text
 
 com.sun.star.text.TextDocument
diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu 
b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
index bbc8392..0332e3e 100644
--- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
@@ -4,7 +4,7 @@
 
 TEXT
 0
-*.txt
+txt
 generic_Text
 
 com.sun.star.text.WebDocument
diff --git 
a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu 
b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
index a866ff1..498057c 100644
--- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
+++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
@@ -4,7 +4,7 @@
 
 
 0
-*.csv
+csv
 generic_Text
 
 com.sun.star.sheet.SpreadsheetDocument
diff --git a/filter/source/config/fragments/filters/Text__encoded_.xcu 
b/filter/source/config/fragments/filters/Text__encoded_.xcu
index af51016..af05106 100644
--- a/filter/source/config/fragments/filters/Text__encoded_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded_.xcu
@@ -4,7 +4,7 @@
 
 TEXT_DLG
 0
-*.txt
+txt
 generic_Text
 
 com.sun.star.text.TextDocument
diff --git 
a/filter/source/config/fragments/filters/Text__encoded___Sta

[Libreoffice-commits] .: sd/source

[Libreoffice Gerrit user]

 sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx   |6 +-
 sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx |8 +--
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx|   26 
--
 sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx |2 
 4 files changed, 33 insertions(+), 9 deletions(-)

New commits:
commit c29af1572ad15ac5199a09e5812fb8354c165329
Author: Caolán McNamara 
Date:   Wed Aug 22 14:20:32 2012 +0100

Resolves: rhbz#842292 crash in calling callback whose instance was deleted

Change-Id: I4cc04d59f48b42cc105703daa9983dd7c9f7af62

diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx 
b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index b8234b5..c1bf497 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -100,11 +100,13 @@ void DragAndDropContext::UpdatePosition (
 ::boost::shared_ptr pInsertionIndicatorHandler (
 mpTargetSlideSorter->GetController().GetInsertionIndicatorHandler());
 
-if ( ! (bAllowAutoScroll
+bool bDoAutoScroll = bAllowAutoScroll
 && 
mpTargetSlideSorter->GetController().GetScrollBarManager().AutoScroll(
 rMousePosition,
 ::boost::bind(
-&DragAndDropContext::UpdatePosition, this, rMousePosition, 
eMode, false
+&DragAndDropContext::UpdatePosition, this, rMousePosition, 
eMode, false));
+
+if (!bDoAutoScroll)
 {
 pInsertionIndicatorHandler->UpdatePosition(aMouseModelPosition, eMode);
 
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index a45f640..4a2d808 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -617,13 +617,15 @@ bool ScrollBarManager::RepeatAutoScroll (void)
 }
 }
 
-maAutoScrollFunctor = ::boost::function();
+clearAutoScrollFunctor();
 mbIsAutoScrollActive = false;
 return false;
 }
 
-
-
+void ScrollBarManager::clearAutoScrollFunctor()
+{
+maAutoScrollFunctor = ::boost::function();
+}
 
 IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler)
 {
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 6217c07..16c23ad 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -273,6 +273,7 @@ private:
 SelectionMode meSelectionMode;
 Point maSecondCorner;
 Pointer maSavedPointer;
+bool mbAutoScrollInstalled;
 sal_Int32 mnAnchorIndex;
 sal_Int32 mnSecondIndex;
 view::ButtonBar::Lock maButtonBarLock;
@@ -1503,6 +1504,7 @@ MultiSelectionModeHandler::MultiSelectionModeHandler (
   meSelectionMode(SM_Normal),
   maSecondCorner(rMouseModelPosition),
   maSavedPointer(mrSlideSorter.GetContentWindow()->GetPointer()),
+  mbAutoScrollInstalled(false),
   mnAnchorIndex(-1),
   mnSecondIndex(-1),
   maButtonBarLock(rSlideSorter)
@@ -1523,6 +1525,12 @@ void MultiSelectionModeHandler::Initialize(const 
sal_uInt32 nEventCode)
 
 MultiSelectionModeHandler::~MultiSelectionModeHandler (void)
 {
+if (mbAutoScrollInstalled)
+{
+//a call to this handler's MultiSelectionModeHandler::UpdatePosition
+//may be still waiting to be called back
+
mrSlideSorter.GetController().GetScrollBarManager().clearAutoScrollFunctor();
+}
 mrSlideSorter.GetContentWindow()->SetPointer(maSavedPointer);
 }
 
@@ -1564,6 +1572,14 @@ void MultiSelectionModeHandler::ProcessEvent (
 bool MultiSelectionModeHandler::ProcessButtonUpEvent (
 SelectionFunction::EventDescriptor& rDescriptor)
 {
+if (mbAutoScrollInstalled)
+{
+//a call to this handler's MultiSelectionModeHandler::UpdatePosition
+//may be still waiting to be called back
+
mrSlideSorter.GetController().GetScrollBarManager().clearAutoScrollFunctor();
+mbAutoScrollInstalled = false;
+}
+
 if (Match(rDescriptor.mnEventCode, BUTTON_UP | LEFT_BUTTON | SINGLE_CLICK))
 {
 mrSelectionFunction.SwitchToNormalMode();
@@ -1620,16 +1636,18 @@ void MultiSelectionModeHandler::UpdatePosition (
 SharedSdWindow pWindow (mrSlideSorter.GetContentWindow());
 const Point aMouseModelPosition (pWindow->PixelToLogic(rMousePosition));
 
-if ( ! (bAllowAutoScroll && 
mrSlideSorter.GetController().GetScrollBarManager().AutoScroll(
+bool bDoAutoScroll = bAllowAutoScroll && 
mrSlideSorter.GetController().GetScrollBarManager().AutoScroll(
 rMousePosition,
 ::boost::bind(
 &MultiSelectionModeHandler::UpdatePosition,
 this,
 rMousePosition,
-

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

t...@tim-passingham.co.uk changed:

   What|Removed |Added

 Depends on||53640

-- 
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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #91 from t...@tim-passingham.co.uk 2012-08-22 13:21:20 UTC ---
Can't use Pivot Tables at all since the results are icorrect, so 3.6 is
unusable. https://bugs.freedesktop.org/show_bug.cgi?id=53640

-- 
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 patch

[Andras Timar]

Hi Ricardo,

2012/8/18 Ricardo Montania :
> Hello. First commit. :)
>
> EasyHacking, unused code. Any problem, please tell me.
>

The pacth looks good, I'll integrate it soon. Would you mind sending a
blanket licence statement to this mailing list, such as

"All of my past & future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license."

Thanks,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

solver=installation p. 1: including directly vs. delivering external headers

[Matúš Kukan]

Hi all,

with gbuild expanding (thanks to David tirelessly working on that :-))
things are more under control and we don't need to use solver for
other modules that much.
In theory, (later,) in solver could be only stuff needed for
make_installer.pl I think. Or better the solver can be installation.

I think the plan for headers is to avoid delivering them, move and use
only one include path, mainly because of Windows.
And this is waiting for re-licensing. But there are other things to do.

What about external headers ?
We could move also x11_extensions/, Mesa/, ... but maybe we don't want
to mix them ?
And we can't move headers from tarball as vigra.
So we need either deliver them somewhere* or add include path for them.
I think include path could be fine since they are not used that much ?

*if we deliver to solver, then there should be another directory for
installation, so delivering to workdir could be better.

I think the result is going to be cool, esp. for Windows without
symlinks but no idea about the time, at worse in a year I hope.

Thanks for listening and/or ideas,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice