subject:"core.git\: officecfg\/registry"

[Libreoffice-commits] core.git: officecfg/registry

2013-03-29 Thread Andras Timar

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit fba8a3cb719a0e795495215c52ba424a7a0d1608
Author: Andras Timar 
Date:   Fri Mar 29 10:25:19 2013 +0100

Save a Copy command does not have an image

Change-Id: Ibd607b5324a23e6c7be0ffec8237bc9d51bbd4ad

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index dc3d21d..925d513 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1898,9 +1898,6 @@
 
 Save a Copy...
 
-
-1
-
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-04-10 Thread Thomas Arnhold

 officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7e61eab07832a55427a8b532d9e2bf27929e446
Author: Thomas Arnhold 
Date:   Wed Apr 10 04:48:01 2013 +0200

fdo#63350 math: move stardard toolbar to the left

Change-Id: I8f57d46737315caa41f7488e82262067a35f5253

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
index 528c3f8..f2c9191 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
@@ -42,7 +42,7 @@
 
 
 
-0,0
+1,0
 
 
 true
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-07-15 Thread Jan Holesovsky

 officecfg/registry/data/org/openoffice/Office/Views.xcu |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 114edb760079ca6ad0791db30c75394cf6f634e9
Author: Jan Holesovsky 
Date:   Mon Jul 15 17:32:40 2013 +0200

Enable sidebar by default when the Experimental Sidebar is put to 'on'.

Change-Id: I525f15bc3f6b40522bf0dce754dd8e99386cd775

diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu 
b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index bd3a06b..65d02dd 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -24,5 +24,12 @@
 false
   
 
+
+
+
+  
+true
+  
+
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-08-05 Thread Gabor Kelemen

 officecfg/registry/data/org/openoffice/Setup.xcu |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 8f44fb5ee0bd21d192820ffd359504f6d1c68a52
Author: Gabor Kelemen 
Date:   Mon Aug 5 11:12:17 2013 +0200

Mark Base window titles for localisation

Change-Id: If876592729c695e5a0916df24873f17f2b1b0254
Reviewed-on: https://gerrit.libreoffice.org/5283
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index 1d7961b..50bdb21 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -335,7 +335,7 @@
   swform
 
 
-  Base: Database Form
+  Base: Database Form
 
 
   WriterFormWindowState
@@ -370,7 +370,7 @@
   swreport
 
 
-  Base: Report Design
+  Base: Report Design
 
 
   WriterReportWindowState
@@ -481,7 +481,7 @@
   GenericCategories
 
 
-  Base: Relation Design
+  Base: Relation Design
 
   
   
@@ -506,7 +506,7 @@
   GenericCategories
 
 
-  Base: Query Design
+  Base: Query Design
 
   
   
@@ -531,7 +531,7 @@
   GenericCategories
 
 
-  Base: View Design
+  Base: View Design
 
   
   
@@ -556,7 +556,7 @@
   GenericCategories
 
 
-  Base: Table Design
+  Base: Table Design
 
   
   
@@ -581,7 +581,7 @@
   GenericCategories
 
 
-  Base: Data View
+  Base: Data View
 
   
   
@@ -606,7 +606,7 @@
   GenericCategories
 
 
-  Base: Table Data View
+  Base: Table Data View
 
   
   
@@ -773,7 +773,7 @@
   GenericCategories
 
 
-  Base: Oracle Report Builder
+  Base: Oracle Report Builder
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-12-02 Thread Samuel Mehrbrodt

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0d4e04b8378ca3e142c8b2f2c50851b3c74df012
Author: Samuel Mehrbrodt 
Date:   Sun Dec 1 22:51:18 2013 +0100

fdo#43637 Two commands with the same name "Backspace"

One of them emulates the "Backspace" and the other one "Shift+Backspace", 
so I renamed it accordingly

Change-Id: I8a2a9f2b5b7212d4ea385c3b5f2e47ac014accc3
Reviewed-on: https://gerrit.libreoffice.org/6887
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 1afe40e..88ec469 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1576,7 +1576,7 @@
   
   
 
-  Backspace
+  Shift+Backspace
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-12-04 Thread Samuel Mehrbrodt

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

New commits:
commit 06299d6c1620e5b2f2a3588d7c93790278397cbd
Author: Samuel Mehrbrodt 
Date:   Sun Dec 1 17:53:05 2013 +0100

Prefer the Liberation fonts over Arial/Times

The new Writer template was supposed to use the Liberation fonts: 
http://nabble.documentfoundation.org/Default-Writer-Template-td4076271.html
So I changed the defaults to prefer them over their MS equivalents. When 
they are not available, they will be substituted as used.

This should not cause problems since the Liberation Fonts have the same 
metrics as Times, Arial and Courier New.

Change-Id: I00dc14db2aee3b6f57eec7b6f93b69fcf8e5c2cc
Reviewed-on: https://gerrit.libreoffice.org/6886
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 71ff091..ec48498 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -58,25 +58,25 @@
   
 
   
-Albany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans 
L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
+Liberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans 
L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
   
   
 MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;AR PL 
ShanHeiSun Uni;MS PGothic;Arial Unicode MS;Lucida Sans Unicode;Tahoma
   
   
-Albany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans 
L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
+Liberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans 
L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
   
   
-Cumberland AMT;Cumberland;Courier New;Cousine;Liberation 
Mono;Nimbus Mono L;DejaVu Sans Mono;Courier;Lucida Sans Typewriter;Lucida 
Typewriter;Monaco;Monospaced
+Liberation Mono;Cumberland AMT;Cumberland;Courier 
New;Cousine;Nimbus Mono L;DejaVu Sans Mono;Courier;Lucida Sans 
Typewriter;Lucida Typewriter;Monaco;Monospaced
   
   
-Albany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans 
L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
+Liberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans 
L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
   
   
-Albany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans 
L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
+Liberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans 
L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
   
   
-Thorndale AMT;Thorndale;Times New Roman;Tinos;Liberation 
Serif;Nimbus Roman No9 L;DejaVu Serif;Times;Lucida Serif;Lucida 
Bright;Timmons;New York;Serif
+Liberation Serif;Thorndale AMT;Thorndale;Times New 
Roman;Tinos;Nimbus Roman No9 L;DejaVu Serif;Times;Lucida Serif;Lucida 
Bright;Timmons;New York;Serif
   
   
 HG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG 
Mincho;Mincho;MS PMincho;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG 
Gothic;Gothic;MS PGothic;AR PL ShanHeiSun Uni;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma
@@ -103,22 +103,22 @@
 Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS
   
   
-Albany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans 
L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
+Liberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans 
L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans 
Unicode;Tahoma;SansSerif
   
   
 Arial Unicode MS;DejaVu Sans;Lucida Sans Unicode;Tahoma;Albany 
AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;SansSerif
   
   
-Thorndale AMT;Thorndale;Times New Roman;Tino;Liberation 
Serif;DejaVu Serif;Nimbus Roman No9 L;Times;Lucida Serif;Lucida 
Bright;Timmons;New York;Serif
+Liberation Serif;Thorndale AMT;Thorndale;Times New 
Roman;Tino;DejaVu Serif;Nimbus Roman No9 L;Times;Lucida Serif;Lucida 
Bright;Timmons;New York;Serif
   
   
 StarSymbol;OpenSymbol;Arial Unicode MS;StarBats;Zapf 
Dingbats;WingDings;Symbol
   
   
-Cumberland AMT;Cumberland;Courier New;Cousine;Liberation 
Mono;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida 
Typewriter;Monaco;Monospaced
+Liberation Mono;Cumberland AMT;Cumberland;Courier 
New;Cousine;Nimbus Mono L;Courier;Lucida Sans Typewr

[Libreoffice-commits] core.git: officecfg/registry

2013-11-20 Thread Cor Nouws

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae2a19fa846f533e6ec7d1bb9839a6a709862872
Author: Cor Nouws 
Date:   Tue Nov 12 23:47:06 2013 +0100

fdo#59427 next step template menu: change string New Document.. to Manage

TODO: uno:NewDoc sh/could be changed to, but lets fit that in future
improvements/changes in this area

Change-Id: I5e926afbd8cb714962091a973167c928adf0225a
Reviewed-on: https://gerrit.libreoffice.org/6659
Reviewed-by: BjÃ¶rn Michaelsen 
Tested-by: BjÃ¶rn Michaelsen 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 7b539e1..a16b900 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1882,7 +1882,7 @@
   
   
 
-  New Document From Template
+  Manage
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-05-28 Thread Andras Timar

 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu |   28 
+-
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit d93c8739e899f15eadc6e348b41be07253bd0357
Author: Andras Timar 
Date:   Tue May 28 16:49:01 2013 +0200

do not localize whitespace-only strings

Change-Id: Ie13a80afd0df6972488b8e7f8629a1c4bc840afb

diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index 5c303fe..29825fc 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -775,10 +775,10 @@
 
 
   
- 
+ 
   
   
- 
+ 
   
 
 
@@ -799,10 +799,10 @@
 
 
   
- 
+ 
   
   
- 
+ 
   
 
 
@@ -823,10 +823,10 @@
 
 
   
- 
+ 
   
   
- 
+ 
   
 
 
@@ -847,10 +847,10 @@
 
 
   
- 
+ 
   
   
- 
+ 
   
 
 
@@ -863,10 +863,10 @@
 
 
   
- 
+ 
   
   
- 
+ 
   
 
 
@@ -879,10 +879,10 @@
 
 
   
- 
+ 
   
   
- 
+ 
   
 
 
@@ -911,10 +911,10 @@
 
 
   
- 
+ 
   
   
- 
+ 
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-06-05 Thread Ariel Constenla-Haile

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a1b7295260b0293ebf7d89bd84806b5b52aa07a4
Author: Ariel Constenla-Haile 
Date:   Fri Apr 26 21:56:09 2013 +

Specify an icon for ".uno:ExtendedHelp"

(cherry picked from commit 52a0a12e677e96ae0df70a710c3e10f00c8abf4b)

Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

Change-Id: If5da2911b3ca94b93e09917f74640ff5ac9f75f3

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index bbed900..dbdc93a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1505,6 +1505,9 @@
 
   What's ~This?
 
+
+  1
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-06-12 Thread Winfried Donkers

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e2e0db8f2967d866cba5c5400617d97aceaeefe9
Author: Winfried Donkers 
Date:   Mon Jun 10 12:47:13 2013 +0200

fdo#64626 clarify use of border line settings on toolbar

Using the toolbar button to set border lines in calc, lines are added,
but not removed. I thought this to be a bug, but it isn't. Using the
toolbar button is for addition, and using the same button with the SHIFT
key is for addition+deletion.

Unfortunately, this is not mentioned in help files or hints.
This patch remedies this by giving a better hint when using the toolbar
button.

Change-Id: I0cf5cc9bffbec363cde3c7493f024cdfa72c54f4
Reviewed-on: https://gerrit.libreoffice.org/4220
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index dbdc93a..241e43e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2772,7 +2772,7 @@
   
   
 
-  Borders
+  Borders, add lines; SHIFT to add and 
remove
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-01-03 Thread Eike Rathke

 officecfg/registry/data/org/openoffice/Office/Calc.xcu |   22 +
 1 file changed, 22 insertions(+)

New commits:
commit 9cf662e46b30f46bdbc473b0e605be8cfca1d4af
Author: Eike Rathke 
Date:   Fri Jan 3 14:05:15 2014 +0100

added EUR/EEK and EUR/LVL factors for internal CONVERT(), fdo#73239

Change-Id: Ia385cbba240d1d8095e8a6ed6f4798d99c14794d

diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu 
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 82711fc..190766e 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -195,6 +195,28 @@
 30.1260
   
 
+
+  
+EUR
+  
+  
+EEK
+  
+  
+15.6466
+  
+
+
+  
+EUR
+  
+  
+LVL
+  
+  
+0.702804
+  
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-08-14 Thread Joel Madero

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   10 
+-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit d9ead65397ea4b6d4bcc66cf304653bb71e14c9c
Author: Joel Madero 
Date:   Tue Aug 13 09:41:52 2013 -0700

fdo#67584 - Incorrect Flip Labels

Fixed flip label (format -> flip) in writer - previously flip horizontally 
listed twice instead of flip vertically and flip horizontally

modified:   
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu

Change-Id: I0ceced973891699606ea6faa3ed3d8863a11c705
Reviewed-on: https://gerrit.libreoffice.org/5373
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 76ff150..6f69a20 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -722,7 +722,15 @@
   
   
 
-  Flip Horizontally
+  Flip Vertically
+
+
+  1
+
+  
+  
+
+  Flip Horizontal
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-08-19 Thread Ivan Timofeev

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33b631c483e017e9ba9430034eb659f085093944
Author: Ivan Timofeev 
Date:   Sun Aug 18 19:26:04 2013 +0400

fdo#67653: Revert "go back to 8 colorvalueset columns"

This reverts commit 7e7ccea7cc91e86d7d345b85940dba16bec36fc4.

Change-Id: Idc09233ccd53a7368da978bb7c1a04a640118e62
Reviewed-on: https://gerrit.libreoffice.org/5503
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index c1e96a1..ac9ed45 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6262,7 +6262,7 @@
   
   Defines the number of columns that will be shown in a 
ColorValueSet.
 
-8
+12
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-09-25 Thread Jesús Corrius

 officecfg/registry/data/org/openoffice/Office/Common.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa52e16b3fb1b8b051f8f64a52c126ba3cbf4d54
Author: JesÃºs Corrius 
Date:   Wed Sep 25 22:24:38 2013 +0200

don't steal the focus after loading a document

to reproduce it, just load a large document and meanwhile
change the focus to another window. when the libreoffice
document ends loading, the libreoffice window will be
bought into foreground and steal the focus

Change-Id: Id4b9be67270c17523d9dabf452fa321de660f808

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index ef0e765..0eb3e64 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -27,7 +27,7 @@
 
 
   
-true
+false
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-09-25 Thread Krisztian Pinter

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96d97654611386eae3254ce184b9ad0944d37879
Author: Krisztian Pinter 
Date:   Wed Sep 25 23:29:51 2013 +0200

Increase number of remembered recent documents from 10 to 25

Change-Id: Ie844c13643325180265825d2becc5cbf4b5aea3e

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 8c1e568..ccc6d12 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2060,7 +2060,7 @@
 
   
 
-10
+25
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-09-29 Thread Danny Brown

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 32dcd60b47b78c5afa3885bd3a392b511ca713c3
Author: Danny Brown 
Date:   Wed Sep 18 00:04:31 2013 +0100

Ctrl + K now opens the HyperlinkDialog

Change-Id: I0177b32376b7d4c80876ad686d9e7bb16ac8d7fa

Conflicts:
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 1dab5f7..0e488b3 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -45,6 +45,12 @@
   .uno:Copy
 
   
+  
+
+  I10N SHORTCUTS - NO 
TRANSLATE
+  .uno:HyperlinkDialog
+
+  
   
 
   I10N SHORTCUTS - NO 
TRANSLATE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-10-06 Thread Stephan Bergmann

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |  112 
+-
 1 file changed, 56 insertions(+), 56 deletions(-)

New commits:
commit 08f60082db4a8ad2ca9fde09271d7eace9bd175f
Author: Stephan Bergmann 
Date:   Sun Oct 6 16:32:23 2013 +0200

Consistently place platform-specific install:modules on values, not nodes

...so the (locale-specific) values end up in main.xcd on the appropriate
platforms, instead of in the corresponding res/registry_*.xcd but on all
platforms.

Change-Id: I833fbad24868b86db826ff2da408a9f7101d5633

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 2c86382..272278c 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -100,10 +100,10 @@
   .uno:SearchDialog
 
   
-  
+  
 
   I10N SHORTCUTS - NO 
TRANSLATE
-  .uno:SearchDialog
+  .uno:SearchDialog
 
   
   
@@ -309,10 +309,10 @@
 vnd.sun.star.findbar:FocusToFindbar
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:SearchDialog
+.uno:SearchDialog
   
 
 
@@ -889,16 +889,16 @@
 .uno:SelectData
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
 
@@ -1495,10 +1495,10 @@
 .uno:FormatUngroup
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:SuperScript
+.uno:SuperScript
   
 
 
@@ -1538,16 +1538,16 @@
 .uno:LeftPara
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
 
@@ -2138,10 +2138,10 @@
 .uno:StartOfDocumentSel
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:SuperScript
+.uno:SuperScript
   
 
 
@@ -,16 +,16 @@
 .uno:ExecuteMacroField
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
 
@@ -2736,10 +2736,10 @@
 .uno:FormatUngroup
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:SuperScript
+.uno:SuperScript
   
 
 
@@ -2785,16 +2785,16 @@
 .uno:LeftPara
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
 
@@ -3459,10 +3459,10 @@
 .uno:StartOfDocumentSel
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:SuperScript
+.uno:SuperScript
   
 
 
@@ -3543,16 +3543,16 @@
 .uno:ExecuteMacroField
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
 
@@ -4226,10 +4226,10 @@
 .uno:StartOfDocumentSel
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:SuperScript
+.uno:SuperScript
   
 
 
@@ -4322,16 +4322,16 @@
 .uno:ExecuteMacroField
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:ResetAttributes
   
 
-
+

[Libreoffice-commits] core.git: officecfg/registry

2013-10-07 Thread Caolán McNamara

 officecfg/registry/data/org/openoffice/Office/Embedding.xcu |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1b717e5686f34c3ce798310a6216f7ea98fb2cd9
Author: CaolÃ¡n McNamara 
Date:   Mon Oct 7 16:10:22 2013 +0100

Resolves: rhbz#1012353 fdo#48846 allow starmath objects to be resized

Change-Id: I8fb524a324b4ada64623f7c4f9ea2348765260b7

diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu 
b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
index e39af5d..44031e8 100644
--- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
@@ -236,9 +236,7 @@
   
 com.sun.star.formula.FormulaProperties
   
-  
-8589934592
-  
+  
   
 PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE SAVECOPYAS
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-10-10 Thread Herbert Dürr

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

New commits:
commit f63a40965ccf1db5c5efe5517e3d6bdad6d727a8
Author: Herbert DÃ¼rr 
Date:   Thu Oct 10 06:57:44 2013 +

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

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index b73dacc..e159f61 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -1534,7 +1534,7 @@
   
   
 
-  hiraginomarugothicpronw3;hiraginomarugothicprow3
+  
carlito;hiraginomarugothicpronw3;hiraginomarugothicprow3
 
 
   Normal,SansSerif
@@ -1547,7 +1547,7 @@
   
   
 
-  applelisung
+  caladea;applelisung
 
 
   Normal,Serif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-11-01 Thread Julien Nabet

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7fb2aa82f69329e73434c7e6a3ce3a1d3d99f2cb
Author: Julien Nabet 
Date:   Tue Oct 29 22:30:23 2013 +0100

fdo#68414: SIDEBAR: property's Text named incorrectly

Change-Id: I2b1fdbde3655b26ec7b94fb35e1277be532d3232
Reviewed-on: https://gerrit.libreoffice.org/6480
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 26a2bc8..9f60067 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -186,7 +186,7 @@
 
   
 
-  Text
+  Character
 
 
   TextPropertyPanel
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-05-18 Thread Kohei Yoshida

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1d7c97a607615c3f176c9f553d1d011e4ee55c1d
Author: Kohei Yoshida 
Date:   Sun May 18 14:16:28 2014 -0400

fdo#78824: Avoid having two menu entries having the same accelarator.

Sort should have an 'S' as accelerator.  The other one can be auto-assigned.

Change-Id: I61e630c9b6d89658c65cca77333f1ad0a591e3ab

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 1bfa929..a0f7e86 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -666,7 +666,7 @@
   
   
 
-  ~Statistics
+  Statistics
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-02-22 Thread Petr Mladek

 officecfg/registry/data/org/openoffice/Setup.xcu |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 48bf145cf4f84703b9920e2cffafbba448ae7ae1
Author: Petr Mladek 
Date:   Fri Feb 22 14:38:08 2013 +0100

