date:20130603

[Libreoffice-commits] core.git: helpcontent2

2013-06-03 Thread Andras Timar

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

New commits:
commit f84c1627328fdcede824b52d30681eef3b7ddaca
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 08:17:11 2013 +0200

Updated core
Project: help  5c702bf0306d4a922ab2a66ded71bdc8f68e6b5a

diff --git a/helpcontent2 b/helpcontent2
index 1d9d3ac..5c702bf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1d9d3acc0df264a436b5ae719f13b2967a796ea8
+Subproject commit 5c702bf0306d4a922ab2a66ded71bdc8f68e6b5a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Andras Timar

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

New commits:
commit 3c524d5d6df2d5c9b7e3ff4342c1c573a9bde85b
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 08:17:11 2013 +0200

Updated core
Project: help  2957f1aef6f46ba1472f7e62c0617c3ddbbdb92f

diff --git a/helpcontent2 b/helpcontent2
index a33e3d2..2957f1a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a33e3d2f0dfbd43a9cbbf6b84436204c6e45ffbc
+Subproject commit 2957f1aef6f46ba1472f7e62c0617c3ddbbdb92f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Andras Timar

 source/text/shared/01/06202000.xhp   |2 +-
 source/text/shared/02/01170101.xhp   |2 +-
 source/text/shared/02/limit.xhp  |2 +-
 source/text/simpress/02/1003.xhp |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2957f1aef6f46ba1472f7e62c0617c3ddbbdb92f
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 08:17:11 2013 +0200

fix the the, a a

Change-Id: Ib1dee95fc5b9cfbfe5a731ea749b8db6c34ba875

diff --git a/source/text/shared/01/06202000.xhp 
b/source/text/shared/01/06202000.xhp
index 1b347b2..4b1afe3 100644
--- a/source/text/shared/01/06202000.xhp
+++ b/source/text/shared/01/06202000.xhp
@@ -34,7 +34,7 @@
 bookmark xml-lang=en-US 
branch=hid/cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK 
id=bm_id9376506 localize=false/paragraph role=heading id=par_idN1055F 
xml-lang=en-US level=2 l10n=NEWBook/paragraph
 paragraph role=paragraph id=par_idN10563 xml-lang=en-US 
l10n=NEWahelp 
hid=svx:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOKSelect the user-defined 
dictionary that you want to edit./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL 
id=bm_id6413159 localize=false/paragraph role=heading id=par_idN1057A 
xml-lang=en-US level=2 l10n=NEWOriginal/paragraph
-paragraph role=paragraph id=par_idN1057E xml-lang=en-US 
l10n=NEWahelp 
hid=svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINALSelect the entry 
in the current dictionary that you want to edit. If you want, you can also type 
a new entry in this box./ahelp To move from the Original box to the the first 
text box in the Suggestions area, press Enter./paragraph
+paragraph role=paragraph id=par_idN1057E xml-lang=en-US 
l10n=NEWahelp 
hid=svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINALSelect the entry 
in the current dictionary that you want to edit. If you want, you can also type 
a new entry in this box./ahelp To move from the Original box to the first 
text box in the Suggestions area, press Enter./paragraph
 !-- removed HID svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHAR 
--paragraph role=heading id=par_idN10596 xml-lang=en-US level=2 
l10n=NEWReplace by character/paragraph
 paragraph role=paragraph id=par_idN1059A xml-lang=en-US 
l10n=NEWahelp 
hid=svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHARConverts the 
text on a character by character basis and not on a word by word 
basis./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1 id=bm_id6543778 
localize=false/
diff --git a/source/text/shared/02/01170101.xhp 
b/source/text/shared/02/01170101.xhp
index 7b80ccc..00815ed 100644
--- a/source/text/shared/02/01170101.xhp
+++ b/source/text/shared/02/01170101.xhp
@@ -539,7 +539,7 @@
   section id=Section64
 bookmark xml-lang=en-US branch=hid/EXTENSIONS_HID_PROP_TOGGLE 
id=bm_id9645680 localize=false/
 paragraph xml-lang=en-US id=par_idN11538 role=heading level=2 
l10n=NEWTogglecommentUFI: see dba spec 
form_controls_interop_1.sxw/comment/paragraph
- paragraph xml-lang=en-US id=par_idN1154E role=paragraph 
l10n=NEWahelp hid=.Specifies if a Push Button behaves as a Toggle 
Button. If you set Toggle to Yes, you can switch between the selected and 
not selected control states when you click the button or press the spacebar 
while the the control has the focus. A button in the selected state appears 
pressed in./ahelp/paragraph
+ paragraph xml-lang=en-US id=par_idN1154E role=paragraph 
l10n=NEWahelp hid=.Specifies if a Push Button behaves as a Toggle 
Button. If you set Toggle to Yes, you can switch between the selected and 
not selected control states when you click the button or press the spacebar 
while the control has the focus. A button in the selected state appears 
pressed in./ahelp/paragraph
   /section
   section id=Section65
 bookmark xml-lang=en-US branch=hid/EXTENSIONS_HID_PROP_FOCUSONCLICK 
id=bm_id6996978 localize=false/
diff --git a/source/text/shared/02/limit.xhp b/source/text/shared/02/limit.xhp
index 297c0eb..1104855 100644
--- a/source/text/shared/02/limit.xhp
+++ b/source/text/shared/02/limit.xhp
@@ -21,6 +21,6 @@
 /bookmark
 paragraph role=heading id=hd_id3149991 xml-lang=en-US 
level=1Limit/paragraph
 bookmark xml-lang=en-US branch=hid/.uno:DBLimit id=bm_id3147588 
localize=false/
-paragraph role=paragraph id=par_id3154894 xml-lang=en-USahelp 
hid=.Expands the created select statement of the link 
href=text/shared/explorer/database/02010100.xhp name=SQL QuerySQL 
Query/link by the LIMIT X clause/ahelp. This can be used to limit your SQL 
Query results to those that fall within the the first X number of 
it./paragraph
+paragraph role=paragraph id=par_id3154894 xml-lang=en-USahelp 
hid=.Expands the created select statement of the link 
href=text/shared/explorer/database/02010100.xhp name=SQL QuerySQL 
Query/link by the LIMIT X clause/ahelp. This can be used to limit your SQL 
Query results to those that fall within

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

2013-06-03 Thread Andras Timar

 source/text/shared/01/06202000.xhp   |2 +-
 source/text/shared/02/01170101.xhp   |2 +-
 source/text/shared/02/limit.xhp  |2 +-
 source/text/simpress/02/1003.xhp |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5c702bf0306d4a922ab2a66ded71bdc8f68e6b5a
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 08:17:11 2013 +0200

fix the the, a a

Change-Id: Ib1dee95fc5b9cfbfe5a731ea749b8db6c34ba875

diff --git a/source/text/shared/01/06202000.xhp 
b/source/text/shared/01/06202000.xhp
index 1b347b2..4b1afe3 100644
--- a/source/text/shared/01/06202000.xhp
+++ b/source/text/shared/01/06202000.xhp
@@ -34,7 +34,7 @@
 bookmark xml-lang=en-US 
branch=hid/cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK 
id=bm_id9376506 localize=false/paragraph role=heading id=par_idN1055F 
xml-lang=en-US level=2 l10n=NEWBook/paragraph
 paragraph role=paragraph id=par_idN10563 xml-lang=en-US 
l10n=NEWahelp 
hid=svx:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOKSelect the user-defined 
dictionary that you want to edit./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL 
id=bm_id6413159 localize=false/paragraph role=heading id=par_idN1057A 
xml-lang=en-US level=2 l10n=NEWOriginal/paragraph
-paragraph role=paragraph id=par_idN1057E xml-lang=en-US 
l10n=NEWahelp 
hid=svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINALSelect the entry 
in the current dictionary that you want to edit. If you want, you can also type 
a new entry in this box./ahelp To move from the Original box to the the first 
text box in the Suggestions area, press Enter./paragraph
+paragraph role=paragraph id=par_idN1057E xml-lang=en-US 
l10n=NEWahelp 
hid=svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINALSelect the entry 
in the current dictionary that you want to edit. If you want, you can also type 
a new entry in this box./ahelp To move from the Original box to the first 
text box in the Suggestions area, press Enter./paragraph
 !-- removed HID svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHAR 
--paragraph role=heading id=par_idN10596 xml-lang=en-US level=2 
l10n=NEWReplace by character/paragraph
 paragraph role=paragraph id=par_idN1059A xml-lang=en-US 
l10n=NEWahelp 
hid=svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_EDIT:CB_REPLACEBYCHARConverts the 
text on a character by character basis and not on a word by word 
basis./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1 id=bm_id6543778 
localize=false/
diff --git a/source/text/shared/02/01170101.xhp 
b/source/text/shared/02/01170101.xhp
index 7b80ccc..00815ed 100644
--- a/source/text/shared/02/01170101.xhp
+++ b/source/text/shared/02/01170101.xhp
@@ -539,7 +539,7 @@
   section id=Section64
 bookmark xml-lang=en-US branch=hid/EXTENSIONS_HID_PROP_TOGGLE 
id=bm_id9645680 localize=false/
 paragraph xml-lang=en-US id=par_idN11538 role=heading level=2 
l10n=NEWTogglecommentUFI: see dba spec 
form_controls_interop_1.sxw/comment/paragraph
- paragraph xml-lang=en-US id=par_idN1154E role=paragraph 
l10n=NEWahelp hid=.Specifies if a Push Button behaves as a Toggle 
Button. If you set Toggle to Yes, you can switch between the selected and 
not selected control states when you click the button or press the spacebar 
while the the control has the focus. A button in the selected state appears 
pressed in./ahelp/paragraph
+ paragraph xml-lang=en-US id=par_idN1154E role=paragraph 
l10n=NEWahelp hid=.Specifies if a Push Button behaves as a Toggle 
Button. If you set Toggle to Yes, you can switch between the selected and 
not selected control states when you click the button or press the spacebar 
while the control has the focus. A button in the selected state appears 
pressed in./ahelp/paragraph
   /section
   section id=Section65
 bookmark xml-lang=en-US branch=hid/EXTENSIONS_HID_PROP_FOCUSONCLICK 
id=bm_id6996978 localize=false/
diff --git a/source/text/shared/02/limit.xhp b/source/text/shared/02/limit.xhp
index 297c0eb..1104855 100644
--- a/source/text/shared/02/limit.xhp
+++ b/source/text/shared/02/limit.xhp
@@ -21,6 +21,6 @@
 /bookmark
 paragraph role=heading id=hd_id3149991 xml-lang=en-US 
level=1Limit/paragraph
 bookmark xml-lang=en-US branch=hid/.uno:DBLimit id=bm_id3147588 
localize=false/
-paragraph role=paragraph id=par_id3154894 xml-lang=en-USahelp 
hid=.Expands the created select statement of the link 
href=text/shared/explorer/database/02010100.xhp name=SQL QuerySQL 
Query/link by the LIMIT X clause/ahelp. This can be used to limit your SQL 
Query results to those that fall within the the first X number of 
it./paragraph
+paragraph role=paragraph id=par_id3154894 xml-lang=en-USahelp 
hid=.Expands the created select statement of the link 
href=text/shared/explorer/database/02010100.xhp name=SQL QuerySQL 
Query/link by the LIMIT X clause/ahelp. This can be used to limit your SQL 
Query results to those that fall within

[Libreoffice-commits] core.git: sc/uiconfig

2013-06-03 Thread Andras Timar

 sc/uiconfig/scalc/ui/sheetprintpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a074787abfa48642398d3516e57bbcb569a8571b
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 08:24:39 2013 +0200

typo: Columns and row headers - Column and row headers

Change-Id: I24045e58421f72d6245b148e825e93fac47002ea

diff --git a/sc/uiconfig/scalc/ui/sheetprintpage.ui 
b/sc/uiconfig/scalc/ui/sheetprintpage.ui
index 0f1b6c9..7d87d59 100644
--- a/sc/uiconfig/scalc/ui/sheetprintpage.ui
+++ b/sc/uiconfig/scalc/ui/sheetprintpage.ui
@@ -202,7 +202,7 @@
 property name=column_homogeneousTrue/property
 child
   object class=GtkCheckButton id=checkBTN_HEADER
-property name=label translatable=yes_Columns and row 
headers/property
+property name=label translatable=yes_Column and row 
headers/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/uiconfig

2013-06-03 Thread Andras Timar

 sc/uiconfig/scalc/ui/sheetprintpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59629fe05ebd7e1c26be525fef08ea79412373e8
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 08:24:39 2013 +0200

typo: Columns and row headers - Column and row headers

Change-Id: I24045e58421f72d6245b148e825e93fac47002ea

diff --git a/sc/uiconfig/scalc/ui/sheetprintpage.ui 
b/sc/uiconfig/scalc/ui/sheetprintpage.ui
index 0f1b6c9..7d87d59 100644
--- a/sc/uiconfig/scalc/ui/sheetprintpage.ui
+++ b/sc/uiconfig/scalc/ui/sheetprintpage.ui
@@ -202,7 +202,7 @@
 property name=column_homogeneousTrue/property
 child
   object class=GtkCheckButton id=checkBTN_HEADER
-property name=label translatable=yes_Columns and row 
headers/property
+property name=label translatable=yes_Column and row 
headers/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gdb support for exceptions (Re: using backtrace() in exception throwing?)

2013-06-03 Thread Stephan Bergmann


On 05/31/2013 09:33 PM, Tom Tromey wrote:

Tom I think it may be fixable in GCC.

I filed a GCC bug:

 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57487

You can CC yourself on it if you want to see what happens.


Great, thanks.  (So your idea would be to, in a second step, teach ABRT 
to issue additional gdb commands besides backtrace in case the trace 
contains __gnu_cxx::__verbose_terminate_handler, right?)


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

[Libreoffice-commits] core.git: framework/source offapi/com

2013-06-03 Thread Zolnai Tamás

 framework/source/services/frame.cxx   |2 +-
 offapi/com/sun/star/embed/XCommonEmbedPersist.idl |2 +-
 offapi/com/sun/star/embed/XEmbedObjectCreator.idl |6 +++---
 offapi/com/sun/star/embed/XEmbedObjectFactory.idl |2 +-
 offapi/com/sun/star/embed/XEmbedPersist.idl   |6 +++---
 offapi/com/sun/star/embed/XInsertObjectDialog.idl |2 +-
 offapi/com/sun/star/frame/XStorable2.idl  |2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 8cc9383fe7dbb81c28da6c843638c04c803cc8ab
Author: Zolnai TamÃ¡s zolnaitamas2...@gmail.com
Date:   Sat Jun 1 14:08:37 2013 +0200

Replace invalid doxygen commands: thrown - throws

Change-Id: I9e9f513afe37ccf34f2d5762a27b4a728fd24f36
Reviewed-on: https://gerrit.libreoffice.org/4136
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 6ece139..edf60e1 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1554,7 +1554,7 @@ void SAL_CALL Frame::removeFrameActionListener( const 
css::uno::Reference css::
 veto exception and must try to close this frame at later 
time again. Otherwhise the
 source of throwed exception is the right one. May it will 
be the frame himself.
 
-@thrown CloseVetoException
+@throws CloseVetoException
 if any internal things willn't be closed
 
 @threadsafe yes
diff --git a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl 
b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
index 1b46bbf..3976cb2 100644
--- a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
@@ -77,7 +77,7 @@ published interface XCommonEmbedPersist: 
com::sun::star::uno::XInterface
 optional parameters for object reloading, see also
 type scope=com::sun::star::embedEmbeddedObjectDescriptor/type
 
-@thrown ::com::sun::star::lang::IllegalArgumentException
+@throws ::com::sun::star::lang::IllegalArgumentException
 one of arguments is illegal
 
 @throws com::sun::star::embed::WrongStateException
diff --git a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl 
b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
index 9e64448..f4e801b 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
@@ -105,10 +105,10 @@ published interface XEmbedObjectCreator: 
com::sun::star::uno::XInterface
 an object of type typeEmbeddedObjectDescriptor/type
 contains object related properties
 
-@thrown ::com::sun::star::lang::IllegalArgumentException
+@throws ::com::sun::star::lang::IllegalArgumentException
 one of arguments is illegal
 
-@thrown ::com::sun::star::container::NoSuchElementException
+@throws ::com::sun::star::container::NoSuchElementException
 the specified entry does not exist
 
 @throws com::sun::star::io::IOException
@@ -149,7 +149,7 @@ published interface XEmbedObjectCreator: 
com::sun::star::uno::XInterface
 an object of type typeEmbeddedObjectDescriptor/type
 contains object related properties
 
-@thrown ::com::sun::star::lang::IllegalArgumentException
+@throws ::com::sun::star::lang::IllegalArgumentException
 one of arguments is illegal
 
 @throws com::sun::star::io::IOException
diff --git a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl 
b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
index 7460b37..63a687d 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
@@ -76,7 +76,7 @@ published interface XEmbedObjectFactory: 
com::sun::star::uno::XInterface
 see also
 type scope=com::sun::star::embedEmbeddedObjectDescriptor/type
 
-@thrown ::com::sun::star::lang::IllegalArgumentException
+@throws ::com::sun::star::lang::IllegalArgumentException
 one of arguments is illegal
 
 @throws com::sun::star::io::IOException
diff --git a/offapi/com/sun/star/embed/XEmbedPersist.idl 
b/offapi/com/sun/star/embed/XEmbedPersist.idl
index 6c24d3f..10e0857 100644
--- a/offapi/com/sun/star/embed/XEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XEmbedPersist.idl
@@ -80,7 +80,7 @@ published interface XEmbedPersist: XCommonEmbedPersist
 see also
 type scope=com::sun::star::embedEmbeddedObjectDescriptor/type
 
-@thrown ::com::sun::star::lang::IllegalArgumentException
+@throws ::com::sun::star::lang::IllegalArgumentException
 one of arguments is illegal
 
 @throws com::sun::star::embed::WrongStateException
@@ -120,7 +120,7 @@ published interface XEmbedPersist:

[PUSHED] Replace invalid doxygen commands: thrown - throws

2013-06-03 Thread Thomas Arnhold (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/4136

Approvals:
  Thomas Arnhold: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e9f513afe37ccf34f2d5762a27b4a728fd24f36
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

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

2013-06-03 Thread Pierre-Eric Pelloux-Prayer

 sw/source/ui/misc/redlndlg.cxx |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 1fadebef054b811d8d6487d45d76dea1990e1268
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date:   Mon May 27 10:45:08 2013 +0200

fdo#57874: verify GetRedlinePos return value before usage

Make sure return value of GetRedlinePos is checked each time
before usage.
Fix crash in Redline dialog.

Change-Id: I5586d8ddc1a7905c524a522addc89969e704048d

diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 7885bb4..5ea478f 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -293,10 +293,15 @@ void SwRedlineAcceptDlg::InitAuthors()
 SvTreeListEntry* pSelEntry = pTable-FirstSelected();
 while (pSelEntry)
 {
+// find the selected redline
+// (fdo#57874: ignore, if the redline is already gone)
 sal_uInt16 nPos = GetRedlinePos(*pSelEntry);
-const SwRedline rRedln = pSh-GetRedline( nPos );
+if( nPos != USHRT_MAX )
+{
+const SwRedline rRedln = pSh-GetRedline( nPos );
 
-bIsNotFormated |= nsRedlineType_t::REDLINE_FORMAT != rRedln.GetType();
+bIsNotFormated |= nsRedlineType_t::REDLINE_FORMAT != 
rRedln.GetType();
+}
 pSelEntry = pTable-NextSelected(pSelEntry);
 }
 
@@ -1007,7 +1012,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
 sal_uInt16 nPos = GetRedlinePos(*pTopEntry);
 
 // disable commenting for protected areas
-if ((pRed = pSh-GotoRedline(nPos, sal_True)) != 0)
+if (nPos != USHRT_MAX  (pRed = pSh-GotoRedline(nPos, 
sal_True)) != 0)
 {
 if( pSh-IsCrsrPtAtEnd() )
 pSh-SwapPam();
@@ -1048,6 +1053,10 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
 pEntry = pTable-GetParent(pEntry);
 
 sal_uInt16 nPos = GetRedlinePos(*pEntry);
+
+if (nPos == USHRT_MAX)
+break;
+
 const SwRedline rRedline = pSh-GetRedline(nPos);
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc

2013-06-03 Thread Andras Timar

 instsetoo_native/util/openoffice.lst |8 
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ea385ee7612e7b75c54e9440834a37cf923201db
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 09:42:41 2013 +0200

Bump for 3.6-26

Change-Id: I96ec2e7e79ada9bcbb352c15b34cda12ea815e35

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index f594053..bdda918 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
 CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 25
+WINDOWSPATCHLEVEL 26
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-525
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-526
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-525
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-526
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-525
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-526
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index bd5..5767841 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:525)
-BUILD=525
+RSCREVISION=360m1(Build:526)
+BUILD=526
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Fix icu version checks.

2013-06-03 Thread Mark Wielaard (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4139

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/4139/1

Fix icu version checks.

commit 30c303 Make charmap.cxx compile with icu = 4.4. was incomplete
and had wrong version checks. After ICU 4.8 (4.8.1.1) the next version
of ICU was 49 (49.1) so U_ICU_VERSION_MAJOR_NUM contains two digets (49),
earlier that it was just one digit (4). The correct header to include to
do version checks is unicode/uversion.h. USCRIPT_MANDAEAN is the old
alias of USCRIPT_MANDAIC (same numeric value). U_JG_FARSI_YEH is only
available since ICU 4.4. Note that on older icu versions (4.2.1) the
200B (ZWSP) Zero Width Space breakiterator testcase fails (others
succeed).

Change-Id: If73c1402239a28546077437e9382f0bd38642bad
---
M i18npool/qa/cppunit/test_breakiterator.cxx
M i18nutil/source/utility/unicode.cxx
M svx/source/dialog/charmap.cxx
M sw/source/core/text/porlay.cxx
4 files changed, 13 insertions(+), 6 deletions(-)



diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index b3ec68f..4ba6a79 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -19,7 +19,7 @@
 #include com/sun/star/i18n/WordType.hpp
 #include unotest/bootstrapfixturebase.hxx
 
-#include unicode/uvernum.h
+#include unicode/uversion.h
 
 #include rtl/strbuf.hxx
 #include rtl/ustrbuf.hxx
@@ -236,6 +236,8 @@
 }
 
 //See https://bugs.freedesktop.org/show_bug.cgi?id=49629
+//Note that the breakiterator test will fail on older icu versions
+//(4.2.1) for the 200B (ZWSP) Zero Width Space testcase.
 sal_Unicode aBreakTests[] = { ' ', 1, 2, 3, 4, 5, 6, 7, 0x91, 0x92, 
0x200B, 0xE8FF, 0xF8FF };
 for (int mode = i18n::WordType::ANY_WORD; mode = 
i18n::WordType::WORD_COUNT; ++mode)
 {
diff --git a/i18nutil/source/utility/unicode.cxx 
b/i18nutil/source/utility/unicode.cxx
index 2c2dd42..b46a7f6 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -826,15 +826,15 @@
 case USCRIPT_TAI_VIET:
 sRet = blt;
 break;
+case USCRIPT_MANDAEAN: /* Aliased to USCRIPT_MANDAIC in icu 4.6. */
+sRet = mic;
+break;
 #if (U_ICU_VERSION_MAJOR_NUM  4) || (U_ICU_VERSION_MAJOR_NUM == 4  
U_ICU_VERSION_MINOR_NUM = 4)
 case USCRIPT_NABATAEAN: //no language with an assigned code yet
 sRet = mis;
 break;
 case USCRIPT_PALMYRENE: //no language with an assigned code yet
 sRet = mis;
-break;
-case USCRIPT_MANDAIC:
-sRet = mic;
 break;
 case USCRIPT_BAMUM:
 sRet = bax;
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index bc6c83e..907d9f8 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1302,7 +1302,7 @@
 case UBLOCK_DOMINO_TILES:
 aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, 
RID_SUBSETSTR_DOMINO_TILES ) );
 break;
