[Libreoffice-commits] .: filter/type-detection-debug.diff

[Kohei Yoshida]

 filter/type-detection-debug.diff |  135 ---
 1 file changed, 135 deletions(-)

New commits:
commit 89d6c3ef8ea691dbd3383cffe21e75c3200821de
Author: Kohei Yoshida 
Date:   Fri May 25 02:12:59 2012 -0400

Accidentally committed this...

Change-Id: I0335111dd30850db435d728ddcc6b4554eea6f5b

diff --git a/filter/type-detection-debug.diff b/filter/type-detection-debug.diff
deleted file mode 100644
index 84fc5dc..000
--- a/filter/type-detection-debug.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
-index cac9b14..f24198b 100644
 a/filter/source/config/cache/typedetection.cxx
-+++ b/filter/source/config/cache/typedetection.cxx
-@@ -43,6 +43,49 @@
- #include 
- #include 
- 
-+
-+#include 
-+#include 
-+#include 
-+
-+namespace {
-+
-+class stack_printer
-+{
-+public:
-+explicit stack_printer(const char* msg) :
-+msMsg(msg)
-+{
-+fprintf(stdout, "%s: --begin\n", msMsg.c_str());
-+mfStartTime = getTime();
-+}
-+
-+~stack_printer()
-+{
-+double fEndTime = getTime();
-+fprintf(stdout, "%s: --end (duration: %g sec)\n", msMsg.c_str(), 
(fEndTime-mfStartTime));
-+}
-+
-+void printTime(int line) const
-+{
-+double fEndTime = getTime();
-+fprintf(stdout, "%s: --(%d) (duration: %g sec)\n", msMsg.c_str(), 
line, (fEndTime-mfStartTime));
-+}
-+
-+private:
-+double getTime() const
-+{
-+timeval tv;
-+gettimeofday(&tv, NULL);
-+return tv.tv_sec + tv.tv_usec / 100.0;
-+}
-+
-+::std::string msMsg;
-+double mfStartTime;
-+};
-+
-+}
-+
- //___
- // namespace
- 
-@@ -108,6 +151,21 @@ TypeDetection::~TypeDetection()
- 
- namespace {
- 
-+void print(const FlatDetection& rFD, const char* msg)
-+{
-+fprintf(stdout, "--- %s\n", msg);
-+FlatDetection::const_iterator i = rFD.begin(), iend = rFD.end();
-+for (; i != iend; ++i)
-+{
-+const FlatDetectionInfo& r = *i;
-+fprintf(stdout, "  * type = '%s'  match by extension = %d  match by 
pattern = %d  pre-selected as type = %d  pre-selected as filter = %d  
pre-selected as doc service = %d\n",
-+rtl::OUStringToOString(r.sType, 
RTL_TEXTENCODING_UTF8).getStr(),
-+r.bMatchByExtension, r.bMatchByPattern, r.bPreselectedAsType,
-+r.bPreselectedByFilter, r.bPreselectedByDocumentService);
-+}
-+fprintf(stdout, "---\n");
-+}
-+
- /**
-  * Types with matching extension come first, then types that are supported
-  * by the document service come next.
-@@ -129,6 +187,7 @@ struct SortByPriority : public 
std::binary_functiondetectFlatForURL(aURL, lFlatTypes);
- 
-+print(lFlatTypes, "flat by url");
-+
- aLock.clear();
- // <- SAFE --
- 
- // Properly prioritize all candidate types.
- lFlatTypes.sort(SortByPriority());
-+print(lFlatTypes, "sorted by priority");
- 
- ::rtl::OUString sType  ;
- ::rtl::OUString sLastChance;
-@@ -190,8 +254,16 @@ struct SortByPriority : public 
std::binary_function0)
-+{
- sType = impl_detectTypeFlatAndDeep(stlDescriptor, lFlatTypes, 
bAllowDeep, lUsedDetectors, sLastChance);
- 
-+{
-+rtl::OUString aFilter = 
stlDescriptor.getUnpackedValueOrDefault(comphelper::MediaDescriptor::PROP_FILTERNAME(),
 rtl::OUString());
-+fprintf(stdout, "TypeDetection::queryTypeByDescriptor:   
filter = '%s'  type = '%s' (flat and deep)\n",
-+rtl::OUStringToOString(aFilter, 
RTL_TEXTENCODING_UTF8).getStr(), rtl::OUStringToOString(sType, 
RTL_TEXTENCODING_UTF8).getStr());
-+}
-+}
-+
- //***
- // if no flat detected (nor preselected!) type could be
- // verified and no error occurred during creation of
-@@ -203,6 +275,11 @@ struct SortByPriority : public 
std::binary_functionhttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/tail_build'

[David Tardon]

New branch 'feature/tail_build' available with the following commits:
commit c77b47db6b289e74085bfe5539a727d093d9b0fa
Author: David Tardon 
Date:   Fri May 25 07:44:29 2012 +0200

add more modules to cross_tail_build

Change-Id: I759bc9bbbeb740a9b4feeed1667307d97ecef6c2

commit bc21df751ac2540a76ce13d9757dd060cbf56f04
Author: David Tardon 
Date:   Fri May 25 07:36:28 2012 +0200

amend the filter to handle cross_tail_build too

Change-Id: Idd6a1c9b6c4820db211f9552db670c928fb07494

commit d2a9eb97dfd29a83983e5764d0b96eee9b28fe7f
Author: David Tardon 
Date:   Thu May 24 12:21:14 2012 +0200

move embedserv to tail_build

Change-Id: Ieea814347e3c895c39a3dfc3312d6b1a735f4d68

commit 263932985a3ce7cf495e9c47b49b940672dae71d
Author: David Tardon 
Date:   Thu May 24 12:18:28 2012 +0200

move nlpsolver to tail_build

Change-Id: Ib1af41063f2062efc9392c81f94d95b99060cc82

commit b7b7904a968b624c9889a200077a65a1d1fd3ebf
Author: David Tardon 
Date:   Thu May 24 12:17:24 2012 +0200

move unoil to tail_build

Change-Id: I0a4ee1c1bf9acbcb83a02d2ae6ab383fd8f4c5e2

commit 5aee24cc0d9d92a8678590992bea48a4f92ce81c
Author: David Tardon 
Date:   Thu May 24 12:15:38 2012 +0200

move javaunohelper to tail_build

Change-Id: I549395fc5686bac70616b7344c4b32737ae14289

commit d9cf1601146415f6c41e85043cb61b3ae91bef9d
Author: David Tardon 
Date:   Thu May 24 12:13:37 2012 +0200

move cpputools to tail_build

Change-Id: Ia4048ec901a4bedc00b3a6f43059cfb82202d340

commit 07339b1958cb710a9159e52cd65967c0b9bb3408
Author: David Tardon 
Date:   Thu May 24 12:12:43 2012 +0200

move io to tail_build

Change-Id: I6ceab6d3b27530f44ecd5977837655d7b38eb7fd

commit caf7cb0ab657bd9b03bc92ca956266af4ef060e2
Author: David Tardon 
Date:   Thu May 24 12:11:58 2012 +0200

move binaryurp to tail_build

Change-Id: I0e5ad225498a48d1bf1a5b2fc34a518abf7f1a72

commit 75d6a25c68d974088623c814e9df8de827663cc5
Author: David Tardon 
Date:   Thu May 24 12:10:14 2012 +0200

move ure to tail_build

Change-Id: I3dbc3ee8e7117476dbf5d7bae363d7a4c55bbea6

commit 8662fa573672a445175b03907610621209ba8cec
Author: David Tardon 
Date:   Thu May 24 12:08:45 2012 +0200

move i18nutil to tail_build

Change-Id: I813f6ecd26c79607f0c19a28ef921aff5f0b82b6

commit 85efc3ee5e182b5d6ca8641d5953340a8bddebb7
Author: David Tardon 
Date:   Thu May 24 12:08:03 2012 +0200

move regexp to tail_build

Change-Id: I517727b528b08b6284ccd0805ce8836d171b8df7

commit 1f2a4949cc72dce67b2497eba192755938dc98d2
Author: David Tardon 
Date:   Thu May 24 12:07:10 2012 +0200

move twain to tail_build

Change-Id: I8d749eeb4229d0c7ef616aabab0e33bdfb8ea773

commit e642340e8175cbd69157959cc1b34250d990aa2a
Author: David Tardon 
Date:   Thu May 24 12:06:04 2012 +0200

move sane to tail_build

Change-Id: I605ee6700d5d51eb6e06e97482ccd482ebb13e22

commit fbf9a81ecaddde4713a0c51e95640530b8e2884d
Author: David Tardon 
Date:   Thu May 24 12:05:01 2012 +0200

move sax to tail_build

Change-Id: If269e6b011714766818ce4b1f56c7006ab8020c3

commit 9c92beec6f0cd0602ef02baaf5306cdb2f6c557e
Author: David Tardon 
Date:   Thu May 24 12:03:48 2012 +0200

move qadevOOo to tail_build

Change-Id: Ice1555795632831117283ba180b88bd2734f55c2

commit 2461f17172f3c902e10ceaf63d7bb4a1fe9a3566
Author: David Tardon 
Date:   Thu May 24 12:02:36 2012 +0200

move unotest to tail_build

Change-Id: I9dd5fbfc82e01a04e90fc249964412778f728d0e

commit d0e263541fe6137f8c29ea3a1023bba1410fc0fb
Author: David Tardon 
Date:   Thu May 24 12:00:51 2012 +0200

move basegfx and o3tl to tail_build

Change-Id: Idaf053adc621035ebc3b7a124bdffde869ce5def

commit 0a960dc63860246d5ed1c279bd80e3e83cf23840
Author: David Tardon 
Date:   Thu May 24 11:59:16 2012 +0200

move i18npool to tail_build

Change-Id: I2854abb5b5bffb029259195cfdabb4722f00bc84

commit bb9c841d4970df852b3bb71e76b159703182a21b
Author: David Tardon 
Date:   Thu May 24 11:56:50 2012 +0200

move tools to tail_build

Change-Id: I4e8ccd71b178d24b95fffe10bb22f075df83a8c9

commit 68116aaf2319de17aab1e92f0ac3e0c6d4793952
Author: David Tardon 
Date:   Thu May 24 21:09:14 2012 +0200

basegfx needs o3tl headers

Change-Id: Icdd490639de136ea866d6ef43016befefeb06604

commit b61d9e0150dc85f1229572f6cfaa5b576be4af20
Author: David Tardon 
Date:   Thu May 24 19:51:31 2012 +0200

add missing dependency

Change-Id: Iadd19f68ee4ed49842d6669354de6c1dca515cfc

commit 2ba216558549d65fcd5ac92cfcc573688afd1f22
Author: David Tardon 
Date:   Thu May 24 13:22:39 2012 +0200

these makefiles are not created anymore

Change-Id: I430fcca0df44966e05a57d1cafd16d18bebdca81

commit d4dee2dd8699f3113e7ff71a677d7ec0117010ad
Author: David Tardon 
Date:   Thu May 24 13:17:40 2012 +0200

bin i18npool/version.mk, hardcode the version

This makefile must be inc

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

[Julien Nabet]

 sc/inc/dbdata.hxx  |1 -
 sc/source/core/tool/dbdata.cxx |7 ---
 unusedcode.easy|1 -
 3 files changed, 9 deletions(-)

New commits:
commit 405ed562c9fa19d9fcf71e426739fcb022f9719e
Author: Julien Nabet 
Date:   Fri May 25 07:43:42 2012 +0200

Drop unused function "findByTable"

Change-Id: I396bd5a6eb9ecc123529259f668f98be4b4245ca

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index f770deb..538ea9e 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -213,7 +213,6 @@ public:
 const_iterator end() const;
 const ScDBData* findAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool 
bStartOnly) const;
 const ScDBData* findByRange(const ScRange& rRange) const;
-const ScDBData* findByTable(SCTAB nTab) const;
 ScDBData* getByRange(const ScRange& rRange);
 void insert(ScDBData* p);
 void erase(iterator itr);
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 60e6d28..32b15c7 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -808,13 +808,6 @@ const ScDBData* ScDBCollection::AnonDBs::findByRange(const 
ScRange& rRange) cons
 return itr == maDBs.end() ? NULL : &(*itr);
 }
 
-const ScDBData* ScDBCollection::AnonDBs::findByTable(SCTAB nTab) const
-{
-DBsType::const_iterator itr = find_if(
-maDBs.begin(), maDBs.end(), FindFilterDBByTable(nTab));
-return itr == maDBs.end() ? NULL : &(*itr);
-}
-
 ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange)
 {
 const ScDBData* pData = findByRange(rRange);
diff --git a/unusedcode.easy b/unusedcode.easy
index 4ad7d19..11dec4a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -40,7 +40,6 @@ ScCompressedArray::ScCompressedArray(int, unsigned short co
 ScCompressedArray::SetValue(int, unsigned short const&)
 ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
 
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator > >, 
std::__debug::vector > >, ScDBData>)
-ScDBCollection::AnonDBs::findByTable(short) const
 ScDPLabelData::ScDPLabelData(rtl::OUString const&, short, bool)
 ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
 ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/gbuild_merge'

[David Tardon]

New branch 'feature/gbuild_merge' available with the following commits:
commit a756801abac9894b89dd981470ccd22ec9b52d94
Author: David Tardon 
Date:   Thu May 24 10:02:27 2012 +0200

move shell to cross_tail_build

Change-Id: I52ddd365f24589ca73a4671eca84b146df82dcb1

commit cb2aaee727d7de670486a68e72ea90fc710a6207
Author: David Tardon 
Date:   Thu May 24 09:58:30 2012 +0200

oovbaapi is already in tail_build

Change-Id: I5746268239018a92c23e5f37d400c592d884964c

commit 46ed346bec398875c1e7a949306270cb1a107cf1
Author: David Tardon 
Date:   Thu May 24 09:56:42 2012 +0200

x11_extensions is already in tail_build

Change-Id: I25b955ad98cdd70236765aa819f49af19c7307b7

commit 882a254e61f6be88cc9c31504055b94515485399
Author: David Tardon 
Date:   Thu May 24 09:50:28 2012 +0200

xmlhelp is already in tail_build

Change-Id: I7ff04b880e739e4d085f92435283569fe5bfbcf1

commit d52732a0cb89473c724a3f001730401ab2d62495
Author: David Tardon 
Date:   Thu May 24 09:47:50 2012 +0200

move shell to tail_build

Change-Id: I0fe4460e940afd9f9a73bd798c3a3e17eb055024

commit e1fb13c6ddde5353d674806b5562ad2231c2a30e
Author: David Tardon 
Date:   Thu May 24 09:41:33 2012 +0200

move unotools to tail_build

Change-Id: Ib820d967acd3ec78299365d443c838cd2d3cc4de

commit b09e4bd1f6f9fe02c40147782f0992de7a5f14ca
Author: David Tardon 
Date:   Sat May 12 17:51:04 2012 +0200

move scp2 to tail_build

Change-Id: Ib1e954f51908df67d05a86189b864bf7064e59d3

commit 875dc9f5c214e6b0bb45873fa6a09d1cc0e1a66d
Author: David Tardon 
Date:   Sat May 12 17:44:11 2012 +0200

remove unused source files

Change-Id: Ic11bfb94cbee4116fe94255f5dc7c49bf795797a

commit 1723ef7430d8337d353ef33795e8d866154618cd
Author: David Tardon 
Date:   Sat May 12 17:43:20 2012 +0200

run silently

Change-Id: I75474c2f0e938987c28dcfa1f31428e77de03e90

commit 7c2b94e376cfb6a4f0bcf2beb25e65abbde6d80b
Author: David Tardon 
Date:   Sat May 12 17:15:25 2012 +0200

handle silent mode

Change-Id: I2ebcacc089d86c9de85b617d80d6a557498d8add

commit 7932557a7982fafbe25951c2c7bf668da83879bf
Author: David Tardon 
Date:   Sat May 12 17:11:19 2012 +0200

show multiple assignments of gids as warning

Change-Id: Iae3e78e2abe59714d5eb9fa0609861a00e85c944

commit 75e9cd740a578760a12b59425938c2644d8afa8e
Author: David Tardon 
Date:   Sat May 12 17:05:57 2012 +0200

allow to run par2script silently

Change-Id: Ib1d9cd1dc1e9c24a5a72c51060797f2214a95c89

commit d7f50cf673144acd9cb734eeafb84695c6c1
Author: David Tardon 
Date:   Sun May 6 14:50:07 2012 +0200

gbuildize scp2

Change-Id: If9a0906a76943160cfdbd647b26a801bc4389615

commit 77365a05f6b4bfbda8ada6604bd393a259712df4
Author: David Tardon 
Date:   Sun May 6 14:49:41 2012 +0200

create gbuild class for install scripts

commit 041f28818c4acfd63540bf5c7a3e920094c11bd0
Author: David Tardon 
Date:   Wed May 9 11:08:06 2012 +0200

make the output more predictable

So it is easier to check differences between install scripts generated
by dmake and gbuild.

Change-Id: I12bbdf481c84c896b67a94eaca6460ffb52d96ec

commit 87f54aa4fb8d685715848aef6217570723ee8f97
Author: David Tardon 
Date:   Sun May 6 14:48:18 2012 +0200

export ALL_LANGS

commit cedaded33fb4448ec8112e421ca2a7bcd510c6d4
Author: David Tardon 
Date:   Thu May 24 08:58:00 2012 +0200

do not allow both kde and tde at the same time

Change-Id: I423c621c2bd543775c0d6f238fca40a64acaf0cc

commit d429ec9d014e418fc0d206e48269984065292f5c
Author: David Tardon 
Date:   Thu May 24 07:36:04 2012 +0200

WaE: converting to non-pointer type 'long long int' from NULL

Change-Id: I9d603c0d5c4920d148ec15d6368e89f9c037c26a

commit 8bc2d88dbf0641a6576c5848a544c66e1d1fc61c
Author: David Tardon 
Date:   Wed May 23 17:24:11 2012 +0200

WaE: declaration of 'index' shadows a global declaration

Change-Id: I83a0fb26b4d376a2b9e221179fdc55a6b7900649

commit 740d4d5c24c65bcc30083d7e9b4cb7635a351f08
Author: David Tardon 
Date:   Mon Apr 30 17:09:13 2012 +0200

use gb_WinResTarget_use_custom_headers

Change-Id: I62f63eb4eeb8d48c35bec1c8e9f05e7037ccd12c

commit 4e8532b43fcd24fe3181a3a44626013a4849f4f7
Author: David Tardon 
Date:   Mon Apr 30 17:08:45 2012 +0200

add gb_WinResTarget_use_custom_headers

Change-Id: Ifce1f75f8de0cd35dd744dfd39af7aefef512ecc

commit dfd724f9474398570db22b208afb6c48f942e88d
Author: David Tardon 
Date:   Mon Apr 30 16:40:54 2012 +0200

fix dep. generation for WinResTarget

Change-Id: I4ee6eb456bf400747c2e397ec6cd402fb6251bc6

commit 163b9f66908b1a23ed0b0348bf74889cc11d4a87
Author: David Tardon 
Date:   Mon Apr 30 15:15:03 2012 +0200

set vars for dep. target consistently

Change-Id: Ie6a68d9ed96e35f6e8c4778bcd4fd8920d19159c

commit fd7edcbe2a500bd9d4b93e48a657272fa83a3675
Author: David Tardon 
Date:   Mon Apr 30 14:53:11 2012 

noticed same freeze with same last console logs on 3 bugs

[julien2412]

Hello,

I just noticed the same Writer freeze during opening with the same last
console message :
warn:legacy.osl:31275:1:/home/julien/compile-libreoffice/libo_3_5/sw/source/core/bastyp/bparr.cxx:141:
operator[]: Index aussserhalb

You can take a look at fdo#49890 and its 2 dups (or at least I thought so)

So if someone is interested by fdo#49890, he/she may solve perhaps 3 or more
bugs in the same fix.

Julien.
PS : I don't pretend it 's a priority or "must do" thing, just noticed this
(and again perhaps I'm wrong), that's all :-)

--
View this message in context: 
http://nabble.documentfoundation.org/noticed-same-freeze-with-same-last-console-logs-on-3-bugs-tp3985917.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Best place to ask about hacking on "chart2" code?

[Kohei Yoshida]

Hi there,

On Thu, May 24, 2012 at 5:31 PM, walt  wrote:
> Back in the openoffice days there was a wikki site dedicated
> to the graphics part of openoffice code.  Is there such a place
> for libreoffice wannabe graphics hackers?

Well, that would be this list.  This list is all inclusive as long as
the topic is about hacking on this code base.

Also, the openoffice wiki page you mentioned, if it's still
accessible, should be still relevant for the major part of the chart
code.

HTH,

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

Best place to ask about hacking on "chart2" code?

[walt]

Back in the openoffice days there was a wikki site dedicated
to the graphics part of openoffice code.  Is there such a place
for libreoffice wannabe graphics hackers?

Thanks.

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

[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf' - sc/source

[Daniel Bankston]

 sc/source/filter/xml/xmlcelli.cxx |  119 +-
 sc/source/filter/xml/xmlsubti.cxx |3 
 sc/source/filter/xml/xmlsubti.hxx |2 
 3 files changed, 56 insertions(+), 68 deletions(-)

New commits:
commit 1ddcc44190a690a3ac221a8c4b38d830046f03ef
Author: Daniel Bankston 
Date:   Thu May 24 16:31:34 2012 -0500

Make suggested code style changes

Change-Id: I9cd71b78098adc6b0fee1139ffb1a1202d9981dc

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 9d1c7c0..89bf499 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -455,64 +455,61 @@ SvXMLImportContext 
*ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr
 return pContext;
 }
 
-namespace
+namespace {
+
+static bool ScCellExists( const ScAddress& rScAddress )
 {
-static bool lcl_ScCellExists( const ScAddress& rScAddress )
-{
-return( rScAddress.Col() <= MAXCOL && rScAddress.Row() <= MAXROW );
-}
+return( rScAddress.Col() <= MAXCOL && rScAddress.Row() <= MAXROW );
+}
 
-static ScRange lcl_ScGetCellRangeByPosition( const ScRange& rScRange, 
const SCCOL nLeft, const SCROW nTop, const SCCOL nRight, const SCROW nBottom )
-throw( lang::IndexOutOfBoundsException )
+ScRange getCellRangeByPosition( const ScRange& rScRange, const SCCOL nLeft, 
const SCROW nTop, const SCCOL nRight, const SCROW nBottom )
+{
+if( nLeft >= 0 && nTop >= 0 && nRight >= 0 && nBottom >= 0 )
 {
-if( nLeft >= 0 && nTop >= 0 && nRight >= 0 && nBottom >= 0 )
-{
-SCCOL nStartX = rScRange.aStart.Col() + nLeft;
-SCROW nStartY = rScRange.aStart.Row() + nTop;
-SCCOL nEndX = rScRange.aStart.Col() + nRight;
-SCROW nEndY = rScRange.aStart.Row() + nBottom;
-
-if( nStartX <= nEndX && nEndX <= rScRange.aEnd.Col() &&
-nStartY <= nEndY && nEndY <= rScRange.aEnd.Row() )
-{
-return ScRange( nStartX, nStartY, rScRange.aStart.Tab(), 
nEndX, nEndY, rScRange.aEnd.Tab() );
-}
-}
-throw lang::IndexOutOfBoundsException();
-}
+SCCOL nStartX = rScRange.aStart.Col() + nLeft;
+SCROW nStartY = rScRange.aStart.Row() + nTop;
+SCCOL nEndX = rScRange.aStart.Col() + nRight;
+SCROW nEndY = rScRange.aStart.Row() + nBottom;
 
-static ScRange lcl_ScGetCellRangeByPosition( const ScRange& rScRange, 
const ScAddress& rScCell ) throw( lang::IndexOutOfBoundsException )
-{
-try
+if( nStartX <= nEndX && nEndX <= rScRange.aEnd.Col() &&
+nStartY <= nEndY && nEndY <= rScRange.aEnd.Row() )
 {
-return lcl_ScGetCellRangeByPosition( rScRange, rScCell.Col(), 
rScCell.Row(), rScCell.Col(), rScCell.Row() );
+return ScRange( nStartX, nStartY, rScRange.aStart.Tab(), nEndX, 
nEndY, rScRange.aEnd.Tab() );
 }
-catch( lang::IndexOutOfBoundsException & ) { throw; }
 }
+return ScRange( ScAddress::INITIALIZE_INVALID );
+}
+
+ScRange getCellRangeByPosition( const ScRange& rScRange, const ScAddress& 
rScCell )
+{
+return getCellRangeByPosition( rScRange, rScCell.Col(), rScCell.Row(), 
rScCell.Col(), rScCell.Row() );
+}
 
-static void lcl_ScMerge( ScDocShell* pDocSh, const ScRange& rScRange, 
const bool bMerge )
+void merge( ScDocShell* pDocSh, const ScRange& rScRange, const bool bMerge )
+{
+if( pDocSh )
 {
-if( pDocSh )
-{
-ScCellMergeOption aMergeOption(
-rScRange.aStart.Col(), rScRange.aStart.Row(),
-rScRange.aEnd.Col(), rScRange.aEnd.Row(), false
-);
-aMergeOption.maTabs.insert( rScRange.aStart.Tab() );
-if ( bMerge )
-pDocSh->GetDocFunc().MergeCells( aMergeOption, false, true, 
true );
-else
-pDocSh->GetDocFunc().UnmergeCells( aMergeOption, true, true );
-}
+ScCellMergeOption aMergeOption(
+rScRange.aStart.Col(), rScRange.aStart.Row(),
+rScRange.aEnd.Col(), rScRange.aEnd.Row(), false
+);
+aMergeOption.maTabs.insert( rScRange.aStart.Tab() );
+if ( bMerge )
+pDocSh->GetDocFunc().MergeCells( aMergeOption, false, true, true );
+else
+pDocSh->GetDocFunc().UnmergeCells( aMergeOption, true, true );
 }
 }
 
+} //anonymous namespace
+
 bool ScXMLTableRowCellContext::IsMerged( const ScRange& rScRange, const 
ScAddress& rScCell, ScRange& rScCellRange ) const
 {
-if( lcl_ScCellExists(rScCell) )
+if( ScCellExists(rScCell) )
 {
 ScDocument* pDoc = rXMLImport.GetDocument();
-rScCellRange = lcl_ScGetCellRangeByPosition( rScRange, rScCell );
+rScCellRange = getCellRangeByPosition( rScRange, rScCell );
+if( !rScRange.IsValid() ) return false;
 pDoc->ExtendOverlapped( rScCellRange );
 pDoc->ExtendMerge( rScCellRan

[PATCH] CLucene contribs-lib artifacts were missing

[David Ostrovsky]

Hi,

just for the record, this was the missing patch for system wide CLucene 
installation.
I'm not sure if we want it in this place. I didn't include it in the 
list of applied patches in CustomTarget_source.mk but

I guess it wouldn't hurt.

Ciao
David

>From cfd4a041c5c6ef10701dfa0ac0027640415192d5 Mon Sep 17 00:00:00 2001
From: David Ostrovsky 
Date: Thu, 24 May 2012 22:54:07 +0200
Subject: [PATCH] CLucene contribs-lib artifacts were missing during system
 wide installation

Change-Id: I11e9b17336a16bfcaceebe7613c156ff3e2b94d1
---
 clucene/patches/contribs-lib-makefile.patch |   23 +++
 1 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100644 clucene/patches/contribs-lib-makefile.patch

diff --git a/clucene/patches/contribs-lib-makefile.patch b/clucene/patches/contribs-lib-makefile.patch
new file mode 100644
index 000..1d66cde
--- /dev/null
+++ b/clucene/patches/contribs-lib-makefile.patch
@@ -0,0 +1,23 @@
+--- src/contribs-lib/CMakeLists.txt	2012-05-24 22:38:20.002443317 +0200
 src/contribs-lib/CMakeLists.txt	2012-05-24 22:38:05.218443899 +0200
+@@ -113,3 +113,20 @@
+ COMPILE_DEFINITIONS_DEBUG _DEBUG
+ )
+
++#install lib
++install(TARGETS clucene-contribs-lib
++ DESTINATION ${LIB_DESTINATION}
++ COMPONENT runtime )
++
++#install public headers.
++FOREACH(file ${HEADERS})
++	get_filename_component(apath ${file} PATH)
++	get_filename_component(aname ${file} NAME)
++	file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
++	IF ( NOT aname MATCHES "^_.*" )
++		install(FILES ${file}
++		DESTINATION include/${relpath}
++		COMPONENT development)
++	ENDIF ( NOT aname MATCHES "^_.*" )
++ENDFOREACH(file)
++
-- 
1.7.5.4

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

[PATCH] fdo#35973 - [EasyHack] Remember the state of the sidebar pane in Impress

[Rob Snelders]

Hi All,

This patch makes the SlideSorter-toolbar in Impress and Draw remember if 
it was visible or not for each view.
When this patch is accepted then I'll create a similar patch for the 
ToolPanel-toolbar.


--
Greetings,
Rob Snelders
>From d0152a068a92019131032a03bf39f00fb2fc7bf5 Mon Sep 17 00:00:00 2001
From: Rob Snelders 
Date: Thu, 24 May 2012 21:59:57 +0200
Subject: [PATCH] fdo#35973 [EasyHack] Remember the state of the sidebar pane
 in Impress

---
 .../drawing/framework/XConfigurationController.idl |6 +
 .../data/org/openoffice/Office/Impress.xcu |   22 +
 .../schema/org/openoffice/Office/Impress.xcs   |   44 ++-
 .../configuration/ConfigurationController.cxx  |   10 +-
 sd/source/ui/framework/module/ResourceManager.cxx  |   24 +-
 sd/source/ui/framework/module/ResourceManager.hxx  |3 +
 .../ui/framework/module/SlideSorterModule.cxx  |   31 +-
 .../ui/framework/module/SlideSorterModule.hxx  |2 +-
 .../ui/inc/framework/ConfigurationController.hxx   |3 +
 svtools/Library_svt.mk |1 +
 svtools/Package_inc.mk |1 +
 svtools/inc/svtools/slidesorterbaropt.hxx  |  134 +
 svtools/source/config/slidesorterbaropt.cxx|  580 
 13 files changed, 846 insertions(+), 15 deletions(-)
 create mode 100644 svtools/inc/svtools/slidesorterbaropt.hxx
 create mode 100644 svtools/source/config/slidesorterbaropt.cxx

diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index 4c0fd46..1e7cdb2 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -154,6 +154,12 @@ interface XConfigurationController
 interface XConfigurationControllerBroadcaster;
 interface XResourceFactoryManager;
 
+/** Check if the ConfigurationController is disposing
+@return
+When the ConfigurationController is disposing then true else false
+*/
+boolean IsDisposing ();
+
 /** Request the activation of a resource.
 The request is processed asynchronously.  Notifications about
 configuration changes are sent after this call returns.
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 6101cef..f894ccb 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -28,6 +28,28 @@
 
 http://openoffice.org/2004/installation"; xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
   
+
+  
+
+  true
+
+
+  true
+
+
+  true
+
+
+  false
+
+
+  false
+
+
+  true
+
+ 
+
 
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 094cee5..8350429 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -1402,11 +1402,53 @@
   
 
   
-  
+  
 
   Values related to the slide sorter.
   Slide Sorter Options
 
+
+  
+Options that control the visibility of the slide sorter.
+Slide Sorter Visibility
+  
+  
+
+  Visibility of the Slide Sorter in the Impress view.
+  Slide Sorter Visibility ImpressView
+
+  
+  
+
+  Visibility of the Slide Sorter in the Outline view.
+  Slide Sorter Visibility OutlineView
+
+  
+  
+
+  Visibility of the Slide Sorter in the Notes view.
+  Slide Sorter Visibility NotesView
+
+  
+  
+
+  Visibility of the Slide Sorter in the HandOut view.
+  Slide Sorter Visibility HandOutView
+
+  
+  
+
+  Visibility of the Slide Sorter in the SlideSorter view.
+  Slide Sorter Visibility SlideSorterView
+
+  
+  
+
+  Visibility of the Slide Sorter in the Draw view.
+  Slide Sorter Visibility DrawView
+
+  
+
 
   
 Values for tuning the preview cache of the slide sorter.
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 0f49bae..6eb4299 100644
--

[Libreoffice-commits] .: solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/windows/file.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf799459d8e8eabd764450c82450036c5d0e742f
Author: Andras Timar 
Date:   Thu May 24 22:36:21 2012 +0200

fdo#48087 fill in MsiFileHash table for unversioned files

Change-Id: I7d409fbe813f07dc87301b6c6f01a40f531d368c

diff --git a/solenv/bin/modules/installer/windows/file.pm 
b/solenv/bin/modules/installer/windows/file.pm
index f694fbe..2279129 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -1018,7 +1018,7 @@ sub create_files_table
 if ( ! exists($installer::globals::languageproperties{$property}) 
) { $installer::globals::languageproperties{$property} = $value; }
 }
 
-if ( $installer::globals::prepare_winpatch )
+unless ( $file{'Version'} )
 {
 my $path = $onefile->{'sourcepath'};
 if ( $^O =~ /cygwin/i ) { $path = $onefile->{'cyg_sourcepath'}; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 3.5.3rc1 win32 / debug package ...

[bfo . bugmail]

On Wed, May 23, 2012 at 3:11 PM, Petr Mladek - pmla...@suse.cz wrote:
>> Please consider. Always you can ask the friendly guys at Mozilla how
>> to set this all up...
> Thanks for tip.

What a discovery! Seems like complete how to:
http://zenit.senecac.on.ca/wiki/index.php/Mozilla_Source_and_Symbol_Server
Blog postings, bugs on b.m.o, other resources also worth of checking:
http://crashopensource.wordpress.com/2007/09/20/starting-the-project-mozilla-source-and-symbol-server/
https://bugzilla.mozilla.org/show_bug.cgi?id=385792
https://bugzilla.mozilla.org/show_bug.cgi?id=408134
https://bugzilla.mozilla.org/show_bug.cgi?id=419904
https://bugzilla.mozilla.org/show_bug.cgi?id=424240
https://bugzilla.mozilla.org/show_bug.cgi?id=424817
https://bugzilla.mozilla.org/show_bug.cgi?id=428518
http://web.archive.org/web/20071218162257/http://www.jorgon.freeserve.co.uk/Other/pdb.htm

Best regards.

P.S.
It would be great if ESC could go the Mozilla's path of doing things
in QA department.
The knowledge base is on Mozilla's wiki. Software is... open sourced
and available to download.
You should get connected to make LO better. Definitely.

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

Re: [Libreoffice-qa] minutes of ESC call...

[Alexander Wilms]

Hi everyone,

Sorry that I didn't attend the esc call, but I had issues with the freephone
service which wouldn't let me connect.

Anyway, here's what I wanted to mention:

1) Wer're done with the design of the template picker
(http://wiki.documentfoundation.org/Design/Templates_and_documents_rework#Tentative_Design).
We already had a conversation with Rafael and there don't seem to be any
issues

2) The design of the Remote Control is mostly done
(http://wiki.documentfoundation.org/Design/Whiteboards/Impress_remote#Tentative_Design).
We'd need to know whether the last few connections (and PINs) would be
saved. That would allow automatical reconnecting without having to
regenerate and enter the PIN

3) The file manager part of the Android UI is done
(http://wiki.documentfoundation.org/Design/Whiteboards/File_Manager#Tentative_Design).
Will the GSoC student work on that first or the GUI that actually displays
the files' content?


Feedback from the GSoC participants would be appreciated



Templates (I'll discuss this with Bjoern next week) :

- Where should source files be stored? (Blender files, SVGs used to create
the backdrops) Maybe on the Wiki?

  => Allows others to actually improve the templates without
having to redo everything

- Will only master slides be included or also a new default style for
Writer?

- Could we drop all the old master slides? They're not very modern

  - I've got 8 new masterslides that are ready for inclusion
( http://wiki.documentfoundation.org/Design/Call_for_Templates )

  - Is it OK to use fonts licensed under the Open Font
License that are currently not included in LibO?

- Is there a final decision whether we'll use flat ODF files or regular ott,
otp etc.?

Kind Regards

Alex

  


--
View this message in context: 
http://nabble.documentfoundation.org/minutes-of-ESC-call-tp3985834p3985880.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

[PUSHED on master][PATCH] fix proposed for fdo#50178 (Visio)

[julien2412]

Thank you Michael for your review.
I commited and pushed it on master
(http://cgit.freedesktop.org/libreoffice/core/commit/?id=03764e29978bcf0b59a3738166b5af31d0af582a)

Would it be ok for 3.5 branch ?

Julien.

--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-fix-proposed-for-fdo-50178-Visio-tp3985678p3985876.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] .: libvisio/libvisio-0.0.16-fdo50178.patch libvisio/makefile.mk

[Julien Nabet]

 libvisio/libvisio-0.0.16-fdo50178.patch |   29 +
 libvisio/makefile.mk|1 +
 2 files changed, 30 insertions(+)

New commits:
commit 03764e29978bcf0b59a3738166b5af31d0af582a
Author: Julien Nabet 
Date:   Thu May 24 20:36:21 2012 +0200

Resolves: fdo#50178 Reading Visio file causes crash

Problem with iterators, more info here :

http://nabble.documentfoundation.org/PATCH-fix-proposed-for-fdo-50178-Visio-td3985678.html

Change-Id: Ie7131e8bc79539b3a2a5f86608a4574e1ac0fbf8

diff --git a/libvisio/libvisio-0.0.16-fdo50178.patch 
b/libvisio/libvisio-0.0.16-fdo50178.patch
new file mode 100644
index 000..e05887a
--- /dev/null
+++ b/libvisio/libvisio-0.0.16-fdo50178.patch
@@ -0,0 +1,29 @@
+--- misc/build/libvisio-0.0.16/src/lib/VSDXContentCollector.cpp
2012-04-14 17:29:03.0 +0200
 misc/libvisio-0.0.16/src/lib/VSDXContentCollector.cpp  2012-05-23 
22:30:44.542099908 +0200
+@@ -1470,7 +1470,8 @@
+ /* NURBS with incomplete data */
+ void libvisio::VSDXContentCollector::collectNURBSTo(unsigned id, unsigned 
level, double x2, double y2, double knot, double knotPrev, double weight, 
double weightPrev, unsigned dataID)
+ {
+-  std::map::const_iterator iter;
++  std::map::const_iterator iter;
++  std::map::const_iterator iterEnd;
+   NURBSData data;
+   if (dataID == 0xFFFE) // Use stencil NURBS data
+   {
+@@ -1490,13 +1491,15 @@
+ }
+ dataID = tmpElement->m_dataID;
+ iter = m_stencilShape->m_nurbsData.find(dataID);
++iterEnd =  m_stencilShape->m_nurbsData.end();
+   }
+   else // No stencils involved, directly get dataID and fill in missing parts
+   {
+ iter = m_NURBSData.find(dataID);
++iterEnd = m_NURBSData.end();
+   }
+ 
+-  if (iter != m_NURBSData.end())
++  if (iter != iterEnd)
+   {
+ data = iter->second;
+ data.knots.push_back(knot);
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 2a1be7e..29e8658 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -59,6 +59,7 @@ TARFILE_MD5=2fa6028324347860e684e75310818d43
 
 PATCH_FILES=\
 $(TARFILE_NAME)-nothrow.patch \
+$(TARFILE_NAME)-fdo50178.patch \
 $(TARFILE_NAME).patch
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-ux-advise] [PATCH] fdo#34772 Word count / statistics in the status bar

[Muhammad Haggag]

Thanks for the help!

I created a followup patch that makes the strings as resources:
https://bugs.freedesktop.org/attachment.cgi?id=62063

Review:
https://bugs.freedesktop.org/page.cgi?id=splinter.html&bug=34772&attachment=62063

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

Re: 3.5.3rc1 win32 / debug package ...

[bfo . bugmail]

On Wed, May 23, 2012 at 3:11 PM, Petr Mladek - pmla...@suse.cz wrote:
> bfo.bugm...@spamgourmet.com píše v Pá 18. 05. 2012 v 22:22 +0200:
> > On Thu, 2012-05-10 at 12:13 +0200, Jesús Corrius wrote:
> > > In any case, the right way to do it would be to automatically generate
> > > all PDBs for each released version, for example in:
> > > solver\wntmsci.pro\pdb.
> > > Then we put those generated PDBs online at symbols.libreoffice.org.
> > >> I think first we should have the symbol server for Jesus' debug
> > >> build.
> > >> Or he should publish the PDB files along with the installer.
> > I am Windows user interested in helping confirming UNCONFIRMED and
> > other crash bug reports on b.f.o.
> > Please set up the symbol server and even source server just as Mozilla
> > did.
> > This will help people without strong programming knowledge to just run
> > the WinDbg,
> > download the symbols/source, catch a crasher and fill complete bug
> > reports
> > for Windows platform with source excerpt included.
> I remember that it has been discussed on the ESC meeting two weeks ago
> or so. I do not remember the conclusion. I know that we want it. I am
> not sure if we have a volunteer who could do the work.

I just read in ESC minutes that daily builds with --enable-symbols are
again available at
http://dev-builds.libreoffice.org/daily/W2008R2@20-With-Symbol-Bytemark-Hosting/master
Unfortunately .pdb files are not available there. Maybe tinderbox administrator
could script creating an archives of pdb/source files and upload them
just as msi installers?
This would be great start...

> The wikipage would be really helpful. Have you managed to get it working
> by the screencast? Would you mind to describe the steps on the wiki? Do
> not be afraid. It need not be perfect. Anyone could improve the text in
> the future.

I managed to get WinDbg to work with my own LOdev build with symbols
and source on Windows 7 using VS 2008 Express.
!analyze -v output is not exactly as on sceencast. It lacks
FAULTING_SOURCE_LINE and FAULTING_SOURCE_CODE sections,
but when I hit Call stack I see links to the source and by clicking it
by hand I see used code sections as on screencast.

Yes, I will try to draft an wiki article in few days as a starter to
be improved by LO experts,
but I am not sure if my WinDbg output is any good.

In between I have to practice and browse this list more, as I still
have problems building LO 3.5.2.2 by myself (had to disable java,
rebasing, postgres connector). Tried with 3.5.4.2 but it is even worse
(some cairo canvas errors).

Maybe tinderbox operators could share their settings with the community?
I don't think that they know all the environment configuration by
heart. If they do, then wiki articles
can be written in minutes :).

