date:20130620

 sfx2/source/dialog/dinfdlg.cxx |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 722ce13234182692996c586607868a0cd4b039b5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jun 19 21:18:20 2013 +0100

Resolves: fdo#65930 line height needs to be calculated in ctor

we need to know that right from the start, not after the first
layout event after shown.

Change-Id: If7cc12cdf3e83913f0162fe34b376196162f6a45
(cherry picked from commit 7694bb997a68f6f8ebc03817be7e31ceb872ceb4)
Reviewed-on: https://gerrit.libreoffice.org/4373
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index e13e557..f5f619d 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1398,6 +1398,19 @@ CustomPropertiesWindow::CustomPropertiesWindow(Window* 
pParent,
 m_aNameBox.SetAccessibleName(rHeaderAccName);
 m_aTypeBox.SetAccessibleName(rHeaderAccType);
 m_aValueEdit.SetAccessibleName(rHeaderAccValue);
+
+m_aNameBox.Hide();
+m_aTypeBox.Hide();
+m_aValueEdit.Hide();
+m_aDateField.Hide();
+m_aTimeField.Hide();
+m_aDurationField.Hide();
+m_aEditButton.Hide();
+m_aYesNoButton.Hide();
+m_aRemoveButton.Hide();
+
+m_nLineHeight =
+( m_aRemoveButton.GetPosPixel().Y() * 2 ) + 
m_aRemoveButton.GetSizePixel().Height();
 }
 
 CustomPropertiesWindow::~CustomPropertiesWindow()
@@ -1555,16 +1568,6 @@ void CustomPropertiesWindow::InitControls( HeaderBar* 
pHeaderBar, const ScrollBa
 DBG_ASSERT( pHeaderBar, CustomPropertiesWindow::InitControls(): invalid 
headerbar );
 DBG_ASSERT( pScrollBar, CustomPropertiesWindow::InitControls(): invalid 
scrollbar );
 
-m_aNameBox.Hide();
-m_aTypeBox.Hide();
-m_aValueEdit.Hide();
-m_aDateField.Hide();
-m_aTimeField.Hide();
-m_aDurationField.Hide();
-m_aEditButton.Hide();
-m_aYesNoButton.Hide();
-m_aRemoveButton.Hide();
-
 const long nOffset = 4;
 const long nScrollBarWidth = pScrollBar-GetSizePixel().Width();
 const long nButtonWidth = m_aRemoveButton.GetSizePixel().Width() + 
nScrollBarWidth + nOffset;
@@ -1614,9 +1617,6 @@ void CustomPropertiesWindow::InitControls( HeaderBar* 
pHeaderBar, const ScrollBa
 
 pCurrent++;
 }
-
-m_nLineHeight =
-( m_aRemoveButton.GetPosPixel().Y() * 2 ) + 
m_aRemoveButton.GetSizePixel().Height();
 }
 
 sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-20 Thread Luke Deller

 sw/source/filter/ww8/wrtw8sty.cxx |6 --
 sw/source/filter/ww8/ww8par.cxx   |  113 --
 sw/source/filter/ww8/ww8par.hxx   |8 +-
 sw/source/filter/ww8/ww8par6.cxx  |   88 +
 4 files changed, 68 insertions(+), 147 deletions(-)

New commits:
commit 4b1ec8ce97d465b409f98c200b865c851844a3c7
Author: Luke Deller l...@deller.id.au
Date:   Sun Feb 10 02:31:47 2013 +1100

import different first page header/footer from doc

When a Word section has a different first page header/footer,
this used to be imported into LO as a chain of two page styles.
Now that LO supports a single page style with different first page
header/footer we can import to that.

This change also incidentally fixes fdo#57908.
bnc#654230 had the same underlying problem, so the workaround committed
for that (which includes comments expressing lack of understanding)
has been removed.

Reviewed-on: https://gerrit.libreoffice.org/2065
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
Signed-off-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

Conflicts:
sw/source/filter/ww8/wrtw8sty.cxx

Change-Id: I6df7e9abc8f2a327a3b33e06322ca943f6f24605

diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index d837181..4c0c50f 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1615,12 +1615,6 @@ void MSWordExportBase::SectionProperties( const 
WW8_SepInfo rSepInfo, WW8_PdAtt
 }
 }
 
-// The code above tries to detect if this is first page 
headers/footers,
-// but it doesn't work even for quite trivial testcases. As I don't 
actually
-// understand that code, I'll keep it. The simple and (at least for 
me) reliable way
-// to detect for first page seems to be just RES_POOLPAGE_FIRST.
-if( pPd-GetPoolFmtId() == RES_POOLPAGE_FIRST )
-titlePage = true;
 if( titlePage )
 AttrOutput().SectionTitlePage();
 
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 57ca4f5..2ff0fa7 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1910,27 +1910,11 @@ bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8 
nWhichItems, sal_uInt8 grpfIh
 return false;
 }
 
-void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int nSect,
-const SwPageDesc *pPrev, const wwSection rSection)
+void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
+const wwSection rSection)
 {
-sal_uInt8 nWhichItems = 0;
-SwPageDesc *pPD = 0;
-if (!bIsTitle)
-{
-nWhichItems =
-rSection.maSep.grpfIhdt  ~(WW8_HEADER_FIRST | WW8_FOOTER_FIRST);
-pPD = rSection.mpPage;
-}
-else
-{
-// Always read title page header/footer data - it could be used by 
following sections
-nWhichItems = ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST );
-
-pPD = rSection.mpTitlePage;
-}
-
 sal_uInt8 grpfIhdt = rSection.maSep.grpfIhdt;