-#if U_ICU_VERSION_MAJOR_NUM = 44
+#if (U_ICU_VERSION_MAJOR_NUM  4) || (U_ICU_VERSION_MAJOR_NUM == 4  
U_ICU_VERSION_MINOR_NUM = 4)
 case UBLOCK_SAMARITAN:
 aAllSubsets.push_back( Subset( 0x0800, 0x083F, 
RID_SUBSETSTR_SAMARITAN ) );
 break;
@@ -1382,7 +1382,7 @@
 aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, 
RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C ) );
 break;
 #endif
-#if U_ICU_VERSION_MAJOR_NUM = 46
+#if (U_ICU_VERSION_MAJOR_NUM  4) || (U_ICU_VERSION_MAJOR_NUM == 4  
U_ICU_VERSION_MINOR_NUM = 6)
 case UBLOCK_MANDAIC:
 aAllSubsets.push_back( Subset( 0x0840, 0x085F, 
RID_SUBSETSTR_MANDAIC ) );
 break;
@@ -1420,6 +1420,7 @@
 aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, 
RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D ) );
 break;
 #endif
+// Note ICU version 49 (NOT 4.9), so the MAJOR_NUM is two digits.
 #if U_ICU_VERSION_MAJOR_NUM = 49
 case UBLOCK_ARABIC_EXTENDED_A:
 aAllSubsets.push_back( Subset( 0x08A0, 0x08FF, 
RID_SUBSETSTR_ARABIC_EXTENDED_A ) );
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index b820b8b..edc8458 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -72,7 +72,11 @@
 #define isRehChar(c)IS_JOINING_GROUP((c), REH)
 #define isTehMarbutaChar(c) IS_JOINING_GROUP((c), TEH_MARBUTA)
 #define isWawChar(c)IS_JOINING_GROUP((c), WAW)
+#if (U_ICU_VERSION_MAJOR_NUM  4) || (U_ICU_VERSION_MAJOR_NUM == 4  
U_ICU_VERSION_MINOR_NUM = 4)
 #define isYehChar(c)(IS_JOINING_GROUP((c), YEH) || 
IS_JOINING_GROUP((c), FARSI_YEH))
+#else
+#define isYehChar(c)

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

2013-06-03 Thread Adam Co

 sw/qa/extras/ooxmlexport/data/page-background.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |9 +++
 sw/source/filter/ww8/docxexport.cxx|   25 +
 3 files changed, 34 insertions(+)

New commits:
commit 515701a1ff18d04ede235bef862c465adf41062f
Author: Adam Co rattles2...@gmail.com
Date:   Sun Jun 2 11:21:18 2013 +0300

fdo#65257 : DOCX not exporting background color

Signed-off-by: Miklos Vajna vmik...@suse.cz

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

Change-Id: Ida3f66d5adb063400494e1da589a463b4d7c2a86

diff --git a/sw/qa/extras/ooxmlexport/data/page-background.docx 
b/sw/qa/extras/ooxmlexport/data/page-background.docx
new file mode 100644
index 000..8c1f2ebd
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/page-background.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 3ed2f18..278d71c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -70,6 +70,7 @@ public:
 void testFdo48557();
 void testI120928();
 void testFdo64826();
+void testPageBackground();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -118,6 +119,7 @@ void Test::run()
 {fdo48557.odt, Test::testFdo48557},
 {i120928.docx, Test::testI120928},
 {fdo64826.docx, Test::testFdo64826},
+{page-background.docx, Test::testPageBackground},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -680,6 +682,13 @@ void Test::testFdo64826()
 CPPUNIT_ASSERT_EQUAL(true, bool(getPropertysal_Bool(mxComponent, 
RecordChanges)));
 }
 
+void Test::testPageBackground()
+{
+// 'Document Background' wasn't exported.
+uno::Referencebeans::XPropertySet 
xPageStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x92D050), 
getPropertysal_Int32(xPageStyle, BackColor));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 0ceacc05..dd280dc 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -44,6 +44,7 @@
 #include frmfmt.hxx
 #include section.hxx
 #include ftninfo.hxx
+#include pagedesc.hxx
 
 #include editeng/editobj.hxx
 #include editeng/outlobj.hxx
@@ -690,6 +691,16 @@ void DocxExport::WriteSettings()
 OString 