Best regards.

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

Re: build time optimization

[Norbert Thiebaud]

On Thu, May 24, 2012 at 10:44 AM, Noel Grandin  wrote:
> On Thu, May 24, 2012 at 5:08 PM, Norbert Thiebaud  wrote:
>> I have not tested ramdisk on Windows, so I do not know how effective it is.
>>
>
> I'm running a tinderbox with a ramdisk on Windows - reduces build time
> dramatically.

can you post an How-to ? (and possibly some numbers)

Note: I do not have enough memory to use it... but I may consider
investing in some RAM if that is worth it...

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

[Libreoffice-commits] .: 8 commits - oox/CustomTarget_generated.mk oox/Library_oox.mk oox/Module_oox.mk oox/Package_generated.mk oox/source sc/Library_scfilt.mk

[Michael Stahl]

 oox/CustomTarget_generated.mk |   62 
 oox/Library_oox.mk|   56 +-
 oox/Module_oox.mk |1 
 oox/Package_generated.mk  |3 -
 oox/source/token/Makefile |  126 --
 sc/Library_scfilt.mk  |1 
 6 files changed, 69 insertions(+), 180 deletions(-)

New commits:
commit d1384b4253325764ea2cf30b7afa86ce27ef418f
Author: Michael Stahl 
Date:   Thu May 24 16:58:46 2012 +0200