migrate even more configuration setting (fdo#57061)

+ application windows size
+ I was afraid to migrate any /org.openoffice.Setup stuff
  because there seemed to be many hardcoded values;
  But the parts mentioned in registrymodifications.xcu
  should be configurable and thus safe to migrate
+ âEnable macro recordingâ and âEnable experimental featuresâ 
options
+ sigh, we do not want to migrate
  /org.openoffice.Office.Common/Misc/FirstRun; thus we need to
  explicitely mention all the other items which is error prone
+ Tools/Options/LibreOffice/Paths/My documents
+ ah, the paths are handled on two locations: 
/org.openoffice.Office.Paths
  and /org.openoffice.Office.Common/Path
+ Macros
+ I was afraid to copy user/basic because there were some content
  out of box. I though that it might be version specific. In fact,
  the default content is just empty templates that look the same
  even in old releases => it should be secure to copy it after all

Change-Id: Ie1c04e9df36f6b6961bbaaeb922e29d64128ade4

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index b4e5e7c..6bca381 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -824,6 +824,7 @@
   
 .*/autotext/.*
 .*/autocorr/.*
+.*/basic/.*
 .*/config/.*\.so[bcdegh]
 .*/config/soffice.cfg/modules/.*/menubar/.*\.xml
 .*/config/soffice.cfg/modules/.*/statusbar/.*\.xml
@@ -860,16 +861,23 @@
 /org.openoffice.Office.Common/I18N
 /org.openoffice.Office.Common/InternalMSExport
 /org.openoffice.Office.Common/Load
+/org.openoffice.Office.Common/Misc/AlwaysAllowSave
+
/org.openoffice.Office.Common/Misc/DisableUICustomization
+/org.openoffice.Office.Common/Misc/ExperimentalMode
 
/org.openoffice.Office.Common/Misc/FormControlPilotsEnabled
+/org.openoffice.Office.Common/Misc/MacroRecorderMode
 /org.openoffice.Office.Common/Misc/PluginsEnabled
+
/org.openoffice.Office.Common/Misc/ShowLinkWarningDialog
 /org.openoffice.Office.Common/Misc/SymbolSet
+/org.openoffice.Office.Common/Misc/SymbolStyle
+/org.openoffice.Office.Common/Misc/ToolboxStyle
 /org.openoffice.Office.Common/Misc/UseSystemFileDialog
 
/org.openoffice.Office.Common/Misc/UseSystemPrintDialog
-/org.openoffice.Office.Common/Misc/SymbolStyle
 
/org.openoffice.Office.Common/Misc/FilePickerPlacesNames
 
/org.openoffice.Office.Common/Misc/FilePickerPlacesUrls
 /org.openoffice.Office.Common/ODF
 /org.openoffice.Office.Common/Passwords
+/org.openoffice.Office.Common/Path
 
/org.openoffice.Office.Common/Print/PrintingModifiesDocument
 /org.openoffice.Office.Common/Print/Warning
 /org.openoffice.Office.Common/Vectorize
@@ -937,6 +945,11 @@
   /org.openoffice.Office.Security
 
   
+  
+
+  /org.openoffice.Setup/Office/Factories
+
+  
   
 
   /org.openoffice.Office.UI/ColorScheme
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-02-24 Thread Joel Madero

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dcff3305fa43388a0285d05be6da84ea7daa49fe
Author: Joel Madero 
Date:   Tue Feb 19 14:44:47 2013 -0800

fdo#59828 update Format Paintbrush Label

Change "Format Paintbrush" to "Format Paintbrush (double click for
multi-selection") to be more concise and provide a bit more detail for users

modified:   
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

Change-Id: I8a0baaf0564ed9cc5eca99ef10b184905a3dd16b
Reviewed-on: https://gerrit.libreoffice.org/2273
Reviewed-by: BjÃ¶rn Michaelsen 
Tested-by: BjÃ¶rn Michaelsen 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ac67696..69c31bb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3332,7 +3332,7 @@
 
 
 
-Format Paintbrush
+Format Paintbrush (double click 
for multi-selection)
 
 
 9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-03-08 Thread Petr Mladek

 officecfg/registry/data/org/openoffice/Setup.xcu |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7cb3fef6e7f25b7391963f316ffd72535c3f923f
Author: Petr Mladek 
Date:   Fri Mar 8 13:50:43 2013 +0100

Migrate also Java and Online Update setting (fdo#57061)

The format of the javasetting*.xml file is the same, so why not migrate
it. Note that it does help for 4.0 because we modified javavendors.xml.
This would cause release of the java setting even when they are not
migrated. Well, the migration might be useful in the future, for 5.0 ;-)

I was slightly scared to migrate the /org.openoffice.Office.Job
but registrymodifications.xcu should include only stuff that can
be modified. Minor updates handled this well. AFAIK, we did not
change anything in this area for 4.0, so it should be fine.

Change-Id: I7775c238a7c298bf877241429c197e76f2093f5d

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index 6bca381..4017fc7 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -826,6 +826,7 @@
 .*/autocorr/.*
 .*/basic/.*
 .*/config/.*\.so[bcdegh]
+.*/config/javasettings.*\.xml
 .*/config/soffice.cfg/modules/.*/menubar/.*\.xml
 .*/config/soffice.cfg/modules/.*/statusbar/.*\.xml
 .*/config/soffice.cfg/modules/.*/toolbar/.*\.xml
@@ -843,6 +844,7 @@
 /org.openoffice.Office.Events
 /org.openoffice.Office.ExtendedColorScheme
 /org.openoffice.Office.Histories
+/org.openoffice.Office.Jobs
 /org.openoffice.Office.Paths
 /org.openoffice.Office.Recovery
 /org.openoffice.Office.Common/Accessibility
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-09-21 Thread Samuel Mehrbrodt

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f5b24e71828fc6eb095fdd7167bdc8043525563d
Author: Samuel Mehrbrodt 
Date:   Fri Sep 5 22:04:57 2014 +0200

fdo#80536 Add a shortcut to "Edit Mode" menu entry

Change-Id: Ib2535a091cad506c6ce49941361757a9f9e72865
Reviewed-on: https://gerrit.libreoffice.org/11302
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index ef0ec1b..f59a259 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -45,6 +45,12 @@
   .uno:Copy
 
   
+  
+
+  I10N SHORTCUTS - NO 
TRANSLATE
+  .uno:EditDoc
+
+  
   
 
   I10N SHORTCUTS - NO 
TRANSLATE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-09-22 Thread Samuel Mehrbrodt

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |6 
+++---
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |6 
+++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c5464f127d4d4707a5f92281c480266fd3f1b361
Author: Samuel Mehrbrodt 
Date:   Mon Sep 22 23:25:53 2014 +0200

Improve the wording of some actions

Change-Id: I1458378d5ef0ae3f2476fa455cc45b473de04456

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 60fed19..a138e47 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2019,7 +2019,7 @@
   
   
 
-  Print File Directly
+  Print Document Directly
 
 
   1
@@ -2246,7 +2246,7 @@
   
   
 
-  ~File...
+  ~Document...
 
 
   1
@@ -3382,7 +3382,7 @@
   
   
 
-  Format Paintbrush (double click for 
multi-selection)
+  Clone Formatting (double click for 
multi-selection)
 
 
   9
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 59f52b2..c0bd421 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -88,7 +88,7 @@
   
   
 
-  Insert Endnote Directly
+  Insert Endnote
 
 
   1
@@ -492,7 +492,7 @@
   
   
 
-  Insert Fields
+  Insert Field
 
 
   9
@@ -561,7 +561,7 @@
   
   
 
-  Insert Footnote Directly
+  Insert Footnote
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-06-15 Thread Maxim Monastirsky

 officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu | 
  11 --
 officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu | 
  17 --
 officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu| 
  11 --
 3 files changed, 39 deletions(-)

New commits:
commit 5d834fd66a9c57b1c1ca14f446dd33a5c36e6729
Author: Maxim Monastirsky 
Date:   Mon Jun 2 00:47:23 2014 +0300

Remove remaining bogus references to changes toolbar

A follow-up to commit 43de2fa02bbbf364326c3452a58c600bc2cb2688.

Looking at sw/uiconfig/*/toolbar, only swriter has it.

Change-Id: Ic81d862a2e05dc47f55d7f1c567d520d9548e235

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index b5740db..d2dc9f9 100644
--- 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -714,17 +714,6 @@
   true
 
   
-  
-
-  Changes
-
-
-  false
-
-
-  false
-
-  
 
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index c54a494..2573d77 100644
--- 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
@@ -694,23 +694,6 @@
   true
 
   
-  
-
-  Changes
-
-
-  true
-
-
-  2
-
-
-  0,0
-
-
-  true
-
-  
 
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 53f7e79..7e8eda4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -620,17 +620,6 @@
   true
 
   
-  
-
-  Changes
-
-
-  false
-
-
-  false
-
-  
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-06-25 Thread Joren De Cuyper

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f1ee11ce499f02eda7fdd783901f1ad62eac0bc7
Author: Joren De Cuyper 
Date:   Tue Jun 24 22:24:44 2014 +0200

fix fdo#80490 - string 'Auto Spell Checking'

This only changes the tooltip when you hover over the icon of the
toolbar icon.

Change-Id: I1724fbc6e88f6ed8fe200bd1a1c0b7ac4ff16166
Reviewed-on: https://gerrit.libreoffice.org/9885
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 0704fa6..4a3b542 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4141,7 +4141,7 @@
   
   
 
-  ~AutoSpellcheck
+  ~Automatic Spell Checking
 
 
   9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-05-01 Thread Maxim Monastirsky

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|   
24 --
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
24 --
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   
24 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   
24 --
 4 files changed, 24 insertions(+), 72 deletions(-)

New commits:
commit 36dfee00febfa51b73ac58655ba26fb56d020679
Author: Maxim Monastirsky 
Date:   Thu May 1 21:50:28 2014 +0300

Keep only one instance of CellVert commands

Change-Id: I623f47ec06924bf6355ea9531aab1c5286d18a17

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 3b8e357..18dc5d3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1701,30 +1701,6 @@
   1
 
   
-  
-
-  Top
-
-
-  1
-
-  
-  
-
-  Center ( vertical )
-
-
-  1
-
-  
-  
-
-  Bottom
-
-
-  1
-
-  
 
 
   
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index fbabdd3..b4b6366 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1647,30 +1647,6 @@
   1
 
   
-  
-
-  Bottom
-
-
-  1
-
-  
-  
-
-  Center ( vertical )
-
-
-  1
-
-  
-  
-
-  Top
-
-
-  1
-
-  
   
 
   Insert Row
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ad9275b..0704fa6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5328,6 +5328,30 @@
   Delete Comment
 
   
+  
+
+  Top
+
+
+  1
+
+  
+  
+
+  Center ( vertical )
+
+
+  1
+
+  
+  
+
+  Bottom
+
+
+  1
+
+  
 
 
   
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 247d2d1..2417301 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1906,14 +1906,6 @@
   To Previous Paragraph
 
   
-  
-
-  Top
-
-
-  1
-
-  
   
 
   Allow Row to Break Across Pages and 
Columns
@@ -1932,27 +1924,11 @@
   To Next Paragraph
 
   
-  
-
-  Center ( vertical )
-
-
-  1
-
-  
   
 
   To Next Placeholder
 
   
-  
-
-  Bottom
-
-
-  1
-
-  
   
 
   To Previous Placeholder
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-05-12 Thread Kohei Yoshida

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 45bdefccfc532d73bed2f8182543e13a18a7ac1c
Author: Kohei Yoshida 
Date:   Mon May 12 20:05:25 2014 -0400

Turn this off by default.

Not a good idea to make a "legacy" behavior on by default.

Change-Id: Ib9f211dd57e3223b98f2ba6a076b05364b50ed48

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 8feb9e9..d2b9692 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -720,7 +720,7 @@
   Use legacy behaviour when selecting cells
   Use legacy behaviour when selecting cells
 
-true
+false
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-08-23 Thread Julien Nabet

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02f6c270e79879188b2be670c6db4feb56bb064e
Author: Julien Nabet 
Date:   Sat Aug 23 19:34:21 2014 +0200

Resolves fdo#82970: Insert footnote button has incorrect tooltip

Change-Id: I8b958a847495fe9949829453dcc259a9a6467b83

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index b5e25a8..59f52b2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -561,7 +561,7 @@
   
   
 
-  Insert Footnote/Endnote Directly
+  Insert Footnote Directly
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-08-26 Thread Markus Mohrhard

 officecfg/registry/data/org/openoffice/Office/Canvas.xcu |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 676efb67198d48be778035d07cacb71efef38dff
Author: Markus Mohrhard 
Date:   Mon Aug 18 15:27:44 2014 +0200

avoid picking the incomplete OGL canvas, fdo#83084

Change-Id: Ia7e47d599eddc5c3ae192a6bebc3c84cd059e81a

diff --git a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu 
b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
index 8851827..f1d965e 100644
--- a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
@@ -48,7 +48,6 @@
   
 com.sun.star.comp.rendering.SpriteCanvas.DX9,
  
com.sun.star.comp.rendering.SpriteCanvas.Cairo,
- com.sun.star.comp.rendering.SpriteCanvas.OGL,
  com.sun.star.comp.rendering.SpriteCanvas.VCL
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-03-24 Thread László Németh

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

New commits:
commit d87ee64034381f6a59cd250d3bd783957cb0ada1
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Mon Mar 24 13:50:43 2014 +0100

librelogo toolbar: fix tooltips

Change-Id: If6083ca832c0cc6c8f9783dfafb908bf6f653490

diff --git a/officecfg/registry/data/org/openoffice/Office/Addons.xcu 
b/officecfg/registry/data/org/openoffice/Office/Addons.xcu
index 04dfca2..3763c5e 100644
--- a/officecfg/registry/data/org/openoffice/Office/Addons.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Addons.xcu
@@ -75,7 +75,7 @@
 
vnd.sun.star.script:LibreLogo|LibreLogo.py$run?language=Python&location=share
   
   
-Start Logo program (text or selected text 
of the document)
+Start Logo program (text or selected text 
of the documents) or an example (in empty documents)
   
   
 _self
@@ -151,7 +151,7 @@
 
vnd.sun.star.script:LibreLogo|LibreLogo.py$__translate__?language=Python&location=share
   
   
-Uppercase commands, also translate them to 
the language of the document
+Set editing layout, format program or 
translate it into the language of the document
   
   
 _self
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-03-25 Thread Eike Rathke

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   28 +++
 1 file changed, 28 insertions(+)

New commits:
commit bc43fc2fb27eab02a949832626ce1a9dc380ee6b
Author: Eike Rathke 
Date:   Tue Mar 25 14:20:37 2014 +0100

added Formula/Syntax/StringConversion config item, fdo#37132 related

Change-Id: I349ee1a708acfcf087680b6b07b80fb2ce911c4d

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index a45aaa3..8feb9e9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1442,6 +1442,34 @@
   
   false
 
+
+  
+  
+How to treat text when encountered as operand in an 
arithmetic operation or as argument to a function that expects a number 
instead.
+  
+  
+
+  
+Generate #VALUE! error
+  
+
+
+  
+Treat as zero
+  
+
+
+  
+Convert only unambiguous
+  
+
+
+  
+Convert also locale dependent
+  
+
+  
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-02-05 Thread Rob Snelders

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |   23 ---
 1 file changed, 23 deletions(-)

New commits:
commit 7cd90162f1c4a1d763e40c8f9972fd59e219ccd1
Author: Rob Snelders 
Date:   Mon Feb 3 12:34:33 2014 +0100

fdo#73070 - UI: "Insert shapes" does not belong under "Properties"

Change-Id: I6fe9c21b13d154744721cec564d7a3f5974d12a4
Reviewed-on: https://gerrit.libreoffice.org/7804
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 0f5f2ea..a269c93 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -969,29 +969,6 @@
 
   
 
-  
-
-  Insert Shapes
-
-
-  InsertPropertyPanel
-
-
-  PropertyDeck
-
-
-  
-Draw, any, visible ;
-  
-
-
-  
private:resource/toolpanel/SvxPanelFactory/InsertPropertyPanel
-
-
-  50
-
-  
-
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-02-12 Thread Maxim Monastirsky

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   24 
++
 1 file changed, 24 insertions(+)

New commits:
commit 729b386ee0f33d8d5e4c96f5bd2894d51b1c7476
Author: Maxim Monastirsky 
Date:   Tue Feb 11 10:05:07 2014 +0200

Add some missing commands

This will load icons for the relevant sidebar buttons (in
paragraph panel, used with a drawing object).

Change-Id: I5426a873db3b8b9f5d7a17c99c35529aceaf381d
Reviewed-on: https://gerrit.libreoffice.org/7992
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 7d3525e..5c75e98 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1698,6 +1698,30 @@
   1
 
   
+  
+
+  Top
+
+
+  1
+
+  
+  
+
+  Center ( vertical )
+
+
+  1
+
+  
+  
+
+  Bottom
+
+
+  1
+
+  
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-02-13 Thread Stefan Knorr

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e076b5290e706b8a69abd397a9f255eba6a0cd1a
Author: Stefan Knorr 
Date:   Wed Jul 31 18:28:23 2013 +0200

Exit sounds terminal, so steal Firefox's Find bar tooltip text

Change-Id: I3e16f1ebafe5f497643abda3b1dbfdfeaebb60af
Reviewed-on: https://gerrit.libreoffice.org/8027
Reviewed-by: Samuel Mehrbrodt 
Reviewed-by: BjÃ¶rn Michaelsen 
Tested-by: BjÃ¶rn Michaelsen 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index e174849..43e4aa6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1490,7 +1490,7 @@
   
   
 
-  Exit Search
+  Close Find Bar
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-02-18 Thread Rodolfo Ribeiro Gomes

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   10 
--
 1 file changed, 10 deletions(-)

New commits:
commit 2c9c54285b952b59b5262500089c9c1a7902deb2
Author: Rodolfo Ribeiro Gomes 
Date:   Tue Feb 11 21:49:08 2014 -0200

Removes bogus UNO command AcceptChange and RejectChange

These are not real commands. The real ones are:
- AcceptTracedChange
- RejectTracedChange

Change-Id: I352cea4a5ffec73947932264783b61ae044f25cf
Signed-off-by: Rodolfo Ribeiro Gomes 
Reviewed-on: https://gerrit.libreoffice.org/8000
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 3cb9be4..0e871e4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -272,16 +272,6 @@
   Copy Hyperlink Location
 
   
-  
-
-  Accept Change
-
-  
-  
-
-  Reject Change
-
-  
   
 
   Bookmar~k...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-03-07 Thread Andras Timar

 officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 82ff9ec5935fd5647cb39ae5a85565f4260b0212
Author: Andras Timar 
Date:   Fri Mar 7 11:39:55 2014 +0100

fdo#60833 user's wordbook should be selected by default

Change-Id: Ic710f719df3ba71a8b71e6ef8afd54d60e73c5d9

diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index ace6f96..980bd70 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -217,6 +217,7 @@
   
   
 IgnoreAllList
+standard.dic
 en-US.dic
 en-GB.dic
 sl.dic
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-09-29 Thread Samuel Mehrbrodt

 officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d9632a6effabe8554c4e7e05ee24c16acd0f4f95
Author: Samuel Mehrbrodt 
Date:   Mon Sep 29 12:32:27 2014 +0200

fdo#70998 Fix capitalization

Change-Id: Ie0dc41bd091cedcc6bd8a20aff16a9d0e4b73689

diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs 
b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index f4b63a4..cd65511 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -36,7 +36,7 @@
   
   
   
-Specifies whether Images and Objects are displayed.
+Specifies whether images and objects are displayed.
 Images and Objects
   
   true
@@ -592,7 +592,7 @@
   
   
   
-Specifies whether Images are printed.
+Specifies whether images are printed.
 Images
   
   true
@@ -923,7 +923,7 @@
 
 
   
-Specifies whether the Image Object Bar or the Text Object 
Bar/Web is the visible toolbar when a Image is selected.
+Specifies whether the Image Object Bar or the Text Object 
Bar/Web is the visible toolbar when a image is selected.
   
   -1
 
@@ -975,7 +975,7 @@
 
 
 
-  Specifies whether an Image is embedded or added as link when 
it is inserted into the Gallery.
+  Specifies whether an image is embedded or added as link when 
it is inserted into the Gallery.
 
 true
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-03-17 Thread Stephan Bergmann

 officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs |  144 
++---
 officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs  |  149 
++
 2 files changed, 186 insertions(+), 107 deletions(-)

New commits:
commit 11e0e8351809befd186a8aaf91d7a583e22f2157
Author: Stephan Bergmann 
Date:   Sun Mar 17 21:00:36 2013 +0100

Clean up indentation

Change-Id: I8c4be3a69544ff579f054ec455512f2bddc11944

diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs 
b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
index b89cc9c..2cb2fab 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
@@ -17,57 +17,95 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
-AS
-Contains common filters for Office. See package TypeDetection 
and TypeDetection_Types for other parts of type/filter configuration too.
-
-
-   
-Lists filters that can import or export 
content.
-   
-An unique ID, which is used internal to differ 
between file formats of same type.
-   0
-   
-
-Supported content type of this filter. Must be an 
internal type name.
-   
-
-
-The uno service name of the supported office 
document type.
-   
-
-
-The uno implementation name a dialog, which is 
used to ask an user for special filter parameter (e.g. for csv).
-   
-
-
-Filter specific data.
-   
-
-
-The uno implementation name of the filter 
service.
-   
-
-
-Name of a corresponding template, which is merged 
together with the style seets of the loaded document.
-   
-
-
-Specify the filter in some further properties 
(e.g. import/export/..).
-   
-
-
-Localized name of the filter, whch can be shown at 
the UI.
-
-
-Extension to use when exporting content using this 
filter.  When this value is not given, it is inferred from the Type associated 
with this filter.
-
-   
-   
-   
-
-Lists the registered office filters.
-
-   
+http://openoffice.org/2001/registry";
+xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+  
+AS
+Contains common filters for Office. See package TypeDetection and
+TypeDetection_Types for other parts of type/filter configuration 
too.
+  
+  
+
+  
+Lists filters that can import or export content.
+  
+  
+
+  A unique ID, which is used internally to differentiate among
+  file formats of the same type.
+
+   0
+  
+  
+
+  Supported content type of this filter. Must be an internal type
+  name.
+
+   
+  
+  
+
+  The uno service name of the supported office document
+  type.
+
+   
+  
+  
+
+  The uno implementation name a dialog, which is used to ask a
+  user for special filter parameter (e.g., for csv).
+
+   
+  
+  
+
+  Filter specific data.
+
+   
+  
+  
+
+  The uno implementation name of the filter service.
+
+   
+  
+  
+
+  Name of a corresponding template, which is merged together with
+  the style seets of the loaded document.
+
+   
+  
+  
+
+  Specify the filter in some further properties
+  (import/export/...).
+
+   
+  
+  
+
+  Localized name of the filter, whch can be shown at the
+  UI.
+
+  
+  
+
+  Extension to use when exporting content using this filter. When
+  this value is not given, it is inferred from the Type associated with
+  this filter.
+
+  
+
+  
+  
+
+  
+Lists the registered office filters.
+  
+
+  
 
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs 
b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
index b30d31a..4b7c7c4 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs

[Libreoffice-commits] core.git: officecfg/registry

2013-03-21 Thread Thomas Arnhold

 officecfg/registry/data/org/openoffice/Office/UI.xcu | 
   1 
 officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu | 
   1 
 officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu | 
   1 
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 
  22 -
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 
  26 ---
 officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu   | 
  37 --
 officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu | 
  37 --
 officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu   | 
  37 --
 8 files changed, 162 deletions(-)

New commits:
commit 0e49bd05eef97ddd25a5657cdd5fb277a2a86014
Author: Thomas Arnhold 
Date:   Fri Mar 22 03:13:15 2013 +0100

officecfg: remove translated strings

Change-Id: Ie8d5e04556dc73213e972969d7dd7461799cd396
Reviewed-on: https://gerrit.libreoffice.org/2905
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index 6d924b8..44fd486 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -87,7 +87,6 @@
 
 
 
-Database Documents
 Database documents
 
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
index a69cc7d..35f95f0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
@@ -71,7 +71,6 @@
 
 
 Dialog
-Dialog
 
 
 true
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
index 4445a4c..9a5873f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
@@ -502,7 +502,6 @@
 
 
 
-Bericht...
 Report...
 
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index e1fe537..58013bd 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1859,7 +1859,6 @@
 
   
 
-  Zellen verbinden
   Merge Cells
 
 
@@ -1868,7 +1867,6 @@
   
   
 
-  Zelle teilen
   Split Cells
 
 
@@ -1877,7 +1875,6 @@
   
   
 
-  Optimieren
   Optimize
 
 
@@ -1902,7 +1899,6 @@
   
   
 
-  Unten
   Bottom
 
 
@@ -1911,7 +1907,6 @@
   
   
 
-  Mittig (vertikal)
   Center ( vertical )
 
 
@@ -1920,7 +1915,6 @@
   
   
 
-  Oben
   Top
 
 
@@ -1929,7 +1923,6 @@
   
   
 
-  Zeile einfÃ¼gen
   Insert Row
 
 
@@ -1943,7 +1936,6 @@
   
   
 
-  Spalte einfÃ¼gen
   Insert Column
 
 
@@ -1957,11 +1949,9 @@
   
   
 
-  Zeile lÃ¶schen
   Delete Row
 
 
-  Zeilen
   ~Rows
 
 
@@ -1970,11 +1960,9 @@
   
   
 
-  Spalte lÃ¶schen
   Delete Column
 
 
-  Spalten
   ~Columns
 
 
@@ -1983,11 +1971,9 @@
   
   
 
-  Tabelle selektieren
   Select Table
 
 
-  Tabelle
   ~Table
 
 
@@ -1996,11 +1982,9 @@
   
   
 
-  Spalte selektieren
   Select Column
 
 
-  Spalten
   ~Columns
 
 
@@ -2009,11 +1993,9 @@
   
   
 
-  Zeile selektieren
   Select Rows
 
 
-  Zeilen
   ~Rows
 
 
@@ -2022,7 +2004,6 @@
   
   
 
-  Tabelleneigenschaften...
   Ta~ble Properties...
 
 
@@ -2031,7 +2012,6 @@
   
   
 
-  Summe
   Sum
 
 
@@ -2040,7 +2020,6 @@

[Libreoffice-commits] core.git: officecfg/registry

2013-03-23 Thread Rob Snelders

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f53afc7016063b6d74ca5dbdafd04bfcf1eb0da
Author: Rob Snelders 
Date:   Sat Mar 23 20:28:42 2013 +0100

Change duplicate short-cut Alt-I-U

Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu

Change-Id: I0cabf39b3844a056a6c1d83a7941715435fb6307
Reviewed-on: https://gerrit.libreoffice.org/2943
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index ad4b97e..50afd03 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -384,7 +384,7 @@
   
   
 
-  D~uplicate Slide
+  Duplicate ~Slide
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-02-07 Thread Petr Mladek

 officecfg/registry/data/org/openoffice/Setup.xcu |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8db4f720f536ddf137c2d4d76045ab33b37c4437
Author: Petr Mladek 
Date:   Thu Feb 7 17:43:35 2013 +0100

migrate menu and toolbars customization (fdo#57061)

I hope that LO will handle potential incompatible menu or toolbar
entrie. But this problem happens also when updating between minor
versions.

Change-Id: I5be9b4e036464806d04eb6e0e9808b503f288498

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index c1fa23f..c5bc495 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -825,7 +825,9 @@
 .*/autotext/.*
 .*/autocorr/.*
 .*/config/.*\.so[bcdegh]
-.*/config/soffice.cfg/modules/.*/toolbar/custom.*\.xml
+.*/config/soffice.cfg/modules/.*/menubar/.*\.xml
+.*/config/soffice.cfg/modules/.*/statusbar/.*\.xml
+.*/config/soffice.cfg/modules/.*/toolbar/.*\.xml
 .*/config/soffice.cfg/modules/.*/images/.*
 .*/gallery/.*
 .*/template/.*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-02-11 Thread Petr Mladek

 officecfg/registry/data/org/openoffice/Setup.xcu |  100 +++
 1 file changed, 100 insertions(+)

New commits:
commit 941fdb183415bcb917dd87446cef22db3756cd82
Author: Petr Mladek 
Date:   Mon Feb 11 15:05:58 2013 +0100

migrate even more user setting (fdo#57061)

- paths setting
- recently opened files
- recovery setting (enable/disable; time)
- ODF import/export setting
- font anti aliasing setting
- windows and toolbars setting (visibility, position, docking)

Change-Id: I01ee912a782f14ba0751659ad87863b749950793

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index c5bc495..c5fec5a 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -840,6 +840,9 @@
 /org.openoffice.Office.Embedding
 /org.openoffice.Office.Events
 /org.openoffice.Office.ExtendedColorScheme
+/org.openoffice.Office.Histories
+/org.openoffice.Office.Paths
+/org.openoffice.Office.Recovery
 /org.openoffice.Office.Common/Accessibility
 
/org.openoffice.Office.Common/Accessibility/AutoDetectSystemHC
 /org.openoffice.Office.Common/AsianLayout
@@ -864,6 +867,7 @@
 /org.openoffice.Office.Common/Misc/SymbolStyle
 
/org.openoffice.Office.Common/Misc/FilePickerPlacesNames
 
/org.openoffice.Office.Common/Misc/FilePickerPlacesUrls
+/org.openoffice.Office.Common/ODF
 /org.openoffice.Office.Common/Passwords
 
/org.openoffice.Office.Common/Print/PrintingModifiesDocument
 /org.openoffice.Office.Common/Print/Warning
@@ -873,6 +877,7 @@
 /org.openoffice.Office.Common/Undo
 
/org.openoffice.Office.Common/View/Dialog/Dialog/MiddleMouseButton
 
/org.openoffice.Office.Common/View/Dialog/MousePositioning
+/org.openoffice.Office.Common/View/FontAntiAliasing
 /org.openoffice.Office.Common/View/Localization
 /org.openoffice.Office.Common/View/Menu
 /org.openoffice.Office.Common/_3D_Engine
@@ -947,6 +952,101 @@
   /org.openoffice.Office.Writer/Wizard
 
   
+  
+
+  
/org.openoffice.Office.UI.BaseWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.BasicIDEWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.CalcWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.ChartWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.DbBrowserWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.DbQueryWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.DbRelationWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.DbTableDataWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.DbTableWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.DrawWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.ImpressWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.MathWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.StartModuleWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.WriterFormWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.WriterGlobalWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.WriterReportWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.WriterWebWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.WriterWindowState/UIElements
+
+  
+  
+
+  
/org.openoffice.Office.UI.XFormsWindowState/UIElements
+
+  
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-comm

[Libreoffice-commits] core.git: officecfg/registry

2013-02-11 Thread Petr Mladek

 officecfg/registry/data/org/openoffice/Setup.xcu |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7e2cae964edab85e43d7ce0141d46d962d0ccd4c
Author: Petr Mladek 
Date:   Mon Feb 11 16:20:36 2013 +0100

migrate also custom accelerators setting (fdo#57061)

I was not sure how this can be triggered util the comment 46 in fdo#57061.
I was not brave enough to enable this without testing.

It seems to work, people complain about it, let's enable this migration
as well.

Change-Id: I79fa4b95828a55619ce098dc8fd357af317a1d47

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index c5fec5a..b4e5e7c 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -835,6 +835,7 @@
 
 
   
+/org.openoffice.Office.Accelerators
 /org.openoffice.Office.Compatibility
 /org.openoffice.Office.Custom
 /org.openoffice.Office.Embedding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-04-16 Thread Thomas Arnhold

 officecfg/registry/schema/org/openoffice/Office/Commands.xcs|   11 --
 officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs  |   12 --
 officecfg/registry/schema/org/openoffice/Office/Draw.xcs|   48 
-
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |1 
 officecfg/registry/schema/org/openoffice/Office/Labels.xcs  |8 -
 officecfg/registry/schema/org/openoffice/Office/Math.xcs|   14 --
 officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs |8 -
 officecfg/registry/schema/org/openoffice/Office/SFX.xcs |8 -
 officecfg/registry/schema/org/openoffice/Office/Security.xcs|8 -
 officecfg/registry/schema/org/openoffice/Office/Substitution.xcs|9 -
 officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs   |8 -
 officecfg/registry/schema/org/openoffice/Office/Views.xcs   |8 -
 officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs   |   15 --
 officecfg/registry/schema/org/openoffice/UserProfile.xcs|   53 
--
 officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs  |   12 --
 officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs  |   14 --
 officecfg/registry/schema/org/openoffice/ucb/Store.xcs  |   16 ---
 17 files changed, 253 deletions(-)

New commits:
commit 3ca9820f14cfc1b579fe8196c225b0f099312f6d
Author: Thomas Arnhold 
Date:   Wed Apr 17 02:44:27 2013 +0200

remove some newlines at eof

and one last  tag

Change-Id: I4fa21ba3cb4b76327ae476f2f7f75152db478f76

diff --git a/officecfg/registry/schema/org/openoffice/Office/Commands.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
index d5a9f2b..3d95490 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
@@ -45,14 +45,3 @@


 
-
-
-
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs 
b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index dbf4af0..f458163 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -1086,15 +1086,3 @@


 
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index 2ebb96c..501d67b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -982,51 +982,3 @@


 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index ec0c12b..c724ca7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -1602,7 +1602,6 @@
 
 
 
-GM
 
 Access path, where images were loaded last time.
 The default is work directory.
diff --git a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
index 0e23852..8be9e95 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
@@ -56,11 +56,3 @@


 
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index b494bd7..d379aa6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -1183,17 +1183,3 @@


 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git 
a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs 
b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
index e405e7f..6848a7f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
@@ -40,11 +40,3 @@


 
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs 
b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
index 78df4e7..34d8e1f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
@@ -35,11 +35,3 @@


 
-
-
-
-
-
-
-
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/Security.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Security.xcs
index a2b4954..75337d9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Security.xcs
++

[Libreoffice-commits] core.git: officecfg/registry

2013-04-16 Thread Thomas Arnhold

 officecfg/registry/schema/org/openoffice/LDAP.xcs |   96 ++
 1 file changed, 63 insertions(+), 33 deletions(-)

New commits:
commit fe4260c53e7df91a4d2dad06104d7979a212de29
Author: Thomas Arnhold 
Date:   Wed Apr 17 03:13:23 2013 +0200

reformat xml file with xmllint

maybe this should be done for all files in officecfg...

xmllint --format --recover foo.xml

Change-Id: I1fe97a84a706b7d51e21d268cbf7baf32eb0f8f0

diff --git a/officecfg/registry/schema/org/openoffice/LDAP.xcs 
b/officecfg/registry/schema/org/openoffice/LDAP.xcs
index ff99a65..18db511 100644
--- a/officecfg/registry/schema/org/openoffice/LDAP.xcs
+++ b/officecfg/registry/schema/org/openoffice/LDAP.xcs
@@ -18,37 +18,67 @@
  -->
 
 http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="LDAP" 
oor:package="org.openoffice" xml:lang="en-US">
-
-Specifies the LDAP related settings
-
-
-
-Specifies LDAP server settings
-Host name 
of LDAP Server
-
-Port number of the LDAP Server
-   389
-
-Root 
entry of the LDAP server
-
-   
-
-   
-   
-Specifies LDAP settings used for UserProfile 
settings
-DN of 
user with read-only access to LDAP repository. Only required if anonymous 
access is not supported.
-
-Password of Search User. Only required if 
anonymous access is not supported.
-
-Name of User entity object class in LDAP 
repository
-   
-   Name of User entity unique attribute in LDAP 
repository
-   
-   Obsolete and unused
-
-   
-   Specifies the LDAP related 
settings
-   
-   
-
+  
+Specifies the LDAP related settings
+  
+  
+
+  
+Specifies LDAP server settings
+  
+  
+
+  Host name of LDAP Server
+
+  
+  
+
+  Port number of the LDAP Server
+
+389
+  
+  
+
+  Root entry of the LDAP server
+
+  
+
+  
+  
+
+  
+Specifies LDAP settings used for UserProfile settings
+  
+  
+
+  DN of user with read-only access to LDAP repository. Only 
required if anonymous access is not supported.
+
+  
+  
+
+  Password of Search User. Only required if anonymous access is 
not supported.
+
+  
+  
+
+  Name of User entity object class in LDAP repository
+
+  
+  
+
+  Name of User entity unique attribute in LDAP repository
+
+  
+  
+
+  Obsolete and unused
+
+  
+  
+
+  Specifies the LDAP related settings
+
+  
+
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-05-14 Thread Joren De Cuyper

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |  122 
+-
 1 file changed, 64 insertions(+), 58 deletions(-)

New commits:
commit 833cafe4eb9e0bd6b599e8bcbb6d77f4f2243034
Author: Joren De Cuyper 
Date:   Sat May 11 12:16:00 2013 +0200

fdo#32368 - Link both Ctrl+Y as Ctrl+Shift+Z as shortcut keys for Redo

As discussed on the UX-advice and bug report itself,
we agreed to link both shortcut keys to the redo command.

Due 
http://opengrok.libreoffice.org/xref/core/framework/source/inc/accelerators/acceleratorcache.hxx#75
 :
/*map commands to keys in relation 1:n. First key is interpreted as 
preferred one!*/ the shortcut key
that is mentioned in the menu entry is ctrl+y (or cmd+y for Mac users).

UX-advice thread: 
http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-May/002033.html

Change-Id: I8d766b300d79e9ebd85dc5ae7bb327cf9c1a7c41
Reviewed-on: https://gerrit.libreoffice.org/3853
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index d2d7069..2ef7c67 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -190,22 +190,22 @@
   .uno:Repeat
 
   
-  
+  
 
   I10N SHORTCUTS - NO 
TRANSLATE
   .uno:Redo
 
   
-  
+  
 
   I10N SHORTCUTS - NO 
TRANSLATE
-  .uno:Undo
+  .uno:Redo
 
   
-  
+  
 
   I10N SHORTCUTS - NO 
TRANSLATE
-  .uno:Redo
+  .uno:Undo
 
   
 
@@ -1132,22 +1132,22 @@
 .uno:PasteSpecial
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
 
@@ -1248,22 +1248,22 @@
 .uno:Cut
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
   
@@ -1668,22 +1668,22 @@
 .uno:Cut
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
 
@@ -2447,22 +2447,22 @@
 .uno:RemoveDirectCharFormats
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
   
@@ -2927,22 +2927,22 @@
 .uno:Cut
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
 
@@ -3001,22 +3001,22 @@
 .uno:FullScreen
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
   
@@ -3774,22 +3774,22 @@
 .uno:RemoveDirectCharFormats
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+

[Libreoffice-commits] core.git: officecfg/registry

2013-05-17 Thread Fridrich Štrba

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 67ba9fdb2c298cbc62e64b9768355a8bf8c5b098
Author: Fridrich Å trba 
Date:   Fri May 17 18:38:16 2013 +0200

Fix build

Change-Id: I39f8160311ab24f8bdd680b87a407ba69a4e51e3

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index fea2329..fbff56b8 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5021,6 +5021,12 @@
 
 false
   
+  
+
+  Specifies if PDF automatically opens after export.
+
+false
+  
   
 
   Specifies if bookmarks are exported to PDF.
@@ -5278,12 +5284,6 @@
   screen.
 
 false
-  
-
-  Specifies if PDF automatically opens after export.
-
-false
-  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-05-20 Thread Joren De Cuyper

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   20 
+-
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 43aee4c0a0ba9bb4d1722208e18991eb2408eed8
Author: Joren De Cuyper 
Date:   Sat May 11 00:15:30 2013 +0200

resolve fdo#64446 Repeat shortcut isn't showed correctly in menu entry

Change-Id: I991185f6b4efd305dc55c9ad85f9f706f8a0
Reviewed-on: https://gerrit.libreoffice.org/3850
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 2ef7c67..1dab5f7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -961,7 +961,7 @@
 .uno:ToggleFormula
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Repeat
@@ -1218,7 +1218,7 @@
 .uno:Quit
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Repeat
@@ -1592,7 +1592,7 @@
 .uno:Quit
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Repeat
@@ -2288,7 +2288,7 @@
 .uno:SuperScript
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Repeat
@@ -2839,7 +2839,7 @@
 .uno:Quit
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Repeat
@@ -3609,7 +3609,7 @@
 .uno:SuperScript
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Repeat
@@ -4388,7 +4388,7 @@
 .uno:SuperScript
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Repeat
@@ -5131,7 +5131,7 @@
 .uno:SuperScript
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Repeat
@@ -5904,7 +5904,7 @@
 .uno:SuperScript
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Repeat
@@ -6677,7 +6677,7 @@
 .uno:SuperScript
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Repeat
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-05-22 Thread Ariel Constenla-Haile

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 1d296f2b48827df13172e3b8c3fdf708807392e8
Author: Ariel Constenla-Haile 
Date:   Sun Jan 13 16:25:29 2013 +

Document missing enumeration value

Add missing Key Tab in
/org.openoffice.Office.Writer/AutoFunction/Completion/AcceptKey

(cherry picked from commit 4ff43c2b8dbf361093ff2ffa683e117526771332)

Conflicts:
officecfg/registry/schema/org/openoffice/Office/Writer.xcs

Change-Id: I3441a9b97f3e74c115bde84da9a1c85f9c901185

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 5a1d564..78524c4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -4647,6 +4647,11 @@
 KeyRight
   
 
+ 
+  
+KeyTab
+  
+
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2013-05-23 Thread Jürgen Schmidt

 officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu |   20 
--
 1 file changed, 20 deletions(-)

New commits:
commit f2321c529adf6d4a455742c30fb75fbe3f7efe02
Author: JÃ¼rgen Schmidt 
Date:   Thu Dec 20 14:35:07 2012 +

Resolves: #i121522# remove nonexistent, never published extensions...

from ExtensionDependencies

(cherry picked from commit 3484496e57ab59b4f613d7c9f727b5945e17e5b4)

Conflicts:
officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu

Change-Id: I1b2e7382837a4cfad667187a7f930ca54385c31e

diff --git 
a/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu 
b/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu
index 9de81b1..aab16d5 100644
--- a/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu
@@ -18,26 +18,6 @@
 -->
 http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="ExtensionDependencies" 
oor:package="org.openoffice.Office">
   
-
-  
-
-  1.0.0
-
-  
-  
-
-  
-
-
-  
-
-  1.0
-
-  
-  
-
-  
-
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-18 Thread Matúš Kukan

 officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu |4 -
 sc/source/ui/miscdlgs/datastreams.cxx|   27 
+-
 2 files changed, 28 insertions(+), 3 deletions(-)

New commits:
commit 9c45345a680f7444df251f9403c7d56572380f21
Author: MatÃºÅ¡ Kukan 
Date:   Mon Nov 18 13:31:39 2013 +0100

datastreams: make toolbar docked, hidden and show it when starting streaming

Change-Id: Icbf1abffc5424e213550c7cf27cdaa59126fa54d

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 8ef44d3..f5e294b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -56,13 +56,13 @@
   
   
 
-  false
+  true
 
 
   Data Streams
 
 
-  true
+  false
 
   
   
diff --git a/sc/source/ui/miscdlgs/datastreams.cxx 
b/sc/source/ui/miscdlgs/datastreams.cxx
index 1639dbc..dd5a821 100644
--- a/sc/source/ui/miscdlgs/datastreams.cxx
+++ b/sc/source/ui/miscdlgs/datastreams.cxx
@@ -9,14 +9,18 @@
 
 #include 
 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
-#include 
 
 namespace datastreams {
 
@@ -80,6 +84,27 @@ void DataStreams::Start()
 mpScDocument->EnableUndo(false);
 mbRunning = true;
 mxThread->maStart.set();
+css::uno::Reference< css::frame::XFrame > xFrame =
+
mpScDocShell->GetViewData()->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface();
+if (!xFrame.is())
+return;
+
+css::uno::Reference< css::beans::XPropertySet > xPropSet(xFrame, 
css::uno::UNO_QUERY);
+if (!xPropSet.is())
+return;
+
+css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
+xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager;
+if (!xLayoutManager.is())
+return;
+
+const OUString sResourceURL( "private:resource/toolbar/datastreams" );
+css::uno::Reference< css::ui::XUIElement > xUIElement = 
xLayoutManager->getElement(sResourceURL);
+if (!xUIElement.is())
+{
+xLayoutManager->createElement( sResourceURL );
+xLayoutManager->showElement( sResourceURL );
+}
 }
 
 void DataStreams::Stop()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry scripting/workben

2014-06-25 Thread Joren De Cuyper

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 -
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs  |   18 
+-
 officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs   |   12 
+++---
 scripting/workben/bindings/writermenubar.xml|2 -
 4 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 140e53564100ed7c7bff881d5b8c10e5fda01dd2
Author: Joren De Cuyper 
Date:   Tue Jun 24 21:45:09 2014 +0200

partially fix fdo#80490 - string 'Non-printing Characters'

Change 'Nonprinting Characters' to 'Non-printing Characters'

Change-Id: I599b2bc3fe80805b87cbb83c1dc74eba85799105
Reviewed-on: https://gerrit.libreoffice.org/9884
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 2417301..877f30d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2122,7 +2122,7 @@
   
   
 
-  ~Nonprinting Characters
+  ~Non-printing Characters
 
 
   9
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 409e7d1..3c4d340 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1061,7 +1061,7 @@
   Contains settings for the visibility of various non-printing 
characters.
 
 
-  
+  
   
 Determines whether certain settings are applied (display of 
tab stops, spaces, breaks)
 Meta characters
@@ -1071,7 +1071,7 @@
 
   
   
-  
+  
   
 Specifies whether paragraph ends are shown on the 
screen.
 Paragraph end
@@ -1081,7 +1081,7 @@
 
   
   
-  
+  
   
 Specifies whether optional hyphens are shown on the 
screen.
 Optional hyphens
@@ -1091,7 +1091,7 @@
 
   
   
-  
+  
   
 Specifies whether spaces are shown on the screen.
 Spaces
@@ -1101,7 +1101,7 @@
 
   
   
-  
+  
   
 Specifies whether protected spaces are shown on the 
screen.
 Protected Spaces
@@ -,7 +,7 @@
 
   
   
-  
+  
   
 Specifies whether breaks are shown on the screen.
 Tabs
@@ -1121,7 +1121,7 @@
 
   
   
-  
+  
   
 Specifies whether paragraph ends are shown on the 
screen.
 Breaks
@@ -1131,7 +1131,7 @@
 
   
   
-  
+  
   
 Specifies whether hidden text fields are displayed on the 
screen.
 Fields: Hidden text
@@ -1141,7 +1141,7 @@
 
   
   
-  
+  
   
 Specifies whether hidden paragraphs are displayed on the 
screen.
 Hidden paragraphs
diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs 
b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index 43bac02..f4b63a4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -95,7 +95,7 @@
   Contains settings for the visibility of various non-printing 
characters.
 
 
-  
+  
   
 Determines whether certain settings are applied or not 
(display of tab stops, spaces, breaks).
 Meta characters
@@ -105,7 +105,7 @@
 
   
   
-  
+  
   
 Specifies whether paragraph ends are shown on the 
screen.
 Paragraph end
@@ -115,7 +115,7 @@
 
   
   
-  
+  
   
 Specifies whether optional hyphens are shown on the 
screen.
 Optional hyphens
@@ -125,7 +125,7 @@
 
   
   
-  
+  
   
 Specifies whether spaces are shown on the screen.
 Spaces
@@ -135,7 +135,7 @@
 
   
   
-  
+  
   
 Specifies whether protected spaces are shown on the 
screen.
 Protected Spaces
@@ -145,7 +145,7 @@
 
   
   
-  
+  
   
 Specifies whether breaks are shown on the screen.
 Breaks
diff --git a/scripting/workben/bindings/writermenubar.xml

[Libreoffice-commits] core.git: officecfg/registry sw/uiconfig

2014-08-16 Thread Julien Nabet

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 sw/uiconfig/swriter/ui/optformataidspage.ui  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 46b7a08767e17ff1ef086393c4e111a8ffa19d55
Author: Julien Nabet 
Date:   Sat Aug 16 22:06:46 2014 +0200

Related: fdo#45588 Use of different items for Formatting Marks

There's still help part to change
See https://bugs.freedesktop.org/show_bug.cgi?id=45588#c9

Change-Id: Ieb69ebffc680b0352ed481524a95a78bca50ac83

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 74597a3..f9e33bf 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5547,7 +5547,7 @@
   
   
 
-  ~Optional hyphen
+  S~oft hyphen
 
   
   
diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui 
b/sw/uiconfig/swriter/ui/optformataidspage.ui
index c128453..85dd592 100644
--- a/sw/uiconfig/swriter/ui/optformataidspage.ui
+++ b/sw/uiconfig/swriter/ui/optformataidspage.ui
@@ -57,7 +57,7 @@
 
 
   
-Custom 
h_yphens
+Soft 
h_yphens
 True
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-24 Thread Aurimas Fišeras

 officecfg/registry/data/org/openoffice/Office/Calc.xcu |   11 +++
 sc/source/core/tool/interpr2.cxx   |3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 21c8b5815a21b6586fe13b12d00a9fb432c2aef4
Author: Aurimas FiÅ¡eras 
Date:   Sat Aug 23 11:50:56 2014 +0300

added Lithuanian "LTL" to EUROCONVERT(), CONVERT()

Change-Id: Iefde129177df827c4b6508ff190f20e1e1973221
Reviewed-on: https://gerrit.libreoffice.org/11088
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu 
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 190766e..a62d065 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -217,6 +217,17 @@
 0.702804
   
 
+
+  
+EUR
+  
+  
+LTL
+  
+  
+3.45280
+  
+
   
   
 
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index e695d57..ac6d71e 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2795,7 +2795,8 @@ static bool lclConvertMoney( const OUString& aSearchUnit, 
double& rfRate, int& r
 { "CYP", 0.585274, 2 },
 { "SKK", 30.1260,  2 },
 { "EEK", 15.6466,  2 },
-{ "LVL", 0.702804, 2 }
+{ "LVL", 0.702804, 2 },
+{ "LTL", 3.45280,  2 }
 };
 
 static const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( 
aConvertTable[0] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sfx2/source

2014-08-25 Thread Andras Timar

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 -
 sfx2/source/dialog/backingwindow.cxx   |5 -
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 895efd4f399fd717343bbc1ba3538fa01cf0a40a
Author: Andras Timar 
Date:   Mon Aug 25 20:50:27 2014 +0200

make background color of startcenter configurable

Change-Id: Ice6a92186d641e9446b9d328518e4000c840a142

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 408874f..8ac7f69 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2196,7 +2196,7 @@
 
   
   
-Specifies whether to generate a thumbnail image and place it 
inside the 
+Specifies whether to generate a thumbnail image and place it 
inside the
  the odf archive file, which makes it possible to see a preview of 
the document.
 Store a preview of this document
   
@@ -3599,6 +3599,13 @@
   
   0
 
+
+  
+  
+Specifies the background color of the start center.
+  
+  7514196
+
   
 
 
diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 1e6c4c8..e258b30 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -53,6 +53,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
@@ -70,7 +72,6 @@ const char OPEN_URL[] =   ".uno:Open";
 const char SERVICENAME_CFGREADACCESS[] = 
"com.sun.star.configuration.ConfigurationAccess";
 
 float fMultiplier = 1.4f;
-const Color aButtonsBackground(114, 168, 84); // TDF green
 const Color aButtonsText(COL_WHITE);
 
 /***
@@ -292,6 +293,8 @@ void BackingWindow::initControls()
 mpHelpButton->SetControlForeground(aButtonsText);
 mpExtensionsButton->SetControlForeground(aButtonsText);
 
+const Color 
aButtonsBackground(officecfg::Office::Common::Help::StartCenter::StartCenterBackgroundColor::get());
+
 mpAllButtonsBox->SetBackground(aButtonsBackground);
 mpSmallButtonsBox->SetBackground(aButtonsBackground);
 mpHelpBox->SetBackground(aButtonsBackground);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-03-21 Thread Kohei Yoshida

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |4 +--
 sc/source/ui/view/tabvwsh3.cxx|4 ++-
 sc/source/ui/view/tabvwsha.cxx|   13 
+-
 3 files changed, 7 insertions(+), 14 deletions(-)

New commits:
commit f2d009a675755136e2e06b2866bc055b06cea6c8
Author: Kohei Yoshida 
Date:   Fri Mar 21 11:28:59 2014 -0400

Make it harder to accidentally set print range to '- none -'.

And make the current print range behavior a bit more intuitive.  People
often "remove" ranges to quickly clear any custom ranges if set.  They
wouldn't expect this to actually set the print range to "none".

Also, change the wording of the menu item from "Remove" to "Clear", to
refect this behavior change.

Change-Id: I0369020fedf1c7463d718809875022adef697bf4

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index cdfd826..249b0ba 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -550,10 +550,10 @@
   
   
 
-  ~Remove Print Area
+  ~Clear Print Area
 
 
-  ~Remove
+  ~Clear
 
 
   1
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index c74de5a..d8d4827 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -190,8 +190,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 
 case SID_DELETE_PRINTAREA:
 {
+// Clear currently defined print range if any, and reset it to
+// print entire sheet which is the default.
 OUString aEmpty;
-SetPrintRanges( false, &aEmpty, NULL, NULL, false );// 
Druckbereich loeschen
+SetPrintRanges(true, &aEmpty, NULL, NULL, false);
 rReq.Done();
 }
 break;
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index af5cd66..5e8ae2a 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -191,21 +191,12 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
 break;
 
 case SID_DELETE_PRINTAREA:
-if ( nTabSelCount > 1 )
-{
-// #i22589# also take "Print Entire Sheet" into account 
here
-bool bHas = false;
-for (SCTAB i=0; !bHas && iGetPrintRangeCount(i) || pDoc->IsPrintEntireSheet(i));
-if (!bHas)
-rSet.DisableItem( nWhich );
-}
-else if ( !pDoc->GetPrintRangeCount( nTab ) && 
!pDoc->IsPrintEntireSheet( nTab ) )
-rSet.DisableItem( nWhich );
 if ( pDocShell && pDocShell->IsDocShared() )
 {
 rSet.DisableItem( nWhich );
 }
+else if (pDoc->IsPrintEntireSheet(nTab))
+rSet.DisableItem(nWhich);
 break;
 
 case SID_STATUS_PAGESTYLE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sfx2/source

2014-03-03 Thread christianju

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 +
 sfx2/source/doc/objstor.cxx|6 --
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 0035b3218d8652652e62afe89eddfd28a9021b75
Author: christianju 
Date:   Mon Feb 10 02:30:48 2014 +0100

fdo#61320: Allow user to choose whether to create thumbnails inside odf.

Change-Id: I8c8129534ebcca32941ad76b201bb9a0243d8c3e

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 5349984..1e681e9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2154,6 +2154,15 @@
   
   false
 
+
+  
+  
+Specifies whether to generate a thumbnail image and place it 
inside the 
+ the odf archive file, which makes it possible to see a preview of 
the document.
+Store a preview of this document
+  
+  true
+
 
   
   
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 965297c..883b75d 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -99,6 +99,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -1450,8 +1451,9 @@ sal_Bool SfxObjectShell::SaveTo_Impl
 }
 }
 
-
-if ( bOk && GetCreateMode() != SFX_CREATE_MODE_EMBEDDED && 
!bPasswdProvided )
+//fdo#61320: only store thumbnail image if the corresponding option is 
not disabled in the configuration
+if ( bOk && 
officecfg::Office::Common::Save::Document::GenerateThumbnail::get()
+&& GetCreateMode() != SFX_CREATE_MODE_EMBEDDED && 
!bPasswdProvided )
 {
 // store the thumbnail representation image
 // the thumbnail is not stored in case of encrypted document
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-09-29 Thread Samuel Mehrbrodt

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs   |   
40 +-
 officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs |
4 -
 sw/source/ui/app/app.src |
2 
 sw/source/ui/app/error.src   |
4 -
 sw/source/ui/shells/shells.src   |
6 -
 sw/source/ui/utlui/utlui.src |
4 -
 6 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 145eda05e5a35f17118726e74b511cdd1f36a53a
Author: Samuel Mehrbrodt 
Date:   Mon Sep 29 12:20:40 2014 +0200

fdo#70998 Fix capitalization

Change-Id: I17d3f512309ab0cd5d717b2e7ca3e8d51165c8a4

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 3c4d340..74cfbd6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -205,7 +205,7 @@
 
 
   
-Contains information about a linked file, i.e. an Image 
file.
+Contains information about a linked file, i.e. an image 
file.
   
   
 
@@ -1001,7 +1001,7 @@
   
   
   
-Specifies whether Images and Objects are displayed.
+Specifies whether images and objects are displayed.
 Images and Objects
   
   true
@@ -1961,7 +1961,7 @@
   
   
   
-Specifies whether Images are printed.
+Specifies whether images are printed.
 Images
   
   true
@@ -1971,7 +1971,7 @@
   
   
   
-Specifies whether Tables are printed.
+Specifies whether tables are printed.
 Tables
   
   true
@@ -1981,7 +1981,7 @@
   
   
   
-Specifies whether Drawings are printed.
+Specifies whether drawings are printed.
 Drawings
   
   true
@@ -2689,7 +2689,7 @@
 
 
   
-Specifies how Tables, Images, Frames and Office documents, 
which have been inserted as OLE objects, are labeled
+Specifies how tables, images, frames and office documents, 
which have been inserted as OLE objects, are labeled
 Automatic
   
   false
@@ -2966,11 +2966,11 @@
   
 
 
-  Settings for insertion of captions for Images.
+  Settings for insertion of captions for images.
 
 
   
-Determines if the caption settings are valid for an 
Image in a text document.
+Determines if the caption settings are valid for an 
image in a text document.
 Writer Image
   
   false
@@ -3095,7 +3095,7 @@
   
   
 
-  Determines whether the border and shadow attributes of 
the Image frame should be applied to the newly inserted caption frame 
surrounding the Image.
+  Determines whether the border and shadow attributes of 
the image frame should be applied to the newly inserted caption frame 
surrounding the image.
   Apply attributes
 
   
@@ -3238,7 +3238,7 @@
   
   
 
-  Determines whether the border and shadow attributes of 
the Image frame should be applied to the newly inserted caption frame 
surrounding the Image.
+  Determines whether the border and shadow attributes of 
the image frame should be applied to the newly inserted caption frame 
surrounding the image.
   Apply attributes
 
   
@@ -3376,7 +3376,7 @@
   
   
 
-  Determines whether the border and shadow attributes of 
the Image frame should be applied to the newly inserted caption frame 
surrounding the Image.
+  Determines whether the border and shadow attributes of 
the image frame should be applied to the newly inserted caption frame 
surrounding the image.
   Apply attributes
 
   
@@ -3514,7 +3514,7 @@
   
   
 
-  Determines whether the border and shadow attributes of 
the Image frame should be applied to the newly inserted caption frame 
surrounding the Image.
+  Determines whether the border and shadow attributes of 
the image frame should be applied to the newly inserted caption frame 
surrounding the image.
   Apply attributes
 
   
@@ -3523,11 +3523,11 @@

[Libreoffice-commits] core.git: officecfg/registry sfx2/source

2013-05-21 Thread Andre Fischer

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +
 sfx2/source/sidebar/Deck.cxx |4 ---
 sfx2/source/sidebar/SidebarController.cxx|   14 ---
 3 files changed, 2 insertions(+), 18 deletions(-)

New commits:
commit 9a32ed36709cb03a8b5d3bcff0276bc31c934848
Author: Andre Fischer 
Date:   Fri May 17 12:23:50 2013 +

Resolves; #i122219# Show 'Cell Appearance' and 'Number Format' panels...

when editing cells.(cherry picked from commit 
09d043596e8283dd6ced26d1e4ff0da530252df0)

Change-Id: I2fe0f9655efa24fb99b566f5c515b0fd1f651f6b

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index a92643a..cd69c01 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -724,6 +724,7 @@
   
 Calc,  Auditing, visible ;
 Calc,  Cell, visible ;
+Calc,  EditCell, visible ;
 Calc,  default,  visible ;
 Calc,  Pivot,visible ;
   
@@ -753,6 +754,7 @@
   
 Calc,  Auditing, hidden ;
 Calc,  Cell, hidden ;
+Calc,  EditCell, hidden ;
 Calc,  default,  hidden ;
 Calc,  Pivot,hidden ;
   
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0fed648..9a16ad5 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -294,8 +294,6 @@ const SharedPanelContainer& Deck::GetPanels (void) const
 
 void Deck::RequestLayout (void)
 {
-//PrintWindowTree();
-
 DeckLayouter::LayoutDeck(
 GetContentArea(),
 maPanels,
@@ -304,8 +302,6 @@ void Deck::RequestLayout (void)
 *mpScrollContainer,
 *mpFiller,
 *mpVerticalScrollBar);
-
-Invalidate();
 }
 
 
diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index af0a547..7cc315e 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -518,20 +518,6 @@ void SidebarController::SwitchToDeck (
 }
 }
 
-if (mpCurrentDeck
-&& ArePanelSetsEqual(mpCurrentDeck->GetPanels(), 
aPanelContextDescriptors))
-{
-// Requested set of panels is identical to the current set of
-// panels => Nothing to do.
-return;
-}
-
-// When the document is read-only, check if there are any panels that 
can still be displayed.
-if (mbIsDocumentReadOnly)
-{
-}
-
-
 // Provide a configuration and Deck object.
 if ( ! mpCurrentDeck)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-25 Thread Michael Meeks

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   12 +
 sc/inc/calcconfig.hxx|1 
 sc/source/core/data/documen9.cxx |7 
 sc/source/core/tool/calcconfig.cxx   |8 
 sc/source/core/tool/formulaopt.cxx   |   16 +
 sc/source/ui/optdlg/calcoptionsdlg.cxx   |  123 ---
 sc/source/ui/optdlg/calcoptionsdlg.hrc   |3 
 sc/source/ui/optdlg/calcoptionsdlg.hxx   |5 
 sc/source/ui/optdlg/calcoptionsdlg.src   |   12 +
 9 files changed, 131 insertions(+), 56 deletions(-)

New commits:
commit 26a45c1886d9167d8f9ae9aad6234a3702768d8a
Author: Michael Meeks 
Date:   Tue Jun 25 13:38:22 2013 +0100

cleanup options dialog, and add an option for formula grouping.

Change-Id: I3cb19fb24028bc07d24b56786b6573dc79911bda

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 8ee1809..b396438 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1318,6 +1318,18 @@
   
 Contains settings that affect formula handling.
   
+  
+
+  Contains settings for how to calculate formulae.
+
+
+  
+  
+Whether to use OpenCL for formula computation, if 
available.
+  
+  false
+
+  
   
 
   Contains settings for formula syntax.
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 96eabcc..aace08d 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -28,6 +28,7 @@ struct SC_DLLPUBLIC ScCalcConfig
 {
 formula::FormulaGrammar::AddressConvention meStringRefAddressSyntax;
 bool mbEmptyStringAsZero:1;
+bool mbOpenCLEnabled:1;
 
 ScCalcConfig();
 
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index d081379..525f12d 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -52,6 +52,7 @@
 #include "editutil.hxx"
 #include "postit.hxx"
 #include "charthelper.hxx"
+#include "interpre.hxx"
 
 using namespace ::com::sun::star;
 #include 
@@ -689,9 +690,11 @@ void ScDocument::ApplyAsianEditSettings( 
ScEditEngineDefaulter& rEngine )
 
 void ScDocument::RebuildFormulaGroups()
 {
-static const char *pEnableFormulaGroups = getenv("SC_FORMULAGROUP");
+bool bEnableFormulaGroups;
 
-if ( !pEnableFormulaGroups )
+bEnableFormulaGroups = ScInterpreter::GetGlobalConfig().mbOpenCLEnabled;
+
+if ( !bEnableFormulaGroups )
 return;
 
 SCTAB nTab;
diff --git a/sc/source/core/tool/calcconfig.cxx 
b/sc/source/core/tool/calcconfig.cxx
index c85ddf2..ed93f64 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -14,7 +14,10 @@
 
 ScCalcConfig::ScCalcConfig() :
 meStringRefAddressSyntax(formula::FormulaGrammar::CONV_UNSPECIFIED),
-mbEmptyStringAsZero(false) {}
+mbEmptyStringAsZero(false),
+mbOpenCLEnabled(false)
+{
+}
 
 void ScCalcConfig::reset()
 {
@@ -24,7 +27,8 @@ void ScCalcConfig::reset()
 bool ScCalcConfig::operator== (const ScCalcConfig& r) const
 {
 return meStringRefAddressSyntax == r.meStringRefAddressSyntax &&
-mbEmptyStringAsZero == r.mbEmptyStringAsZero;
+   mbEmptyStringAsZero == r.mbEmptyStringAsZero &&
+   mbOpenCLEnabled == r.mbOpenCLEnabled;
 }
 
 bool ScCalcConfig::operator!= (const ScCalcConfig& r) const
diff --git a/sc/source/core/tool/formulaopt.cxx 
b/sc/source/core/tool/formulaopt.cxx
index df9e69a..db35f93 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -204,7 +204,8 @@ SfxPoolItem* ScTpFormulaItem::Clone( SfxItemPool * ) const
 #define SCFORMULAOPT_EMPTY_STRING_AS_ZERO 6
 #define SCFORMULAOPT_OOXML_RECALC 7
 #define SCFORMULAOPT_ODF_RECALC   8
-#define SCFORMULAOPT_COUNT9
+#define SCFORMULAOPT_OPENCL_ENABLED   9
+#define SCFORMULAOPT_COUNT   10
 
 Sequence ScFormulaCfg::GetPropertyNames()
 {
@@ -219,6 +220,7 @@ Sequence ScFormulaCfg::GetPropertyNames()
 "Syntax/EmptyStringAsZero",  // SCFORMULAOPT_EMPTY_STRING_AS_ZERO
 "Load/OOXMLRecalcMode",  // SCFORMULAOPT_OOXML_RECALC
 "Load/ODFRecalcMode",// SCFORMULAOPT_ODF_RECALC
+"Calculation/OpenCL" // SCFORMULAOPT_OPENCL_ENABLED
 };
 Sequence aNames(SCFORMULAOPT_COUNT);
 OUString* pNames = aNames.getArray();
@@ -390,6 +392,12 @@ ScFormulaCfg::ScFormulaCfg() :
 SetODFRecalcOptions(eOpt);
 }
 break;
+case SCFORMULAOPT_OPENCL_ENABLED:
+{
+sal_Bool bVal = GetCalcConfig().mbOpenCLEnabled;
+pValues[nProp] >>=

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

2014-05-20 Thread Michal Siedlaczek

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |   26 
 sw/source/core/uibase/inc/optload.hxx  |   37 
 sw/source/core/uibase/inc/wordcountdialog.hxx  |4 
 sw/source/ui/config/optload.cxx|   40 
 sw/source/ui/dialog/wordcountdialog.cxx|   27 
 sw/uiconfig/swriter/ui/optgeneralpage.ui   |  600 +++--
 sw/uiconfig/swriter/ui/wordcount.ui|   52 +
 7 files changed, 500 insertions(+), 286 deletions(-)

New commits:
commit 43cd2f79da7a639d09fe43e6194f7568cbc78970
Author: Michal Siedlaczek 
Date:   Sat Jan 25 11:19:16 2014 +0100

Displaying the number of standardized pages in the Word count window

The number of standardized pages (unit defined in the options)
for the entire document and the selected area is displayed
(if enabled in options) in the Word count window.
The number of pages of size P for an area containing N characters equals 
P/N.
This value is a float with one decimal place precision.
The default size of the standardized page is 1800 characters
(including whitespace characters).

The configuration can be altered in Options->Writer->General.

Conflicts:
sw/source/ui/config/optload.cxx

Change-Id: If13e87c73cb7706ff6618fa0352ba29c7c670aec
Reviewed-on: https://gerrit.libreoffice.org/7642
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index b59764c..409e7d1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5463,6 +5463,32 @@
 
 ââ
   
+  
+
+  configures if standardized page count should be displayed on 
the Word Count window
+  Show Standardized Page Count
+
+false
+  
+  
+
+  configures how many characters is considered one standardized 
page
+  Characters Per Standardized Page
+
+
+  
+
+  Specifies the minimum value allowed.
+
+  
+  
+
+  Specifies the maximum value allowed.
+
+  
+
+1800
+  
 
 
   
diff --git a/sw/source/core/uibase/inc/optload.hxx 
b/sw/source/core/uibase/inc/optload.hxx
index 015..2c1f739 100644
--- a/sw/source/core/uibase/inc/optload.hxx
+++ b/sw/source/core/uibase/inc/optload.hxx
@@ -39,25 +39,28 @@ class SwWrtShell;
 class SwLoadOptPage : public SfxTabPage
 {
 private:
-RadioButton* m_pAlwaysRB;
-RadioButton* m_pRequestRB;
-RadioButton* m_pNeverRB;
-
-CheckBox*m_pAutoUpdateFields;
-CheckBox*m_pAutoUpdateCharts;
-
-ListBox* m_pMetricLB;
-FixedText*   m_pTabFT;
-MetricField* m_pTabMF;
-CheckBox*m_pUseSquaredPageMode;
-CheckBox*m_pUseCharUnit;
-Edit*m_pWordCountED;
-
-SwWrtShell*  m_pWrtShell;
-sal_uInt16   m_nLastTab;
-sal_Int32m_nOldLinkMode;
+RadioButton* m_pAlwaysRB;
+RadioButton* m_pRequestRB;
+RadioButton* m_pNeverRB;
+
+CheckBox*m_pAutoUpdateFields;
+CheckBox*m_pAutoUpdateCharts;
+
+ListBox* m_pMetricLB;
+FixedText*   m_pTabFT;
+MetricField* m_pTabMF;
+CheckBox*m_pUseSquaredPageMode;
+CheckBox*m_pUseCharUnit;
+Edit*m_pWordCountED;
+CheckBox*m_pShowStandardizedPageCount;
+NumericField*m_pStandardizedPageSizeNF;
+
+SwWrtShell*  m_pWrtShell;
+sal_uInt16   m_nLastTab;
+sal_Int32m_nOldLinkMode;
 
 DECL_LINK(MetricHdl, void *);
+DECL_LINK(StandardizedPageCountCheckHdl, void *);
 
 public:
 SwLoadOptPage(Window* pParent, const SfxItemSet& rSet);
diff --git a/sw/source/core/uibase/inc/wordcountdialog.hxx 
b/sw/source/core/uibase/inc/wordcountdialog.hxx
index 9656015..fef9d92 100644
--- a/sw/source/core/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/core/uibase/inc/wordcountdialog.hxx
@@ -31,18 +31,22 @@ class SwWordCountFloatDlg : public SfxModelessDialog
 virtual voidActivate() SAL_OVERRIDE;
 void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc);
 void showCJK(bool bShowCJK);
+void showStandardizedPages(bool bShowStandardizedPages);
 
 FixedText* m_pCurrentWordFT;
 FixedText* m_pCurrentCharacterFT;
 FixedText* m_pCurrentCharacterExcludingSpacesFT;
 FixedText* m_pCurrentCjkcharsFT;
+FixedText* m_pCurrentStandardizedPagesFT;
 
 FixedText* m_pDocWordFT;
 FixedText* m_pDocCharacterFT;
 FixedText* m_pDocCharacterExcludingSpacesFT;
 FixedText* m_pDocCjkcharsFT;
+FixedText* m_pDocStandardizedPagesFT;
 
 FixedText* m_pCjkcharsLabelFT;
+FixedT

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

2014-09-12 Thread Tor Lillqvist

 officecfg/registry/data/org/openoffice/Office/Paths.xcu|2 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |4 -
 officecfg/util/alllang.xsl |   52 +++--
 officecfg/util/schema_trim.xsl |   44 ++-
 solenv/gbuild/Configuration.mk |4 +
 solenv/gbuild/HelpTarget.mk|2 
 6 files changed, 95 insertions(+), 13 deletions(-)

New commits:
commit fa2801f2c349811e00c3f2f19f9ce62a68daa4dc
Author: Tor Lillqvist 
Date:   Fri Sep 12 12:09:17 2014 +0300

Handle LIBO_SHARE_HELP_FOLDER

Change-Id: I4f004321c58da1d81a2cc3c80504347db583d86a

diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu 
b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 7568f4d..6d739e6 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -98,7 +98,7 @@
 
 
   
-
+
   
 
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 8ac7f69..09a9b18 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1652,7 +1652,7 @@
   
 Specifies the path to the Office help files.
   
-  $(instpath)/help
+  $(instpath)/@LIBO_SHARE_HELP_FOLDER@
 
 
   
@@ -1847,7 +1847,7 @@
 Specifies the default directory where Office help files are
 located.
   
-  $(instpath)/help
+  $(instpath)/@LIBO_SHARE_HELP_FOLDER@
 
 
   
diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl
index 31b53bc..f5d9ae1 100644
--- a/officecfg/util/alllang.xsl
+++ b/officecfg/util/alllang.xsl
@@ -35,6 +35,7 @@
 en-US
 
 
+
 
 
 
@@ -341,19 +342,23 @@
 
 
   
-
+
   
-  
-  
+  
+  
+  
+  
 
   
 
 
 
-  
+  
 
-
-
+
+
+
+
   
 
 
@@ -378,4 +383,39 @@
   
 
 
+
+  
+  
+  
+  
+  
+  
+
+ 
+   
+   
+   
+ 
+  
+  
+
+
+
+
+
+  
+
+
+ 
+   
+   
+   
+ 
+
+  
+
+
 
diff --git a/officecfg/util/schema_trim.xsl b/officecfg/util/schema_trim.xsl
index 79b3c5c..4ebac1c 100644
--- a/officecfg/util/schema_trim.xsl
+++ b/officecfg/util/schema_trim.xsl
@@ -24,6 +24,7 @@
version="1.0">
 
 
+
 
 

@@ -81,10 +82,12 @@
 
 
 
-  
+  
 
-
-
+
+
+
+
   
 
 
@@ -109,4 +112,39 @@
   
 
 
+
+  
+  
+  
+  
+  
+  
+
+ 
+   
+   
+   
+ 
+  
+  
+
+
+
+
+
+  
+
+
+ 
+   
+   
+   
+ 
+
+  
+
+
 
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 06aa8a1..e5b8a9a 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -85,6 +85,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_Configuration_XSLTCOMMAND) --nonet \
-o $(1) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
+   --stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \
$(gb_XcsTarget_XSLT_SchemaTrim) \
$(3))
 endef
@@ -122,6 +123,7 @@ $(call gb_Helper_abbreviate_dirs,\
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) 
\
$(gb_Configuration__stringparam_schemaRoot) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
+   --stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \
--path $(SRCDIR)/officecfg/registry \
$(gb_XcuTarget_XSLT_AllLang) \
$(3))
@@ -158,6 +160,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_Configuration__stringparam_schemaRoot)

[Libreoffice-commits] core.git: officecfg/registry sd/sdi sd/source

2014-02-05 Thread Andrzej Hunt

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu   |6 ++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |5 --
 sd/sdi/_drvwsh.sdi   |5 ++
 sd/sdi/outlnvsh.sdi  |5 ++
 sd/source/ui/app/sddll.cxx   |1 
 sd/source/ui/func/fuoltext.cxx   |   15 
++
 sd/source/ui/func/fupoor.cxx |   18 
+++
 sd/source/ui/inc/fuoltext.hxx|1 
 sd/source/ui/inc/fupoor.hxx  |1 
 sd/source/ui/view/drviews7.cxx   |4 +
 sd/source/ui/view/drviewse.cxx   |   24 
+
 sd/source/ui/view/outlnvs2.cxx   |2 
 sd/source/ui/view/outlnvsh.cxx   |   25 
++
 14 files changed, 112 insertions(+), 5 deletions(-)

New commits:
commit 84b4b7b931b194fc4d1980d2fa9c7fd6e0c9134c
Author: Andrzej Hunt 
Date:   Sun Feb 2 22:35:39 2014 +

fdo#51525 Add Paste Unformatted Text to Impress.

Change-Id: I4eff66ee2990fd7bf6a9be6b9f0801e7a70206e9
Reviewed-on: https://gerrit.libreoffice.org/7783
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 272278c..624bcdf 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2927,6 +2927,12 @@
 .uno:PasteSpecial
   
 
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:PasteUnformatted
+  
+
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index a16b900..e174849 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3425,6 +3425,11 @@
   1
 
   
+  
+
+  Paste Unformatted Text
+
+  
   
 
   Delete C~ontents...
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 4ed20add..3cb9be4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1081,11 +1081,6 @@
   1
 
   
-  
-
-  Paste Unformatted Text
-
-  
   
 
   Paste ~Special...
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 857b30e..5e3373e 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -96,6 +96,11 @@ interface DrawView
 ExecMethod = FuSupport ;
 StateMethod = GetMenuState ;
 ]
+SID_PASTE_UNFORMATTED
+[
+ExecMethod = FuSupport ;
+StateMethod = GetMenuState ;
+]
 SID_CLIPBOARD_FORMAT_ITEMS
 [
 ExecMethod = FuSupport ;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 7216934..dae93d6 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -36,6 +36,11 @@ interface OutlineView
 ExecMethod = FuSupport ;
 StateMethod = GetMenuState ;
 ]
+SID_PASTE_UNFORMATTED // ole : no, status : ?
+[
+ExecMethod = FuSupport ;
+StateMethod = GetMenuState ;
+]
 SID_DELETE // ole : no, status : ?
 [
 ExecMethod = FuSupport ;
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index f7a27c0..1863c75 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -262,6 +262,7 @@ void SdDLL::RegisterControllers()
 svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH, 
pMod );
 
 SvxClipBoardControl::RegisterControl( SID_PASTE, pMod );
+SvxClipBoardControl::RegisterControl( SID_PASTE_UNFORMATTED, pMod );
 
 svx::ExtrusionColorControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod 
);
 svx::FontWorkShapeTypeControl::RegisterControl( SID_FONTWORK_SHAPE_TYPE, 
pMod );
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 22836070..09ee7d3 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -278,6 +278,21 @@ void FuOutlineText::DoPaste()
 pOutlineView->GetViewByWindow(mpWindow)->PasteSpecial();
 }
 
+/**
+ * Paste object as unforma

[Libreoffice-commits] core.git: officecfg/registry sd/source sd/uiconfig

2014-02-18 Thread Rob Snelders

 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |   10 --
 sd/source/ui/app/optsitem.cxx   |   54 +---
 sd/source/ui/dlg/tpoption.cxx   |5 -
 sd/source/ui/func/fusldlg.cxx   |2 
 sd/source/ui/inc/optsitem.hxx   |1 
 sd/source/ui/inc/tpoption.hxx   |1 
 sd/source/ui/slideshow/slideshowimpl.cxx|4 
 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui|   33 +--
 8 files changed, 30 insertions(+), 80 deletions(-)

New commits:
commit 12b78edde94af7550b14382d9bfd1c77854e5fb0
Author: Rob Snelders 
Date:   Tue Feb 4 12:37:01 2014 +0100

Remove from option-dialog the CurrentPage-option (fdo#71601)

Change-Id: I28a75468b1f43e0219fa0f03fe89601a77d3cd4d
Reviewed-on: https://gerrit.libreoffice.org/7842
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index f5f9a42..5fe21cdf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -614,16 +614,6 @@
 
   Specifies configuration items governing behavior when starting 
a presentation.
 
-
-  
-  
-  
-  
-Indicates whether to start the presentation with the current 
(true) or the first (false) page.
-Always with current page
-  
-  true
-
 
   
 Indicates whether to enable the Impress remote 
controller.
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 9435add..ee478f3 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -487,7 +487,6 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, 
sal_Bool bUseConfig ) :
 bPickThrough( sal_True ),
 bDoubleClickTextEdit( sal_True ),
 bClickChangeRotation( sal_False ),
-bStartWithActualPage( sal_False ),
 bEnableSdremote( sal_False ),
 bEnablePresenterScreen( sal_True),
 bSolidDragging( sal_True ),
@@ -523,7 +522,6 @@ sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& 
rOpt ) const
 IsPickThrough() == rOpt.IsPickThrough() &&
 IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() &&
 IsClickChangeRotation() == rOpt.IsClickChangeRotation() &&
-IsStartWithActualPage() == rOpt.IsStartWithActualPage() &&
 IsEnableSdremote() == rOpt.IsEnableSdremote() &&
 IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen()&&
 IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
@@ -569,7 +567,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& 
ppNames, sal_uLong& rCount )
 
 // just for impress
 "NewDoc/AutoPilot",
-"Start/CurrentPage",
 "Compatibility/AddBetween",
 "ShowUndoDeleteWarning",
 "SlideshowRespectZOrder",
@@ -616,38 +613,36 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
 if( pValues[14].hasValue() )
 SetStartWithTemplate( *(sal_Bool*) pValues[ 14 ].getValue() );
 if( pValues[15].hasValue() )
-SetStartWithActualPage( *(sal_Bool*) pValues[ 15 ].getValue() );
+SetSummationOfParagraphs( *(sal_Bool*) pValues[ 15 ].getValue() );
 if( pValues[16].hasValue() )
-SetSummationOfParagraphs( *(sal_Bool*) pValues[ 16 ].getValue() );
+SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 16 ].getValue() );
+
 if( pValues[17].hasValue() )
-SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 17 ].getValue() );
+SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 17 ].getValue());
 
 if( pValues[18].hasValue() )
-SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 18 ].getValue());
+SetPreviewNewEffects(*(sal_Bool*) pValues[ 18 ].getValue());
 
 if( pValues[19].hasValue() )
-SetPreviewNewEffects(*(sal_Bool*) pValues[ 19 ].getValue());
+SetPreviewChangedEffects(*(sal_Bool*) pValues[ 19 ].getValue());
 
 if( pValues[20].hasValue() )
-SetPreviewChangedEffects(*(sal_Bool*) pValues[ 20 ].getValue());
+SetPreviewTransitions(*(sal_Bool*) pValues[ 20 ].getValue());
 
 if( pValues[21].hasValue() )
-SetPreviewTransitions(*(sal_Bool*) pValues[ 21 ].getValue());
+SetDisplay(*(sal_Int32*) pValues[ 21 ].getValue());
 
 if( pValues[22].hasValue() )
-SetDisplay(*(sal_Int32*) pValues[ 22 ].getValue());
+SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 22 ] 
) );
 
 if( pValues[23].hasValue() )
-SetPresentationPenColor( getSafeValue< sa

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

2013-05-09 Thread mmeof

 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |7 ++
 sd/source/ui/app/optsitem.cxx   |   13 +--
 sd/source/ui/dlg/tpoption.cxx   |9 +++
 sd/source/ui/dlg/tpoption.src   |   10 +++-
 sd/source/ui/inc/optsitem.hxx   |3 ++
 sd/source/ui/inc/tpoption.hrc   |2 -
 sd/source/ui/inc/tpoption.hxx   |1 
 sdext/source/presenter/PresenterScreen.cxx  |   14 +++-
 sdext/source/presenter/PresenterScreen.hxx  |2 +
 9 files changed, 56 insertions(+), 5 deletions(-)

New commits:
commit 39da7ee77e5c5add8aaef12bf1e80c66132782fa
Author: mmeof 
Date:   Fri May 3 09:20:28 2013 -0700

fdo#56995 Created global option to disable presenter console in Impress

Changes made are as Follows
/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
To add the new global checkbox to Libreoffice Impress>General>Start
A new xml block for EnablePresenterScreen was added

/sd/source/ui/app/optsitem.cxx
To add the setter/getter for the new checkbox button, namely:
SetEnablePresenterScreen
IsEnablePresenterScreen
EnablePresenterScreen added to index number 26 of:
GetPropNameArray()
/sd/source/ui/dlg/tpoption.cxx
SdTpOptionsMisc() editted to attach EnablePresenterScreen to 
CBX_ENABLE_PRESENTER_SCREEN
aCbxEnablePresenterScreen  ( this, SdResId( 
CBX_ENABLE_PRESENTER_SCREEN))
Also Added to FillItemSet() and Reset() functions
/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src
enableSdRemote size changed to
Size = MAP_APPFONT ( 116 , 10 ) ;
Pos = MAP_APPFONT ( 12 , 171  ) ;
158 was correct but 171 was added on request
To allow enableSdRemote(CBX_ENABLE_SDREMOTE) and 
enablePresenterScreen( CBX_ENABLE_PRESENTER_SCREEN) to be drawn adjacent.
enablePresenterScreen checkbox CBX_ENABLE_PRESENTER_SCREEN added
/sd/source/ui/inc/optsitem.hxx
Set default value for enablePresenterScreen as 1 or TRUE
sal_BoolbEnablePresenterScreen : 1;
Added getter/setter named same as above for interface definition
sd/source/ui/inc/tpoption.hrc
Defined CBX_ENABLE_PRESENTER_SCREEN as 42nd checkbox
#define CBX_ENABLE_PRESENTER_SCREEN 42
/sd/source/ui/inc/tpoption.hxx
 Added interface declaration of aCbxEnablePresenterScreen which was 
attached to  CBX_ENABLE_PRESENTER_SCREEN
/sdext/source/presenter/PresenterScreen.hxx
 Added interface declaration of
bool isPresenterScreenEnabled()
 to PresenterScreen class to allow presenterscreen to get if 
the option is checked
/sdext/source/presenter/PresenterScreen.cxx
 Added definition of
 isPresenterScreenEnabled(const 
css::uno::Reference& rxContext)
Input : Current Process Context
Output : The 0/1 value of EnablePresenterScreen from 
presenterconfig
In PresenterScreenListener::notifyEvent( )
Added
 
if(mpPresenterScreen->isPresenterScreenEnabled(mxComponentContext)
mpPresenterScreen->InitializePresenterScreen()
To initialize PresenterScreen only when enabled

Change-Id: If8242e607323df57d8e78d08cf2129d03c0c9e4f
Reviewed-on: https://gerrit.libreoffice.org/3762
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 1ec830b..8161806 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -601,6 +601,13 @@
   
   true
 
+
+   
+Indicates whether to show Presenter Screen Console which 
shows next slide, notes etc.
+Enable Presenter Screen
+  
+  true
+
   
   
 
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 9fe08cc..e960588 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -489,6 +489,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, 
sal_Bool bUseConfig ) :
 bClickChangeRotation( sal_False ),
 bStartWithActualPage( sal_False ),
 bEnableSdremote( sal_False ),
+bEnablePresenterScreen( sal_True),
 bSolidDragging( sal_True ),
 bSummationOfParagraphs( sal_False ),
 bShowUndoDeleteWarning( sal_True

[Libreoffice-commits] core.git: officecfg/registry sd/sdi sd/source sd/uiconfig

2013-04-10 Thread Gergő Mocsi

 officecfg/registry/data/org/openoffice/Office/Impress.xcu|
5 
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
2 
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs  |   
17 
 sd/sdi/SlideSorterController.sdi |
1 
 sd/sdi/drviewsh.sdi  |
1 
 sd/sdi/outlnvsh.sdi  |
3 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx|  
701 --
 sd/source/ui/dlg/PhotoAlbumDialog.hxx|   
35 
 sd/source/ui/view/drviews6.cxx   |   
20 
 sd/uiconfig/simpress/menubar/menubar.xml |
3 
 sd/uiconfig/simpress/ui/photoalbum.ui|   
35 
 11 files changed, 723 insertions(+), 100 deletions(-)

New commits:
commit 3a56257e858c6793156a78b387451802593455e0
Author: GergÅ Mocsi 
Date:   Tue Apr 2 12:57:59 2013 +0200

Create Photo Album implementation

Added a checkbox to enable/diable Keep Aspect ratio.
Options 2 images/slide, 4 images/slide implemented.
UI tweaks: dialog window remembers last used directory (via config),
buttons get enabled/disabled according to the content of the ListBox.
ListBox show filename only, full path is shown lower in a label.
Dialog window reopens again, if slide preview is not in focus.
Added a title slide: author, title.

Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
sd/uiconfig/simpress/ui/photoalbum.ui

Change-Id: I68d2a3e00f8c55b909fe4d98aa3958188653390e
Reviewed-on: https://gerrit.libreoffice.org/3169
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu 
b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index dfff9b0..3793b99 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -195,4 +195,9 @@
   vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml
 
   
+  
+
+  $(work)
+
+  
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 50afd03..d135cd13 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -55,7 +55,7 @@
   
  
 
-  Create Photo Album
+  Photo Album
 
 
   1
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index e84ba82..ec0c12b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -1594,5 +1594,22 @@
 
   
 
+
+
+
+Contains configuration items form Impress Photo Album function.
+
+
+
+
+GM
+
+Access path, where images were loaded last time.
+The default is work directory.
+
+
+$(work)
+
+
   
 
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index d1af8d0..f38a3a8 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -297,6 +297,7 @@ interface SlideSorterView
 SID_PHOTOALBUM
 [
 ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
 ]
 }
 
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index d4aab0e..5f58cb8 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -216,6 +216,7 @@ interface ImpressEditView : DrawView
 SID_PHOTOALBUM
 [
 ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
 ]
 }
 
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 9d2db2b..1e8991f 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -529,7 +529,8 @@ interface OutlineView
 ]
 SID_PHOTOALBUM
 [
-ExecMethod = FuTemporary;
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
 ]
 }
 
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index bd87f34..5bbd5cf 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -9,17 +9,17 @@
 
 #include "PhotoAlbumDialog.hxx"
 
-#include 
-#include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
-#include 
-#include 
+#include 
+
 #include 
+#

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

2013-11-04 Thread Eilidh McAdam

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 ++
 sc/inc/printopt.hxx  |3 +
 sc/inc/table.hxx |1 
 sc/source/core/data/table1.cxx   |3 -
 sc/source/core/data/table5.cxx   |   39 +--
 sc/source/core/tool/printopt.cxx |   20 ++-
 sc/source/ui/inc/tpprint.hxx |1 
 sc/source/ui/optdlg/tpprint.cxx  |7 ++
 sc/uiconfig/scalc/ui/optdlg.ui   |   16 ++
 9 files changed, 76 insertions(+), 21 deletions(-)

New commits:
commit 7e4f8eb5eff642c7fc8bfa665289d55a1c5b054b
Author: Eilidh McAdam 
Date:   Sat Nov 2 20:35:44 2013 +

fdo#40788: Allow manual breaks in Calc to be forced

If the scale settings specify that the print ranges must be scaled
across a specific number of pages, the default behaviour is to ignore
breaks to avoid the case where breaks force more pages than specified.
Here, an option under Calc -> Print -> Pages is added so that the user
can specify that manual row and column breaks should be forced.

Change-Id: I445cd7ce9e16e4ec2d0c320f059edad62b40f22d
Reviewed-on: https://gerrit.libreoffice.org/6531
Tested-by: Eike Rathke 
Reviewed-by: Eike Rathke 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 4c583a4..0cdb9d5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1659,6 +1659,13 @@
   
   false
 
+
+  
+Specifies whether manual row and column breaks should be 
forced, regardless of sheet scale settings.
+Force manual breaks
+  
+  false
+
   
   
 
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index 7148c68..ff1fd67 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -29,6 +29,7 @@ class SC_DLLPUBLIC ScPrintOptions
 private:
 sal_BoolbSkipEmpty;
 sal_BoolbAllSheets;
+sal_BoolbForceBreaks;
 
 public:
 ScPrintOptions();
@@ -39,6 +40,8 @@ public:
 voidSetSkipEmpty( sal_Bool bVal )   { bSkipEmpty = bVal; }
 sal_BoolGetAllSheets() const{ return bAllSheets; }
 voidSetAllSheets( sal_Bool bVal )   { bAllSheets = bVal; }
+sal_BoolGetForceBreaks() const  { return bForceBreaks; }
+voidSetForceBreaks( sal_Bool bVal ) { bForceBreaks = bVal; }
 
 voidSetDefaults();
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 394847f..126b0ae 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -194,6 +194,7 @@ private:
 boolbPrintEntireSheet:1;
 boolbActiveScenario:1;
 boolmbPageBreaksValid:1;
+boolmbForceBreaks:1;
 
 friend class ScDocument;// for FillInfo
 friend class ScValueIterator;
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index ca8a07c..4eed3b0 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -271,7 +271,8 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const 
OUString& rNewName,
 bGlobalKeepQuery(false),
 bPrintEntireSheet(true),
 bActiveScenario(false),
-mbPageBreaksValid(false)
+mbPageBreaksValid(false),
+mbForceBreaks(false)
 {
 
 if (bColInfo)
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 0392b21..8c8d6bf 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -38,11 +38,14 @@
 #include "segmenttree.hxx"
 #include "columniterator.hxx"
 #include "globalnames.hxx"
+#include "scmod.hxx"
+#include "printopt.hxx"
 
 #include 
 
 #include 
 #include 
+#include 
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::sheet::TablePageBreakData;
@@ -66,7 +69,8 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
 if (!bPageSizeValid)
 return;
 
-if (mbPageBreaksValid)
+// Always update breaks if force breaks option has changed
+if (mbPageBreaksValid && mbForceBreaks == 
SC_MOD()->GetPrintOptions().GetForceBreaks())
 return;
 }
 
@@ -120,24 +124,29 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
 }
 
 // get bSkipColBreaks/bSkipRowBreaks flags:
-
+// fdo#40788 - print range scale settings can cause manual breaks to be
+// ignored (see below). This behaviour may now be set by the user.
+mbForceBreaks = SC_MOD()->GetPrintOptions().GetForceBreaks();
 bool bSkipColBreaks = false;
 bool bSkipRowBreaks = false;
 
-if ( pStyleSet->GetItemState( ATTR_PAGE_SCALETOPAGES, false, &pItem ) == 
SFX_ITEM_SET )
-{
-

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

2013-08-16 Thread Tomaž Vajngerl

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 +++
 sc/inc/inputopt.hxx  |3 +
 sc/inc/sc.hrc|3 +
 sc/source/core/tool/inputopt.cxx |   34 +--
 sc/source/ui/app/scmod.cxx   |   10 
 sc/source/ui/inc/tpview.hxx  |1 
 sc/source/ui/optdlg/tpview.cxx   |   14 ++
 sc/source/ui/view/tabview2.cxx   |   14 --
 sc/uiconfig/scalc/ui/scgeneralpage.ui|   20 
 9 files changed, 91 insertions(+), 16 deletions(-)

New commits:
commit 462b28770e4fa3dfa6fe4af71a6776cceb4c4640
Author: TomaÅ¾ Vajngerl 
Date:   Fri Aug 16 17:15:34 2013 +0200

fdo#37230 Add legacy cell selection behavior and config. option

When selecting cells with ctrl+shift, the legacy behaviour was to
take in account to which cell the cursor moved. This allowed the
user to make some convenient selections. This behaviour can now be
turned on with a switch in the configuration (Tools > Options >
Calc > General > Input Settings > "Use legacy cursor movement
behavior when selecting").

Change-Id: I00ae7b4ee001b416cc680c7a650631daec71e51b

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index b396438..ada4416 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -714,6 +714,14 @@
 
 true
   
+  
+
+
+  Use legacy behaviour when selecting cells
+  Use legacy behaviour when selecting cells
+
+true
+  
   
 
 
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index be5095a..33e282a 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -38,6 +38,7 @@ private:
 sal_BoolbUseTabCol;
 sal_BoolbTextWysiwyg;
 sal_BoolbReplCellsWarn;
+sal_BoolbLegacyCellSelection;
 
 public:
 ScInputOptions();
@@ -66,6 +67,8 @@ public:
 sal_BoolGetTextWysiwyg() const  { return bTextWysiwyg;   }
 voidSetReplaceCellsWarn(sal_Bool bSet)  { bReplCellsWarn = bSet; }
 sal_BoolGetReplaceCellsWarn() const { return bReplCellsWarn; }
+voidSetLegacyCellSelection(sal_Bool bSet)   { bLegacyCellSelection 
= bSet; }
+sal_BoolGetLegacyCellSelection() const  { return 
bLegacyCellSelection; }
 
 const ScInputOptions&   operator=   ( const ScInputOptions& rOpt );
 };
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 8611337..ca208ea 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -84,6 +84,9 @@
 #define FID_SCALESTATUS (SC_VIEW_START + 10)
 #define SID_UPDATECHART (SC_VIEW_START + 13)
 
+// TabPage entry - Legacy selection
+#define SID_SC_INPUT_LEGACY_CELL_SELECTION (SC_VIEW_START + 15)
+
 // Format options
 #define SID_SCFORMULAOPTIONS(SC_VIEW_START + 20)
 #define SID_SCDEFAULTSOPTIONS   (SC_VIEW_START + 21)
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 6f056d6..da72057 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -68,6 +68,7 @@ void ScInputOptions::SetDefaults()
 bUseTabCol  = false;
 bTextWysiwyg= false;
 bReplCellsWarn  = sal_True;
+bLegacyCellSelection = false;
 }
 
 //
@@ -84,6 +85,7 @@ const ScInputOptions& ScInputOptions::operator=( const 
ScInputOptions& rCpy )
 bUseTabCol  = rCpy.bUseTabCol;
 bTextWysiwyg= rCpy.bTextWysiwyg;
 bReplCellsWarn  = rCpy.bReplCellsWarn;
+bLegacyCellSelection = rCpy.bLegacyCellSelection;
 
 return *this;
 }
@@ -95,17 +97,18 @@ const ScInputOptions& ScInputOptions::operator=( const 
ScInputOptions& rCpy )
 
 #define CFGPATH_INPUT   "Office.Calc/Input"
 
-#define SCINPUTOPT_MOVEDIR  0
-#define SCINPUTOPT_MOVESEL  1
-#define SCINPUTOPT_EDTEREDIT2
-#define SCINPUTOPT_EXTENDFMT3
-#define SCINPUTOPT_RANGEFIND4
-#define SCINPUTOPT_EXPANDREFS   5
-#define SCINPUTOPT_MARKHEADER   6
-#define SCINPUTOPT_USETABCOL7
-#define SCINPUTOPT_TEXTWYSIWYG  8
-#define SCINPUTOPT_REPLCELLSWARN9
-#define SCINPUTOPT_COUNT10
+#define SCINPUTOPT_MOVEDIR0
+#define SCINPUTOPT_MOVESEL1
+#define SCINPUTOPT_EDTEREDIT  2
+#define SCINPUTOPT_EXTENDFMT  3
+#define SCINPUTOPT_RANGEFIND  4
+#define SCINPUTOPT_EXPANDREFS 5
+#define SCINPUTOPT_MARKHEADER 6
+#define SCINPUTOPT_USETABCOL  7
+#define SCINPUTOPT_TEXTWYSIWYG8
+#define SCINPUTOPT_REPLCELLSWARN

[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig

2013-08-22 Thread Ivan Timofeev

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 sc/uiconfig/scalc/menubar/menubar.xml|1 +
 sd/uiconfig/sdraw/menubar/menubar.xml|1 +
 sd/uiconfig/simpress/menubar/menubar.xml |1 +
 sw/uiconfig/sglobal/menubar/menubar.xml  |1 +
 sw/uiconfig/swform/menubar/menubar.xml   |1 +
 sw/uiconfig/swreport/menubar/menubar.xml |1 +
 sw/uiconfig/swriter/menubar/menubar.xml  |1 +
 sw/uiconfig/swxform/menubar/menubar.xml  |1 +
 9 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit f2bfb0d4a4b206852c811b18b25ca508a40aee7f
Author: Ivan Timofeev 
Date:   Thu Aug 22 18:33:35 2013 +0400

fdo#68252: Add FONTWORK into the INSERT menu

Change-Id: Icdb1774996e9b9669e95fdbefca0be054f91465a

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 809cee0..5fc448b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -32,7 +32,7 @@
   
   
 
-  Fontwork Gallery
+  Fontwork Gallery...
 
 
   9
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index d2bda57..6271a36 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -211,6 +211,7 @@
 
 
 
+
 
 
 
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index c3021faf..6e8f9e4 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -189,6 +189,7 @@
   
 
   
+  
 
   
   
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 2fd3032..a9ef76a 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -207,6 +207,7 @@
 
 
 
+
 
 
 
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index a72d86f..334fc37 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -220,6 +220,7 @@
   
 
   
+  
 
   
   
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index 5dde902..4f52a7b 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -219,6 +219,7 @@
   
 
   
+  
 
   
   
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index 5f57d46..00be724 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -220,6 +220,7 @@
   
 
   
+  
 
   
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 71f9b4d..dd05e1f 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -227,6 +227,7 @@
   
 
   
+  
 
   
   
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml 
b/sw/uiconfig/swxform/menubar/menubar.xml
index be5e2cd..a3607b6 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -221,6 +221,7 @@
   
 
   
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sal/osl vcl/generic wizards/source

2013-09-11 Thread Andras Timar

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   14 
+-
 officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs |4 +-
 sal/osl/unx/thread.c   |2 -
 vcl/generic/print/psheader.ps  |2 -
 wizards/source/tools/Misc.xba  |4 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 74cd77b2294ae600576100fdb1b6ba36753c9a00
Author: Andras Timar 
Date:   Wed Sep 11 15:44:49 2013 +0200

typo fix: wether -> whether

Change-Id: Iad4182d7150f851df06a7208a811d482351f736a

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index ac9ed45..d2f26c0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2485,14 +2485,14 @@
 
 
   
-Specifies wether to warn when saving or sending documents 
with
+Specifies whether to warn when saving or sending documents 
with
 personal/hidden data.
   
   false
 
 
   
-Specifies wether to warn when signing documents with
+Specifies whether to warn when signing documents with
 personal/hidden data.
   
   true
@@ -2504,28 +2504,28 @@
 
 
   
-Specifies wether to warn when printing documents with
+Specifies whether to warn when printing documents with
 personal/hidden data.
   
   false
 
 
   
-Specifies wether to warn when creating PDF documents with
+Specifies whether to warn when creating PDF documents with
 personal/hidden data.
   
   false
 
 
   
-Specifies wether to remove personal information on
+Specifies whether to remove personal information on
 saving.
   
   false
 
 
   
-Specifies wether to recommend password protection when saving
+Specifies whether to recommend password protection when 
saving
 documents.
   
   false
@@ -3422,7 +3422,7 @@
   
   
 
-  Determines wether basic help should be shown.
+  Determines whether basic help should be shown.
 
 true
   
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 4da4888..152abe7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -292,7 +292,7 @@
   
 
 
-  Specifies wether Taiwan, Hongkong SAR, and Macao SAR character
+  Specifies whether Taiwan, Hongkong SAR, and Macao SAR character
   variants should be used for translation.
   Use character variants
 
@@ -301,7 +301,7 @@
   
 
 
-  Specifies wether common terms should be detected and translated
+  Specifies whether common terms should be detected and 
translated
   as whole words.
   Translate Common Terms
 
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index 0e1ebba..c137b24 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -1031,7 +1031,7 @@ static void osl_thread_textencoding_init_Impl (void)
 
 /*
 Tools string functions call abort() on an unknown encoding so ASCII
-is a meaningfull fallback regardless wether the assertion makes sense.
+is a meaningfull fallback regardless whether the assertion makes sense.
 */
 
 if ( RTL_TEXTENCODING_DONTKNOW == defaultEncoding )
diff --git a/vcl/generic/print/psheader.ps b/vcl/generic/print/psheader.ps
index ebd93e1..1a690a7 100644
--- a/vcl/generic/print/psheader.ps
+++ b/vcl/generic/print/psheader.ps
@@ -50,7 +50,7 @@ begin
currentfile 1 string readstring % s bool
pop 
% s
0 get   
% s[0]
-   
% --- check wether s[0] is CR, LF ...
+   
% --- check whether s[0] is CR, LF ...
dup 32 gt   
% s > ' ' ? then read on
{ exit }
{ pop  }
diff --git a/wizards/s

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

2014-06-09 Thread Caolán McNamara

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
10 +
 sd/inc/app.hrc   |
5 
 sd/inc/sdcommands.h  |
2 
 sd/sdi/_drvwsh.sdi   |   
10 +
 sd/sdi/sdraw.sdi |   
48 +++
 sd/source/ui/app/popup.src   |   
13 +
 sd/source/ui/inc/DrawViewShell.hxx   |
6 
 sd/source/ui/inc/View.hxx|   
19 ++
 sd/source/ui/view/drviews2.cxx   |   
50 +++
 sd/source/ui/view/drviews7.cxx   |   
66 ++
 sd/source/ui/view/sdview.cxx |   
30 
 11 files changed, 255 insertions(+), 4 deletions(-)

New commits:
commit 7e600aca08ebbd69b0c8ef924c84af4dcf80df56
Author: CaolÃ¡n McNamara 
Date:   Fri Jun 6 15:13:26 2014 +0100

Related: fdo#78151 force outliners in master view to be read-only text

because these contain place-holder text and it doesn't make sense
to be able to edit them (unless some-day we support custom place-holder
prompts)

because they are now read-only add a pair of "show next level" and "hide
last level" features so on right clicking the last outline paragraph
you can make the next one visible, or make the last one invisible

Change-Id: Iea24d810f298156cfe2f32aa53d0515da45e08eb

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index b4b6366..31aa4d7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -584,6 +584,16 @@
   H~yperlink...
 
   
+  
+
+  ~Hide Last Level
+
+  
+  
+
+  ~Show Next Level
+
+  
   
 
   ~Page...
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index ef8631f..fae13da 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -447,9 +447,10 @@
 
 #define SID_ADD_MOTION_PATH (SID_SD_START+442)
 #define SID_TABLE_TOOLBOX   (SID_SD_START+443)
-
 // free
-#define SID_PRESENTATION_MINIMIZER (SID_SD_START+450)
+#define SID_HIDE_LAST_LEVEL (SID_SD_START+448)
+#define SID_SHOW_NEXT_LEVEL (SID_SD_START+449)
+#define SID_PRESENTATION_MINIMIZER  (SID_SD_START+450)
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index 2041d8f..276bf6d 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -119,6 +119,8 @@
 #define CMD_SID_INSERTPAGE_LAYOUT_MENU  ".uno:TaskPaneInsertPage"
 #define CMD_SID_PHOTOALBUM  ".uno:PhotoAlbumDialog"
 #define CMD_SID_PRESENTATION_MINIMIZER  
".uno:PresentationMinimizer"
+#define CMD_SID_HIDE_LAST_LEVEL ".uno:HideLastLevel"
+#define CMD_SID_SHOW_NEXT_LEVEL ".uno:ShowNextLevel"
 
 #endif
 
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index d328cf4..f8119e9 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -2309,6 +2309,16 @@ interface DrawView
 ExecMethod = FuTemporary ;
 StateMethod = GetMenuState ;
 ]
+SID_HIDE_LAST_LEVEL // ole : no, status : ?
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
+SID_SHOW_NEXT_LEVEL // ole : no, status : ?
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
 SID_TRANSLITERATE_UPPER // ole : no, status : ?
 [
 ExecMethod = FuSupport ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 9a03c4f..de7f1a2 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -7025,3 +7025,51 @@ SfxVoidItem PresentationMinimizer 
SID_PRESENTATION_MINIMIZER
 ToolBoxConfig = TRUE,
 GroupId = GID_OPTIONS;
 ]
+
+SfxVoidItem HideLastLevel SID_HIDE_LAST_LEVEL
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = TRUE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = GID_OPTIONS;
+]
+
+SfxVoidItem ShowNextLevel SID_SHOW_NEXT_LEVEL
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = TRUE,
+ReadOnlyDoc = FALSE,
+Togg

[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig

2014-09-27 Thread Samuel Mehrbrodt

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4 
++--
 sc/uiconfig/scalc/menubar/menubar.xml|2 +-
 sd/uiconfig/sdraw/menubar/menubar.xml|2 +-
 sd/uiconfig/simpress/menubar/menubar.xml |2 +-
 sw/uiconfig/sglobal/menubar/menubar.xml  |2 +-
 sw/uiconfig/sweb/menubar/menubar.xml |8 
++--
 sw/uiconfig/swform/menubar/menubar.xml   |2 +-
 sw/uiconfig/swreport/menubar/menubar.xml |2 +-
 sw/uiconfig/swriter/menubar/menubar.xml  |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml  |2 +-
 10 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 18ec913e413b05a44bbe79768f538d93bffa9e5d
Author: Samuel Mehrbrodt 
Date:   Sat Sep 27 15:05:06 2014 +0200

fdo#53682 Merge 'Insert Image' and 'Insert Audio/Video' in submenu

Change-Id: I4ddbd134ba15a48c0c529a11bcb1cd1f71f3a51a

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index a138e47..fd670db 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3053,7 +3053,7 @@
   
   
 
-  ~From File...
+  ~Image...
 
 
   1
@@ -5425,7 +5425,7 @@
   
   
 
-  ~Image
+  ~Media
 
   
   
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 2cac34a..f1df595 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -214,6 +214,7 @@
 
 
 
+
 
 
 
@@ -228,7 +229,6 @@
 
 
 
-
 
 
 
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index ddcd289..77ae00d 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -187,6 +187,7 @@
   
 
   
+  
   
 
   
@@ -197,7 +198,6 @@
 
   
   
-  
   
 
   
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 8e75035..1b15c3f 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -205,6 +205,7 @@
 
 
 
+
 
 
 
@@ -215,7 +216,6 @@
 
 
 
-
 
 
 
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 7da8f32..b450e0c 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -216,6 +216,7 @@
   
 
   
+  
   
 
   
@@ -225,7 +226,6 @@
   
 
   
-  
   
 
   
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index 2fbd8df..4879386 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -169,8 +169,12 @@
   
   
   
-  
-  
+  
+
+  
+  
+
+  
   
 
   
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index c139bd3..69cf742 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -215,6 +215,7 @@
   
 
   
+  
   
 
   
@@ -224,7 +225,6 @@
   
 
   
-  
   
 
   
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index 7fa10f9..86252d7 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -216,6 +216,7 @@
   
 
   
+  
   
 
   
@@ -225,7 +226,6 @@
   
 
   
-  
   
 
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index ab69208..284d2c9 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -223,6 +223,7 @@
   
 
   
+

[Libreoffice-commits] core.git: officecfg/registry sd/source sw/source sw/uiconfig

2014-09-28 Thread Samuel Mehrbrodt

 officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu   |
2 +-
 officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu  |
2 +-
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu  |
2 +-
 officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu  |
2 +-
 officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu   |
2 +-
 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu|
2 +-
 officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu|
2 +-
 officecfg/registry/schema/org/openoffice/Office/Draw.xcs  |
2 +-
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs   |
2 +-
 officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs |
2 +-
 sd/source/ui/app/menuids_tmpl.src |
4 ++--
 sw/source/ui/app/app.src  |
2 +-
 sw/source/ui/app/mn.src   |
2 +-
 sw/uiconfig/swriter/ui/picturedialog.ui   |
4 ++--
 14 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 1a57c512c051cb8b1809f00e569a402ff6be5878
Author: Samuel Mehrbrodt 
Date:   Sun Sep 28 22:51:53 2014 +0200

fdo#70998 Termchange: Picture->Image

Change-Id: I4113d35e2a4778c9833e659b1e4ff4fbb1ab9734

diff --git 
a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
index 84f9fa5..15327e6 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
@@ -52,7 +52,7 @@
 ~Delete
 
 
-Choose settings for optimizing pictures 
and graphics
+Choose settings for optimizing 
images
 
 
 Graphics
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index f5e294b..0742238 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -45,7 +45,7 @@
   0
 
 
-  Picture
+  Image
 
 
   true
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index b1aecb9..a3fc21d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1258,7 +1258,7 @@
   
   
 
-  Picture Placeholders
+  Image Placeholders
 
   
   
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 283f8a9..39d82c9 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -54,7 +54,7 @@
   0
 
 
-  Picture
+  Image
 
 
   true
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index c72079b..c6b5191 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -334,7 +334,7 @@
   0
 
 
-  Picture
+  Image
 
 
   true
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 4dcc178..513ec9a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -396,7 +396,7 @@
   true
 
 
-  Picture
+  Image
 
 
   true
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index 9c6dd1c..0197b14 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -390,7 +390,7 @@
   true
 
 
-  Picture
+  Image
 
 
   true
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs 
b/officecfg/registry/schema/org/openoffice/Office/D

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

2014-03-05 Thread Maxim Monastirsky

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5 -
 sc/inc/sc.hrc |3 
 sc/sdi/formatsh.sdi   |1 
 sc/sdi/scalc.sdi  |   25 -
 sc/source/core/data/docpool.cxx   |3 
 sc/source/ui/app/scmod.cxx|1 
 sc/source/ui/inc/formatsh.hxx |3 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx  |8 -
 sc/source/ui/view/formatsh.cxx|   48 
--
 sc/source/ui/view/tabview3.cxx|1 
 10 files changed, 6 insertions(+), 92 deletions(-)

New commits:
commit c3403ac888c2e62edaf8befe7982f5f8cc95c16f
Author: Maxim Monastirsky 
Date:   Wed Mar 5 09:42:30 2014 +0200

fdo#67104 Use correct command for show grid

Not sure why .uno:ViewGridLines & SID_SCGRIDSHOW were
introduced (in "merge sidebar feature" and related commits).

Change-Id: I90bdfaef86adcbfa44129b8f7f9df61ca7f35114
Reviewed-on: https://gerrit.libreoffice.org/8459
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 5c75e98..cdfd826 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -835,11 +835,6 @@
   ~Formula Bar
 
   
-  
-
-  View Grid lines
-
-  
   
 
   C~olumn & Row Headers
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 3ed851a..ae92cf8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -677,8 +677,7 @@
 // Sidebar -
 
 #define SID_PROPERTY_PANEL_CELLTEXT_DLG (SC_SIDEBAR_PROPERTY_BEGIN+0)
-#define SID_SCGRIDSHOW  (SC_SIDEBAR_PROPERTY_BEGIN+1)
-#define SID_NUMBER_TYPE_FORMAT  (SC_SIDEBAR_PROPERTY_BEGIN+2)
+#define SID_NUMBER_TYPE_FORMAT  (SC_SIDEBAR_PROPERTY_BEGIN+1)
 
 // resources
 
diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi
index 72e1e14..903c5e5 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -101,7 +101,6 @@ interface FormatForSelection
 SID_ALIGNCENTERVER  [ ExecMethod = ExecuteTextAttr; StateMethod = 
GetTextAttrState; ]
 SID_ALIGNBLOCK  [ ExecMethod = ExecuteTextAttr; StateMethod = 
GetTextAttrState; ]
 SID_ALIGNCENTERHOR  [ ExecMethod = ExecuteTextAttr; StateMethod = 
GetTextAttrState; ]
-SID_SCGRIDSHOW  [ ExecMethod = ExecViewOptions; StateMethod = 
GetViewOptions; ]
 
 SID_V_ALIGNCELL [ ExecMethod = ExecuteAlignment; StateMethod = 
GetAlignState; ]
 SID_H_ALIGNCELL [ ExecMethod = ExecuteAlignment; StateMethod = 
GetAlignState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 1313bdb..ca7b225 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -8801,31 +8801,6 @@ SfxVoidItem ExportAsGraphic SID_EXPORT_AS_GRAPHIC
 ]
 
 
-SfxBoolItem ViewGridLines SID_SCGRIDSHOW
-[
-AutoUpdate = TRUE,
-Cachable = Cachable,
-FastCall = FALSE,
-HasCoreId = FALSE,
-HasDialog = FALSE,
-ReadOnlyDoc = FALSE, //TRUE
-Toggle = FALSE,
-Container = FALSE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-Synchron;
-
-Readonly = FALSE,
-
-/* config */
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-StatusBarConfig = FALSE,
-ToolBoxConfig = FALSE,
-GroupId = GID_VIEW;
-]
-
-
 SfxUInt16Item NumberFormatType SID_NUMBER_TYPE_FORMAT
 [
 /* flags: */
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index db06224..3c7e52d 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -182,8 +182,7 @@ static SfxItemInfo const  aItemInfos[] =
 { SID_ATTR_PAGE_FOOTERSET,  SFX_ITEM_POOLABLE },// 
ATTR_PAGE_FOOTERSET
 { SID_SCATTR_PAGE_FORMULAS, SFX_ITEM_POOLABLE },// 
ATTR_PAGE_FORMULAS
 { SID_SCATTR_PAGE_NULLVALS, SFX_ITEM_POOLABLE },// 
ATTR_PAGE_NULLVALS
-{ SID_SCATTR_PAGE_SCALETO,  SFX_ITEM_POOLABLE },// 
ATTR_PAGE_SCALETO
-{ SID_SCGRIDSHOW,   SFX_ITEM_POOLABLE }
+{ SID_SCATTR_PAGE_SCALETO,  SFX_ITEM_POOLABLE } // 
ATTR_PAGE_SCALETO
 };
 
 
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 496062b..ba7aec8 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1121,7 +1121,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
 if (pBindings)
 {
 pBindings->Invalidate(SID_HELPLINES_MOVE);
-pBindings->Invalidate(SID_SCGRIDSHOW);
 }
 }
 
diff --git a/sc/source/ui/i

[Libreoffice-commits] core.git: officecfg/registry sfx2/source unotools/inc unotools/Library_utl.mk unotools/Package_inc.mk unotools/source

2013-04-05 Thread Thomas Arnhold

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   15 
 sfx2/source/appl/app.cxx   |1 
 unotools/Library_utl.mk|2 
 unotools/Package_inc.mk|2 
 unotools/inc/unotools/accelcfg.hxx |   65 --
 unotools/inc/unotools/itemholderbase.hxx   |9 
 unotools/inc/unotools/workingsetoptions.hxx|  122 -
 unotools/inc/unotools/xmlaccelcfg.hxx  |   11 
 unotools/source/config/accelcfg.cxx|  202 
 unotools/source/config/itemholder1.cxx |   18 
 unotools/source/config/workingsetoptions.cxx   |  304 -
 11 files changed, 11 insertions(+), 740 deletions(-)

New commits:
commit 55664c9bd2469d3e493e6f1b67fbb2f96500d492
Author: Thomas Arnhold 
Date:   Tue Apr 2 23:52:27 2013 +0200

unotools: remove some unused items

Change-Id: I95bcac6a3ff8cf4644c9d1596c75cac2d9cd94fe
Reviewed-on: https://gerrit.libreoffice.org/3191
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 66e353c..f819ebe 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3694,21 +3694,6 @@
 
   
 
-
-  
-
-Lists open documents or windows.
-  
-  
-
-
-
-
-  
-  Lists open documents or windows.
-
-  
-
 
   
 Contains settings specifying if a XML package is added to the
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 479f9d4..3b31dbd 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -113,7 +113,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index d99c18b..dcef7a8 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -71,7 +71,6 @@ $(eval $(call gb_Library_use_libraries,utl,\
 $(eval $(call gb_Library_add_exception_objects,utl,\
 unotools/source/accessibility/accessiblerelationsethelper \
 unotools/source/accessibility/accessiblestatesethelper \
-unotools/source/config/accelcfg \
 unotools/source/config/bootstrap \
 unotools/source/config/cmdoptions \
 unotools/source/config/compatibility \
@@ -104,7 +103,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
 unotools/source/config/syslocaleoptions \
 unotools/source/config/useroptions \
 unotools/source/config/viewoptions \
-unotools/source/config/workingsetoptions \
 unotools/source/config/xmlaccelcfg \
 unotools/source/i18n/calendarwrapper \
 unotools/source/i18n/caserotate \
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
index 92ec12e..1a47ec1 100644
--- a/unotools/Package_inc.mk
+++ b/unotools/Package_inc.mk
@@ -27,7 +27,6 @@
 
 $(eval $(call gb_Package_Package,unotools_inc,$(SRCDIR)/unotools/inc))
 
-$(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/accelcfg.hxx,unotools/accelcfg.hxx))
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/accessiblerelationsethelper.hxx,unotools/accessiblerelationsethelper.hxx))
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/accessiblestatesethelper.hxx,unotools/accessiblestatesethelper.hxx))
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/atom.hxx,unotools/atom.hxx))
@@ -96,7 +95,6 @@ $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/ucbstreamhelper.hxx,
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/unotoolsdllapi.h,unotools/unotoolsdllapi.h))
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/useroptions.hxx,unotools/useroptions.hxx))
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/viewoptions.hxx,unotools/viewoptions.hxx))
-$(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/workingsetoptions.hxx,unotools/workingsetoptions.hxx))
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/xmlaccelcfg.hxx,unotools/xmlaccelcfg.hxx))
 
 # vim: set noet sw=4 ts=4:
diff --git a/unotools/inc/unotools/accelcfg.hxx 
b/unotools/inc/unotools/accelcfg.hxx
deleted file mode 100644
index c60a4f0..000
--- a/unotools/inc/unotools/accelcfg.hxx
+++ /dev/null
@@ -1,65 +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:
- *
- *

[Libreoffice-commits] core.git: officecfg/registry reportdesign/uiconfig sc/uiconfig sd/uiconfig starmath/uiconfig sw/uiconfig

2014-04-06 Thread Joren De Cuyper

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 
+
 reportdesign/uiconfig/dbreport/menubar/menubar.xml   |2 +-
 sc/uiconfig/scalc/menubar/menubar.xml|2 +-
 sd/uiconfig/sdraw/menubar/menubar.xml|2 +-
 sd/uiconfig/simpress/menubar/menubar.xml |2 +-
 starmath/uiconfig/smath/menubar/menubar.xml  |2 +-
 sw/uiconfig/sglobal/menubar/menubar.xml  |2 +-
 sw/uiconfig/sweb/menubar/menubar.xml |2 +-
 sw/uiconfig/swform/menubar/menubar.xml   |2 +-
 sw/uiconfig/swreport/menubar/menubar.xml |2 +-
 sw/uiconfig/swriter/menubar/menubar.xml  |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml  |2 +-
 12 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 7007e3952d6bb74bf8c6722df23ee746f773c72c
