[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - officecfg/registry

2019-11-22 Thread Takeshi Abe (via logerrit) 
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9b1955b0d8540968a3796166ddf3694335d
Author: Takeshi Abe 
AuthorDate: Thu Nov 21 19:00:20 2019 +0900
Commit: Xisco Faulí 
CommitDate: Sat Nov 23 08:57:36 2019 +0100

tdf#128892 Give menu "Rename Sheet" an alternative mnemonic H

... to avoid the duplicate R for "Insert Rows".

Change-Id: Ie2e0faf566ba5f85e4b2a72c289a4320e580f7f9
Reviewed-on: https://gerrit.libreoffice.org/83368
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 017c6150e94a3a621f6f3e789fe72cac90a7bf11)
Reviewed-on: https://gerrit.libreoffice.org/83510

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 5fc352c50f8c..099c1f249d21 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1928,7 +1928,7 @@
   
   
 
-  ~Rename Sheet...
+  Rename S~heet...
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-11-22 Thread Takeshi Abe (via logerrit) 
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 017c6150e94a3a621f6f3e789fe72cac90a7bf11
Author: Takeshi Abe 
AuthorDate: Thu Nov 21 19:00:20 2019 +0900
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Nov 22 16:04:45 2019 +0100

tdf#128892 Give menu "Rename Sheet" an alternative mnemonic H

... to avoid the duplicate R for "Insert Rows".

Change-Id: Ie2e0faf566ba5f85e4b2a72c289a4320e580f7f9
Reviewed-on: https://gerrit.libreoffice.org/83368
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 5fc352c50f8c..099c1f249d21 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1928,7 +1928,7 @@
   
   
 
-  ~Rename Sheet...
+  Rename S~heet...
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-07-08 Thread Takeshi Abe (via logerrit) 
 sc/inc/conditio.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86876ff86ef19af20e1c7202e029bbde44051a07
Author: Takeshi Abe 
AuthorDate: Sun Jun 23 19:32:41 2019 +0900
Commit: Tor Lillqvist 
CommitDate: Mon Jul 8 10:03:25 2019 +0200

sc: the type is not Data, but Date

