[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry sc/inc sc/qa sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 10 +
sc/inc/document.hxx |5
sc/inc/inputopt.hxx |3
sc/inc/sc.hrc|1
sc/inc/sortparam.hxx |1
sc/inc/table.hxx |8 -
sc/qa/unit/ucalc.cxx | 10 -
sc/source/core/data/documen3.cxx |5
sc/source/core/data/table3.cxx | 115 ---
sc/source/core/tool/inputopt.cxx | 34 ++--
sc/source/ui/app/scmod.cxx |9 +
sc/source/ui/docshell/dbdocfun.cxx |5
sc/source/ui/undo/undosort.cxx |2
13 files changed, 135 insertions(+), 73 deletions(-)
New commits:
commit 67f3ce3a9df2bc62db5602dd84975047c1137b92
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 16:21:59 2014 +0100
fdo#81633: Add a hidden configuration option to toggle ref update on sort.
This option is defaulted to off for 4.3 for back-compatibility.
Reviewed-on: https://gerrit.libreoffice.org/11902
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
sc/inc/inputopt.hxx
sc/qa/unit/ucalc.cxx
sc/source/core/tool/inputopt.cxx
Change-Id: I5ac686e96742df40f7d8ba5ffec23806db2988a6
(cherry picked from commit c357fb2dbdc54d9ee8471ce4e9f9381e74a6deed)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 0cdb9d5..54e15fc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -678,6 +678,16 @@
/info
valuefalse/value
/prop
+ prop oor:name=UpdateReferenceOnSort oor:type=xs:boolean
oor:nillable=false
+!-- OldPath: Calc/Input --
+!-- OldLocation: Soffice.cfg --
+!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input
--
+info
+ descSpecifies whether references get updated when performing sort
on a range of cells./desc
+ labelUpdate references when sorting range of cells/label
+/info
+valuefalse/value
+ /prop
prop oor:name=HighlightSelection oor:type=xs:boolean
oor:nillable=false
!-- OldPath: Calc/Input --
!-- OldLocation: Soffice.cfg --
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 9d365cc..44107b4 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1664,7 +1664,10 @@ public:
SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
SC_DLLPUBLIC SvNumberFormatter* CreateFormatTable() const;
-void Sort( SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery,
ScProgress* pProgress, sc::ReorderParam* pUndo );
+void Sort(
+SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, bool
bUpdateRefs,
+ScProgress* pProgress, sc::ReorderParam* pUndo );
+
void Reorder( const sc::ReorderParam rParam, ScProgress* pProgress );
SCSIZE Query( SCTAB nTab, const ScQueryParam rQueryParam, bool
bKeepSub );
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index 3a46bf6..3c33154 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -32,6 +32,7 @@ private:
sal_BoolbExtendFormat;
sal_BoolbRangeFinder;
sal_BoolbExpandRefs;
+sal_BoolmbSortRefUpdate;
sal_BoolbMarkHeader;
sal_BoolbUseTabCol;
sal_BoolbTextWysiwyg;
@@ -57,6 +58,8 @@ public:
sal_BoolGetRangeFinder() const { return bRangeFinder; }
voidSetExpandRefs(sal_Bool bSet){ bExpandRefs = bSet;}
sal_BoolGetExpandRefs() const { return bExpandRefs;}
+voidSetSortRefUpdate(sal_Bool bSet) { mbSortRefUpdate = bSet; }
+sal_BoolGetSortRefUpdate() const{ return mbSortRefUpdate; }
voidSetMarkHeader(sal_Bool bSet){ bMarkHeader = bSet;}
sal_BoolGetMarkHeader() const { return bMarkHeader;}
voidSetUseTabCol(sal_Bool bSet) { bUseTabCol = bSet; }
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 8e517ae..63ff3ba 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -86,6 +86,7 @@
// TabPage entry - Legacy selection
#define SID_SC_INPUT_LEGACY_CELL_SELECTION (SC_VIEW_START + 15)
+#define SID_SC_OPT_SORT_REF_UPDATE (SC_VIEW_START + 16)
// Format options
#define SID_SCFORMULAOPTIONS
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry sd/source
officecfg/registry/schema/org/openoffice/Office/Impress.xcs |2 +-
sd/source/ui/remotecontrol/Server.cxx |6 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 99023fe9bd7d8b665faed7fe9cb98b3fb8922292
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Oct 7 10:10:27 2014 +0100
Disable sdremote by default, and improve flow control.
It was intended to disable sdremote by default when it exited
experimental mode.
This reverts commit 576943b9bf7506829de97d2194c4bee35a485436.
Change-Id: I2c1b5443e334021bd9574316167f48b1af6200e5
Reviewed-on: https://gerrit.libreoffice.org/11837
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index b740aca..01836d6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -629,7 +629,7 @@
descIndicates whether to enable the Impress remote
controller./desc
labelEnable remote control/label
/info
- valuetrue/value
+ valuefalse/value
/prop
prop oor:name=EnablePresenterScreen oor:type=xs:boolean
oor:nillable=false
info
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index 51796cc..fb24e67 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -115,7 +115,11 @@ void RemoteServer::execute()
{
OString aName( aLine );
-if ( ! pSocket-readLine( aLine ) ) delete pSocket;
+if ( ! pSocket-readLine( aLine ) )
+{
+delete pSocket;
+continue;
+}
OString aPin( aLine );
SocketAddr aClientAddr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu | 17 -- 1 file changed, 17 deletions(-) New commits: commit e5de2511068a1b7eea34fb10ea19b555abcd663b Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Sun Jun 1 03:45:34 2014 +0200 don't add the changes toolbar to the forms window, fdo#76752 Change-Id: I1a5d62b0995343a73fd8d6941f0fa380bb19e783 Reviewed-on: https://gerrit.libreoffice.org/9605 Reviewed-by: Maxim Monastirsky momonas...@gmail.com Tested-by: Maxim Monastirsky momonas...@gmail.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu index 49f3fe3..7d02379 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu @@ -697,23 +697,6 @@ valuetrue/value /prop /node - node oor:name=private:resource/toolbar/changes oor:op=replace -prop oor:name=UIName oor:type=xs:string - value xml:lang=en-USChanges/value -/prop -prop oor:name=Docked oor:type=xs:boolean - valuetrue/value -/prop -prop oor:name=DockingArea oor:type=xs:int - value2/value -/prop -prop oor:name=DockPos oor:type=xs:string - value0,0/value -/prop -prop oor:name=Visible oor:type=xs:boolean - valuetrue/value -/prop - /node /node /node /oor:component-data ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e6d5a3d6cd90b9618697cde2ec99390fe6ad5ffe Author: Kohei Yoshida kohei.yosh...@collabora.com 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 (cherry picked from commit 1d7c97a607615c3f176c9f553d1d011e4ee55c1d) Reviewed-on: https://gerrit.libreoffice.org/9399 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index c204e5e..8864d3c 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -640,7 +640,7 @@ /node node oor:name=.uno:StatisticsMenu oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-US~Statistics/value + value xml:lang=en-USStatistics/value /prop /node node oor:name=.uno:SamplingDialog oor:op=replace ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Paths.xcu |1 + 1 file changed, 1 insertion(+) New commits: commit a5b68f520067219c5e571238eafe93d1d728ce38 Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 25 09:55:48 2014 + Resolves: fdo#76930 explictly list common lang-independant template dir (cherry picked from commit 6f48d0bb2d3f3b4e4d3e46d3a5cdeaa552df1933) Change-Id: I50d8efe46fc2eb3dfe615ad1f6eb7ee03cdcd29a Reviewed-on: https://gerrit.libreoffice.org/8909 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index 4b5ec7d..05f8e0b 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -158,6 +158,7 @@ /node node oor:name=Template oor:op=fuse oor:mandatory=true node oor:name=InternalPaths +node oor:name=$(insturl)/@LIBO_SHARE_FOLDER@/template/common oor:op=fuse/ node oor:name=$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang) oor:op=fuse/ /node prop oor:name=WritePath ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs |1 + 1 file changed, 1 insertion(+) New commits: commit 385c54367fe1f7453ff9127de79251deaf28cdee Author: Andras Timar andras.ti...@collabora.com Date: Fri Mar 7 11:39:55 2014 +0100 fdo#60833 user's wordbook should be selected by default Change-Id: Ic710f719df3ba71a8b71e6ef8afd54d60e73c5d9 Reviewed-on: https://gerrit.libreoffice.org/8493 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs index 9b78c7a..b6e2094 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs @@ -217,6 +217,7 @@ /info value itIgnoreAllList/it +itstandard.dic/it iten-US.dic/it iten-GB.dic/it itsl.dic/it ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry sc/inc sc/sdi sc/source
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5 -
sc/inc/sc.hrc |3
sc/sdi/formatsh.sdi |1
sc/sdi/scalc.sdi | 26 -
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(+), 93 deletions(-)
New commits:
commit cb2a2813f8fdcb3c888c203a72370883df178c60
Author: Maxim Monastirsky momonas...@gmail.com
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).
Reviewed-on: https://gerrit.libreoffice.org/8459
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit c3403ac888c2e62edaf8befe7982f5f8cc95c16f)
Conflicts:
sc/sdi/scalc.sdi
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
Change-Id: I90bdfaef86adcbfa44129b8f7f9df61ca7f35114
Reviewed-on: https://gerrit.libreoffice.org/8463
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index f397ed9..c204e5e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -809,11 +809,6 @@
value xml:lang=en-US~Formula Bar/value
/prop
/node
- node oor:name=.uno:ViewGridLines oor:op=replace
-prop oor:name=Label oor:type=xs:string
- value xml:lang=en-USView Grid lines/value
-/prop
- /node
node oor:name=.uno:ViewRowColumnHeaders oor:op=replace
prop oor:name=Label oor:type=xs:string
value xml:lang=en-USC~olumn amp; Row Headers/value
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index a717395..4c72f1c 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -676,8 +676,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 6938133..48557e0 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 ec4fbc1..f4bba08 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -8776,32 +8776,6 @@ SfxVoidItem ExportAsGraphic SID_EXPORT_AS_GRAPHIC
GroupId = GID_CHART;
]
-//--
-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 1f8b872..4386a2a 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -179,8 +179,7 @@ static SfxItemInfo const aItemInfos[] =
{ SID_ATTR_PAGE_FOOTERSET, SFX_ITEM_POOLABLE },//
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu | 54 - 1 file changed, 27 insertions(+), 27 deletions(-) New commits: commit d54c7b5c373753f990e53f0342bf87e910902eaf Author: Samuel Mehrbrodt s.mehrbr...@gmail.com 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 caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 06299d6c1620e5b2f2a3588d7c93790278397cbd) 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 @@ node oor:name=DefaultFonts node oor:name=en oor:op=replace prop oor:name=LATIN_DISPLAY oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=CJK_DISPLAY oor:type=xs:string oor:op=replace valueMS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;AR PL ShanHeiSun Uni;MS PGothic;Arial Unicode MS;Lucida Sans Unicode;Tahoma/value /prop prop oor:name=LATIN_HEADING oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=LATIN_FIXED oor:type=xs:string oor:op=replace -valueCumberland AMT;Cumberland;Courier New;Cousine;Liberation Mono;Nimbus Mono L;DejaVu Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced/value +valueLiberation Mono;Cumberland AMT;Cumberland;Courier New;Cousine;Nimbus Mono L;DejaVu Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced/value /prop prop oor:name=LATIN_PRESENTATION oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=LATIN_SPREADSHEET oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=LATIN_TEXT oor:type=xs:string oor:op=replace -valueThorndale AMT;Thorndale;Times New Roman;Tinos;Liberation Serif;Nimbus Roman No9 L;DejaVu Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif/value +valueLiberation Serif;Thorndale AMT;Thorndale;Times New Roman;Tinos;Nimbus Roman No9 L;DejaVu Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif/value /prop prop oor:name=CJK_HEADING oor:type=xs:string oor:op=replace valueHG 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/value @@ -103,22 +103,22 @@ valueTahoma;Lucidasans;Lucida Sans;Arial Unicode MS/value /prop prop oor:name=SANS oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5ede7a6eb759081bb4041dac7b792965b6a1d52a Author: Samuel Mehrbrodt s.mehrbr...@gmail.com 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 caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 0d4e04b8378ca3e142c8b2f2c50851b3c74df012) 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 @@ /node node oor:name=.uno:ShiftBackspace oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USBackspace/value + value xml:lang=en-USShift+Backspace/value /prop /node node oor:name=.uno:SelectWord oor:op=replace ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