Author: Joren De Cuyper 
Date:   Fri Mar 7 23:56:28 2014 +0100

fdo#72276 introduce .uno:ZoomMenu so we can split the menu entries/labels

Currently .uno:zoom is used for the topmenu and submenu.
Deleting the '...' behind the text will delete it for both,
which is not correct. Therefore I introduce .uno:ZoomMenu for the
topmenu.

Change-Id: I75bcae572be0cca7216c34d81e0b99f4c59c0aab
Reviewed-on: https://gerrit.libreoffice.org/8503
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 35303c3..548f9aa 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1280,6 +1280,11 @@
   9
 
   
+  
+
+  ~Zoom
+
+  
   
 
   ~Zoom...
diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml 
b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
index a175c35..459b288 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -159,7 +159,7 @@
 
 
 
-
+
   
 
 
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index d587433..9e3bd35 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -149,7 +149,7 @@
   
   
 
-
+
 
 
 
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 6e8f9e4..0f0508e 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -130,7 +130,7 @@
   
   
   
-  
+  
 
   
   
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index ab11e88..5ffabef 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -144,7 +144,7 @@
 
 
 
-
+
   
 
 
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml 
b/starmath/uiconfig/smath/menubar/menubar.xml
index 9fb9739..3468d43 100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -89,7 +89,7 @@
   
   
   
