Document colors

[Hillar Liiv]

Hi,
I am looging for developer who is willing to help improve color palette. To
make better palette for Libreoffice we need first to make sure that colors
from older palette are accessable when needed. That for we thought about
document colors (colors in use). The document colors are colors that are
used somewhere in document but are not in palette. Currently if there is
some custom color used in document then there is no way to reuse it in
document which is kind of absurd.

Idea is to scan document if there is some color in use and then show it in
some section of palette.

[1] https://wiki.documentfoundation.org/Design/Whiteboards/Color_Handling
[2]
https://wiki.documentfoundation.org/Design/Whiteboards/Color_Handling#Colors_in_Use

If you are willing to implement it please contact.

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

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

[Stephan Bergmann]

 desktop/source/deployment/manager/dp_manager.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 8bf2052de8516a76926b7885621ec001616018fc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Nov 5 09:31:29 2013 +0100

Improve debug output

Change-Id: Ia09e61a37bc485509c604df9279275003050d916

diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index bc286bf..72b3413 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1363,6 +1363,8 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
 url, OUString(), false, OUString(), xCmdEnv );
 if (xPackage.is())
 {
+OUString id = dp_misc::getIdentifier( xPackage );
+
 //Prepare the database entry
 ActivePackages::Data dbData;
 
@@ -1373,11 +1375,10 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
 dbData.fileName = title;
 dbData.mediaType = 
xPackage-getPackageType()-getMediaType();
 dbData.version = xPackage-getVersion();
-OSL_ENSURE(!dbData.version.isEmpty(),
-   Extension Manager: bundled and shared 
extensions must have 
-   an identifier and a version);
-
-OUString id = dp_misc::getIdentifier( xPackage );
+SAL_WARN_IF(
+dbData.version.isEmpty(), desktop.deployment,
+bundled/shared extension   id   at   url
+  has no explicit version);
 
 //We provide a special command environment that will 
prevent
 //showing a license if simple-licens/@accept-by = admin
___
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' - sfx2/Library_sfx.mk

[Andras Timar]

 sfx2/Library_sfx.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 84a975f492d98f67ac8cd386641e5e1d3db158b9
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 5 09:52:20 2013 +0100

sfx2 uses svx/svxerr.hxx

Change-Id: I41a81921333b6c6797f92fc2f7855f3b3609e808

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 28e8ab66..3055d0f 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -20,6 +20,7 @@
 $(eval $(call gb_Library_Library,sfx))
 
 $(eval $(call gb_Library_use_packages,sfx,\
+svx_inc \
 sfx2_inc \
 sfx2_sdi \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65108] Clean-up header includes (global/local)

[bugzilla-daemon]

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

--- Comment #10 from Thomas Arnhold thomas-l...@arnhold.org ---
What's actually the conses about this?

-- 
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: configure.ac

[Tor Lillqvist]

 configure.ac |4 
 1 file changed, 4 insertions(+)

New commits:
commit 05a4ca26a66fbcce879a313e827863c0267cb7c8
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Nov 5 10:49:25 2013 +0200

We don't build NSS for iOS and Android

Change-Id: Ice999350f91f6cde82d6a55e9ca470378d41c61f

diff --git a/configure.ac b/configure.ac
index 1c569af..3a398e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8784,6 +8784,10 @@ nss - Mozilla's Network Security Services (NSS)
 ])
 ;;
 esac
+elif test $_os = iOS -o $_os = Android; then
+# We don't build NSS for iOS and Android
+AC_DEFINE(USE_TLS_OPENSSL)
+TLS=OPENSSL
 else
 # default to using NSS, it results in smaller oox lib
 AC_DEFINE(USE_TLS_NSS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 71246] [EasyHack] Run fixincludeguards.sh and fix include guards

[bugzilla-daemon]

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

Thomas Arnhold thomas-l...@arnhold.org changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Whiteboard||EasyHack DifficultyBeginner
   ||TopicCleanup
 CC||libreoffice@lists.freedeskt
   ||op.org
 Ever confirmed|0   |1

--- Comment #1 from Thomas Arnhold thomas-l...@arnhold.org ---
The script is located at bin/fixincludeguards.sh.

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

[Bug 71246] [EasyHack] Run fixincludeguards.sh and fix include guards

[bugzilla-daemon]

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

Thomas Arnhold thomas-l...@arnhold.org changed:

   What|Removed |Added

   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=68849

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

[Bug 68849] Other: Add header guards to all include files

[bugzilla-daemon]

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

Thomas Arnhold thomas-l...@arnhold.org changed:

   What|Removed |Added

   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=71246

-- 
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 'distro/collabora/cp-4.0' - dictionaries

[Andras Timar]

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

New commits:
commit a1af7dc1cb1c9ff9167256c0b9695fbc345f0df5
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Oct 10 09:22:36 2013 +0200

Updated core
Project: dictionaries  f6f1541bb637008a373ca9de9d4402920ace1650

diff --git a/dictionaries b/dictionaries
index b4f6881..f6f1541 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b4f6881beba5ad08eee1be27020351d8b92396f9
+Subproject commit f6f1541bb637008a373ca9de9d4402920ace1650
___
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' - helpcontent2

[Andras Timar]

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

New commits:
commit cca1f43614617af374d82700c373e3f4e782f5e1
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 09:43:04 2013 +0200

Updated core
Project: help  5c5dd57b54e3107b3069dc8f82df74df63d13555

diff --git a/helpcontent2 b/helpcontent2
index b182589..5c5dd57 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b182589dc00d4890dadb8a6c8d4d1901847fb0bf
+Subproject commit 5c5dd57b54e3107b3069dc8f82df74df63d13555
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'distro/collabora/cp-4.0' - 8 commits - help-to-wiki.py source/text to-wiki/getalltitles.py to-wiki/wikiconv2.py upload-wiki.pl

[Andras Timar]

 help-to-wiki.py   |   10 ++
 source/text/shared/guide/redlining_navigation.xhp |2 --
 to-wiki/getalltitles.py   |2 +-
 to-wiki/wikiconv2.py  |7 ---
 upload-wiki.pl|1 +
 5 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 5c5dd57b54e3107b3069dc8f82df74df63d13555
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 09:43:04 2013 +0200

Hardcode 4.0 version - it will be available as help.libreoffice.org/4.0

Change-Id: Icaa20b41c8582b7057ebeb3d25e6688cf03af41e

diff --git a/help-to-wiki.py b/help-to-wiki.py
index 42aa072..7c5bcce 100755
--- a/help-to-wiki.py
+++ b/help-to-wiki.py
@@ -49,6 +49,7 @@ def create_wiki_dirs():
]
 
 try:
+os.mkdir( wiki )
 os.mkdir( wiki/4.0 )
 except:
 sys.stdout.write( wiki already generated - the wiki/ subdir exists\n 
)
commit 94727de4dacd1180f8f44760f3b7529ff1feade3
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 09:39:36 2013 +0200

Hardcode 4.0 version - it will be available as help.libreoffice.org/4.0

Change-Id: I63fa0615e20debe924404f66d65d86ad41d2d2e1

diff --git a/help-to-wiki.py b/help-to-wiki.py
index 19d58ed..42aa072 100755
--- a/help-to-wiki.py
+++ b/help-to-wiki.py
@@ -49,14 +49,14 @@ def create_wiki_dirs():
]
 
 try:
-os.mkdir( wiki )
+os.mkdir( wiki/4.0 )
 except:
 sys.stdout.write( wiki already generated - the wiki/ subdir exists\n 
)
 sys.exit( 1 )
 
 for i in dirs:
 try:
-os.mkdir( wiki/ + i )
+os.mkdir( wiki/4.0 + i )
 except:
 pass
 
diff --git a/to-wiki/getalltitles.py b/to-wiki/getalltitles.py
index 8db9bcb..8ec6a89 100755
--- a/to-wiki/getalltitles.py
+++ b/to-wiki/getalltitles.py
@@ -130,7 +130,7 @@ def parsexhp(filename):
 title = tp.get_title()
 if len(title)  0:
 readable_title = readable_text(title)
-title = module + '/' + wiki_text(title)
+title = '4.0' + module + '/' + wiki_text(title)
 title = title.replace(' ', '_')
 title = title.replace('___', '_')
 title = title.replace('__', '_')
commit 7ce1a40e82bea15cfb47644c457e6b6a6a4e0306
Author: Andras Timar ati...@suse.com
Date:   Fri May 10 14:18:19 2013 +0200

fdo#64205 escape '' in help text with nowiki tag

Change-Id: I07fed20194bcb4223c1070866fd147388da57ba9
Reviewed-on: https://gerrit.libreoffice.org/3845
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 00d43d2..fb19eae 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -129,7 +129,8 @@ replace_text_list = \
 [[$[officename], {{ProductName}}],
  [%PRODUCTNAME, {{ProductName}}],
  [$PRODUCTNAME, {{ProductName}}],
- [font size, u\u200dfont size]
+ [font size, u\u200dfont size],
+ ['',nowiki''/nowiki]
 ]
 
 def get_link_filename(link, name):
commit ec760d0ab5cc2237e01e6a1d15a7cca49fafa3e3
Author: Andras Timar ati...@suse.com
Date:   Tue May 7 14:49:56 2013 +0200

fdo#64211 replace / to %2F in HIDs for wiki redirects

Change-Id: I93780b76e17a3b833ef4ee6a50bb0969ab8bb01c
Reviewed-on: https://gerrit.libreoffice.org/3811
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz

diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 0e3bb5b..00d43d2 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -457,7 +457,7 @@ class Bookmark(ElementBase):
 self.app = parser.current_app_raw
 self.target = parser.wiki_page_name
 self.authoritative = parser.follow_embed
-self.redirect = name
+self.redirect = name.replace(/, %2F)
 
 def get_all(self):
 global redirects
@@ -1359,7 +1359,7 @@ def write_link(r, target):
 def write_redirects():
 print 'Generating the redirects...'
 written = {}
-# in the first pass, immediately writte the links that are embedded, so 
that
+# in the first pass, immediately write the links that are embedded, so that
 # we can always point to that source versions
 for redir in redirects:
 app = redir[0]
diff --git a/upload-wiki.pl b/upload-wiki.pl
index 1337900..13e2bc6 100755
--- a/upload-wiki.pl
+++ b/upload-wiki.pl
@@ -120,6 +120,7 @@ sub upload_article {
 my $pagename = $File::Find::name;
 $pagename =~ s/^wiki\///;
 $pagename =~ s/\/MAIN$//;
+$pagename =~ s/%2F/\//g;
 
 # pages starting with lowercase 's' are redirects
 if ( $pagename =~ /^s/ ) {
commit 9bef603e2ea8837b33a690bf4f36873f727d71d6
Author: Andras Timar ati...@suse.com
Date:   Mon Apr 8 12:15:34 2013 +0200

another typo

Change-Id: I33f3114581328b5d2b343a486f4b9067fd00540e

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - translations

[Christian Lohmaier]

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

New commits:
commit fc58cfad2a549251b9c8aeeb66bf696cebd1f48b
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Tue Oct 1 17:44:19 2013 +0200

Updated core
Project: translations  943991a25acc0aa97052df0e0f93ce9b16627b67

diff --git a/translations b/translations
index 7454e79..943991a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 7454e7931a2a2e27c11c1665c243ee4a4416868a
+Subproject commit 943991a25acc0aa97052df0e0f93ce9b16627b67
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Lionel Elie Mamane]

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

New commits:
commit 8dd06175e3720562c16afe123d56bffdd85c4b8d
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:08:25 2013 +0100

Updated core
Project: help  5e583229241ba0d1b5de8567645f45bde38f081f

diff --git a/helpcontent2 b/helpcontent2
index db8f752..5e58322 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit db8f7521f190f41bc80b783183a9cff5b98f4c16
+Subproject commit 5e583229241ba0d1b5de8567645f45bde38f081f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 4 commits - AllLangHelp_sbasic.mk source/text

[Lionel Elie Mamane]

 AllLangHelp_sbasic.mk  |6 ++
 source/text/sbasic/shared/03030100.xhp |8 +++-
 source/text/sbasic/shared/03030111.xhp |2 +-
 source/text/sbasic/shared/03030112.xhp |4 ++--
 source/text/sbasic/shared/03030113.xhp |2 +-
 source/text/sbasic/shared/03030114.xhp |4 ++--
 source/text/sbasic/shared/03030115.xhp |2 +-
 source/text/sbasic/shared/03030116.xhp |4 ++--
 8 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit 5e583229241ba0d1b5de8567645f45bde38f081f
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:08:25 2013 +0100

fixup examples of CDate(From|To)Uno(Date|Time|DateTime)

Change-Id: I547317d52bf08bcfb0954267e25ce5f2881d1c75

diff --git a/source/text/sbasic/shared/03030112.xhp 
b/source/text/sbasic/shared/03030112.xhp
index 44f83c1..9772106 100644
--- a/source/text/sbasic/shared/03030112.xhp
+++ b/source/text/sbasic/shared/03030112.xhp
@@ -50,7 +50,7 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateFromUnoDate/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  MsgBox(aDatabaseRow.getDate(3))/paragraph
+  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoDate(aDatabaseRow.getDate(3)))/paragraph
   paragraph role=bascode id=par_id3153127 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoDate(aDateControl.Date))/paragraph
   paragraph role=bascode localize=false xml-lang=en-USEnd 
Sub/paragraph
 /bascode
diff --git a/source/text/sbasic/shared/03030114.xhp 
b/source/text/sbasic/shared/03030114.xhp
index 7334a77..c4d780f 100644
--- a/source/text/sbasic/shared/03030114.xhp
+++ b/source/text/sbasic/shared/03030114.xhp
@@ -50,7 +50,7 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateFromUnoTime/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  MsgBox(aDatabaseRow.getTime(3))/paragraph
+  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoTime(aDatabaseRow.getTime(3)))/paragraph
   paragraph role=bascode id=par_id3153127 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoTime(aTimeControl.Time))/paragraph
   paragraph role=bascode localize=false xml-lang=en-USEnd 
Sub/paragraph
 /bascode
diff --git a/source/text/sbasic/shared/03030116.xhp 
b/source/text/sbasic/shared/03030116.xhp
index 4376cf8..fdd92e3 100644
--- a/source/text/sbasic/shared/03030116.xhp
+++ b/source/text/sbasic/shared/03030116.xhp
@@ -50,7 +50,7 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateFromUnoDateTime/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  MsgBox(aDatabaseRow.getTime(3))/paragraph
+  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoDateTime(aDatabaseRow.getTimestamp(3)))/paragraph
   paragraph role=bascode localize=false xml-lang=en-USEnd 
Sub/paragraph
 /bascode
 /body
commit a2d57f0988aa22e174f5905756a2ed931e59d2f2
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:07:48 2013 +0100

janitorial: space outside of emph

Change-Id: I624e4d61a7482e316297feb78f30b20b57ce39b7

diff --git a/source/text/sbasic/shared/03030111.xhp 
b/source/text/sbasic/shared/03030111.xhp
index a38e325..16d6de5 100644
--- a/source/text/sbasic/shared/03030111.xhp
+++ b/source/text/sbasic/shared/03030111.xhp
@@ -44,7 +44,7 @@
 paragraph role=paragraph id=par_id3154422 xml-lang=en-US l10n=U 
oldref=6com.sun.star.util.Date/paragraph
 paragraph role=heading id=hd_id3147303 xml-lang=en-US level=2 
l10n=U oldref=7Parameters:/paragraph
 paragraph role=paragraph id=par_id3145136 xml-lang=en-US l10n=U 
oldref=8
-emphaDate: /emphDate to convert/paragraph
+emphaDate:/emph Date to convert/paragraph
 embed href=text/sbasic/shared/0003.xhp#errorcode/
 embed href=text/sbasic/shared/0003.xhp#err5/
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
diff --git a/source/text/sbasic/shared/03030112.xhp 
b/source/text/sbasic/shared/03030112.xhp
index d435880..44f83c1 100644
--- a/source/text/sbasic/shared/03030112.xhp
+++ b/source/text/sbasic/shared/03030112.xhp
@@ -44,7 +44,7 @@
 paragraph role=paragraph id=par_id3154422 xml-lang=en-US l10n=U 
oldref=6Date/paragraph
 paragraph role=heading id=hd_id3147303 xml-lang=en-US level=2 
l10n=U oldref=7Parameters:/paragraph
 paragraph role=paragraph id=par_id3145136 xml-lang=en-US l10n=U 
oldref=8
-emphaDate: /emphDate to convert/paragraph
+

Re: About some deprecated glib function in telepathy modules

[Riccardo Magliocchetti]

Hi Julien,

Il 04/11/2013 20:01, julien2412 ha scritto:

Hello,

On pc Debian x86-64 testing updated today, with:
gcc (Debian 4.8.2-1) 4.8.2
ldd (Debian EGLIBC 2.17-93) 2.17


[snip]


Indeed, https://developer.gnome.org/gio/2.36/gio-GIOScheduler.html indicates
this:
As of GLib 2.36, the g_io_scheduler methods are deprecated in favor of
GThreadPool and GTask.

The weird thing is I don't know why I've got these warnings since EGLIBC
2.17 branch is based on GLIBC 2.17 (see http://www.eglibc.org/home)

Any idea? (should we update the calls with the new methods? Include a test
on glibc with MACRO to know which method to call? Silence these warnings for
the moment - until when? - with pragma instructions?)


glibc is the C library, you should look for libglib2.0 (dpkg -l 
libglib2.0*). Grep for glib-2.0 in configure.ac to see where glib is 
used in telepathy. Can't say if it's fine or not to eventually bump glib 
/ telepathy version.


cheers,
riccardo

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

[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl

[Michael Meeks]

 scripts/esc-bug-stats.pl |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit a26bb7cc3f76968290c378b8406c9692cc5a63c3
Author: Michael Meeks michael.me...@collabora.com
Date:   Tue Nov 5 09:18:29 2013 +

misc. fixes.

diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 4984f0c..c8210b0 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -97,20 +97,16 @@ sub extract_number($)
 return $line;
 }
 
-sub crunch_bugstat_lines()
+sub crunch_bugstat_lines(@)
 {
-print STDERR Querying overall / top bug stats\n;
-my $url = 
'https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html';
 my @lines = @_;
 
 my $region = 'header';
 my $closer_name;
 my %closed_stats;
 
-print STDERR   + $url\n;
-
 while ((my $line = shift @lines)  $region ne 'end') {
-   print $region - $line;
+#  print $region - $line;
if ($region eq 'header'  $line =~ /h2Top .* modules\/h2/) {
$region = 'top-modules';
 
@@ -176,6 +172,8 @@ my %bug_to_ver = (
 my %ver_open;
 my %ver_total;
 
+build_overall_bugstats();
+
 print STDERR Querying for open MABs:\n;
 for my $ver (sort keys %bug_to_ver) {
 my $bug = $bug_to_ver{$ver};
@@ -230,8 +228,6 @@ for my $component (sort { $component_count{$b} = 
$component_count{$a} } keys %
 printf STDERR \t  %12s - %2d (+?)\n, $component, 
$component_count{$component};
 }
 
-build_overall_bugstats();
-
 print  EOF
 ?xml version=1.0 encoding=UTF-8?
 office:document 
xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65108] Clean-up header includes (global/local)

[bugzilla-daemon]

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

--- Comment #11 from Michael Meeks michael.me...@collabora.com ---
The ESC discussed this, here was the minute from 2013-06-20.

I guess that it is a good time to resume work on this.

AFAIK there is/was no consensus on the list - but worth looking that out I
think.

* Bulk change of header include style (Michael)
+ thoughts on this:
  https://bugs.freedesktop.org/show_bug.cgi?id=65108
+ defer until 4.1.2 or so - when cherry-picking reduces
+ concern that angle brackets only for system headers (Stephan)
+ discussed this in the past, MS compiler does insane things
  with path lookups if you use quotes (Bjoern)
+ what ? (Stephan)
+ walks entire include path backwards (Bjoern)
+ http://msdn.microsoft.com/en-us/library/36k2cdd4%28v=vs.71%29.aspx
+ libxml - is that a local or a system include ? (Norbert)
+ in the code we can't know that, notion is a bit fuzzy
+ no need to violate the std for no reason (Stephan)
+ performance might be a good idea.
+ potential compromise: have  for files in the same
  directory as the cxx (Michael)
+ indifferent to cleaning it up (Stephan)
+ discuss it on the list

I'd suggest my compromise: using  for includes in the same directory as the
cxx file, and  for everything else; clearly we'd need a script to identify
and re-write for those. Do we have such a thing ? :-)

Thanks for chasing !

-- 
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] help.git: source/text

[Lionel Elie Mamane]

 source/text/sbasic/shared/03030100.xhp |4 +---
 source/text/sbasic/shared/03030200.xhp |6 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 8008ef0da6efee532bcd49b8e8b6560cf4f84c73
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:31:45 2013 +0100

there is also a Converting Time Values help page

Change-Id: I742102ee90942f7d3303e971cffd15282853c0fb

diff --git a/source/text/sbasic/shared/03030100.xhp 
b/source/text/sbasic/shared/03030100.xhp
index 0ff5187..2e6ed88 100644
--- a/source/text/sbasic/shared/03030100.xhp
+++ b/source/text/sbasic/shared/03030100.xhp
@@ -27,7 +27,7 @@
 /topic
 history
 created date=2003-10-31T00:00:00Sun Microsystems, Inc./created
-lastedited date=2013-11-05T09:45:00Added 
CDate(From|To)Uno(Date|Time|DateTime)/lastedited
+lastedited date=2013-11-05T09:45:00Added 
CDate(From|To)Uno(Date(Time)?)/lastedited
 /history
 /meta
 body
@@ -45,8 +45,6 @@
 embed href=text/sbasic/shared/03030108.xhp#cdatefromiso/
 embed href=text/sbasic/shared/03030111.xhp#cdatetounodate/
 embed href=text/sbasic/shared/03030112.xhp#cdatefromunodate/
-embed href=text/sbasic/shared/03030113.xhp#cdatetounotime/
-embed href=text/sbasic/shared/03030114.xhp#cdatefromunotime/
 embed href=text/sbasic/shared/03030115.xhp#cdatetounodatetime/
 embed href=text/sbasic/shared/03030116.xhp#cdatefromunodatetime/
 embed href=text/sbasic/shared/03030110.xhp#dateadd/
diff --git a/source/text/sbasic/shared/03030200.xhp 
b/source/text/sbasic/shared/03030200.xhp
index d27c32e..a196823 100644
--- a/source/text/sbasic/shared/03030200.xhp
+++ b/source/text/sbasic/shared/03030200.xhp
@@ -27,7 +27,7 @@
 /topic
 history
 created date=2003-10-31T00:00:00Sun Microsystems, Inc./created
-lastedited date=2003-10-31T00:00:00converted from old format - 
fpe/lastedited
+lastedited date=2013-11-05T10:25:00Added 
CDate(From|To)Uno((Date)?Time)/lastedited
 /history
 /meta
 body
@@ -42,5 +42,9 @@
   embed href=text/sbasic/shared/03030204.xhp#second/
   embed href=text/sbasic/shared/03030205.xhp#timeserial/
   embed href=text/sbasic/shared/03030206.xhp#timevalue/
+  embed href=text/sbasic/shared/03030113.xhp#cdatetounotime/
+  embed href=text/sbasic/shared/03030114.xhp#cdatefromunotime/
+  embed href=text/sbasic/shared/03030115.xhp#cdatetounodatetime/
+  embed href=text/sbasic/shared/03030116.xhp#cdatefromunodatetime/
  /body
 /helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Lionel Elie Mamane]

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

New commits:
commit 7f2576538e081ca6e01bc3e0e49ace5816390dc6
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:31:45 2013 +0100

Updated core
Project: help  8008ef0da6efee532bcd49b8e8b6560cf4f84c73

diff --git a/helpcontent2 b/helpcontent2
index 5e58322..8008ef0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5e583229241ba0d1b5de8567645f45bde38f081f
+Subproject commit 8008ef0da6efee532bcd49b8e8b6560cf4f84c73
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60698] kill pointless one-file library ...

[bugzilla-daemon]

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

--- Comment #14 from Michael Meeks michael.me...@collabora.com ---
Nice work ! it all helps :-) having said that - I guess really we want to move
to enable --enable-merge-libs=yes by default I suppose which then compiles a
lot of these into a single library anyway :-)