-
+SwPageDesc *pPD = rSection.mpPage;
 
 if( pHdFt )
 {
@@ -1940,7 +1924,7 @@ void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int nSect,
 
 for( sal_uInt8 nI = 0x20; nI; nI = 1, nNumber-- )
 {
-if (nI  nWhichItems)
+if (nI  grpfIhdt)
 {
 bool bOk = true;
 if( bVer67 )
@@ -1953,10 +1937,14 @@ void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int 
nSect,
 
 bool bUseLeft
 = (nI  ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true: 
false;
+bool bUseFirst
+= (nI  ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST )) ? true: 
false;
 bool bFooter
 = (nI  ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD | 
WW8_FOOTER_FIRST )) ? true: false;
 
-SwFrmFmt rFmt = bUseLeft ? pPD-GetLeft() : pPD-GetMaster();
+SwFrmFmt rFmt = bUseLeft ? pPD-GetLeft()
+: bUseFirst ? pPD-GetFirst()
+: pPD-GetMaster();
 
 SwFrmFmt* pHdFtFmt;
 if (bFooter)
@@ -1967,6 +1955,8 @@ void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int nSect,
 pPD-GetMaster().SetFmtAttr(SwFmtFooter(true));
 if (bUseLeft)
 pPD-GetLeft().SetFmtAttr(SwFmtFooter(true));
+if (bUseFirst)
+pPD-GetFirst().SetFmtAttr(SwFmtFooter(true));
 pHdFtFmt = 
const_castSwFrmFmt*(rFmt.GetFooter().GetFooterFmt());
 }
 else
@@ -1977,6 +1967,8 @@ void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int nSect,
 pPD-GetMaster().SetFmtAttr(SwFmtHeader(true));
 if (bUseLeft)

Fernanda Lima fala ao vivo sobre novo estimulante sexual EnergyPRO 3D

2013-06-20 Thread Vitor Barbosa


Indicado de impotência sexual a ejaculação precoce, conheça o composto
energético
e afrodisíaco natual que vai garantir o desempenho e vitalidade das suas
relações

Os nutrientes contidos na formulação exclusiva do Kit EnergyPRO 3D foram
cuidadosamente
definidos para agir de forma progressiva no organismo, contribuindo para o
equilíbrio físico e mental,
trazendo mais energia e vitalidade para o seu dia-dia. Recuperando o ânimo
e a disposição.

Kit EnergyPRO 3D traz de volta o prazer, preocupando-se com a sua saúde e
bem estar. Seus
resultados são comprovados e foram apresentados no blog do programa Amor 
Sexo

www.blogamoresexo-oficial.com


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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.0.1-buildfix2'

2013-06-20 Thread Andras Timar

Tag 'libreoffice-4.1.0.1-buildfix2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-20 08:16 -0700

Tag libreoffice-4.1.0.1-buildfix2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwqxDAAoJEPQ0oe+v7q6jMNAP/RhiXlo5c5VHxtCm+Y/sTTRx
Xxua1vST7TdxEmQ4dhoEq8BZjReqIWzlA41CGmazQmNV4E+1EBI14qRP7r5qqPoz
uUWykdFjSJvw8cWCvYeUrBrYUaWH+biHq+SBdjT1XdvXw9F6S4zwJOEyj/uNCoU0
rArM3YtUufM/9jehY3pdEi62aHMYS02VR7wkTRzN9DdGfE8ImJnEpd3tja+Vgowo
ZQ+96fAkt+AbfecrS/E+jLnsAvJgXK5vLtH0OUrS0UVPaHigl/2uJONi0CrdYzdV
tt4bs8mQg38YZtYqs5oBC+Hgn2Pniz8+MsTm2RfdbnizIUTR+30Na8Y/F6cHhJfg
WigwBBi9w04lR6Hspq+6p8xAOHqFDGBgLTVdvDdbxQqFHUK7MArdfoucTt7bzfjF
BSl1znAn9HVoKHIz9SSYWNJDpCgz1BltS1qmxS0Hap1VYgyM0d2LtjRnLMaBNhIh
fzf+JarENNNpRmhTrOPJ3917+FrcNhwzr3Skz5+HHaW3xzk3jMkLGwBeUO/kV93i
jIlUtR6tfZDuH+H/hxEi7lzjCvtBnH/NXh0VoWdTmCQ1AMAIO/sxBH3SVzT7UFRl
/I6KN8nQPtuZOwc6SB/l5ZkkGFFzJ7Br2qDQtk687dSATl1BPEZR3I4UaKpvT2X/
6eNyMCBw4ISogqOe4W8E
=zMkH
-END PGP SIGNATURE-

Changes since libreoffice-4.1.0.1:
Andras Timar (1):
  buildfix

---
 source/kk/dbaccess/source/ui/misc.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.0.1-buildfix2'

Tag 'libreoffice-4.1.0.1-buildfix2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-20 08:16 -0700

Tag libreoffice-4.1.0.1-buildfix2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwqxEAAoJEPQ0oe+v7q6jPgQP/RmJKIJTpaM7+dgg3vsrlsLx
distxj33AbzaNTUiZCllClZjmsMnPDTfCvNmNci/kif9B1CAwMtwJrjO8ZF9Rm76
2IHorv7k1AkFY2gv8ccc92z/s1eGIq7pD2dx7F+kbYpWAL8PNQnSuHB9Um3Vep8o
Lw0YIUd7LZ/aA2mX0VAzM9+gSOBLXZ7cAMEngwiQGxvi0r8Jc3KcW7ByUGK60U3V
J8Z5tW3fVpIRAWgSMoBK7THcNKqN5WAemKnn5y2bntMg3hYYGxTncUhOO/cRC8C4
4AS5iEmANYpk9wYjKJ4v2RaLOgO11OdNvrHLzb7Ext3tWKlK2M7xwpSHNHZaRwVp
gAAkr7Uyt+75kqxXM9M1FuUPi6JC3sq8WUyq37j4g/21gKgKgePgUo/45i+7QDFG
9bopitH+FpO8V1Rl8HKGXwN7v57rRr5kjQT7DR8LkRRrUgt1x0DPj+KqnkGFcCFg
KbvVB53E5XG1mOalGnYyi112X4x3yNMglIHtCQPMd/NHJtkoeybg1kEOlADh6GTw
Pm6Q90cIatHJUf2oaE3dPwOo6bajNOYLh3rqid+rkyR3ZodlekeIf5lZ7YEEqn1v
Z1Saf0j3rZiOvC6UuiJMzXjopf1kkKeuRRUA8mRiCc8EnI9rj7ohVjnxJqFRd6gq
hp+87Z+JErB6sT17ESfg
=YLcF
-END PGP SIGNATURE-

Changes since libreoffice-4.1.0.1-buildfix1:
David Tardon (1):
  do not try to install helppacks that were not built

---
 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.0.1-buildfix2'

2013-06-20 Thread Christian Lohmaier

Tag 'libreoffice-4.1.0.1-buildfix2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-20 08:16 -0700

Tag libreoffice-4.1.0.1-buildfix2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwqxBAAoJEPQ0oe+v7q6jcFsQAKZDWc7aIyw4Onq8qLbbrBeS
MHIwkyMv/rxNbWcpyK5BjxMDodnfUKCJiOueUVyhD0DCZLuiimhh8IdNOC9LTwP/
h4saJE4ISXFx6OvjeFmEAsE4VCuT6iG7FEoMIONiAvLbOGILPCRFE2JmWWt5iQ8P
D9GV+mVEVeNgvJJsXYKuJnsIqbu23vwzzPhH64/XcXOCBHwuQbOR1p6sccpiNjl8
qm7yhLghL7LGF3VgE6H6AQsgmbI717QkA0m4Pv+Fk1Chq7U3rw6lptbPrVph9tnd
t+29H2tsQ+bYy7uofUF4xx6gtcAoOk+bi1DlSaVzx5mg0wTxjNIYj/0dUUvriAYJ
a4ICMvQgqJ5oO7cZdfCOVotYFvytZkuj48MSw4QdOYEfjBysiKRv739y9elbcUAS
nKVfh17l6qtuh27b9EPQu2InvsCp9pCWBdGtK3j9aUavoLzn0aqQWezPEuO2GUT4
5H6w+h3rUYvbUjRSXnBPxlJ5wVO6GMP1HQAqDy2bFJ/jUrDYEJ8EgqSsSc+MrObf
o/aIJ6uH7m0jdSGLgd23V9imfBoQuTYvKX/Tms2eL8Hmf702Q57susBR7lUppcyg
GO7an1lO+iCurmQkRMouMbAp6xXvcmTpYNi/P1k0+9Ed7ojfPVOFVymHCz1GMcy8
kvWTiSZZ7MXl9ZUBbZqm
=hOJr
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-13:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.0.1-buildfix2'

2013-06-20 Thread Christian Lohmaier

Tag 'libreoffice-4.1.0.1-buildfix2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-20 08:15 -0700

Tag libreoffice-4.1.0.1-buildfix2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwqwZAAoJEPQ0oe+v7q6jOYsP/R3KWSvt9AeZtmlCDq2v/LBw
g0XGD+/Fe7FgHjjfUyfEQ1jE4TOu0acpDzdLksjKz+NJd+aDsQc1hdc54guxrZfr
fdTMiY0D+r1pgVc5n1Kg3qmI4hhxAMQKCGVSntGlIgMT42Ox9uJ0YtfJ6z5QOJyU
m0l9/TTk1qhy7Mj5OaFcJFV5XAlk5zN1VZnQ//Vbn8oxrXJP6ocCkY0ZJzgYiMxY
PsvW/5C19A8kC8o0U3PxkChvaX2eLqc7eBOFwy5Oi90F+3xNvMJAqV3FnFcax7Ns
/3VmxzAvBHsvHJocjgx2K7hmFgw9JFr2dHM7i636GMMNpyiurE/X8TnkHQS4E3Z3
eYAJz5Vn0YYt1w2kXflkdUhKC7wh0pIuyRmKUOIVjJnw2JShTHfl4QyLE9R+lHU7
+3KRAZ2IwdWdWdxItj2R8TWTF3czJ3hhOiG1ekp0kz3K92xWfWSRwmpj7DBwmUQe
r87rmGyl4Y8wshUxwG3TrR4mJinets6LsFzV6VeqZ6IAyjDIrP1g474U1tjpkWn1
5nguShdcFVe1UcTa+HFvy39mRUHBaJ5A9DEDDanj2vtNdlKHfnPDgZSc75Siqxln
ARLuW1HO09C5vI8KeKRq2fRe4b+LF63AQYq2JJTPEttnaaMBX21SReVn4LnXHi8H
pF968h6QkngOOpF6CihC
=Phy9
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-12:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

 solenv/bin/modules/installer.pm |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 4379180aaa6b65e172d366fbf64cbe3cea6d5435
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 20 09:23:56 2013 +0200

quote $ for files from filelists too

Change-Id: Ice814ea226ddac24325770d038e019e19bc635ce

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 6ae5b57..24030ff 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -609,13 +609,6 @@ sub run {
 
 $filesinproductlanguageresolvedarrayref = 
installer::archivefiles::resolving_archive_flag($filesinproductlanguageresolvedarrayref,
 \@additional_paths_from_zipfiles, $languagestringref, $loggingdir);
 
-# packed files sometimes contain a $ in their name: 
HighlightText$1.class. For epm the $ has to be quoted by $$
-
-if (!( $installer::globals::iswindowsbuild || 
$installer::globals::simple ) )
-{
-
installer::scriptitems::quoting_illegal_filenames($filesinproductlanguageresolvedarrayref);
-}
-
 
##
 # Processing files with flag FILELIST and putting listed files into 
the file list
 
##
@@ -624,6 +617,13 @@ sub run {
 
 $filesinproductlanguageresolvedarrayref = 
installer::filelists::resolve_filelist_flag($filesinproductlanguageresolvedarrayref,
 $ENV{'INSTDIR'});
 
+# packed files sometimes contain a $ in their name: 
HighlightText$1.class. For epm the $ has to be quoted by $$
+
+if (!( $installer::globals::iswindowsbuild || 
$installer::globals::simple ) )
+{
+
installer::scriptitems::quoting_illegal_filenames($filesinproductlanguageresolvedarrayref);
+}
+
 #
 # Files with flag SUBST_FILENAME
 #
___
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' - solenv/bin

 solenv/bin/modules/installer.pm |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 36b4c3b0836717a414d5dc327eb90200f583a6b9
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 20 09:23:56 2013 +0200

quote $ for files from filelists too

Change-Id: Ice814ea226ddac24325770d038e019e19bc635ce
(cherry picked from commit 4379180aaa6b65e172d366fbf64cbe3cea6d5435)
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 27244a9..22b5537 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -609,13 +609,6 @@ sub run {
 
 $filesinproductlanguageresolvedarrayref = 
installer::archivefiles::resolving_archive_flag($filesinproductlanguageresolvedarrayref,
 \@additional_paths_from_zipfiles, $languagestringref, $loggingdir);
 
-# packed files sometimes contain a $ in their name: 
HighlightText$1.class. For epm the $ has to be quoted by $$
-
-if (!( $installer::globals::iswindowsbuild || 
$installer::globals::simple ) )
-{
-
installer::scriptitems::quoting_illegal_filenames($filesinproductlanguageresolvedarrayref);
-}
-
 
##
 # Processing files with flag FILELIST and putting listed files into 
the file list
 
##
@@ -624,6 +617,13 @@ sub run {
 
 $filesinproductlanguageresolvedarrayref = 
installer::filelists::resolve_filelist_flag($filesinproductlanguageresolvedarrayref,
 $ENV{'INSTDIR'});
 
+# packed files sometimes contain a $ in their name: 
HighlightText$1.class. For epm the $ has to be quoted by $$
+
+if (!( $installer::globals::iswindowsbuild || 
$installer::globals::simple ) )
+{
+
installer::scriptitems::quoting_illegal_filenames($filesinproductlanguageresolvedarrayref);
+}
+
 #
 # Files with flag SUBST_FILENAME
 #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [ANNOUNCE] libreoffice-4.1.0.1 tag created

2013-06-20 Thread Christian Lohmaier

Hi *,

On Wed, Jun 19, 2013 at 12:43 PM, Christian Lohmaier
lohma...@googlemail.com wrote:
 On Tue, Jun 18, 2013 at 4:03 PM, Christian Lohmaier
 lohma...@googlemail.com wrote:

 The tag libreoffice-4.1.0.1 (AKA RC1) has been created. The
 corresponding official builds will be available within next few days.

Because of a build breaker on Windows when building languges for which
translations are not present in the source, the tag

  libreoffice-4.1.0.1-buildfix2

has been created

Only the core repository is affected.

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

Is the only change.

To switch your tree to it, use:

./g fetch --tags
./g checkout -b tag-libreoffice-4.1.0.1-buildfix2 libreoffice-4.1.0.1-buildfix2

 An new tarball for the core repository including the fix has
been uploaded to
http://dev-builds.libreoffice.org/pre-releases/src/

Additionally the libreoffice-translations-4.1.0.1-buildfix1.tar.xz
tarball has been repackaged to use libreoffice-4.1.0.1 as toplevel
directory instead of libreoffice-4.1.0.1-buildfix1, so files don't
have to be moved manually after unpacking.

Sorry for the inconvenience,

Best Regards

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/source

2013-06-20 Thread Oliver-Rainer Wittmann

 desktop/source/deployment/gui/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4872ee3a623dc639482b125494fb9f1b3a46b5b9
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Thu Jun 20 07:43:37 2013 +

122398: correct library name for Windows platform

diff --git a/desktop/source/deployment/gui/makefile.mk 
b/desktop/source/deployment/gui/makefile.mk
index 2cda839..45ac440 100644
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -86,7 +86,7 @@ SHL1STDLIBS = \
 $(OLE32LIB)
 
 SHL1DEPN =
-SHL1IMPLIB = i$(TARGET)
+SHL1IMPLIB = i$(SHL1TARGET)
 SHL1DEF = $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME = $(SHL1TARGET)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 configmgr/source/valueparser.cxx |2 +-
 configmgr/source/xcdparser.cxx   |2 +-
 configmgr/source/xcsparser.cxx   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ebc635b95cc6d8c5853c443fee9fe76a0c89c121
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 20 10:07:21 2013 +0200

Turn redundant member direct-initializations into value-initializations

...the direct-initializations were introduced with
032d5126e41562917b91b8f4826b0be628169968 cppcheck: fix some 
uninitMemberVar in
configmgr part, presumably to avoid false positives from static analysis 
tools.
But the initializations are redundant, as the invariants of the affected 
classes
imply that the members have meaningful values at their points of use.  And 
the
direct-initializations with arbitrary values make it harder for a 
maintainer to
understand the relevant invariants, namely to ensure the members must have 
been
assigned /meaningful/ values by the time they are used.  Give a (subtle) 
clue by
making those into value-initializations.

Change-Id: Iadb25fa08b6d6b12d5bf8a8f04271270b6a7f7cb

diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index f0a4072..1deced0 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -257,7 +257,7 @@ css::uno::Any parseValue(
 
 }
 
-ValueParser::ValueParser(int layer): layer_(layer), state_(STATE_TEXT) {}
+ValueParser::ValueParser(int layer): layer_(layer), state_() {}
 
 ValueParser::~ValueParser() {}
 
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index 359c73d..a547c14 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -41,7 +41,7 @@ namespace configmgr {
 XcdParser::XcdParser(
 int layer, std::set OUString  const  processedDependencies, Data  
data):
 layer_(layer), processedDependencies_(processedDependencies), data_(data),
-state_(STATE_START), dependencyOptional_(false), nesting_(0)
+state_(STATE_START), dependencyOptional_(), nesting_()
 {}
 
 XcdParser::~XcdParser() {}
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index 6f4744d..0dc218d 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -114,7 +114,7 @@ void merge(
 }
 
 XcsParser::XcsParser(int layer, Data  data):
-valueParser_(layer), data_(data), state_(STATE_START), ignoring_(0)
+valueParser_(layer), data_(data), state_(STATE_START), ignoring_()
 {}
 
 XcsParser::~XcsParser() {}
___
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' - 48/72ee3a623dc639482b125494fb9f1b3a46b5b9

 48/72ee3a623dc639482b125494fb9f1b3a46b5b9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9dad09f25068e3b37b8cfb1765d5e312fee84dff
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jun 20 09:17:38 2013 +0100

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: 3 commits - oox/Library_oox.mk oox/source writerfilter/source

2013-06-20 Thread Miklos Vajna

 oox/Library_oox.mk|1 
 oox/source/shape/LockedCanvasContext.cxx  |   66 ++
 oox/source/shape/LockedCanvasContext.hxx  |   40 +++
 oox/source/shape/ShapeContextHandler.cxx  |   37 ++
 oox/source/shape/ShapeContextHandler.hxx  |2 
 oox/source/token/namespaces.hxx.tail  |1 
 oox/source/token/namespaces.txt   |1 
 writerfilter/source/dmapper/GraphicImport.cxx |1 
 writerfilter/source/ooxml/model.xml   |   23 +
 9 files changed, 171 insertions(+), 1 deletion(-)

New commits:
commit a9966b272151fa66c4a7c74bcb2505ef2ea94a6e
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jun 20 10:37:46 2013 +0200

fdo#43641 oox: initial import of lc:lockedCanvas

If that canvas contains a single shape, the result looks OK. If it
contains a groupshape, we also import something, but then the position /
size is still to be improved.

Change-Id: Ic4e4c08016a05a5e3acb005c3a642981ba4fb16d

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 3d8743f..45f4b9c 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -266,6 +266,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/ppt/timenodelistcontext \
 oox/source/ppt/timetargetelementcontext \
 oox/source/ppt/extdrawingfragmenthandler \
+oox/source/shape/LockedCanvasContext \
 oox/source/shape/ShapeContextHandler \
 oox/source/shape/ShapeDrawingFragmentHandler \
 oox/source/shape/ShapeFilterBase \
diff --git a/oox/source/shape/LockedCanvasContext.cxx 
b/oox/source/shape/LockedCanvasContext.cxx
new file mode 100644
index 000..9a7e9c0
--- /dev/null
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include LockedCanvasContext.hxx
+#include oox/drawingml/shapegroupcontext.hxx
+
+using namespace com::sun::star;
+
+namespace oox { namespace shape {
+
+LockedCanvasContext::LockedCanvasContext( ContextHandler rParent )
+: ContextHandler( rParent )
+{
+}
+
+LockedCanvasContext::~LockedCanvasContext()
+{
+}
+
+oox::drawingml::ShapePtr LockedCanvasContext::getShape()
+{
+return mpShape;
+}
+
+uno::Reference xml::sax::XFastContextHandler  
LockedCanvasContext::createFastChildContext( sal_Int32 aElementToken, const 
uno::Reference xml::sax::XFastAttributeList  /*xAttribs*/ ) throw 
(xml::sax::SAXException, uno::RuntimeException)
+{
+uno::Reference xml::sax::XFastContextHandler  xRet;
+
+switch( getBaseToken( aElementToken ) )
+{
+case XML_lockedCanvas:
+break;
+case XML_nvGrpSpPr:
+break;
+case XML_grpSpPr:
+break;
+case XML_sp:
+{
+oox::drawingml::ShapePtr pMasterShape;
+mpShape.reset(new 
oox::drawingml::Shape(com.sun.star.drawing.CustomShape));
+xRet = new oox::drawingml::ShapeContext( *this, pMasterShape, 
mpShape );
+}
+break;
+case XML_grpSp:
+{
+oox::drawingml::ShapePtr pMasterShape;
+mpShape.reset(new 
oox::drawingml::Shape(com.sun.star.drawing.GroupShape));
+xRet = new oox::drawingml::ShapeGroupContext( *this, pMasterShape, 
mpShape );
+}
+break;
+default:
+SAL_WARN(oox, LockedCanvasContext::createFastChildContext: 
unhandled element:  getBaseToken(aElementToken));
+break;
+}
+return xRet;
+}
+
+} }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/LockedCanvasContext.hxx 
b/oox/source/shape/LockedCanvasContext.hxx
new file mode 100644
index 000..c93d49d
--- /dev/null
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef OOX_SHAPE_LOCKEDCANVASCONTEXT
+#define OOX_SHAPE_LOCKEDCANVASCONTEXT
+
+#include oox/core/contexthandler.hxx
+#include oox/drawingml/shape.hxx
+
+namespace oox { namespace shape {
+
+/// Locked canvas is kind of a container for drawingml shapes: it can even 
contain group shapes.
+class LockedCanvasContext : public oox::core::ContextHandler
+{
+public:
+LockedCanvasContext( oox::core::ContextHandler rParent );
+virtual ~LockedCanvasContext();
+
+virtual com::sun::star::uno::Reference 
com::sun::star::xml::sax::XFastContextHandler  SAL_CALL

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

 store/source/storcach.cxx |4 ++--
 store/source/stortree.cxx |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 104a7bab5806aad5dfc8afb5637ca4363e05443a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 20 10:54:20 2013 +0200

-Werror,-Wdeprecated-register

Change-Id: I1ec3d7845477cfb5bc6a3d7f70ddabef12583e1b

diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index 481177e..e2ac68b6 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -222,7 +222,7 @@ void EntryCache::destroy (Entry * entry)
  *==*/
 static int highbit(sal_Size n)
 {
-register int k = 1;
+int k = 1;
 
 if (n == 0)
 return (0);
@@ -420,7 +420,7 @@ void PageCache_Impl::rescale_Impl (sal_Size new_size)
 
 Entry * PageCache_Impl::lookup_Impl (Entry * entry, sal_uInt32 nOffset)
 {
-register int lookups = 0;
+int lookups = 0;
 while (entry != 0)
 {
 if (entry-m_nOffset == nOffset)
diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx
index 1499824..04bcd89 100644
--- a/store/source/stortree.cxx
+++ b/store/source/stortree.cxx
@@ -57,12 +57,12 @@ OStoreBTreeNodeData::OStoreBTreeNodeData (sal_uInt16 
nPageSize)
  */
 sal_uInt16 OStoreBTreeNodeData::find (const T t) const
 {
-register sal_Int32 l = 0;
-register sal_Int32 r = usageCount() - 1;
+sal_Int32 l = 0;
+sal_Int32 r = usageCount() - 1;
 
 while (l  r)
 {
-register sal_Int32 const m = ((l + r)  1);
+sal_Int32 const m = ((l + r)  1);
 
 if (t.m_aKey == m_pData[m].m_aKey)
 return ((sal_uInt16)(m));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/inc/svdata.hxx  |   22 ++
 vcl/source/app/svdata.cxx   |9 +
 vcl/source/app/svmain.cxx   |3 +++
 vcl/source/gdi/bitmapex.cxx |   42 ++
 4 files changed, 52 insertions(+), 24 deletions(-)

New commits:
commit a3694b1b32cb0677019962a5908fe775c83ed5a6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jun 20 10:01:10 2013 +0100

move static bitmap into a svapp member

so it won't crash on exit when its dtor uses stuff destroyed by deinitvcl
already.

also fix comparisons, i.e. presumably
aLastColorTopLeft == aLastColorTopLeft etc
should have been aLastColorTopLeft == aColorTopLeft

Change-Id: I1f3dc47504c5add113b3a8bcadf010ca3b9f4c31

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 86b0d7a9..a929165 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -284,6 +284,26 @@ struct ImplSVNWFData
 boolmbDDListBoxNoTextArea:1;
 };
 
+struct BlendFrameCache
+{
+Size m_aLastSize;
+sal_uInt8 m_nLastAlpha;
+Color m_aLastColorTopLeft;
+Color m_aLastColorTopRight;
+Color m_aLastColorBottomRight;
+Color m_aLastColorBottomLeft;
+BitmapEx m_aLastResult;
+
+BlendFrameCache()
+: m_aLastSize(0, 0)
+, m_nLastAlpha(0)
+, m_aLastColorTopLeft(COL_BLACK)
+, m_aLastColorTopRight(COL_BLACK)
+, m_aLastColorBottomRight(COL_BLACK)
+, m_aLastColorBottomLeft(COL_BLACK)
+{
+}
+};
 
 struct ImplSVData
 {
@@ -312,6 +332,7 @@ struct ImplSVData
 UnoWrapperBase* mpUnoWrapper;
 Window* mpIntroWindow;  // the splash screen
 DockingManager* mpDockingManager;
+BlendFrameCache*mpBlendFrameCache;
 sal_BoolmbIsTestTool;
 
 oslThreadIdentifier mnMainThreadId;
@@ -330,6 +351,7 @@ Window* ImplGetDefaultWindow();
 VCL_PLUGIN_PUBLIC ResMgr* ImplGetResMgr();
 VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if 
no res mgr
 DockingManager* ImplGetDockingManager();
+BlendFrameCache*ImplGetBlendFrameCache();
 voidImplWindowAutoMnemonic( Window* pWindow );
 
 voidImplUpdateSystemProcessWindow();
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index feec982..2a7bc93 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -256,6 +256,15 @@ DockingManager* ImplGetDockingManager()
 return pSVData-mpDockingManager;
 }
 
+BlendFrameCache* ImplGetBlendFrameCache()
+{
+ImplSVData* pSVData = ImplGetSVData();
+if ( !pSVData-mpBlendFrameCache)
+pSVData-mpBlendFrameCache= new BlendFrameCache();
+
+return pSVData-mpBlendFrameCache;
+}
+
 class AccessBridgeCurrentContext: public cppu::WeakImplHelper1 
com::sun::star::uno::XCurrentContext 
 {
 public:
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 21a351b..9104be9 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -540,6 +540,9 @@ void DeInitVCL()
 if ( pSVData-maAppData.mpFirstEventHook )
 ImplFreeEventHookData();
 
+if (pSVData-mpBlendFrameCache)
+delete pSVData-mpBlendFrameCache, pSVData-mpBlendFrameCache = NULL;
+
 ImplDeletePrnQueueList();
 delete pSVData-maGDIData.mpScreenFontList;
 pSVData-maGDIData.mpScreenFontList = NULL;
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 7a3ca96..227e630 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -1252,31 +1252,25 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame(
 Color aColorBottomRight,
 Color aColorBottomLeft)
 {
-static Size aLastSize(0, 0);
-static sal_uInt8 nLastAlpha(0);
-static Color aLastColorTopLeft(COL_BLACK);
-static Color aLastColorTopRight(COL_BLACK);
-static Color aLastColorBottomRight(COL_BLACK);
-static Color aLastColorBottomLeft(COL_BLACK);
-static BitmapEx aLastResult;
-
-if(aLastSize == rSize
- nLastAlpha == nAlpha
- aLastColorTopLeft == aLastColorTopLeft
- aLastColorTopRight == aLastColorTopRight
- aLastColorBottomRight == aLastColorBottomRight
- aLastColorBottomLeft == aLastColorBottomLeft)
+BlendFrameCache* pBlendFrameCache = ImplGetBlendFrameCache();
+
+if(pBlendFrameCache-m_aLastSize == rSize
+ pBlendFrameCache-m_nLastAlpha == nAlpha
+ pBlendFrameCache-m_aLastColorTopLeft == aColorTopLeft
+ pBlendFrameCache-m_aLastColorTopRight == aColorTopRight
+ pBlendFrameCache-m_aLastColorBottomRight == aColorBottomRight
+ pBlendFrameCache-m_aLastColorBottomLeft == aColorBottomLeft)
 {
-return aLastResult;
+return pBlendFrameCache-m_aLastResult;
 }
 
-aLastSize = rSize;
-nLastAlpha = nAlpha;
-aLastColorTopLeft = aLastColorTopLeft;
-aLastColorTopRight = aLastColorTopRight;
-

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

 sw/source/core/txtnode/thints.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5c214a04b3e2404495951c9d9520a03011fb0ed6
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jun 20 10:30:45 2013 +0300

Remove pointless overdose comment

Change-Id: I0e9a490ae4364b9bf14d6ad8766aef279a69db01

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index 0893dac..f4f96e0 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -64,7 +64,6 @@
 #include poolfmt.hxx
 #include swfont.hxx
 #include istyleaccess.hxx
-// OD 26.06.2003 #108784#
 #include dcontact.hxx
 #include docsh.hxx
 #include svl/smplhint.hxx
commit 1410cac73fc6e4d2c360e33ac5d185ad900cd728
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jun 20 10:29:59 2013 +0300

WaE: macro is not used

Change-Id: I2f55abf4526f4184ba04fc173df8cf5236219cfc

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index 9bcfcf4..0893dac 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -75,7 +75,6 @@
 #define CHECK   Check(true);
 #define CHECK_NOTMERGED Check(false);
 #else
-#define CHECK
 #define CHECK_NOTMERGED
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

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

Bug 54157 depends on bug 60565, which changed state.

Bug 60565 Summary: EDITING: Installing or deleting fonts with Writer open 
results in bizarre document layout
https://bugs.freedesktop.org/show_bug.cgi?id=60565

   What|Removed |Added

 Status|NEEDINFO|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 'libreoffice-4-0' - vcl/inc vcl/unx

 vcl/inc/unx/gtk/gtkgdi.hxx   |4 +++
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   37 +--
 2 files changed, 35 insertions(+), 6 deletions(-)

New commits:
commit 60d26eab97ec50a92f19994a3694f3f1d2d61038
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jun 18 18:01:30 2013 +0100

fdo#60565 - re-read font data on GtkSettings fontconfig-timestamp notify.

Change-Id: If1c4d3a7754cc35208e40494828a799f94f26afc
Reviewed-on: https://gerrit.libreoffice.org/4347
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
Reviewed-on: https://gerrit.libreoffice.org/4376

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 86003ed..7239d43 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -55,6 +55,8 @@ public:
 Rectangle 
rNativeBoundingRegion,
 Rectangle 
rNativeContentRegion );
 void updateSettings( AllSettings rSettings );
+static void refreshFontconfig( GtkSettings *pSettings );
+static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer );
 private:
 GtkWidget   *mpWindow;
 static GtkStyleContext *mpButtonStyle;
@@ -139,6 +141,8 @@ public:
 
 //helper methods for frame's UpdateSettings
 void updateSettings( AllSettings rSettings );
+static void refreshFontconfig( GtkSettings *pSettings );
+static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer );
 
 virtual boolsetClipRegion( const Region );
 virtual voidResetClipRegion();
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 1455850..e4bd038 100755
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3710,14 +3710,16 @@ void printStyleColors( GtkStyle* pStyle )
 }
 #endif
 
-void GtkSalGraphics::updateSettings( AllSettings rSettings )
+void GtkSalGraphics::signalSettingsNotify( GObject *pSettings, GParamSpec 
*pSpec, gpointer )
 {
-GdkScreen* pScreen = gtk_widget_get_screen( m_pWindow );
-gtk_widget_ensure_style( m_pWindow );
-GtkStyle* pStyle = gtk_widget_get_style( m_pWindow );
-GtkSettings* pSettings = gtk_widget_get_settings( m_pWindow );
-StyleSettings aStyleSet = rSettings.GetStyleSettings();
+g_return_if_fail( pSpec != NULL );
 
+if( !strcmp( pSpec-name, gtk-fontconfig-timestamp ) )
+GtkSalGraphics::refreshFontconfig( GTK_SETTINGS( pSettings ) );
+}
+
+void GtkSalGraphics::refreshFontconfig( GtkSettings *pSettings )
+{
 guint latest_fontconfig_timestamp = 0;
 static guint our_fontconfig_timestamp = 0;
 g_object_get( pSettings, gtk-fontconfig-timestamp, 
latest_fontconfig_timestamp, (char *)NULL );
@@ -3726,9 +3728,32 @@ void GtkSalGraphics::updateSettings( AllSettings 
rSettings )
 bool bFirstTime = our_fontconfig_timestamp == 0;
 our_fontconfig_timestamp = latest_fontconfig_timestamp;
 if (!bFirstTime)
+{
 psp::PrintFontManager::get().initialize();
+}
+}
+}
+
+void GtkSalGraphics::updateSettings( AllSettings rSettings )
+{
+GdkScreen* pScreen = gtk_widget_get_screen( m_pWindow );
+gtk_widget_ensure_style( m_pWindow );
+GtkStyle* pStyle = gtk_widget_get_style( m_pWindow );
+GtkSettings* pSettings = gtk_widget_get_settings( m_pWindow );
+StyleSettings aStyleSet = rSettings.GetStyleSettings();
+
+// Listen for font changes
+if( !g_object_get_data( G_OBJECT( pSettings ), libo:listening ) )
+{
+g_object_set_data( G_OBJECT( pSettings ), libo:listening,
+   GUINT_TO_POINTER( 1 ) );
+g_signal_connect_data( G_OBJECT( pSettings ), notify,
+   G_CALLBACK( signalSettingsNotify ),
+   NULL, NULL, G_CONNECT_AFTER );
 }
 
+refreshFontconfig( pSettings );
+
 // get the widgets in place
 NWEnsureGTKMenu( m_nXScreen );
 NWEnsureGTKMenubar( m_nXScreen );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/source xmlsecurity/source

2013-06-20 Thread Oliver-Rainer Wittmann

 desktop/source/migration/services/oo3extensionmigration.cxx |9 +++--
 xmlsecurity/source/dialogs/warnings.src |2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 1da3011189bcf5f79e3212303962937e9dcfe6ea
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Thu Jun 20 08:38:57 2013 +

122397: extension migration - catch certain expection occuring during 
deployment of installed extension in order to continue the migration

diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx 
b/desktop/source/migration/services/oo3extensionmigration.cxx
index 53caeda..03dd9515 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -48,8 +48,7 @@
 
 #include com/sun/star/deployment/VersionException.hpp
 #include dp_gui_handleversionexception.hxx
-
-#include com/sun/star/deployment/VersionException.hpp
+#include com/sun/star/deployment/DeploymentException.hpp
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -366,6 +365,12 @@ bool OO3ExtensionMigration::migrateExtension( const 
::rtl::OUString sSourceDir
 catch ( lang::IllegalArgumentException )
 {
 }
+catch ( deployment::DeploymentException )
+{
+}
+catch ( uno::RuntimeException  )
+{
+}
 }
 
 return false;
commit 1aedcb86f08affb4265539418d4cde377c4de80c
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Thu Jun 20 08:34:23 2013 +

#122564# correct typo, save - safe

diff --git a/xmlsecurity/source/dialogs/warnings.src 
b/xmlsecurity/source/dialogs/warnings.src
index e17a5e8..d6d6b31 100644
--- a/xmlsecurity/source/dialogs/warnings.src
+++ b/xmlsecurity/source/dialogs/warnings.src
@@ -75,7 +75,7 @@ ModalDialog RID_XMLSECTP_MACROWARN
 Pos = MAP_APPFONT( MW_COL_1, MW_ROW_3 );
 Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
 Wordbreak = TRUE;
-Text [ en-US ] = Macros may contain viruses. Disabling macros for a 
document is always save. If you disable macros you may lose functionality 
provided by the document macros.;
+Text [ en-US ] = Macros may contain viruses. Disabling macros for a 
document is always safe. If you disable macros you may lose functionality 
provided by the document macros.;
 };
 CheckBox CB_ALWAYSTRUST
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/aqua/source/gdi/atsui/salgdi.cxx |   42 --
 vcl/coretext/salgdi2.cxx |   43 ---
 vcl/inc/aqua/atsui/salgdi.h  |2 -
 vcl/inc/coretext/salgdi2.h   |2 -
 4 files changed, 89 deletions(-)

New commits:
commit 7bd45e29ed9e740568f42134e9da840d26dc6c00
Author: Khaled Hosny khaledho...@eglug.org
Date:   Tue Jun 4 00:16:06 2013 +0200

Drop CJK extra leading crack

It have been unused on Mac OS X since since 2008 (commit
da4d070d9d2d563f6e1401496957b22b51c81ff9).

Change-Id: I4b3eabe71a54021903009310a87319c9caecfd4c
(cherry picked from commit a3e97576aa0a7d7c5d51a8ca2f9d220e7d342d87)
Reviewed-on: https://gerrit.libreoffice.org/4377
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx 
b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index f4518f9..7a6ce95 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -66,7 +66,6 @@ ImplMacFontData::ImplMacFontData( const 
ImplDevFontAttributes rDFA, ATSUFontID
 ,   mbOs2Read( false )
 ,   mbHasOs2Table( false )
 ,   mbCmapEncodingRead( false )
-,   mbHasCJKSupport( false )
 ,   mbFontCapabilitiesRead( false )
 {}
 
@@ -110,7 +109,6 @@ inline FourCharCode GetTag(const char aTagName[5])
 }
 
 static unsigned GetUShort( const unsigned char* p ){return((p[0]8)+p[1]);}
-static unsigned GetUInt( const unsigned char* p ) { 
return((p[0]24)+(p[1]16)+(p[2]8)+p[3]);}
 
 #if MACOSX_SDK_VERSION = 1070
 extern C {
@@ -240,16 +238,6 @@ void ImplMacFontData::ReadOs2Table( void ) const
 
 // parse the OS/2 raw data
 // TODO: also analyze panose info, etc.
-
-// check if the fonts needs the CJK extra leading heuristic
-const unsigned char* pOS2map = aBuffer[0];
-const sal_uInt32 nVersion = GetUShort( pOS2map );
-if( nVersion = 0x0001 )
-{
-sal_uInt32 ulUnicodeRange2 = GetUInt( pOS2map + 46 );
-if( ulUnicodeRange2  0x2DF0 )
-mbHasCJKSupport = true;
-}
 }
 
 void ImplMacFontData::ReadMacCmapEncoding( void ) const
@@ -281,36 +269,6 @@ void ImplMacFontData::ReadMacCmapEncoding( void ) const
 return;
 if( GetUShort( pCmap ) != 0x )
 return;
-
-// check if the fonts needs the CJK extra leading heuristic
-int nSubTables = GetUShort( pCmap + 2 );
-
-for( const unsigned char* p = pCmap + 4; --nSubTables = 0; p += 8 )
-{
-int nPlatform = GetUShort( p );
-if( nPlatform == kFontMacintoshPlatform ) {
-int nEncoding = GetUShort (p + 2 );
-if( nEncoding == kFontJapaneseScript ||
-nEncoding == kFontTraditionalChineseScript ||
-nEncoding == kFontKoreanScript ||
-nEncoding == kFontSimpleChineseScript )
-{
-mbHasCJKSupport = true;
-break;
-}
-}
-}
-}
-
-// ---
-
-bool ImplMacFontData::HasCJKSupport( void ) const
-{
-ReadOs2Table();
-if( !mbHasOs2Table )
-ReadMacCmapEncoding();
-
-return mbHasCJKSupport;
 }
 
 // ===
diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index 8e98f84..00ee7e3 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -77,7 +77,6 @@ ImplMacFontData::ImplMacFontData( const ImplMacFontData rSrc 
)
 ,   mbOs2Read( rSrc.mbOs2Read )
 ,   mbHasOs2Table( rSrc.mbHasOs2Table )
 ,   mbCmapEncodingRead( rSrc.mbCmapEncodingRead )
-,   mbHasCJKSupport( rSrc.mbHasCJKSupport )
 {
 if( mpCharMap )
 mpCharMap-AddReference();
@@ -92,7 +91,6 @@ ImplMacFontData::ImplMacFontData( const 
ImplDevFontAttributes rDFA, sal_IntPtr
 ,   mbOs2Read( false )
 ,   mbHasOs2Table( false )
 ,   mbCmapEncodingRead( false )
-,   mbHasCJKSupport( false )
 ,   mbFontCapabilitiesRead( false )
 {}
 
@@ -121,7 +119,6 @@ ImplFontEntry* 
ImplMacFontData::CreateFontInstance(FontSelectPattern rFSD) cons
 // ---
 
 static unsigned GetUShort( const unsigned char* p ){return((p[0]8)+p[1]);}
-static unsigned GetUInt( const unsigned char* p ) { 
return((p[0]24)+(p[1]16)+(p[2]8)+p[3]);}
 
 const ImplFontCharMap* ImplMacFontData::GetImplFontCharMap() const
 {
@@ -233,16 +230,6 @@ void ImplMacFontData::ReadOs2Table( void ) const
 
 // parse the OS/2 raw data
 // TODO: also analyze panose info, etc.
-
-// check if the fonts needs the CJK extra leading heuristic
-const unsigned char* pOS2map = aBuffer[0];
-const sal_uInt32 nVersion = GetUShort( pOS2map );
-if( nVersion = 0x0001 )
-{
-sal_uInt32 ulUnicodeRange2 = GetUInt( pOS2map + 46 );
-if( ulUnicodeRange2  0x2DF0 )
-mbHasCJKSupport = true;
-}
 }

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

 vcl/generic/glyphs/gcach_ftyp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa1122a42dad9d89ab608bdc0e0c4b064e431797
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Jun 20 01:27:21 2013 +0200

Fix calculation of internal leading

Stupid me, I totally messed this up! God only knows how many non-bugs
people had to fix because of this typo.

Has the side effect of fixing fdo#64972 (among many others of course,
but this is the only one still open).

Change-Id: I9d8fdb6d37d4af9b0ac973902e469e0bd3a2408a
(cherry picked from commit 22d23d52b0f65636df3a1cb8fada9bf7de77eb78)

Signed-off-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index e34b38d..e3d65d9 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -993,7 +993,7 @@ void ServerFont::FetchFontMetric( ImplFontMetricData rTo, 
long rFactor ) const
 }
 }
 
-rTo.mnIntLeading = (rTo.mnAscent + rTo.mnDescent) - 
((maFaceFT-units_per_EM + 32)  6);
+rTo.mnIntLeading = rTo.mnAscent + rTo.mnDescent - (maFaceFT-units_per_EM 
* fScale + 0.5);
 
 if( pOS2  (pOS2-version != 0x) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 tools/source/stream/vcompat.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9e8e5568e2a566119ab57e1653f72f59f7169e94
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 20 12:39:00 2013 +0200

make this more resilient to stream problems

The metafile stream read in ooxmlexport test for fdo51550.odt is broken
for some reason, so mnTotalSize is not initialized. That means that we
try to seek by an arbitrary value in the destructor.

Change-Id: I3bd5ef3708c816fc8a749b446cecf98c3aa52f65

diff --git a/tools/source/stream/vcompat.cxx b/tools/source/stream/vcompat.cxx
index 85c9a1e..b81f956 100644
--- a/tools/source/stream/vcompat.cxx
+++ b/tools/source/stream/vcompat.cxx
@@ -22,6 +22,8 @@
 
 VersionCompat::VersionCompat( SvStream rStm, sal_uInt16 nStreamMode, 
sal_uInt16 nVersion ) :
 mpRWStm ( rStm ),
+mnCompatPos ( 0 ),
+mnTotalSize ( 0 ),
 mnStmMode   ( nStreamMode ),
 mnVersion   ( nVersion )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/coretext/salgdi2.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 52ad472c910cd79992a6f22dfa0f914daa4f0af9
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 5 14:58:13 2013 +0300

Initialise more fields, especially mfFakeDPIScale

Now the iOS app displays the test document successfully again.

Change-Id: I71aeacc50e51a28ba1e8b67c7da42da0c848f997
(cherry picked from commit 684c875ebecf561bc6726e31a1db9dbbd5fb7850)
Reviewed-on: https://gerrit.libreoffice.org/4380
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index 3d6cc95..e8c4203 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -290,7 +290,9 @@ AquaSalGraphics::AquaSalGraphics()
 , mbVirDev( false )
 , mbWindow( false )
 #else
-: mpMacFontData( NULL )
+: mrContext( NULL )
+, mfFakeDPIScale( 1.0 )
+, mpMacFontData( NULL )
 , mpMacTextStyle( NULL )
 , maTextColor( COL_BLACK )
 , mbNonAntialiasedText( false )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/coretext/ctlayout.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f36acaebced66333bea26f9f99c599bd9e6b9ed3
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jun 4 16:56:16 2013 +0300

Avoid crash on iOS: We need to get a valid context here

Change-Id: Ib3fc01213fc6bc370a6c8b774a063f6f275ba6f2
(cherry picked from commit 35b0a4cd274c1567cf0b8067eb01f17b82ee9f35)
Reviewed-on: https://gerrit.libreoffice.org/4379
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index a4f242d..81105e2 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -432,6 +432,12 @@ void CTLayout::GetCaretPositions( int nMaxIndex, 
sal_Int32* pCaretXArray ) const
 bool CTLayout::GetBoundRect( SalGraphics rGraphics, Rectangle rVCLRect ) 
const
 {
 AquaSalGraphics rAquaGraphics = static_castAquaSalGraphics(rGraphics);
+
+#ifdef IOS
+if( !rAquaGraphics.CheckContext() )
+return false;
+#endif
+
 CGRect aMacRect = CTLineGetImageBounds( mpCTLine, rAquaGraphics.mrContext 
);
 CGPoint aMacPos = CGContextGetTextPosition( rAquaGraphics.mrContext );
 aMacRect.origin.x -= aMacPos.x;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/coretext/ctfonts.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5fd52a60cad1be6ffa08d6508526539d7def0e03
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 5 23:11:35 2013 +0300

CGColorCreateGenericRGB is not available on iOS

Change-Id: Id7c6077ea0e45d848be099d48ef4d7207e65a06f
(cherry picked from commit f2e5461f5615650745f6a846be461d97f6caf2b5)
Reviewed-on: https://gerrit.libreoffice.org/4381
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index 435b141..8d693d1 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -232,8 +232,10 @@ bool CTTextStyle::GetGlyphOutline( sal_GlyphId nGlyphId, 
basegfx::B2DPolyPolygon
 
 void CTTextStyle::SetTextColor( const RGBAColor rColor )
 {
-CGColorRef pCGColor = CGColorCreateGenericRGB( rColor.GetRed(),
-rColor.GetGreen(), rColor.GetBlue(), rColor.GetAlpha() );
+CGFloat aColor[] = { rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(), 
rColor.GetAlpha() };
+CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
+CGColorRef pCGColor = CGColorCreate( cs, aColor );
+CGColorSpaceRelease( cs );
 CFDictionarySetValue( mpStyleDict, kCTForegroundColorAttributeName, 
pCGColor );
 CFRelease( pCGColor);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/coretext/ctfonts.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bfc66b44ed449ae2de6a4bcfed57651cc754f98e
Author: Tor Lillqvist t...@iki.fi
Date:   Sun Jun 16 11:44:59 2013 +0300

kCTFontTableOptionExcludeSynthetic is deprecated in 10.8

Change-Id: Ic5fc06e38db6f2111d516c53b6d1be2e47a7ced7
(cherry picked from commit fa76a7159ad022df555f9c89dfce30a9c1681c26)
Reviewed-on: https://gerrit.libreoffice.org/4382
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index 8d693d1..630325a 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -285,7 +285,7 @@ int CTFontData::GetFontTable( const char pTagName[5], 
unsigned char* pResultBuf
 // get the raw table length
 CTFontDescriptorRef pFontDesc = reinterpret_castCTFontDescriptorRef( 
GetFontId());
 CTFontRef rCTFont = CTFontCreateWithFontDescriptor( pFontDesc, 0.0, NULL);
-#ifdef MACOSX
+#if defined(MACOSX)  MACOSX_SDK_VERSION  1080
 const uint32_t opts( kCTFontTableOptionExcludeSynthetic );
 #else
 const uint32_t opts( kCTFontTableOptionNoOptions );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit f4a57bb8d00cfd22e63bc5e51755953adae492df
Author: Khaled Hosny khaledho...@eglug.org
Date:   Tue Jun 18 01:26:16 2013 +0200

Some notes

Change-Id: I665826017f03b123a8b80d6cf31e37d18e169d10
(cherry picked from commit 984dadaf69a945c8f5e0680bca4b5830b9ebc094)
Reviewed-on: https://gerrit.libreoffice.org/4384
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index 70c7399..ae77b71 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -137,7 +137,8 @@ void CTTextStyle::GetFontMetric( float fPixelSize, 
ImplFontMetricData rMetric )
 
 bool CTTextStyle::GetGlyphBoundRect( sal_GlyphId nGlyphId, Rectangle rRect ) 
const
 {
-CGGlyph nCGGlyph = nGlyphId  GF_IDXMASK; // NOTE: CoreText handles glyph 
fallback itself
+CGGlyph nCGGlyph = nGlyphId  GF_IDXMASK;
+// XXX: this is broken if the glyph came from fallback font
 CTFontRef aCTFontRef = (CTFontRef)CFDictionaryGetValue( mpStyleDict, 
kCTFontAttributeName );
 
 const CTFontOrientation aFontOrientation = kCTFontDefaultOrientation; // 
TODO: horz/vert
@@ -196,8 +197,8 @@ bool CTTextStyle::GetGlyphOutline( sal_GlyphId nGlyphId, 
basegfx::B2DPolyPolygon
 {
 rResult.clear();
 
-// TODO: GF_FONTMASK if using non-native glyph fallback
 CGGlyph nCGGlyph = nGlyphId  GF_IDXMASK;
+// XXX: this is broken if the glyph came from fallback font
 CTFontRef pCTFont = (CTFontRef)CFDictionaryGetValue( mpStyleDict, 
kCTFontAttributeName );
 CGPathRef xPath = CTFontCreatePathForGlyph( pCTFont, nCGGlyph, NULL );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/coretext/ctfonts.cxx   |   26 +-
 vcl/coretext/ctlayout.cxx  |   32 +---
 vcl/coretext/salgdi2.cxx   |1 -
 vcl/inc/coretext/salgdi2.h |2 --
 4 files changed, 18 insertions(+), 43 deletions(-)

New commits:
commit bba255bf3fd030bc62bfc033d814cdb7bd986bfd
Author: Khaled Hosny khaledho...@eglug.org
Date:   Tue Jun 18 01:39:02 2013 +0200

Remove the never set mfFontScale

Lets just assume Core Text does not need this and react if a real
problem with âhugeâ font sizes arise.

Change-Id: I4031e7ca34692eb041ab10154df0064ab5efb462
(cherry picked from commit fd7861397bb4e8dc5ad694a7f677e10fd271f0f6)
Reviewed-on: https://gerrit.libreoffice.org/4383
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index 630325a..70c7399 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -66,14 +66,6 @@ CTTextStyle::CTTextStyle( const FontSelectPattern rFSD )
 const FontSelectPattern* const pReqFont = rFSD;
 
 double fScaledFontHeight = pReqFont-mfExactHeight;
-#if 0 // TODO: does CoreText need font size limiting???
-static const float fMaxFontHeight = 144.0; // TODO: is there a limit for 
CoreText?
-if( fScaledFontHeight  fMaxFontHeight )
-{
-mfFontScale = fScaledFontHeight / fMaxFontHeight;
-fScaledFontHeight = fMaxFontHeight;
-}
-#endif
 
 // convert font rotation to radian
 mfFontRotation = pReqFont-mnOrientation * (M_PI / 1800.0);
@@ -120,13 +112,12 @@ CTTextStyle::~CTTextStyle( void )
 
 // ---
 
-void CTTextStyle::GetFontMetric( float fDPIY, ImplFontMetricData rMetric ) 
const
+void CTTextStyle::GetFontMetric( float fPixelSize, ImplFontMetricData rMetric 
) const
 {
 // get the matching CoreText font handle
 // TODO: is it worth it to cache the CTFontRef in SetFont() and reuse it 
here?
 CTFontRef aCTFontRef = (CTFontRef)CFDictionaryGetValue( mpStyleDict, 
kCTFontAttributeName );
 
-const double fPixelSize = (mfFontScale * fDPIY);
 rMetric.mnAscent   = lrint( CTFontGetAscent( aCTFontRef ) * 
fPixelSize);
 rMetric.mnDescent  = lrint( CTFontGetDescent( aCTFontRef ) * 
fPixelSize);
 rMetric.mnIntLeading   = lrint( CTFontGetLeading( aCTFontRef ) * 
fPixelSize);
@@ -152,10 +143,10 @@ bool CTTextStyle::GetGlyphBoundRect( sal_GlyphId 
nGlyphId, Rectangle rRect ) co
 const CTFontOrientation aFontOrientation = kCTFontDefaultOrientation; // 
TODO: horz/vert
 const CGRect aCGRect = CTFontGetBoundingRectsForGlyphs( aCTFontRef, 
aFontOrientation, nCGGlyph, NULL, 1 );
 
-rRect.Left()   = lrint( mfFontScale * aCGRect.origin.x );
-rRect.Top()= lrint( mfFontScale * aCGRect.origin.y );
-rRect.Right()  = lrint( mfFontScale * (aCGRect.origin.x + 
aCGRect.size.width) );
-rRect.Bottom() = lrint( mfFontScale * (aCGRect.origin.y + 
aCGRect.size.height) );
+rRect.Left()   = lrint( aCGRect.origin.x );
+rRect.Top()= lrint( aCGRect.origin.y );
+rRect.Right()  = lrint( aCGRect.origin.x + aCGRect.size.width );
+rRect.Bottom() = lrint( aCGRect.origin.y + aCGRect.size.height );
 return true;
 }
 
@@ -218,13 +209,6 @@ bool CTTextStyle::GetGlyphOutline( sal_GlyphId nGlyphId, 
basegfx::B2DPolyPolygon
 MyCGPathApplierFunc( (void*)aGgoData, aClosingElement );
 #endif
 
-// apply the font scale
-if( mfFontScale != 1.0 ) {
-basegfx::B2DHomMatrix aScale;
-aScale.scale( +mfFontScale, +mfFontScale );
-rResult.transform( aScale );
-}
-
 return true;
 }
 
diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 81105e2..b3542d9 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -58,11 +58,6 @@ private:
 
 int mnCharCount;// ==mnEndCharPos-mnMinCharPos
 
-// to prevent overflows
-// font requests get size limited by downscaling huge fonts
-// in these cases the font scale becomes something bigger than 1.0
-float mfFontScale; // TODO: does CoreText have a font size limit?
-
 // cached details about the resulting layout
 // mutable members since these details are all lazy initialized
 mutable double  mfCachedWidth;  // cached value of resulting 
typographical width
@@ -79,7 +74,6 @@ CTLayout::CTLayout( const CTTextStyle* pTextStyle )
 ,   mpAttrString( NULL )
 ,   mpCTLine( NULL )
 ,   mnCharCount( 0 )
-,   mfFontScale( pTextStyle-mfFontScale )
 ,   mfCachedWidth( -1 )
 ,   mnBaseAdv( 0 )
 {
@@ -148,7 +142,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs rArgs )
 // in RTL-layouts trailing spaces are leftmost
 // TODO: use BiDi-algorithm to thoroughly check this assumption
 if( rArgs.mnFlags  SAL_LAYOUT_BIDI_RTL)
-mnBaseAdv = rint( CTLineGetTrailingWhitespaceWidth( mpCTLine ) * 
mfFontScale );
+

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

 vcl/coretext/ctfonts.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 84b42f8203290276282b48e83403fe7a4833db28
Author: Khaled Hosny khaledho...@eglug.org
Date:   Tue Jun 18 01:48:51 2013 +0200

Remove pointless TODO note

kCTFontDisplayNameAttribute is something like Foo Regular and Foo Bold,
we certainly donât want that.

Change-Id: Ia24a2abfcbb28883b2c3d05f66070583ddb862c9
(cherry picked from commit a80d2a760121a1b02606d9f5f703c286aa3ba971)
Reviewed-on: https://gerrit.libreoffice.org/4385
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index ae77b71..d4cf1ca 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -317,7 +317,6 @@ ImplDevFontAttributes DevFontFromCTFontDescriptor( 
CTFontDescriptorRef pFD, bool
 rDFA.mbSubsettable = true;
 
 // get font name
-// TODO: use kCTFontDisplayNameAttribute instead???
 CFStringRef pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, 
kCTFontFamilyNameAttribute );
 rDFA.SetFamilyName( GetOUString( pFamilyName ) );
 // get font style
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/coretext/ctfonts.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 24d07ced4571052eaa442ae0a2d95372b81ff449
Author: Khaled Hosny khaledho...@eglug.org
Date:   Tue Jun 18 01:55:11 2013 +0200

Remove another pointless TODO note

Change-Id: Ib4cb8643f25c8516a91a5d805a5834687d42724e
(cherry picked from commit a48f46cf8df67011fab91582187dbd03de59)
Reviewed-on: https://gerrit.libreoffice.org/4386
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index d4cf1ca..810cbbe 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -129,7 +129,6 @@ void CTTextStyle::GetFontMetric( float fPixelSize, 
ImplFontMetricData rMetric )
 
 // all CoreText fonts are scalable
 rMetric.mbScalableFont = true;
-// TODO: check if any kerning is supported
 rMetric.mbKernableFont = true;
 }
 
___
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' - 71/0925d1d93a8ccf36957fa2f4d98d7dedb4cb9f

 71/0925d1d93a8ccf36957fa2f4d98d7dedb4cb9f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5772e3984d79ef128b12af8be9c8b4448b246afd
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jun 20 12:13:55 2013 +0100

Notes added by 'git notes add'

diff --git a/71/0925d1d93a8ccf36957fa2f4d98d7dedb4cb9f 
b/71/0925d1d93a8ccf36957fa2f4d98d7dedb4cb9f
new file mode 100644
index 000..4c12ff7
--- /dev/null
+++ b/71/0925d1d93a8ccf36957fa2f4d98d7dedb4cb9f
@@ -0,0 +1 @@
+merged as: dde5dbdef56b76c296d7d70120b905d2716fa9b0
___
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' - 1d/a3011189bcf5f79e3212303962937e9dcfe6ea

 1d/a3011189bcf5f79e3212303962937e9dcfe6ea |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3209f73c9e7c61479d866295a2665e487b0739a0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jun 20 12:14:52 2013 +0100

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1a/edcb86f08affb4265539418d4cde377c4de80c

 1a/edcb86f08affb4265539418d4cde377c4de80c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a6a3fc08d277cbc507754c1d84f7d1f47b2ee0f0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jun 20 12:16:05 2013 +0100

Notes added by 'git notes add'

diff --git a/1a/edcb86f08affb4265539418d4cde377c4de80c 
b/1a/edcb86f08affb4265539418d4cde377c4de80c
new file mode 100644
index 000..98aafd7
--- /dev/null
+++ b/1a/edcb86f08affb4265539418d4cde377c4de80c
@@ -0,0 +1 @@
+merged as: 647ad63f9f598a92bbd62aaa76f703a50bd63bc3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-20 Thread Jürgen Schmidt

 xmlsecurity/source/dialogs/warnings.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 647ad63f9f598a92bbd62aaa76f703a50bd63bc3
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Thu Jun 20 08:34:23 2013 +

Resolves: #i122564# correct typo, save - safe

(cherry picked from commit 1aedcb86f08affb4265539418d4cde377c4de80c)

Change-Id: I6af85ddfafa1fe1577fd43431a08d62e9c2a5a52

diff --git a/xmlsecurity/source/dialogs/warnings.src 
b/xmlsecurity/source/dialogs/warnings.src
index 2ba45b0..8ae7d04 100644
--- a/xmlsecurity/source/dialogs/warnings.src
+++ b/xmlsecurity/source/dialogs/warnings.src
@@ -71,7 +71,7 @@ ModalDialog RID_XMLSECTP_MACROWARN
 Pos = MAP_APPFONT( MW_COL_1, MW_ROW_3 );
 Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
 Wordbreak = TRUE;
-Text [ en-US ] = Macros may contain viruses. Disabling macros for a 
document is always save. If you disable macros you may lose functionality 
provided by the document macros.;
+Text [ en-US ] = Macros may contain viruses. Disabling macros for a 
document is always safe. If you disable macros you may lose functionality 
provided by the document macros.;
 };
 CheckBox CB_ALWAYSTRUST
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/headless/svpgdi.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a2da7d277f111d55307f1b6f2e8eb8711fd1388
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jun 4 16:12:54 2013 +0300

Hopefully fix build on Linux

Change-Id: Ia2e80b07138a552d04072f4b8d362bcc2be86edf
(cherry picked from commit b9dc42fc41d4a5eebec553d629d089ba06053b13)

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 3b9b68e..dbd233c 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -75,7 +75,7 @@ bool SvpSalGraphics::drawAlphaRect( long /*nX*/, long /*nY*/, 
long /*nWidth*/, l
 return false;
 }
 
-#ifdef MACOSX
+#ifndef IOS
 
 SvpSalGraphics::SvpSalGraphics() :
 m_bUseLineColor( true ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit 5f00be141d86e3ea554cd9d18ebe47d4d59b
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 20 13:15:25 2013 +0200

Revert fdo#65132 compute font height correctly

Commit 22d23d52b0f65636df3a1cb8fada9bf7de77eb78 is the real fix.

This reverts commit 3a6513047409b8e8f6295152b33385ad8ef93681.

Change-Id: I36ac1f64000c3a805289141c2c6dca0de78454d3

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index ec55ff1..8338d9f 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -7082,7 +7082,7 @@ FontMetric OutputDevice::GetFontMetric() const
 // set aMetric with info from font
 aMetric.SetName( maFont.GetName() );
 aMetric.SetStyleName( pMetric-GetStyleName() );
-aMetric.SetSize( PixelToLogic( Size( pMetric-mnWidth, 
pMetric-mnAscent+pMetric-mnDescent ) ) );
+aMetric.SetSize( PixelToLogic( Size( pMetric-mnWidth, 
pMetric-mnAscent+pMetric-mnDescent-pMetric-mnIntLeading ) ) );
 aMetric.SetCharSet( pMetric-IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : 
RTL_TEXTENCODING_UNICODE );
 aMetric.SetFamily( pMetric-GetFamilyType() );
 aMetric.SetPitch( pMetric-GetPitch() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit 083baaa6d8adb04617035ef23a1c42f8e8903c50
Author: Khaled Hosny khaledho...@eglug.org
Date:   Tue Jun 18 06:44:33 2013 +0200

Fix CTLayout::GetBoundRect()

was broken in 35b0a4cd274c1567cf0b8067eb01f17b82ee9f35

Change-Id: I803b510fc875ff9e48ed762114f6d63dad51ad7a
(cherry picked from commit 98741a2078ebd0a9c83f6e676f99de526990f423)
Reviewed-on: https://gerrit.libreoffice.org/4387
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index b3542d9..cbd7e91 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -441,9 +441,9 @@ bool CTLayout::GetBoundRect( SalGraphics rGraphics, 
Rectangle rVCLRect ) const
 
 // CoreText top-bottom are vertically flipped from a VCL aspect
 rVCLRect.Left()   = aPos.X() + aMacRect.origin.x;
-rVCLRect.Right()  = aPos.X() + aMacRect.origin.x + aMacRect.size.width;
+rVCLRect.Right()  = aPos.X() + (aMacRect.origin.x + aMacRect.size.width);
 rVCLRect.Bottom() = aPos.Y() - aMacRect.origin.y;
-rVCLRect.Top()= aPos.Y() - aMacRect.origin.y + aMacRect.size.height;
+rVCLRect.Top()= aPos.Y() - (aMacRect.origin.y + aMacRect.size.height);
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/coretext/ctlayout.cxx |   39 ++-
 1 file changed, 30 insertions(+), 9 deletions(-)

New commits:
commit 8d55b1b6ffd2de965ae3db0712fb2317a9310f1f
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 15:12:30 2013 +0300

fdo#63616: Fix GetBoundRect for rotated text in CoreText backend

Change-Id: I8c9ee84afd71481c2c6b002265b86e048f369f5c
(cherry picked from commit b9c46f46cebc0ebed5a91f8fbb9d0a01366f1f77)
Reviewed-on: https://gerrit.libreoffice.org/4388
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index cbd7e91..8c99ca1 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -432,18 +432,39 @@ bool CTLayout::GetBoundRect( SalGraphics rGraphics, 
Rectangle rVCLRect ) const
 return false;
 #endif
 
+CGContextSaveGState( rAquaGraphics.mrContext );
+CGContextScaleCTM( rAquaGraphics.mrContext, 1.0, -1.0 );
+CGContextSetShouldAntialias( rAquaGraphics.mrContext, 
!rAquaGraphics.mbNonAntialiasedText );
+
+const Point aVclPos = GetDrawPosition( Point(mnBaseAdv,0) );
+CGPoint aTextPos = { (CGFloat) +aVclPos.X(), (CGFloat) -aVclPos.Y() };
+
+if( mpTextStyle-mfFontRotation != 0.0 )
+{
+const CGFloat fRadians = mpTextStyle-mfFontRotation;
+CGContextRotateCTM( rAquaGraphics.mrContext, +fRadians );
+
+const CGAffineTransform aInvMatrix = CGAffineTransformMakeRotation( 
-fRadians );
+aTextPos = CGPointApplyAffineTransform( aTextPos, aInvMatrix );
+}
+
+CGContextSetTextPosition( rAquaGraphics.mrContext, aTextPos.x, aTextPos.y 
);
 CGRect aMacRect = CTLineGetImageBounds( mpCTLine, rAquaGraphics.mrContext 
);
-CGPoint aMacPos = CGContextGetTextPosition( rAquaGraphics.mrContext );
-aMacRect.origin.x -= aMacPos.x;
-aMacRect.origin.y -= aMacPos.y;
 
-const Point aPos = GetDrawPosition( Point(mnBaseAdv, 0) );
+if( mpTextStyle-mfFontRotation != 0.0 )
+{
+const CGFloat fRadians = mpTextStyle-mfFontRotation;
+const CGAffineTransform aMatrix = CGAffineTransformMakeRotation( 
+fRadians );
+aMacRect = CGRectApplyAffineTransform( aMacRect, aMatrix );
+}
+
+CGContextRestoreGState( rAquaGraphics.mrContext );
+
+rVCLRect.Left()   = aVclPos.X() + aMacRect.origin.x;
+rVCLRect.Right()  = aVclPos.X() + (aMacRect.origin.x + 
aMacRect.size.width);
+rVCLRect.Bottom() = aVclPos.Y() - (aMacRect.origin.y);
+rVCLRect.Top()= aVclPos.Y() - (aMacRect.origin.y + 
aMacRect.size.height);
 
-// CoreText top-bottom are vertically flipped from a VCL aspect
-rVCLRect.Left()   = aPos.X() + aMacRect.origin.x;
-rVCLRect.Right()  = aPos.X() + (aMacRect.origin.x + aMacRect.size.width);
-rVCLRect.Bottom() = aPos.Y() - aMacRect.origin.y;
-rVCLRect.Top()= aPos.Y() - (aMacRect.origin.y + aMacRect.size.height);
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit cc91f2bec18b12795fa9d19feda6dfca88a6bacb
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 15:25:26 2013 +0300

Add comment

Change-Id: Id3ec71e8da07a8bf1c979585eb84cd5a9d6f7a77
(cherry picked from commit 47dca10811a31cf28e72b9bc034b9d8975327df3)
Reviewed-on: https://gerrit.libreoffice.org/4389
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 8c99ca1..9bf147e 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -425,6 +425,11 @@ void CTLayout::GetCaretPositions( int nMaxIndex, 
sal_Int32* pCaretXArray ) const
 
 bool CTLayout::GetBoundRect( SalGraphics rGraphics, Rectangle rVCLRect ) 
const
 {
+// Closely mimic DrawText(), except that instead of calling
+// CTLineDraw() to draw the line, we call CTLineGetImageBounds()
+// to get its bounds. But all the coordinate system manipulation
+// before that is the same = should be factored out?
+
 AquaSalGraphics rAquaGraphics = static_castAquaSalGraphics(rGraphics);
 
 #ifdef IOS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit 45277e2a6f0898c11224b6c116c17b580a83310e
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 16:06:15 2013 +0300

Call CheckContext() on OS X, too

Change-Id: I093586b0c979e492ea2a09dca9525b808de3ce70
(cherry picked from commit 97cd0f38a53f97034442de57d48006d30c4a94db)
Reviewed-on: https://gerrit.libreoffice.org/4390
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 9bf147e..6c2a07de 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -432,10 +432,8 @@ bool CTLayout::GetBoundRect( SalGraphics rGraphics, 
Rectangle rVCLRect ) const
 
 AquaSalGraphics rAquaGraphics = static_castAquaSalGraphics(rGraphics);
 
-#ifdef IOS
 if( !rAquaGraphics.CheckContext() )
 return false;
-#endif
 
 CGContextSaveGState( rAquaGraphics.mrContext );
 CGContextScaleCTM( rAquaGraphics.mrContext, 1.0, -1.0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/coretext/ctfonts.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 64f3b80cddf425e6356b66874f15686284b9fa7a
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Jun 3 16:52:10 2013 +0300

Fix dbgutil build

Change-Id: Ife8ca88c8f558955ee006be6294bd7b233e89916
Reviewed-on: https://gerrit.libreoffice.org/4391
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index 810cbbe..68f33f6 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -262,7 +262,7 @@ ImplFontEntry* CTFontData::CreateFontInstance( /*const*/ 
FontSelectPattern rFSD
 
 int CTFontData::GetFontTable( const char pTagName[5], unsigned char* 
pResultBuf ) const
 {
-DBG_ASSERT( aTagName[4]=='\0', CTFontData::GetFontTable with invalid 
tagname!\n );
+DBG_ASSERT( pTagName[4]=='\0', CTFontData::GetFontTable with invalid 
tagname!\n );
 
 const CTFontTableTag nTagCode = (pTagName[0]24) + (pTagName[1]16) + 
(pTagName[2]8) + (pTagName[3]0);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-20 Thread Zolnai Tamás

 cui/source/tabpages/border.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5f396c627579f8ae647571bde9091ff18aab49ec
Author: Zolnai TamÃ¡s zolnaitamas2...@gmail.com
Date:   Thu Jun 20 11:32:04 2013 +0200

Page border bug: margin edits are enable when no broder

To reproduce
1. Format - Page
2. Set left and ritght borders only (All margins is editable)
4. Set inner margins bigger (using syncronize check box), for example 2 cm
5. Click OK

Result
Margin appaer just on the right and the left side, so just on those
sides where there is a border.

Expected:
Only the relevant edits must be enable on border tab page
just as in case of paragraph borders.

Note to fix:
Inner margin without border is used only for table, but not
for other objects (paragraph, page, frame)

Change-Id: Ie611eb29432cb7e75131154d94b4a8db1c3f1bb8

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 26f3a0c..fe68cb6 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1074,8 +1074,8 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl)
 // for tables everything is allowed
 sal_uInt16 nValid = VALID_TOP|VALID_BOTTOM|VALID_LEFT|VALID_RIGHT;
 
-// for border and paragraph the edit is disabled, if there's no border 
set
-if(nSWMode  (SW_BORDER_MODE_FRAME|SW_BORDER_MODE_PARA))
+// for other objects (paragraph, page, frame) the edit is disabled, if 
there's no border set
+if(!(nSWMode  SW_BORDER_MODE_TABLE))
 {
 if(bLineSet)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make ok, but make install fails

2013-06-20 Thread Alexander Thurgood


Le 12/06/2013 12:18, Miklos Vajna a écrit :

Hi Miklos,

What commit, exactly? dev-install was broken in the morning, but it's 
already fixed. 


I couldn't say which commit is responsible, but it is still not building 
for me with make dev-install. Gets to near the end, and then fails with 
missing modules, even if I explicitly add the --with-help switch as 
Caolan suggested.



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

[Libreoffice-commits] core.git: config_host.mk.in configure.ac extensions/Library_npsoplugin.mk extensions/Library_pl.mk helpcompiler/source readlicense_oo/CustomTarget_readme.mk readlicense_oo/docs s

2013-06-20 Thread Matúš Kukan

 config_host.mk.in   |1 -
 configure.ac|   17 ++---
 extensions/Library_npsoplugin.mk|6 ++
 extensions/Library_pl.mk|   11 +++
 helpcompiler/source/HelpCompiler.cxx|9 -
 readlicense_oo/CustomTarget_readme.mk   |1 -
 readlicense_oo/docs/readme.xsl  |1 -
 solenv/bin/modules/installer/control.pm |1 -
 8 files changed, 11 insertions(+), 36 deletions(-)

New commits:
commit ae1bb97f14cd12100d230cbf16b762aefa04decf
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Thu Jun 6 09:35:51 2013 +0200

remove last uses of config 'GUI' variable

Change-Id: I97188235f0b72b5b54423e05deeaf17c5c681048
Reviewed-on: https://gerrit.libreoffice.org/4188
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/config_host.mk.in b/config_host.mk.in
index 9363263..a3ecf99 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -207,7 +207,6 @@ export GTK_CFLAGS=$(gb_SPACE)@GTK_CFLAGS@
 export GTK_LIBS=$(gb_SPACE)@GTK_LIBS@
 export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@
 export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
-export GUI=@GUI@
 export GUIBASE=@GUIBASE@
 export HARDLINKDELIVER=@HARDLINKDELIVER@
 export HAVE_CXX11=@HAVE_CXX11@
diff --git a/configure.ac b/configure.ac
index 51a534f..4d744ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3455,7 +3455,7 @@ AC_SUBST(x_OBJCXXFLAGS)
 AC_SUBST(x_LDFLAGS)
 
 #
-# determine CPU, CPUNAME, GUI, GUIBASE, ...
+# determine CPU, CPUNAME, GUIBASE, ...
 #
 LIB64=lib
 SOLARINC=
@@ -3466,7 +3466,6 @@ aix*)
 COM=GCC
 CPU=P
 CPUNAME=POWERPC
-GUI=UNX
 GUIBASE=unx
 OS=AIX
 RTL_OS=AIX
@@ -3479,7 +3478,6 @@ aix*)
 
 cygwin*)
 COM=MSC
-GUI=WNT
 GUIBASE=not-used
 OS=WNT
 RTL_OS=Windows
@@ -3513,7 +3511,6 @@ cygwin*)
 
 darwin*)
 COM=GCC
-GUI=UNX
 GUIBASE=not-used
 OS=MACOSX
 RTL_OS=MacOSX
@@ -3563,7 +3560,6 @@ darwin*)
 
 dragonfly*)
 COM=GCC
-GUI=UNX
 GUIBASE=unx
 OS=DRAGONFLY
 RTL_OS=DragonFly
@@ -3592,7 +3588,6 @@ dragonfly*)
 
 freebsd*)
 COM=GCC
-GUI=UNX
 GUIBASE=unx
 RTL_OS=FreeBSD
 OS=FREEBSD
@@ -3622,7 +3617,6 @@ freebsd*)
 
 kfreebsd*)
 COM=GCC
-GUI=UNX
 GUIBASE=unx
 OS=LINUX
 RTL_OS=kFreeBSD
@@ -3654,7 +3648,6 @@ kfreebsd*)
 
 linux-gnu*)
 COM=GCC
-GUI=UNX
 GUIBASE=unx
 OS=LINUX
 RTL_OS=Linux
@@ -3798,7 +3791,6 @@ linux-gnu*)
 
 linux-android*)
 COM=GCC
-GUI=UNX
 GUIBASE=not-used
 OS=ANDROID
 RTL_OS=Android
@@ -3836,7 +3828,6 @@ linux-android*)
 
 mingw*)
 COM=GCC
-GUI=WNT
 GUIBASE=not-used
 OS=WNT
 RTL_OS=Windows
@@ -3871,7 +3862,6 @@ mingw*)
 *netbsd*)
 
 COM=GCC
-GUI=UNX
 GUIBASE=unx
 OS=NETBSD
 RTL_OS=NetBSD
@@ -3912,7 +3902,6 @@ mingw*)
 
 openbsd*)
 COM=GCC