-  
+  
 
   
   
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 334fc37..d5736a5 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -146,7 +146,7 @@
   
   
   
-  
+  
 
   
   
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index 3bec1a9..ee78c24 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -117,7 +117,7 @@
   
   
   
-  
+  
 
   
   
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index 4f52a7b..ddf914f 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -145,7 +145,7 @@
   
   
   
-  
+  
 
   
   
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index 00be724..fab0914 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.x

[Libreoffice-commits] core.git: officecfg/registry sd/inc sd/sdi sd/source sd/uiconfig svx/inc

2013-04-16 Thread Jakub Golebiewski

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu   |
5 +
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
8 +
 sd/inc/sdcommands.h  |
1 
 sd/sdi/SlideSorterController.sdi |
5 +
 sd/sdi/sdraw.sdi |   
25 +
 sd/source/ui/inc/DrawViewShell.hxx   |
1 
 sd/source/ui/inc/OutlineViewShell.hxx|
1 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx   |   
26 +
 sd/source/ui/view/drviewse.cxx   |   
45 -
 sd/source/ui/view/outlnvs2.cxx   |   
46 --
 sd/uiconfig/simpress/menubar/menubar.xml |
1 
 svx/inc/svx/svxids.hrc   |
1 
 12 files changed, 147 insertions(+), 18 deletions(-)

