date:20130621

 sc/source/core/tool/scmatrix.cxx |   39 +++
 1 file changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 093146191760973c5c05e57f43c05aede71a8641
Author: Kohei Yoshida 
Date:   Sat Jun 22 01:20:04 2013 -0400

Use position objects for more efficient element value lookups.

The underlying multi_type_vector didn't have the concept of position objects
back when the matrix was reworked. It is now available, and there is no 
reason
why we shouldn't use it to speed things up.

Change-Id: Iac75a5584779c16e6eff7fcd577fc3d717c3c2e7

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 010f8dc..26fe7d3 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -128,12 +128,13 @@ void compareMatrix(MatrixImplType& rMat)
 {
 for (size_t j = 0; j < aDim.column; ++j)
 {
-mdds::mtm::element_t eType = rMat.get_type(i, j);
+MatrixImplType::const_position_type aPos = rMat.position(i, j);
+mdds::mtm::element_t eType = rMat.get_type(aPos);
 if (eType != mdds::mtm::element_numeric && eType != 
mdds::mtm::element_boolean)
 // must be of numeric type (boolean can be numeric).
 continue;
 
-double fVal = rMat.get_numeric(i, j);
+double fVal = rMat.get_numeric(aPos);
 if (!::rtl::math::isFinite(fVal))
 /* FIXME: this silently skips an error instead of propagating 
it! */
 continue;
@@ -469,20 +470,17 @@ OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) 
const
 if (ValidColRowOrReplicated( nC, nR ))
 {
 double fErr = 0.0;
-switch (maMat.get_type(nR, nC))
+MatrixImplType::const_position_type aPos = maMat.position(nR, nC);
+switch (maMat.get_type(aPos))
 {
 case mdds::mtm::element_string:
-return maMat.get(nR, nC);
+return maMat.get_string(aPos);
 case mdds::mtm::element_empty:
 return EMPTY_OUSTRING;
 case mdds::mtm::element_numeric:
-OSL_FAIL("ScMatrixImpl::GetString: access error, no string");
-fErr = maMat.get(nR, nC);
-break;
 case mdds::mtm::element_boolean:
 OSL_FAIL("ScMatrixImpl::GetString: access error, no string");
-fErr = maMat.get(nR, nC);
-break;
+fErr = maMat.get_numeric(aPos);
 default:
 OSL_FAIL("ScMatrixImpl::GetString: access error, no string");
 }
@@ -511,10 +509,11 @@ OUString ScMatrixImpl::GetString( SvNumberFormatter& 
rFormatter, SCSIZE nC, SCSI
 }
 
 double fVal = 0.0;
-switch (maMat.get_type(nR, nC))
+MatrixImplType::const_position_type aPos = maMat.position(nR, nC);
+switch (maMat.get_type(aPos))
 {
 case mdds::mtm::element_string:
-return maMat.get(nR, nC);
+return maMat.get_string(aPos);
 case mdds::mtm::element_empty:
 {
 if (!maMatFlag.get(nR, nC))
@@ -530,10 +529,8 @@ OUString ScMatrixImpl::GetString( SvNumberFormatter& 
rFormatter, SCSIZE nC, SCSI
 return aStr;
 }
 case mdds::mtm::element_numeric:
-fVal = maMat.get(nR, nC);
-break;
 case mdds::mtm::element_boolean:
-fVal = maMat.get(nR, nC);
+fVal = maMat.get_numeric(aPos);
 break;
 default:
 ;
@@ -558,20 +555,21 @@ ScMatrixValue ScMatrixImpl::Get(SCSIZE nC, SCSIZE nR) 
const
 ScMatrixValue aVal;
 if (ValidColRowOrReplicated(nC, nR))
 {
-mdds::mtm::element_t eType = maMat.get_type(nR, nC);
+MatrixImplType::const_position_type aPos = maMat.position(nR, nC);
+mdds::mtm::element_t eType = maMat.get_type(aPos);
 switch (eType)
 {
 case mdds::mtm::element_boolean:
 aVal.nType = SC_MATVAL_BOOLEAN;
-aVal.fVal = maMat.get_boolean(nR, nC);
+aVal.fVal = maMat.get_boolean(aPos);
 break;
 case mdds::mtm::element_numeric:
 aVal.nType = SC_MATVAL_VALUE;
-aVal.fVal = maMat.get_numeric(nR, nC);
+aVal.fVal = maMat.get_numeric(aPos);
 break;
 case mdds::mtm::element_string:
 aVal.nType = SC_MATVAL_STRING;
-aVal.aStr = maMat.get_string(nR, nC);
+aVal.aStr = maMat.get_string(aPos);
 break;
 case mdds::mtm::element_empty:
 // Empty path equals empty plus flag.
@@ -775,12 +773,13 @@ double EvalMatrix(const MatrixImplType& rMat)
 {
 for (size_t j = 0; j < nCols; ++j)
 {
-mdds::mtm::element_t eType = rMat.get_type(i, j);
+MatrixImplType::const_position_type aPos = rMat.

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

2013-06-21 Thread fourier

 svx/source/svdraw/svdotext.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit aaa8271292afd913b9aef20f444ef261928943df
Author: Neil Voss (fourier) 
Date:   Fri May 24 08:19:03 2013 -0500

fdo#42134 FORMATTING: Autofit does not work properly on long texts

Change-Id: I18e314913122ffbc15659ced9d1b746d10ccc17c
(cherry picked from commit bddf3bba1fa13b57a69f2bd5f7c7f96bb945066d)

Signed-off-by: Thorsten Behrens 

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index efb5227..387a561 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1284,6 +1284,12 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, 
const Size& rTextSize,
 fFactor = double(rTextSize.Width())/aCurrTextSize.Width();
 else
 fFactor = double(rTextSize.Height())/aCurrTextSize.Height();
+// fFactor scales in both x and y directions
+// - this is fine for bulleted words
+// - but it scales too much for a long paragraph
+// - taking sqrt scales long paragraphs the best
+// - bulleted words will have to go through more iterations
+fFactor = std::sqrt(fFactor);
 
 sal_uInt16 nCurrStretchX, nCurrStretchY;
 rOutliner.GetGlobalCharStretching(nCurrStretchX, nCurrStretchY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] tb3: tinderbox coordinator

2013-06-21 Thread Thorsten Behrens (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4166

Approvals:
  Thorsten Behrens: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5364dbb25cebd160a967995e2c96fad8fddd7e0b
Gerrit-PatchSet: 3
Gerrit-Project: buildbot
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen 
Gerrit-Reviewer: Norbert Thiebaud 
Gerrit-Reviewer: Thorsten Behrens 

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

[Libreoffice-commits] buildbot.git: tb3/dist-packages tb3/Makefile tb3/tb3 tb3/tb3-set-commit-finished tb3/tb3-set-commit-running tb3/tb3-show-history tb3/tb3-show-proposals tb3/tb3-show-state tb3/tes

2013-06-21 Thread Bjoern Michaelsen

 tb3/Makefile   |   17 ++
 tb3/dist-packages/tb3/__init__.py  |   10 +
 tb3/dist-packages/tb3/repostate.py |  212 +
 tb3/dist-packages/tb3/scheduler.py |  105 ++
 tb3/tb3|  137 +++
 tb3/tb3-set-commit-finished|1 
 tb3/tb3-set-commit-running |1 
 tb3/tb3-show-history   |1 
 tb3/tb3-show-proposals |1 
 tb3/tb3-show-state |1 
 tb3/tests/helpers.py   |   44 +++
 tb3/tests/tb3-cli.py   |   56 +
 tb3/tests/tb3/repostate.py |  147 +
 tb3/tests/tb3/scheduler.py |  110 +++
 14 files changed, 843 insertions(+)

New commits:
commit ee79937f7f02ab4e04e0454db218a6c5a5a6f372
Author: Bjoern Michaelsen 
Date:   Wed Jun 5 17:05:44 2013 +0200

tb3: tinderbox coordinator

tb3 is an robust asyncronous tinderbox coodinator allowing multiple 
builders to
coordinate work in a distributed fashion.

Change-Id: I5364dbb25cebd160a967995e2c96fad8fddd7e0b
Reviewed-on: https://gerrit.libreoffice.org/4166
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/tb3/Makefile b/tb3/Makefile
new file mode 100644
index 000..b03b70a
--- /dev/null
+++ b/tb3/Makefile
@@ -0,0 +1,17 @@
+define runtest
+./tests/tb3/$(1).py
+endef
+
+test: test-repostate test-scheduler test-cli
+   @true
+.PHONY: test
+
+test-%:
+   $(call runtest,$*)
+
+test-cli:
+   ./tests/tb3-cli.py
+
+.PHONY: test-%
+
+# vim: set noet sw=4 ts=4:
diff --git a/tb3/dist-packages/tb3/__init__.py 
b/tb3/dist-packages/tb3/__init__.py
new file mode 100644
index 000..c7a73e3
--- /dev/null
+++ b/tb3/dist-packages/tb3/__init__.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# vim: set et sw=4 ts=4:
diff --git a/tb3/dist-packages/tb3/repostate.py 
b/tb3/dist-packages/tb3/repostate.py
new file mode 100644
index 000..dd4e877
--- /dev/null
+++ b/tb3/dist-packages/tb3/repostate.py
@@ -0,0 +1,212 @@
+#! /usr/bin/env python
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+import sh
+import json
+import datetime
+
+class StateEncoder(json.JSONEncoder):
+def default(self, obj):
+if isinstance(obj, datetime.datetime):
+return [ '__datetime__', (obj - 
datetime.datetime(1970,1,1)).total_seconds() ]
+elif isinstance(obj, datetime.timedelta):
+return [ '__timedelta__', obj.total_seconds() ]
+return json.JSONEncoder.default(self, obj)
+
+class StateDecoder(json.JSONDecoder):
+def decode(self, s):
+obj = super(StateDecoder, self).decode(s)
+for (key, value) in obj.iteritems():
+if isinstance(value, list):
+if value[0] == '__datetime__':
+obj[key] = datetime.datetime.utcfromtimestamp(value[1])
+elif value[0] == '__timedelta__':
+obj[key] = datetime.timedelta(float(value[1]))
+return obj
+
+class RepoState:
+def __init__(self, platform, branch, repo):
+self.platform = platform
+self.branch = branch
+self.repo = repo
+self.git = sh.git.bake(_cwd=repo)
+def __str__(self):
+(last_good, first_bad, last_bad) = (self.get_last_good(), 
self.get_first_bad(), self.get_last_bad())
+result = 'State of repository %s on branch %s for platform %s' % 
(self.repo, self.branch, self.platform)
+result += '\nhead: %s' % (self.get_head())
+if last_good:
+result += '\nlast good commit: %s (%s-%d)' % (last_good, 
self.branch, self.__distance_to_branch_head(last_good))
+if first_bad:
+result += '\nfirst bad commit: %s (%s-%d)' % (first_bad, 
self.branch, self.__distance_to_branch_head(first_bad))
+if last_bad:
+result += '\nlast  bad commit: %s (%s-%d)' % (last_bad, 
self.branch, self.__distance_to_branch_head(last_bad))
+return result
+def __resolve_ref(self, refname):
+try:
+return self.git('show-ref', refname).split(' ')[0]
+except sh.ErrorReturnCode_1:
+return None
+def __distance_to_branch_head(self, commit):
+return int(self.git('rev-list', '--count', '%s..%s' % (commit, 
self.branch)))
+def __get_fullref(self, name):
+return 'refs/tb3/state/%s/%s/%s' % (self.platform, self.branch, name)
+def __set_ref(self, refname, target):

[Libreoffice-commits] core.git: svx/source

2013-06-21 Thread fourier

 svx/source/svdraw/svdotext.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit bddf3bba1fa13b57a69f2bd5f7c7f96bb945066d
Author: Neil Voss (fourier) 
Date:   Fri May 24 08:19:03 2013 -0500

fdo#42134 FORMATTING: Autofit does not work properly on long texts

Change-Id: I18e314913122ffbc15659ced9d1b746d10ccc17c

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index efb5227..387a561 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1284,6 +1284,12 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, 
const Size& rTextSize,
 fFactor = double(rTextSize.Width())/aCurrTextSize.Width();
 else
 fFactor = double(rTextSize.Height())/aCurrTextSize.Height();
+// fFactor scales in both x and y directions
+// - this is fine for bulleted words
+// - but it scales too much for a long paragraph
+// - taking sqrt scales long paragraphs the best
+// - bulleted words will have to go through more iterations
+fFactor = std::sqrt(fFactor);
 
 sal_uInt16 nCurrStretchX, nCurrStretchY;
 rOutliner.GetGlobalCharStretching(nCurrStretchX, nCurrStretchY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/inc sc/source

 sc/inc/dociter.hxx   |7 +++
 sc/source/core/data/dociter.cxx  |   28 +++-
 sc/source/core/data/documen8.cxx |2 ++
 sc/source/core/data/fillinfo.cxx |   18 ++
 4 files changed, 42 insertions(+), 13 deletions(-)

New commits:
commit 38afe6ebddcc54534930941c936437b508a2ca47
Author: Kohei Yoshida 
Date:   Fri Jun 21 20:11:27 2013 -0400

Prevent crash during on-line spell checking.

The new ScHorizontalCellIterator internally uses iterators for each
column to track positions. This means that, if a cell value in the iteration
range chnages while the iteration is on-going, those internal iterators
get invalidated. Allow the client code to rehash the iterators when 
modifying
a cell content during iteration.

Having said that, it's best not to modify cells during iteration.

Change-Id: Ida453d4f883e1fbcbab4eb0401e37fea8c0b901d

diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 2452a60..9458aae 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -441,6 +441,13 @@ public:
 /// Set a(nother) sheet and (re)init.
 voidSetTab( SCTAB nTab );
 
+/**
+ * When modifying a cell while still in iteration, call this to re-fetch
+ * the column iterators used internally because the old iterators have
+ * been invalidated.
+ */
+void RehashCol( SCCOL nCol );
+
 private:
 voidAdvance();
 };
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 9c24aae..1cdc52c 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1695,7 +1695,7 @@ 
ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB
 nEndRow( nRow2 ),
 mnCol( nCol1 ),
 mnRow( nRow1 ),
-bMore( true )
+bMore(false)
 {
 if (mnTab >= pDoc->GetTableCount())
 OSL_FAIL("try to access index out of bounds, FIX IT");
@@ -1714,24 +1714,42 @@ ScHorizontalCellIterator::~ScHorizontalCellIterator()
 
 void ScHorizontalCellIterator::SetTab( SCTAB nTabP )
 {
+bMore = false;
 mnTab = nTabP;
 mnRow = nStartRow;
 mnCol = nStartCol;
-bMore = true;
 
 // Set the start position in each column.
 for (SCCOL i = nStartCol; i <= nEndCol; ++i)
 {
 ScColumn* pCol = &pDoc->maTabs[mnTab]->aCol[i];
-maColPositions[i-nStartCol].maPos = 
pCol->maCells.position(nStartRow).first;
-maColPositions[i-nStartCol].maEnd = pCol->maCells.end();
+ColParam& rParam = maColPositions[i-nStartCol];
+rParam.maPos = pCol->maCells.position(nStartRow).first;
+rParam.maEnd = pCol->maCells.end();
+if (rParam.maPos != rParam.maEnd)
+bMore = true;
 }
 
-if (maColPositions[0].maPos->type == sc::element_type_empty)
+if (!bMore)
+return;
+
+ColParam& rParam = maColPositions[0];
+if (rParam.maPos == rParam.maEnd || rParam.maPos->type == 
sc::element_type_empty)
 // Skip to the first non-empty cell.
 Advance();
 }
 
+void ScHorizontalCellIterator::RehashCol( SCCOL nCol )
+{
+if (nCol < nStartCol || nEndCol < nCol)
+return;
+
+ColParam& rParam = maColPositions[nCol-nStartCol];
+ScColumn& rCol = pDoc->maTabs[mnTab]->aCol[nCol];
+rParam.maPos = rCol.maCells.position(mnRow).first;
+rParam.maEnd = rCol.maCells.end();
+}
+
 ScRefCellValue* ScHorizontalCellIterator::GetNext( SCCOL& rCol, SCROW& rRow )
 {
 if (!bMore)
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 570a14c..4c64c45 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -827,12 +827,14 @@ bool ScDocument::OnlineSpellInRange( const ScRange& 
rSpellRange, ScAddress& rSpe
 {
 // The cell will take ownership of pNewData.
 SetEditText(ScAddress(nCol,nRow,nTab), 
pEngine->CreateTextObject());
+aIter.RehashCol(nCol);
 }
 else
 {
 ScSetStringParam aParam;
 aParam.setTextInput();
 SetString(ScAddress(nCol,nRow,nTab), pEngine->GetText(), 
&aParam);
+aIter.RehashCol(nCol);
 }
 
 //  Paint
commit d873f62d49c61a7943dd6ea2ade9d3549ce5a965
Author: Kohei Yoshida 
Date:   Fri Jun 21 18:05:46 2013 -0400

Fix my wrong logic in row info iteration.

Align the array position of RowInfo by comparing its nRowNo value with
the current row number.

Change-Id: Idd26636cac0ba4ade1b538dd68580b469611da04

diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 34c2562..5f9b6ce 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -145,8 +145,16 @@ class RowInfoFiller
 return mbHiddenRow;
 }
 
-void setInfo(size_t /*nRow*/, const ScRe

Re: [ANN] gerrit daily digest active, please add yourself to watched projects, gerrit firehose ends 2013-06-17 0000UTC

2013-06-21 Thread Mat M

Hello

Le Fri, 21 Jun 2013 10:50:42 +0200, Bjoern Michaelsen
a écrit:

Hi Mat,

On Thu, Jun 20, 2013 at 11:46:51PM +0200, Mat M wrote:

Mind to merge my patch, please ?
http://nabble.documentfoundation.org/LibreOffice-Gerrit-News-2013-06-17-tp4061810p4062117.html

Thank you :)

That patch doesnt apply cleanly as you created it against an outdated
version:

Sorry! I git-pulled before doing the changes and started from commit
073e1c2f3ae from Lubos.

Maybe my workdir was not clean.

Applying: Update itemization's output
error: patch failed: gerritbot/send-daily-digest:27
error: gerritbot/send-daily-digest: patch does not apply
Patch failed at 0001 Update itemization's output
The copy of the patch that failed is found in:
/home/bjoern/checkouts/dev-tools/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

PLEASE: Next time, instead of attaching a plain patch to a mail, please
just

push to gerrit, as that saves a lot of such avoidable trouble, esp. when
patches do not cleanly apply on master.

h! Still forgot gerrit is also working for dev-tools. Sincere
apologies !

Anyway, pushed and deployed as:

https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=commit;h=ef48d775c8baa039e2f16ef7da928d99c2c27994
(which accidentally added a compiled pyc file as I had to manually merge
and

apply that one)

Best,

Bjoern

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

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

Joel Madero  changed:

   What|Removed |Added

 Depends on|66025   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 60270] LibreOffice 4.1 most annoying bugs

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

Tim Bentley  changed:

   What|Removed |Added

 Depends on||66025

-- 
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: LO / Firebird DB Integration

2013-06-21 Thread Andrzej J. R. Hunt

On 20/06/13 20:10, Javier Fernandez wrote:
>
>> I'm also not entirely certain everything will work as expected yet
>> either -- I haven't found a definitive list of files which Firebird 2.5
>> requires in embedded mode -- if anything is missing it can be however
>> easily be added to the bottom of firebird/ExternalPackage_firebird.mk.
> Firebird embedded only requires the libfbembed.so library, just that.
I think I was confused by some outdated documentation for older versions
of Firebird -- just installing libfbembed.so seems to be sufficient to
make things work (i.e. base connects to the firebird db without issues).
I've also sorted out the path issues (see other recent email) --
hopefully things should now work as expected with the internal Firebird.

Cheers,

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

[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc' - firebird/ExternalPackage_firebird.mk firebird/ExternalProject_firebird.mk firebird/firebird-icu.patch.1 firebird/UnpackedTarball_firebi

2013-06-21 Thread Andrzej J . R . Hunt

 RepositoryExternal.mk|2 -
 firebird/ExternalPackage_firebird.mk |   25 ---
 firebird/ExternalProject_firebird.mk |   17 ++
 firebird/UnpackedTarball_firebird.mk |4 ++
 firebird/firebird-icu.patch.1|   58 +++
 5 files changed, 72 insertions(+), 34 deletions(-)

New commits:
commit 0981fd7a1f054f8344b5e525d3a79f0fd23ec9af
Author: Andrzej J.R. Hunt 
Date:   Fri Jun 21 21:23:59 2013 +0100

Patch Firebird to use LO icu.

Previously Firebird built it's bundled icu leading to extra libraries
and path issues.

Change-Id: Ib27e364da3b7e5bc56c7a784c0525426d635bf16

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2062b0a..09b207f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2220,8 +2220,6 @@ ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
 
 ifeq ($(SYSTEM_FIREBIRD),YES)
 
-$(call gb_LinkTarget__use_libatomic_ops,$(1))
-
 define gb_LinkTarget__use_firebird
 $(call gb_LinkTarget_set_include,$(1),\
$(FIREBIRD_CFLAGS) \
diff --git a/firebird/ExternalPackage_firebird.mk 
b/firebird/ExternalPackage_firebird.mk
index 4d72c9b..0a003d6 100644
--- a/firebird/ExternalPackage_firebird.mk
+++ b/firebird/ExternalPackage_firebird.mk
@@ -45,29 +45,4 @@ $(eval $(call 
gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5.2,gen/fireb
 $(eval $(call 
gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5))
 $(eval $(call 
gb_ExternalPackage_add_file,firebird,libfbembed.so,gen/firebird/lib/libfbembed.so))
 
-$(eval $(call gb_ExternalPackage_add_files,firebird,firebird,\
-gen/firebird/firebird.msg \
-gen/firebird/security2.fdb \
-))
-
-$(eval $(call gb_ExternalPackage_add_files,firebird,firebird/bin,\
-gen/firebird/bin/isql \
-))
-
-$(eval $(call gb_ExternalPackage_add_files,firebird,firebird/lib,\
-gen/firebird/lib/libfbembed.so.2.5.2 \
-gen/firebird/lib/libfbembed.so.2.5 \
-gen/firebird/lib/libfbembed.so \
-gen/firebird/lib/libicudata.so \
-gen/firebird/lib/libicudata.so.30 \
-gen/firebird/lib/libicudata.so.30.0 \
-gen/firebird/lib/libicuuc.so \
-gen/firebird/lib/libicuuc.so.30 \
-gen/firebird/lib/libicuuc.so.30.0 \
-gen/firebird/lib/libicui18n.so \
-gen/firebird/lib/libicui18n.so.30 \
-gen/firebird/lib/libicui18n.so.30.0 \
-))
-
-
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/ExternalProject_firebird.mk 
b/firebird/ExternalProject_firebird.mk
index 903e5c6..ca28dbb 100644
--- a/firebird/ExternalProject_firebird.mk
+++ b/firebird/ExternalProject_firebird.mk
@@ -31,17 +31,20 @@ $(eval $(call gb_ExternalProject_register_targets,firebird,\
 
 $(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
-   unset MAKEFLAGS && \
-   export CFLAGS="$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
-   && LDFLAGS="-L$(OUTDIR)/lib \
-   $(if $(filter LINUX 
FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
-   $(if $(SYSBASE),$(if $(filter LINUX 
SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
-   && CPPFLAGS="-I$(OUTDIR)/inc/external $(if 
$(SYSBASE),-I$(SYSBASE)/usr/include)" \
+   unset MAKEFLAGS \
&& export PKG_CONFIG="" \
+   && export CXXFLAGS="-L$(OUTDIR)/lib \
+   $(if $(filter NO,$(SYSTEM_BOOST)),-I$(call 
gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \
+   $(if $(filter NO,$(SYSTEM_ICU)), \
+   -I$(call gb_UnpackedTarball_get_dir,icu)/source 
\
+   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
+   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
+   ,$(ICU_CPPFLAGS))" \
+   && export LD_LIBRARY_PATH="$(OUTDIR)/lib" \
&& ./configure \
--without-editline \
--disable-superserver \
-   $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS)) \
+   --with-system-icu --without-fbsample 
--without-fbsample-db \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if $(filter IOS 
ANDROID,$(OS)),--disable-shared,--disable-static) \
diff --git a/firebird/UnpackedTarball_firebird.mk 
b/firebird/UnpackedTarball_firebird.mk
index ebdfab8..6ecc5fe 100644
--- a/firebird/UnpackedTarball_firebird.mk
+++ b/firebird/UnpackedTarball_firebird.mk
@@ -11,4 +11,8 @@ $(eval $(call gb

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

 sc/inc/fillinfo.hxx  |8 +---
 sc/source/core/data/fillinfo.cxx |1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit f8421c030d5c22d17e16fdbf3c99154a41cb9156
Author: Kohei Yoshida 
Date:   Fri Jun 21 16:16:24 2013 -0400

Make them officially non-copyable.

Change-Id: Ie8f8c2227b35ffb81f902458ce1b0a732b430b53

diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index a55d638..a89 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -25,6 +25,8 @@
 #include "colorscale.hxx"
 #include "cellvalue.hxx"
 
+#include 
+
 class SfxItemSet;
 class SvxBrushItem;
 class SvxBoxItem;
@@ -90,7 +92,7 @@ struct ScIconSetInfo
 bool mbShowValue;
 };
 
-struct CellInfo
+struct CellInfo : boost::noncopyable
 {
 ScRefCellValue  maCell;
 
@@ -145,7 +147,7 @@ struct CellInfo
 
 const SCCOL SC_ROTMAX_NONE = SCCOL_MAX;
 
-struct RowInfo
+struct RowInfo : boost::noncopyable
 {
 CellInfo*   pCellInfo;
 
@@ -166,7 +168,7 @@ private:
 RowInfo&operator=( const RowInfo& );
 };
 
-struct ScTableInfo
+struct ScTableInfo : boost::noncopyable
 {
 svx::frame::Array   maArray;
 RowInfo*mpRowInfo;
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index c0c02d6..34c2562 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -323,7 +323,6 @@ void ScDocument::FillInfo(
 //! Conditionals auch bei HASATTR_ROTATE abfragen 
 
 OSL_ENSURE( nArrCount>2, "nArrCount too small" );
-//  FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-2, nX1, nX2 );
 FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-1, nCol1, nCol2 );
 //  FindMaxRotCol setzt nRotMaxCol
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

 sc/source/core/data/fillinfo.cxx |  184 ++-
 1 file changed, 89 insertions(+), 95 deletions(-)

New commits:
commit 975351bf07cd83261258d60b5d734d34074c4804
Author: Kohei Yoshida 
Date:   Fri Jun 21 16:09:22 2013 -0400

A little more cleanup.

Remove CELLINFO macro, and rename nArrX and nArrY to nArrCol and nArrRow.

Change-Id: Id105cfefc44e454be2df96a4084dee9185435fab

diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index d34d914..c0c02d6 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -42,10 +42,6 @@
 #include "cellvalue.hxx"
 #include "mtvcellfunc.hxx"
 
-#include 
-
-// ---
-
 const sal_uInt16 ROWINFO_MAX = 1024;
 
 
@@ -129,8 +125,6 @@ static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE 
nArrY,
 rEndY = rStartY + pMerge->GetRowMerge() - 1;
 }
 
-#define CELLINFO(x,y) pRowInfo[nArrY+y].pCellInfo[nArrX+x]
-
 namespace {
 
 class RowInfoFiller
@@ -224,8 +218,8 @@ void ScDocument::FillInfo(
 SCCOL nX;
 SCROW nY;
 SCsROW nSignedY;
-SCCOL nArrX;
-SCSIZE nArrY;
+SCCOL nArrCol;
+SCSIZE nArrRow;
 SCSIZE nArrCount;
 bool bAnyMerged = false;
 bool bAnyShadow = false;
@@ -259,7 +253,7 @@ void ScDocument::FillInfo(
 
 //  zuerst nur die Eintraege fuer die ganze Spalte
 
-nArrY=0;
+nArrRow=0;
 SCROW nYExtra = nRow2+1;
 sal_uInt16 nDocHeight = ScGlobal::nStdRowHeight;
 SCROW nDocHeightEndRow = -1;
@@ -278,9 +272,9 @@ void ScDocument::FillInfo(
 nDocHeight = ScGlobal::nStdRowHeight;
 }
 
-if ( nArrY==0 || nDocHeight || nY > MAXROW )
+if ( nArrRow==0 || nDocHeight || nY > MAXROW )
 {
-RowInfo* pThisRowInfo = &pRowInfo[nArrY];
+RowInfo* pThisRowInfo = &pRowInfo[nArrRow];
 pThisRowInfo->pCellInfo = NULL; // wird unten 
belegt
 
 sal_uInt16 nHeight = (sal_uInt16) ( nDocHeight * fRowScale );
@@ -296,8 +290,8 @@ void ScDocument::FillInfo(
 pThisRowInfo->bPivotButton  = false;
 pThisRowInfo->nRotMaxCol= SC_ROTMAX_NONE;
 
-++nArrY;
-if (nArrY >= ROWINFO_MAX)
+++nArrRow;
+if (nArrRow >= ROWINFO_MAX)
 {
 OSL_FAIL("FillInfo: Range too big" );
 nYExtra = nSignedY; // Ende
@@ -308,7 +302,7 @@ void ScDocument::FillInfo(
 if (nSignedY==(SCsROW) nYExtra) // 
zusaetzliche Zeile verdeckt ?
 ++nYExtra;
 }
-nArrCount = nArrY;  // incl. Dummys
+nArrCount = nArrRow;  // incl. Dummys
 
 //  rotierter Text...
 
@@ -333,28 +327,28 @@ void ScDocument::FillInfo(
 FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-1, nCol1, nCol2 );
 //  FindMaxRotCol setzt nRotMaxCol
 
-for (nArrY=0; nArrY nRotMax)
-nRotMax = pRowInfo[nArrY].nRotMaxCol;
+for (nArrRow=0; nArrRow nRotMax)
+nRotMax = pRowInfo[nArrRow].nRotMaxCol;
 }
 
 //  Zell-Infos erst nach dem Test auf gedrehte allozieren
 //  bis nRotMax wegen nRotateDir Flag
 
-for (nArrY=0; nArrYnRowNo;
 pThisRowInfo->pCellInfo = new CellInfo[ nRotMax+1+2 ];  // vom 
Aufrufer zu loeschen !
 
-for (nArrX=0; nArrX<=nRotMax+2; nArrX++)// Zell-Infos 
vorbelegen
+for (nArrCol=0; nArrCol<=nRotMax+2; nArrCol++)// 
Zell-Infos vorbelegen
 {
-if (nArrX>0)
-nX = nArrX-1;
+if (nArrCol>0)
+nX = nArrCol-1;
 else
 nX = MAXCOL+1;  // ungueltig
 
-CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX];
+CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrCol];
 pInfo->bEmptyCellText = true;
 pInfo->maCell.clear();
 if (bPaintMarks)
@@ -392,9 +386,9 @@ void ScDocument::FillInfo(
 }
 }
 
-for (nArrX=nCol2+3; nArrX<=nRotMax+2; nArrX++)// restliche 
Breiten eintragen
+for (nArrCol=nCol2+3; nArrCol<=nRotMax+2; nArrCol++)// 
restliche Breiten eintragen
 {
-nX = nArrX-1;
+nX = nArrCol-1;
 if ( ValidCol(nX) )
 {
 if (!ColHidden(nX, nTab))
@@ -403,7 +397,7 @@ void ScDocument::FillInfo(
 if (!nThisWidth)
 nThisWidth = 1;
 
-pRowInfo[0].pCellInfo[nArrX].nWidth = nThisWidth;
+pRowInfo[0].pCellInfo[nArrCol].nWidth = nThisWidth;
 }
 }
 }
@@ -412,9 +406,9 @@ void ScDocument::FillInfo(
 if(pCondFormList)
 pCondFormList->startRendering();
 
-for (nArrX=0; nArrX<=nCol2+2; nArrX++)// links

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations

2013-06-21 Thread Andras Timar

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21d5c3de928eb3c7cad4aeb3a3f261d30660938e
Author: Andras Timar 
Date:   Fri Jun 21 21:47:35 2013 +0200

Updated core
Project: translations  99df805d26d7e5374d2ca8432d0782dd9da29cf9

diff --git a/translations b/translations
index 82fb702..99df805 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 82fb7022f021b89123154b424984098126d2620c
+Subproject commit 99df805d26d7e5374d2ca8432d0782dd9da29cf9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-1' - source/sid

2013-06-21 Thread Andras Timar

 source/sid/swext/mediawiki/help.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 99df805d26d7e5374d2ca8432d0782dd9da29cf9
Author: Andras Timar 
Date:   Fri Jun 21 21:47:35 2013 +0200

invalid xml

Change-Id: Idc29e27d5c486154ece1befc45a423f40f76ff11

diff --git a/source/sid/swext/mediawiki/help.po 
b/source/sid/swext/mediawiki/help.po
index e5013cf..2961e3d 100644
--- a/source/sid/swext/mediawiki/help.po
+++ b/source/sid/swext/mediawiki/help.po
@@ -46,7 +46,7 @@ msgctxt ""
 "bm_id3154408\n"
 "help.text"
 msgid "Wiki;Wiki 
PublisherWiki 
Publisherextensions;MediaWiki"
-msgstr "bookmark_value>Wiiki 
attamaanchoseedishshuwa;MediaWiki"
+msgstr "Wiiki 
attamaanchoseedishshuwa;MediaWiki"
 
 #: wiki.xhp
 msgctxt ""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sal

2013-06-21 Thread Eike Rathke

 include/sal/log-areas.dox |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 84fdba22e019658082d61317fac98b7e0d035de2
Author: Eike Rathke 
Date:   Fri Jun 21 21:45:18 2013 +0200

unknown log area 'sfx2.sidebar' [loplugin]

Change-Id: I49ed6652f92b1e1ec3091c976db40fb840f2ea78

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 5168260..a5d7517 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -202,6 +202,7 @@ certain functionality.
 @li @c sfx2.dialog
 @li @c sfx2.doc
 @li @c sfx2.notify
+@li @c sfx2.sidebar
 @li @c sfx2.view
 
 @section slideshow
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 3 commits - sc/inc sc/source

 sc/inc/document.hxx  |9 +--
 sc/inc/table.hxx |1 
 sc/source/core/data/column2.cxx  |   31 --
 sc/source/core/data/column3.cxx  |2 
 sc/source/core/data/document.cxx |7 --
 sc/source/core/data/fillinfo.cxx |  115 +++
 sc/source/core/data/table2.cxx   |5 -
 7 files changed, 75 insertions(+), 95 deletions(-)

New commits:
commit a40f7f1b4cb274e365ba27a9026f1ce3a1ad21ee
Author: Kohei Yoshida 
Date:   Fri Jun 21 15:39:46 2013 -0400

Rename parameter names for consistency.

nCol and nRow are better than nX and nY etc.

Change-Id: Ie92d4e2727a1100736610a3876721d61e8279b15

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3fc9fc0..3d28234 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1572,10 +1572,10 @@ public:
 voidSetSrcCharSet( CharSet eNew )   { eSrcSet = eNew; }
 voidUpdateFontCharSet();
 
-voidFillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, 
SCCOL nX2, SCROW nY2,
-SCTAB nTab, double nScaleX, double nScaleY,
-bool bPageMode, bool bFormulaMode,
-const ScMarkData* pMarkData = NULL );
+void FillInfo(
+ScTableInfo& rTabInfo, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2,
+SCTAB nTab, double fColScale, double fRowScale, bool bPageMode, bool 
bFormulaMode,
+const ScMarkData* pMarkData = NULL );
 
 SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
 
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 7f73391..d34d914 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -151,7 +151,7 @@ class RowInfoFiller
 return mbHiddenRow;
 }
 
-void setInfo(const ScRefCellValue& rCell)
+void setInfo(size_t /*nRow*/, const ScRefCellValue& rCell)
 {
 RowInfo* pThisRowInfo = &mpRowInfo[mrArrY];
 CellInfo* pInfo = &pThisRowInfo->pCellInfo[mnArrX];
@@ -169,25 +169,25 @@ public:
 void operator() (size_t nRow, double fVal)
 {
 if (!isHidden(nRow))
-setInfo(ScRefCellValue(fVal));
+setInfo(nRow, ScRefCellValue(fVal));
 }
 
 void operator() (size_t nRow, const OUString& rStr)
 {
 if (!isHidden(nRow))
-setInfo(ScRefCellValue(&rStr));
+setInfo(nRow, ScRefCellValue(&rStr));
 }
 
 void operator() (size_t nRow, const EditTextObject* p)
 {
 if (!isHidden(nRow))
-setInfo(ScRefCellValue(p));
+setInfo(nRow, ScRefCellValue(p));
 }
 
 void operator() (size_t nRow, const ScFormulaCell* p)
 {
 if (!isHidden(nRow))
-setInfo(ScRefCellValue(const_cast(p)));
+setInfo(nRow, ScRefCellValue(const_cast(p)));
 }
 
 void operator() (mdds::mtv::element_t, size_t, size_t nDataSize)
@@ -199,9 +199,10 @@ public:
 
 }
 
-void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL 
nX2, SCROW nY2,
-SCTAB nTab, double nScaleX, double nScaleY,
-bool bPageMode, bool bFormulaMode, const 
ScMarkData* pMarkData )
+void ScDocument::FillInfo(
+ScTableInfo& rTabInfo, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+SCTAB nTab, double fColScale, double fRowScale, bool bPageMode, bool 
bFormulaMode,
+const ScMarkData* pMarkData )
 {
 OSL_ENSURE( maTabs[nTab], "Table does not exist" );
 
@@ -259,10 +260,10 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL 
nX1, SCROW nY1, SCCOL nX
 //  zuerst nur die Eintraege fuer die ganze Spalte
 
 nArrY=0;
-SCROW nYExtra = nY2+1;
+SCROW nYExtra = nRow2+1;
 sal_uInt16 nDocHeight = ScGlobal::nStdRowHeight;
 SCROW nDocHeightEndRow = -1;
-for (nSignedY=((SCsROW)nY1)-1; nSignedY<=(SCsROW)nYExtra; nSignedY++)
+for (nSignedY=((SCsROW)nRow1)-1; nSignedY<=(SCsROW)nYExtra; nSignedY++)
 {
 if (nSignedY >= 0)
 nY = (SCROW) nSignedY;
@@ -282,7 +283,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL 
nX1, SCROW nY1, SCCOL nX
 RowInfo* pThisRowInfo = &pRowInfo[nArrY];
 pThisRowInfo->pCellInfo = NULL; // wird unten 
belegt
 
-sal_uInt16 nHeight = (sal_uInt16) ( nDocHeight * nScaleY );
+sal_uInt16 nHeight = (sal_uInt16) ( nDocHeight * fRowScale );
 if (!nHeight)
 nHeight = 1;
 
@@ -300,7 +301,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL 
nX1, SCROW nY1, SCCOL nX
 {
 OSL_FAIL("FillInfo: Range too big" );
 nYExtra = nSignedY; // Ende
-nY2 = nYExtra - 1;  // Bereich 
anpassen
+nRow2 = nYExtra - 1;  // 
Bereich anpassen

Re: LO / Firebird DB Integration

2013-06-21 Thread Andrzej J. R. Hunt

Hi there,

I've managed to get FB to build with the LO ICU eventually as suggested,
which saves having to do any changes to the RPATH -- that certainly
seems the most elegant solution (only one library is created, which ends
up in install/program).

Unfortunately I had to make some changes to the FB makefiles --
LD_LIBRARY_PATH has to be passed in for the binaries which the build
process creates and uses to work (since they link against LO's ICU),
however this gets overwritten in certain places in the FB build system,
which I've had to modify for the build to succeed.

(I still need to finish creating/integrating the FB patches, I'll push
this once I've tested that everything works as expected.)

Cheers,

Andrzej


On 20/06/13 19:20, Michael Stahl wrote:
> On 20/06/13 16:40, Andrzej J. R. Hunt wrote:
>
>> I've finally managed to figure out how to get the install working -- the
>> driver now loads fine. For the moment however the following is needed
>> for things to work:
>>
>> FIREBIRD=./install/program/firebird
>> LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):./install/program/firebird/lib
>> ../install/program/soffice.bin --base
>>
>> I'm not entirely sure how to provide these paths within LO to avoid
>> having to prepend them yet.
> why is it necessary to install the firebird libraries in some subdir of
> program?  all other libraries (with notable exceptions) live directly in
> program.  if the libraries have RPATH  "$ORIGIN:$ORIGIN/../ure-link/lib"
> then they'll be able to find the other libraries (but it may take some
> measures to get that RPATH in there).
>
>> I'm also not entirely certain everything will work as expected yet
>> either -- I haven't found a definitive list of files which Firebird 2.5
>> requires in embedded mode -- if anything is missing it can be however
>> easily be added to the bottom of firebird/ExternalPackage_firebird.mk.
>>
>> The firebird specific libraries (fb builds its own versions
>> libicuuc/libicudata/etc.) are currently in install/program/firebird/lib
> really?  it bundles its own ICU?  argh... can you teach it to use the
> LO's ICU instead?  no reason why we'd need to ship 2 sets of ICU libraries.
>
>> (I've simply copied the firebird installation structure into
>> install/program/firebird, although I've installed as few files as
>> possible as most of them seem to only be needed for a full FB server) --
>> I'm not entirely sure how correct this is, but libfbembed (which is in
>> the usual place i.e. install/program) doesn't look for
>> libicuuc/libicudata/etc. in the usual locations (I have little/no idea
>> of how library loading works yet, or the appropriate terminology
>> either...), hence it seemed to make more sense to me to just leave them
>> in the place that firebird expects them to be since the path apparently
>> needs to be set wherever they are.
> i'd hope that with the right RPATH it should find the right ICU... but i
> guess your first problem is to get it to _build_ against the right
> ICU... perhaps you just have to add some CFLAGS etc. but perhaps it
> looks for icu-config...
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc-writer-char-borders' - 2 commits - sw/AllLangResTarget_sw.mk sw/inc sw/source

2013-06-21 Thread Zolnai Tamás

 sw/AllLangResTarget_sw.mk   |1 
 sw/inc/chrdlg.hrc   |1 
 sw/source/ui/chrdlg/chardlg.src |   46 
 sw/source/ui/envelp/envfmt.cxx  |2 -
 4 files changed, 1 insertion(+), 49 deletions(-)

New commits:
commit 817b0cfde4b9f6d36d4b14916c3a3adb12581448
Author: Zolnai TamÃ¡s 
Date:   Fri Jun 21 20:10:31 2013 +0200

Remove obsolete draw character tab dialog resource

See also:
70467371485ada5a30b88968607b93dd62b3383c

This commit convert the resource based GUI to the new
widget (using *.ui) Before this commit were two type
of character dialog (DLG_CHAR, DLG_DRAWCHAR (chrdlg.hrc))
but only the DLG_CHAR was used (swdlgfact.cxx)) and
maybe thats the reason why this code remained.
Note: the character dialog in Draw is the same as in Writer
that's the reason this resource is unused.

Change-Id: I8e6a9f3faf3936a48fe343a4fdd03bb902baa6e2

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index ceeb41b..0d5f707 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -68,7 +68,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
 sw/source/ui/app/error.src \
 sw/source/ui/app/mn.src \
 sw/source/ui/chrdlg/ccoll.src \
-sw/source/ui/chrdlg/chardlg.src \
 sw/source/ui/chrdlg/chrdlg.src \
 sw/source/ui/chrdlg/drpcps.src \
 sw/source/ui/chrdlg/paradlg.src \
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index 2100675..c9c5c36 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -24,7 +24,6 @@
 
 #define DLG_PARA(RC_CHRDLG_BEGIN +  2)
 #define DLG_DROPCAPS(RC_CHRDLG_BEGIN +  8)
-#define DLG_DRAWCHAR(RC_CHRDLG_BEGIN +  9)
 #define DLG_DRAWPARA(RC_CHRDLG_BEGIN + 10)
 
 // Tabpages -> now in globals.hrc
diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src
deleted file mode 100644
index bdad1b2..000
--- a/sw/source/ui/chrdlg/chardlg.src
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "globals.hrc"
-#include "chrdlg.hrc"
-#include "helpid.h"
-
-TabDialog DLG_DRAWCHAR
-{
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Text [ en-US ] = "Font" ;
-Moveable = TRUE ;
-Closeable = TRUE ;
-TabControl 1
-{
-OutputSize = TRUE ;
-PageList =
-{
-PageItem
-{
-Identifier = TP_CHAR_STD ;
-Text [ en-US ] = "Font" ;
-PageResID = TP_CHAR_STD ;
-};
-};
-};
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 507f23fcdf863a3b003669c0de8698bffbd73c27
Author: Zolnai TamÃ¡s 
Date:   Fri Jun 21 19:44:51 2013 +0200

Fix include: use just the really needed file

Change-Id: I25590647065d7046b9afa7cbf4b1fdb1b3ca88fc

diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 9fd782c..18632d3 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -35,7 +35,7 @@
 #include 
 #include 
 #include 
-#include "swuipardlg.hxx"
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Bug Confirmation Event Update

2013-06-21 Thread Joel Madero

Hi All,

Quick update: those of you participating our doing an incredible job, if
others want to join I encourage you more than ever to do so, it's really
been a great experience for me and has once again provided proof that
together, we can get a tremendous amount done.

In less than 2 days (42.5 hours there about) we're down 98 bugs in the list
which is about 8.2% of the total count, my personal goal -- which I admit I
thought was a bit naive and hoping for too much - was to get the list down
by 25% or about 300 bugs, obviously I underestimated.


Thanks to those participating, for those thinking about it, please join!
https://wiki.documentfoundation.org/QA/Projects/Bug_Triage_Contest

and the QA IRC channel (#libreoffice-qa) is very active if you'd like to
come and see one of the components which makes the wheels move forward.


Warm Regards,
Joel

-- 
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/coretext

2013-06-21 Thread Khaled Hosny

 vcl/coretext/ctlayout.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9fdd5db03b0b4147295fdacf98e6cf700955e2e1
Author: Khaled Hosny 
Date:   Fri Jun 21 19:21:15 2013 +0200

Attempt to fix Core Text full justification

Apparently we need to subtract the trailing white space from the desired
line length or text will sometimes protrude to the margin.

Change-Id: Iee5ef40670c2fefc189afa319387b180c4ed648d

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 18330936..50ab440 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -140,10 +140,11 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 nPixelWidth = rArgs.mpDXArray[ mnCharCount - 1 ];
 }
 
+float fTrailingSpace = CTLineGetTrailingWhitespaceWidth( mpCTLine );
 // in RTL-layouts trailing spaces are leftmost
 // TODO: use BiDi-algorithm to thoroughly check this assumption
 if( rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL)
-mnBaseAdv = rint( CTLineGetTrailingWhitespaceWidth( mpCTLine ) );
+mnBaseAdv = rint( fTrailingSpace );
 
 // return early if there is nothing to do
 if( nPixelWidth <= 0 )
@@ -154,7 +155,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 if( (nOrigWidth >= nPixelWidth-1) && (nOrigWidth <= nPixelWidth+1) )
 return;
 
-CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, 
nPixelWidth );
+CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, 
nPixelWidth - fTrailingSpace );
 if( !pNewCTLine ) { // CTLineCreateJustifiedLine can and does fail
 // handle failure by keeping the unjustified layout
 // TODO: a better solution such as
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-writer-char-borders' - 3 commits - sw/source

2013-06-21 Thread Zolnai Tamás

 sw/source/ui/envelp/envfmt.cxx   |5 -
 sw/source/ui/shells/drwtxtex.cxx |2 +-
 sw/source/ui/shells/textsh1.cxx  |   12 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit d0cba6519d9952eee15f097b8b06b2a66e8c169a
Author: Zolnai TamÃ¡s 
Date:   Fri Jun 21 16:01:18 2013 +0200

Fix indentation

Change-Id: I4feae9998647694efaad776396aca2ce8f177152

diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 340e938..534e293 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -963,13 +963,13 @@ void SwTextShell::Execute(SfxRequest &rReq)
 if ( !bUseDialog )
 {
 if ( nSlot == SID_ATTR_PARA_LRSPACE)
-{
-SvxLRSpaceItem aParaMargin((const 
SvxLRSpaceItem&)pArgs->Get(nSlot));
-aParaMargin.SetWhich( RES_LR_SPACE);
-aCoreSet.Put(aParaMargin);
-pSet = &aCoreSet;
+{
+SvxLRSpaceItem aParaMargin((const 
SvxLRSpaceItem&)pArgs->Get(nSlot));
+aParaMargin.SetWhich( RES_LR_SPACE);
+aCoreSet.Put(aParaMargin);
+pSet = &aCoreSet;
 
-} else
+} else
 pSet = (SfxItemSet*) pArgs;
 
 }
commit 0c688abd4460a209614fb4560fc7c075cd15c34a
Author: Zolnai TamÃ¡s 
Date:   Fri Jun 21 15:38:37 2013 +0200

Use the draw specific paragraph dialog id

The abstarct dialog creation works the same
with the two existent id (DLG_PARA,DLG_DRAWPARA),
that's why it was not bugous just nonconsistent.

Change-Id: Id0f46d58ff957b1451bedb127fc2d641bd16

diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index ce9f3e7..11d2626 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -421,7 +421,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 SwAbstractDialogFactory* pFact = 
SwAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-SfxAbstractTabDialog* pDlg = pFact->CreateSwParaDlg( 
GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, DLG_PARA, 0, sal_True );
+SfxAbstractTabDialog* pDlg = pFact->CreateSwParaDlg( 
GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, DLG_DRAWPARA, 0, sal_True );
 OSL_ENSURE(pDlg, "Dialogdiet fail!");
 sal_uInt16 nRet = pDlg->Execute();
 if(RET_OK == nRet)
commit 23b1af10016f5297e9ae9c3aa8022b86668b3a2e
Author: Zolnai TamÃ¡s 
Date:   Fri Jun 21 15:22:49 2013 +0200

Use abstract tab dialog to create paragraph dialog

In general this abstraction is used.

Change-Id: Ibd17f468368fef5300c383b30f82d5d6d0c85e7d

diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 462290c..9fd782c 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -352,8 +352,11 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
 // set BoxInfo
 ::PrepareBoxInfo( aTmpSet, *pSh );
 
-SwParaDlg *pDlg = new SwParaDlg(GetParentSwEnvDlg(), 
pSh->GetView(), aTmpSet, DLG_ENVELOP, &pColl->GetName());
+SwAbstractDialogFactory* pFact = swui::GetFactory();
+OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
+SfxAbstractTabDialog *pDlg = 
pFact->CreateSwParaDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, 
DLG_ENVELOP, DLG_PARA, &pColl->GetName());
+OSL_ENSURE(pDlg, "Dialogdiet fail!");
 if ( pDlg->Execute() == RET_OK )
 {
 // maybe relocate defaults
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] [ANN] LibreOffice 4.1.0 RC1 available

2013-06-21 Thread Immanuel Giulea

Very impressive !!



>- A very large number of bugs have been fixed, far too many to attempt
>an accurate listing; even counting them accurately is difficult,
>particularly as some bugs are really features, at time of writing we
>continue to push fixes etc. However a reasonable estimate is around three
>thousand bugs, of which four hundred came from authors with apache.orgmail 
> addresses.
>
>
I am mostly impressed by the incredible number of bugfixes and how many
came from authors with apache.org mail addresses !!

Outstanding !!

Immanuel



On Fri, Jun 21, 2013 at 12:44 PM, Thorsten Behrens <
t...@documentfoundation.org> wrote:

> Dear Community,
>
> The Document Foundation is pleased to announce the first release
> candidate of our new LibreOffice 4.1. The upcoming 4.1 will be our
> sixth major release in two and a half years, and comes with a nice set
> of new features. Please be aware that LibreOffice 4.1 RC1 is not ready
> yet for production use, you should continue to use LibreOffice 4.0.4
> for that.
>
> For further milestones towards 4.1, please refer to our release plan
> timings here:
>
>  https://wiki.documentfoundation.org/ReleasePlan/4.1#4.1.0_release
>
> You can find a (work-in-progress) list of new features for 4.1 on this
> page - please feel free to extend with stuff we've missed, or amend
> text-only descriptions with nice screenshots:
>
>  https://wiki.documentfoundation.org/ReleaseNotes/4.1
>
> 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/
>
> Should you find bugs, please report them to the FreeDesktop Bugzilla:
>
>   https://bugs.freedesktop.org
>
> A good way to assess the release candidate 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
>
> For other ways to get involved with this exciting project - you can
> e.g. contribute code:
>
>   http://www.libreoffice.org/get-involved/developers/
>
> translate LibreOffice to your language:
>
>   http://wiki.documentfoundation.org/LibreOffice_Localization_Guide
>
> or help with funding our operations:
>
>   http://donate.libreoffice.org/
>
> A list of known issues and fixed bugs with 4.1.0 RC1 is available
> from our wiki:
>
>   http://wiki.documentfoundation.org/Releases/4.1.0/RC1
>
> 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
>
> The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
> Rechtsfähige Stiftung des bürgerlichen Rechts
> Legal details: http://www.documentfoundation.org/imprint
>
> --
> To unsubscribe e-mail to: projects+unsubscr...@global.libreoffice.org
> Problems?
> http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
> Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
> List archive: http://listarchives.libreoffice.org/global/projects/
> All messages sent to this list will be publicly archived and cannot be
> deleted
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[GSoC] Improve Toolbars: Weekly Report #1

2013-06-21 Thread Prashant Pandey

Hello everyone,

I am working on LibreOffice's UI part to improve toolbars. The work
commenced by the Conversion of sidebar panels to .ui definition, with the
help of glade.

Since I never dealt with 'Glade', my first on-hand experience started with
learning glade. In the mean time I could learn and prepare the designs for
some sidebars, Kendy provided me a wonderful tutorial to
get started with the coding part too, which could empower me to opportunely
complete the sidebar conversions for the following panels:
NumberFormatPropertyPanel [1], CellAppearancePropertyPanel [2] and
PagePropertyPanel [3]. I am glad to announce that these changes have been
prosperously pushed to master in the first week.

On the present scale, we are finished with 'Calc' (on the part of .ui panel
conversions) and I am currently working on 'Writer'. Around 3 further
changes (for writer) are pushed to gerrit and the work is still in
progress. Hopefully I'll be done with all the required leftover sidebar
conversions, by the end of next week/weekend.

[1]
http://cgit.freedesktop.org/libreoffice/core/commit/?id=782adaed6342ceb798c52cff9c47a6dd8c1c2d72
[2]
http://cgit.freedesktop.org/libreoffice/core/commit/?id=637334cb6fdce9d5ee08f8c9fd9f964ccbb56403
[3]
http://cgit.freedesktop.org/libreoffice/core/commit/?id=0813006e76880e78200cad47baefb5b70d9b21e8

Thanks and Regards,
Prashant Pandey
IRC- elixir
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Bug 6 depends on bug 52240, which changed state.

Bug 52240 Summary: [Task] EDITING: Incomplete Date values are no longer detected
https://bugs.freedesktop.org/show_bug.cgi?id=52240

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[ANN] LibreOffice 4.1.0 RC1 available

2013-06-21 Thread Thorsten Behrens

Dear Community,

The Document Foundation is pleased to announce the first release
candidate of our new LibreOffice 4.1. The upcoming 4.1 will be our
sixth major release in two and a half years, and comes with a nice set
of new features. Please be aware that LibreOffice 4.1 RC1 is not ready
yet for production use, you should continue to use LibreOffice 4.0.4
for that.

For further milestones towards 4.1, please refer to our release plan
timings here:

 https://wiki.documentfoundation.org/ReleasePlan/4.1#4.1.0_release

You can find a (work-in-progress) list of new features for 4.1 on this
page - please feel free to extend with stuff we've missed, or amend
text-only descriptions with nice screenshots:

 https://wiki.documentfoundation.org/ReleaseNotes/4.1

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/

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

  https://bugs.freedesktop.org

A good way to assess the release candidate 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
 
For other ways to get involved with this exciting project - you can
e.g. contribute code:

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

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 4.1.0 RC1 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/4.1.0/RC1

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

The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 3 commits - sc/inc sc/qa sc/source

 sc/inc/column.hxx   |   10 ---
 sc/qa/extras/testdocuments/Ranges-3.xls |binary
 sc/source/core/data/column.cxx  |   93 
 sc/source/core/data/column2.cxx |   18 +-
 sc/source/core/data/column3.cxx |8 +-
 sc/source/core/data/formulacell.cxx |   17 -
 6 files changed, 72 insertions(+), 74 deletions(-)

New commits:
commit ea5a4946c7be75eb9fa6dab62c0bb6a14887adae
Author: Kohei Yoshida 
Date:   Fri Jun 21 11:54:18 2013 -0400

Avoid having formula cell directly update text attributes.

This would cause column cell and text attribute arrays to go out of
sync, because the formula cells may be stored and interpreted in places
such as change track and conditional formatting.

We still need to find a good way to mark text attributes "obsolete" when
formula cells are re-calculated.

Change-Id: Ida612806d3afec23c5ae501f2fc8cc7d52e019a8

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 845fa33..3ce95d4 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -728,11 +728,8 @@ void ScFormulaCell::Compile( const OUString& rFormula, 
bool bNoListening,
 CompileTokenArray( bNoListening );
 }
 else
-{
 bChanged = true;
-pDocument->SetTextWidth(aPos, TEXTWIDTH_DIRTY);
-pDocument->SetScriptType(aPos, SC_SCRIPTTYPE_UNKNOWN);
-}
+
 if ( bWasInFormulaTree )
 pDocument->PutInFormulaTree( this );
 }
@@ -822,11 +819,7 @@ void ScFormulaCell::CompileXML( ScProgress& rProgress )
 pDocument->AddSubTotalCell(this);
 }
 else
-{
 bChanged = true;
-pDocument->SetTextWidth(aPos, TEXTWIDTH_DIRTY);
-pDocument->SetScriptType(aPos, SC_SCRIPTTYPE_UNKNOWN);
-}
 
 //  Same as in Load: after loading, it must be known if ocMacro is in any 
formula
 //  (for macro warning, CompileXML is called at the end of loading XML 
file)
@@ -1096,8 +1089,6 @@ void ScFormulaCell::Interpret()
 pIterCell->bTableOpDirty = false;
 pIterCell->aResult.SetResultError( 
errNoConvergence);
 pIterCell->bChanged = true;
-pDocument->SetTextWidth(pIterCell->aPos, 
TEXTWIDTH_DIRTY);
-pDocument->SetScriptType(pIterCell->aPos, 
SC_SCRIPTTYPE_UNKNOWN);
 }
 }
 // End this iteration and remove entries.
@@ -1389,11 +1380,7 @@ void ScFormulaCell::InterpretTail( 
ScInterpretTailParameter eTailParam )
 aResult.SetResultError( nErr);
 bChanged = bContentChanged = true;
 }
-if( bChanged )
-{
-pDocument->SetTextWidth(aPos, TEXTWIDTH_DIRTY);
-pDocument->SetScriptType(aPos, SC_SCRIPTTYPE_UNKNOWN);
-}
+
 if (bContentChanged && pDocument->IsStreamValid(aPos.Tab()))
 {
 // pass bIgnoreLock=true, because even if called from pending row 
height update,
commit d0c5ec0220f5dd8fe5285709ae5d6165e6a3027f
Author: Kohei Yoshida 
Date:   Fri Jun 21 10:57:35 2013 -0400

Add more calls to CellStorageModified() when it's called for.

Change-Id: Ib7a7abd82060b19f7911f1fef5ff5d850055

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e287a5b..e7c58c1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -464,7 +464,7 @@ private:
 sc::CellStoreType::iterator GetPositionToInsert( const 
sc::CellStoreType::iterator& it, SCROW nRow );
 void ActivateNewFormulaCell( ScFormulaCell* pCell );
 void BroadcastNewCell( SCROW nRow );
-void UpdateScriptType( sc::CellTextAttr& rAttr, SCROW nRow );
+bool UpdateScriptType( sc::CellTextAttr& rAttr, SCROW nRow );
 
 const ScFormulaCell* FetchFormulaCell( SCROW nRow ) const;
 
@@ -476,7 +476,7 @@ private:
  * Called whenever the state of cell array gets modified i.e. new cell
  * insertion, cell removal or relocation, cell value update and so on.
  *
- * Call this only from those methods where maItems is modified directly.
+ * Call this only from those methods where maCells is modified directly.
  */
 void CellStorageModified();
 
diff --git a/sc/qa/extras/testdocuments/Ranges-3.xls 
b/sc/qa/extras/testdocuments/Ranges-3.xls
index c23b70a..5151fa7 100644
Binary files a/sc/qa/extras/testdocuments/Ranges-3.xls and 
b/sc/qa/extras/testdocuments/Ranges-3.xls differ
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 66166be..bd1eeae 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1369,6 +1369,8 @@ void ScColumn::CopyStaticToDocument(SCROW nRow1, SCROW 
nRow2, ScColumn& rDestCol
 if (bLastBlock)
 break;
 }
+
+rDestCol.CellStorageModified();
 }
 
 void ScColumn::CopyCellToDocum

[Libreoffice-commits] core.git: 2 commits - sfx2/source sfx2/uiconfig

 sfx2/source/doc/docfile.cxx  |   29 ++---
 sfx2/uiconfig/ui/documentinfopage.ui |3 +++
 2 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit ecdd9d1a47587aa7557c1b151010c78efa90fef2
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 21 16:05:04 2013 +0100

Resolves: fdo#65501 ensure configured backup dir exists before using it

the ucb stuff is the most god awful painful api ever

Change-Id: I491d2cb9b7d5d37723b32f0a26a22a09c16bc02e

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 543e8e8..711718f 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2123,6 +2123,25 @@ void SfxMedium::DoInternalBackup_Impl( const 
::ucbhelper::Content& aOriginalCont
 aTransactTemp.EnableKillingFile( true );
 }
 
+bool ensureFolder(
+uno::Reference< uno::XComponentContext > xCtx,
+uno::Reference< ucb::XCommandEnvironment > xEnv,
+const OUString& rFolder, ucbhelper::Content & result)
+{
+INetURLObject aURL( rFolder );
+OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, 
INetURLObject::DECODE_WITH_CHARSET );
+aURL.removeSegment();
+::ucbhelper::Content aParent;
+
+if ( ::ucbhelper::Content::create( aURL.GetMainURL( 
INetURLObject::NO_DECODE ),
+  xEnv, xCtx, aParent ) )
+{
+return ::utl::UCBContentHelper::MakeFolder(aParent, aTitle, result);
+}
+
+return false;
+}
+
 //--
 void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& 
aOriginalContent )
 {
@@ -2136,9 +2155,13 @@ void SfxMedium::DoInternalBackup_Impl( const 
::ucbhelper::Content& aOriginalCont
 sal_Int32 nPrefixLen = aFileName.lastIndexOf( '.' );
 String aPrefix = ( nPrefixLen == -1 ) ? aFileName : aFileName.copy( 0, 
nPrefixLen );
 String aExtension = ( nPrefixLen == -1 ) ? String() : 
String(aFileName.copy( nPrefixLen ));
-   String aBakDir = SvtPathOptions().GetBackupPath();
+String aBakDir = SvtPathOptions().GetBackupPath();
 
-DoInternalBackup_Impl( aOriginalContent, aPrefix, aExtension, aBakDir );
+// create content for the parent folder ( = backup folder )
+::ucbhelper::Content  aContent;
+Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
+if( ensureFolder(comphelper::getProcessComponentContext(), xEnv, aBakDir, 
aContent) )
+DoInternalBackup_Impl( aOriginalContent, aPrefix, aExtension, aBakDir 
);
 
 if ( pImp->m_aBackupURL.isEmpty() )
 {
@@ -2177,7 +2200,7 @@ void SfxMedium::DoBackup_Impl()
 // create content for the parent folder ( = backup folder )
 ::ucbhelper::Content  aContent;
 Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
-if( ::ucbhelper::Content::create( aBakDir, xEnv, 
comphelper::getProcessComponentContext(), aContent ) )
+if( ensureFolder(comphelper::getProcessComponentContext(), xEnv, 
aBakDir, aContent) )
 {
 // save as ".bak" file
 INetURLObject aDest( aBakDir );
commit ee5c49c9d1eeef842ca4fc181f962236b32a20ce
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 21 16:06:02 2013 +0100

center buttons vertically

Change-Id: Ibe2aea7608a85b169ffc26a83912b58b06a3473d

diff --git a/sfx2/uiconfig/ui/documentinfopage.ui 
b/sfx2/uiconfig/ui/documentinfopage.ui
index eeccbd0..2809979 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -230,6 +230,7 @@
 True
 True
 True
+center
   
   
 2
@@ -244,6 +245,7 @@
 True
 True
 True
+center
 True
   
   
@@ -381,6 +383,7 @@
 True
 True
 True
+center
 True
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'update' - check.php

2013-06-21 Thread Jan Holesovsky

 check.php |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 60a9e2c57e93d0c961cc24de97e0786aadc5a1ad
Author: Jan Holesovsky 
Date:   Fri Jun 21 17:05:24 2013 +0200

Offer update to 4.0.4.

diff --git a/check.php b/check.php
index 55cd492..9cd27de 100644
--- a/check.php
+++ b/check.php
@@ -203,7 +203,11 @@ $build_hash_to_version = array(
 # 4.0.3 versions
 'a67943cd4d125208f4ea7fa29439551825cfb39' => '4.0.3.1',
 'c6786add5a58268e11aa027c47054344040db1b' => '4.0.3.2',
-#'0eaa50a932c8f2199a615e1eb30f7ac74279539' => '4.0.3.3', # Final
+'0eaa50a932c8f2199a615e1eb30f7ac74279539' => '4.0.3.3', # Final
+
+# 4.0.4 versions
+'7fdd5ee61c1c7379dd088f5d50265f0adbccf53' => '4.0.4.1',
+#'9e9821abd0ffdbc09cd8c52eaa574fa09eb08f2' => '4.0.4.2', # Final
 );
 
 # Descriptions of the target versions
@@ -223,9 +227,9 @@ $update_map = array(
   'update_src'  => 
'http://www.libreoffice.org/download/?type=&lang=&version=3.6.6',
   'substitute'  => true ),
 
-'latest' => array('gitid'   => 
'0eaa50a932c8f2199a615e1eb30f7ac74279539',
-  'id'  => 'LibreOffice 4.0.3',
-  'version' => '4.0.3',
+'latest' => array('gitid'   => 
'9e9821abd0ffdbc09cd8c52eaa574fa09eb08f2',
+  'id'  => 'LibreOffice 4.0.4',
+  'version' => '4.0.4',
   'update_type' => 'text/html',
   'update_src'  => 'http://www.libreoffice.org/download/'),
 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations

2013-06-21 Thread Andras Timar

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 561cb8a1646a3c4c66f049f456d3fab58ea58619
Author: Andras Timar 
Date:   Fri Jun 21 16:49:21 2013 +0200

Updated core
Project: translations  82fb7022f021b89123154b424984098126d2620c

diff --git a/translations b/translations
index 46c683c..82fb702 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 46c683c740acf324164f188a97abea28fe3c1bf9
+Subproject commit 82fb7022f021b89123154b424984098126d2620c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source vcl/source

2013-06-21 Thread Jan Holesovsky

 sfx2/source/sidebar/SidebarController.cxx |   10 ++
 vcl/source/window/builder.cxx |   12 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit bfbdb2d4f443fc13e10ec33d112bd0c23584b658
Author: Jan Holesovsky 
Date:   Fri Jun 21 16:11:53 2013 +0200

sidebar: Improve runtime error reporting (mostly missing .ui).

Change-Id: If7e0f24eab77028ddbfdb17dff82679b214efc74

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 54314af..8002357 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -718,15 +718,9 @@ Reference 
SidebarController::CreateUIElement (
 
 return xUIElement;
 }
-catch(Exception& rException)
+catch(const Exception& rException)
 {
-OSL_TRACE("caught exception: %s",
-OUStringToOString(rException.Message, 
RTL_TEXTENCODING_ASCII_US).getStr());
-// For some reason we can not create the actual panel.
-// Probably because its factory was not properly registered.
-// TODO: provide feedback to developer to better pinpoint the
-// source of the error.
-
+SAL_WARN("sfx2.sidebar", "Cannot create panel: " << 
rException.Message);
 return NULL;
 }
 }
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 8806c4c..e79896e 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -162,9 +162,17 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, 
OUString sUIFile, OStri
 if (!bEN_US)
 loadTranslations(aLocale, sUri);
 
-xmlreader::XmlReader reader(sUri);
+try
+{
+xmlreader::XmlReader reader(sUri);
 
-handleChild(pParent, reader);
+handleChild(pParent, reader);
+}
+catch (const ::com::sun::star::uno::Exception &rExcept)
+{
+SAL_WARN("vcl.layout", "Unable to read .ui file: " << rExcept.Message);
+throw;
+}
 
 //Set Mnemonic widgets when everything has been imported
 for (std::vector::iterator aI = 
m_pParserState->m_aMnemonicWidgetMaps.begin(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 559d2575ba4a13f06b330a079035d5243fef980f
Author: abdulmajeed ahmed 
Date:   Fri Jun 21 16:30:29 2013 +0200

Updated core
Project: help  50f4d76f4c5cc0ff36a5d761dbf78257c3d31d50

diff --git a/helpcontent2 b/helpcontent2
index fd638f9..50f4d76 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fd638f9abaea98e5a5f788b24faedc45fe01ec1e
+Subproject commit 50f4d76f4c5cc0ff36a5d761dbf78257c3d31d50
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

 helpers/help_hid.lst |   12 
 source/text/shared/01/ref_pdf_export.xhp |   22 +++---
 2 files changed, 11 insertions(+), 23 deletions(-)

New commits:
commit 50f4d76f4c5cc0ff36a5d761dbf78257c3d31d50
Author: abdulmajeed ahmed 
Date:   Fri Jun 21 16:30:29 2013 +0200

Update help ids for pdf userinterface tab page ui

Change-Id: I568b7a75c194e8849f2815d69edb3fcacf46e938

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 01f0637..3795343 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1742,7 +1742,6 @@ HID_FILTER_NAVIGATOR_WIN,38073,
 HID_FILTER_PDF_INITIAL_VIEW,64150,
 HID_FILTER_PDF_OPTIONS,64149,
 HID_FILTER_PDF_SECURITY,64152,
-HID_FILTER_PDF_USER_INTERFACE,64151,
 HID_FIRSTSTART_CANCEL,42781,
 HID_FIRSTSTART_FINISH,42782,
 HID_FIRSTSTART_NEXT,42780,
@@ -6265,14 +6264,6 @@ filter_CheckBox_RID_PDF_TAB_GENER_CB_TAGGEDPDF,867845137,
 filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT,867877986,
 filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENAB_ACCESS,867894416,
 filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENDAB_COPY,867894415,
-filter_CheckBox_RID_PDF_TAB_VPREFER_CB_DISPDOCTITLE,867861608,
-filter_CheckBox_RID_PDF_TAB_VPREFER_CB_TRANSITIONEFFECTS,867861614,
-filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVMENUBAR,867861610,
-filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVTOOLBAR,867861611,
-filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVWINCTRL,867861612,
-filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_CNTRWIN,867861606,
-filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_OPNFULL,867861607,
-filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_RESINIT,867861605,
 filter_ComboBox_RID_PDF_TAB_GENER_CO_REDUCEIMAGERESOLUTION,867848207,
 filter_Edit_RID_PDF_TAB_GENER_ED_PAGES,867846149,
 filter_ListBox_RID_PDF_TAB_GENER_LB_FORMSFORMAT,867847702,
@@ -6282,7 +6273,6 @@ filter_ModalDialog_DLG_OPTIONS,1090519040,
 filter_ModalDialog_RID_PDF_ERROR_DLG,1404878848,
 filter_NumericField_DLG_OPTIONS_NUM_FLD_QUALITY,1090525185,
 filter_NumericField_RID_PDF_TAB_OPNFTR_NUM_MAGNF_INITIAL_PAGE,867883100,
-filter_NumericField_RID_PDF_TAB_VPREFER_NUM_BOOKMARKLEVELS,867866738,
 filter_PushButton_RID_PDF_TAB_SECURITY_BTN_OWNER_PWD,867897983,
 filter_PushButton_RID_PDF_TAB_SECURITY_BTN_USER_PWD,867897976,
 filter_RadioButton_RID_PDF_TAB_GENER_RB_ALL,867844610,
@@ -6310,8 +6300,6 @@ 
filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_NONE,867893898,
 filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_HIGHRES,867893896,
 filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_LOWRES,867893895,
 filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_NONE,867893894,
-filter_RadioButton_RID_PDF_TAB_VPREFER_RB_ALLBOOKMARKLEVELS,867861104,
-filter_RadioButton_RID_PDF_TAB_VPREFER_RB_VISIBLEBOOKMARKLEVELS,867861105,
 formula_CheckBox_RID_FORMULADLG_FORMULA_BTN_MATRIX,2655437835,
 formula_CheckBox_RID_FORMULADLG_FORMULA_MODAL_BTN_MATRIX,1581728779,
 formula_Edit_RID_FORMULADLG_FORMULA_ED_REF,2655438867,
diff --git a/source/text/shared/01/ref_pdf_export.xhp 
b/source/text/shared/01/ref_pdf_export.xhp
index f5360c8..72c3028 100644
--- a/source/text/shared/01/ref_pdf_export.xhp
+++ b/source/text/shared/01/ref_pdf_export.xhp
@@ -173,40 +173,40 @@
   Select to generate a PDF file that shows pages side 
by side in a continuous column. For more than two pages, the first page is 
displayed on the left. You must enable support for complex text layout on 
Language settings - Languages in the Options dialog box.
   User Interface tab
   Window options
-
+
 Resize window to initial page
   Select to generate a PDF file that is shown in a 
window displaying the whole initial page.
-
+
 Center window on screen
   Select to generate a PDF file that is shown in a 
reader window centered on screen.
-
+
 Open in full screen mode
   Select to generate a PDF file that is shown in a full 
screen reader window in front of all other windows.
-
+
 Display document title
   Select to generate a PDF file that is shown with the 
document title in the reader's title bar.
   User interface options
-
+
 Hide menu bar
   Select to hide the reader's menu bar when the 
document is active.
-
+
 Hide toolbar
   Select to hide the reader's toolbar when the document 
is active.
-
+
 Hide window controls
   Select to hide the reader's controls when the 
document is active.
   Transitions
 
 
-
+
 Use transition effects
   Selects to export Impress slide transition effects to 
respective PDF effects.
   Bookmarks
-
+
 All bookmark levels
   Select to show all bookmark levels when the reader 
opens the PDF file.
-
-
+
+
 Visible bookmark levels
   Select to show bookmark levels down to the selected 
level when the reader opens the PDF file.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/Library_i18npool.mk

2013-06-21 Thread David Tardon

 i18npool/Library_i18npool.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 247f37890060330f3c3d2d05bbd8e36d689e9ada
Author: David Tardon 
Date:   Fri Jun 21 16:31:03 2013 +0200

Revert "better dependency working also for libmerged"

It might work with libmerged, but it does not work otherwise.

This reverts commit f8fd2e6a3b21ec3899a74d7400cafaba4e83ff6c.

diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 158f93f..f8900bf 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -137,10 +137,10 @@ $(eval $(call gb_Library_add_generated_cobjects,i18npool,\
 # i18npool dlopens localedata_* libraries.
 # This is runtime dependency to prevent tests
 # to be run sooner then localedata_* exists.
-$(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktargetname,i18npool)) :| \
-   $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktargetname,localedata_en)) \
-   $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktargetname,localedata_es)) \
-   $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktargetname,localedata_euro)) \
-   $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktargetname,localedata_others)) \
+$(call gb_Library_get_target,i18npool) : | \
+   $(call gb_Library_get_target,localedata_en) \
+   $(call gb_Library_get_target,localedata_es) \
+   $(call gb_Library_get_target,localedata_euro) \
+   $(call gb_Library_get_target,localedata_others) \
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-21 Thread Miklos Vajna

 sw/qa/extras/rtfimport/data/para-bottom-margin.rtf |   14 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |8 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +++
 3 files changed, 25 insertions(+)

New commits:
commit c6a941b51b68eb097d4d43323b39ff1aba4c753e
Author: Miklos Vajna 
Date:   Fri Jun 21 15:48:39 2013 +0200

bnc#823655 RTF import: ignore styles without a type

Regression from 29dcdf6b56f8dbc1b7de0478afb04122f8dbf0f9.

Change-Id: I970c0e7b3652d7e6f093815b90e04e0c45904b28

diff --git a/sw/qa/extras/rtfimport/data/para-bottom-margin.rtf 
b/sw/qa/extras/rtfimport/data/para-bottom-margin.rtf
new file mode 100644
index 000..7bc5051
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/para-bottom-margin.rtf
@@ -0,0 +1,14 @@
+{\rtf1
+{\stylesheet
+{\ql \li0\ri0\sa200\sl276\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
\rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 
\fs22\lang4105\langfe4105\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp4105\langfenp4105
 \snext0 \sqformat \spriority0 Normal;}
+{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph 
Font;}
+{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
 \ql \li0\ri0\sa200\sl276\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
\rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 
\fs22\lang4105\langfe4105\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp4105\langfenp4105
 \snext11 \ssemihidden \sunhideused 
+Normal Table;}
+}
+\pard \ltrpar\ql 
\li720\ri0\sb1\sl-179\slmult0\nowidctlpar\tx9924\wrapdefault\faauto\rin0\lin720\itap0
 
+{\rtlch\fcs1 \af0\afs16 \ltrch\fcs0 
\f0\fs16\expnd-1\expndtw-5\cf1\insrsid10962741 \hich\af0\dbch\af31505\loch\f0 
hello
+\par }
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 23fdf54..c84cb81 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -143,6 +143,7 @@ public:
 void testFdo62044();
 void testPoshPosv();
 void testN825305();
+void testParaBottomMargin();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -273,6 +274,7 @@ void Test::run()
 {"fdo62044.rtf", &Test::testFdo62044},
 {"posh-posv.rtf", &Test::testPoshPosv},
 {"n825305.rtf", &Test::testN825305},
+{"para-bottom-margin.rtf", &Test::testParaBottomMargin},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1298,6 +1300,12 @@ void Test::testN825305()
 CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DIRECT_VALUE, ePropertyState);
 }
 
+void Test::testParaBottomMargin()
+{
+// This was 353, i.e. bottom margin of the paragraph was 0.35cm instead of 
0.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(getParagraph(1), 
"ParaBottomMargin"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8849ed7..2a33d96 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1028,6 +1028,7 @@ void RTFDocumentImpl::text(OUString& rString)
 break;
 case DESTINATION_STYLESHEET:
 case DESTINATION_STYLEENTRY:
+if 
(m_aStates.top().aTableAttributes.find(NS_rtf::LN_SGC))
 {
 RTFValue::Pointer_t pValue(new 
RTFValue(m_aStates.top().aDestinationText.makeStringAndClear()));
 
m_aStates.top().aTableAttributes.set(NS_rtf::LN_XSTZNAME1, pValue);
@@ -1037,6 +1038,8 @@ void RTFDocumentImpl::text(OUString& rString)
 );
 
m_aStyleTableEntries.insert(make_pair(m_nCurrentStyleIndex, pProp));
 }
+else
+SAL_INFO("writerfilter", "no RTF style type 
defined, ignoring");
 break;
 case DESTINATION_REVISIONTABLE:
 case DESTINATION_REVISIONENTRY:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

 filter/source/msfilter/escherex.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 1b3692c6a4dbd0c16da97c0966d242d31dcf4c5f
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 21 12:02:56 2013 +0100

take a copy of the prop rather than pointer to ref

follow up to af2053c318564ef56235482f058d30ae26ecf77d

Change-Id: I3493077076554b714600c4bb4e93ce44bc690190

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 51ab62a..3696251 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2641,7 +2641,8 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 const OUString sHandles( "Handles"  );
 const OUString sAdjustmentValues   ( "AdjustmentValues"  );
 
-const beans::PropertyValue* pAdjustmentValuesProp = NULL;
+bool bAdjustmentValuesProp = false;
+uno::Any aAdjustmentValuesProp;
 bool bPathCoordinatesProp = false;
 uno::Any aPathCoordinatesProp;
 
@@ -3705,13 +3706,14 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 {
 // it is required, that the information which handle is 
polar has already be read,
 // so we are able to change the polar value to a fixed 
float
-pAdjustmentValuesProp = &rProp;
+aAdjustmentValuesProp = rProp.Value;
+bAdjustmentValuesProp = true;
 }
 }
-if ( pAdjustmentValuesProp )
+if ( bAdjustmentValuesProp )
 {
 uno::Sequence< 
com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
-if ( pAdjustmentValuesProp->Value >>= aAdjustmentSeq )
+if ( aAdjustmentValuesProp >>= aAdjustmentSeq )
 {
 if ( bPredefinedHandlesUsed )
 LookForPolarHandles( eShapeType, 
nAdjustmentsWhichNeedsToBeConverted );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source

 connectivity/source/commontools/TTableHelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 89a8a48ccda987ccfb779ce90d39d374f0781a53
Author: Lionel Elie Mamane 
Date:   Fri Jun 21 16:03:28 2013 +0200

fixup

Change-Id: I20b56f8051d85aec4331d0e5bd83985580f05dbf

diff --git a/connectivity/source/commontools/TTableHelper.cxx 
b/connectivity/source/commontools/TTableHelper.cxx
index d833e62..3e29b7b 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -339,7 +339,7 @@ void OTableHelper::refreshPrimaryKeys(TStringVector& 
_rNames)
 if ( !bAlreadyFetched )
 {
 aPkName = xRow->getString(6);
-SAL_WARN_IF(xRow.wasNull(),"connectivity.commontools", "NULL 
Primary Key name");
+SAL_WARN_IF(xRow->wasNull(),"connectivity.commontools", "NULL 
Primary Key name");
 SAL_WARN_IF(aPkName.isEmpty(),"connectivity.commontools", 
"empty Primary Key name");
 bAlreadyFetched = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Source Files for Wiki publisher

2013-06-21 Thread Othmane

Thank you :) :) i'll check that :) 



--
View this message in context: 
http://nabble.documentfoundation.org/Source-Files-for-Wiki-publisher-tp4062464p4062470.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] core.git: filter/inc filter/source filter/uiconfig filter/UIConfig_xsltdlg.mk

 filter/UIConfig_xsltdlg.mk |1 
 filter/inc/filter.hrc  |1 
 filter/source/pdf/impdialog.cxx|   96 +++
 filter/source/pdf/impdialog.hrc|   20 -
 filter/source/pdf/impdialog.hxx|   27 --
 filter/source/pdf/impdialog.src|  135 --
 filter/uiconfig/ui/pdfuserinterfacepage.ui |  384 +
 7 files changed, 440 insertions(+), 224 deletions(-)

New commits:
commit dbf1360e9fd4ac4a346e918344ef40213fb28914
Author: abdulmajeed ahmed 
Date:   Fri Jun 21 15:52:40 2013 +0200

Convert to .ui pdf userinterface tab page

Change-Id: I9203a63b2d6d1ab14ebee17611a78221755af082

diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk
index 2b2c25f..f3f309c 100644
--- a/filter/UIConfig_xsltdlg.mk
+++ b/filter/UIConfig_xsltdlg.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,filter))
 
 $(eval $(call gb_UIConfig_add_uifiles,filter,\
filter/uiconfig/ui/pdflinkspage \
+   filter/uiconfig/ui/pdfuserinterfacepage \
filter/uiconfig/ui/testxmlfilter \
filter/uiconfig/ui/xmlfiltersettings \
 ))
diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc
index 138d661..91c936a 100644
--- a/filter/inc/filter.hrc
+++ b/filter/inc/filter.hrc
@@ -33,7 +33,6 @@
 
 #define HID_FILTER_PDF_OPTIONS  "HID_FILTER_PDF_OPTIONS"
 #define HID_FILTER_PDF_INITIAL_VIEW   "HID_FILTER_PDF_INITIAL_VIEW"
-#define HID_FILTER_PDF_USER_INTERFACE "HID_FILTER_PDF_USER_INTERFACE"
 #define HID_FILTER_PDF_SECURITY   "HID_FILTER_PDF_SECURITY"
 #define HID_FILTER_PDF_SIGNING"HID_FILTER_PDF_SIGNING"
 
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index ece4ccb..21e98af 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1023,33 +1023,25 @@ IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, void*, 
)
 // 
-
 ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent,
   const SfxItemSet& rCoreSet ) :
-SfxTabPage( pParent, PDFFilterResId( RID_PDF_TAB_VPREFER ), rCoreSet ),
-
-maFlWindowOptions( this, PDFFilterResId( FL_WINOPT ) ),
-maCbResWinInit( this, PDFFilterResId( CB_WNDOPT_RESINIT ) ),
-maCbCenterWindow( this, PDFFilterResId( CB_WNDOPT_CNTRWIN ) ),
-maCbOpenFullScreen( this, PDFFilterResId( CB_WNDOPT_OPNFULL ) ),
-maCbDispDocTitle( this, PDFFilterResId( CB_DISPDOCTITLE ) ),
-
-m_aVerticalLine(this, PDFFilterResId(FL_VPREFER_VERTICAL)),
-
-maFlUIOptions( this, PDFFilterResId( FL_USRIFOPT ) ),
-maCbHideViewerMenubar( this, PDFFilterResId( CB_UOP_HIDEVMENUBAR ) ),
-maCbHideViewerToolbar( this, PDFFilterResId( CB_UOP_HIDEVTOOLBAR ) ),
-maCbHideViewerWindowControls( this, PDFFilterResId( CB_UOP_HIDEVWINCTRL ) 
),
-maFlTransitions( this, PDFFilterResId( FL_TRANSITIONS ) ),
-maCbTransitionEffects( this, PDFFilterResId( CB_TRANSITIONEFFECTS ) ),
-mbIsPresentation( sal_True ),
-maFlBookmarks( this, PDFFilterResId( FL_BOOKMARKS ) ),
-maRbAllBookmarkLevels( this, PDFFilterResId( RB_ALLBOOKMARKLEVELS ) ),
-maRbVisibleBookmarkLevels( this, PDFFilterResId( RB_VISIBLEBOOKMARKLEVELS 
) ),
-maNumBookmarkLevels( this, PDFFilterResId( NUM_BOOKMARKLEVELS ) )
+SfxTabPage( pParent, 
"PdfUserInterfacePage","filter/ui/pdfuserinterfacepage.ui", rCoreSet )
+
 {
-FreeResource();
-maRbAllBookmarkLevels.SetToggleHdl( LINK( this, ImpPDFTabViewerPage, 
ToggleRbBookmarksHdl ) );
-maRbVisibleBookmarkLevels.SetToggleHdl( LINK( this, ImpPDFTabViewerPage, 
ToggleRbBookmarksHdl ) );
-maNumBookmarkLevels.SetAccessibleName(maRbVisibleBookmarkLevels.GetText());
-
maNumBookmarkLevels.SetAccessibleRelationLabeledBy(&maRbVisibleBookmarkLevels);
+get(m_pCbResWinInit,"resize");
+get(m_pCbCenterWindow,"center");
+get(m_pCbOpenFullScreen,"open");
+get(m_pCbDispDocTitle,"display");
+get(m_pCbHideViewerMenubar,"menubar");
+get(m_pCbHideViewerToolbar,"toolbar");
+get(m_pCbHideViewerWindowControls,"window");
+get(m_pCbTransitionEffects,"effects");
+get(m_pRbAllBookmarkLevels,"allbookmarks");
+get(m_pRbVisibleBookmarkLevels,"visiblebookmark");
+get(m_pNumBookmarkLevels,"visiblelevel");
+
+m_pRbAllBookmarkLevels->SetToggleHdl( LINK( this, ImpPDFTabViewerPage, 
ToggleRbBookmarksHdl ) );
+m_pRbVisibleBookmarkLevels->SetToggleHdl( LINK( this, ImpPDFTabViewerPage, 
ToggleRbBookmarksHdl ) );
+
m_pNumBookmarkLevels->SetAccessibleName(m_pRbVisibleBookmarkLevels->GetText());
+
m_pNumBookmarkLevels->SetAccessibleRelationLabeledBy(m_pRbVisibleBookmarkLevels);
 }
 
 // 
-
@@ -1060,7 +1052,7 @@ ImpPDFTabViewerPage::~ImpPDFTabViewerPage()
 // 
-
 IMPL

[Libreoffice-commits] core.git: connectivity/source

 connectivity/source/commontools/TTableHelper.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 2741cb8685b28a4454b456b24c1545858fca52e8
Author: Lionel Elie Mamane 
Date:   Fri Jun 21 15:24:15 2013 +0200

fdo#49708 when there is no Primary Key, there is no Primay Key

As opposed to a primary key with empty name and no columns (!)

Change-Id: I78ca185947a0e8d37bac64bd50add155afaeed47

diff --git a/connectivity/source/commontools/TTableHelper.cxx 
b/connectivity/source/commontools/TTableHelper.cxx
index 8442a26..d833e62 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -339,12 +339,19 @@ void OTableHelper::refreshPrimaryKeys(TStringVector& 
_rNames)
 if ( !bAlreadyFetched )
 {
 aPkName = xRow->getString(6);
+SAL_WARN_IF(xRow.wasNull(),"connectivity.commontools", "NULL 
Primary Key name");
+SAL_WARN_IF(aPkName.isEmpty(),"connectivity.commontools", 
"empty Primary Key name");
 bAlreadyFetched = true;
 }
 }
 
-m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
-_rNames.push_back(aPkName);
+if(bAlreadyFetched)
+{
+SAL_WARN_IF(aPkName.isEmpty(),"connectivity.commontools", "empty 
Primary Key name");
+SAL_WARN_IF(pKeyProps->m_aKeyColumnNames.size() == 
0,"connectivity.commontools", "Primary Key has no columns");
+m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
+_rNames.push_back(aPkName);
+}
 } // if ( xResult.is() && xResult->next() )
 ::comphelper::disposeComponent(xResult);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

 vcl/source/gdi/outdev3.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d67c5b58f6174078fce4074b7c75d690f804c8cd
Author: Norbert Thiebaud 
Date:   Thu Jun 20 12:52:45 2013 -0500

coverity#707562 : Unitialized scalar variable

Change-Id: I3e3bebb25c5d2509de7017ece49d927f1d59c592
Reviewed-on: https://gerrit.libreoffice.org/4403
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 8338d9f..be980cb 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -7172,6 +7172,7 @@ SystemTextLayoutData 
OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c
 SystemTextLayoutData aSysLayoutData;
 aSysLayoutData.nSize = sizeof(aSysLayoutData);
 aSysLayoutData.rGlyphData.reserve( 256 );
+aSysLayoutData.orientation = 0;
 
 if ( mpMetaFile )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/vcl vcl/source

 include/vcl/edit.hxx|2 +-
 vcl/source/control/edit.cxx |   16 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 874dad99efd531abcad486a6b1abc21c13194bb0
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 21 13:00:51 2013 +0100

Resolves: fdo#65635 don't include border gap in height for borderless edits

Change-Id: If778fdeb5bdbd5a5cac33f57ef8d598ddc1408f2
(cherry picked from commit 0a5c151b62a7abc3fc4abaadb0b50c3047eb5f26)
Reviewed-on: https://gerrit.libreoffice.org/4428
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 488758a..11c1ae8 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -122,7 +122,7 @@ protected:
 SAL_DLLPRIVATE voidImplInitSettings( sal_Bool bFont, sal_Bool 
bForeground, sal_Bool bBackground );
 SAL_DLLPRIVATE voidImplLoadRes( const ResId& rResId );
 SAL_DLLPRIVATE voidImplSetSelection( const Selection& rSelection, 
sal_Bool bPaint = sal_True );
-SAL_DLLPRIVATE int ImplGetNativeControlType();
+SAL_DLLPRIVATE int ImplGetNativeControlType() const;
 SAL_DLLPRIVATE longImplGetExtraOffset() const;
 static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( Window* pWin );
 
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 10b25dc..20323b3 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1048,10 +1048,10 @@ void Edit::ImplSetText( const OUString& rText, const 
Selection* pNewSelection )
 
 // ---
 
-int Edit::ImplGetNativeControlType()
+int Edit::ImplGetNativeControlType() const
 {
 int nCtrl = 0;
-Window *pControl = mbIsSubEdit ? GetParent() : this;
+const Window *pControl = mbIsSubEdit ? GetParent() : this;
 
 switch( pControl->GetType() )
 {
@@ -2877,6 +2877,8 @@ void Edit::SetSubEdit( Edit* pEdit )
 
 Size Edit::CalcMinimumSizeForText(const OUString &rString) const
 {
+int eCtrlType = ImplGetNativeControlType();
+
 Size aSize;
 if (mnWidthInChars != -1)
 {
@@ -2893,8 +2895,12 @@ Size Edit::CalcMinimumSizeForText(const OUString 
&rString) const
 if (aSize.Width() < aMinSize.Width())
 aSize.Width() = aMinSize.Width();
 }
-// add some space between text entry and border
-aSize.Height() += 4;
+
+if (eCtrlType != CTRL_EDITBOX_NOBORDER)
+{
+// add some space between text entry and border
+aSize.Height() += 4;
+}
 
 aSize = CalcWindowSize( aSize );
 
@@ -2903,7 +2909,7 @@ Size Edit::CalcMinimumSizeForText(const OUString 
&rString) const
 Rectangle aRect( Point( 0, 0 ), aSize );
 Rectangle aContent, aBound;
 if( const_cast(this)->GetNativeControlRegion(
-   CTRL_EDITBOX, PART_ENTIRE_CONTROL,
+   eCtrlType, PART_ENTIRE_CONTROL,
aRect, 0, aControlValue, OUString(), aBound, aContent) )
 {
 if( aBound.GetHeight() > aSize.Height() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Source Files for Wiki publisher

On Fri, 2013-06-21 at 05:46 -0700, Othmane wrote:
> Hello Everyone,
> 
> I am a new in development for LibreOffice and I have to work on the
> extension Wiki Publisher for Libre Office for my internship. I find it hard
> to work directly on the core source files, so can anyone please tell me
> where i can get the source files for wiki publisher extension.

swext/mediawiki

> 
> My mission consists in migrating from httpclient 3.x to httpclient 4.x on
> wiki publisher.

see apache-commons (I think?)

C.

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

Re: Nightly 4.1 builds

On Fri, 2013-06-21 at 11:10 +0200, Johan Vromans wrote:
> It seems that there haven't been nightly 4.1 buids for the last couple
> of days.

If you're referring to the Linux RHEL-5 builds then, yes, that's because
the same hardware builds the x86 and x86_64 packages in RHEL-5 chroots
so I paused the 4-1 while building the 4-0 latest builds and then
upgraded the underlying OS to F-19 and so forth. I'll reenable them over
the w/e

C.

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

[GSOC]Slide Layout Extendibility :Weekly Report #1

2013-06-21 Thread Vishv Brahmbhatt

Hello Everyone,

Before the beginning of  this week ,I was debugging on impress slide
layouts.Basically,I got to understand the mechanism of creation of slide
layouts in the "normal" page,in the master pages like "notes" and "handout"
and much more.

Currently in the slide layouts, Placeholder object's height,width,position
are hard-coded. So,I did following things during this week:

+So at first ,I started with creation of XML file  which stores following
information:
(1) Layout Type
(2) "PresObj" Kind
(3) Position co-ordinates of "PresObj"
(4) Size of "PreObj"(Width and Height)

+ I have started coding XML parser, which will read this information from
XML file and set the appropriate parameters in the function
"CalcAutoLayoutRectangles" (This function  calculates/sets  the Top
Position,Height and Width of Rectangle "PresObj" used.) And this will
parser will help in bringing configurability with Slide Layouts.

+ So XML parser should be fully completed, probably by "Monday" or
"Tuesday"(mostly it should get completed by this weekend).

+ Next week,I will work on  understanding "Slide Mater View" and  on using
"Slide Mater View" to edit the current built-in layouts.

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

Source Files for Wiki publisher

2013-06-21 Thread Othmane

Hello Everyone,

I am a new in development for LibreOffice and I have to work on the
extension Wiki Publisher for Libre Office for my internship. I find it hard
to work directly on the core source files, so can anyone please tell me
where i can get the source files for wiki publisher extension.

My mission consists in migrating from httpclient 3.x to httpclient 4.x on
wiki publisher.

thank you :)



--
View this message in context: 
http://nabble.documentfoundation.org/Source-Files-for-Wiki-publisher-tp4062464.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] core.git: vcl/source

2013-06-21 Thread Takeshi Abe

 vcl/source/window/menu.cxx |  108 -
 vcl/source/window/mnemonic.cxx |8 +--
 vcl/source/window/splitwin.cxx |   80 +++---
 3 files changed, 98 insertions(+), 98 deletions(-)

New commits:
commit f47b777a0b06fcc56569ac8aeff1a845d634ba1a
Author: Takeshi Abe 
Date:   Fri Jun 21 21:40:18 2013 +0900

sal_Bool to bool

Change-Id: I0673e9ec1d3e69a338313c568c462ab1e820d2b0

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index b896a7d..7bf3c16 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -126,7 +126,7 @@ struct MenuItemData
 sal_BoolbChecked;   // Checked
 sal_BoolbEnabled;   // Enabled
 sal_BoolbVisible;   // Visible (note: this flag 
will not override MENU_FLAG_HIDEDISABLEDENTRIES when true)
-sal_BoolbIsTemporary;   // Temporary inserted ('No 
selection possible')
+boolbIsTemporary;   // Temporary inserted ('No 
selection possible')
 sal_BoolbMirrorMode;
 longnItemImageAngle;
 SizeaSz;// only temporarily valid
@@ -247,7 +247,7 @@ MenuItemData* MenuItemList::Insert(
 pData->bChecked = sal_False;
 pData->bEnabled = sal_True;
 pData->bVisible = sal_True;
-pData->bIsTemporary = sal_False;
+pData->bIsTemporary = false;
 pData->bMirrorMode  = sal_False;
 pData->nItemImageAngle  = 0;
 
@@ -283,7 +283,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, 
size_t nPos)
 pData->bChecked = sal_False;
 pData->bEnabled = sal_True;
 pData->bVisible = sal_True;
-pData->bIsTemporary = sal_False;
+pData->bIsTemporary = false;
 pData->bMirrorMode  = sal_False;
 pData->nItemImageAngle  = 0;
 
@@ -477,13 +477,13 @@ private:
 sal_uInt16  nFirstEntry;
 sal_uInt16  nBorder;
 sal_uInt16  nPosInParent;
-sal_BoolbInExecute;
+boolbInExecute;
 
 sal_BoolbScrollMenu;
 sal_BoolbScrollUp;
 sal_BoolbScrollDown;
-sal_BoolbIgnoreFirstMove;
-sal_BoolbKeyInput;
+boolbIgnoreFirstMove;
+boolbKeyInput;
 
 DECL_LINK(PopupEnd, void *);
 DECL_LINK( HighlightChanged, Timer* );
@@ -682,8 +682,8 @@ private:
 sal_uInt16  nRolloveredItem;
 sal_uLong   nSaveFocusId;
 sal_BoolmbAutoPopup;
-sal_BoolbIgnoreFirstMove;
-sal_BoolbStayActive;
+boolbIgnoreFirstMove;
+boolbStayActive;
 
 DecoToolBox aCloser;
 PushButton  aFloatBtn;
@@ -786,12 +786,12 @@ static sal_uLong ImplChangeTipTimeout( sal_uLong 
nTimeout, Window *pWindow )
return nRet;
 }
 
-static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, 
sal_uInt16 nHighlightedItem, const HelpEvent& rHEvt, const Rectangle 
&rHighlightRect )
+static bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt16 
nHighlightedItem, const HelpEvent& rHEvt, const Rectangle &rHighlightRect )
 {
 if( ! pMenu )
-return sal_False;
+return false;
 
-sal_Bool bDone = sal_False;
+bool bDone = false;
 sal_uInt16 nId = 0;
 
 if ( nHighlightedItem != ITEMPOS_INVALID )
@@ -820,7 +820,7 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, 
Menu* pMenu, sal_uInt1
 Help::ShowQuickHelp( pMenuWindow, aRect, pMenu->GetTipHelpText( 
nId ) );
 ImplChangeTipTimeout( oldTimeout, pMenuWindow );
 }
-bDone = sal_True;
+bDone = true;
 }
 else if ( ( rHEvt.GetMode() & HELPMODE_QUICK ) && pMenuWindow )
 {
@@ -831,7 +831,7 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, 
Menu* pMenu, sal_uInt1
 // call always, even when strlen==0 to correctly remove tip
 Help::ShowQuickHelp( pMenuWindow, aRect, pMenu->GetTipHelpText( nId ) 
);
 ImplChangeTipTimeout( oldTimeout, pMenuWindow );
-bDone = sal_True;
+bDone = true;
 }
 else if ( rHEvt.GetMode() & (HELPMODE_CONTEXT | HELPMODE_EXTENDED) )
 {
@@ -851,7 +851,7 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, 
Menu* pMenu, sal_uInt1
 else
 pHelp->Start( OStringToOUString( aHelpId, 
RTL_TEXTENCODING_UTF8 ), NULL );
 }
-bDone = sal_True;
+bDone = true;
 }
 return bDone;
 }
@@ -1377,7 +1377,7 @@ void Menu::InsertSeparator(const OString &rIdent, 
sal_uInt16 nPos)
 
 void Menu::RemoveItem( sal_uInt16 nPos )
 {
-sal_Bool bRemove = sal_False;
+bool bRemove = false;
 
 if ( nPos < GetItemCount() )
 {
@@ -1386,7 +1386,7 @@ void Menu::Remove

[Libreoffice-commits] core.git: cui/source

2013-06-21 Thread Eike Rathke

 cui/source/tabpages/backgrnd.cxx |   80 ++-
 1 file changed, 47 insertions(+), 33 deletions(-)

New commits:
commit a5a96f5c5f436ed243e13636b36dc16184365cb3
Author: Eike Rathke 
Date:   Fri Jun 21 13:54:50 2013 +0200

de-uglify ** = new * and don't leak temporary SvxBrushItem

Change-Id: I8cc2927c2fe7b12b3ce8122f7d39276f5d58929d

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index e6c9933..16f8d95 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1627,32 +1627,36 @@ IMPL_LINK( SvxBackgroundTabPage, 
TblDestinationHdl_Impl, ListBox*, pBox )
 sal_uInt16 nSelPos = pBox->GetSelectEntryPos();
 if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos)
 {
-SvxBrushItem** pActItem = new (SvxBrushItem*);
+SvxBrushItem* pActItem = NULL;
+bool bDelete = false;
 sal_uInt16 nWhich = 0;
 switch(pTableBck_Impl->nActPos)
 {
 case TBL_DEST_CELL:
-*pActItem = pTableBck_Impl->pCellBrush;
+pActItem = pTableBck_Impl->pCellBrush;
 nWhich = pTableBck_Impl->nCellWhich;
 break;
 case TBL_DEST_ROW:
-*pActItem = pTableBck_Impl->pRowBrush;
+pActItem = pTableBck_Impl->pRowBrush;
 nWhich = pTableBck_Impl->nRowWhich;
 break;
 case TBL_DEST_TBL:
-*pActItem = pTableBck_Impl->pTableBrush;
+pActItem = pTableBck_Impl->pTableBrush;
 nWhich = pTableBck_Impl->nTableWhich;
 break;
 default:
-*pActItem = NULL;
+pActItem = NULL;
 break;
 }
 pTableBck_Impl->nActPos = nSelPos;
-if(!*pActItem)
-*pActItem = new SvxBrushItem(nWhich);
+if(!pActItem)
+{
+pActItem = new SvxBrushItem(nWhich);
+bDelete = true;
+}
 if(XFILL_SOLID == lcl_getFillStyle(m_pLbSelect))  // brush selected
 {
-**pActItem = SvxBrushItem( aBgdColor, nWhich );
+*pActItem = SvxBrushItem( aBgdColor, nWhich );
 }
 else
 {
@@ -1663,42 +1667,53 @@ IMPL_LINK( SvxBackgroundTabPage, 
TblDestinationHdl_Impl, ListBox*, pBox )
 bIsGraphicValid = LoadLinkedGraphic_Impl();
 
 if ( bIsLink )
-**pActItem = SvxBrushItem( aBgdGraphicPath,
+*pActItem = SvxBrushItem( aBgdGraphicPath,
 aBgdGraphicFilter,
 eNewPos,
-(*pActItem)->Which() );
+pActItem->Which() );
 else
-**pActItem = SvxBrushItem( aBgdGraphic,
+*pActItem = SvxBrushItem( aBgdGraphic,
 eNewPos,
-(*pActItem)->Which() );
+pActItem->Which() );
 }
 switch(nSelPos)
 {
 case TBL_DEST_CELL:
-*pActItem = pTableBck_Impl->pCellBrush;
+pActItem = pTableBck_Impl->pCellBrush;
 m_pLbSelect->Enable();
 nWhich = pTableBck_Impl->nCellWhich;
 break;
 case TBL_DEST_ROW:
 if((nHtmlMode & HTMLMODE_ON) && !(nHtmlMode & 
HTMLMODE_SOME_STYLES))
 m_pLbSelect->Disable();
-*pActItem = pTableBck_Impl->pRowBrush;
+pActItem = pTableBck_Impl->pRowBrush;
 nWhich = pTableBck_Impl->nRowWhich;
 break;
 case TBL_DEST_TBL:
-*pActItem = pTableBck_Impl->pTableBrush;
+pActItem = pTableBck_Impl->pTableBrush;
 m_pLbSelect->Enable();
 nWhich = pTableBck_Impl->nTableWhich;
 break;
 default:
-*pActItem = NULL;
+if (bDelete)
+{
+// The item will be new'ed again below, but that will be the
+// default item then, not an existing modified one.
+delete pActItem;
+bDelete = false;
+}
+pActItem = NULL;
 break;
 }
 String aUserData = GetUserData();
-if(!*pActItem)
-*pActItem = new SvxBrushItem(nWhich);
-FillControls_Impl(**pActItem, aUserData);
-delete pActItem;
+if(!pActItem)
+{
+pActItem = new SvxBrushItem(nWhich);
+bDelete = true;
+}
+FillControls_Impl(*pActItem, aUserData);
+if (bDelete)
+delete pActItem;
 }
 return 0;
 }
@@ -1710,21 +1725,21 @@ IMPL_LINK( SvxBackgroundTabPage, 
ParaDestinationHdl_Impl, ListBox*, pBox )
 sal_uInt16 nSelPos = pBox->GetSelectEntryPos();
 if( pParaBck_Impl && pParaBck_Impl->nActPos != nSelPos)
 {
-

[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source basic/source include/basic

2013-06-21 Thread Gergo Mocsi

 basctl/source/basicide/baside2.hxx  |2 -
 basctl/source/basicide/baside2b.cxx |   53 
 basic/source/classes/sb.cxx |1 
 basic/source/classes/sbxmod.cxx |   47 +++
 basic/source/comp/dim.cxx   |2 +
 basic/source/comp/parser.cxx|1 
 basic/source/comp/sbcomp.cxx|2 -
 include/basic/sbmod.hxx |9 ++
 8 files changed, 115 insertions(+), 2 deletions(-)

New commits:
commit 035be6eb0de0b02796ee73940817278f5007e112
Author: Gergo Mocsi 
Date:   Fri Jun 21 14:10:31 2013 +0200

GSOC work week 2, getting infromation from variables and print on terminal

This is an early version. I use the BASIC parser to parse the source,
then the infromation is extracted from the symbol table built by parser.
Error reporting is suppressed, beacuse it is not needed fro code 
completition.
I placed my function inside SbModule, and created a struct called 
CodeCompletitionData, which holds the object's name, it's parent, and it's type 
name.
This function, SbMethod::GetCodeCompleteDataFromParse() is called from 
Basic IDE's Notify function, which updates a cache(actually, reassigns a 
viariable :) ).
Later, in the EditorWindow::KeyInput function there is a check wheteher dot 
key is pressed. After that, the actual variable (or word) is being looked up in 
the vector that holds code completition data. And finally, if it is found, it's 
methods are printed on the terminal.

Change-Id: Idaf19baa8f720b8b117a76dc3cc2f90dd04fd155

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index c02f502..fb48ae3 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -67,7 +67,6 @@ DBG_NAMEEX( ModulWindow )
 OUString getTextEngineText (ExtTextEngine&);
 void setTextEngineText (ExtTextEngine&, OUString const&);
 
-
 class EditorWindow : public Window, public SfxListener
 {
 private:
@@ -109,6 +108,7 @@ private:
 virtual
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
 GetComponentInterface(sal_Bool bCreate = true);
+std::vector< CodeCompleteData > aCodeCompleteCache;
 
 protected:
 virtual voidPaint( const Rectangle& );
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 7b7e3c7..afde040 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -48,6 +48,13 @@
 #include 
 
 #include 
+#include 
+#include "com/sun/star/reflection/XIdlReflection.hpp"
+#include 
+#include 
+#include 
+#include "com/sun/star/reflection/XInterfaceMemberTypeDescription.hpp"
+#include "com/sun/star/reflection/XIdlMethod.hpp"
 
 namespace basctl
 {
@@ -424,7 +431,11 @@ void EditorWindow::MouseButtonUp( const MouseEvent &rEvt )
 {
 pEditView->MouseButtonUp( rEvt );
 if (SfxBindings* pBindings = GetBindingsPtr())
+{
+pBindings->Invalidate( SID_COPY );
+pBindings->Invalidate( SID_CUT );
 pBindings->Invalidate( SID_BASICIDE_STAT_POS );
+}
 }
 }
 
@@ -469,6 +480,7 @@ bool EditorWindow::ImpCanModify()
 
 void EditorWindow::KeyInput( const KeyEvent& rKEvt )
 {
+SvtMiscOptions aMiscOptions;
 if ( !pEditView )   // Happens in Win95
 return;
 
@@ -482,7 +494,31 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
 bool const bWasModified = pEditEngine->IsModified();
 // see if there is an accelerator to be processed first
 bool bDone = SfxViewShell::Current()->KeyInput( rKEvt );
+if( rKEvt.GetKeyCode().GetCode() == KEY_POINT && 
aMiscOptions.IsExperimentalMode())
+{
+TextSelection aSel = GetEditView()->GetSelection();
+sal_uLong nLine =  aSel.GetStart().GetPara();
+OUString aLine( pEditEngine->GetText( nLine ) ); // the line being 
modified
 
+OUString aStr = (aLine.lastIndexOf(" ") == -1 ? 
aLine.replaceFirst(".","") : aLine.copy(aLine.lastIndexOf(" 
")).replaceFirst(".",""));
+for( unsigned int j = 0; j < aCodeCompleteCache.size(); ++j)
+{
+if( aCodeCompleteCache[j].sVarName == aStr )
+{
+Reference< lang::XMultiServiceFactory > xFactory( 
comphelper::getProcessServiceFactory(), UNO_SET_THROW );
+Reference< reflection::XIdlReflection > xRefl( 
xFactory->createInstance("com.sun.star.reflection.CoreReflection"), 
UNO_QUERY_THROW );
+Reference< reflection::XIdlClass > xClass = 
xRefl->forName(aCodeCompleteCache[j].sVarType);
+if( !xRefl.is() )
+break;
+Sequence< Reference< reflection::XIdlMethod > > aMethods = 
xClass->getMethods();
+for(sal_Int32 i = 0; i < aMethods.getLength(); ++i)
+{
+SAL_WARN("method information",aMethods[i]->getName());
+}
+break;
+

[Libreoffice-commits] core.git: include/vcl vcl/source

 include/vcl/edit.hxx|2 +-
 vcl/source/control/edit.cxx |   16 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 0a5c151b62a7abc3fc4abaadb0b50c3047eb5f26
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 21 13:00:51 2013 +0100

Resolves: fdo#65635 don't include border gap in height for borderless edits

Change-Id: If778fdeb5bdbd5a5cac33f57ef8d598ddc1408f2

diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 488758a..11c1ae8 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -122,7 +122,7 @@ protected:
 SAL_DLLPRIVATE voidImplInitSettings( sal_Bool bFont, sal_Bool 
bForeground, sal_Bool bBackground );
 SAL_DLLPRIVATE voidImplLoadRes( const ResId& rResId );
 SAL_DLLPRIVATE voidImplSetSelection( const Selection& rSelection, 
sal_Bool bPaint = sal_True );
-SAL_DLLPRIVATE int ImplGetNativeControlType();
+SAL_DLLPRIVATE int ImplGetNativeControlType() const;
 SAL_DLLPRIVATE longImplGetExtraOffset() const;
 static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( Window* pWin );
 
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 20c41a9..cfd4d33 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1048,10 +1048,10 @@ void Edit::ImplSetText( const OUString& rText, const 
Selection* pNewSelection )
 
 // ---
 
-int Edit::ImplGetNativeControlType()
+int Edit::ImplGetNativeControlType() const
 {
 int nCtrl = 0;
-Window *pControl = mbIsSubEdit ? GetParent() : this;
+const Window *pControl = mbIsSubEdit ? GetParent() : this;
 
 switch( pControl->GetType() )
 {
@@ -2877,6 +2877,8 @@ void Edit::SetSubEdit( Edit* pEdit )
 
 Size Edit::CalcMinimumSizeForText(const OUString &rString) const
 {
+int eCtrlType = ImplGetNativeControlType();
+
 Size aSize;
 if (mnWidthInChars != -1)
 {
@@ -2893,8 +2895,12 @@ Size Edit::CalcMinimumSizeForText(const OUString 
&rString) const
 if (aSize.Width() < aMinSize.Width())
 aSize.Width() = aMinSize.Width();
 }
-// add some space between text entry and border
-aSize.Height() += 4;
+
+if (eCtrlType != CTRL_EDITBOX_NOBORDER)
+{
+// add some space between text entry and border
+aSize.Height() += 4;
+}
 
 aSize = CalcWindowSize( aSize );
 
@@ -2903,7 +2909,7 @@ Size Edit::CalcMinimumSizeForText(const OUString 
&rString) const
 Rectangle aRect( Point( 0, 0 ), aSize );
 Rectangle aContent, aBound;
 if( const_cast(this)->GetNativeControlRegion(
-   CTRL_EDITBOX, PART_ENTIRE_CONTROL,
+   eCtrlType, PART_ENTIRE_CONTROL,
aRect, 0, aControlValue, OUString(), aBound, aContent) )
 {
 if( aBound.GetHeight() > aSize.Height() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: git-new-workdir

On Thu, Dec 13, 2012 at 11:57:27AM -0500, Kohei Yoshida wrote:
> On 12/13/2012 10:21 AM, Lionel Elie Mamane wrote:
>> On Wed, Dec 12, 2012 at 02:21:18PM -0500, Kohei Yoshida wrote:

>>> Not following the thread fully I'm not sure what this is about.  I'm
>>> guessing this is about git-new-workdir vs submodules.

>>> To put it short, I got it to work, and so far I haven't seen any
>>> major issues but some occasional oddities which I just dismiss for
>>> now.

>> I'd appreciate a description of how did it, actually.

> I have this primary master branch

> ~/libo/master

> and in it, submodules work more or less as expected.

> Now, to create a new workdir for, say, libreoffice-4-0 branch, I run

> cd ~/libo
> git-new-workdir master libreoffice-4-0 libreoffice-4-0

> I tend to name the directory the same name as the branch name. Then

> cd libreoffice-4-0
> ln -s ../master/src
> git-new-workdir ../master/helpconent2 helpcontent2 libreoffice-4-0

I see, you just do the git-new-workdir for every submodule before "git
submodule update" is run, and "git submodule update" respects the
setup. That should work, yes, but it abandons the idea of putting the
.git directory of the submodule in .git/modules/foo..

I've managed to fork git-new-workdir into git-new-module-workdir and
using it I've reenabled the --with-linked-git ./configure option. But
I've changed the semantics a bit.

You have a unique special "master" branch that serves as
reference, and you link everything to there. I work slightly
differently:

1) I have bare git repos for core and the submodules

2) My master checkout is in directory "libreoffice-4.2" and when the
   branch "libreoffice-4-2" is created, I switch to it and create a
   new "libreoffice-4-3" checkout.

So, to cater for my needs, "--with-linked-git" now does not point to a
full checkout, but to the parent directory of all submodule git
repositories, where each has to be named after their submodule
name. In your scenario, pointing it to ~/libo/master/ or
~/libo/master/.git/modules should both work. Let me know if it does.

> I would think that you probably should create a branch for the
> submodules as well to get it to work,

Not really, the "submodule update" checkouts a specific SHA1-ID,
without reference to any branch anyway.

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

[Libreoffice-commits] core.git: svx/source

2013-06-21 Thread Adolfo Jayme Barrientos

 svx/source/sidebar/area/AreaPropertyPanel.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 98c38b02d8f6549aefdfdb30399e386acea8fd79
Author: Adolfo Jayme Barrientos 
Date:   Fri Jun 21 14:49:21 2013 +0300

Typo fix: transparence -> transparency

Change-Id: Ie173e8586a1aed573989f57aa92adae5d1bbc9fb

diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src 
b/svx/source/sidebar/area/AreaPropertyPanel.src
index 32696ed..849c141 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -110,7 +110,7 @@ Control RID_SIDEBAR_AREA_PANEL
 Border = TRUE ;
 Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , 
SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + 
TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
 Size = MAP_APPFONT ( MBOX_WIDTH , LISTBOX_HEIGHT ) ;
-QuickHelpText [ en-US ] = "Select the type of transparence to apply." ;
+QuickHelpText [ en-US ] = "Select the type of transparency to apply." ;
 TabStop = TRUE ;
 DropDown = TRUE ;
 HelpID = HID_PPROPERTYPANEL_AREA_LB_TRGR_TYPES ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

 cui/source/tabpages/backgrnd.cxx |   52 +--
 1 file changed, 28 insertions(+), 24 deletions(-)

New commits:
commit def4471b3d5665bda3d323520cc16ce3d2ec7636
Author: Norbert Thiebaud 
Date:   Thu Jun 20 14:56:49 2013 -0500

coverity#707511 Unitialized pointer read

Change-Id: I2b8441dba51d0ed96dc60d6573d8b46e767fe23b
Reviewed-on: https://gerrit.libreoffice.org/4411
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index a8ce0a7..e6c9933 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1631,17 +1631,20 @@ IMPL_LINK( SvxBackgroundTabPage, 
TblDestinationHdl_Impl, ListBox*, pBox )
 sal_uInt16 nWhich = 0;
 switch(pTableBck_Impl->nActPos)
 {
-case TBL_DEST_CELL:
-*pActItem = pTableBck_Impl->pCellBrush;
-nWhich = pTableBck_Impl->nCellWhich;
+case TBL_DEST_CELL:
+*pActItem = pTableBck_Impl->pCellBrush;
+nWhich = pTableBck_Impl->nCellWhich;
 break;
-case TBL_DEST_ROW:
-*pActItem = pTableBck_Impl->pRowBrush;
-nWhich = pTableBck_Impl->nRowWhich;
+case TBL_DEST_ROW:
+*pActItem = pTableBck_Impl->pRowBrush;
+nWhich = pTableBck_Impl->nRowWhich;
 break;
-case TBL_DEST_TBL:
-*pActItem = pTableBck_Impl->pTableBrush;
-nWhich = pTableBck_Impl->nTableWhich;
+case TBL_DEST_TBL:
+*pActItem = pTableBck_Impl->pTableBrush;
+nWhich = pTableBck_Impl->nTableWhich;
+break;
+default:
+*pActItem = NULL;
 break;
 }
 pTableBck_Impl->nActPos = nSelPos;
@@ -1671,23 +1674,24 @@ IMPL_LINK( SvxBackgroundTabPage, 
TblDestinationHdl_Impl, ListBox*, pBox )
 }
 switch(nSelPos)
 {
-case TBL_DEST_CELL:
-*pActItem = pTableBck_Impl->pCellBrush;
-m_pLbSelect->Enable();
-nWhich = pTableBck_Impl->nCellWhich;
+case TBL_DEST_CELL:
+*pActItem = pTableBck_Impl->pCellBrush;
+m_pLbSelect->Enable();
+nWhich = pTableBck_Impl->nCellWhich;
 break;
-case TBL_DEST_ROW:
-{
-if((nHtmlMode & HTMLMODE_ON) && !(nHtmlMode & 
HTMLMODE_SOME_STYLES))
-m_pLbSelect->Disable();
-*pActItem = pTableBck_Impl->pRowBrush;
-nWhich = pTableBck_Impl->nRowWhich;
-}
+case TBL_DEST_ROW:
+if((nHtmlMode & HTMLMODE_ON) && !(nHtmlMode & 
HTMLMODE_SOME_STYLES))
+m_pLbSelect->Disable();
+*pActItem = pTableBck_Impl->pRowBrush;
+nWhich = pTableBck_Impl->nRowWhich;
 break;
-case TBL_DEST_TBL:
-*pActItem = pTableBck_Impl->pTableBrush;
-m_pLbSelect->Enable();
-nWhich = pTableBck_Impl->nTableWhich;
+case TBL_DEST_TBL:
+*pActItem = pTableBck_Impl->pTableBrush;
+m_pLbSelect->Enable();
+nWhich = pTableBck_Impl->nTableWhich;
+break;
+default:
+*pActItem = NULL;
 break;
 }
 String aUserData = GetUserData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

 sfx2/source/inc/workwin.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6bf42bfc5af08ea1c2f40dbc7a142cff88a3df79
Author: Norbert Thiebaud 
Date:   Thu Jun 20 13:38:06 2013 -0500

coverity#707538 : unitialized scalar variables

Change-Id: Ie0cd3f1d43398bf4023b5b4503e3519c8005e149
Reviewed-on: https://gerrit.libreoffice.org/4407
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 1d83bef..e0ab8af 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -57,6 +57,8 @@ struct SfxObjectBar_Impl
 SfxObjectBar_Impl() :
 nId(0),
 nMode(0),
+nPos(0),
+nIndex(0),
 bDestroy(sal_False),
 pIFace(0)
 {}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/git-new-module-workdir config_host.mk.in configure.ac g

 bin/git-new-module-workdir |   88 +
 config_host.mk.in  |1 
 configure.ac   |   18 +
 g  |9 
 4 files changed, 116 insertions(+)

New commits:
commit aa1a988c7403cac81638c195b753fab7ac3600f9
Author: Lionel Elie Mamane 
Date:   Fri Jun 21 13:31:37 2013 +0200

Reintroduce --with-linked-git option

With slightly different semantics:
Instead of pointing at a previous checkout,
point at base directory of all repos.

Change-Id: I254ecc33071be53067c44610b030f737cf75a7ee

diff --git a/bin/git-new-module-workdir b/bin/git-new-module-workdir
new file mode 100755
index 000..bfad184
--- /dev/null
+++ b/bin/git-new-module-workdir
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+usage () {
+   echo "usage:" $@
+   exit 127
+}
+
+die () {
+   echo $@
+   exit 128
+}
+
+if test $# -lt 2 || test $# -gt 2
+then
+   usage "$0  "
+fi
+
+orig_git=$1
+new_workdir=$2
+branch=$3
+
+# want to make sure that what is pointed to has a .git directory ...
+git_dir=$(cd "$orig_git" 2>/dev/null &&
+  git rev-parse --git-dir 2>/dev/null) ||
+  die "Not a git repository: \"$orig_git\""
+
+case "$git_dir" in
+.git)
+   git_dir="$orig_git/.git"
+   ;;
+.)
+   git_dir=$orig_git
+   ;;
+esac
+
+# don't link to a configured bare repository
+isbare=$(git --git-dir="$git_dir" config --bool --get core.bare)
+if test ztrue = z$isbare
+then
+   die "\"$git_dir\" has core.bare set to true," \
+   " remove from \"$git_dir/config\" to use $0"
+fi
+
+# don't link to a workdir
+if test -h "$git_dir/config"
+then
+   die "\"$orig_git\" is a working directory only, please specify" \
+   "a complete repository."
+fi
+
+if ! test -d ".git"
+then
+   die "the current directory is not a git workdir"
+fi
+
+# don't recreate a workdir over an existing repository
+if test -e "$new_workdir/.git"
+then
+   die "destination directory '$new_workdir' already exists."
+fi
+
+# make sure the links use full paths
+git_dir=$(cd "$git_dir"; pwd)
+
+# create the workdir
+mkdir -p ".git/modules/$new_workdir" || die "unable to create 
\".git/modules/$new_workdir\"!"
+
+# create the links to the original repo.  explicitly exclude index, HEAD and
+# logs/HEAD from the list since they are purely related to the current working
+# directory, and should not be shared.
+## LEM: add branches; deprecated, but safer to include it
+for x in branches config refs logs/refs objects info hooks packed-refs remotes 
rr-cache svn
+do
+   case $x in
+   */*)
+   mkdir -p "$(dirname ".git/modules/$new_workdir/$x")"
+   ;;
+   esac
+   ln -s "$git_dir/$x" ".git/modules/$new_workdir/$x"
+done
+
+# now setup the workdir
+mkdir -p "$new_workdir"
+cd "$new_workdir"
+echo "gitdir: ../.git/modules/$new_workdir" > .git
+# copy the HEAD from the original repository as a default branch
+cp "$git_dir/HEAD" ../.git/modules/$new_workdir/HEAD
+# don't checkout the branch, a subsequent "git module update" will do it
diff --git a/config_host.mk.in b/config_host.mk.in
index a3ecf99..1ce8618 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -174,6 +174,7 @@ export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
 export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
 export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
 export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
+export GIT_LINK_SRC=@GIT_LINK_SRC@
 export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
 export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
 export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@
diff --git a/configure.ac b/configure.ac
index c7e6438..b9810f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1238,6 +1238,13 @@ AC_ARG_WITH(referenced-git,
 GIT_REFERENCE_SRC=$withval ,
 )
 
+AC_ARG_WITH(linked-git,
+AS_HELP_STRING([--with-linked-git=],
+[Specify a directory where the repositories of submodules are located.
+ This uses a method similar to git-new-workdir to get submodules.]),
+GIT_LINK_SRC=$withval ,
+)
+
 AC_ARG_WITH(galleries,
 AS_HELP_STRING([--with-galleries],
 [Specify how galleries should be built. It is possible either to
@@ -11616,6 +11623,17 @@ if test -n "${GIT_REFERENCE_SRC}"; then
 fi
 AC_SUBST(GIT_REFERENCE_SRC)
 
+dnl git submodules linked dirs
+dnl ===
+if test -n "${GIT_LINK_SRC}"; then
+for repo in ${GIT_NEEDED_SUBMODULES}; do
+if ! test -d "${GIT_LINK_SRC}"/${repo}; then
+AC_MSG_ERROR([linked git: required repository does not exist: 
${GIT_LINK_SRC}/${repo}])
+fi
+done
+fi
+AC_SUBST(GIT_LINK_SRC)
+
 dnl branding
 dnl ===
 AC_MSG_CHECKING([for alternative branding images directory])
diff --git a/g b/g
index c24ca3b..e273171 100755
--- a/g
+++ b/g
@@ -152,6 +152,10 @@ get_git_reference()
 if [ -f config_host.mk ]; then

[Libreoffice-commits] core.git: svtools/source

 svtools/source/uno/unoiface.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 699180768bf600d646f8652c3fff886bcf052891
Author: Norbert Thiebaud 
Date:   Thu Jun 20 13:26:09 2013 -0500

coverity#707543 : Unitialized scalar variable

Change-Id: I601b8cd42932fcba9b98a5736faa9d38525b093a
Reviewed-on: https://gerrit.libreoffice.org/4406
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 658623f..a08b93f 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -1505,6 +1505,11 @@ RMItemData SVTXRoadmap::GetRMItemData( const 
::com::sun::star::container::Contai
 aValue = xPropertySet->getPropertyValue(OUString( "Enabled" ));
 aValue >>= aCurRMItemData.b_Enabled;
 }
+else
+{
+aCurRMItemData.b_Enabled = sal_False;
+aCurRMItemData.n_ID = 0;
+}
 return aCurRMItemData;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

 sw/source/core/doc/htmltbl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0139e0b1cd4e4ac585417f0c71be10a419711b9d
Author: Norbert Thiebaud 
Date:   Thu Jun 20 13:15:53 2013 -0500

coverity#707550, coverity#707549 : Unitialized scalar variable

Change-Id: I36026768fb51ed80a70addfcad9b831d8e7e6d7c
Reviewed-on: https://gerrit.libreoffice.org/4405
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index d1a784b..9e0e707 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -1212,7 +1212,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 
nAbsAvail, sal_uInt16 nRelAv
 sal_uLong nRealMin = 0;
 for( sal_uInt16 i=0; iGetMin();
-sal_uLong nRealColMin = MINLAY, nDummy1, nDummy2;
+sal_uLong nRealColMin = MINLAY, nDummy1 = 0, nDummy2 = 0;
 AddBorderWidth( nRealColMin, nDummy1, nDummy2, i, 1 );
 
 if( nColMin <= USHRT_MAX )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

 sw/source/core/edit/edtab.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4cb05188fe07e66adc347c20e286e41bc64598ff
Author: Norbert Thiebaud 
Date:   Thu Jun 20 13:08:02 2013 -0500

coverity#707554 Unitialized scalar variable

Change-Id: I8df87c59926a62309e2ba342fe38b4915f81b3f7
Reviewed-on: https://gerrit.libreoffice.org/4404
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 1526496..a0b5de7 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -382,7 +382,7 @@ sal_Bool SwEditShell::IsTableBoxTextFormat() const
 if( !pBox )
 return sal_False;
 
-sal_uInt32 nFmt;
+sal_uInt32 nFmt = 0;
 const SfxPoolItem* pItem;
 if( SFX_ITEM_SET == pBox->GetFrmFmt()->GetAttrSet().GetItemState(
 RES_BOXATR_FORMAT, sal_True, &pItem ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/qa

2013-06-21 Thread Jan Holesovsky

 sd/qa/unit/import-tests.cxx |   26 ++
 1 file changed, 22 insertions(+), 4 deletions(-)

New commits:
commit e2ba9b895b262dd16d452e8b461790beebb2dab3
Author: Jan Holesovsky 
Date:   Fri Jun 21 13:13:26 2013 +0200

Better description of the sd unit tests creation.

Change-Id: I7d3ac7997f54f4cb3fc826601d89248ea42549f4

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index bebda14..c9dfd60 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -48,10 +48,28 @@ public:
 
 /** Test document against a reference XML dump of shapes.
 
-If you want to update one of these tests, set the nUpdateMe to the index of
-the test, the dump XML's will be created (or rewritten) instead of checking.
-Use with care - when the test is failing, first find out why, instead of just
-updating .xml's blindly.
+If you want to update one of these tests, or add a new one, set the nUpdateMe
+to the index of the test, and the dump XML's will be created (or rewritten)
+instead of checking. Use with care - when the test is failing, first find out
+why, instead of just updating .xml's blindly.
+
+Example: Let's say you are adding a test called fdoABCD.pptx.  You'll place it
+to the data/ subdirectory, and will add an entry to aFilesToCompare below,
+like:
+
+{ "fdoABCD.pptx", "xml/fdoABCD_" },
+
+and will count the index in the aFilesToCompare structure (1st is 0, 2nd is 1,
+etc.)  Temporarily you'll set nUpdateMe to this index (instead of -1), and run
+
+make sd
+
+This will generate the sd/qa/unit/data/xml/fdoABCD_*.xml for you.  Now you
+will change nUpdateMe back to -1, and commit your fdoABCD.pptx test, the
+xml/fdoABCD_*.xml dumps, and the aFilesToCompare addition in one commit.
+
+As the last step, you will revert your fix and do 'make sd' again, to check
+that without your fix, the unit test breaks.  Then clean up, and push :-)
 
 NOTE: This approach is suitable only for tests of fixes that actually change
 the layout - best to check by reverting your fix locally after having added
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 93/2fbb775018e3f6d3136cc5e1ab3826509eda36

 93/2fbb775018e3f6d3136cc5e1ab3826509eda36 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9066c0ba8fb85971d22b96eca2bda0249e0f2259
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 21 12:01:22 2013 +0100

Notes added by 'git notes add'

diff --git a/93/2fbb775018e3f6d3136cc5e1ab3826509eda36 
b/93/2fbb775018e3f6d3136cc5e1ab3826509eda36
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/93/2fbb775018e3f6d3136cc5e1ab3826509eda36
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1c/f0f678f41407016388e17e75fb3f073b2febe6

 1c/f0f678f41407016388e17e75fb3f073b2febe6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d45fa033513a7b6eba0cb682faf39c03d2673718
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 21 12:00:52 2013 +0100

Notes added by 'git notes add'

diff --git a/1c/f0f678f41407016388e17e75fb3f073b2febe6 
b/1c/f0f678f41407016388e17e75fb3f073b2febe6
new file mode 100644
index 000..9f141da
--- /dev/null
+++ b/1c/f0f678f41407016388e17e75fb3f073b2febe6
@@ -0,0 +1 @@
+prefer: 1fadebef054b811d8d6487d45d76dea1990e1268
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 70/e8e4f79483c3c31c217c4493361d76af99544f

 70/e8e4f79483c3c31c217c4493361d76af99544f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d8b14a5ee851badf9ea7309989bb80d152c529fd
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 21 11:55:59 2013 +0100

Notes added by 'git notes add'

diff --git a/70/e8e4f79483c3c31c217c4493361d76af99544f 
b/70/e8e4f79483c3c31c217c4493361d76af99544f
new file mode 100644
index 000..c138257
--- /dev/null
+++ b/70/e8e4f79483c3c31c217c4493361d76af99544f
@@ -0,0 +1 @@
+prefer: af2053c318564ef56235482f058d30ae26ecf77d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Nightly 4.1 builds

2013-06-21 Thread Johan Vromans

It seems that there haven't been nightly 4.1 buids for the last couple
of days.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[GSOC] about:config utility - Weekly Report #1

2013-06-21 Thread Efe Gürkan YALAMAN

Hi all,

I started coding this week. Briefly I created initial forms of my project.
I also spend some time to understand and research current code.

Here is the detailed report.

===

*I am implementing this in C++, on feature/aboutconfig branch.
*Implementation will be on CUI module.

*I have 2 milestones about this project.
   -Create a usable dialog.
   -Fill it with related content.

*Filling the content is a milestone because I need to convert all different
preferences to appropriate format. (new format will be
module.group.preference or stg. like that.)

+I created a ui file. Probably I will refactor it later. I want to add a
searchbar to it later.
+Created initial backend for the ui. I created it based on SfxTabPage but
in case of we decide it to be a standalone dialog it may change.
+I need to use a multicolumn listbox for this purpose. Current multicolumn
listboxes based on simpletable. I will try to use OptHeaderTabListBox which
is based on simpletable too.

Next week I am planning to improve current files and research the code.


Best.
-- 
Efe Gürkan YALAMAN
http://about.me/efegurkan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Suspected Junk Mail] Re: SVG: scaling if no width/height is given

2013-06-21 Thread Michael Meeks

On Thu, 2013-06-20 at 21:24 +0200, bugreporte...@hushmail.com wrote:
> Please guys, this is about open source software and people having fun
> doing some coding/helping an open source project/s.

Right - the root cause of these issues grows directly from the
consequences of the choice to have a duplicate projects with similar
goals, combined with a lack of willingness to compromise around project
structure, control, participation, centralisation and the other things
which flow from licensing. That root brings a host of other
significantly buggy interactions across the spectrum, like this one -
regrettable, but naturally none of this is really news.

It's also not really an appropriate topic of discussion for the
developers' list; can we end-thread and (if people really want to do
more round-trips on this) take the discussion to the 'discuss' list or
some other more suitable place. I don't believe this sort of thing is
productive here.

Thanks !

Michael.

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

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - filter/source setup_native/source sw/source

2013-06-21 Thread Andre Fischer

 filter/source/msfilter/escherex.cxx  |   22 +++
 setup_native/source/win32/nsis/ooobanner.bmp |binary
 setup_native/source/win32/nsis/ooobitmap.bmp |binary
 sw/source/ui/misc/redlndlg.cxx   |   51 ++-
 4 files changed, 41 insertions(+), 32 deletions(-)

New commits:
commit 70e8e4f79483c3c31c217c4493361d76af99544f
Author: Andre Fischer 
Date:   Fri Jun 21 09:52:54 2013 +

121256: Remember Any by value not by pointer before using it in outer scope.

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index d126053..ad10d28 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2707,8 +2707,10 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 const rtl::OUString sHandles( 
RTL_CONSTASCII_USTRINGPARAM( "Handles" ) );
 const rtl::OUString sAdjustmentValues   ( 
RTL_CONSTASCII_USTRINGPARAM( "AdjustmentValues" ) );
 
-const beans::PropertyValue* pAdjustmentValuesProp = NULL;
-const beans::PropertyValue* pPathCoordinatesProp = NULL;
+bool bHasAdjustmentValuesProp = false;
+uno::Any aAdjustmentValuesProp;
+bool bHasPathCoordinatesProp = false;
+uno::Any aPathCoordinatesProp;
 sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
 uno::Sequence< beans::PropertyValues > aHandlesPropSeq;
 sal_Bool bPredefinedHandlesUsed = sal_True;
@@ -3157,7 +3159,10 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 else if ( rrProp.Name.equals( sPathCoordinates ) )
 {
 if ( !bIsDefaultObject )
-pPathCoordinatesProp = &rrProp;
+{
+aPathCoordinatesProp = rrProp.Value;
+bHasPathCoordinatesProp = true;
+}
 }
 else if ( rrProp.Name.equals( sPathGluePoints ) )
 {
@@ -3785,13 +3790,14 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 {
 // it is required, that the information which handle is 
polar has already be read,
 // so we are able to change the polar value to a fixed 
float
-pAdjustmentValuesProp = &rProp;
+aAdjustmentValuesProp = rProp.Value;
+bHasAdjustmentValuesProp = true;
 }
 }
-if ( pAdjustmentValuesProp )
+if ( bHasAdjustmentValuesProp )
 {
 uno::Sequence< 
com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
-if ( pAdjustmentValuesProp->Value >>= aAdjustmentSeq )
+if ( aAdjustmentValuesProp >>= aAdjustmentSeq )
 {
 if ( bPredefinedHandlesUsed )
 LookForPolarHandles( eShapeType, 
nAdjustmentsWhichNeedsToBeConverted );
@@ -3802,10 +3808,10 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 AddOpt( (sal_uInt16)( DFF_Prop_adjustValue + k ), 
(sal_uInt32)nValue );
 }
 }
-if( pPathCoordinatesProp )
+if( bHasPathCoordinatesProp )
 {
 com::sun::star::uno::Sequence< 
com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates;
-if ( pPathCoordinatesProp->Value >>= aCoordinates )
+if ( aPathCoordinatesProp >>= aCoordinates )
 {
 // creating the vertices
 if ( (sal_uInt16)aCoordinates.getLength() )
commit 1cf0f678f41407016388e17e75fb3f073b2febe6
Author: Oliver-Rainer Wittmann 
Date:   Fri Jun 21 08:59:33 2013 +

121435: Change Tracking - Accept and Reject dialog - on accessing redline 
by index assure that index has valid value

diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index a3779ad..eb275d3 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -350,7 +350,7 @@ void SwRedlineAcceptDlg::InitAuthors()
 pFilterPage->ClearAuthors();
 
 String sParent;
-sal_uInt16 nCount = pSh->GetRedlineCount();
+const sal_uInt16 nRedlineCount = pSh->GetRedlineCount();
 
 bOnlyFormatedRedlines = sal_True;
 bHasReadonlySel = sal_False;
@@ -358,7 +358,7 @@ void SwRedlineAcceptDlg::InitAuthors()
 sal_uInt16 i;
 
 // Autoren ermitteln
-for ( i = 0; i < nCount; i++)
+for ( i = 0; i < nRedlineCount; i++)
 {
 const SwRedline& rRedln = pSh->GetRedline(i);
 
@@ -390,14 +390,18 @@

Re: make ok, but make install fails

2013-06-21 Thread Alex Thurgood


Le 21/06/2013 10:09, Matúš Kukan a écrit :

Hi Matúš,


or this could also help:
make desktop.clean && make desktop && make dev-install -o build



That did it for me, thanks :-))

Alex



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

[Libreoffice-commits] core.git: cui/source i18npool/inc i18npool/Library_i18npool.mk i18npool/source i18npool/util include/svx include/unotools offapi/com officecfg/registry svl/source svx/source svx/

 cui/source/options/optgdlg.cxx |3 
 i18npool/Library_i18npool.mk   |1 
 i18npool/inc/transliteration_Ignore.hxx|5 +
 i18npool/source/localedata/data/ar_DZ.xml  |2 
 i18npool/source/localedata/data/ar_EG.xml  |   10 ++
 i18npool/source/localedata/data/ar_LB.xml  |2 
 i18npool/source/localedata/data/ar_OM.xml  |6 -
 i18npool/source/localedata/data/ar_SA.xml  |2 
 i18npool/source/localedata/data/ar_TN.xml  |2 
 i18npool/source/registerservices/registerservices.cxx  |2 
 i18npool/source/transliteration/ignoreDiacritics_CTL.cxx   |   45 
++
 i18npool/source/transliteration/transliterationImpl.cxx|7 +
 i18npool/util/i18npool.component   |3 
 include/svx/srchdlg.hxx|2 
 include/unotools/searchopt.hxx |2 
 offapi/com/sun/star/i18n/TransliterationModulesExtra.idl   |3 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 ++
 officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs |6 +
 svl/source/items/srchitem.cxx  |6 +
 svx/source/dialog/srchdlg.cxx  |   30 +-
 svx/uiconfig/ui/findreplacedialog.ui   |   17 +++
 unotools/source/config/searchopt.cxx   |   19 +++-
 22 files changed, 162 insertions(+), 22 deletions(-)

New commits:
commit 448fa131b2dafac305d88480e469cc4bc0515d68
Author: abdulmajeed ahmed 
Date:   Fri Jun 21 11:07:34 2013 +0200

Fix fdo#52204 add new feature ignore diacritics in search for CTL

Change-Id: Ie9044a35003217545bacea214ef59047bff3b8b1

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 12a46f0..729ed7c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -65,6 +65,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -1396,6 +1397,8 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& 
rSet )
 
 if ( m_pCTLSupportCB->GetSavedValue() != m_pCTLSupportCB->IsChecked() )
 {
+SvtSearchOptions aOpt;
+aOpt.SetIgnoreDiacritics_CTL (true);
 pLangConfig->aLanguageOptions.SetCTLFontEnabled( 
m_pCTLSupportCB->IsChecked() );
 
 const sal_uInt16 STATE_COUNT = 1;
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index b578664..158f93f 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_Library_add_exception_objects,i18npool,\
i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP \
i18npool/source/transliteration/ignoreWidth \
i18npool/source/transliteration/ignoreZiZu_ja_JP \
+   i18npool/source/transliteration/ignoreDiacritics_CTL \
i18npool/source/transliteration/katakanaToHiragana \
i18npool/source/transliteration/largeToSmall_ja_JP \
i18npool/source/transliteration/numtochar \
diff --git a/i18npool/inc/transliteration_Ignore.hxx 
b/i18npool/inc/transliteration_Ignore.hxx
index 26f9252..e66e16a 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -113,6 +113,11 @@ TRANSLITERATION_IGNORE(TraditionalKanji_ja_JP)
 #if defined( TRANSLITERATION_ZiZu_ja_JP ) || defined( TRANSLITERATION_ALL )
 TRANSLITERATION_IGNORE(ZiZu_ja_JP)
 #endif
+
+#if defined( TRANSLITERATION_Diacritics_CTL ) || defined( TRANSLITERATION_ALL )
+TRANSLITERATION_IGNORE(Diacritics_CTL)
+#endif
+
 #undef TRANSLITERATION_IGNORE
 
 #define TRANSLITERATION_IGNORE( name ) \
diff --git a/i18npool/source/localedata/data/ar_DZ.xml 
b/i18npool/source/localedata/data/ar_DZ.xml
index c3c3be7..bb63392 100644
--- a/i18npool/source/localedata/data/ar_DZ.xml
+++ b/i18npool/source/localedata/data/ar_DZ.xml
@@ -453,7 +453,7 @@
   2
 
   
-  
+  
   
   
   
diff --git a/i18npool/source/localedata/data/ar_EG.xml 
b/i18npool/source/localedata/data/ar_EG.xml
index defa49e..662a913 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -458,7 +458,15 @@
   2
 
   
-  
+  
+
+
+
+
+
+
+
+  
   
 
   ØµØ
diff --git a/i18npool/source/localedata/data/ar_LB.xml 
b/i18npool/source/localedata/data/ar_LB.xml
index 86aba61..9499dfb 100644
--- a/i18npool/source/localedata/data/ar_LB.xml
+++ b/i18npool/source/localedata/data/ar_LB.xml
@@ -300,7 +300,7 @@
   2
 
   
-  
+  
   
   
   
diff --git a/i18npool/source/localedata/data/ar_OM.xml 
b/i18npool/source/localedata/data/ar_OM.xml
index d293046..5c4bfd7 100644
--- a/i18npool/source/localedata/data/ar_OM.xml
+++ b/i18npool/source/localedata/data/a

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5a/cb8675672007b3d5c581027825edd5b81c9945

 5a/cb8675672007b3d5c581027825edd5b81c9945 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 27d42f66bfcd4f170fc9aa9f8403ef921654cb2b
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 21 10:09:42 2013 +0100

Notes added by 'git notes add'

diff --git a/5a/cb8675672007b3d5c581027825edd5b81c9945 
b/5a/cb8675672007b3d5c581027825edd5b81c9945
new file mode 100644
index 000..b054215
--- /dev/null
+++ b/5a/cb8675672007b3d5c581027825edd5b81c9945
@@ -0,0 +1 @@
+prefer: 555ff26501d1bbd8a7872c20671c6303db1e1701
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 02/31f801a0bf15e3ce59642d502756ec6828bb5e

 02/31f801a0bf15e3ce59642d502756ec6828bb5e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit db5bfb1d1d8b6489b3b86eced5e67e82d2cd6e2d
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 21 09:57:52 2013 +0100

Notes added by 'git notes add'

diff --git a/02/31f801a0bf15e3ce59642d502756ec6828bb5e 
b/02/31f801a0bf15e3ce59642d502756ec6828bb5e
new file mode 100644
index 000..c9779b9
--- /dev/null
+++ b/02/31f801a0bf15e3ce59642d502756ec6828bb5e
@@ -0,0 +1 @@
+prefer: d1ba2cd612a4c39976e2980c7dc4e3fa38c88470
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source

2013-06-21 Thread Cédric Bosdonnat

 oox/source/vml/vmlshape.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 08db0b22bdce0f779e4af01a209aef1be29e9907
Author: CÃ©dric Bosdonnat 
Date:   Fri Jun 21 10:47:42 2013 +0200

n#820504: Some imported VML paths are closed, try to detect the

Change-Id: Idefd0277a85bd7b2b727f59cc4e568869b4932a1

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 414cc03..d34bf33 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -683,12 +683,19 @@ awt::Rectangle LineShape::getRelRectangle() const
 // 
 
 BezierShape::BezierShape(Drawing& rDrawing)
-: SimpleShape(rDrawing, "com.sun.star.drawing.OpenBezierShape")
+: SimpleShape(rDrawing, "com.sun.star.drawing.OpenBezierShape") // TODO 
Could we need both Open and Closed?
 {
 }
 
 Reference< XShape > BezierShape::implConvertAndInsert( const Reference< 
XShapes >& rxShapes, const awt::Rectangle& rShapeRect ) const
 {
+// If we have an 'x' in the last part of the path it means it is closed...
+sal_Int32 nPos = maShapeModel.maVmlPath.lastIndexOf(',');
+if ( nPos != -1 && maShapeModel.maVmlPath.copy(nPos).indexOf('x') != -1 )
+{
+const_cast( this )->setService( 
"com.sun.star.drawing.ClosedBezierShape" );
+}
+
 Reference< XShape > xShape = SimpleShape::implConvertAndInsert( rxShapes, 
rShapeRect );
 awt::Rectangle aCoordSys = getCoordSystem();
 
___
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