[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/inc sc/qa sc/uiconfig
sc/inc/globstr.hrc | 38 +++
sc/qa/uitest/calc_tests3/tdf62267.py |4 +-
sc/qa/uitest/calc_tests4/tdf86253.py |2 -
sc/uiconfig/scalc/ui/conditionalentry.ui | 50 +++
4 files changed, 47 insertions(+), 47 deletions(-)
New commits:
commit 22c51954a28654fde507c341cee28ab85fb9c47f
Author: ayhanyalcinsoy
AuthorDate: Thu Mar 5 11:49:11 2020 +0300
Commit: Eike Rathke
CommitDate: Wed May 27 21:29:21 2020 +0200
tdf#131045:Make condition names grammatically correct
Change-Id: Iae44adc763642632c269d6778b71411be99a68d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90007
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit 45161cc173c3217d79ba285c625851eefce3b8df)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94958
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index acb159d4605f..d393739292e5 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -432,30 +432,30 @@
#define STR_ERR_NAME_INVALIDNC_("STR_ERR_NAME_INVALID",
"Invalid name. Only use letters, numbers and underscore.")
#define STR_UNSAVED_EXT_REF NC_("STR_UNSAVED_EXT_REF",
"This Document contains external references to unsaved documents.\n\nDo you
want to continue?")
#define STR_CLOSE_WITH_UNSAVED_REFS
NC_("STR_CLOSE_WITH_UNSAVED_REFS", "This Document is referenced by another
document and not yet saved. Closing it without saving will result in data
loss.")
-#define STR_COND_CONDITION NC_("STR_COND_CONDITION",
"Cell value is")
+#define STR_COND_CONDITION NC_("STR_COND_CONDITION",
"Cell value")
#define STR_COND_COLORSCALE NC_("STR_COND_COLORSCALE",
"ColorScale")
#define STR_COND_DATABARNC_("STR_COND_DATABAR",
"DataBar")
#define STR_COND_ICONSETNC_("STR_COND_ICONSET",
"IconSet")
-#define STR_COND_BETWEENNC_("STR_COND_BETWEEN",
"between")
-#define STR_COND_NOTBETWEEN NC_("STR_COND_NOTBETWEEN",
"not between")
-#define STR_COND_UNIQUE NC_("STR_COND_UNIQUE",
"unique")
-#define STR_COND_DUPLICATE NC_("STR_COND_DUPLICATE",
"duplicate")
+#define STR_COND_BETWEENNC_("STR_COND_BETWEEN", "is
between")
+#define STR_COND_NOTBETWEEN NC_("STR_COND_NOTBETWEEN", "is
not between")
+#define STR_COND_UNIQUE NC_("STR_COND_UNIQUE", "is
unique")
+#define STR_COND_DUPLICATE NC_("STR_COND_DUPLICATE", "is
duplicate")
#define STR_COND_FORMULANC_("STR_COND_FORMULA",
"Formula is")
-#define STR_COND_TOP10 NC_("STR_COND_TOP10", "Top
Elements")
-#define STR_COND_BOTTOM10 NC_("STR_COND_BOTTOM10",
"Bottom Elements")
-#define STR_COND_TOP_PERCENTNC_("STR_COND_TOP_PERCENT",
"Top Percent")
+#define STR_COND_TOP10 NC_("STR_COND_TOP10", "is in
top elements")
+#define STR_COND_BOTTOM10 NC_("STR_COND_BOTTOM10", "is
in bottom elements")
+#define STR_COND_TOP_PERCENTNC_("STR_COND_TOP_PERCENT",
"is in top percent")
#define STR_COND_DATE NC_("STR_COND_DATE", "Date is")
-#define STR_COND_BOTTOM_PERCENT NC_("STR_COND_BOTTOM_PERCENT",
"Bottom Percent")
-#define STR_COND_ABOVE_AVERAGE NC_("STR_COND_ABOVE_AVERAGE",
"Above Average")
-#define STR_COND_BELOW_AVERAGE NC_("STR_COND_BELOW_AVERAGE",
"Below Average")
-#define STR_COND_ABOVE_EQUAL_AVERAGE
NC_("STR_COND_ABOVE_EQUAL_AVERAGE", "Above or equal Average")
-#define STR_COND_BELOW_EQUAL_AVERAGE
NC_("STR_COND_BELOW_EQUAL_AVERAGE", "Below or equal Average")
-#define STR_COND_ERROR NC_("STR_COND_ERROR", "an
Error code")
-#define STR_COND_NOERRORNC_("STR_COND_NOERROR", "not
an Error code")
-#define STR_COND_BEGINS_WITHNC_("STR_COND_BEGINS_WITH",
"Begins with")
-#define STR_COND_ENDS_WITH NC_("STR_COND_ENDS_WITH",
"Ends with")
-#define STR_COND_CONTAINS NC_("STR_COND_CONTAINS",
"Contains")
-#define STR_COND_NOT_CONTAINS NC_("STR_COND_NOT_CONTAINS",
"Not Contains")
+#define STR_COND_BOTTOM_PERCENT NC_("STR_COND_BOTTOM_PERCENT",
"is in bottom percent")
+#define STR_COND_ABOVE_AVERAGE NC_("STR_COND_ABOVE_AVERAGE",
"is above average")
+#define STR_COND_BELOW_AVERAGE NC_("STR_COND_BELOW_AVERAGE",
"is below average")
+#define STR_COND_ABOVE_EQUAL_AVERAGE
NC_("STR_COND_ABOVE_EQUAL_AVERAGE", "is above or equal average")
+#define STR_COND_BELOW_EQUAL_AVERAGE
[Libreoffice-commits] core.git: sc/inc sc/qa sc/uiconfig
sc/inc/globstr.hrc | 38 +++
sc/qa/uitest/calc_tests3/tdf62267.py |4 +-
sc/qa/uitest/calc_tests4/tdf86253.py |2 -
sc/uiconfig/scalc/ui/conditionalentry.ui | 50 +++
4 files changed, 47 insertions(+), 47 deletions(-)
New commits:
commit 97e14560e4b741c5eec027eced44f8f286d5523c
Author: ayhanyalcinsoy
AuthorDate: Thu Mar 5 11:49:11 2020 +0300
Commit: Eike Rathke
CommitDate: Wed May 27 20:29:50 2020 +0200
tdf#131045:Make condition names grammatically correct
Change-Id: Iae44adc763642632c269d6778b71411be99a68d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90007
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index acb159d4605f..d393739292e5 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -432,30 +432,30 @@
#define STR_ERR_NAME_INVALIDNC_("STR_ERR_NAME_INVALID",
"Invalid name. Only use letters, numbers and underscore.")
#define STR_UNSAVED_EXT_REF NC_("STR_UNSAVED_EXT_REF",
"This Document contains external references to unsaved documents.\n\nDo you
want to continue?")
#define STR_CLOSE_WITH_UNSAVED_REFS
NC_("STR_CLOSE_WITH_UNSAVED_REFS", "This Document is referenced by another
document and not yet saved. Closing it without saving will result in data
loss.")
-#define STR_COND_CONDITION NC_("STR_COND_CONDITION",
"Cell value is")
+#define STR_COND_CONDITION NC_("STR_COND_CONDITION",
"Cell value")
#define STR_COND_COLORSCALE NC_("STR_COND_COLORSCALE",
"ColorScale")
#define STR_COND_DATABARNC_("STR_COND_DATABAR",
"DataBar")
#define STR_COND_ICONSETNC_("STR_COND_ICONSET",
"IconSet")
-#define STR_COND_BETWEENNC_("STR_COND_BETWEEN",
"between")
-#define STR_COND_NOTBETWEEN NC_("STR_COND_NOTBETWEEN",
"not between")
-#define STR_COND_UNIQUE NC_("STR_COND_UNIQUE",
"unique")
-#define STR_COND_DUPLICATE NC_("STR_COND_DUPLICATE",
"duplicate")
+#define STR_COND_BETWEENNC_("STR_COND_BETWEEN", "is
between")
+#define STR_COND_NOTBETWEEN NC_("STR_COND_NOTBETWEEN", "is
not between")
+#define STR_COND_UNIQUE NC_("STR_COND_UNIQUE", "is
unique")
+#define STR_COND_DUPLICATE NC_("STR_COND_DUPLICATE", "is
duplicate")
#define STR_COND_FORMULANC_("STR_COND_FORMULA",
"Formula is")
-#define STR_COND_TOP10 NC_("STR_COND_TOP10", "Top
Elements")
-#define STR_COND_BOTTOM10 NC_("STR_COND_BOTTOM10",
"Bottom Elements")
-#define STR_COND_TOP_PERCENTNC_("STR_COND_TOP_PERCENT",
"Top Percent")
+#define STR_COND_TOP10 NC_("STR_COND_TOP10", "is in
top elements")
+#define STR_COND_BOTTOM10 NC_("STR_COND_BOTTOM10", "is
in bottom elements")
+#define STR_COND_TOP_PERCENTNC_("STR_COND_TOP_PERCENT",
"is in top percent")
#define STR_COND_DATE NC_("STR_COND_DATE", "Date is")
-#define STR_COND_BOTTOM_PERCENT NC_("STR_COND_BOTTOM_PERCENT",
"Bottom Percent")
-#define STR_COND_ABOVE_AVERAGE NC_("STR_COND_ABOVE_AVERAGE",
"Above Average")
-#define STR_COND_BELOW_AVERAGE NC_("STR_COND_BELOW_AVERAGE",
"Below Average")
-#define STR_COND_ABOVE_EQUAL_AVERAGE
NC_("STR_COND_ABOVE_EQUAL_AVERAGE", "Above or equal Average")
-#define STR_COND_BELOW_EQUAL_AVERAGE
NC_("STR_COND_BELOW_EQUAL_AVERAGE", "Below or equal Average")
-#define STR_COND_ERROR NC_("STR_COND_ERROR", "an
Error code")
-#define STR_COND_NOERRORNC_("STR_COND_NOERROR", "not
an Error code")
-#define STR_COND_BEGINS_WITHNC_("STR_COND_BEGINS_WITH",
"Begins with")
-#define STR_COND_ENDS_WITH NC_("STR_COND_ENDS_WITH",
"Ends with")
-#define STR_COND_CONTAINS NC_("STR_COND_CONTAINS",
"Contains")
-#define STR_COND_NOT_CONTAINS NC_("STR_COND_NOT_CONTAINS",
"Not Contains")
+#define STR_COND_BOTTOM_PERCENT NC_("STR_COND_BOTTOM_PERCENT",
"is in bottom percent")
+#define STR_COND_ABOVE_AVERAGE NC_("STR_COND_ABOVE_AVERAGE",
"is above average")
+#define STR_COND_BELOW_AVERAGE NC_("STR_COND_BELOW_AVERAGE",
"is below average")
+#define STR_COND_ABOVE_EQUAL_AVERAGE
NC_("STR_COND_ABOVE_EQUAL_AVERAGE", "is above or equal average")
+#define STR_COND_BELOW_EQUAL_AVERAGE
NC_("STR_COND_BELOW_EQUAL_AVERAGE", "is below or equal average")
+#define STR_COND_ERROR NC_("STR_COND_ERROR", "is
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/tr/DocumentList.xml | 34 1 file changed, 34 insertions(+) New commits: commit 49ca2c32514760bdfa417f81c5ef902fe38bcaad Author: ayhanyalcinsoy AuthorDate: Sun Mar 8 16:36:54 2020 +0300 Commit: Muhammet Kara CommitDate: Mon Mar 23 15:10:10 2020 +0100 tdf#130711: [tr] Extend Autocorrect list for Turkish language (Start with D/E) Change-Id: I312fb575e888c8a4c1ef0d2857e9682a7f31e295 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90187 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml b/extras/source/autocorr/lang/tr/DocumentList.xml index 678b3cc5a0a0..bd74017080db 100644 --- a/extras/source/autocorr/lang/tr/DocumentList.xml +++ b/extras/source/autocorr/lang/tr/DocumentList.xml @@ -170,6 +170,8 @@ + + @@ -182,18 +184,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/tr/DocumentList.xml | 24 1 file changed, 24 insertions(+) New commits: commit 0f3c1d59b62fc912b081737bdc4806ff2bedf58b Author: ayhanyalcinsoy AuthorDate: Wed Feb 26 19:26:15 2020 +0300 Commit: Muhammet Kara CommitDate: Sat Mar 7 11:39:47 2020 +0100 tdf#130711: [tr] Extend Autocorrect list for Turkish language (Start with C/Ç) Change-Id: Icff7d7ec85b34a9cea965ef57b302fb35dda9a5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89562 Tested-by: Jenkins Reviewed-by: Hakan Bakacak Reviewed-by: Yusuf Keten Reviewed-by: Muhammet Kara diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml b/extras/source/autocorr/lang/tr/DocumentList.xml index 21984140f44a..678b3cc5a0a0 100644 --- a/extras/source/autocorr/lang/tr/DocumentList.xml +++ b/extras/source/autocorr/lang/tr/DocumentList.xml @@ -132,14 +132,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/templatedlg.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit b23183af90996395c19eea5c71c7b2f5640b838b
Author: ayhanyalcinsoy
AuthorDate: Fri Feb 28 23:38:13 2020 +0300
Commit: Heiko Tietze
CommitDate: Tue Mar 3 10:04:02 2020 +0100
tdf#130600:Removed the New Category and Refresh icons from Template dialog
Change-Id: Iad22a84820056f05a3aae6d68f008fe904c56ffa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89750
Tested-by: Jenkins
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 592fcd1a45d7..60b18b5795bf 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -174,12 +174,11 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window
*pParent)
, mxLocalViewWeld(new weld::CustomWeld(*m_xBuilder, "template_view",
*mxLocalView))
{
// Create popup menus
-OUString sBmp(BMP_ACTION_REFRESH);
-mxActionBar->insert_item(0, MNI_ACTION_NEW_FOLDER,
SfxResId(STR_CATEGORY_NEW), , nullptr, TRISTATE_INDET);
+mxActionBar->insert_item(0, MNI_ACTION_NEW_FOLDER,
SfxResId(STR_CATEGORY_NEW), nullptr, nullptr, TRISTATE_INDET);
mxActionBar->insert_item(1, MNI_ACTION_RENAME_FOLDER,
SfxResId(STR_CATEGORY_RENAME), nullptr, nullptr, TRISTATE_INDET);
mxActionBar->insert_item(2, MNI_ACTION_DELETE_FOLDER,
SfxResId(STR_CATEGORY_DELETE), nullptr, nullptr, TRISTATE_INDET);
mxActionBar->insert_separator(3, "separator");
-mxActionBar->insert_item(4, MNI_ACTION_REFRESH,
SfxResId(STR_ACTION_REFRESH), , nullptr, TRISTATE_INDET);
+mxActionBar->insert_item(4, MNI_ACTION_REFRESH,
SfxResId(STR_ACTION_REFRESH), nullptr, nullptr, TRISTATE_INDET);
mxActionBar->connect_selected(LINK(this,SfxTemplateManagerDlg,MenuSelectHdl));
mxLocalView->setItemMaxTextLength(TEMPLATE_ITEM_MAX_TEXT_LENGTH);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/menubar/menubar.xml |1 + 1 file changed, 1 insertion(+) New commits: commit 73c69c96e3b582858cff5527fdd43157cffc5600 Author: ayhanyalcinsoy AuthorDate: Wed Feb 12 11:52:03 2020 +0300 Commit: Heiko Tietze CommitDate: Mon Feb 17 14:34:40 2020 +0100 tdf#127142:UI: Add 'Numbering Off' command to Format > Lists submenu Change-Id: I87404ff0c3e7b78cc03cf92cc53e88b4b2b775c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88428 Tested-by: Jenkins Tested-by: Heiko Tietze Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 2ff94dca3af5..896d2f205a31 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -436,6 +436,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 8705ca0c8a8f87fc4880922064f1f84cac1ea42c
Author: ayhanyalcinsoy
AuthorDate: Sun Jan 5 19:39:57 2020 +0300
Commit: Eike Rathke
CommitDate: Fri Feb 14 22:58:36 2020 +0100
tdf#124443: show arguments' tooltip above if in Formula Bar's Input Line
Change-Id: I33d52af9c2b1ac3f5cfe279ff17d487c70b8cf32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86226
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index acf924de9397..b0131488e148 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1156,7 +1156,14 @@ void ScInputHandler::ShowArgumentsTip( OUString&
rSelText )
aBuf.append( " : " );
aBuf.append(
ppFDesc->getParameterDescription(nActive-1) );
aNew = aBuf.makeStringAndClear();
-ShowTipBelow( aNew );
+if (eMode != SC_INPUT_TOP)
+{
+ShowTipBelow( aNew );
+}
+else
+{
+ShowTip(aNew);
+}
bFound = true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/menubar/menubar.xml | 10 ++ 1 file changed, 10 insertions(+) New commits: commit c060c80496429d59bb6f158c44957d853dccb06c Author: ayhanyalcinsoy AuthorDate: Thu Feb 6 08:57:44 2020 +0300 Commit: Muhammet Kara CommitDate: Mon Feb 10 10:04:05 2020 +0100 tdf#129599:Add Redaction action items into main menu in Draw Change-Id: I6021f6a8b0a3259cb6b5494912001ecec883e553 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87994 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index c8254a5e6c1e..02e67fc1bf6a 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -613,6 +613,16 @@ + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source uitest/writer_tests
sw/inc/strings.hrc |5 +++--
sw/qa/extras/layout/layout.cxx |2 +-
sw/qa/extras/odfimport/odfimport.cxx |6 +++---
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |4 ++--
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4 ++--
sw/qa/extras/rtfimport/rtfimport.cxx | 12 ++--
sw/qa/extras/tiledrendering/tiledrendering.cxx | 10 +-
sw/qa/extras/uiwriter/uiwriter.cxx |8
sw/qa/extras/uiwriter/uiwriter2.cxx|2 +-
sw/qa/extras/ww8export/ww8export3.cxx |4 ++--
sw/qa/uitest/writer_tests3/insertPageFooter.py |4 ++--
sw/qa/uitest/writer_tests5/tdf107494.py|8
sw/source/core/doc/SwStyleNameMapper.cxx |4 ++--
sw/source/core/unocore/unosett.cxx |2 +-
sw/source/core/unocore/unostyle.cxx|2 +-
sw/source/filter/xml/xmlimp.cxx|2 +-
sw/source/ui/index/cnttab.cxx |2 +-
sw/source/uibase/app/docst.cxx |3 +--
sw/source/uibase/app/docstyle.cxx |9 +++--
sw/source/uibase/utlui/uitool.cxx |4 ++--
uitest/writer_tests/insertPageHeader.py|4 ++--
21 files changed, 49 insertions(+), 52 deletions(-)
New commits:
commit 0298a702b32bdc4c4711cf31461169e549153b39
Author: ayhanyalcinsoy
AuthorDate: Sat Jan 11 15:54:49 2020 +0300
Commit: Maxim Monastirsky
CommitDate: Sun Feb 2 15:40:45 2020 +0100
tdf#129568 Rename Default Style to Default Paragraph/Page/Table Style
Change-Id: I21672c9b78e52c3c9b2687cb2c0ab21dcf67f19a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86538
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Tested-by: Heiko Tietze
Reviewed-by: Maxim Monastirsky
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index fbb64babe662..755bcc58e47c 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -24,6 +24,7 @@
#define NNC_(Context, StringSingular, StringPlural) reinterpret_cast(Context "\004" u8##StringSingular "\004" u8##StringPlural)
// Format names
+#define STR_POOLCHR_STANDARDNC_("STR_POOLCHR_STANDARD",
"Default Character Style")
#define STR_POOLCHR_FOOTNOTENC_("STR_POOLCHR_FOOTNOTE",
"Footnote Characters")
#define STR_POOLCHR_PAGENO NC_("STR_POOLCHR_PAGENO",
"Page Number")
#define STR_POOLCHR_LABEL NC_("STR_POOLCHR_LABEL",
"Caption Characters")
@@ -60,7 +61,7 @@
#define STR_POOLFRM_WATERSIGN NC_("STR_POOLFRM_WATERSIGN",
"Watermark")
#define STR_POOLFRM_LABEL NC_("STR_POOLFRM_LABEL",
"Labels")
// Template names
-#define STR_POOLCOLL_STANDARD NC_("STR_POOLCOLL_STANDARD",
"Default Style")
+#define STR_POOLCOLL_STANDARD NC_("STR_POOLCOLL_STANDARD",
"Default Paragraph Style")
#define STR_POOLCOLL_TEXT NC_("STR_POOLCOLL_TEXT", "Text
Body")
#define STR_POOLCOLL_TEXT_IDENT NC_("STR_POOLCOLL_TEXT_IDENT",
"First Line Indent")
#define STR_POOLCOLL_TEXT_NEGIDENT
NC_("STR_POOLCOLL_TEXT_NEGIDENT", "Hanging Indent")
@@ -188,7 +189,7 @@
#define STR_POOLCOLL_HTML_DDNC_("STR_POOLCOLL_HTML_DD",
"List Contents")
#define STR_POOLCOLL_HTML_DTNC_("STR_POOLCOLL_HTML_DT",
"List Heading")
//page style names
-#define STR_POOLPAGE_STANDARD NC_("STR_POOLPAGE_STANDARD",
"Default Style")
+#define STR_POOLPAGE_STANDARD NC_("STR_POOLPAGE_STANDARD",
"Default Page Style")
#define STR_POOLPAGE_FIRST NC_("STR_POOLPAGE_FIRST",
"First Page")
#define STR_POOLPAGE_LEFT NC_("STR_POOLPAGE_LEFT", "Left
Page")
#define STR_POOLPAGE_RIGHT NC_("STR_POOLPAGE_RIGHT",
"Right Page")
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 746b8a068aaf..4ed828a0fb56 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -462,7 +462,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInHeader)
SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
SwRootFrame* pLayout(pWrtShell->GetLayout());
CPPUNIT_ASSERT(!pLayout->IsHideRedlines());
-pWrtShell->ChangeHeaderOrFooter("Default Style", /*bHeader*/ true, /*bOn*/
true, false);
+pWrtShell->ChangeHeaderOrFooter("Default Page Style", /*bHeader*/ true,
/*bOn*/ true, false);
CPPUNIT_ASSERT(
pWrtShell
->IsInHeaderFooter()); // assume this is supposed to put cursor in
the new header...
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index 7e4e4a252ae7..56df38c6d686 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -253,7 +253,7 @@
[Libreoffice-commits] core.git: basctl/inc basctl/source
basctl/inc/iderdll.hxx |5 +
basctl/inc/strings.hxx |5 +
basctl/source/basicide/basdoc.hxx |5 +
basctl/source/basicide/basicmod.hxx|5 +
basctl/source/basicide/basicrenderable.hxx |5 +
5 files changed, 5 insertions(+), 20 deletions(-)
New commits:
commit 33bc192286c0f499c0d420b0e6f4a5d8ffbb9bf7
Author: ayhanyalcinsoy
AuthorDate: Sun Dec 22 01:30:32 2019 +0300
Commit: Samuel Mehrbrodt
CommitDate: Mon Jan 27 10:38:34 2020 +0100
tdf#124176:Use pragma once instead of include guards
Change-Id: Ie00f05a3661a9fd6159c424e01f11e7bb1ea45fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85640
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/basctl/inc/iderdll.hxx b/basctl/inc/iderdll.hxx
index 0087c915053c..ef8f28763e68 100644
--- a/basctl/inc/iderdll.hxx
+++ b/basctl/inc/iderdll.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASCTL_INC_IDERDLL_HXX
-#define INCLUDED_BASCTL_INC_IDERDLL_HXX
+#pragma once
namespace basctl
{
@@ -36,6 +35,4 @@ ExtraData* GetExtraData();
} // namespace basctl
-#endif // INCLUDED_BASCTL_INC_IDERDLL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/inc/strings.hxx b/basctl/inc/strings.hxx
index fe12c7c0125b..fc04eae43dc1 100644
--- a/basctl/inc/strings.hxx
+++ b/basctl/inc/strings.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_BASCTL_INC_STRINGS_HRC
-#define INCLUDED_BASCTL_INC_STRINGS_HRC
+#pragma once
// Dialog Controls
---
@@ -38,6 +37,4 @@
#define RID_STR_CLASS_SPINCONTROL "SpinButton"
#define RID_STR_CLASS_HYPERLINKCONTROL "HyperlinkControl"
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/basctl/source/basicide/basdoc.hxx
b/basctl/source/basicide/basdoc.hxx
index 897ce265b1a3..d5b3aabcf961 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASDOC_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_BASDOC_HXX
+#pragma once
#include
#include
@@ -65,6 +64,4 @@ public:
// because I don't know how to use nested names in it.
typedef basctl::DocShell basctl_DocShell;
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_BASDOC_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicmod.hxx
b/basctl/source/basicide/basicmod.hxx
index d94a2198d440..c15d53d85738 100644
--- a/basctl/source/basicide/basicmod.hxx
+++ b/basctl/source/basicide/basicmod.hxx
@@ -18,8 +18,7 @@
*/
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASICMOD_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICMOD_HXX
+#pragma once
#include
@@ -37,6 +36,4 @@ public:
} // namespace basctl
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_BASICMOD_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicrenderable.hxx
b/basctl/source/basicide/basicrenderable.hxx
index 2618e5faa9d2..638749c64982 100644
--- a/basctl/source/basicide/basicrenderable.hxx
+++ b/basctl/source/basicide/basicrenderable.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX
+#pragma once
#include
#include
@@ -64,6 +63,4 @@ public:
} // namespace basctl
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX
-
/* 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: oox/source
oox/source/export/shapes.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 451eab287acd88abc19c97bd99e50cbfa4480bb4
Author: ayhanyalcinsoy
AuthorDate: Sat Jan 4 09:50:28 2020 +0300
Commit: Regina Henschel
CommitDate: Sat Jan 25 11:43:56 2020 +0100
tdf#128049:FILESAVE PPTX Improve export of shape 'forbidden'
Change-Id: I68e0364acd62962785c1e2dc0ee6a1791cf7bc9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86154
Tested-by: Jenkins
Reviewed-by: Regina Henschel
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 5dedd509d2ff..be650130f2b1 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -562,6 +562,7 @@ static bool lcl_IsOnBlacklist(OUString const & rShapeType)
"cube",
"paper",
"frame",
+"forbidden",
"smiley",
"sun",
"flower",
@@ -620,7 +621,6 @@ static bool lcl_IsOnBlacklist(OUString const & rShapeType)
static bool lcl_IsOnWhitelist(OUString const & rShapeType)
{
static const std::initializer_list vWhitelist = {
-"forbidden",
"heart",
"puzzle"
};
@@ -985,6 +985,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const
Reference< XShape >& xShape )
case mso_sptDonut:
case mso_sptSun:
case mso_sptMoon:
+case mso_sptNoSmoking:
case mso_sptHorizontalScroll:
case mso_sptBevel:
case mso_sptBracketPair:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 16 ++---
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 52 +++---
2 files changed, 17 insertions(+), 51 deletions(-)
New commits:
commit 16e7ca76ae873fe953b483f4c34aa9e5610addf8
Author: ayhanyalcinsoy
AuthorDate: Sun Dec 29 01:57:26 2019 +0300
Commit: Mike Kaganski
CommitDate: Sun Jan 12 13:51:03 2020 +0100
tdf#129423: Make export tests export-only where applicable
Change-Id: I71d7e23dfdccd508ab0c12776296886c4bd028a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85880
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index 7ccadb2ba4c7..b34b125a4fe7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -519,7 +519,7 @@ DECLARE_OOXMLEXPORT_TEST(testTextframeGradient,
"textframe-gradient.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(318), getProperty(xFrame,
"RightMargin"));
}
-DECLARE_OOXMLEXPORT_TEST(testCellBtlr, "cell-btlr.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testCellBtlr, "cell-btlr.docx")
{
/*
* The problem was that the exporter didn't mirror the workaround of the
@@ -528,8 +528,6 @@ DECLARE_OOXMLEXPORT_TEST(testCellBtlr, "cell-btlr.docx")
*/
xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tcPr/w:textDirection", "val", "btLr");
}
@@ -867,7 +865,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66929, "fdo66929.docx")
}
}
-DECLARE_OOXMLEXPORT_TEST(testPageBorderSpacingExportCase2,
"page-borders-export-case-2.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testPageBorderSpacingExportCase2,
"page-borders-export-case-2.docx")
{
// The problem was that the exporter didn't mirror the workaround of the
// importer, regarding the page border's spacing : the
@@ -877,8 +875,6 @@ DECLARE_OOXMLEXPORT_TEST(testPageBorderSpacingExportCase2,
"page-borders-export-
// for Word to handle (larger than 31 points)
xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
// Assert the XPath expression - page borders
assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:pgBorders",
"offsetFrom", "page");
@@ -903,12 +899,10 @@ DECLARE_OOXMLEXPORT_TEST(testFdo66145, "fdo66145.docx")
parseDump("/root/page[3]/header/txt/text()"));
}
-DECLARE_OOXMLEXPORT_TEST(testGrabBag, "grabbag.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testGrabBag, "grabbag.docx")
{
// w:mirrorIndents was lost on roundtrip, now should be handled as a grab
bag property
xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:pPr/w:mirrorIndents");
}
@@ -1090,12 +1084,10 @@ DECLARE_OOXMLEXPORT_TEST(testTransparentShadow,
"transparent-shadow.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int16(50), nShadowTransparence);
}
-DECLARE_OOXMLEXPORT_TEST(NoFillAttrInImagedata, "NoFillAttrInImagedata.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(NoFillAttrInImagedata,
"NoFillAttrInImagedata.docx")
{
//problem was that type and color2 which are v:fill attributes were
written in 'v:imagedata'
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
assertXPathNoAttribute(pXmlDoc,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect/v:imagedata",
"type");
assertXPathNoAttribute(pXmlDoc,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect/v:imagedata",
"color2");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 478ee10310b7..6a31591c0a2c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -491,12 +491,10 @@ DECLARE_OOXMLEXPORT_TEST(testFontNameIsEmpty,
"font-name-is-empty.docx")
xmlXPathFreeObject(pXmlObj);
}
-DECLARE_OOXMLEXPORT_TEST(testMultiColumnLineSeparator,
"multi-column-line-separator-SAVED.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testMultiColumnLineSeparator,
"multi-column-line-separator-SAVED.docx")
{
// Check for the Column Separator value.It should be FALSE as the document
does not contain separator line.
xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:pPr/w:sectPr/w:cols","sep","false");
}
@@ -529,25 +527,21 @@ DECLARE_OOXMLEXPORT_TEST(testCustomXmlGrabBag,
"customxml.docx")
CPPUNIT_ASSERT(CustomXml); // Grab Bag has all the expected elements
}
-DECLARE_OOXMLEXPORT_TEST(testCustomXmlRelationships, "customxml.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testCustomXmlRelationships,
"customxml.docx")
{
xmlDocPtr pXmlDoc = parseExport("customXml/_rels/item1.xml.rels");
-if(!pXmlDoc)
-return;
[Libreoffice-commits] core.git: editeng/source fpicker/source hwpfilter/source i18npool/source
editeng/source/editeng/impedit2.cxx |2 +-
editeng/source/rtf/rtfitem.cxx|2 +-
fpicker/source/office/fileview.cxx|4 ++--
hwpfilter/source/hgzip.cxx|4 ++--
i18npool/source/collator/gencoll_rule.cxx |2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit c1599fc5c9800086548595d1f1464619a7024d06
Author: ayhanyalcinsoy
AuthorDate: Fri Dec 27 15:23:57 2019 +0300
Commit: Michael Stahl
CommitDate: Wed Jan 8 17:47:54 2020 +0100
tdf#96505:Get rid of cargo cult long integer literals
Change-Id: I6ee1f79d4b96c4ed161eff11c1b75574d89902dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85843
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index cd7ddad07c3e..2ee7d52496af 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3659,7 +3659,7 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion*
pPortion )
&& nPropLineSpace && ( nPropLineSpace < 100 ) )
{
const EditLine& rL = pPortion->GetLines()[nFirstInvalid];
-long n = rL.GetTxtHeight() * ( 100L - nPropLineSpace );
+long n = rL.GetTxtHeight() * ( 100 - nPropLineSpace );
n /= 100;
aRange.Min() -= n;
aRange.Max() += n;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 297469d85a58..2ada3d2a6289 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -417,7 +417,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
if( IsCalcValue() )
CalcValue();
-nTokenValue = short( 100L * aLSpace.GetLineHeight() /
nTokenValue );
+nTokenValue = short( 100 * aLSpace.GetLineHeight() /
nTokenValue );
aLSpace.SetPropLineSpace(
static_cast(nTokenValue) );
aLSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
diff --git a/fpicker/source/office/fileview.cxx
b/fpicker/source/office/fileview.cxx
index b09f589a32ba..c6fe831a73ec 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -1213,8 +1213,8 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
OSL_ENSURE( nMinTimeout > 0, "SvtFileView_Impl::GetFolderContent_Impl:
invalid minimum timeout!" );
if ( nMinTimeout <= 0 )
nMinTimeout = sal_Int32( 1000 );
-pTimeout->Seconds = nMinTimeout / 1000L;
-pTimeout->Nanosec = ( nMinTimeout % 1000L ) * 100L;
+pTimeout->Seconds = nMinTimeout / 1000;
+pTimeout->Nanosec = ( nMinTimeout % 1000 ) * 100;
m_xContentEnumerator->enumerateFolderContent( _rFolder, this );
diff --git a/hwpfilter/source/hgzip.cxx b/hwpfilter/source/hgzip.cxx
index e813cd01b98e..d26ea22c8824 100644
--- a/hwpfilter/source/hgzip.cxx
+++ b/hwpfilter/source/hgzip.cxx
@@ -66,7 +66,7 @@ gz_stream *gz_open(HStream & _stream)
//s->_inputstream = NULL;
s->z_err = Z_OK;
s->z_eof = 0;
-s->crc = crc32(0L, Z_NULL, 0);
+s->crc = crc32(0, Z_NULL, 0);
s->msg = nullptr;
s->mode = 'r';
@@ -194,7 +194,7 @@ size_t gz_read(gz_stream * file, voidp buf, unsigned len)
else if (s->z_err == Z_OK)
{
inflateReset(&(s->stream));
-s->crc = crc32(0L, Z_NULL, 0);
+s->crc = crc32(0, Z_NULL, 0);
}
}
if (s->z_err != Z_OK || s->z_eof)
diff --git a/i18npool/source/collator/gencoll_rule.cxx
b/i18npool/source/collator/gencoll_rule.cxx
index 5eb659c280b1..091ff6b2fa90 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.cxx
@@ -88,7 +88,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
exit(1);
}
-fseek(fp, 0L, SEEK_END);
+fseek(fp, 0, SEEK_END);
int fileSize = ftell(fp);
rewind(fp);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 33 +++
1 file changed, 8 insertions(+), 25 deletions(-)
New commits:
commit 3b8007d4270c5453a65dabef984ed6c24a5a2b4a
Author: ayhanyalcinsoy
AuthorDate: Sat Dec 28 08:24:08 2019 +0300
Commit: Mike Kaganski
CommitDate: Fri Dec 27 13:51:37 2019 +0100
tdf#129423: Make export tests export-only where applicable
Change-Id: Ib2ec1a6a3af553b416211180a3dc13862ef69665
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85858
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 10cb4292ef90..50f1b33fff47 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -62,11 +62,9 @@ DECLARE_OOXMLEXPORT_TEST(testfdo81381, "fdo81381.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[1]/w:r[1]/w:object[1]/o:OLEObject[1]", "DrawAspect",
"Icon");
}
-DECLARE_OOXMLEXPORT_TEST(testSdtAlias, "sdt-alias.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testSdtAlias, "sdt-alias.docx")
{
xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
// was completely missing.
assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:alias", "val",
"Subtitle");
@@ -157,11 +155,9 @@ DECLARE_OOXMLEXPORT_TEST(testUnwantedSectionBreak,
"unwanted-section-break.docx"
assertXPath(pXmlDoc, "//w:sectPr", 1);
}
-DECLARE_OOXMLEXPORT_TEST(testfdo80897 , "fdo80897.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testfdo80897 , "fdo80897.docx")
{
xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:bodyPr/a:prstTxWarp",
"prst", "textTriangle");
}
@@ -173,12 +169,10 @@ DECLARE_OOXMLEXPORT_TEST(testFdo80997, "fdo80997.docx")
uno::Reference< text::XTextRange > xText = getRun( xParagraph, 1, " text");
}
-DECLARE_OOXMLEXPORT_TEST(testFdo80902, "fdo80902.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo80902, "fdo80902.docx")
{
// The problem was that the docGrid type was set as default so fix it for
other grid type
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
- return;
assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:docGrid", "type",
"lines");
}
@@ -213,13 +207,10 @@ DECLARE_OOXMLEXPORT_TEST(testFirstHeaderFooter,
"first-header-footer.docx")
CPPUNIT_ASSERT_EQUAL(OUString("Even page footer 2"),
parseDump("/root/page[6]/footer/txt/text()"));
}
-DECLARE_OOXMLEXPORT_TEST(testFDO83044, "fdo83044.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFDO83044, "fdo83044.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
- return;
-
assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:text", 1);
}
@@ -717,29 +708,23 @@ DECLARE_OOXMLEXPORT_TEST(testOoxmlSymbolChicagoList,
"symbol_chicago_list.docx")
CPPUNIT_ASSERT_EQUAL(style::NumberingType::SYMBOL_CHICAGO, numFormat);
}
-DECLARE_OOXMLEXPORT_TEST(testOoxmlNumListZHTW, "numlist-zhtw.odt")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testOoxmlNumListZHTW, "numlist-zhtw.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/numbering.xml");
-if (!pXmlDoc)
-return;
assertXPath ( pXmlDoc,
"/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt","val","taiwaneseCountingThousand"
);
}
-DECLARE_OOXMLEXPORT_TEST(testOoxmlNumListZHCN, "numlist-zhcn.odt")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testOoxmlNumListZHCN, "numlist-zhcn.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/numbering.xml");
-if (!pXmlDoc)
-return;
assertXPath ( pXmlDoc,
"/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt","val","chineseCountingThousand"
);
}
-DECLARE_OOXMLEXPORT_TEST(testOOxmlOutlineNumberTypes,
"outline-number-types.odt")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testOOxmlOutlineNumberTypes,
"outline-number-types.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/numbering.xml");
-if (!pXmlDoc)
-return;
assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:pStyle",
"val", "Heading1");
assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt",
"val", "none");
@@ -949,12 +934,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf106953, "tdf106953.docx")
CPPUNIT_ASSERT_EQUAL(static_cast(0),
comphelper::SequenceAsHashMap(xRules->getByIndex(0))["FirstLineIndent"].get());
}
-DECLARE_OOXMLEXPORT_TEST(testTdf115094v3, "tdf115094v3.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf115094v3, "tdf115094v3.docx")
{
// floating table is now exported directly without surrounding frame
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblpPr", "tblpX",
"1996");