sc: fix bogus -I$(WORKDIR)/other_module

diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
index 25152d2..2af5832 100644
--- a/oox/Package_generated.mk
+++ b/oox/Package_generated.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Package_Package,oox_generated,$(call 
gb_CustomTarget_get_workdi
 
 $(eval $(call 
gb_Package_add_file,oox_generated,inc/oox/token/tokens.hxx,inc/oox/token/tokens.hxx))
 $(eval $(call 
gb_Package_add_file,oox_generated,inc/oox/token/namespaces.hxx,inc/oox/token/namespaces.hxx))
+$(eval $(call 
gb_Package_add_file,oox_generated,inc/oox/token/properties.hxx,inc/oox/token/properties.hxx))
 $(eval $(call 
gb_Package_add_file,oox_generated,inc/oox/namespaces.txt,misc/namespaces.txt))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 3d81d71..d582e22 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
-I$(SRCDIR)/sc/source/filter/inc \
-I$(SRCDIR)/sc/source/ui/inc \
-I$(SRCDIR)/sc/inc \
-   -I$(WORKDIR)/oox/inc \
$$(INCLUDE) \
 ))
 
commit d89fe2764c198df405420447952aac81282e151e
Author: Michael Stahl 
Date:   Thu May 24 15:18:14 2012 +0200

oox: remove duplicate custom makefile from writerfilter10