-GUI=UNX
 GUIBASE=unx
 OS=OPENBSD
 RTL_OS=OpenBSD
@@ -3945,7 +3934,6 @@ openbsd*)
 solaris*)
 
 COM=GCC
-GUI=UNX
 GUIBASE=unx
 OS=SOLARIS
 RTL_OS=Solaris
@@ -4011,7 +3999,6 @@ AC_SUBST(CPUNAME)
 AC_SUBST(RTL_OS)
 AC_SUBST(RTL_ARCH)
 AC_SUBST(EPM_FLAGS)
-AC_SUBST(GUI)
 AC_SUBST(GUIBASE)
 AC_SUBST(INPATH)
 AC_SUBST([INSTDIR])
@@ -4127,7 +4114,7 @@ if test $cross_compiling = yes; then
 cp configure CONF-FOR-BUILD
 test -d config_build  cp -p config_build/*.h CONF-FOR-BUILD/config_host
 (
-unset COM GUI GUIBASE OS CPU CPUNAME
+unset COM GUIBASE OS CPU CPUNAME
 unset CC CXX SYSBASE CFLAGS
 unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
 unset CPPUNIT_CFLAGS CPPUNIT_LIBS
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 90d4880..74bdb8a 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -45,9 +45,7 @@ $(eval $(call gb_Library_add_defs,npsoplugin,\
 ))
 endif
 
-endif # GUI=UNX
-
-ifeq ($(OS),WNT)
+else ifeq ($(OS),WNT)
 
 $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
ooopathutils \
@@ -95,7 +93,7 @@ endif
 
 $(eval $(call gb_Library_set_nativeres,npsoplugin,npsoplugin/npsoplugin))
 
-endif # GUI=WNT
+endif
 
 $(eval $(call gb_Library_add_exception_objects,npsoplugin,\
extensions/source/nsplugin/source/npshell \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 3970fdf..102217a 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -55,11 +55,8 @@ $(eval $(call gb_Library_add_exception_objects,pl,\
extensions/source/plugin/win/winmgr \
extensions/source/plugin/win/sysplug \
 ))
-endif # GUI=WNT
 
-ifneq ($(OS),WNT)
-
-ifeq ($(OS),MACOSX)
+else ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_Library_add_objcxxobjects,pl,\
extensions/source/plugin/aqua/macmgr \
@@ -72,7 +69,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,pl,\
 CoreFoundation \
 ))
 
-else # OS!=MACOSX
+else
 
 ifeq

[Libreoffice-commits] core.git: 2 commits - configure.ac icu/icu4c-build.patch

 configure.ac  |2 +-
 icu/icu4c-build.patch |   19 +++
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit e79b6715070cdb4512d8ead784103930ebe8b221
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jun 18 17:04:55 2013 +0300

Stop defining inline as empty on OS X and iOS in icu

It causes problems on newer SDKs.

Change-Id: I6bdb1e50cb239d99b190460fdb11d5c684e92275

diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch
index 1e50511..ba47658 100644
--- a/icu/icu4c-build.patch
+++ b/icu/icu4c-build.patch
@@ -1,3 +1,22 @@
+--- misc/icu/source/common/umutex.h
 misc/icu/source/common/umutex.h
+@@ -48,16 +48,8 @@
+ #endif  /* win32 */
+ 
+ #if U_PLATFORM_IS_DARWIN_BASED
+-#if defined(__STRICT_ANSI__)
+-#define UPRV_REMAP_INLINE
+-#define inline
+-#endif
+ #include libkern/OSAtomic.h
+ #define USE_MAC_OS_ATOMIC_INCREMENT 1
+-#if defined(UPRV_REMAP_INLINE)
+-#undef inline
+-#undef UPRV_REMAP_INLINE
+-#endif
+ #endif
+ 
+ /*
 --- misc/icu/source/tools/toolutil/pkg_genc.h
 +++ misc/build/icu/source/tools/toolutil/pkg_genc.h
 @@ -58,7 +58,7 @@
commit 204867dbecc9058a39ba4b6bc97021ca5d04af59
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jun 18 15:58:17 2013 +0300

Accept also iOS SDK 7.0

Change-Id: I7c863819f5d6022201ce9d450703b5b4d4463dc2

diff --git a/configure.ac b/configure.ac
index 4d744ec..97293ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2697,7 +2697,7 @@ if test $_os = iOS; then
 fi
 
 pref_sdk_ver=6.1
-for I in 6.1 6.0; do
+for I in 6.1 6.0 7.0; do
 
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$I.sdk
 if test -d $t; then
 sysroot=$t
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC] Android Impress Remote: Weekly Report #0

2013-06-20 Thread Thorsten Behrens

Tor Lillqvist wrote:
 Maybe now then would be a good time to split out it for real into a
 separate repository(and take care of the translation some other
 way)?

That would also actually solve the problem of tarball generation for
platforms like FDroid. If this is possible within the GSoC project,
that would be the preferred solution.

Cheers,

-- Thorsten


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

[Bug 60270] LibreOffice 4.1 most annoying bugs

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

Bug 60270 depends on bug 63616, which changed state.

Bug 63616 Summary: Vertical ruler is unreadable
https://bugs.freedesktop.org/show_bug.cgi?id=63616

   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

Re: Firebird Dependencies Upload

2013-06-20 Thread Thorsten Behrens

Andrzej J. R. Hunt wrote:
 No idea what naming scheme I should be using: most libraries have their
 md5sum prepended to their name, but some don't.
 
All else being equal, I'd prefer the prefixed version. Makes it
entirely clear from the (version-controlled) source tree which
external source you pull into your binaries.

Cheers,

-- Thorsten


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

[Libreoffice-commits] core.git: bridges/source config_host/config_gcc.h.in configure.ac

 bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx  |5 
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx   |   22 +--
 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |7 --
 config_host/config_gcc.h.in  |   17 ++
 configure.ac |   12 ++
 5 files changed, 54 insertions(+), 9 deletions(-)

New commits:
commit 5ba3d1740b03efa394b2d2bf34fb8a8d3db2331d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 20 13:57:45 2013 +0200

Clean up declaration of __cxa_get_globals

At least Clang trunk towards 3.4 now rejects incompatible declarations of 
the
same extern C function in different namespaces, so that trick of getting 
at
the function that is exported by libstdc++ but only rudimentarily if at all
exposed in cxxabi.h no longer worked.

TODO: This change should be reflected in any other bridges where it is 
relevant,
too.

Change-Id: Ie3ccbdb7d75cc98636d02c0435958532620724f2

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index ea38f29..8229ce8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -22,11 +22,6 @@
 #include string.h
 #include dlfcn.h
 
-#include cxxabi.h
-#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
-#define _GLIBCXX_CDTOR_CALLABI
-#endif
-
 #include boost/unordered_map.hpp
 
 #include rtl/strbuf.hxx
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index c305197..f3f43e5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -17,12 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include uno/mapping.h
+#include sal/config.h
 
 #include typeinfo
 #include exception
 #include cstddef
 
+#include cxxabi.h
+#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
+#define _GLIBCXX_CDTOR_CALLABI
+#endif
+
+#include config_gcc.h
+#include uno/mapping.h
+
 namespace CPPU_CURRENT_NAMESPACE
 {
 
@@ -65,7 +73,17 @@ struct __cxa_eh_globals
 
 }
 
-extern C CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals () 
throw();
+// __cxa_get_globals is exported from libstdc++ since GCC 3.4.0 (CXXABI_1.3),
+// but it is only declared in cxxabi.h (in namespace __cxxabiv1) since
+// GCC 4.7.0.  It returns a pointer to a struct __cxa_eh_globals, but that
+// struct is only incompletely declared even in the GCC 4.7.0 cxxabi.h.
+// Therefore, provide a declaration here for old GCC (libstdc++, really) 
version
+// that returns a void pointer, and in the code calling it always cast to the
+// above fake definition of CPPU_CURRENT_NAMESPACE::__cxa_eh_globals (which
+// hopefully keeps matching the real definition in libstdc++):
+#if !HAVE_GCC_CXXABI_H_CXA_GET_GLOBALS
+namespace __cxxabiv1 { extern C void * __cxa_get_globals () throw(); }
+#endif
 
 namespace CPPU_CURRENT_NAMESPACE
 {
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index cbf45bb..08c797c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -289,8 +289,11 @@ static void cpp_call(
 }
  catch (...)
  {
-  // fill uno exception
-fillUnoException( __cxa_get_globals()-caughtExceptions, *ppUnoExc, 
pThis-getBridge()-getCpp2Uno() );
+ // fill uno exception
+ fillUnoException(
+ reinterpret_cast CPPU_CURRENT_NAMESPACE::__cxa_eh_globals * (
+ __cxxabiv1::__cxa_get_globals())-caughtExceptions,
+ *ppUnoExc, pThis-getBridge()-getCpp2Uno());
 
 // temporary params
 for ( ; nTempIndizes--; )
diff --git a/config_host/config_gcc.h.in b/config_host/config_gcc.h.in
new file mode 100644
index 000..4376877
--- /dev/null
+++ b/config_host/config_gcc.h.in
@@ -0,0 +1,17 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef CONFIG_GCC_H
+#define CONFIG_GCC_H
+
+#define HAVE_GCC_CXXABI_H_CXA_GET_GLOBALS 0
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index 97293ad..9998743 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5571,6 +5571,17 @@ if test $GCC = yes; then
 AC_MSG_RESULT([yes])
 ], [AC_MSG_RESULT([no])])
 CFLAGS=$save_CFLAGS
+
+AC_MSG_CHECKING([whether $CXX declares __cxa_get_globals in cxxabi.h])
+AC_LANG_PUSH([C++])
+

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

 svx/source/xoutdev/xtabgrdt.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bb7d4a54ccb5907fa78c14d65a1d63f69fcc88f3
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jun 20 14:13:46 2013 +0200

warning C4702: clearly there's a case missing here

Change-Id: I3afdca0a51c41ef75f3ea63e27a6e7a858c30111

diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 559f66b..bf1a7bc 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -136,6 +136,7 @@ Bitmap XGradientList::CreateBitmapForUI( long nIndex )
 aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_AXIAL;
 break;
 }
+case XGRAD_RADIAL :
 {
 aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RADIAL;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LibreOffice 4.1.0 RC1 test builds available

2013-06-20 Thread Fridrich Strba

Hi *,

for the upcoming new version 4.1.0, the RC1 builds now start to be
available on pre-releases. This build is slated to be first release
candidate build on the way towards 4.1.0, please refer to our release
plan timings here:

 http://wiki.documentfoundation.org/ReleasePlan#4.1_release

Builds are now being uploaded to a public (but non-mirrored - so don't
spread news too widely!) place, as soon as they're available. Grab
them here:

 http://dev-builds.libreoffice.org/pre-releases/

If you've a bit of time, please give them a try  report *critical*
bugs not yet in bugzilla here, so we can incorporate them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

NOTE: This build is in a release configuration and _will_ replace your
existing LibreOffice install on Windows.

The list of fixed bugs relative to 4.1.0 beta2 is here:

 
http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-1-release-4.1.0.1.log


So playing with the areas touched there also greatly appreciated - and
validation that those bugs are really fixed.

Thanks a lot for your help,
Fridrich

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

Re: [GSoC] Android Impress Remote: Weekly Report #1

Hi Artur,

On Tue, 2013-06-18 at 00:21 +0300, Artur Dryomov wrote:
 The coding period starts today, so this is report #1.

:-) well - you've done some great work even before #1 - so ... nice.

 * We have a conversation at the ux-advise mailing list about the
 second phase of the client’s design. Mirek moved my proposal

I'm pleased with that; I just poked there a bit myself.

 * I have an eye on some other LO bugs — OS X related mostly. Maybe
 I can help with them someday :-)

Heh ;-)

 Plans for this week.
 * Continue refactoring of existing code.

You're doing that to implement your improved thumbnail 'pull' ideas /
versioning etc. ? personally I'm eager to see the accelerometer remote
cursor myself but ... ;-

ATB,

Michael.

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

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

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

2013-06-20 Thread Jelle van der Waa

 vcl/test/canvasbitmaptest.cxx |  160 --
 1 file changed, 160 deletions(-)

New commits:
commit 07cd857a0e35c9f80f35e8c042ff0ae16aceaef7
Author: Jelle van der Waa je...@vdwaa.nl
Date:   Wed Jun 19 19:59:02 2013 +0200

fdo#39593 remove unused function 'checkBitmapImport' and clean up code

Change-Id: Ia8a504b2b9840b4a6a0c84acd191b1184ce6f099
Reviewed-on: https://gerrit.libreoffice.org/4370
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx
index 5816244..7adba84 100644
--- a/vcl/test/canvasbitmaptest.cxx
+++ b/vcl/test/canvasbitmaptest.cxx
@@ -54,11 +54,9 @@
 using namespace ::com::sun::star;
 using namespace ::vcl::unotools;
 
-// ---
 
 void Main();
 
-// ---
 
 SAL_IMPLEMENT_MAIN()
 {
@@ -78,7 +76,6 @@ SAL_IMPLEMENT_MAIN()
 return 0;
 }
 
-// ---
 
 namespace com { namespace sun { namespace star { namespace rendering
 {
@@ -94,7 +91,6 @@ bool operator==( const ARGBColor rLHS, const RGBColor rRHS )
 
 } } } }
 
-//--
 
 namespace
 {
@@ -121,7 +117,6 @@ class TestWindow : public Dialog
 virtual void Paint( const Rectangle rRect );
 };
 
-//--
 
 static bool g_failure=false;
 
@@ -138,7 +133,6 @@ void test( bool bResult, const char* msg )
 }
 }
 
-//--
 
 bool rangeCheck( const rendering::RGBColor rColor )
 {
@@ -147,7 +141,6 @@ bool rangeCheck( const rendering::RGBColor rColor )
 rColor.Blue  0.0 || rColor.Blue  1.0;
 }
 
-//--
 
 void checkCanvasBitmap( const rtl::ReferenceVclCanvasBitmap xBmp,
 const char*msg,
@@ -297,158 +290,6 @@ void checkCanvasBitmap( const 
rtl::ReferenceVclCanvasBitmap xBmp,
 }
 }
 
-//--
-
-void checkBitmapImport( const rtl::ReferenceVclCanvasBitmap xBmp,
-const char*msg,
-intnOriginalDepth )
-{
-OSL_TRACE(-);
-OSL_TRACE(Testing %s, with depth %d, msg, nOriginalDepth);
-
-BitmapEx aContainedBmpEx( xBmp-getBitmapEx() );
-Bitmap   aContainedBmp( aContainedBmpEx.GetBitmap() );
-int  nDepth = nOriginalDepth;
-
-{
-Bitmap::ScopedReadAccess pAcc( aContainedBmp );
-nDepth = pAcc-GetBitCount();
-}
-
-test( aContainedBmp.GetSizePixel() == Size(200,200),
-  Original bitmap size );
-
-test( xBmp-getSize().Width == 200  xBmp-getSize().Height == 200,
-  Original bitmap size via API );
-
-test( xBmp-hasAlpha() == aContainedBmpEx.IsTransparent(),
-  Correct alpha state );
-
-test( xBmp-getScaledBitmap( geometry::RealSize2D(500,500), sal_False 
).is(),
-  getScaledBitmap() );
-
-rendering::IntegerBitmapLayout aLayout;
-uno::Sequencesal_Int8 aPixelData = xBmp-getData(aLayout, 
geometry::IntegerRectangle2D(0,0,1,1));
-
-const sal_Int32 nExpectedBitsPerPixel(
-aContainedBmpEx.IsTransparent() ? std::max(8,nDepth)+8 : nDepth);
-test( aLayout.ScanLines == 1,
-  # scanlines );
-test( aLayout.ScanLineBytes == (nExpectedBitsPerPixel+7)/8,
-  # scanline bytes );
-test( aLayout.ScanLineStride == (nExpectedBitsPerPixel+7)/8 ||
-  aLayout.ScanLineStride == -(nExpectedBitsPerPixel+7)/8,
-  # scanline stride );
-test( aLayout.PlaneStride == 0,
-  # plane stride );
-
-test( aLayout.ColorSpace.is(),
-  Color space there );
-
-test( aLayout.Palette.is() == (nDepth = 8),
-  Palette existance conforms to bitmap );
-
-uno::Sequencesal_Int8 aPixelData2 = xBmp-getPixel( aLayout, 
geometry::IntegerPoint2D(0,0) );
-
-test( aPixelData2.getLength() == aPixelData.getLength(),
-  getData and getPixel return same amount of data );
-
-aPixelData = xBmp-getData(aLayout, 
geometry::IntegerRectangle2D(0,0,200,1));
-test( aLayout.ScanLines == 1,
-  # scanlines );
-test( aLayout.ScanLineBytes == (200*nExpectedBitsPerPixel+7)/8,
-  # scanline bytes );
-test( aLayout.ScanLineStride == (200*nExpectedBitsPerPixel+7)/8 ||
-  aLayout.ScanLineStride == -(200*nExpectedBitsPerPixel+7)/8,
-  # scanline stride );
-
-uno::Sequence rendering::RGBColor   aRGBColors  = 
xBmp-convertIntegerToRGB( aPixelData );
-

[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source cui/uiconfig

2013-06-20 Thread Efe Gürkan YALAMAN

 cui/source/options/optaboutconfig.hxx |   23 ++-
 cui/uiconfig/ui/aboutconfigdialog.ui  |7 ++-
 2 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit bb82e581d4cb100e804c32e60efa1af5b98ae741
Author: Efe GÃ¼rkan YALAMAN efeyala...@gmail.com
Date:   Thu Jun 20 16:44:25 2013 +0300

Improvements on current prototypes.

License statement added to header. modulename changed svx to cui.

Change-Id: I90f96e6c4720af392b344fce1052dd135e611bae

diff --git a/cui/source/options/optaboutconfig.hxx 
b/cui/source/options/optaboutconfig.hxx
index 969f130a..68fb0c5 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -1,16 +1,24 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef _SVX_OPTABOUTCONFIG_HXX
-#define _SVX_OPTABOUTCONFIG_HXX
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_CUI_OPTABOUTCONFIG_HXX
+#define INCLUDED_CUI_OPTBABOUTCONFIG_HXX
 
 #include svx/simpltabl.hxx
 
-namespace svx
+namespace cui
 {
 class OptHeaderTabListBox;
 }
 
 
-class SvxAboutConfigTabPage : public SfxTabPage
+class CuiAboutConfigTabPage : public SfxTabPage
 {
 private:
 SvxSimpleTableContainer* m_pPrefCtrl;
@@ -18,7 +26,12 @@ private:
 //PushButton* m_pDefaultBtn
 PushButton* m_pEditBtn;
 
-::svx::OptHeaderTabListBox* pPrefBox;
+::cui::OptHeaderTabListBox* pPrefBox;
 public:
+   CuiAboutConfigTabPage( Window* pParent, const SfxItemSet rItemSet );
+   ~CuiAboutConfigTabPage();
+
+   static SfxTabPage* create( Window* pParent, const SfxItemSet rItemset );
+
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui 
b/cui/uiconfig/ui/aboutconfigdialog.ui
index e3af350..960200e 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -85,22 +85,27 @@
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=vexpandTrue/property
 property name=label_xalign0/property
 property name=shadow_typenone/property
 child
   object class=GtkAlignment id=alignment1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=top_padding6/property
 property name=left_padding12/property
 child
   object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=orientationvertical/property
+property name=spacing6/property
 child
   object class=GtkGrid id=grid1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=row_spacing6/property
+property name=column_spacing6/property
 property name=column_homogeneousTrue/property
 child
   object class=GtkLabel id=preference
@@ -185,7 +190,7 @@
   object class=GtkLabel id=label1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=label translatable=yesframe1/property
+property name=label 
translatable=yesPreferences/property
 attributes
   attribute name=weight value=semibold/
 /attributes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-20 Thread Marcos Paulo de Souza

 starmath/source/mathmlimport.cxx |4 +---
 starmath/source/view.cxx |2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 41de10f5fd181dc45b487d2ac29cd2b4fbb34710
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Wed Jun 19 14:32:38 2013 -0300

Fix fdo#59641 - Duplication in formula when import mathml

Remove wrong concatenation of text from EditView in 
SmXMLImport::endDocument, and use
just the text extracted from formula.

After the SmXMLImport::endDocument method, we compare the text from 
doc(extracted from formula) and
from editview(text inserted before call the importer) and as they're 
different, the text from
formula will be inserted in the current edit cursor position.

Also, remove bogus pDocShell-SetText( String() ), as we will set the text 
some lines below.

Change-Id: Ia317a23d27964a9d1264dcaf9ec0d38b8c586655
Reviewed-on: https://gerrit.libreoffice.org/4369
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 4d1f95e..a7133df 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -557,12 +557,10 @@ void SmXMLImport::endDocument(void)
 pDocShell-SetFormulaTree(pTree);
 if (0 == aText.Len())  //If we picked up no annotation text
 {
-//Make up some editable text
-aText = pDocShell-GetText();
+// Get text from imported formula
 pTree-CreateTextFromNode(aText);
 aText = comphelper::string::stripEnd(aText, ' ');
 }
-pDocShell-SetText( String() );
 
 // Convert symbol names
 SmParser rParser = pDocShell-GetParser();
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index d3ffcfe..e0fd8d43 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1519,9 +1519,7 @@ bool SmViewShell::InsertFrom(SfxMedium rMedium)
 if (pEditWin)
 pEditWin-InsertText( aText );
 else
-{
 SAL_WARN( starmath, EditWindow missing );
-}
 
 pDoc-Parse();
 pDoc-SetModified(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source config_host/config_gcc.h.in configure.ac

 bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx |4 +-
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx  |   33 ++--
 config_host/config_gcc.h.in |2 +
 configure.ac|   22 +
 4 files changed, 44 insertions(+), 17 deletions(-)

New commits:
commit c17f01753ce94e9f57d6e4a2763152240fbcd50a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 20 15:58:58 2013 +0200

...and similarly for __cxa_allocate_exception and __cxa_throw

Change-Id: I87ae299aac97180f0587c553d85b051decca155c

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 8229ce8..18a6eff 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -250,7 +250,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * 
pUno2Cpp )
 Reference XInterface () );
 }
 
-pCppExc = __cxa_allocate_exception( pTypeDescr-nSize );
+pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr-nSize );
 ::uno_copyAndConvertData( pCppExc, pUnoExc-pData, pTypeDescr, pUno2Cpp );
 
 // destruct uno exception
@@ -269,7 +269,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * 
pUno2Cpp )
 }
 }
 
-__cxa_throw( pCppExc, rtti, deleteException );
+__cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException );
 }
 
 
//==
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index f3f43e5..61702b7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -80,27 +80,30 @@ struct __cxa_eh_globals
 // Therefore, provide a declaration here for old GCC (libstdc++, really) 
version
 // that returns a void pointer, and in the code calling it always cast to the
 // above fake definition of CPPU_CURRENT_NAMESPACE::__cxa_eh_globals (which
-// hopefully keeps matching the real definition in libstdc++):
+// hopefully keeps matching the real definition in libstdc++); similarly for
+// __cxa_allocate_exception and __cxa_throw, though they do not have the
+// additional problem of an incompletely declared return type:
+
 #if !HAVE_GCC_CXXABI_H_CXA_GET_GLOBALS
-namespace __cxxabiv1 { extern C void * __cxa_get_globals () throw(); }
+namespace __cxxabiv1 { extern C void * __cxa_get_globals() throw(); }
 #endif
 
-namespace CPPU_CURRENT_NAMESPACE
-{
+#if !HAVE_GCC_CXXABI_H_CXA_ALLOCATE_EXCEPTION
+namespace __cxxabiv1 {
+extern C void * __cxa_allocate_exception(std::size_t thrown_size) throw();
+}
+#endif
 
-// The following are in cxxabi.h since GCC 4.7 (they are wrapped in
-// CPPU_CURRENT_NAMESPACE here as different GCC versions have slightly 
different
-// declarations for them, e.g., with or without throw() specification, so would
-// complain about redeclarations of these somewhat implicitly declared
-// functions):
-#if __GNUC__ == 4  __GNUC_MINOR__ = 6
-extern C void *__cxa_allocate_exception(
-std::size_t thrown_size ) throw();
-extern C void __cxa_throw (
-void *thrown_exception, void *tinfo, void (*dest) (void *) ) 
__attribute__((noreturn));
+#if !HAVE_GCC_CXXABI_H_CXA_THROW
+namespace __cxxabiv1 {
+extern C void __cxa_throw(
+void * thrown_exception, void * tinfo, void (* dest)(void *))
+__attribute__((noreturn));
+}
 #endif
 
-// -
+namespace CPPU_CURRENT_NAMESPACE
+{
 
 
//==
 void raiseException(
diff --git a/config_host/config_gcc.h.in b/config_host/config_gcc.h.in
index 4376877..c957179 100644
--- a/config_host/config_gcc.h.in
+++ b/config_host/config_gcc.h.in
@@ -10,7 +10,9 @@
 #ifndef CONFIG_GCC_H
 #define CONFIG_GCC_H
 
+#define HAVE_GCC_CXXABI_H_CXA_ALLOCATE_EXCEPTION 0
 #define HAVE_GCC_CXXABI_H_CXA_GET_GLOBALS 0
+#define HAVE_GCC_CXXABI_H_CXA_THROW 0
 
 #endif
 
diff --git a/configure.ac b/configure.ac
index 9998743..465e7fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5572,6 +5572,17 @@ if test $GCC = yes; then
 ], [AC_MSG_RESULT([no])])
 CFLAGS=$save_CFLAGS
 
+AC_MSG_CHECKING([whether $CXX declares __cxa_allocate_exception in 
cxxabi.h])
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#include cxxabi.h
+void * f() { return __cxxabiv1::__cxa_allocate_exception(0); }
+])], [
+AC_DEFINE([HAVE_GCC_CXXABI_H_CXA_ALLOCATE_EXCEPTION],[1])
+AC_MSG_RESULT([yes])
+], [AC_MSG_RESULT([no])])
+AC_LANG_POP([C++])
+
 AC_MSG_CHECKING([whether $CXX declares __cxa_get_globals in cxxabi.h])
 AC_LANG_PUSH([C++])
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([
@@ -5582,6 +5593,17 @@ if test $GCC = yes; then
 AC_MSG_RESULT([yes])

[Bug 60270] LibreOffice 4.1 most annoying bugs

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

Emir Sarı emir_s...@msn.com changed:

   What|Removed |Added

 Depends on||65971

-- 
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 'feature/gsoc-writer-char-borders' - icon-themes/crystal icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/oxygen officecfg/registry sw/inc

2013-06-20 Thread Zolnai Tamás

 dev/null|binary
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 -
 sw/Library_swui.mk  |1 
 sw/inc/cmdid.h  |1 
 sw/inc/dialog.hrc   |1 
 sw/inc/swabstdlg.hxx|1 
 sw/sdi/_basesh.sdi  |5 
 sw/sdi/swriter.sdi  |   25 ---
 sw/source/ui/dialog/swdlgfact.cxx   |   20 --
 sw/source/ui/dialog/swdlgfact.hxx   |5 
 sw/source/ui/envelp/envfmt.cxx  |1 
 sw/source/ui/frmdlg/frmui.src   |4 
 sw/source/ui/frmdlg/uiborder.cxx|   65 
-
 sw/source/ui/inc/frmui.hrc  |1 
 sw/source/ui/inc/uiborder.hxx   |   42 
--
 sw/source/ui/shells/basesh.cxx  |   67 
--
 16 files changed, 3 insertions(+), 244 deletions(-)

New commits:
commit 2cee5af64e7f498bc3a74f3dc2bc23ca2977b7f3
Author: Zolnai TamÃ¡s zolnaitamas2...@gmail.com
Date:   Thu Jun 20 15:38:01 2013 +0200

Remove obsolote border dialog

Change-Id: I57f3db05a21caeff04f280a0c13c3facfe23c3c1

diff --git a/icon-themes/crystal/cmd/lc_borderdialog.png 
b/icon-themes/crystal/cmd/lc_borderdialog.png
deleted file mode 100644
index c0ca4f6..000
Binary files a/icon-themes/crystal/cmd/lc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/sc_borderdialog.png 
b/icon-themes/crystal/cmd/sc_borderdialog.png
deleted file mode 100644
index 6b6ab48..000
Binary files a/icon-themes/crystal/cmd/sc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/lc_borderdialog.png 
b/icon-themes/galaxy/cmd/lc_borderdialog.png
deleted file mode 100644
index 0cd8935..000
Binary files a/icon-themes/galaxy/cmd/lc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/sc_borderdialog.png 
b/icon-themes/galaxy/cmd/sc_borderdialog.png
deleted file mode 100644
index c8b915b..000
Binary files a/icon-themes/galaxy/cmd/sc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/hicontrast/cmd/lc_borderdialog.png 
b/icon-themes/hicontrast/cmd/lc_borderdialog.png
deleted file mode 100644
index a61a1a6..000
Binary files a/icon-themes/hicontrast/cmd/lc_borderdialog.png and /dev/null 
differ
diff --git a/icon-themes/hicontrast/cmd/sc_borderdialog.png 
b/icon-themes/hicontrast/cmd/sc_borderdialog.png
deleted file mode 100644
index 6c65b36..000
Binary files a/icon-themes/hicontrast/cmd/sc_borderdialog.png and /dev/null 
differ
diff --git a/icon-themes/human/cmd/lc_borderdialog.png 
b/icon-themes/human/cmd/lc_borderdialog.png
deleted file mode 100644
index 323a8df..000
Binary files a/icon-themes/human/cmd/lc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/human/cmd/sc_borderdialog.png 
b/icon-themes/human/cmd/sc_borderdialog.png
deleted file mode 100644
index d71ad45..000
Binary files a/icon-themes/human/cmd/sc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/oxygen/cmd/lc_borderdialog.png 
b/icon-themes/oxygen/cmd/lc_borderdialog.png
deleted file mode 100644
index c0ca4f6..000
Binary files a/icon-themes/oxygen/cmd/lc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/oxygen/cmd/sc_borderdialog.png 
b/icon-themes/oxygen/cmd/sc_borderdialog.png
deleted file mode 100644
index 6b6ab48..000
Binary files a/icon-themes/oxygen/cmd/sc_borderdialog.png and /dev/null differ
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index c8dc745..76ff150 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -829,14 +829,6 @@
   value xml:lang=en-USName.../value
 /prop
   /node
-  node oor:name=.uno:BorderDialog oor:op=replace
-prop oor:name=Label oor:type=xs:string
-  value xml:lang=en-USBorders/value
-/prop
-prop oor:name=Properties oor:type=xs:int
-  value1/value
-/prop
-  /node
   node oor:name=.uno:PageColumnDialog oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USPage Columns/value
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index bec90c2..2f1d4bc 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
 sw/source/ui/frmdlg/frmdlg \

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - chart2/source

2013-06-20 Thread Armin Le Grand

 chart2/source/tools/ExplicitCategoriesProvider.cxx |   22 ++---
 1 file changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 0231f801a0bf15e3ce59642d502756ec6828bb5e
Author: Armin Le Grand a...@apache.org
Date:   Thu Jun 20 13:19:42 2013 +

i121277 Corrected label data generation

diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx 
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 7e84b66..08a4fd9 100755
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -358,8 +358,11 @@ Sequence OUString  lcl_getExplicitSimpleCategories(
 sal_Int32 nCurrentCount = lcl_getCategoryCount( *aOuterIt );
 if( nCurrentCount nMaxCategoryCount )
 {
-ComplexCategory rComplexCategory = aOuterIt-back();
-rComplexCategory.Count += (nMaxCategoryCount-nCurrentCount);
+if(!aOuterIt-empty()) // #121277# Caution, aOuterIt may be 
empty (!)
+{
+ComplexCategory rComplexCategory = aOuterIt-back();
+rComplexCategory.Count += 
(nMaxCategoryCount-nCurrentCount);
+}
 }
 }
 }
@@ -391,12 +394,17 @@ Sequence OUString  lcl_getExplicitSimpleCategories(
 OUString aText;
 for( aOuterIt=aComplexCatsPerIndex.begin() ; aOuterIt != 
aOuterEnd; ++aOuterIt )
 {
-OUString aAddText = (*aOuterIt)[nN].Text;
-if( aAddText.getLength() )
+OUString aAddText;
+
+if(!aOuterIt-empty()) // #121277# Caution, aOuterIt may be 
empty (!)
 {
-if(aText.getLength())
-aText += aSpace;
-aText += aAddText;
+aAddText = (*aOuterIt)[nN].Text;
+if( aAddText.getLength() )
+{
+if(aText.getLength())
+aText += aSpace;
+aText += aAddText;
+}
 }
 }
 aRet[nN]=aText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - editeng/source sw/inc sw/source

 editeng/source/misc/svxacorr.cxx |   13 -
 sw/inc/swtypes.hxx   |2 ++
 sw/source/core/doc/docfmt.cxx|   24 
 3 files changed, 34 insertions(+), 5 deletions(-)

New commits:
commit 5b3867f801dadc5c2c6346561e7d71990cd7eb33
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jun 20 00:20:52 2013 +0200

fdo#62536: sw: fix AutoCorrect bold/underline on existing AUTOFMT

With the native AUTOFMT in Writer the SETATTR_DONTEXPAND does no longer
work reliably: if there is an existing AUTOFMT at the position then it
will be modified and no new hint with DontExpand will be inserted.

Work around this deficiency by inserting a no-length hint with the
preivous formatting at the end of the range.

(similar fix to the i#75891 problem in SwTextShell::InsertSymbol)

(commit 062eaeffe7cb986255063bb9b0a5f3fb3fc8e34c did not
 introduce the problem but made it far more annoying)

Change-Id: I58ece7f5bd5a786b22a066e5902f1784dafa5dce
(cherry picked from commit fe444d1f74abe417962be0bcd3340f40f2446b58)
Reviewed-on: https://gerrit.libreoffice.org/4393
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index cf486af..046c4b3 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -732,24 +732,27 @@ sal_Bool SvxAutoCorrect::FnChgWeightUnderl( 
SvxAutoCorrDoc rDoc, const String
 
 if( STRING_NOTFOUND != nFndPos )
 {
-// Span the Attribute over the area and delete the Character found at
+// first delete the Character at the end - this allows insertion
+// of an empty hint in SetAttr which would be removed by Delete
+// (fdo#62536, AUTOFMT in Writer)
+rDoc.Delete( nEndPos, nEndPos + 1 );
+rDoc.Delete( nFndPos, nFndPos + 1 );
+// Span the Attribute over the area
 // the end.
 if( '*' == cInsChar )   // Bold
 {
 SvxWeightItem aSvxWeightItem( WEIGHT_BOLD, SID_ATTR_CHAR_WEIGHT );
-rDoc.SetAttr( nFndPos + 1, nEndPos,
+rDoc.SetAttr( nFndPos, nEndPos - 1,
 SID_ATTR_CHAR_WEIGHT,
 aSvxWeightItem);
 }
 else// underline
 {
 SvxUnderlineItem aSvxUnderlineItem( UNDERLINE_SINGLE, 
SID_ATTR_CHAR_UNDERLINE );
-rDoc.SetAttr( nFndPos + 1, nEndPos,
+rDoc.SetAttr( nFndPos, nEndPos - 1,
 SID_ATTR_CHAR_UNDERLINE,
 aSvxUnderlineItem);
 }
-rDoc.Delete( nEndPos, nEndPos + 1 );
-rDoc.Delete( nFndPos, nFndPos + 1 );
 }
 
 return STRING_NOTFOUND != nFndPos;
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index fe1c414..214ba5a 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -192,6 +192,8 @@ typedef sal_uInt16 SetAttrMode;
 namespace nsSetAttrMode
 {
 const SetAttrMode SETATTR_DEFAULT= 0x;  // Default.
+/// @attention: DONTEXPAND does not work very well for CHARATR
+/// because it can expand only the whole AUTOFMT or nothing
 const SetAttrMode SETATTR_DONTEXPAND = 0x0001;  // Don't expand text 
attribute any further.
 const SetAttrMode SETATTR_DONTREPLACE= 0x0002;  // Don't replace 
another text attribute.
 
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 4341aa9..c3171cd 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2453,7 +2453,31 @@ void SwDoc::SetFmtItemByAutoFmt( const SwPaM rPam, 
const SfxItemSet rSet )
 SetRedlineMode_intern( (RedlineMode_t)(eOld | 
nsRedlineMode_t::REDLINE_IGNORE));
 }
 
+xub_StrLen const nEnd(rPam.End()-nContent.GetIndex());
+std::vectorsal_uInt16 whichIds;
+SfxItemIter iter(rSet);
+for (SfxPoolItem const* pItem = iter.FirstItem();
+pItem; pItem = iter.NextItem())
+{
+whichIds.push_back(pItem-Which());
+whichIds.push_back(pItem-Which());
+}
+whichIds.push_back(0);
+SfxItemSet currentSet(GetAttrPool(), whichIds[0]);
+pTNd-GetAttr(currentSet, nEnd, nEnd, false, true, false);
+for (size_t i = 0; whichIds[i]; i += 2)
+{   // yuk - want to explicitly set the pool defaults too :-/
+currentSet.Put(currentSet.Get(whichIds[i], true));
+}
+
 InsertItemSet( rPam, rSet, nsSetAttrMode::SETATTR_DONTEXPAND );
+
+// fdo#62536: DONTEXPAND does not work when there is already an AUTOFMT
+// here, so insert the old attributes as an empty hint to stop expand
+SwPaM endPam(*pTNd, nEnd);
+endPam.SetMark();
+InsertItemSet(endPam, currentSet, nsSetAttrMode::SETATTR_DEFAULT);
+
 SetRedlineMode_intern( eOld );
 }
 
___

odd rGlyphData.ExtDataRef().mpData != Format::NONE (vcl/headless/svptext.cxx)


At least current Clang towards 3.4 fails on current master with


/home/sbergman/lo-clang/core/vcl/headless/svptext.cxx:175:40: error: comparison 
between pointer and integer ('void *' and 'sal_Int32' (aka 'int'))
if( rGlyphData.ExtDataRef().mpData != Format::NONE )
~~ ^  


The code of SvpGlyphPeer::RemovingGlyph appears to be that way since its 
inception in 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b6801926b515be4cfb10ca7e3322939f0f97426b 
INTEGRATION: CWS mergesvp (1.1.2); FILE ADDED.  Given that 
basebmp::Format::NONE is



static const sal_Int32 NONE = 0;


that might either be a bad way of checking 
rGlyphData.ExtDataRef().mpData is non-null that just happens to work out 
as intended, or might be a broken attempt at checking that 
rGlyphData.ExtDataRef().meInfo is not Format::NONE.


Anybody an idea what might be the better interpretation?

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

Re: Experimental LibreOffice app for iOS

 I can contribute the code as well. But the LibreOffice code base is huge
 and kinda messy


Sure, but luckily you don't need to touch, or even look at, large parts of
it if your main interest is making an app for iOS;)


 so I doubt I can do much.


The iOS experimental app is in the ios/experimental/LibreOffice directory.
There is an Xcode project there that builds the app assuming the rest of
the LibreOffice code has been cross-compiled first using the command-line
method as described in README.cross.

The parts in the LibreOffice code that interfaces with the iOS-specific UI
layer are in vcl/ios mostly.

Whether the basic idea how this experimental app works is a good one, or
whether some radical re-think is necessary, that is unclear yet,
unfortunately...

One thing that is already obvious is that in order even to get sanely
working panning and zooming on touch devices, a significant amount of
changes are needed also in the core LibreOffice code.


 Thanks for the answer, this README.cross looks like a good starting point.


Great! Hope to eventually see contributions from you!

Please, send email about this in the future to the LibreOffice development
mailing list. In general private email is avoided in open source projects.
I am sending this reply to the list, with you in Bcc.

It is also useful to hang around on our IRC channel (#libreoffice-dev on
freenode) and ask questions there.

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

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

 sdext/source/minimizer/pppoptimizerdialog.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc5a0560f23c494a77699c671e8368feef1641ae
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 20 16:17:53 2013 +0200

Typo

Change-Id: I73700479207c0ee594dd23709640cdff82224469

diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx 
b/sdext/source/minimizer/pppoptimizerdialog.hxx
index 6464a16..c907c38 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.hxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.hxx
@@ -18,7 +18,7 @@
  */
 
 #ifndef PPPOPTIMIZERDIALOG_HXX
-#define PPPOPTIMIZERDIALOGOG_HXX
+#define PPPOPTIMIZERDIALOG_HXX
 
 #include com/sun/star/uno/Sequence.h
 #include com/sun/star/document/XExporter.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit 0a66aac248d69d7fc47f669b5757a52e0f06e38d
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 20 13:15:25 2013 +0200

Revert fdo#65132 compute font height correctly

Commit 22d23d52b0f65636df3a1cb8fada9bf7de77eb78 is the real fix.

This reverts commit 3a6513047409b8e8f6295152b33385ad8ef93681.

(cherry picked from commit 5f00be141d86e3ea554cd9d18ebe47d4d59b)

Change-Id: I36ac1f64000c3a805289141c2c6dca0de78454d3
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4395
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index cf37e01..d5d019a 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -7084,7 +7084,7 @@ FontMetric OutputDevice::GetFontMetric() const
 // set aMetric with info from font
 aMetric.SetName( maFont.GetName() );
 aMetric.SetStyleName( pMetric-GetStyleName() );
-aMetric.SetSize( PixelToLogic( Size( pMetric-mnWidth, 
pMetric-mnAscent+pMetric-mnDescent ) ) );
+aMetric.SetSize( PixelToLogic( Size( pMetric-mnWidth, 
pMetric-mnAscent+pMetric-mnDescent-pMetric-mnIntLeading ) ) );
 aMetric.SetCharSet( pMetric-IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : 
RTL_TEXTENCODING_UNICODE );
 aMetric.SetFamily( pMetric-GetFamilyType() );
 aMetric.SetPitch( pMetric-GetPitch() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/comphelper/evtmethodhelper.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e670e30d546b78bb9642fe2733095f99b3a962a5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 20 16:24:04 2013 +0200

-Werror,-Wheader-guard

Change-Id: I92b868b0d579caf0378d7193502918dd4c8f9497

diff --git a/include/comphelper/evtmethodhelper.hxx 
b/include/comphelper/evtmethodhelper.hxx
index 7ecf08a..787a3c4 100644
--- a/include/comphelper/evtmethodhelper.hxx
+++ b/include/comphelper/evtmethodhelper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef COMPHELPER_EVENTMEHODHELPER_HXX
-#define COMPHELPER_EVENMETHODHELPER_HXX
+#ifndef COMPHELPER_EVENTMETHODHELPER_HXX
+#define COMPHELPER_EVENTMETHODHELPER_HXX
 #include comphelper/sequence.hxx
 //
 namespace comphelper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/comphelper/stillreadwriteinteraction.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e892e374bad362f965ae850069c2c8d5771aa99
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 20 16:30:01 2013 +0200

-Werror,-Wheader-guard

Change-Id: If337f14697fc34ad8be1d84d696efbfb17b3dbb1

diff --git a/include/comphelper/stillreadwriteinteraction.hxx 
b/include/comphelper/stillreadwriteinteraction.hxx
index c6d62e8..9397aa7 100644
--- a/include/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
@@ -18,7 +18,7 @@
  */
 
 #ifndef _COMPHELPER_STILLREADWRITEINTERACTION_HXX_
-#define _COMPHELPER_STRILLREADWRITEINTERACTION_HXX_
+#define _COMPHELPER_STILLREADWRITEINTERACTION_HXX_
 
 #include ucbhelper/interceptedinteraction.hxx
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc' - firebird/ExternalPackage_firebird.mk scp2/InstallModule_firebird.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source set

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

 firebird/ExternalPackage_firebird.mk |   32 --
 scp2/InstallModule_firebird.mk   |   17 +++
 scp2/InstallScript_setup_osl.mk  |1 
 scp2/Module_scp2.mk  |1 
 scp2/source/firebird/file_firebird.scp   |   30 
 scp2/source/firebird/module_firebird.scp |   33 +++
 setup_native/source/packinfo/packinfo_office.txt |   15 ++
 7 files changed, 126 insertions(+), 3 deletions(-)

New commits:
commit 747f7fc9a9a85751bf83946adb6571ba534029d8
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Jun 20 15:19:06 2013 +0100

Setup Firebird installation / scp2 details.

Change-Id: I03393b08db5878b099a2e71b9b515b707a386e3f

diff --git a/firebird/ExternalPackage_firebird.mk 
b/firebird/ExternalPackage_firebird.mk
index c385b59..4d72c9b 100644
--- a/firebird/ExternalPackage_firebird.mk
+++ b/firebird/ExternalPackage_firebird.mk
@@ -39,9 +39,35 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,firebird,firebird))
 #  gen/firebird/security2.fdb \
 # ))
 