Change-Id: I32105e1f40ddb0c206d62f30f66054b7dbe803d0
Reviewed-on: https://gerrit.libreoffice.org/74594
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 49c05fbbb3c7..42448174ca52 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -280,7 +280,7 @@ inline std::basic_ostream & operator 
<<(std::basic_ostream(rType) << ")";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - extras/source starmath/inc starmath/qa starmath/source starmath/uiconfig

2019-06-18 Thread Takeshi Abe (via logerrit) 
 extras/source/truetype/symbol/OpenSymbol.sfd|   25 
 starmath/inc/node.hxx   |2 -
 starmath/inc/strings.hrc|2 +
 starmath/inc/strings.hxx|2 +
 starmath/inc/token.hxx  |4 ++-
 starmath/inc/types.hxx  |1 
 starmath/qa/cppunit/test_nodetotextvisitors.cxx |2 +
 starmath/source/ElementsDockingWindow.cxx   |4 ++-
 starmath/source/mathmlexport.cxx|1 
 starmath/source/mathtype.cxx|2 +
 starmath/source/node.cxx|3 ++
 starmath/source/ooxmlexport.cxx |1 
 starmath/source/ooxmlimport.cxx |3 ++
 starmath/source/parse.cxx   |3 ++
 starmath/source/rtfexport.cxx   |1 
 starmath/uiconfig/smath/popupmenu/edit.xml  |2 +
 16 files changed, 51 insertions(+), 7 deletions(-)

New commits:
commit 528a1e8b1a2b26cf75e714145aea897079c02409
Author: Takeshi Abe 
AuthorDate: Mon May 27 00:12:28 2019 +0900
Commit: Xisco Faulí 
CommitDate: Tue Jun 18 14:07:13 2019 +0200

tdf#120047 Support attribute harpoon/wideharpoon in Math

... for an alternative style of vectors.

They are vec/widevec analogs but with COMBINING RIGHT HARPOON ABOVE
(U+20D1).  The new attribute names are deliberately long in order to
make fewer accidental collisions with variable names in formulae of
exising documents.

This also adds a glyph uni20D1 to OpenSymbol.

Change-Id: I31666e57808aa0e0327500916d3b862549891886
Reviewed-on: https://gerrit.libreoffice.org/72987
Tested-by: Jenkins
Reviewed-by: Takeshi Abe 
(cherry picked from commit 93eeaf0ad902214fb6b4205606b24046a458ee45)
Reviewed-on: https://gerrit.libreoffice.org/74251
Reviewed-by: Xisco Faulí 

diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index 35d4b01328b9..c9e9baad1707 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -3,8 +3,8 @@ FontName: OpenSymbol
 FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
-Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation
-Version: 102.10
+Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi Abe
+Version: 102.11
 ItalicAngle: 0
 UnderlinePosition: -143
 UnderlineWidth: 20
@@ -20,7 +20,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1144938807
-ModificationTime: 1479754802
+ModificationTime: 1558881510
 PfmFamily: 81
 TTFWeight: 400
 TTFWidth: 5
@@ -784,7 +784,7 @@ FitToEm: 1
 WinInfo: 0 34 12
 BeginPrivate: 0
 EndPrivate
-BeginChars: 1052 1052
+BeginChars: 1053 1053
 
 StartChar: Alpha
 Encoding: 0 913 0
@@ -108707,5 +108707,22 @@ SplineSet
  508 1286 l 1,6,-1
 EndSplineSet
 EndChar
+
+StartChar: uni20D1
+Encoding: 1052 8401 1052
+Width: 1056
+Flags: W
+HStem: 1313 112<98 686>
+LayerCount: 2
+Fore
+SplineSet
+98 1313 m 1,0,-1
+ 98 1425 l 1,1,-1
+ 686 1425 l 1,2,-1
+ 645 1575 l 1,3,-1
+ 1026 1313 l 1,4,-1
+ 98 1313 l 1,0,-1
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index da67e9bdece6..73bfb17132c9 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -1019,7 +1019,7 @@ public:
 /** Attribute node
  *
  * Used to give an attribute to another node. Used for commands such as:
- * UNDERLINE, OVERLINE, OVERSTRIKE, WIDEVEC, WIDEHAT and WIDETILDE.
+ * UNDERLINE, OVERLINE, OVERSTRIKE, WIDEVEC, WIDEHARPOON, WIDEHAT and 
WIDETILDE.
  *
  * Children:
  * 0: Attribute
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index eec600990ba0..f12677d26eca 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -165,6 +165,7 @@
 #define RID_HATX_HELP   NC_("RID_HATX_HELP", "Circumflex" )
 #define RID_TILDEX_HELP NC_("RID_TILDEX_HELP", "Tilde" )
 #define RID_VECX_HELP   NC_("RID_VECX_HELP", "Vector 
Arrow" )
+#define RID_HARPOONX_HELP   NC_("RID_HARPOONX_HELP", "Harpoon"

[Libreoffice-commits] core.git: extras/source starmath/inc starmath/qa starmath/source starmath/uiconfig

2019-06-12 Thread Takeshi Abe (via logerrit) 
 extras/source/truetype/symbol/OpenSymbol.sfd|   25 
 starmath/inc/node.hxx   |2 -
 starmath/inc/strings.hrc|2 +
 starmath/inc/strings.hxx|2 +
 starmath/inc/token.hxx  |4 ++-
 starmath/inc/types.hxx  |1 
 starmath/qa/cppunit/test_nodetotextvisitors.cxx |2 +
 starmath/source/ElementsDockingWindow.cxx   |4 ++-
 starmath/source/mathmlexport.cxx|1 
 starmath/source/mathtype.cxx|2 +
 starmath/source/node.cxx|3 ++
 starmath/source/ooxmlexport.cxx |1 
 starmath/source/ooxmlimport.cxx |3 ++
 starmath/source/parse.cxx   |3 ++
 starmath/source/rtfexport.cxx   |1 
 starmath/uiconfig/smath/popupmenu/edit.xml  |2 +
 16 files changed, 51 insertions(+), 7 deletions(-)

New commits:
commit 93eeaf0ad902214fb6b4205606b24046a458ee45
Author: Takeshi Abe 
AuthorDate: Mon May 27 00:12:28 2019 +0900
Commit: Takeshi Abe 
CommitDate: Thu Jun 13 05:11:25 2019 +0200

tdf#120047 Support attribute harpoon/wideharpoon in Math

... for an alternative style of vectors.

They are vec/widevec analogs but with COMBINING RIGHT HARPOON ABOVE
(U+20D1).  The new attribute names are deliberately long in order to
make fewer accidental collisions with variable names in formulae of
exising documents.

This also adds a glyph uni20D1 to OpenSymbol.

Change-Id: I31666e57808aa0e0327500916d3b862549891886
Reviewed-on: https://gerrit.libreoffice.org/72987
Tested-by: Jenkins
Reviewed-by: Takeshi Abe 

diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index 35d4b01328b9..c9e9baad1707 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -3,8 +3,8 @@ FontName: OpenSymbol
 FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
-Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation
-Version: 102.10
+Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi Abe
+Version: 102.11
 ItalicAngle: 0
 UnderlinePosition: -143
 UnderlineWidth: 20
@@ -20,7 +20,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1144938807
-ModificationTime: 1479754802
+ModificationTime: 1558881510
 PfmFamily: 81
 TTFWeight: 400
 TTFWidth: 5
@@ -784,7 +784,7 @@ FitToEm: 1
 WinInfo: 0 34 12
 BeginPrivate: 0
 EndPrivate
-BeginChars: 1052 1052
+BeginChars: 1053 1053
 
 StartChar: Alpha
 Encoding: 0 913 0
@@ -108707,5 +108707,22 @@ SplineSet
  508 1286 l 1,6,-1
 EndSplineSet
 EndChar
+
+StartChar: uni20D1
+Encoding: 1052 8401 1052
+Width: 1056
+Flags: W
+HStem: 1313 112<98 686>
+LayerCount: 2
+Fore
+SplineSet
+98 1313 m 1,0,-1
+ 98 1425 l 1,1,-1
+ 686 1425 l 1,2,-1
+ 645 1575 l 1,3,-1
+ 1026 1313 l 1,4,-1
+ 98 1313 l 1,0,-1
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index da67e9bdece6..73bfb17132c9 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -1019,7 +1019,7 @@ public:
 /** Attribute node
  *
  * Used to give an attribute to another node. Used for commands such as:
- * UNDERLINE, OVERLINE, OVERSTRIKE, WIDEVEC, WIDEHAT and WIDETILDE.
+ * UNDERLINE, OVERLINE, OVERSTRIKE, WIDEVEC, WIDEHARPOON, WIDEHAT and 
WIDETILDE.
  *
  * Children:
  * 0: Attribute
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index eec600990ba0..f12677d26eca 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -165,6 +165,7 @@
 #define RID_HATX_HELP   NC_("RID_HATX_HELP", "Circumflex" )
 #define RID_TILDEX_HELP NC_("RID_TILDEX_HELP", "Tilde" )
 #define RID_VECX_HELP   NC_("RID_VECX_HELP", "Vector 
Arrow" )
+#define RID_HARPOONX_HELP   NC_("RID_HARPOONX_HELP", "Harpoon" 
)
 #define RID_UNDERLINEX_HELP NC_("RID_UNDERLINEX_HELP", "Line 
Below" )
 #define RID_OVERLINEX_HELP

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source

2019-06-01 Thread Takeshi Abe (via logerrit) 
 cui/source/dialogs/about.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit df67a9ae9c1e9f3e21b1674deb4036f61eced05c
Author: Takeshi Abe 
AuthorDate: Thu May 30 23:56:25 2019 +0900
Commit: Xisco Faulí 
CommitDate: Sat Jun 1 19:58:36 2019 +0200

tdf#124936 Show "(x86)" in About dialog on the 32-bit version

... installed on Windows.

Change-Id: I2a4d846265b69f0e46e4c711430689ce39d60fcd
Reviewed-on: https://gerrit.libreoffice.org/73211
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 932c1bd99f4b99705c3948d0babaa1f4160f37c3)
Reviewed-on: https://gerrit.libreoffice.org/73313
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index a99a814d28e1..2059ac7f10c3 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -304,6 +304,8 @@ OUString AboutDialog::GetVersionString()
 
 #ifdef _WIN64
 sVersion += " (x64)";
+#elif defined(_WIN32)
+sVersion += " (x86)";
 #endif
 
 OUString sBuildId = GetBuildId();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-31 Thread Takeshi Abe (via logerrit) 
 cui/source/dialogs/about.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 932c1bd99f4b99705c3948d0babaa1f4160f37c3
Author: Takeshi Abe 
AuthorDate: Thu May 30 23:56:25 2019 +0900
Commit: Michael Stahl 
CommitDate: Fri May 31 11:29:35 2019 +0200

tdf#124936 Show "(x86)" in About dialog on the 32-bit version

... installed on Windows.

Change-Id: I2a4d846265b69f0e46e4c711430689ce39d60fcd
Reviewed-on: https://gerrit.libreoffice.org/73211
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 7d5266682144..cdafad532c2c 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -313,6 +313,8 @@ OUString AboutDialog::GetVersionString()
 
 #ifdef _WIN64
 sVersion += " (x64)";
+#elif defined(_WIN32)
+sVersion += " (x86)";
 #endif
 
 OUString sBuildId = GetBuildId();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-15 Thread Takeshi Abe (via logerrit) 
 scp2/source/ooo/folderitem_ooo.scp |2 +-
 scp2/source/ooo/folderitem_ooo.ulf |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5fbd5c9ba97a7ecacebc6bcc582a36dd1631a5b3
Author: Takeshi Abe 
AuthorDate: Mon May 13 10:32:05 2019 +0900
Commit: Andras Timar 
CommitDate: Wed May 15 12:38:30 2019 +0200

tdf#116431 Make the string "LibreOffice (Safe Mode)" translatable

Change-Id: I29f68f16c228c46841a7a3a50bb6dfe4f703403f
Reviewed-on: https://gerrit.libreoffice.org/72212
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/scp2/source/ooo/folderitem_ooo.scp 
b/scp2/source/ooo/folderitem_ooo.scp
index 2e67a6a6aea0..a9f68ffd3dea 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -67,7 +67,7 @@ FolderItemProperty gid_Fip_Soffice_Desktop_AppID
 End
 
 FolderItem gid_Folderitem_LibreOffice_SafeMode
-Name = "%PRODUCTNAME (Safe Mode)";
+ALL_LANG(Name, STR_FI_NAME_SAFEMODE);
 ModuleID = gid_Module_Root;
 #ifdef ENABLE_SILENT_MSI
 FolderID = PREDEFINED_STARTMENU;
diff --git a/scp2/source/ooo/folderitem_ooo.ulf 
b/scp2/source/ooo/folderitem_ooo.ulf
index 4295c5a2f0b2..22f8a37f7981 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -22,5 +22,8 @@ en-US = "From Template"
 [STR_FI_NAME_OPENDOCUMENT]
 en-US = "Open Document"
 
+[STR_FI_NAME_SAFEMODE]
+en-US = "%PRODUCTNAME (Safe Mode)"
+
 [STR_FI_TOOLTIP_SOFFICE]
 en-US = "LibreOffice, the office productivity suite provided by The Document 
Foundation. See https://www.documentfoundation.org;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - shell/source

2019-04-13 Thread Takeshi Abe (via logerrit) 
 shell/source/backends/desktopbe/desktopbackend.cxx |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 64381dad01132f74e513c347db87f304d0e704ff
Author: Takeshi Abe 
AuthorDate: Thu Mar 28 19:04:30 2019 +0900
Commit: Caolán McNamara 
CommitDate: Sat Apr 13 21:44:18 2019 +0200

tdf#119890 followup: Forbid HOME to be the default dir

... of user templates

This is kludgy yet better than making innocent users waiting for
the template dialog ~forever as pointed out in the comments in
.

Change-Id: I6dfdc0408effb06cc9175cd976ea6687e52a7136
Reviewed-on: https://gerrit.libreoffice.org/70709
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx 
b/shell/source/backends/desktopbe/desktopbackend.cxx
index 5923c6583fb7..4b1d0c44b182 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -127,7 +127,7 @@ void Default::setPropertyValue(OUString const &, 
css::uno::Any const &)
 static_cast< cppu::OWeakObject * >(this), -1);
 }
 
-OUString xdg_user_dir_lookup (const char *type)
+OUString xdg_user_dir_lookup (const char *type, bool bAllowHomeDir)
 {
 size_t nLenType = strlen(type);
 char *config_home;
@@ -218,16 +218,20 @@ OUString xdg_user_dir_lookup (const char *type)
 if (aUserDirBuf.getLength()>0 && !bError)
 {
 aDocumentsDirURL = aUserDirBuf.makeStringAndClear();
-osl::Directory aDocumentsDir( aDocumentsDirURL );
-if( osl::FileBase::E_None == aDocumentsDir.open() )
-return aDocumentsDirURL;
+if ( bAllowHomeDir ||
+ (aDocumentsDirURL != aHomeDirURL && aDocumentsDirURL != 
aHomeDirURL + "/") )
+{
+osl::Directory aDocumentsDir( aDocumentsDirURL );
+if( osl::FileBase::E_None == aDocumentsDir.open() )
+return aDocumentsDirURL;
+}
 }
 /* Use fallbacks historical compatibility if nothing else exists */
 return aHomeDirURL + "/" + OUString::createFromAscii(type);
 }
 