diff --git a/oox/source/token/Makefile b/oox/source/token/Makefile
deleted file mode 100644
index cdd94e7..000
--- a/oox/source/token/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# 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.
-#
-#*
-
-# generate source and header files from text files 
-
-SRCDIR_TOKEN := $(dir $(realpath $(firstword $(MAKEFILE_LIST
-WORKDIR_TOKEN := .
-
-include $(GBUILDDIR)/Output.mk
-include $(GBUILDDIR)/BuildDirs.mk
-include $(GBUILDDIR)/Helper.mk
-
-# XML namespace identifiers and names
-
-$(WORKDIR_TOKEN)/namespaces.hxx : $(SRCDIR_TOKEN)/namespaces.hxx.head 
$(WORKDIR_TOKEN)/namespaceids.inc $(SRCDIR_TOKEN)/namespaces.hxx.tail
-   $(call gb_Output_announce,$@,build,CAT,1)
-   $(call gb_Helper_abbreviate_dirs,cat $^ > $@)
-
-$(WORKDIR_TOKEN)/namespaceids.inc : $(SRCDIR_TOKEN)/namespaces.txt 
$(SRCDIR_TOKEN)/namespaces.pl
-   $(call gb_Output_announce,$@,build,PRL,1)
-   $(call gb_Helper_abbreviate_dirs, \
-   mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 1 < 
$< > $@ \
-   )
-
-$(WORKDIR_TOKEN)/namespacenames.inc : $(SRCDIR_TOKEN)/namespaces.txt 
$(SRCDIR_TOKEN)/namespaces.pl
-   $(call gb_Output_announce,$@,build,PRL,1)
-   $(call gb_Helper_abbreviate_dirs, \
-   mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 2 < 
$< > $@ \
-   )
-
-$(WORKDIR_TOKEN)/namespaces.txt : $(SRCDIR_TOKEN)/namespaces.txt 
$(SRCDIR_TOKEN)/namespaces.pl
-   $(call gb_Output_announce,$@,build,PRL,1)
-   $(call gb_Helper_abbreviate_dirs, \
-   mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 3 < 
$< > $@ \
-   )
-
-# XML token identifiers and names
-
-$(WORKDIR_TOKEN)/tokens.hxx : $(SRCDIR_TOKEN)/tokens.hxx.head 
$(WORKDIR_TOKEN)/tokenids.inc $(SRCDIR_TOKEN)/tokens.hxx.tail
-   $(call gb_Output_announce,$@,build,CAT,1)
-   $(call gb_Helper_abbreviate_dirs,cat $^ > $@)
-
-$(WORKDIR_TOKEN)/tokenids.inc : $(SRCDIR_TOKEN)/tokens.txt 
$(SRCDIR_TOKEN)/tokens.pl
-   $(call gb_Output_announce,$@,build,PRL,1)
-   $(call gb_Helper_abbreviate_

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

[Lubos Lunak]

 sw/qa/extras/ooxmltok/data/n652364.docx |binary
 sw/qa/extras/ooxmltok/data/n750255.docx |binary
 sw/qa/extras/ooxmltok/ooxmltok.cxx  |   88 +++-
 sw/qa/extras/ww8tok/data/n652364.doc|binary
 sw/qa/extras/ww8tok/data/n750255.doc|binary
 sw/qa/extras/ww8tok/ww8tok.cxx  |   82 ++
 sw/source/filter/ww8/ww8par.cxx |6 +
 writerfilter/source/dmapper/PropertyMap.cxx |   18 +
 8 files changed, 189 insertions(+), 5 deletions(-)

New commits:
commit fe7a4aad76c051bc46ae46b175fb182b6e7e3f89
Author: Luboš Luňák 
Date:   Thu May 24 17:58:27 2012 +0200

testcases for bnc#652364 and bnc#750255 for .docx too

Change-Id: I4a98f4df6fde3f52b099fa627baa861f496bb452

diff --git a/sw/qa/extras/ooxmltok/data/n652364.docx 
b/sw/qa/extras/ooxmltok/data/n652364.docx
new file mode 100644
index 000..0845509
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n652364.docx differ
diff --git a/sw/qa/extras/ooxmltok/data/n750255.docx 
b/sw/qa/extras/ooxmltok/data/n750255.docx
new file mode 100644
index 000..a0c7370
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n750255.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx 
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index abd1a2d..fb5e3d2 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -59,6 +59,8 @@ public:
 void testN705956_1();
 void testN705956_2();
 void testN747461();
+void testN750255();
+void testN652364();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -72,6 +74,8 @@ public:
 CPPUNIT_TEST(testN705956_1);
 CPPUNIT_TEST(testN705956_2);
 CPPUNIT_TEST(testN747461);
+CPPUNIT_TEST(testN750255);
+CPPUNIT_TEST(testN652364);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -321,6 +325,84 @@ after they are loaded.
 CPPUNIT_ASSERT_EQUAL( OUString( "Green" ), descr3 );
 }
 
+void Test::testN750255()
+{
+load( "n750255.docx" );
+
+/*
+Column break without columns on the page is a page break, so check those 
paragraphs
+are on page 2 (page style 'Converted1') and page 3 (page style 'Converted2')
+enum = ThisComponent.Text.createEnumeration
+enum.nextElement
+para1 = enum.nextElement
+xray para1.String
+xray para1.PageStyleName
+para2 = enum.nextElement
+xray para2.String
+xray para2.PageStyleName
+*/
+uno::Reference textDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
paraEnumAccess(textDocument->getText(), uno::UNO_QUERY);
+// list of paragraphs
+uno::Reference paraEnum = 
paraEnumAccess->createEnumeration();
+// go to 1st paragraph
+(void) paraEnum->nextElement();
+// get the 2nd and 3rd paragraph
+uno::Reference paragraph1(paraEnum->nextElement(), 
uno::UNO_QUERY);
+uno::Reference paragraph2(paraEnum->nextElement(), 
uno::UNO_QUERY);
+uno::Reference text1(paragraph1, uno::UNO_QUERY);
+uno::Reference text2(paragraph2, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( OUString( "one" ), text1->getString());
+CPPUNIT_ASSERT_EQUAL( OUString( "two" ), text2->getString());
+uno::Reference paragraphProperties1(paragraph1, 
uno::UNO_QUERY);
+uno::Reference paragraphProperties2(paragraph2, 
uno::UNO_QUERY);
+OUString pageStyle1, pageStyle2;
+paragraphProperties1->getPropertyValue( "PageStyleName" ) >>= pageStyle1;
+paragraphProperties2->getPropertyValue( "PageStyleName" ) >>= pageStyle2;
+CPPUNIT_ASSERT_EQUAL( OUString( "Converted1" ), pageStyle1 );
+CPPUNIT_ASSERT_EQUAL( OUString( "Converted2" ), pageStyle2 );
+
+}
+
+void Test::testN652364()
+{
+load( "n652364.docx" );
+
+/*
+Related to 750255 above, column break with columns on the page however should 
be a column break.
+enum = ThisComponent.Text.createEnumeration
+enum.nextElement
+para1 = enum.nextElement
+xray para1.String
+xray para1.PageStyleName
+enum.nextElement
+para2 = enum.nextElement
+xray para2.String
+xray para2.PageStyleName
+*/
+uno::Reference textDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
paraEnumAccess(textDocument->getText(), uno::UNO_QUERY);
+// list of paragraphs
+uno::Reference paraEnum = 
paraEnumAccess->createEnumeration();
+// get the 2nd and 4th paragraph
+(void) paraEnum->nextElement();
+uno::Reference paragraph1(paraEnum->nextElement(), 
uno::UNO_QUERY);
+(void) paraEnum->nextElement();
+uno::Reference paragraph2(paraEnum->nextElement(), 
uno::UNO_QUERY);
+uno::Reference text1(paragraph1, uno::UNO_QUERY);
+uno::Reference text2(paragraph2, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( OUString( "text1" ), text1->getString());
+CPPUNIT_ASSERT_EQUAL( OUString( "text2" ), text2->getString());
+uno::Reference paragraphProperties1(paragraph1, 
uno::UNO_QUERY);
+uno::Reference paragraphProperties2(paragraph2, 
uno::UNO_QUERY);
+OUString pageStyle1, pageStyle2;
+paragraphProperties1->getPropertyValue( "PageStyleN

Re: [Libreoffice-qa] minutes of ESC call...

[Andras Timar]

2012/5/24 Caolán McNamara :
> * QA update (Rainer)
>        + best builds for windows testing to get backtraces ?
>                + use bytemark box builds, tinderbox #20

On Windows, symbols are not embedded in executables but they are in
separate .pdb files. Please zip *.pdb from solver together and upload
it next to the installer, otherwise it will not be possible to produce
backtraces.

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

Re: build time optimization

[Noel Grandin]

On Thu, May 24, 2012 at 5:08 PM, Norbert Thiebaud  wrote:
> I have not tested ramdisk on Windows, so I do not know how effective it is.
>

I'm running a tinderbox with a ramdisk on Windows - reduces build time
dramatically.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sfx2/source

[Kohei Yoshida]

 sfx2/source/control/unoctitm.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit f6d9b4afbda6cf1a3db822b5fb5125448ef9e1d1
Author: Kohei Yoshida 
Date:   Thu May 24 11:40:46 2012 -0400

Delete SfxItemSet before the current shell gets destroyed.

SfxItemSet takes hold of the SfxItemPool instance from the current
shell, and accesses it when it gets destroyed.  The problem arises
when the current shell gets destroyed before the SfxItemSet instnace
does, in which case an illegal memory access ensues.

This fixes intermittent crashes when opening a document in Writer.

Change-Id: Ib5e74b43051f868f22f6efdb311e6c2a75326d9a

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 005db6e..360590f 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -67,6 +67,8 @@
 #include 
 #include 
 
+#include 
+
 namespace css = ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
@@ -725,16 +727,20 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const 
::com::sun::star::util
 }
 
 eMapUnit = GetCoreMetric( pShell->GetPool(), GetId() );
-SfxAllItemSet aSet( pShell->GetPool() );
-TransformParameters( GetId(), lNewArgs, aSet, pSlot );
-if ( aSet.Count() )
+boost::scoped_ptr xSet(new 
SfxAllItemSet(pShell->GetPool()));
+TransformParameters(GetId(), lNewArgs, *xSet, pSlot);
+if (xSet->Count())
 {
 // execute with arguments - call directly
-pItem = pDispatcher->Execute( GetId(), nCall, &aSet, 
&aInternalSet, nModifier );
+pItem = pDispatcher->Execute(GetId(), nCall, 
xSet.get(), &aInternalSet, nModifier);
 bSuccess = (pItem != NULL);
 }
 else
 {
+// Be sure to delete this before we send a dispatch
+// request, which will destroy the current shell.
+xSet.reset();
+
 // execute using bindings, enables support for 
toggle/enum etc.
 SfxRequest aReq( GetId(), nCall, pShell->GetPool() );
 aReq.SetModifier( nModifier );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: build time optimization

[Norbert Thiebaud]

On Thu, May 24, 2012 at 2:23 AM, David Ostrovsky  wrote:
> Hi,
>
> I'm trying to accelerate LO (developer) build on linux_x86-64 system.
> Before you point me to wiki (distributed build, ccache and friends)
> and tell me to use ramdisk: I already did it all and it is still need to be
> optimized ;-)

It is not that certain that ramdisk on linux really helps.
ramdisk eat-up memory that cannot be used for fs-cache...
so ramdisk will increase the cache-miss at the kernel level...

ramdisk on Mac help tremendously because of how horrible HFS is lock-wise.

I have not tested ramdisk on Windows, so I do not know how effective it is.

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

minutes of ESC call...

[Caolán McNamara]

* Present:
+ Rainer, Petr, David, Eike, Andras, Caolan, Kohei, Norbert,
  Cedric, Stephen, Michael Stahl

* Completed action items
+ get bytemark win32 upload ssh keys sent / setup (Norbert /
Thorsten)

* Pending Action Items
+ pull up misc. internal versions for 3.6 (Fridrich)
+ switch to ChromeOS fonts in master if no reply from Liberation
  team (Caolan)
+ Liberation Fonts 2.0 rebased on ChromeOS will happpen
  soonish, at which point we'll just upgrade to it 
+ rename VCL API to make it GetBeamerFoo & fix (Michael)
+ [pending] add encryption default UI option in 3.6 (Thorsten)
+ [in-progress] think over consequences of moving master -> 3.6
  on release etc. (Rainer)
+ still finding the best sol'n
+ [in-progress] create new bugzilla components next week
  (Rainer)
+ low priority, still in progress
+ write 2 paragraph gerrit teaser to dev-list (Bjoern)
+ connect Rainer with sysadmins wrt. status/live issues ticker 
+ will ping Thorsten again


* GSOC update (Cedric)
+ coding starting, looking good
+ lazlo pinged
+ if you can't find your student, ping Fridrich or Cedric

* UI / design update (Astron/Mirek)
+ not around

* Release Engineering update (Petr)
+ 3.5.4
+ untranslated shortcuts, can live without them for 3.5.4
+ 3.6 status
+ an Alpha0 build due next week
+ this is just an early we-can-build on all platforms
  preparatory step

* git submodules status (Norbert)
+ sounds good
+ regular stuff works, edge-cases still needs testing

* build / tinderbox machines
+ bytemark windows box up and running and uploading
+ bytemark linux box pending time

* QA update (Rainer)
+ best builds for windows testing to get backtraces ?
+ use bytemark box builds, tinderbox #20
+ regressions
+ could be that up to 12 (8 in writer) regressions are
  border-line related (mstahl)
+ if we split the regressions query into crashes and
  non-crashes we could probably quicker chew through the
  crashers which are typically easy to fix (caolanm)

http://wiki.documentfoundation.org/Talk:BugReport_Details

* 3.5 most annoying bugs ...
+ 60 open (of 213) older 67/211   68/205  71/205  68/199 74/201
73/193 66/183
 28%  32%  33% 35% 34%37%
38%36%
+
https://bugs.freedesktop.org/showdependencytree.cgi?id=37361&hide_resolved=1

* QA update (Rainer)

* 3.5 most annoying bugs ...
+ 62 open (of 219)
https://bugs.freedesktop.org/showdependencytree.cgi?id=37361&hide_resolved=1

* 3.5 bugs tagged with 'regression'
+ 161(+10) bugs open of 567(+11) total

* Componentcount net *
+ Writer   - 64 (+6)
+ Presentation - 18 (+0)
+ LibreOffice  - 16 (+1)
+ Spreadsheet  - 12 (-1)
+ Drawing  - 9  (+0)
+ Database - 9  (+0)
+ Writer / RTF - 9  (+2)
+ Basic- 2  (+0)

+ https://bugs.freedesktop.org/buglist.cgi?keywords=regression%
2C%
20&keywords_type=allwords&resolution=---&query_format=advanced&product=LibreOffice&list_id=79522

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

[Libreoffice-commits] .: 2 commits - android/experimental

[Tor Lillqvist]

 android/experimental/DocumentLoader/Makefile   
  |2 
 
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 |   32 +++---
 2 files changed, 25 insertions(+), 9 deletions(-)

New commits:
commit 05f786fd2eb8056be946f6aadb21cdd61be8e226
Author: Tor Lillqvist 
Date:   Thu May 24 17:41:09 2012 +0300

More clueless test hacking

Change-Id: I2623625380b11f3d6bf720387504b23ccce529e1

diff --git 
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 3fdc453..975cd05 100644
--- 
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ 
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -105,14 +105,14 @@ public class DocumentLoader
 // Load the wanted document(s)
 String[] inputs = input.split(":");
 for (int i = 0; i < inputs.length; i++) {
-com.sun.star.beans.PropertyValue propertyValues[] =
+com.sun.star.beans.PropertyValue loadProps[] =
 new com.sun.star.beans.PropertyValue[2];
-propertyValues[0] = new com.sun.star.beans.PropertyValue();
-propertyValues[0].Name = "Hidden";
-propertyValues[0].Value = new Boolean(true);
-propertyValues[1] = new com.sun.star.beans.PropertyValue();
-propertyValues[1].Name = "ReadOnly";
-propertyValues[1].Value = new Boolean(true);
+loadProps[0] = new com.sun.star.beans.PropertyValue();
+loadProps[0].Name = "Hidden";
+loadProps[0].Value = new Boolean(true);
+loadProps[1] = new com.sun.star.beans.PropertyValue();
+loadProps[1].Name = "ReadOnly";
+loadProps[1].Value = new Boolean(true);
 
 String sUrl = "file://" + inputs[i];
 
@@ -120,7 +120,7 @@ public class DocumentLoader
 
 Object oDoc =
 xCompLoader.loadComponentFromURL
-(sUrl, "_blank", 0, propertyValues);
+(sUrl, "_blank", 0, loadProps);
 Log.i(TAG, "oDoc is " + (oDoc!=null ? oDoc.toString() : 
"null"));
 
 com.sun.star.lang.XTypeProvider typeProvider = 
(com.sun.star.lang.XTypeProvider) 
UnoRuntime.queryInterface(com.sun.star.lang.XTypeProvider.class, oDoc);
@@ -134,6 +134,22 @@ public class DocumentLoader
 }
 }
 }
+
+com.sun.star.view.XRenderable renderBabe = 
(com.sun.star.view.XRenderable) 
UnoRuntime.queryInterface(com.sun.star.view.XRenderable.class, oDoc);
+Log.i(TAG, "renderBabe is " + (renderBabe!=null ? 
renderBabe.toString() : "null"));
+
+com.sun.star.beans.PropertyValue renderProps[] =
+new com.sun.star.beans.PropertyValue[1];
+renderProps[0] = new com.sun.star.beans.PropertyValue();
+renderProps[0].Name = "IsPrinter";
+renderProps[0].Value = new Boolean(true);
+//renderProps[1] = new com.sun.star.beans.PropertyValue();
+//renderProps[1].Name = "View";
+//renderProps[1].Value = no idea where to get an XController...
+
+Log.i(TAG, "getRendererCount: " + 
renderBabe.getRendererCount(oDoc, renderProps));
+
+renderBabe.render(0, oDoc, renderProps);
 }
 }
 catch (Exception e) {
commit 4ff08c21cead20c03e2bd12568ab7dc7d8403371
Author: Tor Lillqvist 
Date:   Thu May 24 17:40:30 2012 +0300

Don't bother with so many test docs

Change-Id: I725255224ae7a38d7a7843516b7ac979f79e0207

diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index 63fefa7..3774680 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -261,7 +261,7 @@ uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
 
 run:
-   adb shell am start -n org.libreoffice.android.examples/.DocumentLoader 
-e input 
/assets/test1.odt:/assets/border.xls:/assets/test.odt:/assets/testVba.doc
+   adb shell am start -n org.libreoffice.android.examples/.DocumentLoader 
-e input /assets/test1.odt
 
 clean: properties
$(ANT) clean
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

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

Cor Nouws  changed:

   What|Removed |Added

 Depends on|37606   |

--- Comment #315 from Cor Nouws  2012-05-24 07:14:42 PDT ---
(In reply to comment #314)
> Nominating bug 37606 - Writer: Select All doesn't work on a document beginning
> with a table. It is a very old issue from OpenOffice.org. I guess it's not 
> hard
> to fix.

Sorry, but I removed this one.
Just being an old OOo bug does not qualify for 'most annoying'. We could use an
extra storage in that cast ;-)

-- 
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] .: 3 commits - autodoc/source connectivity/source dbaccess/source filter/source framework/source sw/source unotools/source

[Takeshi Abe]

 autodoc/source/display/idl/hfi_globalindex.cxx |   12 
 connectivity/source/drivers/postgresql/pq_xtables.cxx  |2 +-
 dbaccess/source/ui/dlg/dlgsave.cxx |2 --
 filter/source/svg/svgwriter.cxx|4 
 framework/source/fwi/uielement/constitemcontainer.cxx  |2 --
 framework/source/uiconfiguration/uicategorydescription.cxx |1 -
 framework/source/uielement/uicommanddescription.cxx|2 --
 sw/source/ui/vba/vbalisthelper.cxx |   10 --
 unotools/source/config/historyoptions.cxx  |1 -
 9 files changed, 1 insertion(+), 35 deletions(-)

New commits:
commit 06dde54187547d9a6aa16abdbf15336918057683
Author: Takeshi Abe 
Date:   Thu May 24 22:27:27 2012 +0900

catch by const reference

Change-Id: I7fda9e06f5beeab4fdfeb1475cda7719ab230073

diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx 
b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index 44b1e18..afc1477 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -180,7 +180,7 @@ void Tables::refresh()
 }
 m_name2index.swap( map );
 }
-catch ( com::sun::star::sdbc::SQLException & e )
+catch ( const com::sun::star::sdbc::SQLException & e )
 {
 throw RuntimeException( e.Message , e.Context );
 }
commit 4469eb2068fd6f2429823c550295f70ee2f79be7
Author: Takeshi Abe 
Date:   Thu May 24 22:26:44 2012 +0900

removed unused member fields

Change-Id: If89fd07ad78bca303a9bf8484f08cba08afffe8d

diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx 
b/dbaccess/source/ui/dlg/dlgsave.cxx
index 33d0ea6..b016046 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -72,8 +72,6 @@ public:
 HelpButton  m_aPB_HELP;
 String  m_aQryLabel;
 String  m_sTblLabel;
-rtl::OUString   m_sCatalog;
-rtl::OUString   m_sSchema;
 String  m_aName;
 const IObjectNameCheck&
 m_rObjectNameCheck;
commit d428360e48f069622b0aeccf74b88af0be632be8
Author: Takeshi Abe 
Date:   Thu May 24 22:20:19 2012 +0900

removed unused const char[]

Change-Id: Ia5f26c13e7bae42685230769fa86b52703eb2f7e

diff --git a/autodoc/source/display/idl/hfi_globalindex.cxx 
b/autodoc/source/display/idl/hfi_globalindex.cxx
index dc0766b..d02d3cc 100644
--- a/autodoc/source/display/idl/hfi_globalindex.cxx
+++ b/autodoc/source/display/idl/hfi_globalindex.cxx
@@ -112,18 +112,6 @@ const intt C_nNamesArrayOffset = 
intt(ary::idl::Module::class_id);
 const int C_nIxField = 9;
 
 
-
-
-const char C_cAlphabet[] =
-"A B C D E "
-"F G H I J "
-"K L M N O "
-"P Q R S T "
-"U V W X Y "
-"Z";
-
-
-
 HF_IdlGlobalIndex::PageData G_PageData;
 
 }   // end anonymous namespace
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 4d41707..5bcbb5a 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -49,10 +49,7 @@ static const char   aXMLElemLine[] = "line";
 static const char   aXMLElemRect[] = "rect";
 static const char   aXMLElemEllipse[] = "ellipse";
 static const char   aXMLElemPath[] = "path";
-static const char   aXMLElemPolygon[] = "polygon";
-static const char   aXMLElemPolyLine[] = "polyline";
 static const char   aXMLElemText[] = "text";
-static const char   aXMLElemTSpan[] = "tspan";
 static const char   aXMLElemImage[] = "image";
 static const char   aXMLElemMask[] = "mask";
 static const char   aXMLElemPattern[] = "pattern";