+$(eval $(call gb_ExternalPackage_set_outdir,firebird,$(INSTDIR)))
+
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,libfbembed.so,gen/firebird/lib/libfbembed.so))
+
+$(eval $(call gb_ExternalPackage_add_files,firebird,firebird,\
+gen/firebird/firebird.msg \
+gen/firebird/security2.fdb \
+))
+
+$(eval $(call gb_ExternalPackage_add_files,firebird,firebird/bin,\
+gen/firebird/bin/isql \
+))
+
+$(eval $(call gb_ExternalPackage_add_files,firebird,firebird/lib,\
+gen/firebird/lib/libfbembed.so.2.5.2 \
+gen/firebird/lib/libfbembed.so.2.5 \
+gen/firebird/lib/libfbembed.so \
+gen/firebird/lib/libicudata.so \
+gen/firebird/lib/libicudata.so.30 \
+gen/firebird/lib/libicudata.so.30.0 \
+gen/firebird/lib/libicuuc.so \
+gen/firebird/lib/libicuuc.so.30 \
+gen/firebird/lib/libicuuc.so.30.0 \
+gen/firebird/lib/libicui18n.so \
+gen/firebird/lib/libicui18n.so.30 \
+gen/firebird/lib/libicui18n.so.30.0 \
+))
 
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2))
-$(eval $(call 
gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2))
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_firebird.mk b/scp2/InstallModule_firebird.mk
new file mode 100644
index 000..b11169f
--- /dev/null
+++ b/scp2/InstallModule_firebird.mk
@@ -0,0 +1,17 @@
+# -*- 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_InstallModule_InstallModule,scp2/firebird))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/firebird,\
+scp2/source/firebird/file_firebird \
+scp2/source/firebird/module_firebird \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index f54cad1..ebcdcf2 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
scp2/impress \
scp2/math \
scp2/ooo \
+   scp2/firebird \
scp2/python \
scp2/ure \
scp2/writer \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 3178920..285c9a4 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_canvas \
InstallModule_draw \
InstallModule_extensions \
+   InstallModule_firebird \
InstallModule_graphicfilter \
InstallModule_impress \
InstallModule_math \
diff --git a/scp2/source/firebird/file_firebird.scp 
b/scp2/source/firebird/file_firebird.scp
new file mode 100644
index 000..f1e4bc0
--- /dev/null
+++ b/scp2/source/firebird/file_firebird.scp
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license

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

 unotools/source/i18n/charclass.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6f36e70795743690c59042e20f1c2059b00f84b7
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 20 16:38:40 2013 +0200