New commits:
commit baffab9a4ffca9a4940a3310937d6e858e66cc1f
Author: Jakub Golebiewski 
Date:   Tue Apr 9 23:45:52 2013 +0200

Bug 58505 - Tweak F5 for slide display, and add Shift-F5

Added menu entry to start the presentation from current slide.
Changed "Start Presentation" menu entry behavior so it starts
from the first slide.

Change-Id: Iebba85d2d1dcacad7da6b050e2152be5c0d47261

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index fd649ba..6cf3ae3 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2234,6 +2234,11 @@
 
 
  I10N SHORTCUTS 
- NO TRANSLATE
+  .uno:PresentationThisSlide
+ 
+
+
+ I10N SHORTCUTS 
- NO TRANSLATE
   .uno:RestoreEditingView
  
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index d135cd13..9efa408 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -37,6 +37,14 @@
   1
 
   
+  
+
+  Sl~ide Show From This Slide
+
+
+  1
+
+  
   
 
   Impress R~emote
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index daecfe8..f64e686 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -94,6 +94,7 @@
 #define CMD_SID_OUTLINE_TEXT_AUTOFIT".uno.OutlineTextAutofit"
 #define CMD_SID_PAGESETUP   ".uno:PageSetup"
 #define CMD_SID_PRESENTATION".uno:Presentation"