@@ -79,7 +76,6 @@ static const char   aXMLAttrRX[] = "rx";
 static const char   aXMLAttrRY[] = "ry";
 static const char   aXMLAttrWidth[] = "width";
 static const char   aXMLAttrHeight[] = "height";
-static const char   aXMLAttrPoints[] = "points";
 static const char   aXMLAttrStroke[] = "stroke";
 static const char   aXMLAttrStrokeOpacity[] = "stroke-opacity";
 static const char   aXMLAttrStrokeWidth[] = "stroke-width";
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx 
b/framework/source/fwi/uielement/constitemcontainer.cxx
index 414f0ab..fa19b8f 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -42,8 +42,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
-const char WRONG_TYPE_EXCEPTION[] = "Type must be 
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >";
-
 const int PROPHANDLE_UINAME = 1;
 const int PROPCOUNT = 1;
 const char PROPNAME_UINAME[]= "UIName";
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx 
b/framework/source/uiconfiguration/uicategorydescription.cxx
index c955565..414a4da 100644
--- a/framework/source/uiconfiguration/uicategorydesc

[ANN] LibreOffice 3.5.4 RC2 available

[Fridrich Strba]

Dear Community,

The Document Foundation is happy to announce the second release
candidate of LibreOffice 3.5.4. The upcoming 3.5.4 will be the fourth
in a series of frequent bugfix releases on our feature-packed 3.5 code
line. Please be aware that LibreOffice 3.5.4 RC2 is not ready for
production use, you should continue to use LibreOffice 3.5.3 for that.

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

A note for Windows users: this Release Candidate will uninstall your
current stable build and replace it. If you do not wish this to happen
but still would like to test, you should follow the instructions for
installing in parallel:

 http://wiki.documentfoundation.org/Installing_in_parallel

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the RC2 quality is to run some specific manual
tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

 (and the announcement mail:
http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html)

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  https://www.libreoffice.org/get-involved/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/Translation_for_3.5

or help with funding our operations:

  http://challenge.documentfoundation.org/

A list of known issues with 3.5.4 RC2 is available from our wiki:

  http://wiki.documentfoundation.org/Releases/3.5.4/RC2

Please find the list of changes against LibreOffice 3.5.4 RC1 here:


http://download.documentfoundation.org/libreoffice/src/bugfixes-libreoffice-3-5-4-release-3.5.4.2.log

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

Yours,

The Document Foundation Board of Directors
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Excel filters for Writer

[Kohei Yoshida]

On Thu, May 24, 2012 at 7:29 AM, Kohei Yoshida  wrote:
> On Thu, May 24, 2012 at 2:47 AM, Caolán McNamara  wrote:
>> On Wed, 2012-05-23 at 15:56 -0400, Kohei Yoshida wrote:
>>> Thanks.  What about this one?
>>>
>>> http://opengrok.libreoffice.org/xref/core/filter/source/config/fragments/filters/StarWriter_DOS.xcu
>>>
>>> Does the same thinking apply to this one also?  I hope yes.
>>
>> The "import excel .xls into a word processor" filters are just odd in
>> the first place. But the StarWriter for DOS filter presumably makes as
>> much sense as any of the rest of the binfilter filters. What singles
>> StarWriter DOS out as problematic as opposed to say StarWriter 1.0 ?
>
> It's associated with the writer_StarWriter_DOS format type which uses
> .txt as the only extension.  So, it gets prioritized when dealing with
> a plain text file with.txt extension even though it's a binary format.
>  I find that a bit odd.

But let's not worry about this.  As I understand it, we tend to
downplay the significance of file name extensions during type
detection, so it's probably not a big deal.  If, for any reason a real
plain text file is incorrectly classified as starwriter dos document,
then we should probably fix the detection service for that format.

So, let's conclude this thread.

BTW, I've removed those Excel for Writer filter types.  That was
enough to make my bug disappear, for now.

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

Re: per-user installation context on Windows

[Andras Timar]

2012/5/24 Jesús Corrius :
>> If we removed this choice from the UI along with the useless User
>> name/Organization prompts (see fdo#46559), we could have one screen
>> less in the installation wizard. If someone is insisting on installing
>> LibreOffice in per-user context, the ALLUSERS="" property can be
>> passed in the command line (also for help packs).
>
> What about exchanging that for a language selection screen with the
> current locale selected automatically?

It is possible to select languages in Custom Setup dialog. But most of
the users choose Typical setup. What do you think about a reminder on
Ready to install dialog:

You are going to install the following user interface languages:
Catalan, English, 
You can change this by Custom setup. If you want to review or change
any of your installation settings, click Back. ...

I cannot imagine a user-friendly language chooser, when we have 106
languages. But maybe somebody else can. :)

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

[Libreoffice-commits] .: Branch 'feature/mspub' - config_host.mk.in libmspub/makefile.mk libmspub/prj

[Fridrich Strba]

 config_host.mk.in  |2 ++
 libmspub/makefile.mk   |6 ++
 libmspub/prj/build.lst |6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 79f79847d0e217e461448d375767bd78aeda2bf7
Author: Fridrich Å trba 
Date:   Thu May 24 14:41:20 2012 +0200

Fix libmspub build

Change-Id: I24a1380ec61972a5c59f75a3c1f71552542bce7c

diff --git a/config_host.mk.in b/config_host.mk.in
index dcc8bc6..8a31f27 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -362,6 +362,8 @@ export MOZ_INC=@MOZ_INC@
 export MOZ_LDAP_CFLAGS=@MOZ_LDAP_CFLAGS@
 export MOZ_LIB=@MOZ_LIB@
 export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
+export MSPUB_CFLAGS=@MSPUB_CFLAGS@
+export MSPUB_LIBS=@MSPUB_LIBS@
 export MYSQL_DEFINES=@MYSQL_DEFINES@
 export MYSQL_INC=@MYSQL_INC@
 export MYSQL_LIB=@MYSQL_LIB@
diff --git a/libmspub/makefile.mk b/libmspub/makefile.mk
index e2e0877..f361adc 100644
--- a/libmspub/makefile.mk
+++ b/libmspub/makefile.mk
@@ -27,8 +27,8 @@
 
 PRJ=.
 
-PRJNAME=cdr
-TARGET=cdr
+PRJNAME=mspub
+TARGET=mspub
 
 # --- Settings -
 
@@ -62,8 +62,6 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/zlib
 TARFILE_NAME=libmspub-0.0.0
 TARFILE_MD5=8b72793cbe6f152f51e476da053f03bc
 
-#PATCH_FILES=\
-
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
 
diff --git a/libmspub/prj/build.lst b/libmspub/prj/build.lst
index 151fbeb..05fb74e 100644
--- a/libmspub/prj/build.lst
+++ b/libmspub/prj/build.lst
@@ -1,3 +1,3 @@
-publibmspub: LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib soltools NULL
-publibmspubusr1-   all pub_mkout NULL
-publibmspubnmake   -   all pub_libmspub NULL
+mspub  libmspub: LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib soltools NULL
+mspub  libmspubusr1-   all mspub_mkout NULL
+mspub  libmspubnmake   -   all mspub_libmspub NULL
diff --git a/libmspub/prj/dmake b/libmspub/prj/dmake
new file mode 100644
index 000..e69de29
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Critical bug in LibreOffice Calc when using mod (showstopper for 3.5.4?)

[Petr Mladek]

Robinson Tryon píše v Čt 24. 05. 2012 v 00:01 -0400:
> On Wed, May 23, 2012 at 7:59 AM, Axel Reimer  wrote:
> > in LibreOffice Calc 3.5.3 there is a critical bug in the mod function.
> > ...When using
> > =mod=(0,3*100;10) in a cell 3,5527E-015 is displayed as result
> >
> > =mod=(0,6*100;10) in a cell 7,1054E-015 is displayed as result
> >
> > The values for 0,3*100 and 0,6*100 are definitely wrong.
> >
> > This could be a showstopper if this still happens in LibreOffice 3.5.4 RC1.
> > Can someone test if this occurs in 3.5.4 RC1?
> 
> Ayup. I'm seeing the same behavior in 3.5.4.1.
> 
> I threw together a test document based on your examples and stapled it
> to a new bug here:
> https://bugs.freedesktop.org/show_bug.cgi?id=50299

Thanks a lot for reporting it. It looks ugly. Though, it seems to be
"only" a rounding error. It never worked better. It happens also with
other spreadsheet applications. => it can't be blocker. It probably does
not cause too many problems in the real life.

See https://bugs.freedesktop.org/show_bug.cgi?id=50299#c3 for more
details.


Best Regards,
Petr

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

Re: --enable-debug vs --enable-symbols (Re: [Libreoffice-commits] .: 12 commits - config_host.mk.in configure.in filter/source oox/source sal/inc sc/source solenv/gbuild toolkit/source xmlhelp/source)

[Lubos Lunak]

On Monday 21 of May 2012, Michael Meeks wrote:
> On Mon, 2012-05-21 at 18:06 +0200, Stephan Bergmann wrote:
> > I rarely use a debugger to step through code, so I prefer to avoid the
>
>   Egad - is this thread still going on :-) Could we create a set of the
> pros / cons & a concrete proposal for the ESC call on Thursday ?

 I don't see the point, at least now. The thread is going on (and it's far 
from endless), because there is something to talk about, and it's mostly 
about the smaller things which wouldn't be reasonably handled within few 
minutes of a phone call anyway.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: --enable-debug vs --enable-symbols (Re: [Libreoffice-commits] .: 12 commits - config_host.mk.in configure.in filter/source oox/source sal/inc sc/source solenv/gbuild toolkit/source xmlhelp/source)

[Lubos Lunak]

On Tuesday 22 of May 2012, Stephan Bergmann wrote:
> On 05/22/2012 04:02 PM, Lubos Lunak wrote:
> > On Tuesday 22 of May 2012, Stephan Bergmann wrote:
> >> On 05/22/2012 03:19 PM, Lubos Lunak wrote:
> >>>But --enable-debug also enables asserts, logging and similar
> >>> functionality that should be rather useful for developer builds,
> >>> doesn't it?
> >>
> >> But --enable-dbgutil enables that as well (and more of it).
> >
> >   Uhm? If that is the case, then no wonder people get confused, since
> > this means that dbgutil is a superset of debug, except not quite. I've
> > already asked Michael, so I'm going to ask you too: What is your idea
> > about what these options do?
>
> common subset of what --enable-debug and --enable-dbgutil do: enable
> various assertions, warnings, etc. (technically, both enable
> OSL_DEBUG_LEVEL > 0 and disable NDEBUG, for example)
>
> what --enable-debug does in addition: settings that aid in step-through
> debugging (like -O0, -fno-inline)
>
> what --enable-dbgutil does in addition: enable additional assertions,
> warnings, etc. that are binary incompatible

 Hmm. That's a completely arbitrary and non-obvious setup that I doubt anybody 
except for you knows or expects, but on the other hand, I think I do not care 
enough to do anything about it if you want it this way.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/source

[Noel Power]

 sc/source/filter/excel/xetable.cxx |   53 ++---
 1 file changed, 38 insertions(+), 15 deletions(-)

New commits:
commit 9746c6de3a05fe9284d6d6bb2f636bfe912733cd
Author: Noel Power 
Date:   Thu May 24 12:44:19 2012 +0100

fix excel row height export problems ( I hope ) fdo#50304

Change-Id: I43ddb32ecba36107f5973fa5dcf2499cd1330668

diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index e569426..5656b71 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2029,22 +2029,41 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& 
rDefRowData, const ScfUInt
 XclExpDefaultRowData aMaxDefData;
 size_t nMaxDefCount = 0;
 // only look for default format in existing rows, if there are more than 
unused
-for (itr = itrBeg; itr != itrEnd; ++itr)
+bool bSearchExisting = ( maRowMap.size() >= (  GetMaxPos().Row() - 
maRowMap.size() ) );
+if ( bSearchExisting )
 {
-const RowRef& rRow = itr->second;
-if (rRow->IsDefaultable())
+for (itr = itrBeg; itr != itrEnd; ++itr)
 {
-XclExpDefaultRowData aDefData( *rRow );
-size_t& rnDefCount = aDefRowMap[ aDefData ];
-++rnDefCount;
-if( rnDefCount > nMaxDefCount )
+const RowRef& rRow = itr->second;
+if (rRow->IsDefaultable())
 {
-nMaxDefCount = rnDefCount;
-aMaxDefData = aDefData;
+XclExpDefaultRowData aDefData( *rRow );
+size_t& rnDefCount = aDefRowMap[ aDefData ];
+++rnDefCount;
+if( rnDefCount > nMaxDefCount )
+{
+nMaxDefCount = rnDefCount;
+aMaxDefData = aDefData;
+}
+}
+}
+}
+else
+{
+// find a suitable unused row to get the default height from,
+// searching backwards from max row
+for ( SCROW nRow = GetMaxPos().Row(); nRow >= 0; --nRow )
+{
+if ( maRowMap.find( nRow ) == maRowMap.end() )
+{
+// use first encountered unused row height as default
+// I wonder should we do this always ( and abandon the search
+// of exising rows )
+aMaxDefData.mnHeight = GetDoc().GetRowHeight(nRow, 
GetCurrScTab(), false);
+break;
 }
 }
 }
-
 // return the default row format to caller
 rDefRowData = aMaxDefData;
 
@@ -2146,13 +2165,17 @@ XclExpDimensions* XclExpRowBuffer::GetDimensions()
 
 XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool 