-Werror,-Wdeprecated-register

Change-Id: Idacccba79c1c2973e5f20804e628f604398d

diff --git a/unotools/source/i18n/charclass.cxx 
b/unotools/source/i18n/charclass.cxx
index cd8d036..35f3272 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -81,8 +81,8 @@ sal_Bool CharClass::isAsciiNumeric( const String rStr )
 {
 if ( !rStr.Len() )
 return sal_False;
-register const sal_Unicode* p = rStr.GetBuffer();
-register const sal_Unicode* const pStop = p + rStr.Len();
+const sal_Unicode* p = rStr.GetBuffer();
+const sal_Unicode* const pStop = p + rStr.Len();
 do
 {
 if ( !isAsciiDigit( *p ) )
@@ -97,8 +97,8 @@ sal_Bool CharClass::isAsciiAlpha( const String rStr )
 {
 if ( !rStr.Len() )
 return sal_False;
-register const sal_Unicode* p = rStr.GetBuffer();
-register const sal_Unicode* const pStop = p + rStr.Len();
+const sal_Unicode* p = rStr.GetBuffer();
+const sal_Unicode* const pStop = p + rStr.Len();
 do
 {
 if ( !isAsciiAlpha( *p ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make ok, but make install fails

2013-06-20 Thread Miklos Vajna

On Thu, Jun 20, 2013 at 01:35:38PM +0200, Alexander Thurgood 
alex.thurg...@gmail.com wrote:
 I couldn't say which commit is responsible, but it is still not
 building for me with make dev-install. Gets to near the end, and
 then fails with missing modules, even if I explicitly add the
 --with-help switch as Caolan suggested.

Is this a clean build? Even after the fix arrived, an incremental build
will have the same problem. No need to mess with the --with-help or
--without-help switches, I hope. At least I did not. :-)


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

Re: LO / Firebird DB Integration

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

Hi there,

On 15/06/13 20:03, Javier Fernandez wrote:
 Nice work !!! We haven't been able to build Firebird inside libreoffice
 at the beginning, so we movd to the system library instead. Perhaps you
 could take that as reference for the installation details you mentioned.

 BTW, I've tested your changes in the branch and this is what I get by
 opening an already created ODB file configured for Firebird:

 warn:cppuhelper:664:1:cppuhelper/source/shlib.cxx:501: loading component
 library failed:
 file://$HOME/libo.git/solver/unxlngx6/installation/opt/program/../program/libfirebird-sdbclo.so
 terminate called after throwing an instance of
 'com::sun::star::loader::CannotActivateFactoryException'
I've finally managed to figure out how to get the install working -- the
driver now loads fine. For the moment however the following is needed
for things to work:

FIREBIRD=./install/program/firebird
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):./install/program/firebird/lib
./install/program/soffice.bin --base

I'm not entirely sure how to provide these paths within LO to avoid
having to prepend them yet.

I'm also not entirely certain everything will work as expected yet
either -- I haven't found a definitive list of files which Firebird 2.5
requires in embedded mode -- if anything is missing it can be however
easily be added to the bottom of firebird/ExternalPackage_firebird.mk.

The firebird specific libraries (fb builds its own versions
libicuuc/libicudata/etc.) are currently in install/program/firebird/lib
(I've simply copied the firebird installation structure into
install/program/firebird, although I've installed as few files as
possible as most of them seem to only be needed for a full FB server) --
I'm not entirely sure how correct this is, but libfbembed (which is in
the usual place i.e. install/program) doesn't look for
libicuuc/libicudata/etc. in the usual locations (I have little/no idea
of how library loading works yet, or the appropriate terminology
either...), hence it seemed to make more sense to me to just leave them
in the place that firebird expects them to be since the path apparently
needs to be set wherever they are.

 I want to use this email as well to introduce a new section in the wiki,
 related to the Firebird driver implementation:

 https://wiki.documentfoundation.org/Development/Base/FirebirdSQL#Firebird_driver_implementation

 I've added some notes about the current status of the driver
 implementation and some tasks to organize a bit the work to be done to
 complete the implementation.

 I have not too much time at this moment, but I'll try some hours every
 week. Feel free to assign one of those tasks or adding them to your
 personal schedule. I'll be available at the IRC for discussing details
 and help you the best I can, if needed.
Cool! I'm still working on the building of Firebird -- sorting out the
installation details took longer than expected, and it's hard for me to
estimate how long getting the windows build working will actually take
(the installation stuff took me longer than I expected), but hopefully
I'll be able to start work there soon.

ATB,

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

minutes of ESC call ...

* Present:
+ Hangout: Andras, Caolan, Kendy, Joel, Kohei, Tsai, Michael M, Thorsten
+ Phone:   Stephan, Norbert, Cloph, Eike, David, Michael S,
   Astron, Cedric, Tibby

* Completed Action Items:
+ now that digest is ready, as agreed disable gerrit firehose (Bjoern)
[ done ]
+ banner advert might be good for this QA contest = chase marketing 
(Joel)
+ chase QA banner ad for the contest (Astron)
[ chasing in progress, hoping for something tonight ]
AI: + tweak text on the pre-release page (Cloph)

* Pending Action items:
+ get remaining GOSC guys introduced on the QA list (Cedric)
+ update visible bugzilla versions to hide ~all legacy versions (Joel)
[ bsa fixing in progress ]
+ setup a UX Advice bz component and default CC the ux-advise ML (Joel)

* Release Engineering update (Cloph)
+ Petr missed  on holiday for two weeks
+ Cloph carrying the flag
+ 4.1.0 RC1 update
+ two (translation + help) related bugfix tags needed
+ being built, up-loading to the mirrors
+ 3.6.7 schedule - deadline:
+ next monday is nearly the last chance for 3.6 fixes

* QA update (Joel)
+ QA Contest update
+ 
https://wiki.documentfoundation.org/QA/Projects/Bug_Triage_Contest
+ 15+ people signed up so far ... encouraging.
+ French / translated BSA is completed
+ filed a bug through it, asking to change relevant links
+ many thanks to Rob Snelders [!]
+ https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html
+163-128
thanks to top five:
ign_christian: 28
Rob Snelders:  14
Michael Meeks:  7
Eike Rathke:7
Andras Timar:   5
+ Need_Advice bugs input appreciated
+ 5 bugs in that state
+ http://tinyurl.com/ce6d8km
+ curiosity about %age of patches back-ported to stable
+ poked into it: around 60% of 4.1 fixes go back to 4.0 as well.
+ 13% are back-ported to 3.6
+ don't want to break stable by back-porting everythign (Bjoern)
+ thanks to TDF  Bjoern for getting tester netbooks deployed
+ three out there - 2x Windows 8 and 1 Linux.

* GSOC update (Cedric)
+ please mentor your students, mid-term evaluations
  from Mon 29th July until end of that week.

* gerrit bits (Bjoern)
+ check that all devs and gerrit admins are subscribed to an OTRS queue
+ Norbert, Thorsten, Bjoern are there.
+ only ten people who are devs
AI: + dig out docs on signing up to the OTRS queue (Bjoern)

* UX input (Astron)
+ setup a UX Advice bz component and default CC the ux-advise ML
+ unless someone wants to write a script to scrape keywords
  and proxy to mail.
+ idea with component = the better idea.
+ icons on master:
+ added Sifr to the default icon set
+ approved: remove crystal from the default binary build
  configuration (retaining Oxygen) to keep space requirements
  constant.
+ leave crystal icons in the source tree for packagers
+ Android remote discussion improvements
+ perhaps another whiteboard for iOS - somewhat different.

* Hamburg hack-fest update (Bjoern)
+ it was awesome.
+ achieved quite a few nice things:
  https://wiki.documentfoundation.org/Hackfest/Hamburg2013#Achievements
+ great beer event at the beginning (sponsored by Lanedo)
+ hacked until 4am.
+ nice group photo (missing Florian)

https://picasaweb.google.com/104737754628780823336/20130617_Hamburg#5890737500602109074
AI: + write a short blog entry with photos (Eike)

* Investing in even better productivity (Michael)
+ Bought CrossOver office licenses ...
+ mail me if you could use one of this to improve
  productivity.

* Added git commit access for:
+ Issa - for Sifr icons (Michael)

* People who are not members, should consider that (Michael)
+ benefits: voting for and standing for election in
  Board / Membership Committee
+ Certification etc. apply at:
  
http://www.documentfoundation.org/foundation/application-for-tdf-community-membership/
+ election / membership deadlines coming up soon.

* gerrit build-bot awesomeness (Michael)
+ it appears to work rather well, we have hardware coming
+ can we enable it for all committers ?
+ problem originally was around getting more build H/W

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

 sw/source/core/txtnode/thints.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 140da2c862b60a885dd35b86e197e919c28c9e6a
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jun 20 10:29:59 2013 +0300

WaE: macro is not used

Change-Id: I2f55abf4526f4184ba04fc173df8cf5236219cfc
(cherry picked from commit 1410cac73fc6e4d2c360e33ac5d185ad900cd728)

Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index 9bcfcf4..0893dac 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -75,7 +75,6 @@
 #define CHECK   Check(true);
 #define CHECK_NOTMERGED Check(false);
 #else
-#define CHECK
 #define CHECK_NOTMERGED
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 accessibility/source/standard/vclxaccessibletabpagewindow.cxx |   10 +-
 svx/source/fmcomp/fmgridcl.cxx|9 -
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 35b45e6915eecfea0e21525249eabe3afd39d09e
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jun 20 16:29:14 2013 +0200

VCLXAccessibleTabPageWindow: unhandled IndexOutOfBoundsException

... due to GetPagePos returning -1, work around that (can be easily
triggered in template manager).

Change-Id: Ic1334b224730d79e533539a24f115dc9aa2e9570

diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx 
b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 3865832..f63e266 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -114,7 +114,15 @@ Reference XAccessible  
VCLXAccessibleTabPageWindow::getAccessibleParent(  ) th
 {
 Reference XAccessibleContext  xCont( 
xAcc-getAccessibleContext() );
 if ( xCont.is() )
-xParent = xCont-getAccessibleChild( 
m_pTabControl-GetPagePos( m_nPageId ) );
+{
+sal_uInt16 const 
nPagePos(m_pTabControl-GetPagePos(m_nPageId));
+SAL_WARN_IF(TAB_PAGE_NOTFOUND == nPagePos, accessibility,
+getAccessibleParent(): no tab page);
+if (TAB_PAGE_NOTFOUND != nPagePos)
+{
+xParent = xCont-getAccessibleChild(nPagePos);
+}
+}
 }
 }
 
commit 32e2c6456fb3bf3bf75f9b11c90193c537b4ef26
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jun 20 15:02:37 2013 +0200

FmGridControl:  handle non-existing properties

Fix crash with unhandled exception requesting Description.

Change-Id: I6b6cb61273fb042532ab63620729f4129239fe81

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index ed3b2aa..4ea2577 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1908,7 +1908,14 @@ namespace
 ReferenceXPropertySet xProp;
 xIndex-getByIndex( _nPosition ) = xProp;
 if ( xProp.is() )
-xProp-getPropertyValue( _sPropName ) = sRetText;
+{
+try {
+xProp-getPropertyValue( _sPropName ) = sRetText;
+} catch (UnknownPropertyException const e) {
+SAL_WARN(svx.form,
+exception caught:   e.Message);
+}
+}
 }
 }
 return sRetText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - hwpfilter/source svl/source vcl/generic vcl/source

 hwpfilter/source/datecode.h  |2 +-
 hwpfilter/source/grammar.cxx |   20 ++--
 hwpfilter/source/hpara.cxx   |2 +-
 hwpfilter/source/hutil.cxx   |2 +-
 hwpfilter/source/hwpeq.cxx   |2 +-
 hwpfilter/source/lexer.cxx   |   30 +++---
 svl/source/items/itemset.cxx |2 +-
 svl/source/misc/inethist.cxx |6 +++---
 svl/source/numbers/zforfind.cxx  |4 ++--
 svl/source/numbers/zformat.cxx   |   22 +++---
 vcl/generic/fontmanager/parseAFM.cxx |   26 +-
 vcl/source/filter/jpeg/JpegTransform.hxx |2 +-
 vcl/source/filter/wmf/wmfwr.cxx  |2 +-
 vcl/source/gdi/bitmap4.cxx   |2 +-
 vcl/source/gdi/pdfwriter_impl.cxx|8 
 15 files changed, 66 insertions(+), 66 deletions(-)

