Re: Error when building on Windows 10 with LODE
Hi, not sure, but something to do with this one? https://github.com/gpg/libgpg-error/commit/655ed9d83889bbb61d4b96755a2bd676622064c8#diff-3d88d5bfc418d55451e947aa2b40ddf7428f1afbe1e1215f75cecc7cb2d45232 -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
error C2228 in mysqlc_preparedstatement.cxx
Hi, When I tried to build LibreOffice, I encountered the following error. I'm not good at C++, and I don't know how to fix this one. C:/sources/libo-core/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx(98): error C2228: '.bDisposed' の左側はクラス、構造体、共用体でなければなりません make[1]: *** [C:/sources/libo-core/solenv/gbuild/LinkTarget.mk:301: C:/build/workdir/CxxObject/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.o] Error 2 make[1]: *** Waiting for unfinished jobs make: *** [Makefile:283: build] Error 2 can I have some advice ? -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: SAL_N_ELEMENTS undefined, when built with dbglevel > 2
Hi, >it looks like f3fab0832b57677d8dfe1297ae7aba631b44cc30 was the commit that removed it. got it. Thank you! -- himajin100000 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
SAL_N_ELEMENTS undefined, when built with dbglevel > 2
Hi, I'm now trying to build LibreOffice, but when I build with dbglevel=3, the following is produced. C:/sources/libo-core/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx(31): error C3861: 'SAL_N_ELEMENTS': Is there anyone who knows which commit has caused this error? at least the code was buildable on February 18. https://opengrok.libreoffice.org/xref/core/solenv/gbuild/gbuild.mk?r=cb2a94a4#248 https://opengrok.libreoffice.org/xref/core/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx?r=d0265c12#31 -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: First-time build error
Hi, Which version of windows sdk do you have? https://opengrok.libreoffice.org/xref/core/configure.ac?r=a0c8dc42#6494 -- himajin10(Tomoyuki Kubota) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About 7.1
Hi, I would use these information to be sure. https://wiki.documentfoundation.org/ReleasePlan/7.1#7.1.0_release https://git.libreoffice.org/core/+log/refs/heads/libreoffice-7-1/?s=871a91bf41a2ef60195c6c0886d67409b175cb5d Hello. How can I check if those changes are in 7.1 I don't think they are in 7.1 yet. I have never tried, but I believe you can cherrypick the patch to another branch, i.e. libreoffice-7-1. and those have 'Repo | Branch core | libreoffice-7-1' on the left side of the patch. see below for example. https://gerrit.libreoffice.org/c/core/+/106747 when someone with an adequate privilege gives Code-Review+2 there, and merges the cherry-picked patch, the fix will be in the branch. -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Why is tb77 down?
Why is tb77 down now? -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Is Idp down now?
seems the issue is now gone On 2020-08-19 09:30, himajin10 wrote: When I try to use SSO, my web browser returns "The connection has timed out". -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Is Idp down now?
When I try to use SSO, my web browser returns "The connection has timed out". -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: "Bullets and Numbering" translation
Now I confirmed that the issue is resolved. Thank you Caolan! -- himajin10 On 2020-08-07 20:53, Caolán McNamara wrote: On Fri, 2020-08-07 at 14:03 +0900, himajin10 wrote: Hi, Does anyone know the background behind why "Source string comment" gives SVX_NUM_ARABIC for "A, B, C, ..." ? https://translations.documentfoundation.org/translate/libo_ui-master/svxmessages/en/?offset==+note%3AbBGa7+_by=-priority%2Cposition= The source is svx/inc/numberingtype.hrc and the strings are extracted for translation by ./solenv/bin/hrcex which will run... xgettext -C --add-comments --keyword=NC_:1c,2 --keyword=NNC_:1c,2,3 -- from-code=UTF-8 --no-wrap svx/inc/numberingtype.hrc -o - on that .hrc. In the current numberingtypes.hrc the comments are *after* the string so xgettext has put each comment with the following translation, not the correct one which is the one before the comment. It should have appeared as "1, 2, 3, ..." with a Source string comment of SVX_NUM_ARABIC. https://gerrit.libreoffice.org/c/core/+/100309 will change the .hrc so that the next time hrcex is used to extract the translations the comments will get matched to the correct translation. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
"Bullets and Numbering" translation
Hi, Does anyone know the background behind why "Source string comment" gives SVX_NUM_ARABIC for "A, B, C, ..." ? https://translations.documentfoundation.org/translate/libo_ui-master/svxmessages/en/?offset==+note%3AbBGa7+_by=-priority%2Cposition= -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: cannot access opengrok.libreoffice.org (but ping works)
Hi, Seemed I had a network trouble on my side, not the opengrok side. I noticed that when I connect to the server with my smartphone, and I was able to do so. I restarted the ONU and router device, and confirmed that I can connect to the server now! In such circumstances it is advised to just use git grep or whichever grepping tool you like best against your local clone of the source code. Thank you for the information! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
cannot access opengrok.libreoffice.org (but ping works)
Hi, I currently have difficulty accessing opengrok.libreoffice.org Can anyone reproduce this issue? -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help- How to select a cell programatically using Java in LibreOffice calc
Hello, I can write like this in StarBasic, but the behavior is a bit strange. SelectionOverlay doesn't seem to be updated. REM * BASIC * Option Explicit Sub Main Dim selectionsupplier selectionsupplier = ThisComponent.getCurrentController() selectionsupplier.select(ThisComponent.getSheets().getByIndex(0).getCellRangeByPosition(1,1,2,2)) End Sub -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/customize/cfg.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ce5cd186d44e50985ebe3ff6e3e8b0aa262a6f75
Author: himajin10
AuthorDate: Tue May 26 11:34:12 2020 +0200
Commit: Mike Kaganski
CommitDate: Tue May 26 16:29:49 2020 +0200
followed the advice from Mike at
https://gerrit.libreoffice.org/c/core/+/94687
Change-Id: If961da88f3ecba03416394ab8e8093af1b20f664
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94832
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d63f36d33be2..6b2a83d38dc3 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -105,12 +105,12 @@ void printPropertySet(
uno::Reference< beans::XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
-uno::Sequence< beans::Property > aPropDetails =
+const uno::Sequence< beans::Property >& aPropDetails =
xPropSetInfo->getProperties();
SAL_WARN("cui", "printPropertySet: " << aPropDetails.getLength() << "
properties" );
-for ( beans::Property const & aPropDetail : std::as_const(aPropDetails) )
+for ( beans::Property const & aPropDetail : aPropDetails )
{
OUString tmp;
sal_Int32 ival;
@@ -136,7 +136,7 @@ void printProperties(
const OUString& prefix,
const uno::Sequence< beans::PropertyValue >& aProp )
{
-for (PropertyValue const & aPropVal : std::as_const(aProp))
+for (PropertyValue const & aPropVal : aProp)
{
OUString tmp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/customize/cfg.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 8223ab05e0fba320dd9dba2642b8d968d5b246b7
Author: himajin10
AuthorDate: Tue May 26 05:22:15 2020 +0200
Commit: Noel Grandin
CommitDate: Tue May 26 10:42:06 2020 +0200
cfg.cxx build fix
Change-Id: I7bab3dc64f0976b3d3e8711a05ea826243a6be67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94687
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index dae7f6a547b5..d63f36d33be2 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -110,24 +110,24 @@ void printPropertySet(
SAL_WARN("cui", "printPropertySet: " << aPropDetails.getLength() << "
properties" );
-for ( sal_Int32 i = 0; i < aPropDetails.(); ++i )
+for ( beans::Property const & aPropDetail : std::as_const(aPropDetails) )
{
OUString tmp;
sal_Int32 ival;
-uno::Any a = xPropSet->getPropertyValue( aPropDetails[i].Name );
+uno::Any a = xPropSet->getPropertyValue( aPropDetail.Name );
if ( a >>= tmp )
{
-SAL_WARN("cui", prefix << ": Got property: " <<
aPropDetails[i].Name << tmp);
+SAL_WARN("cui", prefix << ": Got property: " << aPropDetail.Name
<< tmp);
}
else if ( ( a >>= ival ) )
{
-SAL_WARN("cui", prefix << ": Got property: " <<
aPropDetails[i].Name << " = " << ival);
+SAL_WARN("cui", prefix << ": Got property: " << aPropDetail.Name
<< " = " << ival);
}
else
{
-SAL_WARN("cui", prefix << ": Got property: " <<
aPropDetails[i].Name << " of type " << a.getValueTypeName());
+SAL_WARN("cui", prefix << ": Got property: " << aPropDetail.Name
<< " of type " << a.getValueTypeName());
}
}
}
@@ -136,13 +136,13 @@ void printProperties(
const OUString& prefix,
const uno::Sequence< beans::PropertyValue >& aProp )
{
-for ( sal_Int32 i = 0; i < aProp.(); ++i )
+for (PropertyValue const & aPropVal : std::as_const(aProp))
{
OUString tmp;
-aProp[i].Value >>= tmp;
+aPropVal.Value >>= tmp;
-SAL_WARN("cui", prefix << ": Got property: " << aProp[i].Name << " = "
<< tmp);
+SAL_WARN("cui", prefix << ": Got property: " << aPropVal.Name << " = "
<< tmp);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build failed
Hello FYI: https://ask.libreoffice.org/en/question/223751/ -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 4 commits - basctl/source icon-themes/colibre icon-themes/colibre_svg include/xmloff sc/qa sc/source xmloff/source
basctl/source/basicide/baside2.hxx |3 +
basctl/source/basicide/baside2b.cxx | 19 ++-
icon-themes/colibre/cmd/32/grafblue.png |binary
icon-themes/colibre/cmd/32/grafgreen.png |binary
icon-themes/colibre/cmd/32/grafred.png |binary
icon-themes/colibre/cmd/lc_circlepie.png |binary
icon-themes/colibre/cmd/lc_grafblue.png |binary
icon-themes/colibre/cmd/lc_grafgreen.png |binary
icon-themes/colibre/cmd/lc_grafred.png |binary
icon-themes/colibre_svg/cmd/32/grafblue.svg |2
icon-themes/colibre_svg/cmd/32/grafgreen.svg |2
icon-themes/colibre_svg/cmd/32/grafred.svg |2
icon-themes/colibre_svg/cmd/lc_circlepie.png |binary
icon-themes/colibre_svg/cmd/lc_grafblue.svg |2
icon-themes/colibre_svg/cmd/lc_grafgreen.svg |2
icon-themes/colibre_svg/cmd/lc_grafred.svg |2
include/xmloff/xmltoken.hxx |3 -
sc/qa/uitest/autofilter/data/tdf130770.ods |binary
sc/qa/uitest/autofilter/tdf130070.py | 73 +++
sc/source/ui/view/gridwin.cxx| 37 +
xmloff/source/core/xmltoken.cxx |3 -
xmloff/source/token/tokens.txt |3 -
22 files changed, 121 insertions(+), 32 deletions(-)
New commits:
commit d7d352e1692f4819742e419ea8b9577eb8b8c0ec
Author: himajin10
AuthorDate: Tue May 19 14:32:52 2020 +0200
Commit: Andras Timar
CommitDate: Sat May 23 09:54:55 2020 +0200
meta:non-whitespace-character-count attribute is known
also, fixed a typo and re-positioned the item to the correct index.
Change-Id: Ibac232a9e6851a0c59884bc82ead5de36ac2e391
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94454
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit acfd959f0b4069b74e76213e4118af9827005fff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94460
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index dfc9ad5ced3d..2a385278a072 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1315,8 +1315,8 @@ namespace xmloff { namespace token {
XML_NOEMPTY,
XML_NOHREF,
XML_NOMATCH,
+XML_NON_WHITESPACE_CHARACTER_COUNT,
XML_NONE,
-XML_NOPRTSUBSET,
XML_NORMAL,
XML_NORMALS_DIRECTION,
XML_NORMALS_KIND,
@@ -1326,6 +1326,7 @@ namespace xmloff { namespace token {
XML_NOTE,
XML_NOTES,
XML_NOTIN,
+XML_NOTPRSUBSET,
XML_NOTSUBSET,
XML_NULL_DATE,
XML_NULL_YEAR,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index b37e90f0b568..9ef0203dedf8 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1317,8 +1317,8 @@ namespace xmloff { namespace token {
TOKEN( "!empty", XML_NOEMPTY ),
TOKEN( "nohref", XML_NOHREF ),
TOKEN( "!match", XML_NOMATCH ),
+TOKEN( "non-whitespace-character-count",
XML_NON_WHITESPACE_CHARACTER_COUNT ),
TOKEN( "none",XML_NONE ),
-TOKEN( "notprsubset", XML_NOPRTSUBSET ),
TOKEN( "normal", XML_NORMAL ),
TOKEN( "normals-direction", XML_NORMALS_DIRECTION ),
TOKEN( "normals-kind",XML_NORMALS_KIND ),
@@ -1328,6 +1328,7 @@ namespace xmloff { namespace token {
TOKEN( "note",XML_NOTE ),
TOKEN( "notes", XML_NOTES ),
TOKEN( "notin", XML_NOTIN ),
+TOKEN( "notprsubset", XML_NOTPRSUBSET ),
TOKEN( "notsubset", XML_NOTSUBSET ),
TOKEN( "null-date", XML_NULL_DATE ),
TOKEN( "null-year", XML_NULL_YEAR ),
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index ef2aaca8ea77..e0244941123a 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -1235,8 +1235,8 @@ no-wrap
NOEMPTY_DUMMY
nohref
NOMATCH_DUMMY
+non-whitespace-character-count
none
-notprsubset
normal
normals-direction
normals-kind
@@ -1246,6 +1246,7 @@ notation
note
notes
notin
+notprsubset
notsubset
null-date
null-year
commit dde26793d8c8a30801542508743f05aeebe2568f
Author: Rizal Muttaqin
AuthorDate: Fri May 22 05:59:00 2020 +0700
Commit: Andras Timar
CommitDate: Sat May 23 09:54:47 2020 +0200
Colibre: tdf#133250 inconsisten colors icons
Change-Id: I2f362e0f0463d7201f0168f7d9a8bdd0c408ac61
Reviewed-on: https://gerrit.libreof
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - include/xmloff xmloff/source
include/xmloff/xmltoken.hxx |3 ++-
xmloff/source/core/xmltoken.cxx |3 ++-
xmloff/source/token/tokens.txt |3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit d6c54d439e35e90dc51ddcbe2e0701ee22a5b9e1
Author: himajin10
AuthorDate: Tue May 19 14:32:52 2020 +0200
Commit: Michael Stahl
CommitDate: Fri May 22 18:50:33 2020 +0200
meta:non-whitespace-character-count attribute is known
also, fixed a typo and re-positioned the item to the correct index.
Change-Id: Ibac232a9e6851a0c59884bc82ead5de36ac2e391
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94454
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit acfd959f0b4069b74e76213e4118af9827005fff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94460
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 1175958548ff..b5105e5da0f3 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1315,8 +1315,8 @@ namespace xmloff { namespace token {
XML_NOEMPTY,
XML_NOHREF,
XML_NOMATCH,
+XML_NON_WHITESPACE_CHARACTER_COUNT,
XML_NONE,
-XML_NOPRTSUBSET,
XML_NORMAL,
XML_NORMALS_DIRECTION,
XML_NORMALS_KIND,
@@ -1326,6 +1326,7 @@ namespace xmloff { namespace token {
XML_NOTE,
XML_NOTES,
XML_NOTIN,
+XML_NOTPRSUBSET,
XML_NOTSUBSET,
XML_NULL_DATE,
XML_NULL_YEAR,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index e0f6e4d7a216..fb760c6307c5 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1317,8 +1317,8 @@ namespace xmloff { namespace token {
TOKEN( "!empty", XML_NOEMPTY ),
TOKEN( "nohref", XML_NOHREF ),
TOKEN( "!match", XML_NOMATCH ),
+TOKEN( "non-whitespace-character-count",
XML_NON_WHITESPACE_CHARACTER_COUNT ),
TOKEN( "none",XML_NONE ),
-TOKEN( "notprsubset", XML_NOPRTSUBSET ),
TOKEN( "normal", XML_NORMAL ),
TOKEN( "normals-direction", XML_NORMALS_DIRECTION ),
TOKEN( "normals-kind",XML_NORMALS_KIND ),
@@ -1328,6 +1328,7 @@ namespace xmloff { namespace token {
TOKEN( "note",XML_NOTE ),
TOKEN( "notes", XML_NOTES ),
TOKEN( "notin", XML_NOTIN ),
+TOKEN( "notprsubset", XML_NOTPRSUBSET ),
TOKEN( "notsubset", XML_NOTSUBSET ),
TOKEN( "null-date", XML_NULL_DATE ),
TOKEN( "null-year", XML_NULL_YEAR ),
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index 921ff2b63b5a..024877e8cf45 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -1235,8 +1235,8 @@ no-wrap
NOEMPTY_DUMMY
nohref
NOMATCH_DUMMY
+non-whitespace-character-count
none
-notprsubset
normal
normals-direction
normals-kind
@@ -1246,6 +1246,7 @@ notation
note
notes
notin
+notprsubset
notsubset
null-date
null-year
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff xmloff/source
include/xmloff/xmltoken.hxx |3 ++-
xmloff/source/core/xmltoken.cxx |3 ++-
xmloff/source/token/tokens.txt |3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit acfd959f0b4069b74e76213e4118af9827005fff
Author: himajin10
AuthorDate: Tue May 19 14:32:52 2020 +0200
Commit: Michael Stahl
CommitDate: Wed May 20 11:08:28 2020 +0200
meta:non-whitespace-character-count attribute is known
also, fixed a typo and re-positioned the item to the correct index.
Change-Id: Ibac232a9e6851a0c59884bc82ead5de36ac2e391
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94454
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 3911f61c2849..3650805e6015 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1321,8 +1321,8 @@ namespace xmloff::token {
XML_NOEMPTY,
XML_NOHREF,
XML_NOMATCH,
+XML_NON_WHITESPACE_CHARACTER_COUNT,
XML_NONE,
-XML_NOPRTSUBSET,
XML_NORMAL,
XML_NORMALS_DIRECTION,
XML_NORMALS_KIND,
@@ -1332,6 +1332,7 @@ namespace xmloff::token {
XML_NOTE,
XML_NOTES,
XML_NOTIN,
+XML_NOTPRSUBSET,
XML_NOTSUBSET,
XML_NULL_DATE,
XML_NULL_YEAR,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 18275ebb5ec0..7d37edc78800 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1327,8 +1327,8 @@ namespace xmloff::token {
TOKEN( "!empty", XML_NOEMPTY ),
TOKEN( "nohref", XML_NOHREF ),
TOKEN( "!match", XML_NOMATCH ),
+TOKEN( "non-whitespace-character-count",
XML_NON_WHITESPACE_CHARACTER_COUNT ),
TOKEN( "none",XML_NONE ),
-TOKEN( "notprsubset", XML_NOPRTSUBSET ),
TOKEN( "normal", XML_NORMAL ),
TOKEN( "normals-direction", XML_NORMALS_DIRECTION ),
TOKEN( "normals-kind",XML_NORMALS_KIND ),
@@ -1338,6 +1338,7 @@ namespace xmloff::token {
TOKEN( "note",XML_NOTE ),
TOKEN( "notes", XML_NOTES ),
TOKEN( "notin", XML_NOTIN ),
+TOKEN( "notprsubset", XML_NOTPRSUBSET ),
TOKEN( "notsubset", XML_NOTSUBSET ),
TOKEN( "null-date", XML_NULL_DATE ),
TOKEN( "null-year", XML_NULL_YEAR ),
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index 42a83f7ae15a..e7e52379a740 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -1237,8 +1237,8 @@ no-wrap
NOEMPTY_DUMMY
nohref
NOMATCH_DUMMY
+non-whitespace-character-count
none
-notprsubset
normal
normals-direction
normals-kind
@@ -1248,6 +1248,7 @@ notation
note
notes
notin
+notprsubset
notsubset
null-date
null-year
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: I want to join the development of libreoffice
This is a mail resent to libreoffice dev mailing list, because I carelessly sent a personal mail. === Hi, https://wiki.documentfoundation.org/Development Building LibreOffice and reading about gerrit is good point to start with, I believe. -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Calc keyboard shortcuts
On 2020-02-22 05:20, Mike Kaganski wrote: On 2020-02-21 23:05, Stephen Fanning wrote: (1) The key combination Ctrl+Shift+C appears to be a shortcut equivalent to the menu interaction Edit > Track Changes > Record. Is there any reason why this shortcut is not shown on the relevant menu option? https://imgur.com/a/SQ9LFEX In Writer, short cut is shown, but in Calc, it's not. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/ja/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp"
Hi, On 2020-02-12 18:50, Christian Lohmaier wrote: You didn't specify what commit you were trying to build, but I assume it is fixed already with the push of translations yesterday, which corresponds to https://cgit.freedesktop.org/libreoffice/core/commit/?id=b995cd09a79e69b44d6765b00c1e4a3741db6f08 in core repository. Thank you for the answer. I will try some other day to see if the warning has gone. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/ja/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp"
forgot to mention I was using "--with-help=html" too. On 2020-02-12 15:22, himajin10 wrote: Hi, When I tried to build LibreOffice using --with-lang="ja de", I encountered the following warnings. warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/ja/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp" warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/qtz/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp" warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/de/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp" Is there some way to solve this one? --- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/ja/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp"
Hi, When I tried to build LibreOffice using --with-lang="ja de", I encountered the following warnings. warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/ja/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp" warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/qtz/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp" warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/de/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp" Is there some way to solve this one? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: build error : 'f__faststorefence': is not a member of 'GrGLInterface::Functions'
On 2020-02-01 15:48, Kaganski Mike wrote: On 2020-02-01 8:58, himajin10 wrote: I'm getting the following error. how should I fix this error?(and why doesn't Jenkis fail?) C:/build/workdir/UnpackedTarball/skia/src/gpu/gl/GrGLGpu.cpp(3771): error C2039: 'f__faststorefence': is not a member of 'GrGLInterface::Functions' C:\build\workdir\UnpackedTarball\skia\include/gp/gl/GrGLInterface.h(74): note: see declaration of 'GrGLInterface::Functions' https://gerrit.libreoffice.org/c/core/+/87780 Thanks, I'll try rebasing and building. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
build error : 'f__faststorefence': is not a member of 'GrGLInterface::Functions'
Hi, I'm getting the following error. how should I fix this error?(and why doesn't Jenkis fail?) C:/build/workdir/UnpackedTarball/skia/src/gpu/gl/GrGLGpu.cpp(3771): error C2039: 'f__faststorefence': is not a member of 'GrGLInterface::Functions' C:\build\workdir\UnpackedTarball\skia\include/gp/gl/GrGLInterface.h(74): note: see declaration of 'GrGLInterface::Functions' --- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - jvmfwk/distributions jvmfwk/plugins
jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml |6 --
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |6 --
jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |6 --
jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml |4 +++-
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |4 +++-
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx |1 +
6 files changed, 19 insertions(+), 8 deletions(-)
New commits:
commit 4ce8d2d865224e29e2b8bcb0c267a6437722aa73
Author: himajin10
AuthorDate: Sat Jan 19 14:25:50 2019 +0900
Commit: Michael Weghorn
CommitDate: Tue Aug 13 17:58:40 2019 +0200
Support AdoptOpenJDK
Reviewed-on: https://gerrit.libreoffice.org/66634
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
Reviewed-by: Samuel Mehrbrodt
Reviewed-by: Stephan Bergmann
(cherry picked from commit 61c4f96d6ae6a80370774e53287edb27cbce8067)
Conflicts:
jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
Change-Id: Idcfd542c6caede3d987e9b8219cf48114800daa5
Reviewed-on: https://gerrit.libreoffice.org/77416
Reviewed-by: Michael Weghorn
Tested-by: Michael Weghorn
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 13089bca3000..0d1d15da7610 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
http://openoffice.org/2004/java/framework/1.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
@@ -35,6 +34,9 @@
1.5.0
-
+
+1.8.0
+
+
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 943b2ce1bf45..18d44d4f58f6 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -44,6 +44,8 @@
1.6.0
-
-
+
+1.8.0
+
+
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 61ab2e29a846..4e2b34ef429d 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -35,6 +35,8 @@
1.6.0
-
-
+
+ 1.8.0
+
+
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index c7b0568c2d18..31de8c37b2b2 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -29,6 +29,8 @@
1.5.0
+
+1.8.0
+
-
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 330461094180..66c9472d10af 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -35,6 +35,8 @@
1.6.0
+
+1.8.0
+
-
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index a08b237b62cd..afe51216a334 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -41,6 +41,7 @@ BEGIN_VENDOR_MAP()
#endif
VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
+VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
#ifndef MACOSX
VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1ea226c6d247c349d87df3deb382052cd619e9bc Author: himajin10 AuthorDate: Fri Apr 19 23:16:08 2019 +0900 Commit: Gerrit Code Review CommitDate: Tue Apr 23 09:48:06 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - fix forgotten LANG->LANGUAGE Change-Id: Idcfd73213452510f769854062d0916a3c871b548 Reviewed-on: https://gerrit.libreoffice.org/70982 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/helpcontent2 b/helpcontent2 index 8a21dc1cc51f..5c561c2f3744 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8a21dc1cc51f0363b33e59b5c34c74d5c6737f1e +Subproject commit 5c561c2f3744c5697ea6d25357f4223f0dbe977e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: configure fails for lo 6.1.6 - Windows SDK... configure: error: Some (all?) Windows SDK files not found
sorry for many typos the previous), the previous e-mail as the following code indicates As the following code indicates > winsdkBINsubdir="$regvalue".0 winsdkLIBsubdir=$regvalue it wasn't meaningless, I just overlooked the BIN and LIB > and if you have 10.0.17763.0, $winsdksubdir will be 10.0.17763 If you have 10.0.17763.0, $winsdklibsubdir will be 10.0.17763 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: configure fails for lo 6.1.6 - Windows SDK... configure: error: Some (all?) Windows SDK files not found
btw: registry key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft/Microsoft SDKs\Windows" is not available Hi, > 10.0.17134.0 > 10.0.17763.0 > > btw: registry key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft/Microsoft > SDKs\Windows" is not available Did you notice that you have to look into 32bit registry node? you need to either 1. launch 32 bit registry editor 2. launch 64 bit registry editor and look under WOW6432Node https://support.microsoft.com/en-ca/help/305097/how-to-view-the-system-registry-by-using-64-bit-versions-of-windows as the following code indicates(sorry, I forgot to attach line number in the previous), https://github.com/LibreOffice/core/blob/libreoffice-6-1-6/configure.ac#L5236 if test -n "$regvalue"; then winsdkbinsubdir="$regvalue".0 fi winsdklibsubdir=$regvalue # meaningless overwriting = and if you have 10.0.17763.0, $winsdksubdir will be 10.0.17763 instead of 10.0.17763.0 when the code returns from find_winsdk_version , I guess. Regards, himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: configure fails for lo 6.1.6 - Windows SDK... configure: error: Some (all?) Windows SDK files not found
On 2019/04/21 22:54, Oliver Brinzing wrote: or UCRT location... found checking for MSBuild.exe location for: 15.0... > or UCRT location... found > checking for MSBuild.exe location for: 15.0... Hello, Oliver https://opengrok.libreoffice.org/xref/core/configure.ac?r=4ea0059b#5414 https://github.com/LibreOffice/core/blob/libreoffice-6-1-6/configure.ac Which Windows SDK version did you use? -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: doxygen: Illegal command n as part of a title section
self-reminder * DocTitle https://github.com/doxygen/doxygen/blob/208c689e4c13cc065045a6f6b1ff685eda5a3cd6/src/docparser.cpp#L4596 https://github.com/doxygen/doxygen/blob/208c689e4c13cc065045a6f6b1ff685eda5a3cd6/src/docparser.cpp#L4539 https://github.com/doxygen/doxygen/blob/208c689e4c13cc065045a6f6b1ff685eda5a3cd6/src/docparser.cpp#L4547 https://github.com/doxygen/doxygen/blob/208c689e4c13cc065045a6f6b1ff685eda5a3cd6/src/docparser.cpp#L1387 * DocPara https://github.com/doxygen/doxygen/blob/208c689e4c13cc065045a6f6b1ff685eda5a3cd6/src/docparser.cpp#L4601 https://github.com/doxygen/doxygen/blob/208c689e4c13cc065045a6f6b1ff685eda5a3cd6/src/docparser.cpp#L6593 https://github.com/doxygen/doxygen/blob/208c689e4c13cc065045a6f6b1ff685eda5a3cd6/src/docparser.cpp#L6749 https://github.com/doxygen/doxygen/blob/208c689e4c13cc065045a6f6b1ff685eda5a3cd6/src/docparser.cpp#L6787 https://github.com/doxygen/doxygen/blob/208c689e4c13cc065045a6f6b1ff685eda5a3cd6/src/docparser.cpp#L5489 https://github.com/doxygen/doxygen/blob/208c689e4c13cc065045a6f6b1ff685eda5a3cd6/src/docparser.cpp#L5816 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
doxygen: Illegal command n as part of a title section
Hello, himajin10 here! When I build LibreOffice locally, I often get just a bit upset because of the following warnings. Less warning will give me less stress :-) /cygdrive/c/build/instdir/sdk/include/cppuhelper/implbase1.hxx:245: warning: Illegal command n as part of a title section /cygdrive/c/build/instdir/sdk/include/cppuhelper/implbase10.hxx:251: warning: Illegal command n as part of a title section /cygdrive/c/build/instdir/sdk/include/cppuhelper/implbase11.hxx:252: warning: Illegal command n as part of a title section I found the following ALIAS https://opengrok.libreoffice.org/xref/core/odk/docs/cpp/Doxyfile?r=86c189cf#33 and Doxyfile for cpp on my local machine says INPUT = /cygdrive/c/sources/libo-core/odk/docs/cpp/main.dox /cygdrive/c/sources/libo-core/include/sal/log-areas.dox /cygdrive/c/build/instdir/sdk/include/sal /cygdrive/c/build/instdir/sdk/include/salhelper /cygdrive/c/build/instdir/sdk/include/rtl /cygdrive/c/build/instdir/sdk/include/osl /cygdrive/c/build/instdir/sdk/include/typelib /cygdrive/c/build/instdir/sdk/include/uno /cygdrive/c/build/instdir/sdk/include/cppu /cygdrive/c/build/instdir/sdk/include/cppuhelper /cygdrive/c/build/instdir/sdk/include/com/sun/star/uno/Any.h /cygdrive/c/build/instdir/sdk/include/com/sun/star/uno/Any.hxx /cygdrive/c/build/instdir/sdk/include/com/sun/star/uno/genfunc.h /cygdrive/c/build/instdir/sdk/include/com/sun/star/uno/genfunc.hxx /cygdrive/c/build/instdir/sdk/include/com/sun/star/uno/Reference.h /cygdrive/c/build/instdir/sdk/include/com/sun/star/uno/Reference.hxx /cygdrive/c/build/instdir/sdk/include/com/sun/star/uno/Sequence.h /cygdrive/c/build/instdir/sdk/include/com/sun/star/uno/Sequence.hxx /cygdrive/c/build/instdir/sdk/include/com/sun/star/uno/Type.h /cygdrive/c/build/instdir/sdk/include/com/sun/star/uno/Type.hxx When I get the intersection of INPUT and all the codes in opengrok which use @derive command, I got https://opengrok.libreoffice.org/search?full=%22%40derive%22=%22%2Fcore%2Finclude%2Fcppuhelper%2F%22=core https://opengrok.libreoffice.org/search?full=%27%40derive%27=%22%2Fcore%2Finclude%2Frtl%2F%22=core , all of which are giving the similar errors. http://www.doxygen.nl/manual/commands.html#cmdpar says title follows @par command. Probably that par title does not accept @n is the cause of the warning. Does anyone know the the correct syntax? I still haven't search for it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error: attempting to reference a deleted function
himajin10 here! himajin10 here! I've updated my Visual Studio to version 16.0.0 Preview 4.3 and I am encountering an error. I'm not good at C++. I hope someone helps me. C:\PROGRA~2\MIB055~1\2019\Preview\VC\Tools\MSVC\14.20.27508\Include\list(1010): error C2280: 'std::pair<_Kty,_Ty> ::pair<_Kty,_Ty>::operator =(volatile const std::pair<_Kty,_Ty> &)': attempting to reference a deleted function Though I dont't think I understood well, reading these posts https://stackoverflow.com/questions/41794892/ and adding WidgetDefinition() = default; WidgetDefinition(const WidgetDefinition&) = delete; WidgetDefinition& operator =(const WidgetDefinition&) = delete; to WidgetDefinition class in WidgetDefinition.hxx seems to have done the trick. (for inadequate understanding, I'm not submitting a patch. ) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Error: attempting to reference a deleted function
himajin10 here! I've updated my Visual Studio to version 16.0.0 Preview 4.3 and I am encountering an error. I'm not good at C++. I hope someone helps me. C:\PROGRA~2\MIB055~1\2019\Preview\VC\Tools\MSVC\14.20.27508\Include\list(1010): error C2280: 'std::pair<_Kty,_Ty> ::pair<_Kty,_Ty>::operator =(volatile const std::pair<_Kty,_Ty> &)': attempting to reference a deleted function with [ _Kty=vcl::ControlTypeAndPart, _Ty=std::shared_ptr ] C:\PROGRA~2\MIB055~1\2019\Preview\VC\Tools\MSVC\14.20.27508\Include\utility(177): note: see declaration of 'std::pair<_Kty,_Ty>::operator =' with [ _Kty=vcl::ControlTypeAndPart, _Ty=std::shared_ptr ] C:\PROGRA~2\MIB055~1\2019\Preview\VC\Tools\MSVC\14.20.27508\Include\utility(177): note: 'std::pair<_Kty,_Ty> ::pair<_Kty,_Ty>::operator =(volatile const std::pair<_Kty,_Ty> &)': function was explicitly deleted with [ _Kty=vcl::ControlTypeAndPart, _Ty=std::shared_ptr ] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: tdf#123263 Type checking SbiSymDef and Array
Some tests are added to the bug report. -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
tdf#123263 Type checking SbiSymDef and Array
Just for Information I'm now tackling on tdf#123263 https://gerrit.libreoffice.org/#/c/67585/ and I'm now stuck. I want to sort out my idea, share my headaches :-) , and solicit advice. === 1. In StarBasic, assignment is done in SbiRuntime::StepPUT, but StarBasic only type-checks with checkUnoStructCopy.(see the URL below) 2. Some functions like Split( defined in SbRtl_Split in C++), requires data that can be converted to string type. A call of GetString ,which internally calls SbxValue::Get(SbxValues rRes), does this. 3. Even when type of left variable and right expression in assignment are not of the same type, sometimes it's preferable to implicitly convert to the type of lvalue, and I believe SbxValue::Get(SbxValues rRes) would be help. 4. With these in mind, I wrote https://gerrit.libreoffice.org/#/c/67585/14/basic/source/runtime/runtime.cxx refVar is for the left variable and refVal is for right value. IsFixed() is for Variable type. 5. This did not solve the issue. I printf-ed with SAL_INFO the types of refVar and refVal (SbxDataType) static_cast-ed to int, while running the code in the bug report. Result indicated SbxSTRING and SbxINTEGER with no SbxARRAY information. 6. I decided on finding where these type data is taken from. And, I found out that on parsing, identifiers are managed with SbiSymDef, and parenthesis for arrays are handled separatly in SbiParser::VarDecl https://gerrit.libreoffice.org/#/c/67585/14/basic/source/comp/dim.cxx Variable declarations of array type in StarBasic is as follows: Dim x() As Integer 'As Integer' part is handled in SbiParser::TypeDecl, which calls SbiSymDef::SetType, but parethesis is handled before that in VarDecl. To carry over this information, I added the third optional parameter to TypeDecl. 7. And by doing these, the code in the bug report seemed to work, and I submitted the patch to gerrit.Unfortunately that resulted in unit test failures. 8. Unit test error: Symbol oControlGroup already defined differently. I searched OpenGrok for the identifier oControlGroup and hit this. https://opengrok.libreoffice.org/xref/core/wizards/source/tools/ModuleControls.xba?r=da543e4e#131 9. I tried this code on my own local machine with SAL_INFOs, and understood StarBasic wants the left expression of dot character to be of SbxOBJECT. https://opengrok.libreoffice.org/xref/core/basic/source/comp/exprtree.cxx?r=e48e0632#158 before my patch, objects can be stored only to variables of type SbxOBJECT or SbxVARIABLE. Sometimes StarBasic tries to SbiSymDef::SetTypes( SbxOBJECT ) thingy, often with interim variables, if the variable is defined as SbxVARIANT. The type of SbiSymDef is used for if statements later. As suggested by the algorythm above type of SbiSymDef is essential, and I don't want change this. Also, expressions like the following Dim x() As Object x(i).someproperty x is an of (SbxOBJECT | SbxARRAY) and x(i) is SbxOBJECT but I'm not sure whether I should/can hold x(i) as SbiSymDef -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Does anyone know why searching on ask.libreoffice.org/ja/ fails?
Hi, I have a question regarding website infrastructure searching for the term "LibreOffice" on https://ask.libreoffice.org/ja/questions/ results in Internal server error neither Korean version https://ask.libreoffice.org/ko/questions/ nor Taiwanese version https://ask.libreoffice.org/zh-tw/questions/ have this problem. If this ML is not the right place to ask this type of question, I would be happy if you let me know who to ask. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Just for Information: Support for VS 2019 Preview 1
>setlocal set PYTHONPATH=$(PySourcePath)Lib >setlocal set PYTHONPATH=$(PySourcePath)Lib and another typo: >in pythonnt_rc.h files in each _ctypes project. >in pythonnt_rc.h file in each project. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Just for Information: Support for VS 2019 Preview 1
typo: > 6. so, I mean to change to setlocal && set PYTHONPATH=$(PySourcePath)Lib for XML, I did setlocal set PYTHONPATH=$(PySourcePath)Lib ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Just for Information: Support for VS 2019 Preview 1
In addtion to the modification given in
https://gerrit.libreoffice.org/#/c/64630/
I needed to:
1.
https://opengrok.libreoffice.org/xref/core/external/twain_dsm/ExternalProject_twain_dsm.mk?r=585d9806#26
I need to consider $(VCVER) = 160 and $(VCVER)-$(WINDOWS_SDK_VERSION) =
160-10 case for all the similar cases:
https://opengrok.libreoffice.org/search?project=core=VCVER=
$(if $(filter 160,$(VCVER)),/p:PlatformToolset=v141
/p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
$(if $(filter
160-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))
\
2.
https://opengrok.libreoffice.org/xref/core/configure.ac?r=905c107c#3432
I don't have 16.0 folder under MSBuild directory.
What I have is "Current" directory. so I need special treatment for this
case.
but even when configure failed to find the MSBuild.exe based on this
rule, if another MSBuild is found in one of the PATHs added during build
process, the build process might succeed. This case seemed to happen to
me somehow only for x64(probably from old .NET stuffs). For x86,error
for unsupported ToolsVersion was given. weird.
3. regarding lcms2,
https://opengrok.libreoffice.org/xref/core/external/lcms2/ExternalProject_lcms2.mk?r=e751e242#26
currently, the code rebased to master has 2015 directory under Projects
folder, and code on github has 2017 directory
https://github.com/mm2/Little-CMS/tree/master/Projects/VC2017
for now, I changed the directory from 2013 to 2015, and can successfully
build the source. Would it be better to update the archive on
libreoffice to rebase to the one in github and change the diretory to
2017? If yes, how can I ask the server manager to add the updated archive?
https://opengrok.libreoffice.org/xref/core/download.lst?r=a01ac385#140
4. regarding python3,
"Project not selected to build for this solution" error is given for
xxlimit and _freeze_importlib
the cause seemed that though pcbuild.sln assigned
{F749B822-B489-4CA5-A3AD-CE078F5F338A} for the xxlimit project, the only
configurations existed were
{F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|Win32.ActiveCfg = Debug|Win32
{F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|x64.ActiveCfg = Debug|x64
and I needed the configurations for Build.0
{F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|Win32.Build.0 = Debug|Win32
{F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|x64.Build.0 = Debug|x64
And the same for the _freeze_importlib.
5.
pyproject.props in XML format stores the data for the file to be
produced for each project in python. This data contains newlines and is
stored in attributes. but newlines in attributes are often changed to a
single white space. therefore
#define FIELD3 5150
#define MS_DLL_ID "3.5-32"
#define PYTHON_DLL_NAME "_ctypes_d.pyd"
becomes
#define FIELD3 5150 #define MS_DLL_ID "3.5-32" #define PYTHON_DLL_NAME
"_ctypes_d.pyd"
in pythonnt_rc.h files in each _ctypes project. Almost the
same(PYTHON_DLL_NAME needs to be adapted) for other projects.
6.
For the same reason given in the No.5,
some projects have
setlocal
set PYTHONPATH=$(PySourcePath)Lib
"$(OutDir)python$(PyDebugExt).exe"
"$(PySourcePath)PC\validate_ucrtbase.py" $(UcrtName)'
stored in attributes, resuting in
setlocal set PYTHONPATH=$(PySourcePath)Lib
so, I mean to change to
setlocal && set PYTHONPATH=$(PySourcePath)Lib
for XML, I did
setlocal && set PYTHONPATH=$(PySourcePath)Lib
I forgot exact what projects are in this symptom
7.
xxlimited.vcxproj has Py_LIMITED_API=0x0305 but this is incompatible
with debug build. I removed that.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[SOLVED]Re: Is there someone who successfully make their own build of LibreOffice with Visual Studio 15.8.0 Preview 3.0 ?
I've updated my environment to Visual Studio 15.8 Preview 5.0 and now I successfully built my own build. --- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Is there someone who successfully make their own build of LibreOffice with Visual Studio 15.8.0 Preview 3.0 ?
Is there someone who successfully make their own build of LibreOffice
with Visual Studio 15.8.0 Preview 3.0 ?
by asking this question, I'm trying to be sure that the error was not my
fault.
I get the following error
C:/build/workdir/UnpackedTarball/libmwaw/src/lib/ClarisDrawText.cxx(58):
fatal error C1075: '{': no matching token found
even after adding seekpos as follows
https://developercommunity.visualstudio.com/content/problem/282567/member-seekpos-in-class-fpos-is-missing.html
If I remember what I have done myself correctly, I haven't changed any
parts of sourcecode of libmwaw since I successfully made my own build in
June with previous version of Visual Studio.
---
himajin10
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Development
Hello Jorge. Looking back myself when I was a beginner, starting with "Building LibreOffice" on the right side was the best thing to begin with.(but be prepared. It was very time-consuming for the first time, as there was no cache) https://wiki.documentfoundation.org/Development after deciding which bug to solve, I browsed the code and modified it with the C++ knowledge I had on my local PC. then I followed the instruction for the gerrit to have my patch approved. https://wiki.documentfoundation.org/Development/gerrit -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Assertion Failed!: MSVCP140D.dll , Expression: ploc->_Mbcurmax == 1 || ploc->_Mbcurmax == 2
Thanks you Tor Lillqvist https://gerrit.libreoffice.org/#/c/54110/ Now, I confirmed that I can make my own build again. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Assertion Failed!: MSVCP140D.dll , Expression: ploc->_Mbcurmax == 1 || ploc->_Mbcurmax == 2
the code reaches before this line, but does not reach after this line https://github.com/boostorg/locale/blob/7cfa65b2b8114afe44c7a950553620133cd5df15/src/std/std_backend.cpp#L152 I tried std::cout << typeid(name.c_str()).name() << std::endl; and the terminal showed char const * __ptr64 though I'm not sure I'm doing the investigation correctly. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc |1
cui/source/dialogs/cuicharmap.cxx | 42 ++
2 files changed, 26 insertions(+), 17 deletions(-)
New commits:
commit fa17a6021f79374ba0e4e010587fa01774805da5
Author: himajin10 <himajin100...@gmail.com>
Date: Tue Mar 20 05:41:35 2018 +0900
tdf#114549:entering hex/dec code should change char sample
by checking has_focus() for m_xHexCodeText and m_xDecimalCodeText.
Also,CharHighlightHdl and SearchCharHighlightHdl now look alike.
Also add case for missing glyph for entered hex/dec code.
Change-Id: I32c782ac09756462f11b209afa12183d5ae7ac1f
Reviewed-on: https://gerrit.libreoffice.org/51616
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 5ee718467f54..66da2d39506d 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -97,6 +97,7 @@
#define RID_SVXSTR_SELECTOR_RUN
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
#define RID_SVXSTR_ROW NC_("RID_SVXSTR_ROW",
"Insert Rows")
#define RID_SVXSTR_REMOVE_FAVORITES
NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
+#define RID_SVXSTR_MISSING_GLYPH
NC_("RID_SVXSTR_MISSING_GLYPH", "Missing Glyph")
#define RID_SVXSTR_ADD_FAVORITES
NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites")
// PPI is pixel per inch, %1 is a number
#define RID_SVXSTR_PPI NC_("RID_SVXSTR_PPI", "(%1
PPI)")
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
old mode 100644
new mode 100755
index ae4eedfb84ba..4727baca0fc2
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -935,6 +935,17 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl,
SvxShowCharSet*, void)
{
// using the new UCS4 constructor
aText = OUString( , 1 );
+// Get the hexadecimal code
+aHexText = OUString::number(cChar, 16).toAsciiUpperCase();
+// Get the decimal code
+aDecimalText = OUString::number(cChar);
+setCharName(cChar);
+
+// Update the hex and decimal codes only if necessary
+if (m_xHexCodeText->get_text() != aHexText)
+m_xHexCodeText->set_text( aHexText );
+if (m_xDecimalCodeText->get_text() != aDecimalText)
+m_xDecimalCodeText->set_text( aDecimalText );
const Subset* pSubset = nullptr;
if( pSubsetMap )
@@ -945,7 +956,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl,
SvxShowCharSet*, void)
m_xSubsetLB->set_active(-1);
}
-if (m_xShowSet->HasFocus())
+if(m_xShowSet->HasFocus() || m_xHexCodeText->has_focus() ||
m_xDecimalCodeText->has_focus() )
{
m_xShowChar->SetText( aText );
m_xShowChar->SetFont( aFont );
@@ -953,22 +964,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl,
SvxShowCharSet*, void)
setFavButtonState(aText, aFont.GetFamilyName());
}
-
-// show char codes
-if ( bSelect )
-{
-// Get the hexadecimal code
-aHexText = OUString::number(cChar, 16).toAsciiUpperCase();
-// Get the decimal code
-aDecimalText = OUString::number(cChar);
-setCharName(cChar);
-}
-
-// Update the hex and decimal codes only if necessary
-if (m_xHexCodeText->get_text() != aHexText)
-m_xHexCodeText->set_text( aHexText );
-if (m_xDecimalCodeText->get_text() != aDecimalText)
-m_xDecimalCodeText->set_text( aDecimalText );
}
IMPL_LINK_NOARG(SvxCharacterMap, SearchCharHighlightHdl, SvxShowCharSet*, void)
@@ -1034,6 +1029,19 @@ void SvxCharacterMap::selectCharByCode(Radix radix)
if (xFontCharMap->HasChar(cChar))
// Select the corresponding character
SetChar(cChar);
+else {
+m_xCharName->set_label(CuiResId(RID_SVXSTR_MISSING_GLYPH));
+m_xShowChar->SetText(" ");
+switch(radix)
+{
+case Radix::decimal:
+m_xHexCodeText->set_text(OUString::number(cChar, 16));
+break;
+case Radix::hexadecimal:
+m_xDecimalCodeText->set_text(OUString::number(cChar));
+break;
+}
+}
}
IMPL_LINK_NOARG(SvxCharacterMap, DecimalCodeChangeHdl, weld::Entry&, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Assertion Failed!: MSVCP140D.dll , Expression: ploc->_Mbcurmax == 1 || ploc->_Mbcurmax == 2
more to add: SHA-256 of MSVCP140D.DLL: 831c4c13bc87604b60d0daa7317edd178ed33517a199cb1fc9c4890d7e9e038a as I noticed this may be caused by update to Windows 10 ver 1803(build 17134.1) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Assertion Failed!: MSVCP140D.dll , Expression: ploc->_Mbcurmax == 1 || ploc->_Mbcurmax == 2
Hi, himajin10 here. Just for explanation(but I'll definitely be very happy if you kindly help me.) I've updated my Visual Studio 2017 Preview to 15.7.0 Preview 6.0 and then started to fail to make my own LibreOffice build with the following error. Debug Assertion Failed! Program: C:\WINDOWS\SYSTEM32\MSVCP140D.dll File: f:\dd\vctools\crt\crtw32\stdcpp\xmbtowc.c Line: 89 Expression: ploc->_Mbcurmax == 1 || ploc->_Mbcurmax == 2 FYI Through printf-debugging thingy, I now know the cause is at https://opengrok.libreoffice.org/xref/core/unotools/source/i18n/resmgr.cxx?r=01f3d849#126 as the code before this is reached and the code after this is not reached. FYI: Translate::Create is called at https://opengrok.libreoffice.org/xref/core/framework/source/fwe/classes/fwkresid.cxx?r=101a79cc#25 FwkResId is called at https://opengrok.libreoffice.org/xref/core/framework/source/services/desktop.cxx?r=b4d36b5d#117 probably called by https://opengrok.libreoffice.org/xref/core/sfx2/source/appl/appinit.cxx?r=c5ab53e3#197 SfxApplication::Initialize_Impl() is called at https://opengrok.libreoffice.org/xref/core/sfx2/source/appl/app.cxx?r=00ff4d19#147 SfxApplication::GetOrCreate() is called at https://opengrok.libreoffice.org/xref/core/svx/source/gengal/gengal.cxx?r=b2147abd#277 when gengal.exe is executed. === I'm now freezing in front of the daunting task of understanding how to use boost library and under what algorithm it works.I'm just at novice level even in C++. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/firebird
external/firebird/firebird-vs2017.patch.1 |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit bbff9949f9c22daf1921b5680121102e4bd422ab Author: himajin10 <himajin100...@gmail.com> Date: Thu Mar 29 03:09:08 2018 +0900 Suppport _MSC_VER 1913 and 1914(Firebird) Change-Id: Ifeab9119fcc1037365251cd49dd7714cc37b3012 Reviewed-on: https://gerrit.libreoffice.org/52164 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1 index 7d140589c881..a4dad62e34a9 100644 --- a/external/firebird/firebird-vs2017.patch.1 +++ b/external/firebird/firebird-vs2017.patch.1 @@ -1,11 +1,11 @@ diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp firebird/src/common/os/win32/mod_loader.cpp --- firebird.orig/src/common/os/win32/mod_loader.cpp 2017-02-15 22:11:48.939042400 +0100 +++ firebird/src/common/os/win32/mod_loader.cpp2017-02-15 22:12:30.062262700 +0100 -@@ -103,6 +103,8 @@ +@@ -103,6 +103,6 @@ "msvcr120.dll", - #elif _MSC_VER == 1900 - "vcruntime140.dll", -+#elif _MSC_VER == 1910 || _MSC_VER == 1911 || _MSC_VER == 1912 +-#elif _MSC_VER == 1900 +- "vcruntime140.dll", ++#elif _MSC_VER >= 1900 && _MSC_VER <= 1914 + "vcruntime140.dll", #else #error Specify CRT DLL name here ! ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/bastyp/bparr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5c7ba324eb1b66b367c3f00164044a80778b8871 Author: himajin10 <himajin100...@gmail.com> Date: Sat Mar 31 20:58:31 2018 +0900 restore carelessly removed expandtab for vim see Miklos' comment on https://gerrit.libreoffice.org/#/c/52168/ Change-Id: Ief0cc781580e9b50c28d5f550189469ffa82d25a Reviewed-on: https://gerrit.libreoffice.org/52191 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx index e8add976077e..da67b8b1a617 100644 --- a/sw/source/core/bastyp/bparr.cxx +++ b/sw/source/core/bastyp/bparr.cxx @@ -495,4 +495,4 @@ sal_uInt16 BigPtrArray::Compress() return nFirstChgPos; } -/* vim:set shiftwidth=4 softtabstop=4 */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit3.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ff2628e181209093752f7e0ca9f4de128ee1239f
Author: himajin10 <himajin100...@gmail.com>
Date: Fri Mar 30 12:31:12 2018 +0900
unprefixed to prefixed, GetRightToLeft() to IsRightToLeft()
Change-Id: Id11b30f14d0a4f4c8c45918ff15f32cab3171171
Reviewed-on: https://gerrit.libreoffice.org/52169
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 7364bb1dea34..7cc6dfddb695 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3149,12 +3149,13 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
tools::Rectangle aClipRect, Po
}
#if OSL_DEBUG_LEVEL > 2
-if ( rTextPortion.GetKind() ==
PORTIONKIND_HYPHENATOR )
+// Do we really need this if statement?
+if ( rTextPortion.GetKind() ==
PortionKind::HYPHENATOR )
{
aTmpFont.SetFillColor( COL_LIGHTGRAY );
aTmpFont.SetTransparent( sal_False );
}
-if ( rTextPortion.GetRightToLeft() )
+if ( rTextPortion.IsRightToLeft() )
{
aTmpFont.SetFillColor( COL_LIGHTGRAY );
aTmpFont.SetTransparent( sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/update/feed/updatefeed.cxx |4 1 file changed, 4 insertions(+) New commits: commit 1e73a1bfab8abe658e2864ae1512737e489dfb0f Author: himajin10 <himajin100...@gmail.com> Date: Thu Mar 29 02:05:27 2018 +0900 Added includes that are only used in DEBUG builds Change-Id: I80f835ce31d44c1df32955fdc48f0accfb062747 Reviewed-on: https://gerrit.libreoffice.org/52162 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index e1d846ba8546..e42f064d156f 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -58,6 +58,10 @@ #include #include +#ifdef DEBUG +#include +#include +#endif namespace beans = com::sun::star::beans ; namespace container = com::sun::star::container ; namespace deployment = com::sun::star::deployment ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/bastyp/bparr.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 0c71a3efb9c7b617c82cef0e9db105f64690cbcb
Author: himajin10 <himajin100...@gmail.com>
Date: Thu Mar 29 02:25:46 2018 +0900
adapt to variable name change in commit ca67dcae
Change-Id: Ie5eef74f76221b45c72a78f53a3f7ce072f02b5c
Reviewed-on: https://gerrit.libreoffice.org/52168
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 81316418a55e..e8add976077e 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -200,7 +200,7 @@ void BigPtrArray::BlockDel( sal_uInt16 nDel )
void BigPtrArray::Insert( BigPtrEntry* pElem, sal_uLong pos )
{
-CHECKIDX( ppInf, nBlock, nSize, nCur );
+CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
BlockInfo* p;
sal_uInt16 cur;
@@ -293,12 +293,12 @@ void BigPtrArray::Insert( BigPtrEntry* pElem, sal_uLong
pos )
if( cur != ( m_nBlock - 1 ) ) UpdIndex( cur );
m_nCur = cur;
-CHECKIDX( ppInf, nBlock, nSize, nCur );
+CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
}
void BigPtrArray::Remove( sal_uLong pos, sal_uLong n )
{
-CHECKIDX( ppInf, nBlock, nSize, nCur );
+CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
sal_uInt16 nBlkdel = 0; // deleted blocks
sal_uInt16 cur = Index2Block( pos ); // current block number
@@ -377,7 +377,7 @@ void BigPtrArray::Remove( sal_uLong pos, sal_uLong n )
if( m_nBlock > ( m_nSize / ( MAXENTRY / 2 ) ) )
Compress();
-CHECKIDX( ppInf, nBlock, nSize, nCur );
+CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
}
void BigPtrArray::Replace( sal_uLong idx, BigPtrEntry* pElem)
@@ -393,7 +393,7 @@ void BigPtrArray::Replace( sal_uLong idx, BigPtrEntry*
pElem)
/** Compress the array */
sal_uInt16 BigPtrArray::Compress()
{
-CHECKIDX( ppInf, nBlock, nSize, nCur );
+CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
// Iterate over InfoBlock array from beginning to end. If there is a
deleted
// block in between so move all following ones accordingly. The pointer
@@ -490,9 +490,9 @@ sal_uInt16 BigPtrArray::Compress()
if( m_nCur >= nFirstChgPos )
m_nCur = 0;
-CHECKIDX( ppInf, nBlock, nSize, nCur );
+CHECKIDX( m_ppInf.get(), m_nBlock, m_nSize, m_nCur );
return nFirstChgPos;
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/items/stylepool.cxx | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit abbd8994740ee4c51bf473edba7b7dabf72c3a47
Author: himajin10 <himajin100...@gmail.com>
Date: Wed Mar 28 18:22:40 2018 +0900
explicitly pass false as arguments of createIterator
StylePool::createIterator has default paramters,but StylePoolImpl's does
not.
Change-Id: I1eff95cd3dc9e9bf7bae04aa78920c2d82acabd8
Reviewed-on: https://gerrit.libreoffice.org/52160
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 15fb042ef0e9..f1ddc7e0ab7b 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -334,10 +334,16 @@ private:
std::map< const SfxItemSet*, Node > maRoot;
// #i86923#
std::unique_ptr mpIgnorableItems;
+#ifdef DEBUG
+sal_Int32 mnCount;
+#endif
public:
// #i86923#
explicit StylePoolImpl( SfxItemSet const * pIgnorableItems )
: maRoot(),
+#ifdef DEBUG
+ mnCount(0),
+#endif
mpIgnorableItems( pIgnorableItems != nullptr
? pIgnorableItems->Clone( false )
: nullptr )
@@ -355,6 +361,7 @@ public:
bool bSkipIgnorableItems );
};
+
std::shared_ptr StylePoolImpl::insertItemSet( const SfxItemSet&
rSet )
{
bool bNonPoolable = false;
@@ -400,6 +407,9 @@ std::shared_ptr StylePoolImpl::insertItemSet(
const SfxItemSet& rSet
{
pCurNode->setItemSet( rSet );
bNonPoolable = false; // to avoid a double insertion
+#ifdef DEBUG
+++mnCount;
+#endif
}
// If rSet contains at least one non poolable item, a new itemset has to
be inserted
if( bNonPoolable )
@@ -407,7 +417,7 @@ std::shared_ptr StylePoolImpl::insertItemSet(
const SfxItemSet& rSet
#ifdef DEBUG
{
sal_Int32 nCheck = -1;
-IStylePoolIteratorAccess* pIter = createIterator();
+IStylePoolIteratorAccess* pIter = createIterator(false,false);
std::shared_ptr pTemp;
do
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/customize/cfg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e82f9e3d39ae31b1dd29a99484b7d125bb03f783
Author: himajin10 <himajin100...@gmail.com>
Date: Fri Mar 30 07:19:09 2018 +0900
use arrow instead of dot
Change-Id: I1014ed27ca97b59972737a0df5fe9de235ec732f
Reviewed-on: https://gerrit.libreoffice.org/52166
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 7f27e15f695a..5495a1c8dbfc 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -161,7 +161,7 @@ void printEntries(SvxEntries* entries)
{
for (auto const& entry : *entries)
{
-SAL_WARN("cui", "printEntries: " << entry.GetName());
+SAL_WARN("cui", "printEntries: " << entry->GetName());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/print2.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 15b7da00160ee65eceb816ff664c7bb46ffd69a2
Author: himajin10 <himajin100...@gmail.com>
Date: Thu Mar 29 02:34:18 2018 +0900
fix for for-range loops should come to #ifdef DEBUG too
Change-Id: Ib1b317e2564080e367d8d1fa0245c1707b141e57
Reviewed-on: https://gerrit.libreoffice.org/52163
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index bb54e2be1821..8bccc523ad9c 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -1314,14 +1314,14 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile(
const GDIMetaFile& rInMtf,
#if OSL_DEBUG_LEVEL > 1
// iterate over all aCCList members and generate rectangles for the
bounding boxes
rOutMtf.AddAction( new MetaFillColorAction( COL_WHITE, false ) );
-for( aCurr = aCCList.begin(); aCurr != aLast; ++aCurr )
+for(auto const& aCurr:aCCList)
{
-if( aCurr->bIsSpecial )
+if( aCurr.bIsSpecial )
rOutMtf.AddAction( new MetaLineColorAction( COL_RED, true) );
else
rOutMtf.AddAction( new MetaLineColorAction( COL_BLUE, true) );
-rOutMtf.AddAction( new MetaRectAction( aMapModeVDev->PixelToLogic(
aCurr->aBounds ) ) );
+rOutMtf.AddAction( new MetaRectAction( aMapModeVDev->PixelToLogic(
aCurr.aBounds ) ) );
}
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/numpages.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b19a6a5419cb69ca87b8c19d8921d707b5ab164f
Author: himajin10 <himajin100...@gmail.com>
Date: Fri Mar 30 08:21:57 2018 +0900
removed semicolon,added missing close-parenthesis
Change-Id: Ibe60ec5af4cdba95f3bcefef03d17371f40d14fc
Reviewed-on: https://gerrit.libreoffice.org/52167
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 816ae9795343..8b1a57cac64d 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2709,13 +2709,13 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const
SvxNumberFormat& rNumFmt)
if ( rNumFmt.GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
OUString sDebugText = OUString::number(
convertTwipToMm100(rNumFmt.GetAbsLSpace() ) ) + sHash
-+ OUString::number(
convertTwipToMm100(rNumFmt.GetCharTextDistance() ) + sHash
++ OUString::number(
convertTwipToMm100(rNumFmt.GetCharTextDistance() )) + sHash
+ OUString::number(
convertTwipToMm100(rNumFmt.GetFirstLineOffset() ) );
rFixed.SetText(sDebugText);
}
else if ( rNumFmt.GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_ALIGNMENT )
{
-OUString sDebugText = OUString::number(
convertTwipToMm100(rNumFmt.GetListtabPos() ) ) + sHash;
+OUString sDebugText = OUString::number(
convertTwipToMm100(rNumFmt.GetListtabPos() ) ) + sHash
+ OUString::number(
convertTwipToMm100(rNumFmt.GetFirstLineIndent() ) ) + sHash
+ OUString::number(
convertTwipToMm100(rNumFmt.GetIndentAt() ) );
rFixed.SetText(sDebugText);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 17 +++--
sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx |7 ++-
2 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 6b60390a9c3cd9eb6198260f3ab8ab600279396a
Author: himajin10 <himajin100...@gmail.com>
Date: Thu Mar 29 01:56:29 2018 +0900
RequestQueue::RemoveRequest should return bool if dbglevel >= 2
Change-Id: Ie6120abf9c96cf4ba53111650a86fbf33418ac13
Reviewed-on: https://gerrit.libreoffice.org/52161
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 809fbf46ca01..a17f181dd9f2 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -140,11 +140,18 @@ void RequestQueue::PageInDestruction(const SdrPage& rPage)
RemoveRequest();
}
-void RequestQueue::RemoveRequest (
+#if OSL_DEBUG_LEVEL >=2
+bool
+#else
+void
+#endif
+RequestQueue::RemoveRequest(
CacheKey aKey)
{
::osl::MutexGuard aGuard (maMutex);
-
+#if OSL_DEBUG_LEVEL >=2
+bool bIsRemoved = false;
+#endif
while(true)
{
Container::const_iterator aRequestIterator = ::std::find_if (
@@ -161,10 +168,16 @@ void RequestQueue::RemoveRequest (
SdrPage *pPage = const_cast<SdrPage*>(aRequestIterator->maKey);
pPage->RemovePageUser(*this);
mpRequestQueue->erase(aRequestIterator);
+#if OSL_DEBUG_LEVEL >=2
+bIsRemoved = true;
+#endif
}
else
break;
}
+#if OSL_DEBUG_LEVEL >=2
+return bIsRemoved;
+#endif
}
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index ba83e1657bfa..2470ffe1720b 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -61,7 +61,12 @@ public:
It is OK when the specified request is not a member of the
queue.
*/
-void RemoveRequest (CacheKey aKey);
+#if OSL_DEBUG_LEVEL >=2
+bool
+#else
+void
+#endif
+RemoveRequest (CacheKey aKey);
/** Change the priority class of the specified request.
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
StylePoolImpl::createIterator function does not take 0 arguments
It seems that .hpp(and .hdl included from .hpp) for the RectanglePoint
was created from .idl/.rdb by cppumaker that runs based on the .mk file,
and the resulting files will be stored under
C:\build\workdir\UnoApiHeadersTarget\offapi\comprehensive\
C:\build\workdir\UnoApiHeadersTarget\offapi\normal\
RectanglePoint.hdl says
enum SAL_DLLPUBLIC_RTTI RectanglePoint
{
RectanglePoint_LEFT_TOP = 0,
RectanglePoint_MIDDLE_TOP = 1,
RectanglePoint_RIGHT_TOP = 2,
RectanglePoint_LEFT_MIDDLE = 3,
RectanglePoint_MIDDLE_MIDDLE = 4,
RectanglePoint_RIGHT_MIDDLE = 5,
RectanglePoint_LEFT_BOTTOM = 6,
RectanglePoint_MIDDLE_BOTTOM = 7,
RectanglePoint_RIGHT_BOTTOM = 8,
RectanglePoint_MAKE_FIXED_SIZE = SAL_MAX_ENUM
};
so...now there's no wonder the compiler complains about the mere
LEFT_TOP. Fixed.
I also confirmed successful compilation with << operator for
RectanglePoint(with few modifications for the enum).
Thank you all for the advice.
I successfully made my own build with many of the macros intact from my
own local branch.
I've submitted most of the patches to gerrit,
https://gerrit.libreoffice.org/#/c/52160/
https://gerrit.libreoffice.org/#/c/52161/
https://gerrit.libreoffice.org/#/c/52162/
https://gerrit.libreoffice.org/#/c/52163/
https://gerrit.libreoffice.org/#/c/52164/
https://gerrit.libreoffice.org/#/c/52166/
https://gerrit.libreoffice.org/#/c/52167/
https://gerrit.libreoffice.org/#/c/52168/
https://gerrit.libreoffice.org/#/c/52169/
except all the following.
* RectanglePointToOUString , for the code's crappiness (unintentionally
submitted. deleted from gerrit on my side: 52165)
* the proposed << operator code for not knowing well about interception
between the tools that automatically generate .hdl as mentioned above.(
Unsubmitted)
* the code for boxclipper.cxx( Unsubmitted )
Currently, I'm receiving Verified-1, but it's not my fault. I'll try
later( Does this need to be rebased to trigger re-build then?)
broken buildslave - failed to checkout
the build failed because of an issue with the bot itself, not with the code.
The Bot failed to checkout the source
gerrit_mac
--
himajin10
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: StylePoolImpl::createIterator function does not take 0 arguments
Hi,
I decided to try to fix the errors in the macros I have just commented
out or deleted so far, and most of them seemed successful.However one of
the errors start causing headaches on me(C++ newbie too), so the patches
is to be submitted later than I expected, neither this evening nor tonight.
===
https://opengrok.libreoffice.org/xref/core/sd/source/filter/eppt/pptx-epptooxml.cxx?r=b2147abd#2887
CODE 1=START(concept)===
void dump_pset(Reference< XPropertySet > const& rXPropSet){
RectanglePoint pointValue;
if (value >>= pointValue)
SAL_INFO("sd.eppt", name << " = " << pointValue << "
(RectanglePoint)");
}
CODE 1==END
the compiler complains that RectanglePoint can't be converted.
so I wrote
CODE 2==START
OUString RectanglePointToOUString(const css::drawing::RectanglePoint& rp){
if(rp == css::drawing::RectanglePoint::LEFT_TOP)
return OUString::createFromAscii("LEFT_TOP");
if(rp == css::drawing::RectanglePoint::MIDDLE_TOP)
return OUString::createFromAscii("MIDDLE_TOP");
if(rp == css::drawing::RectanglePoint::RIGHT_TOP)
return OUString::createFromAscii("RIGHT_TOP");
if(rp == css::drawing::RectanglePoint::LEFT_MIDDLE)
return OUString::createFromAscii("LEFT_MIDDLE");
if(rp == css::drawing::RectanglePoint::MIDDLE_MIDDLE)
return OUString::createFromAscii("MIDDLE_MIDDLE");
if(rp == css::drawing::RectanglePoint::RIGHT_MIDDLE)
return OUString::createFromAscii("RIGHT_MIDDLE");
if(rp == css::drawing::RectanglePoint::LEFT_BOTTOM)
return OUString::createFromAscii("LEFT_BOTTOM");
if(rp == css::drawing::RectanglePoint::MIDDLE_BOTTOM)
return OUString::createFromAscii("MIDDLE_BOTTOM");
if(rp == css::drawing::RectanglePoint::RIGHT_BOTTOM)
return OUString::createFromAscii("RIGHT_BOTTOM");
SAL_WARN("sd","Unknown RectanglePoint Value");
return OUString::createFromAscii("");
}
void dump_pset(Reference< XPropertySet > const& rXPropSet){
// snip
RectanglePoint pointValue;
if (value >>= pointValue)
SAL_INFO("sd.eppt", name << " = " <<
RectanglePointToOUString(pointValue) << "(RectanglePoint)");
// snip
}
CODE 2==END
this thingy.
but compiler started to complain:
'LEFT_TOP':illegal qualified name in member declaration
'LEFT_TOP':undeclared identifier
himajin10
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'StylePoolImpl::createIterator': function does not take 0 arguments
> Where did you find the info that suggested these are necessary? If > it's some wiki page, it would be good to fix it. nowhere. I just read man thing-y for the command, and for some options, I searched google, and for some other options, I read the configure.ac and so on just to fill my self-satisfactory desire of using the lastest environment (64bit, Windows 10 SDK. I failed to adapt to JDK 9-ea when it was still not RTM due to the removal of tools.jar ) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'StylePoolImpl::createIterator': function does not take 0 arguments
> How exactly do you do your builds As is often the case with newbies to a certain domain, people are often afraid that they could have missed anything, and want to get relaxed with full-feature option, and that's what happened to me, as a newbie to OSS development. I spent several hours reading codes on opengrok, but what the program really does wasn't clear enough to me and wanted a logging feature. I came to know I can use SAL_INFO and SAL_WARN, and that was my ultimate goal at that time. Here I started to be in a status mentioned above, I chose to enable full feature. Most code seemed using OSL_DEBUG_LEVEL up to 2. Taking margins into account, I set dbglevel=3. SO THE COMMAND I USED WAS: /cygdrive/c/sources/libo-core/autogen.sh --enable-64-bit --enable-sal-log --enable-dbgutil --enable-selective-debuginfo="sw/ sc/ vcl/ sax/ svx/" --with-lang="ja" --with-external-tar=/cygdrive/c/sources/lo-externalsrc --with-junit=/cygdrive/c/sources/junit-4.12.jar --with-hamcrest=/cygdrive/c/sources/hamcrest-core-1.3.jar --with-ant-home=/cygdrive/c/sources/apache-ant-1.10.2 --enable-pch --disable-ccache --with-windows-sdk=10.0 --with-visual-studio=2017 /cygdrive/c/cygwin64/opt/lo/bin/make build-nocheck gb_COLOR=1 dbglevel=3 There were some rotting code, precisely rotten code, like basegfx/test/boxclipper.cxx?r=db045855#364 (missing argument). Not knowing what would be the ideal fix , I just commented out or deleted all those craps on my local branch, and I succeeded to make my own build and to use SAL_INFO. >it would not be set when you merely configure --enable-debug or --enable-dbgutil, >Having fallen into this pitfall a couple of times and got a headache understanding why the code was not executed, >What you say "make my own DEBUG build", what do you mean exactly? Wow. So I was also misunderstanding the DEBUG macro too. I was thinking, by using either of the options the DEBUG build in my definition would be made, and that's what I meant the "DEBUG build" for. I believe that developers( including me, as a newbie ) should put efforts in keeping compile task to be (mostly) successful as possible as they can, even if the code is not often used, and that was my motivation of writing "I will write a patch" in the aforementioned bug report. I already have prepared some patches(but does not cover all the problems) in my local branch to reduce someone's needs for his/her efforts in the future who would want to make his/her own build. If no one against this idea of mine appears by tomorrow afternoon, I will submit the patches to gerrit and wait for the code-review. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
'StylePoolImpl::createIterator': function does not take 0 arguments
Hello, I'm himajin10, often trying to make my own DEBUG build. This mail is just for explanation. I have written a bug report "tdf#116677:StylePool::createIterator has default paramters, but StylePoolImpl's does not" , but there Xisco Faulí kindly requested me to post these build issues to dev mailing-list, not to bugzilla. C:/sources/libo-core/svl/source/items/stylepool.cxx(410): error C2660: 'StylePoolImpl::createIterator': function does not take 0 arguments on trying to write a patch for this issue, I also found that variable declaration for mnCount(only used in DEBUG builds) was removed by the commit 778e9a65bf5 done by Noel Grandin.(This removal would not be problematic on release builds, but is problematic for DEBUG builds) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/dpoutput.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 8100a41597637165f364849e6964fdcf8906e5b7
Author: himajin10 <himajin100...@gmail.com>
Date: Thu Mar 22 17:50:03 2018 +0900
tdf#116470:Apply BOLD to CJK/CTL pivot table style
by changing ATTR_CJK_FONT_WEIGHT and ATTR_CTL_FONT_WEIGHT
(carelessly forgotten in Change 51511)
Change-Id: Idd7fce6b20f8e1f5b8d70bdc74ba06833cd0a1d9
Reviewed-on: https://gerrit.libreoffice.org/51727
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 34e06009f5bf..5c584944e20f 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -300,8 +300,11 @@ void lcl_SetStyleById(ScDocument* pDoc, SCTAB nTab,
SFXSTYLEBIT_USERDEF ) );
pStyle->SetParent( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) );
SfxItemSet& rSet = pStyle->GetItemSet();
-if (strcmp(pStrId, STR_PIVOT_STYLENAME_RESULT) == 0 || strcmp(pStrId,
STR_PIVOT_STYLENAME_TITLE) == 0)
+if (strcmp(pStrId, STR_PIVOT_STYLENAME_RESULT) == 0 || strcmp(pStrId,
STR_PIVOT_STYLENAME_TITLE) == 0){
rSet.Put( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT ) );
+rSet.Put( SvxWeightItem( WEIGHT_BOLD, ATTR_CJK_FONT_WEIGHT ) );
+rSet.Put( SvxWeightItem( WEIGHT_BOLD, ATTR_CTL_FONT_WEIGHT ) );
+}
if (strcmp(pStrId, STR_PIVOT_STYLENAME_CATEGORY) == 0 ||
strcmp(pStrId, STR_PIVOT_STYLENAME_TITLE) == 0)
rSet.Put( SvxHorJustifyItem( SvxCellHorJustify::Left,
ATTR_HOR_JUSTIFY ) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source sd/inc sd/source
sc/inc/pch/precompiled_scui.hxx |3 +++
sc/inc/strings.hrc |1 +
sc/source/ui/drawfunc/fuins1.cxx | 23 ---
sd/inc/pch/precompiled_sd.hxx|3 +++
sd/inc/strings.hrc |1 +
sd/source/ui/func/fuinsert.cxx | 19 ++-
6 files changed, 46 insertions(+), 4 deletions(-)
New commits:
commit e97ab52a83d2440ca42c85229ef794549208cb7d
Author: himajin10 <himajin100...@gmail.com>
Date: Sat Mar 17 07:00:02 2018 +0900
tdf#116438:Apps should ask if rotation should be applied
For Calc,Draw,Impress. Writer already does this.
Change-Id: I92512719673fb39a973b8a68378e93f30d82c327
Reviewed-on: https://gerrit.libreoffice.org/51447
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx
index 08321aeca6f3..244b05d121cb 100644
--- a/sc/inc/pch/precompiled_scui.hxx
+++ b/sc/inc/pch/precompiled_scui.hxx
@@ -45,6 +45,9 @@
#include
#include
#include
+#include
+#include
+#include
#include
#include
#include
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 02596e6bccdd..29ee57ae53f8 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -47,6 +47,7 @@
#define SCSTR_NO_TAB_BG_COLOR
NC_("SCSTR_NO_TAB_BG_COLOR", "Default")
#define SCSTR_RENAMEOBJECT NC_("SCSTR_RENAMEOBJECT",
"Name Object")
#define STR_INSERTGRAPHIC NC_("STR_INSERTGRAPHIC",
"Insert Image")
+#define STR_QUERYROTATION NC_("STR_QUERYROTATION",
"This image is rotated. Would you like to rotate it into standard orientation?")
#define SCSTR_TOTAL NC_("SCSTR_TOTAL", "%1
results found")
#define SCSTR_SKIPPED NC_("SCSTR_SKIPPED",
"(only %1 are listed)")
// Attribute
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 72c243bbe882..b7c4ed8d5e8b 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -31,7 +31,9 @@
#include
#include
#include
-
+#include
+#include
+#include
#include
#include
#include
@@ -100,6 +102,21 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
ScTabViewShell* pViewSh, const vcl::Window* pWindow,
SdrView* pView,
ScAnchorType aAnchorType = SCA_CELL )
{
+Graphic& rGraphic1 = const_cast(rGraphic);
+GraphicNativeMetadata aMetadata;
+if ( aMetadata.read(rGraphic1) )
+{
+const sal_uInt16 aRotation = aMetadata.getRotation();
+if (aRotation != 0)
+{
+std::unique_ptr
xQueryBox(Application::CreateMessageDialog(nullptr,
VclMessageType::Question,VclButtonsType::YesNo,ScResId(STR_QUERYROTATION)));
+if (xQueryBox->run() == RET_YES)
+{
+GraphicNativeTransform aTransform( rGraphic1 );
+aTransform.rotate( aRotation );
+}
+}
+}
ScDrawView* pDrawView = pViewSh->GetScDrawView();
// #i123922# check if an existing object is selected; if yes, evtl. replace
@@ -117,7 +134,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
SdrObject* pResult = pDrawView->ApplyGraphicToObject(
*pPickObj,
-rGraphic,
+rGraphic1,
aBeginUndo,
bAsLink ? rFileName : OUString(),
bAsLink ? rFilterName : OUString());
@@ -160,7 +177,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
tools::Rectangle aRect ( aInsertPos, aLogicSize );
-SdrGrafObj* pObj = new SdrGrafObj( rGraphic, aRect );
+SdrGrafObj* pObj = new SdrGrafObj( rGraphic1, aRect );
// calling SetGraphicLink here doesn't work
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index e02b65cbae48..0f42d8defb23 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -138,7 +138,10 @@
#include
#include
#include
+#include
#include
+#include
+#include
#include
#include
#include
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 52b5d6796cdd..1a5a829044ec 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -31,6 +31,7 @@
#define STR_UNDO_REPLACE
NC_("STR_UNDO_REPLACE", "Replace")
#define STR_UNDO_DRAGDROP
NC_("STR_UNDO_DRAGDROP", "Drag and Drop")
#define STR_INSERTGRAPHIC
NC_("STR_INSERTGRAPHIC", "Insert Image")
+#define STR_QUERYROTATION
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/globstr.hrc | 12 ++--
sc/source/core/data/dpoutput.cxx| 28 ++--
sc/source/core/tool/stylehelper.cxx | 27 ++-
3 files changed, 46 insertions(+), 21 deletions(-)
New commits:
commit 82aab78ccd0aab7502260124d330155a569c170e
Author: himajin10 <himajin100...@gmail.com>
Date: Sun Mar 18 10:20:51 2018 +0900
tdf#116470:Convert between ProgName/DisplayName for pivot table style
to avoid styles in different languages to be unnecessarily registered
Change-Id: I450909d798749f751b1c59cda28865f6c3ea76c3
Reviewed-on: https://gerrit.libreoffice.org/51511
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index d08ec69ed2a5..8fc75f74b237 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -348,12 +348,12 @@
#define STR_FUNCTIONLIST_MORE NC_("STR_FUNCTIONLIST_MORE",
"More...")
#define STR_ERR_INVALID_AREANC_("STR_ERR_INVALID_AREA",
"Invalid range")
// Templates for data pilot tables.
-#define STR_PIVOT_STYLE_INNER NC_("STR_PIVOT_STYLE_INNER",
"Pivot Table Value")
-#define STR_PIVOT_STYLE_RESULT NC_("STR_PIVOT_STYLE_RESULT",
"Pivot Table Result")
-#define STR_PIVOT_STYLE_CATEGORY
NC_("STR_PIVOT_STYLE_CATEGORY", "Pivot Table Category")
-#define STR_PIVOT_STYLE_TITLE NC_("STR_PIVOT_STYLE_TITLE",
"Pivot Table Title")
-#define STR_PIVOT_STYLE_FIELDNAME
NC_("STR_PIVOT_STYLE_FIELDNAME", "Pivot Table Field")
-#define STR_PIVOT_STYLE_TOP NC_("STR_PIVOT_STYLE_TOP",
"Pivot Table Corner")
+#define STR_PIVOT_STYLENAME_INNER
NC_("STR_PIVOT_STYLE_INNER", "Pivot Table Value")
+#define STR_PIVOT_STYLENAME_RESULT
NC_("STR_PIVOT_STYLE_RESULT", "Pivot Table Result")
+#define STR_PIVOT_STYLENAME_CATEGORY
NC_("STR_PIVOT_STYLE_CATEGORY", "Pivot Table Category")
+#define STR_PIVOT_STYLENAME_TITLE
NC_("STR_PIVOT_STYLE_TITLE", "Pivot Table Title")
+#define STR_PIVOT_STYLENAME_FIELDNAME
NC_("STR_PIVOT_STYLE_FIELDNAME", "Pivot Table Field")
+#define STR_PIVOT_STYLENAME_TOP NC_("STR_PIVOT_STYLE_TOP",
"Pivot Table Corner")
#define STR_OPERATION_FILTERNC_("STR_OPERATION_FILTER",
"Filter")
#define STR_OPERATION_SORT NC_("STR_OPERATION_SORT",
"Sort")
#define STR_OPERATION_SUBTOTAL NC_("STR_OPERATION_SUBTOTAL",
"Subtotals")
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index c28f82c76f51..34e06009f5bf 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -300,9 +300,9 @@ void lcl_SetStyleById(ScDocument* pDoc, SCTAB nTab,
SFXSTYLEBIT_USERDEF ) );
pStyle->SetParent( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) );
SfxItemSet& rSet = pStyle->GetItemSet();
-if (strcmp(pStrId, STR_PIVOT_STYLE_RESULT) == 0 || strcmp(pStrId,
STR_PIVOT_STYLE_TITLE) == 0)
+if (strcmp(pStrId, STR_PIVOT_STYLENAME_RESULT) == 0 || strcmp(pStrId,
STR_PIVOT_STYLENAME_TITLE) == 0)
rSet.Put( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT ) );
-if (strcmp(pStrId, STR_PIVOT_STYLE_CATEGORY) == 0 || strcmp(pStrId,
STR_PIVOT_STYLE_TITLE) == 0)
+if (strcmp(pStrId, STR_PIVOT_STYLENAME_CATEGORY) == 0 ||
strcmp(pStrId, STR_PIVOT_STYLENAME_TITLE) == 0)
rSet.Put( SvxHorJustifyItem( SvxCellHorJustify::Left,
ATTR_HOR_JUSTIFY ) );
}
@@ -788,17 +788,17 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow,
SCTAB nTab,
outputimp.OutputBlockFrame(
nCol,nMemberStartRow+static_cast(nLevel), nCol,nDataStartRow-1 );
lcl_SetStyleById( pDoc,nTab,
nCol,nMemberStartRow+static_cast(nLevel), nCol,nDataStartRow-1,
-STR_PIVOT_STYLE_TITLE );
+STR_PIVOT_STYLENAME_TITLE );
lcl_SetStyleById( pDoc,nTab, nCol,nDataStartRow, nCol,nTabEndRow,
-STR_PIVOT_STYLE_RESULT );
+STR_PIVOT_STYLENAME_RESULT );
}
else
{
outputimp.OutputBlockFrame(
nMemberStartCol+static_cast(nLevel),nRow, nDataStartCol-1,nRow );
lcl_SetStyleById( pDoc,nTab,
nMemberStartCol+static_cast(n
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - package/source
package/source/manifest/ManifestExport.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ce5d2cd0d9fe0c04fde50ba54fb4ca154f2bdf12
Author: himajin10 <himajin100...@gmail.com>
Date: Mon Mar 12 04:52:30 2018 +0900
tdf#116351: fix re-use of AttributeList on PGP manifest
multiple attributes of the same name on the same element,
because AttributeList was wrongly re-used
Change-Id: I29b2317ce3d836d7349fa0474709726bed2c5ad4
Reviewed-on: https://gerrit.libreoffice.org/51087
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 32f42d093d4408666151d03f04823e2bb39e46cd)
Reviewed-on: https://gerrit.libreoffice.org/51250
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/package/source/manifest/ManifestExport.cxx
b/package/source/manifest/ManifestExport.cxx
index 5cf87334ca62..d8c00cf5f9a0 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -231,8 +231,6 @@ ManifestExport::ManifestExport( uno::Reference<
xml::sax::XDocumentHandler > con
{
// yeah, so that goes directly below the manifest:manifest
// element
-::comphelper::AttributeList * pNewAttrList = new
::comphelper::AttributeList;
-uno::Reference < xml::sax::XAttributeList > xNewAttrList
(pNewAttrList);
OUStringBuffer aBuffer;
xHandler->ignorableWhitespace ( sWhiteSpace );
@@ -267,6 +265,8 @@ ManifestExport::ManifestExport( uno::Reference<
xml::sax::XDocumentHandler > con
xHandler->startElement( sEncryptedKeyElement, nullptr );
xHandler->ignorableWhitespace ( sWhiteSpace );
+::comphelper::AttributeList * pNewAttrList = new
::comphelper::AttributeList;
+uno::Reference < xml::sax::XAttributeList > xNewAttrList
(pNewAttrList);
// TODO: the algorithm should rather be configurable
pNewAttrList->AddAttribute ( sAlgorithmAttribute,
sCdataAttribute,
"http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p; );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: package/source
package/source/manifest/ManifestExport.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 32f42d093d4408666151d03f04823e2bb39e46cd
Author: himajin10 <himajin100...@gmail.com>
Date: Mon Mar 12 04:52:30 2018 +0900
tdf#116351: fix re-use of AttributeList on PGP manifest
multiple attributes of the same name on the same element,
because AttributeList was wrongly re-used
Change-Id: I29b2317ce3d836d7349fa0474709726bed2c5ad4
Reviewed-on: https://gerrit.libreoffice.org/51087
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/package/source/manifest/ManifestExport.cxx
b/package/source/manifest/ManifestExport.cxx
index 46ace993b581..2c819b346ff0 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -232,8 +232,6 @@ ManifestExport::ManifestExport( uno::Reference<
xml::sax::XDocumentHandler > con
{
// yeah, so that goes directly below the manifest:manifest
// element
-::comphelper::AttributeList * pNewAttrList = new
::comphelper::AttributeList;
-uno::Reference < xml::sax::XAttributeList > xNewAttrList
(pNewAttrList);
OUStringBuffer aBuffer;
xHandler->ignorableWhitespace ( sWhiteSpace );
@@ -268,6 +266,8 @@ ManifestExport::ManifestExport( uno::Reference<
xml::sax::XDocumentHandler > con
xHandler->startElement( sEncryptedKeyElement, nullptr );
xHandler->ignorableWhitespace ( sWhiteSpace );
+::comphelper::AttributeList * pNewAttrList = new
::comphelper::AttributeList;
+uno::Reference < xml::sax::XAttributeList > xNewAttrList
(pNewAttrList);
// TODO: the algorithm should rather be configurable
pNewAttrList->AddAttribute ( sAlgorithmAttribute,
sCdataAttribute,
"http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p; );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
himajin100000(real name:Tomoyuki Kubota) license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