bRowAlwaysEmpty )
 {
-RowMap::iterator itr = maRowMap.find(nXclRow);
-if (itr == maRowMap.end())
+RowMap::iterator itr = maRowMap.begin();
+for ( size_t nFrom = maRowMap.size(); nFrom <= nXclRow; ++nFrom )
 {
-RowRef p(new XclExpRow(GetRoot(), nXclRow, maOutlineBfr, 
bRowAlwaysEmpty));
-::std::pair r = 
maRowMap.insert(RowMap::value_type(nXclRow, p));
-itr = r.first;
+itr = maRowMap.find(nFrom);
+if ( itr == maRowMap.end() )
+{
+RowRef p(new XclExpRow(GetRoot(), nFrom, maOutlineBfr, 
bRowAlwaysEmpty));
+maRowMap.insert(RowMap::value_type(nFrom, p));
+}
 }
+itr = maRowMap.find(nXclRow);
 return *itr->second;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: per-user installation context on Windows

[Jesús Corrius]

> If we removed this choice from the UI along with the useless User
> name/Organization prompts (see fdo#46559), we could have one screen
> less in the installation wizard. If someone is insisting on installing
> LibreOffice in per-user context, the ALLUSERS="" property can be
> passed in the command line (also for help packs).

What about exchanging that for a language selection screen with the
current locale selected automatically?

-- 
Jesús Corrius 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: per-user installation context on Windows

[Andras Timar]

2012/5/24 Christian Lohmaier :
> Hi Andras, *,
>
> On Thu, May 24, 2012 at 1:21 PM, Andras Timar  wrote:
>> [...]
>> If we removed this choice from the UI along with the useless User
>> name/Organization prompts (see fdo#46559),
>
> Without a user name in the Options, documents will always be opened at
> the very top, not at the last edit position. So it would be preferable
> to prompt the user when there is no previous installation.
> But if the user name/Organization really is not used for LO's option
> as you write in the bug, feel free to bin them.

Yes, it is a widespread misunderstanding. User name in Options used to
be set by the (long ago binned) first start wizard, not by the
installer.

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

[Libreoffice-commits] .: desktop/win32

[Jesús Corrius]

 desktop/win32/source/applauncher/launcher.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f0f8576596e104549e66e62d15a262acfd70dcec
Author: Jesús Corrius 
Date:   Thu May 24 13:33:39 2012 +0200

Don't spam fellow developers until I fix the problem in MinGW

diff --git a/desktop/win32/source/applauncher/launcher.cxx 
b/desktop/win32/source/applauncher/launcher.cxx
index 8ba9cb6..074e2b5 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -56,7 +56,8 @@ extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, 
LPTSTR, int )
 {
// Set an explicit Application User Model ID for the process
 
-   SetExplicitAppUserModelID(APPUSERMODELID);
+// FIXME: Comment this out until I find a fix for minGW.
+// SetExplicitAppUserModelID(APPUSERMODELID);
 
 // Retreive startup info
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf' - sc/source

[Daniel Bankston]

 sc/source/filter/xml/xmlcelli.cxx |  146 +-
 sc/source/filter/xml/xmlcelli.hxx |7 -
 sc/source/filter/xml/xmlsubti.cxx |   16 
 sc/source/filter/xml/xmlsubti.hxx |1 
 4 files changed, 117 insertions(+), 53 deletions(-)

New commits:
commit b249c549b57e56f2f5aba69dce4a139107fbbaa7
Author: Daniel Bankston 
Date:   Thu May 24 06:05:15 2012 -0500

Convert ODS import merge methods to use direct Sc calls

During ODS import, ScXMLTableRowCellContext::DoMerge() and
ScXMLTableRowCellContext::IsMerged() are used to handle merged cells.
These methods now use direct Sc calls instead of UNO calls.

Change-Id: Ie9a0cd743aca67ee8bc841c2c2133ad67444efca

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index c75991a..9d1c7c0 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -41,6 +41,9 @@
 #include "unonames.hxx"
 #include "postit.hxx"
 #include "sheetdata.hxx"
+#include "cellmergeoption.hxx"
+#include "docsh.hxx"
+#include "docfunc.hxx"
 
 #include "XMLTableShapeImportHelper.hxx"
 #include "XMLTextPContext.hxx"
@@ -452,68 +455,109 @@ SvXMLImportContext 
*ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr
 return pContext;
 }
 
-bool ScXMLTableRowCellContext::IsMerged (const uno::Reference 
& xCellRange, const sal_Int32 nCol, const sal_Int32 nRow,
-table::CellRangeAddress& aCellAddress) const
+namespace
 {
-table::CellAddress aCell; // don't need to set the sheet, because every 
sheet can contain the same count of cells.
-aCell.Column = nCol;
-aCell.Row = nRow;
-if (CellExists(aCell))
+static bool lcl_ScCellExists( const ScAddress& rScAddress )
 {
-uno::Reference xMergeSheetCellRange 
(xCellRange->getCellRangeByPosition(nCol,nRow,nCol,nRow), uno::UNO_QUERY);
-uno::Reference xTable 
(xMergeSheetCellRange->getSpreadsheet());
-uno::Reference xMergeSheetCursor 
(xTable->createCursorByRange(xMergeSheetCellRange));
-if (xMergeSheetCursor.is())
+return( rScAddress.Col() <= MAXCOL && rScAddress.Row() <= MAXROW );
+}
+
+static ScRange lcl_ScGetCellRangeByPosition( const ScRange& rScRange, 
const SCCOL nLeft, const SCROW nTop, const SCCOL nRight, const SCROW nBottom )
+throw( lang::IndexOutOfBoundsException )
+{
+if( nLeft >= 0 && nTop >= 0 && nRight >= 0 && nBottom >= 0 )
 {
-xMergeSheetCursor->collapseToMergedArea();
-uno::Reference xMergeCellAddress 
(xMergeSheetCursor, uno::UNO_QUERY);
-if (xMergeCellAddress.is())
+SCCOL nStartX = rScRange.aStart.Col() + nLeft;
+SCROW nStartY = rScRange.aStart.Row() + nTop;
+SCCOL nEndX = rScRange.aStart.Col() + nRight;
+SCROW nEndY = rScRange.aStart.Row() + nBottom;
+
+if( nStartX <= nEndX && nEndX <= rScRange.aEnd.Col() &&
+nStartY <= nEndY && nEndY <= rScRange.aEnd.Row() )
 {
-aCellAddress = xMergeCellAddress->getRangeAddress();
-if (aCellAddress.StartColumn == nCol && aCellAddress.EndColumn 
== nCol &&
-aCellAddress.StartRow == nRow && aCellAddress.EndRow == 
nRow)
-return false;
-else
-return true;
+return ScRange( nStartX, nStartY, rScRange.aStart.Tab(), 
nEndX, nEndY, rScRange.aEnd.Tab() );
 }
 }
+throw lang::IndexOutOfBoundsException();
+}
+
+static ScRange lcl_ScGetCellRangeByPosition( const ScRange& rScRange, 
const ScAddress& rScCell ) throw( lang::IndexOutOfBoundsException )
+{
+try
+{
+return lcl_ScGetCellRangeByPosition( rScRange, rScCell.Col(), 
rScCell.Row(), rScCell.Col(), rScCell.Row() );
+}
+catch( lang::IndexOutOfBoundsException & ) { throw; }
+}
+
+static void lcl_ScMerge( ScDocShell* pDocSh, const ScRange& rScRange, 
const bool bMerge )
+{
+if( pDocSh )
+{
+ScCellMergeOption aMergeOption(
+rScRange.aStart.Col(), rScRange.aStart.Row(),
+rScRange.aEnd.Col(), rScRange.aEnd.Row(), false
+);
+aMergeOption.maTabs.insert( rScRange.aStart.Tab() );
+if ( bMerge )
+pDocSh->GetDocFunc().MergeCells( aMergeOption, false, true, 
true );
+else
+pDocSh->GetDocFunc().UnmergeCells( aMergeOption, true, true );
+}
+}
+}
+
+bool ScXMLTableRowCellContext::IsMerged( const ScRange& rScRange, const 
ScAddress& rScCell, ScRange& rScCellRange ) const
+{
+if( lcl_ScCellExists(rScCell) )
+{
+ScDocument* pDoc = rXMLImport.GetDocument();
+rScCellRange = lcl_ScGetCellRangeByPosition( rScRange, rScCell );
+pDoc->ExtendOverlapped( rScCellRange );
+pDoc->ExtendMerge( rScCellRange );
+r

Re: per-user installation context on Windows

[Christian Lohmaier]

Hi Andras, *,

On Thu, May 24, 2012 at 1:21 PM, Andras Timar  wrote:
> [...]
> If we removed this choice from the UI along with the useless User
> name/Organization prompts (see fdo#46559),

Without a user name in the Options, documents will always be opened at
the very top, not at the last edit position. So it would be preferable
to prompt the user when there is no previous installation.
But if the user name/Organization really is not used for LO's option
as you write in the bug, feel free to bin them.

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

Re: Excel filters for Writer

[Kohei Yoshida]

On Thu, May 24, 2012 at 2:47 AM, Caolán McNamara  wrote:
> On Wed, 2012-05-23 at 15:56 -0400, Kohei Yoshida wrote:
>> Thanks.  What about this one?
>>
>> http://opengrok.libreoffice.org/xref/core/filter/source/config/fragments/filters/StarWriter_DOS.xcu
>>
>> Does the same thinking apply to this one also?  I hope yes.
>
> The "import excel .xls into a word processor" filters are just odd in
> the first place. But the StarWriter for DOS filter presumably makes as
> much sense as any of the rest of the binfilter filters. What singles
> StarWriter DOS out as problematic as opposed to say StarWriter 1.0 ?

It's associated with the writer_StarWriter_DOS format type which uses
.txt as the only extension.  So, it gets prioritized when dealing with
a plain text file with.txt extension even though it's a binary format.
 I find that a bit odd.

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

[Libreoffice-commits] .: sc/source

[Markus Mohrhard]

 sc/source/filter/xml/xmlexprt.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit cd834e5c78c65449a47a6a5310d05bf9775f2da6
Author: Markus Mohrhard 
Date:   Thu May 24 13:22:30 2012 +0200

don't export empty color formats & conditional formats

Change-Id: I880facafc155af2e8c67f66f9d3463daf1191207

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 5951ee0..2379401 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2851,7 +2851,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const 
Reference ODFVER_012)
+if(getDefaultVersion() > SvtSaveOptions::ODFVER_012)
 {
 //export new conditional format information
 ExportConditionalFormat(nTable);
@@ -3823,6 +3823,16 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
 ScColorFormatList* pColorFormatList = pDoc->GetColorScaleList(nTab);
 if(pCondFormatList || pColorFormatList)
 {
+bool bExport = false;
+if(pCondFormatList && pCondFormatList->size())
+bExport = true;
+
+if(pColorFormatList && pColorFormatList->size())
+bExport = true;
+
+if(!bExport)
+return;
+
 SvXMLElementExport aElementCondFormats(*this, XML_NAMESPACE_CALC_EXT, 
XML_CONDITIONAL_FORMATS, true, true);
 
 if(pCondFormatList)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

[Eike Rathke]

 i18npool/source/localedata/data/zh_TW.xml |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4a3e7dfb0d573cf97555822e11f816dc400b67e4
Author: Eike Rathke 
Date:   Thu May 24 13:22:19 2012 +0200

added missing closing quotes at end of literals

Change-Id: I3d204aa54dd9c13dfb87e702fa07aa4234977a49

diff --git a/i18npool/source/localedata/data/zh_TW.xml 
b/i18npool/source/localedata/data/zh_TW.xml
index c683372..a978450 100644
--- a/i18npool/source/localedata/data/zh_TW.xml
+++ b/i18npool/source/localedata/data/zh_TW.xml
@@ -268,13 +268,13 @@
   "年"M"月"D"日" HH"時"MM"分"SS"秒"
 
 
-  EE"年"M"月"D"日" HH"時"MM"分
+  EE"年"M"月"D"日" HH"時"MM"分"
 
 
-  GGEE"年"M"月"D"日" HH"時"MM"分
+  GGEE"年"M"月"D"日" HH"時"MM"分"
 
 
-  GGGEE"年"M"月"D"日" HH"時"MM"分
+  GGGEE"年"M"月"D"日" HH"時"MM"分"
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

per-user installation context on Windows

[Andras Timar]

Hi,

In the setup wizard of LibreOffice one can choose between installing
LibreOffice for all users (per-machine context), and installing
LibreOffice for the currently logged in user (per-user context). I
could not find a good reason to keep this choice on the UI.

Installation works from administrator account only. Non-privileged
users cannot install LibreOffice even in per-user context. They can
use portable versions for example. Help packs are installed in
per-machine context unconditionally.

If we removed this choice from the UI along with the useless User
name/Organization prompts (see fdo#46559), we could have one screen
less in the installation wizard. If someone is insisting on installing
LibreOffice in per-user context, the ALLUSERS="" property can be
passed in the command line (also for help packs).

Please let me know, if you disagree.

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

Re: [PATCH] fix proposed for fdo#50178 (Visio)

[Michael Stahl]

On 23/05/12 23:08, julien2412 wrote:
> Hello,
> 
> I took a look at the fdo#50178 Reading Visio file causes crash and put a
> backtrace here https://bugs.freedesktop.org/attachment.cgi?id=61938
> 
> Interesting console message :
> /usr/include/c++/4.6/debug/safe_iterator.h:465:error: attempt to compare 
> iterators from different sequences.
> 
> and location for bt :
>  
> /libvisio/unxlngx6/misc/build/libvisio-0.0.16/src/lib/VSDXContentCollector.cpp:1499
> 
> Then here is the line which fails :
> 1499   if (iter != m_NURBSData.end())
> 
> The problem is "iter" can be initialized in both ways :
> - 1492 iter = m_stencilShape->m_nurbsData.find(dataID);
> - or 1496  iter = m_NURBSData.find(dataID);
> 
> So I propose a patch which defines a variable "iterEnd" initialized in both
> specific cases and with which "iter" is compared.
> http://nabble.documentfoundation.org/file/n3985678/libvisio-0.0.16-fdo50178.patch
> libvisio-0.0.16-fdo50178.patch 

hmmm yes that looks reasonable, should fix it.

> PS : If the fix is right, I'm not sure how to commit push it ("git add 
> libvisio-0.0.16-fdo50178.patch" then "git commit -a" etc.?)

just git add both files, the new one and the existing one, and then git
commit.

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

[Libreoffice-commits] .: sc/source

[Markus Mohrhard]

 sc/source/filter/xml/xmlexprt.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 4d676e0fb325d3938cdc7064f9a80821fff645d3
Author: Markus Mohrhard 
Date:   Thu May 24 12:41:18 2012 +0200

export new conditional format info only into 1.2 with extension

Change-Id: I4d52f5aa36785110888ca1fdd6fc85ee40406674

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 9c1b3bd..5951ee0 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2851,8 +2851,11 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const 
Reference ODFVER_012)
+{
+//export new conditional format information
+ExportConditionalFormat(nTable);
+}
 
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 50221, which changed state.

Bug 50221 Summary: FILESAVE particular .xls (MSO97) will CRASH
https://bugs.freedesktop.org/show_bug.cgi?id=50221

   What|Old Value   |New Value

 Status|UNCONFIRMED |NEW
 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

Re: build time optimization

[Christian Lohmaier]

Hi David,

On Thu, May 24, 2012 at 9:23 AM, David Ostrovsky  wrote:
>
> I'm trying to accelerate LO (developer) build on linux_x86-64 system.
> Before you point me to wiki (distributed build, ccache and friends)
> and tell me to use ramdisk: I already did it all and it is still need to be
> optimized ;-)

Well - do the few external modules that you don't have in your system
really matter that much with regards to build time when you're already
using ccache?
Given that you build in the same directory always or use ccache's
prefix-option so that the cache can actually be used, the time needed
to build those few external libs is negligible, isn't it?

I rather have make clean really do make clean for everything.

> (And with other external libs you would probably end up messing around with
> pkg-config because pc files are missing)

Nah, you would just set PKG_CONFIG_PATH accordingly.

> I'm thinking about another magic configure option, like
> --with-external-lib-directory=/opt/libo

Not necessary IMHO. As you also want to be able to run your build LO
on your machine, don't you?
So you need those external libs available on your system, thus you
need to add the library path to your ld.so.conf or similar mechanism.

> this would install all dependend libs to this directory during first build
> and this would *survive* the make clean

It is pointless to have system libraries in a system that is not
"available" in the system, but only for the build.

> Unfortunately this option would not be so easy to implement, I guess.
> Another thoughts on that?

Yes, run ./configure --prefix /opt/lodpes ; make ; make install
on the external libs you're missing and export
PKG_CONFIG_PATH=/opt/lodeps/share/pkgconfig:/usr/share/pkgconfig
before running configure/autogen.sh
And see above for the runtime thing. you can also just install them to
/usr/local/ so you don't have to bother with
LD_LIBRARY_PATH/ld.so.conf

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

[Libreoffice-commits] .: sc/source

[Eike Rathke]

 sc/source/core/data/attarray.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 816f65da41c8c30e5854e333a6498e58c64303aa
Author: Eike Rathke 
Date:   Thu May 24 12:37:57 2012 +0200

resolved fdo#41214 crash due to offset error

diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 9de2b02..f201e5d 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1800,12 +1800,11 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, 
SCROW nLastData, bool bFu
 while ( nPos < nCount )
 {
 // find range of visually equal formats
-SCSIZE nStartPos = nPos;
-SCSIZE nEndPos = nStartPos + 1;
+SCSIZE nEndPos = nPos;
 while ( nEndPos < nCount-1 &&
 pData[nEndPos].pPattern->IsVisibleEqual( 
*pData[nEndPos+1].pPattern))
 ++nEndPos;
-SCROW nAttrStartRow = ( nStartPos > 0 ) ? ( pData[nStartPos-1].nRow + 
1 ) : 0;
+SCROW nAttrStartRow = ( nPos > 0 ) ? ( pData[nPos-1].nRow + 1 ) : 0;
 if ( nAttrStartRow <= nLastData )
 nAttrStartRow = nLastData + 1;
 SCROW nAttrSize = pData[nEndPos].nRow + 1 - nAttrStartRow;
@@ -1816,7 +1815,7 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, 
SCROW nLastData, bool bFu
 rLastRow = pData[nEndPos].nRow;
 bFound = true;
 }
-nPos = nEndPos;
+nPos = nEndPos + 1;
 }
 
 return bFound;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: postprocess/rebase

[Fridrich Strba]

 postprocess/rebase/coffbase.txt |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9812152a2b562c57cc57de959d8f8d591aa9ebc5
Author: Fridrich Å trba 
Date:   Thu May 24 12:31:11 2012 +0200

No point to rebase inexisting dll

Change-Id: Ibbb917858fb1bd327cae4bde0b4dd34ac3787e64

diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 2aa9823..4fe3a25 100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -389,4 +389,3 @@ ucpmyucp1.uno.dll 0x580a 0x0002
 vbaeventsmi.uno.dll 0x5807 0x0002
 vbahelpermi.dll  0x57fc 0x000a
 vbaswobjmi.uno.dll 0x57ef 0x000c
-wpftmi.dll   0x57e5 0x0006
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/mspub' - filter/Configuration_filter.mk filter/source postprocess/rebase RepositoryExternal.mk tail_build/prj writerperfect/Library_wpftdraw.mk writerperfect/M

[Fridrich Strba]

 RepositoryExternal.mk|   27 
 filter/Configuration_filter.mk   |2 
 filter/source/config/fragments/filters/PublisherDocument.xcu |   13 
 filter/source/config/fragments/types/draw_Publisher_Document.xcu |   12 
 postprocess/rebase/coffbase.txt  |1 
 tail_build/prj/build.lst |2 
 writerperfect/Library_wpftdraw.mk|2 
 writerperfect/Module_writerperfect.mk|2 
 writerperfect/prj/build.lst  |2 
 writerperfect/source/draw/MSPUBImportFilter.cxx  |  275 
++
 writerperfect/source/draw/MSPUBImportFilter.hxx  |  111 
 writerperfect/source/draw/wpftdraw_genericfilter.cxx |5 
 writerperfect/util/wpftdraw.component|4 
 13 files changed, 455 insertions(+), 3 deletions(-)

New commits:
commit c3d9e65a78776587b9edcb95bf1c52e5f396a08b
Author: Fridrich Å trba 
Date:   Thu May 24 12:29:22 2012 +0200

Adding Publisher Import filter

Change-Id: I87d648b408de2e1dcbef9a52a7cf4ba918972025

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8e620bf..09ab7f4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -729,6 +729,33 @@ endef
 endif # SYSTEM_LIBCDR
 
 
+ifeq ($(SYSTEM_LIBMSPUB),YES)
+
+define gb_LinkTarget__use_mspub
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+$(MSPUB_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(MSPUB_LIBS))
+
+endef
+
+else # !SYSTEM_LIBMSPUB
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+   mspublib \
+))
+
+define gb_LinkTarget__use_mspub
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   mspublib \
+)
+
+endef
+
+endif # SYSTEM_LIBMSPUB
+
+
 ifeq ($(SYSTEM_LIBVISIO),YES)
 
 define gb_LinkTarget__use_visio
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index f143840..aa689ca 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -542,6 +542,7 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s
draw8_template \
draw_WordPerfect_Graphics \
draw_Visio_Document \
+draw_Publisher_Document \
draw_CorelDraw_Document \
draw_Corel_Presentation_Exchange \
 )