aZoom(OString::valueOf(sal_Int32(pViewShell-GetViewOptions()-GetZoom(;
 pFS-singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent), 
aZoom.getStr(), FSEND);
 
+// Display Background Shape
+const SwFrmFmt rFmt = pDoc-GetPageDesc(0).GetMaster();
+const SfxPoolItem* pItem = 0;
+SfxItemState eState = rFmt.GetItemState(RES_BACKGROUND, true, pItem);
+if (SFX_ITEM_SET == eState  pItem)
+{
+// Turn on the 'displayBackgroundShape'
+pFS-singleElementNS( XML_w, XML_displayBackgroundShape, FSEND );
+}
+
 // Track Changes
 if ( settings.trackRevisions )
 pFS-singleElementNS( XML_w, XML_trackRevisions, FSEND );
@@ -732,6 +743,20 @@ void DocxExport::WriteMainText()
 // setup the namespaces
 m_pDocumentFS-startElementNS( XML_w, XML_document, MainXmlNamespaces( 
m_pDocumentFS ));
 
+// Write background page color
+const SwFrmFmt rFmt = pDoc-GetPageDesc(0).GetMaster();
+const SfxPoolItem* pItem = 0;
+SfxItemState eState = rFmt.GetItemState(RES_BACKGROUND, true, pItem);
+if (SFX_ITEM_SET == eState  pItem)
+{
+// The 'color' is set for the first page style - take it and use it as 
the background color of the entire DOCX
+const SvxBrushItem* pBrush = (const SvxBrushItem*)pItem;
+Color backgroundColor = pBrush-GetColor();
+OString aBackgroundColorStr = 
msfilter::util::ConvertColor(backgroundColor);
+
+m_pDocumentFS-singleElementNS( XML_w, XML_background, FSNS( XML_w, 
XML_color ), aBackgroundColorStr, FSEND );
+}
+
 // body
 m_pDocumentFS-startElementNS( XML_w, XML_body, FSEND );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#65257 : DOCX not exporting background color

2013-06-03 Thread Miklos Vajna (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/4130


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida3f66d5adb063400494e1da589a463b4d7c2a86
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Adam CloudOn rattles2...@gmail.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

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

2013-06-03 Thread Fridrich Štrba

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

New commits:
commit f5d6e7af69f6b8972bd97d1d8e2a6d9ec5a6294a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Jun 3 10:16:26 2013 +0200

Fixing crash with dereferencing front() and back() of an empty vector

Change-Id: If7204614aa7a650f4a2804fc63dd3301ece2281e

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 1ec5c24..35ad93d 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -769,7 +769,8 @@ Reference XShape  BezierShape::implConvertAndInsert( 
const Reference XShapes
 for ( unsigned int i = 0; i  aFlagLists.size(); i++ )
 aBezierCoords.Flags[i] = ContainerHelper::vectorToSequence( 
aFlagLists[i] );
 
-if( aCoordLists.front().front().X == aCoordLists.back().back().X
+if( !aCoordLists.front().empty()  !aCoordLists.back().empty()
+ aCoordLists.front().front().X == aCoordLists.back().back().X
  aCoordLists.front().front().Y == aCoordLists.back().back().Y )
 { // HACK: If the shape is in fact closed, which can be found out only 
when the path is known,
   // force to closed bezier shape (otherwise e.g. fill won't work).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Miklos Vajna

 sw/source/filter/ww8/docxexport.cxx |   28 ++--
 sw/source/filter/ww8/docxexport.hxx |4 
 2 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit 89935d18826ada54abceb8148fad8731be2571f5
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Jun 3 10:25:05 2013 +0200

Introduce DocxExport::getBackground()

Does the same as part of DocxExport::WriteMainText() and
DocxExport::WriteSettings().

Change-Id: I5597edc2c3a84bd2058ee8c4cfdc21241e471bd3

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index dd280dc..0afa634 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -692,10 +692,7 @@ void DocxExport::WriteSettings()
 pFS-singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent), 
aZoom.getStr(), FSEND);
 
 // Display Background Shape
-const SwFrmFmt rFmt = pDoc-GetPageDesc(0).GetMaster();
-const SfxPoolItem* pItem = 0;
-SfxItemState eState = rFmt.GetItemState(RES_BACKGROUND, true, pItem);
-if (SFX_ITEM_SET == eState  pItem)
+if (boost::optionalconst SvxBrushItem* oBrush = getBackground())
 {
 // Turn on the 'displayBackgroundShape'
 pFS-singleElementNS( XML_w, XML_displayBackgroundShape, FSEND );
@@ -738,20 +735,31 @@ VMLExport DocxExport::VMLExporter()
 return *m_pVMLExport;
 }
 
-void DocxExport::WriteMainText()
+boost::optionalconst SvxBrushItem* DocxExport::getBackground()
 {
-// setup the namespaces
-m_pDocumentFS-startElementNS( XML_w, XML_document, MainXmlNamespaces( 
m_pDocumentFS ));
-
-// Write background page color
+boost::optionalconst SvxBrushItem* oRet;
 const SwFrmFmt rFmt = pDoc-GetPageDesc(0).GetMaster();
 const SfxPoolItem* pItem = 0;
 SfxItemState eState = rFmt.GetItemState(RES_BACKGROUND, true, pItem);
+
 if (SFX_ITEM_SET == eState  pItem)
 {
 // The 'color' is set for the first page style - take it and use it as 
the background color of the entire DOCX
 const SvxBrushItem* pBrush = (const SvxBrushItem*)pItem;
-Color backgroundColor = pBrush-GetColor();
+oRet.reset(pBrush);
+}
+return oRet;
+}
+
+void DocxExport::WriteMainText()
+{
+// setup the namespaces
+m_pDocumentFS-startElementNS( XML_w, XML_document, MainXmlNamespaces( 
m_pDocumentFS ));
+
+// Write background page color
+if (boost::optionalconst SvxBrushItem* oBrush = getBackground())
+{
+Color backgroundColor = (*oBrush)-GetColor();
 OString aBackgroundColorStr = 
msfilter::util::ConvertColor(backgroundColor);
 
 m_pDocumentFS-singleElementNS( XML_w, XML_background, FSNS( XML_w, 
XML_color ), aBackgroundColorStr, FSEND );
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index 2348349..c7a2b28 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -28,6 +28,7 @@
 
 #include cstdio
 #include vector
+#include boost/optional.hpp
 
 class DocxAttributeOutput;
 class DocxExportFilter;
@@ -206,6 +207,9 @@ private:
 /// All xml namespaces to be used at the top of any text .xml file (main 
doc, headers, footers,...)
 sax_fastparser::XFastAttributeListRef MainXmlNamespaces( 
sax_fastparser::FSHelperPtr serializer );
 
+/// Get background color of the document, if there is one.
+boost::optionalconst SvxBrushItem* getBackground();
+
 public:
 /// FIXME this is temporary, remotely reminding the method of the same
 /// name in WW8Export.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Michael Meeks

 vcl/unx/gtk/window/gtksalframe.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 2d5d1415161ef687cf0d4d6eccad0940e3016110
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Jun 3 09:27:26 2013 +0100

fdo#56583 - avoid setting user time on unrealized windows.

Change-Id: Iab776088b1d168295d636069e1a92ba948241653

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx 
b/vcl/unx/gtk/window/gtksalframe.cxx
index 041a8a0..0f53e93 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1013,9 +1013,17 @@ static void lcl_set_user_time( GtkWindow* i_pWindow, 
guint32 i_nTime )
 bGetSetUserTimeFn = false;
 p_gdk_x11_window_set_user_time = 
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin, 
gdk_x11_window_set_user_time );
 }
+bool bSet = false;
 if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( 
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
-else
+{
+GdkWindow* pWin = widget_get_window(GTK_WIDGET(i_pWindow));
+if( pWin ) // only if the window is realized.
+{
+p_gdk_x11_window_set_user_time( pWin, i_nTime );
+bSet = true;
+}
+}
+if( !bSet )
 {
 Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
 Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Tor Lillqvist

 extensions/source/propctrlr/objectinspectormodel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f5cd4c2bddc694467892c7cdae513679cb1cac5a
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Jun 3 11:24:07 2013 +0300

WaE: unused parameter '_rxContext'

Change-Id: I75c9d894f792dd7a4ac85acace586e163d57c077

diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx 
b/extensions/source/propctrlr/objectinspectormodel.cxx
index d9868d3..1682f0e 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -179,7 +179,7 @@ namespace pcr
 }
 
 //
-Reference XInterface  SAL_CALL ObjectInspectorModel::Create(const 
Reference XComponentContext  _rxContext )
+Reference XInterface  SAL_CALL ObjectInspectorModel::Create(const 
Reference XComponentContext  /* _rxContext */ )
 {
 return *( new ObjectInspectorModel() );
 }
___
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

2013-06-03 Thread bugzilla-daemon

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

Petr Mladek pmla...@suse.cz changed:

   What|Removed |Added

 Depends on||65132

--- Comment #27 from Petr Mladek pmla...@suse.cz ---
Add bug 65132: Too big font when editing presentation. The text is even harder
to read. It is high visible regression.

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

Re: Libreoffice - tests

2013-06-03 Thread Michael Meeks


On Mon, 2013-06-03 at 00:41 +0200, Martin Liška wrote:
 I send you in attachment build log and install log file.
 
 Do you have any ideas why calc build failed?

For anyone looking at this, please bear in mind that Martin is
attempting to use LTO. Martin can you verify that a parallel build with
--enable-mergelibs does not fail on the same test ?

If so - the problem is isolated in gcc - and I guess that team would
want to have a look into it.

Thanks,

Michael.

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

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

[Libreoffice-commits] help.git: Branch 'libreoffice-4-0' - help-to-wiki.py to-wiki/getalltitles.py

2013-06-03 Thread Andras Timar

 help-to-wiki.py |4 ++--
 to-wiki/getalltitles.py |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 513b459ef0d3c6b25ae816b78a138d7b200ea652
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 09:39:36 2013 +0200

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

Change-Id: I63fa0615e20debe924404f66d65d86ad41d2d2e1

diff --git a/help-to-wiki.py b/help-to-wiki.py
index 19d58ed..42aa072 100755
--- a/help-to-wiki.py
+++ b/help-to-wiki.py
@@ -49,14 +49,14 @@ def create_wiki_dirs():
]
 
 try:
-os.mkdir( wiki )
+os.mkdir( wiki/4.0 )
 except:
 sys.stdout.write( wiki already generated - the wiki/ subdir exists\n 
)
 sys.exit( 1 )
 
 for i in dirs:
 try:
-os.mkdir( wiki/ + i )
+os.mkdir( wiki/4.0 + i )
 except:
 pass
 
diff --git a/to-wiki/getalltitles.py b/to-wiki/getalltitles.py
index 8db9bcb..8ec6a89 100755
--- a/to-wiki/getalltitles.py
+++ b/to-wiki/getalltitles.py
@@ -130,7 +130,7 @@ def parsexhp(filename):
 title = tp.get_title()
 if len(title)  0:
 readable_title = readable_text(title)
-title = module + '/' + wiki_text(title)
+title = '4.0' + module + '/' + wiki_text(title)
 title = title.replace(' ', '_')
 title = title.replace('___', '_')
 title = title.replace('__', '_')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Andras Timar

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

New commits:
commit 710cf1a14d4b2e784997e43f23d003a1a6ab4ebd
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 09:39:36 2013 +0200

Updated core
Project: help  513b459ef0d3c6b25ae816b78a138d7b200ea652

diff --git a/helpcontent2 b/helpcontent2
index d8f4605..513b459 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d8f46055f562917e857c4395601138f0515e71d0
+Subproject commit 513b459ef0d3c6b25ae816b78a138d7b200ea652
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-4-0' - help-to-wiki.py

2013-06-03 Thread Andras Timar

 help-to-wiki.py |1 +
 1 file changed, 1 insertion(+)

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

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

Change-Id: Icaa20b41c8582b7057ebeb3d25e6688cf03af41e

diff --git a/help-to-wiki.py b/help-to-wiki.py
index 42aa072..7c5bcce 100755
--- a/help-to-wiki.py
+++ b/help-to-wiki.py
@@ -49,6 +49,7 @@ def create_wiki_dirs():
]
 
 try:
+os.mkdir( wiki )
 os.mkdir( wiki/4.0 )
 except:
 sys.stdout.write( wiki already generated - the wiki/ subdir exists\n 
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Andras Timar

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

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

Updated core
Project: help  e15ec6915ca8837f68fc1b1133d6380f087f81c0

diff --git a/helpcontent2 b/helpcontent2
index 513b459..e15ec69 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 513b459ef0d3c6b25ae816b78a138d7b200ea652
+Subproject commit e15ec6915ca8837f68fc1b1133d6380f087f81c0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fix for unused return value.

2013-06-03 Thread Noel Grandin (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4140

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/4140/1

fix for unused return value.

This code was introduced by:
   commit d09dd8986436f17717443823ef18bd8552fdf408
   Author: Frank Schoenheit [fs] frank.schoenh...@sun.com
   Date:   Wed Sep 15 13:55:34 2010 +0200
   dba34a: export/import min-/max-/default-/value for date/time as
   XML-Schema conformant strings
It looks like it intended to use determineDefaultServiceName(), but
neglected to store the return value.

Change-Id: I1607f39cf771b594389492785c7e72478d44843a
---
M xmloff/source/forms/elementimport.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/xmloff/source/forms/elementimport.cxx 
b/xmloff/source/forms/elementimport.cxx
index 9d180b0..443209f 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -184,7 +184,7 @@
 }
 
 if ( m_sServiceName.isEmpty() )
-determineDefaultServiceName();
+m_sServiceName = determineDefaultServiceName();
 
 // create the object *now*. This allows setting properties in the 
various handleAttribute methods.
 // (Though currently not all code is migrated to this pattern, most 
attributes are still handled

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1607f39cf771b594389492785c7e72478d44843a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com

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

[Libreoffice-commits] core.git: helpcontent2

2013-06-03 Thread Andras Timar

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

New commits:
commit 89edebf672a5f031e60fe257536a5ca90c54aba8
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 10:52:23 2013 +0200

Updated core
Project: help  adf5bd4a4f01d914ca17e792e4817075d405e900

diff --git a/helpcontent2 b/helpcontent2
index 5c702bf..adf5bd4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5c702bf0306d4a922ab2a66ded71bdc8f68e6b5a
+Subproject commit adf5bd4a4f01d914ca17e792e4817075d405e900
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Andras Timar

 source/text/scalc/guide/text_wrap.xhp |2 +-
 source/text/schart/01/stepped_line_properties.xhp |2 +-
 source/text/schart/01/type_xy.xhp |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit adf5bd4a4f01d914ca17e792e4817075d405e900
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 10:52:23 2013 +0200

typos: horizonal, expandened

Change-Id: I316950e42b90c057c1f3807d0b9c92cd203a0031

diff --git a/source/text/scalc/guide/text_wrap.xhp 
b/source/text/scalc/guide/text_wrap.xhp
index 7633e23..440bd8d 100644
--- a/source/text/scalc/guide/text_wrap.xhp
+++ b/source/text/scalc/guide/text_wrap.xhp
@@ -38,7 +38,7 @@
 section id=wraptext
 list type=ordered
 listitem
-paragraph role=listitem id=par_id3156280 xml-lang=en-US l10n=U 
oldref=41Pressing the switchinline select=syscaseinline 
select=MACCommand/caseinlinedefaultinlineCtrl/defaultinline/switchinline+Enter
 keys inserts a manual line break. This shortcut works directly in the cell or 
in the input line. The input line can be expaneded to the multi-line by the 
Down arrow button on the right./paragraph
+paragraph role=listitem id=par_id3156280 xml-lang=en-US l10n=U 
oldref=41Pressing the switchinline select=syscaseinline 
select=MACCommand/caseinlinedefaultinlineCtrl/defaultinline/switchinline+Enter
 keys inserts a manual line break. This shortcut works directly in the cell or 
in the input line. The input line can be expanded to the multi-line by the Down 
arrow button on the right./paragraph
 /listitem
 /list
 paragraph role=paragraph id=par_id3153142 xml-lang=en-US l10n=U 
oldref=43If you want the text to automatically break at the right border of 
the cell, proceed as follows:/paragraph
diff --git a/source/text/schart/01/stepped_line_properties.xhp 
b/source/text/schart/01/stepped_line_properties.xhp
index d1b2118..b8fb016 100644
--- a/source/text/schart/01/stepped_line_properties.xhp
+++ b/source/text/schart/01/stepped_line_properties.xhp
@@ -46,7 +46,7 @@
 /listitem
 listitem
 image id=img_id56635427 src=chart2/res/step_center_y_30.png width=30px 
height=30pxalt xml-lang=en-US id=alt_id56635427Center Y 
icon/alt/image
-paragraph role=paragraph id=par_id0679473 xml-lang=en-US 
l10n=NEWahelp 
hid=modules/schart/ui/steppedlinesdlg/step_center_y_rbStart to step up 
vertically to the middle of the Y values, draw a horizonal line and finish by 
stepping vertically to the end./ahelp/paragraph
+paragraph role=paragraph id=par_id0679473 xml-lang=en-US 
l10n=NEWahelp 
hid=modules/schart/ui/steppedlinesdlg/step_center_y_rbStart to step up 
vertically to the middle of the Y values, draw a horizontal line and finish by 
stepping vertically to the end./ahelp/paragraph
 /listitem
 /list
 /body
diff --git a/source/text/schart/01/type_xy.xhp 
b/source/text/schart/01/type_xy.xhp
index a5d41a3..8b28316 100644
--- a/source/text/schart/01/type_xy.xhp
+++ b/source/text/schart/01/type_xy.xhp
@@ -103,7 +103,7 @@
 /listitem
 listitem
 image id=img_id56635427 src=chart2/res/step_center_y_30.png width=30px 
height=30pxalt xml-lang=en-US id=alt_id56635427Center Y 
icon/alt/image
-paragraph role=paragraph id=par_id0679473 xml-lang=en-US 
l10n=NEWStart to step up vertically to the middle of the Y values, draw a 
horizonal line and finish by stepping vertically to the end./paragraph
+paragraph role=paragraph id=par_id0679473 xml-lang=en-US 
l10n=NEWStart to step up vertically to the middle of the Y values, draw a 
horizontal line and finish by stepping vertically to the end./paragraph
 /listitem
 /list
 section id=relatedtopics
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Andras Timar

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

New commits:
commit dcbe1bb928d80524a1f04044fd7c34fc8c36b382
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 10:52:23 2013 +0200

Updated core
Project: help  c1c9605fc9c2ff03cb825e4265772582c773c93e

diff --git a/helpcontent2 b/helpcontent2
index 2957f1a..c1c9605 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2957f1aef6f46ba1472f7e62c0617c3ddbbdb92f
+Subproject commit c1c9605fc9c2ff03cb825e4265772582c773c93e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Andras Timar

 source/text/scalc/guide/text_wrap.xhp |2 +-
 source/text/schart/01/stepped_line_properties.xhp |2 +-
 source/text/schart/01/type_xy.xhp |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c1c9605fc9c2ff03cb825e4265772582c773c93e
Author: Andras Timar ati...@suse.com
Date:   Mon Jun 3 10:52:23 2013 +0200

typos: horizonal, expandened

Change-Id: I316950e42b90c057c1f3807d0b9c92cd203a0031

diff --git a/source/text/scalc/guide/text_wrap.xhp 
b/source/text/scalc/guide/text_wrap.xhp
index 7633e23..440bd8d 100644
--- a/source/text/scalc/guide/text_wrap.xhp
+++ b/source/text/scalc/guide/text_wrap.xhp
@@ -38,7 +38,7 @@
 section id=wraptext
 list type=ordered
 listitem
-paragraph role=listitem id=par_id3156280 xml-lang=en-US l10n=U 
oldref=41Pressing the switchinline select=syscaseinline 
select=MACCommand/caseinlinedefaultinlineCtrl/defaultinline/switchinline+Enter
 keys inserts a manual line break. This shortcut works directly in the cell or 
in the input line. The input line can be expaneded to the multi-line by the 
Down arrow button on the right./paragraph
+paragraph role=listitem id=par_id3156280 xml-lang=en-US l10n=U 
oldref=41Pressing the switchinline select=syscaseinline 
select=MACCommand/caseinlinedefaultinlineCtrl/defaultinline/switchinline+Enter
 keys inserts a manual line break. This shortcut works directly in the cell or 
in the input line. The input line can be expanded to the multi-line by the Down 
arrow button on the right./paragraph
 /listitem
 /list
 paragraph role=paragraph id=par_id3153142 xml-lang=en-US l10n=U 
oldref=43If you want the text to automatically break at the right border of 
the cell, proceed as follows:/paragraph
diff --git a/source/text/schart/01/stepped_line_properties.xhp 
b/source/text/schart/01/stepped_line_properties.xhp
index d1b2118..b8fb016 100644
--- a/source/text/schart/01/stepped_line_properties.xhp
+++ b/source/text/schart/01/stepped_line_properties.xhp
@@ -46,7 +46,7 @@
 /listitem
 listitem
 image id=img_id56635427 src=chart2/res/step_center_y_30.png width=30px 
height=30pxalt xml-lang=en-US id=alt_id56635427Center Y 
icon/alt/image
-paragraph role=paragraph id=par_id0679473 xml-lang=en-US 
l10n=NEWahelp 
hid=modules/schart/ui/steppedlinesdlg/step_center_y_rbStart to step up 
vertically to the middle of the Y values, draw a horizonal line and finish by 
stepping vertically to the end./ahelp/paragraph
+paragraph role=paragraph id=par_id0679473 xml-lang=en-US 
l10n=NEWahelp 
hid=modules/schart/ui/steppedlinesdlg/step_center_y_rbStart to step up 
vertically to the middle of the Y values, draw a horizontal line and finish by 
stepping vertically to the end./ahelp/paragraph
 /listitem
 /list
 /body
diff --git a/source/text/schart/01/type_xy.xhp 
b/source/text/schart/01/type_xy.xhp
index a5d41a3..8b28316 100644
--- a/source/text/schart/01/type_xy.xhp
+++ b/source/text/schart/01/type_xy.xhp
@@ -103,7 +103,7 @@
 /listitem
 listitem
 image id=img_id56635427 src=chart2/res/step_center_y_30.png width=30px 
height=30pxalt xml-lang=en-US id=alt_id56635427Center Y 
icon/alt/image
-paragraph role=paragraph id=par_id0679473 xml-lang=en-US 
l10n=NEWStart to step up vertically to the middle of the Y values, draw a 
horizonal line and finish by stepping vertically to the end./paragraph
+paragraph role=paragraph id=par_id0679473 xml-lang=en-US 
l10n=NEWStart to step up vertically to the middle of the Y values, draw a 
horizontal line and finish by stepping vertically to the end./paragraph
 /listitem
 /list
 section id=relatedtopics
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Libreoffice - tests

2013-06-03 Thread Martin Liška

I built libreoffice with disabled LTO and parallel build was successfull :)

That means LTO optimization really corrupted some of libreoffice
libraries and as a result tests are failing?

Thank you,
Martin


On 3 June 2013 10:34, Michael Meeks michael.me...@suse.com wrote:

 On Mon, 2013-06-03 at 00:41 +0200, Martin Liška wrote:
 I send you in attachment build log and install log file.

 Do you have any ideas why calc build failed?

 For anyone looking at this, please bear in mind that Martin is
 attempting to use LTO. Martin can you verify that a parallel build with
 --enable-mergelibs does not fail on the same test ?

 If so - the problem is isolated in gcc - and I guess that team would
 want to have a look into it.

 Thanks,

 Michael.

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

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

REMINDER: Release 4.1.0.0.beta2 from libreoffice-4-1 branch

2013-06-03 Thread Petr Mladek

Hi,

please note that the commit deadline for 4.1.0.0.beta2 is today (Monday),
June 3, 2013.

Please, try to get all late features done! This is the last beta. The
hard English string, UI freeze is getting close. It will happen with
the deadline for rc1 on June 17, 2013.


See also
http://wiki.documentfoundation.org/ReleasePlan#4.1_release
http://wiki.documentfoundation.org/Release_Criteria
http://wiki.documentfoundation.org/Development/Branches


Best Regards,
Petr


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

Grammar Check not working in Calc?

2013-06-03 Thread Guenter Bartsch

dear all,

just a quick question: are grammar check plugins supposed to work in calc?

we have implemented a small grammar check plugin which works nicely in
writer. however, it doesn't seem to get called ever when entering
tests in calc spreadsheets - is this a bug in our plugin or a problem
in libreoffice in general?

thanks,

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

Gerrit migration on June 19th

2013-06-03 Thread Florian Effenberger


Hello,

Alex, Robert and I plan to do a smooth migration from LXC to KVM based 
virtual machines. Steps involved are recreating all production VMs in 
KVM in parallel (we have enough IPs available), then shutting down LXC, 
then upgrading the host system. Luckily, with KVM, the base OS and 
kernel of the guest does not need to fit the one of the host.


For working on the gerrit migration, we have scheduled

Wednesday, June 19th,
at about 1600 UTC

Depending on how far we get, we'd directly switch the machines on that 
evening.


Is there any critical blocker for the above timetable?

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

Re: Extending / Chaining Spell Checker

2013-06-03 Thread Stephan Bergmann


On 06/01/2013 06:48 PM, Guenter Bartsch wrote:

would still be interested if there is a cleaner way to achieve this.


I at least have no idea.  (I just found the XLinguServiceManager.idl 
quote after looking around a bit, but otherwise don't know that area of 
the code well.)


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

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

2013-06-03 Thread Stephan Bergmann

 sc/source/core/tool/interpr2.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9b5640777d4f373c8e25f600445936b8215f1be3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jun 3 11:53:10 2013 +0200

ScInterpreter::GetString can return reference to shared string instance

...ScInterpreter::aTempStr member.  Regression introduced with
a11be8a87a749f56d5c5514bbd9ffd90b3f75392 use size_t where possible and fix 
some
more places causing JunitTest_sc_unoapi's
sc.ScDDELinkObj::com::sun::star::util::XRefreshable to fail.

Change-Id: I50227b004e37f68c5040d4ace90a79300f711be8

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 91397b4..b42cf4d 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2255,9 +2255,9 @@ void ScInterpreter::ScDde()
 sal_uInt8 nMode = SC_DDE_DEFAULT;
 if (nParamCount == 4)
 nMode = (sal_uInt8) ::rtl::math::approxFloor(GetDouble());
-const OUString aItem  = GetString();
-const OUString aTopic = GetString();
-const OUString aAppl  = GetString();
+OUString aItem  = GetString();
+OUString aTopic = GetString();
+OUString aAppl  = GetString();
 
 if (nMode  SC_DDE_TEXT)
 nMode = SC_DDE_DEFAULT;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Stephan Bergmann

 sc/inc/document.hxx  |2 +-
 sc/source/core/data/documen8.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 52a2f1d57d706a6ba45d307ed3f5409c8f0527ef
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jun 3 12:03:38 2013 +0200

This looks like a typo

...from a11be8a87a749f56d5c5514bbd9ffd90b3f75392 use size_t where possible 
and
fix some more places.

Change-Id: I27c6d3532dd3f672d7b06b60add32d44a20d9068

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index eb29dea..2b7490e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -692,7 +692,7 @@ public:
 /** Returns the result matrix of the specified DDE link.
 @param nDdePos  Index of the DDE link (does not include other links 
from link manager).
 @return  The result matrix, if the DDE link has been found, 0 
otherwise. */
-SC_DLLPUBLIC const ScMatrix* GetDdeLinkResultMatrix( sal_uInt16 size_t ) 
const;
+SC_DLLPUBLIC const ScMatrix* GetDdeLinkResultMatrix( size_t nDdePos ) 
const;
 
 /** Tries to find a DDE link or creates a new, if not extant.
 @param pResults  If not 0, sets the matrix as as DDE link result 
matrix (also for existing links).
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index d090ad0..236b9e5 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -1377,7 +1377,7 @@ bool ScDocument::GetDdeLinkMode( size_t nDdePos, 
sal_uInt8 rnMode ) const
 return false;
 }
 
-const ScMatrix* ScDocument::GetDdeLinkResultMatrix( sal_uInt16 nDdePos ) const
+const ScMatrix* ScDocument::GetDdeLinkResultMatrix( size_t nDdePos ) const
 {
 const ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos );
 return pDdeLink ? pDdeLink-GetResult() : NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst python/makefile.mk python/python-2.7.3-mingw.patch python/python-2.7.4-nohardlink.patch python/python-2.7.4-pcbuild.p

2013-06-03 Thread Jürgen Schmidt

 external_deps.lst|6 
 python/makefile.mk   |2 
 python/python-2.7.3-mingw.patch  | 7316 ---
 python/python-2.7.4-nohardlink.patch |   11 
 python/python-2.7.4-pcbuild.patch| 1778 
 python/python-2.7.4-sysbase.patch|   13 
 python/python-2.7.5-mingw.patch  | 7316 +++
 python/python-2.7.5-nohardlink.patch |   11 
 python/python-2.7.5-pcbuild.patch| 1778 
 python/python-2.7.5-sysbase.patch|   13 
 python/python-freebsd.patch  |   36 
 python/python-md5.patch  |6 
 python/python-solaris.patch  |4 
 python/python-ssl.patch  |   12 
 python/pyversion.mk  |2 
 sysui/desktop/debian/control |4 
 16 files changed, 9154 insertions(+), 9154 deletions(-)

New commits:
commit 163130698094a0824a4d82dbbb2cdfa9c59fed29
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Mon Jun 3 08:15:43 2013 +

#122010# update Python to 2.7.5

diff --git a/external_deps.lst b/external_deps.lst
index 9924501..5e02b96 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -217,9 +217,9 @@ if (ENABLE_MEDIAWIKI == YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_PYTHON != YES)
-MD5 = 62704ea0f125923208d84ff0568f7d50
-name = Python-2.7.4.tar.bz2
-URL1 = http://www.python.org/ftp/python/2.7.4/Python-2.7.4.tar.bz2
+MD5 =  6334b666b7ff2038c761d7b27ba699c1
+name = Python-2.7.5.tar.bz2
+URL1 = http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.bz2
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_BOOST!=YES || (OS==SOLARIS  COM!=GCC))
diff --git a/python/makefile.mk b/python/makefile.mk
index 5c22086..593b10f 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=62704ea0f125923208d84ff0568f7d50
+TARFILE_MD5=6334b666b7ff2038c761d7b27ba699c1
 PATCH_FILES=\
 python-solaris.patch \
 python-freebsd.patch \
diff --git a/python/python-2.7.3-mingw.patch b/python/python-2.7.5-mingw.patch
similarity index 98%
rename from python/python-2.7.3-mingw.patch
rename to python/python-2.7.5-mingw.patch
index d668d2b..255aad7 100644
--- a/python/python-2.7.3-mingw.patch
+++ b/python/python-2.7.5-mingw.patch
@@ -1,6 +1,6 @@
-diff -ru misc/Python-2.7.3/Include/pyport.h 
misc/build/Python-2.7.3/Include/pyport.h
 misc/Python-2.7.3/Include/pyport.h 2012-04-09 18:07:29.0 -0500
-+++ misc/build/Python-2.7.3/Include/pyport.h   2012-07-25 15:33:16.0 
-0500
+diff -ru misc/Python-2.7.5/Include/pyport.h 
misc/build/Python-2.7.5/Include/pyport.h
+--- misc/Python-2.7.5/Include/pyport.h 2012-04-09 18:07:29.0 -0500
 misc/build/Python-2.7.5/Include/pyport.h   2012-07-25 15:33:16.0 
-0500
 @@ -9,6 +9,30 @@
  #include inttypes.h
  #endif
@@ -32,9 +32,9 @@ diff -ru misc/Python-2.7.3/Include/pyport.h 
misc/build/Python-2.7.3/Include/pypo
  #ifdef HAVE_STDINT_H
  #include stdint.h
  #endif
-diff -ru misc/Python-2.7.3/Lib/distutils/ccompiler.py 
misc/build/Python-2.7.3/Lib/distutils/ccompiler.py
 misc/Python-2.7.3/Lib/distutils/ccompiler.py   2012-04-09 
18:07:29.0 -0500
-+++ misc/build/Python-2.7.3/Lib/distutils/ccompiler.py 2012-07-25 
15:33:16.0 -0500
+diff -ru misc/Python-2.7.5/Lib/distutils/ccompiler.py 
misc/build/Python-2.7.5/Lib/distutils/ccompiler.py
+--- misc/Python-2.7.5/Lib/distutils/ccompiler.py   2012-04-09 
18:07:29.0 -0500
 misc/build/Python-2.7.5/Lib/distutils/ccompiler.py 2012-07-25 
15:33:16.0 -0500
 @@ -893,6 +893,7 @@
  # on a cygwin built python we can use gcc like an ordinary UNIXish
  # compiler
@@ -43,9 +43,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/ccompiler.py 
misc/build/Python-2.7.3/Li
  ('os2emx', 'emx'),
  
  # OS name mappings
-diff -ru misc/Python-2.7.3/Lib/distutils/command/build_ext.py 
misc/build/Python-2.7.3/Lib/distutils/command/build_ext.py
 misc/Python-2.7.3/Lib/distutils/command/build_ext.py   2012-04-09 
18:07:29.0 -0500
-+++ misc/build/Python-2.7.3/Lib/distutils/command/build_ext.py 2012-07-25 
15:33:16.0 -0500
+diff -ru misc/Python-2.7.5/Lib/distutils/command/build_ext.py 
misc/build/Python-2.7.5/Lib/distutils/command/build_ext.py
+--- misc/Python-2.7.5/Lib/distutils/command/build_ext.py   2012-04-09 
18:07:29.0 -0500
 misc/build/Python-2.7.5/Lib/distutils/command/build_ext.py 2012-07-25 
15:33:16.0 -0500
 @@ -221,7 +221,7 @@
  
  # for extensions under Cygwin and AtheOS Python's library directory 
must be
@@ -64,9 +64,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/command/build_ext.py 
misc/build/Python-
  template = python%d.%d
  pythonlib = (template %
 (sys.hexversion  24, (sys.hexversion  16)  0xff))
-diff -ru misc/Python-2.7.3/Lib/distutils/command/install.py

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

2013-06-03 Thread Stephan Bergmann

 vcl/source/filter/wmf/enhwmf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ea041fee44aecc6efda14c1d17f4637d3b42f11
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jun 3 12:22:35 2013 +0200

Use the right control variable for index access

Change-Id: Ic0b9f7bc62cbce52c7f870ba77d5463fd759566f

diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 9fd8a9f..ad2a3a6 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -428,7 +428,7 @@ void EnhWMFReader::ReadAndDrawPolyPolygon()
 {
 T nX(0), nY(0);
 *pWMF  nX  nY;
-pPtAry[ i ] = Point( nX, nY );
+pPtAry[ j ] = Point( nX, nY );
 ++nReadPoints;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Matthias Hofmann

 sd/inc/shapelist.hxx   |   12 
 sd/source/core/drawdoc.cxx |9 -
 sd/source/core/sdpage.cxx  |   11 ++-
 sd/source/core/sdpage2.cxx |9 +++--
 sd/source/core/shapelist.cxx   |   22 --
 sd/source/ui/view/drviews1.cxx |3 ++-
 6 files changed, 23 insertions(+), 43 deletions(-)

New commits:
commit e89ab73fa01e825bd55908c9ba3697cb00cead16
Author: Matthias Hofmann bor...@web.de
Date:   Sun Jun 2 14:14:37 2013 +0200

remove ShapeList::getNextShape(SdrObject* pObj)

The getNextShape(pObj) method is just used for iterating over the complete
ShapeList. But the complexity for this operation is exponential.
When using getNextShape() iterating over the list have linear complexity.
In short: it is much faster.

Change-Id: I3896af2247f348153d62f2bcdd207c5a75239689
Reviewed-on: https://gerrit.libreoffice.org/4132
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index f3c779e..f828ebc6 100644
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -48,16 +48,12 @@ namespace sd
 /** @return true if given shape is part of this list */
 bool hasShape( SdrObject rObject ) const;
 
-/** returns the shape following the given shape in the list or 0
-returns the first shape if pObj is 0 */
-SdrObject* getNextShape(SdrObject* pObj) const;
-
-/**
-*/
+/** returns the shape the internal iterator points to, or 0 if
+ * the list end is reached. moves the internal iterator to the
+ * next shape. */
 SdrObject* getNextShape();
 
-/**
-*/
+/** Sets the internal iterator to the shape at given index. */
 void seekShape( sal_uInt32 nIndex );
 
 /**
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 2d294eb..aca4996 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -694,7 +694,7 @@ void SdDrawDocument::UpdateAllLinks()
 */
 void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* 
pSPool )
 {
-const sd::ShapeList rPresentationShapes( 
pPage-GetPresentationShapeList() );
+sd::ShapeList rPresentationShapes( pPage-GetPresentationShapeList() );
 if(!rPresentationShapes.isEmpty())
 {
 // Create lists of title and outline styles
@@ -706,11 +706,12 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, 
SdStyleSheetPool* pSPool
 
 SfxStyleSheet* pTitleSheet = 
(SfxStyleSheet*)pSPool-GetTitleSheet(aName);
 
-SdrObject* pObj = rPresentationShapes.getNextShape(0);
+SdrObject* pObj = 0;
+rPresentationShapes.seekShape(0);
 
 // Now look for title and outline text objects, then make those objects
 // listeners.
-while(pObj)
+while( (pObj = rPresentationShapes.getNextShape()) )
 {
 if (pObj-GetObjInventor() == SdrInventor)
 {
@@ -761,8 +762,6 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, 
SdStyleSheetPool* pSPool
 }
 }
 }
-
-pObj = rPresentationShapes.getNextShape(pObj);
 }
 }
 }
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 6c4faf3..71d407b 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -156,7 +156,9 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int 
nIndex, bool bFuzzySearc
 std::vector SdrObject*  aMatches;
 
 SdrObject* pObj = 0;
