Missing extensions in build?

[Chris Sherlock]

Hi folks,

When I run make dev-install, I'm noticing the following:

Couldn't find '/home/chris/repos/LibreOffice/core/solver/
unxlngi6.pro/installation/opt/URE/bin': skipping
Couldn't find '/home/chris/repos/LibreOffice/core/solver/
unxlngi6.pro/installation/opt/share/extensions/presenter-screen': skipping
Couldn't find '/home/chris/repos/LibreOffice/core/solver/
unxlngi6.pro/installation/opt/share/extensions/nlpsolver': skipping
Couldn't find '/home/chris/repos/LibreOffice/core/solver/
unxlngi6.pro/installation/opt/share/extensions/pdf-import': skipping
Couldn't find '/home/chris/repos/LibreOffice/core/solver/
unxlngi6.pro/installation/opt/share/extensions/wiki-publisher': skipping

Any ideas what might be causing this?

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

[Libreoffice-commits] core.git: 3 commits - Makefile.in wizards/Pyuno_commonwizards.mk

[David Tardon]

 Makefile.in|2 +-
 wizards/Pyuno_commonwizards.mk |   29 ++---
 2 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 8c40d1e70fbbe5e8adf5ca7b234558da67733bf8
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 14 08:52:31 2013 +0200

sort the list

Change-Id: I93732470733e006b7965c922634cc4f9c1f86fd2

diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index ed35889..6dee945 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -29,42 +29,42 @@ $(eval $(call 
gb_Pyuno_Pyuno,commonwizards,$(SRCDIR)/wizards/com/sun/star/wizard
 
 $(eval $(call gb_Pyuno_add_files,commonwizards,wizards,\
 __init__.py \
-common/__init__.py \
 common/ConfigGroup.py \
+common/ConfigSet.py \
 common/Configuration.py \
+common/Desktop.py \
 common/FileAccess.py \
-common/Properties.py \
-common/Resource.py \
+common/HelpIds.py \
 common/NoValidPathException.py \
+common/NumberFormatter.py \
+common/Properties.py \
 common/PropertyNames.py \
+common/Resource.py \
 common/SystemDialog.py \
-common/ConfigSet.py \
-common/Desktop.py \
-common/HelpIds.py \
-common/NumberFormatter.py \
-text/TextElement.py \
-document/__init__.py \
+common/__init__.py \
 document/OfficeDocument.py \
-text/__init__.py \
+document/__init__.py \
 text/TextDocument.py \
+text/TextElement.py \
 text/TextFieldHandler.py \
 text/TextSectionHandler.py \
-ui/__init__.py \
+text/__init__.py \
 ui/ControlScroller.py \
+ui/DocumentPreview.py \
 ui/ImageList.py \
 ui/PathSelection.py \
-ui/UnoDialog.py \
-ui/DocumentPreview.py \
 ui/PeerConfig.py \
 ui/UIConsts.py \
+ui/UnoDialog.py \
 ui/UnoDialog2.py \
 ui/WizardDialog.py \
-ui/event/__init__.py \
+ui/__init__.py \
 ui/event/CommonListener.py \
 ui/event/DataAware.py \
 ui/event/ListModelBinder.py \
 ui/event/RadioDataAware.py \
 ui/event/UnoDataAware.py \
+ui/event/__init__.py \
 ))
 
 # vim:set noet sw=4 ts=4:
commit c7623be48628274300f23f9986725bf64cf792ac
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 14 08:51:55 2013 +0200

drop duplicate entry

Change-Id: I76cadd4c15dae8a352053c406839b7ec85c0e7e9

diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index ead94f2..ed35889 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_Pyuno_add_files,commonwizards,wizards,\
 ui/ControlScroller.py \
 ui/ImageList.py \
 ui/PathSelection.py \
-ui/UIConsts.py \
 ui/UnoDialog.py \
 ui/DocumentPreview.py \
 ui/PeerConfig.py \
commit 3d50cfa224a8ad3b062d0173d373f024a41781eb
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 14 08:18:27 2013 +0200

gbuild: ZipPackage is gone

Change-Id: I6652a0e9a04c21531ed5b6d60ade9cbccc91608c

diff --git a/Makefile.in b/Makefile.in
index 183f4ea..01a98d5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,7 +127,7 @@ gbuild_TARGETS := AllLangHelp \
UnpackedTarball \
WinResTarget \
Zip \
-   ZipPackage
+
 # build a generic gbuild target
 $(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach 
module,$(gbuild_modules),$(target)_$(module)/%)):
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Faisal M . Al-Otaibi]

 sw/source/core/docnode/ndtbl1.cxx |   48 --
 1 file changed, 26 insertions(+), 22 deletions(-)

New commits:
commit 327adac44129264f7bc0dab161afbb88ec3003d8
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Wed Apr 10 12:50:30 2013 +0300

more fix to fdo#62470

fix some problem appear when delete the right border.

Change-Id: I2bd1d69142bb0a920bdb58c833f8cbbb461a8350
Reviewed-on: https://gerrit.libreoffice.org/3305
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa

diff --git a/sw/source/core/docnode/ndtbl1.cxx 
b/sw/source/core/docnode/ndtbl1.cxx
index 9fa5d7e..3eb533b 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -696,33 +696,37 @@ void SwDoc::SetTabBorders( const SwCursor rCursor, const 
SfxItemSet rSet )
 {
 if( bLeftOver  bRightOver)
 {
-if ( bLeftOver ? bLeftValid : bVertValid )
-{
-aBox.SetLine( bLeftOver ? pLeft : 0,
-  BOX_LINE_RIGHT );
-bVertValid ? nType |= 0x0020 : nType |= 
0x0010;
-}
-if ( bRightOver ? bRightValid : bVertValid )
-{
-aBox.SetLine( bRightOver ? pRight : pVert,
-  BOX_LINE_LEFT );
-bVertValid ? nType |= 0x0008 : nType |= 
0x0004;
-}
+if ( bLeftValid )
+{
+aBox.SetLine( pLeft, BOX_LINE_RIGHT );
+nType |= 0x0010;
+}
+if ( bRightValid )
+{
+aBox.SetLine( pRight, BOX_LINE_LEFT );
+nType |= 0x0004;
+}
 }
 else
 {
-if ( bRightOver ? bLeftValid : bVertValid )
-{
-aBox.SetLine( bRightOver ? pLeft : 0,
-  BOX_LINE_RIGHT );
-bVertValid ? nType |= 0x0020 : nType |= 
0x0010;
-}
-if ( bLeftOver ? bRightValid : bVertValid )
+if ( bLeftValid )
+{
+aBox.SetLine( bRightOver ? pLeft : 0, 
BOX_LINE_RIGHT );
+bVertValid ? nType |= 0x0020 : nType |= 0x0010;
+}
+if ( bLeftOver )
+{
+if ( bRightValid )
 {
-aBox.SetLine( bLeftOver ? pRight : pVert,
-  BOX_LINE_LEFT );
-bVertValid ? nType |= 0x0008 : nType |= 
0x0004;
+aBox.SetLine( pRight, BOX_LINE_LEFT );
+nType |= 0x0004;
 }
+}
+else if ( bVertValid )
+{
+aBox.SetLine( pVert, BOX_LINE_LEFT );
+nType |= 0x0008;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] more fix to fdo#62470

[Ahmad Harthi (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3305

Approvals:
  Ahmad Harthi: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bd1d69142bb0a920bdb58c833f8cbbb461a8350
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa
Gerrit-Reviewer: Ahmad Harthi aalhar...@kacst.edu.sa

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

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

[Lionel Elie Mamane]

 svx/source/fmcomp/gridctrl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 31d81f87dd8f6aef1eceac4989e77a7cc6a1bc57
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sun Apr 14 09:37:00 2013 +0200

fdo#52179 on copy kb-shortcut, from *current* row, not last painted row (!)

Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 33a464e..aff76d1 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3394,7 +3394,7 @@ void DbGridControl::KeyInput( const KeyEvent rEvt )
 {
 size_t Location = GetModelColumnPos( nColId );
 DbGridColumn* pColumn = ( Location  m_aColumns.size() ) ? 
m_aColumns[ Location ] : NULL;
-OStringTransfer::CopyString( GetCurrentRowCellText( 
pColumn,m_xPaintRow ), this );
+OStringTransfer::CopyString( GetCurrentRowCellText( pColumn, 
m_xCurrentRow ), this );
 return;
 }
 }
commit 460ad501c8b640f52aef2fc0dd5034b41651a9f5
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sun Apr 14 08:58:18 2013 +0200

act if the row we act on is valid, not some other one

Change-Id: I8bcdff69bf19f5425eab86de5f99bd2a903fe267

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 7dac3c2..33a464e 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2703,7 +2703,7 @@ XubString 
DbGridControl::GetCurrentRowCellText(DbGridColumn* pColumn,const DbGri
 {
 // Ausgabe des Textes fuer eine Zelle
 XubString aText;
-if ( pColumn  IsValid(m_xPaintRow) )
+if ( pColumn  IsValid(_rRow) )
 aText = pColumn-GetCellText(_rRow, m_xFormatter);
 return aText;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] fdo#52179 on copy kb-shortcut, from *current* row, not last ...

[Lionel Elie Mamane (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3378

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3378/1

fdo#52179 on copy kb-shortcut, from *current* row, not last painted row (!)

Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae
---
M svx/source/fmcomp/gridctrl.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 9a40816..2663b8f 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3397,7 +3397,7 @@
 {
 size_t Location = GetModelColumnPos( nColId );
 DbGridColumn* pColumn = ( Location  m_aColumns.size() ) ? 
m_aColumns[ Location ] : NULL;
-OStringTransfer::CopyString( GetCurrentRowCellText( 
pColumn,m_xPaintRow ), this );
+OStringTransfer::CopyString( GetCurrentRowCellText( pColumn, 
m_xCurrentRow ), this );
 return;
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu

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

[PATCH libreoffice-3-6] fdo#52179 on copy kb-shortcut, from *current* row, not last ...

[Lionel Elie Mamane (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3379

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/3379/1

fdo#52179 on copy kb-shortcut, from *current* row, not last painted row (!)

Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae
---
M svx/source/fmcomp/gridctrl.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 13c8f3e..528881b 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3397,7 +3397,7 @@
 {
 size_t Location = GetModelColumnPos( nColId );
 DbGridColumn* pColumn = ( Location  m_aColumns.size() ) ? 
m_aColumns[ Location ] : NULL;
-OStringTransfer::CopyString( GetCurrentRowCellText( 
pColumn,m_xPaintRow ), this );
+OStringTransfer::CopyString( GetCurrentRowCellText( pColumn, 
m_xCurrentRow ), this );
 return;
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu

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

Re: Missing extensions in build?

[Andras Timar]

Hi,

On Sun, Apr 14, 2013 at 8:11 AM, Chris Sherlock
chris.sherloc...@gmail.com wrote:
 When I run make dev-install, I'm noticing the following:

 Couldn't find
 '/home/chris/repos/LibreOffice/core/solver/unxlngi6.pro/installation/opt/URE/bin':
 skipping
 Couldn't find
 '/home/chris/repos/LibreOffice/core/solver/unxlngi6.pro/installation/opt/share/extensions/presenter-screen':
 skipping
 Couldn't find
 '/home/chris/repos/LibreOffice/core/solver/unxlngi6.pro/installation/opt/share/extensions/nlpsolver':
 skipping
 Couldn't find
 '/home/chris/repos/LibreOffice/core/solver/unxlngi6.pro/installation/opt/share/extensions/pdf-import':
 skipping
 Couldn't find
 '/home/chris/repos/LibreOffice/core/solver/unxlngi6.pro/installation/opt/share/extensions/wiki-publisher':
 skipping

 Any ideas what might be causing this?

http://opengrok.libreoffice.org/xref/core/solenv/bin/linkoo#142
presenter-screen and pdfimport are not extensions any more, nlpsolver
and wiki-publisher are not built by default. I'm not sure about
URE/bin.

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

[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Package_cfgsrvbitmapunx.mk extras/Package_cfgsrvnolang.mk extras/Package_cfgusr.mk extras/Zip_cfgsrvbitmapunx.mk extras/Zip_cfgsrvnolang.

[Julien Nabet]

 extras/Module_extras.mk|   12 ++---
 extras/Package_cfgsrvbitmapunx.mk  |   19 
 extras/Package_cfgsrvnolang.mk |   81 +
 extras/Package_cfgusr.mk   |   18 
 extras/Zip_cfgsrvbitmapunx.mk  |   17 ---
 extras/Zip_cfgsrvnolang.mk |   79 
 extras/Zip_cfgusr.mk   |   16 ---
 scp2/source/ooo/file_extra_ooo.scp |   19 
 8 files changed, 134 insertions(+), 127 deletions(-)

New commits:
commit 712acdd7dbbaa94b299c1ae739d4081f2f057b27
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Apr 13 02:34:16 2013 +0200

fdo#63197, Convert Zip_cfgsrvbitmapunx, Zip_cfgsrvnolang and Zip_cfgusr

Change-Id: I11064116d44f4e45676553dd26a9fe75376d923f
Reviewed-on: https://gerrit.libreoffice.org/3368
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 6597afd..8df931c 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -14,18 +14,18 @@ $(eval $(call gb_Module_add_targets,extras,\
CustomTarget_autocorr \
CustomTarget_glade \
Package_autocorr \
+   Package_autotextuser \
+   Package_cfgsrvbitmapunx \
+   Package_cfgsrvnolang \
+   Package_cfgusr \
+   Package_database \
+   Package_databasebiblio \
Package_fonts \
Package_glade \
Package_labels \
Package_newfiles \
Package_palettes \
Package_wordbook \
-   Package_database \
-   Package_databasebiblio \
-   Package_autotextuser \
-   Zip_cfgsrvbitmapunx \
-   Zip_cfgsrvnolang \
-   Zip_cfgusr \
Zip_gallbullets \
Zip_gallhtmlexpo \
Zip_gallroot \
diff --git a/extras/Package_cfgsrvbitmapunx.mk 
b/extras/Package_cfgsrvbitmapunx.mk
new file mode 100644
index 000..1d61796
--- /dev/null
+++ b/extras/Package_cfgsrvbitmapunx.mk
@@ -0,0 +1,19 @@
+# -*- 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_Package_Package,extras_cfgsrvbitmapunx,$(SRCDIR)/extras/unx/source/bitmaps))
+
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,share/config,\
+   psetupl.xpm \
+   psetup.xpm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_cfgsrvnolang.mk b/extras/Package_cfgsrvnolang.mk
new file mode 100644
index 000..603a444
--- /dev/null
+++ b/extras/Package_cfgsrvnolang.mk
@@ -0,0 +1,81 @@
+# -*- 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_Package_Package,extras_cfgsrvnolang,$(SRCDIR)/extras/source/misc_config))
+
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,extras_cfgsrvnolang,share/config,\
+   wizard/form/styles/beige.css \
+   wizard/form/styles/bgr.css \
+   wizard/form/styles/dark.css \
+   wizard/form/styles/grey.css \
+   wizard/form/styles/ibg.css \
+   wizard/form/styles/ice.css \
+   wizard/form/styles/orange.css \
+   wizard/form/styles/red.css \
+   wizard/form/styles/violet.css \
+   wizard/form/styles/water.css \
+   wizard/web/images/calc.gif \
+   wizard/web/images/draw.gif \
+   wizard/web/images/fls.gif \
+   wizard/web/images/graphics.gif \
+   wizard/web/images/html.gif \
+   wizard/web/images/impress.gif \
+   wizard/web/images/media.gif \
+   wizard/web/images/other.gif \
+   wizard/web/images/pdf.gif \
+   wizard/web/images/writer.gif \
+   wizard/web/layouts/diagonal/index.html.xsl \
+   wizard/web/layouts/frame_bottom/index.html.xsl \
+   wizard/web/layouts/frame_bottom/mainframe.html \
+   wizard/web/layouts/frame_bottom/tocframe.html.xsl \
+   wizard/web/layouts/frame_left/index.html.xsl \
+   wizard/web/layouts/frame_left/mainframe.html \
+   wizard/web/layouts/frame_left/tocframe.html.xsl \
+   wizard/web/layouts/frame_right/index.html.xsl \
+   wizard/web/layouts/frame_right/mainframe.html \
+   wizard/web/layouts/frame_right/tocframe.html.xsl \
+   wizard/web/layouts/frame_top/index.html.xsl \
+   wizard/web/layouts/frame_top/mainframe.html \
+   wizard/web/layouts/frame_top/tocframe.html.xsl \
+   wizard/web/layouts/layoutF.xsl \
+   

[PUSHED] fdo#63197, Convert Zip_cfgsrvbitmapunx, Zip_cfgsrvnolang and...

[David Tardon (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3368

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11064116d44f4e45676553dd26a9fe75376d923f
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: David Tardon dtar...@redhat.com
Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr

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

2 Patches for libmspub

[Franz Schmid]

Hallo again,

here are two patches for improving libmspub

Greetings,
Franz Schmid
From c24205bf034a5f4759638f5c2c7d7e09823d32ab Mon Sep 17 00:00:00 2001
From: Franz Schmid fr...@linux-hp-i7.site
Date: Sun, 14 Apr 2013 10:51:31 +0200
Subject: [PATCH 2/3] Added output of the wrap path as an svg clip path.

---
 src/lib/EscherFieldIds.h   |1 +
 src/lib/MSPUBCollector.cpp |   18 +-
 src/lib/MSPUBCollector.h   |1 +
 src/lib/MSPUBParser.cpp|8 
 src/lib/PolygonUtils.cpp   |   25 +
 src/lib/PolygonUtils.h |1 +
 src/lib/ShapeInfo.h|3 ++-
 7 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/lib/EscherFieldIds.h b/src/lib/EscherFieldIds.h
index 7c7446e..7b3ff22 100644
--- a/src/lib/EscherFieldIds.h
+++ b/src/lib/EscherFieldIds.h
@@ -78,6 +78,7 @@
 #define FIELDID_GEO_BOTTOM 0x0143
 #define FIELDID_P_VERTICES 0xC145
 #define FIELDID_P_SEGMENTS 0xC146
+#define FIELDID_P_WRAPPOLYGONVERTICES  0xC383
 #define FIELDID_P_CONNECTION_SITES 0xC151
 #define FIELDID_P_ADJUST_HANDLES   0xC155
 #define FIELDID_P_GUIDES   0xC156
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 82b7cca..36f51ca 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -222,6 +222,11 @@ void libmspub::MSPUBCollector::setShapeCustomPath(unsigned seqNum,
   m_shapeInfosBySeqNum[seqNum].m_customShape = shape;
 }
 
+void libmspub::MSPUBCollector::setShapeClipPath(unsigned seqNum, const std::vectorlibmspub::Vertex clip)
+{
+  m_shapeInfosBySeqNum[seqNum].m_clipPath = clip;
+}
+
 void libmspub::MSPUBCollector::beginGroup()
 {
   ShapeGroupElement *tmp = new ShapeGroupElement(m_currentShapeGroup);
@@ -409,7 +414,18 @@ boost::functionvoid(void) libmspub::MSPUBCollector::paintShape(const ShapeInfo
(hasStroke  hasFill) || (hasStroke  hasText) || (hasFill  hasText);
   if (makeLayer)
   {
-m_painter-startLayer(WPXPropertyList());
+if (info.m_clipPath.size()  0)
+{
+  const Coordinate coord = info.m_coordinates.get_value_or(Coordinate());
+  double x, y, height, width;
+  x = coord.getXIn(m_width);
+  y = coord.getYIn(m_height);
+  height = coord.getHeightIn();
+  width = coord.getWidthIn();
+  m_painter-startLayer(calcClipPath(info.m_clipPath, x, y, height, width, foldedTransform, info.getCustomShape()));
+}
+else
+  m_painter-startLayer(WPXPropertyList());
   }
   graphicsProps.insert(draw:stroke, none);
   const Coordinate coord = info.m_coordinates.get_value_or(Coordinate());
diff --git a/src/lib/MSPUBCollector.h b/src/lib/MSPUBCollector.h
index 719eb1e..5755043 100644
--- a/src/lib/MSPUBCollector.h
+++ b/src/lib/MSPUBCollector.h
@@ -105,6 +105,7 @@ public:
   void setShapeCoordinatesRotated90(unsigned seqNum);
   void setShapeCustomPath(unsigned seqNum,
   const DynamicCustomShape shape);
+  void setShapeClipPath(unsigned seqNum, const std::vectorlibmspub::Vertex clip);
   void setShapeVerticalTextAlign(unsigned seqNum, VerticalAlign va);
   void designateMasterPage(unsigned seqNum);
   void setMasterPage(unsigned pageSeqNum, unsigned masterSeqNum);
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 21ade39..9050a1c 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -1767,6 +1767,13 @@ void libmspub::MSPUBParser::parseEscherShape(WPXInputStream *input, const Escher
 guideData, p_geoRight ? *p_geoRight : 21600,
 p_geoBottom ? *p_geoBottom : 21600));
   }
+  const std::vectorunsigned char wrapVertexData = foptValues.m_complexValues[FIELDID_P_WRAPPOLYGONVERTICES];
+  if (!wrapVertexData.empty())
+  {
+std::vectorlibmspub::Vertex ret = parseVertices(wrapVertexData);
+			m_collector-setShapeClipPath(*shapeSeqNum, ret);
+MSPUB_DEBUG_MSG((Current Escher shape has wrap Path\n));
+		  }
 }
 if (foundAnchor)
 {
@@ -2161,6 +2168,7 @@ libmspub::FOPTValues libmspub::MSPUBParser::extractFOPTValues(WPXInputStream *in
 unsigned short id = readU16(input);
 unsigned value  = readU32(input);
 ret.m_scalarValues[id] = value;
+MSPUB_DEBUG_MSG((EscherFopt ID %u  Value %u\n, id, value));
 bool complex = id  0x8000;
 if (complex)
 {
diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp
index 8fb4c7c..df72a16 100644
--- a/src/lib/PolygonUtils.cpp
+++ b/src/lib/PolygonUtils.cpp
@@ -5896,6 +5896,31 @@ void getRayEllipseIntersection(double initX, double initY, double rx, double ry,
   yOut += cy;
 }
 
+WPXPropertyList libmspub::calcClipPath(const std::vectorlibmspub::Vertex verts, double x, double y, double height, double width, VectorTransformation2D transform, boost::shared_ptrconst CustomShape shape)
+{
+  WPXPropertyList vertices;
+  Vector2D 

[PATCH] Calc: converted sort warning dialog to .ui

[Albert Thuswaldner (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3380

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3380/1

Calc: converted sort warning dialog to .ui

Change-Id: I2bc44990efb62183507f46b22bfd8e09edf02eb6
---
M sc/UIConfig_scalc.mk
M sc/inc/sc.hrc
M sc/inc/scabstdlg.hxx
M sc/source/ui/attrdlg/scdlgfact.cxx
M sc/source/ui/attrdlg/scdlgfact.hxx
M sc/source/ui/dbgui/sortdlg.cxx
M sc/source/ui/inc/sortdlg.hrc
M sc/source/ui/inc/sortdlg.hxx
M sc/source/ui/src/sortdlg.src
M sc/source/ui/view/cellsh2.cxx
A sc/uiconfig/scalc/ui/sortwarning.ui
11 files changed, 162 insertions(+), 94 deletions(-)



diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8f800bf..12196b1 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -73,6 +73,7 @@
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \
sc/uiconfig/scalc/ui/sortoptionspage \
+   sc/uiconfig/scalc/ui/sortwarning \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
 ))
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 4749970..3da7156 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1080,7 +1080,6 @@
 
 #define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145)
 #define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146)
-#define RID_SCDLG_SORT_WARNING  (SC_DIALOGS_START + 147)
 #define RID_SCDLG_TABPROTECTION (SC_DIALOGS_START + 148)
 #define RID_SCDLG_RETYPEPASS(SC_DIALOGS_START + 150)
 #define RID_SCDLG_RETYPEPASS_INPUT  (SC_DIALOGS_START + 151)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 89997d4..124843e 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -46,6 +46,7 @@
 class ScDPObject;
 struct ScPivotFuncData;
 struct ScDPNumGroupInfo;
+class ScSortWarningDlg;
 class ScTabViewShell;
 class ScConditionalFormat;
 class ScConditionalFormatList;
@@ -293,6 +294,10 @@
 virtual sal_uInt16  GetSelectEntryPos(sal_uInt16 nPos) const = 0;
 };
 
+class AbstractScSortWarningDlg : public VclAbstractDialog  //add for 
ScSortWarningDlg
+{
+};
+
 class AbstractScStringInputDlg :  public VclAbstractDialog  //add for 
ScStringInputDlg
 {
 public:
@@ -345,7 +350,8 @@
 const String   rStrLabel,
 int nId,
 sal_Bool
bColDefault = sal_True ) = 0;
-virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, 
const String rExtendText, const String rCurrentText, int nId ) = 0;  //add 
for ScSortWarningDlg
+
+virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, 
const String rExtendText, const String rCurrentText ) = 0; //add for 
ScSortWarningDlg
 
 virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* 
pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
 const 
ScAddress rPos, int nId ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 98b656f..ab73973 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -109,6 +109,7 @@
 IMPL_ABSTDLG_BASE(AbstractScDPShowDetailDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScSortWarningDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
@@ -729,23 +730,10 @@
 return 0;
 }
 
-
-
-VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( 
Window* pParent, const String rExtendText,
-  
const String rCurrentText, int nId )
+AbstractScSortWarningDlg* 
ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const 
String rExtendText, const String rCurrentText )
 {
-Dialog * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_SORT_WARNING:
-pDlg = new ScSortWarningDlg( pParent, rExtendText, rCurrentText );
-break;
-default:
-break;
-}
-if( pDlg )
-return new ScVclAbstractDialog_Impl( pDlg );
-return 0;
+ScSortWarningDlg* pDlg = new ScSortWarningDlg(pParent, rExtendText, 
rCurrentText );
+return new AbstractScSortWarningDlg_Impl( pDlg );
 }
 
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 3383616..cf239e8 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -47,6 +47,7 @@
 class ScDPNumGroupDlg;
 class ScDPDateGroupDlg;
 class ScDPShowDetailDlg;
+class ScSortWarningDlg;
 class ScNewScenarioDlg;
 class ScShowTabDlg;
 class ScStringInputDlg;
@@ -343,6 

[PATCH] WIP: date/time IDL datatypes incompatible change

[Lionel Elie Mamane (via Code Review)]

Hello LibreOffice gerrit bot, Eike Rathke,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/2783

to look at the new patch set (#12).

Change subject: WIP: date/time IDL datatypes incompatible change
..

WIP: date/time IDL datatypes incompatible change

Done:
 - nanosecond precision
 - signed (allowed negative) year

TODO: timezone

Also: assorted improvements / bugfixes in date/time handling code.
Some factorisation of copy/pasted code.

Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6
---
M basic/source/runtime/methods.cxx
M comphelper/source/misc/anycompare.cxx
M comphelper/source/misc/types.cxx
M connectivity/inc/connectivity/dbconversion.hxx
M connectivity/source/commontools/FValue.cxx
M connectivity/source/commontools/dbconversion.cxx
M connectivity/source/drivers/calc/CTable.cxx
M connectivity/source/drivers/dbase/DTable.cxx
M connectivity/source/drivers/file/FDateFunctions.cxx
M connectivity/source/drivers/jdbc/ConnectionLog.cxx
M connectivity/source/drivers/kab/KResultSet.cxx
M connectivity/source/drivers/macab/macabutilities.hxx
M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
M connectivity/source/drivers/odbcbase/OResultSet.cxx
M connectivity/source/drivers/postgresql/pq_tools.cxx
M connectivity/source/inc/odbc/OTools.hxx
M editeng/source/items/flditem.cxx
M editeng/source/uno/unofield.cxx
M extensions/source/logging/csvformatter.cxx
M extensions/source/logging/logrecord.cxx
M extensions/source/logging/plaintextformatter.cxx
M extensions/source/propctrlr/formcomponenthandler.cxx
M extensions/source/propctrlr/standardcontrol.cxx
M filter/source/msfilter/svdfppt.cxx
M forms/qa/integration/forms/TimeValidator.java
M forms/source/component/Time.cxx
M forms/source/xforms/convert.cxx
M forms/source/xforms/datatypes.cxx
M framework/source/jobs/jobdata.cxx
M odk/examples/DevelopersGuide/Forms/TimeValidator.java
M offapi/com/sun/star/util/Date.idl
M offapi/com/sun/star/util/DateTime.idl
M offapi/com/sun/star/util/DateTimeRange.idl
M offapi/com/sun/star/util/Duration.idl
M offapi/com/sun/star/util/Time.idl
M offapi/type_reference/types.rdb
M oox/source/core/xmlfilterbase.cxx
M oox/source/dump/dumperbase.cxx
M oox/source/ppt/comments.cxx
M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
M reportbuilder/java/org/libreoffice/report/SDBCReportData.java
M reportdesign/source/filter/xml/xmlControlProperty.cxx
M sax/qa/cppunit/test_converter.cxx
M sax/source/tools/converter.cxx
M sc/inc/chgtrack.hxx
M sc/source/core/data/dbdocutl.cxx
M sc/source/core/data/dpobject.cxx
M sc/source/core/tool/chgtrack.cxx
M sc/source/core/tool/chgviset.cxx
M sc/source/core/tool/interpr2.cxx
M sc/source/filter/html/htmlexp.cxx
M sc/source/filter/oox/unitconverter.cxx
M sc/source/filter/xcl97/XclExpChangeTrack.cxx
M sc/source/filter/xcl97/XclImpChangeTrack.cxx
M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
M sc/source/filter/xml/XMLConverter.cxx
M sc/source/ui/docshell/docsh3.cxx
M sc/source/ui/miscdlgs/sharedocdlg.cxx
M sc/source/ui/unoobj/fielduno.cxx
M sc/source/ui/view/viewfun6.cxx
M scripting/source/pyprov/pythonscript.py
M sd/source/filter/eppt/eppt.cxx
M sd/source/filter/eppt/pptx-epptooxml.cxx
M sd/source/ui/annotations/annotationmanager.cxx
M sd/source/ui/dlg/animobjs.cxx
M sfx2/qa/complex/sfx2/DocumentProperties.java
M sfx2/source/appl/sfxpicklist.cxx
M sfx2/source/bastyp/frmhtmlw.cxx
M sfx2/source/bastyp/helper.cxx
M sfx2/source/dialog/dinfdlg.cxx
M sfx2/source/dialog/versdlg.cxx
M sfx2/source/doc/SfxDocumentMetaData.cxx
M sfx2/source/doc/objcont.cxx
M sfx2/source/doc/oleprops.cxx
M sfx2/source/view/viewprn.cxx
M svl/source/items/dateitem.cxx
M svl/source/misc/fstathelper.cxx
M svtools/source/contnr/DocumentInfoPreview.cxx
M svtools/source/contnr/contentenumeration.cxx
M svtools/source/misc/templatefoldercache.cxx
M svtools/source/svhtml/parhtml.cxx
M svtools/source/table/cellvalueconversion.cxx
M svx/source/fmcomp/gridcell.cxx
M sw/source/core/doc/doccomp.cxx
M sw/source/core/doc/docglbl.cxx
M sw/source/core/doc/docredln.cxx
M sw/source/core/fields/docufld.cxx
M sw/source/core/fields/flddat.cxx
M sw/source/core/unocore/swunohelper.cxx
M sw/source/core/unocore/unoredline.cxx
M sw/source/filter/ww8/wrtww8.cxx
M sw/source/filter/ww8/ww8par.cxx
M sw/source/filter/xml/XMLRedlineImportHelper.cxx
M tools/Library_tl.mk
M tools/inc/tools/datetime.hxx
M tools/inc/tools/time.hxx
M tools/source/datetime/datetime.cxx
M tools/source/datetime/ttime.cxx
M tools/source/inet/inetmsg.cxx
M tools/source/rc/rc.cxx
M ucb/source/sorter/sortresult.cxx
M ucb/source/ucp/cmis/cmis_content.cxx
M ucb/source/ucp/file/shell.cxx
M ucb/source/ucp/ftp/ftpdirp.cxx
M ucb/source/ucp/ftp/ftpdirp.hxx
M unotools/inc/unotools/datetime.hxx
M unotools/source/i18n/localedatawrapper.cxx
M unotools/source/misc/datetime.cxx
M unotools/source/ucbhelper/ucbhelper.cxx

buildbot: please schedule gerrit#c2783

[Lionel Elie Mamane]

Hi,

I brought https://gerrit.libreoffice.org/2783/ up to the state where
it compiles (for me, on Debian GNU/Linux), and it starts to look like
in a state where I could commit it.

Since it touches a *lot* of code (and also Windows-only code, that is
thus wholly untested now), please schedule a buildbot run. Thanks.

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

Re: [Libreoffice-qa] Master daily builds for Windows are broken

[Pedro]

Petr Mladek wrote
 Pedro píše v St 10. 04. 2013 v 02:20 -0700:
 The last successful build is from April 8th at 5 AM.

Just in case nobody noticed, tinderbox #6 hasn't managed to have success
since April 8th and tinderbox #16 started reporting success as of today but
no binaries were created.

Tinderbox #7 using MinGW hasn't been able to succeed since April 3rd.



--
View this message in context: 
http://nabble.documentfoundation.org/Re-Libreoffice-qa-Master-daily-builds-for-Windows-are-broken-tp4049365p4049833.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Converted Insert - Link to External data widget.

[Abdulelah Alarifi (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3381

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3381/1

Converted Insert - Link to External data widget.

Change-Id: Ife2f49853a9974010d6247ae40df9b534d044c12
---
A sc/uiconfig/scalc/ui/externaldata.ui
1 file changed, 293 insertions(+), 0 deletions(-)



diff --git a/sc/uiconfig/scalc/ui/externaldata.ui 
b/sc/uiconfig/scalc/ui/externaldata.ui
new file mode 100644
index 000..4673442
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/externaldata.ui
@@ -0,0 +1,293 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=externaldata
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesExternal Data/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property name=spacing2/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area1
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=ok
+property name=labelgtk-ok/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=help
+property name=labelgtk-help/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+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=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/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=box2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing6/property
+child
+  object class=GtkBox id=box3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=spacing6/property
+child
+  object class=GtkComboBox id=combobox1
+property name=visibleTrue/property
+  

[Libreoffice-commits] core.git: android/experimental

[David Tardon]

 android/experimental/DocumentLoader/Makefile  |2 +-
 android/experimental/LibreOffice4Android/Makefile |2 +-
 android/experimental/desktop/Makefile |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1c0e3ea7a0f02251b6a1876ba2eec7ed5cd83246
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 14 15:00:05 2013 +0200

fix android build

Change-Id: I97903559e1f6ef48476a74a674c0832d9cb44640

diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index 9336ba5..123042f 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -102,7 +102,7 @@ copy-stuff:
 # vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
 # set to the app's data dir above.
mkdir -p assets/gz.unpack/user/fonts
-   for F in $(OUTDIR)/pck/Liberation*.ttf $(OUTDIR)/pck/Gen*.ttf 
$(OUTDIR)/pck/opens___.ttf; do \
+   for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf 
$(INSTDIR)/share/fonts/truetype/Gen*.ttf 
$(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
gzip -9 $$F assets/gz.unpack/user/fonts/`basename $$F`; \
done
 #
diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index 4e63b69..598cc6a 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -100,7 +100,7 @@ copy-stuff:
 # vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
 # set to the app's data dir above.
mkdir -p assets/gz.unpack/user/fonts
-   for F in $(OUTDIR)/pck/Liberation*.ttf $(OUTDIR)/pck/Gen*.ttf 
$(OUTDIR)/pck/opens___.ttf; do \
+   for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf 
$(INSTDIR)/share/fonts/truetype/Gen*.ttf 
$(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
gzip -9 $$F assets/gz.unpack/user/fonts/`basename $$F`; \
done
 #
diff --git a/android/experimental/desktop/Makefile 
b/android/experimental/desktop/Makefile
index f63abc0..86935f3 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -103,7 +103,7 @@ copy-stuff:
 # vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
 # set to the app's data dir above.
mkdir -p assets/gz.unpack/user/fonts
-   for F in $(OUTDIR)/pck/Liberation*.ttf $(OUTDIR)/pck/Gen*.ttf 
$(OUTDIR)/pck/opens___.ttf; do \
+   for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf 
$(INSTDIR)/share/fonts/truetype/Gen*.ttf 
$(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
gzip -9 $$F assets/gz.unpack/user/fonts/`basename $$F`; \
done
 #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#63197: Convert list below:

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3382

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3382/1

fdo#63197: Convert list below:

Zip_gallbullets, Zip_gallhtmlexpo, Zip_gallroot, Zip_gallsound
Zip_gallsounds, Zip_gallsystem, Zip_gallwwwback, Zip_gallwwwgraf

Change-Id: Ic326d83ad69968a4871518065277e863eb8815a8
---
M extras/Module_extras.mk
R extras/Package_gallbullets.mk
R extras/Package_gallhtmlexpo.mk
R extras/Package_gallroot.mk
R extras/Package_gallsound.mk
R extras/Package_gallsounds.mk
R extras/Package_gallsystem.mk
R extras/Package_gallwwwback.mk
R extras/Package_gallwwwgraf.mk
M scp2/source/ooo/file_extra_ooo.scp
10 files changed, 71 insertions(+), 48 deletions(-)



diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 8df931c..348b62d 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -21,19 +21,19 @@
Package_database \
Package_databasebiblio \
Package_fonts \
+   Package_gallbullets \
+   Package_gallhtmlexpo \
+   Package_gallroot \
+   Package_gallsound \
+   Package_gallsounds \
+   Package_gallsystem \
+   Package_gallwwwback \
+   Package_gallwwwgraf \
Package_glade \
Package_labels \
Package_newfiles \
Package_palettes \
Package_wordbook \
-   Zip_gallbullets \
-   Zip_gallhtmlexpo \
-   Zip_gallroot \
-   Zip_gallsound \
-   Zip_gallsounds \
-   Zip_gallsystem \
-   Zip_gallwwwback \
-   Zip_gallwwwgraf \
Zip_tpllayoutimpr \
Zip_tplwizagenda \
Zip_tplwizbitmap \
diff --git a/extras/Zip_gallbullets.mk b/extras/Package_gallbullets.mk
similarity index 84%
rename from extras/Zip_gallbullets.mk
rename to extras/Package_gallbullets.mk
index 81fcc75..c5d903f 100644
--- a/extras/Zip_gallbullets.mk
+++ b/extras/Package_gallbullets.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,gallbullets,$(SRCDIR)/extras/source/gallery/bullets))
+$(eval $(call 
gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets))
 
-$(eval $(call gb_Zip_add_files,gallbullets,\
+$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallbullets,share/gallery/bullets,\
blkpearl.gif \
bluarrow.gif \
bluball.gif \
diff --git a/extras/Zip_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk
similarity index 81%
rename from extras/Zip_gallhtmlexpo.mk
rename to extras/Package_gallhtmlexpo.mk
index ad2ff41..f0531c5 100644
--- a/extras/Zip_gallhtmlexpo.mk
+++ b/extras/Package_gallhtmlexpo.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call 
gb_Zip_Zip,gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo))
+$(eval $(call 
gb_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo))
 
-$(eval $(call gb_Zip_add_files,gallhtmlexpo,\
+$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallhtmlexpo,share/gallery/htmlexpo,\
bludown.gif \
blufirs_.gif \
blufirs.gif \
diff --git a/extras/Zip_gallroot.mk b/extras/Package_gallroot.mk
similarity index 66%
rename from extras/Zip_gallroot.mk
rename to extras/Package_gallroot.mk
index c5f21bf..cb1ae1b 100644
--- a/extras/Zip_gallroot.mk
+++ b/extras/Package_gallroot.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,gallroot,$(SRCDIR)/extras/source/gallery))
+$(eval $(call 
gb_Package_Package,extras_gallroot,$(SRCDIR)/extras/source/gallery))
 
-$(eval $(call gb_Zip_add_files,gallroot,\
+$(eval $(call gb_Package_set_outdir,extras_gallroot,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallroot,share/gallery,\
apples.gif \
bigapple.gif \
flower.gif \
diff --git a/extras/Zip_gallsound.mk b/extras/Package_gallsound.mk
similarity index 63%
rename from extras/Zip_gallsound.mk
rename to extras/Package_gallsound.mk
index 0129923..b535eda 100644
--- a/extras/Zip_gallsound.mk
+++ b/extras/Package_gallsound.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call 
gb_Zip_Zip,gallsound,$(SRCDIR)/extras/source/gallery/gallery_sound))
+$(eval $(call 
gb_Package_Package,extras_gallsound,$(SRCDIR)/extras/source/gallery/gallery_sound))
 
-$(eval $(call gb_Zip_add_files,gallsound,\
+$(eval $(call gb_Package_set_outdir,extras_gallsound,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallsound,presets/gallery,\
sg100.sdv \
sg100.thm \
sg30.sdv \
diff --git a/extras/Zip_gallsounds.mk b/extras/Package_gallsounds.mk
similarity index 77%
rename from extras/Zip_gallsounds.mk
rename to extras/Package_gallsounds.mk
index 3021c79..94799ed 100644
--- 

Re: buildbot: please schedule gerrit#c2783

[David Ostrovsky]

On Sun, 2013-04-14 at 13:21 +0200, Lionel Elie Mamane wrote:
 Hi,
 
 I brought https://gerrit.libreoffice.org/2783/ up to the state where
 it compiles (for me, on Debian GNU/Linux), and it starts to look like
 in a state where I could commit it.
 
 Since it touches a *lot* of code (and also Windows-only code, that is
 thus wholly untested now), please schedule a buildbot run. Thanks.
 
done

davido@linux-ucwl:~$ ssh logerrit buildbot show -p core 
--
Task-Id   Start/EndType/State   RefBot
Branch
f01a01b23 Apr-14 14:05 Change   refs/changes/83/2783/12 -
master
f01a01b23_WINDOWS -Job: INITrefs/changes/83/2783/12 -
master
f01a01b23_LINUX   -Job: INITrefs/changes/83/2783/12 -
master
f01a01b23_MAC -Job: INITrefs/changes/83/2783/12 -
master
--
  4 task(s)


David

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

Re: [PATCH] WIP: date/time IDL datatypes incompatible change

[Lionel Elie Mamane]

On Sun, Apr 14, 2013 at 02:22:54PM +0200, Thomas Arnhold wrote:

 are those OUString(buf.getStr()) necessary? I think it's working as
 it was before :)

 See sax/qa/cppunit/test_converter.cxx (afaik it's only in this file):

 -SAL_INFO(sax.cppunit,  buf.getStr());
 +SAL_INFO(sax.cppunit,  OUString(buf.getStr()));

Err... Indeed. Not sure why I changed that, I suppose there must have
been a reason.

I've changed it back.

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

[PATCH] WIP: date/time IDL datatypes incompatible change

[Lionel Elie Mamane (via Code Review)]

Hello LibreOffice gerrit bot, Eike Rathke,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/2783

to look at the new patch set (#13).

Change subject: WIP: date/time IDL datatypes incompatible change
..

WIP: date/time IDL datatypes incompatible change

Done:
 - nanosecond precision
 - signed (allowed negative) year

TODO: timezone

Also: assorted improvements / bugfixes in date/time handling code.
Some factorisation of copy/pasted code.

Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6
---
M basic/source/runtime/methods.cxx
M comphelper/source/misc/anycompare.cxx
M comphelper/source/misc/types.cxx
M connectivity/inc/connectivity/dbconversion.hxx
M connectivity/source/commontools/FValue.cxx
M connectivity/source/commontools/dbconversion.cxx
M connectivity/source/drivers/calc/CTable.cxx
M connectivity/source/drivers/dbase/DTable.cxx
M connectivity/source/drivers/file/FDateFunctions.cxx
M connectivity/source/drivers/jdbc/ConnectionLog.cxx
M connectivity/source/drivers/kab/KResultSet.cxx
M connectivity/source/drivers/macab/macabutilities.hxx
M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
M connectivity/source/drivers/odbcbase/OResultSet.cxx
M connectivity/source/drivers/postgresql/pq_tools.cxx
M connectivity/source/inc/odbc/OTools.hxx
M editeng/source/items/flditem.cxx
M editeng/source/uno/unofield.cxx
M extensions/source/logging/csvformatter.cxx
M extensions/source/logging/logrecord.cxx
M extensions/source/logging/plaintextformatter.cxx
M extensions/source/propctrlr/formcomponenthandler.cxx
M extensions/source/propctrlr/standardcontrol.cxx
M filter/source/msfilter/svdfppt.cxx
M forms/qa/integration/forms/TimeValidator.java
M forms/source/component/Time.cxx
M forms/source/xforms/convert.cxx
M forms/source/xforms/datatypes.cxx
M framework/source/jobs/jobdata.cxx
M odk/examples/DevelopersGuide/Forms/TimeValidator.java
M offapi/com/sun/star/util/Date.idl
M offapi/com/sun/star/util/DateTime.idl
M offapi/com/sun/star/util/DateTimeRange.idl
M offapi/com/sun/star/util/Duration.idl
M offapi/com/sun/star/util/Time.idl
M offapi/type_reference/types.rdb
M oox/source/core/xmlfilterbase.cxx
M oox/source/dump/dumperbase.cxx
M oox/source/ppt/comments.cxx
M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
M reportbuilder/java/org/libreoffice/report/SDBCReportData.java
M reportdesign/source/filter/xml/xmlControlProperty.cxx
M sax/qa/cppunit/test_converter.cxx
M sax/source/tools/converter.cxx
M sc/inc/chgtrack.hxx
M sc/source/core/data/dbdocutl.cxx
M sc/source/core/data/dpobject.cxx
M sc/source/core/tool/chgtrack.cxx
M sc/source/core/tool/chgviset.cxx
M sc/source/core/tool/interpr2.cxx
M sc/source/filter/html/htmlexp.cxx
M sc/source/filter/oox/unitconverter.cxx
M sc/source/filter/xcl97/XclExpChangeTrack.cxx
M sc/source/filter/xcl97/XclImpChangeTrack.cxx
M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
M sc/source/filter/xml/XMLConverter.cxx
M sc/source/ui/docshell/docsh3.cxx
M sc/source/ui/miscdlgs/sharedocdlg.cxx
M sc/source/ui/unoobj/fielduno.cxx
M sc/source/ui/view/viewfun6.cxx
M scripting/source/pyprov/pythonscript.py
M sd/source/filter/eppt/eppt.cxx
M sd/source/filter/eppt/pptx-epptooxml.cxx
M sd/source/ui/annotations/annotationmanager.cxx
M sd/source/ui/dlg/animobjs.cxx
M sfx2/qa/complex/sfx2/DocumentProperties.java
M sfx2/source/appl/sfxpicklist.cxx
M sfx2/source/bastyp/frmhtmlw.cxx
M sfx2/source/bastyp/helper.cxx
M sfx2/source/dialog/dinfdlg.cxx
M sfx2/source/dialog/versdlg.cxx
M sfx2/source/doc/SfxDocumentMetaData.cxx
M sfx2/source/doc/objcont.cxx
M sfx2/source/doc/oleprops.cxx
M sfx2/source/view/viewprn.cxx
M svl/source/items/dateitem.cxx
M svl/source/misc/fstathelper.cxx
M svtools/source/contnr/DocumentInfoPreview.cxx
M svtools/source/contnr/contentenumeration.cxx
M svtools/source/misc/templatefoldercache.cxx
M svtools/source/svhtml/parhtml.cxx
M svtools/source/table/cellvalueconversion.cxx
M svx/source/fmcomp/gridcell.cxx
M sw/source/core/doc/doccomp.cxx
M sw/source/core/doc/docglbl.cxx
M sw/source/core/doc/docredln.cxx
M sw/source/core/fields/docufld.cxx
M sw/source/core/fields/flddat.cxx
M sw/source/core/unocore/swunohelper.cxx
M sw/source/core/unocore/unoredline.cxx
M sw/source/filter/ww8/wrtww8.cxx
M sw/source/filter/ww8/ww8par.cxx
M sw/source/filter/xml/XMLRedlineImportHelper.cxx
M tools/Library_tl.mk
M tools/inc/tools/datetime.hxx
M tools/inc/tools/time.hxx
M tools/source/datetime/datetime.cxx
M tools/source/datetime/ttime.cxx
M tools/source/inet/inetmsg.cxx
M tools/source/rc/rc.cxx
M ucb/source/sorter/sortresult.cxx
M ucb/source/ucp/cmis/cmis_content.cxx
M ucb/source/ucp/file/shell.cxx
M ucb/source/ucp/ftp/ftpdirp.cxx
M ucb/source/ucp/ftp/ftpdirp.hxx
M unotools/inc/unotools/datetime.hxx
M unotools/source/i18n/localedatawrapper.cxx
M unotools/source/misc/datetime.cxx
M unotools/source/ucbhelper/ucbhelper.cxx

MAC TB build failed weirdly

[Lionel Elie Mamane]

On Sun, Apr 14, 2013 at 02:12:27PM +, LibreOffice gerrit bot (via Code 
Review) wrote:
 LibreOffice gerrit bot has posted comments on this change.

 Build f01a01b23 on MAC by TB tb21 at Apr-14 14:12 
 https://ci.libreoffice.org/job/buildbot/484 : FAILED

The error looks like:

make[1]: execvp: touch: Bad file descriptor
make[1]: *** 
[/Users/n_th/lo/core_gerrit/workdir/unxmacxi.pro/UnoApiHeadersTarget/offapi/normal/com/sun/star/text/XTextCursor.hpp]
Error 127
make[1]: *** Deleting file 
`/Users/n_th/lo/core_gerrit/workdir/unxmacxi.pro/UnoApiHeadersTarget/offapi/normal/com/sun/star/text/XTextCursor.hpp'

Which looks might weird and most probably a tinderbox issue :)

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

[Libreoffice-commits] core.git: bin/module-deps.pl

[Peter Foley]

 bin/module-deps.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cd809a1e4397af66f2e418532c368a7ec7a8c1b1
Author: Peter Foley pefol...@verizon.net
Date:   Sun Apr 14 10:24:46 2013 -0400

fix weird Circular Dep messages

Change-Id: Ib8e442740a421d3ed86202813e97aa0239fb2299

diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index 2742600..acf072a 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -33,7 +33,7 @@ sub read_deps()
 if (defined $from_file) {
 open ($p, $from_file) || die can't read deps from cache file: $!;
 } else {
-open ($p, ENABLE_PRINT_DEPS=1 $gnumake -q -f $makefile_build all|) 
|| die can't launch make: $!;
+open ($p, ENABLE_PRINT_DEPS=1 $gnumake -qrf $makefile_build|) || die 
can't launch make: $!;
 }
 $|=1;
 print STDERR reading deps ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 solenv/gbuild/Package.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 611d4163ef53142dc2a5604d8bb953173d2d6978
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 14 16:20:54 2013 +0200

gbuild: add arg. check to Package functions

Change-Id: I07cfa78b254fe0993bbfcd86a58346af5daf1664

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 0c5f0ff..5c40e60 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -111,6 +111,7 @@ gb_Package_OUTDIR_$(1) := $(2)
 endef
 
 define gb_Package_add_file
+$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_file requires 3 
arguments))
 $(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
 $(call gb_Package_get_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
 $(call gb_Package_get_clean_target,$(1)) : FILES += 
$$(gb_Package_OUTDIR_$(1))/$(2)
@@ -127,6 +128,7 @@ endef
 # $(eval $(call gb_Package_add_files,foo_inc,inc/foo,foo/bar/foo.hxx))
 # # - inc/foo/foo.hxx
 define gb_Package_add_files
+$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_files requires 3 
arguments))
 $(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(notdir 
$(file)),$(file)))
 
 endef
@@ -140,6 +142,7 @@ endef
 # $(eval $(call gb_Package_add_files,foo_inc,inc,foo/bar/foo.hxx))
 # # - inc/foo/bar/foo.hxx
 define gb_Package_add_files_with_dir
+$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_files_with_dir 
requires 3 arguments))
 $(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(file),$(file)))
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

review for 4.0.3 deadline? [PATCH] fdo#63391 deadlock on opening .odb file that auto-connects t...

[Lionel Elie Mamane]

On Wed, Apr 10, 2013 at 05:06:08PM +, Lionel Elie Mamane (via Code Review) 
wrote:

 I have submitted a patch for review:

 https://gerrit.libreoffice.org/3310

 fdo#63391 deadlock on opening .odb file that auto-connects to the database

If I could get some feedback on this before we freeze/branch 4.0.3, it
would help me decide whether to try to get it in 4.0.3 (or
not)... Thanks in advance!

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

[Libreoffice-commits] core.git: helpcontent2

[Andras Timar]

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

New commits:
commit 3078ef476cb5d68654a1e1687fdcd5a622f1e68f
Author: Andras Timar ati...@suse.com
Date:   Sun Apr 14 16:35:48 2013 +0200

Updated core
Project: help  8958c6b2dfdb38a7ef0a9415ab0f302cf19171df

diff --git a/helpcontent2 b/helpcontent2
index f25d6a1..8958c6b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f25d6a1081dd929a8872fcd9305b5f06355d3337
+Subproject commit 8958c6b2dfdb38a7ef0a9415ab0f302cf19171df
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 source/text/shared/00/0004.xhp |   17 
 source/text/shared/01/0102.xhp |   39 +++--
 source/text/shared/01/0107.xhp |   27 -
 3 files changed, 34 insertions(+), 49 deletions(-)

New commits:
commit 8958c6b2dfdb38a7ef0a9415ab0f302cf19171df
Author: Andras Timar ati...@suse.com
Date:   Sun Apr 14 16:35:48 2013 +0200

fdo#52318: update help of LibreOffice Open/Save as dialog

Change-Id: Ieb420daefe2d72b323b51686d4892e94953dd3b4

diff --git a/source/text/shared/00/0004.xhp 
b/source/text/shared/00/0004.xhp
index e4464a4..1ea328e 100644
--- a/source/text/shared/00/0004.xhp
+++ b/source/text/shared/00/0004.xhp
@@ -334,22 +334,7 @@
/image/paragraph
 /tablecell
 tablecell colspan= rowspan=
-paragraph role=paragraph id=par_id3153005 xml-lang=en-US l10n=U 
oldref=40Create New Directory/paragraph
-/tablecell
-/tablerow
-/table
-
-/section
-section id=systandardverzeichnis2
-table id=tbl_id3156357
-tablerow
-tablecell colspan= rowspan=
-paragraph role=paragraph id=par_id3146990 xml-lang=en-US l10n=E
-image id=img_id3147257 src=fpicker/res/fp011.png width=0.222inch 
height=0.222inchalt id=alt_id3147257 xml-lang=en-USIcon/alt
-   /image/paragraph
-/tablecell
-tablecell colspan= rowspan=
-paragraph role=paragraph id=par_id3153949 xml-lang=en-US l10n=U 
oldref=41Default Directory/paragraph
+paragraph role=paragraph id=par_id3153005 xml-lang=en-US l10n=U 
oldref=40Create New Folder/paragraph
 /tablecell
 /tablerow
 /table
diff --git a/source/text/shared/01/0102.xhp 
b/source/text/shared/01/0102.xhp
index 3d7671c..c40528c 100644
--- a/source/text/shared/01/0102.xhp
+++ b/source/text/shared/01/0102.xhp
@@ -30,7 +30,6 @@
 bookmark xml-lang=en-US branch=index 
id=bm_id3145211bookmark_valuedirectories; creating new/bookmark_value
   bookmark_valuefolder creation/bookmark_value
   bookmark_valueMy Documents folder; opening/bookmark_value
-  bookmark_valuedefault directories/bookmark_value
   bookmark_valuemultiple documents; opening/bookmark_value
   bookmark_valueopening; several files/bookmark_value
   bookmark_valueselecting; several files/bookmark_value
@@ -50,31 +49,25 @@
 section id=howtoget
 embed href=text/shared/00/0401.xhp#oeffnen/
 /section
-paragraph role=paragraph id=par_id3149877 xml-lang=en-US l10n=U 
oldref=109The following sections describe the item 
type=productname%PRODUCTNAME/itememphOpen/emph dialog box. To activate 
the item type=productname%PRODUCTNAME/itememphOpen/emph and 
emphSave/emph dialog boxes, choose emphswitchinline 
select=syscaseinline select=MAC%PRODUCTNAME - 
Preferences/caseinlinedefaultinlineTools - 
Options/defaultinline/switchinline - link 
href=text/shared/optionen/01010600.xhp name=%PRODUCTNAME - 
General%PRODUCTNAME- General/link/emph, and then select the emphUse 
%PRODUCTNAME dialogs/emph in the emphOpen/Save dialogs/emph 
area./paragraph
+paragraph role=paragraph id=par_id3149877 xml-lang=en-US l10n=U 
oldref=109The following sections describe the item 
type=productname%PRODUCTNAME/item emphOpen/emph dialog box. To 
activate the item type=productname%PRODUCTNAME/item emphOpen/emph and 
emphSave/emph dialog boxes, choose emphswitchinline 
select=syscaseinline select=MAC%PRODUCTNAME - 
Preferences/caseinlinedefaultinlineTools - 
Options/defaultinline/switchinline - link 
href=text/shared/optionen/01010600.xhp name=%PRODUCTNAME - 
General%PRODUCTNAME- General/link/emph, and then select the emphUse 
%PRODUCTNAME dialogs/emph in the emphOpen/Save dialogs/emph 
area./paragraph
 paragraph role=note id=par_id3150713 xml-lang=en-US l10n=U 
oldref=52If the file that you want to open contains Styles, link 
href=text/shared/01/0102.xhp#vorlagen name=special rulesspecial 
rules/link apply./paragraph
 !-- removed HID SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP 
--
+embed href=text/shared/01/0107.xhp#connecttoserver/
 bookmark xml-lang=en-US 
branch=hid/fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP 
id=bm_id1104770 localize=false/
 paragraph xml-lang=en-US id=hd_id3147250 role=heading level=2 l10n=U
  oldref=11Up One Level/paragraph
-  paragraph xml-lang=en-US id=par_id3147226 role=paragraph 
l10n=CHG oldref=12ahelp 
hid=SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UPMove up one 
directory in the directory hierarchy. Long-click to see the higher level 
directories./ahelpcommentUFI: it is still a long-click/comment/paragraph
+  paragraph xml-lang=en-US id=par_id3147226 role=paragraph 
l10n=CHG oldref=12ahelp 
hid=SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UPMove up one 
folder in the folder hierarchy. Long-click to see the higher level 
folders./ahelpcommentUFI: it is still a long-click/comment/paragraph
   embed href=text/shared/00/0004.xhp#syuebergeordneterordner2/
 !-- removed HID 

[Libreoffice-commits] core.git: scp2/inc

[Thomas Arnhold]

 scp2/inc/macros.inc |   12 
 1 file changed, 12 deletions(-)

New commits:
commit 6fb3c3872c626efe740c850d9e89447a1d7ca053
Author: Thomas Arnhold tho...@arnhold.org
Date:   Sat Apr 13 15:01:14 2013 +0200

remove unused macros

Change-Id: I0b0a73e8c9d6c5fb760c2278e58b87f08e881ce4

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index ad9f264..7ae0b4e 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -30,9 +30,6 @@
 #define REG_VALUE_LNG(id) \
 ALL_LANG(Value,STR_REG_VAL_##id);
 
-#define ALL_LANG_STR_VALUE_LNG(ident) \
-ALL_LANG(Value,STR_VALUE_##ident)
-
 #ifdef UNX
 #ifdef MACOSX
 #define UNXSUFFIX .dylib
@@ -374,15 +371,6 @@ End
 #define SCP2_URE_DL_UNO_VER(n, v) n v .dll
 #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) .dll
 #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
-#if defined _MSC_VER
-#if defined _DEBUG_RUNTIME
-#define SCP2_STDLP_DEBUG d
-#else
-#define SCP2_STDLP_DEBUG 
-#endif
-#else // GCC
-#define SCP2_STDLP_DEBUG 
-#endif
 #else
 #define SCP2_URE_DL_DIR gid_Dir_Ure_Lib
 #define SCP2_URE_DL_NORMAL(n) lib n STRING(UNXSUFFIX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] WIP: date/time IDL datatypes incompatible change

[Lionel Elie Mamane (via Code Review)]

Hello LibreOffice gerrit bot, Eike Rathke,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/2783

to look at the new patch set (#14).

Change subject: WIP: date/time IDL datatypes incompatible change
..

WIP: date/time IDL datatypes incompatible change

Done:
 - nanosecond precision
 - signed (allowed negative) year

TODO: timezone

Also: assorted improvements / bugfixes in date/time handling code.
Some factorisation of copy/pasted code.

Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6
---
M basic/source/runtime/methods.cxx
M comphelper/source/misc/anycompare.cxx
M comphelper/source/misc/types.cxx
M connectivity/inc/connectivity/dbconversion.hxx
M connectivity/source/commontools/FValue.cxx
M connectivity/source/commontools/dbconversion.cxx
M connectivity/source/drivers/calc/CTable.cxx
M connectivity/source/drivers/dbase/DTable.cxx
M connectivity/source/drivers/file/FDateFunctions.cxx
M connectivity/source/drivers/jdbc/ConnectionLog.cxx
M connectivity/source/drivers/kab/KResultSet.cxx
M connectivity/source/drivers/macab/macabutilities.hxx
M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
M connectivity/source/drivers/odbcbase/OResultSet.cxx
M connectivity/source/drivers/postgresql/pq_tools.cxx
M connectivity/source/inc/odbc/OTools.hxx
M editeng/source/items/flditem.cxx
M editeng/source/uno/unofield.cxx
M extensions/source/logging/csvformatter.cxx
M extensions/source/logging/logrecord.cxx
M extensions/source/logging/plaintextformatter.cxx
M extensions/source/propctrlr/formcomponenthandler.cxx
M extensions/source/propctrlr/standardcontrol.cxx
M filter/source/msfilter/svdfppt.cxx
M forms/qa/integration/forms/TimeValidator.java
M forms/source/component/Time.cxx
M forms/source/xforms/convert.cxx
M forms/source/xforms/datatypes.cxx
M framework/source/jobs/jobdata.cxx
M odk/examples/DevelopersGuide/Forms/TimeValidator.java
M offapi/com/sun/star/util/Date.idl
M offapi/com/sun/star/util/DateTime.idl
M offapi/com/sun/star/util/DateTimeRange.idl
M offapi/com/sun/star/util/Duration.idl
M offapi/com/sun/star/util/Time.idl
M offapi/type_reference/types.rdb
M oox/source/core/xmlfilterbase.cxx
M oox/source/dump/dumperbase.cxx
M oox/source/ppt/comments.cxx
M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
M reportbuilder/java/org/libreoffice/report/SDBCReportData.java
M reportdesign/source/filter/xml/xmlControlProperty.cxx
M sax/qa/cppunit/test_converter.cxx
M sax/source/tools/converter.cxx
M sc/inc/chgtrack.hxx
M sc/source/core/data/dbdocutl.cxx
M sc/source/core/data/dpobject.cxx
M sc/source/core/tool/chgtrack.cxx
M sc/source/core/tool/chgviset.cxx
M sc/source/core/tool/interpr2.cxx
M sc/source/filter/html/htmlexp.cxx
M sc/source/filter/oox/unitconverter.cxx
M sc/source/filter/xcl97/XclExpChangeTrack.cxx
M sc/source/filter/xcl97/XclImpChangeTrack.cxx
M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
M sc/source/filter/xml/XMLConverter.cxx
M sc/source/ui/docshell/docsh3.cxx
M sc/source/ui/miscdlgs/sharedocdlg.cxx
M sc/source/ui/unoobj/fielduno.cxx
M sc/source/ui/view/viewfun6.cxx
M scripting/source/pyprov/pythonscript.py
M sd/source/filter/eppt/eppt.cxx
M sd/source/filter/eppt/pptx-epptooxml.cxx
M sd/source/ui/annotations/annotationmanager.cxx
M sd/source/ui/dlg/animobjs.cxx
M sfx2/qa/complex/sfx2/DocumentProperties.java
M sfx2/source/appl/sfxpicklist.cxx
M sfx2/source/bastyp/frmhtmlw.cxx
M sfx2/source/bastyp/helper.cxx
M sfx2/source/dialog/dinfdlg.cxx
M sfx2/source/dialog/versdlg.cxx
M sfx2/source/doc/SfxDocumentMetaData.cxx
M sfx2/source/doc/objcont.cxx
M sfx2/source/doc/oleprops.cxx
M sfx2/source/view/viewprn.cxx
M svl/source/items/dateitem.cxx
M svl/source/misc/fstathelper.cxx
M svtools/source/contnr/DocumentInfoPreview.cxx
M svtools/source/contnr/contentenumeration.cxx
M svtools/source/misc/templatefoldercache.cxx
M svtools/source/svhtml/parhtml.cxx
M svtools/source/table/cellvalueconversion.cxx
M svx/source/fmcomp/gridcell.cxx
M sw/source/core/doc/doccomp.cxx
M sw/source/core/doc/docglbl.cxx
M sw/source/core/doc/docredln.cxx
M sw/source/core/fields/docufld.cxx
M sw/source/core/fields/flddat.cxx
M sw/source/core/unocore/swunohelper.cxx
M sw/source/core/unocore/unoredline.cxx
M sw/source/filter/ww8/wrtww8.cxx
M sw/source/filter/ww8/ww8par.cxx
M sw/source/filter/xml/XMLRedlineImportHelper.cxx
M tools/Library_tl.mk
M tools/inc/tools/datetime.hxx
M tools/inc/tools/time.hxx
M tools/source/datetime/datetime.cxx
M tools/source/datetime/ttime.cxx
M tools/source/inet/inetmsg.cxx
M tools/source/rc/rc.cxx
M ucb/source/sorter/sortresult.cxx
M ucb/source/ucp/cmis/cmis_content.cxx
M ucb/source/ucp/file/shell.cxx
M ucb/source/ucp/ftp/ftpdirp.cxx
M ucb/source/ucp/ftp/ftpdirp.hxx
M unotools/inc/unotools/datetime.hxx
M unotools/source/i18n/localedatawrapper.cxx
M unotools/source/misc/datetime.cxx
M unotools/source/ucbhelper/ucbhelper.cxx

[PATCH] WIP: date/time IDL datatypes incompatible change

[Lionel Elie Mamane (via Code Review)]

Hello LibreOffice gerrit bot, Eike Rathke,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/2783

to look at the new patch set (#15).

Change subject: WIP: date/time IDL datatypes incompatible change
..

WIP: date/time IDL datatypes incompatible change

Done:
 - nanosecond precision
 - signed (allowed negative) year

TODO: timezone

Also: assorted improvements / bugfixes in date/time handling code.
Some factorisation of copy/pasted code.

Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6
---
M basic/source/runtime/methods.cxx
M comphelper/source/misc/anycompare.cxx
M comphelper/source/misc/types.cxx
M connectivity/inc/connectivity/dbconversion.hxx
M connectivity/source/commontools/FValue.cxx
M connectivity/source/commontools/dbconversion.cxx
M connectivity/source/drivers/calc/CTable.cxx
M connectivity/source/drivers/dbase/DTable.cxx
M connectivity/source/drivers/file/FDateFunctions.cxx
M connectivity/source/drivers/jdbc/ConnectionLog.cxx
M connectivity/source/drivers/kab/KResultSet.cxx
M connectivity/source/drivers/macab/macabutilities.hxx
M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
M connectivity/source/drivers/odbcbase/OResultSet.cxx
M connectivity/source/drivers/postgresql/pq_tools.cxx
M connectivity/source/inc/odbc/OTools.hxx
M editeng/source/items/flditem.cxx
M editeng/source/uno/unofield.cxx
M extensions/source/logging/csvformatter.cxx
M extensions/source/logging/logrecord.cxx
M extensions/source/logging/plaintextformatter.cxx
M extensions/source/propctrlr/formcomponenthandler.cxx
M extensions/source/propctrlr/standardcontrol.cxx
M filter/source/msfilter/svdfppt.cxx
M forms/qa/integration/forms/TimeValidator.java
M forms/source/component/Time.cxx
M forms/source/xforms/convert.cxx
M forms/source/xforms/datatypes.cxx
M framework/source/jobs/jobdata.cxx
M odk/examples/DevelopersGuide/Forms/TimeValidator.java
M offapi/com/sun/star/util/Date.idl
M offapi/com/sun/star/util/DateTime.idl
M offapi/com/sun/star/util/DateTimeRange.idl
M offapi/com/sun/star/util/Duration.idl
M offapi/com/sun/star/util/Time.idl
M offapi/type_reference/types.rdb
M oox/source/core/xmlfilterbase.cxx
M oox/source/dump/dumperbase.cxx
M oox/source/ppt/comments.cxx
M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
M reportbuilder/java/org/libreoffice/report/SDBCReportData.java
M reportdesign/source/filter/xml/xmlControlProperty.cxx
M sax/qa/cppunit/test_converter.cxx
M sax/source/tools/converter.cxx
M sc/inc/chgtrack.hxx
M sc/source/core/data/dbdocutl.cxx
M sc/source/core/data/dpobject.cxx
M sc/source/core/tool/chgtrack.cxx
M sc/source/core/tool/chgviset.cxx
M sc/source/core/tool/interpr2.cxx
M sc/source/filter/html/htmlexp.cxx
M sc/source/filter/oox/unitconverter.cxx
M sc/source/filter/xcl97/XclExpChangeTrack.cxx
M sc/source/filter/xcl97/XclImpChangeTrack.cxx
M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
M sc/source/filter/xml/XMLConverter.cxx
M sc/source/ui/docshell/docsh3.cxx
M sc/source/ui/miscdlgs/sharedocdlg.cxx
M sc/source/ui/unoobj/fielduno.cxx
M sc/source/ui/view/viewfun6.cxx
M scripting/source/pyprov/pythonscript.py
M sd/source/filter/eppt/eppt.cxx
M sd/source/filter/eppt/pptx-epptooxml.cxx
M sd/source/ui/annotations/annotationmanager.cxx
M sd/source/ui/dlg/animobjs.cxx
M sfx2/qa/complex/sfx2/DocumentProperties.java
M sfx2/source/appl/sfxpicklist.cxx
M sfx2/source/bastyp/frmhtmlw.cxx
M sfx2/source/bastyp/helper.cxx
M sfx2/source/dialog/dinfdlg.cxx
M sfx2/source/dialog/versdlg.cxx
M sfx2/source/doc/SfxDocumentMetaData.cxx
M sfx2/source/doc/objcont.cxx
M sfx2/source/doc/oleprops.cxx
M sfx2/source/view/viewprn.cxx
M svl/source/items/dateitem.cxx
M svl/source/misc/fstathelper.cxx
M svtools/source/contnr/DocumentInfoPreview.cxx
M svtools/source/contnr/contentenumeration.cxx
M svtools/source/misc/templatefoldercache.cxx
M svtools/source/svhtml/parhtml.cxx
M svtools/source/table/cellvalueconversion.cxx
M svx/source/fmcomp/gridcell.cxx
M sw/source/core/doc/doccomp.cxx
M sw/source/core/doc/docglbl.cxx
M sw/source/core/doc/docredln.cxx
M sw/source/core/fields/docufld.cxx
M sw/source/core/fields/flddat.cxx
M sw/source/core/unocore/swunohelper.cxx
M sw/source/core/unocore/unoredline.cxx
M sw/source/filter/ww8/wrtww8.cxx
M sw/source/filter/ww8/ww8par.cxx
M sw/source/filter/xml/XMLRedlineImportHelper.cxx
M tools/Library_tl.mk
M tools/inc/tools/datetime.hxx
M tools/inc/tools/time.hxx
M tools/source/datetime/datetime.cxx
M tools/source/datetime/ttime.cxx
M tools/source/inet/inetmsg.cxx
M tools/source/rc/rc.cxx
M ucb/source/sorter/sortresult.cxx
M ucb/source/ucp/cmis/cmis_content.cxx
M ucb/source/ucp/file/shell.cxx
M ucb/source/ucp/ftp/ftpdirp.cxx
M ucb/source/ucp/ftp/ftpdirp.hxx
M unotools/inc/unotools/datetime.hxx
M unotools/source/i18n/localedatawrapper.cxx
M unotools/source/misc/datetime.cxx
M unotools/source/ucbhelper/ucbhelper.cxx

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

[David Tardon]

 solenv/gbuild/Package.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1591194a5fc45cbd44c0f4cb022d8ff8c88e0a24
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 14 17:04:50 2013 +0200

gb_Package_add_files _can_ take empty list of files

Change-Id: I5cc555de3f9b329b7bea6ea31b1689c2033a0904

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 5c40e60..e2306fe 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -128,7 +128,7 @@ endef
 # $(eval $(call gb_Package_add_files,foo_inc,inc/foo,foo/bar/foo.hxx))
 # # - inc/foo/foo.hxx
 define gb_Package_add_files
-$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_files requires 3 
arguments))
+$(if $(strip $(3)),,$(if $(filter 1,$(words $(2))),,$(call 
gb_Output_error,gb_Package_add_files: it looks like either pkg name or dest. 
dir is missing)))
 $(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(notdir 
$(file)),$(file)))
 
 endef
@@ -142,7 +142,7 @@ endef
 # $(eval $(call gb_Package_add_files,foo_inc,inc,foo/bar/foo.hxx))
 # # - inc/foo/bar/foo.hxx
 define gb_Package_add_files_with_dir
-$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_files_with_dir 
requires 3 arguments))
+$(if $(strip $(3)),,$(if $(filter 1,$(words $(2))),,$(call 
gb_Output_error,gb_Package_add_files: it looks like either pkg name or dest. 
dir is missing)))
 $(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(file),$(file)))
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jian Hong Cheng]

 svgio/inc/svgio/svgreader/svgnode.hxx|8 +
 svgio/inc/svgio/svgreader/svgstyleattributes.hxx |   32 +--
 svgio/source/svgreader/svgcirclenode.cxx |4 
 svgio/source/svgreader/svgellipsenode.cxx|6 -
 svgio/source/svgreader/svggnode.cxx  |6 -
 svgio/source/svgreader/svgimagenode.cxx  |6 -
 svgio/source/svgreader/svglinenode.cxx   |6 -
 svgio/source/svgreader/svgmarkernode.cxx |6 -
 svgio/source/svgreader/svgnode.cxx   |  100 ++-
 svgio/source/svgreader/svgpathnode.cxx   |6 -
 svgio/source/svgreader/svgpatternnode.cxx|6 -
 svgio/source/svgreader/svgpolynode.cxx   |8 -
 svgio/source/svgreader/svgrectnode.cxx   |6 -
 svgio/source/svgreader/svgstyleattributes.cxx|   88 ++--
 svgio/source/svgreader/svgtextnode.cxx   |6 -
 svgio/source/svgreader/svgusenode.cxx|6 -
 sw/source/filter/ww8/wrtww8.cxx  |   42 ++---
 sw/source/filter/ww8/ww8atr.cxx  |3 
 sw/source/filter/ww8/ww8par2.cxx |2 
 sw/source/filter/ww8/ww8par2.hxx |1 
 sw/source/filter/ww8/ww8par6.cxx |7 +
 21 files changed, 224 insertions(+), 131 deletions(-)

New commits:
commit 0efd28738af121097dcc186dab85dd65c88a0b7b
Author: Jian Hong Cheng chen...@apache.org
Date:   Mon Jul 9 07:32:12 2012 +

Fix issue #i120140: After doc file saved by AOO, one more section is created

* sw/source/filter/ww8/wrtww8.cxx
* sw/source/filter/ww8/ww8atr.cxx
MS Word Binary Interoperability

Patch by: Lin Yuan,yuanlin@gmail.com
Found by: Yan Ji,yanji...@gmail.com
Review by: Jian Hong Cheng,chen...@apache.org
Conflicts:
sw/source/filter/ww8/wrtww8.cxx

Change-Id: If32bcced32b671f026ec8c32dd21684eb9e7b1fe

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index e997d61..a62370f 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2539,20 +2539,39 @@ void MSWordExportBase::WriteText()
 ;
 else if ( !IsInTable() ) //No sections in table
 {
-ReplaceCr( (char)0xc ); // indicator for Page/Section-Break
+//#120140# Do not need to insert a page/section break after a 
section end. Check this case first
+sal_Bool bNeedExportBreakHere = sal_True;
+if ( aIdx.GetNode().IsTxtNode() )
+{
+SwTxtNode *pTempNext = aIdx.GetNode().GetTxtNode();
+if ( pTempNext )
+{
+const SfxPoolItem * pTempItem = NULL;
+if (pTempNext-GetpSwAttrSet()  SFX_ITEM_SET == 
pTempNext-GetpSwAttrSet()-GetItemState(RES_PAGEDESC, false, pTempItem)
+ pTempItem  
((SwFmtPageDesc*)pTempItem)-GetRegisteredIn())
+{
+//Next node has a new page style which means this 
node is a section end. Do not insert another page/section break here
+bNeedExportBreakHere = sal_False;
+}
+}
+}
+if (bNeedExportBreakHere)  //#120140# End of check
+{
+ReplaceCr( (char)0xc ); // indicator for Page/Section-Break
 
-const SwSectionFmt* pParentFmt = rSect.GetFmt()-GetParent();
-if ( !pParentFmt )
-pParentFmt = (SwSectionFmt*)0x;
+const SwSectionFmt* pParentFmt = 
rSect.GetFmt()-GetParent();
+if ( !pParentFmt )
+pParentFmt = (SwSectionFmt*)0x;
 
-sal_uLong nRstLnNum;
-if ( aIdx.GetNode().IsCntntNode() )
-nRstLnNum = ((SwCntntNode)aIdx.GetNode()).GetSwAttrSet().
-GetLineNumber().GetStartValue();
-else
-nRstLnNum = 0;
+sal_uLong nRstLnNum;
+if ( aIdx.GetNode().IsCntntNode() )
+nRstLnNum = 
((SwCntntNode)aIdx.GetNode()).GetSwAttrSet().
+
GetLineNumber().GetStartValue();
+else
+nRstLnNum = 0;
 
-AppendSection( pAktPageDesc, pParentFmt, nRstLnNum );
+AppendSection( pAktPageDesc, pParentFmt, nRstLnNum );
+}
 }
 }
 else if ( pNd-IsStartNode() )
@@ -2723,7 +2742,6 @@ void WW8Export::WriteFkpPlcUsw()
  the existence of an ObjectPool dir is necessary for triggering
  some magic. cmc
 */
-/* Similiarly having msvbasic storage seems to also trigger 

Re: MAC TB build failed weirdly

[Tor Lillqvist]

 make[1]: execvp: touch: Bad file descriptor

I have seen this too in (interactive) Mac builds. Most likely number
of open files exceeded or something similar. Reducing parallelism
might help.

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 37/446076e684a0d0de448366ab927531e3b54bba

[Xisco Fauli]

 37/446076e684a0d0de448366ab927531e3b54bba |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ff97fecfc0d6c6fad7d3111d94b3ba814419e05e
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 14 17:56:41 2013 +0200

Notes added by 'git notes add'

diff --git a/37/446076e684a0d0de448366ab927531e3b54bba 
b/37/446076e684a0d0de448366ab927531e3b54bba
new file mode 100644
index 000..08bcce5
--- /dev/null
+++ b/37/446076e684a0d0de448366ab927531e3b54bba
@@ -0,0 +1 @@
+merged as: f75ca1fdad1094fbea4bb6cb0e3cc9458700c470
___
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' - 0e/895f45df5c23fd8e714ba7e73fba463a97452d

[Xisco Fauli]

 0e/895f45df5c23fd8e714ba7e73fba463a97452d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b9dc14806b92b1614017b4d4f632b1acb3acf8e4
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 14 17:58:11 2013 +0200

Notes added by 'git notes add'

diff --git a/0e/895f45df5c23fd8e714ba7e73fba463a97452d 
b/0e/895f45df5c23fd8e714ba7e73fba463a97452d
new file mode 100644
index 000..8d08b00
--- /dev/null
+++ b/0e/895f45df5c23fd8e714ba7e73fba463a97452d
@@ -0,0 +1 @@
+merged as: bc589d57f083279b6d619904b937fae706ece493
___
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' - e2/9639ac11dae30edb3cd1265b8cd945dbdf0536

[Xisco Fauli]

 e2/9639ac11dae30edb3cd1265b8cd945dbdf0536 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b5d6fa2340b37ad8d22ba84eaa8d86282e91269a
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 14 18:00:33 2013 +0200

Notes added by 'git notes add'

diff --git a/e2/9639ac11dae30edb3cd1265b8cd945dbdf0536 
b/e2/9639ac11dae30edb3cd1265b8cd945dbdf0536
new file mode 100644
index 000..077f233
--- /dev/null
+++ b/e2/9639ac11dae30edb3cd1265b8cd945dbdf0536
@@ -0,0 +1 @@
+merged as: 5bdba378d6fc9f18f618967ec37d07efed2afee4
___
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' - 75/c944eef99cfa3323b411a6e5e892cbf5aa84cc

[Xisco Fauli]

 75/c944eef99cfa3323b411a6e5e892cbf5aa84cc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d88ff5699b153802f456c5dba27f1faae32ae502
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 14 18:02:04 2013 +0200

Notes added by 'git notes add'

diff --git a/75/c944eef99cfa3323b411a6e5e892cbf5aa84cc 
b/75/c944eef99cfa3323b411a6e5e892cbf5aa84cc
new file mode 100644
index 000..a0ed5f4
--- /dev/null
+++ b/75/c944eef99cfa3323b411a6e5e892cbf5aa84cc
@@ -0,0 +1 @@
+merged as: 4e07258cbd1f4fb16d6ce2174fb5c74c3b36da33
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sdext/Library_presenter.mk sdext/Library_PresenterScreen.mk sdext/Module_sdext.mk sfx2/Library_qstart_gtk.mk sfx2/Library_qstart.mk sfx2/Module_sfx2.mk

[Peter Foley]

 sdext/Library_PresenterScreen.mk |   83 +++
 sdext/Library_presenter.mk   |   83 ---
 sdext/Module_sdext.mk|2 
 sfx2/Library_qstart.mk   |   69 
 sfx2/Library_qstart_gtk.mk   |   69 
 sfx2/Module_sfx2.mk  |2 
 6 files changed, 154 insertions(+), 154 deletions(-)

New commits:
commit 869b3a614c889a75c87e30afd180df7417cb47a8
Author: Peter Foley pefol...@verizon.net
Date:   Sun Apr 14 12:05:27 2013 -0400

make file names match library names

Change-Id: Id9b7decbf2f3cfc89e76e7c86a801904375971be

diff --git a/sdext/Library_PresenterScreen.mk b/sdext/Library_PresenterScreen.mk
new file mode 100644
index 000..63479c6
--- /dev/null
+++ b/sdext/Library_PresenterScreen.mk
@@ -0,0 +1,83 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,PresenterScreen))
+
+$(eval $(call 
gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter))
+
+$(eval $(call gb_Library_use_externals,PresenterScreen,\
+   boost_headers \
+))
+
+$(eval $(call gb_Library_use_sdk_api,PresenterScreen))
+
+$(eval $(call gb_Library_use_libraries,PresenterScreen,\
+cppu \
+cppuhelper \
+sal \
+vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,PresenterScreen,\
+sdext/source/presenter/PresenterAccessibility \
+sdext/source/presenter/PresenterBitmapContainer \
+sdext/source/presenter/PresenterButton \
+sdext/source/presenter/PresenterCanvasHelper \
+sdext/source/presenter/PresenterComponent \
+sdext/source/presenter/PresenterConfigurationAccess \
+sdext/source/presenter/PresenterController \
+sdext/source/presenter/PresenterCurrentSlideObserver \
+sdext/source/presenter/PresenterFrameworkObserver \
+sdext/source/presenter/PresenterGeometryHelper \
+sdext/source/presenter/PresenterHelpView \
+sdext/source/presenter/PresenterHelper \
+sdext/source/presenter/PresenterNotesView \
+sdext/source/presenter/PresenterPaintManager \
+sdext/source/presenter/PresenterPane \
+sdext/source/presenter/PresenterPaneBase \
+sdext/source/presenter/PresenterPaneBorderManager \
+sdext/source/presenter/PresenterPaneBorderPainter \
+sdext/source/presenter/PresenterPaneContainer \
+sdext/source/presenter/PresenterPaneFactory \
+sdext/source/presenter/PresenterProtocolHandler \
+sdext/source/presenter/PresenterScreen \
+sdext/source/presenter/PresenterScrollBar \
+sdext/source/presenter/PresenterSlidePreview \
+sdext/source/presenter/PresenterSlideShowView \
+sdext/source/presenter/PresenterSlideSorter \
+sdext/source/presenter/PresenterSprite \
+sdext/source/presenter/PresenterSpritePane \
+sdext/source/presenter/PresenterTextView \
+sdext/source/presenter/PresenterTheme \
+sdext/source/presenter/PresenterTimer \
+sdext/source/presenter/PresenterToolBar \
+sdext/source/presenter/PresenterUIPainter \
+sdext/source/presenter/PresenterViewFactory \
+sdext/source/presenter/PresenterWindowManager \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
deleted file mode 100644
index 63479c6..000
--- a/sdext/Library_presenter.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the License); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an AS IS basis,
-# WITHOUT 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e4/b509ed7e67cdd38201d26e864c3a5a7620d911

[Xisco Fauli]

 e4/b509ed7e67cdd38201d26e864c3a5a7620d911 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b73c92aaf2c3cc525347ceca9c89884880ba3349
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 14 18:03:52 2013 +0200

Notes added by 'git notes add'

diff --git a/e4/b509ed7e67cdd38201d26e864c3a5a7620d911 
b/e4/b509ed7e67cdd38201d26e864c3a5a7620d911
new file mode 100644
index 000..672b7c6
--- /dev/null
+++ b/e4/b509ed7e67cdd38201d26e864c3a5a7620d911
@@ -0,0 +1 @@
+merged as: 0efd28738af121097dcc186dab85dd65c88a0b7b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] gbuild: pass config. file to HelpTarget explicitly

[David Tardon (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3383

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/3383/1

gbuild: pass config. file to HelpTarget explicitly

This is preparation for delivering HelpTarget files as a Package, which
would not be possible with the previous impl.

Change-Id: Ia79effcb77aaa7054987879c394cb277e377c9d8
---
M solenv/gbuild/AllLangHelp.mk
M solenv/gbuild/HelpTarget.mk
2 files changed, 17 insertions(+), 15 deletions(-)



diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index 95cdd8c..d154de2 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -51,7 +51,6 @@
 # gb_AllLangHelp_AllLangHelp__one_lang module lang helpname zipname
 define gb_AllLangHelp_AllLangHelp__one_lang
 $(call gb_HelpTarget_HelpTarget,$(3),$(1),$(2))
-$(call gb_HelpTarget_set_configdir,$(3),$(gb_AllLangHelp_AUXDIR))
 $(call gb_HelpTarget_set_helpdir,$(3),$(gb_AllLangHelp_HELPDIR))
 
 $(call gb_HelpTarget_get_outdir_target,$(4)) : $(call 
gb_HelpTarget_get_target,$(3))
@@ -156,6 +155,7 @@
 define gb_AllLangHelp__use_linked_module
 $(call gb_HelpTarget_use_linked_module,$(call 
gb_AllLangHelp__get_helpname,$(1),$(3)),$(call 
gb_AllLangHelp__get_helpname,$(2),$(3)))
 $(call gb_HelpTarget_set_indexed,$(call 
gb_AllLangHelp__get_helpname,$(1),$(3)))
+$(call gb_HelpTarget_set_configfile,$(call 
gb_AllLangHelp__get_helpname,$(1),$(3)),$(gb_AllLangHelp_AUXDIR)/$(3)/$(1))
 
 endef
 
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 9fd03b8..70ff4ca 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -273,11 +273,11 @@
-o $(WORKDIR)/dummy.zip \
-src $(HELP_SRCDIR) \
-zipdir $(HELP_WORKDIR) \
-   -compact $(gb_HelpLinkTarget_COMPACTTARGET)
+   -compact $(gb_HelpLinkTarget_COMPACTTARGET) \
-idxcaption $(gb_HelpLinkTarget_IDXCAPTIONTARGET) \
-idxcontent $(gb_HelpLinkTarget_IDXCONTENTTARGET) \
-sty $(gb_HelpLinkTarget_EMBEDTARGET) \
-   $(if $(and $(HELP_CONFIGDIR),$(HELP_INDEXED)),-add $(HELP_MODULE).cfg 
$(HELP_CONFIGDIR)/$(HELP_LANG)/$(HELP_MODULE).cfg) \
+   $(if $(HELP_CONFIGFILE),-add $(HELP_MODULE).cfg $(HELP_CONFIGFILE)) \
$(if $(HELP_TREE),-add $(HELP_MODULE).tree $(HELP_TREE)) \
$(foreach file,$(HELP_ADD_FILES),-add $(notdir $(file)) $(file)) \
$(foreach extra,$(HELP_EXTRA_ADD_FILES),-add $(subst $(COMMA), 
,$(extra))) \
@@ -313,7 +313,7 @@
 # gb_HelpLinkTarget_HelpLinkTarget name module lang workdir
 define gb_HelpLinkTarget_HelpLinkTarget
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_ADD_FILES :=
-$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGDIR :=
+$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGFILE :=
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES :=
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_FILES :=
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED :=
@@ -329,9 +329,10 @@
 
 endef
 
-# gb_HelpLinkTarget_set_configdir target configdir
-define gb_HelpLinkTarget_set_configdir
-$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGDIR := $(2)
+# gb_HelpLinkTarget_set_configfile target configfile
+define gb_HelpLinkTarget_set_configfile
+$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGFILE := $(2)
+$(call gb_HelpLinkTarget_get_target,$(1)) : $(2)
 
 endef
 
@@ -511,8 +512,7 @@
 $(call gb_Output_announce,$(2),$(true),HLP,4)
 cd $(call gb_HelpTarget_get_workdir,$(2))  \
 $(gb_HelpJarTarget_COMMAND) -q -0 -rX --filesync --must-match $(1) \
-   $(HELP_PACK_FILES) \
-   $(if $(and $(HELP_CONFIGDIR),$(HELP_INDEXED)),$(HELP_MODULE).cfg)
+   $(HELP_PACK_FILES)
 endef
 
 $(dir $(call gb_HelpTarget_get_target,%)).dir :
@@ -551,7 +551,6 @@
 #
 # gb_HelpTarget_HelpTarget target module lang
 define gb_HelpTarget_HelpTarget
-$(call gb_HelpTarget_get_target,$(1)) : HELP_CONFIGDIR :=
 $(call gb_HelpTarget_get_target,$(1)) : HELP_MODULE := $(2)
 $(call gb_HelpTarget_get_target,$(1)) : HELP_INDEXED :=
 $(call gb_HelpTarget_get_target,$(1)) : HELP_LANG := $(3)
@@ -610,11 +609,14 @@
 
 endef
 
-# gb_HelpTarget_set_configdir target configdir
-define gb_HelpTarget_set_configdir
-$(call gb_HelpLinkTarget_set_configdir,$(1),$(SRCDIR)/$(2))
-
-$(call gb_HelpTarget_get_target,$(1)) : HELP_CONFIGDIR := $(SRCDIR)/$(2)
+# Set config. file used for the help module.
+#
+# The configfile is relative to $(SRCDIR) and without extension.
+#
+# gb_HelpTarget_set_configfile target configfile
+define gb_HelpTarget_set_configfile
+$(call gb_HelpLinkTarget_set_configfile,$(1),$(SRCDIR)/$(2).cfg)
+$(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).cfg)
 
 endef
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia79effcb77aaa7054987879c394cb277e377c9d8
Gerrit-PatchSet: 1

[PATCH] gbuild: deliver help files as packages

[David Tardon (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3384

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3384/1

gbuild: deliver help files as packages

Change-Id: I52904567d0c7434af3f013cad7c3d9a8a67ac9f2
---
M scp2/inc/macros.inc
M scp2/macros/macro.pl
M scp2/source/base/file_base.scp
M scp2/source/calc/file_calc.scp
M scp2/source/draw/file_draw.scp
M scp2/source/impress/file_impress.scp
M scp2/source/math/file_math.scp
M scp2/source/ooo/file_ooo.scp
M scp2/source/writer/file_writer.scp
M solenv/gbuild/AllLangHelp.mk
M solenv/gbuild/HelpTarget.mk
M solenv/gbuild/TargetLocations.mk
12 files changed, 46 insertions(+), 60 deletions(-)



diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 7ae0b4e..6ff7959 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -56,6 +56,7 @@
 #define READMETXTFILENAME(name,lang,ext)  STRING(CONCAT4(name,lang,.,ext))
 #define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang))
 #define EXTRAFILENAME(name,lang)  STRING(CONCAT3(name,lang,.zip))
+#define EXTRAFILELISTNAME(prefix,name,lang)   
STRING(CONCAT4(prefix,name,lang,.filelist))
 #define CONFIGLANGFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
 
 #define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
@@ -81,13 +82,13 @@
 Styles = (ARCHIVE)
 
 #ifdef WITH_HELPPACK_INTEGRATION
-#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
+#define FILELIST_TXT_FILE_BODY_HELPPACK \
 TXT_FILE_BODY; \
-Styles = (ARCHIVE,FORCEHELPPACK,LANGUAGEMODULE)
+Styles = (FILELIST,FORCEHELPPACK,LANGUAGEMODULE)
 #else
-#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
+#define FILELIST_TXT_FILE_BODY_HELPPACK \
 TXT_FILE_BODY; \
-Styles = (ARCHIVE,HELPPACK,LANGUAGEMODULE)
+Styles = (FILELIST,HELPPACK,LANGUAGEMODULE)
 #endif
 
 #define PACKED_LIB_FILE_BODY \
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index dc5d2a9..2ad3fad 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -169,7 +169,7 @@
 next if ( $poorhelplocalizations{$lang} );
 print OUTFILE ; unless $first;
 $first = 0;
-print OUTFILE \\\n\tName ($lang) = EXTRAFILENAME(name,_$lang);
+print OUTFILE \\\n\tName ($lang) = 
EXTRAFILELISTNAME(HelpTarget/,name,/$lang);
 }
 print OUTFILE \n\n;
 }
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index f684e1d..fb1a230 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -66,10 +66,9 @@
 
 #if defined WITH_HELP
 File gid_File_Help_Sdatabase_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
 EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
-Patchfiles = (); 
 End
 #endif
 
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index f598556..8f5dfbb 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -71,10 +71,9 @@
 
 #if defined WITH_HELP
 File gid_File_Help_Scalc_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
 EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(scalc);
-Patchfiles = ();
 End
 #endif
 
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 676112f..4b7c4db 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -36,10 +36,9 @@
 
 #if defined WITH_HELP
 File gid_File_Help_Sdraw_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
 EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdraw);
-Patchfiles = (); 
 End
 #endif
 
diff --git a/scp2/source/impress/file_impress.scp 
b/scp2/source/impress/file_impress.scp
index 88cbf69..f2eebf0 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -57,10 +57,9 @@
 
 #if defined WITH_HELP
 File gid_File_Help_Simpress_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
 EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
-Patchfiles = (); 
 End
 #endif
 
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index acbb3c9..aa0fcb3 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -52,10 +52,9 @@
 
 #if defined WITH_HELP
 File gid_File_Help_Smath_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
 EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(smath);
-Patchfiles = ();
 End
 #endif
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index c5b8fc4..8a308d8 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ 

[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Package_gallbullets.mk extras/Package_gallhtmlexpo.mk extras/Package_gallroot.mk extras/Package_gallsound.mk extras/Package_gallsounds.mk

[Julien Nabet]

 extras/Module_extras.mk|   16 ++---
 extras/Package_gallbullets.mk  |   79 ++
 extras/Package_gallhtmlexpo.mk |   65 +
 extras/Package_gallroot.mk |   22 +++
 extras/Package_gallsound.mk|   21 +++
 extras/Package_gallsounds.mk   |   52 +
 extras/Package_gallsystem.mk   |   38 
 extras/Package_gallwwwback.mk  |   79 ++
 extras/Package_gallwwwgraf.mk  |  110 +
 extras/Zip_gallbullets.mk  |   77 -
 extras/Zip_gallhtmlexpo.mk |   63 -
 extras/Zip_gallroot.mk |   20 --
 extras/Zip_gallsound.mk|   19 --
 extras/Zip_gallsounds.mk   |   50 
 extras/Zip_gallsystem.mk   |   36 
 extras/Zip_gallwwwback.mk  |   77 -
 extras/Zip_gallwwwgraf.mk  |  108 
 scp2/source/ooo/file_extra_ooo.scp |   55 ++
 18 files changed, 505 insertions(+), 482 deletions(-)

New commits:
commit 192c3ca83354921313d452fa4353c2bc8da1a13e
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Apr 14 15:50:28 2013 +0200

fdo#63197: Convert list below:

Zip_gallbullets, Zip_gallhtmlexpo, Zip_gallroot, Zip_gallsound
Zip_gallsounds, Zip_gallsystem, Zip_gallwwwback, Zip_gallwwwgraf

Change-Id: Ic326d83ad69968a4871518065277e863eb8815a8
Reviewed-on: https://gerrit.libreoffice.org/3382
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 8df931c..348b62d 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -21,19 +21,19 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_database \
Package_databasebiblio \
Package_fonts \
+   Package_gallbullets \
+   Package_gallhtmlexpo \
+   Package_gallroot \
+   Package_gallsound \
+   Package_gallsounds \
+   Package_gallsystem \
+   Package_gallwwwback \
+   Package_gallwwwgraf \
Package_glade \
Package_labels \
Package_newfiles \
Package_palettes \
Package_wordbook \
-   Zip_gallbullets \
-   Zip_gallhtmlexpo \
-   Zip_gallroot \
-   Zip_gallsound \
-   Zip_gallsounds \
-   Zip_gallsystem \
-   Zip_gallwwwback \
-   Zip_gallwwwgraf \
Zip_tpllayoutimpr \
Zip_tplwizagenda \
Zip_tplwizbitmap \
diff --git a/extras/Package_gallbullets.mk b/extras/Package_gallbullets.mk
new file mode 100644
index 000..c5d903f
--- /dev/null
+++ b/extras/Package_gallbullets.mk
@@ -0,0 +1,79 @@
+# -*- 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_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets))
+
+$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallbullets,share/gallery/bullets,\
+   blkpearl.gif \
+   bluarrow.gif \
+   bluball.gif \
+   bludiamd.gif \
+   bluered.gif \
+   blusqare.gif \
+   blustar.gif \
+   coffee_1.gif \
+   coffee_2.gif \
+   coffee_3.gif \
+   coffee_4.gif \
+   coffee_5.gif \
+   con-blue.gif \
+   con-cyan.gif \
+   con-green.gif \
+   con-lilac.gif \
+   con-oran.gif \
+   con-pink.gif \
+   con-red.gif \
+   con-yellow.gif \
+   corner_1.gif \
+   corner_2.gif \
+   corner_3.gif \
+   corner_4.gif \
+   darkball.gif \
+   darkblue.gif \
+   gldpearl.gif \
+   golfball.gif \
+   grnarrow.gif \
+   grnball.gif \
+   grndiamd.gif \
+   grnpearl.gif \
+   grnsqare.gif \
+   grnstar.gif \
+   gryarrow.gif \
+   gryball.gif \
+   grydiamd.gif \
+   grysqare.gif \
+   grystar.gif \
+   orgarrow.gif \
+   orgball.gif \
+   orgdiamd.gif \
+   orgsqare.gif \
+   orgstar.gif \
+   pebble_1.gif \
+   pebble_2.gif \
+   pebble_3.gif \
+   poliball.gif \
+   popcorn_1.gif \
+   popcorn_2.gif \
+   rainbow.gif \
+   redarrow.gif \
+   redball.gif \
+   reddiamd.gif \
+   redsqare.gif \
+   redstar.gif \
+   whtpearl.gif \
+   ylwarrow.gif \
+   ylwball.gif \
+   ylwdiamd.gif \
+   ylwsqare.gif \
+   ylwstar.gif \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk
new file mode 100644
index 000..f0531c5
--- 

[PUSHED] fdo#63197: Convert list below:

[David Tardon (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3382

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic326d83ad69968a4871518065277e863eb8815a8
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: David Tardon dtar...@redhat.com

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

Re: [libreoffice-users] has there been a change in computing for enough room during install?

[Kieran Peckett]

Just added LibreOffice-Dev to the conversation, as Tom suggested.

On Saturday, 13 April 2013, Tom Davies wrote:

 Hi :)
 Good question.  The devs list might have more idea.
 Regards from
 Tom :)





 
  From: Kracked_P_P---webmaster webmas...@krackedpress.com javascript:;
 
 To: LibreO - Users Global us...@global.libreoffice.org javascript:;
 Sent: Saturday, 13 April 2013, 0:19
 Subject: [libreoffice-users] has there been a change in computing for
 enough room during install?
 
 
 
 I was wondering if there has been some changes in how LO 4.0.2 deals with
 computing to see if there is enough room on the drive for the new install.
 
 I went from 4.0.1.2 to 4.0.2.2 on Windows and it has taken over 5 minutes
 for the laptops to deal with this step.  One was Win7 Professional and the
 other was Home Premium.  Both are on dual core laptops. Both are in the
 mid-range for processor speeds.
 
 I am upgrading to 4.0.2 on the Win7/Pro system, right now, and had to
 wait over 5 minutes, I wonder if something has changed.  It has never taken
 more than 2 minutes to do this computing process on this laptop.  It has
 over 60 GB free and the Win7/HomePre one has over 200 GB free, it is
 strange that it is taking so long for this part of the install process.
 Yes, the disks have been defragged and both system have at least 3GB RAM.
 
 
 
 
 
 -- For unsubscribe instructions e-mail to:
 users+h...@global.libreoffice.org javascript:;
 Problems?
 http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
 Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
 List archive: http://listarchives.libreoffice.org/global/users/
 All messages sent to this list will be publicly archived and cannot be
 deleted
 
 
 
 
 --
 For unsubscribe instructions e-mail to: 
 users+h...@global.libreoffice.orgjavascript:;
 Problems?
 http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
 Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
 List archive: http://listarchives.libreoffice.org/global/users/
 All messages sent to this list will be publicly archived and cannot be
 deleted


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

[Libreoffice-commits] core.git: 3 commits - ios/Executable_LibreOffice.mk svgio/inc svgio/source touch/Library_libotouch.mk touch/Module_touch.mk

[Tor Lillqvist]

 ios/Executable_LibreOffice.mk|2 ++
 svgio/inc/svgio/svgreader/svgstyleattributes.hxx |2 +-
 svgio/source/svgreader/svgstyleattributes.cxx|2 +-
 touch/Library_libotouch.mk   |9 -
 touch/Module_touch.mk|7 ---
 5 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 9bc0ca091b7037f7c8f4782103a81b7287bc1de3
Author: Tor Lillqvist t...@iki.fi
Date:   Sun Apr 14 20:40:58 2013 +0300

WaE: type qualifiers ignored on function return type

Change-Id: I40d946b1e3ba104e8b8acac53ccf7296f6ee78fc

diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx 
b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 4e0c1ac..fe290ae 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -315,7 +315,7 @@ namespace svgio
 void setFillOpacity(const SvgNumber rFillOpacity = SvgNumber()) { 
maFillOpacity = rFillOpacity; }
 
 /// fill rule content
-const FillRule getFillRule() const;
+FillRule getFillRule() const;
 void setFillRule(const FillRule aFillRule = FillRule_notset) { 
maFillRule = aFillRule; }
 
 /// fill StrokeDasharray content
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 0787490..140107f 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2006,7 +2006,7 @@ namespace svgio
 return SvgNumber(1.0);
 }
 
-const FillRule SvgStyleAttributes::getFillRule() const
+FillRule SvgStyleAttributes::getFillRule() const
 {
 if(FillRule_notset != maFillRule)
 {
commit 03a9ec4aa5a795b86fa626de1bf23196d7375f50
Author: Tor Lillqvist t...@iki.fi
Date:   Sun Apr 14 18:55:55 2013 +0300

Don't bother with unused stuff

Also, install the header files on all platforms.

Change-Id: I06820416956a6b35ff327d8871f7d4adf16ef15b

diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk
index 7e26f3d..cd0a14c 100644
--- a/touch/Library_libotouch.mk
+++ b/touch/Library_libotouch.mk
@@ -14,16 +14,7 @@ $(eval $(call gb_Library_set_include,libotouch,\
 ))
 
 $(eval $(call gb_Library_use_sdk_api,libotouch))
-
-$(eval $(call gb_Library_use_internal_comprehensive_api,libotouch,\
-   touch \
-))
-
-$(eval $(call gb_Library_use_libraries,libotouch,\
-))
-
 $(eval $(call gb_Library_add_exception_objects,libotouch,\
-   touch/source/uno/Document \
touch/source/generic/libotouch \
 ))
 
diff --git a/touch/Module_touch.mk b/touch/Module_touch.mk
index fde090d..b2857a9 100644
--- a/touch/Module_touch.mk
+++ b/touch/Module_touch.mk
@@ -11,12 +11,13 @@ $(eval $(call gb_Module_Module,touch))
 ifneq (,$(filter IOS ANDROID,$(OS)))
 
 $(eval $(call gb_Module_add_targets,touch,\
-   CustomTarget_touch_javamaker \
-   InternalUnoApi_touch \
Library_libotouch \
-   Package_inc \
 ))
 
 endif
 
+$(eval $(call gb_Module_add_targets,touch,\
+   Package_inc \
+))
+
 # vim: set noet sw=4 ts=4:
commit b0e6bba1c5892574c5531fa2d2b0a5797f3ef053
Author: Tor Lillqvist t...@iki.fi
Date:   Sun Apr 14 18:55:08 2013 +0300

Try depending on touch_inc to maybe fix tinderbox build

Change-Id: I9833437256243c26b9ff468937ec9f975c2e898d

diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index f4daea8..8e4e0e1 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\
 ios/experimental/LibreOffice/LibreOffice/ViewController \
 ))
 
+$(call gb_Executable_use_package,LibreOffice,touch_inc)
+
 $(call gb_LinkTarget_get_target,Executable/LibreOffice) : $(call 
gb_Postprocess_get_target,AllModulesButInstsetNative)
 
 # Mark the executable as depending on all libraries so that it gets
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Help needed for fdo#63311

[Christina Roßmanith]

Hi,

if you add text (e.g. abc) to a shape like a smiley, save the 
document, delete the text and save again the text is still present in 
the saved file. Closing the drawing isn't necessary.


If you don't save the drawing after adding the text but delete the text 
and save the drawing afterwards the text isn't present in the written file.


In shapeexport.cxx at line 242  if(xText.is()  
!xText-getString().isEmpty())   xText-getString() evaluates to abc 
if the drawing was saved even if the text was deleted. So I guess 
something happens to the text during saving (because saving is 
necessary to trigger the wrong behaviour) and this something isn't 
updated properly if the text is deleted.


And this is where I am stuck but maybe my findings ring some bells for 
someone else?


Christina


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

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

[Andras Timar]

 dictionaries|2 
 filter/source/graphicfilter/eos2met/eos2met.cxx |   16 --
 filter/source/graphicfilter/epict/epict.cxx |   21 +---
 filter/source/svg/svgexport.cxx |   42 +
 filter/source/svg/svgfilter.component   |3 +
 filter/source/svg/svgfilter.cxx |   27 +--
 filter/source/svg/svgfilter.hxx |2 
 filter/source/svg/svgwriter.cxx |   38 +++
 filter/source/svg/svgwriter.hxx |   22 -
 svx/source/svdraw/svdxcgv.cxx   |   12 
 svx/source/unodraw/unoshap4.cxx |   14 -
 svx/source/unodraw/unoshape.cxx |   14 -
 vcl/source/filter/graphicfilter.cxx |   58 
 vcl/source/gdi/impgraph.cxx |   34 ++
 14 files changed, 184 insertions(+), 121 deletions(-)

New commits:
commit e415070c594c161d160d27b18ed3323660052593
Author: Andras Timar ati...@suse.com
Date:   Sun Apr 14 21:34:27 2013 +0200

Updated core
Project: dictionaries  b32611e23a1f35f16f4c37bbbdc02027157424d1

diff --git a/dictionaries b/dictionaries
index 26b7c42..b32611e 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 26b7c425b0cecaad38249bfdc17b8d5cecee2670
+Subproject commit b32611e23a1f35f16f4c37bbbdc02027157424d1
commit 4fa8df7320f6bdc8333f5936537d2ed93e8892ce
Author: Armin Le Grand a...@apache.org
Date:   Mon Jun 11 08:38:23 2012 +

Resolves: #i119735# missing css.svg.SVGWriter when using GraphicProvider

missing implementation for com.sun.star.svg.SVGWriter when using
GraphicProvider

Adapted patch provided by Sven Jacobi (thanks), added some fixes/cleanups to
make it work with all kind of graphics (SVG, Bitmap, Metafile)

(cherry picked from commit 891011181285d7ad54984ffd05ed44d825a70647)

Conflicts:
filter/inc/filter/msfilter/msdffimp.hxx
filter/source/graphicfilter/epict/epict.cxx
filter/source/svg/svgexport.cxx
filter/source/svg/svguno.cxx
filter/source/svg/svgwriter.cxx
filter/source/svg/svgwriter.hxx
svtools/source/filter/filter.cxx

Change-Id: Ie53f995614060a00c709f620f89d132913a25c5c

diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx 
b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 1fe92ac..9e5ae3b 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -2560,20 +2560,8 @@ extern C SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
 GraphicExport( SvStream  rStream, Graphic  rGraphic, FilterConfigItem* 
pFilterConfigItem, sal_Bool )
 {   METWriter aMETWriter;
 
-if ( rGraphic.GetType() == GRAPHIC_GDIMETAFILE )
-return aMETWriter.WriteMET( rGraphic.GetGDIMetaFile(), rStream, 
pFilterConfigItem );
-else
-{
-Bitmap aBmp=rGraphic.GetBitmap();
-GDIMetaFile aMTF;
-VirtualDevice aVirDev;
-
-aMTF.Record(aVirDev);
-aVirDev.DrawBitmap(Point(),aBmp);
-aMTF.Stop();
-aMTF.SetPrefSize(aBmp.GetSizePixel());
-return aMETWriter.WriteMET( aMTF, rStream, pFilterConfigItem );
-}
+// #119735# just use GetGDIMetaFile, it will create a bufferd version of 
contained bitmap now automatically
+return aMETWriter.WriteMET( rGraphic.GetGDIMetaFile(), rStream, 
pFilterConfigItem );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/epict/epict.cxx 
b/filter/source/graphicfilter/epict/epict.cxx
index c68d400..3c02e0a 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -2275,23 +2275,10 @@ GraphicExport(SvStream  rStream, Graphic  rGraphic, 
FilterConfigItem* pFilterC
 {
 PictWriter  aPictWriter;
 
-if (rGraphic.GetType()==GRAPHIC_GDIMETAFILE)
-{
-GDIMetaFile aScaledMtf( rGraphic.GetGDIMetaFile() );
-return aPictWriter.WritePict( aScaledMtf, rStream, pFilterConfigItem );
-}
-else
-{
-Bitmap aBmp=rGraphic.GetBitmap();
-GDIMetaFile aMTF;
-VirtualDevice aVirDev;
-
-aMTF.Record(aVirDev);
-aVirDev.DrawBitmap(Point(),aBmp);
-aMTF.Stop();
-aMTF.SetPrefSize(aBmp.GetSizePixel());
-return aPictWriter.WritePict( aMTF, rStream, pFilterConfigItem );
-}
+// #i119735# just use GetGDIMetaFile, it will create a bufferd version of 
contained bitmap now automatically
+GDIMetaFile aScaledMtf( rGraphic.GetGDIMetaFile() );
+
+return aPictWriter.WritePict( aScaledMtf, rStream, pFilterConfigItem );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 918ef48..27a7125 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2343,4 

[Libreoffice-commits] dictionaries.git: en/dialog hu_HU/dialog pt_BR/dialog ru_RU/dialog

[Andras Timar]

 en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu|   51 
--
 hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |   51 
--
 pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |   44 

 ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu |   46 
-
 4 files changed, 85 insertions(+), 107 deletions(-)

New commits:
commit b32611e23a1f35f16f4c37bbbdc02027157424d1
Author: Andras Timar ati...@suse.com
Date:   Sun Apr 14 21:34:27 2013 +0200

put sentence/grammar checker options under Language Settings

Change-Id: Ic05b4162c64f2eff43cb9dc88b282934a6fd2ce3

diff --git a/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu 
b/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index 563fa67..f5995c7 100644
--- a/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -1,36 +1,27 @@
 ?xml version='1.0' encoding='UTF-8'?
 !DOCTYPE oor:component-data SYSTEM ../../../../component-update.dtd
 oor:component-data oor:name=OptionsDialog 
oor:package=org.openoffice.Office 
xmlns:oor=http://openoffice.org/2001/registry; 
xmlns:xs=http://www.w3.org/2001/XMLSchema; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-node oor:name=Nodes
-node oor:name=org.openoffice.lightproof oor:op=fuse
-prop oor:name=Label
-value xml:lang=en-USDictionaries/value
-/prop
-node oor:name=Leaves
-
-node oor:name=org.openoffice.lightproof.en 
oor:op=fuse
-
-prop oor:name=Id
-
valueorg.openoffice.en.hunspell.dictionaries/value
-/prop
-
-prop oor:name=Label
-
-value 
xml:lang=en-USEnglish sentence checking/value
-
-/prop
-
-prop oor:name=OptionsPage
-value%origin%/en.xdl/value
-/prop
-
-prop oor:name=EventHandlerService
-
valueorg.libreoffice.comp.pyuno.LightproofOptionsEventHandler.en/value
-/prop
-
-/node
-
-/node
+node oor:name=Nodes
+node oor:name=LanguageSettings oor:op=fuse
+prop oor:name=Label
+value xml:lang=en-USLanguage Settings/value
+/prop
+node oor:name=Leaves
+node oor:name=org.openoffice.lightproof.en oor:op=fuse
+prop oor:name=Id
+valueorg.openoffice.en.hunspell.dictionaries/value
+/prop
+prop oor:name=Label
+value xml:lang=en-USEnglish sentence 
checking/value
+/prop
+prop oor:name=OptionsPage
+value%origin%/en.xdl/value
+/prop
+prop oor:name=EventHandlerService
+
valueorg.libreoffice.comp.pyuno.LightproofOptionsEventHandler.en/value
+/prop
 /node
+/node
 /node
+/node
 /oor:component-data
diff --git a/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu 
b/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index 4379028..73b4347 100644
--- a/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -1,36 +1,27 @@
 ?xml version='1.0' encoding='UTF-8'?
 !DOCTYPE oor:component-data SYSTEM ../../../../component-update.dtd
 oor:component-data oor:name=OptionsDialog 
oor:package=org.openoffice.Office 
xmlns:oor=http://openoffice.org/2001/registry; 
xmlns:xs=http://www.w3.org/2001/XMLSchema; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-node oor:name=Nodes
-node oor:name=org.openoffice.lightproof oor:op=fuse
-prop oor:name=Label
-value xml:lang=en-USDictionaries/value
-/prop
-node oor:name=Leaves
-
-node 
oor:name=org.openoffice.lightproof.hu_HU oor:op=fuse
-
-prop oor:name=Id
-  

Re: Help needed for fdo#63311

[Regina Henschel]

Hi Christina,

Christina Roßmanith schrieb:

Hi,

if you add text (e.g. abc) to a shape like a smiley, save the
document, delete the text and save again the text is still present in
the saved file. Closing the drawing isn't necessary.

If you don't save the drawing after adding the text but delete the text
and save the drawing afterwards the text isn't present in the written file.

In shapeexport.cxx at line 242  if(xText.is() 
!xText-getString().isEmpty())   xText-getString() evaluates to abc
if the drawing was saved even if the text was deleted. So I guess
something happens to the text during saving (because saving is
necessary to trigger the wrong behaviour) and this something isn't
updated properly if the text is deleted.


Saving is not necessary. As I commented in the issue, you can see when 
you look at the shape with a macro, that the content is not erased.


The error is not in load/save but must be somewhere earlier.

Kind regards
Regina

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 89/1011181285d7ad54984ffd05ed44d825a70647

[Caolán McNamara]

 89/1011181285d7ad54984ffd05ed44d825a70647 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d4195cc965444253f6ed18b313319b261c9e942d
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 21:36:17 2013 +0100

Notes added by 'git notes add'

diff --git a/89/1011181285d7ad54984ffd05ed44d825a70647 
b/89/1011181285d7ad54984ffd05ed44d825a70647
new file mode 100644
index 000..33f46fb
--- /dev/null
+++ b/89/1011181285d7ad54984ffd05ed44d825a70647
@@ -0,0 +1 @@
+merged as: 4fa8df7320f6bdc8333f5936537d2ed93e8892ce
___
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' - 49/64a13d97ca8ed16fb18ed10957c73f32651821

[Caolán McNamara]

 49/64a13d97ca8ed16fb18ed10957c73f32651821 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a150888eea6f281d02ab6caec7d3d3395bfe867a
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 21:42:08 2013 +0100

Notes added by 'git notes add'

diff --git a/49/64a13d97ca8ed16fb18ed10957c73f32651821 
b/49/64a13d97ca8ed16fb18ed10957c73f32651821
new file mode 100644
index 000..fbbb9f6
--- /dev/null
+++ b/49/64a13d97ca8ed16fb18ed10957c73f32651821
@@ -0,0 +1 @@
+prefer: a3f55e0ad678464a30dde004c97c8b0a680bc8de
___
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' - 84/6a7425314d1782bae3b517d1394a46ff980256

[Caolán McNamara]

 84/6a7425314d1782bae3b517d1394a46ff980256 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 39e7e5a8b4d3f91980d55d2a0467cd4832bc3f1d
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 21:45:46 2013 +0100

Notes added by 'git notes add'

diff --git a/84/6a7425314d1782bae3b517d1394a46ff980256 
b/84/6a7425314d1782bae3b517d1394a46ff980256
new file mode 100644
index 000..c652e4c
--- /dev/null
+++ b/84/6a7425314d1782bae3b517d1394a46ff980256
@@ -0,0 +1 @@
+merged as: d859e54534994d2e6f0c62e7711fa674406f8e22
___
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' - 7d/e1caa8f31be16c3e83b86d5ca9a76678a9958b

[Caolán McNamara]

 7d/e1caa8f31be16c3e83b86d5ca9a76678a9958b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4e13351f1cc659e53e53007e053e27a975c842be
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 21:51:20 2013 +0100

Notes added by 'git notes add'

diff --git a/7d/e1caa8f31be16c3e83b86d5ca9a76678a9958b 
b/7d/e1caa8f31be16c3e83b86d5ca9a76678a9958b
new file mode 100644
index 000..b360571
--- /dev/null
+++ b/7d/e1caa8f31be16c3e83b86d5ca9a76678a9958b
@@ -0,0 +1 @@
+prefer: 0219642858f34c7c895896f7ec1e30d41dac3505
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Need SDK Expert to Confirm this Bug - FDO#61503

[Joel Madero]

Hi All,

Need someone who knows SDK stuff to look at this one for us. Thanks in 
advanced


*Bug 61503* https://bugs.freedesktop.org/show_bug.cgi?id=61503 
-uno.util.Bootstrap.bootstrap()


https://bugs.freedesktop.org/show_bug.cgi?id=61503list_id=284306



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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8c/72d0c834224e69b57d7e4e77d606d7b2662c90

[Caolán McNamara]

 8c/72d0c834224e69b57d7e4e77d606d7b2662c90 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30d77aec01c705591fcb858aa1c443e2bff9bf64
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 23:00:45 2013 +0100

Notes added by 'git notes add'

diff --git a/8c/72d0c834224e69b57d7e4e77d606d7b2662c90 
b/8c/72d0c834224e69b57d7e4e77d606d7b2662c90
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/8c/72d0c834224e69b57d7e4e77d606d7b2662c90
@@ -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: offapi/com

[Caolán McNamara]

 offapi/com/sun/star/awt/grid/XGridRowSelection.idl|2 +-
 offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0406322ed8e40478b355c7e3463033cb5c02dadb
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 23:05:53 2013 +0100

these @sinces were during the LibreOffice era

Change-Id: Ide4dfaaa3b74aea8dcde0a18d8cd55ca7eb46d1a

diff --git a/offapi/com/sun/star/awt/grid/XGridRowSelection.idl 
b/offapi/com/sun/star/awt/grid/XGridRowSelection.idl
index af75597..18c140c 100644
--- a/offapi/com/sun/star/awt/grid/XGridRowSelection.idl
+++ b/offapi/com/sun/star/awt/grid/XGridRowSelection.idl
@@ -28,7 +28,7 @@ module com {  module sun {  module star {  module awt { 
module grid {
 
 /** This interfaces provides access to the selection of row for 
typeUnoControlGrid/type.
 
-@since OpenOffice.org 3.4
+@since LibreOffice 3.4
  */
 published interface XGridRowSelection
 {
diff --git a/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl 
b/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl
index 7b606cf..95e9f60 100644
--- a/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl
+++ b/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module sdb {
 @see XDatabaseRegistrations
 @see XDatabaseRegistrationsListener
 
-@since  OpenOffice.org 3.3
+@since  LibreOffice 3.3
  */
 published struct DatabaseRegistrationEvent : 
::com::sun::star::lang::EventObject
 {
___
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' - 8d/25afff66c4f0ff28a9df0491af6408d3cd8ff3

[Caolán McNamara]

 8d/25afff66c4f0ff28a9df0491af6408d3cd8ff3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 587296346722929d5cacd8a679fee8740b77b6c9
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 23:13:58 2013 +0100

Notes added by 'git notes add'

diff --git a/8d/25afff66c4f0ff28a9df0491af6408d3cd8ff3 
b/8d/25afff66c4f0ff28a9df0491af6408d3cd8ff3
new file mode 100644
index 000..cad8d46
--- /dev/null
+++ b/8d/25afff66c4f0ff28a9df0491af6408d3cd8ff3
@@ -0,0 +1 @@
+prefer: 0406322ed8e40478b355c7e3463033cb5c02dadb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lei De Bin]

 sw/source/filter/ww8/ww8par5.cxx |   73 ++-
 1 file changed, 65 insertions(+), 8 deletions(-)

New commits:
commit e12cd3855781f92e233b582812bff95c89fd9ef9
Author: Lei De Bin le...@apache.org
Date:   Fri Jul 20 00:39:51 2012 +

Resolve: #i119581# fix import issue for various .doc macro button imports

fix import issue for 'checkin' 'checkout' 'showsample' macro button in 
writer

Reported by: Lou Qingle
Patch by: Lei De Bin
Review by: Li Jian Yuan(cherry picked from commit 
7a3114b8e6960153900759a81a6edf1f74b3981c)

Change-Id: Iec6c2945a587c0451b8a404eb449c53237eeb7dc

diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index e746d6e..b1e9219 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2236,6 +2236,32 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, 
String rStr )
 rDoc.InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 );
 return FLD_OK;
 }
+//helper function
+//For MS MacroButton field, the symbol in plain text is always ( (0x28),
+//which should be mapped according to the macro type
+bool ConvertMacroSymbol( const String rName, String rReference )
+{
+bool bConverted = false;
+if( rReference.EqualsAscii( ( ) )
+{
+bConverted = true;
+sal_Unicode cSymbol;
+if( rName.EqualsAscii( CheckIt ) )
+cSymbol = 0xF06F;
+else if( rName.EqualsAscii( UncheckIt ) )
+cSymbol = 0xF0FE;
+else if( rName.EqualsAscii( ShowExample ) )
+cSymbol = 0xF02A;
+//else if... : todo
+else
+bConverted = false;
+
+if( bConverted )
+rReference = cSymbol;
+}
+return bConverted;
+}
+//end
 
 // MACROSCHALTFLACHE
 eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, String rStr)
@@ -2278,22 +2304,53 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, 
String rStr)
 if( !aName.Len() )
 return FLD_TAGIGN;  // makes no sense without Makro-Name
 
+//try converting macro symbol according to macro name
+bool bApplyWingdings = ConvertMacroSymbol( aName, aVText );
 aName.InsertAscii( StarOffice.Standard.Modul1., 0 );
 
 SwMacroField aFld( (SwMacroFieldType*)
 rDoc.GetSysFldType( RES_MACROFLD ), aName, aVText );
-rDoc.InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 );
 
+if( !bApplyWingdings )
+{
+
+rDoc.InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 );
+WW8_CP nOldCp = pPlcxMan-Where();
+WW8_CP nCp = nOldCp + nOffset;
 
-WW8_CP nOldCp = pPlcxMan-Where();
-WW8_CP nCp = nOldCp + nOffset;
+SwPaM aPaM(*pPaM);
+aPaM.SetMark();
+aPaM.Move(fnMoveBackward);
+aPaM.Exchange();
+
+mpPostProcessAttrsInfo = new WW8PostProcessAttrsInfo(nCp, nCp, aPaM);
+}
+else
+{
+//set Wingdings font
+sal_uInt16 i = 0;
+for ( ; i  pFonts-GetMax(); i++ )
+{
+FontFamily eFamily;
+String aFontName;
+FontPitch ePitch;
+CharSet eSrcCharSet;
+if( GetFontParams( i, eFamily, aFontName, ePitch, eSrcCharSet )
+ aFontName.EqualsAscii(Wingdings) )
+{
+break;
+}
+}
 
-SwPaM aPaM(*pPaM);
-aPaM.SetMark();
-aPaM.Move(fnMoveBackward);
-aPaM.Exchange();
+if ( i  pFonts-GetMax() )
+{
 
-mpPostProcessAttrsInfo = new WW8PostProcessAttrsInfo(nCp, nCp, aPaM);
+SetNewFontAttr( i, true, RES_CHRATR_FONT );
+rDoc.InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 );
+pCtrlStck-SetAttr( *pPaM-GetPoint(), RES_CHRATR_FONT );
+ResetCharSetVars();
+}
+}
 
 return FLD_OK;
 }
___
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' - 7a/3114b8e6960153900759a81a6edf1f74b3981c

[Caolán McNamara]

 7a/3114b8e6960153900759a81a6edf1f74b3981c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c79c1c9dd9307bde4623486fc2181408e82148b6
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 23:26:24 2013 +0100

Notes added by 'git notes add'

diff --git a/7a/3114b8e6960153900759a81a6edf1f74b3981c 
b/7a/3114b8e6960153900759a81a6edf1f74b3981c
new file mode 100644
index 000..6cf8de3
--- /dev/null
+++ b/7a/3114b8e6960153900759a81a6edf1f74b3981c
@@ -0,0 +1 @@
+merged as: e12cd3855781f92e233b582812bff95c89fd9ef9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 58978, which changed state.

Bug 58978 Summary: FILEOPEN and FILESAVE causes General Error for .odt
https://bugs.freedesktop.org/show_bug.cgi?id=58978

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |---

-- 
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: offapi/com

[Ariel Constenla-Haile]

 offapi/com/sun/star/drawing/GraphicExportFilter.idl  |4 -
 offapi/com/sun/star/drawing/XGraphicExportFilter.idl |   72 ++-
 offapi/com/sun/star/graphic/GraphicDescriptor.idl|2 
 3 files changed, 43 insertions(+), 35 deletions(-)

New commits:
commit 5dd816d65b4f1611970a4d9af8783c52bc4574fe
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Wed Jul 4 12:08:57 2012 +

Small format fixes in IDL files

(cherry picked from commit 9cd7d8572e79e19c8e3f6434acd6ac3d7038a225)

Conflicts:
offapi/com/sun/star/drawing/GraphicExportFilter.idl

Change-Id: I77749ab974cf131547cac4e8d41763c3bc3cd3ae

diff --git a/offapi/com/sun/star/drawing/GraphicExportFilter.idl 
b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
index 33899e7..9472603 100644
--- a/offapi/com/sun/star/drawing/GraphicExportFilter.idl
+++ b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
@@ -26,8 +26,8 @@
 
 
 /** a component that supports this service lets you export pages, shapes, or
-groups of shapes from a DrawingDocument to a file in one of the file 
formats
-supported by the component.
+groups of shapes from a typeDrawingDocument/type to a file in one of 
the
+file formats supported by the component.
 */
 published service GraphicExportFilter : XGraphicExportFilter;
 
diff --git a/offapi/com/sun/star/drawing/XGraphicExportFilter.idl 
b/offapi/com/sun/star/drawing/XGraphicExportFilter.idl
index 2777e28..81418c4 100644
--- a/offapi/com/sun/star/drawing/XGraphicExportFilter.idl
+++ b/offapi/com/sun/star/drawing/XGraphicExportFilter.idl
@@ -32,44 +32,52 @@
 */
 published interface XGraphicExportFilter
 {
-/** calling method scope=scope=com::sun::star::documentXFilter::filter
-/method starts the export of the graphic file. The following 
properties
-from thetype scope=com::sun::star::documentMediaDescriptor
-/type are supported:p
+/** calling method 
scope=com::sun::star::documentXFilter::filter/method
+starts the export of the graphic file.
 
-member scope=com::sun::star::documentMediaDescriptor::MediaType
-/memberb
+pThe following properties from the
+type scope=com::sun::star::documentMediaDescriptor/type are
+supported:/p
 
-Depending on the export filters supported by this component this is
-the mime type of the target graphic file. Possible values areb
-image/x-MS-bmpb
-application/dxfb
-application/postscriptb
-image/gifb
-image/jpegb
-image/pngb
-image/x-pictb
-image/x-pcxb
-image/x-portable-bitmapb
-image/x-portable-graymapb
-image/x-portable-pixmapb
-image/x-cmu-rasterb
-image/targab
-image/tiffb
-image/x-xbitmapb
-image/x-xpixmapb
-image/svg+xmlp
-Ask the interface type scope=com::sun::star::documentXMimeTypeInfo
-/type for all values supported by the component.
-
-member 
scope=com::sun::star::documentMediaDescriptor::URL/memberb
-This is the target url of the file that will be created during export.
+ul
+li
+member 
scope=com::sun::star::documentMediaDescriptor::MediaType/member
+pDepending on the export filters supported by this component,
+this is the mime type of the target graphic file./p
+pPossible values are:/p
+ul
+liimage/x-MS-bmp/li
+liapplication/dxf/li
+liapplication/postscript/li
+liimage/gif/li
+liimage/jpeg/li
+liimage/png/li
+liimage/x-pict/li
+liimage/x-pcx/li
+liimage/x-portable-bitmap/li
+liimage/x-portable-graymap/li
+liimage/x-portable-pixmap/li
+liimage/x-cmu-raster/li
+liimage/targa/li
+liimage/tiff/li
+liimage/x-xbitmap/li
+liimage/x-xpixmap/li
+liimage/svg+xml/li
+/ul
+pAsk the interface type 
scope=com::sun::star::documentXMimeTypeInfo/type
+for all values supported by the component./p
+/li
+li
+member 
scope=com::sun::star::documentMediaDescriptor::URL/member
+pThis is the target url of the file that will be created 
during export./p
+/li
+/ul
 */
 interface ::com::sun::star::document::XFilter;
 
 /** sets the source component for this export filter.
-This could either be a typeDrawPage/type, a typeShape/type
-or a typeShapes/type.
+pThis could either be a typeDrawPage/type, a typeShape/type
+or a typeShapes/type./p
  */
 interface 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9c/d7d8572e79e19c8e3f6434acd6ac3d7038a225

[Caolán McNamara]

 9c/d7d8572e79e19c8e3f6434acd6ac3d7038a225 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cd7472c9be3b2d096cc87992464814f4b1012596
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 23:42:35 2013 +0100

Notes added by 'git notes add'

diff --git a/9c/d7d8572e79e19c8e3f6434acd6ac3d7038a225 
b/9c/d7d8572e79e19c8e3f6434acd6ac3d7038a225
new file mode 100644
index 000..b1f49a5
--- /dev/null
+++ b/9c/d7d8572e79e19c8e3f6434acd6ac3d7038a225
@@ -0,0 +1 @@
+merged as: 5dd816d65b4f1611970a4d9af8783c52bc4574fe
___
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' - fe/c5319e1f25d6fff47911f9c5f656770a269195

[Caolán McNamara]

 fe/c5319e1f25d6fff47911f9c5f656770a269195 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bd8d0172eca787ee783c64dc023abc22aa213057
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 23:45:35 2013 +0100

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: 3 commits - drawinglayer/drawinglayer.component drawinglayer/source filter/qa filter/source Library_merged.mk solenv/gbuild

[Peter Foley]

 Library_merged.mk   |3 -
 drawinglayer/drawinglayer.component |2 
 drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx |4 -
 filter/qa/cppunit/filters-pict-test.cxx |4 +
 filter/qa/cppunit/filters-tga-test.cxx  |4 +
 filter/qa/cppunit/filters-tiff-test.cxx |4 +
 filter/source/graphicfilter/egif/egif.cxx   |2 
 filter/source/graphicfilter/eos2met/eos2met.cxx |2 
 filter/source/graphicfilter/epbm/epbm.cxx   |2 
 filter/source/graphicfilter/epgm/epgm.cxx   |2 
 filter/source/graphicfilter/epict/epict.cxx |2 
 filter/source/graphicfilter/eppm/eppm.cxx   |2 
 filter/source/graphicfilter/eps/eps.cxx |2 
 filter/source/graphicfilter/eras/eras.cxx   |2 
 filter/source/graphicfilter/etiff/etiff.cxx |2 
 filter/source/graphicfilter/expm/expm.cxx   |2 
 filter/source/graphicfilter/idxf/idxf.cxx   |2 
 filter/source/graphicfilter/ieps/ieps.cxx   |2 
 filter/source/graphicfilter/ios2met/ios2met.cxx |2 
 filter/source/graphicfilter/ipbm/ipbm.cxx   |2 
 filter/source/graphicfilter/ipcd/ipcd.cxx   |2 
 filter/source/graphicfilter/ipcx/ipcx.cxx   |2 
 filter/source/graphicfilter/ipict/ipict.cxx |2 
 filter/source/graphicfilter/ipsd/ipsd.cxx   |2 
 filter/source/graphicfilter/iras/iras.cxx   |2 
 filter/source/graphicfilter/itga/itga.cxx   |2 
 filter/source/graphicfilter/itiff/itiff.cxx |2 
 filter/source/odfflatxml/OdfFlatXml.cxx |2 
 filter/source/odfflatxml/odfflatxml.component   |2 
 filter/source/placeware/exporter.cxx|4 -
 filter/source/placeware/zip.cxx |   26 -
 filter/source/placeware/zip.hxx |6 +-
 solenv/gbuild/LinkTarget.mk |   28 -
 solenv/gbuild/extensions/pre_MergedLibsList.mk  |   45 +++-
 34 files changed, 126 insertions(+), 50 deletions(-)

New commits:
commit bd956534b696faec24d2dbf2ca064585099d0704
Author: Peter Foley pefol...@verizon.net
Date:   Sun Apr 14 18:31:03 2013 -0400

add connectivity libs to libmerged

Change-Id: Ia82c3a036ef04e24f7494b6a5a54d01e1b5a58d2

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index a0209c8..bf4bd06 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -29,8 +29,10 @@ ifneq ($(MERGELIBS),)
 # set of libraries to link even more stuff into one merged library
 gb_EXTRAMERGEDLIBS := \
$(if $(filter unx,$(GUIBASE)),basebmp) \
+   $(call gb_Helper_optional,DBCONNECTIVITY,calc) \
chartcore \
$(call gb_Helper_optional,DBCONNECTIVITY,dba) \
+   $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
$(call gb_Helper_optional,EXPORT,egi) \
@@ -44,11 +46,13 @@ gb_EXTRAMERGEDLIBS := \
$(call gb_Helper_optional,EXPORT,eti) \
$(call gb_Helper_optional,EXPORT,exp) \
$(call gb_Helper_optional,DBCONNECTIVITY,file) \
+   $(call gb_Helper_optional,DBCONNECTIVITY,flat) \
flash \
for \
forui \
fwl \
graphicfilter \
+   $(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \
icd \
icg \
idx \
@@ -61,6 +65,10 @@ gb_EXTRAMERGEDLIBS := \
ira \
itg \
iti \
+   $(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \
+   $(call gb_Helper_optional,DBCONNECTIVITY,mork) \
+   $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
+   $(if $(filter-out ANDROID IOS,$(OS)),odbc) \
$(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
odfflatxml \
oox \
@@ -69,6 +77,7 @@ gb_EXTRAMERGEDLIBS := \
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
sd \
+   $(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \
svgfilter \
swd \
t602filter \
commit 1472c5ed16744e1ec918fdb18feaf868dd5a1c47
Author: Peter Foley pefol...@verizon.net
Date:   Sun Apr 14 17:24:38 2013 -0400

add filter libs to libmerged

Change-Id: I1891d1499aae87a87436bc9aaf4f70203dfbb585

diff --git a/Library_merged.mk b/Library_merged.mk
index 009cfb2..044df38 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -57,7 +57,8 @@ $(eval $(call gb_Library_use_externals,merged,\
jpeg \
lcms2 \
libxml2 \
-   $(call gb_Helper_optional,DESKTOP,libxslt) \
+   libxslt \
+   libexslt \
 

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

[Andre Fischer]

 vcl/inc/vcl/region.hxx|1 +
 vcl/source/gdi/region.cxx |   12 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit a5aeb9e0a0e8766ddaefb147f24ca858f0fff75b
Author: Andre Fischer a...@apache.org
Date:   Thu Jul 5 14:49:29 2012 +

Resolves: #i120096# Detect empty polygon in Region constructor...

and set impl object accordingly.

Reported by: Du Jing
Fixed by: Andre Fischer
(cherry picked from commit dbd0cea6052c5198fc960883830c3daebb989a4c)

Change-Id: I210ec0e696e673309aad64a1e157e207bea10a66

diff --git a/vcl/inc/vcl/region.hxx b/vcl/inc/vcl/region.hxx
index 9a5ed68..02eebc7 100644
--- a/vcl/inc/vcl/region.hxx
+++ b/vcl/inc/vcl/region.hxx
@@ -57,6 +57,7 @@ private:
 SAL_DLLPRIVATE void ImplCopyData();
 SAL_DLLPRIVATE void ImplCreateRectRegion( const Rectangle 
rRect );
 SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const 
PolyPolygon rPolyPoly );
+SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const 
basegfx::B2DPolyPolygon rPolyPoly );
 SAL_DLLPRIVATE void ImplPolyPolyRegionToBandRegionFunc();
 SAL_DLLPRIVATE inline void  ImplPolyPolyRegionToBandRegion();
 SAL_DLLPRIVATE const ImplRegion*ImplGetImplRegion() const { return 
mpImplRegion; }
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index b46972a..e359f59 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -1100,7 +1100,7 @@ Region::Region( const basegfx::B2DPolyPolygon rPolyPoly )
 DBG_CTOR( Region, ImplDbgTestRegion );
 DBG_CHKOBJ( rPolyPoly, PolyPolygon, NULL );
 
-mpImplRegion = new ImplRegion( rPolyPoly );
+ImplCreatePolyPolyRegion( rPolyPoly );
 }
 
 // ---
@@ -1190,6 +1190,16 @@ void Region::ImplCreatePolyPolyRegion( const 
PolyPolygon rPolyPoly )
 
 // ---
 
+void Region::ImplCreatePolyPolyRegion( const basegfx::B2DPolyPolygon 
rPolyPoly )
+{
+if (rPolyPoly.count()==0 || rPolyPoly.getB2DRange().isEmpty())
+mpImplRegion = (ImplRegion*)(aImplEmptyRegion);
+else
+mpImplRegion = new ImplRegion( rPolyPoly );
+}
+
+// ---
+
 void Region::ImplPolyPolyRegionToBandRegionFunc()
 {
 // ensure to subdivide when bezier segemnts are used, it's going to
___
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' - db/d0cea6052c5198fc960883830c3daebb989a4c

[Caolán McNamara]

 db/d0cea6052c5198fc960883830c3daebb989a4c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7865f339bbd4610ff8613e6a312df761ac6b62b4
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Apr 14 23:58:58 2013 +0100

Notes added by 'git notes add'

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

Re: [Libreoffice-commits] core.git: 3 commits - drawinglayer/drawinglayer.component drawinglayer/source filter/qa filter/source Library_merged.mk solenv/gbuild

[Rene Engelhard]

Hi,

didn't we at some point decide that only core stuff should be in
libmerged and not stuff which is not in -core or stuff which can be
split out?

On Sun, Apr 14, 2013 at 03:47:15PM -0700, Peter Foley wrote:
 + $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \
   $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
   $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
   $(call gb_Helper_optional,EXPORT,egi) \
 @@ -44,11 +46,13 @@ gb_EXTRAMERGEDLIBS := \
   $(call gb_Helper_optional,EXPORT,eti) \
   $(call gb_Helper_optional,EXPORT,exp) \
   $(call gb_Helper_optional,DBCONNECTIVITY,file) \
 + $(call gb_Helper_optional,DBCONNECTIVITY,flat) \
   flash \
   for \
   forui \
   fwl \
   graphicfilter \
 + $(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \
   icd \
   icg \
   idx \
[...]
 + $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
 + $(if $(filter-out ANDROID IOS,$(OS)),odbc) \
   $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
   odfflatxml \
   oox \
 @@ -69,6 +77,7 @@ gb_EXTRAMERGEDLIBS := \
   $(call gb_Helper_optional,PYUNO,pyuno) \
   $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
   sd \
 + $(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \
   svgfilter \
   swd \
   t602filter \

Those get moved into -base for me. (They are database drivers, and yes,
I know those are in core upstream, I consider that a bug)

And thus this commit would break my packaging if I used libmerged...

See http://packages.debian.org/experimental/amd64/libreoffice-base/filelist

Regards,

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

Re: [Libreoffice-commits] core.git: 3 commits - drawinglayer/drawinglayer.component drawinglayer/source filter/qa filter/source Library_merged.mk solenv/gbuild

[Rene Engelhard]

Hi,

On Mon, Apr 15, 2013 at 12:57:50AM +0200, Rene Engelhard wrote:
 didn't we at some point decide that only core stuff should be in
 libmerged and not stuff which is not in -core or stuff which can be
 split out?

Ah, nevermind, this is in EXTRAMERGEDLIBS, so probably only enabled with
--enable-mergelibs=all...

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

[Libreoffice-commits] core.git: Changes to 'feature/extract-tooltip'

[Tomaž Vajngerl]

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

[Libreoffice-commits] core.git: Branch 'feature/extract-tooltip' - sfx2/source

[Markus Mohrhard]

 sfx2/source/appl/sfxhelp.cxx |  125 +--
 1 file changed, 87 insertions(+), 38 deletions(-)

New commits:
commit dd80b754ca901e69323fe72a3ef62ed716c67b1f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Apr 15 01:26:29 2013 +0200

initial work on extracting tooltips from the help

Change-Id: I8cbef3b5bbc63fae946f9e53f2e8e11d7fa51df2

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 7a8ec78..7ddc8c6 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -56,6 +56,7 @@
 #include vcl/msgbox.hxx
 #include svtools/ehdl.hxx
 #include svtools/sfxecode.hxx
+#include rtl/bootstrap.hxx
 
 #include newhelp.hxx
 #include sfx2/objsh.hxx
@@ -69,6 +70,8 @@
 #include rtl/strbuf.hxx
 #include rtl/string.hxx
 
+#include boost/scoped_ptr.hpp
+
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::uno;
@@ -206,28 +209,19 @@ private:
 std::set  OString  m_aIds;
 
 public:
-SfxHelpOptions_Impl();
-~SfxHelpOptions_Impl();
+SfxHelpOptions_Impl();
+~SfxHelpOptions_Impl();
 
-boolHasId( const OString rId ) { return m_aIds.size() ? 
m_aIds.find( rId ) != m_aIds.end() : false; }
-virtual voidNotify( const com::sun::star::uno::Sequence 
OUString  aPropertyNames );
-virtual voidCommit();
+bool HasId( const OString rId ) { return m_aIds.size() ? m_aIds.find( rId 
) != m_aIds.end() : false; }
+virtual void Notify( const com::sun::star::uno::Sequence OUString  
aPropertyNames );
+virtual void Commit();
 };
 
 static Sequence OUString  GetPropertyNames()
 {
-static const char* aPropNames[] =
-{
-HelpAgentStarterList,
-};
-
-const int nCount = sizeof( aPropNames ) / sizeof( const char* );
-Sequence OUString  aNames( nCount );
+Sequence OUString  aNames( 1 );
 OUString* pNames = aNames.getArray();
-OUString* pEnd   = pNames + aNames.getLength();
-int i = 0;
-for ( ; pNames != pEnd; ++pNames )
-*pNames = OUString::createFromAscii( aPropNames[i++] );
+pNames[0] = OUString( HelpAgentStarterList );
 
 return aNames;
 }
@@ -298,21 +292,25 @@ void SfxHelpOptions_Impl::Commit()
 class SfxHelp_Impl
 {
 private:
-SfxHelpOptions_Impl*m_pOpt; // the options
-::std::vector OUString m_aModulesList; // list of all installed 
modules
+SfxHelpOptions_Impl* m_pOpt; // the options
+
+typedef std::map OUString, OUString  IdToTextType;
+typedef std::map OUString, IdToTextType  ModuleToTooltipsType;
+ModuleToTooltipsType maToolTips;
+
+OUString GetHelpText_Impl( const OUString rCommandURL, const OUString 
rModule );
+IdToTextType loadHelpStrings( const OUString rModule );
 
 public:
 SfxHelp_Impl();
 ~SfxHelp_Impl();
 
-SfxHelpOptions_Impl*GetOptions();
-static OUString GetHelpText( const OUString aCommandURL, const 
OUString rModule );
+SfxHelpOptions_Impl* GetOptions();
+OUString GetHelpText( const OUString aCommandURL, const OUString rModule 
);
 };
 
 SfxHelp_Impl::SfxHelp_Impl() :
-
-m_pOpt  ( NULL )
-
+m_pOpt ( NULL )
 {
 }
 
@@ -321,17 +319,70 @@ SfxHelp_Impl::~SfxHelp_Impl()
 delete m_pOpt;
 }
 
+std::mapOUString, OUString SfxHelp_Impl::loadHelpStrings( const OUString 
rModule)
+{
+IdToTextType aRet;
+OUString uri($BRAND_BASE_DIR/program/resource/);
+rtl::Bootstrap::expandMacros(uri);
+OUString aFileURL = uri + rModule + .properties;
+SAL_WARN(sfx2.appl, file url:   aFileURL);
+boost::scoped_ptrSvFileStream pStrm( new SvFileStream( aFileURL, 
(STREAM_READ| STREAM_SHARE_DENYWRITE | STREAM_NOCREATE) ) );
+if( pStrm-GetError() == 0 )
+{
+bool bRead = true;
+while(bRead)
+{
+OUString aLine;
+bRead = pStrm-ReadByteStringLine(aLine, RTL_TEXTENCODING_UTF8);
+if(bRead)
+{
+sal_Int32 nIndex = 0;
+OUString aId = aLine.getToken(0, '=', nIndex);
+SAL_WARN_IF(nIndex == -1, sfx.appl, not a valid line);
+if(nIndex != -1)
+{
+OUString aValue = aLine.copy(nIndex);
+aRet.insert( std::pair OUString, OUString ( aId, aValue 
) );
+SAL_WARN(sfx2.appl, added help string with id:   aId 
  and value:   aValue);
+}
+}
+}
+}
+else
+{
+SAL_WARN(sfx2.appl, problem opening tooltip file:   aFileURL);
+}
+
+return aRet;
+}
+
+OUString SfxHelp_Impl::GetHelpText_Impl( const OUString rCommandURL, const 
OUString rModule )
+{
+ModuleToTooltipsType::const_iterator itr = maToolTips.find(rModule);
+
+if(itr == maToolTips.end())
+{
+IdToTextType aHelpTexts = loadHelpStrings(rModule);
+itr = 

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

[Lionel Elie Mamane]

 connectivity/source/drivers/odbcbase/OTools.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit a63c9bac6a6223ac716b7bcb590dac4eb01d5def
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Apr 15 01:27:39 2013 +0200

fdo#61142 mixup between size and length

Change-Id: Ia2903d5139378e97bb2e8d00ccb2c213d3e1dee6

diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx 
b/connectivity/source/drivers/odbcbase/OTools.cxx
index 3e3f393..4f85184 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -424,11 +424,15 @@ OUString OTools::getStringValue(OConnection* _pConnection,
 // we assume everyone (LibO  ODBC) uses UTF-16; see 
OPreparedStatement::setParameter
 BOOST_STATIC_ASSERT(sizeof(sal_Unicode) == 2);
 BOOST_STATIC_ASSERT(sizeof(SQLWCHAR)== 2);
+BOOST_STATIC_ASSERT(sizeof(waCharArray) % 2 == 0);
+// Size == number of bytes, Len == number of UTF-16 code units
+const SQLLEN nMaxSize = sizeof(waCharArray);
+const SQLLEN nMaxLen  = sizeof(waCharArray) / sizeof(sal_Unicode);
+BOOST_STATIC_ASSERT(nMaxLen * sizeof(sal_Unicode) == nMaxSize);
+
 // read the unicode data
-const SQLLEN nMaxLen = sizeof(waCharArray) / sizeof(sal_Unicode);
 SQLLEN pcbValue = SQL_NO_TOTAL;
-
-while ((pcbValue == SQL_NO_TOTAL ) || (pcbValue = nMaxLen) )
+while ((pcbValue == SQL_NO_TOTAL ) || (pcbValue = nMaxSize) )
 {
 OTools::ThrowException(_pConnection,

(*(T3SQLGetData)_pConnection-getOdbcFunction(ODBC3SQLGetData))(
@@ -446,7 +450,7 @@ OUString OTools::getStringValue(OConnection* _pConnection,
 SQLLEN nReadChars;
 OSL_ENSURE( (pcbValue  0) || (pcbValue % 2 == 0),
 ODBC: SQLGetData of SQL_C_WCHAR returned odd number 
of bytes);
-if ( (pcbValue == SQL_NO_TOTAL) || (pcbValue = nMaxLen) )
+if ( (pcbValue == SQL_NO_TOTAL) || (pcbValue = nMaxSize) )
 {
 // we filled the buffer; remove the terminating null character
 nReadChars = nMaxLen-1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] fdo#61142 mixup between size and length

[Lionel Elie Mamane (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3385

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3385/1

fdo#61142 mixup between size and length

Change-Id: Ia2903d5139378e97bb2e8d00ccb2c213d3e1dee6
---
M connectivity/source/drivers/odbcbase/OTools.cxx
1 file changed, 9 insertions(+), 5 deletions(-)



diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx 
b/connectivity/source/drivers/odbcbase/OTools.cxx
index d568b7f..7165c4d 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -424,11 +424,15 @@
 // we assume everyone (LibO  ODBC) uses UTF-16; see 
OPreparedStatement::setParameter
 BOOST_STATIC_ASSERT(sizeof(sal_Unicode) == 2);
 BOOST_STATIC_ASSERT(sizeof(SQLWCHAR)== 2);
-// read the unicode data
-const SQLLEN nMaxLen = sizeof(waCharArray) / sizeof(sal_Unicode);
-SQLLEN pcbValue = SQL_NO_TOTAL;
+BOOST_STATIC_ASSERT(sizeof(waCharArray) % 2 == 0);
+// Size == number of bytes, Len == number of UTF-16 code units
+const SQLLEN nMaxSize = sizeof(waCharArray);
+const SQLLEN nMaxLen  = sizeof(waCharArray) / sizeof(sal_Unicode);
+BOOST_STATIC_ASSERT(nMaxLen * sizeof(sal_Unicode) == nMaxSize);
 
-while ((pcbValue == SQL_NO_TOTAL ) || (pcbValue = nMaxLen) )
+// read the unicode data
+SQLLEN pcbValue = SQL_NO_TOTAL;
+while ((pcbValue == SQL_NO_TOTAL ) || (pcbValue = nMaxSize) )
 {
 OTools::ThrowException(_pConnection,

(*(T3SQLGetData)_pConnection-getOdbcFunction(ODBC3SQLGetData))(
@@ -446,7 +450,7 @@
 SQLLEN nReadChars;
 OSL_ENSURE( (pcbValue  0) || (pcbValue % 2 == 0),
 ODBC: SQLGetData of SQL_C_WCHAR returned odd number 
of bytes);
-if ( (pcbValue == SQL_NO_TOTAL) || (pcbValue = nMaxLen) )
+if ( (pcbValue == SQL_NO_TOTAL) || (pcbValue = nMaxSize) )
 {
 // we filled the buffer; remove the terminating null character
 nReadChars = nMaxLen-1;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2903d5139378e97bb2e8d00ccb2c213d3e1dee6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu

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

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

[Oliver-Rainer Wittmann]

 sw/source/filter/ww8/wrtww8gr.cxx |   50 --
 1 file changed, 38 insertions(+), 12 deletions(-)

New commits:
commit 7f71ed1c62775a4e5b2efebf55f284a5c32b2df4
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Jul 6 07:07:48 2012 +

Resolves: #i119567# wmf in PICT assure correct scaling...

in case that the size is substituted.

Found by: Yan Ji yanji.yj at gmail dot com
Patch by: zjchen zjchencdl at gmail dot com
Review by: Oliver orw at apache dot org
(cherry picked from commit 69ea079e09f64ac037686f874617efc63d0449f5)

Change-Id: I1eb4b0be184fcefca26eee5f98ba6135a32574c2

diff --git a/sw/source/filter/ww8/wrtww8gr.cxx 
b/sw/source/filter/ww8/wrtww8gr.cxx
index 74f46da..32c5b2e 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -630,8 +630,9 @@ void SwWW8WrGrf::WritePICFHeader(SvStream rStrm, const 
sw::Frame rFly,
 substitute the final size and loose on retaining the scaling factor but
 still keep the correct display size anyway.
 */
-if ( (aGrTwipSz.Width()  SHRT_MAX) || (aGrTwipSz.Height()  SHRT_MAX)
-|| (aGrTwipSz.Width()  0 ) || (aGrTwipSz.Height()  0) )
+const bool bIsSubstitutedSize = (aGrTwipSz.Width()  SHRT_MAX) || 
(aGrTwipSz.Height()  SHRT_MAX) ||
+(aGrTwipSz.Width()  0 ) || 
(aGrTwipSz.Height()  0);
+if ( bIsSubstitutedSize )
 {
 aGrTwipSz.Width() = nWidth;
 aGrTwipSz.Height() = nHeight;
@@ -646,26 +647,51 @@ void SwWW8WrGrf::WritePICFHeader(SvStream rStrm, const 
sw::Frame rFly,
 Set_UInt16(pArr, msword_castsal_uInt16(aGrTwipSz.Width()));
 Set_UInt16(pArr, msword_castsal_uInt16(aGrTwipSz.Height()));
 
-if( aGrTwipSz.Width() + nXSizeAdd ) // set mx
+if ( aGrTwipSz.Width() + nXSizeAdd ) // set mx
 {
-double fVal = nWidth * 1000.0 / (aGrTwipSz.Width() + nXSizeAdd);
-Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) );
+if ( !bIsSubstitutedSize )
+{
+const double fVal = nWidth * 1000.0 / (aGrTwipSz.Width() + 
nXSizeAdd );
+Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) );
+}
+else
+{
+Set_UInt16( pArr, 1000 );
+}
 }
 else
+{
 pArr += 2;
+}
 
-if( aGrTwipSz.Height() + nYSizeAdd )// set my
+if ( aGrTwipSz.Height() + nYSizeAdd )// set my
 {
-double fVal = nHeight * 1000.0 / (aGrTwipSz.Height() + nYSizeAdd);
-Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) );
+if ( !bIsSubstitutedSize )
+{
+const double fVal = nHeight * 1000.0 / (aGrTwipSz.Height() + 
nYSizeAdd);
+Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) );
+}
+else
+{
+Set_UInt16( pArr, 1000 );
+}
 }
 else
+{
 pArr += 2;
+}
 
-Set_UInt16( pArr, nCropL ); // set dxaCropLeft
-Set_UInt16( pArr, nCropT ); // set dyaCropTop
-Set_UInt16( pArr, nCropR ); // set dxaCropRight
-Set_UInt16( pArr, nCropB ); // set dyaCropBottom
+if ( !bIsSubstitutedSize )
+{
+Set_UInt16( pArr, nCropL ); // set dxaCropLeft
+Set_UInt16( pArr, nCropT ); // set dyaCropTop
+Set_UInt16( pArr, nCropR ); // set dxaCropRight
+Set_UInt16( pArr, nCropB ); // set dyaCropBottom
+}
+else
+{
+pArr += 8;
+}
 
 rStrm.Write( aArr, nHdrLen );
 }
___
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' - 69/ea079e09f64ac037686f874617efc63d0449f5

[Caolán McNamara]

 69/ea079e09f64ac037686f874617efc63d0449f5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f1c445ab7ad7780be21885bb12ec622583d464f2
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Apr 15 02:19:55 2013 +0100

Notes added by 'git notes add'

diff --git a/69/ea079e09f64ac037686f874617efc63d0449f5 
b/69/ea079e09f64ac037686f874617efc63d0449f5
new file mode 100644
index 000..385ed09
--- /dev/null
+++ b/69/ea079e09f64ac037686f874617efc63d0449f5
@@ -0,0 +1 @@
+merged as: 7f71ed1c62775a4e5b2efebf55f284a5c32b2df4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Depends on||62073

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Depends on|62073   |

--- Comment #215 from Joel Madero jmadero@gmail.com ---
Added 62073 - copy/paste of a line in impress results in a change in size for
bullets, ctrl + z doesn't undo the changed bullet size -- common feature,
prevents high quality work

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

Enhancements - Getting User Input

[Joel Madero]

Hi All,

Is there any way that we could get a user voted enhancement per release 
system going? This might be a great way to get users involved and excited.


My proposal:

We select 10-15 possible enhancements that can be completed in a 
reasonably short period of time (within a minor release). We blog about 
this (I can do this) with a simple poll. We then announce this to the 
user list and make some PR announcement about we are listening to what 
you think!. Allowing this would limit the list to enhancements that we 
agree can be done in a short period but open up which enhancement to 
the wider community.


My thought is we attempt this for our next release in 4.1


Thoughts?

Included devs and QA as both are involved with this decision.



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

Re: [Libreoffice-qa] [Moztrap] Question for Test Case #305

[Thomas Hackert]

Hello Yifan, *,
On Sat, Apr 13, 2013 at 11:26:33PM -0600, Yi Fan Jiang wrote:
 Your revising is obviously better,


to me it still sounds a litte bit strange ... :(

 thanks for the detailed review, which is

You are welcome :)

 what I always wanted to do :) The current test cases descriptions are 
 far less than perfect, so fixing these wording problems at any time are 
 pretty valuable and appreciated.

G

 Would you please help to update the English version as well? Thanks!

Well, I have done it in the past, when I was sure, that something was
wrong ... ;) But ... As I am not a native speaker of the English
language (and my last English lesson was years ago, so I forgot too many
things ... :( ), I would prefer someone more knowledgeable than me to
have a look at the test cases (but the Wiki pages about QA/testing as
well ... ;) ) ... ;)
Have a nice day
Thomas.
TOFU removed

-- 
NP: Math The Band – Ode to Carjackers
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] [Moztrap] Question for Test Case #305

[Yi Fan Jiang]

Hi Thomas,

I see, it is better to have people reviewing the cases. Before that, I think 
the way
we are working on is also good to optimize test case:

  Some one write cases - people find it unclear or buggy - update test case 
to be more understandable

BTW, I didn't comment on more details in caseversion#305 because I saw the 
problematic wording in the steps description as well. Do you mind if I try to 
update the case next week, though I am not a native speaker either :)

Best wishes,
Yifan

 Thomas Hackert thack...@nexgo.de 04/14/13 3:04 PM 

 Would you please help to update the English version as well? Thanks!

Well, I have done it in the past, when I was sure, that something was
wrong ... ;) But ... As I am not a native speaker of the English
language (and my last English lesson was years ago, so I forgot too many
things ... :( ), I would prefer someone more knowledgeable than me to
have a look at the test cases (but the Wiki pages about QA/testing as
well ... ;) ) ... ;)
Have a nice day
Thomas.
TOFU removed

-- 
NP: Math The Band – Ode to Carjackers
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] [Moztrap] Question for Test Case #305

[Thomas Hackert]

Hello Yi Fan, *,
On Sonntag, 14. April 2013 09:29 Yi Fan Jiang wrote:
 I see, it is better to have people reviewing the cases. Before
 that, I think the way we are working on is also good to optimize
 test case:

OK

   Some one write cases - people find it unclear or buggy -
   update test case to be more understandable

But only, if one know, what they should mean ... ;)

 BTW, I didn't comment on more details in caseversion#305 because I
 saw the problematic wording in the steps description as well. Do
 you mind if I try to update the case next week, though I am not a
 native speaker either :)

Yes, please :) I will translate it then next weekend, and – if I 
find any unclear steps, descriptions or the like – will report back 
here ... ;)
Have a nice afternoon
Thomas.

TOFU removed

-- 
The sky is blue so we know where to stop mowing.
-- Judge Harold T. Stone

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] [Moztrap] Confusion in Test case #289

[Thomas Hackert]

Hello Yifan, *,
sorry again for the inconvenience, but I think something went wrong 
in test case 289 
(http://vm12.documentfoundation.org/manage/caseversion/289/) ... :(

As test description there is

quote
launch Libreoffice Writer/Base/Impress/Draw/Math respectively and 
Press F1 The help page of corresponding libreofffice component would 
be opened in the web browser, the content should be shown in your 
own language. install libreoffice help package of your own language 
(vp.3)
/quote

, but in its results there is

quote
4. the main help page of libreofffice would be opened in a 
standalone native Libreoffice help window, the content should be 
shown in your own language. Launch Libreoffice 
Writer/Base/Impress/Draw/Math respectively and Press F1 The help 
page of corresponding libreofffice component would be opened in a 
standalone native Libreoffice help window, the content should be 
shown in your own language.
/quote

... Could it be, that you mixed the test run with its expected 
results for some reason?

And it would be nice, if you could use an uniform spelling for 
LibreOffice throughout the tests ... ;)

Sorry for the inconvenience again
Thomas.

-- 
NP: Anthares – Summer Wind

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] Version in fdo version picker for SI-GUI

[Florian Reisinger]

Hi :)

I hope you don't mind a so short mail for a such important topic :)

As this (SI-GUI) is now an official LibreOffice project I lost the
tracker at github

All I want is 1 (one) version in the drop down list and me as default
assignee for that component.

I really hope, that this is possible :)

Liebe Grüße, / Yours,
Florian Reisinger
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] How to exclude Bugzilla Sub Components from BSA

[Rainer Bielefeld]

Hi,

some of our Sub Components have been created to grant easy and 
effective queries, but it is rather improbable that someone using the 
BSA will need these Sub Component for a bug report. Such Sub components 
can be defined on the help pages for the components as I demonstrated 
for Tinderbox on

https://wiki.documentfoundation.org/BugzAssHlp_WWW_long

Adventages and possible disadvantages see on Talk page there. Please 
feel free to add more thoughts.


How that can work for a Component without separate help template I 
demonstarte here

https://wiki.documentfoundation.org/QA/BSA/BugReport_Details#Presentation

@Joel: I hope that will not break BSA update functions, but I am optimistic.

Best regards


Rainer
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Version in fdo version picker for SI-GUI

[Rainer Bielefeld]

Florian Reisinger schrieb:


As this (SI-GUI) is now an official LibreOffice project I lost the
tracker at github


Hi Florian,

thank you for the great tool. I will take your request to the wishlist. 
Joel and I stumbled upon several inconsistencies and some incompleteness 
in the Bugzilla Components system, and I promised to create a draft of a 
ToDo for further discussion in the Wiki End of April.


Currently I think that SI-GUI will not produce many Bug reports, so that 
an own component might be a little excessive. A quick solution I will 
promise here in few minutes.


Best regards


Rainer
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Version in fdo version picker for SI-GUI

[Florian Reisinger]

Hi :)

My current solution: link to this page:
https://bugs.freedesktop.org/enter_bug.cgi?alias=assigned_to=reisi007%40gmail.comattach_text=blocked=bug_file_loc=http%3A%2F%2Fflosmind.wordpress.com%2Flibreoffice-server-install-gui%2Fbug_severity=normalbug_status=UNCONFIRMEDcomment=component=Extensionscontenttypeentry=contenttypemethod=listcontenttypeselection=text%2Fplaindata=dependson=description=form_name=enter_bugkeywords=maketemplate=Remember%20values%20as%20bookmarkable%20templateop_sys=Windows%20%28All%29priority=mediumproduct=LibreOfficeqa_contact=rep_platform=Allshort_desc=%5Bsi-gui%5Dversion=unspecified

Just wanted to let you know :)

Liebe Grüße, / Yours,
Florian Reisinger

Am 14.04.2013 um 18:30 schrieb Rainer Bielefeld 
libreoff...@bielefeldundbuss.de:

Florian Reisinger schrieb:

As this (SI-GUI) is now an official LibreOffice project I lost the

tracker at github


Hi Florian,

thank you for the great tool. I will take your request to the wishlist.
Joel and I stumbled upon several inconsistencies and some incompleteness in
the Bugzilla Components system, and I promised to create a draft of a ToDo
for further discussion in the Wiki End of April.

Currently I think that SI-GUI will not produce many Bug reports, so that an
own component might be a little excessive. A quick solution I will promise
here in few minutes.

Best regards


Rainer
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Version in fdo version picker for SI-GUI

[Rainer Bielefeld]

Florian Reisinger schrieb:

Hi Florian,

how will distribution be in future? A solution with Extensions website 
(what will need the latest build there) or will you remove SI-GUI from 
there and only contribute links on the QA Wiki pages and similar?


Best regards


Rainer
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Version in fdo version picker for SI-GUI

[Florian Reisinger]

Am 14.04.2013 um 18:39 schrieb Rainer Bielefeld 
libreoff...@bielefeldundbuss.de:

Florian Reisinger schrieb:

Hi Florian,

how will distribution be in future? A solution with Extensions website
(what will need the latest build there) or will you remove SI-GUI from
there and only contribute links on the QA Wiki pages and similar?


Difficult to say... Unless there is a change in location the setup.exe @
extensions.libreoffice.org should work in the same way as the setup.exe
versions from dev-builds.libreoffice.org - Both are downloading the latest
version. THAT is why I ask for 1 version -- Within 3 days everyone should
get a prompt update available so only master is needed

BTW: The great job on the wiki is mostly done by Robinson (by the way: A
big Thank you for that :) )


*What the distribution system is like (in short):* Everyone gets the latest
version, when the .exe points there. I will not update
extensions.libreoffice.org (unless - location change) or any wiki page
(wiki - unless visual editor) in the near future, but the information
should be up-to-date for a quite long time, so that it does not really
matter
(I hope everyone understands that... Rephrased: *Rolling releases, with an
online installer + updater,* which tries to *download the latest
version*from an specific URL.
*That will work unless the URL changes...*)

Really hope that this helps :)


Best regards


Rainer


Liebe Grüße, / Yours,
Florian Reisinger
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Version in fdo version picker for SI-GUI

[Rainer Bielefeld]

Hi Florian


Here a quick solution keeping the current Extensions Component with 
correct Bugzilla Syntax you see on

https://wiki.documentfoundation.org/BugReport_Details#Extensions
 until we have a final decision. Unfortunately (of course) the SI-GUI 
name will break consistence with older reports (Server Installation 
GUI), but that should not be a big problem.


The Sub Component will not appear in BSA Picker

If you do not want to keep Extensions Website up to date with latest 
builds you should leave a link to the now download location in the 
Version description or elsewhere.


And yes, I am happy that we are getting some progress in QA Wiki what 
was very outdated and with unclear structure.


CU

Rainer
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] How to exclude Bugzilla Sub Components from BSA

[Joel Madero]

On 04/14/2013 08:50 AM, Rainer Bielefeld wrote:

Hi,

some of our Sub Components have been created to grant easy and 
effective queries, but it is rather improbable that someone using the 
BSA will need these Sub Component for a bug report. Such Sub 
components can be defined on the help pages for the components as I 
demonstrated for Tinderbox on

https://wiki.documentfoundation.org/BugzAssHlp_WWW_long

Adventages and possible disadvantages see on Talk page there. Please 
feel free to add more thoughts.


How that can work for a Component without separate help template I 
demonstarte here
https://wiki.documentfoundation.org/QA/BSA/BugReport_Details#Presentation 



@Joel: I hope that will not break BSA update functions, but I am 
optimistic.


Best regards


Rainer
+1, I think that this is a great idea. Adding Rob to the discussion as 
BSA is his project.


Rob - can this be done? I think the more basic BSA is the better in 
terms of our user experience.



Best,
Joel
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] [libreoffice-website] Ask: How can we interoperate with QA and Bugzilla?

[Joel Madero]

On 04/13/2013 06:02 PM, Robinson Tryon wrote:

[cc'd QA list as this is relevant to their interests]

One of the perennial questions about the Ask site is How do we
interoperate with QA (and the QA Team) and Bugzilla?

We often get questions on the Ask site such as this:

http://ask.libreoffice.org/en/question/16015/excel-xml-2003-file-gives-general-error/

I have a file in 2003 xml format that Excel happily accepts but
LibreOffice gives a General error when it tries to open it. Any
ideas?

It would be easy to send the user directly to FDO, but the bug tracker
can be a scary place. Often we send a user over there, and they ping
us back on the Ask site when they haven't received a response to their
bug. Sometime their bug will get marked 'NEEDINFO' or 'NO REPRO', but
the user might not know what they need to do next.

I think that the QA Team and the active users of the Ask site need to
get a bit more friendly, and perhaps share some ideas about how to
best help our users. If you think about it, we do a lot of the same
things:

- Users come to us with problems
- We try to triage the reports
- We ask for more information
- We try to provide solutions or find someone who can

One thing that could help our process would be to make it easier to
take a question from the Ask site and send it to FDO.


yes indeed this would be great. I think one pointer can be asking users 
to add the link to their ask page in the URL section of FDO - this will 
alert triagers/QA staff that this originated on Ask site.





I've started some guidelines on when we should send a Question to
FDO[1], but I'd like more input from our contributors. The bugtracker
is really optimal for things like
- reproducing bugs
- keeping track of the details required for repro (OS, LO version, etc..)
- interacting with developers

To improve the guidelines, it would be great to have QA folks use the
Ask site more, and have Ask site members be more involved with QA. I
know that a number of people on the Ask site are already involved in
QA, including Pedro, Manfred, Rainer, etc.., and I know that I've seen
QA folks such as Joren and Joel over on the Ask site :-)
Only a tiny bit ;) I think we can/should ask ALL members of QA to get 
familiar with Ask and ALL contributors from the ask site to get familiar 
with FDO (including starting an account and perhaps triaging a little so 
they get familiar with how to recommend users to create good bug 
reports that don't get tossed back into NEEDINFO state.


If anyone has suggestions on how we can improve our communication or
collaboration, please ping me directly or via the list. I'd like to
hear from more of you!


My suggestion is to start by encouraging both sides to get familiar with 
the counterpart (FDO people get familiar with Ask, Ask get familiar with 
FDO). Once we are familiar we can come up with concrete ideas to make 
interoperability better. I really like the idea of an Ask button that 
generates a bug report - perhaps making it submit through BSA would 
work? Should we get Rob involved with this discussion?


Another thing is I think that people at Ask should encourage very active 
users to go from user to contributor - QA side has gotten quite direct 
about asking users to get involved and it has been relatively 
successful. I'm not sure if this is the case with Ask but in general, 
both teams need more people.


Together, I think that we can improve both the Ask site and QA, and
make the LibreOffice support system a less scary and more responsive
experience for our users.


I completely agree with this - perhaps some basic tutorials are in 
demand, walkthroughs of how to use FDO and how to use Ask properly. 
Maybe documentation can help us there,  else we can tackle it ourselves.



Best,
Joel
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] Enhancements - Getting User Input

[Joel Madero]

Hi All,

Is there any way that we could get a user voted enhancement per release 
system going? This might be a great way to get users involved and excited.


My proposal:

We select 10-15 possible enhancements that can be completed in a 
reasonably short period of time (within a minor release). We blog about 
this (I can do this) with a simple poll. We then announce this to the 
user list and make some PR announcement about we are listening to what 
you think!. Allowing this would limit the list to enhancements that we 
agree can be done in a short period but open up which enhancement to 
the wider community.


My thought is we attempt this for our next release in 4.1


Thoughts?

Included devs and QA as both are involved with this decision.



Best,
Joel
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 53725] Instant Word count: Does not work, Python Error Message

[bugzilla-daemon]

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

Yawar Amin yawar.a...@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1

--- Comment #4 from Yawar Amin yawar.a...@gmail.com ---
Leif,

Yikes. I've really slacked off on this one :-)

The error is because of a vestigial `print' statement in the wc.py file. Since
recent versions of OOo/LibO are using Python 3, the print statement should be
turned into a print function--basically line 54 should be changed from `print
...' to `print(...)'.

However even after this change I seem to be having some trouble with counting
words in a selection. Working on this now in the BitBucket repo at
https://bitbucket.org/yawaramin/oo.o-live-word-count/overview

If anyone can help debug that, would appreciate. Contact me for details

Thanks,

Yawar

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

[Libreoffice-bugs] [Bug 48145] FILEOPEN File Encryption Password protected document.odt impossible

[bugzilla-daemon]

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

Rainer Bielefeld libreoff...@bielefeldundbuss.de changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |INVALID

--- Comment #2 from Rainer Bielefeld libreoff...@bielefeldundbuss.de ---
Closing Bug due to reporter's inactivity as INVALID due to lacking information.

@reporter:
Please feel free to reopen this bug if you find out that the problem still
exists with the current stable LibreOffice version and if you can contribute
requested additional information due to
http://wiki.documentfoundation.org/BugReport (especially BugReport Details)!

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

[Libreoffice-bugs] [Bug 48274] EDITING: Fill disabled if hidden (or filtered) cells in range instead of filling omitting invisible cells

[bugzilla-daemon]

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

Rainer Bielefeld libreoff...@bielefeldundbuss.de changed:

   What|Removed |Added

 Status|NEEDINFO|NEW
 CC||er...@redhat.com,
   ||kohei.yosh...@suse.de,
   ||markus.mohrhard@googlemail.
   ||com
Version|3.5.1 release   |3.3.0 Beta2

--- Comment #2 from Rainer Bielefeld libreoff...@bielefeldundbuss.de ---
Still [Reproducible] with parallel Dev-installation of  Version
4.1.0.0.alpha0+ (Build ID: 049ce78144650d92eb6bd73292868f73d37c901) TinderBox:
Win-x86@6, Branch:master, Pull Time: 2013-03-29_23:59:42 ENGLISH UI / German
Locale on German WIN7 Home Premium (64bit) with LODev/4 Masters User Profile 

Already [Reproducible] with Server Installation of LibreOffice 3.3.3  English
UI/ German Locale [OOO330m19 (Build:301) tag libreoffice-3.3.3.1] on German
WIN7 Home Premium (64bit) 

I can't find a DUP, so NEW.

Additional info:
Same with AOOo 3.4.0, so probably inherited from OOo
Same with Symphony and still with AOOo 4 Master
Softmaker FreeOffice: Fill is active, but overwrites hidden cells, even worse!
(Old) Gnumeric: Copa/past overwrites hidden cells, I did not find a Fill
function

@Spreadsheet Team
Please change  Status to ASSIGNED and add yourself to Assigned To if you
accept this Bug or forward the Bug if it's not your turf (and remove others in
team from CC).

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

[Libreoffice-bugs] [Bug 48144] VIEWING menus and dialogs: Text strings missing with desktop composition

[bugzilla-daemon]

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

--- Comment #7 from Eric eriks.a.peters...@gmail.com ---
I think there is nothing to do in LO, because the problem was gone.

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

[Libreoffice-bugs] [Bug 62470] FORMATING: incorrect matching of border lines in 'Table Format' dialog for RTL Table

[bugzilla-daemon]

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

--- Comment #5 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Faisal M. Al-Otaibi committed a patch related to this issue.
It has been pushed to master:

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

more fix to fdo#62470



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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

[Libreoffice-bugs] [Bug 53725] Instant Word count: Does not work, Python Error Message

[bugzilla-daemon]

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

Yawar Amin yawar.a...@gmail.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #5 from Yawar Amin yawar.a...@gmail.com ---
OK. Selection word count bug fixed and code simplified. Leif, can you package
the new version I've just pushed to BitBucket?

Thanks

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

[Libreoffice-bugs] [Bug 52179] Libreoffice base copies from wrong row of a read-only table control with Ctrl+C

[bugzilla-daemon]

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

Lionel Elie Mamane lio...@mamane.lu changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |lio...@mamane.lu
   |desktop.org |
Summary|: Libreoffice base copies   |Libreoffice base copies
   |wrong fields of a table |from wrong row of a
   |control with Ctrl+C |read-only table control
   ||with Ctrl+C

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

[Libreoffice-bugs] [Bug 54052] Improvement - PDF export defaults in Options/General

[bugzilla-daemon]

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

Jorendc joren.libreoff...@telenet.be changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 CC||joren.libreoffice@telenet.b
   ||e
 Ever confirmed|0   |1

--- Comment #1 from Jorendc joren.libreoff...@telenet.be ---
Thanks for reporting. This is a valid user request. Therefore I mark it as NEW.

Kind regards,
Joren

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

[Libreoffice-bugs] [Bug 63508] FILESAVE : TextBox.font not saved

[bugzilla-daemon]

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

--- Comment #1 from Laurent lvergneal...@free.fr ---
Sorry, this bug is already described under bug 49249 (New status)

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