@@ -554,6 +555,7 @@ $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filt
draw8_template \
WordPerfectGraphics \
VisioDocument \
+PublisherDocument \
CorelDrawDocument \
CorelPresentationExchange \
 )
diff --git a/filter/source/config/fragments/filters/PublisherDocument.xcu 
b/filter/source/config/fragments/filters/PublisherDocument.xcu
new file mode 100644
index 000..bb53e94
--- /dev/null
+++ b/filter/source/config/fragments/filters/PublisherDocument.xcu
@@ -0,0 +1,13 @@
+
+IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER 
PREFERRED
+
+com.sun.star.comp.Draw.MSPUBImportFilter
+
+
+Microsoft Publisher 2003
+
+0
+draw_Publisher_Document
+
+com.sun.star.drawing.DrawingDocument
+
diff --git a/filter/source/config/fragments/types/draw_Publisher_Document.xcu 
b/filter/source/config/fragments/types/draw_Publisher_Document.xcu
new file mode 100644
index 000..8a253a3
--- /dev/null
+++ b/filter/source/config/fragments/types/draw_Publisher_Document.xcu
@@ -0,0 +1,12 @@
+
+com.sun.star.comp.Draw.MSPUBImportFilter
+
+pub
+application/x-mspublisher
+true
+Publisher 
Document
+
+Microsoft Publisher 2003
+
+
+
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 2aa9823..4fe3a25 100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -389,4 +389,3 @@ ucpmyucp1.uno.dll 0x580a 0x0002
 vbaeventsmi.uno.dll 0x5807 0x0002
 vbahelpermi.dll  0x57fc 0x000a
 vbaswobjmi.uno.dll 0x57ef 0x000c
-wpftmi.dll   0x57e5 0x0006
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index b3afe4f..5b5f27e 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl 
FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell 
HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr 
LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec 
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio 
LPSOL

[Libreoffice-commits] .: Branch 'feature/mspub' - config_host.mk.in configure.in libmspub/makefile.mk libmspub/prj libmspub/README Makefile.top ooo.lst.in

[Fridrich Strba]

 Makefile.top   |2 +
 config_host.mk.in  |1 
 configure.in   |   25 
 libmspub/README|1 
 libmspub/makefile.mk   |   74 +
 libmspub/prj/build.lst |3 +
 libmspub/prj/d.lst |6 +++
 ooo.lst.in |1 
 8 files changed, 113 insertions(+)

New commits:
commit 6fc0d54d872d88b6716fa9393f4e4156c5a0c703
Author: Fridrich Å trba 
Date:   Thu May 24 11:59:16 2012 +0200

Adding libmspub module

Change-Id: Iec9c9c5419a40e7ad64af057f1bbb426ca3163b0

diff --git a/Makefile.top b/Makefile.top
index 1396514..476c1aa 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -194,6 +194,7 @@ libcmis\
 libcroco\
 libexttextcat\
 libgsf\
+libmspub\
 libpng\
 librsvg\
 libvisio\
@@ -466,6 +467,7 @@ findunusedcode:
   | grep -v ^jvmaccess:: \
   | grep -v ^libcdr:: \
   | grep -v ^libcmis:: \
+  | grep -v ^libmspub:: \
   | grep -v ^libvisio:: \
   | grep -v ^libwpg:: \
   | grep -v ^libwps_tools_win:: \
diff --git a/config_host.mk.in b/config_host.mk.in
index 76d4a1d..dcc8bc6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -499,6 +499,7 @@ export SYSTEM_LIBCROCO=@SYSTEM_LIBCROCO@
 export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
 export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
 export SYSTEM_LIBGSF=@SYSTEM_LIBGSF@
+export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@
 export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
 export SYSTEM_LIBRSVG=@SYSTEM_LIBRSVG@
 export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@
diff --git a/configure.in b/configure.in
index 2382c83..8983807 100644
--- a/configure.in
+++ b/configure.in
@@ -1219,6 +1219,11 @@ AC_ARG_WITH(system-libcdr,
 [Use libcdr already on system.]),,
 [with_system_libcdr="$with_system_libs"])
 