-while( (pObj = maPresentationShapeList.getNextShape(pObj)) != 0 )
+maPresentationShapeList.seekShape(0);
+
+while( (pObj = maPresentationShapeList.getNextShape()) )
 {
 SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pObj);
 if( pInfo )
@@ -1572,11 +1574,11 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool 
bInit, sal_Bool bCreate
 // now delete all empty presentation objects that are no longer used by 
the new layout
 if( bInit )
 {
-SdrObject* pObj = maPresentationShapeList.getNextShape(0);
+SdrObject* pObj = 0;
+maPresentationShapeList.seekShape(0);
 
-while( pObj )
+while( (pObj = maPresentationShapeList.getNextShape()) )
 {
-SdrObject* pNext = maPresentationShapeList.getNextShape(pObj);
 if( aUsedPresentationObjects.count(pObj) == 0 )
 {
 
@@ -1592,7 +1594,6 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool 
bInit, sal_Bool bCreate
 }
 /* #i108541# keep non empty pres obj as pres obj even if they are not part of 
the current layout */
 }
-pObj = pNext;
 }
 }
 }
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 95d9e3a..1b4f9ab 100644
--- a/sd/source/core/sdpage2.cxx
+++

[PUSHED] remove ShapeList::getNextShape(SdrObject* pObj)

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

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4132

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3896af2247f348153d62f2bcdd207c5a75239689
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: mhofmann bor...@web.de
Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu
Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com

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

Re: unexpected css::container::ElementExistException in SwXFrame::attachToRange

2013-06-03 Thread Miklos Vajna

On Fri, May 31, 2013 at 12:46:23PM +0200, Michael Stahl mst...@redhat.com 
wrote:
 this problem was introduced with
 
 commit 1a3c90a292c7fc9060604151de9dc51eecf5b6a7
 Author: Miklos Vajna vmik...@suse.cz
 Date:   Wed Feb 6 12:09:48 2013 +0100
 
 sw: let drawinglayer manage gradient styles of our textframes
 
 With this, the hacks from commits
 81a46fc86a530f028a5bd2f5e52fe0372d50ee38 and
 d7efffebd9651dd866349915360ade64b97d7301 are no longer necessary.
 
 
 i hope i've fixed it with f5e8f5b0b5410d29b5cb1fb6fbbd8bf3c48a0201 but
 don't have any real gradient bugdocs to check if it is the right fix.

sw/qa/extras/ooxmlexport/data/textframe-gradient.docx is a relevant
bugdoc, I see no problem with your commit. Making sure that the used
gradient name is unique is a task for the caller of that method.


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

[Libreoffice-commits] dev-tools.git: ciabot/run-libreoffice-ciabot.pl

2013-06-03 Thread Miklos Vajna

 ciabot/run-libreoffice-ciabot.pl |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a572905eb0762544d69082a019774efd43a8a10a
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Jun 3 12:54:56 2013 +0200

ciabot: watch si-gui

Asked by Florian Reisinger

Change-Id: I49ce715cd75e23909a6a050510b22f27a6fc8a91

diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index b7173b5..f53a2d6 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -124,6 +124,7 @@ print timestamp() .  Checking for changes in the 
libreoffice repo  sending rep
 core,
 dictionaries,
 help,
+si-gui,
 );
 
 $test = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Noel Grandin

 xmloff/source/forms/elementimport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d47fb9474421e950b828a921565656babab9d9ba
Author: Noel Grandin n...@peralex.com
Date:   Mon Jun 3 10:37:33 2013 +0200

fix for unused return value.

This code was introduced by:
   commit d09dd8986436f17717443823ef18bd8552fdf408
   Author: Frank Schoenheit [fs] frank.schoenh...@sun.com
   Date:   Wed Sep 15 13:55:34 2010 +0200
   dba34a: export/import min-/max-/default-/value for date/time as
   XML-Schema conformant strings
It looks like it intended to use determineDefaultServiceName(), but
neglected to store the return value.

Change-Id: I1607f39cf771b594389492785c7e72478d44843a
Reviewed-on: https://gerrit.libreoffice.org/4140
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/xmloff/source/forms/elementimport.cxx 
b/xmloff/source/forms/elementimport.cxx
index 9d180b0..443209f 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -184,7 +184,7 @@ namespace xmloff
 }
 
 if ( m_sServiceName.isEmpty() )
-determineDefaultServiceName();
+m_sServiceName = determineDefaultServiceName();
 
 // create the object *now*. This allows setting properties in the 
various handleAttribute methods.
 // (Though currently not all code is migrated to this pattern, most 
attributes are still handled
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fix for unused return value.

2013-06-03 Thread 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/4140

Approvals:
  Luboš Luňák: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1607f39cf771b594389492785c7e72478d44843a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz

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

Re: [libreoffice-users] Ask.LibreOffice.org and Bugzilla Twitter accounts

2013-06-03 Thread Florian Effenberger


Hi Zeki,

Zeki Bildirici wrote on 2013-05-22 19:23:


I want you to inform about some minor updates:


thank you very much for your great work on this!


- I've moved the external service for Ask site to dlvr.it because of
detailed statistics


So the previous Twitterfeed credentials are not needed anymore? Can you 
privately send me the credentials for the dlvr.it account for Ask then, 
so I can add it to our KeePass keyring?



too.If we can increase the number of followers more traffic and
interest will be provided. For last 24 hours, 73 clicks, 24 posts
which means 24 new bug is opened, ratio is ~3.0 per click)


As discussed via separate mail, I've tweeted privately and from the 
official TDF account, hoping this attracts a few more followers. ;-)



Also posting about this accounts on TDF
planet(http://planet.documentfoundation.org/) may help to promote this
twitter accounts.


If you want, we can post something on the official TDF blog, which then 
is also shown at the Planet. Feel free to come up with a draft!



Best regards and keep being awesome for LibreOffice!


The very same to you, Zeki - thanks a bunch! ;)

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

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

2013-06-03 Thread Mark Wielaard

 i18npool/qa/cppunit/test_breakiterator.cxx |4 +++-
 i18nutil/source/utility/unicode.cxx|6 +++---
 svx/source/dialog/charmap.cxx  |5 +++--
 sw/source/core/text/porlay.cxx |4 
 4 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit addc791623288fae7832c78e0c2923937251d1f7
Author: Mark Wielaard m...@klomp.org
Date:   Mon Jun 3 09:35:25 2013 +0200

Fix icu version checks.

commit 30c303 Make charmap.cxx compile with icu = 4.4. was incomplete
and had wrong version checks. After ICU 4.8 (4.8.1.1) the next version
of ICU was 49 (49.1) so U_ICU_VERSION_MAJOR_NUM contains two digets (49),
earlier that it was just one digit (4). The correct header to include to
do version checks is unicode/uversion.h. USCRIPT_MANDAEAN is the old
alias of USCRIPT_MANDAIC (same numeric value). U_JG_FARSI_YEH is only
available since ICU 4.4. Note that on older icu versions (4.2.1) the
200B (ZWSP) Zero Width Space breakiterator testcase fails (others
succeed).

Change-Id: If73c1402239a28546077437e9382f0bd38642bad
Reviewed-on: https://gerrit.libreoffice.org/4139
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index b3ec68f..4ba6a79 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -19,7 +19,7 @@
 #include com/sun/star/i18n/WordType.hpp
 #include unotest/bootstrapfixturebase.hxx
 
-#include unicode/uvernum.h
+#include unicode/uversion.h
 
 #include rtl/strbuf.hxx
 #include rtl/ustrbuf.hxx
@@ -236,6 +236,8 @@ void TestBreakIterator::testWordBoundaries()
 }
 
 //See https://bugs.freedesktop.org/show_bug.cgi?id=49629
+//Note that the breakiterator test will fail on older icu versions
+//(4.2.1) for the 200B (ZWSP) Zero Width Space testcase.
 sal_Unicode aBreakTests[] = { ' ', 1, 2, 3, 4, 5, 6, 7, 0x91, 0x92, 
0x200B, 0xE8FF, 0xF8FF };
 for (int mode = i18n::WordType::ANY_WORD; mode = 
i18n::WordType::WORD_COUNT; ++mode)
 {
diff --git a/i18nutil/source/utility/unicode.cxx 
b/i18nutil/source/utility/unicode.cxx
index 2c2dd42..b46a7f6 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -826,6 +826,9 @@ OString SAL_CALL 
unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript)
 case USCRIPT_TAI_VIET:
 sRet = blt;
 break;
+case USCRIPT_MANDAEAN: /* Aliased to USCRIPT_MANDAIC in icu 4.6. */
+sRet = mic;
+break;
 #if (U_ICU_VERSION_MAJOR_NUM  4) || (U_ICU_VERSION_MAJOR_NUM == 4  
U_ICU_VERSION_MINOR_NUM = 4)
 case USCRIPT_NABATAEAN: //no language with an assigned code yet
 sRet = mis;
@@ -833,9 +836,6 @@ OString SAL_CALL 
unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript)
 case USCRIPT_PALMYRENE: //no language with an assigned code yet
 sRet = mis;
 break;
-case USCRIPT_MANDAIC:
-sRet = mic;
-break;
 case USCRIPT_BAMUM:
 sRet = bax;
 break;
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index bc6c83e..907d9f8 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1302,7 +1302,7 @@ void SubsetMap::InitList()
 case UBLOCK_DOMINO_TILES:
 aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, 
RID_SUBSETSTR_DOMINO_TILES ) );
 break;
-#if U_ICU_VERSION_MAJOR_NUM = 44
+#if (U_ICU_VERSION_MAJOR_NUM  4) || (U_ICU_VERSION_MAJOR_NUM == 4  
U_ICU_VERSION_MINOR_NUM = 4)
 case UBLOCK_SAMARITAN:
 aAllSubsets.push_back( Subset( 0x0800, 0x083F, 
RID_SUBSETSTR_SAMARITAN ) );
 break;
@@ -1382,7 +1382,7 @@ void SubsetMap::InitList()
 aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, 
RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C ) );
 break;
 #endif
-#if U_ICU_VERSION_MAJOR_NUM = 46
+#if (U_ICU_VERSION_MAJOR_NUM  4) || (U_ICU_VERSION_MAJOR_NUM == 4  
U_ICU_VERSION_MINOR_NUM = 6)
 case UBLOCK_MANDAIC:
 aAllSubsets.push_back( Subset( 0x0840, 0x085F, 
RID_SUBSETSTR_MANDAIC ) );
 break;
@@ -1420,6 +1420,7 @@ void SubsetMap::InitList()
 aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, 
RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D ) );
 break;
 #endif
+// Note ICU version 49 (NOT 4.9), so the MAJOR_NUM is two digits.
 #if U_ICU_VERSION_MAJOR_NUM = 49
 case UBLOCK_ARABIC_EXTENDED_A:
 aAllSubsets.push_back( Subset( 0x08A0, 0x08FF, 
RID_SUBSETSTR_ARABIC_EXTENDED_A ) );
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index

[PUSHED] Fix icu version checks.

2013-06-03 Thread 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/4139

Approvals:
  Luboš Luňák: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: If73c1402239a28546077437e9382f0bd38642bad
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz

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

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

2013-06-03 Thread Isamu Mogi

 solenv/gbuild/platform/WNT_INTEL_GCC.mk |4 ++--
 solenv/gbuild/platform/com_MSC_defs.mk  |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit be4bf1016e66e74bc2ab8d031cae2ffb2a0777d8
Author: Isamu Mogi saturda...@gmail.com
Date:   Sat Jun 1 14:15:21 2013 +

gbuild: Fix indent

Change-Id: I9dafd3dd75f00a8447b78d4765ec1087c84f61c2
Reviewed-on: https://gerrit.libreoffice.org/4126
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 35706c1..3fe9b0d 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -48,8 +48,8 @@ gb_COMPILERDEFS += -DBOOST_MEM_FN_ENABLE_CDECL
 endif
 
 gb_RCDEFS := \
--DWINVER=0x0400 \
--DWIN32 \
+   -DWINVER=0x0400 \
+   -DWIN32 \
 
 gb_RCFLAGS := \
 -V
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index adfaa6b..b239cec 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -56,8 +56,8 @@ gb_COMPILERDEFS += \
 endif
 
 gb_RCDEFS := \
--DWINVER=0x0400 \
--DWIN32 \
+   -DWINVER=0x0400 \
+   -DWIN32 \
 
 gb_RCFLAGS := \
 -V
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] gbuild: Fix indent

2013-06-03 Thread 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/4126

Approvals:
  Luboš Luňák: Verified; Looks good to me, approved

Objections:
  Björn Michaelsen: This need some tweaks before it is merged


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9dafd3dd75f00a8447b78d4765ec1087c84f61c2
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Isamu Mogi saturda...@gmail.com
Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: Isamu Mogi saturda...@gmail.com
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz

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

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

2013-06-03 Thread Michael Meeks

 vcl/unx/gtk/window/gtksalframe.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit baa6b7f1a86a0014c9ce176b687bf6ac3edf933d
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Jun 3 09:27:26 2013 +0100

fdo#56583 - avoid setting user time on unrealized windows.

Change-Id: Iab776088b1d168295d636069e1a92ba948241653

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx 
b/vcl/unx/gtk/window/gtksalframe.cxx
index 041a8a0..0f53e93 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1013,9 +1013,17 @@ static void lcl_set_user_time( GtkWindow* i_pWindow, 
guint32 i_nTime )
 bGetSetUserTimeFn = false;
 p_gdk_x11_window_set_user_time = 
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin, 
gdk_x11_window_set_user_time );
 }
+bool bSet = false;
 if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( 
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
-else
+{
+GdkWindow* pWin = widget_get_window(GTK_WIDGET(i_pWindow));
+if( pWin ) // only if the window is realized.
+{
+p_gdk_x11_window_set_user_time( pWin, i_nTime );
+bSet = true;
+}
+}
+if( !bSet )
 {
 Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
 Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Stephan Bergmann

 vcl/source/filter/wmf/enhwmf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6dfd6a0e115136f7ae1730458508d76007560517
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jun 3 12:22:35 2013 +0200

Use the right control variable for index access

Change-Id: Ic0b9f7bc62cbce52c7f870ba77d5463fd759566f
(cherry picked from commit 8ea041fee44aecc6efda14c1d17f4637d3b42f11)

diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 9fd8a9f..ad2a3a6 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -428,7 +428,7 @@ void EnhWMFReader::ReadAndDrawPolyPolygon()
 {
 T nX(0), nY(0);
 *pWMF  nX  nY;
-pPtAry[ i ] = Point( nX, nY );
+pPtAry[ j ] = Point( nX, nY );
 ++nReadPoints;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Armin Le Grand

 svx/source/customshapes/EnhancedCustomShape2d.cxx |   30 ++
 1 file changed, 30 insertions(+)

New commits:
commit 76bbe5ff357406ac1e0f212373c9fd4132b0d178
Author: Armin Le Grand a...@apache.org
Date:   Mon Dec 10 14:45:55 2012 +

#121437# Added patch from Regina which implements QuadraticBezier segemnts 
to CustomShapes

Patch by: Regina
Review by: ALG
(cherry picked from commit 4faa46872cad4ed779b07803b7f616b32d800284)

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 0675abd..e5d5c2b 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1562,6 +1562,36 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16 
rSrcPt, sal_uInt16 rSegm
 }
 break;
 
+case QUADRATICCURVETO :
+{
+for ( sal_uInt16 i = 0; ( i  nPntCount )  ( ( rSrcPt + 
1 )  nCoordSize ); i++ )
+{
+if ( rSrcPt )
+{
+const Point aPreviousEndPoint(GetPoint( 
seqCoordinates[ rSrcPt - 1 ], sal_True, sal_True));
+const Point aControlQ(GetPoint( seqCoordinates[ 
rSrcPt++ ], sal_True, sal_True ));
+const Point aEnd(GetPoint( seqCoordinates[ 
rSrcPt++ ], sal_True, sal_True ));
+const Point aControlA((aPreviousEndPoint + 
(aControlQ * 2)) / 3);
+const Point aControlB(((aControlQ * 2) + aEnd) / 
3);
+
+DBG_ASSERT(aNewB2DPolygon.count(), 
EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!));
+aNewB2DPolygon.appendBezierSegment(
+basegfx::B2DPoint(aControlA.X(), 
aControlA.Y()),
+basegfx::B2DPoint(aControlB.X(), 
aControlB.Y()),
+basegfx::B2DPoint(aEnd.X(), aEnd.Y()));
+}
+else // no previous point , do a moveto
+{
+rSrcPt++; // skip control point
+const Point aEnd(GetPoint( seqCoordinates[ 
rSrcPt++ ], sal_True, sal_True ));
+
+DBG_ASSERT(aNewB2DPolygon.count(), 
EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!));
+aNewB2DPolygon.append(basegfx::B2DPoint(aEnd.X(), 
aEnd.Y()));
+}
+}
+}
+break;
+
 case ANGLEELLIPSE :
 {
 if ( nPntCount )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] correct fix for fdo#62938

2013-06-03 Thread Stephan Bergmann


On 06/03/2013 05:07 AM, Markus Mohrhard wrote:

commit 7dfb72e69c629e5897ee515f8c42b7e45610ab8e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Jun 3 04:49:12 2013 +0200

 correct fix for fdo#62938

 Change-Id: Ib8e5cf92d733bafaef7f9e0bb8e3bf823075f489

diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index 3fa6142..efcc0e4 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -231,13 +231,14 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( 
ScXMLImport rImport,
  // don't have any attributes
  if (bHeader)
  {
-nHeaderStartRow = rImport.GetTables().GetCurrentRow();
+ScAddress aAddr = rImport.GetTables().GetCurrentCellPos();
+nHeaderStartRow = aAddr.Row();
  ++nHeaderStartRow;
  }
  else if (bGroup)
  {
-nGroupStartRow = rImport.GetTables().GetCurrentRow();
-++nGroupStartRow;
+ScAddress aAddr = rImport.GetTables().GetCurrentCellPos();
+nHeaderStartRow = aAddr.Row();
  sal_Int16 nAttrCount = xAttrList.is() ? xAttrList-getLength() : 0;
  for( sal_Int16 i=0; i  nAttrCount; ++i )
  {


This breaks CppunitTest_sc_outlineobj:


xsheetoutline.cxx:149:Assertion
Test name: sc_apitest::ScOutlineObj::testShowLevel
equality assertion failed
- Expected: OutlineSheet.A1:D1
- Actual  :
- testShowLevel Column


Reverting it helps, but I have no idea whether it is the fix or the test 
that is broken.


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

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

2013-06-03 Thread Fridrich Štrba

 svx/source/customshapes/EnhancedCustomShape2d.cxx |   30 --
 1 file changed, 30 deletions(-)

New commits:
commit 855d7bc6b19357788193cb57a013867866367ecd
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Jun 3 13:53:29 2013 +0200

Revert #121437# Added patch from Regina which implements QuadraticBezier 
segemnts to CustomShapes

This reverts commit 76bbe5ff357406ac1e0f212373c9fd4132b0d178.

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index e5d5c2b..0675abd 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1562,36 +1562,6 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16 
rSrcPt, sal_uInt16 rSegm
 }
 break;
 
-case QUADRATICCURVETO :
-{
-for ( sal_uInt16 i = 0; ( i  nPntCount )  ( ( rSrcPt + 
1 )  nCoordSize ); i++ )
-{
-if ( rSrcPt )
-{
-const Point aPreviousEndPoint(GetPoint( 
seqCoordinates[ rSrcPt - 1 ], sal_True, sal_True));
-const Point aControlQ(GetPoint( seqCoordinates[ 
rSrcPt++ ], sal_True, sal_True ));
-const Point aEnd(GetPoint( seqCoordinates[ 
rSrcPt++ ], sal_True, sal_True ));
-const Point aControlA((aPreviousEndPoint + 
(aControlQ * 2)) / 3);
-const Point aControlB(((aControlQ * 2) + aEnd) / 
3);
-
-DBG_ASSERT(aNewB2DPolygon.count(), 
EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!));
-aNewB2DPolygon.appendBezierSegment(
-basegfx::B2DPoint(aControlA.X(), 
aControlA.Y()),
-basegfx::B2DPoint(aControlB.X(), 
aControlB.Y()),
-basegfx::B2DPoint(aEnd.X(), aEnd.Y()));
-}
-else // no previous point , do a moveto
-{
-rSrcPt++; // skip control point
-const Point aEnd(GetPoint( seqCoordinates[ 
rSrcPt++ ], sal_True, sal_True ));
-
-DBG_ASSERT(aNewB2DPolygon.count(), 
EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!));
-aNewB2DPolygon.append(basegfx::B2DPoint(aEnd.X(), 
aEnd.Y()));
-}
-}
-}
-break;
-
 case ANGLEELLIPSE :
 {
 if ( nPntCount )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-3-6] fdo#56583 - avoid setting user time on unrealized windows.

2013-06-03 Thread Michael Meeks (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4142

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/4142/1

fdo#56583 - avoid setting user time on unrealized windows.

Change-Id: Iab776088b1d168295d636069e1a92ba948241653
---
M vcl/unx/gtk/window/gtkframe.cxx
1 file changed, 10 insertions(+), 2 deletions(-)



diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 36be0b2..47aa654 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -822,9 +822,17 @@
 bGetSetUserTimeFn = false;
 p_gdk_x11_window_set_user_time = 
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin, 
gdk_x11_window_set_user_time );
 }