-css::uno::Any xdgDirectoryIfExists(char const * type) {
-auto url = xdg_user_dir_lookup(type);
+css::uno::Any xdgDirectoryIfExists(char const * type, bool bAllowHomeDir) {
+auto url = xdg_user_dir_lookup(type, bAllowHomeDir);
 return css::uno::Any(
 osl::Directory(url).open() == osl::FileBase::E_None
 ? css::beans::Optional(true, css::uno::Any(url))
@@ -238,12 +242,13 @@ css::uno::Any Default::getPropertyValue(OUString const & 
PropertyName)
 {
 if (PropertyName == "TemplatePathVariable")
 {
-return xdgDirectoryIfExists("Templates");
+// Never pick up the HOME directory as the default location of user's 
templates
+return xdgDirectoryIfExists("Templates", false);
 }
 
 if (PropertyName == "WorkPathVariable")
 {
-return xdgDirectoryIfExists("Documents");
+return xdgDirectoryIfExists("Documents", true);
 }
 
 if ( PropertyName == "EnableATToolSupport" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-04-13 Thread Takeshi Abe (via logerrit) 
 shell/source/backends/desktopbe/desktopbackend.cxx |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 88d46ba32e4a03d848d82210071c42208e0d6eca
Author: Takeshi Abe 
AuthorDate: Thu Mar 28 19:04:30 2019 +0900
Commit: Caolán McNamara 
CommitDate: Sat Apr 13 14:59:48 2019 +0200

tdf#119890 followup: Forbid HOME to be the default dir

... of user templates

This is kludgy yet better than making innocent users waiting for
the template dialog ~forever as pointed out in the comments in
.

Change-Id: I6dfdc0408effb06cc9175cd976ea6687e52a7136
Reviewed-on: https://gerrit.libreoffice.org/69883
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx 
b/shell/source/backends/desktopbe/desktopbackend.cxx
index 4f3c2940869b..14b22b033fb1 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -127,7 +127,7 @@ void Default::setPropertyValue(OUString const &, 
css::uno::Any const &)
 static_cast< cppu::OWeakObject * >(this), -1);
 }
 
-OUString xdg_user_dir_lookup (const char *type)
+OUString xdg_user_dir_lookup (const char *type, bool bAllowHomeDir)
 {
 size_t nLenType = strlen(type);
 char *config_home;
@@ -218,16 +218,20 @@ OUString xdg_user_dir_lookup (const char *type)
 if (aUserDirBuf.getLength()>0 && !bError)
 {
 aDocumentsDirURL = aUserDirBuf.makeStringAndClear();
-osl::Directory aDocumentsDir( aDocumentsDirURL );
-if( osl::FileBase::E_None == aDocumentsDir.open() )
-return aDocumentsDirURL;
+if ( bAllowHomeDir ||
+ (aDocumentsDirURL != aHomeDirURL && aDocumentsDirURL != 
aHomeDirURL + "/") )
+{
+osl::Directory aDocumentsDir( aDocumentsDirURL );
+if( osl::FileBase::E_None == aDocumentsDir.open() )
+return aDocumentsDirURL;
+}
 }
 /* Use fallbacks historical compatibility if nothing else exists */
 return aHomeDirURL + "/" + OUString::createFromAscii(type);
 }
 
-css::uno::Any xdgDirectoryIfExists(char const * type) {
-auto url = xdg_user_dir_lookup(type);
+css::uno::Any xdgDirectoryIfExists(char const * type, bool bAllowHomeDir) {
+auto url = xdg_user_dir_lookup(type, bAllowHomeDir);
 return css::uno::Any(
 osl::Directory(url).open() == osl::FileBase::E_None
 ? css::beans::Optional(true, css::uno::Any(url))
@@ -238,12 +242,13 @@ css::uno::Any Default::getPropertyValue(OUString const & 
PropertyName)
 {
 if (PropertyName == "TemplatePathVariable")
 {
-return xdgDirectoryIfExists("Templates");
+// Never pick up the HOME directory as the default location of user's 
templates
+return xdgDirectoryIfExists("Templates", false);
 }
 
 if (PropertyName == "WorkPathVariable")
 {
-return xdgDirectoryIfExists("Documents");
+return xdgDirectoryIfExists("Documents", true);
 }
 
 if ( PropertyName == "EnableATToolSupport" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source include/filter

2019-04-12 Thread Takeshi Abe (via logerrit) 
 filter/source/msfilter/svdfppt.cxx  |6 +-
 include/filter/msfilter/svdfppt.hxx |3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 03b3562a91c54e0c1b77982e1ca391b1131ac3c2
Author: Takeshi Abe 
AuthorDate: Wed Mar 13 00:10:20 2019 +0900
Commit: Noel Grandin 
CommitDate: Fri Apr 12 10:49:10 2019 +0200

filter: inline PptFontCollection to avoid inheritance of std::vector

Change-Id: Ib431f6f69dc3da958629f54d6d2a1ce76b9d63a5
Reviewed-on: https://gerrit.libreoffice.org/69108
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 69597b3a8b05..7b4e365cfd69 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -461,10 +461,6 @@ SvStream& ReadPptFontEntityAtom( SvStream& rIn, 
PptFontEntityAtom& rAtom )
 return rIn;
 }
 
-class PptFontCollection : public 
std::vector>
-{
-};
-
 SvStream& ReadPptUserEditAtom( SvStream& rIn, PptUserEditAtom& rAtom )
 {
 sal_Int16 lastViewType = 0;
@@ -2163,7 +2159,7 @@ bool SdrPowerPointImport::ReadFontCollection()
 {
 bRet = true;
 if (!m_pFonts)
-m_pFonts.reset( new PptFontCollection );
+m_pFonts.reset( new 
std::vector> );
 std::unique_ptr pFont(new 
PptFontEntityAtom);
 ReadPptFontEntityAtom( rStCtrl, *pFont );
 
diff --git a/include/filter/msfilter/svdfppt.hxx 
b/include/filter/msfilter/svdfppt.hxx
index f907cc01d40e..66be39501c79 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -281,7 +281,6 @@ struct PptFontEntityAtom
 friend SvStream& ReadPptFontEntityAtom(SvStream& rIn, PptFontEntityAtom& 
rAtom);
 };
 
-class PptFontCollection;
 enum class PptViewTypeEnum : sal_uInt16
 {
 NONE = 0,
@@ -463,7 +462,7 @@ protected:
 
 ::std::vector< PPTOleEntry > aOleObjectList;
 
-std::unique_ptr m_pFonts;
+std::unique_ptr>> m_pFonts;
 
 sal_uInt32  nStreamLen;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-3' - i18npool/source svl/source

2019-04-03 Thread Takeshi Abe (via logerrit) 
 i18npool/source/calendar/calendar_gregorian.cxx |2 +-
 i18npool/source/localedata/data/ja_JP.xml   |8 +++-
 svl/source/numbers/zformat.cxx  |2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 970b34a83fcec4feed79418cfb4a9246acb1648a
Author: Takeshi Abe 
AuthorDate: Mon Apr 1 11:44:32 2019 +0900
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Apr 3 16:28:06 2019 +0200

Introduce next Japanese gengou era 'Reiwa'

starting from 2019-05-01, which has been announced officially.

This fills the provisional slot acknowledged at
cacbb0faef77ae8462de9ff5c7307a6a2e28b2bb.

Change-Id: Ifb12e6afaad4c66d455f664b46ec946e80324e87
Reviewed-on: https://gerrit.libreoffice.org/70157
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 70bfc2174cd5ac6678ecd43b0d325398e0320a03)
Reviewed-on: https://gerrit.libreoffice.org/70184
Reviewed-by: Xisco Faulí 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index b8f1d15ee66f..cc15c9c40f6e 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -209,7 +209,7 @@ static const Era gengou_eraArray[] = {
 {1912,  7, 30, 0},  // Taisho
 {1926, 12, 25, 0},  // Showa
 {1989,  1,  8, 0},  // Heisei
-{2019,  5,  1, 0},  //(Naruhito) (TODO: real era name not known yet 
(2018-07-26))
+{2019,  5,  1, 0},  // Reiwa
 {0, 0, 0, 0}
 };
 Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray)
diff --git a/i18npool/source/localedata/data/ja_JP.xml 
b/i18npool/source/localedata/data/ja_JP.xml
index fe4c247485f9..c15c665f2eab 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -481,11 +481,9 @@
   平成
 
 
-  
-  Naruhito
-  Na
-  Naruhito
+  Reiwa
+  令
+  令和
 
   
   
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index bad3b224089c..eb96820c9892 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3454,7 +3454,7 @@ void SvNumberformat::ImpAppendEraG( OUStringBuffer& 
OutString,
 cEra = 'H';
 break;
 case 5:
-cEra = 'N'; /* TODO: the real one letter era name is not known 
yet (2018-07-26) */
+cEra = 'R';
 break;
 default:
 cEra = '?';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - i18npool/source svl/source

2019-04-03 Thread Takeshi Abe (via logerrit) 
 i18npool/source/calendar/calendar_gregorian.cxx |2 +-
 i18npool/source/localedata/data/ja_JP.xml   |8 +++-
 svl/source/numbers/zformat.cxx  |2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 70bfc2174cd5ac6678ecd43b0d325398e0320a03
Author: Takeshi Abe 
AuthorDate: Mon Apr 1 11:44:32 2019 +0900
Commit: Eike Rathke 
CommitDate: Wed Apr 3 11:19:04 2019 +0200

Introduce next Japanese gengou era 'Reiwa'

starting from 2019-05-01, which has been announced officially.

This fills the provisional slot acknowledged at
cacbb0faef77ae8462de9ff5c7307a6a2e28b2bb.

Change-Id: Ifb12e6afaad4c66d455f664b46ec946e80324e87
Reviewed-on: https://gerrit.libreoffice.org/70157
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index b8f1d15ee66f..cc15c9c40f6e 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -209,7 +209,7 @@ static const Era gengou_eraArray[] = {
 {1912,  7, 30, 0},  // Taisho
 {1926, 12, 25, 0},  // Showa
 {1989,  1,  8, 0},  // Heisei
-{2019,  5,  1, 0},  //(Naruhito) (TODO: real era name not known yet 
(2018-07-26))
+{2019,  5,  1, 0},  // Reiwa
 {0, 0, 0, 0}
 };
 Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray)
diff --git a/i18npool/source/localedata/data/ja_JP.xml 
b/i18npool/source/localedata/data/ja_JP.xml
index fe4c247485f9..c15c665f2eab 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -481,11 +481,9 @@
   平成
 
 
-  
-  Naruhito
-  Na
-  Naruhito
+  Reiwa
+  令
+  令和
 
   
   
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index bad3b224089c..eb96820c9892 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3454,7 +3454,7 @@ void SvNumberformat::ImpAppendEraG( OUStringBuffer& 
OutString,
 cEra = 'H';
 break;
 case 5:
-cEra = 'N'; /* TODO: the real one letter era name is not known 
yet (2018-07-26) */
+cEra = 'R';
 break;
 default:
 cEra = '?';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source svl/source

2019-04-02 Thread Takeshi Abe (via logerrit) 
 i18npool/source/calendar/calendar_gregorian.cxx |2 +-
 i18npool/source/localedata/data/ja_JP.xml   |8 +++-
 svl/source/numbers/zformat.cxx  |2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 597c5d75b8e72d429e096535334eaac7973455ef
Author: Takeshi Abe 
AuthorDate: Mon Apr 1 11:44:32 2019 +0900
Commit: Eike Rathke 
CommitDate: Tue Apr 2 22:54:49 2019 +0200

Introduce next Japanese gengou era 'Reiwa'

starting from 2019-05-01, which has been announced officially.

This fills the provisional slot acknowledged at
cacbb0faef77ae8462de9ff5c7307a6a2e28b2bb.

Change-Id: Ifb12e6afaad4c66d455f664b46ec946e80324e87
Reviewed-on: https://gerrit.libreoffice.org/70028
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index 4e4a14dc0079..662c84b897c9 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -209,7 +209,7 @@ static const Era gengou_eraArray[] = {
 {1912,  7, 30, 0},  // Taisho
 {1926, 12, 25, 0},  // Showa
 {1989,  1,  8, 0},  // Heisei
-{2019,  5,  1, 0},  //(Naruhito) (TODO: real era name not known yet 
(2018-07-26))
+{2019,  5,  1, 0},  // Reiwa
 {0, 0, 0, 0}
 };
 Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray)
diff --git a/i18npool/source/localedata/data/ja_JP.xml 
b/i18npool/source/localedata/data/ja_JP.xml
index fe4c247485f9..c15c665f2eab 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -481,11 +481,9 @@
   平成
 
 
-  
-  Naruhito
-  Na
-  Naruhito
+  Reiwa
+  令
+  令和
 
   
   
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index db066e136c06..daa9791dba3c 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3476,7 +3476,7 @@ void SvNumberformat::ImpAppendEraG( OUStringBuffer& 
OutString,
 cEra = 'H';
 break;
 case 5:
-cEra = 'N'; /* TODO: the real one letter era name is not known 
yet (2018-07-26) */
+cEra = 'R';
 break;
 default:
 cEra = '?';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-29 Thread Takeshi Abe (via logerrit) 
 scp2/source/ooo/registryitem_ooo.scp |2 +-
 scp2/source/ooo/registryitem_ooo.ulf |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9c607b61f4e66c78b0c36802a1dcc997bf39e307
Author: Takeshi Abe 
AuthorDate: Mon Feb 25 17:25:30 2019 +0900
Commit: Andras Timar 
CommitDate: Fri Mar 29 13:18:03 2019 +0100

tdf#114311 Translate "LibreOffice Extension" file type in Windows

Change-Id: I5e2f222449424d4a6498d8566f13aca7f07c0c51
Reviewed-on: https://gerrit.libreoffice.org/68303
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/registryitem_ooo.scp 
b/scp2/source/ooo/registryitem_ooo.scp
index ed93d2816100..9a7998ace432 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -573,7 +573,7 @@ RegistryItem gid_Regitem_Office_Extension_1
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Root;
 Subkey = "office.Extension.1";
-Value = "%PRODUCTNAME Extension";
+REG_VALUE_LNG(EXTENSION)
 Styles = ();
 End
 
diff --git a/scp2/source/ooo/registryitem_ooo.ulf 
b/scp2/source/ooo/registryitem_ooo.ulf
index 8c073488f0e5..c07b641a0e0b 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -22,5 +22,8 @@ en-US = ""
 [STR_REG_VAL_SO60_CONFIGFILE]
 en-US = "%PRODUCTNAME Configuration File"
 
+[STR_REG_VAL_EXTENSION]
+en-US = "%PRODUCTNAME Extension"
+
 [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
 en-US = "LibreOffice"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits