[Libreoffice-commits] core.git: unoidl/source
unoidl/source/sourceprovider-parser.y |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 766cdc8a603b17710f8c60558c07e4b64cdda54b
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 27 09:00:39 2013 +0100
Silence false may be used uninitialized warnings
Change-Id: Ie708de4a7fbd34e1ab3c417688de79d5bdf0e0b8
diff --git a/unoidl/source/sourceprovider-parser.y
b/unoidl/source/sourceprovider-parser.y
index 77fcd7e..15bb011 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -174,7 +174,7 @@ bool coerce(
{
assert(lhs != 0);
assert(rhs != 0);
-bool ok;
+bool ok = bool(); // avoid warnings
switch (lhs-type) {
case unoidl::detail::SourceProviderExpr::TYPE_BOOL:
ok = rhs-type != unoidl::detail::SourceProviderExpr::TYPE_BOOL;
@@ -431,7 +431,10 @@ Found findEntity(
+ argName));
return FOUND_ERROR;
} else {
-
unoidl::detail::SourceProviderType::Type argT;
+
unoidl::detail::SourceProviderType::Type
+argT
+=
unoidl::detail::SourceProviderType::Type();
+// avoid warnings
switch (argEnt-kind) {
case
unoidl::detail::SourceProviderEntity::KIND_LOCAL:
if (e-pad.is()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - vcl/unx
vcl/unx/generic/gdi/salgdi3.cxx |2 +-
vcl/unx/headless/svptext.cxx|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1ef0a5008bec9d9bf17824ea78d4b2510d1903d5
Author: Herbert Dürr h...@apache.org
Date: Wed Nov 27 07:17:44 2013 +
#i123755# adjust kernpair hashmap resize() to rehash()
diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx
index e80b492..4fdad0a 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/unx/headless/svptext.cxx
@@ -189,7 +189,7 @@ void PspKernInfo::Initialize() const
return;
// feed psprint's kerning list into a lookup-friendly container
-maUnicodeKernPairs.resize( rKernPairs.size() );
+maUnicodeKernPairs.rehash( rKernPairs.size() );
PspKernPairs::const_iterator it = rKernPairs.begin();
for(; it != rKernPairs.end(); ++it )
{
commit ec653233c500478fe585e8f2b3482be7268a4584
Author: Herbert Dürr h...@apache.org
Date: Wed Nov 27 06:55:29 2013 +
#i123755# adjust kernpair hashmap resize() to rehash()
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 1d2f6fe..9288139 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -131,7 +131,7 @@ void PspKernInfo::Initialize() const
return;
// feed psprint's kerning list into a lookup-friendly container
-maUnicodeKernPairs.resize( rKernPairs.size() );
+maUnicodeKernPairs.rehash( rKernPairs.size() );
PspKernPairs::const_iterator it = rKernPairs.begin();
for(; it != rKernPairs.end(); ++it )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Vendors Name via UNO API / Basic Macros
On 26/11/2013 17:42, Lionel Elie Mamane wrote: On Tue, Nov 26, 2013 at 02:36:41PM +0100, Fernand Vanrie wrote: On 26/11/2013 13:56, Lionel Elie Mamane wrote: On Thu, Nov 21, 2013 at 08:34:04PM +0100, Jan Holesovsky wrote: Thomas Krumbein píše v Pá 15. 11. 2013 v 15:43 +0100: Well, this change was a small technical thing - but with a very big influence on typical market applications. Every custom macro application with dialogs or forms for user interfaces is influenced if dialogs/forms using Date/time fields. Have you filed a bugreport, please? A minimal example of the macro that fails would be most appreciated. Well - it´s not a bug, because you mentioned the change in release-notes of version 4.1. There are many ways how to make the problem less annoying in Basic ;-) - we control the Basic implementation, so can work around many things, and if we are lucky, this will be one of them. I am sure we'd try to do that before the release with the incompatible change if we knew early. Well, I considered doing some magic that when the property is written, why not a extra property , date = isodate as it was (all old code can run it) cdate = new way That's essentially a variant of roll back the change. 1) This requires an incompatible change again; 4.2 would be incompatible with 4.1. is suppose that there is not a lot off API-basic code around for 4.2 :-) 2) Applied to Time, it leaves the problem of round-tripping. 3) If we set DataFieldProperty to the name of the new (pseudo?)property (UnoDate? DateAsUNO? StructDate?), the other problems I'm thinking about should go OK, except that indirect access through DataFieldProperty will still be incompatible, but that should be minor? Go for it, then we can go for 4.1. If not: then please let it know, we can start changing the code using a conversion Greetz Fernand ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblebox.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1533129759c0017413efe2213bfe503c26dc16f0 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Nov 27 09:12:38 2013 +0100 Revert sense in VCLXAccessibleBox::getAccessibleActionCount again ...this had been switched from m_bIsDropDownBox ? 1 : 0 to m_bIsDropDownBox ? 0 : 1 in efb23f29983f87104a684e7fab00b84fc59d131d Integrate branch of IAccessible2 for no apparent reason and broke JunitTest_testtools_unoapi. Change-Id: I276d2f452648387a5fa693349cf868787b2d48e1 diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 7aa7836..764c0ca 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -409,7 +409,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount (void) // There is one action for drop down boxes (toggle popup) and none for // the other boxes. -return m_bIsDropDownBox ? 0 : 1; +return m_bIsDropDownBox ? 1 : 0; } sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblebox.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 382421189fd7cd421b82d3397dad6860cd6536e8
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 27 09:15:14 2013 +0100
Improve exception message
Change-Id: I06ffe3088546d55b29d61ccfae16937d8a7ce9e8
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 764c0ca..dbb5dcd 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -422,7 +422,11 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction
(sal_Int32 nIndex)
::osl::Guard ::osl::Mutex aGuard( GetMutex() );
if (nIndex0 || nIndex=getAccessibleActionCount())
-throw ::com::sun::star::lang::IndexOutOfBoundsException();
+throw ::com::sun::star::lang::IndexOutOfBoundsException(
+(VCLXAccessibleBox::doAccessibleAction: index
+ + OUString::number(nIndex) + not among 0..
+ + OUString::number(getAccessibleActionCount())),
+static_castOWeakObject*(this));
if (m_aBoxType == COMBOBOX)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 60769, which changed state. Bug 60769 Summary: FILEOPEN, FILESAVE, Could not save document, error in writing sub document context.xml then corrupt file. https://bugs.freedesktop.org/show_bug.cgi?id=60769 What|Removed |Added Status|RESOLVED|REOPENED 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
[Libreoffice-commits] dev-tools.git: git-hooks/contrib
git-hooks/contrib/mso-dumper.git/hooks/update | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
New commits:
commit cbddd8325c50eab71792838706dc6acfc8db6083
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 27 09:17:11 2013 +0100
git-hooks: mso-dumper is now on gerrit
Change-Id: I7aed2559c122c384673e27d5533e4b546f0a21b1
diff --git a/git-hooks/contrib/mso-dumper.git/hooks/update
b/git-hooks/contrib/mso-dumper.git/hooks/update
index 5abf97c..4308a20 100755
--- a/git-hooks/contrib/mso-dumper.git/hooks/update
+++ b/git-hooks/contrib/mso-dumper.git/hooks/update
@@ -9,11 +9,25 @@
# (2) make this file executable by chmod +x update.
#
+# prevent pushing from anyone but the logerrit user
+if [ $(id -u -n ) != logerrit ] ; then
+ echo *** The reference for this repo is gerrit. do not push directly
to fdo 2
+ exit 1
+fi
+from=$(git show -s --pretty=format:'%an %ae' $3^{})
+
project=$(cat $GIT_DIR/description)
recipients=libreoffice-comm...@lists.freedesktop.org
ref_type=$(git cat-file -t $3)
+# Avoid re-introducing obsolete tags
+if grep -q ^$1$ hooks/obsolete-tags; then
+ echo *** Re-introducing an obsolete tag ($1) is not allowed in this
repo 2
+ echo *** Use corereleasebranches/killtagslocal.sh from
contrib/dev-tools.git to get rid of them. 2
+ exit 1
+fi
+
# Only allow annotated tags in a shared repo
# Remove this code to treat dumb tags the same as everything else
case $1,$ref_type in
@@ -122,5 +136,5 @@ else
done
fi |
mail -s $subject -a X-Git-Repository:
git://anongit.freedesktop.org/git/libreoffice/contrib/mso-dumper.git \
- -a List-Post: mailto:libreoffice@lists.freedesktop.org $recipients
+ -a List-Post: mailto:libreoffice@lists.freedesktop.org -a From:
$from $recipients
exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: 3 commits - compress.py decompress.py doc-dump.py msodumper/docdirstream.py msodumper/docrecord.py msodumper/docsprm.py msodumper/docstream.py msodumper/formula.p
compress.py |4
decompress.py |4
doc-dump.py |5
msodumper/docdirstream.py | 183 +
msodumper/docrecord.py| 3701 +++
msodumper/docsprm.py | 353 +++
msodumper/docstream.py| 991
msodumper/formula.py | 727 ++
msodumper/globals.py | 479
msodumper/msocrypto.py| 77
msodumper/msodraw.py | 1318 +++
msodumper/node.py | 219 +
msodumper/ole.py | 938
msodumper/olestream.py| 220 +
msodumper/oletool.py | 65
msodumper/pptrecord.py| 1721 ++
msodumper/pptstream.py| 442 +++
msodumper/vbahelper.py| 280 ++
msodumper/xlsmodel.py | 639 +
msodumper/xlsparser.py| 753 ++
msodumper/xlsrecord.py| 5380 ++
msodumper/xlsstream.py| 550
msodumper/xmlpp.py| 149 +
ppt-dump.py |6
src/docdirstream.py | 183 -
src/docrecord.py | 3701 ---
src/docsprm.py| 353 ---
src/docstream.py | 991
src/formula.py| 727 --
src/globals.py| 479
src/msocrypto.py | 77
src/msodraw.py| 1318 ---
src/node.py | 219 -
src/ole.py| 938
src/olestream.py | 220 -
src/oletool.py| 65
src/pptrecord.py | 1721 --
src/pptstream.py | 442 ---
src/vbahelper.py | 280 --
src/xlsmodel.py | 639 -
src/xlsparser.py | 753 --
src/xlsrecord.py | 5380 --
src/xlsstream.py | 550
src/xmlpp.py | 149 -
test/doc/test.py |1
vbadump.py|4
xls-dump.py |9
47 files changed, 19199 insertions(+), 19204 deletions(-)
New commits:
commit a88102b95a18f61ef0ada3b7f3a9ad3c921a56e0
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 27 09:26:18 2013 +0100
test/doc/test.py: remove one more reference to renamed src/
diff --git a/test/doc/test.py b/test/doc/test.py
index 03eb87e..b6c4d36 100755
--- a/test/doc/test.py
+++ b/test/doc/test.py
@@ -8,7 +8,6 @@
import sys
sys.path.append(sys.path[0]+/../..)
-sys.path.append(sys.path[0]+/../../src)
doc_dumper = __import__('doc-dump')
from xml.etree import ElementTree
import unittest
commit 27a98c7aa1bc287f6a576e7dabaa62db1a194b68
Author: Jean-Francois Dockes j...@dockes.org
Date: Tue Nov 26 13:20:19 2013 +0100
More import statement changes after src - msodumper
diff --git a/compress.py b/compress.py
index 7ab4a9a..72a0ad8 100755
--- a/compress.py
+++ b/compress.py
@@ -27,8 +27,8 @@
import sys, os.path, optparse
-sys.path.append(sys.path[0]+/src)
-import vbahelper
+
+from msodumper import vbahelper
def main():
diff --git a/decompress.py b/decompress.py
index 50e7401..5b4b0fb 100755
--- a/decompress.py
+++ b/decompress.py
@@ -27,8 +27,8 @@
import sys, os.path, optparse
-sys.path.append(sys.path[0]+/src)
-import vbahelper
+
+from msodumper import vbahelper
def main():
diff --git a/vbadump.py b/vbadump.py
index b8b2aa2..2c930ec 100755
--- a/vbadump.py
+++ b/vbadump.py
@@ -27,8 +27,8 @@
import sys, os.path, optparse, math
-sys.path.append(sys.path[0]+/src)
-import ole, globals, node, olestream, vbahelper
+
+from msodumper import ole, globals, node, olestream, vbahelper
#codepage - codepagename map
# note: there are some missing entries ( the commented out ones ) that
commit 16c3cf3535919c8eb16973f216baf342ae0dee51
Author: Jean-Francois Dockes j...@dockes.org
Date: Tue Nov 26 13:08:03 2013 +0100
Renamed src directory to msodumper and handle imports in a more pythonic way
diff --git a/doc-dump.py b/doc-dump.py
index 7279a34..65152a8 100755
--- a/doc-dump.py
+++ b/doc-dump.py
@@ -8,9 +8,8 @@
import sys
sys = reload(sys)
sys.setdefaultencoding(utf-8)
-sys.path.append(sys.path[0]+/src)
-import globals
-import docstream
+
+from msodumper import globals, docstream
class DOCDumper:
def __init__(self, filepath, params):
diff --git a/msodumper/__init__.py b/msodumper/__init__.py
new file mode 100644
index 000..e69de29
diff --git a/src/docdirstream.py b/msodumper/docdirstream.py
similarity index 100%
rename from src/docdirstream.py
rename to msodumper/docdirstream.py
diff --git a/src/docrecord.py b/msodumper/docrecord.py
similarity index 100%
rename from src/docrecord.py
rename to msodumper/docrecord.py
diff --git a/src/docsprm.py b/msodumper/docsprm.py
similarity index 100%
rename from src/docsprm.py
rename to
Re: Lao / Thai / Khmer Bundled Fonts
Hi Robert, I think there is no formal process when to include a new font. If it makes sense, it's ok. Fonts are not that big. I would just create a patch which adds the fonts you need and publish it on gerrit.libreoffice.org. Then there is still time to discuss this (otherwise this might get lost). Thanks Samuel Am 25.11.2013 13:04, schrieb Robert M Campbell: I was just curious, when does LibreOffice choose to bundle fonts? When is there a good reason to bundle them? I ask this because LibreOffice has a Burmese font, but no Thai, Lao, or Khmer fonts that I can tell. Droid Sans includes Thai support. Khmer OS provides Khmer support. And SIL's Mittaphab and Lao Government's Phetsarath OT are possible options for Lao, but the most widely used Lao font in Laos is Saysettha Lao. The government wants everyone to use Phetsarath OT (which is their standard). Windows 8 ships with Dok Champa, which I know little about... And SIL is working on a graphite font Mittaphap. I know Mittaphap is OFL, Phetsarath OT has no license (public domain?), so those are fair open options. Saysettha is not open source, nor is Dok Champa, to my understanding. But the real question is whether or not LibreOffice will want to include fonts for language coverage in the first place? Possible benefits I see: * Consistent look and feel for users of those languages across platforms and systems * Provides native access for people without reliable Internet (sometimes a problem in Laos) Possible problems I see: * Makes LibreOffice bigger * Could get out of hand if everyone wants to submit their favorite font * People might complain because it doesn't have their favorite Saysettha font What do you all think? -- Respectfully, *Robert M Campbell* IT Specialist for ADRA Laos Open Source Advocate Lao Cell: +856 207 616 7299 US Phone: +1 270 681 0399 robert.rcampb...@gmail.com rcampb...@adralaos.org Visit ADRA Lao's Facebook Page at facebook.com/ADRALaos www.facebook.com/ADRALaos ___ 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 'refs/notes/commits' - 2 commits - 1e/f0a5008bec9d9bf17824ea78d4b2510d1903d5 ec/653233c500478fe585e8f2b3482be7268a4584
1e/f0a5008bec9d9bf17824ea78d4b2510d1903d5 |1 + ec/653233c500478fe585e8f2b3482be7268a4584 |1 + 2 files changed, 2 insertions(+) New commits: commit aea6c9c77a051cf7eabdf8dcf66525b08e0d788e Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 09:17:59 2013 + Notes added by 'git notes add' diff --git a/1e/f0a5008bec9d9bf17824ea78d4b2510d1903d5 b/1e/f0a5008bec9d9bf17824ea78d4b2510d1903d5 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/1e/f0a5008bec9d9bf17824ea78d4b2510d1903d5 @@ -0,0 +1 @@ +ignore: obsolete commit 4b2617bd08f79fb8b282ee1140be3f04cc65356e Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 09:17:48 2013 + Notes added by 'git notes add' diff --git a/ec/653233c500478fe585e8f2b3482be7268a4584 b/ec/653233c500478fe585e8f2b3482be7268a4584 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/ec/653233c500478fe585e8f2b3482be7268a4584 @@ -0,0 +1 @@ +ignore: obsolete ___ 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' - d0/12f7a06a5aee38ea5b6baad98dd4df27ad410d
d0/12f7a06a5aee38ea5b6baad98dd4df27ad410d |1 + 1 file changed, 1 insertion(+) New commits: commit d4f60fc3b4f5e8d9f820babe40932118c9b0a8b6 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 09:18:22 2013 + Notes added by 'git notes add' diff --git a/d0/12f7a06a5aee38ea5b6baad98dd4df27ad410d b/d0/12f7a06a5aee38ea5b6baad98dd4df27ad410d new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/d0/12f7a06a5aee38ea5b6baad98dd4df27ad410d @@ -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' - 58/1e812b783e76b0f00cfebb3ea2cd99fd87c84d
58/1e812b783e76b0f00cfebb3ea2cd99fd87c84d |1 + 1 file changed, 1 insertion(+) New commits: commit a814f5e34baaf0e8938ad98d18bd003b9c410bbc Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 09:19:21 2013 + Notes added by 'git notes add' diff --git a/58/1e812b783e76b0f00cfebb3ea2cd99fd87c84d b/58/1e812b783e76b0f00cfebb3ea2cd99fd87c84d new file mode 100644 index 000..044dbe9 --- /dev/null +++ b/58/1e812b783e76b0f00cfebb3ea2cd99fd87c84d @@ -0,0 +1 @@ +prefer: abbe6ce54c1ad96b1c12f019825916e078a02cb3 ___ 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' - 82/6b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e
82/6b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e |1 + 1 file changed, 1 insertion(+) New commits: commit c78ee8a64409731e8733f2ffbeeff04ea0ede0db Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 09:18:52 2013 + Notes added by 'git notes add' diff --git a/82/6b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e b/82/6b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e new file mode 100644 index 000..ebc3c31 --- /dev/null +++ b/82/6b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e @@ -0,0 +1 @@ +prefer: 2b951c2e2fb70e796f836115f1718bf4884b06eb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
fdo69552 backward compatibility with optional arguments in calc functions
Hi Eike, You reviewed https://gerrit.libreoffice.org/6767 and commented a.o. But more important, for backward compatibility file storage the parameter needs to be added when omitted so older versions still can calculate the function. See formula/source/core/api/token.cxx MissingConvention::isRewriteNeeded() and FormulaMissingContext::AddMoreArgs() and FormulaMissingContext::AddMissing() The problem I have here is that with CEILING() and FLOOR() the second argument (significance) is optional and has its default value (1 or -1) depending on the sign of the first argument (value). How do I obtain this value in formula/source/core/api/token.cxx FormulaMissingContext::AddMoreArgs() and FormulaMissingContext::AddMissing()? The same problem may apply in sc/source/filter/excel/xeformula.cxx XclExpFmlaCompImpl::AppendTrailingParam(), but I take one hurdle at the time ;) Any suggestions would be greatly appreciated. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/gbuild-to-ide Makefile.in
Makefile.in |3
bin/gbuild-to-ide | 170 ++
2 files changed, 172 insertions(+), 1 deletion(-)
New commits:
commit 61e66d762d0485abaff497e606c3819536d42437
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 26 21:39:58 2013 +0200
Add initial hacks for eventual Xcode support
Just some late-night hacking without much thinking whether it makes
any sense and without any clear picture of what I am doing. Probably
useless. No promises I will ever continue on this.
Change-Id: Ie61925129bb678a17b30cb25a7882ccfe3a1de82
diff --git a/Makefile.in b/Makefile.in
index cac8fc5..e3deee7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,7 +331,8 @@ $(1)-ide-integration:
endef
$(foreach ide,\
- kdevelop, \
+ kdevelop \
+ xcode, \
$(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
endif # MAKE_RESTARTS
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index ac008c5..63f917f 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -277,6 +277,174 @@ VersionControl=kdevgit
self.write_modulestub(location, modulename)
self.write_modulebeef(location, modulename)
+class XcodeIntegrationGenerator(IdeIntegrationGenerator):
+def indent(self, file, level):
+if level == 0:
+return
+for i in range(0, level):
+file.write(' ')
+
+def write_object(self, object, file, indent):
+if isinstance(object, int):
+file.write('%d' % object)
+elif isinstance(object, str) and not re.search('[^A-Za-z0-9_]',
object):
+file.write('%s' % object)
+elif isinstance(object, str):
+file.write('%s' % object)
+elif isinstance(object, dict):
+self.write_dict(object, file, indent)
+
+# Write a dictionary out as an old-style (NeXT) ASCII plist
+def write_dict(self, dict, file, indent):
+file.write('{')
+file.write('\n')
+for key in sorted(dict.keys()):
+self.indent(file, indent+1)
+file.write('%s = ' % key)
+self.write_object(dict[key], file, indent+1)
+file.write(';\n')
+self.indent(file, indent)
+file.write('}')
+
+def write_dict_to_plist(self, dict, file):
+file.write('// !$*UTF8*$!\n')
+indent = 0
+self.write_dict(dict, file, 0)
+
+def get_product_type(self, modulename):
+if modulename in self.gbuildparser.libs:
+return 'com.apple.product-type.library.dynamic'
+elif modulename in self.gbuildparser.exes:
+return 'com.apple.product-type.something'
+
+counter = 0
+def generate_id(self):
+XcodeIntegrationGenerator.counter = XcodeIntegrationGenerator.counter
+ 1
+return str('X%07x' % XcodeIntegrationGenerator.counter)
+
+def generate_build_phases(self, modulename):
+result = [ self.sourcesBuildPhaseId ]
+return result
+
+def generate_root_object(self, modulename):
+result = { 'isa':'PBXProject',
+ 'attributes':{ 'LastUpgradeCheck':'0500',
+ 'ORGANIZATIONNAME':'LibreOffice' },
+ 'buildConfigurationList':self.generate_id(),
+ 'compatibilityVersion':'Xcode 3.2',
+ 'hasScannedForEncodings':0,
+ 'knownRegions':['en'],
+ 'mainGroup':self.mainGroupId,
+ 'productRefGroup':self.productRefGroupId,
+ 'projectDirPath':'',
+ 'projectRoot':'',
+ 'targets':self.targetId }
+return result
+
+def generate_target(self, modulename):
+result = { 'isa':'PBXNativeTarget',
+ 'buildConfigurationList':self.generate_id(),
+ 'buildPhases':self.generate_build_phases(modulename),
+ 'buildRules':[],
+ 'dependencies':[],
+ 'name':modulename,
+ 'productName':modulename,
+ 'productReference':self.productReferenceId,
+ 'productType':self.get_product_type(modulename) }
+return result
+
+def generate_main_group(self, modulename):
+result = { 'isa':'PBXGroup',
+ 'children':[ self.subMainGroupId, self.productGroupId ],
+ 'sourceTree':'group' }
+return result;
+
+def generate_sub_main_children(self, modulename):
+return {}
+
+def generate_sub_main_group(self, modulename):
+result = { 'isa':'PBXGroup',
+ 'children':self.generate_sub_main_children(modulename),
+ 'path':modulename,
+ 'sourceTree':'group' }
+return result;
+
+def generate_product_group(self, modulename):
+result = { 'isa':'PBXGroup',
+ 'children':[ self.productReferenceId ],
+
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8c2924c0cc8706a7e89ba9e16d15153b2d05b647
Author: Michael Meeks michael.me...@collabora.com
Date: Wed Nov 27 09:33:03 2013 +
Fix windows compile.
Change-Id: Ibf6d11e513ed615e29d97ab21c8b02315b42d75c
diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
index e55baf2..9b82049 100644
--- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
@@ -108,7 +108,7 @@ css::uno::Sequence ::sal_Int8 SAL_CALL
OOXMLFastTokenHandler::getUTF8Identifi
#endif
}
-::sal_Int32 OOXMLFastTokenHandler::getTokenDirect( const char *pStr, sal_Int32
nLength ) const
+sal_Int32 OOXMLFastTokenHandler::getTokenDirect( const char *pStr, sal_Int32
nLength ) const
{
struct tokenmap::token * pToken =
tokenmap::Perfect_Hash::in_word_set( pStr, nLength );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/AllLangResTarget_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk
include/svx/linkwarn.hxx | 16 +
svx/AllLangResTarget_svx.mk |1
svx/UIConfig_svx.mk |1
svx/source/dialog/linkwarn.cxx| 104 +++---
svx/source/dialog/linkwarn.hrc| 53 ---
svx/source/dialog/linkwarn.src| 74 ---
svx/uiconfig/ui/linkwarndialog.ui | 89
7 files changed, 103 insertions(+), 235 deletions(-)
New commits:
commit 34592b9189bf47438a452479972968d33a3a4c1b
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 27 09:35:33 2013 +
convert link warning dialog to .ui
the amount of code required for the new vs old dialog is amusing
Change-Id: I7feee572eecd94fab3e8c2210755b70832cbd2f2
diff --git a/include/svx/linkwarn.hxx b/include/svx/linkwarn.hxx
index ba0d841..beb7154 100644
--- a/include/svx/linkwarn.hxx
+++ b/include/svx/linkwarn.hxx
@@ -21,24 +21,16 @@
#define INCLUDED_SVX_LINKWARN_HXX
#include vcl/button.hxx
-#include vcl/fixed.hxx
-#include sfx2/basedlgs.hxx
+#include vcl/layout.hxx
#include svx/svxdllapi.h
-class SVX_DLLPUBLIC SvxLinkWarningDialog : public SfxModalDialog
+class SVX_DLLPUBLIC SvxLinkWarningDialog : public MessageDialog
{
private:
-FixedImage m_aQueryImage;
-FixedText m_aInfoText;
-OKButtonm_aLinkGraphicBtn;
-CancelButtonm_aEmbedGraphicBtn;
-FixedLine m_aOptionLine;
-CheckBoxm_aWarningOnBox;
-
-voidInitSize();
+CheckBox* m_pWarningOnBox;
public:
- SvxLinkWarningDialog( Window* pParent, const OUString _rFileName
);
+SvxLinkWarningDialog(Window* pParent, const OUString _rFileName);
virtual ~SvxLinkWarningDialog();
};
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index f2674d1..002b339 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/dialog/imapdlg.src \
svx/source/dialog/langbox.src \
svx/source/dialog/language.src \
-svx/source/dialog/linkwarn.src \
svx/source/dialog/passwd.src \
svx/source/dialog/prtqry.src \
svx/source/dialog/ruler.src \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index cb4c759..1780983 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/findreplacedialog \
+ svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/passwd \
svx/uiconfig/ui/redlinecontrol \
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index e15d795..e46ebfc 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -17,119 +17,33 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include linkwarn.hrc
-#include svx/linkwarn.hxx
-#include svx/dialogs.hrc
-#include svx/dialmgr.hxx
-#include vcl/msgbox.hxx
-#include sfx2/basedlgs.hxx
+#include svx/linkwarn.hxx
#include svtools/miscopt.hxx
-SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const OUString
_rFileName ) :
-SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_LINK_WARNING ) ),
-m_aQueryImage ( this, SVX_RES( FI_QUERY ) ),
-m_aInfoText ( this, SVX_RES( FT_INFOTEXT ) ),
-m_aLinkGraphicBtn ( this, SVX_RES( PB_OK ) ),
-m_aEmbedGraphicBtn ( this, SVX_RES( PB_NO ) ),
-m_aOptionLine ( this, SVX_RES( FL_OPTION ) ),
-m_aWarningOnBox ( this, SVX_RES( CB_WARNING_OFF ) )
+SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const OUString
_rFileName )
+: MessageDialog(pParent, LinkWarnDialog , svx/ui/linkwarndialog.ui)
{
-FreeResource();
-
-// set questionmark image
-m_aQueryImage.SetImage( QueryBox::GetStandardImage() );
+get(m_pWarningOnBox, ask);
// replace filename
-OUString sInfoText = m_aInfoText.GetText();
+OUString sInfoText = get_primary_text();
sInfoText = sInfoText.replaceAll(%FILENAME, _rFileName);
-m_aInfoText.SetText( sInfoText );
+set_primary_text( sInfoText );
// load state of warning on checkbox from misc options
SvtMiscOptions aMiscOpt;
-m_aWarningOnBox.Check( aMiscOpt.ShowLinkWarningDialog() == sal_True );
+m_pWarningOnBox-Check( aMiscOpt.ShowLinkWarningDialog() == sal_True );
if( aMiscOpt.IsShowLinkWarningDialogReadOnly() )
-m_aWarningOnBox.Disable();
-
-// set focus to Cancel button
-m_aEmbedGraphicBtn.GrabFocus();
-
-// calculate and set the size of the dialog and its controls
-InitSize();
+m_pWarningOnBox-Disable();
}
-// ---
-
[Libreoffice-commits] core.git: include/sax sax/source
include/sax/fastattribs.hxx |2 +-
sax/source/tools/fastattribs.cxx |5 +
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit bc90fb9e3072d751158a8ea0ca0a893d271b8973
Author: Michael Meeks michael.me...@collabora.com
Date: Wed Nov 27 09:47:40 2013 +
fastparser: Outline virtual destructor to please MSVC++.
Change-Id: I8368698e80e5ebe339b822a9e0e767e8ba867e07
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index f1f64dd..bb1b93d 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -53,7 +53,7 @@ typedef std::vector UnknownAttribute UnknownAttributeList;
class SAX_DLLPUBLIC FastTokenHandlerBase
{
public:
-virtual ~FastTokenHandlerBase() {}
+virtual ~FastTokenHandlerBase();
virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32
nLength ) const = 0;
};
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index bc63b3e..595c736 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -27,6 +27,11 @@ using namespace ::com::sun::star::xml::sax;
namespace sax_fastparser
{
+// wasteage to keep MSVC happy vs. an in-line {}
+FastTokenHandlerBase::FastTokenHandlerBase()
+{
+}
+
UnknownAttribute::UnknownAttribute( const OUString rNamespaceURL, const
OString rName, const sal_Char* pValue )
: maNamespaceURL( rNamespaceURL ), maName( rName ), maValue( pValue )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/crsrsh.hxx |1 - sw/qa/tiledrendering/tiledrendering.cxx |1 - sw/source/core/draw/dview.cxx |3 --- sw/source/core/layout/pagechg.cxx |1 - sw/source/core/layout/wsfrm.cxx |1 - sw/source/core/text/atrstck.cxx |1 - sw/source/core/text/inftxt.cxx |1 - sw/source/core/text/txtfrm.cxx |1 - sw/source/core/unocore/unoportenum.cxx |1 - sw/source/core/view/viewsh.cxx |1 - sw/source/filter/ww8/wrtw8esh.cxx |3 --- sw/source/filter/ww8/ww8graf.cxx|1 - sw/source/ui/app/appopt.cxx |1 - sw/source/ui/docvw/edtwin.cxx |1 - sw/source/ui/index/cnttab.cxx |3 --- sw/source/ui/uiview/view2.cxx |1 - sw/source/ui/uno/unotxdoc.cxx |1 - 17 files changed, 23 deletions(-) New commits: commit 19d0b079dceb2ca4e241a9394407d8ddf2a6f42f Author: Takeshi Abe t...@fixedpoint.jp Date: Wed Nov 27 18:53:09 2013 +0900 Drop duplicate #include Change-Id: I8c5daff82b96e4d9e2e89e18473c9be8c9c8162b diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 8548d91..ddc4f2b 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -36,7 +36,6 @@ #include tblsel.hxx #include viscrs.hxx #include node.hxx -#include tblsel.hxx #include IDocumentMarkAccess.hxx class KeyCode; diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 57b512c..321a2d8 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -32,7 +32,6 @@ #include com/sun/star/uno/XInterface.hpp #include com/sun/star/frame/XComponentLoader.hpp #include com/sun/star/frame/Desktop.hpp -#include com/sun/star/lang/XComponent.hpp #include com/sun/star/beans/XPropertySet.hpp using namespace ::com::sun::star; diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 266324d..306d5ce 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -47,9 +47,6 @@ #include IDocumentUndoRedo.hxx // #i7672# -#include editeng/outliner.hxx - -#include com/sun/star/embed/EmbedMisc.hpp #include com/sun/star/embed/Aspects.hpp #include vector diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 9e1a49d5..2cfb864 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -40,7 +40,6 @@ #include edtwin.hxx #include viewimp.hxx -#include viewopt.hxx #include pagefrm.hxx #include rootfrm.hxx #include cntfrm.hxx diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 985b787..bb7b03f 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -64,7 +64,6 @@ #include editeng/frmdiritem.hxx // OD 2004-05-24 #i28701# #include sortedobjs.hxx -#include viewopt.hxx using namespace ::com::sun::star; diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index a1c8d96..848f98b 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -53,7 +53,6 @@ #include txtinet.hxx #include IDocumentSettingAccess.hxx #include viewsh.hxx -#include viewopt.hxx #define STACK_INCREMENT 4 diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index adf78fa..ecde3b0 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -69,7 +69,6 @@ // #i12836# enhanced pdf export #include EnhancedPDFExportHelper.hxx #include docufld.hxx -#include frmtool.hxx #include unomid.h diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 41ff7e9..db2f479 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -33,7 +33,6 @@ #include doc.hxx #include rootfrm.hxx #include pagefrm.hxx -#include rootfrm.hxx #include viewsh.hxx #include pam.hxx #include ndtxt.hxx diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 8d5377d..39955aa 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -50,7 +50,6 @@ #include crsskip.hxx #include switerator.hxx #include docufld.hxx -#include fmtfld.hxx #include osl/mutex.hxx #include vcl/svapp.hxx #include comphelper/string.hxx diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 143ac40..add342d 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -63,7 +63,6 @@ #include sortedobjs.hxx #include anchoredobject.hxx #include wrtsh.hxx -#include vcl/alpha.hxx #include ../../ui/inc/view.hxx #include PostItMgr.hxx diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 5b7ab4a..93a1294 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -92,9 +92,6 @@ #include oox/ole/olehelper.hxx #include
[Libreoffice-commits] core.git: sax/source
sax/source/tools/fastattribs.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1afc1c033b1ce636eb258a218a26f24c7ad648ed
Author: Michael Meeks michael.me...@collabora.com
Date: Wed Nov 27 10:06:24 2013 +
Urgh - add embarassingly missing ~
Change-Id: I6ffcb1561920eba2cbc3fa019431d84f07386570
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index 595c736..617376f 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -28,7 +28,7 @@ namespace sax_fastparser
{
// wasteage to keep MSVC happy vs. an in-line {}
-FastTokenHandlerBase::FastTokenHandlerBase()
+FastTokenHandlerBase::~FastTokenHandlerBase()
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 9 commits - graphite/graphite-2.3.1.patch sw/source
graphite/graphite-2.3.1.patch | 20
sw/source/core/access/accportions.cxx |2 +-
sw/source/core/access/acctable.cxx|2 +-
sw/source/core/crsr/crsrsh.cxx|1 -
sw/source/core/docnode/node.cxx |2 +-
sw/source/core/fields/expfld.cxx |2 +-
sw/source/ui/index/cnttab.cxx |2 +-
sw/source/ui/uiview/view.cxx |6 +++---
sw/source/ui/utlui/content.cxx|1 -
9 files changed, 28 insertions(+), 10 deletions(-)
New commits:
commit 21745044cbac84fdf38bbf45c96338b11953897f
Author: Pavel JanÃk pavelja...@apache.org
Date: Wed Nov 27 09:36:54 2013 +
WaE: Remove unused variable.
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 11e3740..08e00dd 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -2714,7 +2714,6 @@ void SwContentTree::KeyInput(const KeyEvent rEvent)
SwContent* pCnt = (SwContent*)pEntry-GetUserData();
-sal_Bool bSel = sal_False;
sal_uInt16 nJumpType = pCnt-GetParent()-GetType();
switch(nJumpType)
{
commit 4956355877b7c9368f99ef4a91b6a1805ceac32c
Author: Pavel JanÃk pavelja...@apache.org
Date: Wed Nov 27 09:35:48 2013 +
WaE: reorder initializations properly to prevent compiler warnings.
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index cce9c32..eedcd04 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -727,6 +727,9 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh
)
: SfxViewShell( _pFrame, SWVIEWFLAGS ),
aPageStr( SW_RES( STR_PAGE )),
nNewPage(USHRT_MAX),
+//IAccessibility2 Implementation 2009-
+nOldPageNum(0),
+//-IAccessibility2 Implementation 2009
pNumRuleNodeFromDoc(0), // #i23726#
pEditWin( new SwEditWin( _pFrame-GetWindow(), *this ) ),
pWrtShell(0),
@@ -763,9 +766,6 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh
)
nFormSfxId( USHRT_MAX ),
nLastPasteDestination( 0x ),
nLeftBorderDistance( 0 ),
-//IAccessibility2 Implementation 2009-
-nOldPageNum(0),
-//-IAccessibility2 Implementation 2009
nRightBorderDistance( 0 ),
bInMailMerge(sal_False),
bInDtor(sal_False),
commit e23ad02d49504ff89e7a4fe68e49bb758854eeaf
Author: Pavel JanÃk pavelja...@apache.org
Date: Wed Nov 27 09:34:44 2013 +
WaE: unname unused argument to prevent compiler warnings.
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index c789f38..b87e317 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -4053,7 +4053,7 @@ void SwTokenWindow::SetFocus2theAllBtn()
m_pParent-SetFocus2theAllBtn();
}
}
-sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType, const Control*
pCurControl) const
+sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType, const Control*
/* pCurControl */) const
{
//there are only one entry-text button and only one page-number button,
//so we need not add index for these two buttons.
commit 81626b7c35790ca326c220108695730ea7a200b1
Author: Pavel JanÃk pavelja...@apache.org
Date: Wed Nov 27 09:31:30 2013 +
WaE: reorder initializations properly to prevent compiler warnings.
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 253e9aa..6274bd8d 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -1155,8 +1155,8 @@ SwInputField::SwInputField( SwInputFieldType* pFieldType,
, aContent(rContent)
, aPText(rPrompt)
, nSubType(nSub)
-, mpFmtFld( NULL )
, mbIsFormField( bIsFormField )
+, mpFmtFld( NULL )
{
}
commit 1bf8fcfd6fd447af3c24ffd41955a3ca2fb21356
Author: Pavel JanÃk pavelja...@apache.org
Date: Wed Nov 27 09:30:18 2013 +
WaE: unname unused argument to prevent compiler warnings.
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 55d8b08..302fe2a 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1374,7 +1374,7 @@ void SwCntntNode::MakeFrms( SwCntntNode rNode )
//Solution:Add a input param to identify if the acc table should be disposed.
//add a flag(bNeedDel) to indicate whether to del corresponding frm even in
doc loading process,
//void SwCntntNode::DelFrms()
-void SwCntntNode::DelFrms( sal_Bool bNeedDel, sal_Bool bIsDisposeAccTable )
+void SwCntntNode::DelFrms( sal_Bool /* bNeedDel */, sal_Bool
bIsDisposeAccTable )
//-IAccessibility2 Implementation 2009
{
if( !GetDepends() )
commit 255ab8c307c82b4c7b3379a3509e56e304eb475f
Author: Pavel JanÃk pavelja...@apache.org
Date: Wed Nov 27 09:29:03 2013 +
WaE: Remove unused variable.
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index b6375c6..e0936bb
[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk
writerfilter/Library_writerfilter.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 963fb6a84f1366028b185519144ce18e61d630c0 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Nov 27 11:17:38 2013 +0100 Need to link against sax now Change-Id: I7f54513f93319df0a4846fd79c78bb65327abbbd diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 7306cec..ff16aac 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ msfilter \ oox \ sal \ +sax \ sfx \ sot \ svt \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Lao / Thai / Khmer Bundled Fonts
On Wed, Nov 27, 2013 at 10:10:26AM +0100, Samuel Mehrbrodt wrote: Hi Robert, I think there is no formal process when to include a new font. If it makes sense, it's ok. Fonts are not that big. Fonts CAN be that big :) Look at TeX Live, of its 3.5 GB install, 1.4 GB are fonts. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
chart2/AllLangResTarget_chartcontroller.mk |1
chart2/UIConfig_chart2.mk |1
chart2/source/controller/dialogs/TabPages.hrc |4
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 35 ++---
chart2/source/controller/dialogs/tp_LegendPosition.hxx |9 -
chart2/source/controller/dialogs/tp_LegendPosition.src | 64 -
chart2/uiconfig/ui/tp_LegendPosition.ui| 118 +
7 files changed, 141 insertions(+), 91 deletions(-)
New commits:
commit e5ad76c11ff6dc3e349c8a73628269c4a9dc3302
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Tue Nov 26 23:14:18 2013 -0200
Convert chart legend position tabpage to widget UI
Change-Id: Iefdbbff83ea05c2e926191a2058a0be67c281789
Reviewed-on: https://gerrit.libreoffice.org/6824
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/chart2/AllLangResTarget_chartcontroller.mk
b/chart2/AllLangResTarget_chartcontroller.mk
index 907e238..fbe346a 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
chart2/source/controller/dialogs/tp_DataLabel.src \
chart2/source/controller/dialogs/tp_DataSource.src \
chart2/source/controller/dialogs/tp_ErrorBars.src \
-chart2/source/controller/dialogs/tp_LegendPosition.src \
chart2/source/controller/dialogs/tp_PointGeometry.src \
chart2/source/controller/dialogs/tp_PolarOptions.src \
chart2/source/controller/dialogs/tp_RangeChooser.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index fa584e2..9635e96 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/titlerotationtabpage \
chart2/uiconfig/ui/tp_axisLabel \
chart2/uiconfig/ui/tp_AxisPositions \
+ chart2/uiconfig/ui/tp_LegendPosition \
chart2/uiconfig/ui/tp_SeriesToAxis \
chart2/uiconfig/ui/tp_Scale \
chart2/uiconfig/ui/tp_Trendline \
diff --git a/chart2/source/controller/dialogs/TabPages.hrc
b/chart2/source/controller/dialogs/TabPages.hrc
index f746edc..64a9602 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -25,10 +25,6 @@
//see attrib.hrc in old chart
-#define GRP_LEGEND 1
-#define FL_LEGEND_TEXTORIENT2
-#define FT_LEGEND_TEXTDIR 3
-#define LB_LEGEND_TEXTDIR 4
//Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES
// ID's for title rotation tabpage
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 0de7587..6f30aeb 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -29,46 +29,47 @@
namespace chart
{
-SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow,
- const SfxItemSet rInAttrs)
-: SfxTabPage( pWindow, SchResId(TP_LEGEND_POS), rInAttrs )
-, aGrpLegend( this, SchResId(GRP_LEGEND) )
-, m_apLegendPositionResources( new LegendPositionResources(this) )
-, m_aFlTextOrient( this, SchResId( FL_LEGEND_TEXTORIENT ) )
-, m_aFtTextDirection( this, SchResId( FT_LEGEND_TEXTDIR ) )
-, m_aLbTextDirection( this, SchResId( LB_LEGEND_TEXTDIR ),
m_aFlTextOrient, m_aFtTextDirection )
+SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet
rInAttrs)
+: SfxTabPage( pWindow
+ ,tp_LegendPosition
+ ,modules/schart/ui/tp_LegendPosition.ui
+ , rInAttrs )
{
-m_apLegendPositionResources-SetAccessibleRelationMemberOf(aGrpLegend);
-FreeResource();
+get(m_pLbTextDirection,LB_LEGEND_TEXTDIR);
+
+m_pLbTextDirection-SetDropDownLineCount(3);
+
+get(m_pBxPosition,boxPOSITION);
+m_pLegendPositionResources = new LegendPositionResources(m_pBxPosition);
}
SchLegendPosTabPage::~SchLegendPosTabPage()
{
+delete m_pLegendPositionResources;
}
-SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow,
-const SfxItemSet rOutAttrs)
+SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet
rOutAttrs)
{
return new SchLegendPosTabPage(pWindow, rOutAttrs);
}
sal_Bool SchLegendPosTabPage::FillItemSet(SfxItemSet rOutAttrs)
{
-m_apLegendPositionResources-writeToItemSet(rOutAttrs);
+m_pLegendPositionResources-writeToItemSet(rOutAttrs);
-if( m_aLbTextDirection.GetSelectEntryCount() 0 )
-rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR,
m_aLbTextDirection.GetSelectEntryValue() ) );
+if( m_pLbTextDirection-GetSelectEntryCount() 0 )
+
[Libreoffice-commits] core.git: editeng/source
editeng/source/accessibility/AccessibleEditableTextPara.cxx |9 + 1 file changed, 1 insertion(+), 8 deletions(-) New commits: commit 4f94f16ba15218e5e7a9eb4d72ddb4cb62884dbb Author: Stephan Bergmann sberg...@redhat.com Date: Wed Nov 27 11:28:57 2013 +0100 IAccessible2: revert some bounds-checking changes again ...that were introduced with c23ab5eaed57cc3fb5860e26c591c73c5b22687b Integrate branch of IAccessible2 but broke JunitTest_sc_unoapi, which expects calls to getCharacterAttributes and getIndexAtPoint to actually fail for out-of-bounds arguments. The above commit does not make it obvious why those changes were actually made. Change-Id: I3492c3e6a49d68885df1206e9368f4483c0dc4f9 diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index e9941df..614294f 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -1381,11 +1381,7 @@ namespace accessibility EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast sal_uInt16 (GetParagraphIndex()) ); if (aBulletInfo.bVisible) nIndex += aBulletInfo.aText.getLength(); -if (nIndex != 0 nIndex = getCharacterCount()) -nIndex = getCharacterCount()-1; -// -if (nIndex != 0) -CheckIndex(nIndex); // may throw IndexOutOfBoundsException +CheckIndex(nIndex); // may throw IndexOutOfBoundsException bool bSupplementalMode = false; uno::Sequence OUString aPropertyNames = rRequestedAttributes; @@ -1534,9 +1530,6 @@ namespace accessibility SolarMutexGuard aGuard; -if ((rPoint.X = 0) (rPoint.Y = 0)) -return 0; - sal_Int32 nPara; sal_uInt16 nIndex; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source chart2/uiconfig
chart2/source/controller/dialogs/dlg_InsertLegend.cxx |2
chart2/source/controller/dialogs/res_LegendPosition.cxx | 247
+-
chart2/source/controller/dialogs/res_LegendPosition.hxx | 52 +-
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 13
chart2/source/controller/dialogs/tp_LegendPosition.hxx | 10
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx |2
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx |4
chart2/source/controller/inc/dlg_InsertLegend.hxx |4
chart2/uiconfig/ui/tp_LegendPosition.ui | 78 ++-
9 files changed, 363 insertions(+), 49 deletions(-)
New commits:
commit 07a58db41301d15523519b99d2c64f1885909cda
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 27 10:31:37 2013 +
provide two LegendPositionResources for the interim
LegendPositionResources for .ui based stuff and a legacy
oldLegendPositionResources which can be phased out when
the last .res based user is gone
Change-Id: I02478882e0cb54ee0fe5c2c5d15382f94758a3d2
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index e291771..c8513d2 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
SchLegendDlg::SchLegendDlg(Window* pWindow, const uno::Reference
uno::XComponentContext xCC )
: ModalDialog(pWindow, SchResId(DLG_LEGEND))
-, m_apLegendPositionResources( new LegendPositionResources(this,xCC) )
+, m_apLegendPositionResources( new oldLegendPositionResources(this,xCC) )
, aBtnOK(this, SchResId(BTN_OK))
, aBtnCancel(this, SchResId(BTN_CANCEL))
, aBtnHelp(this, SchResId(BTN_HELP))
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx
b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 3f0b459..fe7d3df 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -42,7 +42,219 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-LegendPositionResources::LegendPositionResources( Window* pWindow )
+LegendPositionResources::LegendPositionResources(VclBuilderContainer rParent)
+: m_xCC() //unused in this scenario
+, m_pCbxShow( NULL ) //unused in this scenario, assumed to be visible
+{
+rParent.get(m_pRbtLeft, left);
+rParent.get(m_pRbtRight, right);
+rParent.get(m_pRbtTop, top);
+rParent.get(m_pRbtBottom, bottom);
+impl_setRadioButtonToggleHdl();
+}
+
+LegendPositionResources::LegendPositionResources(VclBuilderContainer rParent,
+const uno::Reference uno::XComponentContext xCC)
+: m_xCC(xCC)
+{
+rParent.get(m_pCbxShow, show);
+rParent.get(m_pRbtLeft, left);
+rParent.get(m_pRbtRight, right);
+rParent.get(m_pRbtTop, top);
+rParent.get(m_pRbtBottom, bottom);
+
+m_pCbxShow-SetToggleHdl( LINK( this, LegendPositionResources,
PositionEnableHdl ) );
+impl_setRadioButtonToggleHdl();
+}
+
+void LegendPositionResources::impl_setRadioButtonToggleHdl()
+{
+m_pRbtLeft-SetToggleHdl( LINK( this, LegendPositionResources,
PositionChangeHdl ) );
+m_pRbtTop-SetToggleHdl( LINK( this, LegendPositionResources,
PositionChangeHdl ) );
+m_pRbtRight-SetToggleHdl( LINK( this, LegendPositionResources,
PositionChangeHdl ) );
+m_pRbtBottom-SetToggleHdl( LINK( this, LegendPositionResources,
PositionChangeHdl ) );
+}
+
+LegendPositionResources::~LegendPositionResources()
+{
+}
+
+void LegendPositionResources::writeToResources( const uno::Reference
frame::XModel xChartModel )
+{
+try
+{
+uno::Reference XDiagram xDiagram = ChartModelHelper::findDiagram(
xChartModel );
+uno::Reference beans::XPropertySet xProp( xDiagram-getLegend(),
uno::UNO_QUERY );
+if( xProp.is() )
+{
+//show
+sal_Bool bShowLegend = sal_False;
+xProp-getPropertyValue( Show ) = bShowLegend;
+if (m_pCbxShow)
+m_pCbxShow-Check( bShowLegend );
+PositionEnableHdl(0);
+
+//position
+chart2::LegendPosition ePos;
+xProp-getPropertyValue( AnchorPosition ) = ePos;
+switch( ePos )
+{
+case chart2::LegendPosition_LINE_START:
+m_pRbtLeft-Check();
+break;
+case chart2::LegendPosition_LINE_END:
+m_pRbtRight-Check();
+break;
+case chart2::LegendPosition_PAGE_START:
+m_pRbtTop-Check();
+break;
+case chart2::LegendPosition_PAGE_END:
+m_pRbtBottom-Check();
+break;
+
+
[Libreoffice-commits] core.git: 2 commits - basctl/source include/svtools qadevOOo/tests svtools/source
basctl/source/basicide/baside2b.cxx |2
include/svtools/textwindowpeer.hxx | 43 ++--
qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java |5
svtools/source/edit/textwindowpeer.cxx | 64
4 files changed, 59 insertions(+), 55 deletions(-)
New commits:
commit 0ee2cddfbd9cc710371048df560e397d6881d69b
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 27 11:35:17 2013 +0100
Properly encapsulate svt::TextWindowPeer
Change-Id: Iffa67c345a03852ad7872031b4c5a87e223ffcad
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 76b717f..fee2d61 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2102,7 +2102,7 @@ EditorWindow::GetComponentInterface(sal_Bool bCreate)
if (!pEditEngine)
CreateEditEngine();
-xPeer = new ::svt::TextWindowPeer(*GetEditView());
+xPeer = svt::createTextWindowPeer(*GetEditView());
SetComponentInterface(xPeer);
}
return xPeer;
diff --git a/include/svtools/textwindowpeer.hxx
b/include/svtools/textwindowpeer.hxx
index 14ef753..7da6b83 100644
--- a/include/svtools/textwindowpeer.hxx
+++ b/include/svtools/textwindowpeer.hxx
@@ -20,45 +20,24 @@
#ifndef INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX
#define INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX
-#include svtools/svtdllapi.h
-#include toolkit/awt/vclxwindow.hxx
+#include sal/config.h
-#include memory
+#include com/sun/star/uno/Reference.hxx
+#include sal/types.h
+#include svtools/svtdllapi.h
-class TextEngine;
+namespace com { namespace sun { namespace star { namespace awt {
+class XWindowPeer;
+} } } }
class TextView;
-namespace svt
-{
-class AccessibleFactoryAccess ;
-
-class TextWindowPeer: public ::VCLXWindow
-{
-public:
-SVT_DLLPUBLIC TextWindowPeer(::TextView rView);
-
-virtual ~TextWindowPeer();
-
-private:
-// VCLXWindow inherits funny copy constructor and assignment operator from
-// ::cppu::OWeakObject, so override them here:
-
-TextWindowPeer(TextWindowPeer ); // not implemented
-
-void operator =(TextWindowPeer); // not implemented
-
-virtual ::com::sun::star::uno::Reference
-::com::sun::star::accessibility::XAccessibleContext
-CreateAccessibleContext();
-
-::TextEngine m_rEngine;
-::TextView m_rView;
+namespace svt {
-::std::auto_ptr ::svt::AccessibleFactoryAccessm_pFactoryAccess;
-};
+css::uno::Referencecss::awt::XWindowPeer SVT_DLLPUBLIC createTextWindowPeer(
+TextView view);
}
-#endif // INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/edit/textwindowpeer.cxx
b/svtools/source/edit/textwindowpeer.cxx
index 11fa8c9..6e0a8b7 100644
--- a/svtools/source/edit/textwindowpeer.cxx
+++ b/svtools/source/edit/textwindowpeer.cxx
@@ -17,31 +17,55 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+#include svtaccessiblefactory.hxx
+
+#include boost/noncopyable.hpp
+#include com/sun/star/accessibility/XAccessibleContext.hpp
+#include com/sun/star/awt/XWindowPeer.hpp
+#include com/sun/star/uno/Reference.hxx
+#include sal/types.h
#include svtools/textwindowpeer.hxx
+#include toolkit/awt/vclxwindow.hxx
+#include vcl/texteng.hxx
#include vcl/textview.hxx
-#include svtaccessiblefactory.hxx
-namespace svt
+namespace {
+
+class TextWindowPeer: public VCLXWindow, private boost::noncopyable {
+public:
+explicit TextWindowPeer(TextView view);
+
+virtual ~TextWindowPeer() {}
+
+private:
+virtual css::uno::Referencecss::accessibility::XAccessibleContext
+CreateAccessibleContext();
+
+TextEngine m_rEngine;
+TextView m_rView;
+svt::AccessibleFactoryAccess m_aFactoryAccess;
+};
+
+TextWindowPeer::TextWindowPeer(TextView view):
+m_rEngine(*view.GetTextEngine()), m_rView(view)
+{
+SetWindow(view.GetWindow());
+}
+
+css::uno::Referencecss::accessibility::XAccessibleContext
+TextWindowPeer::CreateAccessibleContext() {
+return m_aFactoryAccess.getFactory().createAccessibleTextWindowContext(
+this, m_rEngine, m_rView);
+}
+
+}
+
+css::uno::Referencecss::awt::XWindowPeer svt::createTextWindowPeer(
+TextView view)
{
-TextWindowPeer::TextWindowPeer(::TextView rView):
-m_rEngine(*rView.GetTextEngine()), m_rView(rView)
-{
-SetWindow(rView.GetWindow());
-m_pFactoryAccess.reset( new AccessibleFactoryAccess );
-}
-
-// virtual
-TextWindowPeer::~TextWindowPeer()
-{
-}
-
-css::uno::Reference css::accessibility::XAccessibleContext
TextWindowPeer::CreateAccessibleContext()
-{
-return
m_pFactoryAccess-getFactory().createAccessibleTextWindowContext(
-this, m_rEngine, m_rView
-);
-}
+return new TextWindowPeer(view);
}
/* vim:set shiftwidth=4
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |2 -- source/text/schart/01/0402.xhp | 18 +- 2 files changed, 9 insertions(+), 11 deletions(-) New commits: commit 1a08f80034749e9f2d8fc94497e3d0cd528afe70 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 10:42:38 2013 + update helpids for legend tabpage .ui conversion Change-Id: If98262d2275054ee81c15ccb81838bc2f0da53e2 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 576d761..5fa995c 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3030,7 +3030,6 @@ HID_SCH_DATA_RANGES_LIST,63296, HID_SCH_DATA_SERIES_LABEL,63367, HID_SCH_DLG_RANGES,63327, HID_SCH_LB_BAR_GEOMETRY,63325, -HID_SCH_LEGEND_POS,63285, HID_SCH_LEGEND_POS_BOTTOM,63343, HID_SCH_LEGEND_POS_LEFT,63340, HID_SCH_LEGEND_POS_RIGHT,63342, @@ -5665,7 +5664,6 @@ chart2_ListBox_TP_3D_SCENEAPPEARANCE_LB_SCHEME,551882242, chart2_ListBox_TP_3D_SCENEILLUMINATION_LB_AMBIENTLIGHT,551898625, chart2_ListBox_TP_3D_SCENEILLUMINATION_LB_LIGHTSOURCE,551898626, chart2_ListBox_TP_CHARTTYPE_LB_3D_SCHEME,551783937, -chart2_ListBox_TP_LEGEND_POS_LB_LEGEND_TEXTDIR,551620100, chart2_ListBox_TP_LOCATION_LB_TABLE,551833089, chart2_MetricField_TP_3D_SCENEGEOMETRY_MTR_FLD_PERSPECTIVE,551868932, chart2_MetricField_TP_3D_SCENEGEOMETRY_MTR_FLD_X_ROTATION,551868929, diff --git a/source/text/schart/01/0402.xhp b/source/text/schart/01/0402.xhp index 4ab2297..5118331 100644 --- a/source/text/schart/01/0402.xhp +++ b/source/text/schart/01/0402.xhp @@ -61,28 +61,28 @@ paragraph role=heading id=hd_id3150201 xml-lang=en-US level=2 l10n=U oldref=4Position/paragraph paragraph role=paragraph id=par_id3155376 xml-lang=en-US l10n=U oldref=5Select the position for the legend:/paragraph !-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_LEFT -- -!-- removed HID SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_LEFT -- +bookmark xml-lang=en-US branch=modules/schart/ui/tp_LegendPosition/left id=bm_id1106200811535391 localize=false/ bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_LEGEND_POS_LEFT id=bm_id1106200811535392 localize=false/ paragraph role=heading id=hd_id3152988 xml-lang=en-US level=3 l10n=U oldref=8Left/paragraph -paragraph role=paragraph id=par_id3155087 xml-lang=en-US l10n=U oldref=9ahelp hid=SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_LEFTPositions the legend at the left of the chart./ahelp/paragraph +paragraph role=paragraph id=par_id3155087 xml-lang=en-US l10n=U oldref=9ahelp hid=schart/ui/tp_LegendPosition/leftPositions the legend at the left of the chart./ahelp/paragraph !-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_TOP -- -!-- removed HID SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_TOP -- +bookmark xml-lang=en-US branch=modules/schart/ui/tp_LegendPosition/top id=bm_id1106200811535393 localize=false/ bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_LEGEND_POS_TOP id=bm_id8514053 localize=false/ paragraph role=heading id=hd_id3153816 xml-lang=en-US level=3 l10n=U oldref=10Top/paragraph -paragraph role=paragraph id=par_id3153912 xml-lang=en-US l10n=U oldref=11ahelp hid=SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_TOPPositions the legend at the top of the chart./ahelp/paragraph +paragraph role=paragraph id=par_id3153912 xml-lang=en-US l10n=U oldref=11ahelp hid=schart/ui/tp_LegendPosition/topPositions the legend at the top of the chart./ahelp/paragraph !-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_RIGHT -- -!-- removed HID SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_RIGHT -- +bookmark xml-lang=en-US branch=modules/schart/ui/tp_LegendPosition/right id=bm_id1106200811535394 localize=false/ bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_LEGEND_POS_RIGHT id=bm_id5492721 localize=false/ paragraph role=heading id=hd_id3144773 xml-lang=en-US level=3 l10n=U oldref=12Right/paragraph -paragraph role=paragraph id=par_id3155268 xml-lang=en-US l10n=U oldref=13ahelp hid=SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_RIGHTPositions the legend at the right of the chart./ahelp/paragraph +paragraph role=paragraph id=par_id3155268 xml-lang=en-US l10n=U oldref=13ahelp hid=schart/ui/tp_LegendPosition/rightPositions the legend at the right of the chart./ahelp/paragraph !-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_BOTTOM -- -!-- removed HID SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_BOTTOM -- +bookmark xml-lang=en-US branch=modules/schart/ui/tp_LegendPosition/bottom id=bm_id1106200811535395 localize=false/ bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_LEGEND_POS_BOTTOM id=bm_id445570 localize=false/ paragraph role=heading id=hd_id3152871 xml-lang=en-US level=3 l10n=U oldref=14Bottom/paragraph -paragraph role=paragraph id=par_id3153249 xml-lang=en-US l10n=U oldref=15ahelp hid=SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_BOTTOMPositions the legend at the bottom of the chart./ahelp/paragraph +paragraph role=paragraph id=par_id3153249 xml-lang=en-US l10n=U oldref=15ahelp hid=schart/ui/tp_LegendPosition/bottomPositions the legend at the bottom of the chart./ahelp/paragraph paragraph
[Libreoffice-commits] core.git: 2 commits - chart2/source helpcontent2
chart2/source/controller/inc/HelpIds.hrc |1 - helpcontent2 |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit b5c2e38a71099a724b34697c38c64e870fe2061f Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 10:36:21 2013 + drop unused HID_SCH_LEGEND_POS helpid Change-Id: I520951b21dd017c0d8a21f455f9abaa18e329e68 diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index 6370905..f2b7c1f 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -19,7 +19,6 @@ #ifndef CHART_HELPIDS_HRC #define CHART_HELPIDS_HRC -#define HID_SCH_LEGEND_POS CHART2_HID_SCH_LEGEND_POS #define HID_SCH_DATA_DESCR CHART2_HID_SCH_DATA_DESCR #define HID_SCH_WIN_DOCUMENT CHART2_HID_SCH_WIN_DOCUMENT commit 34daf67f27c02fcd6d9a90c39a7a8c0d3e30e8ee Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 10:42:38 2013 + Updated core Project: help 1a08f80034749e9f2d8fc94497e3d0cd528afe70 diff --git a/helpcontent2 b/helpcontent2 index b0dd802..1a08f80 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b0dd80238089dfcc0b3bf7bed99564adce649397 +Subproject commit 1a08f80034749e9f2d8fc94497e3d0cd528afe70 ___ 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' - 9b/bfae5c7597ec24c04e3becb32ee73b230c549f
9b/bfae5c7597ec24c04e3becb32ee73b230c549f |1 + 1 file changed, 1 insertion(+) New commits: commit de0ed17f4cc6a2b35413107bdc4002b729522559 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 10:44:50 2013 + Notes added by 'git notes add' diff --git a/9b/bfae5c7597ec24c04e3becb32ee73b230c549f b/9b/bfae5c7597ec24c04e3becb32ee73b230c549f new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/9b/bfae5c7597ec24c04e3becb32ee73b230c549f @@ -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: basegfx/source cppcanvas/source include/basegfx
basegfx/source/polygon/b2dlinegeometry.cxx |7 +-
cppcanvas/source/inc/implrenderer.hxx |3 -
cppcanvas/source/mtfrenderer/emfplus.cxx| 75
include/basegfx/polygon/b2dlinegeometry.hxx |7 ++
4 files changed, 55 insertions(+), 37 deletions(-)
New commits:
commit acd5edd3d4ee77387b9e437dc1368da080c40c03
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 27 11:51:32 2013 +0100
EMF+: Line thickness has to be considered when drawing the caps.
Change-Id: I6043ee3c214f453afaef06125993c73be624c07e
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 5c016bb..417944d 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -44,7 +44,8 @@ namespace basegfx
double fWidth,
double fCandidateLength,
double fDockingPosition, // 0-top, 1-bottom
-double* pConsumedLength)
+double* pConsumedLength,
+double fShift)
{
B2DPolyPolygon aRetval;
OSL_ENSURE(rCandidate.count() 1L,
createAreaGeometryForLineStartEnd: Line polygon has too less points (!));
@@ -89,7 +90,7 @@ namespace basegfx
const double
fArrowYLength(B2DVector(aUpperCenter).getLength());
// move arrow to have docking position centered
-aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition);
+aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition + fShift);
// prepare polygon length
if(fTools::equalZero(fCandidateLength))
@@ -98,7 +99,7 @@ namespace basegfx
}
// get the polygon vector we want to plant this arrow on
-const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition));
+const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition) - fShift);
const B2DVector aHead(rCandidate.getB2DPoint((bStart) ? 0L :
rCandidate.count() - 1L));
const B2DVector aTail(getPositionAbsolute(rCandidate,
(bStart) ? fConsumedLength : fCandidateLength -
fConsumedLength, fCandidateLength));
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index c649db3..3d0c48d 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -282,7 +282,8 @@ static float GetSwapFloat( SvStream rSt )
double setFont( sal_uInt8 objectId, const ActionFactoryParameters
rParms, OutDevState rState );
/// Render LineCap, like the start or end arrow of a polygon.
-void EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon rPolygon,
double fPolyLength,
+/// @return how much we should shorten the original polygon.
+double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon rPolygon,
double fPolyLength,
const ::basegfx::B2DPolyPolygon rLineCap, bool bStart,
const com::sun::star::rendering::StrokeAttributes
rAttributes,
const ActionFactoryParameters rParms, OutDevState
rState);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f3f6b50..4172649 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1317,13 +1317,12 @@ namespace cppcanvas
}
}
-
-void ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon
rPolygon, double fPolyLength,
+double ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon
rPolygon, double fPolyLength,
const ::basegfx::B2DPolyPolygon rLineCap, bool bStart, const
rendering::StrokeAttributes rAttributes,
const ActionFactoryParameters rParms, OutDevState rState)
{
if (!rLineCap.count())
-return;
+return 0.0;
// it seems the line caps in EMF+ are 4*larger than what
// LibreOffice expects, and the mapping in
@@ -1335,7 +1334,7 @@ namespace cppcanvas
basegfx::B2DPolyPolygon
aArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
rPolygon, rLineCap, bStart,
-fWidth, fPolyLength, 0.0, NULL));
+fWidth, fPolyLength, 0, NULL,
rAttributes.StrokeWidth));
// createAreaGeometryForLineStartEnd from some reason always sets
// the path as closed, correct it
@@ -1347,6 +1346,8 @@ namespace cppcanvas
maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
rParms.mrCurrActionIndex += pAction-getActionCount()-1;
}
+
+return rAttributes.StrokeWidth;
}
void
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - basegfx/source cppcanvas/source include/basegfx
basegfx/source/polygon/b2dlinegeometry.cxx |7 +-
cppcanvas/source/inc/implrenderer.hxx |3 -
cppcanvas/source/mtfrenderer/emfplus.cxx| 75
include/basegfx/polygon/b2dlinegeometry.hxx |7 ++
4 files changed, 55 insertions(+), 37 deletions(-)
New commits:
commit f305861b1be589ff6854be2f72541398b61c637b
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 27 11:51:32 2013 +0100
EMF+: Line thickness has to be considered when drawing the caps.
Change-Id: I6043ee3c214f453afaef06125993c73be624c07e
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 5c016bb..417944d 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -44,7 +44,8 @@ namespace basegfx
double fWidth,
double fCandidateLength,
double fDockingPosition, // 0-top, 1-bottom
-double* pConsumedLength)
+double* pConsumedLength,
+double fShift)
{
B2DPolyPolygon aRetval;
OSL_ENSURE(rCandidate.count() 1L,
createAreaGeometryForLineStartEnd: Line polygon has too less points (!));
@@ -89,7 +90,7 @@ namespace basegfx
const double
fArrowYLength(B2DVector(aUpperCenter).getLength());
// move arrow to have docking position centered
-aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition);
+aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition + fShift);
// prepare polygon length
if(fTools::equalZero(fCandidateLength))
@@ -98,7 +99,7 @@ namespace basegfx
}
// get the polygon vector we want to plant this arrow on
-const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition));
+const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition) - fShift);
const B2DVector aHead(rCandidate.getB2DPoint((bStart) ? 0L :
rCandidate.count() - 1L));
const B2DVector aTail(getPositionAbsolute(rCandidate,
(bStart) ? fConsumedLength : fCandidateLength -
fConsumedLength, fCandidateLength));
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index c649db3..3d0c48d 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -282,7 +282,8 @@ static float GetSwapFloat( SvStream rSt )
double setFont( sal_uInt8 objectId, const ActionFactoryParameters
rParms, OutDevState rState );
/// Render LineCap, like the start or end arrow of a polygon.
-void EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon rPolygon,
double fPolyLength,
+/// @return how much we should shorten the original polygon.
+double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon rPolygon,
double fPolyLength,
const ::basegfx::B2DPolyPolygon rLineCap, bool bStart,
const com::sun::star::rendering::StrokeAttributes
rAttributes,
const ActionFactoryParameters rParms, OutDevState
rState);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4907b6f..e7fa984 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1319,13 +1319,12 @@ namespace cppcanvas
}
}
-
-void ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon
rPolygon, double fPolyLength,
+double ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon
rPolygon, double fPolyLength,
const ::basegfx::B2DPolyPolygon rLineCap, bool bStart, const
rendering::StrokeAttributes rAttributes,
const ActionFactoryParameters rParms, OutDevState rState)
{
if (!rLineCap.count())
-return;
+return 0.0;
// it seems the line caps in EMF+ are 4*larger than what
// LibreOffice expects, and the mapping in
@@ -1337,7 +1336,7 @@ namespace cppcanvas
basegfx::B2DPolyPolygon
aArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
rPolygon, rLineCap, bStart,
-fWidth, fPolyLength, 0.0, NULL));
+fWidth, fPolyLength, 0, NULL,
rAttributes.StrokeWidth));
// createAreaGeometryForLineStartEnd from some reason always sets
// the path as closed, correct it
@@ -1349,6 +1348,8 @@ namespace cppcanvas
maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
rParms.mrCurrActionIndex += pAction-getActionCount()-1;
}
+
+return rAttributes.StrokeWidth;
}
void
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 422e84ecbc6c13c07d8da1c05c085bd3d83f69bc Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 11:20:04 2013 + Updated core Project: translations eaf5194e57a9a6b82672a019c8db30c9a67ff21a diff --git a/translations b/translations index c8c4037..eaf5194 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit c8c40371caa4507a490f8c5ab0961a35848d01c5 +Subproject commit eaf5194e57a9a6b82672a019c8db30c9a67ff21a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: source/it
source/it/officecfg/registry/data/org/openoffice/Office/UI.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eaf5194e57a9a6b82672a019c8db30c9a67ff21a Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 11:20:04 2013 + Resolves: rhbz#1035092 no shortcut key for Italian 'Tools' menu Change-Id: I2f8867e7d4b9c7884d1d3af4f34a93fa5da08b47 diff --git a/source/it/officecfg/registry/data/org/openoffice/Office/UI.po b/source/it/officecfg/registry/data/org/openoffice/Office/UI.po index ea1ff2f..97dc332 100644 --- a/source/it/officecfg/registry/data/org/openoffice/Office/UI.po +++ b/source/it/officecfg/registry/data/org/openoffice/Office/UI.po @@ -18673,7 +18673,7 @@ msgctxt Label\n value.text msgid ~Tools -msgstr Strumenti +msgstr ~Strumenti #: GenericCommands.xcu msgctxt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/source/ui/app/app.src|4 -
sw/source/ui/dochdl/swdtflvr.cxx|2
sw/source/ui/inc/app.hrc|1
sw/source/ui/uiview/view2.cxx |2
sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui | 34
6 files changed, 37 insertions(+), 7 deletions(-)
New commits:
commit b5fced896632a3c07586702b461545667b33966e
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date: Wed Nov 27 13:33:09 2013 +0300
convert Rotate into standard orientation querybox to .ui
Change-Id: Id85362c0930a4156e569bd4c6b13aa94213f09c7
Reviewed-on: https://gerrit.libreoffice.org/6826
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 5b3a755..441cc43 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -159,6 +159,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/querycontinuebegindialog \
sw/uiconfig/swriter/ui/querycontinueenddialog \
sw/uiconfig/swriter/ui/querydefaultcompatdialog \
+ sw/uiconfig/swriter/ui/queryrotateintostandarddialog \
sw/uiconfig/swriter/ui/querysavelabeldialog \
sw/uiconfig/swriter/ui/queryshowchangesdialog \
sw/uiconfig/swriter/ui/mmcreatingdialog \
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index bc8cd0e..a7863ce 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -708,10 +708,6 @@ ToolBox RID_MODULE_TOOLBOX
Scroll = TRUE ;
};
-String STR_ROTATE_TO_STANDARD_ORIENTATION
-{
-Text [ en-US ] = This image is rotated. Would you like to rotate it into
standard orientation?;
-};
String STR_CAPTION_TABLE
{
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 045cf6c..98e9d1d 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -381,7 +381,7 @@ namespace
sal_uInt16 aRotation = aMetadata.getRotation();
if (aRotation != 0)
{
-QueryBox aQueryBox(0, WB_YES_NO | WB_DEF_YES,
SW_RES(STR_ROTATE_TO_STANDARD_ORIENTATION) );
+MessageDialog aQueryBox(
0,QueryRotateIntoStandardOrientationDialog,modules/swriter/ui/queryrotateintostandarddialog.ui);
if (aQueryBox.Execute() == RET_YES)
{
GraphicNativeTransform aTransform( aGraphic );
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 3734788..c5ac3f5 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -101,7 +101,6 @@
#define STR_SIMPLE (RC_APP_BEGIN + 129)
#define STR_AUTHMRK_EDIT(RC_APP_BEGIN + 130)
#define STR_AUTHMRK_INSERT (RC_APP_BEGIN + 131)
-#define STR_ROTATE_TO_STANDARD_ORIENTATION (RC_APP_BEGIN + 132)
#define STR_CAPTION_TABLE (RC_APP_BEGIN + 133)
#define STR_CAPTION_FRAME (RC_APP_BEGIN + 134)
#define STR_CAPTION_GRAPHIC (RC_APP_BEGIN + 135)
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 7c9aa10..9c04f53 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -225,7 +225,7 @@ int SwView::InsertGraphic( const OUString rPath, const
OUString rFilter,
sal_uInt16 aRotation = aMetadata.getRotation();
if (aRotation != 0)
{
-QueryBox aQueryBox(GetWindow(), WB_YES_NO | WB_DEF_YES,
SW_RES(STR_ROTATE_TO_STANDARD_ORIENTATION) );
+MessageDialog aQueryBox(
GetWindow(),QueryRotateIntoStandardOrientationDialog,modules/swriter/ui/queryrotateintostandarddialog.ui);
if (aQueryBox.Execute() == RET_YES)
{
GraphicNativeTransform aTransform( aGraphic );
diff --git a/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
new file mode 100644
index 000..b50cdd9
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
@@ -0,0 +1,34 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+ !-- interface-requires gtk+ 3.0 --
+ object class=GtkMessageDialog
id=QueryRotateIntoStandardOrientationDialog
+property name=can_focusFalse/property
+property name=border_width12/property
+property name=title translatable=yesRotate into standard
orientation?/property
+property name=resizableFalse/property
+property name=type_hintdialog/property
+property name=skip_taskbar_hintTrue/property
+property name=message_typequestion/property
+property name=buttonsyes-no/property
+property name=text translatable=yesThis image is rotated. Would you
like to rotate it into standard
Re: Fix sort order of Dockes
On 11/26/2013 06:58 PM, Tae Wong wrote: In the D section of Development/Developers, there are sort errors: Sameer comes after Rohit: Desai, Karan Deshmukh, Sameer Deshmukh, Rohit Dywan comes before Dockes. Mládek's last name should have a diacritic: Mládek, Petr. It's a wiki after all, so feel free to directly fix obvious bugs like the above yourself. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Lao / Thai / Khmer Bundled Fonts
On Wed, Nov 27, 2013 at 5:25 PM, Khaled Hosny khaledho...@eglug.org wrote: On Wed, Nov 27, 2013 at 10:10:26AM +0100, Samuel Mehrbrodt wrote: Hi Robert, I think there is no formal process when to include a new font. If it makes sense, it's ok. Fonts are not that big. Fonts CAN be that big :) Look at TeX Live, of its 3.5 GB install, 1.4 GB are fonts. My hope is to not add more than a few KB per font, if at all possible. Font language support shouldn't be 'include 9 million glyphs of various artistic types and what-not'. We just need basic support for Thai, Khmer, and Lao, so the simpler / smaller, the better. If they want some other font, they should install it IMHO. Hopefully, someday, there'll be a nice all language font that isn't too big. Until then... Another Q - where exactly am I patching? When I helped with the ICU update, a archive was added to the web server and the download.list was used. In that case, the only patch would be for the download.list. Or, should we have a font contribution subfolder/submodule that contains each font in the master that contains all of the embedded fonts? That way in review process, people can look at the font and determine if it's a good idea to add and is open and etc... -Robert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Vendors Name via UNO API / Basic Macros
On 11/26/2013 01:56 PM, Lionel Elie Mamane wrote: On Thu, Nov 21, 2013 at 08:34:04PM +0100, Jan Holesovsky wrote: Thomas Krumbein píše v Pá 15. 11. 2013 v 15:43 +0100: Well, this change was a small technical thing - but with a very big influence on typical market applications. Every custom macro application with dialogs or forms for user interfaces is influenced if dialogs/forms using Date/time fields. Have you filed a bugreport, please? A minimal example of the macro that fails would be most appreciated. Well - it´s not a bug, because you mentioned the change in release-notes of version 4.1. There are many ways how to make the problem less annoying in Basic ;-) - we control the Basic implementation, so can work around many things, and if we are lucky, this will be one of them. I am sure we'd try to do that before the release with the incompatible change if we knew early. Well, I considered doing some magic that when the property is written, if it gets an integer, interpret it the old way and if it gets a UNO Date struct, interpret it the obvious (new) way. Someone (Stephan Bergmann?) told me that one could do that for attributes but not (pseudo?)properties (or something like that); the Basic implementation (bridge?) would refuse to even pass a value of the wrong type to the C++ code. I don't see how to achieve it short of special-casing this into the bridge / other parts of the Basic implementation. Which sounds like a guaranteed subscription for maintenance nightmares, and thus not the best of ideas. Would the Basic implementation / UNO bridge people be willing to actually have that kind of special-casing? Not sure what you mean with the sentence about attributes and properties. But the Basic implementation would indeed be the place where to handle such special cases to improve backwards compatibility. (Which matches the observation that Basic authors and Basic code, which often comes included in documents, probably have the hardest time copying with our deliberate incompatibilities.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Lao / Thai / Khmer Bundled Fonts
On Wed, Nov 27, 2013 at 06:34:59PM +0700, Robert M Campbell wrote: On Wed, Nov 27, 2013 at 5:25 PM, Khaled Hosny khaledho...@eglug.org wrote: On Wed, Nov 27, 2013 at 10:10:26AM +0100, Samuel Mehrbrodt wrote: Hi Robert, I think there is no formal process when to include a new font. If it makes sense, it's ok. Fonts are not that big. Fonts CAN be that big :) Look at TeX Live, of its 3.5 GB install, 1.4 GB are fonts. My hope is to not add more than a few KB per font, if at all possible. Font language support shouldn't be 'include 9 million glyphs of various artistic types and what-not'. We just need basic support for Thai, Khmer, and Lao, so the simpler / smaller, the better. If they want some other font, they should install it IMHO. Hopefully, someday, there'll be a nice all language font that isn't too big. Until then... Another Q - where exactly am I patching? When I helped with the ICU update, a archive was added to the web server and the download.list was used. In that case, the only patch would be for the download.list. Or, should we have a font contribution subfolder/submodule that contains each font in the master that contains all of the embedded fonts? That way in review process, people can look at the font and determine if it's a good idea to add and is open and etc... Check external/more_fonts/* Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/layout/wsfrm.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit b1a660f9298f00cb97b51d77e896abece4767562 Author: Pavel JanÃk pavelja...@apache.org Date: Wed Nov 27 11:10:10 2013 + WaE: reorder initializations properly to prevent compiler warnings. diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 7b5f684..302ccf7 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -88,6 +88,10 @@ using namespace ::com::sun::star; SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) : SwClient( pMod ), +//IAccessibility2 Implementation 2009- +//Solution:Add a member to identify if the acc table should dispose +bIfAccTableShouldDisposing( sal_False ), +//-IAccessibility2 Implementation 2009 // -- OD 2006-05-10 #i65250# mnFrmId( SwFrm::mnLastFrmId++ ), // -- @@ -96,10 +100,6 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) : pNext( 0 ), pPrev( 0 ), pDrawObjs( 0 ) -//IAccessibility2 Implementation 2009- -//Solution:Add a member to identify if the acc table should dispose -, bIfAccTableShouldDisposing( sal_False ) -//-IAccessibility2 Implementation 2009 , bInfBody( sal_False ) , bInfTab ( sal_False ) , bInfFly ( sal_False ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - oox/Library_oox.mk oox/source writerfilter/source
oox/Library_oox.mk|1
oox/source/shape/ShapeContextHandler.cxx | 38
oox/source/shape/ShapeContextHandler.hxx |2
oox/source/shape/WpgContext.cxx | 59 ++
oox/source/shape/WpgContext.hxx | 38
oox/source/token/namespaces.hxx.tail |1
oox/source/token/namespaces.txt |1
oox/source/token/tokens.txt |1
writerfilter/source/dmapper/GraphicImport.cxx |1
writerfilter/source/ooxml/model.xml | 23 ++
10 files changed, 164 insertions(+), 1 deletion(-)
New commits:
commit ec746c830c4ce86e446b929a88a3376a51871314
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 27 11:40:46 2013 +0100
oox: initial import of wpg:wgp
We import something that's visible, but the position of the shape is not
correct yet.
Change-Id: Ie68f0ebad1cc992a6c8d7704d7262f7e983f3b19
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 7bd3710..b7e763c 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -277,6 +277,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/shape/ShapeContextHandler \
oox/source/shape/ShapeDrawingFragmentHandler \
oox/source/shape/ShapeFilterBase \
+oox/source/shape/WpgContext \
oox/source/shape/WpsContext \
oox/source/token/namespacemap \
oox/source/token/propertynames \
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index bcf43c8..c12518d 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -23,6 +23,7 @@
#include ShapeDrawingFragmentHandler.hxx
#include LockedCanvasContext.hxx
#include WpsContext.hxx
+#include WpgContext.hxx
#include oox/vml/vmldrawingfragment.hxx
#include oox/vml/vmlshape.hxx
#include oox/drawingml/themefragmenthandler.hxx
@@ -136,6 +137,26 @@ uno::Referencexml::sax::XFastContextHandler
ShapeContextHandler::getWpsContext
return mxWpsContext;
}
+uno::Referencexml::sax::XFastContextHandler
ShapeContextHandler::getWpgContext(sal_Int32 nElement)
+{
+if (!mxWpgContext.is())
+{
+FragmentHandler2Ref rFragmentHandler(new
ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
+ShapePtr pMasterShape;
+
+switch (getBaseToken(nElement))
+{
+case XML_wgp:
+mxWpgContext.set(new WpgContext(*rFragmentHandler));
+break;
+default:
+break;
+}
+}
+
+return mxWpgContext;
+}
+
uno::Referencexml::sax::XFastContextHandler
ShapeContextHandler::getGraphicShapeContext(::sal_Int32 Element )
{
@@ -216,6 +237,9 @@ ShapeContextHandler::getContextHandler()
case NMSP_wps:
xResult.set(getWpsContext(mnStartToken));
break;
+case NMSP_wpg:
+xResult.set(getWpgContext(mnStartToken));
+break;
default:
xResult.set(getGraphicShapeContext(mnStartToken));
break;
@@ -240,7 +264,7 @@ void SAL_CALL ShapeContextHandler::startFastElement
mpThemePtr.reset(new Theme());
-if (Element == DGM_TOKEN(relIds) || Element == LC_TOKEN(lockedCanvas) ||
Element == C_TOKEN(chart) || Element == WPS_TOKEN(wsp))
+if (Element == DGM_TOKEN(relIds) || Element == LC_TOKEN(lockedCanvas) ||
Element == C_TOKEN(chart) || Element == WPS_TOKEN(wsp) || Element ==
WPG_TOKEN(wgp))
{
// Parse the theme relation, if available; the diagram won't have
colors without it.
if (!msRelationFragmentPath.isEmpty())
@@ -432,6 +456,18 @@ ShapeContextHandler::getShape() throw
(uno::RuntimeException)
mxWpsContext.clear();
}
}
+else if (mxWpgContext.is())
+{
+ShapePtr pShape =
dynamic_castWpgContext*(mxWpgContext.get())-getShape();
+if (pShape)
+{
+basegfx::B2DHomMatrix aMatrix;
+pShape-setPosition(maPosition);
+pShape-addShape(*mxFilterBase, mpThemePtr.get(), xShapes,
aMatrix, pShape-getFillProperties());
+xResult = pShape-getXShape();
+mxWpgContext.clear();
+}
+}
else if (mpShape.get() != NULL)
{
basegfx::B2DHomMatrix aTransformation;
diff --git a/oox/source/shape/ShapeContextHandler.hxx
b/oox/source/shape/ShapeContextHandler.hxx
index 0c21313..7a9b93c 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -155,6 +155,7 @@ private:
css::uno::ReferenceXFastContextHandler mxDiagramShapeContext;
css::uno::ReferenceXFastContextHandler mxLockedCanvasContext;
css::uno::ReferenceXFastContextHandler mxWpsContext;
+css::uno::ReferenceXFastContextHandler mxWpgContext;
[Libreoffice-commits] core.git: Branch 'feature/datastreams' - 5 commits - sc/inc sc/source
Rebased ref, commits from common ancestor:
commit f0f384b9f721d793dc5877e0a8596d47280ba34e
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Nov 27 12:42:59 2013 +0100
Let's use ScRefreshTimer for data streams instead of our own thread.
As was the original idea, for some reason abandoned, and as ScAreaLink does.
The main advantage is that ImportData() is not called anymore with
invalid mpScDocument (when we close it).
There is surely something going on with SolarMutex and it just works better.
Change-Id: I09256a18ffa14606fc8e06b968016bbc0562a6fa
diff --git a/sc/source/ui/docshell/datastream.cxx
b/sc/source/ui/docshell/datastream.cxx
index 504a4dd..9c45df0 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -34,37 +34,6 @@
namespace datastreams {
-class CallerThread : public salhelper::Thread
-{
-DataStream *mpDataStream;
-public:
-osl::Condition maStart;
-bool mbTerminate;
-
-CallerThread(DataStream *pData):
-Thread(CallerThread)
-,mpDataStream(pData)
-,mbTerminate(false)
-{}
-
-private:
-virtual void execute()
-{
-while (!mbTerminate)
-{
-// wait for a small amount of time, so that
-// painting methods have a chance to be called.
-// And also to make UI more responsive.
-TimeValue const aTime = {0, 10};
-maStart.wait();
-maStart.reset();
-if (!mbTerminate)
-while (mpDataStream-ImportData())
-wait(aTime);
-};
-}
-};
-
class ReaderThread : public salhelper::Thread
{
SvStream *mpStream;
@@ -215,7 +184,8 @@ DataStream* DataStream::Set(ScDocShell *pShell, const
OUString rURL, const OUSt
DataStream::DataStream(ScDocShell *pShell, const OUString rURL, const
OUString rRange,
sal_Int32 nLimit, const OUString rMove, sal_uInt32 nSettings)
-: mpScDocShell(pShell)
+: ScRefreshTimer()
+, mpScDocShell(pShell)
, mpScDocument(mpScDocShell-GetDocument())
, meMove(NO_MOVE)
, mbRunning(false)
@@ -223,9 +193,9 @@ DataStream::DataStream(ScDocShell *pShell, const OUString
rURL, const OUString
, mnLinesCount(0)
, mpEndRange(NULL)
{
-mxThread = new datastreams::CallerThread( this );
-mxThread-launch();
-
+SetRefreshHandler(LINK( this, DataStream, RefreshHdl ));
+SetRefreshControl(mpScDocument-GetRefreshTimerControlAddress());
+SetTimeout( 1 );
Decode(rURL, rRange, nLimit, rMove, nSettings);
maStartRange = maRange;
@@ -241,10 +211,7 @@ DataStream::DataStream(ScDocShell *pShell, const OUString
rURL, const OUString
DataStream::~DataStream()
{
if (mbRunning)
-Stop();
-mxThread-mbTerminate = true;
-mxThread-maStart.set();
-mxThread-join();
+StopImport();
if (mxReaderThread.is())
mxReaderThread-endThread();
}
@@ -303,21 +270,22 @@ void DataStream::Decode(const OUString rURL, const
OUString rRange,
meMove = MOVE_DOWN;
}
-void DataStream::Start()
+void DataStream::StartImport()
{
if (mbRunning)
return;
mbIsUndoEnabled = mpScDocument-IsUndoEnabled();
mpScDocument-EnableUndo(false);
mbRunning = true;
-mxThread-maStart.set();
+AutoTimer::Start();
}
-void DataStream::Stop()
+void DataStream::StopImport()
{
if (!mbRunning)
return;
mbRunning = false;
+AutoTimer::Stop();
mpScDocument-EnableUndo(mbIsUndoEnabled);
}
@@ -343,6 +311,12 @@ void DataStream::MoveData()
}
}
+IMPL_LINK_NOARG(DataStream, RefreshHdl)
+{
+ImportData();
+return 0;
+}
+
bool DataStream::ImportData()
{
SolarMutexGuard aGuard;
@@ -410,7 +384,7 @@ sfx2::SvBaseLink::UpdateResult DataStream::DataChanged(
const OUString , const css::uno::Any )
{
MakeToolbarVisible(mpScDocShell);
-Stop();
+StopImport();
bool bStart = true;
if (mnSettings SCRIPT_STREAM
officecfg::Office::Common::Security::Scripting::MacroSecurityLevel::get() = 1)
@@ -421,7 +395,7 @@ sfx2::SvBaseLink::UpdateResult DataStream::DataChanged(
bStart = false;
}
if (bStart)
-Start();
+StartImport();
return SUCCESS;
}
@@ -432,10 +406,10 @@ void DataStream::Edit(Window* pWindow, const Link )
if (aDialog.Execute() == RET_OK)
{
bool bWasRunning = mbRunning;
-Stop();
+StopImport();
aDialog.StartStream(this);
if (bWasRunning)
-Start();
+StartImport();
}
}
diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx
index 19a522b..59d43fe 100644
--- a/sc/source/ui/inc/datastream.hxx
+++ b/sc/source/ui/inc/datastream.hxx
@@ -13,13 +13,13 @@
#include rtl/ustring.hxx
#include sfx2/lnkbase.hxx
#include address.hxx
+#include refreshtimer.hxx
#include boost/noncopyable.hpp
#include
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - canvas/source
canvas/source/cairo/cairo_canvashelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9134ff3fa0ce47a5c2e0ded563a0bb8b8fc3206f
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 27 13:11:04 2013 +0100
cairo canvas: Line dashing size depends on the line width.
Change-Id: I6a3f563b6effd37b448ec3e8463a87879e0566d4
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index ff2d71e..34886b0 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1229,7 +1229,7 @@ namespace cairocanvas
{
double* pDashArray = new double[
strokeAttributes.DashArray.getLength() ];
for( sal_Int32 i=0; istrokeAttributes.DashArray.getLength();
i++ )
-pDashArray[i]=strokeAttributes.DashArray[i];
+pDashArray[i] = strokeAttributes.DashArray[i] * w;
cairo_set_dash( mpCairo.get(), pDashArray,
strokeAttributes.DashArray.getLength(), 0 );
delete[] pDashArray;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source
canvas/source/cairo/cairo_canvashelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 843b211820075fceefe94a3bd73612ae7539361b
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 27 13:11:04 2013 +0100
cairo canvas: Line dashing size depends on the line width.
Change-Id: I6a3f563b6effd37b448ec3e8463a87879e0566d4
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index ff2d71e..34886b0 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1229,7 +1229,7 @@ namespace cairocanvas
{
double* pDashArray = new double[
strokeAttributes.DashArray.getLength() ];
for( sal_Int32 i=0; istrokeAttributes.DashArray.getLength();
i++ )
-pDashArray[i]=strokeAttributes.DashArray[i];
+pDashArray[i] = strokeAttributes.DashArray[i] * w;
cairo_set_dash( mpCairo.get(), pDashArray,
strokeAttributes.DashArray.getLength(), 0 );
delete[] pDashArray;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
gru (MozTrap, Jenkins) currently down
Hello, I am sorry to say that gru (hosting MozTrap and Jenkins) is currently down. It looks like a hardware problem given that not even a hardware reset with forced boot into the rescue system work. Our ISP has been informed and I hope will act soon. Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - canvas/source
canvas/source/cairo/cairo_canvashelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit efa14d5943ec504fdcb02bd1b98d3a3189022e11
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 27 13:11:04 2013 +0100
cairo canvas: Line dashing size depends on the line width.
Change-Id: I6a3f563b6effd37b448ec3e8463a87879e0566d4
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index cbda60a..27f31de 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1231,7 +1231,7 @@ namespace cairocanvas
{
double* pDashArray = new double[
strokeAttributes.DashArray.getLength() ];
for( sal_Int32 i=0; istrokeAttributes.DashArray.getLength();
i++ )
-pDashArray[i]=strokeAttributes.DashArray[i];
+pDashArray[i] = strokeAttributes.DashArray[i] * w;
cairo_set_dash( mpCairo.get(), pDashArray,
strokeAttributes.DashArray.getLength(), 0 );
delete[] pDashArray;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - basegfx/inc basegfx/source cppcanvas/source
basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx |7 +-
basegfx/source/polygon/b2dlinegeometry.cxx |7 +-
cppcanvas/source/inc/implrenderer.hxx |3
cppcanvas/source/mtfrenderer/emfplus.cxx| 75 +---
4 files changed, 55 insertions(+), 37 deletions(-)
New commits:
commit 54b092ba3d19fe4f91c0eaaa74bc697007b2768c
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 27 11:51:32 2013 +0100
EMF+: Line thickness has to be considered when drawing the caps.
Change-Id: I6043ee3c214f453afaef06125993c73be624c07e
diff --git a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
b/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
index 934158f..62e230f 100644
--- a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
@@ -63,6 +63,10 @@ namespace basegfx
again calculating the length (which may be expensive with
beziers). If 0.0 is
given, the length is calculated on demand.
+@param fShift
+When it is necessary to count with the thickness of the line, it
+makes sense to move the start position slightly - so define the
shift.
+
@return
The Line start and end polygon, correctly rotated and scaled
*/
@@ -73,7 +77,8 @@ namespace basegfx
double fWidth,
double fCandidateLength = 0.0, // 0.0 - calculate self
double fDockingPosition = 0.5, // 0-top, 1-bottom
-double* pConsumedLength = 0L);
+double* pConsumedLength = 0L,
+double fShift = 0.0);
/** create filled polygon geometry for lines with a line width
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 329b486..c6b5c74 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -44,7 +44,8 @@ namespace basegfx
double fWidth,
double fCandidateLength,
double fDockingPosition, // 0-top, 1-bottom
-double* pConsumedLength)
+double* pConsumedLength,
+double fShift)
{
B2DPolyPolygon aRetval;
OSL_ENSURE(rCandidate.count() 1L,
createAreaGeometryForLineStartEnd: Line polygon has too less points (!));
@@ -89,7 +90,7 @@ namespace basegfx
const double
fArrowYLength(B2DVector(aUpperCenter).getLength());
// move arrow to have docking position centered
-aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition);
+aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition + fShift);
// prepare polygon length
if(fTools::equalZero(fCandidateLength))
@@ -98,7 +99,7 @@ namespace basegfx
}
// get the polygon vector we want to plant this arrow on
-const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition));
+const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition) - fShift);
const B2DVector aHead(rCandidate.getB2DPoint((bStart) ? 0L :
rCandidate.count() - 1L));
const B2DVector aTail(getPositionAbsolute(rCandidate,
(bStart) ? fConsumedLength : fCandidateLength -
fConsumedLength, fCandidateLength));
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 786af41..cd9cda0 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -278,7 +278,8 @@ static float GetSwapFloat( SvStream rSt )
double setFont( sal_uInt8 objectId, const ActionFactoryParameters
rParms, OutDevState rState );
/// Render LineCap, like the start or end arrow of a polygon.
-void EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon rPolygon,
double fPolyLength,
+/// @return how much we should shorten the original polygon.
+double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon rPolygon,
double fPolyLength,
const ::basegfx::B2DPolyPolygon rLineCap, bool bStart,
const com::sun::star::rendering::StrokeAttributes
rAttributes,
const ActionFactoryParameters rParms, OutDevState
rState);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f663638..7b8862c 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1316,13 +1316,12 @@ namespace cppcanvas
}
}
-
-void ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon
rPolygon, double fPolyLength,
+double ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon
rPolygon, double fPolyLength,
const ::basegfx::B2DPolyPolygon rLineCap, bool
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d32eea1634cff144a45c3ee6b0bb54e1cc7663c5 Author: Jan Holesovsky ke...@collabora.com Date: Tue Nov 19 10:02:12 2013 +0100 EMF+: Stroke size is always supposed to be absolute. Change-Id: I7221311e5dee6384dc2d1c071bf6f1c61811895a Reviewed-on: https://gerrit.libreoffice.org/6827 Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 9d9c311..daed614 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -613,7 +613,7 @@ namespace cppcanvas SAL_INFO (cppcanvas.emf, TODO: pen with zero width - using minimal which might not be correct\n); } #endif -rStrokeAttributes.StrokeWidth = (rState.mapModeTransform * rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getX (); +rStrokeAttributes.StrokeWidth = fabs((rState.mapModeTransform * rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getX()); } void Read (SvStream s, ImplRenderer rR, sal_Int32, sal_Int32 ) ___ 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' - vcl/source
vcl/source/filter/wmf/winmtf.cxx | 33 +
vcl/source/filter/wmf/winmtf.hxx |1 -
vcl/source/filter/wmf/winwmf.cxx |1 -
3 files changed, 1 insertion(+), 34 deletions(-)
New commits:
commit 22f63e3e7be99f13fd719ffc03aa78e34bd545af
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 27 12:12:42 2013 +0100
fdo#61272: Do the mapping correctly both for WMF and EMF.
Turns out that for the WMF, we already had everything set up correctly, we
were just overwriting the right settings with default data again :-) - fix
that.
Includes the following commits:
* Revert wmf-mm-text-1.diff: Fix WMF rendering, n#417818
* Revert wmf-mm-text.diff: Fix WMF rendering, n#417818
* fdo#56886 EMF: Fixes some scaling problems of clipped regions, Twips
Change-Id: I7ff859246dbaea3868438d3632f9adc60fc4ee37
Reviewed-on: https://gerrit.libreoffice.org/6829
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index c8c6652..6d44084 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -374,19 +374,6 @@ Point WinMtfOutput::ImplMap( const Point rPt )
{
switch( mnMapMode )
{
-case MM_TEXT:
-fX2 -= mnWinOrgX;
-fY2 -= mnWinOrgY;
-if( mnDevWidth != 1 || mnDevHeight != 1 ) {
-fX2 *=
HUNDREDTH_MILLIMETERS_PER_MILLIINCH*1000/mnUnitsPerInch;
-fY2 *=
HUNDREDTH_MILLIMETERS_PER_MILLIINCH*1000/mnUnitsPerInch;
-}
-fX2 += mnDevOrgX;
-fY2 += mnDevOrgY;
-fX2 *= (double)mnMillX * 100.0 / (double)mnPixX;
-fY2 *= (double)mnMillY * 100.0 / (double)mnPixY;
-
-break;
case MM_LOENGLISH :
{
fX2 -= mnWinOrgX;
@@ -471,15 +458,6 @@ Size WinMtfOutput::ImplMap( const Size rSz )
{
switch( mnMapMode )
{
-case MM_TEXT:
-if( mnDevWidth != 1 mnDevHeight != 1 ) {
-fWidth *=
HUNDREDTH_MILLIMETERS_PER_MILLIINCH*1000/mnUnitsPerInch;
-fHeight*=
HUNDREDTH_MILLIMETERS_PER_MILLIINCH*1000/mnUnitsPerInch;
-} else {
-fWidth *= (double)mnMillX * 100 / (double)mnPixX;
-fHeight *= (double)mnMillY * 100 / (double)mnPixY;
-}
-break;
case MM_LOENGLISH :
{
fWidth *= HUNDREDTH_MILLIMETERS_PER_MILLIINCH*10;
@@ -916,7 +894,6 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile rGDIMetaFile ) :
mbComplexClip ( false ),
mnGfxMode ( GM_COMPATIBLE ),
mnMapMode ( MM_TEXT ),
-mnUnitsPerInch ( 96 ),
mnDevOrgX ( 0 ),
mnDevOrgY ( 0 ),
mnDevWidth ( 1 ),
@@ -2025,7 +2002,7 @@ void WinMtfOutput::SetRefMill( const Size rSize )
void WinMtfOutput::SetMapMode( sal_uInt32 nMapMode )
{
mnMapMode = nMapMode;
-if ( nMapMode == MM_TEXT )
+if ( nMapMode == MM_TEXT !mbIsMapWinSet )
{
mnWinExtX = mnDevWidth;
mnWinExtY = mnDevHeight;
@@ -2039,14 +2016,6 @@ void WinMtfOutput::SetMapMode( sal_uInt32 nMapMode )
-void WinMtfOutput::SetUnitsPerInch( sal_uInt16 nUnitsPerInch )
-{
-if( nUnitsPerInch != 0 )
-mnUnitsPerInch = nUnitsPerInch;
-}
-
-
-
void WinMtfOutput::SetWorldTransform( const XForm rXForm )
{
maXForm.eM11 = rXForm.eM11;
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index bec5d8a..8e18f7e 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -679,7 +679,6 @@ public:
sal_uInt32 GetMapMode() const { return mnMapMode; };
voidSetMapMode( sal_uInt32 mnMapMode );
-voidSetUnitsPerInch( sal_uInt16 nUnitsPerInch );
voidSetWorldTransform( const XForm rXForm );
voidModifyWorldTransform( const XForm rXForm, sal_uInt32
nMode );
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 84b1a78..3777c3b 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1108,7 +1108,6 @@ sal_Bool WMFReader::ReadHeader()
}
}
-pOut-SetUnitsPerInch( nUnitsPerInch );
pOut-SetWinOrg( aPlaceableBound.TopLeft() );
Size aWMFSize( labs( aPlaceableBound.GetWidth() ), labs(
aPlaceableBound.GetHeight() ) );
pOut-SetWinExt( aWMFSize );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - basegfx/source cppcanvas/source include/basegfx
basegfx/source/polygon/b2dlinegeometry.cxx |7 +-
cppcanvas/source/inc/implrenderer.hxx |3 -
cppcanvas/source/mtfrenderer/emfplus.cxx| 75
include/basegfx/polygon/b2dlinegeometry.hxx |7 ++
4 files changed, 55 insertions(+), 37 deletions(-)
New commits:
commit 26bfc77430c40530113d3ce739896139522565f4
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 27 11:51:32 2013 +0100
EMF+: Line thickness has to be considered when drawing the caps.
Change-Id: I6043ee3c214f453afaef06125993c73be624c07e
Reviewed-on: https://gerrit.libreoffice.org/6832
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 5c016bb..417944d 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -44,7 +44,8 @@ namespace basegfx
double fWidth,
double fCandidateLength,
double fDockingPosition, // 0-top, 1-bottom
-double* pConsumedLength)
+double* pConsumedLength,
+double fShift)
{
B2DPolyPolygon aRetval;
OSL_ENSURE(rCandidate.count() 1L,
createAreaGeometryForLineStartEnd: Line polygon has too less points (!));
@@ -89,7 +90,7 @@ namespace basegfx
const double
fArrowYLength(B2DVector(aUpperCenter).getLength());
// move arrow to have docking position centered
-aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition);
+aArrowTransform.translate(0.0, -fArrowYLength *
fDockingPosition + fShift);
// prepare polygon length
if(fTools::equalZero(fCandidateLength))
@@ -98,7 +99,7 @@ namespace basegfx
}
// get the polygon vector we want to plant this arrow on
-const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition));
+const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition) - fShift);
const B2DVector aHead(rCandidate.getB2DPoint((bStart) ? 0L :
rCandidate.count() - 1L));
const B2DVector aTail(getPositionAbsolute(rCandidate,
(bStart) ? fConsumedLength : fCandidateLength -
fConsumedLength, fCandidateLength));
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 270c0de..d602945 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -282,7 +282,8 @@ static float GetSwapFloat( SvStream rSt )
double setFont( sal_uInt8 objectId, const ActionFactoryParameters
rParms, OutDevState rState );
/// Render LineCap, like the start or end arrow of a polygon.
-void EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon rPolygon,
double fPolyLength,
+/// @return how much we should shorten the original polygon.
+double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon rPolygon,
double fPolyLength,
const ::basegfx::B2DPolyPolygon rLineCap, bool bStart,
const com::sun::star::rendering::StrokeAttributes
rAttributes,
const ActionFactoryParameters rParms, OutDevState
rState);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 1d752e7..bf9720b 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1320,13 +1320,12 @@ namespace cppcanvas
}
}
-
-void ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon
rPolygon, double fPolyLength,
+double ImplRenderer::EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon
rPolygon, double fPolyLength,
const ::basegfx::B2DPolyPolygon rLineCap, bool bStart, const
rendering::StrokeAttributes rAttributes,
const ActionFactoryParameters rParms, OutDevState rState)
{
if (!rLineCap.count())
-return;
+return 0.0;
// it seems the line caps in EMF+ are 4*larger than what
// LibreOffice expects, and the mapping in
@@ -1338,7 +1337,7 @@ namespace cppcanvas
basegfx::B2DPolyPolygon
aArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
rPolygon, rLineCap, bStart,
-fWidth, fPolyLength, 0.0, NULL));
+fWidth, fPolyLength, 0, NULL,
rAttributes.StrokeWidth));
// createAreaGeometryForLineStartEnd from some reason always sets
// the path as closed, correct it
@@ -1350,6 +1349,8 @@ namespace cppcanvas
maActions.push_back(MtfAction(pAction,
rParms.mrCurrActionIndex));
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 51 +--
1 file changed, 49 insertions(+), 2 deletions(-)
New commits:
commit 34de60961b098416b38af8e8595e2579b2b6bc66
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Nov 22 12:01:15 2013 +0100
EMF+: Implement line dashing.
Change-Id: I9eb21c0a8b5baa5b0080845f61b12fc65034d959
Reviewed-on: https://gerrit.libreoffice.org/6830
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index daed614..a1b6ebd 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -89,6 +89,13 @@
#define EmfPlusRegionInitialStateInfinite 0x1003
+const sal_Int32 EmfPlusLineStyleSolid = 0x;
+const sal_Int32 EmfPlusLineStyleDash = 0x0001;
+const sal_Int32 EmfPlusLineStyleDot = 0x0002;
+const sal_Int32 EmfPlusLineStyleDashDot = 0x0003;
+const sal_Int32 EmfPlusLineStyleDashDotDot = 0x0004;
+const sal_Int32 EmfPlusLineStyleCustom = 0x0005;
+
using namespace ::com::sun::star;
using namespace ::basegfx;
@@ -614,6 +621,34 @@ namespace cppcanvas
}
#endif
rStrokeAttributes.StrokeWidth = fabs((rState.mapModeTransform
* rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getX());
+
+// set dashing
+if (dashStyle != EmfPlusLineStyleSolid)
+{
+const float dash[] = {3, 3};
+const float dot[] = {1, 3};
+const float dashdot[] = {3, 3, 1, 3};
+const float dashdotdot[] = {3, 3, 1, 3, 1, 3};
+
+sal_Int32 nLen = 0;
+const float *pPattern;
+switch (dashStyle)
+{
+case EmfPlusLineStyleDash: nLen =
SAL_N_ELEMENTS(dash); pPattern = dash; break;
+case EmfPlusLineStyleDot:nLen =
SAL_N_ELEMENTS(dot); pPattern = dot; break;
+case EmfPlusLineStyleDashDot:nLen =
SAL_N_ELEMENTS(dashdot); pPattern = dashdot; break;
+case EmfPlusLineStyleDashDotDot: nLen =
SAL_N_ELEMENTS(dashdotdot); pPattern = dashdotdot; break;
+case EmfPlusLineStyleCustom: nLen =
dashPatternLen; pPattern = dashPattern; break;
+}
+if (nLen 0)
+{
+uno::Sequencedouble aDashArray(nLen);
+for (int i = 0; i nLen; ++i)
+aDashArray[i] = pPattern[i];
+
+rStrokeAttributes.DashArray = aDashArray;
+}
+}
}
void Read (SvStream s, ImplRenderer rR, sal_Int32, sal_Int32 )
@@ -651,7 +686,10 @@ namespace cppcanvas
mitterLimit = 0;
if (penFlags 32)
+{
s dashStyle;
+SAL_INFO(cppcanvas.emf, EMF+\t\tdashStyle: 0x
std::hex dashStyle);
+}
else
dashStyle = 0;
@@ -665,14 +703,23 @@ namespace cppcanvas
else
dashOffset = 0;
-if (penFlags 256) {
+if (penFlags 256)
+{
+dashStyle = EmfPlusLineStyleCustom;
+
s dashPatternLen;
+SAL_INFO(cppcanvas.emf, EMF+\t\tdashPatternLen:
dashPatternLen);
+
if( dashPatternLen0 ||
sal_uInt32(dashPatternLen)SAL_MAX_INT32/sizeof(float) )
dashPatternLen = SAL_MAX_INT32/sizeof(float);
dashPattern = new float [dashPatternLen];
for (i = 0; i dashPatternLen; i++)
+{
s dashPattern [i];
-} else
+SAL_INFO(cppcanvas.emf, EMF+\t\t\tdashPattern[
i ]: dashPattern[i]);
+}
+}
+else
dashPatternLen = 0;
if (penFlags 512)
___
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' - canvas/source
canvas/source/cairo/cairo_canvashelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 35e44c9d756f3815b00be9aabbb19bd36c430b37
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 27 13:11:04 2013 +0100
cairo canvas: Line dashing size depends on the line width.
Change-Id: I6a3f563b6effd37b448ec3e8463a87879e0566d4
Reviewed-on: https://gerrit.libreoffice.org/6833
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index ca75d35..5953495 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1230,7 +1230,7 @@ namespace cairocanvas
{
double* pDashArray = new double[
strokeAttributes.DashArray.getLength() ];
for( sal_Int32 i=0; istrokeAttributes.DashArray.getLength();
i++ )
-pDashArray[i]=strokeAttributes.DashArray[i];
+pDashArray[i] = strokeAttributes.DashArray[i] * w;
cairo_set_dash( mpCairo.get(), pDashArray,
strokeAttributes.DashArray.getLength(), 0 );
delete[] pDashArray;
}
___
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' - cppcanvas/source
cppcanvas/source/inc/implrenderer.hxx|9
cppcanvas/source/mtfrenderer/emfplus.cxx | 314 +++
2 files changed, 290 insertions(+), 33 deletions(-)
New commits:
commit 51a8b809a999b390b26287c9f3d4d45fc8ecd8f9
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Nov 22 17:06:10 2013 +0100
EMF+: Parse and render custom line cap data.
Contains the following commits:
* EMF+: Small cleanup more logging in preparation for line starts ends.
* EMF+: Parse custom line cap data for start and end line caps.
* EMF+: Render custom line cap data.
* EMF+: Set the stroke attributes on the custom line caps.
Change-Id: Ibdf69c7944e4d027d9dc6974bd740f9b70fb5079
Reviewed-on: https://gerrit.libreoffice.org/6831
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 79a2967..270c0de 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -280,7 +280,14 @@ static float GetSwapFloat( SvStream rSt )
/* EMF+ */
void processEMFPlus( MetaCommentAction* pAct, const
ActionFactoryParameters rFactoryParms, OutDevState rState, const
CanvasSharedPtr rCanvas );
double setFont( sal_uInt8 objectId, const ActionFactoryParameters
rParms, OutDevState rState );
-void EMFPPlusDrawPolygon (::basegfx::B2DPolyPolygon polygon,
const ActionFactoryParameters rParms, OutDevState rState, const
CanvasSharedPtr rCanvas, sal_uInt32 penIndex);
+
+/// Render LineCap, like the start or end arrow of a polygon.
+void EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon rPolygon,
double fPolyLength,
+const ::basegfx::B2DPolyPolygon rLineCap, bool bStart,
+const com::sun::star::rendering::StrokeAttributes
rAttributes,
+const ActionFactoryParameters rParms, OutDevState
rState);
+
+void EMFPPlusDrawPolygon (const ::basegfx::B2DPolyPolygon
polygon, const ActionFactoryParameters rParms, OutDevState rState, const
CanvasSharedPtr rCanvas, sal_uInt32 penIndex);
void EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon polygon,
const ActionFactoryParameters rParms, OutDevState rState, const
CanvasSharedPtr rCanvas, bool isColor, sal_uInt32 brushIndexOrColor);
ActionVector maActions;
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index a1b6ebd..1d752e7 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -28,6 +28,7 @@
#include basegfx/vector/b2dsize.hxx
#include basegfx/range/b2drange.hxx
#include basegfx/range/b2drectangle.hxx
+#include basegfx/polygon/b2dlinegeometry.hxx
#include basegfx/polygon/b2dpolygon.hxx
#include basegfx/polygon/b2dpolygontools.hxx
#include basegfx/polygon/b2dpolypolygon.hxx
@@ -36,8 +37,10 @@
#include rtl/ustring.hxx
#include sal/alloca.h
-#include com/sun/star/rendering/XCanvas.hpp
+#include com/sun/star/rendering/PathCapType.hpp
+#include com/sun/star/rendering/PathJoinType.hpp
#include com/sun/star/rendering/TexturingMode.hpp
+#include com/sun/star/rendering/XCanvas.hpp
#include bitmapaction.hxx
#include implrenderer.hxx
@@ -96,6 +99,22 @@ const sal_Int32 EmfPlusLineStyleDashDot = 0x0003;
const sal_Int32 EmfPlusLineStyleDashDotDot = 0x0004;
const sal_Int32 EmfPlusLineStyleCustom = 0x0005;
+const sal_uInt32 EmfPlusCustomLineCapDataTypeDefault = 0x;
+const sal_uInt32 EmfPlusCustomLineCapDataTypeAdjustableArrow = 0x0001;
+
+const sal_uInt32 EmfPlusCustomLineCapDataFillPath = 0x0001;
+const sal_uInt32 EmfPlusCustomLineCapDataLinePath = 0x0002;
+
+const sal_uInt32 EmfPlusLineCapTypeFlat = 0x;
+const sal_uInt32 EmfPlusLineCapTypeSquare = 0x0001;
+const sal_uInt32 EmfPlusLineCapTypeRound = 0x0002;
+const sal_uInt32 EmfPlusLineCapTypeTriangle = 0x0003;
+
+const sal_uInt32 EmfPlusLineJoinTypeMiter = 0x;
+const sal_uInt32 EmfPlusLineJoinTypeBevel = 0x0001;
+const sal_uInt32 EmfPlusLineJoinTypeRound = 0x0002;
+const sal_uInt32 EmfPlusLineJoinTypeMiterClipped = 0x0003;
+
using namespace ::com::sun::star;
using namespace ::basegfx;
@@ -587,6 +606,137 @@ namespace cppcanvas
}
};
+/// Convert stroke caps between EMF+ and rendering API
+sal_Int8 lcl_convertStrokeCap(sal_uInt32 nEmfStroke)
+{
+switch (nEmfStroke)
+{
+case EmfPlusLineCapTypeSquare: return
rendering::PathCapType::SQUARE;
+case EmfPlusLineCapTypeRound: return
rendering::PathCapType::ROUND;
+}
+
+// we have no mapping for EmfPlusLineCapTypeTriangle, so return
+// BUTT always
+return
Reformatting a text document via UNO
Hi all, is there a way to reformat parts or whole text document e.g. from a Basic macro? Without inserting / changing a text content to force formatting. I am thinking about a macro changing a compatibility option called by user during document editing. Thanks -- Pavel Laštovička blue.point Solutions spol. s r. o. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gru (MozTrap, Jenkins) currently down
Hello, Florian Effenberger wrote on 2013-11-27 13:25: I am sorry to say that gru (hosting MozTrap and Jenkins) is currently down. It looks like a hardware problem given that not even a hardware reset with forced boot into the rescue system work. Our ISP has been informed and I hope will act soon. the machine is now up again. It was stalled at the BIOS during hard disk detection (which makes me hope it's not a hardware issue, because it crashed before we did a reboot). I am now working on restoring the services. Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gru (MozTrap, Jenkins) currently down
Le 27/11/2013 14:07, Florian Effenberger a écrit : Hello, Florian Effenberger wrote on 2013-11-27 13:25: I am sorry to say that gru (hosting MozTrap and Jenkins) is currently down. It looks like a hardware problem given that not even a hardware reset with forced boot into the rescue system work. Our ISP has been informed and I hope will act soon. the machine is now up again. It was stalled at the BIOS during hard disk detection (which makes me hope it's not a hardware issue, because it crashed before we did a reboot). I am now working on restoring the services. ok, thanks a lot! Cheers Sophie ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gru (MozTrap, Jenkins) currently down
Hello, Florian Effenberger wrote on 2013-11-27 14:07: the machine is now up again. It was stalled at the BIOS during hard disk detection (which makes me hope it's not a hardware issue, because it crashed before we did a reboot). I am now working on restoring the services. all services should be back to normal now. Sorry for the inconveniences. Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Reformatting a text document via UNO
Hi Pavel, On Wed, Nov 27, 2013 at 01:45:11PM +0100, Pavel Laštovička pavel.lastovi...@blue-point.cz wrote: is there a way to reformat parts or whole text document e.g. from a Basic macro? Without inserting / changing a text content to force formatting. It's possible to create a text range that covers the whole document, then you can set properties on it, if you mean something like paragraph or text portion formatting. I am thinking about a macro changing a compatibility option called by user during document editing. Here is an example how you can set such compatibility options using UNO: http://opengrok.libreoffice.org/xref/core/writerfilter/source/filter/ImportFilter.cxx#267 This is C++, but you can do the same from a macro as well. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 60769, which changed state. Bug 60769 Summary: FILEOPEN, FILESAVE, Could not save document, error in writing sub document context.xml then corrupt file. https://bugs.freedesktop.org/show_bug.cgi?id=60769 What|Removed |Added Status|REOPENED|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
[Libreoffice-commits] core.git: 3 commits - solenv/gbuild
solenv/gbuild/UIConfig.mk|3 +++ solenv/gbuild/extensions/post_PackageInfo.mk | 15 ++- 2 files changed, 17 insertions(+), 1 deletion(-) New commits: commit f448777213bae4248cb330725cea0bc38dddc143 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Nov 27 14:13:16 2013 +0100 add missing l10n config files Change-Id: Ia7e654cdeffd832f51016ff51aa180fe3924ff4e diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index 9c1caec..22c6c45 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -59,11 +59,17 @@ define gb_PackageInfo_emit_l10n_for_one_uifile endef +define gb_PackageInfo_emit_l10n_for_one_configfile +echo $(LIBO_SHARE_FOLDER)/registry/$(2)$(1).xcd $(gb_PackageInfo_get_target)/l10n-$(1).files + +endef + define gb_PackageInfo_emit_l10n_for_one_lang @touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf)) $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst %/,%,$(gb_AllLangPackage_ALLDIRS)),$(call gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1 $(if $(filter $(gb_AllLangResTarget_LANGS),$(1)),$(foreach target,$(gb_AllLangResTarget_ALLTARGETS),$(call gb_PackageInfo_emit_l10n_for_one_ressource,$(target),$(1 $(foreach uifile,$(gb_UIConfig_ALLFILES),$(call gb_PackageInfo_emit_l10n_for_one_uifile,$(1),$(firstword $(subst :,$(WHITESPACE),$(uifile))),$(lastword $(subst :,$(WHITESPACE),$(uifile) +$(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack- res/fcfg_langpack_ res/registry_,$(call gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile endef commit 95434a81c320717cd29c2aebc91a750c547f6c62 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Nov 27 13:50:08 2013 +0100 add uiconfig file translations Change-Id: I9bb39bdd677af4be0da621370c51eb9e22ecc33f diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 657d362..07e6a13 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -305,12 +305,15 @@ $(call gb_UIConfig__add_translations,$(1),$(2),\ endef + +gb_UIConfig_ALLFILES:= # Adds .ui file to the package # # The file is relative to $(SRCDIR) and without extension. # # gb_UIConfig_add_uifile target uifile define gb_UIConfig_add_uifile +gb_UIConfig_ALLFILES+=$(1):$(notdir $(2)) $(call gb_UIConfig__add_uifile,$(1),$(2)) ifneq ($(gb_UIConfig_LANGS),) diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index c83b8c8..9c1caec 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -54,10 +54,16 @@ define gb_PackageInfo_emit_l10n_for_one_ressource endef +define gb_PackageInfo_emit_l10n_for_one_uifile +@echo $(gb_UIConfig_INSTDIR)/$(2)/ui/res/$(1)/$(3) $(gb_PackageInfo_get_target)/l10n-$(1).files + +endef + define gb_PackageInfo_emit_l10n_for_one_lang @touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf)) $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst %/,%,$(gb_AllLangPackage_ALLDIRS)),$(call gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1 $(if $(filter $(gb_AllLangResTarget_LANGS),$(1)),$(foreach target,$(gb_AllLangResTarget_ALLTARGETS),$(call gb_PackageInfo_emit_l10n_for_one_ressource,$(target),$(1 +$(foreach uifile,$(gb_UIConfig_ALLFILES),$(call gb_PackageInfo_emit_l10n_for_one_uifile,$(1),$(firstword $(subst :,$(WHITESPACE),$(uifile))),$(lastword $(subst :,$(WHITESPACE),$(uifile) endef commit cc7eb173a3b7faa81ea9dc1835f00df4375f5f4d Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Nov 27 01:22:59 2013 +0100 add missing help files in packageinfo Change-Id: Ia2498a118e729276a78ef3a4eb43b5d0b302d326 diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index 9fd49e7..c83b8c8 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -38,7 +38,8 @@ endef define gb_PackageInfo_emit_help_for_one_lang @touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/help-$(1).$(suf)) -$(foreach target,$(filter-out shared,$(gb_AllLangHelp_ALLTARGETS)),$(call gb_PackageInfo_emit_help_for_one_target,$(1)/$(target),$(gb_PackageInfo_get_target)/help-$(1).files)) +$(foreach target,$(gb_AllLangHelp_ALLTARGETS),$(call gb_PackageInfo_emit_help_for_one_target,$(1)/$(target),$(gb_PackageInfo_get_target)/help-$(1).files)) +$(foreach suf,html css,$(foreach file,$(wildcard $(INSTDIR)/help/$(1)/*.$(suf)),echo $(patsubst $(INSTDIR)/%,%,$(file)) $(gb_PackageInfo_get_target)/help-$(1).files )) true endef
[Libreoffice-commits] core.git: binaryurp/source
binaryurp/source/reader.cxx | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 289e54feabc936b8175327355a159073830a326a
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 27 14:49:22 2013 +0100
binaryurp: silently ignore superfluous MUSTREPLY/SYNCHRONOUS flags
...in a non-oneway call. This can happen when a pre LO 4 entity is calling
a
LO 4 entity post 90eac3e69749a9227c4b6902b1f3cef1e338c6d1
API CHANGE remove [oneway] method attributes. (See mail thread starting
at
http://mail-archives.apache.org/mod_mbox/openoffice-api/201311.mbox/%3Ca4e7f34d-b8cb-4d5a-890f-6894d3410265%40ucimail2.uci.cu%3E
hi, code in Java.)
Change-Id: I9f800a979d84a95cc5cd96f75ee7472e8cf6cf4b
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 522b165..184f037 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -238,12 +238,10 @@ void Reader::readMessage(Unmarshal unmarshal) {
{
synchronous = forceSynchronous;
} else {
-if (forceSynchronous) {
-throw css::uno::RuntimeException(
-(URP: synchronous request message with non-oneway function ID
- received),
-css::uno::Reference css::uno::XInterface ());
-}
+SAL_INFO_IF(
+forceSynchronous, binaryurp,
+(superfluous MUSTREPLY/SYNCHRONOUS ignored in request message
with
+ non-oneway function ID));
synchronous = true;
}
bool setter = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - binaryurp/source
binaryurp/source/reader.cxx | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 6defaf61a9db438072372f95f5591c6db939
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 27 14:49:22 2013 +0100
binaryurp: silently ignore superfluous MUSTREPLY/SYNCHRONOUS flags
...in a non-oneway call. This can happen when a pre LO 4 entity is calling
a
LO 4 entity post 90eac3e69749a9227c4b6902b1f3cef1e338c6d1
API CHANGE remove [oneway] method attributes. (See mail thread starting
at
http://mail-archives.apache.org/mod_mbox/openoffice-api/201311.mbox/%3Ca4e7f34d-b8cb-4d5a-890f-6894d3410265%40ucimail2.uci.cu%3E
hi, code in Java.)
Change-Id: I9f800a979d84a95cc5cd96f75ee7472e8cf6cf4b
(cherry picked from commit 289e54feabc936b8175327355a159073830a326a)
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 522b165..184f037 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -238,12 +238,10 @@ void Reader::readMessage(Unmarshal unmarshal) {
{
synchronous = forceSynchronous;
} else {
-if (forceSynchronous) {
-throw css::uno::RuntimeException(
-(URP: synchronous request message with non-oneway function ID
- received),
-css::uno::Reference css::uno::XInterface ());
-}
+SAL_INFO_IF(
+forceSynchronous, binaryurp,
+(superfluous MUSTREPLY/SYNCHRONOUS ignored in request message
with
+ non-oneway function ID));
synchronous = true;
}
bool setter = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Regina Henschel rb.hensc...@t-online.de changed: What|Removed |Added CC||rb.hensc...@t-online.de Depends on||67576 --- Comment #22 from Regina Henschel rb.hensc...@t-online.de --- Added bug 67576 impossible to set printing page size manually. The actual paper size, which is set in the printer properties, is ignored. It is broken since version 4.1.2. The problem has produced several bug reports. Besides the here added 67576 it seems, that the following bugs are duplicate or at least related: bug 67727 PRINTING: Paper Size and Orientation Fail in Brochure and Multi-Up Printing bug 67903 Print dialog preview in Draw does not update with paper size change bug 72070 Other: Page size when printing bug 71803 PRINTING: Printing envelopes does not respect user inputted sizes bug 70676 PRINTING: Difficulties with combining smaller pages on a bigger one -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - binaryurp/source
binaryurp/source/reader.cxx | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit adba911af4e6a3e9b713ba97096b78bd45502ab1
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 27 14:49:22 2013 +0100
binaryurp: silently ignore superfluous MUSTREPLY/SYNCHRONOUS flags
...in a non-oneway call. This can happen when a pre LO 4 entity is calling
a
LO 4 entity post 90eac3e69749a9227c4b6902b1f3cef1e338c6d1
API CHANGE remove [oneway] method attributes. (See mail thread starting
at
http://mail-archives.apache.org/mod_mbox/openoffice-api/201311.mbox/%3Ca4e7f34d-b8cb-4d5a-890f-6894d3410265%40ucimail2.uci.cu%3E
hi, code in Java.)
Change-Id: I9f800a979d84a95cc5cd96f75ee7472e8cf6cf4b
(cherry picked from commit 289e54feabc936b8175327355a159073830a326a)
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 522b165..184f037 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -238,12 +238,10 @@ void Reader::readMessage(Unmarshal unmarshal) {
{
synchronous = forceSynchronous;
} else {
-if (forceSynchronous) {
-throw css::uno::RuntimeException(
-(URP: synchronous request message with non-oneway function ID
- received),
-css::uno::Reference css::uno::XInterface ());
-}
+SAL_INFO_IF(
+forceSynchronous, binaryurp,
+(superfluous MUSTREPLY/SYNCHRONOUS ignored in request message
with
+ non-oneway function ID));
synchronous = true;
}
bool setter = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/inc svx/source
svx/inc/svx/svdobj.hxx |6
svx/source/accessibility/AccessibleShape.cxx | 35 ++-
svx/source/svdraw/svdobj.cxx |6
3 files changed, 13 insertions(+), 34 deletions(-)
New commits:
commit bd0c3b940f6006d3cb49381230795db667aeb943
Author: Armin Le Grand a...@apache.org
Date: Wed Nov 27 13:00:02 2013 +
removed pCaptionObj from accessibility; it was not initialized but accessed
in one place. Checked with symphony code, there was a set method which is not
in AOO trunk, thus solved accesses to zero pointer usage
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 4c684c8..ce0e1ba 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -452,9 +452,6 @@ protected:
SdrObjUserCall* pUserCall;
SdrObjPlusData* pPlusData;// Broadcaster, UserData,
Konnektoren, ... (Das ist der Bitsack)
-//IAccessibility2 Implementation 2009-
-SdrObject* pCaptionObj;
-//-IAccessibility2 Implementation 2009
sal_uInt32 nOrdNum; // Rangnummer des Obj in der
Liste
/** Position in the navigation order. SAL_MAX_UINT32 when not used.
@@ -1131,9 +1128,6 @@ public:
// #121917#
virtual bool HasText() const;
-//IAccessibility2 Implementation 2009-
-const SdrObject* GetCaptionObj() const;
-//-IAccessibility2 Implementation 2009
protected:
voidimpl_setUnoShape( const ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface _rxUnoShape );
diff --git a/svx/source/accessibility/AccessibleShape.cxx
b/svx/source/accessibility/AccessibleShape.cxx
index cd48af73..11a79df 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -452,36 +452,27 @@ uno::ReferenceXAccessibleRelationSet SAL_CALL
throw (::com::sun::star::uno::RuntimeException)
{
::osl::MutexGuard aGuard (maMutex);
-::utl::AccessibleRelationSetHelper* pRelationSet =
-new utl::AccessibleRelationSetHelper;
-SdrObject* pCaptionSdr = const_cast SdrObject* (
m_pShape-GetCaptionObj() ) ;
-if(pCaptionSdr!=NULL)
-{
-uno::Sequence uno::Reference uno::XInterface aSequence(1);
-uno::Referencedrawing::XShape xCaptionShape (
pCaptionSdr-getUnoShape(),uno::UNO_QUERY);
-if(xCaptionShape.is())
-{
-aSequence[0] = mpParent-GetAccessibleCaption(xCaptionShape);
-pRelationSet-AddRelation( AccessibleRelation(
AccessibleRelationType::DESCRIBED_BY, aSequence ) );
-}
-}
-else
+::utl::AccessibleRelationSetHelper* pRelationSet = new
utl::AccessibleRelationSetHelper;
+uno::Sequence uno::Reference uno::XInterface aSequence(1);
+aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
+
+//this mxshape is the captioned shape, only for sw
+if(aSequence[0].get())
{
-//this mxshape is the captioned shape, only for sw
-if(mpParent-GetAccessibleCaption(mxShape).get())
-{
-uno::Sequence uno::Reference uno::XInterface aSequence(1);
-aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
-pRelationSet-AddRelation( AccessibleRelation(
AccessibleRelationType::DESCRIBED_BY, aSequence ) );
-}
+pRelationSet-AddRelation(
+AccessibleRelation( AccessibleRelationType::DESCRIBED_BY,
aSequence ) );
}
- if (pRelationSet != NULL)
+
+if (pRelationSet != NULL)
{
return uno::ReferenceXAccessibleRelationSet (
new ::utl::AccessibleRelationSetHelper (*pRelationSet));
}
else
+{
return uno::ReferenceXAccessibleRelationSet(NULL);
+}
+
return uno::ReferenceXAccessibleRelationSet();
}
//-IAccessibility2 Implementation 2009
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 1fad8b6..499445c 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -3185,12 +3185,6 @@ bool SdrObject::HasText() const
return false;
}
-//IAccessibility2 Implementation 2009-
-const SdrObject* SdrObject::GetCaptionObj() const
-{
-return pCaptionObj;
-}
-//-IAccessibility2 Implementation 2009
//
// @ @@ @ @@ @ @@ @@
___
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
sw/qa/extras/ooxmlimport/data/wpg-only.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |7 +++
writerfilter/source/dmapper/GraphicImport.cxx |5 +
3 files changed, 12 insertions(+)
New commits:
commit 8518cf42f48cdf07ad14681cb19f476438542236
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 27 15:22:44 2013 +0100
DOCX drawingML shape import: fix position of group shapes
Change-Id: Ib5db40ecd5782d729d406b285d3399cc2626e335
diff --git a/sw/qa/extras/ooxmlimport/data/wpg-only.docx
b/sw/qa/extras/ooxmlimport/data/wpg-only.docx
new file mode 100755
index 000..7c86361
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/wpg-only.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 69beb44..853c316 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1548,6 +1548,13 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpsOnly,
textbox-wps-only.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(2805), getPropertysal_Int32(xFrame,
VertOrientPosition));
}
+DECLARE_OOXMLIMPORT_TEST(testWpgOnly, wpg-only.docx)
+{
+uno::Referencedrawing::XShape xShape = getShape(1);
+// Check position, it was nearly 0. This is a shape, so use getPosition(),
not a property.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(548005)),
xShape-getPosition().X);
+}
+
DECLARE_OOXMLIMPORT_TEST(testFdo70457, fdo70457.docx)
{
// The document contains a rotated bitmap
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index aeea2d0..f1c161b 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1029,6 +1029,11 @@ void GraphicImport::lcl_attribute(Id nName, Value val)
// For non-textframes, this is handled already in
oox::drawingml::Shape::createAndInsert().
m_pImpl-applyPosition(xShapeProps);
}
+else if
(xServiceInfo-supportsService(com.sun.star.drawing.GroupShape))
+{
+// Position of the groupshape should be set after
children have been added.
+
m_xShape-setPosition(awt::Point(m_pImpl-nLeftPosition,
m_pImpl-nTopPosition));
+}
m_pImpl-applyMargins(xShapeProps);
bool bOpaque = m_pImpl-bOpaque
!m_pImpl-rDomainMapper.IsInHeaderFooter();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Reformatting a text document via UNO
On 11/27/2013 07:45 AM, Pavel Laštovička wrote: Hi all, is there a way to reformat parts or whole text document e.g. from a Basic macro? Without inserting / changing a text content to force formatting. I am thinking about a macro changing a compatibility option called by user during document editing. Thanks Not sure that I understand the question. I think that you are asking how to tell the document update everything now even though no perceivable change has occurred with the document itself. An example of this is using the menu option Tools Update All. I have usually done this by recording the macro to do an update all and then simply issuing the dispatch that does it. -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/workbookfragment.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit fdc57d0d66727cb726c44a9993dddc9a5cf6ae7a Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Nov 27 09:48:37 2013 -0500 Re-group formula cells before we do recalc on load (for xlsx). Change-Id: Iae6177433f05875e014de50eb4100fa381ddafdd diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index f8b5ef7..c189be9 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -532,6 +532,7 @@ void WorkbookFragment::finalizeImport() // Recalculate formula cells. ScDocument rDoc = getScDocument(); +rDoc.RebuildFormulaGroups(); ScDocShell rDocSh = getDocShell(); Reference XComponentContext xContext = comphelper::getProcessComponentContext(); ScRecalcOptions nRecalcMode = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/oox/workbookfragment.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 67a9f7363be665b6c582d9542101eb989a3ac87d Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Nov 27 09:48:37 2013 -0500 Re-group formula cells before we do recalc on load (for xlsx). Change-Id: Iae6177433f05875e014de50eb4100fa381ddafdd diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 30f0f34..a23d6fe 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -338,6 +338,7 @@ void WorkbookFragment::finalizeImport() // Recalculate formula cells. ScDocument rDoc = getScDocument(); +rDoc.RebuildFormulaGroups(); ScDocShell rDocSh = getDocShell(); Reference XComponentContext xContext = comphelper::getProcessComponentContext(); ScRecalcOptions nRecalcMode = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 jl...@mail.com changed: What|Removed |Added Depends on||71248 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/workbookfragment.cxx | 46 --
sc/source/filter/oox/workbookhelper.cxx | 53 ++
2 files changed, 53 insertions(+), 46 deletions(-)
New commits:
commit 06b3ccf8069c6478634dc218eaad3f02ecbfbc85
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 27 10:26:32 2013 -0500
Move recalc on-load to after ScDocumentImport::finalize().
Doing this would avoid re-grouping formula cells twice.
Change-Id: I732658fc92f2fb3ddde0c0c00ae85f72074b6b48
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index c189be9..7acb16a 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -26,7 +26,6 @@
#include oox/helper/progressbar.hxx
#include oox/helper/propertyset.hxx
#include oox/ole/olestorage.hxx
-#include vcl/msgbox.hxx
#include biffinputstream.hxx
#include chartsheetfragment.hxx
@@ -46,12 +45,9 @@
#include document.hxx
#include docsh.hxx
-#include globstr.hrc
#include calcconfig.hxx
#include oox/core/fastparser.hxx
-#include comphelper/processfactory.hxx
-#include officecfg/Office/Calc.hxx
#include salhelper/thread.hxx
#include osl/conditn.hxx
@@ -529,48 +525,6 @@ void WorkbookFragment::finalizeImport()
// final conversions, e.g. calculation settings and view settings
finalizeWorkbookImport();
-
-// Recalculate formula cells.
-ScDocument rDoc = getScDocument();
-rDoc.RebuildFormulaGroups();
-ScDocShell rDocSh = getDocShell();
-Reference XComponentContext xContext =
comphelper::getProcessComponentContext();
-ScRecalcOptions nRecalcMode =
-
static_castScRecalcOptions(officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::get(xContext));
-bool bHardRecalc = false;
-if (nRecalcMode == RECALC_ASK)
-{
-if (rDoc.IsUserInteractionEnabled())
-{
-// Ask the user if full re-calculation is desired.
-QueryBox aBox(
-rDocSh.GetActiveDialogParent(), WinBits(WB_YES_NO |
WB_DEF_YES),
-ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS));
-
aBox.SetCheckBoxText(ScGlobal::GetRscString(STR_ALWAYS_PERFORM_SELECTED));
-
-sal_Int32 nRet = aBox.Execute();
-bHardRecalc = nRet == RET_YES;
-
-if (aBox.GetCheckBoxState())
-{
-// Always perform selected action in the future.
-boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
-
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(0),
batch);
-ScFormulaOptions aOpt = SC_MOD()-GetFormulaOptions();
-aOpt.SetOOXMLRecalcOptions(bHardRecalc ? RECALC_ALWAYS :
RECALC_NEVER);
-SC_MOD()-SetFormulaOptions(aOpt);
-
-batch-commit();
-}
-}
-}
-else if (nRecalcMode == RECALC_ALWAYS)
-bHardRecalc = true;
-
-if (bHardRecalc)
-rDocSh.DoHardRecalc(false);
-else
-rDoc.CalcFormulaTree(false, true, false);
}
// private
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 66a51b4..3cba32f 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -39,6 +39,7 @@
#include oox/helper/progressbar.hxx
#include oox/helper/propertyset.hxx
#include oox/ole/vbaproject.hxx
+#include vcl/msgbox.hxx
#include addressconverter.hxx
#include biffinputstream.hxx
#include biffcodec.hxx
@@ -73,12 +74,16 @@
#include globalnames.hxx
#include documentimport.hxx
#include drwlayer.hxx
+#include globstr.hrc
#include formulabuffer.hxx
#include vcl/mapmod.hxx
#include editutil.hxx
#include editeng/editstat.hxx
+#include comphelper/processfactory.hxx
+#include officecfg/Office/Calc.hxx
+
#include boost/noncopyable.hpp
#include boost/scoped_ptr.hpp
@@ -236,6 +241,8 @@ private:
/** Finalizes the filter process (sets some needed document properties). */
voidfinalize();
+void recalcFormulaCells();
+
private:
typedef ::std::auto_ptr ScEditEngineDefaulter EditEngineDefaulterPtr;
typedef ::std::auto_ptr FormulaBuffer FormulaBufferPtr;
@@ -653,9 +660,55 @@ void WorkbookGlobals::finalize()
//ScDocShell::AfterXMLLoading() for ods
mpDoc-SetInsertingFromOtherDoc(false);
getDocImport().finalize();
+
+recalcFormulaCells();
}
}
+void WorkbookGlobals::recalcFormulaCells()
+{
+// Recalculate formula cells.
+ScDocument rDoc = getScDocument();
+ScDocShell rDocSh = getDocShell();
+Reference XComponentContext xContext =
comphelper::getProcessComponentContext();
+ScRecalcOptions nRecalcMode =
+
Re: [Libreoffice-commits] IAccessible2 problems
Below are two commits that were necessary to make (Linux) make check work again post http://cgit.freedesktop.org/libreoffice/core/commit/?id=efb23f29983f87104a684e7fab00b84fc59d131d Integrate branch of IAccessible2. In both cases, the problematic changes made by that commit looked rather unmotivated to me, and I do not know whether it would actually have been better to change the code under test or the test code. So, insight welcome. Stephan On 11/27/2013 09:15 AM, Stephan Bergmann wrote: commit 1533129759c0017413efe2213bfe503c26dc16f0 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Nov 27 09:12:38 2013 +0100 Revert sense in VCLXAccessibleBox::getAccessibleActionCount again ...this had been switched from m_bIsDropDownBox ? 1 : 0 to m_bIsDropDownBox ? 0 : 1 in efb23f29983f87104a684e7fab00b84fc59d131d Integrate branch of IAccessible2 for no apparent reason and broke JunitTest_testtools_unoapi. Change-Id: I276d2f452648387a5fa693349cf868787b2d48e1 diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 7aa7836..764c0ca 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -409,7 +409,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount (void) // There is one action for drop down boxes (toggle popup) and none for // the other boxes. -return m_bIsDropDownBox ? 0 : 1; +return m_bIsDropDownBox ? 1 : 0; } sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) On 11/27/2013 11:33 AM, Stephan Bergmann wrote: commit 4f94f16ba15218e5e7a9eb4d72ddb4cb62884dbb Author: Stephan Bergmann sberg...@redhat.com Date: Wed Nov 27 11:28:57 2013 +0100 IAccessible2: revert some bounds-checking changes again ...that were introduced with c23ab5eaed57cc3fb5860e26c591c73c5b22687b Integrate branch of IAccessible2 but broke JunitTest_sc_unoapi, which expects calls to getCharacterAttributes and getIndexAtPoint to actually fail for out-of-bounds arguments. The above commit does not make it obvious why those changes were actually made. Change-Id: I3492c3e6a49d68885df1206e9368f4483c0dc4f9 diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index e9941df..614294f 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -1381,11 +1381,7 @@ namespace accessibility EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast sal_uInt16 (GetParagraphIndex()) ); if (aBulletInfo.bVisible) nIndex += aBulletInfo.aText.getLength(); -if (nIndex != 0 nIndex = getCharacterCount()) -nIndex = getCharacterCount()-1; -// -if (nIndex != 0) -CheckIndex(nIndex); // may throw IndexOutOfBoundsException +CheckIndex(nIndex); // may throw IndexOutOfBoundsException bool bSupplementalMode = false; uno::Sequence OUString aPropertyNames = rRequestedAttributes; @@ -1534,9 +1530,6 @@ namespace accessibility SolarMutexGuard aGuard; -if ((rPoint.X = 0) (rPoint.Y = 0)) -return 0; - sal_Int32 nPara; sal_uInt16 nIndex; ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - svx/source
svx/source/accessibility/ShapeTypeHandler.cxx |2 --
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |2 --
2 files changed, 4 deletions(-)
New commits:
commit e556e2890ca2baaf05a2694463b15aee6b803454
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 27 16:48:05 2013 +0100
-Werror,-Wunused-variable
Change-Id: Ia202059eb891b1088dc276c963e16ede93fe8d05
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index e433f67..a4b25dd 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -345,7 +345,6 @@ void SvxPixelCtlAccessible::grabFocus( ) throw
(uno::RuntimeException)
sal_Int32 SvxPixelCtlAccessible::getForeground( )
throw (::com::sun::star::uno::RuntimeException)
{
-uno::Any aRet;
::osl::MutexGuard aGuard( m_aMutex );
IsValid();
return pPixelCtl-GetControlForeground().GetColor();
@@ -354,7 +353,6 @@ sal_Int32 SvxPixelCtlAccessible::getForeground( )
sal_Int32 SvxPixelCtlAccessible::getBackground( )
throw (::com::sun::star::uno::RuntimeException)
{
-uno::Any aRet;
::osl::MutexGuard aGuard( m_aMutex );
IsValid();
return pPixelCtl-GetControlBackground().GetColor();
commit 2733831474036f4893e8a90795f5799279d151d0
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 27 16:47:32 2013 +0100
-Werror,-Wunused-variable
Change-Id: Id3e24e7efd84db03d0d1636bf099bac3fede55db
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx
b/svx/source/accessibility/ShapeTypeHandler.cxx
index f23b9ab..dc3fb56 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -306,8 +306,6 @@ OUString
SdrObject *pSdrObj = pShape-GetSdrObject();
if (pSdrObj)
{
-OUString aTmp(pSdrObj-TakeObjNameSingul());
-
if(pSdrObj-ISA(SdrObjCustomShape))
{
SdrObjCustomShape* pCustomShape =
(SdrObjCustomShape*)pSdrObj;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 76bb6d7678669b5af1731fb87e632784cd3c01fc
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 27 16:49:43 2013 +0100
statement aligned as second statement in if body but not in a statement
block
Change-Id: I497a31b35d68a31155fd31bcd3d07e782be944c3
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index a4b25dd..3b0a4ae 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -94,7 +94,7 @@ uno::Reference XAccessible
SvxPixelCtlAccessible::getAccessibleChild( sal_Int
::osl::MutexGuard aGuard( m_aMutex );
IsValid();
if ( i 0 || i = getAccessibleChildCount())
-throw lang::IndexOutOfBoundsException();
+throw lang::IndexOutOfBoundsException();
uno::Reference XAccessible xAcc;
if(pPixelCtl)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdobj.hxx |2 -
svx/source/accessibility/AccessibleShape.cxx | 35 ++-
svx/source/svdraw/svdobj.cxx |5 ---
3 files changed, 13 insertions(+), 29 deletions(-)
New commits:
commit 7ef4a5bd51c606c70661dd303ebd1eeaec0c3834
Author: Armin Le Grand a...@apache.org
Date: Wed Nov 27 13:00:02 2013 +
removed pCaptionObj from accessibility
it was not initialized but accessed in one place. Checked with symphony
code,
there was a set method which is not in AOO trunk, thus solved accesses to
zero
pointer usage
(cherry picked from commit bd0c3b940f6006d3cb49381230795db667aeb943)
Conflicts:
svx/inc/svx/svdobj.hxx
svx/source/svdraw/svdobj.cxx
Change-Id: Ic8dec5c6def35753d757066c7ea02e1a92b46f6c
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index ee08d6b..f1b3dbb 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -357,7 +357,6 @@ protected:
SdrObjUserCall* pUserCall;
SdrObjPlusData* pPlusData;// Broadcaster, UserData,
Konnektoren, ... (Das ist der Bitsack)
-SdrObject* pCaptionObj;
sal_uInt32 nOrdNum; // Rangnummer des Obj in der
Liste
SfxGrabBagItem* pGrabBagItem; // Holds the GrabBagItem property
@@ -1036,7 +1035,6 @@ public:
// #i121917#
virtual bool HasText() const;
-const SdrObject* GetCaptionObj() const;
protected:
/** Sets a new UNO shape
*
diff --git a/svx/source/accessibility/AccessibleShape.cxx
b/svx/source/accessibility/AccessibleShape.cxx
index fa36b9c..bdb7453 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -421,36 +421,27 @@ uno::ReferenceXAccessibleRelationSet SAL_CALL
throw (::com::sun::star::uno::RuntimeException)
{
::osl::MutexGuard aGuard (maMutex);
-::utl::AccessibleRelationSetHelper* pRelationSet =
-new utl::AccessibleRelationSetHelper;
-SdrObject* pCaptionSdr = const_cast SdrObject* (
m_pShape-GetCaptionObj() ) ;
-if(pCaptionSdr!=NULL)
-{
-uno::Sequence uno::Reference uno::XInterface aSequence(1);
-uno::Referencedrawing::XShape xCaptionShape (
pCaptionSdr-getUnoShape(),uno::UNO_QUERY);
-if(xCaptionShape.is())
-{
-aSequence[0] = mpParent-GetAccessibleCaption(xCaptionShape);
-pRelationSet-AddRelation( AccessibleRelation(
AccessibleRelationType::DESCRIBED_BY, aSequence ) );
-}
-}
-else
+::utl::AccessibleRelationSetHelper* pRelationSet = new
utl::AccessibleRelationSetHelper;
+uno::Sequence uno::Reference uno::XInterface aSequence(1);
+aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
+
+//this mxshape is the captioned shape, only for sw
+if(aSequence[0].get())
{
-//this mxshape is the captioned shape, only for sw
-if(mpParent-GetAccessibleCaption(mxShape).get())
-{
-uno::Sequence uno::Reference uno::XInterface aSequence(1);
-aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
-pRelationSet-AddRelation( AccessibleRelation(
AccessibleRelationType::DESCRIBED_BY, aSequence ) );
-}
+pRelationSet-AddRelation(
+AccessibleRelation( AccessibleRelationType::DESCRIBED_BY,
aSequence ) );
}
- if (pRelationSet != NULL)
+
+if (pRelationSet != NULL)
{
return uno::ReferenceXAccessibleRelationSet (
new ::utl::AccessibleRelationSetHelper (*pRelationSet));
}
else
+{
return uno::ReferenceXAccessibleRelationSet(NULL);
+}
+
return uno::ReferenceXAccessibleRelationSet();
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 4016094..b495c5b 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -3128,11 +3128,6 @@ void SdrObject::notifyShapePropertyChange( const
::svx::ShapeProperty _eProperty
return
pSvxShape-getShapePropertyChangeNotifier().notifyPropertyChange( _eProperty );
}
-const SdrObject* SdrObject::GetCaptionObj() const
-{
-return pCaptionObj;
-}
-
//
// transformation interface for StarOfficeAPI. This implements support for
___
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' - bd/0c3b940f6006d3cb49381230795db667aeb943
bd/0c3b940f6006d3cb49381230795db667aeb943 |1 + 1 file changed, 1 insertion(+) New commits: commit 6cecff0fb3cafe610dcc4518c32c0dd504274543 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 15:52:04 2013 + Notes added by 'git notes add' diff --git a/bd/0c3b940f6006d3cb49381230795db667aeb943 b/bd/0c3b940f6006d3cb49381230795db667aeb943 new file mode 100644 index 000..1935dda --- /dev/null +++ b/bd/0c3b940f6006d3cb49381230795db667aeb943 @@ -0,0 +1 @@ +merged as: 7ef4a5bd51c606c70661dd303ebd1eeaec0c3834 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/oox/workbookfragment.cxx | 55 --
sc/source/filter/oox/workbookhelper.cxx | 53
2 files changed, 62 insertions(+), 46 deletions(-)
New commits:
commit 2352e1cf0215f9a7e9ef98e1d99d081419eb615f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 27 10:26:32 2013 -0500
Move recalc on-load to after ScDocumentImport::finalize().
Doing this would avoid re-grouping formula cells twice.
(cherry picked from commit 06b3ccf8069c6478634dc218eaad3f02ecbfbc85)
Conflicts:
sc/source/filter/oox/workbookfragment.cxx
Change-Id: I732658fc92f2fb3ddde0c0c00ae85f72074b6b48
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index a23d6fe..5eea78b 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -26,7 +26,6 @@
#include oox/helper/progressbar.hxx
#include oox/helper/propertyset.hxx
#include oox/ole/olestorage.hxx
-#include vcl/msgbox.hxx
#include biffinputstream.hxx
#include chartsheetfragment.hxx
@@ -46,11 +45,17 @@
#include document.hxx
#include docsh.hxx
-#include globstr.hrc
#include calcconfig.hxx
-#include comphelper/processfactory.hxx
-#include officecfg/Office/Calc.hxx
+#include oox/core/fastparser.hxx
+#include salhelper/thread.hxx
+#include osl/conditn.hxx
+
+#include queue
+#include boost/scoped_ptr.hpp
+
+#define MULTI_THREAD_SHEET_PARSING 0
+
#include oox/ole/vbaproject.hxx
namespace oox {
@@ -335,48 +340,6 @@ void WorkbookFragment::finalizeImport()
// final conversions, e.g. calculation settings and view settings
finalizeWorkbookImport();
-
-// Recalculate formula cells.
-ScDocument rDoc = getScDocument();
-rDoc.RebuildFormulaGroups();
-ScDocShell rDocSh = getDocShell();
-Reference XComponentContext xContext =
comphelper::getProcessComponentContext();
-ScRecalcOptions nRecalcMode =
-
static_castScRecalcOptions(officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::get(xContext));
-bool bHardRecalc = false;
-if (nRecalcMode == RECALC_ASK)
-{
-if (rDoc.IsUserInteractionEnabled())
-{
-// Ask the user if full re-calculation is desired.
-QueryBox aBox(
-rDocSh.GetActiveDialogParent(), WinBits(WB_YES_NO |
WB_DEF_YES),
-ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS));
-
aBox.SetCheckBoxText(ScGlobal::GetRscString(STR_ALWAYS_PERFORM_SELECTED));
-
-sal_Int32 nRet = aBox.Execute();
-bHardRecalc = nRet == RET_YES;
-
-if (aBox.GetCheckBoxState())
-{
-// Always perform selected action in the future.
-boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
-
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(0),
batch);
-ScFormulaOptions aOpt = SC_MOD()-GetFormulaOptions();
-aOpt.SetOOXMLRecalcOptions(bHardRecalc ? RECALC_ALWAYS :
RECALC_NEVER);
-SC_MOD()-SetFormulaOptions(aOpt);
-
-batch-commit();
-}
-}
-}
-else if (nRecalcMode == RECALC_ALWAYS)
-bHardRecalc = true;
-
-if (bHardRecalc)
-rDocSh.DoHardRecalc(false);
-else
-rDoc.CalcFormulaTree(false, true, false);
}
// private
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 33270e5..94afb7c 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -39,6 +39,7 @@
#include oox/helper/progressbar.hxx
#include oox/helper/propertyset.hxx
#include oox/ole/vbaproject.hxx
+#include vcl/msgbox.hxx
#include addressconverter.hxx
#include biffinputstream.hxx
#include biffcodec.hxx
@@ -73,12 +74,16 @@
#include globalnames.hxx
#include documentimport.hxx
#include drwlayer.hxx
+#include globstr.hrc
#include formulabuffer.hxx
#include vcl/mapmod.hxx
#include editutil.hxx
#include editeng/editstat.hxx
+#include comphelper/processfactory.hxx
+#include officecfg/Office/Calc.hxx
+
#include boost/noncopyable.hpp
#include boost/scoped_ptr.hpp
@@ -236,6 +241,8 @@ private:
/** Finalizes the filter process (sets some needed document properties). */
voidfinalize();
+void recalcFormulaCells();
+
private:
typedef ::std::auto_ptr ScEditEngineDefaulter EditEngineDefaulterPtr;
typedef ::std::auto_ptr FormulaBuffer FormulaBufferPtr;
@@ -653,9 +660,55 @@ void WorkbookGlobals::finalize()
//ScDocShell::AfterXMLLoading() for ods
mpDoc-SetInsertingFromOtherDoc(false);
getDocImport().finalize();
+
+recalcFormulaCells();
}
}
Re: Reformatting a text document via UNO
Pavel , all formating can been handled wit a macro, the Gimmicks library is a good start to see it working Hi all, is there a way to reformat parts or whole text document e.g. from a Basic macro? Without inserting / changing a text content to force formatting. I am thinking about a macro changing a compatibility option called by user during document editing. Thanks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/accessibility/charmapacc.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a66090955f9e05905417660fc14e91b352f304d2
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 27 16:09:59 2013 +
C2872: 'accessibility' : ambiguous symbol
Change-Id: I9a7f5a768346539f14c1fc84d1c60e99107e3899
diff --git a/svx/source/accessibility/charmapacc.cxx
b/svx/source/accessibility/charmapacc.cxx
index 06cae40..28a11fe 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -754,10 +754,10 @@ uno::Reference css::accessibility::XAccessibleStateSet
SAL_CALL SvxShowCharSe
{
if (mpParent-mrParent.IsEnabled())
{
-pStateSet-AddState( accessibility::AccessibleStateType::ENABLED );
+pStateSet-AddState(
css::accessibility::AccessibleStateType::ENABLED );
// SELECTABLE
-pStateSet-AddState(
accessibility::AccessibleStateType::SELECTABLE );
-pStateSet-AddState( accessibility::AccessibleStateType::FOCUSABLE
);
+pStateSet-AddState(
css::accessibility::AccessibleStateType::SELECTABLE );
+pStateSet-AddState(
css::accessibility::AccessibleStateType::FOCUSABLE );
}
// SELECTED
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - 2 commits - sc/source
sc/source/filter/oox/workbookfragment.cxx | 45 -
sc/source/filter/oox/workbookhelper.cxx | 53 ++
2 files changed, 53 insertions(+), 45 deletions(-)
New commits:
commit 1a2adce30c06f29783867623c4c71b12c82f366f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 27 10:26:32 2013 -0500
Move recalc on-load to after ScDocumentImport::finalize().
Doing this would avoid re-grouping formula cells twice.
Change-Id: I732658fc92f2fb3ddde0c0c00ae85f72074b6b48
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index c189be9..7acb16a 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -26,7 +26,6 @@
#include oox/helper/progressbar.hxx
#include oox/helper/propertyset.hxx
#include oox/ole/olestorage.hxx
-#include vcl/msgbox.hxx
#include biffinputstream.hxx
#include chartsheetfragment.hxx
@@ -46,12 +45,9 @@
#include document.hxx
#include docsh.hxx
-#include globstr.hrc
#include calcconfig.hxx
#include oox/core/fastparser.hxx
-#include comphelper/processfactory.hxx
-#include officecfg/Office/Calc.hxx
#include salhelper/thread.hxx
#include osl/conditn.hxx
@@ -529,48 +525,6 @@ void WorkbookFragment::finalizeImport()
// final conversions, e.g. calculation settings and view settings
finalizeWorkbookImport();
-
-// Recalculate formula cells.
-ScDocument rDoc = getScDocument();
-rDoc.RebuildFormulaGroups();
-ScDocShell rDocSh = getDocShell();
-Reference XComponentContext xContext =
comphelper::getProcessComponentContext();
-ScRecalcOptions nRecalcMode =
-
static_castScRecalcOptions(officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::get(xContext));
-bool bHardRecalc = false;
-if (nRecalcMode == RECALC_ASK)
-{
-if (rDoc.IsUserInteractionEnabled())
-{
-// Ask the user if full re-calculation is desired.
-QueryBox aBox(
-rDocSh.GetActiveDialogParent(), WinBits(WB_YES_NO |
WB_DEF_YES),
-ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS));
-
aBox.SetCheckBoxText(ScGlobal::GetRscString(STR_ALWAYS_PERFORM_SELECTED));
-
-sal_Int32 nRet = aBox.Execute();
-bHardRecalc = nRet == RET_YES;
-
-if (aBox.GetCheckBoxState())
-{
-// Always perform selected action in the future.
-boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
-
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(0),
batch);
-ScFormulaOptions aOpt = SC_MOD()-GetFormulaOptions();
-aOpt.SetOOXMLRecalcOptions(bHardRecalc ? RECALC_ALWAYS :
RECALC_NEVER);
-SC_MOD()-SetFormulaOptions(aOpt);
-
-batch-commit();
-}
-}
-}
-else if (nRecalcMode == RECALC_ALWAYS)
-bHardRecalc = true;
-
-if (bHardRecalc)
-rDocSh.DoHardRecalc(false);
-else
-rDoc.CalcFormulaTree(false, true, false);
}
// private
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 66a51b4..3cba32f 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -39,6 +39,7 @@
#include oox/helper/progressbar.hxx
#include oox/helper/propertyset.hxx
#include oox/ole/vbaproject.hxx
+#include vcl/msgbox.hxx
#include addressconverter.hxx
#include biffinputstream.hxx
#include biffcodec.hxx
@@ -73,12 +74,16 @@
#include globalnames.hxx
#include documentimport.hxx
#include drwlayer.hxx
+#include globstr.hrc
#include formulabuffer.hxx
#include vcl/mapmod.hxx
#include editutil.hxx
#include editeng/editstat.hxx
+#include comphelper/processfactory.hxx
+#include officecfg/Office/Calc.hxx
+
#include boost/noncopyable.hpp
#include boost/scoped_ptr.hpp
@@ -236,6 +241,8 @@ private:
/** Finalizes the filter process (sets some needed document properties). */
voidfinalize();
+void recalcFormulaCells();
+
private:
typedef ::std::auto_ptr ScEditEngineDefaulter EditEngineDefaulterPtr;
typedef ::std::auto_ptr FormulaBuffer FormulaBufferPtr;
@@ -653,9 +660,55 @@ void WorkbookGlobals::finalize()
//ScDocShell::AfterXMLLoading() for ods
mpDoc-SetInsertingFromOtherDoc(false);
getDocImport().finalize();
+
+recalcFormulaCells();
}
}
+void WorkbookGlobals::recalcFormulaCells()
+{
+// Recalculate formula cells.
+ScDocument rDoc = getScDocument();
+ScDocShell rDocSh = getDocShell();
+Reference XComponentContext xContext =
comphelper::getProcessComponentContext();
+ScRecalcOptions nRecalcMode =
+
[Libreoffice-commits] core.git: 2 commits - forms/source
forms/source/component/Grid.cxx|9 --
forms/source/component/formcontrolfont.cxx | 120 ++---
forms/source/component/navigationbar.cxx |9 --
forms/source/inc/formcontrolfont.hxx | 11 ++
forms/source/richtext/richtextmodel.cxx|9 --
5 files changed, 97 insertions(+), 61 deletions(-)
New commits:
commit 6aefcb6a6f90896754f3432e5ae41403998b7ab0
Author: Michael Stahl mst...@redhat.com
Date: Wed Nov 27 17:08:22 2013 +0100
forms: avoid deadlock when setting FontControlModel properties
Deadlock found in forms_unoapi on Windows, with
OGridControlModel::setFastPropertyValue_NoBroadcast() calling event
handler that tries to lock SolarMutex.
FontControlModel::setFastPropertyValue_NoBroadcast() and its callers in
3 other classes must not send events via firePropertyChange()
because they are called by OPropertySetHelper::setFastPropertyValues()
with its Mutex locked.
It is possible (though sadly quite convoluted) to delay the sending of
the events by calling setDependentFastPropertyValue() instead.
Change-Id: I0c767cfec01fe1bcaeb1236287b5faf81a2e7441
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index c81675f..bb52635 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -707,12 +707,9 @@ void OGridControlModel::setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, con
default:
if ( isFontRelatedProperty( nHandle ) )
{
-FontDescriptor aOldFont( getFont() );
-
-FontControlModel::setFastPropertyValue_NoBroadcast( nHandle,
rValue );
-
-if ( isFontAggregateProperty( nHandle ) )
-firePropertyChange( PROPERTY_ID_FONT, makeAny( getFont()
), makeAny( aOldFont ) );
+FontControlModel::setFastPropertyValue_NoBroadcast_impl(
+*this, OGridControlModel::setDependentFastPropertyValue,
+nHandle, rValue);
}
else
OControlModel::setFastPropertyValue_NoBroadcast( nHandle,
rValue );
diff --git a/forms/source/component/formcontrolfont.cxx
b/forms/source/component/formcontrolfont.cxx
index 5745802..4b85cae 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -20,6 +20,7 @@
#include formcontrolfont.hxx
#include property.hrc
#include property.hxx
+#include cppuhelper/propshlp.hxx
#include comphelper/property.hxx
#include comphelper/types.hxx
#include tools/color.hxx
@@ -351,104 +352,139 @@ namespace frm
}
//--
-void FontControlModel::setFastPropertyValue_NoBroadcast( sal_Int32
_nHandle, const Any _rValue ) throw ( Exception )
+static void setFastPropertyValue_NoBroadcast_implimpl(
+FontDescriptor rFont,
+sal_Int32 nHandle, const Any rValue) throw (Exception)
{
-switch( _nHandle )
+switch (nHandle)
{
-case PROPERTY_ID_TEXTCOLOR:
-m_aTextColor = _rValue;
-break;
-
-case PROPERTY_ID_TEXTLINECOLOR:
-m_aTextLineColor = _rValue;
-break;
-
-case PROPERTY_ID_FONTEMPHASISMARK:
-_rValue = m_nFontEmphasis;
-break;
-
-case PROPERTY_ID_FONTRELIEF:
-_rValue = m_nFontRelief;
-break;
-
-case PROPERTY_ID_FONT:
-_rValue = m_aFont;
-break;
-
case PROPERTY_ID_FONT_NAME:
-_rValue = m_aFont.Name;
+rValue = rFont.Name;
break;
case PROPERTY_ID_FONT_STYLENAME:
-_rValue = m_aFont.StyleName;
+rValue = rFont.StyleName;
break;
case PROPERTY_ID_FONT_FAMILY:
-_rValue = m_aFont.Family;
+rValue = rFont.Family;
break;
case PROPERTY_ID_FONT_CHARSET:
-_rValue = m_aFont.CharSet;
+rValue = rFont.CharSet;
break;
case PROPERTY_ID_FONT_CHARWIDTH:
-_rValue = m_aFont.CharacterWidth;
+rValue = rFont.CharacterWidth;
break;
case PROPERTY_ID_FONT_KERNING:
-_rValue = m_aFont.Kerning;
+rValue = rFont.Kerning;
break;
case PROPERTY_ID_FONT_ORIENTATION:
-_rValue = m_aFont.Orientation;
+rValue = rFont.Orientation;
break;
case PROPERTY_ID_FONT_PITCH:
-_rValue = m_aFont.Pitch;
+rValue = rFont.Pitch;
break;
case PROPERTY_ID_FONT_TYPE:
-_rValue = m_aFont.Type;
+rValue = rFont.Type;
break;
case PROPERTY_ID_FONT_WIDTH:
-_rValue = m_aFont.Width;
+rValue = rFont.Width;
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - forms/source
forms/source/component/Grid.cxx|9 --
forms/source/component/formcontrolfont.cxx | 120 ++---
forms/source/component/navigationbar.cxx |9 --
forms/source/inc/formcontrolfont.hxx | 11 ++
forms/source/richtext/richtextmodel.cxx|9 --
5 files changed, 97 insertions(+), 61 deletions(-)
New commits:
commit 1bb01f851071d4fa4e70be0f9d7c8dc83739ed05
Author: Michael Stahl mst...@redhat.com
Date: Wed Nov 27 17:08:22 2013 +0100
forms: avoid deadlock when setting FontControlModel properties
Deadlock found in forms_unoapi on Windows, with
OGridControlModel::setFastPropertyValue_NoBroadcast() calling event
handler that tries to lock SolarMutex.
FontControlModel::setFastPropertyValue_NoBroadcast() and its callers in
3 other classes must not send events via firePropertyChange()
because they are called by OPropertySetHelper::setFastPropertyValues()
with its Mutex locked.
It is possible (though sadly quite convoluted) to delay the sending of
the events by calling setDependentFastPropertyValue() instead.
Change-Id: I0c767cfec01fe1bcaeb1236287b5faf81a2e7441
(cherry picked from commit 6aefcb6a6f90896754f3432e5ae41403998b7ab0)
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index c81675f..bb52635 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -707,12 +707,9 @@ void OGridControlModel::setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, con
default:
if ( isFontRelatedProperty( nHandle ) )
{
-FontDescriptor aOldFont( getFont() );
-
-FontControlModel::setFastPropertyValue_NoBroadcast( nHandle,
rValue );
-
-if ( isFontAggregateProperty( nHandle ) )
-firePropertyChange( PROPERTY_ID_FONT, makeAny( getFont()
), makeAny( aOldFont ) );
+FontControlModel::setFastPropertyValue_NoBroadcast_impl(
+*this, OGridControlModel::setDependentFastPropertyValue,
+nHandle, rValue);
}
else
OControlModel::setFastPropertyValue_NoBroadcast( nHandle,
rValue );
diff --git a/forms/source/component/formcontrolfont.cxx
b/forms/source/component/formcontrolfont.cxx
index 5745802..4b85cae 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -20,6 +20,7 @@
#include formcontrolfont.hxx
#include property.hrc
#include property.hxx
+#include cppuhelper/propshlp.hxx
#include comphelper/property.hxx
#include comphelper/types.hxx
#include tools/color.hxx
@@ -351,104 +352,139 @@ namespace frm
}
//--
-void FontControlModel::setFastPropertyValue_NoBroadcast( sal_Int32
_nHandle, const Any _rValue ) throw ( Exception )
+static void setFastPropertyValue_NoBroadcast_implimpl(
+FontDescriptor rFont,
+sal_Int32 nHandle, const Any rValue) throw (Exception)
{
-switch( _nHandle )
+switch (nHandle)
{
-case PROPERTY_ID_TEXTCOLOR:
-m_aTextColor = _rValue;
-break;
-
-case PROPERTY_ID_TEXTLINECOLOR:
-m_aTextLineColor = _rValue;
-break;
-
-case PROPERTY_ID_FONTEMPHASISMARK:
-_rValue = m_nFontEmphasis;
-break;
-
-case PROPERTY_ID_FONTRELIEF:
-_rValue = m_nFontRelief;
-break;
-
-case PROPERTY_ID_FONT:
-_rValue = m_aFont;
-break;
-
case PROPERTY_ID_FONT_NAME:
-_rValue = m_aFont.Name;
+rValue = rFont.Name;
break;
case PROPERTY_ID_FONT_STYLENAME:
-_rValue = m_aFont.StyleName;
+rValue = rFont.StyleName;
break;
case PROPERTY_ID_FONT_FAMILY:
-_rValue = m_aFont.Family;
+rValue = rFont.Family;
break;
case PROPERTY_ID_FONT_CHARSET:
-_rValue = m_aFont.CharSet;
+rValue = rFont.CharSet;
break;
case PROPERTY_ID_FONT_CHARWIDTH:
-_rValue = m_aFont.CharacterWidth;
+rValue = rFont.CharacterWidth;
break;
case PROPERTY_ID_FONT_KERNING:
-_rValue = m_aFont.Kerning;
+rValue = rFont.Kerning;
break;
case PROPERTY_ID_FONT_ORIENTATION:
-_rValue = m_aFont.Orientation;
+rValue = rFont.Orientation;
break;
case PROPERTY_ID_FONT_PITCH:
-_rValue = m_aFont.Pitch;
+rValue = rFont.Pitch;
break;
case PROPERTY_ID_FONT_TYPE:
-_rValue = m_aFont.Type;
+rValue = rFont.Type;
break;
case PROPERTY_ID_FONT_WIDTH:
-
[Libreoffice-commits] core.git: include/svtools svtools/source svtools/uiconfig svtools/UIConfig_svt.mk
include/svtools/fileview.hxx | 29 +++--
include/svtools/svtools.hrc |2
svtools/UIConfig_svt.mk |1
svtools/source/contnr/fileview.cxx | 68 +++--
svtools/source/contnr/fileview.hrc | 10 ---
svtools/source/contnr/fileview.src | 70 -
svtools/uiconfig/ui/querydeletedialog.ui | 99 +++
7 files changed, 135 insertions(+), 144 deletions(-)
New commits:
commit 02d4eb7438a83982b2602ea1d83d5accb1fe11f6
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 27 16:42:53 2013 +
convert query delete dialog to .ui
Change-Id: I0ab09c2c54bba4a287ef0f7cc812596958373e15
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index fd2ccfe..8b90816 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -25,8 +25,9 @@
#include vcl/ctrl.hxx
#include vcl/image.hxx
#include vcl/fixed.hxx
-#include vcl/button.hxx
#include vcl/dialog.hxx
+#include vcl/button.hxx
+#include vcl/layout.hxx
#include rtl/ustring.hxx
// class SvtFileView -
@@ -216,24 +217,19 @@ namespace svtools {
enum QueryDeleteResult_Impl
{
-QUERYDELETE_YES = 0,
-QUERYDELETE_NO,
-QUERYDELETE_ALL,
-QUERYDELETE_CANCEL
+QUERYDELETE_CANCEL = RET_CANCEL,
+QUERYDELETE_YES = RET_YES,
+QUERYDELETE_NO = RET_NO,
+QUERYDELETE_ALL = -1
};
-class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public ModalDialog
+class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public MessageDialog
{
-FixedText _aEntryLabel;
-FixedText _aEntry;
-FixedText _aQueryMsg;
-
-PushButton _aYesButton;
-PushButton _aAllButton;
-PushButton _aNoButton;
-CancelButton_aCancelButton;
+PushButton* m_pYesButton;
+PushButton* m_pAllButton;
+PushButton* m_pNoButton;
-QueryDeleteResult_Impl _eResult;
+QueryDeleteResult_Impl m_eResult;
private:
@@ -244,8 +240,7 @@ public:
QueryDeleteDlg_Impl( Window* pParent,
const OUString rName );
-voidEnableAllButton() { _aAllButton.Enable( sal_True
); }
-QueryDeleteResult_Impl GetResult() const { return _eResult; }
+voidEnableAllButton() { m_pAllButton-Enable(true); }
};
}
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
index 301d2f7..e11c5ae 100644
--- a/include/svtools/svtools.hrc
+++ b/include/svtools/svtools.hrc
@@ -27,8 +27,6 @@
//.
// various unsorted stuff
-#define DLG_SVT_QUERYDELETE (RID_SVTOOLS_START+6)
-
#define STR_SVT_AUTOMATIC_COLOR (RID_SVTOOLS_START+16)
#define STR_SVT_FILEVIEW_COLUMN_TITLE (RID_SVTOOLS_START + 20)
diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk
index 153054f..5a6b0ca 100644
--- a/svtools/UIConfig_svt.mk
+++ b/svtools/UIConfig_svt.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\
svtools/uiconfig/ui/graphicexport \
svtools/uiconfig/ui/placeedit \
svtools/uiconfig/ui/printersetupdialog \
+ svtools/uiconfig/ui/querydeletedialog \
svtools/uiconfig/ui/restartdialog \
svtools/uiconfig/ui/GraphicExportOptionsDialog \
))
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index 8757ca0..32ee18b 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -59,7 +59,7 @@
#include unotools/localfilehelper.hxx
#include ucbhelper/content.hxx
#include ucbhelper/commandenvironment.hxx
-#include vcl/msgbox.hxx
+#include vcl/layout.hxx
#include rtl/math.hxx
#include tools/config.hxx
#include osl/mutex.hxx
@@ -536,7 +536,7 @@ protected:
protected:
// IEnumerationResultHandler overridables
-virtual voidenumerationDone( ::svt::EnumerationResult _eResult );
+virtual voidenumerationDone( ::svt::EnumerationResult eResult );
voidimplEnumerationSuccess();
// ITimeoutHandler
@@ -900,7 +900,7 @@ void ViewTabListBox_Impl::ClearAll()
// ---
void ViewTabListBox_Impl::DeleteEntries()
{
-svtools::QueryDeleteResult_Impl eResult = svtools::QUERYDELETE_YES;
+short eResult = svtools::QUERYDELETE_YES;
SvTreeListEntry* pEntry = FirstSelected();
OUString aURL;
@@ -946,10 +946,7 @@ void ViewTabListBox_Impl::DeleteEntries()
if ( GetSelectionCount() 1 )
aDlg.EnableAllButton();
-if ( aDlg.Execute() == RET_OK )
-eResult = aDlg.GetResult();
-else
-eResult =
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |4 source/text/shared/01/0102.xhp | 12 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) New commits: commit fb4f27116b49a84dd6463a5feeca40c676c642d2 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 16:54:34 2013 + update helpids for query delete dialog .ui conversion Change-Id: I2f355c44721576a9c40e8f03866915db5ec406ce diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 5fa995c..d637d9a 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6469,7 +6469,6 @@ svtools_ModalDialog_DLG_LOGIN,1336426496, svtools_ModalDialog_DLG_ROADMAP_SKELETON,1334575104, svtools_ModalDialog_DLG_SVT_PRNDLG_PRINTDLG,1338785792, svtools_ModalDialog_DLG_SVT_PRNDLG_PRNSETUPDLG,1338769408, -svtools_ModalDialog_DLG_SVT_QUERYDELETE,1334673408, svtools_NumericField_DLG_COLOR_NUM_BLUE,1090066435, svtools_NumericField_DLG_COLOR_NUM_GREEN,1090066434, svtools_NumericField_DLG_COLOR_NUM_HUE,1090066436, @@ -6486,9 +6485,6 @@ svtools_PushButton_DLG_SVT_PRNDLG_PRINTDLG_BTN_OPTIONS,1338790454, svtools_PushButton_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES,1338790403, svtools_PushButton_DLG_SVT_PRNDLG_PRNSETUPDLG_BTN_OPTIONS,1338774033, svtools_PushButton_DLG_SVT_PRNDLG_PRNSETUPDLG_BTN_PROPERTIES,1338774019, -svtools_PushButton_DLG_SVT_QUERYDELETE_BTN_ALL,1334678022, -svtools_PushButton_DLG_SVT_QUERYDELETE_BTN_NO,1334678021, -svtools_PushButton_DLG_SVT_QUERYDELETE_BTN_YES,1334678020, svtools_PushButton_TT_INLINE_TRANSLATION_TT_PB_ACCEPT,2886668808, svtools_PushButton_TT_INLINE_TRANSLATION_TT_PB_NEXT,2886668809, svtools_PushButton_TT_INLINE_TRANSLATION_TT_PB_RESTORE,2886668807, diff --git a/source/text/shared/01/0102.xhp b/source/text/shared/01/0102.xhp index c40528c..2038aeb 100644 --- a/source/text/shared/01/0102.xhp +++ b/source/text/shared/01/0102.xhp @@ -83,12 +83,12 @@ paragraph xml-lang=en-US id=par_id3147618 role=listitem l10n=U oldref=112ahelp hid=HID_FILEVIEW_MENU_RENAMETo rename a file, right-click the file, and then choose emphRename/emph./ahelp/paragraph /listitem /list -bookmark xml-lang=en-US branch=hid/svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES id=bm_id3151245 localize=false/ -paragraph xml-lang=en-US id=par_id3153331 role=paragraph l10n=U oldref=124ahelp hid=SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES visibility=hiddenClick to delete the file with the name shown in this dialog./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO id=bm_id3150822 localize=false/ -paragraph xml-lang=en-US id=par_id3161458 role=paragraph l10n=U oldref=125ahelp hid=SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO visibility=hiddenClick to cancel deletion of the file with the name shown in this dialog./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL id=bm_id3154346 localize=false/ -paragraph xml-lang=en-US id=par_id3147531 role=paragraph l10n=U oldref=126ahelp hid=SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL visibility=hiddenClick to delete all selected files./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/svt/ui/querydeletedialog/yes id=bm_id3151245 localize=false/ +paragraph xml-lang=en-US id=par_id3153331 role=paragraph l10n=U oldref=124ahelp hid=svt/ui/querydeletedialog/yes visibility=hiddenClick to delete the file with the name shown in this dialog./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/svt/ui/querydeletedialog/no id=bm_id3150822 localize=false/ +paragraph xml-lang=en-US id=par_id3161458 role=paragraph l10n=U oldref=125ahelp hid=svt/ui/querydeletedialog/no visibility=hiddenClick to cancel deletion of the file with the name shown in this dialog./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/svt/ui/querydeletedialog/all id=bm_id3154346 localize=false/ +paragraph xml-lang=en-US id=par_id3147531 role=paragraph l10n=U oldref=126ahelp hid=svt/ui/querydeletedialog/all visibility=hiddenClick to delete all selected files./ahelp/paragraph bookmark xml-lang=en-US branch=hid/SFX2_HID_FILEDLG_FOLDER_FILENAME id=bm_id3149656 localize=false/ bookmark xml-lang=en-US branch=hid/FPICKER_HID_FILEDLG_AUTOCOMPLETEBOX id=bm_id3149045 localize=false/ paragraph xml-lang=en-US id=hd_id3154280 role=heading level=2 l10n=U ___ 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 47d01f8a9aedae45e97dca5889b31be3df6b6fd8 Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 27 16:54:34 2013 + Updated core Project: help fb4f27116b49a84dd6463a5feeca40c676c642d2 diff --git a/helpcontent2 b/helpcontent2 index 1a08f80..fb4f271 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1a08f80034749e9f2d8fc94497e3d0cd528afe70 +Subproject commit fb4f27116b49a84dd6463a5feeca40c676c642d2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx |8
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |6 +++---
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 10 +-
3 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 8bdf8dc075928bd0eb3e49ac0f51727c0677dc37
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 27 16:58:11 2013 +
error C2872: 'accessibility' : ambiguous symbol
Change-Id: Ibff922712e25a846bab1628e87d0d322d1ff0a33
Reviewed-on: https://gerrit.libreoffice.org/6836
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
index c710f13..1e9d02e 100644
--- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
+++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
@@ -47,12 +47,12 @@ void
VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi
{
return;
}
-Reference accessibility::XAccessible xDocAcc =
pDocWin-GetAccessible();
+Reference css::accessibility::XAccessible xDocAcc =
pDocWin-GetAccessible();
if ( !xDocAcc.is() )
{
return;
}
-Reference accessibility::XAccessibleGetAccFlowTo xGetAccFlowTo(
xDocAcc, UNO_QUERY );
+Reference css::accessibility::XAccessibleGetAccFlowTo
xGetAccFlowTo( xDocAcc, UNO_QUERY );
if ( !xGetAccFlowTo.is() )
{
return;
@@ -69,11 +69,11 @@ void
VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi
uno::Sequence uno::Reference uno::XInterface aSequence( nLen
);
for ( sal_Int32 i = 0; i nLen; i++ )
{
-uno::Reference accessibility::XAccessible xAcc;
+uno::Reference css::accessibility::XAccessible xAcc;
aAnySeq[i] = xAcc;
aSequence[i] = xAcc;
}
-rRelationSet.AddRelation( accessibility::AccessibleRelation(
accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aSequence ) );
+rRelationSet.AddRelation( css::accessibility::AccessibleRelation(
css::accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aSequence ) );
}
}
}
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 3b0a4ae..38ee6c6 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -172,7 +172,7 @@ uno::Reference XAccessibleRelationSet
SvxPixelCtlAccessible::getAccessibleRel
IsValid();
Window* pWindow = (Window*)pPixelCtl;
utl::AccessibleRelationSetHelper* rRelationSet = new
utl::AccessibleRelationSetHelper;
-uno::Reference accessibility::XAccessibleRelationSet rSet =
rRelationSet;
+uno::Reference css::accessibility::XAccessibleRelationSet rSet =
rRelationSet;
if ( pWindow )
{
Window *pLabeledBy = pWindow-GetAccessibleRelationLabeledBy();
@@ -180,7 +180,7 @@ uno::Reference XAccessibleRelationSet
SvxPixelCtlAccessible::getAccessibleRel
{
uno::Sequence uno::Reference uno::XInterface aSequence(1);
aSequence[0] = pLabeledBy-GetAccessible();
-rRelationSet-AddRelation( accessibility::AccessibleRelation(
accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
+rRelationSet-AddRelation( css::accessibility::AccessibleRelation(
css::accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
}
Window* pMemberOf = pWindow-GetAccessibleRelationMemberOf();
@@ -188,7 +188,7 @@ uno::Reference XAccessibleRelationSet
SvxPixelCtlAccessible::getAccessibleRel
{
uno::Sequence uno::Reference uno::XInterface aSequence(1);
aSequence[0] = pMemberOf-GetAccessible();
-rRelationSet-AddRelation( accessibility::AccessibleRelation(
accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
+rRelationSet-AddRelation( css::accessibility::AccessibleRelation(
css::accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
}
return rSet;
}
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index cda769a..15a2ed0 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -366,7 +366,7 @@ Reference XAccessibleRelationSet SAL_CALL
SvxRectCtlAccessibleContext::getAcc
{
//return Reference XAccessibleRelationSet ();
utl::AccessibleRelationSetHelper* pRelationSetHelper = new
utl::AccessibleRelationSetHelper;
-
[Libreoffice-commits] dev-tools.git: test-bugzilla-files/test-bugzilla-files.py
test-bugzilla-files/test-bugzilla-files.py |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d82bdc09c6956a26929927091238a308a959f440
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Nov 27 18:12:52 2013 +0100
always create a new line for a crashed file
diff --git a/test-bugzilla-files/test-bugzilla-files.py
b/test-bugzilla-files/test-bugzilla-files.py
index 84e282b..862933d 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -308,7 +308,8 @@ def handleCrash(file, disposed):
crashLog = open(crashlog.txt, a)
crashLog.write('Crash:' + file + ' ')
if disposed == 1:
-crashLog.write('through disposed\n')
+crashLog.write('through disposed')
+crashLog.write('\n')
crashLog.close()
#crashed_files.append(file)
# add here the remaining handling code for crashed files
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Reformatting a text document via UNO
Hello, Dne 27.11.2013 13:45, Pavel Laštovička napsal(a): Hi all, is there a way to reformat parts or whole text document e.g. from a Basic macro? Without inserting / changing a text content to force formatting. thanks for replies and I am sorry I was not clear. By formatting I meant the process of building a line from portions, where SwLinePortion::Format() is called for each portion. From my testing this happens when some line portion changes its content (for example typing 1 character) or a user selects print preview. It could be done by inserting some content into a line and then deleting it back but I hope there is a more elegant solution :-) Pavel Laštovička blue.point Solutions spol. s r. o. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: bibisect/bibisect.cfg bibisect/build.sh bibisect/Makefile
bibisect/Makefile |2 -
bibisect/bibisect.cfg |8 ++--
bibisect/build.sh | 90 ++
3 files changed, 24 insertions(+), 76 deletions(-)
New commits:
commit 225ee8fe68d54639742b7e5830daef078b54cd20
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Oct 8 22:07:13 2013 +0200
simplify and update for 4.2 instdir
diff --git a/bibisect/Makefile b/bibisect/Makefile
index e2899bf..2f56d8a 100755
--- a/bibisect/Makefile
+++ b/bibisect/Makefile
@@ -29,7 +29,7 @@
include bibisect.cfg
-BINREPO:=$(WORKDIR)/binrepo
+BINREPO:=/root/binrepo
BUILDDIR:=$(WORKDIR)/build
ARTIFACTDIR:=$(WORKDIR)/artifact
ORDERMODE?=master
diff --git a/bibisect/bibisect.cfg b/bibisect/bibisect.cfg
index fc997a2..abafb8f 100644
--- a/bibisect/bibisect.cfg
+++ b/bibisect/bibisect.cfg
@@ -1,10 +1,10 @@
#FROM:=8450a99c
-FROM:=8450a99c
-TO:=master
+FROM:=cb4e009c4539c535108021934e545194b35cad9d
+TO:=e579d45
INTERVAL:=64
ORDERMODE:=master
-WORKDIR:=$(HOME)/bibisect
-SOURCEREPO:=$(WORKDIR)/source/.git
+WORKDIR:=/run/bibisect
+SOURCEREPO:=/root/core/.git
BUILDSCRIPT:=$(dir $(realpath $(firstword $(MAKEFILE_LIST/build.sh
diff --git a/bibisect/build.sh b/bibisect/build.sh
index c1747e4..e96b255 100755
--- a/bibisect/build.sh
+++ b/bibisect/build.sh
@@ -32,56 +32,10 @@ ARTIFACTDIR=$2
cd ${BUILDDIR}
-
BUILDCOMMIT=`git rev-list -1 HEAD`
-#apply patches between 3c5353256bb94ba99fea94939cf06ba723737c10 and
6a0972ced879259e7f960e7bb852b0e175a05b7a
-if test ! `git merge-base ${BUILDCOMMIT}
6a0972ced879259e7f960e7bb852b0e175a05b7a` =
6a0972ced879259e7f960e7bb852b0e175a05b7a
-then
-if test `git merge-base ${BUILDCOMMIT}
3c5353256bb94ba99fea94939cf06ba723737c10` =
3c5353256bb94ba99fea94939cf06ba723737c10
-then
-echo This is newer than 3c5353256bb94ba99fea94939cf06ba723737c10,
cherrypicking. ${ARTIFACTDIR}/patch.log
-git cherry-pick 6a0972ced879259e7f960e7bb852b0e175a05b7a
${ARTIFACTDIR}/patch.log 21
-git cherry-pick 6963de9536cfca1145685a611a6c88c5160d9a1c
${ARTIFACTDIR}/patch.log 21
-git rm solenv/gbuild/templates/makefile.mk ${ARTIFACTDIR}/patch.log
21
-git commit -C 6963de9536cfca1145685a611a6c88c5160d9a1c
${ARTIFACTDIR}/patch.log 21
-git cherry-pick b1c3e8ae28fcd84c7182f4898c3250e18ed92f1a
${ARTIFACTDIR}/patch.log 21
-git rm tail_build/prj/makefile.mk ${ARTIFACTDIR}/patch.log 21
-git rm solenv/inc/gbuildbridge.mk ${ARTIFACTDIR}/patch.log 21
-git commit -C b1c3e8ae28fcd84c7182f4898c3250e18ed92f1a
${ARTIFACTDIR}/patch.log 21
-git cherry-pick 0bd553e8629104fbc37ac574017519b3f3752cb3
${ARTIFACTDIR}/patch.log 21
-
-if test ! `git merge-base ${BUILDCOMMIT}
f3653d3c1e93a7e92a546b770e418b8cf5c06c54` =
f3653d3c1e93a7e92a546b770e418b8cf5c06c54
-then
-echo This is older than f3653d3c1e93a7e92a546b770e418b8cf5c06c54,
codemaker is still dmake. ${ARTIFACTDIR}/patch.log
-touch codemaker/prj/dmake
-fi
-if test ! `git merge-base ${BUILDCOMMIT}
a57b6347999889bbbcf55e704ac480482fdc5497` =
a57b6347999889bbbcf55e704ac480482fdc5497
-then
-echo This is older than a57b6347999889bbbcf55e704ac480482fdc5497,
unodevtools is still dmake. ${ARTIFACTDIR}/patch.log
-touch unodevtools/prj/dmake
-fi
-if test ! `git merge-base ${BUILDCOMMIT}
bed6580ec330fea6bc7ee015adf1baf6298ed3fb` =
bed6580ec330fea6bc7ee015adf1baf6298ed3fb
-then
-echo This is older than bed6580ec330fea6bc7ee015adf1baf6298ed3fb,
idlc is still dmake. ${ARTIFACTDIR}/patch.log
-touch idlc/prj/dmake
-fi
-if test ! `git merge-base ${BUILDCOMMIT}
5342bc073b6dff059f9e60ad5fea6905752f0f9c` =
5342bc073b6dff059f9e60ad5fea6905752f0f9c
-then
-echo This is older than 5342bc073b6dff059f9e60ad5fea6905752f0f9c,
cpputools is still dmake. ${ARTIFACTDIR}/patch.log
-touch cpputools/prj/dmake
-fi
-if test ! `git merge-base ${BUILDCOMMIT}
f55eed29c68205f69dd263f8a9657ac407a73ee3` =
f55eed29c68205f69dd263f8a9657ac407a73ee3
-then
-echo This is older than f55eed29c68205f69dd263f8a9657ac407a73ee3,
rdbmaker is still dmake. ${ARTIFACTDIR}/patch.log
-touch rdbmaker/prj/dmake
-fi
-fi
-fi
-
cat EOF autogen.lastrun
--disable-dependency-tracking
---disable-linkoo
--disable-option-checking
--without-junit
--without-help
@@ -95,43 +49,37 @@ EOF
export CCACHE_DIR=`readlink -f /root/ccache`
export CCACHE_BASEDIR=`readlink -f .`
-#export CCACHE_PREFIX=distcc
-#export DISTCC_HOSTS=localhost/8 192.168.0.103/8 192.168.0.98/16
unset DISPLAY
ccache -M 8G
-# delete outdated cache to keep the cache small (and in RAM)
-#find ${CCACHE_DIR} -mmin +120 -type f -delete
./autogen.sh ${ARTIFACTDIR}/autogen.log 21
git log -1 --pretty=format:source-hash-%H%n%n $BUILDCOMMIT
${ARTIFACTDIR}/commitmsg
git log -1 --pretty=fuller $BUILDCOMMIT ${ARTIFACTDIR}/commitmsg
make ${ARTIFACTDIR}/make.log 21
echo second try:
Re: Lao / Thai / Khmer Bundled Fonts
On Wed, Nov 27, 2013 at 6:48 PM, Khaled Hosny khaledho...@eglug.org wrote: On Wed, Nov 27, 2013 at 06:34:59PM +0700, Robert M Campbell wrote: On Wed, Nov 27, 2013 at 5:25 PM, Khaled Hosny khaledho...@eglug.org wrote: My hope is to not add more than a few KB per font, if at all possible. Font language support shouldn't be 'include 9 million glyphs of various artistic types and what-not'. We just need basic support for Thai, Khmer, and Lao, so the simpler / smaller, the better. If they want some other font, they should install it IMHO. Hopefully, someday, there'll be a nice all language font that isn't too big. Until then... Another Q - where exactly am I patching? When I helped with the ICU update, a archive was added to the web server and the download.list was used. In that case, the only patch would be for the download.list. Or, should we have a font contribution subfolder/submodule that contains each font in the master that contains all of the embedded fonts? That way in review process, people can look at the font and determine if it's a good idea to add and is open and etc... Check external/more_fonts/* Regards, Khaled I created these files, but still will need someone to upload the files to the web folder... Check out https://bugs.freedesktop.org/show_bug.cgi?id=72079 I'll commit to gerrit once they are online (so I point to the right url in the download.lst)... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Lao / Thai / Khmer Bundled Fonts
Also, I wonder if these languages should set these fonts as the default? If so, can make that change as well... -- Respectfully, *Robert M Campbell* IT Specialist for ADRA Laos Open Source Advocate Lao Cell: +856 207 616 7299 US Phone: +1 270 681 0399 robert.rcampb...@gmail.com Visit ADRA Lao's Facebook Page at facebook.com/ADRALaos On Thu, Nov 28, 2013 at 12:51 AM, Robert M Campbell robert.rcampb...@gmail.com wrote: On Wed, Nov 27, 2013 at 6:48 PM, Khaled Hosny khaledho...@eglug.orgwrote: On Wed, Nov 27, 2013 at 06:34:59PM +0700, Robert M Campbell wrote: On Wed, Nov 27, 2013 at 5:25 PM, Khaled Hosny khaledho...@eglug.org wrote: My hope is to not add more than a few KB per font, if at all possible. Font language support shouldn't be 'include 9 million glyphs of various artistic types and what-not'. We just need basic support for Thai, Khmer, and Lao, so the simpler / smaller, the better. If they want some other font, they should install it IMHO. Hopefully, someday, there'll be a nice all language font that isn't too big. Until then... Another Q - where exactly am I patching? When I helped with the ICU update, a archive was added to the web server and the download.list was used. In that case, the only patch would be for the download.list. Or, should we have a font contribution subfolder/submodule that contains each font in the master that contains all of the embedded fonts? That way in review process, people can look at the font and determine if it's a good idea to add and is open and etc... Check external/more_fonts/* Regards, Khaled I created these files, but still will need someone to upload the files to the web folder... Check out https://bugs.freedesktop.org/show_bug.cgi?id=72079 I'll commit to gerrit once they are online (so I point to the right url in the download.lst)... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/Library_scfilt.mk sc/source
sc/Library_scfilt.mk |1
sc/source/filter/inc/sheetdatacontext.hxx | 11 +
sc/source/filter/oox/sheetdatacontext.cxx |6
sc/source/filter/oox/threadpool.cxx | 162 ++
sc/source/filter/oox/threadpool.hxx | 53 +++
sc/source/filter/oox/workbookfragment.cxx | 212 +++---
6 files changed, 285 insertions(+), 160 deletions(-)
New commits:
commit 0710299634a2276749c36ed86a5a60a20d63073f
Author: Michael Meeks michael.me...@collabora.com
Date: Wed Nov 27 18:11:34 2013 +
sc: threaded parsing of the core data inside large XLSX files
Enabled in experimental mode only or via SC_IMPORT_THREADS=N this
allows significant parallelisation of sheet reading. I also implement
a simple thread pool to manage that.
Change-Id: I66c72211f2699490230e993a374c26b1892eac12
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 499f873..eb0d5d2 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -211,6 +211,7 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/oox/tablebuffer \
sc/source/filter/oox/tablefragment \
sc/source/filter/oox/themebuffer \
+ sc/source/filter/oox/threadpool \
sc/source/filter/oox/unitconverter \
sc/source/filter/oox/viewsettings \
sc/source/filter/oox/workbookfragment \
diff --git a/sc/source/filter/inc/sheetdatacontext.hxx
b/sc/source/filter/inc/sheetdatacontext.hxx
index b492d2a..3f3e377 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -23,6 +23,9 @@
#include excelhandlers.hxx
#include richstring.hxx
#include sheetdatabuffer.hxx
+#include vcl/svapp.hxx
+
+#define MULTI_THREAD_SHEET_PARSING 1
namespace oox {
namespace xls {
@@ -54,8 +57,16 @@ struct SheetDataContextBase
*/
class SheetDataContext : public WorksheetContextBase, private
SheetDataContextBase
{
+// If we are doing threaded parsing, this SheetDataContext
+// forms the inner loop for bulk data parsing, and for the
+// duration of this we can drop the solar mutex.
+#if MULTI_THREAD_SHEET_PARSING
+SolarMutexReleaser aReleaser;
+#endif
+
public:
explicitSheetDataContext( WorksheetFragmentBase rFragment );
+virtual~SheetDataContext();
protected:
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32
nElement, const AttributeList rAttribs );
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx
b/sc/source/filter/oox/sheetdatacontext.cxx
index 5170234..9a0f7df 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -90,6 +90,12 @@ SheetDataContext::SheetDataContext( WorksheetFragmentBase
rFragment ) :
mnRow( -1 ),
mnCol( -1 )
{
+SAL_INFO( sc.filter, start safe sheet data context - unlock\n );
+}
+
+SheetDataContext::~SheetDataContext()
+{
+SAL_INFO( sc.filter, end safe sheet data context - relock\n );
}
ContextHandlerRef SheetDataContext::onCreateContext( sal_Int32 nElement, const
AttributeList rAttribs )
diff --git a/sc/source/filter/oox/threadpool.cxx
b/sc/source/filter/oox/threadpool.cxx
new file mode 100644
index 000..9de1a14
--- /dev/null
+++ b/sc/source/filter/oox/threadpool.cxx
@@ -0,0 +1,162 @@
+/* -*- 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/.
+ */
+
+#include threadpool.hxx
+
+class ThreadPool::ThreadWorker : public salhelper::Thread
+{
+ThreadPool*mpPool;
+osl::Condition maNewWork;
+public:
+ThreadWorker( ThreadPool *pPool ) :
+salhelper::Thread(sheet-import-thread-pool),
+mpPool( pPool ) {}
+
+virtual void execute()
+{
+ThreadTask *pTask;
+while ( ( pTask = waitForWork() ) )
+{
+pTask-doWork();
+delete pTask;
+}
+}
+
+ThreadTask *waitForWork()
+{
+ThreadTask *pRet = NULL;
+
+osl::ResettableMutexGuard aGuard( mpPool-maGuard );
+
+pRet = mpPool-popWork();
+
+while( !pRet )
+{
+maNewWork.reset();
+
+if( mpPool-mbTerminate )
+break;
+
+aGuard.clear(); // unlock
+
+maNewWork.wait();
+
+aGuard.reset(); // lock
+
+pRet = mpPool-popWork();
+}
+
+return pRet;
+}
+
+//
+// Why a condition per worker thread - you may ask.
+//
+// Unfortunately the Windows synchronisation API that we wrap
+// is horribly inadequate cf.
+//http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
+// The existing osl::Condition API should only ever be used
+
[Libreoffice-commits] core.git: starmath/uiconfig
starmath/uiconfig/smath/ui/smathsettings.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b294ca2c404409a7e35f1025fcfd7e2aaf9b5fb2 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Nov 27 20:25:04 2013 +0100 no need to escape tilde in glade dialogs Change-Id: I7a7c059c7a6925204aeef19c3640d9ffbff4e6de diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui b/starmath/uiconfig/smath/ui/smathsettings.ui index f567673..1b983c2 100644 --- a/starmath/uiconfig/smath/ui/smathsettings.ui +++ b/starmath/uiconfig/smath/ui/smathsettings.ui @@ -239,7 +239,7 @@ property name=spacing6/property child object class=GtkCheckButton id=norightspaces -property name=label translatable=yesIg_nore _~ and ` at the end of the line/property +property name=label translatable=yesIg_nore ~ and ` at the end of the line/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/uiconfig
starmath/uiconfig/smath/ui/smathsettings.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 85da677fa06c9b915bcc415b2e95d87a6cbeb750 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Nov 27 20:25:04 2013 +0100 no need to escape tilde in glade dialogs Change-Id: I7a7c059c7a6925204aeef19c3640d9ffbff4e6de diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui b/starmath/uiconfig/smath/ui/smathsettings.ui index f567673..1b983c2 100644 --- a/starmath/uiconfig/smath/ui/smathsettings.ui +++ b/starmath/uiconfig/smath/ui/smathsettings.ui @@ -239,7 +239,7 @@ property name=spacing6/property child object class=GtkCheckButton id=norightspaces -property name=label translatable=yesIg_nore _~ and ` at the end of the line/property +property name=label translatable=yesIg_nore ~ and ` at the end of the line/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/grouptokenconverter.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 88df79be2f4b3e4af36fc51dbcdaa30ddc652674
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 27 14:05:45 2013 -0500
We shouldn't check isValid() here.
When the referenced range consists of entirely empty cells, we get
an empty array, which is correct, but an empty array returns false when
calling isValid(), which is not correct. After some thought, it's best
not to check for isValid() here.
Change-Id: I50dcea4f2b55d5f5c6f1226cca4106ddcad62145
diff --git a/sc/source/core/data/grouptokenconverter.cxx
b/sc/source/core/data/grouptokenconverter.cxx
index 55b2709..b295fee 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -116,9 +116,9 @@ bool ScGroupTokenConverter::convert(ScTokenArray rCode)
// returned array equals or greater than the requested
// length.
-formula::VectorRefArray aArray =
mrDoc.FetchVectorRefArray(aRefPos, nLen);
-if (!aArray.isValid())
-return false;
+formula::VectorRefArray aArray;
+if (nLen)
+aArray = mrDoc.FetchVectorRefArray(aRefPos, nLen);
formula::SingleVectorRefToken aTok(aArray, nLen);
mrGroupTokens.AddToken(aTok);
@@ -184,9 +184,9 @@ bool ScGroupTokenConverter::convert(ScTokenArray rCode)
for (SCCOL i = aAbs.aStart.Col(); i = aAbs.aEnd.Col(); ++i)
{
aRefPos.SetCol(i);
-formula::VectorRefArray aArray =
mrDoc.FetchVectorRefArray(aRefPos, nArrayLength);
-if (!aArray.isValid())
-return false;
+formula::VectorRefArray aArray;
+if (nArrayLength)
+aArray = mrDoc.FetchVectorRefArray(aRefPos,
nArrayLength);
aArrays.push_back(aArray);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/grouptokenconverter.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 56805bab63f30496c7f13a0e88c2b265044cad30
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 27 14:05:45 2013 -0500
We shouldn't check isValid() here.
When the referenced range consists of entirely empty cells, we get
an empty array, which is correct, but an empty array returns false when
calling isValid(), which is not correct. After some thought, it's best
not to check for isValid() here.
Change-Id: I50dcea4f2b55d5f5c6f1226cca4106ddcad62145
diff --git a/sc/source/core/data/grouptokenconverter.cxx
b/sc/source/core/data/grouptokenconverter.cxx
index 55b2709..b295fee 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -116,9 +116,9 @@ bool ScGroupTokenConverter::convert(ScTokenArray rCode)
// returned array equals or greater than the requested
// length.
-formula::VectorRefArray aArray =
mrDoc.FetchVectorRefArray(aRefPos, nLen);
-if (!aArray.isValid())
-return false;
+formula::VectorRefArray aArray;
+if (nLen)
+aArray = mrDoc.FetchVectorRefArray(aRefPos, nLen);
formula::SingleVectorRefToken aTok(aArray, nLen);
mrGroupTokens.AddToken(aTok);
@@ -184,9 +184,9 @@ bool ScGroupTokenConverter::convert(ScTokenArray rCode)
for (SCCOL i = aAbs.aStart.Col(); i = aAbs.aEnd.Col(); ++i)
{
aRefPos.SetCol(i);
-formula::VectorRefArray aArray =
mrDoc.FetchVectorRefArray(aRefPos, nArrayLength);
-if (!aArray.isValid())
-return false;
+formula::VectorRefArray aArray;
+if (nArrayLength)
+aArray = mrDoc.FetchVectorRefArray(aRefPos,
nArrayLength);
aArrays.push_back(aArray);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/svtools sc/source
dbaccess/source/ui/app/AppControllerDnD.cxx |2 +-
include/svtools/fileview.hxx|1 +
sc/source/filter/oox/threadpool.cxx |6 +-
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit dfe593b30a1fafeb3deeb51753b5cac25cbcd4b0
Author: Michael Stahl mst...@redhat.com
Date: Wed Nov 27 20:50:44 2013 +0100
sc: no such thing as std::vector::find
Change-Id: I11bb688a8e0affda9ed78a61d9aba3d244914f8c
diff --git a/sc/source/filter/oox/threadpool.cxx
b/sc/source/filter/oox/threadpool.cxx
index 9de1a14..8349661 100644
--- a/sc/source/filter/oox/threadpool.cxx
+++ b/sc/source/filter/oox/threadpool.cxx
@@ -9,6 +9,9 @@
#include threadpool.hxx
+#include algorithm
+
+
class ThreadPool::ThreadWorker : public salhelper::Thread
{
ThreadPool*mpPool;
@@ -102,7 +105,8 @@ void ThreadPool::waitUntilWorkersDone()
{
rtl::Reference ThreadWorker xWorker = maWorkers.back();
maWorkers.pop_back();
-assert( maWorkers.find( xWorker ) == maWorkers.end() );
+assert(std::find(maWorkers.begin(), maWorkers.end(), xWorker)
+== maWorkers.end());
xWorker-signalNewWork();
aGuard.clear();
{ // unlocked
commit a74b3e89c9b853338506249b0fac8d5f54909de7
Author: Michael Stahl mst...@redhat.com
Date: Wed Nov 27 20:47:18 2013 +0100
QueryDeleteDlg_Impl: add GetResult() that was removed in ...
02d4eb7438a83982b2602ea1d83d5accb1fe11f6
Change-Id: I45b5691a3dc4cf2444e0daf8cb2ae0134532f596
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx
b/dbaccess/source/ui/app/AppControllerDnD.cxx
index b712ca6..906e341 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -219,7 +219,7 @@ void OApplicationController::deleteObjects( ElementType
_eType, const ::std::vec
aDlg.EnableAllButton();
if ( aDlg.Execute() == RET_OK )
-eResult = aDlg.GetResult();
+eResult = aDlg.GetQueryDeleteResult();
else
return;
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 8b90816..6135385 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -240,6 +240,7 @@ public:
QueryDeleteDlg_Impl( Window* pParent,
const OUString rName );
+QueryDeleteResult_Impl GetQueryDeleteResult() const { return m_eResult; }
voidEnableAllButton() { m_pAllButton-Enable(true); }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 40469] Modifed Frame Style Options Not Preserved, Keep Ratio Option Unavailable
https://bugs.freedesktop.org/show_bug.cgi?id=40469 --- Comment #9 from Julien Nabet serval2...@yahoo.fr --- I tried 2 leads: 1) is it normal bFormat = sal_True and gdb session gave me this: #0 SwFrmPage::SetFormatUsed (this=0x1cb36f0, bFmt=1 '\001') at /home/julien/compile-libreoffice/libo/sw/source/ui/frmdlg/frmpage.cxx:2319 #1 0x2aaad88ac24a in SwTemplateDlg::PageCreated (this=0x1fa0c30, nId=2, rPage=...) at /home/julien/compile-libreoffice/libo/sw/source/ui/fmtui/tmpdlg.cxx:437 #2 0x2d9a192c in SfxTabDialog::ActivatePageHdl (this=0x1fa0c30, pTabCtrl=0x1c97100) at /home/julien/compile-libreoffice/libo/sfx2/source/dialog/tabdlg.cxx:1324 #3 0x2d99fbfb in SfxTabDialog::Start_Impl (this=0x1fa0c30) at /home/julien/compile-libreoffice/libo/sfx2/source/dialog/tabdlg.cxx:747 #4 0x2d99f7d0 in SfxTabDialog::Execute (this=0x1fa0c30) at /home/julien/compile-libreoffice/libo/sfx2/source/dialog/tabdlg.cxx:678 #5 0x2aaad8824cad in AbstractTabDialog_Impl::Execute (this=0x18a8cb0) at /home/julien/compile-libreoffice/libo/sw/source/ui/dialog/swdlgfact.cxx:103 #6 0x2aaac947834c in SwDocShell::Edit (this=0x15f39f0, rName=Frame, rParent=, nFamily=4, nMask=0, bNew=0 '\000', sPage=, pActShell=0x0, bBasic=0 '\000') at /home/julien/compile-libreoffice/libo/sw/source/ui/app/docst.cxx:749 2) if it's normal that ratio is disabled if bFormat = true git history shows it's been like this since the initial import (in 2000) I don't know what to conclude with all this however. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/AllLangResTarget_sc.mk |1
sc/UIConfig_scalc.mk|1
sc/source/ui/condformat/colorformat.cxx | 141 --
sc/source/ui/inc/colorformat.hrc| 36 --
sc/source/ui/inc/colorformat.hxx| 35 --
sc/source/ui/src/colorformat.src| 160
sc/uiconfig/scalc/ui/databaroptions.ui | 417
7 files changed, 493 insertions(+), 298 deletions(-)
New commits:
commit d933a10c744adde8566f1e5db24760be03979828
Author: Katarina Behrens bu...@bubli.org
Date: Wed Nov 27 22:54:49 2013 +0100
Converted data bar options dialog to .ui
all right this time
Change-Id: I9168df3cd83cfa910e4a189b5330a28ad85773ac
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 274c08a..abeb023 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/scstring.src \
sc/source/ui/src/sortdlg.src \
sc/source/ui/src/filter.src \
-sc/source/ui/src/colorformat.src \
sc/source/ui/src/condformatdlg.src \
sc/source/ui/src/condformatmgr.src \
sc/source/ui/src/xmlsourcedlg.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 23c4972..1d68b97 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
sc/uiconfig/scalc/toolbar/basicshapes \
sc/uiconfig/scalc/toolbar/calloutshapes \
sc/uiconfig/scalc/toolbar/colorbar \
+ sc/uiconfig/scalc/toolbar/databaroptions \
sc/uiconfig/scalc/toolbar/datastreams \
sc/uiconfig/scalc/toolbar/drawbar \
sc/uiconfig/scalc/toolbar/drawobjectbar \
diff --git a/sc/source/ui/condformat/colorformat.cxx
b/sc/source/ui/condformat/colorformat.cxx
index 9c8e57e..b126174 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -10,8 +10,8 @@
#include colorformat.hxx
#include colorscale.hxx
-#include colorformat.hrc
#include document.hxx
+#include sc.hrc
#include svx/xtable.hxx
#include svx/drawitem.hxx
@@ -61,55 +61,47 @@ void SetValue( ScColorScaleEntry* pEntry, Edit aEdit)
}
ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, const
ScDataBarFormatData rData, ScDocument* pDoc, const ScAddress rPos):
-ModalDialog( pWindow, ScResId( RID_SCDLG_DATABAR ) ),
-maBtnOk( this, ScResId( BTN_OK ) ),
-maBtnCancel( this, ScResId( BTN_CANCEL ) ),
-maFlBarColors( this, ScResId( FL_BAR_COLORS ) ),
-maFlAxes( this, ScResId( FL_AXIS ) ),
-maFlValues( this, ScResId( FL_VALUES ) ),
-maFtMin( this, ScResId( FT_MINIMUM ) ),
-maFtMax( this, ScResId( FT_MAXIMUM ) ),
-maFtPositive( this, ScResId( FT_POSITIVE ) ),
-maFtNegative( this, ScResId( FT_NEGATIVE ) ),
-maFtPosition( this, ScResId( FT_POSITION ) ),
-maFtAxisColor( this, ScResId( FT_COLOR_AXIS ) ),
-maLbPos( this, ScResId( LB_POS ) ),
-maLbNeg( this, ScResId( LB_NEG ) ),
-maLbAxisCol( this, ScResId( LB_COL_AXIS ) ),
-maLbTypeMin( this, ScResId( LB_TYPE ) ),
-maLbTypeMax( this, ScResId( LB_TYPE ) ),
-maLbAxisPos( this, ScResId( LB_AXIS_POSITION ) ),
-maEdMin( this, ScResId( ED_MIN ) ),
-maEdMax( this, ScResId( ED_MAX ) ),
-maStrWarnSameValue( SC_RESSTR( STR_WARN_SAME_VALUE ) ),
+ModalDialog( pWindow, DataBarOptions,
modules/scalc/ui/databaroptions.ui ),
mpNumberFormatter( pDoc-GetFormatTable() ),
mpDoc(pDoc),
maPos(rPos)
{
+get( mpBtnOk, ok);
+get( mpBtnCancel, cancel );
+get( mpLbPos, positive_colour );
+get( mpLbNeg, negative_colour );
+get( mpLbTypeMin, min );
+get( mpLbTypeMax, max );
+get( mpLbAxisPos, axis_pos );
+get( mpLbAxisCol, axis_colour );
+get( mpEdMin, min_value );
+get( mpEdMax, max_value );
+
+maStrWarnSameValue = getFixedText(str_same_value)-GetText();
+
Init();
-FreeResource();
-maLbPos.SelectEntry( rData.maPositiveColor );
+mpLbPos-SelectEntry( rData.maPositiveColor );
if(rData.mpNegativeColor)
-maLbNeg.SelectEntry( *rData.mpNegativeColor );
+mpLbNeg-SelectEntry( *rData.mpNegativeColor );
switch (rData.meAxisPosition)
{
case databar::NONE:
-maLbAxisPos.SelectEntryPos(2);
+mpLbAxisPos-SelectEntryPos(2);
break;
case databar::AUTOMATIC:
-maLbAxisPos.SelectEntryPos(0);
+mpLbAxisPos-SelectEntryPos(0);
break;
case databar::MIDDLE:
-maLbAxisPos.SelectEntryPos(1);
+mpLbAxisPos-SelectEntryPos(1);
break;
}
-::SetType(rData.mpLowerLimit.get(), maLbTypeMin);
-::SetType(rData.mpUpperLimit.get(), maLbTypeMax);
-SetValue(rData.mpLowerLimit.get(), maEdMin);
-SetValue(rData.mpUpperLimit.get(), maEdMax);
-
[Libreoffice-commits] core.git: sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a9e7f34c83101c7a3f478ae6d8c487f0ea1c9bfd Author: Katarina Behrens bu...@bubli.org Date: Wed Nov 27 23:45:54 2013 +0100 Unbreak the build Change-Id: I75dcedfb8fb8b294326898713e7220080d429342 diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 1d68b97..2d8859b 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -29,7 +29,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\ sc/uiconfig/scalc/toolbar/basicshapes \ sc/uiconfig/scalc/toolbar/calloutshapes \ sc/uiconfig/scalc/toolbar/colorbar \ - sc/uiconfig/scalc/toolbar/databaroptions \ sc/uiconfig/scalc/toolbar/datastreams \ sc/uiconfig/scalc/toolbar/drawbar \ sc/uiconfig/scalc/toolbar/drawobjectbar \ @@ -69,6 +68,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/correlationdialog \ sc/uiconfig/scalc/ui/covariancedialog \ sc/uiconfig/scalc/ui/createnamesdialog \ + sc/uiconfig/scalc/ui/databaroptions \ sc/uiconfig/scalc/ui/dataform \ sc/uiconfig/scalc/ui/datastreams \ sc/uiconfig/scalc/ui/definedatabaserangedialog \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