+bool bSet = false;
 if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( 
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
-else
+{
+GdkWindow* pWin = widget_get_window(GTK_WIDGET(i_pWindow));
+if( pWin ) // only if the window is realized.
+{
+p_gdk_x11_window_set_user_time( pWin, i_nTime );
+bSet = true;
+}
+}
+if( !bSet )
 {
 Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
 Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab776088b1d168295d636069e1a92ba948241653
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Meeks michael.me...@suse.com

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

[PATCH libreoffice-4-0] fdo#56583 - avoid setting user time on unrealized windows.

2013-06-03 Thread Michael Meeks (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4143

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/4143/1

fdo#56583 - avoid setting user time on unrealized windows.

Change-Id: Iab776088b1d168295d636069e1a92ba948241653
---
M vcl/unx/gtk/window/gtkframe.cxx
1 file changed, 10 insertions(+), 2 deletions(-)



diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index d783e95..fc5154b 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1011,9 +1011,17 @@
 bGetSetUserTimeFn = false;
 p_gdk_x11_window_set_user_time = 
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin, 
gdk_x11_window_set_user_time );
 }
+bool bSet = false;
 if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( 
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
-else
+{
+GdkWindow* pWin = widget_get_window(GTK_WIDGET(i_pWindow));
+if( pWin ) // only if the window is realized.
+{
+p_gdk_x11_window_set_user_time( pWin, i_nTime );
+bSet = true;
+}
+}
+if( !bSet )
 {
 Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
 Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab776088b1d168295d636069e1a92ba948241653
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Meeks michael.me...@suse.com

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/setsdkenv_windows.template sd/source

2013-06-03 Thread Andre Fischer

 odk/setsdkenv_windows.template  |   22 +++-
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |1 
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 88914c616747693083819ec44ea81c9d96fa5136
Author: Andre Fischer a...@apache.org
Date:   Mon Jun 3 10:38:19 2013 +

122437: Fixed context notification for Draw documents.

diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx 
b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 0bed381..46895c0 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -567,6 +567,7 @@ void SlideSorterViewShell::Activate (sal_Bool 
bIsMDIActivate)
 case ViewShell::ST_IMPRESS:
 case ViewShell::ST_SLIDE_SORTER:
 case ViewShell::ST_NOTES:
+case ViewShell::ST_DRAW:
 eContext = EnumContext::Context_DrawPage;
 if (pMainViewShell-ISA(DrawViewShell))
 {
commit ec3d57252111792c7cf5dbc13966b426c0a5b8fa
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Mon Jun 3 10:11:15 2013 +

#122356# add mistakenly removed licene header

diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index eb04beb..501a2f8 100644
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -1,5 +1,25 @@
 @echo off
-Rem This script sets all enviroment variables, which
+REM *
+REM
+REM  Licensed to the Apache Software Foundation (ASF) under one
+REM  or more contributor license agreements.  See the NOTICE file
+REM  distributed with this work for additional information
+REM  regarding copyright ownership.  The ASF licenses this file
+REM  to you under the Apache License, Version 2.0 (the
+REM  License)rem you may not use this file except in compliance
+REM  with the License.  You may obtain a copy of the License at
+REM
+REMhttp://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing,
+REM  software distributed under the License is distributed on an
+REM  AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM  KIND, either express or implied.  See the License for the
+REM  specific language governing permissions and limitations
+REM  under the License.
+REM
+REM *
+REM This script sets all enviroment variables, which
 REM are necessary for building the examples of the Office Development Kit.
 REM The Script was developed for the operating systems Windows.
 REM The SDK name
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - vcl/unx

2013-06-03 Thread Michael Meeks

 vcl/unx/gtk/window/gtkframe.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 7758117776f5365112c4833d38f294125c1300d4
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Jun 3 09:27:26 2013 +0100

fdo#56583 - avoid setting user time on unrealized windows.

Change-Id: Iab776088b1d168295d636069e1a92ba948241653

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index d783e95..fc5154b 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1011,9 +1011,17 @@ static void lcl_set_user_time( GtkWindow* i_pWindow, 
guint32 i_nTime )
 bGetSetUserTimeFn = false;
 p_gdk_x11_window_set_user_time = 
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin, 
gdk_x11_window_set_user_time );
 }
+bool bSet = false;
 if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( 
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
-else
+{
+GdkWindow* pWin = widget_get_window(GTK_WIDGET(i_pWindow));
+if( pWin ) // only if the window is realized.
+{
+p_gdk_x11_window_set_user_time( pWin, i_nTime );
+bSet = true;
+}
+}
+if( !bSet )
 {
 Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
 Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - vcl/unx

2013-06-03 Thread Michael Meeks

 vcl/unx/gtk/window/gtkframe.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 49bc98f8ced6cc45a652a2a800975ea494781405
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Jun 3 09:27:26 2013 +0100

fdo#56583 - avoid setting user time on unrealized windows.

Change-Id: Iab776088b1d168295d636069e1a92ba948241653

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index d783e95..fc5154b 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1011,9 +1011,17 @@ static void lcl_set_user_time( GtkWindow* i_pWindow, 
guint32 i_nTime )
 bGetSetUserTimeFn = false;
 p_gdk_x11_window_set_user_time = 
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin, 
gdk_x11_window_set_user_time );
 }
+bool bSet = false;
 if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( 
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
-else
+{
+GdkWindow* pWin = widget_get_window(GTK_WIDGET(i_pWindow));
+if( pWin ) // only if the window is realized.
+{
+p_gdk_x11_window_set_user_time( pWin, i_nTime );
+bSet = true;
+}
+}
+if( !bSet )
 {
 Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
 Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/util solenv/inc

2013-06-03 Thread Petr Mladek

 instsetoo_native/util/openoffice.lst |   22 +++---
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 30d66c3569b10f4518c878b673212c35134d6f44
Author: Petr Mladek pmla...@suse.cz
Date:   Fri May 31 16:39:55 2013 +0200

bump product version to 4.0-4, release number to 304

Change-Id: Ica4dbb0099c03cbdf311f6e7ed173bd791e77c87

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 26ca787..591b430 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -50,13 +50,13 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-303
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-303
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
 PRODUCTVERSION 4.0
 PACKAGEVERSION 4.0
 PACKAGEREVISION 1
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
 {
 PRODUCTNAME OxygenOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-303
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
 BASEPRODUCTVERSION 4.0
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 31cf9e8..f6260a6 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=400
-RSCREVISION=400m1(Build:303)
-BUILD=303
+RSCREVISION=400m1(Build:304)
+BUILD=304
 LAST_MINOR=m0
 SOURCEVERSION=OOO400
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/unx

2013-06-03 Thread Michael Meeks

 vcl/unx/gtk/window/gtkframe.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 2d03cef0145db7475db66dd611c22c6e6fc51b48
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Jun 3 09:27:26 2013 +0100

fdo#56583 - avoid setting user time on unrealized windows.

Change-Id: Iab776088b1d168295d636069e1a92ba948241653
Reviewed-on: https://gerrit.libreoffice.org/4143
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index d783e95..fc5154b 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1011,9 +1011,17 @@ static void lcl_set_user_time( GtkWindow* i_pWindow, 
guint32 i_nTime )
 bGetSetUserTimeFn = false;
 p_gdk_x11_window_set_user_time = 
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin, 
gdk_x11_window_set_user_time );
 }
+bool bSet = false;
 if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( 
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
-else
+{
+GdkWindow* pWin = widget_get_window(GTK_WIDGET(i_pWindow));
+if( pWin ) // only if the window is realized.
+{
+p_gdk_x11_window_set_user_time( pWin, i_nTime );
+bSet = true;
+}
+}
+if( !bSet )
 {
 Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
 Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - vcl/unx

2013-06-03 Thread Michael Meeks

 vcl/unx/gtk/window/gtkframe.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 8fc65f9095bb95692afb1d7522d4d5765dbb3658
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Jun 3 09:27:26 2013 +0100

fdo#56583 - avoid setting user time on unrealized windows.

Change-Id: Iab776088b1d168295d636069e1a92ba948241653
Reviewed-on: https://gerrit.libreoffice.org/4142
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 36be0b2..47aa654 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -822,9 +822,17 @@ static void lcl_set_user_time( GtkWindow* i_pWindow, 
guint32 i_nTime )
 bGetSetUserTimeFn = false;
 p_gdk_x11_window_set_user_time = 
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin, 
gdk_x11_window_set_user_time );
 }
+bool bSet = false;
 if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( 
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
-else
+{
+GdkWindow* pWin = widget_get_window(GTK_WIDGET(i_pWindow));
+if( pWin ) // only if the window is realized.
+{
+p_gdk_x11_window_set_user_time( pWin, i_nTime );
+bSet = true;
+}
+}
+if( !bSet )
 {
 Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
 Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#56583 - avoid setting user time on unrealized windows.

2013-06-03 Thread Petr Mladek (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/4143

Approvals:
  Petr Mladek: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab776088b1d168295d636069e1a92ba948241653
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Meeks michael.me...@suse.com
Gerrit-Reviewer: Petr Mladek pmla...@suse.cz

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

[PUSHED libreoffice-3-6] fdo#56583 - avoid setting user time on unrealized windows.

2013-06-03 Thread Petr Mladek (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/4142

Approvals:
  Petr Mladek: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab776088b1d168295d636069e1a92ba948241653
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Meeks michael.me...@suse.com
Gerrit-Reviewer: Petr Mladek pmla...@suse.cz

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

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

2013-06-03 Thread Khaled Hosny

 cui/uiconfig/ui/paragalignpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cfd41ac7e7084e1eacfec9fa08a099510058791b
Author: Khaled Hosny khaledho...@eglug.org
Date:   Mon Jun 3 14:18:19 2013 +0200

Fix typo after conversion to .ui

The last item in the list was Justified not Right before the conversion.

Change-Id: I6bf8446963df67d26bc8c210bdbdde73a1d3b6e1

diff --git a/cui/uiconfig/ui/paragalignpage.ui 
b/cui/uiconfig/ui/paragalignpage.ui
index 0119414..68238bc 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -447,7 +447,7 @@
 col id=12/col
   /row
   row
-col id=0 translatable=yesRight/col
+col id=0 translatable=yesJustified/col
 col id=13/col
   /row
 /data
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Armin Le Grand

 svx/source/customshapes/EnhancedCustomShape2d.cxx |   37 ++
 1 file changed, 25 insertions(+), 12 deletions(-)

New commits:
commit a3b384ee41f352b5b99ea1265018f2d14405df65
Author: Armin Le Grand a...@apache.org
Date:   Mon Dec 10 14:45:55 2012 +

#121437# Added patch from Regina which implements QuadraticBezier segemnts 
to CustomShapes

Patch by: Regina
Review by: ALG
(cherry picked from commit 4faa46872cad4ed779b07803b7f616b32d800284)

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 0675abd..f17e145 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -913,7 +913,7 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( 
const sal_Int32 nIndex )
 struct EquationResult aResult = 
((EnhancedCustomShape2d*)this)-vEquationResults[ nIndex ];
 
 fNumber = aResult.fValue = (*vNodesSharedPtr[ nIndex ])();
-aResult.bReady = sal_True;
+aResult.bReady = true;
 
 if ( !rtl::math::isFinite( fNumber ) )
 fNumber = 0.0;
@@ -1729,21 +1729,34 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16 
rSrcPt, sal_uInt16 rSegm
 break;
 
 case QUADRATICCURVETO :
+{
 for ( sal_Int32 i(0L); ( i  nPntCount )  ( rSrcPt + 1  
nCoordSize ); i++ )
 {
-const Point aControl(GetPoint( seqCoordinates[ 
rSrcPt++ ], true, true ));
-const Point aEnd(GetPoint( seqCoordinates[ rSrcPt++ ], 
true, true ));
+if ( rSrcPt )
+{
+const Point aPreviousEndPoint(GetPoint( 
seqCoordinates[ rSrcPt - 1 ], true, true));
+const Point aControlQ(GetPoint( seqCoordinates[ 
rSrcPt++ ], true, true ));
+const Point aEnd(GetPoint( seqCoordinates[ 
rSrcPt++ ], true, true ));
+const Point aControlA((aPreviousEndPoint + 
(aControlQ * 2.0)) / 3.0);
+const Point aControlB(((aControlQ * 2.0) + aEnd) / 
3.0);
 
-DBG_ASSERT(aNewB2DPolygon.count(), 
EnhancedCustomShape2d::CreateSubPath: Error in adding control point (!));
-basegfx::B2DPoint aStartPointB2D( 
aNewB2DPolygon.getB2DPoint(aNewB2DPolygon.count() - 1 ) );
-Point aStartPoint( aStartPointB2D.getX(), 
aStartPointB2D.getY() );
+DBG_ASSERT(aNewB2DPolygon.count(), 
EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!));
+aNewB2DPolygon.appendBezierSegment(
+basegfx::B2DPoint(aControlA.X(), 
aControlA.Y()),
+basegfx::B2DPoint(aControlB.X(), 
aControlB.Y()),
+basegfx::B2DPoint(aEnd.X(), aEnd.Y()));
+}
+else // no previous point , do a moveto
+{
+rSrcPt++; // skip control point
+const Point aEnd(GetPoint( seqCoordinates[ 
rSrcPt++ ], true, true ));
 
-aNewB2DPolygon.appendBezierSegment(
-basegfx::B2DPoint(aStartPoint.X() + 
2.0*(aControl.X() - aStartPoint.X())/3.0, aStartPoint.Y() + 2.0*(aControl.Y() - 
aStartPoint.Y())/3.0),
-basegfx::B2DPoint(aEnd.X() + 2.0*(aControl.X() - 
aEnd.X())/3.0, aEnd.Y() + 2.0*(aControl.Y() - aEnd.Y())/3.0),
-basegfx::B2DPoint(aEnd.X(), aEnd.Y()));
+DBG_ASSERT(aNewB2DPolygon.count(), 
EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!));
+aNewB2DPolygon.append(basegfx::B2DPoint(aEnd.X(), 
aEnd.Y()));
+}
 }
-break;
+}
+break;
 
 case LINETO :
 {
@@ -2380,7 +2393,7 @@ bool EnhancedCustomShape2d::IsPostRotate() const
 
 SdrObject* EnhancedCustomShape2d::CreateLineGeometry()
 {
-return CreateObject( sal_True );
+return CreateObject( true );
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4f/aa46872cad4ed779b07803b7f616b32d800284

2013-06-03 Thread Fridrich Štrba

 4f/aa46872cad4ed779b07803b7f616b32d800284 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7477eb9dcdae458207bc0476ac094d5cb1e07d50
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Jun 3 14:25:03 2013 +0200

Notes added by 'git notes add'

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-06-03 Thread bugzilla-daemon

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

Bug 54157 depends on bug 62224, which changed state.

Bug 62224 Summary: Border Values changes on reopening the format cells Widget 
in impress
https://bugs.freedesktop.org/show_bug.cgi?id=62224

   What|Removed |Added

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

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

[Libreoffice-commits] core.git: 3 commits - editeng/source include/editeng include/sfx2 include/svx svx/source

2013-06-03 Thread David Tardon

 editeng/source/items/borderline.cxx   |5 
 include/editeng/borderline.hxx|2 
 include/sfx2/sfxdlg.hxx   |2 
 include/svx/sdr/table/tablecontroller.hxx |8 +
 svx/source/table/tablecontroller.cxx  |  222 +-
 5 files changed, 236 insertions(+), 3 deletions(-)

New commits:
commit f6eb9bd5d06e0dc13b4ff862e8138d7a6a8ccb44
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 3 14:31:36 2013 +0200

add a doc comment

Change-Id: If9d99c0b7ba54b0d8d53006cacf14e4b62fe2297

diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index a994c7d..e7a4d21 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -58,6 +58,8 @@ namespace com { namespace sun { namespace star { namespace 
frame {
 class SfxAbstractDialog : virtual public VclAbstractDialog
 {
 public:
+/** Get a set of items changed in the dialog.
+  */
 virtual const SfxItemSet*   GetOutputItemSet() const = 0;
 virtual voidSetText( const OUString rStr ) = 0;
 virtual OUStringGetText() const = 0;
commit 9cd71f996e3625e8174c46bf85e336c1ee90df7f
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 3 14:22:07 2013 +0200

copy values from the original item set

... because SfxAbstractDialog::GetOutputItemSet() only contains the
items that have been _changed_ in the dialog.

Change-Id: Iaf20bb42b65e420fe4e7aff979378eff7b5e5df2

diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 79f5aca..b91ea92 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -745,7 +745,8 @@ void SvxTableController::onFormatTable( SfxRequest rReq )
 // Even Cancel Button is returning positive(101) value,
 if( pDlg.get()  ( pDlg-Execute() == RET_OK ) )
 {
-SfxItemSet aNewSet( *(pDlg-GetOutputItemSet ()) );
+SfxItemSet aNewSet( aNewAttr );
+aNewSet.Put( *(pDlg-GetOutputItemSet ()) );
 
 SvxBoxItem aNewBoxItem( static_cast const SvxBoxItem ( 
aNewSet.Get( SDRATTR_TABLE_BORDER ) ) );
 
commit 67e87f8b88a5a6a741717cc4a8e64f65f9c9cd52
Author: David Tardon dtar...@redhat.com
Date:   Sat Jun 1 09:43:50 2013 +0200

fdo#62224 reconstruct border state for table dialog

Change-Id: I68a4cd1974579119a2d6dccba008441a9bec78df

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 9e1d8f6..70ff353 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -683,6 +683,11 @@ bool SvxBorderLine::HasPriority( const SvxBorderLine 
rOtherLine ) const
 return false;
 }
 
+bool operator!=( const SvxBorderLine rLeft, const SvxBorderLine rRight )
+{
+return !(rLeft == rRight);
+}
+
 } // namespace editeng
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index 067e216..a7713b7 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -160,7 +160,7 @@ namespace editeng {
 static BorderWidthImpl getWidthImpl( SvxBorderStyle nStyle );
 };
 
-// 
+EDITENG_DLLPUBLIC bool operator!=( const SvxBorderLine rLeft, const 
SvxBorderLine rRight );
 
 } // namespace editeng
 
diff --git a/include/svx/sdr/table/tablecontroller.hxx 
b/include/svx/sdr/table/tablecontroller.hxx
index 5efdd87..2f4126c 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -33,6 +33,8 @@
 class SdrObjEditView;
 class SdrObject;
 class SfxItemSet;
+class SvxBoxInfoItem;
+class SvxBoxItem;
 
 namespace sdr { namespace table {
 
@@ -78,6 +80,12 @@ public:
 
 SVX_DLLPRIVATE void MergeAttrFromSelectedCells(SfxItemSet rAttr, bool 
bOnlyHardAttr) const;
 SVX_DLLPRIVATE void SetAttrToSelectedCells(const SfxItemSet rAttr, bool 
bReplaceAll);
+/** Fill the values that are common for all selected cells.
+  *
+  * This lets the Borders dialog to display the line arrangement
+  * properly.
+  */
+SVX_DLLPRIVATE void FillCommonBorderAttrFromSelectedCells(SvxBoxItem 
rBox, SvxBoxInfoItem rBoxInfo) const;
 
 SVX_DLLPRIVATE virtual bool GetAttributes(SfxItemSet rTargetSet, bool 
bOnlyHardAttr) const;
 SVX_DLLPRIVATE virtual bool SetAttributes(const SfxItemSet rSet, bool 
bReplaceAll);
diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index a561590..79f5aca 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include algorithm
 
 #include svx/sdr/table/tablecontroller.hxx
 #include tablemodel.hxx
@@ -724,7 +725,6 @@ void SvxTableController::onFormatTable( SfxRequest rReq )
 if(

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

2013-06-03 Thread David Tardon

 svx/source/table/tablecontroller.cxx |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit d9a888fcd2d667c6b2932cd7d1a4bd33ae4796f7
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 3 14:37:09 2013 +0200

fix comment to agree with code

Change-Id: I82cc02e6bc63f04655ba87039d008f2c25025a30

diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index b91ea92..b01839c 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2750,12 +2750,11 @@ void 
SvxTableController::FillCommonBorderAttrFromSelectedCells( SvxBoxItem rBox
 /* Here we go through all the selected cells (enhanced by
  * the adjoining row/column on each side) and determine the
  * lines for presentation. The algorithm is simple:
- * 1. if a border or inner line is set in all cells to the
- *same value, it will be used.
+ * 1. if a border or inner line is set (or unset) in all
+ *cells to the same value, it will be used.
  * 2. if a border or inner line is set only in some cells,
- *or it has different values, it will be set to
- *indeterminate state (SetValid() on rBoxInfoItem).
- * 3. otherwise it will be unset.
+ *it will be set to indeterminate state (SetValid() on
+ *rBoxInfoItem).
  */
 for( sal_Int32 nRow = std::max( aStart.mnRow - 1, (sal_Int32)0 ); 
nRow  nLastRow; nRow++ )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Fridrich Štrba

 sc/source/core/tool/rangeutl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 50bbd1aefe0c78c254a18cc6e1dfeaf5c6858112
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Jun 3 14:51:24 2013 +0200

Fix ooo51302-1.ods: check for special index value of -1

Change-Id: I3fbb700300d18a878cbf23c94e35bc69f864824b

diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 054c61f..1fbf007 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -374,7 +374,7 @@ sal_Int32 ScRangeStringConverter::IndexOf(
 sal_BoolbQuoted = false;
 sal_BoolbExitLoop   = false;
 
-while( !bExitLoop  (nIndex  nLength) )
+while( !bExitLoop  (nIndex = 0  nIndex  nLength) )
 {
 sal_Unicode cCode = rString[ nIndex ];
 bExitLoop = (cCode == cSearchChar)  !bQuoted;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Fridrich Štrba

 sc/source/core/tool/rangeutl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cacc516693b879c08bd3b1963eeed9c38928615f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Jun 3 14:55:52 2013 +0200

And this one has the same potential to crash

Change-Id: Icd2b2f2c11b7e86a10cae887b96f96a6fbe8a44e

diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 1fbf007..38305f6 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -394,7 +394,7 @@ sal_Int32 ScRangeStringConverter::IndexOfDifferent(
 sal_Int32   nIndex  = nOffset;
 sal_BoolbExitLoop   = false;
 
-while( !bExitLoop  (nIndex  nLength) )
+while( !bExitLoop  (nIndex = 0  nIndex  nLength) )
 {
 bExitLoop = (rString[ nIndex ] != cSearchChar);
 if( !bExitLoop )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Direct csv import into Base table

2013-06-03 Thread Zolnai Tamás

Hi Lionel,

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

 Hi,

 Would you mind if I included the developer's mailing list in CC in our
 discussion?


Of course not. :)



 On Mon, Jun 03, 2013 at 12:05:56PM +0200, Zolnai Tamás wrote:

 I'm working on a new feature in Base again. It's just a little
  user helper feature to make available the direct import of an csv
  file into table, without open Calc and copypaste the content from
  it to Base.

 Base can already do that without resorting to Calc:

 1) Menu File / New / Database

 2) Connect to existing database / Text

 3) Fill in needed configuration

 3) Open the just created .odb file in window 1

 4) Open the destination .odb file in window 2

 5) Drag'n drop (or copy/paste) from window 1 to window 2.

 And it works for any supported database type, not only CSV, as long as
 the destination database driver supports SDBCX (that is, table
 creation).

 If you intend to put an easier / faster / ... UI on this procedure,
 sure, that seems nice.


 The usability of this method is the same as which I mentioned. Have to
open an other window and use copypaste (additionally make a useless file).
So yes, my primary aim is to add an easier way.


  already have the plan to implement it and it seems to me that it
  will work not just with csv files but all Calc compatible format (in
  this case only the first sheet will be imported, but later it can be
  extended).

 This starts to look like you want to reimplement a different way to
 achieve the same as the above, and not only slap a different / better
 UI on it. Unless there is a good reason (which one?), I'd rather
 not. Two implementations = more code, two sets of bugs, confusion for
 the user, ...

 Note that the above works for any calc compatible format by using
 Spreadsheet instead of Text. And many other sources...

 Again, slapping a better UI on it, that would e.g. avoid the need to
 create an .odb file which the user will delete right after, would be
 nice. I imagine it would work like this: reuse the database wizard
 open existing database and connect to existing database stuff to
 setup a SDBC URL, but do *not* create a .odb file connecting to that
 URL. Instead, connect to that URL in code, list the tables, ask the
 user which tables to import, and import them into the current
 database. Bonus points for reusing the same codepath as a paste in the
 the copy/paste case (one time for each table).


I didn't know about this feature up to now, but for the first blush it is
not the same feature, at least from the users point of view. As I see these
connection is a readonly access to a bunch of csv/text files (or sheets of
one spreadsheet file) with openning an alone database to them. The feature
which I intend to implement is making a new table and insert into the
already opened database. With this I just say that for the user it can be
looked as a different thing and so not make confusion.
(It's really an readonly access? Because copypaste all the tables not a
usefull method to make them modifyable.)

Implementation is an other part. Of course I will look up the code of this
connection thing and reuse all the usefull code. But the implementation
which I planed is not means real new code, but intentse use of UNO API. The
Writer OLE-object feature use the XEmbeddedObject and other class linked
with it. One advantage of using this XEmbeddedObject is that it uses
implicitly the same file import as Calc do. So in case of csv/text files
the Calc's csv import dialog will be opened, which more usefull than the
page with the same aim in Base. More usefull means more options and a table
showing the expected result.

I don't know the underlying code of this connection feature yet, but I
would not suprise if it uses the same XEmbeddedObject.


  I will use up the code which lies under the OLE-object feature of
  Writer, which already contains the csv import.

 Why would that be any better than what I outlined above?


Because of the mentioned csv import dialog.


 The only question is where this feature would be reachable. I have two
  ideas and I think all of these two places should be used:
 1. Table view - Tasks. Add a 4th option like Import Table From
  File This point contains all other places which are almost the
  duplicates of this Tables list (e.g. Insert menu with label Table
  (Import)... ).
 2. Table view - Tables - context menu. The label can be Import
  Table

 The context menu does not make that much sense to me, unless we *also*
 add the other tasks to it (and then also in Queries, Forms and Reports).


It comes in my mind just because the commonly used method is the copypaste
and so people get to use the context menu. :)
But of course the first point will be enough too.


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

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

2013-06-03 Thread David Tardon

 editeng/source/items/borderline.cxx   |5 
 include/editeng/borderline.hxx|2 
 include/svx/sdr/table/tablecontroller.hxx |8 +
 svx/source/table/tablecontroller.cxx  |  222 +-
 4 files changed, 234 insertions(+), 3 deletions(-)

New commits:
commit 22ec6b5a369d2a1a8a334f405f304facfbb0e4b9
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 3 14:22:07 2013 +0200

copy values from the original item set

... because SfxAbstractDialog::GetOutputItemSet() only contains the
items that have been _changed_ in the dialog.

Change-Id: Iaf20bb42b65e420fe4e7aff979378eff7b5e5df2
(cherry picked from commit 9cd71f996e3625e8174c46bf85e336c1ee90df7f)

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 79f5aca..b91ea92 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -745,7 +745,8 @@ void SvxTableController::onFormatTable( SfxRequest rReq )
 // Even Cancel Button is returning positive(101) value,
 if( pDlg.get()  ( pDlg-Execute() == RET_OK ) )
 {
-SfxItemSet aNewSet( *(pDlg-GetOutputItemSet ()) );
+SfxItemSet aNewSet( aNewAttr );
+aNewSet.Put( *(pDlg-GetOutputItemSet ()) );
 
 SvxBoxItem aNewBoxItem( static_cast const SvxBoxItem ( 
aNewSet.Get( SDRATTR_TABLE_BORDER ) ) );
 
commit 352c89983e108f687c8eed79bdac00c36c641e22
Author: David Tardon dtar...@redhat.com
Date:   Sat Jun 1 09:43:50 2013 +0200

fdo#62224 reconstruct border state for table dialog

Change-Id: I68a4cd1974579119a2d6dccba008441a9bec78df
(cherry picked from commit 67e87f8b88a5a6a741717cc4a8e64f65f9c9cd52)

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 9e1d8f6..70ff353 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -683,6 +683,11 @@ bool SvxBorderLine::HasPriority( const SvxBorderLine 
rOtherLine ) const
 return false;
 }
 
+bool operator!=( const SvxBorderLine rLeft, const SvxBorderLine rRight )
+{
+return !(rLeft == rRight);
+}
+
 } // namespace editeng
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index 067e216..a7713b7 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -160,7 +160,7 @@ namespace editeng {
 static BorderWidthImpl getWidthImpl( SvxBorderStyle nStyle );
 };
 
-// 
+EDITENG_DLLPUBLIC bool operator!=( const SvxBorderLine rLeft, const 
SvxBorderLine rRight );
 
 } // namespace editeng
 
diff --git a/include/svx/sdr/table/tablecontroller.hxx 
b/include/svx/sdr/table/tablecontroller.hxx
index 5efdd87..2f4126c 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -33,6 +33,8 @@
 class SdrObjEditView;
 class SdrObject;
 class SfxItemSet;
+class SvxBoxInfoItem;
+class SvxBoxItem;
 
 namespace sdr { namespace table {
 
@@ -78,6 +80,12 @@ public:
 
 SVX_DLLPRIVATE void MergeAttrFromSelectedCells(SfxItemSet rAttr, bool 
bOnlyHardAttr) const;
 SVX_DLLPRIVATE void SetAttrToSelectedCells(const SfxItemSet rAttr, bool 
bReplaceAll);
+/** Fill the values that are common for all selected cells.
+  *
+  * This lets the Borders dialog to display the line arrangement
+  * properly.
+  */
+SVX_DLLPRIVATE void FillCommonBorderAttrFromSelectedCells(SvxBoxItem 
rBox, SvxBoxInfoItem rBoxInfo) const;
 
 SVX_DLLPRIVATE virtual bool GetAttributes(SfxItemSet rTargetSet, bool 
bOnlyHardAttr) const;
 SVX_DLLPRIVATE virtual bool SetAttributes(const SfxItemSet rSet, bool 
bReplaceAll);
diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index a561590..79f5aca 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include algorithm
 
 #include svx/sdr/table/tablecontroller.hxx
 #include tablemodel.hxx
@@ -724,7 +725,6 @@ void SvxTableController::onFormatTable( SfxRequest rReq )
 if( !pArgs  pTableObj-GetModel() )
 {
 SfxItemSet aNewAttr( pTableObj-GetModel()-GetItemPool() );
-MergeAttrFromSelectedCells(aNewAttr, sal_False);
 
 // merge drawing layer text distance items into SvxBoxItem used by the 
dialog
 SvxBoxItem aBoxItem( static_cast const SvxBoxItem ( aNewAttr.Get( 
SDRATTR_TABLE_BORDER ) ) );
@@ -732,7 +732,13 @@ void SvxTableController::onFormatTable( SfxRequest rReq )
 aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 (

Direct csv import into Base table

2013-06-03 Thread Zolnai Tamás

Hi Lionel,

   I'm working on a new feature in Base again. It's just a little user
helper feature to make available the direct import of an csv file into
table, without open Calc and copypaste the content from it to Base. I
already have the plan to implement it and it seems to me that it will work
not just with csv files but all Calc compatible format (in this case only
the first sheet will be imported, but later it can be extended). I will use
up the code which lies under the OLE-object feature of Writer, which
already contains the csv import.
   The only question is where this feature would be reachable. I have two
ideas and I think all of these two places should be used:
   1. Table view - Tasks. Add a 4th option like Import Table From
File This point contains all other places which are almost the
duplicates of this Tables list (e.g. Insert menu with label Table
(Import)... ).
   2. Table view - Tables - context menu. The label can be Import
Table

If you agree with these points than I send a mail to the ux mailing list
for a new icon which can be displayed in the Tasks list and in the menu.

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

Re: Direct csv import into Base table

2013-06-03 Thread Lionel Elie Mamane

Hi,

Would you mind if I included the developer's mailing list in CC in our
discussion?

On Mon, Jun 03, 2013 at 12:05:56PM +0200, Zolnai Tamás wrote:

I'm working on a new feature in Base again. It's just a little
 user helper feature to make available the direct import of an csv
 file into table, without open Calc and copypaste the content from
 it to Base.

Base can already do that without resorting to Calc:

1) Menu File / New / Database

2) Connect to existing database / Text

3) Fill in needed configuration

3) Open the just created .odb file in window 1

4) Open the destination .odb file in window 2

5) Drag'n drop (or copy/paste) from window 1 to window 2.

And it works for any supported database type, not only CSV, as long as
the destination database driver supports SDBCX (that is, table
creation).

If you intend to put an easier / faster / ... UI on this procedure,
sure, that seems nice.

 already have the plan to implement it and it seems to me that it
 will work not just with csv files but all Calc compatible format (in
 this case only the first sheet will be imported, but later it can be
 extended).

This starts to look like you want to reimplement a different way to
achieve the same as the above, and not only slap a different / better
UI on it. Unless there is a good reason (which one?), I'd rather
not. Two implementations = more code, two sets of bugs, confusion for
the user, ...

Note that the above works for any calc compatible format by using
Spreadsheet instead of Text. And many other sources...

Again, slapping a better UI on it, that would e.g. avoid the need to
create an .odb file which the user will delete right after, would be
nice. I imagine it would work like this: reuse the database wizard
open existing database and connect to existing database stuff to
setup a SDBC URL, but do *not* create a .odb file connecting to that
URL. Instead, connect to that URL in code, list the tables, ask the
user which tables to import, and import them into the current
database. Bonus points for reusing the same codepath as a paste in the
the copy/paste case (one time for each table).

 I will use up the code which lies under the OLE-object feature of
 Writer, which already contains the csv import.

Why would that be any better than what I outlined above?

The only question is where this feature would be reachable. I have two
 ideas and I think all of these two places should be used:
1. Table view - Tasks. Add a 4th option like Import Table From
 File This point contains all other places which are almost the
 duplicates of this Tables list (e.g. Insert menu with label Table
 (Import)... ).
2. Table view - Tables - context menu. The label can be Import
 Table

The context menu does not make that much sense to me, unless we *also*
add the other tasks to it (and then also in Queries, Forms and Reports).

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

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

2013-06-03 Thread Fridrich Štrba

 oox/source/vml/vmlshape.cxx   |3 +
 sc/source/core/tool/rangeutl.cxx  |4 +-
 svx/source/customshapes/EnhancedCustomShape2d.cxx |   37 ++
 3 files changed, 29 insertions(+), 15 deletions(-)

New commits:
commit 2327f65ccf8231cef7e6ed4a9fb0df8dbdaa15f2
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Jun 3 10:16:26 2013 +0200

Fixing crash with dereferencing front() and back() of an empty vector

Change-Id: If7204614aa7a650f4a2804fc63dd3301ece2281e
(cherry picked from commit f5d6e7af69f6b8972bd97d1d8e2a6d9ec5a6294a)

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 1ec5c24..35ad93d 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -769,7 +769,8 @@ Reference XShape  BezierShape::implConvertAndInsert( 
const Reference XShapes
 for ( unsigned int i = 0; i  aFlagLists.size(); i++ )
 aBezierCoords.Flags[i] = ContainerHelper::vectorToSequence( 
aFlagLists[i] );
 
-if( aCoordLists.front().front().X == aCoordLists.back().back().X
+if( !aCoordLists.front().empty()  !aCoordLists.back().empty()
+ aCoordLists.front().front().X == aCoordLists.back().back().X
  aCoordLists.front().front().Y == aCoordLists.back().back().Y )
 { // HACK: If the shape is in fact closed, which can be found out only 
when the path is known,
   // force to closed bezier shape (otherwise e.g. fill won't work).
commit 864dc65f8fb02348eaf0d83f38591f913342191f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Jun 3 14:55:52 2013 +0200

And this one has the same potential to crash

Change-Id: Icd2b2f2c11b7e86a10cae887b96f96a6fbe8a44e
(cherry picked from commit cacc516693b879c08bd3b1963eeed9c38928615f)

diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 1fbf007..38305f6 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -394,7 +394,7 @@ sal_Int32 ScRangeStringConverter::IndexOfDifferent(
 sal_Int32   nIndex  = nOffset;
 sal_BoolbExitLoop   = false;
 
-while( !bExitLoop  (nIndex  nLength) )
+while( !bExitLoop  (nIndex = 0  nIndex  nLength) )
 {
 bExitLoop = (rString[ nIndex ] != cSearchChar);
 if( !bExitLoop )
commit 48cbf49e3c03e64192046211ca42e277bf89eab8
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Jun 3 14:51:24 2013 +0200

Fix ooo51302-1.ods: check for special index value of -1

Change-Id: I3fbb700300d18a878cbf23c94e35bc69f864824b
(cherry picked from commit 50bbd1aefe0c78c254a18cc6e1dfeaf5c6858112)

diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 054c61f..1fbf007 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -374,7 +374,7 @@ sal_Int32 ScRangeStringConverter::IndexOf(
 sal_BoolbQuoted = false;
 sal_BoolbExitLoop   = false;
 
-while( !bExitLoop  (nIndex  nLength) )
+while( !bExitLoop  (nIndex = 0  nIndex  nLength) )
 {
 sal_Unicode cCode = rString[ nIndex ];
 bExitLoop = (cCode == cSearchChar)  !bQuoted;
commit 6f2573dffc64bf36e284b6eae595a51c866cb49a
Author: Armin Le Grand a...@apache.org
Date:   Mon Dec 10 14:45:55 2012 +

#121437# Added patch from Regina which implements QuadraticBezier segemnts 
to CustomShapes

Patch by: Regina
Review by: ALG
(cherry picked from commit 4faa46872cad4ed779b07803b7f616b32d800284)

(cherry picked from commit a3b384ee41f352b5b99ea1265018f2d14405df65)

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 0675abd..f17e145 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -913,7 +913,7 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( 
const sal_Int32 nIndex )
 struct EquationResult aResult = 
((EnhancedCustomShape2d*)this)-vEquationResults[ nIndex ];
 
 fNumber = aResult.fValue = (*vNodesSharedPtr[ nIndex ])();
-aResult.bReady = sal_True;
+aResult.bReady = true;
 
 if ( !rtl::math::isFinite( fNumber ) )
 fNumber = 0.0;
@@ -1729,21 +1729,34 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16 
rSrcPt, sal_uInt16 rSegm
 break;
 
 case QUADRATICCURVETO :
+{
 for ( sal_Int32 i(0L); ( i  nPntCount )  ( rSrcPt + 1  
nCoordSize ); i++ )
 {
-const Point aControl(GetPoint( seqCoordinates[ 
rSrcPt++ ], true, true ));
-const Point aEnd(GetPoint( seqCoordinates[ rSrcPt++ ], 
true, true ));
+if ( rSrcPt )
+

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

2013-06-03 Thread Jan Holesovsky

 svx/uiconfig/ui/sidebartextpanel.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c4d28a032a6a98abad0f38dc94b9e156b7bb158b
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Jun 3 15:09:54 2013 +0200

sidebar: Increase the width request of fonts size listbox.

Change-Id: I18135db75708cea9f887ce8ad4f9909fdbea543e

diff --git a/svx/uiconfig/ui/sidebartextpanel.ui 
b/svx/uiconfig/ui/sidebartextpanel.ui
index 4f76438..0b81586 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -32,7 +32,7 @@
 /child
 child
   object class=svtlo-FontSizeBox id=fontsize
-property name=width_request50/property
+property name=width_request60/property
 property name=visibleTrue/property
 property name=can_focusFalse/property
   /object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Michael Meeks

 vcl/coretext/ctfonts.cxx  |   31 ++-
 vcl/coretext/ctfonts.hxx  |   31 ++-
 vcl/coretext/ctlayout.cxx |   32 ++--
 3 files changed, 42 insertions(+), 52 deletions(-)

New commits:
commit 8400e2294e1145427bd9eda7a36a76b0ae75e577
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Jun 3 14:20:27 2013 +0100

Clarify headers.

Change-Id: I125e4cacd94cd33d24cf1266967eb92906600cc4

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index 2884cb5..9c58891 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -1,23 +1,20 @@
-/**
+/*
+ * This file is part of the LibreOffice project.
  *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * 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/.
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * This file incorporates work covered by the following license notice:
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include boost/unordered_map.hpp
 
diff --git a/vcl/coretext/ctfonts.hxx b/vcl/coretext/ctfonts.hxx
index e903b63..d80a566 100644
--- a/vcl/coretext/ctfonts.hxx
+++ b/vcl/coretext/ctfonts.hxx
@@ -1,23 +1,20 @@
-/**
+/*
+ * This file is part of the LibreOffice project.
  *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * 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/.
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * This file incorporates work covered by the following license notice:
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include coretext/salgdi2.h
 #include sallayout.hxx
diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 0d71047..be9f0e3 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -1,25 +1,21 @@
-/**
+/*
+ * This file is part of the LibreOffice project.
  *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF

[PATCH libreoffice-4-0] fdo#62224 reconstruct border state for table dialog

2013-06-03 Thread David Tardon (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4144

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/4144/1

fdo#62224 reconstruct border state for table dialog

Change-Id: I68a4cd1974579119a2d6dccba008441a9bec78df
(cherry picked from commit 67e87f8b88a5a6a741717cc4a8e64f65f9c9cd52)

Conflicts:
include/svx/sdr/table/tablecontroller.hxx

Change-Id: Id9d72360d234dd1f9dbb9fd252fc0abefff9ad63
---
M editeng/inc/editeng/borderline.hxx
M editeng/source/items/borderline.cxx
M svx/source/table/tablecontroller.cxx
M svx/source/table/tablecontroller.hxx
4 files changed, 232 insertions(+), 2 deletions(-)



diff --git a/editeng/inc/editeng/borderline.hxx 
b/editeng/inc/editeng/borderline.hxx
index 067e216..a7713b7 100644
--- a/editeng/inc/editeng/borderline.hxx
+++ b/editeng/inc/editeng/borderline.hxx
@@ -160,7 +160,7 @@
 static BorderWidthImpl getWidthImpl( SvxBorderStyle nStyle );
 };
 
-// 
+EDITENG_DLLPUBLIC bool operator!=( const SvxBorderLine rLeft, const 
SvxBorderLine rRight );
 
 } // namespace editeng
 
diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 646a348..fe451c3 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -723,6 +723,11 @@
 return false;
 }
 
+bool operator!=( const SvxBorderLine rLeft, const SvxBorderLine rRight )
+{
+return !(rLeft == rRight);
+}
+
 } // namespace editeng
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 9368675..f29946d 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include algorithm
 
 #include tablecontroller.hxx
 
@@ -712,7 +713,6 @@
 if( !pArgs  pTableObj-GetModel() )
 {
 SfxItemSet aNewAttr( pTableObj-GetModel()-GetItemPool() );
-MergeAttrFromSelectedCells(aNewAttr, sal_False);
 
 // merge drawing layer text distance items into SvxBoxItem used by the 
dialog
 SvxBoxItem aBoxItem( static_cast const SvxBoxItem ( aNewAttr.Get( 
SDRATTR_TABLE_BORDER ) ) );
@@ -720,7 +720,13 @@
 aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 ( 
((SdrTextRightDistItem)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), 
BOX_LINE_RIGHT );
 aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 ( 
((SdrTextUpperDistItem)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), 
BOX_LINE_TOP );
 aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 ( 
((SdrTextLowerDistItem)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), 
BOX_LINE_BOTTOM );
+
+SvxBoxInfoItem aBoxInfoItem( static_cast const SvxBoxInfoItem ( 
aNewAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ) );
+
+MergeAttrFromSelectedCells(aNewAttr, sal_False);
+FillCommonBorderAttrFromSelectedCells( aBoxItem, aBoxInfoItem );
 aNewAttr.Put( aBoxItem );
+aNewAttr.Put( aBoxInfoItem );
 
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
 std::auto_ptr SfxAbstractTabDialog  pDlg( pFact ? 
pFact-CreateSvxFormatCellsDialog( NULL, aNewAttr, pTableObj-GetModel(), 
pTableObj) : 0 );
@@ -2573,6 +2579,217 @@
 return 0;
 }
 
+namespace
+{
+
+struct LinesState
+{
+LinesState(SvxBoxItem rBoxItem_, SvxBoxInfoItem rBoxInfoItem_)
+: rBoxItem(rBoxItem_)
+, rBoxInfoItem(rBoxInfoItem_)
+{
+std::fill_n(aBorderSet, 4, false);
+std::fill_n(aInnerLineSet, 2, false);
+std::fill_n(aBorderIndeterminate, 4, false);
+std::fill_n(aInnerLineIndeterminate, 2, false);
+}
+
+SvxBoxItem rBoxItem;
+SvxBoxInfoItem rBoxInfoItem;
+bool aBorderSet[4];
+bool aInnerLineSet[2];
+bool aBorderIndeterminate[4];
+bool aInnerLineIndeterminate[2];
+};
+
+class BoxItemWrapper
+{
+public:
+BoxItemWrapper(SvxBoxItem rBoxItem, SvxBoxInfoItem rBoxInfoItem, 
sal_uInt16 nBorderLine, sal_uInt16 nInnerLine, bool bBorder);
+
+const SvxBorderLine* getLine() const;
+void setLine(const SvxBorderLine* pLine);
+
+private:
+SvxBoxItem m_rBoxItem;
+SvxBoxInfoItem m_rBoxInfoItem;
+const sal_uInt16 m_nLine;
+const bool m_bBorder;
+};
+
+BoxItemWrapper::BoxItemWrapper(
+SvxBoxItem rBoxItem, SvxBoxInfoItem rBoxInfoItem,
+const sal_uInt16 nBorderLine, const sal_uInt16 nInnerLine, const bool 
bBorder)
+: m_rBoxItem(rBoxItem)
+, m_rBoxInfoItem(rBoxInfoItem)
+, m_nLine(bBorder ? nBorderLine : nInnerLine)
+, m_bBorder(bBorder)
+{
+assert(bBorder ? (m_nLine = BOX_LINE_RIGHT) : (m_nLine = 
BOXINFO_LINE_VERT));
+}
+
+const SvxBorderLine* BoxItemWrapper::getLine() const
+{
+if (m_bBorder)
+return

[PATCH libreoffice-4-0] copy values from the original item set

2013-06-03 Thread David Tardon (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4145

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/4145/1

copy values from the original item set

... because SfxAbstractDialog::GetOutputItemSet() only contains the
items that have been _changed_ in the dialog.

Change-Id: Iaf20bb42b65e420fe4e7aff979378eff7b5e5df2
(cherry picked from commit 9cd71f996e3625e8174c46bf85e336c1ee90df7f)

Change-Id: I9100dbe05c418a9dd1b819534a08076c9a4aed1c
---
M svx/source/table/tablecontroller.cxx
1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index f29946d..b25e5f1 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -732,7 +732,8 @@
 std::auto_ptr SfxAbstractTabDialog  pDlg( pFact ? 
pFact-CreateSvxFormatCellsDialog( NULL, aNewAttr, pTableObj-GetModel(), 
pTableObj) : 0 );
 if( pDlg.get()  pDlg-Execute() )
 {
-SfxItemSet aNewSet( *(pDlg-GetOutputItemSet ()) );
+SfxItemSet aNewSet( aNewAttr );
+aNewSet.Put( *(pDlg-GetOutputItemSet ()) );
 
 SvxBoxItem aNewBoxItem( static_cast const SvxBoxItem ( 
aNewSet.Get( SDRATTR_TABLE_BORDER ) ) );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9100dbe05c418a9dd1b819534a08076c9a4aed1c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: David Tardon dtar...@redhat.com

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

[Libreoffice-commits] core.git: odk/Package_autodoc.mk offapi/com offapi/UnoApi_offapi.mk oox/source sd/source sd/util

2013-06-03 Thread Stephan Bergmann

 odk/Package_autodoc.mk   |1 
 offapi/UnoApi_offapi.mk  |3 --
 offapi/com/sun/star/oox/PowerPointExport.idl |   37 ---
 oox/source/ppt/pptimport.cxx |   30 ++---
 sd/source/filter/eppt/pptx-epptooxml.cxx |5 +--
 sd/util/sdfilt.component |1 
 6 files changed, 17 insertions(+), 60 deletions(-)

New commits:
commit 3505f0e46c2e0a743ab5de9adfbec3044a4573a6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jun 3 15:06:11 2013 +0200

Revert fdo#46808, Convert oox::PowerPointExport service to new style

This reverts commit 02021163dbbcc8904da0b2138c8b53684dcc8ab4.  The filter
appears to be split in two (com.sun.star.comp.oox.ppt.PowerPointImport
implementation oox::ppt::PowerPointImport from 
include/oox/ppt/pptimport.hxx for
im-/export, for export calling 
com.sun.star.comp.Impress.oox.PowerPointExport
implementation PowerPointExport from sd/source/filter/eppt/epptooxml.hxx) 
for no
good reason, so the com.sun.star.oox.PowerPointExport new-style service is
supporting a hack that should rather be cleaned up.

Conflicts:
offapi/UnoApi_offapi.mk

Change-Id: I875192a68a8e3458dbfd74b4981a6a2e86ce44d7

diff --git a/odk/Package_autodoc.mk b/odk/Package_autodoc.mk
index b73e7ba..bd1117b 100644
--- a/odk/Package_autodoc.mk
+++ b/odk/Package_autodoc.mk
@@ -107,7 +107,6 @@ $(eval $(call 
gb_Package_add_files_with_dir,odk_autodoc,$(gb_Package_SDKDIRNAME)
com/sun/star/media \
com/sun/star/mozilla \
com/sun/star/office \
-   com/sun/star/oox \
com/sun/star/packages \
com/sun/star/packages/manifest \
com/sun/star/packages/zip \
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 4aee919..90b05ef 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -265,9 +265,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/office,\
Quickstart \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/oox,\
-   PowerPointExport \
-))
 $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/manifest,\
ManifestReader \
ManifestWriter \
diff --git a/offapi/com/sun/star/oox/PowerPointExport.idl 
b/offapi/com/sun/star/oox/PowerPointExport.idl
deleted file mode 100644
index 14f84eb..000
--- a/offapi/com/sun/star/oox/PowerPointExport.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_oox_PowerPointExport_idl__
-#define __com_sun_star_oox_PowerPointExport_idl__
-
-#include com/sun/star/document/XExporter.idl
-
-
-module com { module sun { module star { module oox {
-
-/**
-   @since LibreOffice 4.2
-*/
-service PowerPointExport : com::sun::star::document::XExporter;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index e9008b3..285ac2a 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -24,12 +24,10 @@
 #include oox/helper/graphichelper.hxx
 #include oox/ole/vbaproject.hxx
 
-#include com/sun/star/oox/PowerPointExport.hpp
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
-using namespace ::oox::core;
+using namespace oox::core;
 
 using ::com::sun::star::beans::PropertyValue;
 using ::com::sun::star::lang::XComponent;
@@ -98,7 +96,7 @@ sal_Int32 PowerPointImport::getSchemeColor( sal_Int32 nToken 
) const
 if ( mpActualSlidePersist )
 {
 sal_Bool bColorMapped = sal_False;
-::oox::drawingml::ClrMapPtr pClrMapPtr( 
mpActualSlidePersist-getClrMap() );
+oox::drawingml::ClrMapPtr pClrMapPtr( 
mpActualSlidePersist-getClrMap() );
 if ( pClrMapPtr )
 bColorMapped =

Clean-up of split filter implementations needed

2013-06-03 Thread Stephan Bergmann

With 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=565861a41c536cc1497eb7419512cb1353d8 
No need for two Excel filter services and 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=3505f0e46c2e0a743ab5de9adfbec3044a4573a6 
Revert 'fdo#46808, Convert oox::PowerPointExport service to new style' 
I had noted two service implementations that were each split in two for 
no apparent good reason, and those hacks were starting to grow.


In both cases, it was not immediately obvious to me how to fold the 
import and the export implementation into a single C++ class, though. 
(In the first case, I was able to remove the additional export service 
completely by forwarding to it from the import service directly in C++. 
 In the second case, that was not trivially possible, as the export 
service is implemented in sd and the import service in oox, and the 
latter cannot include from the former.)


It would be great if anybody with deeper insight into 
oox::core::XmlFilterBase etc. could clean this up further.


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

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

2013-06-03 Thread Tor Lillqvist

 vcl/coretext/ctfonts.cxx   |2 +-
 vcl/inc/coretext/salgdi2.h |8 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

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

Fix dbgutil build

Change-Id: Ife8ca88c8f558955ee006be6294bd7b233e89916

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index 9c58891..1b4264a 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -299,7 +299,7 @@ ImplFontEntry* CTFontData::CreateFontInstance( /*const*/ 
FontSelectPattern rFSD
 
 int CTFontData::GetFontTable( const char pTagName[5], unsigned char* 
pResultBuf ) const
 {
-DBG_ASSERT( aTagName[4]=='\0', CTFontData::GetFontTable with invalid 
tagname!\n );
+DBG_ASSERT( pTagName[4]=='\0', CTFontData::GetFontTable with invalid 
tagname!\n );
 
 const CTFontTableTag nTagCode = (pTagName[0]24) + (pTagName[1]16) + 
(pTagName[2]8) + (pTagName[3]0);
 
commit 6c2d27b0a61d8851a1df7545aa391dfb4d0d77c8
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Jun 3 16:51:02 2013 +0300

Fix 64-bit build

When compiling as 64-bit code, NSRect *is* CGRect.

Change-Id: Ia14db1354251bd2a2f53fd9d02dc2816ccef2b17

diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h
index 90fb594..7693737 100644
--- a/vcl/inc/coretext/salgdi2.h
+++ b/vcl/inc/coretext/salgdi2.h
@@ -199,7 +199,9 @@ public:
 boolCheckContext();
 CGContextRefGetContext();
 voidUpdateWindow( NSRect ); // delivered in NSView 
coordinates
+#if !defined(__LP64__)  !defined(NS_BUILD_32_LIKE_64)
 voidRefreshRect( const CGRect );
+#endif
 voidRefreshRect( const NSRect );
 voidRefreshRect(float lX, float lY, float lWidth, float 
lHeight);
 
@@ -217,7 +219,7 @@ public:
 virtual voiddrawRect( long nX, long nY, long nWidth, long nHeight 
);
 virtual voiddrawPolyLine( sal_uLong nPoints, const SalPoint* 
pPtAry );
 virtual voiddrawPolygon( sal_uLong nPoints, const SalPoint* pPtAry 
);
-virtual voiddrawPolyPolygon( sal_uInt32 nPoly, const sal_uLong* 
pPoints, PCONSTSALPOINT* pPtAry );
+virtual voiddrawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* 
pPoints, PCONSTSALPOINT* pPtAry );
 virtual booldrawPolyPolygon( const ::basegfx::B2DPolyPolygon, 
double fTransparency );
 virtual sal_BooldrawPolyLineBezier( sal_uLong nPoints, const SalPoint* 
pPtAry, const sal_uInt8* pFlgAry );
 virtual sal_BooldrawPolygonBezier( sal_uLong nPoints, const SalPoint* 
pPtAry, const sal_uInt8* pFlgAry );
@@ -398,11 +400,15 @@ private:
 
 // --- some trivial inlines
 
+#if !defined(__LP64__)  !defined(NS_BUILD_32_LIKE_64)
+
 inline void AquaSalGraphics::RefreshRect( const CGRect rRect )
 {
 RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, 
rRect.size.height );
 }
 
+#endif
+
 inline void AquaSalGraphics::RefreshRect( const NSRect rRect )
 {
 RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, 
rRect.size.height );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-03 Thread Andre Fischer

 sfx2/inc/sfx2/sidebar/ControllerItem.hxx |5 +
 sfx2/source/sidebar/ControllerItem.cxx   |   18 ++
 2 files changed, 23 insertions(+)

New commits:
commit 3f483a9219b9135f9f854d62b4ad0512d3752660
Author: Andre Fischer a...@apache.org
Date:   Mon Jun 3 12:33:38 2013 +

122433: The sidebar ControllerItem can now give access to the extended help 
text for commands.

diff --git a/sfx2/inc/sfx2/sidebar/ControllerItem.hxx 
b/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
index 0641e38..0d53b01 100644
--- a/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
+++ b/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
@@ -103,6 +103,11 @@ public:
 */
 ::rtl::OUString GetLabel (void) const;
 
+/** Return the extended help text for the command.
+Returns an empty string when the UNO command name is not available.
+*/
+::rtl::OUString GetHelpText (void) const;
+
 /** Return the icon for the command.  Uses the system high contrast mode 
state.
 */
 Image GetIcon (void) const;
diff --git a/sfx2/source/sidebar/ControllerItem.cxx 
b/sfx2/source/sidebar/ControllerItem.cxx
index a4b6a08..1455232 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -208,6 +208,23 @@ void ControllerItem::ResetFrame (void)
 
 
 
+::rtl::OUString ControllerItem::GetHelpText (void) const
+{
+Help* pHelp = Application::GetHelp();
+if (pHelp != NULL)
+{
+if (msCommandName.getLength()  0)
+{
+const ::rtl::OUString sHelp 
(pHelp-GetHelpText(A2S(.uno:)+msCommandName, NULL));
+return sHelp;
+}
+}
+return ::rtl::OUString();
+}
+
+
+
+
 Image ControllerItem::GetIcon (void) const
 {
 return 
GetIcon(Application::GetSettings().GetStyleSettings().GetHighContrastMode());
@@ -228,6 +245,7 @@ Image ControllerItem::GetIcon (const bool 
bIsHighContrastMode) const
 void ControllerItem::SetupToolBoxItem (ToolBox rToolBox, const sal_uInt16 
nIndex)
 {
 rToolBox.SetQuickHelpText(nIndex, GetLabel());
+rToolBox.SetHelpText(nIndex, GetHelpText());
 rToolBox.SetItemImage(nIndex, GetIcon());
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Direct csv import into Base table

2013-06-03 Thread Lionel Elie Mamane

On Mon, Jun 03, 2013 at 02:57:47PM +0200, Zolnai Tamás wrote:
 On Mon, Jun 03, 2013 at 12:05:56PM +0200, Zolnai Tamás wrote:

I'm working on a new feature in Base again. It's just a little
 user helper feature to make available the direct import of an csv
 file into table, without open Calc and copypaste the content from
 it to Base.

 Base can already do that without resorting to Calc:

 If you intend to put an easier / faster / ... UI on this procedure,
 sure, that seems nice.

 The usability of this method is the same as which I mentioned. Have to
 open an other window and use copypaste (additionally make a useless file).
 So yes, my primary aim is to add an easier way.

 already have the plan to implement it and it seems to me that it
 will work not just with csv files but all Calc compatible format
 (in this case only the first sheet will be imported, but later it
 can be extended).

 This starts to look like you want to reimplement a different way to
 achieve the same as the above, and not only slap a different /
 better UI on it. Unless there is a good reason (which one?), I'd
 rather not. Two implementations = more code, two sets of bugs,
 confusion for the user, ...

 Note that the above works for any calc compatible format by using
 Spreadsheet instead of Text. And many other sources...

 Again, slapping a better UI on it, that would e.g. avoid the need to
 create an .odb file which the user will delete right after, would be
 nice. I imagine it would work like this: reuse the database wizard
 open existing database and connect to existing database stuff to
 setup a SDBC URL, but do *not* create a .odb file connecting to that
 URL. Instead, connect to that URL in code, list the tables, ask the
 user which tables to import, and import them into the current
 database. Bonus points for reusing the same codepath as a paste in the
 the copy/paste case (one time for each table).

 I didn't know about this feature up to now, but for the first blush
 it is not the same feature, at least from the users point of
 view. As I see these connection is a readonly access to a bunch of
 csv/text files (or sheets of one spreadsheet file) with openning an
 alone database to them.

Whether the access the source is read-only or read-write depends on
the underlying driver; for CSV it is probably read-only, be it only
for lack of a primary key. For DBaseIII, for example, I think it is
read/write.

But Read-only access to the source is all you need for import, so I
don't quite get the point in the current discussion.

 The feature which I intend to implement is making a new table and
 insert into the already opened database.

Yes, which is exactly what the procedure described in my previous mail
also does. Except it is not limited to CSV and other calc-supported
formats (but any supported database), and already gives you access to
each sheet of a calc file instead of the first.

Which was my main motivation for slapping a better UI on *this*
procedure rather than on the more limited go through Calc route.

 With this I just say that for the user it can be looked as a
 different thing and so not make confusion.

Well, if drag'n drop and import of the *same* data behave
differently in the *same* application (that is, Base), I think this is
confusing and unpredictable: even if the user knows of these two ways,
why would he expect one to work better or different than the
other?

 Implementation is an other part. Of course I will look up the code
 of this connection thing and reuse all the usefull code. But the
 implementation which I planed is not means real new code, but
 intentse use of UNO API.

Once you have a SDBC URL, the rest of the work is also completely
through the UNO API: I expect in
 com.sun.star.sdb
 com.sun.star.sdbc
 com.sun.star.sdbcx

I expect that the existing code path used when copy/pasting from one
Base file to the other uses pretty much these APIs.


 The Writer OLE-object feature (...) the same file import as Calc do
 (...) which more usefull than the page with the same aim in
 Base. More usefull means more options and a table showing the
 expected result.

Well, if the CSV setup screen in Base sucks, we can fix
*that*. Possibly even use the same setup screen than in Calc? As in:
merge the two.

If you do that (additionally to the easier Base import UI), you'll
have enhanced not only import into new base file but also connect
to CSV directly, which is used e.g. by Writer's mail merge, as well
as by Base. I.e. it has broader appeal / applicability for our users.


IMO, having a import into any database from any database feature is
also more broadly useful than only import into any database from a
Calc-supported file. So I'd prefer we had the former; I don't think
it is essentially more difficult, but I agree that for the specific
case of CSV, enhancing Base's connect UI to match Calc's open UI *is*
definitely an additional work.

CSV seems to be more important for you than all other database

[ABANDONED] clang, -Wuninitialized

2013-06-03 Thread Julien Nabet (via Code Review)

Julien Nabet has abandoned this change.

Change subject: clang, -Wuninitialized
..


Patch Set 1: Abandoned

Thank you Stephan for your review.
Thank you Lubos about the patch.
Following what you said, I abandon this change.

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ib7c585c227d999870d5277cbee0f5bfd562185c3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com

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

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

2013-06-03 Thread Michael Stahl

 sw/source/core/doc/docredln.cxx   |2 +-
 sw/source/filter/ww8/writerhelper.cxx |7 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 460507f07177587a9bb6438a438de95c47abb3f0
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jun 3 16:13:52 2013 +0200

SwDoc::AppendRedline: fix an obscure memory leak

... that also causes ~SwIndexReg assertion on closing the document.

Change-Id: Icea617c893ddc08b817a5b16f68fa128a41531d4

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 6f3e18b..a6a92a1 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -430,7 +430,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool 
bCallDelete )
 {
 // own insert-over-insert redlines:
 // just scrap the inside ones
-mpRedlineTbl-Remove( n );
+mpRedlineTbl-DeleteAndDestroy( n );
 bDec = true;
 }
 else if( POS_OVERLAP_BEHIND == eCmpPos )
commit bb6ecd8b40313b7cc83d4e619029f4e001334a52
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jun 3 12:24:18 2013 +0200

sw: fix ~SwIndexReg assert

Not really a problem, since local aRegion's point is not used after its
node is deleted.

Change-Id: Ibeb885fb31f19b02e4c3c63e3b99d00ced756810

diff --git a/sw/source/filter/ww8/writerhelper.cxx 
b/sw/source/filter/ww8/writerhelper.cxx
index 664d5aa..08c68a0 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -751,7 +751,12 @@ namespace sw
 SwRedlineData aData(pFltRedline-eType, pFltRedline-nAutorNo,
 pFltRedline-aStamp, aEmptyStr, 0);
 
-mrDoc.AppendRedline(new SwRedline(aData, aRegion), true);
+SwRedline *const pNewRedline(new SwRedline(aData, aRegion));
+// the point node may be deleted in AppendRedline, so park
+// the PaM somewhere safe
+aRegion.DeleteMark();
+*aRegion.GetPoint() = 
SwPosition(SwNodeIndex(mrDoc.GetNodes()));
+mrDoc.AppendRedline(pNewRedline, true);
 
mrDoc.SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_NONE | 
nsRedlineMode_t::REDLINE_SHOW_INSERT |
  nsRedlineMode_t::REDLINE_SHOW_DELETE ));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Direct csv import into Base table

2013-06-03 Thread Dan Lewis


On 06/03/2013 06:05 AM, Zolnai Tamás wrote:

Hi Lionel,

   I'm working on a new feature in Base again. It's just a little user 
helper feature to make available the direct import of an csv file into 
table, without open Calc and copypaste the content from it to Base. I 
already have the plan to implement it and it seems to me that it will 
work not just with csv files but all Calc compatible format (in this 
case only the first sheet will be imported, but later it can be 
extended). I will use up the code which lies under the OLE-object 
feature of Writer, which already contains the csv import.
   The only question is where this feature would be reachable. I have 
two ideas and I think all of these two places should be used:
   1. Table view - Tasks. Add a 4th option like Import Table From 
File This point contains all other places which are almost the 
duplicates of this Tables list (e.g. Insert menu with label Table 
(Import)... ).
   2. Table view - Tables - context menu. The label can be Import 
Table


If you agree with these points than I send a mail to the ux mailing 
list for a new icon which can be displayed in the Tasks list and in 
the menu.


Best Regards,
Tamás

 Pardon me for making a comment. Base can connect to a CSV file now 
using the Base wizard. It seems like what you want to do could be made 
part of this wizard. At least this makes more sense to me since it is 
creating or modifying a database.


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

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

2013-06-03 Thread Michael Stahl

 sw/source/core/doc/docredln.cxx   |2 +-
 sw/source/filter/ww8/writerhelper.cxx |7 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 80882b03b7e6fb3bdd18aa1ce482d96ec4cd6447
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jun 3 16:13:52 2013 +0200

SwDoc::AppendRedline: fix an obscure memory leak

... that also causes ~SwIndexReg assertion on closing the document.

Change-Id: Icea617c893ddc08b817a5b16f68fa128a41531d4
(cherry picked from commit 460507f07177587a9bb6438a438de95c47abb3f0)

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 6f3e18b..a6a92a1 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -430,7 +430,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool 
bCallDelete )
 {
 // own insert-over-insert redlines:
 // just scrap the inside ones
-mpRedlineTbl-Remove( n );
+mpRedlineTbl-DeleteAndDestroy( n );
 bDec = true;
 }
 else if( POS_OVERLAP_BEHIND == eCmpPos )
commit 80cee9c82cab9466c4b2e7622e395efb0e066adb
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jun 3 12:24:18 2013 +0200

sw: fix ~SwIndexReg assert

Not really a problem, since local aRegion's point is not used after its
node is deleted.

Change-Id: Ibeb885fb31f19b02e4c3c63e3b99d00ced756810
(cherry picked from commit bb6ecd8b40313b7cc83d4e619029f4e001334a52)

diff --git a/sw/source/filter/ww8/writerhelper.cxx 
b/sw/source/filter/ww8/writerhelper.cxx
index 228bc59..fad2d67 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -759,7 +759,12 @@ namespace sw
 SwRedlineData aData(pFltRedline-eType, pFltRedline-nAutorNo,
 pFltRedline-aStamp, aEmptyStr, 0);
 
-mrDoc.AppendRedline(new SwRedline(aData, aRegion), true);
+SwRedline *const pNewRedline(new SwRedline(aData, aRegion));
+// the point node may be deleted in AppendRedline, so park
+// the PaM somewhere safe
+aRegion.DeleteMark();
+*aRegion.GetPoint() = 
SwPosition(SwNodeIndex(mrDoc.GetNodes()));
+mrDoc.AppendRedline(pNewRedline, true);
 
mrDoc.SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_NONE | 
nsRedlineMode_t::REDLINE_SHOW_INSERT |
  nsRedlineMode_t::REDLINE_SHOW_DELETE ));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gdb support for exceptions (Re: using backtrace() in exception throwing?)

2013-06-03 Thread Tom Tromey

 Stephan == Stephan Bergmann sberg...@redhat.com writes:

Stephan Great, thanks.  (So your idea would be to, in a second step, teach
Stephan ABRT to issue additional gdb commands besides backtrace in case the
Stephan trace contains __gnu_cxx::__verbose_terminate_handler, right?)

If that GCC bug is fixed, then the existing bt full would capture the
type information.  The info would appear in a mangled form, but it is
trivial to run that through c++filt.

Like in my example:

t = 0x601060 _ZTIi@@CXXABI_1.3

-

$ c++filt _ZTIi
typeinfo for int

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

Re: Gdb support for exceptions (Re: using backtrace() in exception throwing?)

2013-06-03 Thread Stephan Bergmann


On 06/03/2013 04:36 PM, Tom Tromey wrote:

Stephan == Stephan Bergmann sberg...@redhat.com writes:


Stephan Great, thanks.  (So your idea would be to, in a second step, teach
Stephan ABRT to issue additional gdb commands besides backtrace in case the
Stephan trace contains __gnu_cxx::__verbose_terminate_handler, right?)

If that GCC bug is fixed, then the existing bt full would capture the
type information.  The info would appear in a mangled form, but it is
trivial to run that through c++filt.


Ah, right; I'd failed to note how bt full also prints local vars, and 
how e.g. ABRT already uses that.


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

Re: Grammar Check not working in Calc?

2013-06-03 Thread Németh László

Dear Guenter,

Unfortunately, Calc, Draw, moreover, Writer text frames haven't
supported grammar checking, yet.

Best regards,
László

2013/6/3 Guenter Bartsch guenter.bart...@gmail.com:
 dear all,

 just a quick question: are grammar check plugins supposed to work in calc?

 we have implemented a small grammar check plugin which works nicely in
 writer. however, it doesn't seem to get called ever when entering
 tests in calc spreadsheets - is this a bug in our plugin or a problem
 in libreoffice in general?

 thanks,

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

Re: [ANN] LibreOffice 4.0.4 RC1 test builds available

2013-06-03 Thread Petr Mladek

Joren píše v Pá 31. 05. 2013 v 01:50 +0200:
 Hi,
 
 Op 30/05/13 17:30, Fridrich Strba schreef:
  Hi *,
 
  for the upcoming new version 4.0.4, the RC1 builds now start to be
  available on pre-releases. This build is slated to be first release
  candidate build on the way towards 4.0.4, please refer to our release
  plan timings here:
 
   http://wiki.documentfoundation.org/ReleasePlan#4.0.4_release
 
  Builds are now being uploaded to a public (but non-mirrored - so don't
  spread news too widely!) place, as soon as they're available. Grab
  them here:
 
   http://dev-builds.libreoffice.org/pre-releases/
 
  If you've a bit of time, please give them a try  report *critical*
  bugs not yet in bugzilla here, so we can incorporate them into the
  release notes. 
 When trying to download the .dmg from
 http://dev-builds.libreoffice.org/pre-releases/mac/x86/ I get an 'Access
 forbidden!' message. I tried downloading by right click  Save link as,
 but that result in downloading a 1kb file.

It seems to work now.

Best Regards,
Petr

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

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

2013-06-03 Thread David Tardon

 svx/source/table/tablecontroller.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9e5342509b302ba1f816f21cc3ad1cb7093982e0
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 3 14:22:07 2013 +0200

copy values from the original item set

... because SfxAbstractDialog::GetOutputItemSet() only contains the
items that have been _changed_ in the dialog.

Change-Id: Iaf20bb42b65e420fe4e7aff979378eff7b5e5df2
(cherry picked from commit 9cd71f996e3625e8174c46bf85e336c1ee90df7f)

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

diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 9368675..16a2c2c 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -726,7 +726,8 @@ void SvxTableController::onFormatTable( SfxRequest rReq )
 std::auto_ptr SfxAbstractTabDialog  pDlg( pFact ? 
pFact-CreateSvxFormatCellsDialog( NULL, aNewAttr, pTableObj-GetModel(), 
pTableObj) : 0 );
 if( pDlg.get()  pDlg-Execute() )
 {
-SfxItemSet aNewSet( *(pDlg-GetOutputItemSet ()) );
+SfxItemSet aNewSet( aNewAttr );
+aNewSet.Put( *(pDlg-GetOutputItemSet ()) );
 
 SvxBoxItem aNewBoxItem( static_cast const SvxBoxItem ( 
aNewSet.Get( SDRATTR_TABLE_BORDER ) ) );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - jvmfwk/plugins

2013-06-03 Thread Michael Stahl

 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |   18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit f50f172efbe534863c91f4b1cc6dc58a05f1eeb9
Author: Michael Stahl mst...@redhat.com
Date:   Sun Jun 2 16:37:40 2013 +0200

jvmfwk: de-Pascalize do_msvcr71_magic

The uninitialized Module variable causes the smoketest to fail when
built with MSVC 2012 (assinging to it raises some weird exception).

Change-Id: I77b3b591a94f4dfbb373938e3787f75e6a8e09c5
(cherry picked from commit 1ff01d207d90685cb897f518c2a688b5ef33358e)
Reviewed-on: https://gerrit.libreoffice.org/4135
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index fbc4eeb9..33db97d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -488,20 +488,15 @@ static void load_msvcr71(LPCWSTR jvm_dll)
 // and just let the implicit loading try to take care of it.
 static void do_msvcr71_magic(rtl_uString *jvm_dll)
 {
-FILE *f;
-rtl_uString* Module;
-oslFileError nError;
+rtl_uString* Module(0);
 struct stat st;
-PIMAGE_DOS_HEADER dos_hdr;
-IMAGE_NT_HEADERS *nt_hdr;
-IMAGE_IMPORT_DESCRIPTOR *imports;
 
-nError = osl_getSystemPathFromFileURL(jvm_dll, Module);
+oslFileError nError = osl_getSystemPathFromFileURL(jvm_dll, Module);
 
 if ( osl_File_E_None != nError )
 rtl_uString_assign(Module, jvm_dll);
 
-f = _wfopen(reinterpret_castLPCWSTR(Module-buffer), Lrb);
+FILE *f = _wfopen(reinterpret_castLPCWSTR(Module-buffer), Lrb);
 
 if (fstat(fileno(f), st) == -1)
 {
@@ -509,7 +504,7 @@ static void do_msvcr71_magic(rtl_uString *jvm_dll)
 return;
 }
 
-dos_hdr = (PIMAGE_DOS_HEADER) malloc(st.st_size);
+PIMAGE_DOS_HEADER dos_hdr = (PIMAGE_DOS_HEADER) malloc(st.st_size);
 
 if (fread(dos_hdr, st.st_size, 1, f) != 1 ||
 memcmp(dos_hdr, MZ, 2) != 0 ||
@@ -523,9 +518,10 @@ static void do_msvcr71_magic(rtl_uString *jvm_dll)
 
 fclose(f);
 
-nt_hdr = (IMAGE_NT_HEADERS *) ((char *)dos_hdr + dos_hdr-e_lfanew);
+IMAGE_NT_HEADERS *nt_hdr = (IMAGE_NT_HEADERS *) ((char *)dos_hdr + 
dos_hdr-e_lfanew);
 
-imports = (IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr + 
nt_hdr-OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
+IMAGE_IMPORT_DESCRIPTOR *imports =
+(IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr + 
nt_hdr-OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
 
 while (imports = (IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr + 
st.st_size - sizeof (IMAGE_IMPORT_DESCRIPTOR)) 
imports-Name != 0 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] copy values from the original item set

2013-06-03 Thread Fridrich Strba (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/4145

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9100dbe05c418a9dd1b819534a08076c9a4aed1c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: David Tardon dtar...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED libreoffice-4-0] jvmfwk: de-Pascalize do_msvcr71_magic

2013-06-03 Thread Fridrich Strba (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/4135

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77b3b591a94f4dfbb373938e3787f75e6a8e09c5
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

Re: [ANN] LibreOffice 4.1.0 Beta1 available

2013-06-03 Thread Petr Mladek

Andreas Radke píše v St 29. 05. 2013 v 22:52 +0200:
 It seems distro-pack-install needs some fixes. My testing build uses
 
 make DESTDIR=${srcdir}/fakeinstall distro-pack-install
 
 and then I move files from fakeinstall dir to sub packages using the
 file lists. This leads to:
 
 mv: cannot stat
 '/build/libreoffice/src/fakeinstall/usr/share/applications/libreoffice-startcenter.desktop':
 No such file or directory
 
 [andyrtr@workstation64 trunk]$ find 
 /mnt/sdb3/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/pkg/
  | grep .desktop
 /mnt/sdb3/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/pkg/libreoffice-common/usr/lib/libreoffice/share/xdg/base.desktop
 /mnt/sdb3/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/pkg/libreoffice-common/usr/lib/libreoffice/share/xdg/startcenter.desktop
 /mnt/sdb3/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/pkg/libreoffice-common/usr/lib/libreoffice/share/xdg/writer.desktop
 /mnt/sdb3/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/pkg/libreoffice-common/usr/lib/libreoffice/share/xdg/qstart.desktop
 /mnt/sdb3/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/pkg/libreoffice-common/usr/lib/libreoffice/share/xdg/calc.desktop
 /mnt/sdb3/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/pkg/libreoffice-common/usr/lib/libreoffice/share/xdg/xsltfilter.desktop
 /mnt/sdb3/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/pkg/libreoffice-common/usr/lib/libreoffice/share/xdg/math.desktop
 /mnt/sdb3/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/pkg/libreoffice-common/usr/lib/libreoffice/share/xdg/impress.desktop
 /mnt/sdb3/andyrtr/arch64/chroots/testing-x86_64/andyrtr/build/libreoffice/pkg/libreoffice-common/usr/lib/libreoffice/share/xdg/draw.desktop
 
 For libo-common the files are no more going to /usr/share/applications. 
 Maybe this is due to the remove of unix-wrapper switch.
 
 common_list.txt is still including:
 
 /usr/share/applications/libreoffice-startcenter.desktop
 /usr/share/applications/libreoffice-xsltfilter.desktop

This should get fixed by
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-1id=681449afee3f21b0df608109649e35ccdc770abd

Anyway, there are still problems with the distro-pack-install. There are
some new file lists or so that need to be handled.

Best Regards,
Petr

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

[PUSHED] Remove Tango icon duplicates using symlinks

2013-06-03 Thread Fridrich Strba (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/4113

Approvals:
  Mathias M: Looks good to me, but someone else must approve
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a4c09cdf6d60b90236663a4b7f30456a8c32e86
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Mathias M m...@gmx.fr
Gerrit-Reviewer: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br

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

1 2 3 4 >

1 - 100 of 350 matches

Mail list logo