New commits:
commit e7b87d69be29dfe9d7c879935a26171beba29cb5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 20 17:32:31 2013 +0200

-Werror,-Wdeprecated-register

Change-Id: I8edac5a93f9471c6f245bd484e845985c11027dd

diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index af26388..ba7c712 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -486,9 +486,9 @@ __yy_memcpy (to, from, count)
  char *from;
  unsigned int count;
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  char *f = from;
+  char *t = to;
+  int i = count;
 
   while (i--  0)
 *t++ = *f++;
@@ -501,9 +501,9 @@ __yy_memcpy (to, from, count)
 static void
 __yy_memcpy (char *to, char *from, unsigned int count)
 {
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  char *t = to;
+  char *f = from;
+  int i = count;
 
   while (i--  0)
 *t++ = *f++;
@@ -544,10 +544,10 @@ int
 yyparse(YYPARSE_PARAM_ARG)
  YYPARSE_PARAM_DECL
 {
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
+  int yystate;
+  int yyn;
+  short *yyssp;
+  YYSTYPE *yyvsp;
   int yyerrstatus;  /*  number of tokens to shift before error messages 
enabled */
   int yychar1 = 0;  /*  lookahead token as an internal (translated) token 
number */
 
diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx
index b1d6f54..f1b374e 100644
--- a/hwpfilter/source/hpara.cxx
+++ b/hwpfilter/source/hpara.cxx
@@ -86,7 +86,7 @@ HWPPara::~HWPPara(void)
 int HWPPara::Read(HWPFile  hwpf, unsigned char flag)
 {
 unsigned char same_cshape;
-register int ii;
+int ii;
 scflag = flag;
 // Paragraph Information
 hwpf.Read1b(reuse_shape, 1);
diff --git a/hwpfilter/source/hutil.cxx b/hwpfilter/source/hutil.cxx
index 5ec61a8..3f64701 100644
--- a/hwpfilter/source/hutil.cxx
+++ b/hwpfilter/source/hutil.cxx
@@ -83,7 +83,7 @@ void str2hstr(const char *c, hchar * i)
 
 int hstrlen(const hchar * s)
 {
-register int n = 0;
+int n = 0;
 
 while (*s++)
 n++;
diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx
index 89bbcad..4dd732c 100644
--- a/hwpfilter/source/hwpeq.cxx
+++ b/hwpfilter/source/hwpeq.cxx
@@ -466,7 +466,7 @@ void push_token(MzString white, MzString token, istream 
*strm)
alphabet string, sigle character */
 static int next_token(MzString white, MzString token, istream *strm)
 {
-  register int  ch = 0;
+  int  ch = 0;
 
   if( stk-state(strm) ) {
 white = stk-white;
diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx
index 3b08915..9413c73 100644
--- a/hwpfilter/source/lexer.cxx
+++ b/hwpfilter/source/lexer.cxx
@@ -1116,9 +1116,9 @@ YY_MALLOC_DECL
 
 YY_DECL
 {
-register yy_state_type yy_current_state;
-register char *yy_cp, *yy_bp;
-register int yy_act;
+yy_state_type yy_current_state;
+char *yy_cp, *yy_bp;
+int yy_act;
 
 if ( yy_init )
 {
@@ -1160,7 +1160,7 @@ YY_DECL
 yy_match:
 do
 {
-register YY_CHAR yy_c = 
sal::static_int_castYY_CHAR(yy_ec[YY_SC_TO_UI(*yy_cp)]);
+YY_CHAR yy_c = 
sal::static_int_castYY_CHAR(yy_ec[YY_SC_TO_UI(*yy_cp)]);
 if ( yy_accept[yy_current_state] )
 {
 yy_last_accepting_state = yy_current_state;
@@ -1525,9 +1525,9 @@ case YY_STATE_EOF(INITIAL):
 
 static int yy_get_next_buffer()
 {
-register char *dest = yy_current_buffer-yy_ch_buf;
-register char *source = yytext_ptr;
-register int number_to_move, i;
+char *dest = yy_current_buffer-yy_ch_buf;
+char *source = yytext_ptr;
+int number_to_move, i;
 int ret_val;
 
 if ( yy_c_buf_p  yy_current_buffer-yy_ch_buf[yy_n_chars + 1] )
@@ -1657,14 +1657,14 @@ static int yy_get_next_buffer()
 
 static yy_state_type yy_get_previous_state()
 {
-register yy_state_type yy_current_state;
-register char *yy_cp;
+yy_state_type yy_current_state;

Re: Direct csv import into Base table

On Sat, Jun 08, 2013 at 12:40:05AM +0200, Zolnai Tamás wrote:


 Well, enhanching Base connection to text database (which will be used for
 import too in my current plan) can be handled indenpedently from the
 primary task (import) and because I will start working on my GSoC project
 soon, this improvement remains for other times.

Sure, fair enough.

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

Re: odd rGlyphData.ExtDataRef().mpData != Format::NONE (vcl/headless/svptext.cxx)

On Thu, 2013-06-20 at 16:15 +0200, Stephan Bergmann wrote:
 that might either be a bad way of checking 
 rGlyphData.ExtDataRef().mpData is non-null that just happens to work out 
 as intended, or might be a broken attempt at checking that 
 rGlyphData.ExtDataRef().meInfo is not Format::NONE.
 
 Anybody an idea what might be the better interpretation?

I rather suspect that either is equivalent, I'd vote for meInfo is not
Format::NONE to match the new SvpGcpHelper condition.

But, can you see anyplace where meInfo *or* mpInfo is actually
set/changed away from the ctor defaults of 0, 0. i.e. is it the case
that all the conditionals off ExtGlyphData are constants. And I can't
see anyplace where that pGcpHelper gets deleted (in the normal
condition). The ServerFont::SetExtended call doesn't seem to actually do
anything either.

It seems to me that it would make more sense to me to remove the
SetExtended stuff, and replace that call with an assignment to the
ExtDataRef of that newed pSvpGcpHelper and then make the original above
change. 

C.

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

Re: Cppcheck: reassignment of m_bInChangingState (dbaccess module)

On Wed, Jun 12, 2013 at 01:08:48PM -0700, julien2412 wrote:

 Cppcheck reported this:
 [source/core/dataaccess/documentdefinition.cxx:211] -
 [source/core/dataaccess/documentdefinition.cxx:212]: (performance,
 inconclusive) Variable 'm_bInChangingState' is reassigned a value before the
 old one has been used if variable is no semaphore variable
 Indeed:
 207 void SAL_CALL OEmbedObjectHolder::changingState( const
 lang::EventObject /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState
 ) throw (embed::WrongStateException, uno::RuntimeException)
 208 {
 209 if ( !m_bInChangingState  nNewState ==
 EmbedStates::RUNNING  nOldState == EmbedStates::ACTIVE  m_pDefinition )
 210 {
 211 m_bInChangingState = true;
 212 m_bInChangingState = false;
 213 }
 214 }

 Is there something lacking between both (like
 OEmbedObjectHolder::stateChanged function, just some lines below)?

Well, this code appeared in:

commit 66de7dc15ba8e6f04eccd755fcc7494e98ffd46d
Author: Rüdiger Timm r...@openoffice.org
Date:   Wed Jan 30 07:34:38 2008 +

INTEGRATION: CWS dba24d (1.48.6); FILE MERGED

as:

if ( !m_bInChangingState  nNewState == EmbedStates::RUNNING  
nOldState == EmbedStates::ACTIVE  m_pDe
{
m_bInChangingState = true;
//m_pDefinition-save(sal_False);
m_bInChangingState = false;
}

Which suggests it could be buggy in the way that m_pDefinition-save
should *not* be commented out. Or maybe not. Dunno. Have to look at
what OEmbedObjectHolder::changingState does, when it is called, etc.

The commented out m_pDefinition-save was later removed, but as part
of a general dumb cleanup of remove all commented-out code, so I
don't trust it.

It seems to be the implementation of the interface
com/sun/star/embed/XStateChangeListener.idl

The OEmbedObjectHolder class is local to that file. It is created and
assigned to m_xListener member of ODocumentDefinition. But I don't see
any *use* of that m_xListener at all, and it is a private
member. sigh It looks like someone, way back in 2008
half-implemented something but never finished it...

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

Java recognition with OSX Master

2013-06-20 Thread Alexander Thurgood

Hi all,

I'm seeing this in the Console logs on master build on OSX when I click
on the Advanced settings, where the JVM is recognised :

com.apple.coreservices.launchservices
coreservicesd

SendFlattenedData, got error #268435460 (ipc/send) timed out from
::mach_msg(), sending notification kLSNotifyChildDeath to
notificationID=2977

I'm wondering if this is the cause of my other error message when
attempting to open a DB report :

javaloader error - no mapping from java to C++


Alex

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

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

2013-06-20 Thread Thorsten Behrens

 svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx |4 -
 vcl/source/gdi/bitmapex.cxx |   34 ++--
 2 files changed, 7 insertions(+), 31 deletions(-)

New commits:
commit 77b273ee3a2df87664262418c360d3a4a0ed48ea
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Jun 14 13:26:43 2013 +0200

Fixup alpha bitmap generation for Windows.

This improves upon d6f58fd25eeca84a94528409a05b80aa5172b8b8 by
using the BitmapEx ctor instead of manual initialisation. Several
EMF+ files would otherwise show up horribly mangled on Windows.

Change-Id: I1808cb45818f3f0118653164c83c49d6134b9324
(cherry picked from commit fefab3bb38f55471d9fa9316d1249ad00adefc37)

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 227e630..e123ac2 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -787,9 +787,6 @@ bool BitmapEx::Create( const 
::com::sun::star::uno::Reference
::com::sun::star::rendering::XBitmapCanvas  
xBitmapCanvas,
const Size rSize )
 {
-SetEmpty();
-Size aSize( rSize );
-
 uno::Reference beans::XFastPropertySet  xFastPropertySet( xBitmapCanvas, 
uno::UNO_QUERY );
 if( xFastPropertySet.get() )
 {
@@ -809,38 +806,17 @@ bool BitmapEx::Create( const 
::com::sun::star::uno::Reference
 pSalBmp = ImplGetSVData()-mpDefInst-CreateSalBitmap();
 pSalMask = ImplGetSVData()-mpDefInst-CreateSalBitmap();
 
-if( pSalBmp-Create( xBitmapCanvas, aSize ) )
+Size aLocalSize(rSize);
+if( pSalBmp-Create( xBitmapCanvas, aLocalSize ) )
 {
-#ifdef CLAMP_BITDEPTH_PARANOIA
-// did we get alpha mixed up in the bitmap itself
-// eg. Cairo Canvas ... yes performance of this is awful.
-if( pSalBmp-GetBitCount()  24 )
-{
-// Format convert the pixels with generic code
-Bitmap aSrcPixels( pSalBmp );
-aBitmap = Bitmap( rSize, 24 );
-BitmapReadAccess aSrcRead( aSrcPixels );
-BitmapWriteAccess aDestWrite( aBitmap );
-aDestWrite.CopyBuffer( aSrcRead );
-}
-else
-#endif
-aBitmap = Bitmap( pSalBmp );
-
-aBitmapSize = rSize;
-if ( pSalMask-Create( xBitmapCanvas, aSize, true ) )
+if ( pSalMask-Create( xBitmapCanvas, aLocalSize, true ) )
 {
-aMask = Bitmap( pSalMask );
-bAlpha = sal_True;
-aBitmapSize = rSize;
-eTransparent = !aMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP;
-
+*this = BitmapEx(Bitmap(pSalBmp), Bitmap(pSalMask) );
 return true;
 }
 else
 {
-bAlpha = sal_False;
-eTransparent = TRANSPARENT_NONE;
+*this = BitmapEx(Bitmap(pSalBmp));
 return true;
 }
 }
commit fbb7c74a2c5cd37d4ff27deb154656655f047bbc
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 12 17:04:49 2013 +0300

Don't display the broken OLE link icon except on Windows

Change-Id: Iede3d98ab5e5f9cd1896465e2a8c61605601999f

diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx 
b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index cea71d5..4e14184 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -51,14 +51,14 @@ namespace drawinglayer
 bScaleContent = pSource-IsEmptyPresObj();
 }
 }
-
+#ifdef WNT // Little point in displaying the broken OLE graphic on OSes that 
don't have real OLE, maybe?
 if(GRAPHIC_NONE == aGraphic.GetType())
 {
 // no source, use fallback resource emty OLE graphic
 aGraphic = SdrOle2Obj::GetEmptyOLEReplacementGraphic();
 bScaleContent = true;
 }
-
+#endif
 if(GRAPHIC_NONE != aGraphic.GetType())
 {
 const GraphicObject aGraphicObject(aGraphic);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [TDF#1003216] New direct committer: Alex Ivan

2013-06-20 Thread ger...@otrs.documentfoundation.org

Hello Alex,

I have added you to the group committers. This mean you now have: - the
ability to push other peoples patches to master with your review - the ability
to push your own patches to master directly This power comes with a
responsibility: We would like to invite you to do your share in reviewing the
patches of others. Every little bit helps, but it might be best to set
yourself a regular time (once a week, once a month, once a quarter). If you
are unsure at first, and shy to push patches by someone else to master, you
can start off by simply commenting on a patch. As said above: Every little bit
helps! Thanks and welcome on board!

Best,

Bjoern Michaelsen

--
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: [1]http://www.documentfoundation.org/imprint

15.06.2013 16:32 - Alex Ivan schrieb:   Hello,
  
 My name is Alex Ivan and I will be working on Google Summer of Code on the
project
 of implementing table styles for LibreOffice Writer.
  
 I have also submitted this patch, which has been merged:
 [2]https://gerrit.libreoffice.org/#/c/3401/
  
 I will require push rights in order to set up a feature branch and begin
coding.
  
 Best Wishes,
 Alex Ivan



[1] http://www.documentfoundation.org/imprint
[2] https://gerrit.libreoffice.org/#/c/3401/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

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

New commits:
commit 0cf61137d2a1993d310e2e8ff9bda4d0ed493ef0
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Jun 20 17:34:24 2013 +0100

fdo#65975 - fix presumed 32bit windows compile bug in configure.

Change-Id: Ia96eef31ddf00f47219265cef306ef950ecb3b27

diff --git a/configure.ac b/configure.ac
index 465e7fd..75a2013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4873,7 +4873,7 @@ find_msvc_x64_dlls()
 vsarch=x64
 fi
 
-msvcdllpath=$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT
+msvcdllpath=$VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT
 
MSVC_DEBUG_DLL_PATH=$VC_PRODUCT_DIR/redist/Debug_NonRedist/$vsarch/Microsoft.VC${VCVER}.DebugCRT
 msvcdlls=msvcp${VCVER}.dll msvcr${VCVER}.dll
 MSVC_DEBUG_DLLS=msvcp${VCVER}d.dll msvcr${VCVER}d.dll
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/inc/scmatrix.hxx  |6 
 sc/source/core/data/dociter.cxx  |4 +--
 sc/source/core/tool/scmatrix.cxx |   52 +++
 3 files changed, 60 insertions(+), 2 deletions(-)

New commits:
commit d7d96ec83f0ecb028e60de0cb18a877a37ddab0a
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jun 20 13:01:15 2013 -0400

Fix ScCellIterator, which also fixes matrix handling in the formula engine.

This one alone fixes 2 unit test failures.

Change-Id: I3392f4567888447d867ed29f7ecda2474fae1547

diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 6ba2b7f..66b271b 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -28,7 +28,7 @@
 
 #include boost/intrusive_ptr.hpp
 
-#define DEBUG_MATRIX 1
+#define DEBUG_MATRIX 0
 
 class ScInterpreter;
 class SvNumberFormatter;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 207c305..e9053d3 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1049,7 +1049,7 @@ bool ScCellIterator::first()
 
 bool ScCellIterator::next()
 {
-maCurPos.IncRow();
+incPos();
 return getCurrent();
 }
 
@@ -1839,7 +1839,7 @@ void ScHorizontalCellIterator::Advance()
 return;
 }
 
-if (nNextRow  MAXROW)
+if (nNextRow  static_castsize_t(MAXROW))
 {
 // No more blocks to search.
 bMore = false;
commit 0fa527827ac64274a4b18a48f454ddaba7c35cd1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jun 20 12:06:11 2013 -0400

Add Dump() method to ScMatrix, which is useful when debugging.

Change-Id: I45e6c28b58a03782814ef1089b49a52b873573a6

diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index c91b0ca..6ba2b7f 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -28,6 +28,8 @@
 
 #include boost/intrusive_ptr.hpp
 
+#define DEBUG_MATRIX 1
+
 class ScInterpreter;
 class SvNumberFormatter;
 class ScMatrixImpl;
@@ -349,6 +351,10 @@ public:
 
 // All other matrix functions  MatMult, MInv, ...  are in ScInterpreter
 // to be numerically safe.
+
+#if DEBUG_MATRIX
+void Dump() const;
+#endif
 };
 
 inline void intrusive_ptr_add_ref(const ScMatrix* p)
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 9b2c634..010f8dc 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -37,6 +37,12 @@
 #include mdds/multi_type_vector_types.hpp
 #include mdds/multi_type_vector_trait.hpp
 
+#if DEBUG_MATRIX
+#include iostream
+using std::cout;
+using std::endl;
+#endif
+
 using ::std::pair;
 using ::std::for_each;
 using ::std::count_if;
@@ -216,6 +222,10 @@ public:
 ScMatrix::IterateResult Product(bool bTextAsZero) const;
 size_t Count(bool bCountStrings) const;
 
+#if DEBUG_MATRIX
+void Dump() const;
+#endif
+
 private:
 void CalcPosition(SCSIZE nIndex, SCSIZE rC, SCSIZE rR) const;
 };
@@ -957,6 +967,41 @@ size_t ScMatrixImpl::Count(bool bCountStrings) const
 return aFunc.getCount();
 }
 
+#if DEBUG_MATRIX
+void ScMatrixImpl::Dump() const
+{
+cout  -- matrix content  endl;
+SCSIZE nCols, nRows;
+GetDimensions(nCols, nRows);
+for (SCSIZE nRow = 0; nRow  nRows; ++nRow)
+{
+for (SCSIZE nCol = 0; nCol  nCols; ++nCol)
+{
+coutrow=  nRow  , col=  nCol   : ;
+switch (maMat.get_type(nRow, nCol))
+{
+case mdds::mtm::element_string:
+cout  string (  maMat.get_string(nRow, nCol)  );
+break;
+case mdds::mtm::element_numeric:
+cout  numeric (  maMat.get_numeric(nRow, nCol)  
);
+break;
+case mdds::mtm::element_boolean:
+cout  boolean (  maMat.get_boolean(nRow, nCol)  
);
+break;
+case mdds::mtm::element_empty:
+cout  empty;
+break;
+default:
+;
+}
+
+cout  endl;
+}
+}
+}
+#endif
+
 void ScMatrixImpl::CalcPosition(SCSIZE nIndex, SCSIZE rC, SCSIZE rR) const
 {
 SCSIZE nRowSize = maMat.size().row;
@@ -1264,4 +1309,11 @@ size_t ScMatrix::Count(bool bCountStrings) const
 return pImpl-Count(bCountStrings);
 }
 
+#if DEBUG_MATRIX
+void ScMatrix::Dump() const
+{
+pImpl-Dump();
+}
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: SVG: scaling if no width/height is given

2013-06-20 Thread Regina Henschel


Hi Christina,

I have seen you patch at Gerrit now.

I think, that SvgAspectRatio::createLinearMapping is the wrong place to 
constrain the scaling because this method is used in svgimagenode.cxx 
and svgstyleattributes.cxx too. I think, that the decision whether to 
keep aspect ratio or not, should be made in the node itself. Have you 
tried to set the default settings explicitly in the constructor of 
SvgSvgNode?


Kind regards
Regina



Christina Roßmanith schrieb:

Hi,

the problem described here -
https://bugs.freedesktop.org/show_bug.cgi?id=64125 is caused by a
missing width and height attribute of the SVG given as an example. So,
what would we expect given a ViewBox attribute when importing a graphic?

What I'd expect is that the aspect ratio is kept and a reasonable
scaling is applied in order to fill a page, table cell or whatever. And
that the little green squares (handles?) behave like a bounding box for
the graphic content. Is that correct?

What I've achieved so far is the correct scaling. What I'm looking for
is where the total size of the graphic is still determined wrong (see
attached screenshot) - little green squares are more like DIN A4 than
the ViewBox size.

Christina


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



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

Re: Limit - New Database feature

On Tue, Jun 11, 2013 at 08:53:36AM +0200, Thomas Hackert wrote:
 On Montag, 10. Juni 2013 21:06 Zolnai Tamás wrote:
 thanks, Alex, to bringing my problem to this list :)

  Thanks for the note. I looked up the thread on german discuss
  list. The problem is not that doesn't insert the required WHERE
  clause before the LIMIT (it sounds like adding a criteria on GUI
  and this criteria not inserted into the select statement before
  the limit clause while running), but hsqldb does not support
  queries like select * from table limit y. In hsqldb's concept we
  have to use a WHERE or an ORDER BY clause before LIMIT or at least
  a Table alias.

 But should this not be mentioned in the help to SQL;LIMIT clause

No, please don't document work-arounds to HSQLDB limitations /
unexpected disambiguation, especially since we can work around it in
code automatically here.

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

Re: Limit - New Database feature

On Mon, Jun 10, 2013 at 09:06:56PM +0200, Zolnai Tamás wrote:

 I found a driver property with name AppendTableAliasInSelect which seems
 to be responsible for appending alias. It is used only in generating
 statement in QueryDesignView.cxx, so I think it can be used wihtout any
 problem. I can't test whether it works yet, I'm compiling by now, but it
 seems to me it works as its name suggests. So if you don't have any
 objection to it or don't have a better solution than I solve the problem in
 this way.

It seems like a good idea to just enable it unconditionally for
embedded HSQLDB. Feel free to commit that / submit a patch (and CC me
or add me as reviewer on Gerrit).

It happens in
connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu

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

Re: LO / Firebird DB Integration

On 20/06/13 16:40, Andrzej J. R. Hunt wrote:

 I've finally managed to figure out how to get the install working -- the
 driver now loads fine. For the moment however the following is needed
 for things to work:
 
 FIREBIRD=./install/program/firebird
 LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):./install/program/firebird/lib
 ../install/program/soffice.bin --base
 
 I'm not entirely sure how to provide these paths within LO to avoid
 having to prepend them yet.

why is it necessary to install the firebird libraries in some subdir of
program?  all other libraries (with notable exceptions) live directly in
program.  if the libraries have RPATH  $ORIGIN:$ORIGIN/../ure-link/lib
then they'll be able to find the other libraries (but it may take some
measures to get that RPATH in there).

 I'm also not entirely certain everything will work as expected yet
 either -- I haven't found a definitive list of files which Firebird 2.5
 requires in embedded mode -- if anything is missing it can be however
 easily be added to the bottom of firebird/ExternalPackage_firebird.mk.
 
 The firebird specific libraries (fb builds its own versions
 libicuuc/libicudata/etc.) are currently in install/program/firebird/lib

really?  it bundles its own ICU?  argh... can you teach it to use the
LO's ICU instead?  no reason why we'd need to ship 2 sets of ICU libraries.

 (I've simply copied the firebird installation structure into
 install/program/firebird, although I've installed as few files as
 possible as most of them seem to only be needed for a full FB server) --
 I'm not entirely sure how correct this is, but libfbembed (which is in
 the usual place i.e. install/program) doesn't look for
 libicuuc/libicudata/etc. in the usual locations (I have little/no idea
 of how library loading works yet, or the appropriate terminology
 either...), hence it seemed to make more sense to me to just leave them
 in the place that firebird expects them to be since the path apparently
 needs to be set wherever they are.

i'd hope that with the right RPATH it should find the right ICU... but i
guess your first problem is to get it to _build_ against the right
ICU... perhaps you just have to add some CFLAGS etc. but perhaps it
looks for icu-config...


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

Re: scp2 - modules (and fdo#60924)

2013-06-20 Thread Bjoern Michaelsen

Hi Matúš,

sorry for the late reply.

On Tue, Jun 11, 2013 at 05:34:38PM +0200, Matúš Kukan wrote:
 Hi,
 
 Anyone knows what should be the result of processing scp2 files?
 Few $(OUTDIR)/bin/*.ins files but I mean the solenv/bin/modules/ thing.
 We could install (copy) files directly with gbuild, so what would be
 missing after removing scp2 ?
 
 Especially I don't understand the chaos in various modules (gid_Module_Foos)
  - do we need them also for Windows? e.g. 
 scp2/source/activex/module_activex.scp
 For Linux it's somehow used to create packages I think.
 
 Bjoern, do you have ideas how to continue with
 https://bugs.freedesktop.org/show_bug.cgi?id=60924 ?
 Marcos is doing great work there.
 I'm not sure I can continue to mentor it - maybe we are doing good -
 but I don't know which modules do we need in gbuild.

Since with fdo#60924 gbuild knows about:

- which layer a lib belongs to (and thus: were in the install it should end up)
- which of the old gid_Module stuff a lib belongs to

we should able to populate instdir/ on a gid_Module by gid_Module basis. In the
long run, this should allow to conveniently build LibreOffice in parts.

Of course, the gid_Modules differ somewhat as distros patched and modified it
to their needs. We should find a decent default, but in the end distro will
patch the package split to their needs anyway. The important advantage with
having the module information in gbuild: one can shift a lib from one module to
another, without having to tweak and patch _both_ the build and the install.

Ideally, in the end IMHO one would be able to build and install parts of
LibreOffice as in make install_ure or make install_writer ...

Best,

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

Re: LO / Firebird DB Integration

2013-06-20 Thread Javier Fernandez

Hi,

On 20/06/13 16:40, Andrzej J. R. Hunt wrote:
Hi there,

On 15/06/13 20:03, Javier Fernandez wrote:
Nice work !!! We haven't been able to build Firebird inside libreoffice
at the beginning, so we movd to the system library instead. Perhaps you
could take that as reference for the installation details you mentioned.

BTW, I've tested your changes in the branch and this is what I get by
opening an already created ODB file configured for Firebird:

warn:cppuhelper:664:1:cppuhelper/source/shlib.cxx:501: loading component
library failed:
file://$HOME/libo.git/solver/unxlngx6/installation/opt/program/../program/libfirebird-sdbclo.so
terminate called after throwing an instance of
'com::sun::star::loader::CannotActivateFactoryException'
I've finally managed to figure out how to get the install working -- the
driver now loads fine. For the moment however the following is needed
for things to work:

FIREBIRD=./install/program/firebird
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):./install/program/firebird/lib
./install/program/soffice.bin --base

I'm not entirely sure how to provide these paths within LO to avoid
having to prepend them yet.

I think you can try to inspect how it was using the Firebird external
libraries, so you can figure out how to do it with internal builds. Try
to build the branch before your changes and see where the libraries are
installed. But Andres should know more about this, I'll ping him to know
his opinion.

I'm also not entirely certain everything will work as expected yet
either -- I haven't found a definitive list of files which Firebird 2.5
requires in embedded mode -- if anything is missing it can be however
easily be added to the bottom of firebird/ExternalPackage_firebird.mk.

Firebird embedded only requires the libfbembed.so library, just that.

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

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

 sc/qa/unit/ucalc.cxx |   26 --
 sc/source/core/data/column.cxx   |6 +++---
 sc/source/core/data/column3.cxx  |1 -
 sc/source/core/data/document.cxx |6 +++---
 4 files changed, 18 insertions(+), 21 deletions(-)

New commits:
commit e0a542d59c61d6a98225df0a6bc35c144de4b012
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jun 20 15:24:03 2013 -0400

Make sure to set the cloned formula cells dirty during undo / redo.

This fixes the last failed unit test from ucalc.

Change-Id: I37a79e444084397629cac77e2137377cd555a89c

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 76e5aa2..fa7c605 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -5844,14 +5844,12 @@ void Test::testCopyPaste()
 m_pDoc-SetRangeName(pGlobalRangeName);
 m_pDoc-SetRangeName(0, pLocalRangeName1);
 
-//add formula
+// Add formula to B1.
 OUString aFormulaString(=local1+global+SUM($C$1:$D$4));
 m_pDoc-SetString(1, 0, 0, aFormulaString);
 
-double aValue = 0;
-m_pDoc-GetValue(1, 0, 0, aValue);
-std::cout  Value:   aValue  std::endl;
-ASSERT_DOUBLES_EQUAL_MESSAGE(formula should return 8, aValue, 8);
+double fValue = m_pDoc-GetValue(ScAddress(1,0,0));
+ASSERT_DOUBLES_EQUAL_MESSAGE(formula should return 8, fValue, 8);
 
 //copy Sheet1.A1:C1 to Sheet2.A2:C2
 ScRange aRange(0,0,0,2,0,0);
@@ -5869,17 +5867,17 @@ void Test::testCopyPaste()
 aMarkData2.SetMarkArea(aRange);
 ScRefUndoData* pRefUndoData= new ScRefUndoData(m_pDoc);
 ScUndoPaste aUndo(
-m_xDocShRef, ScRange(0, 1, 1, 2, 1, 1), aMarkData2, pUndoDoc, NULL, 
IDF_ALL, pRefUndoData, false);
+m_xDocShRef, aRange, aMarkData2, pUndoDoc, NULL, IDF_ALL, 
pRefUndoData, false);
 m_pDoc-CopyFromClip(aRange, aMarkData2, nFlags, NULL, aClipDoc);
 
 //check values after copying
 OUString aString;
-m_pDoc-GetValue(1,1,1, aValue);
+fValue = m_pDoc-GetValue(ScAddress(1,1,1));
 m_pDoc-GetFormula(1,1,1, aString);
-ASSERT_DOUBLES_EQUAL_MESSAGE(copied formula should return 2, aValue, 2);
+ASSERT_DOUBLES_EQUAL_MESSAGE(copied formula should return 2, fValue, 2);
 CPPUNIT_ASSERT_MESSAGE(formula string was not copied correctly, aString 
== aFormulaString);
-m_pDoc-GetValue(0,1,1, aValue);
-CPPUNIT_ASSERT_MESSAGE(copied value should be 1, aValue == 1);
+fValue = m_pDoc-GetValue(ScAddress(0,1,1));
+CPPUNIT_ASSERT_MESSAGE(copied value should be 1, fValue == 1);
 
 //chack local range name after copying
 pLocal1 = m_pDoc-GetRangeName(1)-findByUpperName(OUString(LOCAL1));
@@ -5893,14 +5891,14 @@ void Test::testCopyPaste()
 
 //check undo and redo
 aUndo.Undo();
-m_pDoc-GetValue(1,1,1, aValue);
-ASSERT_DOUBLES_EQUAL_MESSAGE(after undo formula should return nothing, 
aValue, 0);
+fValue = m_pDoc-GetValue(ScAddress(1,1,1));
+ASSERT_DOUBLES_EQUAL_MESSAGE(after undo formula should return nothing, 
fValue, 0);
 aString = m_pDoc-GetString(2, 1, 1);
 CPPUNIT_ASSERT_MESSAGE(after undo string should be removed, 
aString.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM()));
 
 aUndo.Redo();
-m_pDoc-GetValue(1,1,1, aValue);
-ASSERT_DOUBLES_EQUAL_MESSAGE(formula should return 2 after redo, aValue, 
2);
+fValue = m_pDoc-GetValue(ScAddress(1,1,1));
+ASSERT_DOUBLES_EQUAL_MESSAGE(formula should return 2 after redo, fValue, 
2);
 aString = m_pDoc-GetString(2, 1, 1);
 CPPUNIT_ASSERT_MESSAGE(Cell Sheet2.C2 should contain: test, 
aString.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(test)));
 m_pDoc-GetFormula(1,1,1, aString);
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index a62b05c..c7ee06b 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1587,8 +1587,9 @@ class CopyByCloneHandler : public 
sc::CellBlockCloneHandler
 if (bForceFormula || bCloneFormula)
 {
 // Clone as formula cell.
-rPos.miCellPos = getDestCellStore().set(
-rPos.miCellPos, rDestPos.Row(), new ScFormulaCell(rSrcCell, 
getDestDoc(), rDestPos));
+ScFormulaCell* pCell = new ScFormulaCell(rSrcCell, getDestDoc(), 
rDestPos);
+pCell-SetDirtyVar();
+rPos.miCellPos = getDestCellStore().set(rPos.miCellPos, 
rDestPos.Row(), pCell);
 setDefaultAttrToDest(rPos, rDestPos.Row());
 
 return;
@@ -1773,7 +1774,6 @@ void ScColumn::CopyToColumn(
 pAttrArray-CopyArea( nRow1, nRow2, 0, *rColumn.pAttrArray);
 }
 
-
 if ((nFlags  IDF_CONTENTS) != 0)
 {
 boost::scoped_ptrsc::CellBlockCloneHandler pHdl(NULL);
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 6559ca3..d2eacdd 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -388,7 +388,6 @@ void ScColumn::CopyCellsInRangeToColumn(
 ;
 }
 
-
 if

Re: Limit - New Database feature

2013-06-20 Thread Zolnai Tamás

Hi Lionel,

I have already found a better solution. You might skip the mail in which I
wrote that I fixed the hsqldb bug directly.
The commit including this fix:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=05d738294025b4a26e7cc3c6180e10ff784555e2


Regards,
Tamás



2013/6/20 Lionel Elie Mamane lio...@mamane.lu

 On Mon, Jun 10, 2013 at 09:06:56PM +0200, Zolnai Tamás wrote:

  I found a driver property with name AppendTableAliasInSelect which
 seems
  to be responsible for appending alias. It is used only in generating
  statement in QueryDesignView.cxx, so I think it can be used wihtout any
  problem. I can't test whether it works yet, I'm compiling by now, but it
  seems to me it works as its name suggests. So if you don't have any
  objection to it or don't have a better solution than I solve the problem
 in
  this way.

 It seems like a good idea to just enable it unconditionally for
 embedded HSQLDB. Feel free to commit that / submit a patch (and CC me
 or add me as reviewer on Gerrit).

 It happens in
 connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu

 --
 Lionel

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

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

2013-06-20 Thread bugreporter99

I was rejected and blamed for even looking
 there
..,

But that is really off topic on this list

 That's really said when a person trys to help and gets rejected.
Also it's frustrating to have to report the SAME bugs to TWO different
bugtrackers.
Please guys, this is about open source software and people having fun
doing some coding/helping an open source project/s.
There have to be a way where the people of LO/AOO which are working on
the same topic (like svg) can code together and then allow to put the
code back to BOTH projects. (Instead of two people trying to fix the
same bug at the same time)

regards, a very said bugreporter
On 19.06.2013 at 7:43 PM, Bjoern Michaelsen  wrote:Hi Armin,

On Wed, Jun 19, 2013 at 06:20:55PM +0200, Armin Le Grand wrote:
 The last ime I did and asked if I could use the obvious single-line
 change (long time ago) I was rejected and blamed for even looking
 there, you know ;-)

You can -- obviously respecting the usual license. Its not like the
consenus on
the licensing choice in the LibreOffice project -- that served us so
excellent
-- is a secret somehow. But that is really off topic on this list,
which is
here for discussion of patches and technical progress.

Best,

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

Re: Limit - New Database feature

On Thu, Jun 20, 2013 at 09:23:13PM +0200, Zolnai Tamás wrote:

 I have already found a better solution. You might skip the mail in which I
 wrote that I fixed the hsqldb bug directly.
 The commit including this fix:
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=05d738294025b4a26e7cc3c6180e10ff784555e2


OK, great.

 2013/6/20 Lionel Elie Mamane lio...@mamane.lu
 
  On Mon, Jun 10, 2013 at 09:06:56PM +0200, Zolnai Tamás wrote:
 
   I found a driver property with name AppendTableAliasInSelect which
  seems
   to be responsible for appending alias. It is used only in generating
   statement in QueryDesignView.cxx, so I think it can be used wihtout any
   problem. I can't test whether it works yet, I'm compiling by now, but it
   seems to me it works as its name suggests. So if you don't have any
   objection to it or don't have a better solution than I solve the problem
  in
   this way.
 
  It seems like a good idea to just enable it unconditionally for
  embedded HSQLDB. Feel free to commit that / submit a patch (and CC me
  or add me as reviewer on Gerrit).
 
  It happens in
  connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu
 
  --
  Lionel
 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

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

-- 
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: [ANN] gerrit daily digest active, please add yourself to watched projects, gerrit firehose ends 2013-06-17 0000UTC

2013-06-20 Thread Mat M


Hi Bjoern



Le Wed, 19 Jun 2013 08:59:02 +0200, Bjoern Michaelsen  
bjoern.michael...@canonical.com a écrit:



Hi,

On Thu, Jun 13, 2013 at 04:39:01PM +0200, Bjoern Michaelsen wrote:
so the gerrit firehose will end on Monday 2013-06-17 UTC --  
plus/minus a

bit for me fumbling around with it.


this is done now.

Best,

Bjoern


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

Thank you :)

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

[Libreoffice-commits] core.git: 2 commits - configure.ac vcl/Library_vcl.mk

 configure.ac   |   33 +
 vcl/Library_vcl.mk |2 +-
 2 files changed, 26 insertions(+), 9 deletions(-)

New commits:
commit 585410476faca215122c96fdd4196ebf77a8df7d
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jun 20 22:30:07 2013 +0300

Link with IOKit framework instead of -lIOKit directly

Change-Id: I67753d191264b362bf540ae6df19e8df1ce9c716

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index c4f52de..ea35ffc 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -79,7 +79,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_add_libs,vcl,\
--lIOKit \
+-framework IOKit \
 -lobjc \
 ))
 endif
commit 31ad78737a727bbd1d072c311ff1ae68515aea8c
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jun 20 17:40:47 2013 +0300

Look for the 10.9 SDK, too

Change-Id: Iee70f531422fe6a312830dc9aa2d57e4f802953d

diff --git a/configure.ac b/configure.ac
index 75a2013..c7e6438 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2417,8 +2417,8 @@ if test $_os = Darwin; then
 BITNESS_OVERRIDE=64
 fi
 
-# If no --with-macosx-sdk option is given, look for 10.6, 10.7
-# and 10.8 SDKs, in that order. If not found in some (old)
+# If no --with-macosx-sdk option is given, look for 10.6, 10.7,
+# 10.8 and 10.9 SDKs, in that order. If not found in some (old)
 # default locations, try the xcode-select tool.
 
 # The intent is that for most Mac-based developers, a suitable
@@ -2429,8 +2429,8 @@ if test $_os = Darwin; then
 # addition to Xcode 4 in /Applications/Xcode.app, the 10.6 SDK
 # should be found.
 
-# For developers with a current Xcode 4 installed from the Mac App
-# Store, the 10.6, 10.7 or 10.8 SDK should be found.
+# For developers with a current Xcode, the lowest-numbered SDK
+# should be found.
 
 AC_MSG_CHECKING([what Mac OS X SDK to use])
 
@@ -2451,6 +2451,8 @@ if test $_os = Darwin; then
 with_macosx_sdk=10.7
 elif test -d 
$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk; then
 with_macosx_sdk=10.8
+elif test -d 
$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk; then
+with_macosx_sdk=10.9
 fi
 fi
 if test -z $with_macosx_sdk; then
@@ -2468,6 +2470,9 @@ if test $_os = Darwin; then
 10.8)
 MACOSX_SDK_VERSION=1080
 ;;
+10.9)
+MACOSX_SDK_VERSION=1090
+;;
 *)
 AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported value are 10.6--8])
 ;;
@@ -2475,7 +2480,7 @@ if test $_os = Darwin; then
 
 # Next find it (again, if we deduced its version above by finding
 # it... but we need to look for it once more in case
-# --with-macosx-sdk was given so that the aboce search did not
+# --with-macosx-sdk was given so that the above search did not
 # happen).
 if test -z $MACOSX_SDK_PATH; then
 case $with_macosx_sdk in
@@ -2493,7 +2498,7 @@ if test $_os = Darwin; then
 fi
 fi
 ;;
-10.7|10.8)
+10.7)
 if test -d /Developer/SDKs/MacOSX$with_macosx_sdk.sdk; then
 MACOSX_SDK_PATH=/Developer/SDKs/MacOSX$with_macosx_sdk.sdk
 elif test -x /usr/bin/xcode-select; then
@@ -2503,6 +2508,12 @@ if test $_os = Darwin; then
 fi
 fi
 ;;
+10.8|10.9)
+xcodepath=`xcode-select -print-path`
+if test -d 
$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk;
 then
+
MACOSX_SDK_PATH=$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk
+fi
+;;
 esac
 if test -z $MACOSX_SDK_PATH; then
 AC_MSG_ERROR([Could not figure out the location of Mac OS X 
$with_macosx_sdk SDK])
@@ -2531,8 +2542,11 @@ if test $_os = Darwin; then
 10.8)
 MAC_OS_X_VERSION_MIN_REQUIRED=1080
 ;;
+10.9)
+MAC_OS_X_VERSION_MIN_REQUIRED=1090
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported value are 
10.6--8])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported value are 
10.6--9])
 ;;
 esac
 
@@ -2570,7 +2584,7 @@ if test $_os = Darwin; then
 CXX=g++-4.2 $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH
 fi
 ;;
-10.7|10.8)
+10.7|10.8|10.9)
 if test $enable_libc__ = yes -a 
$with_macosx_version_min_required != 10.6; then
 # Use libc++ instead of libstdc++ when possible
 # and also compile as C++11
@@ -2603,6 +2617,9 @@ if

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

 sc/qa/unit/ucalc.cxx  |   61 +++---
 sc/source/core/data/cellvalue.cxx |2 +
 sc/source/core/data/dociter.cxx   |   33 +---
 3 files changed, 74 insertions(+), 22 deletions(-)

New commits:
commit 3b302335569a17e2f4a61d116f55af2b545b9cbc
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jun 20 20:45:21 2013 -0400

Turns out ScHorizontalIterator was still broken. Fix it for real.

And a unit test to accompany the fix.

Change-Id: I41e9451049d3c6ab7b3fd7904bcef3675979884c

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index fa7c605..a21592f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -53,6 +53,7 @@
 #include globstr.hrc
 #include tokenarray.hxx
 #include scopetools.hxx
+#include dociter.hxx
 
 #include formula/IFunctionDescription.hxx
 
@@ -121,6 +122,8 @@ public:
 void testSheetsFunc();
 void testVolatileFunc();
 
+void testHorizontalIterator();
+
 /**
  * Basic test for formula dependency tracking.
  */
@@ -286,6 +289,7 @@ public:
 CPPUNIT_TEST(testCopyToDocument);
 CPPUNIT_TEST(testSheetsFunc);
 CPPUNIT_TEST(testVolatileFunc);
+CPPUNIT_TEST(testHorizontalIterator);
 CPPUNIT_TEST(testFormulaDepTracking);
 CPPUNIT_TEST(testFormulaDepTracking2);
 CPPUNIT_TEST(testCellBroadcaster);
@@ -1714,6 +1718,53 @@ void Test::testVolatileFunc()
 m_pDoc-DeleteTab(0);
 }
 
+void Test::testHorizontalIterator()
+{
+m_pDoc-InsertTab(0, test);
+
+// Raw data
+const char* aData[][2] = {
+{ A, B },
+{ C, 1 },
+{ D, 2 },
+{ E, 3 }
+};
+
+ScAddress aPos(0,0,0);
+insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData));
+ScHorizontalCellIterator aIter(m_pDoc, 0, 0, 0, 1, SAL_N_ELEMENTS(aData));
+
+struct {
+SCCOL nCol;
+SCROW nRow;
+const char* pVal;
+} aChecks[] = {
+{ 0, 0, A },
+{ 1, 0, B },
+{ 0, 1, C },
+{ 1, 1, 1 },
+{ 0, 2, D },
+{ 1, 2, 2 },
+{ 0, 3, E },
+{ 1, 3, 3 },
+};
+
+SCCOL nCol;
+SCROW nRow;
+size_t i = 0, n = SAL_N_ELEMENTS(aChecks);
+for (ScRefCellValue* pCell = aIter.GetNext(nCol, nRow); pCell; pCell = 
aIter.GetNext(nCol, nRow), ++i)
+{
+if (i = n)
+CPPUNIT_FAIL(Iterator claims there is more data than there should 
be.);
+
+CPPUNIT_ASSERT_EQUAL(aChecks[i].nCol, nCol);
+CPPUNIT_ASSERT_EQUAL(aChecks[i].nRow, nRow);
+CPPUNIT_ASSERT_EQUAL(OUString::createFromAscii(aChecks[i].pVal), 
pCell-getString());
+}
+
+m_pDoc-DeleteTab(0);
+}
+
 void Test::testFormulaDepTracking()
 {
 CPPUNIT_ASSERT_MESSAGE (failed to insert sheet, m_pDoc-InsertTab (0, 
foo));
@@ -6715,13 +6766,9 @@ void Test::testAnchoredRotatedShape()
 ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *m_pDoc, 0);
 
 Rectangle aSnap = pObj-GetSnapRect();
-printf(expected height %ld actual %ld\n, aRotRect.GetHeight(), 
aSnap.GetHeight() );
 CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( 
aRotRect.GetHeight(), aSnap.GetHeight(), TOLERANCE ) );
-printf(expected width %ld actual %ld\n, aRotRect.GetWidth(), 
aSnap.GetWidth() );
 CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( 
aRotRect.GetWidth(), aSnap.GetWidth(), TOLERANCE ) );
-printf(expected left %ld actual %ld\n, aRotRect.Left(), aSnap.Left() 
);
 CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRotRect.Left(), 
aSnap.Left(), TOLERANCE ) );
-printf(expected right %ld actual %ld\n, aRotRect.Top(), aSnap.Top() 
);
 CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRotRect.Top(), 
aSnap.Top(), TOLERANCE ) );
 
 ScDrawObjData aAnchor;
@@ -6744,20 +6791,14 @@ void Test::testAnchoredRotatedShape()
 
 aSnap = pObj-GetSnapRect();
 
-printf(expected new height %ld actual %ld\n, aRotRect.GetHeight(), 
aSnap.GetHeight() );
 // ensure that width and height have been adjusted accordingly
 CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( 
aRotRect.GetHeight(), aSnap.GetHeight(), TOLERANCE ) );
-printf(expected new width %ld %ld\n, aRotRect.GetWidth(), 
aSnap.GetWidth() );
 CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( 
aRotRect.GetWidth(), aSnap.GetWidth(), TOLERANCE ) );
 
 // ensure that anchor start and end addresses haven't changed
-printf(expected startrow %ld actual %ld\n, 
(long)aAnchor.maStart.Row(), (long)pData-maStart.Row()  );
 CPPUNIT_ASSERT_EQUAL( aAnchor.maStart.Row(), pData-maStart.Row() ); 
// start row 0
-printf(expected startcol %ld actual %ld\n, 
(long)aAnchor.maStart.Col(), (long)pData-maStart.Col()  );
 CPPUNIT_ASSERT_EQUAL( aAnchor.maStart.Col(), pData-maStart.Col() ); 
// start column 5
-printf(expected endrow %ld actual %ld\n, (long)aAnchor.maEnd.Row(),

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