+AC_ARG_WITH(system-libmspub,
+AS_HELP_STRING([--with-system-libmspub],
+[Use libmspub already on system.]),,
+[with_system_libmspub="no"])
+
 AC_ARG_WITH(system-libvisio,
 AS_HELP_STRING([--with-system-libvisio],
 [Use libvisio already on system.]),,
@@ -6255,6 +6260,26 @@ AC_SUBST(CDR_CFLAGS)
 AC_SUBST(CDR_LIBS)
 
 dnl ===
+dnl Check for system libmspub
+dnl ===
+AC_MSG_CHECKING([which libmspub to use])
+if test "$with_system_libmspub" = "yes"; then
+AC_MSG_RESULT([external])
+SYSTEM_LIBMSPUB=YES
+PKG_CHECK_MODULES( MSPUB, libmspub-0.0 )
+elif test $_os = iOS; then
+# libmspub depends on libwpd and libwpg and those are LGPL
+AC_MSG_RESULT([none])
+else
+AC_MSG_RESULT([internal])
+SYSTEM_LIBMSPUB=NO
+BUILD_TYPE="$BUILD_TYPE LIBMSPUB"
+fi
+AC_SUBST(SYSTEM_LIBMSPUB)
+AC_SUBST(MSPUB_CFLAGS)
+AC_SUBST(MSPUB_LIBS)
+
+dnl ===
 dnl Check for system libvisio
 dnl ===
 AC_MSG_CHECKING([which libvisio to use])
diff --git a/libmspub/README b/libmspub/README
new file mode 100644
index 000..6d2765a
--- /dev/null
+++ b/libmspub/README
@@ -0,0 +1 @@
+Library parsing the Microsoft Publisher documents.
diff --git a/libmspub/makefile.mk b/libmspub/makefile.mk
new file mode 100644
index 000..e2e0877
--- /dev/null
+++ b/libmspub/makefile.mk
@@ -0,0 +1,74 @@
+#*
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# 
+# for a copy of the LGPLv3 License.
+#
+#*
+
+PRJ=.
+
+PRJNAME=cdr
+TARGET=cdr
+
+# --- Settings -
+
+.INCLUDE : settings.mk
+
+# --- Files 
+
+.IF "$(SYSTEM_LIBMSPUB)" == "YES"
+@all:
+@echo "Using system libmspub..."
+.ENDIF
+
+# libcdr depends on the libwpd, libwpg and zlib
+.IF "$(SYSTEM_LIBWPD)" == "YES"
+INCPRE+=$(WPD_CFLAGS)
+.EL

Re: build time optimization

[Lubos Lunak]

On Thursday 24 of May 2012, David Ostrovsky wrote:
> Then next step would be not to build external libs during LO build.
> There is a magic option: --with-system-libs.
> If you try this option on debian based systems (x86_64) you would
> probably end up with
> clucene dependency not met error.
...
> But wait, LO does it already during the build, doesn't it?
> It picks up the really fresh external lib, applies his own patches and
> install it to his working dir ...
> just to throw it away after make clean ;-(
>
> I'm thinking about another magic configure option, like
> --with-external-lib-directory=/opt/libo
> this would install all dependend libs to this directory during first
> build and this would *survive* the make clean
> call, so the next time all external lib artifacts would be reused from
> there.
> The best is, this option would also help to accelerate the build on
> other platforms!
>
> Unfortunately this option would not be so easy to implement, I guess.
> Another thoughts on that?

 We had a discussion about this recently, in the thread started at [1]. You 
have roughly the following options:

- do not use 'make clean'
- install as many system libraries as you can (or even build them explicitly 
from source), use --with-system-libraries and explicit --without-system-foo 
as needed
- implement the --with-system-libraries=auto mentioned in [2] to save you the 
explicit --without-system-foo hassle

 Implementing your suggestion is possibly more work than any of these.

[1] http://lists.freedesktop.org/archives/libreoffice/2012-April/030645.html
[2] http://lists.freedesktop.org/archives/libreoffice/2012-April/030897.html

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/mspub' - 4 commits - boost/makefile.mk dbaccess/source starmath/source svtools/inc svtools/source svx/inc svx/source sw/source tools/inc

[Fridrich Strba]

 boost/makefile.mk |   47 --
 dbaccess/source/ui/misc/charsets.cxx  |2 -
 starmath/source/parse.cxx |2 -
 starmath/source/smmod.cxx |8 ++---
 svtools/inc/svtools/langtab.hxx   |2 -
 svtools/source/misc/langtab.cxx   |7 ++---
 svx/inc/svx/strarray.hxx  |2 -
 svx/inc/svx/txenctab.hxx  |2 -
 svx/source/dialog/strarray.cxx|5 +--
 svx/source/dialog/txenctab.cxx|7 ++---
 sw/source/ui/dbui/mailmergehelper.cxx |2 -
 sw/source/ui/dbui/mmconfigitem.cxx|4 +-
 sw/source/ui/dbui/mmlayoutpage.cxx|4 +-
 tools/inc/tools/resary.hxx|   30 -
 14 files changed, 73 insertions(+), 51 deletions(-)

New commits:
commit 70eb7af641ed1c2fdc754d522472f804f80d0a9d
Author: Fridrich Sch Strba 
Date:   Wed Apr 4 16:18:09 2012 +0200

Be sure all boost headers are copied to output directory

Change-Id: I862b728537e9e862f1d5af78bcc87576964534d0

diff --git a/boost/makefile.mk b/boost/makefile.mk
index 27e588d..6c9db56 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -107,38 +107,81 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : 
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
 -@$(MKDIRHIER) $(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/accumulators 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/algorithm 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/archive 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/asio 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/assign 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bimap 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/circular_buffer 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/compatibility 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/filesystem 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/flyweight 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/format 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/functional 
$(INCCOM)$/$(PRJNAME)
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/io 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function_types 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/fusion 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/gil 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/graph 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/integer 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/interprocess 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/intrusive 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/io 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iostreams 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lambda 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/logic 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/math 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpi 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_D

[Libreoffice-commits] .: svtools/source

[Stephan Bergmann]

 svtools/source/contnr/templwin.cxx |2 +-
 svtools/source/contnr/templwin.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 226b81d0f300a62da9351d1fc011b88f93f0b2b0
Author: Stephan Bergmann 
Date:   Thu May 24 10:58:31 2012 +0200

returning reference to temporary [-Werror]

Change-Id: Ib37f1fc9658cb50227463cf2aa1421ba47b2ec9f

diff --git a/svtools/source/contnr/templwin.cxx 
b/svtools/source/contnr/templwin.cxx
index b1b85c2..98cf194 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -594,7 +594,7 @@ SvtDocInfoTable_Impl::SvtDocInfoTable_Impl() :
 }
 // ---
 
-const String& SvtDocInfoTable_Impl::GetString( long nId ) const
+rtl::OUString SvtDocInfoTable_Impl::GetString( long nId ) const
 {
 sal_uInt32 nPos( FindIndex( nId ) );
 
diff --git a/svtools/source/contnr/templwin.hxx 
b/svtools/source/contnr/templwin.hxx
index 207efeb..d945cf7 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -173,7 +173,7 @@ private:
 public:
 SvtDocInfoTable_Impl();
 
-const String&   GetString( long nId ) const;
+rtl::OUString GetString( long nId ) const;
 };
 
 class SvtFrameWindow_Impl : public Window
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: boost/makefile.mk

[Fridrich Strba]

 boost/makefile.mk |   47 +--
 1 file changed, 45 insertions(+), 2 deletions(-)

New commits:
commit 70eb7af641ed1c2fdc754d522472f804f80d0a9d
Author: Fridrich Sch Strba 
Date:   Wed Apr 4 16:18:09 2012 +0200

Be sure all boost headers are copied to output directory

Change-Id: I862b728537e9e862f1d5af78bcc87576964534d0

diff --git a/boost/makefile.mk b/boost/makefile.mk
index 27e588d..6c9db56 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -107,38 +107,81 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : 
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
 -@$(MKDIRHIER) $(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/accumulators 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/algorithm 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/archive 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/asio 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/assign 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bimap 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/circular_buffer 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/compatibility 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/filesystem 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/flyweight 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/format 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/functional 
$(INCCOM)$/$(PRJNAME)
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/io 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function_types 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/fusion 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/gil 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/graph 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/integer 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/interprocess 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/intrusive 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/io 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iostreams 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lambda 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/logic 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/math 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpi 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multi_array 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multi_index 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/parameter 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/polygon 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/

[Libreoffice-commits] .: 3 commits - dbaccess/source starmath/source svtools/inc svtools/source svx/inc svx/source sw/source tools/inc

[Caolán McNamara]

 dbaccess/source/ui/misc/charsets.cxx  |2 +-
 starmath/source/parse.cxx |2 +-
 starmath/source/smmod.cxx |8 
 svtools/inc/svtools/langtab.hxx   |2 +-
 svtools/source/misc/langtab.cxx   |7 +++
 svx/inc/svx/strarray.hxx  |2 +-
 svx/inc/svx/txenctab.hxx  |2 +-
 svx/source/dialog/strarray.cxx|5 ++---
 svx/source/dialog/txenctab.cxx|7 +++
 sw/source/ui/dbui/mailmergehelper.cxx |2 +-
 sw/source/ui/dbui/mmconfigitem.cxx|4 ++--
 sw/source/ui/dbui/mmlayoutpage.cxx|4 ++--
 tools/inc/tools/resary.hxx|   30 ++
 13 files changed, 28 insertions(+), 49 deletions(-)

New commits:
commit a16b4676a53fdc94c63821cf14e7f24e0fe20959
Author: Caolán McNamara 
Date:   Thu May 24 07:36:47 2012 +0100

convert ResStringArray to rtl::OUString

Change-Id: I51b86a10caa5da6e12583c2b22404b0d9282b13d

diff --git a/dbaccess/source/ui/misc/charsets.cxx 
b/dbaccess/source/ui/misc/charsets.cxx
index d0789ab..e8fbf30 100644
--- a/dbaccess/source/ui/misc/charsets.cxx
+++ b/dbaccess/source/ui/misc/charsets.cxx
@@ -63,7 +63,7 @@ namespace dbaui
 if ( RTL_TEXTENCODING_DONTKNOW == _eEncoding )
 return sal_True;
 
-return 0 != GetTextString( _eEncoding ).Len();
+return !GetTextString(_eEncoding).isEmpty();
 }
 
 //-
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 9ecd5ae..d3999a5 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2376,7 +2376,7 @@ void SmParser::Special()
 sal_uInt16 nCount = sal::static_int_cast< sal_uInt16 
>(pFrom->Count());
 for (sal_uInt16 i = 0;  i < nCount;  ++i)
 {
-if (pFrom->GetString(i) == rName)
+if (pFrom->GetString(i).equals(rName))
 {
 aNewName = pTo->GetString(i);
 bReplace = true;
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 8b85ad2..d757bcb 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -100,7 +100,7 @@ const String SmLocalizedSymbolData::GetUiSymbolName( const 
String &rExportName )
 sal_uInt16 nCount = sal::static_int_cast< xub_StrLen 
>(rExportNames.Count());
 for (sal_uInt16 i = 0;  i < nCount  &&  !aRes.Len();  ++i)
 {
-if (rExportName == rExportNames.GetString(i))
+if (rExportNames.GetString(i).equals(rExportName))
 {
 aRes = rUiNames.GetString(i);
 break;
@@ -121,7 +121,7 @@ const String SmLocalizedSymbolData::GetExportSymbolName( 
const String &rUiName )
 sal_uInt16 nCount = sal::static_int_cast< xub_StrLen >(rUiNames.Count());
 for (sal_uInt16 i = 0;  i < nCount  &&  !aRes.Len();  ++i)
 {
-if (rUiName == rUiNames.GetString(i))
+if (rUiNames.GetString(i).equals(rUiName))
 {
 aRes = rExportNames.GetString(i);
 break;
@@ -142,7 +142,7 @@ const String SmLocalizedSymbolData::GetUiSymbolSetName( 
const String &rExportNam
 sal_uInt16 nCount = sal::static_int_cast< xub_StrLen 
>(rExportNames.Count());
 for (sal_uInt16 i = 0;  i < nCount  &&  !aRes.Len();  ++i)
 {
-if (rExportName == rExportNames.GetString(i))
+if (rExportNames.GetString(i).equals(rExportName))
 {
 aRes = rUiNames.GetString(i);
 break;
@@ -163,7 +163,7 @@ const String SmLocalizedSymbolData::GetExportSymbolSetName( 
const String &rUiNam
 sal_uInt16 nCount = sal::static_int_cast< xub_StrLen >(rUiNames.Count());
 for (sal_uInt16 i = 0;  i < nCount  &&  !aRes.Len();  ++i)
 {
-if (rUiName == rUiNames.GetString(i))
+if (rUiNames.GetString(i).equals(rUiName))
 {
 aRes = rExportNames.GetString(i);
 break;
diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx
index 5785322..0d1ab3a 100644
--- a/svtools/inc/svtools/langtab.hxx
+++ b/svtools/inc/svtools/langtab.hxx
@@ -49,7 +49,7 @@ public:
  Tools->Options->LanguageSettings->UserInterface listbox.
 If FALSE, do replace.
  */
-const String&   GetString( const LanguageType eType, bool 
bUserInterfaceSelection = false ) const;
+const rtl::OUString GetString( const LanguageType eType, bool 
bUserInterfaceSelection = false ) const;
 LanguageTypeGetType( const String& rStr ) const;
 
 sal_uInt32  GetEntryCount() const;
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 64af70e..9168daf 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -135,7 +135,7 @@ SvtLanguageTable::~SvtLanguageTable()
 
 //
 
-const String& SvtLanguageTabl

[Libreoffice-commits] Changes to 'feature/mspub'

[Fridrich Strba]

New branch 'feature/mspub' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: build time optimization

[Stephan Bergmann]

On 05/24/2012 09:23 AM, David Ostrovsky wrote:

I'm thinking about another magic configure option, like
--with-external-lib-directory=/opt/libo
this would install all dependend libs to this directory during first
build and this would *survive* the make clean
call, so the next time all external lib artifacts would be reused from
there.


The line what to keep across a "make clean" and what to through away 
could be a gray one.  On the one hand, some low-level LO modules (e.g., 
soltools) do not really change much these days, so you could argue to 
not rebuild them, either.  On the other hand, the external modules *do* 
depend on LO code (its build machinery), so not re-building them after a 
"make clean" is unsound if you modified any LO code they depend on.


In the end, I'd question why you do "make clean" anyway, if you are 
after fast build times.  These days, our dependency tracking has 
apparently become fine enough that there are hardly any apparent build 
failures resulting from missing dependencies any longer.


(And, btw, most of the --with-external-libs should work just fine.  You 
typically only need a few select --without-external-* overrides.)


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

[Libreoffice-commits] .: 2 commits - desktop/win32

[Jesús Corrius]

 desktop/win32/source/applauncher/appusermodelid.cxx |2 +-
 desktop/win32/source/applauncher/launcher.hxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8fd58d062786a44572a087f16476cd5fc01c0408
Author: Jesús Corrius 
Date:   Thu May 24 10:12:39 2012 +0200

replace wcscat_s -> wcscat to please minGW

diff --git a/desktop/win32/source/applauncher/appusermodelid.cxx 
b/desktop/win32/source/applauncher/appusermodelid.cxx
index 721fefa..2095817 100644
--- a/desktop/win32/source/applauncher/appusermodelid.cxx
+++ b/desktop/win32/source/applauncher/appusermodelid.cxx
@@ -37,7 +37,7 @@ void SetExplicitAppUserModelID(PCWSTR AppID)
 {
WCHAR szShell32[MAX_PATH];
GetSystemDirectoryW(szShell32, MAX_PATH);
-   wcscat_s(szShell32, MAX_PATH, L"\\Shell32.dll");
+   wcscat(szShell32, L"\\Shell32.dll");
 
HINSTANCE hinstDll = LoadLibraryW(szShell32);
 
commit dbbda42a4373dcd28c9f3b11a9d66fa1f69bbb85
Author: Jesús Corrius 
Date:   Thu May 24 10:10:28 2012 +0200

include files always in lowercase

diff --git a/desktop/win32/source/applauncher/launcher.hxx 
b/desktop/win32/source/applauncher/launcher.hxx
index 0dcf720..e602bfe 100644
--- a/desktop/win32/source/applauncher/launcher.hxx
+++ b/desktop/win32/source/applauncher/launcher.hxx
@@ -4,7 +4,7 @@
 #error Need C++ to compile
 #endif
 
-#include 
+#include 
 
 #ifndef _INC_TCHAR
 #   ifdef UNICODE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW 3-5] fdo#48932 speed up scrolling/typing in huge writer documents

[Caolán McNamara]

fdo#48932 is a large 7000 page document which reacts very slowly on text
input and scrolling around. It appears to be mostly managing the
header/footer and page break indicators which makes it sluggish

b63766b3dd453a82f59db505c736d861f662cc0f make it fast again, and seem to
have no side efforts. Though I'd like to have someone else verify that.

Attached is a backport to 3-5 to apply cleanly.

C.
>From 4bada122523dfaf4441341e0f86b1ba98b5ce3b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
Date: Thu, 24 May 2012 08:57:17 +0100
Subject: [PATCH] Resolves: fdo#48932 super slow typing and scrolling in large
 documents

AFAICS it appears that theres a one to one mapping from a SwFrameControl to
a SwFrm, so in any of the three given classes of Page, Footer or Header a
SwFrm will have zero or one SwFrameControls and a SwFrameControl doesn't
get rebound to a different SwFrm or anything like that, so we can use
a map and index off the SwFrm* to find them rather than constantly
looping over vectors to find the right one.

Maybe could move the SwFrameControl directly in the SwPageFrm's
themselves.

Change-Id: I4de0a34f657143ef2d4409b604cc8e114dad132f
---
 sw/source/ui/docvw/FrameControlsManager.cxx |  110 ---
 sw/source/ui/inc/FrameControlsManager.hxx   |6 +-
 2 files changed, 37 insertions(+), 79 deletions(-)

diff --git a/sw/source/ui/docvw/FrameControlsManager.cxx b/sw/source/ui/docvw/FrameControlsManager.cxx
index 5c00b58..1413942 100644
--- a/sw/source/ui/docvw/FrameControlsManager.cxx
+++ b/sw/source/ui/docvw/FrameControlsManager.cxx
@@ -37,21 +37,6 @@
 
 using namespace std;
 
-namespace
-{
-class FramePredicate
-{
-const SwFrm* m_pToMatch;
-
-public:
-FramePredicate( const SwFrm* pFrm ) : m_pToMatch( pFrm ) { };
-virtual ~FramePredicate() {};
-
-virtual bool operator()( SwFrameControlPtr pToCheck )
-{ return m_pToMatch == pToCheck->GetFrame(); };
-};
-}
-
 SwFrameControlsManager::SwFrameControlsManager( SwEditWin* pEditWin ) :
 m_pEditWin( pEditWin ),
 m_aControls( )
@@ -60,14 +45,6 @@ SwFrameControlsManager::SwFrameControlsManager( SwEditWin* pEditWin ) :
 
 SwFrameControlsManager::~SwFrameControlsManager()
 {
-map< FrameControlType, vector< SwFrameControlPtr > >::iterator pIt = m_aControls.begin();
-
-while ( pIt != m_aControls.end() )
-{
-pIt->second.clear( );
-++pIt;
-}
-m_aControls.clear();
 }
 
 SwFrameControlsManager::SwFrameControlsManager( const SwFrameControlsManager& rCopy ) :
@@ -85,75 +62,66 @@ const SwFrameControlsManager& SwFrameControlsManager::operator=( const SwFrameCo
 
 SwFrameControlPtr SwFrameControlsManager::GetControl( FrameControlType eType, const SwFrm* pFrm )
 {
-SwFrameControlPtr pControl;
-
-vector< SwFrameControlPtr >& aControls = m_aControls[eType];
+SwFrameControlPtrMap& rControls = m_aControls[eType];
 
-vector< SwFrameControlPtr >::iterator pIt = find_if(
-aControls.begin(), aControls.end( ), FramePredicate( pFrm ) );
+SwFrameControlPtrMap::iterator aIt = rControls.find(pFrm);
 
-if ( pIt != aControls.end() )
-pControl = *pIt;
+if (aIt != rControls.end())
+return aIt->second;
 
-return pControl;
+return SwFrameControlPtr();
 }
 
-std::vector< SwFrameControlPtr >& SwFrameControlsManager::GetControls( FrameControlType eType )
+SwFrameControlPtrMap& SwFrameControlsManager::GetControls( FrameControlType eType )
 {
 return m_aControls[eType];
 }
 
 void SwFrameControlsManager::AddControl( FrameControlType eType, SwFrameControlPtr pControl )
 {
-m_aControls[eType].push_back( pControl );
+m_aControls[eType].insert(make_pair(pControl->GetFrame(), pControl));
 }
 
 void SwFrameControlsManager::RemoveControls( const SwFrm* pFrm )
 {
-map< FrameControlType, vector< SwFrameControlPtr > >::iterator pIt = m_aControls.begin();
+map< FrameControlType, SwFrameControlPtrMap >::iterator pIt = m_aControls.begin();
 
 while ( pIt != m_aControls.end() )
 {
-vector< SwFrameControlPtr >& aVect = pIt->second;
-aVect.erase( remove_if( aVect.begin(),
-aVect.end(),
-FramePredicate( pFrm ) ), aVect.end() );
+SwFrameControlPtrMap& rMap = pIt->second;
+rMap.erase(pFrm);
 ++pIt;
 }
 }
 
 void SwFrameControlsManager::RemoveControlsByType( FrameControlType eType, const SwFrm* pFrm )
 {
-vector< SwFrameControlPtr >& aVect = m_aControls[eType];
-aVect.erase( remove_if( aVect.begin(),
-aVect.end(),
-FramePredicate( pFrm ) ), aVect.end() );
+SwFrameControlPtrMap& rMap = m_aControls[eType];
+rMap.erase(pFrm);
 }
 
-
 void SwFrameControlsManager::HideControls( FrameControlType eType )
 {
-vector< SwFrameControlPtr >::iterator pIt = m_aControls[eType].begin();
+SwFrameCont

Re: [PUSHED][REVIEW-3-5] Better fix for ThreadPool/ORequestThread life cycle

[Caolán McNamara]

On Wed, 2012-05-23 at 14:33 +0200, Stephan Bergmann wrote:
> With this second fix, however, calling unopkg add/remove of active.oxt 
> and passive.oxt (from desktop/test/deployment/) in a tight loop revealed 
> no anomalies any longer, on neither master nor libreoffice-3-5 (and on 
> master, I let it burn cycles all night long

Seeing as an all-night unopkg add/remove loop was the test criteria the
last time this sort of thing arose, pushed this now.

C. 

threads: "more trouble than they're worth" :-)

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

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - binaryurp/source cppu/inc cppu/source cpputools/source cppu/util

[Caolán McNamara]

 binaryurp/source/bridge.cxx   |  205 +++---
 binaryurp/source/bridge.hxx   |   25 ++--
 binaryurp/source/bridgefactory.cxx|2 
 binaryurp/source/incomingrequest.cxx  |2 
 binaryurp/source/reader.cxx   |2 
 binaryurp/source/writer.cxx   |2 
 cppu/inc/uno/threadpool.h |8 -
 cppu/source/threadpool/thread.cxx |  184 +-
 cppu/source/threadpool/thread.hxx |   52 +++-
 cppu/source/threadpool/threadpool.cxx |  124 ++--
 cppu/source/threadpool/threadpool.hxx |   43 ++-
 cppu/util/makefile.mk |2 
 cpputools/source/unoexe/unoexe.cxx|4 
 13 files changed, 372 insertions(+), 283 deletions(-)

New commits:
commit b7721ccca2f76c52dd6c6bb9b8f673fb276fea52
Author: Stephan Bergmann 
Date:   Wed May 23 09:42:37 2012 +0200

Better fix for ThreadPool/ORequestThread life cycle

This is a follow up to d015384e1d98fe77fd59339044f58efb1ab9fb25 "Fixed
ThreadPool (and dependent ORequestThread) life cycle" that still had some
problems:

* First, if Bridge::terminate was first entered from the reader or writer
thread, it would not join on that thread, so that thread could still be 
running
during exit.

That has been addressed by giving Bridge::dispose new semantics:  It waits 
until
both Bridge::terminate has completed (even if that was called from a 
different
thread) and all spawned threads (reader, writer, ORequestThread workers) 
have
been joined.  (This implies that Bridge::dispose must not be called from 
such a
thread, to avoid deadlock.)

* Second, if Bridge::terminate was first entered from an ORequestThread, the
call to uno_threadpool_dispose(0) to join on all such worker threads could
deadlock.

That has been addressed by making the last call to uno_threadpool_destroy 
wait
to join on all worker threads, and by calling uno_threadpool_destroy only 
from
the final Bridge::terminate (from Bridge::dispose), to avoid deadlock.  (The
special semantics of uno_threadpool_dispose(0) are no longer needed and have
been removed, as they conflicted with the fix for the third problem below.)

* Third, once uno_threadpool_destroy had called uno_threadpool_dispose(0), 
the
ThreadAdmin singleton had been disposed, so no new remote bridges could
successfully be created afterwards.

That has been addressed by making ThreadAdmin a member of ThreadPool, and 
making
(only) those uno_ThreadPool handles with overlapping life spans share one
ThreadPool instance (which thus is no longer a singleton, either).
Additionally, ORequestThread has been made more robust (in the style of
salhelper::Thread) to avoid races.

(cherry picked from commit 2fa2660b55a34a5780f9ea8dbbbe92d05dc9a818)

Conflicts:

binaryurp/source/bridge.cxx
cppu/Library_cppu.mk
cppu/source/threadpool/threadpool.cxx

Change-Id: I2cbd1b3f9aecc1bf4649e482d2c22b33b471788f

Signed-off-by: Caolán McNamara 

diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index f591fe0..13987fe 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -105,11 +105,9 @@ extern "C" void SAL_CALL 
freeProxyCallback(uno_ExtEnvironment *, void * pProxy)
 static_cast< Proxy * >(pProxy)->do_free();
 }
 
-void joinThread(osl::Thread * thread) {
+bool isThread(osl::Thread * thread) {
 assert(thread != 0);
-if (thread->getIdentifier() != osl::Thread::getCurrentIdentifier()) {
-thread->join();
-}
+return osl::Thread::getCurrentIdentifier() == thread->getIdentifier();
 }
 
 class AttachThread: private boost::noncopyable {
@@ -213,8 +211,8 @@ Bridge::Bridge(
 rtl::OUString(
 RTL_CONSTASCII_USTRINGPARAM(
 "com.sun.star.bridge.XProtocolProperties::commitChange"))),
-threadPool_(0), currentContextMode_(false), proxies_(0), calls_(0),
-normalCall_(false), activeCalls_(0), terminated_(false),
+state_(STATE_INITIAL), threadPool_(0), currentContextMode_(false),
+proxies_(0), calls_(0), normalCall_(false), activeCalls_(0),
 mode_(MODE_REQUESTED)
 {
 assert(factory.is() && connection.is());
@@ -238,11 +236,14 @@ void Bridge::start() {
 rtl::Reference< Writer > w(new Writer(this));
 {
 osl::MutexGuard g(mutex_);
-assert(threadPool_ == 0 && !writer_.is() && !reader_.is());
+assert(
+state_ == STATE_INITIAL && threadPool_ == 0 && !writer_.is() &&
+!reader_.is());
 threadPool_ = uno_threadpool_create();
 assert(threadPool_ != 0);
 reader_ = r;
 writer_ = w;
+state_ = STATE_STARTED;
 }
 // It is important to call reader_->create() last here; both
 // Writer::execute and Reader::execute can call Bridge::terminate, but
@@ -

build time optimization

[David Ostrovsky]

Hi,

I'm trying to accelerate LO (developer) build on linux_x86-64 system.
Before you point me to wiki (distributed build, ccache and friends)
and tell me to use ramdisk: I already did it all and it is still need to 
be optimized ;-)


There are many disable configure options already, like disable mozilla 
and friends,
and for some libs the combination does the job, like disable xmlsec and 
disable mozilla does disable nss.


Then next step would be not to build external libs during LO build.
There is a magic option: --with-system-libs.
If you try this option on debian based systems (x86_64) you would 
probably end up with

clucene dependency not met error.

Just a matter of installing those two available clucene packages?
Unfortunately not: as it turns out those packages are hopelessly 
outdated (2008).
So, just pick the version, that is shipped with LO, apply the patches in 
clucene directory and

make install and we are done?
Unfortunately not, because the next error probably would be 
clucene-contrib-lib is missing.
As it turns out, there is still one clucene patch missing: to force 
clucene-contrib-lib to be actually installed.
After applying this missing patch to clucene-contrib-lib build file the 
installation was sucessfull,

and then next missing external dependency error appears ;-)

(And with other external libs you would probably end up messing around 
with pkg-config because pc files are missing)


But wait, LO does it already during the build, doesn't it?
It picks up the really fresh external lib, applies his own patches and 
install it to his working dir ...

just to throw it away after make clean ;-(

I'm thinking about another magic configure option, like
--with-external-lib-directory=/opt/libo
this would install all dependend libs to this directory during first 
build and this would *survive* the make clean
call, so the next time all external lib artifacts would be reused from 
there.
The best is, this option would also help to accelerate the build on 
other platforms!


Unfortunately this option would not be so easy to implement, I guess.
Another thoughts on that?

Ciao
David



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