But - either way, all these tiny fragments (if they don't break dependencies)
waste linking time and RAM to load/link them - so thanks !

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

[Bug 60698] kill pointless one-file library ...

[bugzilla-daemon]

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

--- Comment #15 from Marcos Souza marcos.souza@gmail.com ---
The io module was a suggestion by Stephan!

And yes, I'll try to look for more cases like this :)

Thanks a lot for helping!

-- 
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: sw/qa sw/source writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |1 +
 sw/source/filter/ww8/docxtablestyleexport.cxx  |   11 +++
 writerfilter/source/dmapper/TablePropertiesHandler.cxx |5 +
 3 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit ebf3df49118dad83acaf045b71815d7900289046
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Nov 5 11:01:38 2013 +0100

DOCX filter: handle tcMar inside tblStylePr

Change-Id: Ifc7694b39337fb9824c2b57083fee101d48f6b84

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 91dd026..dcb106c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1357,6 +1357,7 @@ DECLARE_OOXML_TEST(testQuicktables, quicktables.docx)
 assertXPath(pXmlStyles, 
/w:styles/w:style[@w:styleId='Calendar4']/w:tcPr/w:shd, themeFillShade, 
80);
 assertXPath(pXmlStyles, 
/w:styles/w:style[@w:styleId='Calendar4']/w:tblStylePr[@w:type='firstCol']/w:pPr/w:ind,
 rightChars, 0);
 assertXPath(pXmlStyles, 
/w:styles/w:style[@w:styleId='Calendar4']/w:tblStylePr[@w:type='firstCol']/w:pPr/w:ind,
 right, 144);
+assertXPath(pXmlStyles, 
/w:styles/w:style[@w:styleId='Calendar4']/w:tblStylePr[@w:type='band2Horz']/w:tcPr/w:tcMar/w:bottom,
 w, 86);
 }
 
 DECLARE_OOXML_TEST(testSmartart, smartart.docx)
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx 
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 8a1510d..4cc4174 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -71,12 +71,12 @@ DocxStringTokenMap const aTblCellMarTokens[] = {
 };
 
 /// Export of w:tblCellMar in a table style.
-void lcl_TableStyleTblCellMar(sax_fastparser::FSHelperPtr pSerializer, 
uno::Sequencebeans::PropertyValue rTblCellMar)
+void lcl_TableStyleTblCellMar(sax_fastparser::FSHelperPtr pSerializer, 
uno::Sequencebeans::PropertyValue rTblCellMar, sal_Int32 nType = 
XML_tblCellMar)
 {
 if (!rTblCellMar.hasElements())
 return;
 
-pSerializer-startElementNS(XML_w, XML_tblCellMar, FSEND);
+pSerializer-startElementNS(XML_w, nType, FSEND);
 for (sal_Int32 i = 0; i  rTblCellMar.getLength(); ++i)
 {
 if (sal_Int32 nToken = DocxStringGetToken(aTblCellMarTokens, 
rTblCellMar[i].Name))
@@ -88,7 +88,7 @@ void lcl_TableStyleTblCellMar(sax_fastparser::FSHelperPtr 
pSerializer, uno::Sequ
 FSEND);
 }
 }