+#define CMD_SID_PRESENTATION_THIS_SLIDE 
".uno:PresentationThisSlide"
 #define CMD_SID_REMOTE_DLG  ".uno:Remote"
 #define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout"
 #define CMD_SID_RENAMELAYER ".uno:RenameLayer"
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index f38a3a8..5b717d1 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -136,6 +136,11 @@ interface SlideSorterView
 ExecMethod = FuTemporary ;
 StateMethod = GetMenuState ;
 ]
+SID_PRESENTATION_THIS_SLIDE // ole : no, status : ?
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
 SID_HIDE_SLIDE // ole : no, status : ?
 [
 ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 83b4d04..5e913a2 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -5196,6 +5196,31 @@ SfxVoidItem Presentation SID_PRESENTATION
 ]
 
 //--
+SfxVoidItem PresentationThisSlide SID_PRESENTATION_THIS_SLIDE
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = TRUE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Asynchron;
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_VIEW;
+]
+
+//--
 SfxVoidItem PresentationDialog SID_PRESENTATION_DLG
 ()
 [
diff --git a/sd/source/ui/inc/DrawViewShell.hxx 
b/sd/source/ui/inc/DrawViewShell.hxx
index 64de25e..f8b94ba 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -403,6 +403,7 @@ protected:
 voidGetMenuStateSel(SfxItemSet& rSet);
 
 priv

[Libreoffice-commits] core.git: officecfg/registry starmath/inc starmath/Library_sm.mk starmath/sdi starmath/source starmath/uiconfig

2013-05-19 Thread Tomaž Vajngerl

 officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu |5 
 starmath/Library_sm.mk|1 
 starmath/inc/ElementsDockingWindow.hxx|  142 ++
 starmath/inc/starmath.hrc |   48 
 starmath/sdi/smath.sdi|   52 
 starmath/sdi/smslots.sdi  |   11 
 starmath/source/ElementsDockingWindow.cxx |  530 
++
 starmath/source/commands.src  |   42 
 starmath/source/document.cxx  |4 
 starmath/source/smdll.cxx |3 
 starmath/source/smres.src |   57 -
 starmath/source/view.cxx  |   78 +
 starmath/uiconfig/smath/menubar/menubar.xml   |1 
 13 files changed, 935 insertions(+), 39 deletions(-)

New commits:
commit 2d3baccf0249f8c68dcf8f9b453d0bc82d8f
Author: TomaÅ¾ Vajngerl 
Date:   Mon May 20 00:13:10 2013 +0200

Math: new rendered Elements docking window added

Added a docking window with elements that are rendered using the
math renderer insted of static pictures. Currently this is an
alternative to the existing elements floating window which will
be removed when the new one is ready. This is an initial but
fully functional version.

Change-Id: I7678d09d643c532c672447026b0f12b7b70fc91d

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index 0c6e2ab..fc99e06 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
@@ -156,6 +156,11 @@
   Elements
 
   
+  
+
+  Elements Dock
+
+  
   
 
   Formula Cursor
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 342190b..a56e439 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,sm,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,sm,\
+starmath/source/ElementsDockingWindow \
 starmath/source/accessibility \
 starmath/source/action \
 starmath/source/caret \
diff --git a/starmath/inc/ElementsDockingWindow.hxx 
b/starmath/inc/ElementsDockingWindow.hxx
new file mode 100644
index 000..48fc51b
--- /dev/null
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -0,0 +1,142 @@
+/* -*- 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 _ELEMENTSDOCKINGWINDOW_HXX_
+#define _ELEMENTSDOCKINGWINDOW_HXX_
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+class SmElement
+{
+SmNode* mpNode;
+OUString maText;
+public:
+SmElement(SmNode* pNode, OUString aText);
+virtual ~SmElement();
+SmNode* getNode();
+
+OUString getText() { return maText; }
+
+virtual bool isSeparator()
+{
+return false;
+}
+
+Point mBoxLocation;
+Size  mBoxSize;
+};
+
+class SmElementSeparator : public SmElement
+{
+public:
+SmElementSeparator();
+
+virtual bool isSeparator()
+{
+return true;
+}
+};
+
+class SmElementsControl : public Control
+{
+
+static const sal_uInt16 aUnaryBinaryOperatorsList[];
+static const sal_uInt16 aRelationsList[];
+static const sal_uInt16 aSetOperations[];
+static const sal_uInt16 aFunctions[];
+static const sal_uInt16 aOperators[];
+static const sal_uInt16 aAttributes[];
+static const sal_uInt16 aBrackets[];
+static const sal_uInt16 aFormats[];
+static const sal_uInt16 aOthers[];
+
+Link aSelectHdlLink;
+
+virtual void Paint(const Rectangle&);
+virtual void MouseButtonDown(const MouseEvent& rMEvt);
+virtual void MouseMove( const MouseEvent& rMEvt );
+
+SmDocShell* mpDocShell;
+SmFormatmaFormat;

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/Library_sc.mk sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk

2013-11-30 Thread Tomaž Vajngerl

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 
 sc/Library_sc.mk  |2 
 sc/UIConfig_scalc.mk  |1 
 sc/inc/sc.hrc |1 
 sc/sdi/cellsh.sdi |1 
 sc/sdi/scalc.sdi  |   24 
 sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc  |1 
 sc/source/ui/StatisticsDialogs/StatisticsDialogs.src  |5 
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx|  257 

 sc/source/ui/StatisticsDialogs/TTestDialog.cxx|  194 ++
 sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx |   28 
 sc/source/ui/app/scdll.cxx|1 
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx  |   96 +++
 sc/source/ui/inc/TTestDialog.hxx  |   35 +
 sc/source/ui/inc/TableFillingAndNavigationTools.hxx   |   28 
 sc/source/ui/inc/reffact.hxx  |6 
 sc/source/ui/view/cellsh1.cxx |   10 
 sc/source/ui/view/tabvwsh.cxx |1 
 sc/source/ui/view/tabvwshc.cxx|7 
 sc/uiconfig/scalc/menubar/menubar.xml |1 
 sc/uiconfig/scalc/ui/ttestdialog.ui   |  308 
++
 21 files changed, 1007 insertions(+), 8 deletions(-)

New commits:
commit 88bece824dd012d9d9ec2812b5ba5ddd3311a5fe
Author: TomaÅ¾ Vajngerl 
Date:   Sat Nov 30 17:58:00 2013 +0100

Add t-test Statistics Dialog.

Change-Id: I6c2b478a4ce6976b5f8fe9cde3d8fbd309dff965

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index f397ed9..e5d53f3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -699,6 +699,14 @@
   1
 
   
+  
+
+  ~t-test...
+
+
+  1
+
+  
   
 
   ~Headers & Footers...
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index fe2ddf8..23d5040 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -486,7 +486,9 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog \
 sc/source/ui/StatisticsDialogs/SamplingDialog \
 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog \
+sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog \
 sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools \
+sc/source/ui/StatisticsDialogs/TTestDialog \
 sc/source/ui/undo/areasave \
 sc/source/ui/undo/refundo \
 sc/source/ui/undo/target \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index e87e0eb..033238b 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
sc/uiconfig/scalc/ui/tpviewpage \
+   sc/uiconfig/scalc/ui/ttestdialog \
sc/uiconfig/scalc/ui/ungroupdialog \
sc/uiconfig/scalc/ui/validationhelptabpage \
sc/uiconfig/scalc/ui/movecopysheet \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 49db89d..83f602c 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -267,6 +267,7 @@
 #define SID_COVARIANCE_DIALOG   (SC_MESSAGE_START + 75)
 #define SID_EXPONENTIAL_SMOOTHING_DIALOG(SC_MESSAGE_START + 76)
 #define SID_MOVING_AVERAGE_DIALOG   (SC_MESSAGE_START + 77)
+#define SID_TTEST_DIALOG(SC_MESSAGE_START + 78)
 
 // functions
 
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 2fe1237..a9b35e2 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -158,6 +158,7 @@ interface CellSelection
 SID_COVARIANCE_DIALOG   [ ExecMethod = ExecuteEdit; 
StateMethod = GetBlockState; ]
 SID_EXPONENTIAL_SMOOTHING_DIALOG[ ExecMethod = ExecuteEdit; 
StateMethod = GetBlockState; ]
 SID_MOVING_AVERAGE_DIALOG   [ ExecMethod = ExecuteEdit; 
StateMethod = GetBlockState; ]
+SID_TTEST_DIALOG[ ExecMethod = ExecuteEdit; 
StateMethod = GetBlockState; ]
 SID_MARKDATAAREA[ ExecMethod = ExecuteMove; StateMethod = 
GetStateCursor; ]
 SID_MARKARRAYFORMULA [ ExecMethod = ExecuteMove; StateMethod = 
GetStateCursor; ]
 SID_SETINPUTMODE[ ExecMethod = ExecuteMove; StateMethod = 
GetStateCursor; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index ec4fbc1..02330257 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -3134

[Libreoffice-commits] core.git: officecfg/registry sd/inc sd/Library_sdui.mk sd/sdi sd/source sd/uiconfig sd/UI_simpress.mk

2013-03-20 Thread Gergő Mocsi

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
9 
 sd/Library_sdui.mk   |
4 
 sd/UI_simpress.mk|
1 
 sd/inc/app.hrc   |
2 
 sd/inc/sdabstdlg.hxx |
2 
 sd/inc/sdcommands.h  |
1 
 sd/sdi/SlideSorterController.sdi |
4 
 sd/sdi/drviewsh.sdi  |
4 
 sd/sdi/outlnvsh.sdi  |
4 
 sd/sdi/sdraw.sdi |   
24 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx|  
378 
 sd/source/ui/dlg/PhotoAlbumDialog.hxx|   
74 +
 sd/source/ui/dlg/sddlgfact.cxx   |
5 
 sd/source/ui/dlg/sddlgfact.hxx   |
5 
 sd/source/ui/view/drviews6.cxx   |   
13 
 sd/uiconfig/simpress/menubar/menubar.xml |
2 
 sd/uiconfig/simpress/ui/photoalbum.ui|  
440 ++
 17 files changed, 970 insertions(+), 2 deletions(-)

New commits:
commit 7ef3b46fd5bdfb3a87e9b0a840287fdb6ff4734b
Author: GergÅ Mocsi 
Date:   Thu Mar 7 11:57:04 2013 +0100

fdo#35546, implementing 'Create Photo Album' function

Create a slideshow from a series of image files.
Created the dialog window (called photoalbum.ui).
Image preview is working.
Options "Fit to slide" and "1 image and title" are implemented.
Added a title page with the author's full name.
TODO: 2 images / 4 images per slide
  i18n of messages
  UI tweaks

Change-Id: I14b337187dc5d373fcd28489098fda813b5fd5f6
Reviewed-on: https://gerrit.libreoffice.org/2582
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index d52bafc..e1fe537 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -60,6 +60,15 @@
   1
 
   
+ 
+
+
+  Create Photo Album
+
+
+  1
+
+  
   
 
 
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 601fb2a..0501234 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -62,6 +62,9 @@ $(eval $(call gb_Library_use_libraries,sdui,\
 cppuhelper \
 editeng \
 i18nisolang1 \
+fwk \
+fwl \
+fwe \
 sal \
 sd \
 sfx \
@@ -106,6 +109,7 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
 sd/source/ui/dlg/tpaction \
 sd/source/ui/dlg/tpoption \
 sd/source/ui/dlg/vectdlg \
+sd/source/ui/dlg/PhotoAlbumDialog \
 ))
 
 # $(WORKDIR)/inc/sd/sddll0.hxx :
diff --git a/sd/UI_simpress.mk b/sd/UI_simpress.mk
index 2caf77c..d6cf6e0 100644
--- a/sd/UI_simpress.mk
+++ b/sd/UI_simpress.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,modules/simpress))
 $(eval $(call gb_UI_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/presentationdialog \
sd/uiconfig/simpress/ui/printeroptions \
+   sd/uiconfig/simpress/ui/photoalbum \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index a0a1087..5dc3b3d 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -214,7 +214,6 @@
 #define SID_LINE_ARROW_SQUARE   (SID_SD_START+177)
 #define SID_LINE_SQUARE_ARROW   (SID_SD_START+178)
 // and even more...
-
 #define ID_VAL_ENDINTENS(SID_SD_START+197)
 #define ID_VAL_STARTINTENS  (SID_SD_START+198)
 #define ID_VAL_BORDER   (SID_SD_START+199)
@@ -356,6 +355,7 @@
 #define SID_CUSTOM_ANIMATION_SCHEMES_PANEL  (SID_SD_START+333)
 #define SID_SLIDE_TRANSITIONS_PANEL (SID_SD_START+334)
 // free
+#define SID_PHOTOALBUM  (SID_SD_START+336)
 #define SID_REMOTE_DLG  (SID_SD_START+337)
 #define SID_CONNECTION_DLG  (SID_SD_START+338)
 #define SID_PRESENTATION_DLG(SID_SD_START+339)
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index b3cde08..4051149 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -213,6 +213,8 @@ public:
 virtual CreateTabPage   GetSdOptionsMiscTabPageCreatorFunc() = 
0;
 virtual CreateTabPage   GetSdOptionsSnapTabPageCreatorFunc() = 
0;
 
+virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( ::Window*

[Libreoffice-commits] core.git: officecfg/registry sfx2/sdi sfx2/source starmath/inc starmath/qa starmath/sdi starmath/source starmath/uiconfig

2013-05-30 Thread Rodolfo Ribeiro Gomes

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 
 sfx2/sdi/appslots.sdi|8 
 sfx2/source/appl/appserv.cxx |   16 +
 starmath/inc/starmath.hrc|5 
 starmath/qa/cppunit/test_starmath.cxx|9 
 starmath/sdi/smath.sdi   |  124 
--
 starmath/sdi/smslots.sdi |   26 --
 starmath/source/smres.src|8 
 starmath/source/view.cxx |   21 -
 starmath/uiconfig/smath/toolbar/toolbar.xml  |6 
 10 files changed, 35 insertions(+), 190 deletions(-)

New commits:
commit ffc2e5be1f712b09710e2096ad2f7eb81b80118d
Author: Rodolfo Ribeiro Gomes 
Date:   Tue May 28 11:22:05 2013 -0300

Clean zoom redundances in Math and fix fdo#55929

Zoom can be handled by sfx2 in many ways:
- 50%, 75%, 100%, 150%, 200%
- Optimal view (fit in window)
- Entire page
- Page width

The math module was doing the first two by itself. Remove it.

Strange enough, state methods for  zoom interface definitions on
sfx2's appslots.sdi were needed. I thought 'Container' property
in sfx.sdi should do the job. It seems to do nothing, though.
(The zoom should be disabled only if the object is an OLE/Container).

The Help-Ids from pop-up menu in Math/Formula were kept, because
they doesn't exist in sfx2.

Change-Id: Ie1ae413780551b34aa36b338f9a9df79a198319c
Reviewed-on: https://gerrit.libreoffice.org/4076
Reviewed-by: LuboÅ¡ LuÅÃ¡k 
Tested-by: LuboÅ¡ LuÅÃ¡k 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 46ed65a..bbed900 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1773,7 +1773,7 @@
   
   
 
-  Optimal
+  Optimal view
 
 
   1
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index aa1da36..320a75e 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -182,34 +182,42 @@ interface Application
 SID_ZOOM_ENTIRE_PAGE
 [
 ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
 ]
 SID_ZOOM_OPTIMAL
 [
 ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
 ]
 SID_ZOOM_PAGE_WIDTH
 [
 ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
 ]
 SID_ZOOM_50_PERCENT
 [
 ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
 ]
 SID_ZOOM_75_PERCENT
 [
 ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
 ]
 SID_ZOOM_100_PERCENT
 [
 ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
 ]
 SID_ZOOM_150_PERCENT
 [
 ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
 ]
 SID_ZOOM_200_PERCENT
 [
 ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
 ]
 SID_HELP_TUTORIALS
 [
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 80a380f..825125d 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -827,6 +827,22 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 }
 break;
 
+case SID_ZOOM_50_PERCENT:
+case SID_ZOOM_75_PERCENT:
+case SID_ZOOM_100_PERCENT:
+case SID_ZOOM_150_PERCENT:
+case SID_ZOOM_200_PERCENT:
+case SID_ZOOM_OPTIMAL:
+case SID_ZOOM_ENTIRE_PAGE:
+case SID_ZOOM_PAGE_WIDTH:
+{
+const SfxPoolItem *pItem;
+SfxItemState aState = 
SfxViewFrame::Current()->GetDispatcher()->QueryState(SID_ATTR_ZOOM, pItem);
+if ( aState == SFX_ITEM_DISABLED )
+rSet.DisableItem( nWhich );
+}
+break;
+
 default:
 break;
 }
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index f233fa4..3b2e902 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -31,13 +31,9 @@
 #define SID_PREVMARK(SID_SMA_START + 4)
 #define SID_SYMBOLS_CATALOGUE   (SID_SMA_START + 5)
 #define SID_PREFERENCES (SID_SMA_START + 6)
-#define SID_VIEW050 (SID_SMA_START + 7)
-#define SID_VIEW100 (SID_SMA_START + 8)
-#defin

84 matches

Mail list logo