-pSerializer-endElementNS(XML_w, XML_tblCellMar);
+pSerializer-endElementNS(XML_w, nType);
 }
 
 static DocxStringTokenMap const aTcBorderTokens[] = {
@@ -448,7 +448,7 @@ void lcl_TableStyleTcPr(sax_fastparser::FSHelperPtr 
pSerializer, uno::Sequenceb
 
 pSerializer-startElementNS(XML_w, XML_tcPr, FSEND);
 
-uno::Sequencebeans::PropertyValue aShd, aTcBorders;
+uno::Sequencebeans::PropertyValue aShd, aTcBorders, aTcMar;
 OUString aVAlign;
 for (sal_Int32 i = 0; i  rTcPr.getLength(); ++i)
 {
@@ -456,10 +456,13 @@ void lcl_TableStyleTcPr(sax_fastparser::FSHelperPtr 
pSerializer, uno::Sequenceb
 aShd = rTcPr[i].Value.get uno::Sequencebeans::PropertyValue ();
 else if (rTcPr[i].Name == tcBorders)
 aTcBorders = rTcPr[i].Value.get 
uno::Sequencebeans::PropertyValue ();
+else if (rTcPr[i].Name == tcMar)
+aTcMar = rTcPr[i].Value.get uno::Sequencebeans::PropertyValue 
();
 else if (rTcPr[i].Name == vAlign)
 aVAlign = rTcPr[i].Value.getOUString();
 }
 lcl_TableStyleTcBorders(pSerializer, aTcBorders);
+lcl_TableStyleTblCellMar(pSerializer, aTcMar, XML_tcMar);
 lcl_TableStyleShd(pSerializer, aShd);
 if (!aVAlign.isEmpty())
 pSerializer-singleElementNS(XML_w, XML_vAlign,
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx 
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 824cd0b..6854f92 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -211,12 +211,17 @@ namespace dmapper {
 }
 break;
 case NS_ooxml::LN_CT_TcPrBase_tcMar:
+//
 {
 writerfilter::ReferenceProperties::Pointer_t pProperties 
= rSprm.getProps();
 if (pProperties.get())
 {
 CellMarginHandlerPtr pCellMarginHandler(new 
CellMarginHandler);
+if (m_pCurrentInteropGrabBag)
+pCellMarginHandler-enableInteropGrabBag(tcMar);
 pProperties-resolve(*pCellMarginHandler);
+if (m_pCurrentInteropGrabBag)
+
m_pCurrentInteropGrabBag-push_back(pCellMarginHandler-getInteropGrabBag());
 TablePropertyMapPtr pCellProperties(new 
TablePropertyMap);
 if 

[Bug 65108] Clean-up header includes (global/local)

[bugzilla-daemon]

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

--- Comment #12 from Stephan Bergmann sberg...@redhat.com ---
(In reply to comment #11)
 I'd suggest my compromise: using  for includes in the same directory as
 the cxx file, and  for everything else; clearly we'd need a script to
 identify and re-write for those. Do we have such a thing ? :-)

A conforming compiler is not require to support #include ... for anything but
the standard headers.  In practice, the compilers we use today do.  So, all
other things being equal, the safest thing to do would be to use #include ...
for inclusion of all of LO's source files.

However, the odd behavior of MSVC described in comment 8,
http://msdn.microsoft.com/en-us/library/36k2cdd4%28v=vs.80%29.aspx #include
Directive (C/C++) can be used as an argument in favor of   Though I
would probably use ... exclusively then, and not even stick to ... for
inclusion of source files from the same directory.

-- 
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: vcl/source

[Niklas Johansson]

 vcl/source/window/msgbox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af93243d06d81e996c1fae92190bc9622503e25b
Author: Niklas Johansson sleeping.pil...@gmail.com
Date:   Tue Nov 5 11:19:06 2013 +0100

Resolves: fdo#70588 MultiLineEdits don't need WB_WORDBREAK set

and inherits from Edit which reuses that same bit for password

Change-Id: I8add146fdbc1b3402b5409f01f75c620da25a313
Reviewed-on: https://gerrit.libreoffice.org/6579
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 31c0c86..0e95ea8 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -233,7 +233,7 @@ void MessBox::ImplPosControls()
 longnMaxWidth = GetDesktopRectPixel().GetWidth()-8;
 longnMaxLineWidth;
 longnWidth;
-WinBits nWinStyle = WB_LEFT | WB_WORDBREAK | WB_NOLABEL;
+WinBits nWinStyle = WB_LEFT | WB_NOLABEL;
 sal_uInt16  nTextStyle = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP | 
TEXT_DRAW_LEFT;
 
 delete mpVCLMultiLineEdit;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Lionel Elie Mamane]

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

New commits:
commit 9802db7ff181a9c4d15cc453725b63b82a941fff
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 11:50:22 2013 +0100

Updated core
Project: help  fed648365a724a068113c6491d380fab67b5f5da

diff --git a/helpcontent2 b/helpcontent2
index 8008ef0..fed6483 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8008ef0da6efee532bcd49b8e8b6560cf4f84c73
+Subproject commit fed648365a724a068113c6491d380fab67b5f5da
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - source/text

[Lionel Elie Mamane]

 source/text/sbasic/shared/03030113.xhp |2 +-
 source/text/sbasic/shared/03030115.xhp |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fed648365a724a068113c6491d380fab67b5f5da
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 11:50:22 2013 +0100

fixup confusion between CDateToUnoTime and CDateToUnoDateTime

Change-Id: Ie3a13726086da113835f54f4eb1c68201edd44f9

diff --git a/source/text/sbasic/shared/03030115.xhp 
b/source/text/sbasic/shared/03030115.xhp
index a95123b..47d2ed8 100644
--- a/source/text/sbasic/shared/03030115.xhp
+++ b/source/text/sbasic/shared/03030115.xhp
@@ -21,9 +21,9 @@
 
 helpdocument version=1.0
   meta
-topic id=textsbasicshared03030113xml indexer=include status=PUBLISH
-  title id=tit xml-lang=en-USCDateToUnoDate Function 
[Runtime]/title
-  filename/text/sbasic/shared/03030113.xhp/filename
+topic id=textsbasicshared03030115xml indexer=include status=PUBLISH
+  title id=tit xml-lang=en-USCDateToUnoDateTime Function 
[Runtime]/title
+  filename/text/sbasic/shared/03030115.xhp/filename
 /topic
 history
   created date=2013-09-10T16:09:00Lionel Elie Mamane/created
commit f7005e7bfab2a31e7e6988b12758fd6f9af3e1f5
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 11:49:49 2013 +0100

wrong title

Change-Id: I776db2914bb4e51af35d7c4610d457892b36e9b5

diff --git a/source/text/sbasic/shared/03030113.xhp 
b/source/text/sbasic/shared/03030113.xhp
index 20cc482..257f6a1 100644
--- a/source/text/sbasic/shared/03030113.xhp
+++ b/source/text/sbasic/shared/03030113.xhp
@@ -22,7 +22,7 @@
 helpdocument version=1.0
   meta
 topic id=textsbasicshared03030113xml indexer=include status=PUBLISH
-  title id=tit xml-lang=en-USCDateToUnoDate Function 
[Runtime]/title
+  title id=tit xml-lang=en-USCDateToUnoTime Function 
[Runtime]/title
   filename/text/sbasic/shared/03030113.xhp/filename
 /topic
 history
___
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' - vcl/source

[László Németh]

 vcl/source/glyphs/graphite_layout.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 224876cca06663be6e1fdfb092ec7ba6ae1d4a5d
Author: László Németh nem...@numbertext.org
Date:   Fri Sep 6 11:20:09 2013 +0200

fdo#68313 fix combining diacritics problem with Graphite fonts

Change-Id: I042a32cc9c025efcd25ccf95427bee5d6d4024fb

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 1190408..bbd7cc5 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -594,9 +594,9 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs 
rArgs)
 nSegCharLimit - rArgs.mnEndCharPos, bRtl);
 }
 }
-int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
-rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
-if (rArgs.mnMinCharPos + numchars  limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
+//int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
+//rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+int numchars = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, 
fdo#68313, FIXME
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source dbaccess/source extensions/source sc/source sw/source

[Noel Grandin]

 cui/source/options/optjava.cxx|2 +-
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx   |4 ++--
 dbaccess/source/ui/dlg/queryfilter.cxx|6 +++---
 dbaccess/source/ui/misc/TokenWriter.cxx   |8 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |9 -
 extensions/source/propctrlr/standardcontrol.cxx   |4 ++--
 sc/source/core/tool/compiler.cxx  |7 +++
 sc/source/filter/excel/xecontent.cxx  |6 +++---
 sc/source/filter/excel/xlformula.cxx  |4 ++--
 sc/source/filter/html/htmlexp.cxx |4 ++--
 sc/source/filter/html/htmlimp.cxx |4 ++--
 sc/source/ui/dbgui/asciiopt.cxx   |8 
 sc/source/ui/dbgui/csvgrid.cxx|4 ++--
 sc/source/ui/dbgui/csvruler.cxx   |4 ++--
 sc/source/ui/dbgui/fieldwnd.cxx   |4 ++--
 sc/source/ui/dbgui/imoptdlg.cxx   |2 +-
 sc/source/ui/dbgui/scuiasciiopt.cxx   |   12 ++--
 sc/source/ui/docshell/arealink.cxx|2 +-
 sc/source/ui/docshell/docsh8.cxx  |2 +-
 sc/source/ui/miscdlgs/anyrefdg.cxx|4 ++--
 sc/source/ui/miscdlgs/linkarea.cxx|4 ++--
 sc/source/ui/optdlg/tpusrlst.cxx  |4 ++--
 sc/source/ui/pagedlg/areasdlg.cxx |4 ++--
 sw/source/core/unocore/unochart.cxx   |6 +++---
 sw/source/filter/ww8/docxattributeoutput.cxx  |4 ++--
 sw/source/ui/dochdl/swdtflvr.cxx  |4 ++--
 sw/source/ui/envelp/envimg.cxx|4 ++--
 sw/source/ui/fldui/fldmgr.cxx |4 ++--
 28 files changed, 66 insertions(+), 68 deletions(-)

New commits:
commit 3d65dfa3c98e0f79c579cfac23d55092f7554244
Author: Noel Grandin n...@peralex.com
Date:   Mon Oct 28 13:20:52 2013 +0200

convert xub_StrLen to sal_Int32

Converts code that calls comphelper::string::getTokenCount() to
use sal_Int32 to store the return value.

Change-Id: I439605a39d29b1309649e30f3ff40dfa412efcde

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index e1dca0dd..8679154 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -1074,7 +1074,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString 
_rPath )
 m_pPathList-Clear();
 xub_StrLen i;
 sal_Int32 nIdx = 0;
-xub_StrLen nCount = comphelper::string::getTokenCount(_rPath, 
CLASSPATH_DELIMITER);
+sal_Int32 nCount = comphelper::string::getTokenCount(_rPath, 
CLASSPATH_DELIMITER);
 for ( i = 0; i  nCount; ++i )
 {
 OUString sToken = _rPath.getToken( 0, CLASSPATH_DELIMITER, nIdx );
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 0ac82b4..83f1feb 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -86,7 +86,7 @@ DBG_NAME(OTextConnectionHelper)
 {
 DBG_CTOR(OTextConnectionHelper,NULL);
 
-xub_StrLen nCnt = 
comphelper::string::getTokenCount(m_aFieldSeparatorList, '\t');
+sal_Int32 nCnt = 
comphelper::string::getTokenCount(m_aFieldSeparatorList, '\t');
 xub_StrLen i;
 
 for( i = 0 ; i  nCnt ; i += 2 )
@@ -469,7 +469,7 @@ DBG_NAME(OTextConnectionHelper)
 void OTextConnectionHelper::SetSeparator( ComboBox rBox, const OUString 
rList, const OUString rVal )
 {
 charnTok = '\t';
-xub_StrLen  nCnt(comphelper::string::getTokenCount(rList, nTok));
+sal_Int32   nCnt = comphelper::string::getTokenCount(rList, nTok);
 xub_StrLen  i;
 
 for( i=0 ; inCnt ; i+=2 )
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx 
b/dbaccess/source/ui/dlg/queryfilter.cxx
index fa7f1b7..e624cbb 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -210,7 +210,7 @@ DlgFilterCrit::~DlgFilterCrit()
 sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString 
_rSelectedPredicate ) const
 {
 sal_Int32 nPredicateIndex = -1;
-for ( xub_StrLen i=0; i  
comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';'); ++i)
+for ( sal_Int32 i=0; i  
comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';'); ++i)
 if ( aSTR_COMPARE_OPERATORS.getToken(i, ';') == _rSelectedPredicate )
 {
 nPredicateIndex = i;
@@ -712,7 +712,7 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, 
pListBox )
 
 if(eColumnSearch  == ColumnSearch::FULL)
 {
-for(xub_StrLen i=0;i  
comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';');i++)
+for(sal_Int32 i=0;i  

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - xmloff/inc xmloff/source

[Michael Stahl]

 xmloff/inc/xmloff/xmlmultiimagehelper.hxx  |2 -
 xmloff/source/core/xmlmultiimagehelper.cxx |4 +--
 xmloff/source/draw/ximpshap.cxx|5 ++--
 xmloff/source/text/XMLTextFrameContext.cxx |   30 +++--
 4 files changed, 34 insertions(+), 7 deletions(-)

New commits:
commit d5f3bb7e94cdfbaf978064486eb658637ab60642
Author: Michael Stahl mst...@redhat.com
Date:   Tue Sep 3 00:32:08 2013 +0200

fdo#68839: ODF import: fix name of multi-image frame

When multiple image child elements are inside a frame, each one is
imported and gets unique name via SwDoc::SetFlyName().  But the
retained one is not necessarily the first one, which is the only one
that may have the original name.

Also the solveMultipleImages needs to return a smart pointer, as nothing
else keeps the image contexts alive.

(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)

(cherry picked from commit b69d152cfa1da868ba960345d72ba78f9f8e1b35)

Conflicts:
xmloff/source/core/xmlmultiimagehelper.cxx
xmloff/source/draw/ximpshap.cxx
xmloff/source/text/XMLTextFrameContext.cxx

Reviewed-on: https://gerrit.libreoffice.org/5781
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

Conflicts:
xmloff/source/core/xmlmultiimagehelper.cxx
xmloff/source/draw/ximpshap.cxx

Change-Id: I28a8a752f3eed176cc2ebb4c9af11a0dd4d18ea6

diff --git a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx 
b/xmloff/inc/xmloff/xmlmultiimagehelper.hxx
index 3d7d647..3ca1170 100644
--- a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx
+++ b/xmloff/inc/xmloff/xmlmultiimagehelper.hxx
@@ -44,7 +44,7 @@ public:
 /// see imlementation for evtl. changing weights and/or adding filetypes.
 ///
 /// @returns import context of the selected image
-const SvXMLImportContext* solveMultipleImages();
+SvXMLImportContextRef solveMultipleImages();
 
 /// add a content to the remembered image import contexts
 void addContent(const SvXMLImportContext rSvXMLImportContext);
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx 
b/xmloff/source/core/xmlmultiimagehelper.cxx
index b8cb4a6..1eebf2c 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -89,9 +89,9 @@ MultiImageImportHelper::~MultiImageImportHelper()
 }
 }
 
-const SvXMLImportContext* MultiImageImportHelper::solveMultipleImages()
+SvXMLImportContextRef MultiImageImportHelper::solveMultipleImages()
 {
-const SvXMLImportContext* pContext(0);
+SvXMLImportContextRef pContext;
 if(maImplContextVector.size()  1)
 {
 // multiple child contexts were imported, decide which is the most 
valuable one
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index f0307c9..66eb6cd 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3531,8 +3531,9 @@ void SdXMLFrameShapeContext::StartElement(const 
uno::Reference xml::sax::XAttri
 void SdXMLFrameShapeContext::EndElement()
 {
 // solve if multiple image child contexts were imported
-const SvXMLImportContext* const pSelectedContext(solveMultipleImages());
-const SdXMLGraphicObjectShapeContext* pShapeContext( dynamic_castconst 
SdXMLGraphicObjectShapeContext*( pSelectedContext ) );
+SvXMLImportContextRef const pSelectedContext(solveMultipleImages());
+const SdXMLGraphicObjectShapeContext* pShapeContext(
+dynamic_castconst 
SdXMLGraphicObjectShapeContext*(pSelectedContext));
 if ( pShapeContext  !maShapeId.isEmpty() )
 {
 // fdo#64512 and fdo#60075 - make sure *this* shape is
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx 
b/xmloff/source/text/XMLTextFrameContext.cxx
index c850e67..ec77561 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -375,6 +375,7 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext
 const ::rtl::OUString sTextBoxServiceName;
 const ::rtl::OUString sGraphicServiceName;
 
+::rtl::OUString m_sOrigName;
 ::rtl::OUString sName;
 ::rtl::OUString sStyleName;
 ::rtl::OUString sNextName;
@@ -452,6 +453,8 @@ public:
 
 void SetDesc( const ::rtl::OUString rDesc );
 
+void SetName();
+
 ::com::sun::star::text::TextContentAnchorType GetAnchorType() const { 
return eAnchorType; }
 
 const ::com::sun::star::uno::Reference 
@@ -906,6 +909,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
 sStyleName = rValue;
 break;
 case XML_TOK_TEXT_FRAME_NAME:
+m_sOrigName = rValue;
 sName = rValue;
 break;
 case XML_TOK_TEXT_FRAME_FRAME_NAME:
@@ -1293,6 +1297,19 @@ void XMLTextFrameContext_Impl::SetHyperlink( const 
OUString rHRef,
 }
 }
 
+void XMLTextFrameContext_Impl::SetName()
+{
+

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - 7 commits - instsetoo_native/util oox/source solenv/inc sw/inc sw/qa sw/source

[Andras Timar]

 instsetoo_native/util/openoffice.lst  |   24 +++---
 oox/source/drawingml/chart/seriesconverter.cxx|3 +
 oox/source/drawingml/chart/typegroupconverter.cxx |   19 +++
 solenv/inc/minor.mk   |4 +-
 sw/inc/crsrsh.hxx |4 +-
 sw/qa/extras/odfimport/data/fdo69862.odt  |binary
 sw/qa/extras/odfimport/data/fdo69979.odt  |binary
 sw/qa/extras/odfimport/odfimport.cxx  |   36 ++
 sw/source/core/crsr/crsrsh.cxx|   12 +++
 sw/source/core/edit/eddel.cxx |2 -
 sw/source/core/edit/edglss.cxx|2 -
 sw/source/ui/wrtsh/select.cxx |8 
 12 files changed, 88 insertions(+), 26 deletions(-)

New commits:
commit 5910474aa23c4e2365be167077817586db162432
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Oct 28 06:34:44 2013 -0700

Bump for 4.0-20

Change-Id: I2ced784f302ab7011f496470cfa19e67e6f8ed3e

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 59317f7..25672e0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -33,7 +33,7 @@ Globals
 CREATE_MSP_INSTALLSET 0
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 19
+WINDOWSPATCHLEVEL 20
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -19
+PRODUCTEXTENSION -20
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-319
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-320
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -19
+PRODUCTEXTENSION -20
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-319
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-320
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
 PRODUCTVERSION 4.0
 PACKAGEVERSION 4.0
 PACKAGEREVISION 1
-PRODUCTEXTENSION -19
+PRODUCTEXTENSION -20
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -19
+PRODUCTEXTENSION -20
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -19
+PRODUCTEXTENSION -20
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -19
+PRODUCTEXTENSION -20
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -19
+PRODUCTEXTENSION -20
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
 {
 PRODUCTNAME OxygenOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -19
+PRODUCTEXTENSION -20
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-319
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-320
 BASEPRODUCTVERSION 4.0
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git 

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

[Caolán McNamara]

 animations/source/animcore/animcore.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1563162131ae00cd2a33c59349567a7b820dc5db
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 11:45:52 2013 +

Resolves: fdo#69645 Parent Node disposed and mpParent pointing to junk

mpParent points the contents of mxParent which is a WeakReference, so
we can check if the WeakReference is still valid before using mpParent

Change-Id: I40424714865e506b8cf27017539795eb834e10d2

diff --git a/animations/source/animcore/animcore.cxx 
b/animations/source/animcore/animcore.cxx
index 6678893..089c868 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -2060,7 +2060,8 @@ void AnimationNode::fireChangeListener()
 }
 }
 
-if( mpParent )
+//fdo#69645 use get() on WeakReference of mxParent to test if mpParent is 
still valid
+if( mpParent  mxParent.get().is() )
 mpParent-fireChangeListener();
 }
 
___
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' - helpcontent2

[Lionel Elie Mamane]

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

New commits:
commit 0dde92512c09ac615be1f0a83e99a54429e47f4b
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:05:01 2013 +0100

Updated core
Project: help  b109f2f6d0d6f0456397f69046c8a4ab2cf17836

Install new help files

Change-Id: I8fc26aadfa7509e19a6f4fb5941b6c1eb9cf9258
Reviewed-on: https://gerrit.libreoffice.org/6576
Tested-by: Andras Timar andras.ti...@collabora.com
Reviewed-by: Andras Timar andras.ti...@collabora.com

diff --git a/helpcontent2 b/helpcontent2
index 472620f..b109f2f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 472620fd6f95163f400ba8a88c6f7edc11d6c967
+Subproject commit b109f2f6d0d6f0456397f69046c8a4ab2cf17836
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-4-1' - AllLangHelp_sbasic.mk

[Lionel Elie Mamane]

 AllLangHelp_sbasic.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit b109f2f6d0d6f0456397f69046c8a4ab2cf17836
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:05:01 2013 +0100

Install new help files

Change-Id: I8fc26aadfa7509e19a6f4fb5941b6c1eb9cf9258
Reviewed-on: https://gerrit.libreoffice.org/6576
Tested-by: Andras Timar andras.ti...@collabora.com
Reviewed-by: Andras Timar andras.ti...@collabora.com

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index c03b371..8d11f41 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -124,6 +124,12 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03030107 \
 helpcontent2/source/text/sbasic/shared/03030108 \
 helpcontent2/source/text/sbasic/shared/03030110 \
+helpcontent2/source/text/sbasic/shared/03030111 \
+helpcontent2/source/text/sbasic/shared/03030112 \
+helpcontent2/source/text/sbasic/shared/03030113 \
+helpcontent2/source/text/sbasic/shared/03030114 \
+helpcontent2/source/text/sbasic/shared/03030115 \
+helpcontent2/source/text/sbasic/shared/03030116 \
 helpcontent2/source/text/sbasic/shared/03030120 \
 helpcontent2/source/text/sbasic/shared/03030130 \
 helpcontent2/source/text/sbasic/shared/03030200 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 8 commits - cui/source drawinglayer/source instsetoo_native/util svx/source

[Andre Fischer]

 cui/source/tabpages/tpbitmap.cxx   |   33 +-
 drawinglayer/source/processor2d/vclprocessor2d.cxx |   15 -
 instsetoo_native/util/makefile.mk  |  286 +
 svx/source/xoutdev/xattrbmp.cxx|6 
 4 files changed, 273 insertions(+), 67 deletions(-)

New commits:
commit ebdc37c7a1371d1d6ed75f0c10c1d4cdc88e630f
Author: Andre Fischer a...@apache.org
Date:   Wed Oct 30 08:34:46 2013 +

123532: Hide one warning about changes of %-target handling in dmake 4.5.

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index d28b7cf..c608103 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -203,7 +203,7 @@ $(MAKETARGETS){$(PKGFORMAT:^.)} : $(ADDDEPS)
 # This macro makes calling the make_installer.pl script a bit easier.
 # Just add -p and -msitemplate switches.
 MAKE_INSTALLER_COMMAND=\
-$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl \
+@$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl\
 -f $(PRJ)$/util$/openoffice.lst\
 -l $(subst,$(@:s/_/ /:1)_, $(@:b)) \
 -u $(OUT)  \
@@ -215,14 +215,23 @@ MAKE_INSTALLER_COMMAND=   
\
 # This macro makes calling gen_update_info.pl a bit easier
 # Just add --product switches, and xml input file and redirect output.
 GEN_UPDATE_INFO_COMMAND=   \
-$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl\
+@$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl   \
 --buildid $(BUILD) \
 --arch $(RTL_ARCH)   \
 --os $(RTL_OS)   \
 --lstfile $(PRJ)$/util$/openoffice.lst \
 --languages $(subst,$(@:s/_/ /:1)_, $(@:b))
 
-openoffice_%{$(PKGFORMAT:^.) .archive} :
+openoffice_%{$(PKGFORMAT:^.)} :
+$(MAKE_INSTALLER_COMMAND)  \
+-p Apache_OpenOffice   \
+-msitemplate $(MSIOFFICETEMPLATEDIR)
+$(GEN_UPDATE_INFO_COMMAND) \
+--product Apache_OpenOffice\
+$(PRJ)$/util$/update.xml   \
+ $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+openoffice_%{.archive} :
 $(MAKE_INSTALLER_COMMAND)  \
 -p Apache_OpenOffice   \
 -msitemplate $(MSIOFFICETEMPLATEDIR)
commit 440bd20976d8402e3a35dd1694d99f8be68e9701
Author: Andre Fischer a...@apache.org
Date:   Wed Oct 30 08:32:59 2013 +

123532: Renamed hack_msitemplates target to msitemplates.

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index d967598..d28b7cf 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -169,7 +169,7 @@ MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
 ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
 
 .IF $(OS) == WNT
-ADDDEPS+=hack_msitemplates
+ADDDEPS+=msitemplates
 .ENDIF
 
 $(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS)
@@ -293,7 +293,7 @@ $(BIN)$/dev$/intro.zip : 
$(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
 @-$(MKDIR) $(@:d)
 $(COPY) $ $@
 
-hack_msitemplates .PHONY: msi_template_files msi_langpack_template_files 
msi_sdk_template_files
+msitemplates .PHONY: msi_template_files msi_langpack_template_files 
msi_sdk_template_files
 
 MSI_OFFICE_TEMPLATE_FILES= \
 ActionTe.idt   \
commit 10329bfb1e0c100bdb9d3c947049897b6432b602
Author: Andre Fischer a...@apache.org
Date:   Wed Oct 30 08:31:19 2013 +

123532: Unhacked the hack_msitemplates target to msitemplates.

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 6a58356..d967598 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -293,18 +293,161 @@ $(BIN)$/dev$/intro.zip : 
$(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
 @-$(MKDIR) $(@:d)
 $(COPY) $ $@
 
-hack_msitemplates .PHONY:
--$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
--$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
--$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
--$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
--$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
--$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
-$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
-$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
-$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
-$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* 
$(MSIOFFICETEMPLATEDIR)$/Binary
-$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* 
$(MSILANGPACKTEMPLATEDIR)$/Binary
-$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* 
$(MSISDKOOTEMPLATEDIR)$/Binary
-
-
+hack_msitemplates .PHONY: msi_template_files msi_langpack_template_files 
msi_sdk_template_files
+
+MSI_OFFICE_TEMPLATE_FILES=  

[Libreoffice-commits] libvisio.git: src/conv

[Fridrich Štrba]

 src/conv/raw/vsd2raw.cpp |  338 ---
 src/conv/raw/vss2raw.cpp |7 
 2 files changed, 2 insertions(+), 343 deletions(-)

New commits:
commit bdfaab8e82224873c4e18a9c3ae058d734ff1b7d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Nov 5 13:08:08 2013 +0100

Add printing of indent levels in vs?2raw

Change-Id: I034d6e604b60ddbfc21e1ddee2935d59f9bd1292

diff --git a/src/conv/raw/vsd2raw.cpp b/src/conv/raw/vsd2raw.cpp
index 1226923..e20e2b7 100644
--- a/src/conv/raw/vsd2raw.cpp
+++ b/src/conv/raw/vsd2raw.cpp
@@ -28,347 +28,11 @@
  * instead of those above.
  */
 
-#include stdio.h
-#include stdarg.h
-#include string.h
-#include stack
-
 #include librevenge-stream/librevenge-stream.h
 #include librevenge-generators/librevenge-generators.h
 #include librevenge/librevenge.h
 #include libvisio/libvisio.h
 
-
-#if 0
-
-enum PainterCallback
-{
-  PC_START_GRAPHICS = 0,
-  PC_START_LAYER,
-  PC_START_EMBEDDED_GRAPHICS,
-  PC_START_TEXT_OBJECT,
-  PC_START_TEXT_LINE,
-  PC_START_TEXT_SPAN
-};
-
-#ifdef _U
-#undef _U
-#endif
-
-#define _U(M, L) \
-   if (!m_printCallgraphScore) \
-   __iuprintf M; \
-   else \
-   m_callStack.push(L);
-
-#ifdef _D
-#undef _D
-#endif
-
-#define _D(M, L) \
-   if (!m_printCallgraphScore) \
-   __idprintf M; \
-   else \
-   { \
-   PainterCallback lc = m_callStack.top(); \
-   if (lc != L) \
-   m_callbackMisses++; \
-   m_callStack.pop(); \
-   }
-
-class RawPainter : public librevenge::RVNGDrawingInterface
-{
-public:
-  RawPainter(bool printCallgraphScore);
-
-  ~RawPainter();
-
-  void startDocument(const librevenge::RVNGPropertyList  /*propList*/) {}
-  void endDocument() {}
-  void setDocumentMetaData(const librevenge::RVNGPropertyList  /*propList*/) 
{}
-  void startPage(const librevenge::RVNGPropertyList propList);
-  void endPage();
-  void startLayer(const librevenge::RVNGPropertyList propList);
-  void endLayer();
-  void startEmbeddedGraphics(const librevenge::RVNGPropertyList propList);
-  void endEmbeddedGraphics();
-
-  void setStyle(const librevenge::RVNGPropertyList propList, const 
librevenge::RVNGPropertyListVector gradient);
-
-  void drawRectangle(const librevenge::RVNGPropertyList propList);
-  void drawEllipse(const librevenge::RVNGPropertyList propList);
-  void drawPolyline(const librevenge::RVNGPropertyListVector vertices);
-  void drawPolygon(const librevenge::RVNGPropertyListVector vertices);
-  void drawPath(const librevenge::RVNGPropertyListVector path);
-  void drawGraphicObject(const librevenge::RVNGPropertyList propList, const 
librevenge::RVNGBinaryData binaryData);
-  void startTextObject(const librevenge::RVNGPropertyList propList, const 
librevenge::RVNGPropertyListVector path);
-  void endTextObject();
-
-
-  void openOrderedListLevel(const librevenge::RVNGPropertyList  /*propList*/) 
{}
-  void closeOrderedListLevel() {}
-
-  void openUnorderedListLevel(const librevenge::RVNGPropertyList  
/*propList*/) {}
-  void closeUnorderedListLevel() {}
-
-  void openListElement(const librevenge::RVNGPropertyList  /*propList*/, 
const librevenge::RVNGPropertyListVector  /* tabStops */) {}
-  void closeListElement() {}
-
-  void openParagraph(const librevenge::RVNGPropertyList propList, const 
librevenge::RVNGPropertyListVector tabStops);
-  void closeParagraph();
-
-  void openSpan(const librevenge::RVNGPropertyList propList);
-  void closeSpan();
-
-  void insertTab() {}
-  void insertSpace() {}
-  void insertText(const librevenge::RVNGString text);
-  void insertLineBreak() {}
-  void insertField(const librevenge::RVNGString  /* type */, const 
librevenge::RVNGPropertyList  /*propList*/) {}
-
-
-private:
-  int m_indent;
-  int m_callbackMisses;
-  bool m_printCallgraphScore;
-  std::stackPainterCallback m_callStack;
-
-  void __indentUp()
-  {
-m_indent++;
-  }
-  void __indentDown()
-  {
-if (m_indent  0) m_indent--;
-  }
-
-  void __iprintf(const char *format, ...);
-  void __iuprintf(const char *format, ...);
-  void __idprintf(const char *format, ...);
-};
-
-librevenge::RVNGString getPropString(const librevenge::RVNGPropertyList 
propList)
-{
-  librevenge::RVNGString propString;
-  librevenge::RVNGPropertyList::Iter i(propList);
-  if (!i.last())
-  {
-propString.append(i.key());
-propString.append(: );
-propString.append(i()-getStr().cstr());
-for (; i.next(); )
-{
-  propString.append(, );
-  propString.append(i.key());
-  propString.append(: );
-  propString.append(i()-getStr().cstr());
-}
-  }
-
-  return propString;
-}
-
-librevenge::RVNGString getPropString(const librevenge::RVNGPropertyListVector 
itemList)
-{
-  librevenge::RVNGString propString;
-
-  propString.append(();
-  librevenge::RVNGPropertyListVector::Iter i(itemList);
-
-  if (!i.last())
-  {
-propString.append(();
-

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

[Lionel Elie Mamane]

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

New commits:
commit e478ea90badae3b60c3176d25f537f71510f5582
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:06:32 2013 +0100

Updated core
Project: help  1d14cb67424676b4fb8c8baf2d44cea6b6d46ff2

UNO Date/Time conversion functions in Converting Date/Time Values help 
pages

Change-Id: I67608ec843a45b5a342c82a816174acb9391ca73
Reviewed-on: https://gerrit.libreoffice.org/6577
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/helpcontent2 b/helpcontent2
index b109f2f..1d14cb6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b109f2f6d0d6f0456397f69046c8a4ab2cf17836
+Subproject commit 1d14cb67424676b4fb8c8baf2d44cea6b6d46ff2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 38125] Wildcards * need to operate the same as in Excel

[bugzilla-daemon]

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

Eike Rathke er...@redhat.com changed:

   What|Removed |Added

 Whiteboard|EasyHack|
   |DifficultyInteresting   |
   |SkillCpp|

--- Comment #14 from Eike Rathke er...@redhat.com ---
Removing entirely from EasyHack, it's not. Change needs to implement the actual
wildcard search algorithm, add it to TextSearch, adapt the formula interpreter
to support it and read/write the attribute from/to ODF.

-- 
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] help.git: Branch 'libreoffice-4-1' - source/text

[Lionel Elie Mamane]

 source/text/sbasic/shared/03030100.xhp |6 +-
 source/text/sbasic/shared/03030200.xhp |6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 1d14cb67424676b4fb8c8baf2d44cea6b6d46ff2
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:06:32 2013 +0100

UNO Date/Time conversion functions in Converting Date/Time Values help 
pages

Change-Id: I67608ec843a45b5a342c82a816174acb9391ca73
Reviewed-on: https://gerrit.libreoffice.org/6577
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/source/text/sbasic/shared/03030100.xhp 
b/source/text/sbasic/shared/03030100.xhp
index 83016a3..2e6ed88 100644
--- a/source/text/sbasic/shared/03030100.xhp
+++ b/source/text/sbasic/shared/03030100.xhp
@@ -27,7 +27,7 @@
 /topic
 history
 created date=2003-10-31T00:00:00Sun Microsystems, Inc./created
-lastedited date=2005-04-25T13:52:00converted from old format - 
fpe/lastedited
+lastedited date=2013-11-05T09:45:00Added 
CDate(From|To)Uno(Date(Time)?)/lastedited
 /history
 /meta
 body
@@ -43,6 +43,10 @@
 embed href=text/sbasic/shared/03030106.xhp#year/
 embed href=text/sbasic/shared/03030107.xhp#cdatetoiso/
 embed href=text/sbasic/shared/03030108.xhp#cdatefromiso/
+embed href=text/sbasic/shared/03030111.xhp#cdatetounodate/
+embed href=text/sbasic/shared/03030112.xhp#cdatefromunodate/
+embed href=text/sbasic/shared/03030115.xhp#cdatetounodatetime/
+embed href=text/sbasic/shared/03030116.xhp#cdatefromunodatetime/
 embed href=text/sbasic/shared/03030110.xhp#dateadd/
 embed href=text/sbasic/shared/03030120.xhp#datediff/
 embed href=text/sbasic/shared/03030130.xhp#datepart/
diff --git a/source/text/sbasic/shared/03030200.xhp 
b/source/text/sbasic/shared/03030200.xhp
index d27c32e..a196823 100644
--- a/source/text/sbasic/shared/03030200.xhp
+++ b/source/text/sbasic/shared/03030200.xhp
@@ -27,7 +27,7 @@
 /topic
 history
 created date=2003-10-31T00:00:00Sun Microsystems, Inc./created
-lastedited date=2003-10-31T00:00:00converted from old format - 
fpe/lastedited
+lastedited date=2013-11-05T10:25:00Added 
CDate(From|To)Uno((Date)?Time)/lastedited
 /history
 /meta
 body
@@ -42,5 +42,9 @@
   embed href=text/sbasic/shared/03030204.xhp#second/
   embed href=text/sbasic/shared/03030205.xhp#timeserial/
   embed href=text/sbasic/shared/03030206.xhp#timevalue/
+  embed href=text/sbasic/shared/03030113.xhp#cdatetounotime/
+  embed href=text/sbasic/shared/03030114.xhp#cdatefromunotime/
+  embed href=text/sbasic/shared/03030115.xhp#cdatetounodatetime/
+  embed href=text/sbasic/shared/03030116.xhp#cdatefromunodatetime/
  /body
 /helpdocument
___
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' - helpcontent2

[Lionel Elie Mamane]

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

New commits:
commit 2875092a96aef377d2e8c8a50ddf4b8f77d1abd4
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 11:50:22 2013 +0100

Updated core
Project: help  c70893d214cca3e0dca55fc730e889bb3b31edb2

fixup confusion between CDateToUnoTime and CDateToUnoDateTime

Change-Id: Ie3a13726086da113835f54f4eb1c68201edd44f9
Reviewed-on: https://gerrit.libreoffice.org/6582
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/helpcontent2 b/helpcontent2
index 1d14cb6..c70893d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1d14cb67424676b4fb8c8baf2d44cea6b6d46ff2
+Subproject commit c70893d214cca3e0dca55fc730e889bb3b31edb2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-4-1' - source/text

[Lionel Elie Mamane]

 source/text/sbasic/shared/03030115.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c70893d214cca3e0dca55fc730e889bb3b31edb2
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 11:50:22 2013 +0100

fixup confusion between CDateToUnoTime and CDateToUnoDateTime

Change-Id: Ie3a13726086da113835f54f4eb1c68201edd44f9
Reviewed-on: https://gerrit.libreoffice.org/6582
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/source/text/sbasic/shared/03030115.xhp 
b/source/text/sbasic/shared/03030115.xhp
index 69fde10..a8eb520 100644
--- a/source/text/sbasic/shared/03030115.xhp
+++ b/source/text/sbasic/shared/03030115.xhp
@@ -21,9 +21,9 @@
 
 helpdocument version=1.0
   meta
-topic id=textsbasicshared03030113xml indexer=include status=PUBLISH
-  title id=tit xml-lang=en-USCDateToUnoDate Function 
[Runtime]/title
-  filename/text/sbasic/shared/03030113.xhp/filename
+topic id=textsbasicshared03030115xml indexer=include status=PUBLISH
+  title id=tit xml-lang=en-USCDateToUnoDateTime Function 
[Runtime]/title
+  filename/text/sbasic/shared/03030115.xhp/filename
 /topic
 history
   created date=2013-09-10T16:09:00Lionel Elie Mamane/created
___
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' - eb/dc37c7a1371d1d6ed75f0c10c1d4cdc88e630f

[Caolán McNamara]

 eb/dc37c7a1371d1d6ed75f0c10c1d4cdc88e630f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7d9ea8443b8f06bb10f185fe7a7350ec40c47d59
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 12:19:36 2013 +

Notes added by 'git notes add'

diff --git a/eb/dc37c7a1371d1d6ed75f0c10c1d4cdc88e630f 
b/eb/dc37c7a1371d1d6ed75f0c10c1d4cdc88e630f
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/eb/dc37c7a1371d1d6ed75f0c10c1d4cdc88e630f
@@ -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' - 2 commits - 10/329bfb1e0c100bdb9d3c947049897b6432b602 44/0bd20976d8402e3a35dd1694d99f8be68e9701

[Caolán McNamara]

 10/329bfb1e0c100bdb9d3c947049897b6432b602 |1 +
 44/0bd20976d8402e3a35dd1694d99f8be68e9701 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit b2401b2560fc72b898e581a01b6b44d737cf8ed1
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 12:20:25 2013 +

Notes added by 'git notes add'

diff --git a/10/329bfb1e0c100bdb9d3c947049897b6432b602 
b/10/329bfb1e0c100bdb9d3c947049897b6432b602
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/10/329bfb1e0c100bdb9d3c947049897b6432b602
@@ -0,0 +1 @@
+ignore: obsolete
commit 9cf5a56e78032cde3cc7e95d41955becf25ae84c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 12:20:18 2013 +

Notes added by 'git notes add'

diff --git a/44/0bd20976d8402e3a35dd1694d99f8be68e9701 
b/44/0bd20976d8402e3a35dd1694d99f8be68e9701
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/44/0bd20976d8402e3a35dd1694d99f8be68e9701
@@ -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' - 2 commits - 61/723eb0b32e9b9a53e4b66496d5b72578811f07 e3/0007606216e9b549df0110d85c0c3af5b53401

[Caolán McNamara]

 61/723eb0b32e9b9a53e4b66496d5b72578811f07 |1 +
 e3/0007606216e9b549df0110d85c0c3af5b53401 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit a597903b4dddb45d295be76137e308409682a0b4
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 12:20:05 2013 +

Notes added by 'git notes add'

diff --git a/61/723eb0b32e9b9a53e4b66496d5b72578811f07 
b/61/723eb0b32e9b9a53e4b66496d5b72578811f07
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/61/723eb0b32e9b9a53e4b66496d5b72578811f07
@@ -0,0 +1 @@
+ignore: obsolete
commit 66137c00643dbb74ffef7dbbb9fee88cf78044ae
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 12:19:56 2013 +

Notes added by 'git notes add'

diff --git a/e3/0007606216e9b549df0110d85c0c3af5b53401 
b/e3/0007606216e9b549df0110d85c0c3af5b53401
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/e3/0007606216e9b549df0110d85c0c3af5b53401
@@ -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' - 2 commits - 54/0585382cb686e467789919571530ec9820d99e bd/35c43d07f349fa08b4645d4183eb3790962287

[Caolán McNamara]

 54/0585382cb686e467789919571530ec9820d99e |1 +
 bd/35c43d07f349fa08b4645d4183eb3790962287 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 6dde1d63abcfe4ec6472e2719ce690d13a28883c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 12:22:15 2013 +

Notes added by 'git notes add'

diff --git a/54/0585382cb686e467789919571530ec9820d99e 
b/54/0585382cb686e467789919571530ec9820d99e
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/54/0585382cb686e467789919571530ec9820d99e
@@ -0,0 +1 @@
+ignore: obsolete
commit 4322b518115e8504a01214748dcea4a72bc90305
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 12:22:08 2013 +

Notes added by 'git notes add'

diff --git a/bd/35c43d07f349fa08b4645d4183eb3790962287 
b/bd/35c43d07f349fa08b4645d4183eb3790962287
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/bd/35c43d07f349fa08b4645d4183eb3790962287
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 38125] Wildcards * need to operate the same as in Excel

[bugzilla-daemon]

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

Stephan Bergmann sberg...@redhat.com changed:

   What|Removed |Added

 CC|libreoffice@lists.freedeskt |
   |op.org  |

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

[Lionel Elie Mamane]

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

New commits:
commit 9e0605705d8c6e02e345c1d1963f69d16f5cbdc0
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 11:49:49 2013 +0100

Updated core
Project: help  450486167016110462b82d2c337c12bfc4e3a56b

wrong title

Change-Id: I776db2914bb4e51af35d7c4610d457892b36e9b5
Reviewed-on: https://gerrit.libreoffice.org/6581
Tested-by: Andras Timar andras.ti...@collabora.com
Reviewed-by: Andras Timar andras.ti...@collabora.com

diff --git a/helpcontent2 b/helpcontent2
index c70893d..4504861 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c70893d214cca3e0dca55fc730e889bb3b31edb2
+Subproject commit 450486167016110462b82d2c337c12bfc4e3a56b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

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

New commits:
commit ff1d2de5e6e8ba10f0cd6ce0293ba5a5e0a5bf4d
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 5 13:25:46 2013 +0100

Updated core
Project: translations  2e0897ab9320fc258d9e2b47e1c33a6c524bf742

diff --git a/translations b/translations
index 99feb03..2e0897a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 99feb03d4c84ddc7fe8f17931efa1a72ff6a0cdf
+Subproject commit 2e0897ab9320fc258d9e2b47e1c33a6c524bf742
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 source/sl/helpcontent2/source/text/sbasic/shared.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2e0897ab9320fc258d9e2b47e1c33a6c524bf742
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Nov 5 13:25:46 2013 +0100

wrong title

Change-Id: I48438b2ec058fed80d6784c2e511dc7c1807b676

diff --git a/source/sl/helpcontent2/source/text/sbasic/shared.po 
b/source/sl/helpcontent2/source/text/sbasic/shared.po
index 6ccab96..4d83ab2 100644
--- a/source/sl/helpcontent2/source/text/sbasic/shared.po
+++ b/source/sl/helpcontent2/source/text/sbasic/shared.po
@@ -14335,8 +14335,8 @@ msgctxt 
 03030113.xhp\n
 tit\n
 help.text
-msgid CDateToUnoDate Function [Runtime]
-msgstr Funkcija CDateToUnoDate [med izvajanjem]
+msgid CDateToUnoTime Function [Runtime]
+msgstr Funkcija CDateToUnoTime [med izvajanjem]
 
 #: 03030113.xhp
 msgctxt 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[David Tardon]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7098f83ec3121f2fb8d077795575c600744ed85a
Author: David Tardon dtar...@redhat.com
Date:   Tue Nov 5 13:29:29 2013 +0100

add check for libodfgen version

Change-Id: I4d053c3234d93f141abbbab1412c591795c412e2

diff --git a/configure.ac b/configure.ac
index 3a398e6..26a357d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7699,7 +7699,7 @@ 
libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.0],[-I${WORKDI
 dnl ===
 dnl Check for system libodfgen
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.0])
+libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.0 = 0.0.3])
 
 dnl ===
 dnl Check for system libcdr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 67274] Gallery: Do not link inserted images

[bugzilla-daemon]

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

--- Comment #7 from Michael Meeks michael.me...@collabora.com ---
No idea but I assume code like this:

706 const Graphic aGrf( pGalleryItem-GetGraphic() );
707 
708 if ( nSelType  nsSelectionType::SEL_GRF )
709 rSh.ReRead( aGrfName, aFltName, aGrf );
710 else
711 rSh.Insert( aGrfName, aFltName, aGrf );

Creates that Graphic - and that (somehow) the GraphicObject that gets created
from that gets tagged as linked somehow - perhaps chasing rSh.Insert() and
re-read to see what parameters they take might be useful (?)

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

Re: About some deprecated glib function in telepathy modules

[Caolán McNamara]

On Mon, 2013-11-04 at 11:01 -0800, julien2412 wrote:
 Any idea? (should we update the calls with the new methods?...)

Because the warnings are in the tubes/telepathy area which isn't default
on and built on the RHEL-5 baseline and wouldn't work on that old
baseline anyway you should feel free IMO to replace the uses of the old
apis in favour of the new ones there.

C.

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ba/54ce4fc788605fc96235f432b455311faee406

[Caolán McNamara]

 ba/54ce4fc788605fc96235f432b455311faee406 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fd6cbf00aefe3101708f779908793d10d9a6d37c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 12:37:40 2013 +

Notes added by 'git notes add'

diff --git a/ba/54ce4fc788605fc96235f432b455311faee406 
b/ba/54ce4fc788605fc96235f432b455311faee406
new file mode 100644
index 000..fa1b173
--- /dev/null
+++ b/ba/54ce4fc788605fc96235f432b455311faee406
@@ -0,0 +1 @@
+merged as: 36f21914b31a28f75ec2195c266424a18408f747
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 cui/source/tabpages/tpbitmap.cxx   |   33 ++---
 drawinglayer/source/processor2d/vclprocessor2d.cxx |   15 +++--
 svx/source/xoutdev/xattrbmp.cxx|6 ++-
 3 files changed, 38 insertions(+), 16 deletions(-)

New commits:
commit 36f21914b31a28f75ec2195c266424a18408f747
Author: Armin Le Grand a...@apache.org
Date:   Tue Oct 29 17:40:43 2013 +

Resolves: i123564 corrected some aspects when working with bitmaps...

with low color depth or small size

(cherry picked from commit ba54ce4fc788605fc96235f432b455311faee406)

Conflicts:
cui/source/tabpages/tpbitmap.cxx

Change-Id: I10677414ab7d1904dbb29cd395a0c0334e0faa03

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 17e89cb..89a51a8 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -354,29 +354,40 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
 Color aPixelColor = aFront;
 Color aBackColor = aBack;
 
-m_pBitmapCtl-SetPixelColor( aPixelColor );
-m_pBitmapCtl-SetBackgroundColor( aBackColor );
+// #i123564# This causes the wrong color to be selected
+// as foreground color when the 1st bitmap in the bitmap
+// list is selected. I see no reason why this is done,
+// thus I will take it out
+//
+//if( 0 == m_pLbBitmaps-GetSelectEntryPos() )
+//{
+//  m_pLbColor-SelectEntry( Color( COL_BLACK ) );
+//  ChangePixelColorHdl_Impl( this );
+//}
+//else
+
+m_pLbColor-SelectEntry( aPixelColor );
 
-// if the entry is not in the listbox,
-// the color is added temporarily
-if( 0 == m_pLbBitmaps-GetSelectEntryPos() )
-{
-m_pLbColor-SelectEntry( Color( COL_BLACK ) );
-ChangePixelColorHdl_Impl( this );
-}
-else
-m_pLbColor-SelectEntry( aPixelColor );
 if( m_pLbColor-GetSelectEntryCount() == 0 )
 {
 m_pLbColor-InsertEntry( aPixelColor, OUString() );
 m_pLbColor-SelectEntry( aPixelColor );
 }
+
 m_pLbBackgroundColor-SelectEntry( aBackColor );
+
 if( m_pLbBackgroundColor-GetSelectEntryCount() == 0 )
 {
 m_pLbBackgroundColor-InsertEntry( aBackColor, OUString() );
 m_pLbBackgroundColor-SelectEntry( aBackColor );
 }
+
+// update m_pBitmapCtl, rXFSet and m_pCtlPreview
+m_pBitmapCtl-SetPixelColor( aPixelColor );
+m_pBitmapCtl-SetBackgroundColor( aBackColor );
+rXFSet.Put(XFillBitmapItem(OUString(), 
Graphic(m_pBitmapCtl-GetBitmapEx(;
+m_pCtlPreview-SetAttributes( aXFillAttr.GetItemSet() );
+m_pCtlPreview-Invalidate();
 }
 else
 {
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index cf5289a..1cd768e 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -484,8 +484,9 @@ namespace drawinglayer
 
aGraphicRange.transform(mpOutputDevice-GetViewTransformation() * 
aLocalTransform);
 
 // extract discrete size of graphic
-const sal_Int32 
nBWidth(basegfx::fround(aGraphicRange.getWidth()));
-const sal_Int32 
nBHeight(basegfx::fround(aGraphicRange.getHeight()));
+// caution: when getting to zero, nothing would be 
painted; thus, do not allow this
+const sal_Int32 nBWidth(std::max(sal_Int32(1), 
basegfx::fround(aGraphicRange.getWidth(;
+const sal_Int32 nBHeight(std::max(sal_Int32(1), 
basegfx::fround(aGraphicRange.getHeight(;
 
 // only do something when bitmap fill has a size 
in discrete units
 if(nBWidth  0  nBHeight  0)
@@ -497,9 +498,17 @@ namespace drawinglayer
 static bool bEnablePreScaling(true);
 const bool bPreScaled(bEnablePreScaling  
nBWidth * nBHeight  (250 * 250));
 
+// ... but only up to a maximum size, else it 
gets too expensive
 if(bPreScaled)
 {
-// ... but only up to a maximum size, else 
it gets too expensive
+// if color depth is below 24bit, expand 
before scaling for better quality.
+// This is even needed for low colors, 
else the scale will produce
+ 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - more_fonts/fonts officecfg/registry

[Caolán McNamara]

 more_fonts/fonts/fc_local.conf |   16 ++--
 officecfg/registry/data/org/openoffice/VCL.xcu |4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 8e4d52328e87e2d3ced4b6230f00980ea229f2cc
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 10 10:12:44 2013 +0100

update local font.conf for Calibri/Carlito Cambria/Caladea

Change-Id: I9391876f2b09750ad5f44483f489743581948d21

diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf
index c442c83..6af763c 100644
--- a/more_fonts/fonts/fc_local.conf
+++ b/more_fonts/fonts/fc_local.conf
@@ -11,13 +11,25 @@
  /default
/alias
 
-!-- --
alias binding=same
  familyArial Narrow/family
  accept
  familyLiberation Sans Narrow/family
  /accept
/alias
-!-- --
+
+   alias binding=same
+ familyCalibri/family
+ accept
+ familyCarlito/family
+ /accept
+   /alias
+
+   alias binding=same
+ familyCambria/family
+ accept
+ familyCaladea/family
+ /accept
+   /alias
 
 /fontconfig
commit 11853ae18e27c9b252ade624ab9011d3f0f630d5
Author: Herbert Dürr h...@apache.org
Date:   Thu Oct 10 06:57:44 2013 +

#i123456# add Caladea and Carlito as fallback fonts
(cherry picked from commit c98566be40d6991467dde665af3eb0085d4ad80c)

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index e3b506a..71ff091 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -1534,7 +1534,7 @@
   /node
   node oor:name=calibri oor:op=replace
 prop oor:name=SubstFonts
-  valuehiraginomarugothicpronw3;hiraginomarugothicprow3/value
+  
valuecarlito;hiraginomarugothicpronw3;hiraginomarugothicprow3/value
 /prop
 prop oor:name=FontType
   valueNormal,SansSerif/value
@@ -1553,7 +1553,7 @@
   /node
   node oor:name=cambria oor:op=replace
 prop oor:name=SubstFonts
-  valueapplelisung/value
+  valuecaladea;applelisung/value
 /prop
 prop oor:name=FontType
   valueNormal,Serif/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 source/text/sbasic/shared/03030111.xhp |4 ++--
 source/text/sbasic/shared/03030112.xhp |4 ++--
 source/text/sbasic/shared/03030113.xhp |4 ++--
 source/text/sbasic/shared/03030114.xhp |4 ++--
 source/text/sbasic/shared/03030115.xhp |2 +-
 source/text/sbasic/shared/03030116.xhp |2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 7e453f7aa00ad02def99283bd32a096615530f8e
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 13:44:54 2013 +0100

basic code not localisable

Change-Id: Ifcc4985afac1f62787d317352bdb45a490d71963

diff --git a/source/text/sbasic/shared/03030111.xhp 
b/source/text/sbasic/shared/03030111.xhp
index 16d6de5..5673e62 100644
--- a/source/text/sbasic/shared/03030111.xhp
+++ b/source/text/sbasic/shared/03030111.xhp
@@ -50,8 +50,8 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateToUnoDate/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  aDatabaseRow.updateDate(3, CDateToUnoDate(Now))/paragraph
-  paragraph role=bascode id=par_id3153127 xml-lang=en-US l10n=U  
  aDateControl.Date = CDateToUnoDate(Now)/paragraph
+  paragraph role=bascode localize=false id=par_id3153126 
xml-lang=en-US l10n=UaDatabaseRow.updateDate(3, 
CDateToUnoDate(Now))/paragraph
+  paragraph role=bascode localize=false id=par_id3153127 
xml-lang=en-US l10n=UaDateControl.Date = 
CDateToUnoDate(Now)/paragraph
   paragraph role=bascode localize=false xml-lang=en-USEnd 
Sub/paragraph
 /bascode
 /body
diff --git a/source/text/sbasic/shared/03030112.xhp 
b/source/text/sbasic/shared/03030112.xhp
index 9772106..ef4fb3e 100644
--- a/source/text/sbasic/shared/03030112.xhp
+++ b/source/text/sbasic/shared/03030112.xhp
@@ -50,8 +50,8 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateFromUnoDate/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoDate(aDatabaseRow.getDate(3)))/paragraph
-  paragraph role=bascode id=par_id3153127 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoDate(aDateControl.Date))/paragraph
+  paragraph role=bascode localize=false id=par_id3153126 
xml-lang=en-US l10n=U
MsgBox(CDateFromUnoDate(aDatabaseRow.getDate(3)))/paragraph
+  paragraph role=bascode localize=false id=par_id3153127 
xml-lang=en-US l10n=U
MsgBox(CDateFromUnoDate(aDateControl.Date))/paragraph
   paragraph role=bascode localize=false xml-lang=en-USEnd 
Sub/paragraph
 /bascode
 /body
diff --git a/source/text/sbasic/shared/03030113.xhp 
b/source/text/sbasic/shared/03030113.xhp
index 257f6a1..9d95b88 100644
--- a/source/text/sbasic/shared/03030113.xhp
+++ b/source/text/sbasic/shared/03030113.xhp
@@ -50,8 +50,8 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateToUnoTime/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  aDatabaseRow.updateTime(3, CDateToUnoTime(Now))/paragraph
-  paragraph role=bascode id=par_id3153127 xml-lang=en-US l10n=U  
  aTimeControl.Time = CDateToUnoTime(Now)/paragraph
+  paragraph role=bascode localize=false id=par_id3153126 
xml-lang=en-US l10n=UaDatabaseRow.updateTime(3, 
CDateToUnoTime(Now))/paragraph
+  paragraph role=bascode localize=false id=par_id3153127 
xml-lang=en-US l10n=UaTimeControl.Time = 
CDateToUnoTime(Now)/paragraph
   paragraph role=bascode localize=false xml-lang=en-USEnd 
Sub/paragraph
 /bascode
 /body
diff --git a/source/text/sbasic/shared/03030114.xhp 
b/source/text/sbasic/shared/03030114.xhp
index c4d780f..95476a7 100644
--- a/source/text/sbasic/shared/03030114.xhp
+++ b/source/text/sbasic/shared/03030114.xhp
@@ -50,8 +50,8 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateFromUnoTime/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoTime(aDatabaseRow.getTime(3)))/paragraph
-  paragraph role=bascode id=par_id3153127 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoTime(aTimeControl.Time))/paragraph
+  paragraph role=bascode localize=false id=par_id3153126 
xml-lang=en-US l10n=U
MsgBox(CDateFromUnoTime(aDatabaseRow.getTime(3)))/paragraph
+  paragraph role=bascode localize=false id=par_id3153127 
xml-lang=en-US l10n=U
MsgBox(CDateFromUnoTime(aTimeControl.Time))/paragraph
   paragraph role=bascode localize=false xml-lang=en-USEnd 
Sub/paragraph
 /bascode
 /body
diff --git 

[Libreoffice-commits] core.git: helpcontent2

[Lionel Elie Mamane]

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

New commits:
commit bb60c5a877057918b59de08207e83aa284d281cc
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 13:44:54 2013 +0100

Updated core
Project: help  7e453f7aa00ad02def99283bd32a096615530f8e

diff --git a/helpcontent2 b/helpcontent2
index fed6483..7e453f7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fed648365a724a068113c6491d380fab67b5f5da
+Subproject commit 7e453f7aa00ad02def99283bd32a096615530f8e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-4-1' - source/text

[Lionel Elie Mamane]

 source/text/sbasic/shared/03030111.xhp |4 ++--
 source/text/sbasic/shared/03030112.xhp |4 ++--
 source/text/sbasic/shared/03030113.xhp |4 ++--
 source/text/sbasic/shared/03030114.xhp |4 ++--
 source/text/sbasic/shared/03030115.xhp |2 +-
 source/text/sbasic/shared/03030116.xhp |2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 1acc4c2f499813c5b4b88830b8fb111e89d84098
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:08:25 2013 +0100

fixup examples of CDate(From|To)Uno(Date|Time|DateTime)

also mark them as non-localizable

Change-Id: I547317d52bf08bcfb0954267e25ce5f2881d1c75
Reviewed-on: https://gerrit.libreoffice.org/6578
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/source/text/sbasic/shared/03030111.xhp 
b/source/text/sbasic/shared/03030111.xhp
index a38e325..9b13464 100644
--- a/source/text/sbasic/shared/03030111.xhp
+++ b/source/text/sbasic/shared/03030111.xhp
@@ -50,8 +50,8 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateToUnoDate/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  aDatabaseRow.updateDate(3, CDateToUnoDate(Now))/paragraph
-  paragraph role=bascode id=par_id3153127 xml-lang=en-US l10n=U  
  aDateControl.Date = CDateToUnoDate(Now)/paragraph
+  paragraph role=bascode localize=false id=par_id3153126 
xml-lang=en-US l10n=UaDatabaseRow.updateDate(3, 
CDateToUnoDate(Now))/paragraph
+  paragraph role=bascode localize=false id=par_id3153127 
xml-lang=en-US l10n=UaDateControl.Date = 
CDateToUnoDate(Now)/paragraph
   paragraph role=bascode localize=false xml-lang=en-USEnd 
Sub/paragraph
 /bascode
 /body
diff --git a/source/text/sbasic/shared/03030112.xhp 
b/source/text/sbasic/shared/03030112.xhp
index d435880..bfa889d 100644
--- a/source/text/sbasic/shared/03030112.xhp
+++ b/source/text/sbasic/shared/03030112.xhp
@@ -50,8 +50,8 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateFromUnoDate/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  MsgBox(aDatabaseRow.getDate(3))/paragraph
-  paragraph role=bascode id=par_id3153127 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoDate(aDateControl.Date))/paragraph
+  paragraph role=bascode localize=false id=par_id3153126 
xml-lang=en-US l10n=U
MsgBox(CDateFromUnoDate(aDatabaseRow.getDate(3)))/paragraph
+  paragraph role=bascode localize=false id=par_id3153127 
xml-lang=en-US l10n=U
MsgBox(CDateFromUnoDate(aDateControl.Date))/paragraph
   paragraph role=bascode localize=false xml-lang=en-USEnd 
Sub/paragraph
 /bascode
 /body
diff --git a/source/text/sbasic/shared/03030113.xhp 
b/source/text/sbasic/shared/03030113.xhp
index 4e63cd1..6957d16 100644
--- a/source/text/sbasic/shared/03030113.xhp
+++ b/source/text/sbasic/shared/03030113.xhp
@@ -50,8 +50,8 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateToUnoTime/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  aDatabaseRow.updateTime(3, CDateToUnoTime(Now))/paragraph
-  paragraph role=bascode id=par_id3153127 xml-lang=en-US l10n=U  
  aTimeControl.Time = CDateToUnoTime(Now)/paragraph
+  paragraph role=bascode localize=false id=par_id3153126 
xml-lang=en-US l10n=UaDatabaseRow.updateTime(3, 
CDateToUnoTime(Now))/paragraph
+  paragraph role=bascode localize=false id=par_id3153127 
xml-lang=en-US l10n=UaTimeControl.Time = 
CDateToUnoTime(Now)/paragraph
   paragraph role=bascode localize=false xml-lang=en-USEnd 
Sub/paragraph
 /bascode
 /body
diff --git a/source/text/sbasic/shared/03030114.xhp 
b/source/text/sbasic/shared/03030114.xhp
index 833cf2b..eec641b 100644
--- a/source/text/sbasic/shared/03030114.xhp
+++ b/source/text/sbasic/shared/03030114.xhp
@@ -50,8 +50,8 @@
 paragraph role=heading id=hd_id3147243 xml-lang=en-US level=2 
l10n=U oldref=9Example:/paragraph
 bascode
   paragraph role=bascode localize=false xml-lang=en-USSub 
ExampleCDateFromUnoTime/paragraph
-  paragraph role=bascode id=par_id3153126 xml-lang=en-US l10n=U  
  MsgBox(aDatabaseRow.getTime(3))/paragraph
-  paragraph role=bascode id=par_id3153127 xml-lang=en-US l10n=U  
  MsgBox(CDateFromUnoTime(aTimeControl.Time))/paragraph
+  paragraph role=bascode localize=false id=par_id3153126 
xml-lang=en-US l10n=U
MsgBox(CDateFromUnoTime(aDatabaseRow.getTime(3)))/paragraph
+  paragraph role=bascode localize=false id=par_id3153127 
xml-lang=en-US l10n=U 

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

[Lionel Elie Mamane]

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

New commits:
commit 60dd61d4466552371a99854fdb1fad5179878727
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 5 10:08:25 2013 +0100

Updated core
Project: help  1acc4c2f499813c5b4b88830b8fb111e89d84098

fixup examples of CDate(From|To)Uno(Date|Time|DateTime)

also mark them as non-localizable

Change-Id: I547317d52bf08bcfb0954267e25ce5f2881d1c75
Reviewed-on: https://gerrit.libreoffice.org/6578
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/helpcontent2 b/helpcontent2
index 4504861..1acc4c2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 450486167016110462b82d2c337c12bfc4e3a56b
+Subproject commit 1acc4c2f499813c5b4b88830b8fb111e89d84098
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Accessible labels in alerts claim to be ROLE_PASSWORD_TEXT

[Caolán McNamara]

On Mon, 2013-11-04 at 17:07 +0100, Niklas Johansson wrote:
 Yes, I tried that while debugging the issue and it makes it better. It 
 now reports as ROLE_TEXT but since the text in our message boxes are 
 copyable that might be better than reporting it as ROLE_LABEL.
 
 An other issue around this message box was the VclBox surrounding the 
 buttons, that gets the role FILLER but should probably have the role 
 PANEL. Changing the sal_uInt16 VclBox::getDefaultAccessibleRole() 
 const to return PANEL made NVDA read the dialog content when the dialog 
 got displayed.

There is no problem in changing it from FILLER to PANEL if that's the
right thing to do. But what happens in a normal gtk message dialog ?

If I cook up a super simple one in glade and use glade-previewer -f
simplemessage.ui and use the python code in the original code I get
6. [filler] for the GtkButtonBox that contains the buttons. 

In general where I'm hoping to get to is that LibreOffice reports the
same sort of hierarchy and types for a .ui that gtk would if it was
rendering it. I *think* gtk defaults to PANEL for containers but FILLER
for GtkBox, which is where those defaults in layout.cxx come from.

C.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - officecfg/registry

[Caolán McNamara]

 officecfg/registry/data/org/openoffice/VCL.xcu |   24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 9037966caf65544400f8441c733c061a5b8de32f
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Oct 23 15:13:19 2013 +0100

Set carlito/calibri caladea/cambria as MSOffice export replacements

so when we save one of our files that uses the chromium fonts to e.g. .doc 
we
can set the in-file recommended fallback font to the MS equivalents to tell
MSOffice what to use.

Change-Id: Ia04022c91a7c43729ef315011addf33c316619ee
Reviewed-on: https://gerrit.libreoffice.org/6585
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index b73dacc..e3b506a 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -1540,7 +1540,13 @@
   valueNormal,SansSerif/value
 /prop
   /node
-  node oor:name=candara oor:op=replace
+  node oor:name=carlito oor:op=replace
+prop oor:name=SubstFonts
+  
valuecalibri;hiraginomarugothicpronw3;hiraginomarugothicprow3/value
+/prop
+prop oor:name=SubstFontsMS
+  valueCalibri/value
+/prop
 prop oor:name=FontType
   valueNormal,SansSerif/value
 /prop
@@ -1553,6 +1559,22 @@
   valueNormal,Serif/value
 /prop
   /node
+  node oor:name=caladea oor:op=replace
+prop oor:name=SubstFonts
+  valuecambria;applelisung/value
+/prop
+prop oor:name=SubstFontsMS
+  valueCambria/value
+/prop
+prop oor:name=FontType
+  valueNormal,Serif/value
+/prop
+  /node
+  node oor:name=candara oor:op=replace
+prop oor:name=FontType
+  valueNormal,SansSerif/value
+/prop
+  /node
   node oor:name=consolas oor:op=replace
 prop oor:name=FontType
   valueNormal,SansSerif,Fixed/value
___
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' - more_fonts/fonts

[Caolán McNamara]

 more_fonts/fonts/fc_local.conf |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit a046875b590bb840790a0d2aa2f63154d0d2f9a8
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 10 10:12:44 2013 +0100

update local font.conf for Calibri/Carlito Cambria/Caladea

Change-Id: I9391876f2b09750ad5f44483f489743581948d21
Reviewed-on: https://gerrit.libreoffice.org/6587
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com

diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf
index c442c83..6af763c 100644
--- a/more_fonts/fonts/fc_local.conf
+++ b/more_fonts/fonts/fc_local.conf
@@ -11,13 +11,25 @@
  /default
/alias
 
-!-- --
alias binding=same
  familyArial Narrow/family
  accept
  familyLiberation Sans Narrow/family
  /accept
/alias
-!-- --
+
+   alias binding=same
+ familyCalibri/family
+ accept
+ familyCarlito/family
+ /accept
+   /alias
+
+   alias binding=same
+ familyCambria/family
+ accept
+ familyCaladea/family
+ /accept
+   /alias
 
 /fontconfig
___
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' - officecfg/registry

[Herbert Dürr]

 officecfg/registry/data/org/openoffice/VCL.xcu |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a14cd9c11b6875ba227982bbc7864107cb70d8e6
Author: Herbert Dürr h...@apache.org
Date:   Thu Oct 10 06:57:44 2013 +

 #i123456# add Caladea and Carlito as fallback fonts

(cherry picked from commit c98566be40d6991467dde665af3eb0085d4ad80c)

Change-Id: I987c841cb697c829bd9fdeeacb5eb5ac05043f68
Reviewed-on: https://gerrit.libreoffice.org/6588
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index e3b506a..71ff091 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -1534,7 +1534,7 @@
   /node
   node oor:name=calibri oor:op=replace
 prop oor:name=SubstFonts
-  valuehiraginomarugothicpronw3;hiraginomarugothicprow3/value
+  
valuecarlito;hiraginomarugothicpronw3;hiraginomarugothicprow3/value
 /prop
 prop oor:name=FontType
   valueNormal,SansSerif/value
@@ -1553,7 +1553,7 @@
   /node
   node oor:name=cambria oor:op=replace
 prop oor:name=SubstFonts
-  valueapplelisung/value
+  valuecaladea;applelisung/value
 /prop
 prop oor:name=FontType
   valueNormal,Serif/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source editeng/source formula/source linguistic/source sc/source sw/source vcl/source vcl/win

[Noel Grandin]

 cui/source/dialogs/hyphen.cxx|9 -
 cui/source/dialogs/postdlg.cxx   |2 +-
 editeng/source/misc/svxacorr.cxx |2 +-
 formula/source/ui/dlg/FormulaHelper.cxx  |6 +++---
 linguistic/source/misc.cxx   |7 +++
 sc/source/core/data/dptabres.cxx |4 ++--
 sc/source/core/tool/address.cxx  |4 ++--
 sc/source/core/tool/compiler.cxx |   10 --
 sc/source/core/tool/rangenam.cxx |4 ++--
 sc/source/filter/excel/excimp8.cxx   |4 ++--
 sc/source/filter/excel/xicontent.cxx |2 +-
 sc/source/filter/ftools/ftools.cxx   |2 +-
 sc/source/ui/app/inputhdl.cxx|2 +-
 sc/source/ui/navipi/content.cxx  |6 +++---
 sc/source/ui/optdlg/tpusrlst.cxx |4 ++--
 sc/source/ui/pagedlg/areasdlg.cxx|   10 +-
 sc/source/ui/view/output2.cxx|2 +-
 sc/source/ui/view/viewfunc.cxx   |9 -
 sw/source/core/doc/acmplwrd.cxx  |2 +-
 sw/source/core/doc/doclay.cxx|   18 +-
 sw/source/core/doc/doctxm.cxx|6 +++---
 sw/source/core/edit/autofmt.cxx  |4 ++--
 sw/source/core/edit/edattr.cxx   |2 +-
 sw/source/core/fields/ddefld.cxx |2 +-
 sw/source/core/table/swtable.cxx |2 +-
 sw/source/core/text/itratr.cxx   |2 +-
 sw/source/core/text/txtdrop.cxx  |2 +-
 sw/source/core/txtnode/fntcache.cxx  |8 
 sw/source/core/txtnode/ndtxt.cxx |8 
 sw/source/core/txtnode/swfont.cxx|2 +-
 sw/source/core/txtnode/txtedt.cxx|   14 +++---
 sw/source/core/undo/unovwr.cxx   |2 +-
 sw/source/filter/html/htmlfly.cxx|2 +-
 sw/source/filter/html/swhtml.cxx |2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 sw/source/filter/ww8/docxexport.cxx  |2 +-
 sw/source/filter/ww8/rtfsdrexport.cxx|2 +-
 sw/source/filter/ww8/wrtw8esh.cxx|2 +-
 sw/source/filter/ww8/ww8glsy.cxx |2 +-
 sw/source/filter/ww8/ww8par.cxx  |4 ++--
 sw/source/ui/envelp/envimg.cxx   |2 +-
 sw/source/ui/lingu/hhcwrp.cxx|2 +-
 vcl/source/gdi/outdev3.cxx   |6 +++---
 vcl/win/source/window/salframe.cxx   |2 +-
 44 files changed, 94 insertions(+), 99 deletions(-)

New commits:
commit a6dc113734385cbf37db7ff1804f5276530f78f7
Author: Noel Grandin n...@peralex.com
Date:   Mon Oct 28 15:41:25 2013 +0200

convert xub_StrLen to sal_Int32

Convert code like:
   xub_StrLen nLen = aStr.getLength();
into
   sal_Int32 nLen = aStr.getLength();

Change-Id: Ib0af6b747068257478918fd1cc93e4925f32ac47

diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index fffb3fc..ca46130 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -76,11 +76,10 @@ void HyphenEdit::KeyInput( const KeyEvent rKEvt )
 void SvxHyphenWordDialog::EnableLRBtn_Impl()
 {
 OUString  aTxt( aEditWord );
-xub_StrLen nLen = aTxt.getLength();
-xub_StrLen i;
+sal_Int32 nLen = aTxt.getLength();
 
 m_pRightBtn-Disable();
-for ( i = nOldPos + 2; i  nLen; ++i )
+for ( sal_Int32 i = nOldPos + 2; i  nLen; ++i )
 {
 if ( aTxt[ i ] == sal_Unicode( HYPH_POS_CHAR ) )
 {
@@ -93,7 +92,7 @@ void SvxHyphenWordDialog::EnableLRBtn_Impl()
 if (nOldPos = aTxt.getLength())
 nOldPos = aTxt.getLength() - 1;
 m_pLeftBtn-Disable();
-for ( i = nOldPos;  i--  0; )
+for ( sal_Int32 i = nOldPos;  i--  0; )
 {
 if ( aTxt[ i ] == sal_Unicode( HYPH_POS_CHAR ) )
 {
@@ -328,7 +327,7 @@ void SvxHyphenWordDialog::SelLeft()
 void SvxHyphenWordDialog::SelRight()
 {
 OUString aTxt( aEditWord );
-for ( xub_StrLen i = nOldPos + 1;  i  aTxt.getLength();  ++i )
+for ( sal_Int32 i = nOldPos + 1;  i  aTxt.getLength();  ++i )
 {
 if (aTxt[ i ] == sal_Unicode( HYPH_POS_CHAR ))
 {
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 9f3ea3e..adc1a5d 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -201,7 +201,7 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
 aStr = convertLineEnd(aStr, GetSystemLineEnd());
 
 m_pEditED-SetText(aStr);
-xub_StrLen nLen = aStr.getLength();
+sal_Int32 nLen = aStr.getLength();
 m_pEditED-GrabFocus();
 m_pEditED-SetSelection( Selection( nLen, nLen ) );
 return 0;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 4479705..a459c67 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1048,7 +1048,7 @@ 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - download.lst Makefile.fetch more_fonts/ExternalPackage_caladea.mk more_fonts/ExternalPackage_carlito.mk more_fonts/Module_more_fonts.mk more_

[Caolán McNamara]

 Makefile.fetch|2 ++
 download.lst  |2 ++
 more_fonts/ExternalPackage_caladea.mk |   21 +
 more_fonts/ExternalPackage_carlito.mk |   21 +
 more_fonts/Module_more_fonts.mk   |4 
 more_fonts/UnpackedTarball_caladea.mk |   14 ++
 more_fonts/UnpackedTarball_carlito.mk |   14 ++
 scp2/source/ooo/file_font_ooo.scp |4 
 scp2/source/ooo/module_hidden_ooo.scp |2 ++
 9 files changed, 84 insertions(+)

New commits:
commit 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Oct 23 14:57:32 2013 +0100

bundle Carlito and Caladea

Change-Id: Ibb68ad33764bcbab88e68c35805a00287177a5c8
Reviewed-on: https://gerrit.libreoffice.org/6586
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/Makefile.fetch b/Makefile.fetch
index e743d62..cde2e86 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -96,6 +96,8 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,EPM,$(EPM_TARBALL)) \
$(call fetch_Optional,EXPAT,$(EXPAT_TARBALL)) \
$(call fetch_Optional,MARIADB,$(MARIADB_TARBALL)) \
+   $(call fetch_Optional,MORE_FONTS,$(FONT_CALADEA_TARBALL)) \
+   $(call fetch_Optional,MORE_FONTS,$(FONT_CARLITO_TARBALL)) \
$(call fetch_Optional,MORE_FONTS,$(FONT_DEJAVU_TARBALL)) \
$(call fetch_Optional,MORE_FONTS,$(FONT_GENTIUM_TARBALL)) \
$(call 
fetch_Optional,MORE_FONTS,$(FONT_LIBERATION_NARROW_TARBALL)) \
diff --git a/download.lst b/download.lst
index 996a509..ea91017 100644
--- a/download.lst
+++ b/download.lst
@@ -24,6 +24,8 @@ export DBGHELP_DLL := 
13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
 export FONTCONFIG_TARBALL := 
77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz
+export FONT_CALADEA_TARBALL := 
368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
+export FONT_CARLITO_TARBALL := 
c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
 export FONT_DEJAVU_TARBALL := 
f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip
 export FONT_GENTIUM_TARBALL := 
35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
 export FONT_LIBERATION_NARROW_TARBALL := 
0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz
diff --git a/more_fonts/ExternalPackage_caladea.mk 
b/more_fonts/ExternalPackage_caladea.mk
new file mode 100644
index 000..668fb5b
--- /dev/null
+++ b/more_fonts/ExternalPackage_caladea.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_caladea,font_caladea))
+
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_caladea,$(INSTDIR)))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_caladea,share/fonts/truetype,\
+   Caladea-Italic.ttf \
+   Caladea-Regular.ttf \
+   Caladea-BoldItalic.ttf \
+   Caladea-Bold.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_carlito.mk 
b/more_fonts/ExternalPackage_carlito.mk
new file mode 100644
index 000..e0a9cff
--- /dev/null
+++ b/more_fonts/ExternalPackage_carlito.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_carlito,font_carlito))
+
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_carlito,$(INSTDIR)))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_carlito,share/fonts/truetype,\
+   Carlito-BoldItalic.ttf \
+   Carlito-Regular.ttf \
+   Carlito-Italic.ttf \
+   Carlito-Bold.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Module_more_fonts.mk b/more_fonts/Module_more_fonts.mk
index c9a75148..3f4a653 100644
--- a/more_fonts/Module_more_fonts.mk
+++ b/more_fonts/Module_more_fonts.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_Module_Module,more_fonts))
 
 $(eval $(call gb_Module_add_targets,more_fonts,\
Package_conf \
+   ExternalPackage_caladea \
+   ExternalPackage_carlito \
ExternalPackage_dejavu \

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

[Markus Mohrhard]

 sfx2/source/doc/docmacromode.cxx |   29 ++---
 1 file changed, 14 insertions(+), 15 deletions(-)

New commits:
commit 62308b65adf5980875753da4069156af79fbbfd4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sat Nov 2 23:29:27 2013 +0100

don't warn for empty VBA structure, fdo#61059

Change-Id: I0d0f7fa216fcea7ca893120ad183dc3758ca51d4
(cherry picked from commit 2e803712c4c2b844dab1fefdfbda12058a5f1ab7)
Reviewed-on: https://gerrit.libreoffice.org/6573
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 83d5572..39d2b6d 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -332,25 +332,24 @@ namespace sfx2
 else
 {
 OUString aStdLibName( Standard );
+OUString aVBAProject( VBAProject );
 Sequence OUString  aElements = 
xContainer-getElementNames();
 if ( aElements.getLength() )
 {
-if ( aElements.getLength()  1 || 
!aElements[0].equals( aStdLibName ) )
-bHasMacroLib = sal_True;
-else
+sal_Int32 nElements = aElements.getLength();
+for( sal_Int32 i = 0; i  nElements; ++i )
 {
-// usually a Standard library is always present 
(design)
-// for this reason we must check if it's empty
-//
-// Note: Since #i73229#, this is not true anymore. 
There's no default
-// Standard lib anymore. Wouldn't it be time to 
get completely
-// rid of the Standard thingie - this shouldn't 
be necessary
-// anymore, should it?
-Reference  XNameAccess  xLib;
-Any aAny = xContainer-getByName( aStdLibName );
-aAny = xLib;
-if ( xLib.is() )
-bHasMacroLib = xLib-hasElements();
+OUString aElement = aElements[i];
+if( aElement == aStdLibName || aElement == 
aVBAProject )
+{
+Reference  XNameAccess  xLib;
+Any aAny = xContainer-getByName( aStdLibName 
);
+aAny = xLib;
+if ( xLib.is()  xLib-hasElements() )
+return sal_True;
+}
+else
+return sal_True;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: configure.ac src/conv src/Makefile.am

[Fridrich Štrba]

 configure.ac  |1 +
 src/Makefile.am   |5 -
 src/conv/Makefile.am  |4 
 src/conv/raw/Makefile.am  |4 
 src/conv/svg/Makefile.am  |4 
 src/conv/text/Makefile.am |4 
 6 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit bcce044ce26cea0d863cef8fd34d7cda7182caf6
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Nov 5 14:26:50 2013 +0100

--disable-tools actually working

Change-Id: I83bd3e4c35d2a250b61626aa826b473c5d6edd14

diff --git a/configure.ac b/configure.ac
index 5b3f67b..969bc45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,6 +346,7 @@ AC_MSG_NOTICE([
 Build configuration:
debug:   ${enable_debug}
docs:${build_docs}
+   tools:   ${enable_tools}
werror:  ${enable_werror}
 ==
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index d56ced2..64fd45e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,5 @@
-SUBDIRS = lib conv
+SUBDIRS = lib
 
+if BUILD_TOOLS
+SUBDIRS += conv
+endif
diff --git a/src/conv/Makefile.am b/src/conv/Makefile.am
index 189bcd4..f46e7d9 100644
--- a/src/conv/Makefile.am
+++ b/src/conv/Makefile.am
@@ -1 +1,5 @@
+if BUILD_TOOLS
+
 SUBDIRS = raw svg text
+
+endif
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 3c7c474..7ef88ee 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
 bin_PROGRAMS = vsd2raw vss2raw
 
 AM_CXXFLAGS = \
@@ -52,3 +54,5 @@ EXTRA_DIST = \
 BUILD_EXTRA_DIST = \
vsd2raw.rc \
vss2raw.rc  
+
+endif
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index d366cd0..6f24fc6 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
 bin_PROGRAMS = vsd2xhtml vss2xhtml
 
 AM_CXXFLAGS = \
@@ -52,3 +54,5 @@ EXTRA_DIST = \
 BUILD_EXTRA_DIST = \
vsd2xhtml.rc \
vss2xhtml.rc
+
+endif
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 5e3a1d9..7b08e81 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
 bin_PROGRAMS = vsd2text vss2text
 
 AM_CXXFLAGS = \
@@ -49,3 +51,5 @@ EXTRA_DIST = \
 BUILD_EXTRA_DIST = \
vsd2text.rc \
vss2text.rc 
+
+endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65108] Clean-up header includes (global/local)

[bugzilla-daemon]

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

--- Comment #13 from Tor Lillqvist t...@iki.fi ---
A conforming compiler is also allowed to support only 16-bit integers (or other
similar stuff), so I don't really see the point in bringing up theoretical
restrictions that no real-life compiler that our code would get near to has.

-- 
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] libvisio.git: src/conv

[Fridrich Štrba]

 src/conv/text/Makefile.am  |3 ++
 src/conv/text/vsd2text.cpp |   67 +
 src/conv/text/vss2text.cpp |   67 +
 3 files changed, 7 insertions(+), 130 deletions(-)

New commits:
commit 325248eff211f52fbd8fd41835b942194b94a7a4
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Nov 5 14:45:02 2013 +0100

Use RVNGTextDrawingGenerator

Change-Id: Ie775928694fd562d380e6f9600d31e5911d48b8c

diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 7b08e81..6be006f 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -6,6 +6,7 @@ AM_CXXFLAGS = \
-I$(top_srcdir)/inc \
$(LIBVISIO_CXXFLAGS) \
$(REVENGE_STREAM_CFLAGS) \
+   $(REVENGE_GENERATORS_CFLAGS) \
$(DEBUG_CXXFLAGS)
 
 vsd2text_DEPENDENCIES = @VSD2TEXT_WIN32_RESOURCE@
@@ -14,12 +15,14 @@ vss2text_DEPENDENCIES = @VSS2TEXT_WIN32_RESOURCE@
 
 vsd2text_LDADD = \
../../lib/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.la \
+   $(REVENGE_GENERATORS_LIBS) \
$(LIBVISIO_LIBS) \
$(REVENGE_STREAM_LIBS) \
@VSD2TEXT_WIN32_RESOURCE@
 
 vss2text_LDADD = \
../../lib/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.la \
+   $(REVENGE_GENERATORS_LIBS) \
$(LIBVISIO_LIBS) \
$(REVENGE_STREAM_LIBS) \
@VSS2TEXT_WIN32_RESOURCE@
diff --git a/src/conv/text/vsd2text.cpp b/src/conv/text/vsd2text.cpp
index ff1652b..e843fa4 100644
--- a/src/conv/text/vsd2text.cpp
+++ b/src/conv/text/vsd2text.cpp
@@ -32,73 +32,10 @@
 #include string.h
 
 #include librevenge-stream/librevenge-stream.h
+#include librevenge-generators/librevenge-generators.h
 #include librevenge/librevenge.h
 #include libvisio/libvisio.h
 
-class TextPainter : public librevenge::RVNGDrawingInterface
-{
-public:
-  TextPainter();
-
-  void startDocument(const librevenge::RVNGPropertyList  /*propList*/) {}
-  void endDocument() {}
-  void setDocumentMetaData(const librevenge::RVNGPropertyList  /*propList*/) 
{}
-  void startPage(const librevenge::RVNGPropertyList ) {}
-  void endPage() {}
-  void startLayer(const librevenge::RVNGPropertyList ) {}
-  void endLayer() {}
-  void startEmbeddedGraphics(const librevenge::RVNGPropertyList ) {}
-  void endEmbeddedGraphics() {}
-
-  void setStyle(const librevenge::RVNGPropertyList , const 
librevenge::RVNGPropertyListVector ) {}
-
-  void drawRectangle(const librevenge::RVNGPropertyList ) {}
-  void drawEllipse(const librevenge::RVNGPropertyList ) {}
-  void drawPolyline(const librevenge::RVNGPropertyListVector ) {}
-  void drawPolygon(const librevenge::RVNGPropertyListVector ) {}
-  void drawPath(const librevenge::RVNGPropertyListVector ) {}
-  void drawGraphicObject(const librevenge::RVNGPropertyList , const 
librevenge::RVNGBinaryData ) {}
-  void startTextObject(const librevenge::RVNGPropertyList , const 
librevenge::RVNGPropertyListVector ) {}
-  void endTextObject() {}
-
-
-  void openOrderedListLevel(const librevenge::RVNGPropertyList  /*propList*/) 
{}
-  void closeOrderedListLevel() {}
-
-  void openUnorderedListLevel(const librevenge::RVNGPropertyList  
/*propList*/) {}
-  void closeUnorderedListLevel() {}
-
-  void openListElement(const librevenge::RVNGPropertyList  /*propList*/, 
const librevenge::RVNGPropertyListVector  /* tabStops */) {}
-  void closeListElement() {}
-
-  void openParagraph(const librevenge::RVNGPropertyList  /*propList*/, const 
librevenge::RVNGPropertyListVector  /* tabStops */) {}
-  void closeParagraph();
-
-  void openSpan(const librevenge::RVNGPropertyList  /* propList */) {}
-  void closeSpan() {}
-
-  void insertTab() {}
-  void insertSpace() {}
-  void insertText(const librevenge::RVNGString text);
-  void insertLineBreak() {}
-  void insertField(const librevenge::RVNGString  /* type */, const 
librevenge::RVNGPropertyList  /*propList*/) {}
-
-};
-
-TextPainter::TextPainter(): librevenge::RVNGDrawingInterface()
-{
-}
-
-void TextPainter::insertText(const librevenge::RVNGString str)
-{
-  printf(%s, str.cstr());
-}
-
-void TextPainter::closeParagraph()
-{
-  printf(\n);
-}
-
 namespace
 {
 
@@ -139,7 +76,7 @@ int main(int argc, char *argv[])
 return 1;
   }
 
-  TextPainter painter;
+  librevenge::RVNGTextDrawingGenerator painter;
   if (!libvisio::VisioDocument::parse(input, painter))
   {
 fprintf(stderr, ERROR: Parsing of document failed!\n);
diff --git a/src/conv/text/vss2text.cpp b/src/conv/text/vss2text.cpp
index aa5b55a..217dc62 100644
--- a/src/conv/text/vss2text.cpp
+++ b/src/conv/text/vss2text.cpp
@@ -32,73 +32,10 @@
 #include string.h
 
 #include librevenge-stream/librevenge-stream.h
+#include librevenge-generators/librevenge-generators.h
 #include librevenge/librevenge.h
 #include libvisio/libvisio.h
 
-class TextPainter : public librevenge::RVNGDrawingInterface
-{
-public:
-  TextPainter();
-
-  void startDocument(const librevenge::RVNGPropertyList  /*propList*/) {}
-  void 

[Libreoffice-commits] Changes to 'libcdr-0.0'

[Julien Nabet]

New branch 'libcdr-0.0' available with the following commits:
___
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' - sc/source

[Kohei Yoshida]

 sc/source/core/tool/address.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit d655c6d839abcc2a7eb1c7b6c5ad7cd98da716c2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Nov 4 23:31:51 2013 -0500

Using OUStringBuffer is faster than chained += operator.

Change-Id: I9991028ddd8ab6e2e43fe9a19428c9fdfbd38db6

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 4f465f9..039b256 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -65,6 +65,7 @@ static const sal_Unicode* lcl_ParseQuotedName( const 
sal_Unicode* p, OUString r
 if (*p != '\'')
 return p;
 
+OUStringBuffer aBuf;
 const sal_Unicode* pStart = p;
 sal_Unicode cPrev = 0;
 for (++p; *p; ++p)
@@ -74,19 +75,22 @@ static const sal_Unicode* lcl_ParseQuotedName( const 
sal_Unicode* p, OUString r
 if (cPrev == '\'')
 {
 // double single-quote equals one single quote.
-rName += OUString(*p);
+aBuf.append(*p);
 cPrev = 0;
 continue;
 }
 }
 else if (cPrev == '\'')
+{
 // We are past the closing quote.  We're done!
+rName = aBuf.makeStringAndClear();
 return p;
+}
 else
-rName += OUString(*p);
+aBuf.append(*p);
 cPrev = *p;
 }
-rName = ;
+
 return pStart;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: what this error

[Christian Lohmaier]

Hi *,

On Mon, Nov 4, 2013 at 12:18 PM, Soliman Eldebaky
soliman.mou...@gmail.com wrote:
 : *
 : ERROR: ERROR: Found an error in the logfile. Packaging failed. at
 C:/sources/libo-core/solenv/bin/modules/installer/worker.pm line 164
 : 

That is only the message that there was an error, not what error. You
need to look further up in the log.

--with-lang=en-US ar

en-US is always included, just specify ar.

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

[Bug 70553] Update .desktop files to use freedesktop actions

[bugzilla-daemon]

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

--- Comment #9 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org ---
(In reply to comment #8)
 Thank you Björn :-)
 
 Could this patch be backported to 4.1 ? 

Perhaps not so good idea because this would imply to add translatable strings.

Best regards. JBF

-- 
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 'refs/notes/commits' - 2 commits - 97/481ab1d4dc21f78cfcf503d4cfe1df1c8cf3cc ea/d03cdff0414dd0c121ac834d48b4f9fd7cabfb

[Caolán McNamara]

 97/481ab1d4dc21f78cfcf503d4cfe1df1c8cf3cc |1 +
 ea/d03cdff0414dd0c121ac834d48b4f9fd7cabfb |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 296744f05b45f2687ece8fa9de5ea56a309ca96e
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 14:46:27 2013 +

Notes added by 'git notes add'

diff --git a/ea/d03cdff0414dd0c121ac834d48b4f9fd7cabfb 
b/ea/d03cdff0414dd0c121ac834d48b4f9fd7cabfb
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/ea/d03cdff0414dd0c121ac834d48b4f9fd7cabfb
@@ -0,0 +1 @@
+ignore: obsolete
commit 1beee13d409c10bf7dbe995155d93caaddfa95f3
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 14:46:12 2013 +

Notes added by 'git notes add'

diff --git a/97/481ab1d4dc21f78cfcf503d4cfe1df1c8cf3cc 
b/97/481ab1d4dc21f78cfcf503d4cfe1df1c8cf3cc
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/97/481ab1d4dc21f78cfcf503d4cfe1df1c8cf3cc
@@ -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' - 2 commits - a5/e093baadd6d016bfb6780c9eea31ab5f7ec171 b8/0a5d878bf5056e64f6b172562c1c7aff9eba44

[Caolán McNamara]

 a5/e093baadd6d016bfb6780c9eea31ab5f7ec171 |1 +
 b8/0a5d878bf5056e64f6b172562c1c7aff9eba44 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 31de3f27a92932c4068f92b224b43cb21f24e761
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 14:46:43 2013 +

Notes added by 'git notes add'

diff --git a/a5/e093baadd6d016bfb6780c9eea31ab5f7ec171 
b/a5/e093baadd6d016bfb6780c9eea31ab5f7ec171
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/a5/e093baadd6d016bfb6780c9eea31ab5f7ec171
@@ -0,0 +1 @@
+ignore: obsolete
commit b79ea990b84b49e1b2a7cc4d7f0232a125120716
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 14:46:35 2013 +

Notes added by 'git notes add'

diff --git a/b8/0a5d878bf5056e64f6b172562c1c7aff9eba44 
b/b8/0a5d878bf5056e64f6b172562c1c7aff9eba44
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/b8/0a5d878bf5056e64f6b172562c1c7aff9eba44
@@ -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' - 2 commits - 5e/251e4f8640c7e3f14dff426ae075ae58825003 af/5fd1e2966d1b45f8565ca694c38ee44706e44c

[Caolán McNamara]

 5e/251e4f8640c7e3f14dff426ae075ae58825003 |1 +
 af/5fd1e2966d1b45f8565ca694c38ee44706e44c |1 +
 2 files changed, 2 insertions(+)

New commits:
commit f99ee89880a1d5307a9dbdeedbe901f2df639664
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 14:47:09 2013 +

Notes added by 'git notes add'

diff --git a/5e/251e4f8640c7e3f14dff426ae075ae58825003 
b/5e/251e4f8640c7e3f14dff426ae075ae58825003
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/5e/251e4f8640c7e3f14dff426ae075ae58825003
@@ -0,0 +1 @@
+ignore: aoo
commit 08708bc5dfd0e68fb69ab72526d06f522f6b7864
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 14:46:58 2013 +

Notes added by 'git notes add'

diff --git a/af/5fd1e2966d1b45f8565ca694c38ee44706e44c 
b/af/5fd1e2966d1b45f8565ca694c38ee44706e44c
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/af/5fd1e2966d1b45f8565ca694c38ee44706e44c
@@ -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: 4 commits - sw/qa sw/source writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 
 sw/source/filter/ww8/docxtablestyleexport.cxx|  297 ---
 writerfilter/source/dmapper/BorderHandler.cxx|2 
 writerfilter/source/dmapper/CellColorHandler.cxx |6 
 writerfilter/source/dmapper/DomainMapper.cxx |3 
 writerfilter/source/dmapper/TDefTableHandler.cxx |2 
 6 files changed, 176 insertions(+), 143 deletions(-)

New commits:
commit dc30cdbc8d5e7772281511188ba2d2a7c4c8af51
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Nov 5 15:03:33 2013 +0100

Avoid local methods in DocxTableStyleExport

We already have DocxTableStyleExport::Impl, use that instead of passing
around the serializer with no good reason.

Change-Id: I8cc47c34201219c4102c5edb21bcc1455da48ff4

diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx 
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 752a155..61eea42 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -25,12 +25,47 @@
 using namespace com::sun::star;
 using namespace oox;
 
+/// Methods in this class handle values in a table style.
 struct DocxTableStyleExport::Impl
 {
 SwDoc* m_pDoc;
 sax_fastparser::FSHelperPtr m_pSerializer;
 
 void TableStyle(uno::Sequencebeans::PropertyValue rStyle);
+
+/// Handles a boolean value.
+void handleBoolean(OUString aValue, sal_Int32 nToken);
+
+/// Export of w:pPr.
+void tableStylePPr(uno::Sequencebeans::PropertyValue rPPr);
+/// Export of w:tblStylePr.
+void tableStyleTblStylePr(uno::Sequencebeans::PropertyValue 
rTblStylePr);
+/// Export of w:rPr.
+void tableStyleRPr(uno::Sequencebeans::PropertyValue rRPr);
+/// Export of w:rFonts.
+void tableStyleRRFonts(uno::Sequencebeans::PropertyValue rRFonts);
+/// Export of w:lang.
+void tableStyleRLang(uno::Sequencebeans::PropertyValue rLang);
+/// Export of w:ind in a pPr.
+void tableStylePInd(uno::Sequencebeans::PropertyValue rInd);
+/// Export of w:spacing.
+void tableStylePSpacing(uno::Sequencebeans::PropertyValue rSpacing);
+/// Export of w:tblPr.
+void tableStyleTblPr(uno::Sequencebeans::PropertyValue rTblPr);
+/// Export of w:tcPr.
+void tableStyleTcPr(uno::Sequencebeans::PropertyValue rTcPr);
+/// Export of w:tcBorders (and w:tblBorders).
+void tableStyleTcBorders(uno::Sequencebeans::PropertyValue rTcBorders, 
sal_Int32 nToken = XML_tcBorders);
+/// Export of w:tblInd.
+void tableStyleTblInd(uno::Sequencebeans::PropertyValue rTblInd);
+/// Export of w:tblCellMar (and w:tcMar).
+void tableStyleTblCellMar(uno::Sequencebeans::PropertyValue 
rTblCellMar, sal_Int32 nType = XML_tblCellMar);
+/// Export of a given table cell border type.
+void tableStyleTcBorder(sal_Int32 nToken, const 
uno::Sequencebeans::PropertyValue rTcBorder);
+/// Export of w:shd.
+void tableStyleShd(uno::Sequencebeans::PropertyValue rShd);
+/// Export of w:color.
+void tableStyleRColor(uno::Sequencebeans::PropertyValue rColor);
 };
 
 void DocxTableStyleExport::TableStyles()
@@ -59,96 +94,92 @@ void DocxTableStyleExport::TableStyles()
 }
 }
 
-DocxStringTokenMap const aTblCellMarTokens[] = {
-{left, XML_left},
-{right, XML_right},
-{start, XML_start},
-{end, XML_end},
-{top, XML_top},
-{bottom, XML_bottom},
-{0, 0}
-};
-
-/// Export of w:tblCellMar in a table style.
-void lcl_TableStyleTblCellMar(sax_fastparser::FSHelperPtr pSerializer, 
uno::Sequencebeans::PropertyValue rTblCellMar, sal_Int32 nType = 
XML_tblCellMar)
+void 
DocxTableStyleExport::Impl::tableStyleTblCellMar(uno::Sequencebeans::PropertyValue
 rTblCellMar, sal_Int32 nType)
 {
+static DocxStringTokenMap const aTblCellMarTokens[] = {
+{left, XML_left},
+{right, XML_right},
+{start, XML_start},
+{end, XML_end},
+{top, XML_top},
+{bottom, XML_bottom},
+{0, 0}
+};
+
 if (!rTblCellMar.hasElements())
 return;
 
-pSerializer-startElementNS(XML_w, nType, FSEND);
+m_pSerializer-startElementNS(XML_w, nType, FSEND);
 for (sal_Int32 i = 0; i  rTblCellMar.getLength(); ++i)
 {
 if (sal_Int32 nToken = DocxStringGetToken(aTblCellMarTokens, 
rTblCellMar[i].Name))
 {
 comphelper::SequenceAsHashMap aMap(rTblCellMar[i].Value.get 
uno::Sequencebeans::PropertyValue ());
-pSerializer-singleElementNS(XML_w, nToken,
+m_pSerializer-singleElementNS(XML_w, nToken,
 FSNS(XML_w, XML_w), 
OString::number(aMap[w].getsal_Int32()),
 FSNS(XML_w, XML_type), 
OUStringToOString(aMap[type].getOUString(), RTL_TEXTENCODING_UTF8).getStr(),
 FSEND);
 }
 }
-pSerializer-endElementNS(XML_w, nType);
+m_pSerializer-endElementNS(XML_w, nType);
 }
 
-static DocxStringTokenMap const aTcBorderTokens[] = {
-{val, 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ce/8ea19b028c304985958286af18591c68996ccc

[Caolán McNamara]

 ce/8ea19b028c304985958286af18591c68996ccc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 234b48a89db5069ffcb25be353fcfaee4083eb62
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 14:47:55 2013 +

Notes added by 'git notes add'

diff --git a/ce/8ea19b028c304985958286af18591c68996ccc 
b/ce/8ea19b028c304985958286af18591c68996ccc
new file mode 100644
index 000..ab42244
--- /dev/null
+++ b/ce/8ea19b028c304985958286af18591c68996ccc
@@ -0,0 +1 @@
+prefer: 09c53251150d7ad3f4db0cc3390714912db8b0bb
___
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

[bugzilla-daemon]

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

Bug 54157 depends on bug 40788, which changed state.

Bug 40788 Summary: FORMATTING - Calc ignores manual breaks when fit to number 
of pages is chosen
https://bugs.freedesktop.org/show_bug.cgi?id=40788

   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] core.git: Branch 'refs/notes/commits' - 3d/73c711fbc482fad604ec01094253d17f2609d6

[Caolán McNamara]

 3d/73c711fbc482fad604ec01094253d17f2609d6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 437810a1fb7537390200655d05a2362ddde800ae
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 14:48:38 2013 +

Notes added by 'git notes add'

diff --git a/3d/73c711fbc482fad604ec01094253d17f2609d6 
b/3d/73c711fbc482fad604ec01094253d17f2609d6
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/3d/73c711fbc482fad604ec01094253d17f2609d6
@@ -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' - 8f/3a7a11fa39b1b0cfd6cfd0d085eaabe53b1fe9

[Caolán McNamara]

 8f/3a7a11fa39b1b0cfd6cfd0d085eaabe53b1fe9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f1348117862ba613256dec1034699c35c4817ab7
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 14:52:11 2013 +

Notes added by 'git notes add'

diff --git a/8f/3a7a11fa39b1b0cfd6cfd0d085eaabe53b1fe9 
b/8f/3a7a11fa39b1b0cfd6cfd0d085eaabe53b1fe9
new file mode 100644
index 000..042b86a
--- /dev/null
+++ b/8f/3a7a11fa39b1b0cfd6cfd0d085eaabe53b1fe9
@@ -0,0 +1 @@
+prefer: 41cc5c918e9d039144c9505550d9936277e7f091
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 svgio/source/svgreader/svgnode.cxx |   23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 8b2fb0e153fa846a171105b7801c398ffbe3d595
Author: Armin Le Grand a...@apache.org
Date:   Wed Oct 30 11:22:20 2013 +

Resolves: #i123510# changed priority in style preparation

(cherry picked from commit 86459550d81c3eae067e89d9af1b6e872215a588)

Change-Id: Ia567666cd76dce646479003a830d969f4962da71

diff --git a/svgio/source/svgreader/svgnode.cxx 
b/svgio/source/svgreader/svgnode.cxx
index d25f6da..8e8f83d 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -106,14 +106,12 @@ namespace svgio
 }
 }
 
-if(maCssStyleVector.empty())
+if(!maCssStyleVector.empty())
 {
-return rOriginal;
-}
-else
-{
-// set CssStyleParent at maCssStyleVector members to hang them 
in front of
-// the existing style. Build a style chain, reset parent of 
original for security.
+// #i123510# if CSS styles were found, create a linked list 
with rOriginal as parent
+// and all CSS styles as linked children, so that the style 
attribute has
+// priority over the CSS style. If there is no style attribute 
this means that
+// no values are set at rOriginal, thus it is still correct to 
have that order.
 // Repeated style requests should only be issued from sub-Text 
nodes and I'm not
 // sure if in-between text nodes may build other chains 
(should not happen). But
 // it's only a re-chaining with pointers (cheap), so allow to 
do it every time.
@@ -122,14 +120,15 @@ namespace svgio
 
 for(sal_uInt32 a(0); a  maCssStyleVector.size(); a++)
 {
-SvgStyleAttributes* pCandidate = const_cast 
SvgStyleAttributes* (maCssStyleVector[maCssStyleVector.size() - a - 1]);
+SvgStyleAttributes* pNext = const_cast 
SvgStyleAttributes* (maCssStyleVector[a]);
 
-pCandidate-setCssStyleParent(pCurrent);
-pCurrent = pCandidate;
+pCurrent-setCssStyleParent(pNext);
+pCurrent = pNext;
+pCurrent-setCssStyleParent(0);
 }
-
-return pCurrent;
 }
+
+return rOriginal;
 }
 
 SvgNode::SvgNode(
___
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' - 86/459550d81c3eae067e89d9af1b6e872215a588

[Caolán McNamara]

 86/459550d81c3eae067e89d9af1b6e872215a588 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7f816c5bc1c5ecdfa01a00f37a494351c8d7056d
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 14:54:38 2013 +

Notes added by 'git notes add'

diff --git a/86/459550d81c3eae067e89d9af1b6e872215a588 
b/86/459550d81c3eae067e89d9af1b6e872215a588
new file mode 100644
index 000..48f0a7c
--- /dev/null
+++ b/86/459550d81c3eae067e89d9af1b6e872215a588
@@ -0,0 +1 @@
+merged as: 8b2fb0e153fa846a171105b7801c398ffbe3d595
___
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' - c0/f65b29f8028ab750c8caac033645c3da3cf2f5

[Caolán McNamara]

 c0/f65b29f8028ab750c8caac033645c3da3cf2f5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0d8467a8aaab99faebcbedcd3c4502fdd18bc58c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 15:04:40 2013 +

Notes added by 'git notes add'

diff --git a/c0/f65b29f8028ab750c8caac033645c3da3cf2f5 
b/c0/f65b29f8028ab750c8caac033645c3da3cf2f5
new file mode 100644
index 000..7cb6631
--- /dev/null
+++ b/c0/f65b29f8028ab750c8caac033645c3da3cf2f5
@@ -0,0 +1 @@
+merged as: 0794e9ec93be4cfa11daefdb2e428952ea7669a5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 xmloff/source/draw/shapeexport.cxx |   68 -
 1 file changed, 30 insertions(+), 38 deletions(-)

New commits:
commit 0794e9ec93be4cfa11daefdb2e428952ea7669a5
Author: Armin Le Grand a...@apache.org
Date:   Wed Oct 30 12:52:12 2013 +

corrected export of polygons with text

(cherry picked from commit c0f65b29f8028ab750c8caac033645c3da3cf2f5)

Conflicts:
xmloff/source/draw/shapeexport2.cxx

Change-Id: Ic8da384d094ce735ecba51b282de7a697558e51f

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index e341f71..ec3ec75c 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2097,26 +2097,27 @@ void XMLShapeExport::ImpExportEllipseShape(
 
 sal_Bool bCreateNewline( (nFeatures  SEF_EXPORT_NO_WS) == 0 ); // 
#86116#/#92210#
 
+// prepare name (with most used)
+enum ::xmloff::token::XMLTokenEnum eName(XML_CIRCLE);
+
 if(bCircle)
 {
-// write circle
-SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CIRCLE, 
bCreateNewline, sal_True);
-
-ImpExportDescription( xShape ); // #i68101#
-ImpExportEvents( xShape );
-ImpExportGluePoints( xShape );
-ImpExportText( xShape );
+// name already set
 }
 else
 {
-// write ellipse
-SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_ELLIPSE, 
bCreateNewline, sal_True);
-
-ImpExportDescription( xShape ); // #i68101#
-ImpExportEvents( xShape );
-ImpExportGluePoints( xShape );
-ImpExportText( xShape );
+// set name
+eName = XML_ELLIPSE;
 }
+
+// write ellipse or circle
+SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, eName, 
bCreateNewline, sal_True);
+
+ImpExportDescription( xShape ); // #i68101#
+ImpExportEvents( xShape );
+ImpExportGluePoints( xShape );
+ImpExportText( xShape );
+
 }
 }
 
@@ -2152,6 +2153,9 @@ void XMLShapeExport::ImpExportPolygonShape(
 
 sal_Bool bCreateNewline( (nFeatures  SEF_EXPORT_NO_WS) == 0 ); // 
#86116#/#92210#
 
+// prepare name (with most used)
+enum ::xmloff::token::XMLTokenEnum eName(XML_PATH);
+
 if(bBezier)
 {
 // get PolygonBezier
@@ -2171,15 +2175,6 @@ void XMLShapeExport::ImpExportPolygonShape(
 
 // write point array
 mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, 
aPolygonString);
-
-// write object now
-SvXMLElementExport aOBJ(
-mrExport,
-XML_NAMESPACE_DRAW,
-XML_PATH,
-bCreateNewline,
-sal_True);
-
 }
 }
 else
@@ -2198,13 +2193,8 @@ void XMLShapeExport::ImpExportPolygonShape(
 // write point array
 mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_POINTS, 
aPointString);
 
-// write object now
-SvXMLElementExport aOBJ(
-mrExport,
-XML_NAMESPACE_DRAW,
-aPolygon.isClosed() ? XML_POLYGON : XML_POLYLINE,
-bCreateNewline,
-sal_True);
+// set name
+eName = aPolygon.isClosed() ? XML_POLYGON : XML_POLYLINE;
 }
 else
 {
@@ -2218,17 +2208,19 @@ void XMLShapeExport::ImpExportPolygonShape(
 
 // write point array
 mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, 
aPolygonString);
-
-// write object now
-SvXMLElementExport aOBJ(
-mrExport,
-XML_NAMESPACE_DRAW,
-XML_PATH,
-bCreateNewline,
-sal_True);
 }
 }
 
+// write object, but after attributes are added since the destructor 
will
+// consume all of these added attributes. Also before text is added; 
this may
+// open another SvXMLElementExport scope which needs to be inside this 
one
+SvXMLElementExport aOBJ(
+mrExport,
+XML_NAMESPACE_DRAW,
+eName,
+bCreateNewline,
+sal_True);
+
 ImpExportDescription( xShape ); // #i68101#
 ImpExportEvents( xShape );
 ImpExportGluePoints( xShape );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[sushil_shinde]

 sw/qa/extras/ooxmlexport/data/customxml.docx|binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   28 
 sw/source/filter/ww8/docxexport.cxx |   43 +++
 sw/source/filter/ww8/docxexport.hxx |1 
 writerfilter/inc/ooxml/OOXMLDocument.hxx|3 -
 writerfilter/source/filter/ImportFilter.cxx |   32 ++
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |   54 
 writerfilter/source/ooxml/OOXMLDocumentImpl.hxx |5 +-
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx   |   20 
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx   |3 +
 10 files changed, 184 insertions(+), 5 deletions(-)

New commits:
commit 8ab553117e038ec1eab76ac1c3d8a0b5aa968baa
Author: sushil_shinde sushil.shi...@synerzip.com
Date:   Fri Nov 1 19:21:01 2013 +0530

[docx] CustomXml saved in InteropGrabBag and exported customxml when saving.

  The XDocuments representing the DOM of an OOXML's customxml document is
  stored as the PropertyValue OOXCustomXml into the InteropGraBag.

  Added mxCustomXmlDomList object which holds xDocuments for
  each item.xml from CustomXml.

  Exporting all items dom tree from customxml that has been parsed
  when loading the file.
  This is necessary in order to properly reopen docx files that
  contain data like citation.

  This fix grab bags only item[n].xml's files from CustomXml folder.
  itemProps[n].xml's and item.xml's .rels are not preserved and exported 
yet.
  (Working on this part)

Change-Id: I330f34f38a7aa4cd39094371bff15ebbc0318167
Reviewed-on: https://gerrit.libreoffice.org/6519
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/qa/extras/ooxmlexport/data/customxml.docx 
b/sw/qa/extras/ooxmlexport/data/customxml.docx
new file mode 100644
index 000..bfdf8ec
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/customxml.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f8b7904..028189b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1506,6 +1506,34 @@ DECLARE_OOXML_TEST(testCharHighlight, 
char_highlight.docx)
 }
 }
 
+DECLARE_OOXML_TEST(testCustomXmlGrabBag, customxml.docx)
+{
+   // The problem was that CustomXml/item[n].xml files were missing from docx 
file after saving file.
+   // This test case tests whether customxml files grabbagged properly in 
correct object.
+
+   uno::Referencetext::XTextDocument xTextDocument(mxComponent, 
uno::UNO_QUERY);
+   uno::Referencebeans::XPropertySet xTextDocumentPropertySet(xTextDocument, 
uno::UNO_QUERY);
+   uno::Sequencebeans::PropertyValue aGrabBag(0);
+   xTextDocumentPropertySet-getPropertyValue(OUString(InteropGrabBag)) = 
aGrabBag;
+   CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty
+   sal_Bool CustomXml = sal_False;
+   for(int i = 0; i  aGrabBag.getLength(); ++i)
+   {
+   if (aGrabBag[i].Name == OUString(OOXCustomXml))
+   {
+   CustomXml = sal_True;
+   uno::Referencexml::dom::XDocument aCustomXmlDom;
+   uno::Sequenceuno::Referencexml::dom::XDocument  
aCustomXmlDomList;
+   CPPUNIT_ASSERT(aGrabBag[i].Value = aCustomXmlDomList); // 
PropertyValue of proper type
+   sal_Int32 length = aCustomXmlDomList.getLength();
+   CPPUNIT_ASSERT_EQUAL(sal_Int32(3), length);
+   aCustomXmlDom = aCustomXmlDomList[1];
+   CPPUNIT_ASSERT(aCustomXmlDom.get()); // Reference not empty
+   }
+   }
+   CPPUNIT_ASSERT(CustomXml); // Grab Bag has all the expected elements
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 69fc7e9..40112cf 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -351,6 +351,8 @@ void DocxExport::ExportDocument_Impl()
 
 WriteTheme();
 
+WriteCustomXml();
+
 delete pStyles, pStyles = NULL;
 delete m_pSections, m_pSections = NULL;
 }
@@ -782,6 +784,47 @@ void DocxExport::WriteTheme()
 uno::Sequence beans::StringPair () );
 }
 
+void DocxExport::WriteCustomXml()
+{
+uno::Reference beans::XPropertySet  xPropSet( 
pDoc-GetDocShell()-GetBaseModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference beans::XPropertySetInfo  xPropSetInfo = 
xPropSet-getPropertySetInfo();
+OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
+if ( !xPropSetInfo-hasPropertyByName( pName ) )
+return;
+
+uno::Sequenceuno::Referencexml::dom::XDocument  customXmlDomlist;
+uno::Sequence beans::PropertyValue  propList;
+xPropSet-getPropertyValue( pName ) = propList;
+for ( sal_Int32 nProp=0; nProp  propList.getLength(); ++nProp )
+{
+OUString propName = propList[nProp].Name;
+if ( propName 

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

[Miklos Vajna]

 sw/source/filter/ww8/docxexport.cxx |3 ++-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |9 ++---
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx   |   12 
 3 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 250015d1107eabb2e4fdb9e762b3bd06b6c1739b
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Nov 5 16:05:42 2013 +0100

When in Rome, do as the Romans do

Change-Id: I1529d035edb2f1453dc72a32df5c2750dc526672

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 40112cf..fffa8e3 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -806,7 +806,8 @@ void DocxExport::WriteCustomXml()
 }
 }
 
-for (sal_Int32 j = 1; j  customXmlDomlist.getLength(); j++) {
+for (sal_Int32 j = 1; j  customXmlDomlist.getLength(); j++)
+{
 
 uno::Referencexml::dom::XDocument customXmlDom = customXmlDomlist[j];
 if ( customXmlDom.is() )
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index f3ba179..7763447 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -406,7 +406,8 @@ void OOXMLDocumentImpl::resolve(Stream  rStream)
 #endif
 }
 
-void OOXMLDocumentImpl::resolveCustomXmlStream(Stream  rStream){
+void OOXMLDocumentImpl::resolveCustomXmlStream(Stream  rStream)
+{
 // Resolving all item[n].xml files from CustomXml folder.
 uno::Referenceembed::XRelationshipAccess mxRelationshipAccess;
 mxRelationshipAccess.set((*dynamic_castOOXMLStreamImpl 
*(mpStream.get())).accessDocumentStream(), uno::UNO_QUERY_THROW);
@@ -429,13 +430,15 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream  
rStream){
 // Skipping other files.
 if (aPair.Second.compareTo(sCustomType) == 0)
 bFound = true;
-else if(aPair.First.compareTo(sTarget) == 0  bFound){
+else if(aPair.First.compareTo(sTarget) == 0  bFound)
+{
 // Adding value to extern variable customTarget. It will 
be used in ooxmlstreamimpl
 // to ensure customxml target is visited in lcl_getTarget.
 customTarget = aPair.Second;
 }
 }
-if(bFound){
+if(bFound)
+{
 uno::Referencexml::dom::XDocument temp = 
importSubStream(OOXMLStream::CUSTOMXML);
 mxCustomXmlDomListTemp[counter] = temp;
 counter++;
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx 
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 293b695..c1cb798 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -179,12 +179,15 @@ bool 
OOXMLStreamImpl::lcl_getTarget(uno::Referenceembed::XRelationshipAccess
 else if (aPair.First.compareTo(sId) == 0 
  aPair.Second.compareTo(rId) == 0)
 bFound = true;
-else if (aPair.First.compareTo(sTarget) == 0){
+else if (aPair.First.compareTo(sTarget) == 0)
+{
 // checking item[n].xml is not visited already.
-if(customTarget != aPair.Second  sStreamType == 
sCustomType){
+if(customTarget != aPair.Second  sStreamType == 
sCustomType)
+{
 bFound = false;
 }
-else {
+else
+{
 sMyTarget = aPair.Second;
 }
 }
@@ -272,7 +275,8 @@ uno::Referenceio::XInputStream 
OOXMLStreamImpl::getDocumentStream()
 }
 
 // Giving access to mxDocumentStream. It is needed by resolving custom xml to 
get list of customxml's used in document.
-uno::Referenceio::XStream OOXMLStreamImpl::accessDocumentStream(){
+uno::Referenceio::XStream OOXMLStreamImpl::accessDocumentStream()
+{
 return mxDocumentStream;
 }
 
___
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' - a8/cc15c001ac76c0d320837cc4cdf65ecb7fc923

[Caolán McNamara]

 a8/cc15c001ac76c0d320837cc4cdf65ecb7fc923 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c46996931a59a50b1b54bd53172c5a4372dc9eef
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 15:13:30 2013 +

Notes added by 'git notes add'

diff --git a/a8/cc15c001ac76c0d320837cc4cdf65ecb7fc923 
b/a8/cc15c001ac76c0d320837cc4cdf65ecb7fc923
new file mode 100644
index 000..596bdd9
--- /dev/null
+++ b/a8/cc15c001ac76c0d320837cc4cdf65ecb7fc923
@@ -0,0 +1 @@
+merged as: f689578dc4f3a77f6a3e72bbf32adf88a2c55526
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 xmloff/source/draw/shapeexport.cxx |   22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

New commits:
commit f689578dc4f3a77f6a3e72bbf32adf88a2c55526
Author: Armin Le Grand a...@apache.org
Date:   Wed Oct 30 14:41:25 2013 +

Resolves: #i123542# corrected ODF XML export of 3D cube and sphere

(cherry picked from commit a8cc15c001ac76c0d320837cc4cdf65ecb7fc923)

Conflicts:
xmloff/source/draw/shapeexport2.cxx
xmloff/source/draw/shapeexport3.cxx

Change-Id: I35f7817f3ea95177dd3aa633b9cbb1b5703f08a0

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index ec3ec75c..fef66ec 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2211,9 +2211,9 @@ void XMLShapeExport::ImpExportPolygonShape(
 }
 }
 
-// write object, but after attributes are added since the destructor 
will
-// consume all of these added attributes. Also before text is added; 
this may
-// open another SvXMLElementExport scope which needs to be inside this 
one
+// write object, but after attributes are added since this call will
+// consume all of these added attributes and the destructor will close 
the
+// scope. Also before text is added; this may add sub-scopes as needed
 SvXMLElementExport aOBJ(
 mrExport,
 XML_NAMESPACE_DRAW,
@@ -3320,9 +3320,6 @@ void XMLShapeExport::ImpExport3DShape(
 {
 case XmlShapeTypeDraw3DCubeObject:
 {
-// write 3DCube shape
-SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, 
XML_CUBE, sal_True, sal_True);
-
 // minEdge
 aAny = xPropSet-getPropertyValue(D3DPosition);
 drawing::Position3D aPosition3D;
@@ -3354,13 +3351,15 @@ void XMLShapeExport::ImpExport3DShape(
 mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_MAX_EDGE, 
aStr);
 }
 
+// write 3DCube shape
+// #i123542# Do this *after* the attributes are added, else 
these will be lost since opening
+// the scope will clear the global attribute list at the 
exporter
+SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, 
XML_CUBE, sal_True, sal_True);
+
 break;
 }
 case XmlShapeTypeDraw3DSphereObject:
 {
-// write 3DSphere shape
-SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, 
XML_SPHERE, sal_True, sal_True);
-
 // Center
 aAny = xPropSet-getPropertyValue(D3DPosition);
 drawing::Position3D aPosition3D;
@@ -3389,6 +3388,11 @@ void XMLShapeExport::ImpExport3DShape(
 mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SIZE, aStr);
 }
 
+// write 3DSphere shape
+// #i123542# Do this *after* the attributes are added, else 
these will be lost since opening
+// the scope will clear the global attribute list at the 
exporter
+SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, 
XML_SPHERE, sal_True, sal_True);
+
 break;
 }
 case XmlShapeTypeDraw3DLatheObject:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: string freeze has been broken in libreoffice-4-1

[Christian Lohmaier]

Hi *,

On Sun, Nov 3, 2013 at 11:18 AM, Andras Timar tima...@gmail.com wrote:

 I noticed, that a recent commit broke string freeze in libreoffice-4-1
 branch: b350dc2e1e4c3ac7cb722569d462c95dbb3cbbda
 First I wanted to simply revert it. Then I noticed that there were
 more string changing commits in stable branch.

Thanks for having an eye on that.

 So, probably the best would be to update Pootle with the changed pot
 files, and catch up with translations by 4.1.4. These are the changed
 files:
 helpcontent2/source/text/sbasic/shared.pot
 helpcontent2/source/text/shared/01.pot
 officecfg/registry/data/org/openoffice/Office/UI.pot
 sd/source/ui/slideshow.pot

I update the templates on pootle and also already triggered the update
for UI for all languages[1], as there are only two changes (and one
removed string):

* One added context-menu entry Edit presentation (slideshow.pot)
http://cgit.freedesktop.org/libreoffice/core/commit/?id=38f11fdb08249a6cf7140ee74016cd69f28e289a
fdo#45233 Allow editing pps/ppsx Autoplay Presentations

* one changed string Text → Character (UI.pot)
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b350dc2e1e4c3ac7cb722569d462c95dbb3cbbda
fdo#68414: SIDEBAR: property's Text named incorrectly


For help, please trigger the Update from templates yourself.
I'll run the update this weekend

The changes there are mostly changing the attributes of the ahelp
tags, but also new documentation for the date/time related functions.


Thanks again to Andras for noticing  notifying and all translators
for their efforts

ciao
Christian
[1] still running, so don't panic if you don't see the changed strings
yet when your language-code is in the second half of the alphabet
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Adam Co]

 sw/qa/extras/ooxmlexport/data/fdo69644.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 ++
 sw/source/filter/ww8/WW8TableInfo.cxx|   96 ++-
 sw/source/filter/ww8/WW8TableInfo.hxx|3 
 sw/source/filter/ww8/attributeoutputbase.hxx |1 
 sw/source/filter/ww8/docxattributeoutput.cxx |4 -
 sw/source/filter/ww8/wrtww8.cxx  |6 +
 7 files changed, 114 insertions(+), 5 deletions(-)

New commits:
commit 57c54792781cc9befe3a65a97b37fa85f89da0ae
Author: Adam Co rattles2...@gmail.com
Date:   Thu Oct 17 11:48:31 2013 +0200

fdo#69644 - fix docx export of wrong number and width of columns

When the DOCX exporter exported a table, it filled the table
column definitions with the column sizes of the FIRST row only.
This was ok for tables that have the same columns on all rows,
but for more complex tables with different cell widths - the
filter exported the wrong number of columns and the wrong width.
A followup fix would fix the rounding problems there still are
with the column widths that are exported in the table
definition.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx

Change-Id: Ie95dfe60b1c1811776433e457ca04e728623e01e
Reviewed-on: https://gerrit.libreoffice.org/6290

diff --git a/sw/qa/extras/ooxmlexport/data/fdo69644.docx 
b/sw/qa/extras/ooxmlexport/data/fdo69644.docx
new file mode 100644
index 000..1a254db
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo69644.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 028189b..6aeae7b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1534,6 +1534,15 @@ DECLARE_OOXML_TEST(testCustomXmlGrabBag, 
customxml.docx)
CPPUNIT_ASSERT(CustomXml); // Grab Bag has all the expected elements
 }
 
+DECLARE_OOXML_TEST(testFdo69644, fdo69644.docx)
+{
+// The problem was that the exporter exported the table definition
+// with only 3 columns, instead of 5 columns.
+// Check that the table grid is exported with 5 columns
+xmlDocPtr pXmlDoc = parseExport();
+assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tblGrid/w:gridCol, 5);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx 
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 9a0b188..aa39f3d 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -190,10 +190,43 @@ TableBoxVectorPtr 
WW8TableNodeInfoInner::getTableBoxesOfRow()
 return pResult;
 }
 
-GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase  
rBase)
+GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase  
rBase, bool calculateColumnsFromAllRows)
 {
 GridColsPtr pResult(new GridCols);
-WidthsPtr pWidths(getWidthsOfRow());
+WidthsPtr pWidths;
+
+// Check which columns should be checked - only the current row,
+// or all the rows together
+if (calculateColumnsFromAllRows)
+{
+// Calculate the width of all the columns based on ALL the rows.
+// The difference is that this kind of draws vertical lines,
+// so that if the rows look like this:
+//
+//  
+//  |   |  |
+//  
+//  |   |  |
+//  
+//  |   |  |
+//  
+//
+// then the actual column widths will be broken down like this:
+//
+//  
+//  |   |   |   |  |
+//  
+//
+// See the example at
+// http://officeopenxml.com/WPtableGrid.php
+// Under Word 2007 Example
+pWidths = getColumnWidthsBasedOnAllRows();
+}
+else
+{
+// Calculate the width of all the columns based on the current row
+pWidths = getWidthsOfRow();
+}
 
 const SwFrmFmt *pFmt = getTable()-GetFrmFmt();
 OSL_ENSURE(pFmt,Impossible);
@@ -226,6 +259,65 @@ GridColsPtr 
WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase  rBase)
 return pResult;
 }
 
+WidthsPtr WW8TableNodeInfoInner::getColumnWidthsBasedOnAllRows()
+{
+WidthsPtr pWidths;
+
+WW8TableCellGrid::Pointer_t pCellGrid =
+mpParent-getParent()-getCellGridForTable(getTable(), false);
+
+if (pCellGrid.get() == NULL)
+{
+const SwTable * pTable = getTable();
+const SwTableLines rTableLines = pTable-GetTabLines();
+sal_uInt16 nNumOfLines = rTableLines.size();
+
+// Go over all the rows - and for each row - calculate where
+// there is a separator between columns
+WidthsPtr pSeparators(new Widths);
+for ( sal_uInt32 nLineIndex = 0; nLineIndex  nNumOfLines; 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f5/d69b2b8b002ca6905496a9d9065ef76b5641d7

[Caolán McNamara]

 f5/d69b2b8b002ca6905496a9d9065ef76b5641d7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6abc8633266053278b3c6b70226780f6780f9227
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 15:24:29 2013 +

Notes added by 'git notes add'

diff --git a/f5/d69b2b8b002ca6905496a9d9065ef76b5641d7 
b/f5/d69b2b8b002ca6905496a9d9065ef76b5641d7
new file mode 100644
index 000..b84c93a
--- /dev/null
+++ b/f5/d69b2b8b002ca6905496a9d9065ef76b5641d7
@@ -0,0 +1 @@
+merged as: 2e5167528f7566dd9b000e50fc1610b7bf99132a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 sw/inc/ndgrf.hxx|1 
 sw/source/core/doc/notxtfrm.cxx |  156 +---
 2 files changed, 36 insertions(+), 121 deletions(-)

New commits:
commit 2e5167528f7566dd9b000e50fc1610b7bf99132a
Author: Armin Le Grand a...@apache.org
Date:   Thu Oct 31 14:43:21 2013 +

Resolves: #i123500# unified Graphic processing to use GraphicPrimitive2D

(cherry picked from commit f5d69b2b8b002ca6905496a9d9065ef76b5641d7)

Conflicts:
sw/source/core/doc/notxtfrm.cxx

Change-Id: I1758aadcbe97ece271277378e62300b895421768

diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index f886b2f..a2687d6 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -132,7 +132,6 @@ public:
 
 /// wrappers for non-const calls at GraphicObject
 void ReleaseGraphicFromCache() { maGrfObj.ReleaseFromCache(); }
-void DrawGraphicWithPDFHandling(OutputDevice rOutDev, const Point rPt, 
const Size rSz, const GraphicAttr* pGrfAttr = NULL, const sal_uLong nFlags = 
GRFMGR_DRAW_STANDARD) { maGrfObj.DrawWithPDFHandling(rOutDev, rPt, rSz, 
pGrfAttr, nFlags); }
 void StartGraphicAnimation(OutputDevice* pOut, const Point rPt, const 
Size rSz, long nExtraData = 0, const GraphicAttr* pAttr = NULL, sal_uLong 
nFlags = GRFMGR_DRAW_STANDARD, OutputDevice* pFirstFrameOutDev = NULL) { 
maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, 
pFirstFrameOutDev); }
 void StopGraphicAnimation(OutputDevice* pOut = NULL, long nExtraData = 0) 
{ maGrfObj.StopAnimation(pOut, nExtraData); }
 
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 2febb36..fb4abbf 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -69,7 +69,7 @@
 #include dview.hxx
 #include basegfx/matrix/b2dhommatrix.hxx
 #include drawinglayer/processor2d/baseprocessor2d.hxx
-#include drawinglayer/primitive2d/bitmapprimitive2d.hxx
+#include drawinglayer/primitive2d/graphicprimitive2d.hxx
 #include basegfx/matrix/b2dhommatrixtools.hxx
 #include drawinglayer/processor2d/processor2dtools.hxx
 
@@ -689,57 +689,19 @@ bool paintUsingPrimitivesHelper(
 OutputDevice rOutputDevice,
 const drawinglayer::primitive2d::Primitive2DSequence rSequence,
 const basegfx::B2DRange rSourceRange,
-const basegfx::B2DRange rTargetRange,
-const sal_Int32 nLeftCrop = 0,
-const sal_Int32 nTopCrop = 0,
-const sal_Int32 nRightCrop = 0,
-const sal_Int32 nBottomCrop = 0,
-const bool bMirrorX = false,
-const bool bMirrorY = false)
+const basegfx::B2DRange rTargetRange)
 {
-const double fSourceWidth(rSourceRange.getWidth());
-const double fSourceHeight(rSourceRange.getHeight());
-
-if(rSequence.hasElements()  !basegfx::fTools::equalZero(fSourceWidth)  
!basegfx::fTools::equalZero(fSourceHeight))
+if(rSequence.hasElements()  
!basegfx::fTools::equalZero(rSourceRange.getWidth())  
!basegfx::fTools::equalZero(rSourceRange.getHeight()))
 {
-// copy target range and apply evtl. cropping
-basegfx::B2DRange aTargetRange(rTargetRange);
-
-if(nLeftCrop || nTopCrop || nRightCrop || nBottomCrop)
+if(!basegfx::fTools::equalZero(rTargetRange.getWidth())  
!basegfx::fTools::equalZero(rTargetRange.getHeight()))
 {
-// calculate original TargetRange
-const double fFactor100thmmToTwips(72.0 / 127.0);
-
-aTargetRange = basegfx::B2DRange(
-aTargetRange.getMinX() - (nLeftCrop * fFactor100thmmToTwips),
-aTargetRange.getMinY() - (nTopCrop * fFactor100thmmToTwips),
-aTargetRange.getMaxX() + (nRightCrop * fFactor100thmmToTwips),
-aTargetRange.getMaxY() + (nBottomCrop * 
fFactor100thmmToTwips));
-}
-
-const double fTargetWidth(aTargetRange.getWidth());
-const double fTargetHeight(aTargetRange.getHeight());
-
-if(!basegfx::fTools::equalZero(fTargetWidth)  
!basegfx::fTools::equalZero(fTargetHeight))
-{
-// map graphic range to target range. This will automatically 
include
-// tme mapping from Svg 1/100th mm content to twips since the 
target
-// range is twips already
-basegfx::B2DHomMatrix aMappingTransform(
-basegfx::tools::createTranslateB2DHomMatrix(
--rSourceRange.getMinX(),
--rSourceRange.getMinY()));
-
-aMappingTransform.scale(fTargetWidth / fSourceWidth, fTargetHeight 
/ fSourceHeight);
-aMappingTransform.translate(aTargetRange.getMinX(), 
aTargetRange.getMinY());
-
-// apply mirrorings
-if(bMirrorX || bMirrorY)
-{
-aMappingTransform.translate(-aTargetRange.getCenterX(), 
-aTargetRange.getCenterY());
-aMappingTransform.scale(bMirrorX ? -1.0 : 1.0, bMirrorY ? -1.0 
: 1.0); // #119176# small typo with X/Y
-

Convertion SRC to UI: how to set min/max of GtkSpinButton

[Laurent BP]

Hello,

I'm on the way to convert impswfdialog.src to UI. I'm following the how-to
from Caolan
https://wiki.documentfoundation.org/Development/WidgetLayout#HOWTO:_Step_by_step_dialog_conversion

I've got a pb with a GtkSpinButton which must have a minimum value of 1 and
maximum value of 100. How to set these min/max?
This page in the wiki explains several points about GtkSpinButton
https://wiki.documentfoundation.org/Development/WidgetLayout#MetricFields.2C_NumericFields_and_MetricBox
but nothing about min/max.

Thanks for your help.

Laurent BP



-
LibreOffice 4.1.1.2
--
View this message in context: 
http://nabble.documentfoundation.org/Convertion-SRC-to-UI-how-to-set-min-max-of-GtkSpinButton-tp4081532.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Niklas Johansson]

 vcl/source/window/layout.cxx |2 +-
 vcl/source/window/msgbox.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9826dec6f6021dba9859458acb0eb04520e5979a
Author: Niklas Johansson sleeping.pil...@gmail.com
Date:   Tue Nov 5 11:19:06 2013 +0100

Resolves: fdo#70588 MultiLineEdits don't need WB_WORDBREAK set

and inherits from Edit which reuses that same bit for password

Change-Id: I8add146fdbc1b3402b5409f01f75c620da25a313
Reviewed-on: https://gerrit.libreoffice.org/6579
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit af93243d06d81e996c1fae92190bc9622503e25b)
Reviewed-on: https://gerrit.libreoffice.org/6589
Reviewed-by: Niklas Johansson sleeping.pil...@gmail.com

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 64787d2..9b1d56f 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1821,7 +1821,7 @@ short MessageDialog::Execute()
 m_pImage-set_valign(VCL_ALIGN_START);
 m_pImage-Show();
 
-WinBits nWinStyle = WB_LEFT | WB_VCENTER | WB_WORDBREAK | WB_NOLABEL | 
WB_NOTABSTOP;
+WinBits nWinStyle = WB_LEFT | WB_VCENTER | WB_NOLABEL | WB_NOTABSTOP;
 
 m_pPrimaryMessage = new VclMultiLineEdit(m_pGrid, nWinStyle);
 m_pPrimaryMessage-SetPaintTransparent(true);
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 9e27767..28ad892 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -234,7 +234,7 @@ void MessBox::ImplPosControls()
 longnMaxWidth = GetDesktopRectPixel().GetWidth()-8;
 longnMaxLineWidth;
 longnWidth;
-WinBits nWinStyle = WB_LEFT | WB_WORDBREAK | WB_NOLABEL;
+WinBits nWinStyle = WB_LEFT | WB_NOLABEL;
 sal_uInt16  nTextStyle = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP | 
TEXT_DRAW_LEFT;
 
 delete mpVCLMultiLineEdit;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: libcdr.pc.in

[Fridrich Štrba]

 libcdr.pc.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c8d5fe5e64cb8c4075ff11402440ef85d09b958a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Nov 5 17:11:50 2013 +0100

Fix dependencies

Change-Id: Ib6face91cf14f0fbb36c03627e73f3f5c064d282

diff --git a/libcdr.pc.in b/libcdr.pc.in
index bc035bd..70b3dda 100644
--- a/libcdr.pc.in
+++ b/libcdr.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
 Description: Library for parsing the Corel Draw file format structure
 Version: @VERSION@
-Requires: librevenge-0.9 librevenge-stream-0.9 librevenge-0.2
+Requires: librevenge-0.0 librevenge-generators-0.0
 Libs: -L${libdir} -lcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
 Cflags: -I${includedir}/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 starmath/source/mathmlimport.cxx |5 +++--
 starmath/source/node.cxx |3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 603e9338568c29c01f812c4fd47b7e8138e015bb
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Nov 5 16:04:28 2013 +

Resolves: fdo#58094 don't crash on attempting mml import

Change-Id: I812f2b3e333ea59e9ebfc75a854faca050af8711

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 073d96c..f8a272e 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -2248,10 +2248,11 @@ void SmXMLRowContext_Impl::EndElement()
 {
 SmNodeArray aRelationArray;
 SmNodeStack rNodeStack = GetSmImport().GetNodeStack();
-sal_uLong nSize = rNodeStack.size()-nElementCount;
 
-if (nSize  0)
+if (rNodeStack.size()  nElementCount)
 {
+sal_uLong nSize = rNodeStack.size() - nElementCount;
+
 aRelationArray.resize(nSize);
 for (sal_uLong j=nSize;j  0;j--)
 {
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index d8832a5..819bc5e 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2521,7 +2521,8 @@ void SmMatrixNode::CreateTextFromNode(OUString rText)
 for (sal_uInt16 j = 0;  j  nNumCols; j++)
 {
 SmNode *pNode = GetSubNode(i * nNumCols + j);
-pNode-CreateTextFromNode(rText);
+if (pNode)
+pNode-CreateTextFromNode(rText);
 if (j != nNumCols-1)
 rText += # ;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Convertion SRC to UI: how to set min/max of GtkSpinButton

[Tomaž Vajngerl]

Hi,

On Tue, Nov 5, 2013 at 4:41 PM, Laurent BP jumbo4...@yahoo.fr wrote:
 Hello,

 I'm on the way to convert impswfdialog.src to UI. I'm following the how-to
 from Caolan
 https://wiki.documentfoundation.org/Development/WidgetLayout#HOWTO:_Step_by_step_dialog_conversion

 I've got a pb with a GtkSpinButton which must have a minimum value of 1 and
 maximum value of 100. How to set these min/max?
 This page in the wiki explains several points about GtkSpinButton
 https://wiki.documentfoundation.org/Development/WidgetLayout#MetricFields.2C_NumericFields_and_MetricBox
 but nothing about min/max.

In Glade, if you go to General settings for a spin button, there is
an option Adjustment. If you click this one, you get an option to
select and adjustment or add a new one, just add a new one.
Adjustments have all the settings for spin button you need like
min/max and inc/dec steps.

 Thanks for your help.

 Laurent BP

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

Set Default Language for Documents in LibreOffice deployment

[Afonso, Nelson]

Greetings

My name is Nelson and I am a Lieutenent at the Portuguese air Force

We are in the process of delivering LibreOffice to all users.

I wonder if there is a way I can set the option of default language for
documents to portuguese to every user over the network?

Is there a place: file or registry where this options are set?

Thanks in advance

Best Regards

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 40788, which changed state.

Bug 40788 Summary: FORMATTING - Calc ignores manual breaks when fit to number 
of pages is chosen
https://bugs.freedesktop.org/show_bug.cgi?id=40788

   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: Branch 'private/kohei/xlsx-import-speedup' - 2 commits - sc/qa sc/source

[Kohei Yoshida]

 sc/qa/unit/ucalc.hxx   |2 
 sc/qa/unit/ucalc_formula.cxx   |   56 +++
 sc/source/core/tool/address.cxx|   67 +
 sc/source/filter/oox/formulabuffer.cxx |2 
 4 files changed, 111 insertions(+), 16 deletions(-)

New commits:
commit 4d2666fa2b40b17673589e7b226907e9353f7e9d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Nov 5 11:55:57 2013 -0500

Avoid using an extra buffer when the name doesn't contain double-quotes.

Change-Id: Idc76ccad114e5964f80c5a3c8c8da2a64c1a2b86

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 039b256..495c9a0 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -47,6 +47,44 @@ ScAddress::Details::Details ( const ScDocument* pDoc,
 {
 }
 
+namespace {
+
+const sal_Unicode* parseQuotedNameWithBuffer( const sal_Unicode* pStart, const 
sal_Unicode* p, OUString rName )
+{
+// The current character must be on the 2nd quote.
+
+// Push all the characters up to the current, but skip the very first
+// character which is the opening quote.
+OUStringBuffer aBuf(OUString(pStart+1, p-pStart-1));
+
+++p; // Skip the 2nd quote.
+sal_Unicode cPrev = 0;
+for (; *p; ++p)
+{
+if (*p == '\'')
+{
+if (cPrev == '\'')
+{
+// double single-quote equals one single quote.
+aBuf.append(*p);
+cPrev = 0;
+continue;
+}
+}
+else if (cPrev == '\'')
+{
+// We are past the closing quote.  We're done!
+rName = aBuf.makeStringAndClear();
+return p;
+}
+else
+aBuf.append(*p);
+cPrev = *p;
+}
+
+return pStart;
+}
+
 /**
  * Parse from the opening single quote to the closing single quote.  Inside
  * the quotes, a single quote character is encoded by double single-quote
@@ -59,13 +97,11 @@ ScAddress::Details::Details ( const ScDocument* pDoc,
  * @return pointer to the character immediately after the closing single
  * quote.
  */
-static const sal_Unicode* lcl_ParseQuotedName( const sal_Unicode* p, OUString 
rName )
+const sal_Unicode* parseQuotedName( const sal_Unicode* p, OUString rName )
 {
-rName = ;
 if (*p != '\'')
 return p;
 
-OUStringBuffer aBuf;
 const sal_Unicode* pStart = p;
 sal_Unicode cPrev = 0;
 for (++p; *p; ++p)
@@ -75,25 +111,26 @@ static const sal_Unicode* lcl_ParseQuotedName( const 
sal_Unicode* p, OUString r
 if (cPrev == '\'')
 {
 // double single-quote equals one single quote.
-aBuf.append(*p);
-cPrev = 0;
-continue;
+return parseQuotedNameWithBuffer(pStart, p, rName);
 }
 }
 else if (cPrev == '\'')
 {
-// We are past the closing quote.  We're done!
-rName = aBuf.makeStringAndClear();
+// We are past the closing quote.  We're done!  Skip the opening
+// and closing quotes.
+rName = OUString(pStart+1, p - pStart-2);
 return p;
 }
-else
-aBuf.append(*p);
+
 cPrev = *p;
 }
 
+rName = ;
 return pStart;
 }
 
+}
+
 static long int
 sal_Unicode_strtol ( const sal_Unicode*  p,
  const sal_Unicode** pEnd )
@@ -265,7 +302,7 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start,
 }
 else if( *p == '\'')
 {
-p = lcl_ParseQuotedName(p, aTabName);
+p = parseQuotedName(p, aTabName);
 if (aTabName.isEmpty())
 return NULL;
 }
@@ -415,7 +452,7 @@ const sal_Unicode* ScRange::Parse_XL_Header(
 // single quote text inside the quoted text.
 if (*p == '\'')
 {
-p = lcl_ParseQuotedName(p, rExternDocName);
+p = parseQuotedName(p, rExternDocName);
 if (!*p || *p != ']' || rExternDocName.isEmpty())
 {
 rExternDocName = ;
@@ -447,7 +484,7 @@ const sal_Unicode* ScRange::Parse_XL_Header(
 // Excel does not allow [ and ] characters in sheet names though.
 // But, more sickness comes with MOOXML as there may be
 // '[1]Sheet 4'!$A$1  where [1] is the external doc's index.
-p = lcl_ParseQuotedName(p, rExternDocName);
+p = parseQuotedName(p, rExternDocName);
 if (!*p || *p != '!')
 {
 rExternDocName = ;
@@ -1003,7 +1040,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, 
ScDocument* pDoc, ScAddress rAdd
 {
 const sal_Unicode* pStart = p;
 OUString aTmp;
-p = lcl_ParseQuotedName(p, aTmp);
+p = parseQuotedName(p, aTmp);
 aDocName = aTmp;
 if (*p++ == SC_COMPILER_FILE_TAB_SEP)
 bExtDoc = true;
@@ -1036,7 +1073,7 @@